* [PATCH 1/2] tests: fix broken && chains in t1509-root-worktree
@ 2015-08-05 9:43 Patrick Steinhardt
2015-08-05 9:43 ` [PATCH 2/2] tests: fix cleanup after tests " Patrick Steinhardt
0 siblings, 1 reply; 2+ messages in thread
From: Patrick Steinhardt @ 2015-08-05 9:43 UTC (permalink / raw)
To: git; +Cc: Patrick Steinhardt
Signed-off-by: Patrick Steinhardt <ps@pks.im>
---
These two patches have previously been part of my patch series
fixing directory guessing. As Jeff King has been posting a patch
that contains tests for cloning from a server's root without
requiring t1509 I now post these two fixes as separate patches.
t/t1509-root-worktree.sh | 8 ++++----
1 file changed, 4 insertions(+), 4 deletions(-)
diff --git a/t/t1509-root-worktree.sh b/t/t1509-root-worktree.sh
index b6977d4..0c80129 100755
--- a/t/t1509-root-worktree.sh
+++ b/t/t1509-root-worktree.sh
@@ -125,7 +125,7 @@ fi
ONE_SHA1=d00491fd7e5bb6fa28c517a0bb32b8b506539d4d
test_expect_success 'setup' '
- rm -rf /foo
+ rm -rf /foo &&
mkdir /foo &&
mkdir /foo/bar &&
echo 1 > /foo/foome &&
@@ -218,7 +218,7 @@ unset GIT_WORK_TREE
test_expect_success 'go to /' 'cd /'
test_expect_success 'setup' '
- rm -rf /.git
+ rm -rf /.git &&
echo "Initialized empty Git repository in /.git/" > expected &&
git init > result &&
test_cmp expected result
@@ -241,8 +241,8 @@ say "auto bare gitdir"
# DESTROYYYYY!!!!!
test_expect_success 'setup' '
- rm -rf /refs /objects /info /hooks
- rm /*
+ rm -rf /refs /objects /info /hooks &&
+ rm /* &&
cd / &&
echo "Initialized empty Git repository in /" > expected &&
git init --bare > result &&
--
2.5.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
* [PATCH 2/2] tests: fix cleanup after tests in t1509-root-worktree
2015-08-05 9:43 [PATCH 1/2] tests: fix broken && chains in t1509-root-worktree Patrick Steinhardt
@ 2015-08-05 9:43 ` Patrick Steinhardt
0 siblings, 0 replies; 2+ messages in thread
From: Patrick Steinhardt @ 2015-08-05 9:43 UTC (permalink / raw)
To: git; +Cc: Patrick Steinhardt
During cleanup we do a simple 'rm /*' to remove leftover files
from previous tests. As 'rm' errors out when there is anything it
cannot delete and there are directories present at '/' it will
throw an error, causing the '&&' chain to fail.
Fix this by explicitly removing the files.
Signed-off-by: Patrick Steinhardt <ps@pks.im>
---
t/t1509-root-worktree.sh | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/t/t1509-root-worktree.sh b/t/t1509-root-worktree.sh
index 0c80129..553a3f6 100755
--- a/t/t1509-root-worktree.sh
+++ b/t/t1509-root-worktree.sh
@@ -242,7 +242,7 @@ say "auto bare gitdir"
# DESTROYYYYY!!!!!
test_expect_success 'setup' '
rm -rf /refs /objects /info /hooks &&
- rm /* &&
+ rm -f /expected /ls.expected /me /result &&
cd / &&
echo "Initialized empty Git repository in /" > expected &&
git init --bare > result &&
--
2.5.0
^ permalink raw reply related [flat|nested] 2+ messages in thread
end of thread, other threads:[~2015-08-05 9:44 UTC | newest]
Thread overview: 2+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-08-05 9:43 [PATCH 1/2] tests: fix broken && chains in t1509-root-worktree Patrick Steinhardt
2015-08-05 9:43 ` [PATCH 2/2] tests: fix cleanup after tests " Patrick Steinhardt
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).