From d07e8ae7cb39e35e15d9cfa3f18ff1a7f3639086 Mon Sep 17 00:00:00 2001 From: Douglas Stebila Date: Thu, 11 Apr 2019 15:23:39 -0400 Subject: [PATCH] Filter tests when diff'ing against master branch (#103) --- test/helpers.py | 35 +++++++++++++++++++++++++++++++++++ test/pqclean.py | 2 +- 2 files changed, 36 insertions(+), 1 deletion(-) diff --git a/test/helpers.py b/test/helpers.py index 18ac1e4f..873d015d 100644 --- a/test/helpers.py +++ b/test/helpers.py @@ -132,4 +132,39 @@ def permit_test(testname, thing, **args): if scheme.name.lower() in os.environ['PQCLEAN_SKIP_SCHEMES'].lower().split(','): return False + if 'PQCLEAN_ONLY_DIFF' in os.environ: + if shutil.which('git') != None: + # if we're on a non-master branch, and the only changes are in schemes, + # only run tests on those schemes + branch_result = subprocess.run( + ['git', 'status', '--porcelain=2', '--branch'], + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) + # ensure we're in a working directory + if branch_result.returncode != 0: + return True + # ensure we're not on master branch + for branch_line in branch_result.stdout.decode('utf-8').splitlines(): + tokens = branch_line.split(' ') + if tokens[0] == '#' and tokens[1] == 'branch.head': + if tokens[2] == 'master': + return True + # where are there changes? + diff_result = subprocess.run( + ['git', 'diff', '--name-only', 'master'], + stdout=subprocess.PIPE, + stderr=subprocess.STDOUT + ) + assert(diff_result.returncode == 0), "Got unexpected return code {}".format(diff_result.returncode) + for diff_line in diff_result.stdout.decode('utf-8').splitlines(): + # don't skip test if there are any changes outside schemes + if not(diff_line.startswith('crypto_kem')) and not (diff_line.startswith('crypto_sign')): + return True + # do test if the scheme in question has been changed + if diff_line.startswith(thing.path(base='')): + return True + # there were no changes outside schemes, and the scheme in question had no diffs + return False + return True diff --git a/test/pqclean.py b/test/pqclean.py index 12e1d61d..2555b4e0 100644 --- a/test/pqclean.py +++ b/test/pqclean.py @@ -77,7 +77,7 @@ class Implementation: return i def path(self, base='..') -> str: - return os.path.join(self.scheme.path(), self.name) + return os.path.join(self.scheme.path(base=base), self.name) def libname(self) -> str: if os.name == 'nt':