aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBrent Cook <busterb@gmail.com>2017-01-22 19:55:54 -0600
committerBrent Cook <busterb@gmail.com>2017-01-22 20:00:52 -0600
commitfa149b8c8c57a88db14bc017ff048b70963e9d86 (patch)
treed8825d748fd5f5cdf5af3d8b4d8f14dc68eab4a1
parent91f771f9818cc6bd05fd4e77837372fce230dc9c (diff)
downloadportable-fa149b8c8c57a88db14bc017ff048b70963e9d86.tar.gz
portable-fa149b8c8c57a88db14bc017ff048b70963e9d86.tar.bz2
portable-fa149b8c8c57a88db14bc017ff048b70963e9d86.zip
updates for new tests and layout
-rw-r--r--crypto/CMakeLists.txt1
-rw-r--r--crypto/Makefile.am1
-rw-r--r--tests/CMakeLists.txt2
-rw-r--r--tests/Makefile.am2
4 files changed, 6 insertions, 0 deletions
diff --git a/crypto/CMakeLists.txt b/crypto/CMakeLists.txt
index 60df0d8..d8e1ddb 100644
--- a/crypto/CMakeLists.txt
+++ b/crypto/CMakeLists.txt
@@ -3,6 +3,7 @@ include_directories(
3 ../include 3 ../include
4 ../include/compat 4 ../include/compat
5 asn1 5 asn1
6 bn
6 dsa 7 dsa
7 evp 8 evp
8 modes 9 modes
diff --git a/crypto/Makefile.am b/crypto/Makefile.am
index 2f1e057..1332c24 100644
--- a/crypto/Makefile.am
+++ b/crypto/Makefile.am
@@ -1,6 +1,7 @@
1include $(top_srcdir)/Makefile.am.common 1include $(top_srcdir)/Makefile.am.common
2 2
3AM_CPPFLAGS += -I$(top_srcdir)/crypto/asn1 3AM_CPPFLAGS += -I$(top_srcdir)/crypto/asn1
4AM_CPPFLAGS += -I$(top_srcdir)/crypto/bn
4AM_CPPFLAGS += -I$(top_srcdir)/crypto/evp 5AM_CPPFLAGS += -I$(top_srcdir)/crypto/evp
5AM_CPPFLAGS += -I$(top_srcdir)/crypto/modes 6AM_CPPFLAGS += -I$(top_srcdir)/crypto/modes
6AM_CPPFLAGS += -I$(top_srcdir)/crypto 7AM_CPPFLAGS += -I$(top_srcdir)/crypto
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 9196783..fa1bb51 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -71,6 +71,7 @@ endif()
71 71
72# bntest 72# bntest
73add_executable(bntest bntest.c) 73add_executable(bntest bntest.c)
74set_source_files_properties(bntest.c PROPERTIES COMPILE_FLAGS -ULIBRESSL_INTERNAL)
74target_link_libraries(bntest ${TESTS_LIBS}) 75target_link_libraries(bntest ${TESTS_LIBS})
75add_test(bntest bntest) 76add_test(bntest bntest)
76 77
@@ -163,6 +164,7 @@ endif()
163 164
164# exptest 165# exptest
165add_executable(exptest exptest.c) 166add_executable(exptest exptest.c)
167set_source_files_properties(exptest.c PROPERTIES COMPILE_FLAGS -ULIBRESSL_INTERNAL)
166target_link_libraries(exptest ${TESTS_LIBS}) 168target_link_libraries(exptest ${TESTS_LIBS})
167add_test(exptest exptest) 169add_test(exptest exptest)
168 170
diff --git a/tests/Makefile.am b/tests/Makefile.am
index c5dd713..2d13fed 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -73,6 +73,7 @@ endif
73 73
74# bntest 74# bntest
75TESTS += bntest 75TESTS += bntest
76bntest_CPPFLAGS = $(AM_CPPFLAGS) -ULIBRESSL_INTERNAL
76check_PROGRAMS += bntest 77check_PROGRAMS += bntest
77bntest_SOURCES = bntest.c 78bntest_SOURCES = bntest.c
78 79
@@ -170,6 +171,7 @@ endif
170# exptest 171# exptest
171TESTS += exptest 172TESTS += exptest
172check_PROGRAMS += exptest 173check_PROGRAMS += exptest
174exptest_CPPFLAGS = $(AM_CPPFLAGS) -ULIBRESSL_INTERNAL
173exptest_SOURCES = exptest.c 175exptest_SOURCES = exptest.c
174 176
175# gcm128test 177# gcm128test