diff options
| author | kinichiro <kinichiro.inoguchi@gmail.com> | 2020-05-04 23:40:33 +0900 |
|---|---|---|
| committer | kinichiro <kinichiro.inoguchi@gmail.com> | 2020-05-04 23:40:33 +0900 |
| commit | 1fe779234937c7194ef5a11f383136eb005370d5 (patch) | |
| tree | 79f6291f1131f1959a6de57f20839be8d9324c42 | |
| parent | 4270e6716f03a2c65fb2c5f22348f657abccc771 (diff) | |
| download | portable-1fe779234937c7194ef5a11f383136eb005370d5.tar.gz portable-1fe779234937c7194ef5a11f383136eb005370d5.tar.bz2 portable-1fe779234937c7194ef5a11f383136eb005370d5.zip | |
Enable regress handshake_table on Windows
| -rw-r--r-- | patches/handshake_table.c.patch | 18 | ||||
| -rw-r--r-- | tests/CMakeLists.txt | 2 |
2 files changed, 19 insertions, 1 deletions
diff --git a/patches/handshake_table.c.patch b/patches/handshake_table.c.patch new file mode 100644 index 0000000..46f2adb --- /dev/null +++ b/patches/handshake_table.c.patch | |||
| @@ -0,0 +1,18 @@ | |||
| 1 | --- tests/handshake_table.c.orig Mon May 4 23:28:43 2020 | ||
| 2 | +++ tests/handshake_table.c Mon May 4 23:29:50 2020 | ||
| 3 | @@ -477,6 +477,7 @@ | ||
| 4 | unsigned int depth = 0; | ||
| 5 | int ch, graphviz = 0, print = 0; | ||
| 6 | |||
| 7 | +#ifndef _MSC_VER | ||
| 8 | while ((ch = getopt(argc, argv, "Cg")) != -1) { | ||
| 9 | switch (ch) { | ||
| 10 | case 'C': | ||
| 11 | @@ -494,6 +495,7 @@ | ||
| 12 | |||
| 13 | if (argc != 0) | ||
| 14 | usage(); | ||
| 15 | +#endif | ||
| 16 | |||
| 17 | if (graphviz && print) | ||
| 18 | usage(); | ||
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index f8bb6d8..ed63f06 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt | |||
| @@ -226,7 +226,7 @@ target_link_libraries(gost2814789t ${OPENSSL_LIBS}) | |||
| 226 | add_test(gost2814789t gost2814789t) | 226 | add_test(gost2814789t gost2814789t) |
| 227 | 227 | ||
| 228 | # handshake_table | 228 | # handshake_table |
| 229 | if(NOT BUILD_SHARED_LIBS AND NOT MSVC) | 229 | if(NOT BUILD_SHARED_LIBS) |
| 230 | add_executable(handshake_table handshake_table.c) | 230 | add_executable(handshake_table handshake_table.c) |
| 231 | target_link_libraries(handshake_table ${OPENSSL_LIBS}) | 231 | target_link_libraries(handshake_table ${OPENSSL_LIBS}) |
| 232 | add_test(handshake_table handshake_table) | 232 | add_test(handshake_table handshake_table) |