testutil: Remove test_puts_std{out,err}, they are superfluous

[openssl.git] / test / testutil / basic_output.c

diff --git a/test/testutil/basic_output.c b/test/testutil/basic_output.c
index ac413a6a4a38a72b0ea77351fc4f02c9b44f41d1..6e1f99a5adbdac167a42c7193513e2fcd6df90d3 100644 (file)
--- a/test/testutil/basic_output.c
+++ b/test/testutil/basic_output.c
@@ -8,6 +8,7 @@
  */
 
 #include "../testutil.h"
  */
 
 #include "../testutil.h"

+#include "output.h"

 
 #include <openssl/crypto.h>
 #include <openssl/bio.h>
 
 #include <openssl/crypto.h>
 #include <openssl/bio.h>


@@ -15,29 +16,10 @@
 BIO *bio_out = NULL;
 BIO *bio_err = NULL;
 
 BIO *bio_out = NULL;
 BIO *bio_err = NULL;
 

-#ifdef OPENSSL_USE_APPLINK
-/*
- * Using BIO_new_fd() obligates the use of applinks on platforms where it's
- * relevant.  Because it becomes a module of the libtestutil library and would
- * be disregarded if not actively referred to, we have this dummy that does
- * exactly this.  For any module that uses the rest of the routines here,
- * OPENSSL_Applink should tag along for sure.
- */
-void Applink_dummy(void);
-void Applink_dummy(void)
-{
-    OPENSSL_EXTERN void OPENSSL_Applink(void);
-
-    OPENSSL_Applink();
-}
-/* Generate an error for anyone who tries to actually use this dummy */
-# define Applink_dummy "DON'T USE THIS"
-#endif
-

 void test_open_streams(void)
 {
 void test_open_streams(void)
 {

-    bio_out = BIO_new_fd(1, 0);
-    bio_err = BIO_new_fd(2, 0);
+    bio_out = BIO_new_fp(stdout, BIO_NOCLOSE | BIO_FP_TEXT);
+    bio_err = BIO_new_fp(stderr, BIO_NOCLOSE | BIO_FP_TEXT);

 
     OPENSSL_assert(bio_out != NULL);
     OPENSSL_assert(bio_err != NULL);
 
     OPENSSL_assert(bio_out != NULL);
     OPENSSL_assert(bio_err != NULL);


@@ -49,16 +31,6 @@ void test_close_streams(void)
     BIO_free(bio_err);
 }
 
     BIO_free(bio_err);
 }
 

-int test_puts_stdout(const char *str)
-{
-    return BIO_puts(bio_out, str);
-}
-
-int test_puts_stderr(const char *str)
-{
-    return BIO_puts(bio_err, str);
-}
-

 int test_vprintf_stdout(const char *fmt, va_list ap)
 {
     return BIO_vprintf(bio_out, fmt, ap);
 int test_vprintf_stdout(const char *fmt, va_list ap)
 {
     return BIO_vprintf(bio_out, fmt, ap);