X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=t%2Fcscope.tap;h=c39a9b6ddbccc9d774b77d9f25e6247da785a792;hb=6febcd41b3dcf99a89aaf21329c00fdadcd68771;hp=f1f0c4e7c9798a33aea9e02828d51ab4654fe232;hpb=ebc92e19939b215d76804fde2e51a5850bcf23a0;p=platform%2Fupstream%2Fautomake.git

diff --git a/t/cscope.tap b/t/cscope.tap
old mode 100755
new mode 100644
index f1f0c4e..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"
 
-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])
@@ -83,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"
 }
@@ -105,8 +107,7 @@ test_cscope ()
   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"
@@ -156,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