diff options
| author | Pauli <paul.dale@oracle.com> | 2017-08-18 09:50:25 +1000 |
|---|---|---|
| committer | Pauli <paul.dale@oracle.com> | 2017-08-18 09:50:25 +1000 |
| commit | b99fe5f4927b305bae88daac2484c284fe749329 (patch) | |
| tree | 0497ffa8a2d0e0ea72ecca5d32d6878888835fd4 /test/testutil | |
| parent | 524fdd515569e12047ddb29ba4c7f19706aacc98 (diff) | |
| download | openssl-b99fe5f4927b305bae88daac2484c284fe749329.tar.gz | |
Remove tests dependence on e_os.h
Apart from ssltest_old.c, the test suite relied on e_os.h for the
OSSL_NELEM macro and nothing else.
The ssltest_old.c also requires EXIT and some socket macros.
Create a new header to define the OSSL_NELEM macro and use that instead.
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4186)
Diffstat (limited to 'test/testutil')
| -rw-r--r-- | test/testutil/driver.c | 2 | ||||
| -rw-r--r-- | test/testutil/format_output.c | 2 | ||||
| -rw-r--r-- | test/testutil/main.c | 2 | ||||
| -rw-r--r-- | test/testutil/stanza.c | 2 | ||||
| -rw-r--r-- | test/testutil/tests.c | 2 |
5 files changed, 5 insertions, 5 deletions
diff --git a/test/testutil/driver.c b/test/testutil/driver.c index 274d3cde72..1859706996 100644 --- a/test/testutil/driver.c +++ b/test/testutil/driver.c @@ -14,7 +14,7 @@ #include <string.h> #include <assert.h> -#include "../../e_os.h" +#include <internal/nelem.h> #include <openssl/bio.h> /* diff --git a/test/testutil/format_output.c b/test/testutil/format_output.c index ae3bf0ef77..13123d5c6a 100644 --- a/test/testutil/format_output.c +++ b/test/testutil/format_output.c @@ -13,7 +13,7 @@ #include <string.h> #include <ctype.h> -#include "../../e_os.h" +#include <internal/nelem.h> /* The size of memory buffers to display on failure */ #define MEM_BUFFER_SIZE (2000) diff --git a/test/testutil/main.c b/test/testutil/main.c index 34abcb2ce7..2f4eeb6798 100644 --- a/test/testutil/main.c +++ b/test/testutil/main.c @@ -8,7 +8,7 @@ */ #include "../testutil.h" -#include "../../e_os.h" +#include <internal/nelem.h> #include "output.h" #include "tu_local.h" diff --git a/test/testutil/stanza.c b/test/testutil/stanza.c index 8a8f0cc8f4..35967528f8 100644 --- a/test/testutil/stanza.c +++ b/test/testutil/stanza.c @@ -12,7 +12,7 @@ #include <string.h> #include <ctype.h> -#include "e_os.h" +#include "internal/nelem.h" #include "../testutil.h" #include "tu_local.h" diff --git a/test/testutil/tests.c b/test/testutil/tests.c index b2d95db859..cea81ca2ec 100644 --- a/test/testutil/tests.c +++ b/test/testutil/tests.c @@ -14,7 +14,7 @@ #include <errno.h> #include <string.h> #include <ctype.h> -#include "../../e_os.h" +#include <internal/nelem.h> /* * Output a failed test first line. |