From 1180de5d306c599e50ffc8599538ebd7bdce6f2c Mon Sep 17 00:00:00 2001
From: Thom Wiggers <thom@thomwiggers.nl>
Date: Wed, 27 Feb 2019 12:58:00 +0100
Subject: [PATCH] Add environment to sanitizers on ARM

---
 test/helpers.py       | 14 +++++++++++---
 test/test_functest.py | 18 +++++++++++++++---
 2 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/test/helpers.py b/test/helpers.py
index 0d8537ee..09a20985 100644
--- a/test/helpers.py
+++ b/test/helpers.py
@@ -1,11 +1,17 @@
+import os
 import subprocess
 
 
-def run_subprocess(command, working_dir='.', expected_returncode=0):
+def run_subprocess(command, working_dir='.', env=None, expected_returncode=0):
     """
     Helper function to run a shell command and report success/failure
     depending on the exit status of the shell command.
     """
+    if env is not None:
+        env_ = os.environ.copy()
+        env_.update(env)
+        env = env_
+
     # Note we need to capture stdout/stderr from the subprocess,
     # then print it, which nose/unittest will then capture and
     # buffer appropriately
@@ -13,7 +19,8 @@ def run_subprocess(command, working_dir='.', expected_returncode=0):
         command,
         stdout=subprocess.PIPE,
         stderr=subprocess.STDOUT,
-        cwd=working_dir
+        cwd=working_dir,
+        env=env,
     )
     print(working_dir + " > " + " ".join(command))
     print(result.stdout.decode('utf-8'))
@@ -21,7 +28,7 @@ def run_subprocess(command, working_dir='.', expected_returncode=0):
     return result.stdout.decode('utf-8')
 
 
-def make(*args, working_dir='.', **kwargs):
+def make(*args, working_dir='.', env=None, **kwargs):
     """
     Runs a make target in the specified working directory
 
@@ -36,4 +43,5 @@ def make(*args, working_dir='.', **kwargs):
             *['{}={}'.format(k, v) for k, v in kwargs.items()],
         ],
         working_dir=working_dir,
+        env=env,
     )
diff --git a/test/test_functest.py b/test/test_functest.py
index 5cf1df6a..9cffd265 100644
--- a/test/test_functest.py
+++ b/test/test_functest.py
@@ -40,21 +40,33 @@ def check_functest(scheme_name, implementation_name):
 
 
 def check_functest_sanitizers(scheme_name, implementation_name):
-    if platform.machine() not in ['i386', 'x86_64']:
+    env = None
+    if platform.machine() == 'powerpc':
         raise unittest.SkipTest()
+    elif platform.machine() in ['arm32', 'aarch64']:
+        env = {'ASAN_OPTIONS': 'detect_leaks=0'}
+    else:
+        print("Supported platform: {}".format(platform.machine))
     implementation = pqclean.Implementation.by_name(
         scheme_name, implementation_name)
     helpers.make('clean-scheme', 'functest',
                  TYPE=implementation.scheme.type,
                  SCHEME=scheme_name,
                  IMPLEMENTATION=implementation_name,
+                 EXTRAFLAGS='-fsanitize=address,undefined',
                  working_dir=os.path.join('..', 'test'),
-                 EXTRAFLAGS='-fsanitize=address,undefined')
+                 env=env)
     helpers.run_subprocess(
         ['./functest_{}_{}'.format(scheme_name, implementation_name)],
         os.path.join('..', 'bin'),
+        env=env,
     )
-    return check_functest(scheme_name, implementation_name)
+    # Remove files with ASAN library compiled in
+    helpers.make('clean-scheme',
+                 TYPE=implementation.scheme.type,
+                 SCHEME=scheme_name,
+                 IMPLEMENTATION=implementation_name,
+                 working_dir=os.path.join('..', 'test'))
 
 
 if __name__ == '__main__':