# HG changeset patch
# User Thomas Arendsen Hein <thomas@intevation.de>
# Date 2008-01-14 08:00:23
# Node ID a6ccb957fd079f1b5d2ffcc3fadf1940bf5cb513
# Parent  8b95f598097c99ccdb25ca18dede3ac97b0ac817

Solaris compatibility fixes for test-keyword:
- do not use /bin/false (yields 255 instead of 1)
- do not use "cd -", simply use "cd .." instead.

diff --git a/tests/test-keyword b/tests/test-keyword
--- a/tests/test-keyword
+++ b/tests/test-keyword
@@ -44,7 +44,7 @@ hg status
 
 echo % default keyword expansion including commit hook
 echo % interrupted commit should not change state or run commit hook
-HGEDITOR=false hg --debug commit
+hg --debug commit
 echo % status
 hg status
 
@@ -131,7 +131,7 @@ secondline
 EOF
 
 echo % interrupted commit should not change state
-HGEDITOR=false hg commit
+hg commit
 echo % status
 hg status
 
@@ -207,7 +207,7 @@ echo % kwshrink a inside directory x
 hg --verbose kwshrink a
 echo % cat a
 cat a
-cd - > /dev/null 2>&1
+cd ..
 
 echo % kwexpand nonexistent
 hg kwexpand nonexistent
diff --git a/tests/test-keyword.out b/tests/test-keyword.out
--- a/tests/test-keyword.out
+++ b/tests/test-keyword.out
@@ -103,7 +103,7 @@ b
 sym
 transaction abort!
 rollback completed
-abort: edit failed: false exited with status 1
+abort: empty commit message
 % status
 A a
 A b
@@ -207,7 +207,7 @@ a
 % interrupted commit should not change state
 transaction abort!
 rollback completed
-abort: edit failed: false exited with status 1
+abort: empty commit message
 % status
 M a
 ? log