# HG changeset patch # User Mads Kiilerich # Date 2009-12-16 11:10:21 # Node ID a5f3f9b1c42aa0dc9102f77ce46ebb0fe6892acd # Parent 6d4fa274ae75b493473bbf46cf1b87f06f230f1e test-rollback: Ignore hook exit code Failing hooks returned 255 on Solaris diff --git a/tests/test-rollback b/tests/test-rollback --- a/tests/test-rollback +++ b/tests/test-rollback @@ -33,7 +33,7 @@ hg branch echo '% rollback by pretxncommit saves commit message (issue 1635)' echo a >> a -hg --config hooks.pretxncommit=false commit -m"precious commit message" +hg --config hooks.pretxncommit=false commit -m"precious commit message" 2>&1 | sed 's,exited with status .*,exited ...,g' echo '.hg/last-message.txt:' cat .hg/last-message.txt ; echo @@ -43,6 +43,6 @@ cat > $HGTMP/editor <<'__EOF__' echo "another precious commit message" > "$1" __EOF__ chmod +x $HGTMP/editor -HGEDITOR=$HGTMP/editor hg --config hooks.pretxncommit=false commit +HGEDITOR=$HGTMP/editor hg --config hooks.pretxncommit=false commit 2>&1 | sed 's,exited with status .*,exited ...,g' echo '.hg/last-message.txt:' cat .hg/last-message.txt diff --git a/tests/test-rollback.out b/tests/test-rollback.out --- a/tests/test-rollback.out +++ b/tests/test-rollback.out @@ -31,13 +31,13 @@ test % rollback by pretxncommit saves commit message (issue 1635) transaction abort! rollback completed -abort: pretxncommit hook exited with status 1 +abort: pretxncommit hook exited ... .hg/last-message.txt: precious commit message % same thing, but run $EDITOR transaction abort! rollback completed note: commit message saved in .hg/last-message.txt -abort: pretxncommit hook exited with status 1 +abort: pretxncommit hook exited ... .hg/last-message.txt: another precious commit message