210
210
--root=* )
211
211
root=$( expr " z$1 " : ' z[^=]*=\(.*\)' )
212
212
shift ;;
213
- --statusprefix=* )
214
- statusprefix=$( expr " z$1 " : ' z[^=]*=\(.*\)' )
215
- shift ;;
216
213
* )
217
214
echo " error: unknown test option '$1 '" >&2 ; exit 1 ;;
218
215
esac
@@ -320,25 +317,25 @@ trap 'die' EXIT
320
317
321
318
test_ok_ () {
322
319
test_success=$(( $test_success + 1 ))
323
- say_color " " " ${statusprefix} ok $test_count - $@ "
320
+ say_color " " " ok $test_count - $@ "
324
321
}
325
322
326
323
test_failure_ () {
327
324
test_failure=$(( $test_failure + 1 ))
328
- say_color error " ${statusprefix} not ok $test_count - $1 "
325
+ say_color error " not ok $test_count - $1 "
329
326
shift
330
327
echo " $@ " | sed -e ' s/^/# /'
331
328
test " $immediate " = " " || { GIT_EXIT_OK=t; exit 1; }
332
329
}
333
330
334
331
test_known_broken_ok_ () {
335
332
test_fixed=$(( $test_fixed + 1 ))
336
- say_color error " ${statusprefix} ok $test_count - $@ # TODO known breakage vanished"
333
+ say_color error " ok $test_count - $@ # TODO known breakage vanished"
337
334
}
338
335
339
336
test_known_broken_failure_ () {
340
337
test_broken=$(( $test_broken + 1 ))
341
- say_color warn " ${statusprefix} not ok $test_count - $@ # TODO known breakage"
338
+ say_color warn " not ok $test_count - $@ # TODO known breakage"
342
339
}
343
340
344
341
test_debug () {
@@ -462,8 +459,8 @@ test_skip () {
462
459
of_prereq=" of $test_prereq "
463
460
fi
464
461
465
- say_color skip >&3 " ${statusprefix} skipping test: $@ "
466
- say_color skip " ${statusprefix} ok $test_count # skip $1 (missing $missing_prereq ${of_prereq} )"
462
+ say_color skip >&3 " skipping test: $@ "
463
+ say_color skip " ok $test_count # skip $1 (missing $missing_prereq ${of_prereq} )"
467
464
: true
468
465
;;
469
466
* )
@@ -501,11 +498,11 @@ test_done () {
501
498
502
499
if test " $test_fixed " ! = 0
503
500
then
504
- say_color error " ${statusprefix} # $test_fixed known breakage(s) vanished; please update test(s)"
501
+ say_color error " # $test_fixed known breakage(s) vanished; please update test(s)"
505
502
fi
506
503
if test " $test_broken " ! = 0
507
504
then
508
- say_color warn " ${statusprefix} # still have $test_broken known breakage(s)"
505
+ say_color warn " # still have $test_broken known breakage(s)"
509
506
fi
510
507
if test " $test_broken " ! = 0 || test " $test_fixed " ! = 0
511
508
then
@@ -528,9 +525,9 @@ test_done () {
528
525
then
529
526
if test $test_remaining -gt 0
530
527
then
531
- say_color pass " ${statusprefix} # passed all $msg "
528
+ say_color pass " # passed all $msg "
532
529
fi
533
- say " ${statusprefix} 1..$test_count$skip_all "
530
+ say " 1..$test_count$skip_all "
534
531
fi
535
532
536
533
test -d " $remove_trash " &&
@@ -544,8 +541,8 @@ test_done () {
544
541
* )
545
542
if test $test_external_has_tap -eq 0
546
543
then
547
- say_color error " ${statusprefix} # failed $test_failure among $msg "
548
- say " ${statusprefix} 1..$test_count "
544
+ say_color error " # failed $test_failure among $msg "
545
+ say " 1..$test_count "
549
546
fi
550
547
551
548
exit 1 ;;
0 commit comments