Since the setup requires the GPG prerequisite, it doesn't make much sense to try and run any tests without it. So rather than using a prereq on each individual test and possibly forgetting it on new ones (as just happened), skip the entire file if GPG isn't found. Signed-off-by: Brian Gernhardt <brian@xxxxxxxxxxxxxxxxxxxxx> --- t/t7510-signed-commit.sh | 24 +++++++++++++++--------- 1 file changed, 15 insertions(+), 9 deletions(-) diff --git a/t/t7510-signed-commit.sh b/t/t7510-signed-commit.sh index 9810242..414f9d1 100755 --- a/t/t7510-signed-commit.sh +++ b/t/t7510-signed-commit.sh @@ -4,7 +4,13 @@ test_description='signed commit tests' . ./test-lib.sh . "$TEST_DIRECTORY/lib-gpg.sh" -test_expect_success GPG 'create signed commits' ' +if ! test_have_prereq GPG +then + skip_all='skipping signed commit tests; gpg not available' + test_done +fi + +test_expect_success 'create signed commits' ' test_when_finished "test_unconfig commit.gpgsign" && echo 1 >file && git add file && @@ -48,7 +54,7 @@ test_expect_success GPG 'create signed commits' ' git tag eighth-signed-alt ' -test_expect_success GPG 'show signatures' ' +test_expect_success 'show signatures' ' ( for commit in initial second merge fourth-signed fifth-signed sixth-signed seventh-signed do @@ -79,7 +85,7 @@ test_expect_success GPG 'show signatures' ' ) ' -test_expect_success GPG 'detect fudged signature' ' +test_expect_success 'detect fudged signature' ' git cat-file commit seventh-signed >raw && sed -e "s/seventh/7th forged/" raw >forged1 && @@ -89,7 +95,7 @@ test_expect_success GPG 'detect fudged signature' ' ! grep "Good signature from" actual1 ' -test_expect_success GPG 'detect fudged signature with NUL' ' +test_expect_success 'detect fudged signature with NUL' ' git cat-file commit seventh-signed >raw && cat raw >forged2 && echo Qwik | tr "Q" "\000" >>forged2 && @@ -99,7 +105,7 @@ test_expect_success GPG 'detect fudged signature with NUL' ' ! grep "Good signature from" actual2 ' -test_expect_success GPG 'amending already signed commit' ' +test_expect_success 'amending already signed commit' ' git checkout fourth-signed^0 && git commit --amend -S --no-edit && git show -s --show-signature HEAD >actual && @@ -107,7 +113,7 @@ test_expect_success GPG 'amending already signed commit' ' ! grep "BAD signature from" actual ' -test_expect_success GPG 'show good signature with custom format' ' +test_expect_success 'show good signature with custom format' ' cat >expect <<-\EOF && G 13B6F51ECDDE430D @@ -117,7 +123,7 @@ test_expect_success GPG 'show good signature with custom format' ' test_cmp expect actual ' -test_expect_success GPG 'show bad signature with custom format' ' +test_expect_success 'show bad signature with custom format' ' cat >expect <<-\EOF && B 13B6F51ECDDE430D @@ -127,7 +133,7 @@ test_expect_success GPG 'show bad signature with custom format' ' test_cmp expect actual ' -test_expect_success GPG 'show unknown signature with custom format' ' +test_expect_success 'show unknown signature with custom format' ' cat >expect <<-\EOF && U 61092E85B7227189 @@ -137,7 +143,7 @@ test_expect_success GPG 'show unknown signature with custom format' ' test_cmp expect actual ' -test_expect_success GPG 'show lack of signature with custom format' ' +test_expect_success 'show lack of signature with custom format' ' cat >expect <<-\EOF && N -- 2.0.0.495.gf681aa8 -- To unsubscribe from this list: send the line "unsubscribe git" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html