diff --git a/tests/recipes/06_test_sha256sum b/tests/recipes/06_test_sha256sum index 6578719..8197c39 100644 --- a/tests/recipes/06_test_sha256sum +++ b/tests/recipes/06_test_sha256sum @@ -18,7 +18,7 @@ if [ -s "test.exe" ] fi rm -f "sha256sum_exe.log" else - skip=$($skip+1) + skip=$(($skip+1)) fi if [ -s "test.ex_" ] @@ -33,7 +33,7 @@ if [ -s "test.ex_" ] fi rm -f "sha256sum_ex_.log" else - skip=$($skip+1) + skip=$(($skip+1)) fi if [ -s "sample.msi" ] diff --git a/tests/recipes/07_sign_timestamp b/tests/recipes/07_sign_timestamp index b58dbc8..d5a0c66 100644 --- a/tests/recipes/07_sign_timestamp +++ b/tests/recipes/07_sign_timestamp @@ -7,7 +7,7 @@ script_path=$(pwd) # PE file test_name="071. Sign a PE file with Authenticode timestamping" printf "\n%s\n" "$test_name" -if [ -s "test.exe" ] +if [ -s "test.exe" ] && ! grep -q "no libcurl available" "results.log" then ../../osslsigncode sign -h sha256 \ -st "1556668800" \ @@ -24,7 +24,7 @@ if [ -s "test.exe" ] # CAB file test_name="072. Sign a CAB file with Authenticode timestamping" printf "\n%s\n" "$test_name" -if [ -s "test.ex_" ] +if [ -s "test.ex_" ] && ! grep -q "no libcurl available" "results.log" then ../../osslsigncode sign -h sha256 \ -st "1556668800" \ @@ -41,7 +41,7 @@ if [ -s "test.ex_" ] # MSI file test_name="073. Sign a MSI file with Authenticode timestamping" printf "\n%s\n" "$test_name" -if [ -s "sample.msi" ] +if [ -s "sample.msi" ] && ! grep -q "no libcurl available" "results.log" then ../../osslsigncode sign -h sha256 \ -st "1556668800" \ diff --git a/tests/recipes/08_sign_rfc3161 b/tests/recipes/08_sign_rfc3161 index 682ab23..d400209 100644 --- a/tests/recipes/08_sign_rfc3161 +++ b/tests/recipes/08_sign_rfc3161 @@ -11,7 +11,7 @@ script_path=$(pwd) # PE file test_name="081. Sign a PE file with RFC 3161 timestamping" printf "\n%s\n" "$test_name" -if [ -s "test.exe" ] +if [ -s "test.exe" ] && ! grep -q "no libcurl available" "results.log" then ../../osslsigncode sign -h sha256 \ -st "1556668800" \ @@ -28,7 +28,7 @@ if [ -s "test.exe" ] # CAB file test_name="082. Sign a CAB file with RFC 3161 timestamping" printf "\n%s\n" "$test_name" -if [ -s "test.ex_" ] +if [ -s "test.ex_" ] && ! grep -q "no libcurl available" "results.log" then ../../osslsigncode sign -h sha256 \ -st "1556668800" \ @@ -45,7 +45,7 @@ if [ -s "test.ex_" ] # MSI file test_name="083. Sign a MSI file with RFC 3161 timestamping" printf "\n%s\n" "$test_name" -if [ -s "sample.msi" ] +if [ -s "sample.msi" ] && ! grep -q "no libcurl available" "results.log" then ../../osslsigncode sign -h sha256 \ -st "1556668800" \ diff --git a/tests/recipes/35_varia_sha256sum b/tests/recipes/35_varia_sha256sum index 7017a64..60cd72b 100644 --- a/tests/recipes/35_varia_sha256sum +++ b/tests/recipes/35_varia_sha256sum @@ -19,7 +19,7 @@ if [ -s "test.exe" ] fi rm -f "sha256sum_exe.log" else - skip=$($skip+1) + skip=$(($skip+1)) fi if [ -s "sample.msi" ] diff --git a/tests/recipes/37_add_signature_timestamp b/tests/recipes/37_add_signature_timestamp index c32c6ad..fffb6e7 100644 --- a/tests/recipes/37_add_signature_timestamp +++ b/tests/recipes/37_add_signature_timestamp @@ -7,7 +7,7 @@ script_path=$(pwd) # PE file test_name="371. Add an authenticode timestamp to the PE file" printf "\n%s\n" "$test_name" -if [ -s "test.exe" ] +if [ -s "test.exe" ] && ! grep -q "no libcurl available" "results.log" then ../../osslsigncode sign -h sha256 \ -st "1556668800" \ @@ -29,7 +29,7 @@ if [ -s "test.exe" ] # MSI file test_name="372. Add an authenticode timestamp to the MSI file" printf "\n%s\n" "$test_name" -if [ -s "sample.msi" ] +if [ -s "sample.msi" ] && ! grep -q "no libcurl available" "results.log" then ../../osslsigncode sign -h sha256 \ -st "1556668800" \ diff --git a/tests/recipes/38_add_signature_rfc3161 b/tests/recipes/38_add_signature_rfc3161 index d676a4a..7372516 100644 --- a/tests/recipes/38_add_signature_rfc3161 +++ b/tests/recipes/38_add_signature_rfc3161 @@ -7,7 +7,7 @@ script_path=$(pwd) # PE file test_name="381. Add RFC 3161 timestamp to signed PE file" printf "\n%s\n" "$test_name" -if [ -s "test.exe" ] +if [ -s "test.exe" ] && ! grep -q "no libcurl available" "results.log" then ../../osslsigncode sign -h sha256 \ -st "1556668800" \ @@ -29,7 +29,7 @@ if [ -s "test.exe" ] # MSI file test_name="382. Add RFC 3161 timestamp to signed MSI file" printf "\n%s\n" "$test_name" -if [ -s "sample.msi" ] +if [ -s "sample.msi" ] && ! grep -q "no libcurl available" "results.log" then ../../osslsigncode sign -h sha256 \ -st "1556668800" \ diff --git a/tests/recipes/46_verify_timestamp b/tests/recipes/46_verify_timestamp index c3ebdb5..ac9ead3 100644 --- a/tests/recipes/46_verify_timestamp +++ b/tests/recipes/46_verify_timestamp @@ -8,7 +8,7 @@ script_path=$(pwd) # PE file test_name="461. Verify changed PE file after signing with Authenticode timestamping" printf "\n%s\n" "$test_name" -if [ -s "test.exe" ] +if [ -s "test.exe" ] && ! grep -q "no libcurl available" "results.log" then ../../osslsigncode sign -h sha256 \ -st "1556668800" \ diff --git a/tests/recipes/47_verify_rfc3161 b/tests/recipes/47_verify_rfc3161 index 6157ef5..c5ab544 100755 --- a/tests/recipes/47_verify_rfc3161 +++ b/tests/recipes/47_verify_rfc3161 @@ -8,7 +8,7 @@ script_path=$(pwd) # PE file test_name="471. Verify changed PE file after signing with RFC 3161 timestamping" printf "\n%s\n" "$test_name" -if [ -s "test.exe" ] +if [ -s "test.exe" ] && ! grep -q "no libcurl available" "results.log" then ../../osslsigncode sign -h sha256 \ -st "1556668800" \ diff --git a/tests/recipes/52_verify_timestamp b/tests/recipes/52_verify_timestamp index 85a20b0..0971457 100644 --- a/tests/recipes/52_verify_timestamp +++ b/tests/recipes/52_verify_timestamp @@ -6,7 +6,7 @@ # PE file test_name="521. Verify PE file signature with timestamping after the cert has been expired" printf "\n%s\n" "$test_name" -if [ -s "test.exe" ] +if [ -s "test.exe" ] && ! grep -q "no libcurl available" "results.log" then TZ=GMT faketime -f '@2019-05-01 00:00:00' /bin/bash -c ' script_path=$(pwd) @@ -27,7 +27,7 @@ if [ -s "test.exe" ] # MSI file test_name="523. Verify MSI file signature with timestamping after the cert has been expired" printf "\n%s\n" "$test_name" -if [ -s "sample.msi" ] +if [ -s "sample.msi" ] && ! grep -q "no libcurl available" "results.log" then TZ=GMT faketime -f '@2019-05-01 00:00:00' /bin/bash -c ' script_path=$(pwd) diff --git a/tests/recipes/53_verify_rfc3161 b/tests/recipes/53_verify_rfc3161 index a75109c..51226ba 100644 --- a/tests/recipes/53_verify_rfc3161 +++ b/tests/recipes/53_verify_rfc3161 @@ -6,7 +6,7 @@ # PE file test_name="531. Verify PE file signature with RFC3161 after the cert has been expired" printf "\n%s\n" "$test_name" -if [ -s "test.exe" ] +if [ -s "test.exe" ] && ! grep -q "no libcurl available" "results.log" then TZ=GMT faketime -f '@2019-05-01 00:00:00' /bin/bash -c ' script_path=$(pwd) @@ -27,7 +27,7 @@ if [ -s "test.exe" ] # MSI file test_name="533. Verify MSI file signature with RFC3161 after the cert has been expired" printf "\n%s\n" "$test_name" -if [ -s "sample.msi" ] +if [ -s "sample.msi" ] && ! grep -q "no libcurl available" "results.log" then TZ=GMT faketime -f '@2019-05-01 00:00:00' /bin/bash -c ' script_path=$(pwd) diff --git a/tests/recipes/54_verify_expired b/tests/recipes/54_verify_expired index 405b512..2acff2f 100644 --- a/tests/recipes/54_verify_expired +++ b/tests/recipes/54_verify_expired @@ -6,7 +6,7 @@ # PE file test_name="541. Verify PE file signed with the expired cert" printf "\n%s\n" "$test_name" -if [ -s "test.exe" ] +if [ -s "test.exe" ] && ! grep -q "no libcurl available" "results.log" then TZ=GMT faketime -f '@2019-05-01 00:00:00' /bin/bash -c ' script_path=$(pwd) @@ -27,7 +27,7 @@ if [ -s "test.exe" ] # MSI file test_name="543. Verify MSI file signed with the expired cert" printf "\n%s\n" "$test_name" -if [ -s "sample.msi" ] +if [ -s "sample.msi" ] && ! grep -q "no libcurl available" "results.log" then TZ=GMT faketime -f '@2019-05-01 00:00:00' /bin/bash -c ' script_path=$(pwd)