summaryrefslogtreecommitdiff
path: root/tool
diff options
context:
space:
mode:
authornobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-21 03:14:05 (GMT)
committernobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2016-04-21 03:14:05 (GMT)
commit6e8a14dce1d15b13dc008bf9e0c3edf8adab486f (patch)
treecc3aba531a5440f59cffdfd47be5788409c3e8d9 /tool
parent20cd25c86fd28eb1b5068d0db607e6aa33107f65 (diff)
ifchange: ignore unmatch TEST_COLORS
* configure.in: check if succeeded in creating config.h. * tool/ifchange: ignore failures when TEST_COLORS unmatched. just use the default value if expected name is not contained in it. [ruby-core:75046] [Bug #12303] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54657 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'tool')
-rwxr-xr-xtool/ifchange6
1 files changed, 3 insertions, 3 deletions
diff --git a/tool/ifchange b/tool/ifchange
index 7779b28..08aaba5 100755
--- a/tool/ifchange
+++ b/tool/ifchange
@@ -40,7 +40,7 @@ target="$1"
temp="$2"
if [ "$temp" = - ]; then
temp="tmpdata$$.tmp~"
- cat > "$temp" || exit $?
+ cat > "$temp"
trap 'rm -f "$temp"' 0
fi
@@ -50,8 +50,8 @@ if [ "$color" = always -o \( "$color" = auto -a -t 1 \) ]; then
case "`tput smso 2>/dev/null`" in
"$msg_begin"*m)
if [ ${TEST_COLORS:+set} ]; then
- msg_unchanged=`expr ":$TEST_COLORS:" : ".*:pass=\([^:]*\):"`
- msg_updated=`expr ":$TEST_COLORS:" : ".*:fail=\([^:]*\):"`
+ msg_unchanged=`expr ":$TEST_COLORS:" : ".*:pass=\([^:]*\):"` || :
+ msg_updated=`expr ":$TEST_COLORS:" : ".*:fail=\([^:]*\):"` || :
fi
msg_unchanged="${msg_begin}${msg_unchanged:-32;1}m"
msg_updated="${msg_begin}${msg_updated:-31;1}m"