From 615c380811641b92e325ca4f7a732363368716a6 Mon Sep 17 00:00:00 2001 From: kinichiro Date: Tue, 7 Jul 2020 18:24:27 +0900 Subject: Fix ssltest to run on appveyor --- appveyor.yml | 3 +-- tests/testssl.bat | 5 ++++- 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: - cmake --build . --config %CONFIG% test_script: - # TODO: Determine how to run ssltest on AppVeyor - - ctest -C %CONFIG% --timeout 150 --output-on-failure -E ssltest + - ctest -C %CONFIG% --timeout 150 --output-on-failure 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 %openssl% version & if !errorlevel! neq 0 exit /b 1 -for /f "usebackq" %%s in (`%openssl% x509 -in %cert% -text -noout ^| find /c "DSA Public Key"`) do set lines=%%s +set lines=0 +for /f "usebackq" %%s in (`%openssl% x509 -in %cert% -text -noout ^| find "DSA Public Key"`) do ( + set /a lines=%lines%+1 +) if %lines% gtr 0 ( set dsa_cert=YES ) else ( -- cgit v1.2.3-55-g6feb