summaryrefslogtreecommitdiffstats
path: root/test/testutil.h
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2019-02-12 11:37:43 +0100
committerRichard Levitte <levitte@openssl.org>2019-02-13 04:47:11 +0100
commit5674466e007d892ec55441059b3763abd5dd5440 (patch)
tree00168bff4d96171d868d9a06eddc99d2f6932d6d /test/testutil.h
parent7f4268bff3cf49b96d25bfd83013ee310c31520b (diff)
Move libapps headers into their own directory
This got triggered by test/testutil.h including ../apps/opt.h. Some compilers do all inclusions from the directory of the C file being compiled, so when a C file includes a header file with a relative file spec, and that header file also includes another header file with a relative file spec, the compiler no longer follows. As a specific example, test/testutil/basic_output.c included ../testutil.h. Fine so far, but then, test/testutil.h includes ../apps/opt.h, and the compiler ends up trying to include (seen from the source top) test/apps/opt.h rather than apps/opt.h, and fails. The solution could have been to simply add apps/ as an inclusion directory. However, that directory also has header files that have nothing to do with libapps, so we take this a bit further, create apps/include and move libapps specific headers there, and then add apps/include as inclusion directory in the build.info files where needed. Reviewed-by: Paul Yang <yang.yang@baishancloud.com> (Merged from https://github.com/openssl/openssl/pull/8210)
Diffstat (limited to 'test/testutil.h')
-rw-r--r--test/testutil.h2
1 files changed, 1 insertions, 1 deletions
diff --git a/test/testutil.h b/test/testutil.h
index 9e08a42e5e..ec2f532c4c 100644
--- a/test/testutil.h
+++ b/test/testutil.h
@@ -15,7 +15,7 @@
#include <openssl/err.h>
#include <openssl/e_os2.h>
#include <openssl/bn.h>
-#include "../apps/opt.h"
+#include "opt.h"
/*-
* Simple unit tests should implement setup_tests().