X-Git-Url: https://git.openssl.org/gitweb/?a=blobdiff_plain;f=test%2Fx509_internal_test.c;h=03bbcf2bfd25839b972a6b4975830e3af8311627;hb=6862de63d469f3148a2ff5a04a6b9ab6413bd5ac;hp=baa4c5a1fdc588032df18c5e7c093035059c4920;hpb=6ec327eed616deeb4e5ecf1abfb1e1a530ba0701;p=openssl.git

diff --git a/test/x509_internal_test.c b/test/x509_internal_test.c
index baa4c5a1fd..03bbcf2bfd 100644
--- a/test/x509_internal_test.c
+++ b/test/x509_internal_test.c
@@ -1,5 +1,5 @@
 /*
- * Copyright 2016 The OpenSSL Project Authors. All Rights Reserved.
+ * Copyright 2016-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
  * Licensed under the OpenSSL license (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
@@ -15,12 +15,7 @@
 #include <openssl/x509.h>
 #include <openssl/x509v3.h>
 #include "testutil.h"
-#include "e_os.h"
-
-typedef struct {
-    const char *test_case_name;
-    const char *test_section;
-} SIMPLE_FIXTURE;
+#include "internal/nelem.h"
 
 /**********************************************************************
  *
@@ -28,17 +23,19 @@ typedef struct {
  *
  ***/
 
-static SIMPLE_FIXTURE setup_standard_exts(const char *const test_case_name)
-{
-    SIMPLE_FIXTURE fixture;
-    fixture.test_case_name = test_case_name;
-    return fixture;
-}
+#ifdef __VMS
+# pragma names save
+# pragma names as_is,shortened
+#endif
 
 #include "../crypto/x509v3/ext_dat.h"
 #include "../crypto/x509v3/standard_exts.h"
 
-static int execute_standard_exts(SIMPLE_FIXTURE fixture)
+#ifdef __VMS
+# pragma names restore
+#endif
+
+static int test_standard_exts(void)
 {
     size_t i;
     int prev = -1, good = 1;
@@ -53,47 +50,15 @@ static int execute_standard_exts(SIMPLE_FIXTURE fixture)
     }
     if (!good) {
         tmp = standard_exts;
-        fprintf(stderr, "Extensions out of order!\n");
+        TEST_error("Extensions out of order!");
         for (i = 0; i < STANDARD_EXTENSION_COUNT; i++, tmp++)
-            fprintf(stderr, "%d : %s\n", (*tmp)->ext_nid,
-                    OBJ_nid2sn((*tmp)->ext_nid));
-    } else {
-        fprintf(stderr, "Order OK\n");
+            TEST_note("%d : %s", (*tmp)->ext_nid, OBJ_nid2sn((*tmp)->ext_nid));
     }
-
     return good;
 }
 
-static void teardown_standard_exts(SIMPLE_FIXTURE fixture)
-{
-}
-
-/**********************************************************************
- *
- * Test driver
- *
- ***/
-
-static struct {
-    const char *section;
-    SIMPLE_FIXTURE (*setup)(const char *const test_case_name);
-    int (*execute)(SIMPLE_FIXTURE);
-    void (*teardown)(SIMPLE_FIXTURE);
-} tests[] = {
-    {"standard_exts", setup_standard_exts, execute_standard_exts,
-     teardown_standard_exts},
-};
-
-static int drive_tests(int idx)
-{
-    SETUP_TEST_FIXTURE(SIMPLE_FIXTURE, tests[idx].setup);
-    fixture.test_section = tests[idx].section;
-    EXECUTE_TEST(tests[idx].execute, tests[idx].teardown);
-}
-
-int main(int argc, char **argv)
+int setup_tests()
 {
-    ADD_ALL_TESTS(drive_tests, OSSL_NELEM(tests));
-
-    return run_tests(argv[0]);
+    ADD_TEST(test_standard_exts);
+    return 1;
 }