From 9244cfa1f6fcc5c97a2518b33230d1806409d70b Mon Sep 17 00:00:00 2001 From: nobu Date: Thu, 1 Mar 2018 03:26:05 +0000 Subject: [PATCH] tool/bisect.sh: extracted build part [ci skip] git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@62619 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- tool/bisect.sh | 29 +++++++++++++++++------------ 1 file changed, 17 insertions(+), 12 deletions(-) diff --git a/tool/bisect.sh b/tool/bisect.sh index b7cad3322d..0a2d6b0ba9 100755 --- a/tool/bisect.sh +++ b/tool/bisect.sh @@ -21,25 +21,30 @@ case $1 in exec git bisect run "$path" "run-$1" ;; run-miniruby ) - cd "${0%/*}" || exit 125 # assume a copy of this script is in builddir - $MAKE srcs || exit 125 - $MAKE Makefile || exit 125 - $MAKE mini || exit 125 - $MAKE run || exit 1 + prep=mini + run=run ;; run-ruby ) - cd "${0%/*}" || exit 125 # assume a copy of this script is in builddir - $MAKE srcs || exit 125 - $MAKE Makefile || exit 125 - $MAKE program || exit 125 - $MAKE runruby || exit 1 + prep=program + run=runruby ;; "" ) - echo foo bar + echo missing command 1>&2 + exit 1 ;; * ) echo unknown command "'$1'" 1>&2 exit 1 ;; esac -exit 0 + +case "$0" in +*/*) + # assume a copy of this script is in builddir + cd `echo "$0" | sed 's:\(.*\)/.*:\1:'` || exit 125 + ;; +esac +for target in srcs Makefile $prep; do + $MAKE $target || exit 125 +done +exec $MAKE $run