test harness: improve catching of usage errors in script 'test-driver'

[platform/upstream/automake.git] / t / self-check-report.sh

diff --git a/t/self-check-report.sh b/t/self-check-report.sh
old mode 100755 (executable)
new mode 100644 (file)
index e5998b5..99b9838
--- a/t/self-check-report.sh
+++ b/t/self-check-report.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2011-2012 Free Software Foundation, Inc.
+# Copyright (C) 2011-2013 Free Software Foundation, Inc.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -18,37 +18,37 @@
 # Test subroutines to report warnings, and to signal failures, skips
 # and hard errors.
 
-unset stderr_fileno_ || :
+unset stderr_fileno_
 
 am_create_testdir=empty
-. ./defs || Exit 1
+. test-init.sh
 
 set +e
 
 exec 5>&1
 
-(warn_ foobar) 2>&1 1>&5 | grep '^foobar$'             || Exit 1
-(fail_ foo); test $? -eq 1                             || Exit 1
-(fail_ foo) 2>&1 1>&5 | grep "^$me: failed test: foo"  || Exit 1
-(skip_ foo); test $? -eq 77                            || Exit 1
-(skip_ foo) 2>&1 1>&5 | grep "^$me: skipped test: foo" || Exit 1
-(fatal_ foo); test $? -eq 99                           || Exit 1
-(fatal_ foo) 2>&1 1>&5 | grep "^$me: hard error: foo"  || Exit 1
-(framework_failure_ foo); test $? -eq 99               || Exit 1
+(warn_ foobar) 2>&1 1>&5 | grep '^foobar$'             || exit 1
+(fail_ foo); test $? -eq 1                             || exit 1
+(fail_ foo) 2>&1 1>&5 | grep "^$me: failed test: foo"  || exit 1
+(skip_ foo); test $? -eq 77                            || exit 1
+(skip_ foo) 2>&1 1>&5 | grep "^$me: skipped test: foo" || exit 1
+(fatal_ foo); test $? -eq 99                           || exit 1
+(fatal_ foo) 2>&1 1>&5 | grep "^$me: hard error: foo"  || exit 1
+(framework_failure_ foo); test $? -eq 99               || exit 1
 (framework_failure_ foo) 2>&1 1>&5 \
-  | grep "^$me: set-up failure: foo"                   || Exit 1
+  | grep "^$me: set-up failure: foo"                   || exit 1
 
 stderr_fileno_=6
 
-(warn_ foobar) 6>&1 1>&5 | grep '^foobar$'             || Exit 1
-(fail_ foo); test $? -eq 1                             || Exit 1
-(fail_ foo) 6>&1 1>&5 | grep "^$me: failed test: foo"  || Exit 1
-(skip_ foo); test $? -eq 77                            || Exit 1
-(skip_ foo) 6>&1 1>&5 | grep "^$me: skipped test: foo" || Exit 1
-(fatal_ foo); test $? -eq 99                           || Exit 1
-(fatal_ foo) 6>&1 1>&5 | grep "^$me: hard error: foo"  || Exit 1
-(framework_failure_ foo); test $? -eq 99               || Exit 1
+(warn_ foobar) 6>&1 1>&5 | grep '^foobar$'             || exit 1
+(fail_ foo); test $? -eq 1                             || exit 1
+(fail_ foo) 6>&1 1>&5 | grep "^$me: failed test: foo"  || exit 1
+(skip_ foo); test $? -eq 77                            || exit 1
+(skip_ foo) 6>&1 1>&5 | grep "^$me: skipped test: foo" || exit 1
+(fatal_ foo); test $? -eq 99                           || exit 1
+(fatal_ foo) 6>&1 1>&5 | grep "^$me: hard error: foo"  || exit 1
+(framework_failure_ foo); test $? -eq 99               || exit 1
 (framework_failure_ foo) 6>&1 1>&5 \
-  | grep "^$me: set-up failure: foo"                   || Exit 1
+  | grep "^$me: set-up failure: foo"                   || exit 1
 
 :