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

[platform/upstream/automake.git] / t / cond39.sh

diff --git a/t/cond39.sh b/t/cond39.sh
old mode 100755 (executable)
new mode 100644 (file)
index 840b8b8..819b014
--- a/t/cond39.sh
+++ b/t/cond39.sh
@@ -1,5 +1,5 @@
 #!/bin/sh
-# Copyright (C) 2008-2012 Free Software Foundation, Inc.
+# Copyright (C) 2008-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
@@ -17,7 +17,7 @@
 # Build either as CONFIG_FILE or as PROGRAM.
 
 required=cc
-. ./defs || Exit 1
+. test-init.sh
 
 mkdir sub
 
@@ -78,24 +78,22 @@ $AUTOCONF
 $AUTOMAKE --add-missing
 
 ./configure COND=true
-$MAKE 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'overriding commands' stderr && Exit 1
+run_make -E
+grep 'overriding commands' stderr && exit 1
 $MAKE sure-exist
-./prog1 && Exit 1
-./sub/prog2 && Exit 1
+./prog1 && exit 1
+./sub/prog2 && exit 1
 $MAKE clean
 $MAKE sure-not-exist
 $MAKE
 $MAKE sure-exist
-./prog1 && Exit 1
-./sub/prog2 && Exit 1
+./prog1 && exit 1
+./sub/prog2 && exit 1
 $MAKE distclean
 
 ./configure COND=false
-$MAKE 2>stderr || { cat stderr >&2; Exit 1; }
-cat stderr >&2
-grep 'overriding commands' stderr && Exit 1
+run_make -E
+grep 'overriding commands' stderr && exit 1
 ./prog1
 ./sub/prog2
 $MAKE clean