From 127d25903fc705756ac211ea373104d8e8858ae1 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Sun, 19 Apr 2015 22:26:12 +0200
Subject: [PATCH] Add recipes for misc other things we want to test

Note that this required a change in constant_time_test.c, as it says
"ok", which interferes with what Test::Harness expects to see.  I had
constant_time_test.c say "success" instead.

Reviewed-by: Rich Salz <rsalz@openssl.org>
---
 test/constant_time_test.c            |  2 +-
 test/recipes/90-test_constant_time.t | 12 ++++++++++++
 test/recipes/90-test_gost2814789.t   | 14 ++++++++++++++
 test/recipes/90-test_heartbeat.t     | 12 ++++++++++++
 test/recipes/90-test_ige.t           | 12 ++++++++++++
 test/recipes/90-test_jpake.t         | 12 ++++++++++++
 test/recipes/90-test_p5_crpt2.t      | 12 ++++++++++++
 test/recipes/90-test_srp.t           | 12 ++++++++++++
 test/recipes/90-test_v3name.t        | 12 ++++++++++++
 9 files changed, 99 insertions(+), 1 deletion(-)
 create mode 100644 test/recipes/90-test_constant_time.t
 create mode 100644 test/recipes/90-test_gost2814789.t
 create mode 100644 test/recipes/90-test_heartbeat.t
 create mode 100644 test/recipes/90-test_ige.t
 create mode 100644 test/recipes/90-test_jpake.t
 create mode 100644 test/recipes/90-test_p5_crpt2.t
 create mode 100644 test/recipes/90-test_srp.t
 create mode 100644 test/recipes/90-test_v3name.t

diff --git a/test/constant_time_test.c b/test/constant_time_test.c
index ed3d7eaac4..1c04cb7b61 100644
--- a/test/constant_time_test.c
+++ b/test/constant_time_test.c
@@ -295,7 +295,7 @@ int main(int argc, char *argv[])
     }
 
     if (!num_failed) {
-        fprintf(stdout, "ok (ran %d tests)\n", num_all);
+        fprintf(stdout, "success (ran %d tests)\n", num_all);
         return EXIT_SUCCESS;
     } else {
         fprintf(stdout, "%d of %d tests failed!\n", num_failed, num_all);
diff --git a/test/recipes/90-test_constant_time.t b/test/recipes/90-test_constant_time.t
new file mode 100644
index 0000000000..4bdd0a08d0
--- /dev/null
+++ b/test/recipes/90-test_constant_time.t
@@ -0,0 +1,12 @@
+#! /usr/bin/perl
+
+use strict;
+use warnings;
+
+use Test::More;
+use OpenSSL::Test;
+
+setup("test_constant_time");
+
+plan tests => 1;
+ok(run(test(["constant_time_test"])), "running constant_time_test");
diff --git a/test/recipes/90-test_gost2814789.t b/test/recipes/90-test_gost2814789.t
new file mode 100644
index 0000000000..b09e062cc7
--- /dev/null
+++ b/test/recipes/90-test_gost2814789.t
@@ -0,0 +1,14 @@
+#! /usr/bin/perl
+
+use strict;
+use warnings;
+use Test::More;
+use OpenSSL::Test qw/:DEFAULT top_dir/;
+
+setup("test_gost2814789");
+
+$ENV{OPENSSL_ENGINES} =
+    $ENV{BIN_D} ? top_dir($ENV{BIN_D}) : top_dir("engines", "ccgost");
+
+plan tests => 1;
+ok(run(test(["gost2814789test"])), 'running gost2814789test');
diff --git a/test/recipes/90-test_heartbeat.t b/test/recipes/90-test_heartbeat.t
new file mode 100644
index 0000000000..5e226703a3
--- /dev/null
+++ b/test/recipes/90-test_heartbeat.t
@@ -0,0 +1,12 @@
+#! /usr/bin/perl
+
+use strict;
+use warnings;
+
+use Test::More;
+use OpenSSL::Test;
+
+setup("test_heartbeat");
+
+plan tests => 1;
+ok(run(test(["heartbeat_test"])), "running heartbeat_test");
diff --git a/test/recipes/90-test_ige.t b/test/recipes/90-test_ige.t
new file mode 100644
index 0000000000..6c991472c9
--- /dev/null
+++ b/test/recipes/90-test_ige.t
@@ -0,0 +1,12 @@
+#! /usr/bin/perl
+
+use strict;
+use warnings;
+
+use Test::More;
+use OpenSSL::Test;
+
+setup("test_ige");
+
+plan tests => 1;
+ok(run(test(["igetest"])), "running igetest");
diff --git a/test/recipes/90-test_jpake.t b/test/recipes/90-test_jpake.t
new file mode 100644
index 0000000000..5b83df7707
--- /dev/null
+++ b/test/recipes/90-test_jpake.t
@@ -0,0 +1,12 @@
+#! /usr/bin/perl
+
+use strict;
+use warnings;
+
+use Test::More;
+use OpenSSL::Test;
+
+setup("test_jpake");
+
+plan tests => 1;
+ok(run(test(["jpaketest"])), "running jpaketest");
diff --git a/test/recipes/90-test_p5_crpt2.t b/test/recipes/90-test_p5_crpt2.t
new file mode 100644
index 0000000000..e03c5b67be
--- /dev/null
+++ b/test/recipes/90-test_p5_crpt2.t
@@ -0,0 +1,12 @@
+#! /usr/bin/perl
+
+use strict;
+use warnings;
+
+use Test::More;
+use OpenSSL::Test;
+
+setup("test_p5_crpt2");
+
+plan tests => 1;
+ok(run(test(["p5_crpt2_test"])), "running p5_crpt2_test");
diff --git a/test/recipes/90-test_srp.t b/test/recipes/90-test_srp.t
new file mode 100644
index 0000000000..962402043c
--- /dev/null
+++ b/test/recipes/90-test_srp.t
@@ -0,0 +1,12 @@
+#! /usr/bin/perl
+
+use strict;
+use warnings;
+
+use Test::More;
+use OpenSSL::Test;
+
+setup("test_srp");
+
+plan tests => 1;
+ok(run(test(["srptest"])), "running srptest");
diff --git a/test/recipes/90-test_v3name.t b/test/recipes/90-test_v3name.t
new file mode 100644
index 0000000000..17ac8b3384
--- /dev/null
+++ b/test/recipes/90-test_v3name.t
@@ -0,0 +1,12 @@
+#! /usr/bin/perl
+
+use strict;
+use warnings;
+
+use Test::More;
+use OpenSSL::Test;
+
+setup("test_v3name");
+
+plan tests => 1;
+ok(run(test(["v3nametest"])), "running v3nametest");
-- 
GitLab