[前][次][番号順一覧][スレッド一覧]

ruby-changes:44288

From: nobu <ko1@a...>
Date: Thu, 6 Oct 2016 14:47:00 +0900 (JST)
Subject: [ruby-changes:44288] nobu:r56361 (trunk): bisect.sh: improve

nobu	2016-10-06 14:46:55 +0900 (Thu, 06 Oct 2016)

  New Revision: 56361

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

  Log:
    bisect.sh: improve
    
    * tool/bisect.sh: make srcs before building.
    
    * tool/bisect.sh: quote expansions.
    
    * tool/bisect.sh: skip build if chdir and Makefile failed.
    
    * tool/bisect.sh: fail at unknown command.

  Modified files:
    trunk/tool/bisect.sh
Index: tool/bisect.sh
===================================================================
--- tool/bisect.sh	(revision 56360)
+++ tool/bisect.sh	(revision 56361)
@@ -11,24 +11,26 @@ fi https://github.com/ruby/ruby/blob/trunk/tool/bisect.sh#L11
 
 case $1 in
   miniruby | ruby ) # (miniruby|ruby) <srcdir>
-    srcdir=$2
+    srcdir="$2"
     builddir=`pwd` # assume pwd is builddir
-    path=$builddir/_bisect.sh
+    path="$builddir/_bisect.sh"
     echo "path: $path"
-    cp $0 $path
-    cd $srcdir
-    echo "git bisect run $path run-$1"
-    git bisect run $path run-$1
+    cp "$0" "$path"
+    cd "$srcdir"
+    set -x
+    exec git bisect run "$path" "run-$1"
     ;;
   run-miniruby )
-    cd ${0%/*} # assume a copy of this script is in builddir
-    $MAKE Makefile
+    $MAKE srcs || exit 125
+    cd "${0%/*}" || exit 125 # assume a copy of this script is in builddir
+    $MAKE Makefile || exit 125
     $MAKE mini || exit 125
     $MAKE run || exit 1
     ;;
   run-ruby )
-    cd ${0%/*} # assume a copy of this script is in builddir
-    $MAKE Makefile
+    $MAKE srcs || exit 125
+    cd "${0%/*}" || exit 125 # assume a copy of this script is in builddir
+    $MAKE Makefile || exit 125
     $MAKE program || exit 125
     $MAKE runruby || exit 1
     ;;
@@ -36,7 +38,8 @@ case $1 in https://github.com/ruby/ruby/blob/trunk/tool/bisect.sh#L38
     echo foo bar
     ;;
   * )
-    echo unknown command "'$cmd'"
+    echo unknown command "'$cmd'" 1>&2
+    exit 1
     ;;
 esac
 exit 0

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

[前][次][番号順一覧][スレッド一覧]