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
/
tap-global-log.sh
diff --git
a/t/tap-global-log.sh
b/t/tap-global-log.sh
old mode 100755
(executable)
new mode 100644
(file)
index
29e582c
..
b303b4a
--- a/
t/tap-global-log.sh
+++ b/
t/tap-global-log.sh
@@
-1,5
+1,5
@@
#! /bin/sh
#! /bin/sh
-# Copyright (C) 2011-201
2
Free Software Foundation, Inc.
+# Copyright (C) 2011-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
@@
-17,9
+17,9
@@
# TAP support:
# - which log files get copied in the global log?
# TAP support:
# - which log files get copied in the global log?
-.
./defs || Exit 1
+.
test-init.sh
-.
"$am_testauxdir"/tap-setup.sh || fatal_ "sourcing tap-setup.sh"
+.
tap-setup.sh
cat > ok.test << 'END'
1..5
cat > ok.test << 'END'
1..5
@@
-101,11
+101,10
@@
cat > skipall.test << 'END'
1..0 # SKIP all
END
1..0 # SKIP all
END
-# We don't care about the exit status of "make check" here.
-TESTS="`echo *.test`" $MAKE -e check || :
+run_make -e IGNORE TESTS="$(echo *.test)" check
cat test-suite.log
cat test-suite.log
-grep ':.*ok|not seen' test-suite.log &&
E
xit 1
+grep ':.*ok|not seen' test-suite.log &&
e
xit 1
for s in skip todo fail xpass bail error; do
$FGREP "::$s::" test-suite.log
for s in skip todo fail xpass bail error; do
$FGREP "::$s::" test-suite.log
@@
-113,9
+112,11
@@
done
grep '^1\.\.0 # SKIP all$' test-suite.log
grep '^1\.\.0 # SKIP all$' test-suite.log
-case `cat test-suite.log` in
- *"`cat hodgepodge`"*) ;;
- *) Exit 1;;
+test_suite_contents=$(cat test-suite.log)
+hodgepodge_contents=$(cat hodgepodge)
+case $test_suite_contents in
+ *"$hodgepodge_contents"*) ;;
+ *) exit 1;;
esac
:
esac
: