diff options
| author | Brent Cook <bcook@openbsd.org> | 2015-07-21 22:21:14 -0500 |
|---|---|---|
| committer | Brent Cook <bcook@openbsd.org> | 2015-07-21 22:21:14 -0500 |
| commit | a9122f74e0b965c7ecb5e8ceb8e3dfb682e14336 (patch) | |
| tree | 39fcc3acb9de69b28875d5d9caaaf832a522fa8e | |
| parent | 3614acd62e7dfccbd7c8f928559436775a43a6be (diff) | |
| download | portable-a9122f74e0b965c7ecb5e8ceb8e3dfb682e14336.tar.gz portable-a9122f74e0b965c7ecb5e8ceb8e3dfb682e14336.tar.bz2 portable-a9122f74e0b965c7ecb5e8ceb8e3dfb682e14336.zip | |
add cmake tests
| -rw-r--r-- | CMakeLists.txt | 14 | ||||
| -rw-r--r-- | apps/CMakeLists.txt | 5 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 262 | ||||
| -rw-r--r-- | tests/Makefile.am | 2 |
4 files changed, 277 insertions, 6 deletions
diff --git a/CMakeLists.txt b/CMakeLists.txt index 6b5e011..5b55a5a 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt | |||
| @@ -1,8 +1,11 @@ | |||
| 1 | cmake_minimum_required (VERSION 3.2) | 1 | cmake_minimum_required (VERSION 3.2) |
| 2 | include(CheckFunctionExists) | 2 | include(CheckFunctionExists) |
| 3 | include(CheckIncludeFiles) | ||
| 3 | 4 | ||
| 4 | project (LibreSSL) | 5 | project (LibreSSL) |
| 5 | 6 | ||
| 7 | enable_testing() | ||
| 8 | |||
| 6 | if(CMAKE_SYSTEM_NAME MATCHES "OpenBSD") | 9 | if(CMAKE_SYSTEM_NAME MATCHES "OpenBSD") |
| 7 | add_definitions(-DHAVE_ATTRIBUTE__BOUNDED__) | 10 | add_definitions(-DHAVE_ATTRIBUTE__BOUNDED__) |
| 8 | endif() | 11 | endif() |
| @@ -123,7 +126,18 @@ if(HAVE_MEMCMP) | |||
| 123 | add_definitions(-DHAVE_MEMCMP) | 126 | add_definitions(-DHAVE_MEMCMP) |
| 124 | endif() | 127 | endif() |
| 125 | 128 | ||
| 129 | check_include_files(err.h HAVE_ERR_H) | ||
| 130 | if(HAVE_ERR_H) | ||
| 131 | add_definitions(-DHAVE_ERR_H) | ||
| 132 | endif() | ||
| 133 | |||
| 134 | set(OPENSSL_LIBS ssl crypto) | ||
| 135 | if(CMAKE_HOST_WIN32) | ||
| 136 | set(OPENSSL_LIBS ${OPENSSL_LIBS} ws2_32) | ||
| 137 | endif() | ||
| 138 | |||
| 126 | add_subdirectory(crypto) | 139 | add_subdirectory(crypto) |
| 127 | add_subdirectory(ssl) | 140 | add_subdirectory(ssl) |
| 128 | add_subdirectory(apps) | 141 | add_subdirectory(apps) |
| 129 | add_subdirectory(tls) | 142 | add_subdirectory(tls) |
| 143 | add_subdirectory(tests) | ||
diff --git a/apps/CMakeLists.txt b/apps/CMakeLists.txt index 13d6e9c..370cd9c 100644 --- a/apps/CMakeLists.txt +++ b/apps/CMakeLists.txt | |||
| @@ -75,10 +75,5 @@ else() | |||
| 75 | set(OPENSSL_SRC ${OPENSSL_SRC} strtonum.c) | 75 | set(OPENSSL_SRC ${OPENSSL_SRC} strtonum.c) |
| 76 | endif() | 76 | endif() |
| 77 | 77 | ||
| 78 | set(OPENSSL_LIBS ssl crypto) | ||
| 79 | if(CMAKE_HOST_WIN32) | ||
| 80 | set(OPENSSL_LIBS ${OPENSSL_LIBS} ws2_32) | ||
| 81 | endif() | ||
| 82 | |||
| 83 | add_executable(openssl ${OPENSSL_SRC}) | 78 | add_executable(openssl ${OPENSSL_SRC}) |
| 84 | target_link_libraries(openssl ${OPENSSL_LIBS}) | 79 | target_link_libraries(openssl ${OPENSSL_LIBS}) |
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt new file mode 100644 index 0000000..511a13f --- /dev/null +++ b/tests/CMakeLists.txt | |||
| @@ -0,0 +1,262 @@ | |||
| 1 | include_directories( | ||
| 2 | . | ||
| 3 | ../include | ||
| 4 | ../include/compat | ||
| 5 | ../crypto/modes | ||
| 6 | ../crypto/asn1 | ||
| 7 | ../ssl | ||
| 8 | ../apps | ||
| 9 | ) | ||
| 10 | |||
| 11 | # aeadtest | ||
| 12 | add_executable(aeadtest aeadtest.c) | ||
| 13 | target_link_libraries(aeadtest ${OPENSSL_LIBS}) | ||
| 14 | add_test(aeadtest ${CMAKE_CURRENT_SOURCE_DIR}/aeadtest.sh) | ||
| 15 | |||
| 16 | # aes_wrap | ||
| 17 | add_executable(aes_wrap aes_wrap.c) | ||
| 18 | target_link_libraries(aes_wrap ${OPENSSL_LIBS}) | ||
| 19 | add_test(aes_wrap aes_wrap) | ||
| 20 | |||
| 21 | # arc4randomforktest | ||
| 22 | # Windows/mingw does not have fork, but Cygwin does. | ||
| 23 | if(NOT CMAKE_HOST_WIN32) | ||
| 24 | add_executable(arc4randomforktest arc4randomforktest.c) | ||
| 25 | target_link_libraries(arc4randomforktest ${OPENSSL_LIBS}) | ||
| 26 | add_test(arc4randomforktest ${CMAKE_CURRENT_SOURCE_DIR}/arc4randomforktest.sh) | ||
| 27 | endif() | ||
| 28 | |||
| 29 | # asn1test | ||
| 30 | add_executable(asn1test asn1test.c) | ||
| 31 | target_link_libraries(asn1test ${OPENSSL_LIBS}) | ||
| 32 | add_test(asn1test asn1test) | ||
| 33 | |||
| 34 | # base64test | ||
| 35 | add_executable(base64test base64test.c) | ||
| 36 | target_link_libraries(base64test ${OPENSSL_LIBS}) | ||
| 37 | add_test(base64test base64test) | ||
| 38 | |||
| 39 | # bftest | ||
| 40 | add_executable(bftest bftest.c) | ||
| 41 | target_link_libraries(bftest ${OPENSSL_LIBS}) | ||
| 42 | add_test(bftest bftest) | ||
| 43 | |||
| 44 | # bntest | ||
| 45 | add_executable(bntest bntest.c) | ||
| 46 | target_link_libraries(bntest ${OPENSSL_LIBS}) | ||
| 47 | add_test(bntest bntest) | ||
| 48 | |||
| 49 | # bytestringtest | ||
| 50 | add_executable(bytestringtest bytestringtest.c) | ||
| 51 | target_link_libraries(bytestringtest ${OPENSSL_LIBS}) | ||
| 52 | add_test(bytestringtest bytestringtest) | ||
| 53 | |||
| 54 | # casttest | ||
| 55 | add_executable(casttest casttest.c) | ||
| 56 | target_link_libraries(casttest ${OPENSSL_LIBS}) | ||
| 57 | add_test(casttest casttest) | ||
| 58 | |||
| 59 | # chachatest | ||
| 60 | add_executable(chachatest chachatest.c) | ||
| 61 | target_link_libraries(chachatest ${OPENSSL_LIBS}) | ||
| 62 | add_test(chachatest chachatest) | ||
| 63 | |||
| 64 | # cipher_list | ||
| 65 | add_executable(cipher_list cipher_list.c) | ||
| 66 | target_link_libraries(cipher_list ${OPENSSL_LIBS}) | ||
| 67 | add_test(cipher_list cipher_list) | ||
| 68 | |||
| 69 | # cipherstest | ||
| 70 | add_executable(cipherstest cipherstest.c) | ||
| 71 | target_link_libraries(cipherstest ${OPENSSL_LIBS}) | ||
| 72 | add_test(cipherstest cipherstest) | ||
| 73 | |||
| 74 | # cts128test | ||
| 75 | add_executable(cts128test cts128test.c) | ||
| 76 | target_link_libraries(cts128test ${OPENSSL_LIBS}) | ||
| 77 | add_test(cts128test cts128test) | ||
| 78 | |||
| 79 | # destest | ||
| 80 | add_executable(destest destest.c) | ||
| 81 | target_link_libraries(destest ${OPENSSL_LIBS}) | ||
| 82 | add_test(destest destest) | ||
| 83 | |||
| 84 | # dhtest | ||
| 85 | add_executable(dhtest dhtest.c) | ||
| 86 | target_link_libraries(dhtest ${OPENSSL_LIBS}) | ||
| 87 | add_test(dhtest dhtest) | ||
| 88 | |||
| 89 | # dsatest | ||
| 90 | add_executable(dsatest dsatest.c) | ||
| 91 | target_link_libraries(dsatest ${OPENSSL_LIBS}) | ||
| 92 | add_test(dsatest dsatest) | ||
| 93 | |||
| 94 | # ecdhtest | ||
| 95 | add_executable(ecdhtest ecdhtest.c) | ||
| 96 | target_link_libraries(ecdhtest ${OPENSSL_LIBS}) | ||
| 97 | add_test(ecdhtest ecdhtest) | ||
| 98 | |||
| 99 | # ecdsatest | ||
| 100 | add_executable(ecdsatest ecdsatest.c) | ||
| 101 | target_link_libraries(ecdsatest ${OPENSSL_LIBS}) | ||
| 102 | add_test(ecdsatest ecdsatest) | ||
| 103 | |||
| 104 | # ectest | ||
| 105 | add_executable(ectest ectest.c) | ||
| 106 | target_link_libraries(ectest ${OPENSSL_LIBS}) | ||
| 107 | add_test(ectest ectest) | ||
| 108 | |||
| 109 | # enginetest | ||
| 110 | add_executable(enginetest enginetest.c) | ||
| 111 | target_link_libraries(enginetest ${OPENSSL_LIBS}) | ||
| 112 | add_test(enginetest enginetest) | ||
| 113 | |||
| 114 | # evptest | ||
| 115 | add_executable(evptest evptest.c) | ||
| 116 | target_link_libraries(evptest ${OPENSSL_LIBS}) | ||
| 117 | add_test(evptest ${CMAKE_CURRENT_SOURCE_DIR}/evptest.sh) | ||
| 118 | |||
| 119 | # explicit_bzero | ||
| 120 | # explicit_bzero relies on SA_ONSTACK, which is unavailable on Windows | ||
| 121 | if(NOT CMAKE_HOST_WIN32) | ||
| 122 | add_executable(explicit_bzero explicit_bzero.c) | ||
| 123 | target_link_libraries(explicit_bzero ${OPENSSL_LIBS}) | ||
| 124 | add_test(explicit_bzero explicit_bzero) | ||
| 125 | #if !HAVE_MEMMEM | ||
| 126 | #explicit_bzero_SOURCES += memmem.c | ||
| 127 | #endif | ||
| 128 | endif() | ||
| 129 | |||
| 130 | # exptest | ||
| 131 | add_executable(exptest exptest.c) | ||
| 132 | target_link_libraries(exptest ${OPENSSL_LIBS}) | ||
| 133 | add_test(exptest exptest) | ||
| 134 | |||
| 135 | # gcm128test | ||
| 136 | add_executable(gcm128test gcm128test.c) | ||
| 137 | target_link_libraries(gcm128test ${OPENSSL_LIBS}) | ||
| 138 | add_test(gcm128test gcm128test) | ||
| 139 | |||
| 140 | # gost2814789t | ||
| 141 | add_executable(gost2814789t gost2814789t.c) | ||
| 142 | target_link_libraries(gost2814789t ${OPENSSL_LIBS}) | ||
| 143 | add_test(gost2814789t gost2814789t) | ||
| 144 | |||
| 145 | # hmactest | ||
| 146 | add_executable(hmactest hmactest.c) | ||
| 147 | target_link_libraries(hmactest ${OPENSSL_LIBS}) | ||
| 148 | add_test(hmactest hmactest) | ||
| 149 | |||
| 150 | # ideatest | ||
| 151 | add_executable(ideatest ideatest.c) | ||
| 152 | target_link_libraries(ideatest ${OPENSSL_LIBS}) | ||
| 153 | add_test(ideatest ideatest) | ||
| 154 | |||
| 155 | # igetest | ||
| 156 | add_executable(igetest igetest.c) | ||
| 157 | target_link_libraries(igetest ${OPENSSL_LIBS}) | ||
| 158 | add_test(igetest igetest) | ||
| 159 | |||
| 160 | # md4test | ||
| 161 | add_executable(md4test md4test.c) | ||
| 162 | target_link_libraries(md4test ${OPENSSL_LIBS}) | ||
| 163 | add_test(md4test md4test) | ||
| 164 | |||
| 165 | # md5test | ||
| 166 | add_executable(md5test md5test.c) | ||
| 167 | target_link_libraries(md5test ${OPENSSL_LIBS}) | ||
| 168 | add_test(md5test md5test) | ||
| 169 | |||
| 170 | # mont | ||
| 171 | add_executable(mont mont.c) | ||
| 172 | target_link_libraries(mont ${OPENSSL_LIBS}) | ||
| 173 | add_test(mont mont) | ||
| 174 | |||
| 175 | # optionstest | ||
| 176 | add_executable(optionstest optionstest.c) | ||
| 177 | target_link_libraries(optionstest ${OPENSSL_LIBS}) | ||
| 178 | add_test(optionstest optionstest) | ||
| 179 | |||
| 180 | # pbkdf2 | ||
| 181 | add_executable(pbkdf2 pbkdf2.c) | ||
| 182 | target_link_libraries(pbkdf2 ${OPENSSL_LIBS}) | ||
| 183 | add_test(pbkdf2 pbkdf2) | ||
| 184 | |||
| 185 | # pkcs7test | ||
| 186 | add_executable(pkcs7test pkcs7test.c) | ||
| 187 | target_link_libraries(pkcs7test ${OPENSSL_LIBS}) | ||
| 188 | add_test(pkcs7test pkcs7test) | ||
| 189 | |||
| 190 | # poly1305test | ||
| 191 | add_executable(poly1305test poly1305test.c) | ||
| 192 | target_link_libraries(poly1305test ${OPENSSL_LIBS}) | ||
| 193 | add_test(poly1305test poly1305test) | ||
| 194 | |||
| 195 | # pq_test | ||
| 196 | add_executable(pq_test pq_test.c) | ||
| 197 | target_link_libraries(pq_test ${OPENSSL_LIBS}) | ||
| 198 | add_test(pq_test ${CMAKE_CURRENT_SOURCE_DIR}/pq_test.sh) | ||
| 199 | |||
| 200 | # randtest | ||
| 201 | add_executable(randtest randtest.c) | ||
| 202 | target_link_libraries(randtest ${OPENSSL_LIBS}) | ||
| 203 | add_test(randtest randtest) | ||
| 204 | |||
| 205 | # rc2test | ||
| 206 | add_executable(rc2test rc2test.c) | ||
| 207 | target_link_libraries(rc2test ${OPENSSL_LIBS}) | ||
| 208 | add_test(rc2test rc2test) | ||
| 209 | |||
| 210 | # rc4test | ||
| 211 | add_executable(rc4test rc4test.c) | ||
| 212 | target_link_libraries(rc4test ${OPENSSL_LIBS}) | ||
| 213 | add_test(rc4test rc4test) | ||
| 214 | |||
| 215 | # rmdtest | ||
| 216 | add_executable(rmdtest rmdtest.c) | ||
| 217 | target_link_libraries(rmdtest ${OPENSSL_LIBS}) | ||
| 218 | add_test(rmdtest rmdtest) | ||
| 219 | |||
| 220 | # sha1test | ||
| 221 | add_executable(sha1test sha1test.c) | ||
| 222 | target_link_libraries(sha1test ${OPENSSL_LIBS}) | ||
| 223 | add_test(sha1test sha1test) | ||
| 224 | |||
| 225 | # sha256test | ||
| 226 | add_executable(sha256test sha256test.c) | ||
| 227 | target_link_libraries(sha256test ${OPENSSL_LIBS}) | ||
| 228 | add_test(sha256test sha256test) | ||
| 229 | |||
| 230 | # sha512test | ||
| 231 | add_executable(sha512test sha512test.c) | ||
| 232 | target_link_libraries(sha512test ${OPENSSL_LIBS}) | ||
| 233 | add_test(sha512test sha512test) | ||
| 234 | |||
| 235 | # shatest | ||
| 236 | add_executable(shatest shatest.c) | ||
| 237 | target_link_libraries(shatest ${OPENSSL_LIBS}) | ||
| 238 | add_test(shatest shatest) | ||
| 239 | |||
| 240 | # ssltest | ||
| 241 | add_executable(ssltest ssltest.c) | ||
| 242 | target_link_libraries(ssltest ${OPENSSL_LIBS}) | ||
| 243 | add_test(ssltest ${CMAKE_CURRENT_SOURCE_DIR}/ssltest.sh) | ||
| 244 | |||
| 245 | # testdsa | ||
| 246 | add_test(testdsa ${CMAKE_CURRENT_SOURCE_DIR}/testdsa.sh) | ||
| 247 | |||
| 248 | # testenc | ||
| 249 | add_test(testenc ${CMAKE_CURRENT_SOURCE_DIR}/testenc.sh) | ||
| 250 | |||
| 251 | # testrsa | ||
| 252 | add_test(testrsa ${CMAKE_CURRENT_SOURCE_DIR}/testrsa.sh) | ||
| 253 | |||
| 254 | # timingsafe | ||
| 255 | add_executable(timingsafe timingsafe.c) | ||
| 256 | target_link_libraries(timingsafe ${OPENSSL_LIBS}) | ||
| 257 | add_test(timingsafe timingsafe) | ||
| 258 | |||
| 259 | # utf8test | ||
| 260 | add_executable(utf8test utf8test.c) | ||
| 261 | target_link_libraries(utf8test ${OPENSSL_LIBS}) | ||
| 262 | add_test(utf8test utf8test) | ||
diff --git a/tests/Makefile.am b/tests/Makefile.am index 2e3f068..6418b8a 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am | |||
| @@ -11,7 +11,7 @@ LDADD += $(top_builddir)/crypto/libcrypto.la | |||
| 11 | 11 | ||
| 12 | TESTS = | 12 | TESTS = |
| 13 | check_PROGRAMS = | 13 | check_PROGRAMS = |
| 14 | EXTRA_DIST = | 14 | EXTRA_DIST = CMakeFiles.txt |
| 15 | DISTCLEANFILES = pidwraptest.txt | 15 | DISTCLEANFILES = pidwraptest.txt |
| 16 | 16 | ||
| 17 | # aeadtest | 17 | # aeadtest |
