From 157d7b7a78da74f5469f10cb3c48a6bb1f97b878 Mon Sep 17 00:00:00 2001
From: Thom Wiggers <thom@thomwiggers.nl>
Date: Wed, 17 Apr 2019 11:10:49 +0200
Subject: [PATCH 1/2] Fix trailing whitespace

---
 test/test_api_h.py       | 2 +-
 test/test_char.py        | 2 +-
 test/test_compile_lib.py | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/test/test_api_h.py b/test/test_api_h.py
index 5ed2d121..205793f2 100644
--- a/test/test_api_h.py
+++ b/test/test_api_h.py
@@ -8,7 +8,7 @@ import pqclean
 def test_preprocessor():
     for scheme in pqclean.Scheme.all_schemes():
         for implementation in scheme.implementations:
-            if helpers.permit_test('preprocessor', implementation): 
+            if helpers.permit_test('preprocessor', implementation):
                 yield check_preprocessor, implementation
 
 
diff --git a/test/test_char.py b/test/test_char.py
index 48aa55c9..3f8f7296 100644
--- a/test/test_char.py
+++ b/test/test_char.py
@@ -17,7 +17,7 @@ def test_char():
         )
     for scheme in pqclean.Scheme.all_schemes():
         for implementation in scheme.implementations:
-            if helpers.permit_test('char', implementation): 
+            if helpers.permit_test('char', implementation):
                 yield check_char, implementation
 
 
diff --git a/test/test_compile_lib.py b/test/test_compile_lib.py
index e4b1ae5c..c3888543 100644
--- a/test/test_compile_lib.py
+++ b/test/test_compile_lib.py
@@ -10,7 +10,7 @@ import helpers
 def test_compile_lib():
     for scheme in pqclean.Scheme.all_schemes():
         for implementation in scheme.implementations:
-            if helpers.permit_test('compile_lib', implementation): 
+            if helpers.permit_test('compile_lib', implementation):
                 yield check_compile_lib, implementation
 
 

From 3e95b0b4d71ba91e631d89c8037aeebfbac7d49b Mon Sep 17 00:00:00 2001
From: Thom Wiggers <thom@thomwiggers.nl>
Date: Wed, 17 Apr 2019 11:17:46 +0200
Subject: [PATCH 2/2] Add slow test annotator

---
 test/helpers.py           | 9 +++++++++
 test/test_functest.py     | 1 +
 test/test_preprocessor.py | 4 +---
 test/test_valgrind.py     | 3 +--
 4 files changed, 12 insertions(+), 5 deletions(-)

diff --git a/test/helpers.py b/test/helpers.py
index 873d015d..ea1639af 100644
--- a/test/helpers.py
+++ b/test/helpers.py
@@ -80,6 +80,15 @@ 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:
+            raise unittest.SkipTest("Slow test skipped on CI run")
+        return f(*args, **kwargs)
+    return wrapper
+
+
 def ensure_available(executable):
     """
     Checks if a command is available.
diff --git a/test/test_functest.py b/test/test_functest.py
index d7696881..e38eed50 100644
--- a/test/test_functest.py
+++ b/test/test_functest.py
@@ -42,6 +42,7 @@ def check_functest(implementation):
 
 
 @helpers.skip_windows()
+@helpers.slow_test
 def check_functest_sanitizers(implementation):
     env = None
     if platform.machine() == 'ppc' and os.environ.get('CC', 'gcc') == 'clang':
diff --git a/test/test_preprocessor.py b/test/test_preprocessor.py
index c332362e..84c4c8f4 100644
--- a/test/test_preprocessor.py
+++ b/test/test_preprocessor.py
@@ -1,6 +1,3 @@
-import os
-from glob import glob
-
 import pqclean
 import helpers
 
@@ -29,6 +26,7 @@ def check_preprocessor(implementation: pqclean.Implementation):
             "Prohibited use of preprocessor conditional" + "".join(errors)
         )
 
+
 if __name__ == "__main__":
     try:
         import nose2
diff --git a/test/test_valgrind.py b/test/test_valgrind.py
index 1a31f59a..6afba526 100644
--- a/test/test_valgrind.py
+++ b/test/test_valgrind.py
@@ -17,12 +17,11 @@ def test_functest():
                 yield check_valgrind, implementation
 
 
+@helpers.slow_test
 def check_valgrind(implementation: pqclean.Implementation):
     if (platform.machine() not in ('i386', 'x86_64') or
             platform.system() != 'Linux'):
         raise unittest.SkipTest()
-    if os.environ.get('CIRCLECI') == 'true' and os.environ.get('ARCH') == 'i386' and (implementation.scheme.name == 'frodokem1344aes' or implementation.scheme.name == 'frodokem1344shake'):
-        raise unittest.SkipTest('Skipping too-slow valgrind test')
 
     helpers.make(TYPE=implementation.scheme.type,
                  SCHEME=implementation.scheme.name,