From 0bc19b36334d9d0f5c23bd6bc2a5dbcbf5a6e388 Mon Sep 17 00:00:00 2001
From: Douglas Stebila <dstebila@users.noreply.github.com>
Date: Thu, 11 Apr 2019 13:47:53 -0400
Subject: [PATCH] Fix a few nits (#107)

* Minor changes

* Gracefully degrade if clang-tidy segfaults

* Typo on returncode
---
 .../clean/thash_shake256_simple.c                             | 2 +-
 crypto_sign/sphincs-shake256-128f-simple/clean/wots.c         | 2 +-
 test/helpers.py                                               | 4 +++-
 test/test_common.py                                           | 2 +-
 4 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/crypto_sign/sphincs-shake256-128f-simple/clean/thash_shake256_simple.c b/crypto_sign/sphincs-shake256-128f-simple/clean/thash_shake256_simple.c
index 7c2cdb63..341c6fd3 100644
--- a/crypto_sign/sphincs-shake256-128f-simple/clean/thash_shake256_simple.c
+++ b/crypto_sign/sphincs-shake256-128f-simple/clean/thash_shake256_simple.c
@@ -1,9 +1,9 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "thash.h"
 #include "address.h"
 #include "params.h"
+#include "thash.h"
 
 #include "fips202.h"
 
diff --git a/crypto_sign/sphincs-shake256-128f-simple/clean/wots.c b/crypto_sign/sphincs-shake256-128f-simple/clean/wots.c
index a6a8ada6..4431986d 100644
--- a/crypto_sign/sphincs-shake256-128f-simple/clean/wots.c
+++ b/crypto_sign/sphincs-shake256-128f-simple/clean/wots.c
@@ -1,11 +1,11 @@
 #include <stdint.h>
 #include <string.h>
 
-#include "utils.h"
 #include "address.h"
 #include "hash.h"
 #include "params.h"
 #include "thash.h"
+#include "utils.h"
 #include "wots.h"
 
 // TODO clarify address expectations, and make them more uniform.
diff --git a/test/helpers.py b/test/helpers.py
index 62e0b2f5..18ac1e4f 100644
--- a/test/helpers.py
+++ b/test/helpers.py
@@ -114,8 +114,10 @@ def permit_test(testname, thing, **args):
 
     if isinstance(thing, pqclean.Implementation):
         scheme = thing.scheme
-    else:
+    elif isinstance(thing, pqclean.Scheme):
         scheme = thing
+    else:
+        return True
 
     if 'PQCLEAN_ONLY_TYPES' in os.environ:
         if not(scheme.type.lower() in os.environ['PQCLEAN_ONLY_TYPES'].lower().split(',')):
diff --git a/test/test_common.py b/test/test_common.py
index 3640bb3f..e4c89939 100644
--- a/test/test_common.py
+++ b/test/test_common.py
@@ -12,7 +12,7 @@ import helpers
 def test_common():
     for d in os.listdir('common'):
         primitive = re.sub(r"\.c$", "", d)
-        yield check_common, primitive
+        if helpers.permit_test('common', None): yield check_common, primitive
 
 
 def check_common(primitive):