tests/Makefile: skip should-vdj.fa tests when the Python version test fails.

cb9d3fea · Mathieu Giraud · 6577fd78 · cb9d3fea · cb9d3fea
Commit cb9d3fea authored May 22, 2015 by Mathieu Giraud
Hide whitespace changes
Inline Side-by-side

Showing with 7 additions and 3 deletions

Makefile Makefile +1 -3

algo/tests/Makefile algo/tests/Makefile +6 -0

No files found.
--- a/Makefile
+++ b/Makefile
@@ -49,9 +49,7 @@ should: all

 shouldvdj: all
 	@echo
-	@echo "*** Launching .should-vdj-fa tests..."
-	make COVERAGE="$(COVERAGE_OPTION)" -C $(VIDJIL_ALGO_SRC)/tests shouldvdj
-	@echo "*** All .should-vdj.fa tests passed"
+	make COVERAGE="$(COVERAGE_OPTION)" -C $(VIDJIL_ALGO_SRC)/tests shouldvdj_if_python

 shouldvdj_generate:
 	@echo

--- a/algo/tests/Makefile
+++ b/algo/tests/Makefile
@@ -36,9 +36,15 @@ snapshot:

 should: vidjil $(SHOULD_LOG)

+shouldvdj_if_python:
+	-(python ../../tools/check_python_version.py && make shouldvdj)
+	@(python ../../tools/check_python_version.py || echo "!!! Bad python version, we skip .should-vdj.fa tests...")
+
 shouldvdj: vidjil
+	@echo "*** Launching .should-vdj-fa tests..."
 	python should-vdj-to-tap.py -2q -r $(SHOULD_VDJ) $(SHOULD_LOCUS)
 	python should-vdj-to-tap.py $(SHOULD_VDJ)
+	@echo "*** All .should-vdj.fa tests passed"

 %.tap: %.should_get force
 	./should-to-tap.sh $<