projects
/
platform
/
upstream
/
automake.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
tests: fix spurious failure due to localization issues
[platform/upstream/automake.git]
/
t
/
cond5.sh
diff --git
a/t/cond5.sh
b/t/cond5.sh
old mode 100755
(executable)
new mode 100644
(file)
index
3961303
..
ee9d132
--- a/
t/cond5.sh
+++ b/
t/cond5.sh
@@
-1,5
+1,5
@@
#! /bin/sh
#! /bin/sh
-# Copyright (C) 1998-201
2
Free Software Foundation, Inc.
+# Copyright (C) 1998-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,7
+16,7
@@
# Yet another sources-in-conditional test. Report from Tim Goodwin.
# Yet another sources-in-conditional test. Report from Tim Goodwin.
-.
./defs || Exit 1
+.
test-init.sh
cat >> configure.ac << 'END'
AC_PROG_CC
cat >> configure.ac << 'END'
AC_PROG_CC
@@
-45,8
+45,8
@@
$ACLOCAL
$AUTOMAKE 2>stderr &
pid=$!
$AUTOMAKE 2>stderr &
pid=$!
-# MSYS bash seems to have a bug in kill, so don't try to kill too soon
;
-#
and avoid maintainer-check test
.
+# MSYS bash seems to have a bug in kill, so don't try to kill too soon
.
+#
The extra quoting avoids a maintainer-check failure
.
sleep '2'
# Make at most 30 tries, one every 10 seconds (= 300 seconds = 5 min).
sleep '2'
# Make at most 30 tries, one every 10 seconds (= 300 seconds = 5 min).
@@
-55,15
+55,15
@@
while test $try -le 30; do
if kill -0 $pid; then
: process $pid is still alive, wait and retry
sleep '10'
if kill -0 $pid; then
: process $pid is still alive, wait and retry
sleep '10'
- try=
`expr $try + 1`
+ try=
$(($try + 1))
else
cat stderr >&2
# Automake must fail with a proper error message.
grep 'variable.*OPT_SRC.*recursively defined' stderr
else
cat stderr >&2
# Automake must fail with a proper error message.
grep 'variable.*OPT_SRC.*recursively defined' stderr
-
E
xit 0
+
e
xit 0
fi
done
# The automake process probably hung. Kill it, and exit with failure.
echo "$me: Automake process $pid hung"
kill $pid
fi
done
# The automake process probably hung. Kill it, and exit with failure.
echo "$me: Automake process $pid hung"
kill $pid
-
E
xit 1
+
e
xit 1