update

Author: shajoezhu

.circleci/config.yml

@@ -1,4 +1,4 @@
-version: "2.1"
+version: 2.1
 orbs:
   coveralls: coveralls/coveralls@2.2.5
 
@@ -124,7 +124,7 @@ jobs:
             ./tests/test_binaryVcfVsTxt.sh
             ./tests/test-against-previous-version.sh
             ./tests/test_binaryReproducible.sh
-            valgrind  --leak-check=full -v --show-leak-kinds=all ./unit_tests
+            valgrind  --leak-check=full -v --show-leak-kinds=all ./unit_tests_1
             coveralls --exclude lib --exclude tests --exclude src/random --exclude src/codeCogs/ --exclude src/export/ --gcov-options '\-lp'
       - coveralls/upload
 

Makefile.am

@@ -13,7 +13,7 @@ bin_PROGRAMS = dEploid dEploid_dbg
 man1_MANS = docs/_build/man/dEploid.1
 
 TESTS = unit_tests io_unit_tests
-check_PROGRAMS = unit_tests dEploid_dbg io_unit_tests current_unit_tests # dEploid_prof
+check_PROGRAMS = unit_tests_1 unit_tests_2 unit_tests dEploid_dbg io_unit_tests current_unit_tests # dEploid_prof
 PROG = DEPLOID
 
 common_flags = -std=c++17 -Isrc/ -Isrc/codeCogs/ -Isrc/vcf/src/ -DDEPLOIDVERSION=\"${DEPLOIDVERSION}\" -DLASSOVERSION=\"${LASSOVERSION}\" -DCOMPILEDATE=\"${COMPILEDATE}\" -Wall  -Wextra
@@ -57,19 +57,29 @@ dEploid_LDADD = $(common_LDADD)
 dEploid_dbg_LDADD = $(common_LDADD)
 dEploid_prof_LDADD = $(common_LDADD)
 
-unit_tests_SOURCES = $(common_src) \
+unit_tests_1_SOURCES = $(common_src) \
 					 tests/unittest/test_runner.cpp \
 					 tests/unittest/test_ibd.cpp \
 					 tests/unittest/test_updateSingleHap.cpp \
-					 tests/unittest/test_utilities.cpp \
+					 tests/unittest/test_utilities.cpp
+
+unit_tests_2_SOURCES = $(common_src) \
 					 tests/unittest/test_panel.cpp \
 					 tests/unittest/test_mcmc.cpp \
 					 tests/unittest/test_updatePairHap.cpp \
 					 tests/unittest/test_workflow.cpp
 
+unit_tests_SOURCES = $(unit_tests_1_SOURCES) $(unit_tests_2_SOURCES)
+
 unit_tests_CXXFLAGS = $(common_flags) -DNDEBUG -DUNITTEST -Wno-write-strings --coverage
 unit_tests_LDADD    = -lcppunit -ldl $(common_LDADD)
 
+unit_tests_1_CXXFLAGS = $(common_flags) -DNDEBUG -DUNITTEST -Wno-write-strings --coverage
+unit_tests_1_LDADD    = -lcppunit -ldl $(common_LDADD)
+
+unit_tests_2_CXXFLAGS = $(common_flags) -DNDEBUG -DUNITTEST -Wno-write-strings --coverage
+unit_tests_2_LDADD    = -lcppunit -ldl $(common_LDADD)
+
 io_unit_tests_SOURCES = $(common_src) \
 					 tests/unittest/test_runner.cpp \
 					 tests/unittest/test_dEploidIO.cpp