t9502: fix &&-chain breakage
authorJeff King <peff@peff.net>
Fri, 20 Mar 2015 10:13:01 +0000 (06:13 -0400)
committerJunio C Hamano <gitster@pobox.com>
Fri, 20 Mar 2015 18:35:50 +0000 (11:35 -0700)
This script misses a trivial &&-chain in one of its tests,
but it also has a weird reverse: it includes an &&-chain
outside of any test_expect block! This "cat" should never
fail, but if it did, we would not notice, as it would cause
us to skip the follow-on test entirely (which does not
appear intentional; there are many later tests which rely on
this cat).

Let's instead move the setup into its own test_expect_success
block, which is the standard practice nowadays.

Signed-off-by: Jeff King <peff@peff.net>
Signed-off-by: Junio C Hamano <gitster@pobox.com>
t/t9502-gitweb-standalone-parse-output.sh
index 86dfee2e4f93750aa72c0b24df57c77faa091aa7..0796a438bc7759292ba900427304ebf9c814c904 100755 (executable)
@@ -145,9 +145,11 @@ test_expect_success 'forks: not skipped unless "forks" feature enabled' '
        grep -q ">fork of .*<"           gitweb.body
 '
 
-cat >>gitweb_config.perl <<\EOF &&
-$feature{'forks'}{'default'} = [1];
-EOF
+test_expect_success 'enable forks feature' '
+       cat >>gitweb_config.perl <<-\EOF
+       $feature{"forks"}{"default"} = [1];
+       EOF
+'
 
 test_expect_success 'forks: forks skipped if "forks" feature enabled' '
        gitweb_run "a=project_list" &&
@@ -173,7 +175,7 @@ test_expect_success 'forks: can access forked repository' '
 '
 
 test_expect_success 'forks: project_index lists all projects (incl. forks)' '
-       cat >expected <<-\EOF
+       cat >expected <<-\EOF &&
        .git
        foo.bar.git
        foo.git