summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMiklos Vajna <vmiklos@frugalware.org>2010-07-28 03:33:33 +0200
committerMiklos Vajna <vmiklos@frugalware.org>2010-07-28 03:33:33 +0200
commitd417f8f5f19fcdc27bc03e125668d9586ee5ede1 (patch)
tree6e3d488696a76a1d55725f46e4dd1f29e71a16d5
parent568be5d27475936d5fd0ec513ee726c855b824b1 (diff)
downloadbzr-fastimport-d417f8f5f19fcdc27bc03e125668d9586ee5ede1.tar.gz
tests: make sure the dir exists where we run darcs diff
-rw-r--r--exporters/darcs/t/lib.sh6
1 files changed, 3 insertions, 3 deletions
diff --git a/exporters/darcs/t/lib.sh b/exporters/darcs/t/lib.sh
index 095f9ef..7d2218a 100644
--- a/exporters/darcs/t/lib.sh
+++ b/exporters/darcs/t/lib.sh
@@ -262,7 +262,7 @@ diff_importgit()
diff_importhg()
{
- test -z "`(cd $1.darcs; darcs diff)`" &&
+ cd $1.darcs && test -z "`darcs diff 2>&1`" && cd .. &&
diff --exclude _darcs --exclude .hg --exclude '*-darcs-backup*' --exclude 'hg-export.*' \
--exclude '.hgtags' --exclude '*.orig' -Nur $1 $1.darcs
return $?
@@ -270,14 +270,14 @@ diff_importhg()
diff_importdarcs()
{
- test -z "`(cd $1.darcs; darcs diff)`" &&
+ cd $1.importdarcs && test -z "`darcs diff 2>&1`" && cd .. &&
diff --exclude _darcs --exclude '*-darcs-backup*' -Nur $1 $2
return $?
}
diff_importbzr()
{
- test -z "`(cd $1.darcs; darcs diff)`" &&
+ cd $1.darcs && test -z "`darcs diff 2>&1`" && cd .. &&
diff --exclude _darcs --exclude .bzr --exclude '*-darcs-backup*' -Nur $1 $1.darcs
return $?
}