# HG changeset patch # User Thomas Arendsen Hein # Date 1125423778 -7200 # Node ID 235e0effa67244fb020b4397843702b13b5ba98c # Parent 8787d2d5fc7d1f75a1f3adaae39ebf215cf868c9 Fixed two tests to run with bourne shell. diff --git a/tests/test-copy2 b/tests/test-copy2 --- a/tests/test-copy2 +++ b/tests/test-copy2 @@ -8,11 +8,11 @@ hg commit -m1 -d"0 0" echo "# should show copy" cp foo bar hg copy foo bar -hg debugstate|grep ^copy +hg debugstate|grep '^copy' echo "# shouldn't show copy" hg commit -m2 -d"0 0" -hg debugstate|grep ^copy +hg debugstate|grep '^copy' echo "# should match" hg debugindex .hg/data/foo.i @@ -28,7 +28,7 @@ hg debugrename bar cp foo bar hg copy foo bar echo "# should show copy" -hg debugstate|grep ^copy +hg debugstate|grep '^copy' hg commit -m3 -d"0 0" echo "# should show no parents for tip" @@ -38,6 +38,6 @@ hg debugindex .hg/data/foo.i hg debugrename bar echo "# should show no copies" -hg debugstate|grep ^copy +hg debugstate|grep '^copy' exit 0 diff --git a/tests/test-ssh b/tests/test-ssh --- a/tests/test-ssh +++ b/tests/test-ssh @@ -13,7 +13,7 @@ if [ $1 != "user@dummy" ] ; then fi # check that we're in the right directory -if \! [ -x dummyssh ] ; then +if [ ! -x dummyssh ] ; then exit -1 fi diff --git a/tests/test-ssh.out b/tests/test-ssh.out --- a/tests/test-ssh.out +++ b/tests/test-ssh.out @@ -5,7 +5,6 @@ adding changesets adding manifests adding file changes added 1 changesets with 1 changes to 1 files -remote: ./dummyssh: line 11: !: command not found # verify checking changesets checking manifests @@ -16,13 +15,11 @@ 1 files, 1 changesets, 1 total revisions default = ssh://user@dummy/remote pulling from ssh://user@dummy/remote searching for changes -remote: ../dummyssh: line 11: !: command not found no changes found # local change # updating rc # find outgoing searching for changes -remote: ../dummyssh: line 11: !: command not found changeset: 1:536411b157b4 tag: tip user: test @@ -31,7 +28,6 @@ summary: add # push pushing to ssh://user@dummy/remote -remote: ../dummyssh: line 11: !: command not found searching for changes remote: adding changesets remote: adding manifests