diff options
| author | Brent Cook <busterb@gmail.com> | 2017-01-22 19:55:54 -0600 |
|---|---|---|
| committer | Brent Cook <busterb@gmail.com> | 2017-01-22 20:00:52 -0600 |
| commit | fa149b8c8c57a88db14bc017ff048b70963e9d86 (patch) | |
| tree | d8825d748fd5f5cdf5af3d8b4d8f14dc68eab4a1 | |
| parent | 91f771f9818cc6bd05fd4e77837372fce230dc9c (diff) | |
| download | portable-fa149b8c8c57a88db14bc017ff048b70963e9d86.tar.gz portable-fa149b8c8c57a88db14bc017ff048b70963e9d86.tar.bz2 portable-fa149b8c8c57a88db14bc017ff048b70963e9d86.zip | |
updates for new tests and layout
| -rw-r--r-- | crypto/CMakeLists.txt | 1 | ||||
| -rw-r--r-- | crypto/Makefile.am | 1 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 |
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 @@ | |||
| 1 | include $(top_srcdir)/Makefile.am.common | 1 | include $(top_srcdir)/Makefile.am.common |
| 2 | 2 | ||
| 3 | AM_CPPFLAGS += -I$(top_srcdir)/crypto/asn1 | 3 | AM_CPPFLAGS += -I$(top_srcdir)/crypto/asn1 |
| 4 | AM_CPPFLAGS += -I$(top_srcdir)/crypto/bn | ||
| 4 | AM_CPPFLAGS += -I$(top_srcdir)/crypto/evp | 5 | AM_CPPFLAGS += -I$(top_srcdir)/crypto/evp |
| 5 | AM_CPPFLAGS += -I$(top_srcdir)/crypto/modes | 6 | AM_CPPFLAGS += -I$(top_srcdir)/crypto/modes |
| 6 | AM_CPPFLAGS += -I$(top_srcdir)/crypto | 7 | AM_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 |
| 73 | add_executable(bntest bntest.c) | 73 | add_executable(bntest bntest.c) |
| 74 | set_source_files_properties(bntest.c PROPERTIES COMPILE_FLAGS -ULIBRESSL_INTERNAL) | ||
| 74 | target_link_libraries(bntest ${TESTS_LIBS}) | 75 | target_link_libraries(bntest ${TESTS_LIBS}) |
| 75 | add_test(bntest bntest) | 76 | add_test(bntest bntest) |
| 76 | 77 | ||
| @@ -163,6 +164,7 @@ endif() | |||
| 163 | 164 | ||
| 164 | # exptest | 165 | # exptest |
| 165 | add_executable(exptest exptest.c) | 166 | add_executable(exptest exptest.c) |
| 167 | set_source_files_properties(exptest.c PROPERTIES COMPILE_FLAGS -ULIBRESSL_INTERNAL) | ||
| 166 | target_link_libraries(exptest ${TESTS_LIBS}) | 168 | target_link_libraries(exptest ${TESTS_LIBS}) |
| 167 | add_test(exptest exptest) | 169 | add_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 |
| 75 | TESTS += bntest | 75 | TESTS += bntest |
| 76 | bntest_CPPFLAGS = $(AM_CPPFLAGS) -ULIBRESSL_INTERNAL | ||
| 76 | check_PROGRAMS += bntest | 77 | check_PROGRAMS += bntest |
| 77 | bntest_SOURCES = bntest.c | 78 | bntest_SOURCES = bntest.c |
| 78 | 79 | ||
| @@ -170,6 +171,7 @@ endif | |||
| 170 | # exptest | 171 | # exptest |
| 171 | TESTS += exptest | 172 | TESTS += exptest |
| 172 | check_PROGRAMS += exptest | 173 | check_PROGRAMS += exptest |
| 174 | exptest_CPPFLAGS = $(AM_CPPFLAGS) -ULIBRESSL_INTERNAL | ||
| 173 | exptest_SOURCES = exptest.c | 175 | exptest_SOURCES = exptest.c |
| 174 | 176 | ||
| 175 | # gcm128test | 177 | # gcm128test |
