projects
/
platform
/
upstream
/
automake.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
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
d57b2a8
..
c39a9b6
--- a/
t/cscope.tap
+++ b/
t/cscope.tap
@@
-1,5
+1,5
@@
#! /bin/sh
#! /bin/sh
-# Copyright (C) 2009-201
2
Free Software Foundation, Inc.
+# Copyright (C) 2009-201
3
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
#
# 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.
# Test cscope functionality.
-.
./defs || exit 1
+.
test-init.sh
plan_ 18
ocwd=$(pwd) || fatal_ "getting top-level directory"
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])
AC_SUBST([CC], [who-cares])
AC_SUBST([CXX], [who-cares])
AC_SUBST([FC], [who-cares])
@@
-105,8
+107,7
@@
test_cscope ()
fi
r=ok
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"
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
else
- skip_row_ 12 -r "cscope in VPATH require
d
GNU make"
+ skip_row_ 12 -r "cscope in VPATH require
s
GNU make"
fi
fi