kotovalexarian-likes-github/ruby--ruby
1
0
Fork 0
mirror of https://github.com/ruby/ruby.git synced 2022-11-09 12:17:21 -05:00
Code Releases Activity

ifchange: ignore unmatch TEST_COLORS

Browse source 
* 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
This commit is contained in:
nobu 2016-04-21 03:14:05 +00:00
parent 20cd25c86f
commit 6e8a14dce1
3 changed files with 12 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

8
ChangeLog
View file

@ -1,3 +1,11 @@
Thu Apr 21 12:14:04 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* 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]
Wed Apr 20 17:33:31 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> Wed Apr 20 17:33:31 2016 Nobuyoshi Nakada <nobu@ruby-lang.org>
* ext/cgi/escape/escape.c (cgiesc_unescape): define unescape * ext/cgi/escape/escape.c (cgiesc_unescape): define unescape

2
configure.in
View file

@ -4461,7 +4461,7 @@ guard=INCLUDE_RUBY_CONFIG_H
( (
if test "x$CONFIGURE_TTY" = xyes; then color=--color; else color=; fi if test "x$CONFIGURE_TTY" = xyes; then color=--color; else color=; fi
exec ${srcdir}/tool/ifchange $color "${config_h}" - exec ${srcdir}/tool/ifchange $color "${config_h}" -
) ) || AC_MSG_ERROR([faild to create ${config_h}])
tr -d '\015' < largefile.h > confdefs.h tr -d '\015' < largefile.h > confdefs.h
rm largefile.h rm largefile.h

6
tool/ifchange
View file

@ -40,7 +40,7 @@ target="$1"
temp="$2" temp="$2"
if [ "$temp" = - ]; then if [ "$temp" = - ]; then
temp="tmpdata$$.tmp~" temp="tmpdata$$.tmp~"
cat > "$temp" || exit $? cat > "$temp"
trap 'rm -f "$temp"' 0 trap 'rm -f "$temp"' 0
fi fi
@ -50,8 +50,8 @@ if [ "$color" = always -o \( "$color" = auto -a -t 1 \) ]; then
case "`tput smso 2>/dev/null`" in case "`tput smso 2>/dev/null`" in
"$msg_begin"*m) "$msg_begin"*m)
if [ ${TEST_COLORS:+set} ]; then if [ ${TEST_COLORS:+set} ]; then
msg_unchanged=`expr ":$TEST_COLORS:" : ".*:pass=\([^:]*\):"` msg_unchanged=`expr ":$TEST_COLORS:" : ".*:pass=\([^:]*\):"` || :
msg_updated=`expr ":$TEST_COLORS:" : ".*:fail=\([^:]*\):"` msg_updated=`expr ":$TEST_COLORS:" : ".*:fail=\([^:]*\):"` || :
fi fi
msg_unchanged="${msg_begin}${msg_unchanged:-32;1}m" msg_unchanged="${msg_begin}${msg_unchanged:-32;1}m"
msg_updated="${msg_begin}${msg_updated:-31;1}m" msg_updated="${msg_begin}${msg_updated:-31;1}m"