Split up test vectors into per-algo files and app into botan-test for

the tests and botan for everything else.

1 files changed, 11 insertions, 1 deletions

diff --git a/src/tests/tests.h b/src/tests/tests.h
index 494ce72a5..73139f08f 100644
--- a/src/tests/tests.h
+++ b/src/tests/tests.h
@@ -20,6 +20,15 @@ size_t run_tests(std::istream& src,
                  bool clear_between_cb,
                  std::function<std::string (std::map<std::string, std::string>)> cb);
 
+size_t run_tests(const std::string& filename,
+                 const std::string& name_key,
+                 const std::string& output_key,
+                 bool clear_between_cb,
+                 std::function<std::string (std::map<std::string, std::string>)> cb);
+
+std::vector<std::string> list_dir(const std::string& dir_path);
+size_t run_tests_in_dir(const std::string& dir, std::function<size_t (const std::string&)> fn);
+
 // Run a list of tests
 typedef std::function<size_t ()> test_fn;
 
@@ -28,7 +37,9 @@ void test_report(const std::string& name, size_t ran, size_t failed);
 
 #define TEST(expr, msg) do { if(!(expr)) { ++fails; std::cout << msg; } while(0)
 
+#define LIB_SRC_DIR "lib/"
 #define TEST_DATA_DIR "src/tests/data/"
+#define PK_TEST_DATA_DIR "src/tests/data/pubkey"
 
 int test_main(int argc, char* argv[]);
 
@@ -57,7 +68,6 @@ size_t test_gost_3410();
 
 // One off tests
 size_t test_ocb();
-size_t test_eax();
 size_t test_keywrap();
 size_t test_bcrypt();
 size_t test_passhash9();