aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorkinichiro <kinichiro.inoguchi@gmail.com>2020-07-07 18:24:27 +0900
committerkinichiro <kinichiro.inoguchi@gmail.com>2020-07-07 22:45:48 +0900
commit615c380811641b92e325ca4f7a732363368716a6 (patch)
tree16817f94823238f7adc422d6a8f6635b0541b84e
parentfa26b5359b76570b471a1dc3b8ed5dfbd240520c (diff)
downloadportable-615c380811641b92e325ca4f7a732363368716a6.tar.gz
portable-615c380811641b92e325ca4f7a732363368716a6.tar.bz2
portable-615c380811641b92e325ca4f7a732363368716a6.zip
Fix ssltest to run on appveyor
-rw-r--r--appveyor.yml3
-rw-r--r--tests/testssl.bat5
2 files changed, 5 insertions, 3 deletions
diff --git a/appveyor.yml b/appveyor.yml
index 4e0b488..fd59c2c 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -43,5 +43,4 @@ build_script:
43 - cmake --build . --config %CONFIG% 43 - cmake --build . --config %CONFIG%
44 44
45test_script: 45test_script:
46 # TODO: Determine how to run ssltest on AppVeyor 46 - ctest -C %CONFIG% --timeout 150 --output-on-failure
47 - ctest -C %CONFIG% --timeout 150 --output-on-failure -E ssltest
diff --git a/tests/testssl.bat b/tests/testssl.bat
index 1a55f76..0664eb0 100644
--- a/tests/testssl.bat
+++ b/tests/testssl.bat
@@ -11,7 +11,10 @@ set extra=%6
11 11
12%openssl% version & if !errorlevel! neq 0 exit /b 1 12%openssl% version & if !errorlevel! neq 0 exit /b 1
13 13
14for /f "usebackq" %%s in (`%openssl% x509 -in %cert% -text -noout ^| find /c "DSA Public Key"`) do set lines=%%s 14set lines=0
15for /f "usebackq" %%s in (`%openssl% x509 -in %cert% -text -noout ^| find "DSA Public Key"`) do (
16 set /a lines=%lines%+1
17)
15if %lines% gtr 0 ( 18if %lines% gtr 0 (
16 set dsa_cert=YES 19 set dsa_cert=YES
17) else ( 20) else (