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

ruby-changes:55971

From: Takashi <ko1@a...>
Date: Mon, 3 Jun 2019 22:01:40 +0900 (JST)
Subject: [ruby-changes:55971] Takashi Kokubun: 928377d2c5 (trunk): Revert "common.mk: allow brace expansion for benchmark targets"

https://git.ruby-lang.org/ruby.git/commit/?id=928377d2c5

From 928377d2c5153333445d58710534b471042ffb46 Mon Sep 17 00:00:00 2001
From: Takashi Kokubun <takashikkbn@g...>
Date: Mon, 3 Jun 2019 22:00:14 +0900
Subject: Revert "common.mk: allow brace expansion for benchmark targets"

This reverts commit 4c0e21add7c87b70df27fbff81d8f192a467556d
because we're not using /bin/bash.

See 11d3986d6557eb3cfcecbdd0ef6e21b18c7c960b and
1b2b0e1f244b3e71812fa9859e8b87150ea30434 to know its context.
In short, 4c0e21add7c87b70df27fbff81d8f192a467556d does not work on
Ubuntu.

diff --git a/common.mk b/common.mk
index 58520a3..c94d8c6 100755
--- a/common.mk
+++ b/common.mk
@@ -1165,7 +1165,7 @@ bisect-ruby: PHONY https://github.com/ruby/ruby/blob/trunk/common.mk#L1165
 COMPARE_RUBY = $(BASERUBY)
 BENCH_RUBY = $(RUNRUBY)
 ITEM =
-ARGS = $$(ls $(srcdir)/benchmark/*$(ITEM)*.{yml,rb} 2>/dev/null)
+ARGS = $$(find $(srcdir)/benchmark -maxdepth 1 -name '*$(ITEM)*.yml' -o -name '*$(ITEM)*.rb' | sort)
 OPTS =
 
 # You can pass several options through OPTS environment variable.
-- 
cgit v0.10.2


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

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