diff --git a/.travis.yml b/.travis.yml index f698fef1..33aa2cb5 100644 --- a/.travis.yml +++ b/.travis.yml @@ -35,7 +35,6 @@ matrix: homebrew: packages: - python - - valgrind - os: osx osx_image: xcode10.1 compiler: gcc @@ -44,7 +43,6 @@ matrix: packages: - gcc@8 - python - - valgrind env: - MAKETARGET=test-all diff --git a/Makefile b/Makefile index 9e21dbda..c37a7f79 100644 --- a/Makefile +++ b/Makefile @@ -32,7 +32,11 @@ run-functest: bin/functest_$(subst /,_,$(SCHEME)) .PHONY: run-valgrind run-valgrind: bin/functest_$(subst /,_,$(SCHEME)) +ifeq ($(shell uname -s),Linux) valgrind --leak-check=full --error-exitcode=1 $< +else + echo "Valgrind not supported on this platform." +endif bin/sanitizer_$(subst /,_,$(SCHEME)): test/$(dir $(SCHEME))functest.c $(wildcard $(SCHEME)/clean/*.c) $(wildcard $(SCHEME)/clean/*.h) | require_scheme mkdir -p bin @@ -159,7 +163,7 @@ run-symbol-namespace: test/check_symbol_namespace.py | require_scheme .PHONY: run-testvectors-all run-testvectors-all: test/check_testvectors.py - @for scheme in $(ALL_SCHEMES); do \ + for scheme in $(ALL_SCHEMES); do \ python3 test/check_testvectors.py $$scheme || exit 1; \ done diff --git a/test/check_testvectors.py b/test/check_testvectors.py index 4d473cd8..425a0aad 100644 --- a/test/check_testvectors.py +++ b/test/check_testvectors.py @@ -28,7 +28,10 @@ expectedTestvectorsHash = get_hash(SCHEME) subprocess.run(["make", "testvectors", "SCHEME={}".format(SCHEME)]) implementations = [ - x for x in os.listdir('bin') if 'testvectors' in x and SCHEMEFULL in x] + x for x in os.listdir('bin') + if 'testvectors' in x and SCHEMEFULL in x and '.dSYM' not in x + +] for impl in implementations: testvectors = subprocess.run(["bin/{}".format(impl)],