Some post merge fixups/reindent

run_pkcs11_tests was basically duplicated in the low level tests -
expose it and use it in both sets.

1 files changed, 5 insertions, 2 deletions

diff --git a/src/tests/test_pkcs11.h b/src/tests/test_pkcs11.h
index d3922f635..696fcc6ae 100644
--- a/src/tests/test_pkcs11.h
+++ b/src/tests/test_pkcs11.h
@@ -8,8 +8,6 @@
 #ifndef BOTAN_TESTS_PKCS11_H_
 #define BOTAN_TESTS_PKCS11_H_
 
-#define STRING_AND_FUNCTION(x) #x, x
-
 #include "tests.h"
 
 #if defined(BOTAN_HAS_PKCS11)
@@ -23,6 +21,8 @@ namespace Botan_Tests {
 
 #if defined(BOTAN_HAS_PKCS11)
 
+#define STRING_AND_FUNCTION(x) #x, x
+
 // PIN is expected to be set to "123456" prior to running the tests
 const std::string PKCS11_USER_PIN = "123456";
 // SO PIN is expected to be set to "12345678" prior to running the tests
@@ -57,6 +57,9 @@ inline Botan::PKCS11::secure_string TEST_SO_PIN()
    return to_sec_string(PKCS11_TEST_SO_PIN);
    }
 
+std::vector<Test::Result> run_pkcs11_tests(const std::string& name,
+   std::vector<std::pair<std::string, std::function<Test::Result()>>>& fns);
+
 #endif
 }