projects
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Adapt all test programs
[openssl.git]
/
test
/
uitest.c
diff --git
a/test/uitest.c
b/test/uitest.c
index 574412d633d06bb4f1cca2254787da35b7dee78c..855dc45442df27dbc0a0365653dd0eb28db91989 100644
(file)
--- a/
test/uitest.c
+++ b/
test/uitest.c
@@
-11,22
+11,11
@@
#include <string.h>
#include <openssl/opensslconf.h>
#include <openssl/err.h>
#include <string.h>
#include <openssl/opensslconf.h>
#include <openssl/err.h>
-
-/*
- * The VMS build does stdio via a socketpair.
- */
-#ifdef __VMS
-# include "../apps/vms_term_sock.h"
-#endif
-
#include "../apps/apps.h"
#include "../apps/apps.h"
-
#include "testutil.h"
#include "testutil.h"
-#include "test_main_custom.h"
/* apps/apps.c depend on these */
char *default_config_file = NULL;
/* apps/apps.c depend on these */
char *default_config_file = NULL;
-BIO *bio_err = NULL;
#ifndef OPENSSL_NO_UI
# include <openssl/ui.h>
#ifndef OPENSSL_NO_UI
# include <openssl/ui.h>
@@
-102,21
+91,10
@@
static int test_new_ui()
#endif
#endif
-
int test_main(int argc, char *argv[]
)
+
void register_tests(void
)
{
{
- int ret;
-
- bio_err = dup_bio_err(FORMAT_TEXT);
-
#ifndef OPENSSL_NO_UI
ADD_TEST(test_old);
ADD_TEST(test_new_ui);
#endif
#ifndef OPENSSL_NO_UI
ADD_TEST(test_old);
ADD_TEST(test_new_ui);
#endif
-
- ret = run_tests(argv[0]);
-
- (void)BIO_flush(bio_err);
- BIO_free(bio_err);
-
- return ret;
}
}