Merge branch 'micro' into maint

[platform/upstream/automake.git] / t / cscope.tap

diff --git a/t/cscope.tap b/t/cscope.tap
old mode 100755 (executable)
new mode 100644 (file)
index c39feed..c39a9b6
--- a/t/cscope.tap
+++ b/t/cscope.tap
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 2009-2012 Free Software Foundation, Inc.
+# Copyright (C) 2009-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,14 +16,16 @@
 
 # Test cscope functionality.
 
-. ./defs || Exit 1
+. test-init.sh
 
 plan_ 18
 
-ocwd=`pwd` || fatal_ "getting top-level directory"
+ocwd=$(pwd) || fatal_ "getting top-level directory"
 
-cat >> configure.ac << 'END'
-AC_CONFIG_FILES([sub/Makefile])
+cat > configure.ac << 'END'
+AC_INIT([cscope-test], [1.0])
+AM_INIT_AUTOMAKE([subdir-objects])
+AC_CONFIG_FILES([Makefile sub/Makefile])
 AC_SUBST([CC],  [who-cares])
 AC_SUBST([CXX], [who-cares])
 AC_SUBST([FC],  [who-cares])
@@ -65,8 +67,9 @@ $ACLOCAL || fatal_ "aclocal failed"
 $AUTOCONF || fatal_ "autoconf failed"
 $AUTOMAKE -i -a || fatal_ "automake -i -a failed"
 
-# Sun cscope is interactive without redirection.
-if cscope --version </dev/null; then
+# Sun cscope is interactive without redirection; also, it might not
+# support the '-q' option, which is required by our generated recipes.
+if cscope -q --version </dev/null; then
   have_cscope=yes
 else
   have_cscope=no
@@ -82,10 +85,10 @@ test_cleanup ()
     # VPATH build.
     $MAKE distcleancheck
   fi \
-    && test ! -f cscope.files \
-    && test ! -f cscope.out \
-    && test ! -f cscope.in.out \
-    && test ! -f cscope.po.out \
+    && test ! -e cscope.files \
+    && test ! -e cscope.out \
+    && test ! -e cscope.in.out \
+    && test ! -e cscope.po.out \
     || r='not ok'
   result_ "$r" "[$pfx] make distcheck"
 }
@@ -99,13 +102,12 @@ test_cscope ()
   if test $have_cscope = no; then
     # For later tests.
     touch cscope.files cscope.out cscope.in.out cscope.po.out
-    skip_row_ 3 -r "no cscope program avaiable"
+    skip_row_ 3 -r "no proper cscope program available"
     return 0
   fi
 
   r=ok
-  $MAKE cscope 2>stderr || r='not ok'
-  cat stderr >&2
+  run_make -E cscope || r='not ok'
   grep 'cannot find file' stderr && r='not ok'
   rm -f stderr
   result_ "$r" "[$pfx] make cscope"
@@ -155,7 +157,7 @@ if using_gmake; then
 
 else
 
-  skip_row_ 12 -r "cscope in VPATH required GNU make"
+  skip_row_ 12 -r "cscope in VPATH requires GNU make"
 
 fi