Skip to content

Commit 3b33f07

Browse files
committed
JT: Fix the exit status of raw_sh
PullRequest: truffleruby/556
2 parents df10d7a + d14b33d commit 3b33f07

File tree

4 files changed

+8
-6
lines changed

4 files changed

+8
-6
lines changed

lib/truffle/strscan.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -39,7 +39,7 @@ class ScanError < StandardError
3939
end
4040

4141
class StringScanner
42-
42+
4343
Id = 'None$Id'.freeze
4444
Version = '1.0.0'.freeze
4545

@@ -321,7 +321,7 @@ def scan_internal(pattern, advance_pos, getstr, headonly)
321321
# onwards, even if headonly is set. Instead, remove the ^. This could
322322
# possibly be fixed in Joni instead, or maybe there is already some option
323323
# we're not using.
324-
324+
325325
if pattern.source[0] == '^' && pos > 0
326326
pattern = Regexp.new(pattern.source[1..-1])
327327
headonly = true

test/truffle/cexts/msgpack/msgpack.sh

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,12 @@ jt gem-test-pack
77
ruby_home="$PWD"
88
export PATH="$ruby_home/bin:$PATH"
99

10-
# gem install "$(jt gem-test-pack)/gem-cache/bundler-1.16.5.gem" --local
10+
gem install "$(jt gem-test-pack)/gem-cache/bundler-1.16.5.gem" --local --no-document
1111

1212
cd "$(jt gem-test-pack)/gem-testing/msgpack-ruby"
1313

14+
bundle config --local cache_path ./gem-cache
15+
1416
bundle install --local --no-cache
1517
bundle exec rake compile
1618
bundle exec rake spec

test/truffle/ecosystem/blog.sh

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ function truffleruby {
2828
set -xe
2929

3030
jt gem-test-pack
31-
truffleruby gem install truffleruby-gem-test-pack/gem-cache/bundler-1.16.5.gem --local
31+
truffleruby gem install truffleruby-gem-test-pack/gem-cache/bundler-1.16.5.gem --local --no-document
3232

3333
# backup bin/rake, which gets overwritten
3434
cp bin/rake bin/rake-original

tool/jt.rb

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
MRI_TEST_CEXT_LIB_DIR = "#{TRUFFLERUBY_DIR}/.ext/c"
2626
PROFILES_DIR = "#{TRUFFLERUBY_DIR}/profiles"
2727

28-
TRUFFLERUBY_GEM_TEST_PACK_VERSION = "af03b9fbb684624095de928f2b6238db26544052"
28+
TRUFFLERUBY_GEM_TEST_PACK_VERSION = "8b57f6022f0fa17ace7c8d2a3af730357715e0a2"
2929

3030
JDEBUG_PORT = 51819
3131
JDEBUG = "-J-agentlib:jdwp=transport=dt_socket,server=y,address=#{JDEBUG_PORT},suspend=y"
@@ -384,7 +384,7 @@ def raw_sh(*args)
384384
else
385385
$stderr.puts "FAILED (#{status}): #{printable_cmd(args)}"
386386
$stderr.puts out if capture
387-
exit status.to_i
387+
exit(status.exitstatus || status.termsig || status.stopsig || 1)
388388
end
389389
end
390390

0 commit comments

Comments
 (0)