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

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

diff --git a/t/lisp7.sh b/t/lisp7.sh
old mode 100755 (executable)
new mode 100644 (file)
index 79799d1..b58059b
--- a/t/lisp7.sh
+++ b/t/lisp7.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2005-2012 Free Software Foundation, Inc.
+# Copyright (C) 2005-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
@@ -16,7 +16,7 @@
 
 # Make sure that lisp_LISP also works when emacs is not installed.
 
-. ./defs || Exit 1
+. test-init.sh
 
 cat > Makefile.am << 'EOF'
 dist_lisp_LISP = am-one.el am-two.el am-three.el
@@ -37,14 +37,10 @@ $AUTOCONF
 $AUTOMAKE --add-missing
 ./configure
 
-$MAKE >stdout || { cat stdout; Exit 1; }
-cat stdout
-test 1 -eq `grep 'Warnings can be ignored' stdout | wc -l`
-
-test ! -f am-one.elc
-test ! -f am-two.elc
-test ! -f am-three.elc
-test -f elc-stamp
+run_make -O
+test ! -e am-one.elc
+test ! -e am-two.elc
+test ! -e am-three.elc
 
 $MAKE distcheck