am-ft: make the environment available earlier

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

diff --git a/t/lisp3.sh b/t/lisp3.sh
old mode 100755 (executable)
new mode 100644 (file)
index a1531d3..63e8622
--- a/t/lisp3.sh
+++ b/t/lisp3.sh
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2003-2012 Free Software Foundation, Inc.
+# Copyright (C) 2003-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 @@
 # Test that compiling interdependent elisp files works.
 
 required=emacs
-. ./defs || Exit 1
+. test-init.sh
 
 cat > Makefile.am << 'EOF'
 lisp_LISP = am-one.el am-two.el am-three.el
@@ -40,14 +40,13 @@ $ACLOCAL
 $AUTOCONF
 $AUTOMAKE --add-missing
 
-./configure --prefix="`pwd`/_inst"
+./configure --prefix="$(pwd)/_inst"
 
 $MAKE
 
 test -f am-one.elc
 test -f am-two.elc
 test -f am-three.elc
-test -f elc-stamp
 
 # Make sure we can recover from a deletion.
 rm -f am-one.elc
@@ -63,7 +62,7 @@ find _inst # For debugging.
 # Keep thin in sync with m4/lispdir.m4.
 for dir in lib/emacs lib/xemacs share/emacs share/xemacs :; do
   if test $dir = :; then
-    Exit 1
+    exit 1
   elif test -d _inst/$dir/site-lisp; then
     break
   fi
@@ -77,16 +76,7 @@ test -f _inst/$dir/site-lisp/am-three.el
 test -f _inst/$dir/site-lisp/am-three.elc
 
 $MAKE uninstall
-find _inst | $EGREP '\.elc?$' && Exit 1
-
-# Make sure we build all files when any of them change.
-# (We grep a message to make sure the compilation happens.)
-unique=0a3346e2af8a689b85002b53df09142a
-$sleep
-echo "(message \"$unique\")(provide 'am-three)" > am-three.el
-$MAKE >output 2>&1 || { cat output; Exit 1; }
-cat output
-grep $unique output
+find _inst | $EGREP '\.elc?$' && exit 1
 
 # It should also work for VPATH-builds.
 $MAKE distcheck