##// END OF EJS Templates
tests: fix portability issue with test-merge-tools...
Matt Mackall -
r24809:32d0d2f3 stable
parent child Browse files
Show More
@@ -105,9 +105,11 b' simplest hgrc using false for merge:'
105 M f
105 M f
106 ? f.orig
106 ? f.orig
107
107
108 #if unix-permissions
109
108 unexecutable file in $PATH shouldn't be found:
110 unexecutable file in $PATH shouldn't be found:
109
111
110 $ touch false
112 $ echo "echo fail" > false
111 $ hg up -qC 1
113 $ hg up -qC 1
112 $ PATH="`pwd`:$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2
114 $ PATH="`pwd`:$BINDIR" $PYTHON "$BINDIR"/hg merge -r 2
113 merging f
115 merging f
@@ -118,6 +120,8 b" unexecutable file in $PATH shouldn't be "
118 [1]
120 [1]
119 $ rm false
121 $ rm false
120
122
123 #endif
124
121 executable directory in $PATH shouldn't be found:
125 executable directory in $PATH shouldn't be found:
122
126
123 $ mkdir false
127 $ mkdir false
General Comments 0
You need to be logged in to leave comments. Login now