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 'maint'
[platform/upstream/automake.git]
/
t
/
ax
/
tap-summary-aux.sh
diff --git
a/t/ax/tap-summary-aux.sh
b/t/ax/tap-summary-aux.sh
index
f5d1fbd
..
8f38e53
100644
(file)
--- a/
t/ax/tap-summary-aux.sh
+++ b/
t/ax/tap-summary-aux.sh
@@
-29,7
+29,7
@@
fetch_tap_driver
cat > configure.ac <<END
AC_INIT([GNU AutoTAP], [5.12], [bug-automake@gnu.org])
cat > configure.ac <<END
AC_INIT([GNU AutoTAP], [5.12], [bug-automake@gnu.org])
-AM_INIT_AUTOMAKE
([parallel-tests])
+AM_INIT_AUTOMAKE
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
END
AC_CONFIG_FILES([Makefile])
AC_OUTPUT
END
@@
-82,13
+82,13
@@
do_check ()
}
if test $use_colors = yes; then
}
if test $use_colors = yes; then
- red=
'
\e
[0;31m'
- grn=
'
\e
[0;32m'
- lgn=
'
\e
[1;32m'
- blu=
'
\e
[1;34m'
- mgn=
'
\e
[0;35m'
- brg=
'
\e
[1m'
- std=
'
\e
[m'
+ red=
"$esc[0;31m"
+ grn=
"$esc[0;32m"
+ lgn=
"$esc[1;32m"
+ blu=
"$esc[1;34m"
+ mgn=
"$esc[0;35m"
+ brg=
"$esc[1m"
+ std=
"$esc[m"
echo AUTOMAKE_OPTIONS = color-tests >> Makefile.am
else
red= grn= lgn= blu= mgn= brg= std=
echo AUTOMAKE_OPTIONS = color-tests >> Makefile.am
else
red= grn= lgn= blu= mgn= brg= std=
@@
-311,7
+311,7
@@
done > tap
# Lots of non-failures (300 per kind).
(cat tap && cat tap && cat tap) > all.test
# Lots of non-failures (300 per kind).
(cat tap && cat tap && cat tap) > all.test
-test
`wc -l <all.test`
-eq 900 || Exit 99 # Sanity check.
+test
$(wc -l <all.test)
-eq 900 || Exit 99 # Sanity check.
echo 1..900 >> all.test # Test plan.
do_check --pass <<END
$success_header
echo 1..900 >> all.test # Test plan.
do_check --pass <<END
$success_header
@@
-327,7
+327,7
@@
END
# 1 failure and lots of non-failures means failure.
(cat tap && echo "not ok" && cat tap) > all.test
# 1 failure and lots of non-failures means failure.
(cat tap && echo "not ok" && cat tap) > all.test
-test
`wc -l <all.test`
-eq 601 || Exit 99 # Sanity check.
+test
$(wc -l <all.test)
-eq 601 || Exit 99 # Sanity check.
echo 1..601 >> all.test # Test plan.
do_check --fail <<END
$failure_header
echo 1..601 >> all.test # Test plan.
do_check --fail <<END
$failure_header
@@
-343,7
+343,7
@@
END
# 1 error and lots of non-failures means failure.
(cat tap && sed 30q tap && echo 'Bail out!') > all.test
# 1 error and lots of non-failures means failure.
(cat tap && sed 30q tap && echo 'Bail out!') > all.test
-test
`wc -l <all.test`
-eq 331 || Exit 99 # Sanity check.
+test
$(wc -l <all.test)
-eq 331 || Exit 99 # Sanity check.
echo 1..331 >> all.test # Test plan.
do_check --fail <<END
$failure_header
echo 1..331 >> all.test # Test plan.
do_check --fail <<END
$failure_header