Mercurial > hg-stable
changeset 800:ec85f9e6f3b1
Don't use 'set -x', fix exports, sed and hexdump usage for Solaris.
| author | Thomas Arendsen Hein <thomas@intevation.de> |
|---|---|
| date | Fri, 29 Jul 2005 15:19:43 +0100 |
| parents | 583e290e4945 |
| children | 1f9ec150a476 |
| files | tests/test-backwards-remove tests/test-bad-pull tests/test-basic tests/test-bdiff tests/test-clone tests/test-clone-failure tests/test-conflict tests/test-copy tests/test-diffdir tests/test-empty-dir tests/test-flags tests/test-help tests/test-hook tests/test-hup tests/test-merge-revert tests/test-merge-revert2 tests/test-merge1 tests/test-merge2 tests/test-merge3 tests/test-merge4 tests/test-merge5 tests/test-merge6 tests/test-pull tests/test-rawcommit1 tests/test-simple-update tests/test-tag tests/test-tags tests/test-undo tests/test-unrelated-pull tests/test-up-local-change |
| diffstat | 24 files changed, 24 insertions(+), 35 deletions(-) [+] |
line wrap: on
line diff
--- a/tests/test-backwards-remove Fri Jul 29 15:11:34 2005 +0100 +++ b/tests/test-backwards-remove Fri Jul 29 15:19:43 2005 +0100 @@ -1,4 +1,4 @@ -#!/bin/sh -x +#!/bin/sh hg init echo This is file a1 > a hg add a
--- a/tests/test-bad-pull Fri Jul 29 15:11:34 2005 +0100 +++ b/tests/test-bad-pull Fri Jul 29 15:19:43 2005 +0100 @@ -1,4 +1,4 @@ -#!/bin/sh -x +#!/bin/sh hg clone http://localhost:20059/ copy echo $? @@ -17,12 +17,9 @@ run() EOF -set +x # backgrounding sometimes disturbs the order of command tracing python dumb.py 2>/dev/null & -set -x hg clone http://localhost:20059/foo copy2 echo $? -set +x kill $!
--- a/tests/test-basic Fri Jul 29 15:11:34 2005 +0100 +++ b/tests/test-basic Fri Jul 29 15:19:43 2005 +0100 @@ -1,6 +1,5 @@ #!/bin/sh -set -x mkdir t cd t hg init
--- a/tests/test-clone Fri Jul 29 15:11:34 2005 +0100 +++ b/tests/test-clone Fri Jul 29 15:19:43 2005 +0100 @@ -1,6 +1,5 @@ #!/bin/bash -set -x mkdir a cd a hg init
--- a/tests/test-clone-failure Fri Jul 29 15:11:34 2005 +0100 +++ b/tests/test-clone-failure Fri Jul 29 15:19:43 2005 +0100 @@ -1,7 +1,5 @@ #!/bin/bash -set -x - # No local source hg clone a b echo $?
--- a/tests/test-conflict Fri Jul 29 15:11:34 2005 +0100 +++ b/tests/test-conflict Fri Jul 29 15:19:43 2005 +0100 @@ -1,6 +1,5 @@ #!/bin/sh -set -x hg init echo "nothing" > a hg add a @@ -10,7 +9,7 @@ hg co 0 echo "something else" > a hg commit -m branch2 -d "0 0" -export HGMERGE=merge +HGMERGE=merge; export HGMERGE hg up -m 1 hg id grep -Ev ">>>|<<<" a
--- a/tests/test-copy Fri Jul 29 15:11:34 2005 +0100 +++ b/tests/test-copy Fri Jul 29 15:19:43 2005 +0100 @@ -1,6 +1,5 @@ #!/bin/sh -set -x hg init echo a > a hg add a @@ -12,7 +11,7 @@ hg --debug commit -m "2" -d "0 0" hg history hg log a -hexdump -C .hg/data/b.d +md5sum .hg/data/b.d hg cat b > bsum md5sum bsum hg cat a > asum
--- a/tests/test-diffdir Fri Jul 29 15:11:34 2005 +0100 +++ b/tests/test-diffdir Fri Jul 29 15:19:43 2005 +0100 @@ -7,6 +7,6 @@ echo 123 > b hg add b -hg diff | sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/" +hg diff | sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" -hg diff -r tip | sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/" +hg diff -r tip | sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/"
--- a/tests/test-flags Fri Jul 29 15:11:34 2005 +0100 +++ b/tests/test-flags Fri Jul 29 15:19:43 2005 +0100 @@ -1,4 +1,4 @@ -#!/bin/sh -ex +#!/bin/sh -e umask 027 mkdir test1
--- a/tests/test-hook Fri Jul 29 15:11:34 2005 +0100 +++ b/tests/test-hook Fri Jul 29 15:19:43 2005 +0100 @@ -1,4 +1,4 @@ -#!/bin/sh -x +#!/bin/sh hg init echo "[hooks]" > .hg/hgrc
--- a/tests/test-merge-revert Fri Jul 29 15:11:34 2005 +0100 +++ b/tests/test-merge-revert Fri Jul 29 15:19:43 2005 +0100 @@ -1,4 +1,4 @@ -#!/bin/sh -x +#!/bin/sh mkdir t cd t
--- a/tests/test-merge-revert2 Fri Jul 29 15:11:34 2005 +0100 +++ b/tests/test-merge-revert2 Fri Jul 29 15:19:43 2005 +0100 @@ -1,4 +1,4 @@ -#!/bin/sh -x +#!/bin/sh mkdir t cd t @@ -26,7 +26,7 @@ hg update -C 0 echo "changed file1 different" >> file1 HGMERGE=merge hg update -hg diff | sed -e "s/\(\(---\|+++\).*\)\t.*/\1/" -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/" +hg diff | sed -e "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" -e "s/\(<<<<<<<\|>>>>>>>\) .*/\1/" hg status hg id hg revert
--- a/tests/test-merge1 Fri Jul 29 15:11:34 2005 +0100 +++ b/tests/test-merge1 Fri Jul 29 15:19:43 2005 +0100 @@ -1,4 +1,4 @@ -#!/bin/sh -x +#!/bin/sh cat <<'EOF' > merge #!/bin/sh
--- a/tests/test-merge2 Fri Jul 29 15:11:34 2005 +0100 +++ b/tests/test-merge2 Fri Jul 29 15:19:43 2005 +0100 @@ -1,4 +1,4 @@ -#!/bin/sh -x +#!/bin/sh mkdir t cd t
--- a/tests/test-merge3 Fri Jul 29 15:11:34 2005 +0100 +++ b/tests/test-merge3 Fri Jul 29 15:19:43 2005 +0100 @@ -1,4 +1,4 @@ -#!/bin/sh -x +#!/bin/sh hg init echo This is file a1 > a
--- a/tests/test-merge4 Fri Jul 29 15:11:34 2005 +0100 +++ b/tests/test-merge4 Fri Jul 29 15:19:43 2005 +0100 @@ -1,4 +1,4 @@ -#!/bin/sh -x +#!/bin/sh hg init echo This is file a1 > a
--- a/tests/test-merge5 Fri Jul 29 15:11:34 2005 +0100 +++ b/tests/test-merge5 Fri Jul 29 15:19:43 2005 +0100 @@ -1,4 +1,4 @@ -#!/bin/sh -x +#!/bin/sh mkdir t cd t
--- a/tests/test-merge6 Fri Jul 29 15:11:34 2005 +0100 +++ b/tests/test-merge6 Fri Jul 29 15:19:43 2005 +0100 @@ -1,11 +1,11 @@ -#!/bin/sh -x +#!/bin/sh cat <<'EOF' > merge #!/bin/sh echo merging for `basename $1` EOF chmod +x merge -export HGMERGE=./merge +HGMERGE=./merge; export HGMERGE mkdir A1 cd A1
--- a/tests/test-rawcommit1 Fri Jul 29 15:11:34 2005 +0100 +++ b/tests/test-rawcommit1 Fri Jul 29 15:19:43 2005 +0100 @@ -1,4 +1,4 @@ -#!/bin/sh -x +#!/bin/sh hg --debug init echo this is a1 > a hg add a
--- a/tests/test-simple-update Fri Jul 29 15:11:34 2005 +0100 +++ b/tests/test-simple-update Fri Jul 29 15:19:43 2005 +0100 @@ -1,6 +1,6 @@ #!/bin/sh -set -ex +set -e mkdir test cd test
--- a/tests/test-tag Fri Jul 29 15:11:34 2005 +0100 +++ b/tests/test-tag Fri Jul 29 15:19:43 2005 +0100 @@ -1,4 +1,4 @@ -#!/bin/sh -x +#!/bin/sh hg init echo a > a
--- a/tests/test-tags Fri Jul 29 15:11:34 2005 +0100 +++ b/tests/test-tags Fri Jul 29 15:19:43 2005 +0100 @@ -1,6 +1,5 @@ #!/bin/sh -set -x mkdir t cd t hg init
--- a/tests/test-undo Fri Jul 29 15:11:34 2005 +0100 +++ b/tests/test-undo Fri Jul 29 15:19:43 2005 +0100 @@ -1,6 +1,5 @@ #!/bin/sh -set -x mkdir t cd t hg init
--- a/tests/test-up-local-change Fri Jul 29 15:11:34 2005 +0100 +++ b/tests/test-up-local-change Fri Jul 29 15:19:43 2005 +0100 @@ -1,6 +1,6 @@ #!/bin/sh -set -ex +set -e mkdir r1 cd r1 hg init @@ -13,7 +13,7 @@ hg up echo abc > a hg diff > ../d -sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/" < ../d +sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" < ../d cd ../r1 echo b > b @@ -29,5 +29,5 @@ hg parents hg -v history hg diff > ../d -sed "s/\(\(---\|+++\) [^ \t]*\)[ \t].*/\1/" < ../d +sed "s/\(\(---\|+++\) [a-zA-Z0-9_/.-]*\).*/\1/" < ../d