@@ -156,7 +156,7 @@ test_expect_success 'edit cvswork3 and save diff' '
156156 rm t2 &&
157157 cvs -f add adir/afile5 &&
158158 cvs -f rm t2 &&
159- test_must_fail cvs -f diff -N -u >"$WORKDIR/cvswork3edit.diff"
159+ ! cvs -f diff -N -u >"$WORKDIR/cvswork3edit.diff"
160160 )
161161'
162162
@@ -281,7 +281,7 @@ test_expect_success 'cvs co b2 [into cvswork2]' '
281281test_expect_success ' root dir edit [cvswork2]' '
282282 ( cd cvswork2 &&
283283 echo "Line 2" >> textfile.c &&
284- test_must_fail cvs -f diff -u >"$WORKDIR/cvsEdit1.diff" &&
284+ ! cvs -f diff -u >"$WORKDIR/cvsEdit1.diff" &&
285285 cvs -f commit -m "edit textfile.c" textfile.c
286286 ) >cvsEdit1.log 2>&1
287287'
@@ -290,7 +290,7 @@ test_expect_success 'root dir rm file [cvswork2]' '
290290 ( cd cvswork2 &&
291291 cvs -f rm -f t2 &&
292292 cvs -f diff -u > ../cvsEdit2-empty.diff &&
293- test_must_fail cvs -f diff -N -u >"$WORKDIR/cvsEdit2-N.diff" &&
293+ ! cvs -f diff -N -u >"$WORKDIR/cvsEdit2-N.diff" &&
294294 cvs -f commit -m "rm t2"
295295 ) > cvsEdit2.log 2>&1
296296'
@@ -304,11 +304,11 @@ test_expect_success 'subdir edit/add/rm files [cvswork2' '
304304 cvs -f rm bdir/b2file &&
305305 echo "4th file" > bdir/b4file &&
306306 cvs -f add bdir/b4file &&
307- test_must_fail cvs -f diff -N -u >"$WORKDIR/cvsEdit3.diff" &&
307+ ! cvs -f diff -N -u >"$WORKDIR/cvsEdit3.diff" &&
308308 git fetch gitcvs.git b2:b2 &&
309309 ( cd .. &&
310- test_must_fail cvs -f diff -u -N -r v1.2 >"$WORKDIR/cvsEdit3-v1.2.diff" &&
311- test_must_fail cvs -f diff -u -N -r v1.2 -r v1 >"$WORKDIR/cvsEdit3-v1.2-v1.diff"
310+ ! cvs -f diff -u -N -r v1.2 >"$WORKDIR/cvsEdit3-v1.2.diff" &&
311+ ! cvs -f diff -u -N -r v1.2 -r v1 >"$WORKDIR/cvsEdit3-v1.2-v1.diff"
312312 ) &&
313313 cvs -f commit -m "various add/rm/edit"
314314 ) >cvs.log 2>&1
@@ -468,15 +468,15 @@ test_expect_success 'cvs diff -r v1 -u' '
468468
469469test_expect_success ' cvs diff -N -r v2 -u' '
470470 ( cd cvswork &&
471- test_must_fail cvs -f diff -N -r v2 -u ) >cvsDiff.out 2>cvs.log &&
471+ ! cvs -f diff -N -r v2 -u ) >cvsDiff.out 2>cvs.log &&
472472 test ! -s cvs.log &&
473473 test -s cvsDiff.out &&
474474 check_diff cvsDiff.out v2 v1 > check_diff.out 2>&1
475475'
476476
477477test_expect_success ' cvs diff -N -r v2 -r v1.2' '
478478 ( cd cvswork &&
479- test_must_fail cvs -f diff -N -r v2 -r v1.2 -u ) >cvsDiff.out 2>cvs.log &&
479+ ! cvs -f diff -N -r v2 -r v1.2 -u ) >cvsDiff.out 2>cvs.log &&
480480 test ! -s cvs.log &&
481481 test -s cvsDiff.out &&
482482 check_diff cvsDiff.out v2 v1.2 > check_diff.out 2>&1
@@ -494,7 +494,7 @@ test_expect_success 'apply early [cvswork3] diff to b3' '
494494
495495test_expect_success ' check [cvswork3] diff' '
496496 ( cd cvswork3 &&
497- test_must_fail cvs -f diff -N -u ) >"$WORKDIR/cvsDiff.out" 2>cvs.log &&
497+ ! cvs -f diff -N -u ) >"$WORKDIR/cvsDiff.out" 2>cvs.log &&
498498 test ! -s cvs.log &&
499499 test -s cvsDiff.out &&
500500 test $(grep Index: cvsDiff.out | wc -l) = 3 &&
@@ -517,7 +517,7 @@ test_expect_success 'merge early [cvswork3] b3 with b1' '
517517test_expect_success ' cvs up dirty [cvswork3]' '
518518 ( cd cvswork3 &&
519519 cvs -f up &&
520- test_must_fail cvs -f diff -N -u >"$WORKDIR/cvsDiff.out" ) >cvs.log 2>&1 &&
520+ ! cvs -f diff -N -u >"$WORKDIR/cvsDiff.out" ) >cvs.log 2>&1 &&
521521 test -s cvsDiff.out &&
522522 test $(grep Index: cvsDiff.out | wc -l) = 2
523523 check_start_tree cvswork3 &&
0 commit comments