Commit aa821854 authored by Mathieu Giraud's avatar Mathieu Giraud

tests: do not bypass .should-vdj tests anymore but allow 81 failed tests

Commits ad0fe37e and 5815bf0d were very lazy, they are reverted.
It is safer to still check all these tests, allowing some failed tests corresponding
to recent or challenging .should-vdj sequences.

Te results of the tests were carefully compared to the ones before ad0fe37e/5815bf0d.
The difference (6 tests) come from some missing D segments due to 0c3cd0e.
parent d584ac61
......@@ -39,9 +39,9 @@ script:
- make COVERAGE=1 should
- echo -en 'travis_fold:end:script.test-algo-functional\\r'
###
# - echo '"Tests, Algo (functional, .should-vdj.fa)..."' && echo -en 'travis_fold:start:script.test-algo-functional-vdj\\r'
# - make shouldvdj
# - echo -en 'travis_fold:end:script.test-algo-functional-vdj\\r'
- echo '"Tests, Algo (functional, .should-vdj.fa)..."' && echo -en 'travis_fold:start:script.test-algo-functional-vdj\\r'
- make shouldvdj
- echo -en 'travis_fold:end:script.test-algo-functional-vdj\\r'
###
- echo '"Tests, Tools..."' && echo -en 'travis_fold:start:script.test-tools\\r'
- make test_tools
......
......@@ -52,7 +52,7 @@ should: all
shouldvdj: all
@echo
# $(MAKE) COVERAGE="$(COVERAGE_OPTION)" -C $(VIDJIL_ALGO_SRC)/tests shouldvdj_if_python
$(MAKE) COVERAGE="$(COVERAGE_OPTION)" -C $(VIDJIL_ALGO_SRC)/tests shouldvdj_if_python
shouldvdj_generate:
@echo
......
......@@ -10,6 +10,7 @@ OTHER_SRC=$(wildcard unit-tests/*.cpp)
LIB=../core/vidjil.a ../lib/lib.a
SHOULD=$(wildcard should-get-tests/*.should-get)
SHOULD_LOG=$(SHOULD:.should-get=.tap)
SHOULD_VDJ_EXPECTED_FAILS=--expected-fails 81
SHOULD_VDJ=$(wildcard should-vdj-tests/*.should-vdj.fa)
SHOULD_LOCUS=$(wildcard should-vdj-tests/*.should-locus.fa)
REPORTS_PATH := $(patsubst %/Makefile,%,$(abspath $(lastword $(MAKEFILE_LIST))))/../../reports
......@@ -57,10 +58,10 @@ shouldlocus_and_vdj: vidjil
@echo "*** All .should-vdj.fa tests passed"
shouldvdj:
python should-vdj-to-tap.py $(SHOULD_VDJ)
python should-vdj-to-tap.py $(SHOULD_VDJ_EXPECTED_FAILS) $(SHOULD_VDJ)
shouldvdj_with_rc:
python should-vdj-to-tap.py -r $(SHOULD_VDJ)
python should-vdj-to-tap.py $(SHOULD_VDJ_EXPECTED_FAILS) -r $(SHOULD_VDJ)
shouldvdj_with_rc_merged:
cat $(SHOULD_VDJ) > should-vdj-tests/should-vdj.merged.fa
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment