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

[platform/upstream/automake.git] / t / test-driver-custom-no-extra-driver.sh

diff --git a/t/test-driver-custom-no-extra-driver.sh b/t/test-driver-custom-no-extra-driver.sh
old mode 100755 (executable)
new mode 100644 (file)
index 4d7367d..b6b4034
--- a/t/test-driver-custom-no-extra-driver.sh
+++ b/t/test-driver-custom-no-extra-driver.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,7 +18,7 @@
 # installed or referenced if it's not used, i.e., if the user has
 # defined his own '*LOG_DRIVER' variables.
 
-. ./defs || Exit 1
+. test-init.sh
 
 cat >> configure.ac <<'END'
 AC_PROG_CC
@@ -55,8 +55,8 @@ $ACLOCAL
 
 for opts in '' '--add-missing' '-a -c'; do
   $AUTOMAKE $opts
-  $FGREP test-driver Makefile.in sub[12]/Makefile.in && Exit 1
-  find . | $FGREP test-driver && Exit 1
+  $FGREP test-driver Makefile.in sub[12]/Makefile.in && exit 1
+  find . | $FGREP test-driver && exit 1
   : For shells with busted 'set -e'.
 done