Skip to content

Commit eaaf1a8

Browse files
committed
update
1 parent 5f1a318 commit eaaf1a8

File tree

2 files changed

+15
-34
lines changed

2 files changed

+15
-34
lines changed

.github/workflows/ccpp.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -94,12 +94,12 @@ jobs:
9494
key: ${{ matrix.name }}-ccache-${{ steps.ccache_cache_timestamp.outputs.timestamp }}
9595
restore-keys: |
9696
${{ matrix.name }}-ccache-
97-
97+
9898
- name: Use Node.js 16.x
9999
uses: actions/setup-node@v3
100100
with:
101101
node-version: 16.x
102-
102+
103103
- name: configure
104104
run: ./bootstrap
105105

@@ -134,11 +134,11 @@ jobs:
134134
# tests/test-coverage-coverall.sh
135135

136136
# See: https://github.com/marketplace/actions/coveralls-github-action
137-
- name: Coveralls
138-
if: matrix.name == 'ubuntu-gcc-10'
139-
uses: coverallsapp/[email protected]
140-
with:
141-
github-token: ${{ secrets.GITHUB_TOKEN }}
137+
# - name: Coveralls
138+
# if: matrix.name == 'ubuntu-gcc-10'
139+
# uses: coverallsapp/[email protected]
140+
# with:
141+
# github-token: ${{ secrets.GITHUB_TOKEN }}
142142
# run: coveralls --exclude lib --exclude tests --exclude src/random --exclude src/codeCogs/ --exclude src/export/ --exclude src/gzstream/ --gcov-options '\-lp'
143143

144-
144+

Makefile.am

Lines changed: 7 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,7 @@ bin_PROGRAMS = dEploid dEploid_dbg
1313
man1_MANS = docs/_build/man/dEploid.1
1414

1515
TESTS = unit_tests io_unit_tests
16-
check_PROGRAMS = unit_tests_1 unit_tests_2 unit_tests dEploid_dbg io_unit_tests current_unit_tests # dEploid_prof
16+
check_PROGRAMS = unit_tests dEploid_dbg io_unit_tests current_unit_tests # dEploid_prof
1717
PROG = DEPLOID
1818

1919
common_flags = -std=c++2a -Isrc/ -Isrc/codeCogs/ -Isrc/vcf/src/ -DDEPLOIDVERSION=\"${DEPLOIDVERSION}\" -DLASSOVERSION=\"${LASSOVERSION}\" -DCOMPILEDATE=\"${COMPILEDATE}\" -Wall -Wextra
@@ -57,37 +57,19 @@ dEploid_LDADD = $(common_LDADD)
5757
dEploid_dbg_LDADD = $(common_LDADD)
5858
dEploid_prof_LDADD = $(common_LDADD)
5959

60-
unit_tests_1_SOURCES_0 = tests/unittest/test_ibd.cpp \
61-
tests/unittest/test_panel.cpp \
62-
tests/unittest/test_utilities.cpp
63-
64-
unit_tests_2_SOURCES_0 = tests/unittest/test_mcmc.cpp \
60+
unit_tests_SOURCES = $(common_src) \
61+
tests/unittest/test_runner.cpp \
62+
tests/unittest/test_ibd.cpp \
6563
tests/unittest/test_updateSingleHap.cpp \
64+
tests/unittest/test_utilities.cpp \
65+
tests/unittest/test_panel.cpp \
66+
tests/unittest/test_mcmc.cpp \
6667
tests/unittest/test_updatePairHap.cpp \
6768
tests/unittest/test_workflow.cpp
6869

69-
unit_tests_1_SOURCES = $(common_src) \
70-
$(unit_tests_1_SOURCES_0) \
71-
tests/unittest/test_runner.cpp
72-
73-
unit_tests_2_SOURCES = $(common_src) \
74-
$(unit_tests_2_SOURCES_0) \
75-
tests/unittest/test_runner.cpp
76-
77-
unit_tests_SOURCES = $(common_src) \
78-
$(unit_tests_1_SOURCES_0) \
79-
$(unit_tests_2_SOURCES_0) \
80-
tests/unittest/test_runner.cpp
81-
8270
unit_tests_CXXFLAGS = $(common_flags) -DNDEBUG -DUNITTEST -Wno-write-strings --coverage
8371
unit_tests_LDADD = -lcppunit -ldl $(common_LDADD)
8472

85-
unit_tests_1_CXXFLAGS = $(common_flags) -DNDEBUG -DUNITTEST -Wno-write-strings --coverage
86-
unit_tests_1_LDADD = -lcppunit -ldl $(common_LDADD)
87-
88-
unit_tests_2_CXXFLAGS = $(common_flags) -DNDEBUG -DUNITTEST -Wno-write-strings --coverage
89-
unit_tests_2_LDADD = -lcppunit -ldl $(common_LDADD)
90-
9173
io_unit_tests_SOURCES = $(common_src) \
9274
tests/unittest/test_runner.cpp \
9375
tests/unittest/test_dEploidIO.cpp
@@ -116,4 +98,3 @@ if ENABLE_BASH_COMPLETION
11698
bashcompletiondir = $(BASH_COMPLETION_DIR)
11799
dist_bashcompletion_DATA = src/dEploid_completion.sh
118100
endif
119-

0 commit comments

Comments
 (0)