Merge pull request #353 from PQClean/enable_slow_tests
Disable skipping slow tests
This commit is contained in:
Thom Wiggers
GitHub
commit
168e362598
12
.travis.yml
12
.travis.yml
@ -14,7 +14,7 @@ matrix:
|
||||
- git checkout $TRAVIS_BRANCH
|
||||
- git reset --hard $COMMIT
|
||||
script:
|
||||
- travis_wait 60 docker run -e CI=true -e PQCLEAN_ONLY_TYPES -e PQCLEAN_ONLY_DIFF --rm -v ~/.ccache:/ccache -v `pwd`:`pwd` -w `pwd` "pqclean/ci-container:arm64" /bin/bash -c "
|
||||
- travis_wait 60 docker run -e CI=true -e PQCLEAN_SKIP_TESTS -e PQCLEAN_ONLY_TYPES -e PQCLEAN_ONLY_DIFF --rm -v ~/.ccache:/ccache -v `pwd`:`pwd` -w `pwd` "pqclean/ci-container:arm64" /bin/bash -c "
|
||||
uname -a &&
|
||||
export CCACHE_DIR=/ccache &&
|
||||
export CCACHE_NOSTATS=1 &&
|
||||
@ -26,6 +26,7 @@ matrix:
|
||||
env:
|
||||
PQCLEAN_ONLY_TYPES: kem
|
||||
PQCLEAN_ONLY_DIFF: 1
|
||||
PQCLEAN_SKIP_TESTS: valgrind,sanitizer
|
||||
services:
|
||||
- docker
|
||||
- name: "KEMs: ARM64 + Clang"
|
||||
@ -39,7 +40,7 @@ matrix:
|
||||
- git checkout $TRAVIS_BRANCH
|
||||
- git reset --hard $COMMIT
|
||||
script:
|
||||
- travis_wait 60 docker run -e CI=true -e PQCLEAN_ONLY_TYPES -e PQCLEAN_ONLY_DIFF --rm -v ~/.ccache:/ccache -v `pwd`:`pwd` -w `pwd` "pqclean/ci-container:arm64" /bin/bash -c "
|
||||
- travis_wait 60 docker run -e CI=true -e PQCLEAN_SKIP_TESTS -e PQCLEAN_ONLY_TYPES -e PQCLEAN_ONLY_DIFF --rm -v ~/.ccache:/ccache -v `pwd`:`pwd` -w `pwd` "pqclean/ci-container:arm64" /bin/bash -c "
|
||||
uname -a &&
|
||||
export CCACHE_NOSTATS=1 &&
|
||||
export CCACHE_DIR=/ccache &&
|
||||
@ -51,6 +52,7 @@ matrix:
|
||||
env:
|
||||
PQCLEAN_ONLY_TYPES: kem
|
||||
PQCLEAN_ONLY_DIFF: 1
|
||||
PQCLEAN_SKIP_TESTS: valgrind,sanitizer
|
||||
services:
|
||||
- docker
|
||||
- name: "Signs: ARM64 + GCC"
|
||||
@ -64,7 +66,7 @@ matrix:
|
||||
- git checkout $TRAVIS_BRANCH
|
||||
- git reset --hard $COMMIT
|
||||
script:
|
||||
- travis_wait 60 docker run -e CI=true -e PQCLEAN_ONLY_TYPES -e PQCLEAN_ONLY_DIFF -e PQCLEAN_SKIP_SCHEMES --rm -v ~/.ccache:/ccache -v `pwd`:`pwd` -w `pwd` "pqclean/ci-container:arm64" /bin/bash -c "
|
||||
- travis_wait 60 docker run -e CI=true -e PQCLEAN_SKIP_TESTS -e PQCLEAN_ONLY_TYPES -e PQCLEAN_ONLY_DIFF -e PQCLEAN_SKIP_SCHEMES --rm -v ~/.ccache:/ccache -v `pwd`:`pwd` -w `pwd` "pqclean/ci-container:arm64" /bin/bash -c "
|
||||
uname -a &&
|
||||
export CCACHE_NOSTATS=1 &&
|
||||
export CCACHE_DIR=/ccache &&
|
||||
@ -77,6 +79,7 @@ matrix:
|
||||
PQCLEAN_ONLY_TYPES: sign
|
||||
PQCLEAN_ONLY_DIFF: 1
|
||||
PQCLEAN_SKIP_SCHEMES: sphincs-haraka-128f-robust,sphincs-haraka-192s-robust,sphincs-sha256-128f-robust,sphincs-sha256-192s-robust,sphincs-shake256-128f-robust,sphincs-shake256-192s-robust,sphincs-haraka-128f-simple,sphincs-haraka-192s-simple,sphincs-sha256-128f-simple,sphincs-sha256-192s-simple,sphincs-shake256-128f-simple,sphincs-shake256-192s-simple,sphincs-haraka-128s-robust,sphincs-haraka-256f-robust,sphincs-sha256-128s-robust,sphincs-sha256-256f-robust,sphincs-shake256-128s-robust,sphincs-shake256-256f-robust,sphincs-haraka-128s-simple,sphincs-haraka-256f-simple,sphincs-sha256-128s-simple,sphincs-sha256-256f-simple,sphincs-shake256-128s-simple,sphincs-shake256-256f-simple,sphincs-haraka-192f-robust,sphincs-haraka-256s-robust,sphincs-sha256-192f-robust,sphincs-sha256-256s-robust,sphincs-shake256-192f-robust,sphincs-shake256-256s-robust,sphincs-haraka-192f-simple,sphincs-haraka-256s-simple,sphincs-sha256-192f-simple,sphincs-sha256-256s-simple,sphincs-shake256-192f-simple,sphincs-shake256-256s-simple
|
||||
PQCLEAN_SKIP_TESTS: valgrind,sanitizer
|
||||
services:
|
||||
- docker
|
||||
- name: "signs: ARM64 + Clang"
|
||||
@ -90,7 +93,7 @@ matrix:
|
||||
- git checkout $TRAVIS_BRANCH
|
||||
- git reset --hard $COMMIT
|
||||
script:
|
||||
- travis_wait 60 docker run -e CI=true -e PQCLEAN_ONLY_TYPES -e PQCLEAN_ONLY_DIFF=1 -e PQCLEAN_SKIP_SCHEMES --rm -v ~/.ccache:/ccache -v `pwd`:`pwd` -w `pwd` "pqclean/ci-container:arm64" /bin/bash -c "
|
||||
- travis_wait 60 docker run -e CI=true -e PQCLEAN_SKIP_TESTS -e PQCLEAN_ONLY_TYPES -e PQCLEAN_ONLY_DIFF=1 -e PQCLEAN_SKIP_SCHEMES --rm -v ~/.ccache:/ccache -v `pwd`:`pwd` -w `pwd` "pqclean/ci-container:arm64" /bin/bash -c "
|
||||
uname -a &&
|
||||
export CCACHE_NOSTATS=1 &&
|
||||
export CCACHE_DIR=/ccache &&
|
||||
@ -103,6 +106,7 @@ matrix:
|
||||
PQCLEAN_ONLY_TYPES: sign
|
||||
PQCLEAN_ONLY_DIFF: 1
|
||||
PQCLEAN_SKIP_SCHEMES: sphincs-haraka-128f-robust,sphincs-haraka-192s-robust,sphincs-sha256-128f-robust,sphincs-sha256-192s-robust,sphincs-shake256-128f-robust,sphincs-shake256-192s-robust,sphincs-haraka-128f-simple,sphincs-haraka-192s-simple,sphincs-sha256-128f-simple,sphincs-sha256-192s-simple,sphincs-shake256-128f-simple,sphincs-shake256-192s-simple,sphincs-haraka-128s-robust,sphincs-haraka-256f-robust,sphincs-sha256-128s-robust,sphincs-sha256-256f-robust,sphincs-shake256-128s-robust,sphincs-shake256-256f-robust,sphincs-haraka-128s-simple,sphincs-haraka-256f-simple,sphincs-sha256-128s-simple,sphincs-sha256-256f-simple,sphincs-shake256-128s-simple,sphincs-shake256-256f-simple,sphincs-haraka-192f-robust,sphincs-haraka-256s-robust,sphincs-sha256-192f-robust,sphincs-sha256-256s-robust,sphincs-shake256-192f-robust,sphincs-shake256-256s-robust,sphincs-haraka-192f-simple,sphincs-haraka-256s-simple,sphincs-sha256-192f-simple,sphincs-sha256-256s-simple,sphincs-shake256-192f-simple,sphincs-shake256-256s-simple
|
||||
PQCLEAN_SKIP_TESTS: valgrind,sanitizer
|
||||
services:
|
||||
- docker
|
||||
|
||||
|
||||
@ -156,16 +156,6 @@ def skip_windows(message="This test is not supported on Windows"):
|
||||
return wrapper
|
||||
|
||||
|
||||
def slow_test(f):
|
||||
@functools.wraps(f)
|
||||
def wrapper(*args, **kwargs):
|
||||
if ('CI' in os.environ and 'RUN_SLOW' not in os.environ and
|
||||
os.environ.get('TRAVIS_EVENT_TYPE') != 'cron'):
|
||||
raise unittest.SkipTest("Slow test skipped on CI run")
|
||||
return f(*args, **kwargs)
|
||||
return wrapper
|
||||
|
||||
|
||||
@lru_cache(maxsize=None)
|
||||
def ensure_available(executable):
|
||||
"""
|
||||
|
||||
@ -50,12 +50,16 @@ def test_functest(implementation, impl_path, test_dir,
|
||||
)
|
||||
@helpers.skip_windows()
|
||||
@helpers.filtered_test
|
||||
@helpers.slow_test
|
||||
def test_functest_sanitizers(implementation, impl_path, test_dir,
|
||||
init, destr):
|
||||
dest_dir = os.path.join(test_dir, 'bin')
|
||||
env = None
|
||||
if platform.machine() == 'ppc' and os.environ.get('CC', 'gcc') == 'clang':
|
||||
if (implementation.scheme.name == "sphincs-sha256-192s-robust"
|
||||
and 'CI' in os.environ
|
||||
and implementation.name == "clean"
|
||||
and 'clang' in os.environ.get('CC', '')):
|
||||
raise unittest.SkipTest("Clang makes this test use too much RAM")
|
||||
if platform.machine() == 'ppc' and 'clang' in os.environ.get('CC', 'gcc'):
|
||||
raise unittest.SkipTest("Clang does not support ASAN on ppc")
|
||||
elif platform.machine() in ['armv7l', 'aarch64']:
|
||||
env = {'ASAN_OPTIONS': 'detect_leaks=0'}
|
||||
|
||||
@ -30,7 +30,6 @@ def valgrind_supports_exit_early():
|
||||
for impl in pqclean.Scheme.all_supported_implementations()],
|
||||
ids=[str(impl) for impl in pqclean.Scheme.all_supported_implementations()],
|
||||
)
|
||||
@helpers.slow_test
|
||||
@helpers.filtered_test
|
||||
def test_valgrind(implementation: pqclean.Implementation, impl_path, test_dir,
|
||||
init, destr):
|
||||
|
||||
Loading…
Reference in New Issue
Block a user