am-ft: make the environment available earlier

[platform/upstream/automake.git] / t / yacc-cxx.sh

diff --git a/t/yacc-cxx.sh b/t/yacc-cxx.sh
old mode 100755 (executable)
new mode 100644 (file)
index 94e5dad..6e832af
--- a/t/yacc-cxx.sh
+++ b/t/yacc-cxx.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
@@ -16,10 +16,10 @@
 
 # Basic semantic checks on Yacc + C++ support (when yacc-generated
 # headers are not involved).
-# Keep in sync with sister test 'yacc-basic.test'.
+# Keep in sync with sister test 'yacc-basic.sh'.
 
 required='c++ yacc'
-. ./defs || Exit 1
+. test-init.sh
 
 cat >> configure.ac << 'END'
 AC_PROG_CXX
@@ -92,7 +92,7 @@ test -f foo4-parse4.output
 if ! cross_compiling; then
   for i in 1 2 3 4; do
     echo a | ./foo$i
-    echo b | ./foo$i && Exit 1
+    echo b | ./foo$i && exit 1
     : For shells with busted 'set -e'.
   done
 fi
@@ -132,9 +132,9 @@ test -f foo4-parse4.cpp
 ./configure # Re-create 'Makefile'.
 $MAKE maintainer-clean
 ls -l
-test ! -f parse1.cc
-test ! -f parse2.c++
-test ! -f foo3-parse3.cxx
-test ! -f foo4-parse4.cpp
+test ! -e parse1.cc
+test ! -e parse2.c++
+test ! -e foo3-parse3.cxx
+test ! -e foo4-parse4.cpp
 
 :