nobu	2016-04-21 12:14:05 +0900 (Thu, 21 Apr 2016)

  New Revision: 54657

  https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54657

  Log:
    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]

  Modified files:
    trunk/ChangeLog
    trunk/configure.in
    trunk/tool/ifchange
Index: tool/ifchange
===================================================================
--- tool/ifchange	(revision 54656)
+++ tool/ifchange	(revision 54657)
@@ -40,7 +40,7 @@ target="$1" https://github.com/ruby/ruby/blob/trunk/tool/ifchange#L40
 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" = https://github.com/ruby/ruby/blob/trunk/tool/ifchange#L50
     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"
Index: configure.in
===================================================================
--- configure.in	(revision 54656)
+++ configure.in	(revision 54657)
@@ -4461,7 +4461,7 @@ guard=INCLUDE_RUBY_CONFIG_H https://github.com/ruby/ruby/blob/trunk/configure.in#L4461
 (
   if test "x$CONFIGURE_TTY" = xyes; then color=--color; else color=; fi
   exec ${srcdir}/tool/ifchange $color "${config_h}" -
-)
+) || AC_MSG_ERROR([faild to create ${config_h}])
 tr -d '\015' < largefile.h > confdefs.h
 rm largefile.h
 
Index: ChangeLog
===================================================================
--- ChangeLog	(revision 54656)
+++ ChangeLog	(revision 54657)
@@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1
+Thu Apr 21 12:14:04 2016  Nobuyoshi Nakada  <nobu@r...>
+
+	* 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@r...>
 
 	* ext/cgi/escape/escape.c (cgiesc_unescape): define unescape

--
ML: ruby-changes@q...
Info: http://www.atdot.net/~ko1/quickml/