Skip to content

Commit a4e4957

Browse files
committed
Update JVMCI to 0.57
PullRequest: truffleruby/730
2 parents e3fe72e + 29804ac commit a4e4957

File tree

5 files changed

+18
-18
lines changed

5 files changed

+18
-18
lines changed

ci.jsonnet

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -291,7 +291,7 @@ local part_definitions = {
291291
downloads+: {
292292
JAVA_HOME: {
293293
name: "labsjdk",
294-
version: "8u202-jvmci-0.55",
294+
version: "8u202-jvmci-0.57",
295295
platformspecific: true,
296296
},
297297
},
@@ -305,7 +305,7 @@ local part_definitions = {
305305
downloads+: {
306306
JAVA_HOME: {
307307
name: "openjdk",
308-
version: "8u202-jvmci-0.55",
308+
version: "8u202-jvmci-0.57",
309309
platformspecific: true,
310310
},
311311
},
@@ -396,17 +396,13 @@ local part_definitions = {
396396
},
397397

398398
lint: {
399-
downloads+: {
400-
JDT: { name: "ecj", version: "4.5.1", platformspecific: false },
401-
},
402399
packages+: {
403400
ruby: ">=2.1.0",
404401
},
405402
run+: [
406-
# Build with ECJ to get warnings
407403
["mx", "sversions"],
408404
] + self.before_build + [
409-
["mx", "build", "--jdt", "$JDT", "--warning-as-error", "--force-deprecation-as-warning"],
405+
["mx", "build", "--warning-as-error", "--force-deprecation-as-warning"],
410406
] + jt(["lint"]) + self.after_build,
411407
},
412408

mx.truffleruby/suite.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
"name": "tools",
1010
"subdir": True,
1111
# version must always be equal to the version of the "sulong" import below
12-
"version": "665bb5858fd872395ac11eccc743e53ecb61da4e",
12+
"version": "90f6858ea56becd2785e656630cf90254330383d",
1313
"urls": [
1414
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
1515
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},
@@ -19,7 +19,7 @@
1919
"name": "sulong",
2020
"subdir": True,
2121
# version must always be equal to the version of the "tools" import above
22-
"version": "665bb5858fd872395ac11eccc743e53ecb61da4e",
22+
"version": "90f6858ea56becd2785e656630cf90254330383d",
2323
"urls": [
2424
{"url": "https://github.com/oracle/graal.git", "kind": "git"},
2525
{"url": "https://curio.ssw.jku.at/nexus/content/repositories/snapshots", "kind": "binary"},

spec/ruby/core/kernel/sleep_spec.rb

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,16 +6,20 @@
66
Kernel.should have_private_instance_method(:sleep)
77
end
88

9+
it "returns an Integer" do
10+
sleep(0.001).should be_kind_of(Integer)
11+
end
12+
913
it "accepts a Float" do
10-
sleep(0.1).should be_close(0, 2)
14+
sleep(0.001).should >= 0
1115
end
1216

1317
it "accepts a Fixnum" do
14-
sleep(0).should be_close(0, 2)
18+
sleep(0).should >= 0
1519
end
1620

1721
it "accepts a Rational" do
18-
sleep(Rational(1, 9)).should be_close(0, 2)
22+
sleep(Rational(1, 999)).should >= 0
1923
end
2024

2125
it "raises an ArgumentError when passed a negative duration" do

spec/ruby/optional/capi/mutex_spec.rb

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -72,9 +72,10 @@
7272

7373
it "sleeps when the mutex is locked" do
7474
@m.lock
75-
start = Time.now
76-
@s.rb_mutex_sleep(@m, 0.1)
77-
(Time.now - start).should be_close(0.1, 0.2)
75+
t1 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
76+
@s.rb_mutex_sleep(@m, 0.001)
77+
t2 = Process.clock_gettime(Process::CLOCK_MONOTONIC)
78+
(t2 - t1).should >= 0
7879
@m.locked?.should be_true
7980
end
8081
end

tool/make-standalone-distribution.sh

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -52,10 +52,9 @@ cd "$PREFIX/build"
5252
test -d truffleruby || git clone "$original_repo" truffleruby
5353

5454
# Shortcut when running the script locally
55-
if [ -d "$original_repo/../graal" ] && [ -d "$original_repo/../sulong" ]; then
55+
if [ -d "$original_repo/../graal" ]; then
5656
# Building locally (not in CI), copy from local repositories to gain time
5757
test -d graal || git clone "$original_repo/../graal" graal
58-
test -d sulong || git clone "$original_repo/../sulong" sulong
5958
fi
6059

6160
mx -p truffleruby sforceimports
@@ -77,7 +76,7 @@ archive_basename="truffleruby-$version-$os-$arch"
7776

7877
release_home="$PREFIX/$archive_basename"
7978
# Rename the Ruby standalone distribution created by the vm suite
80-
cp -R mxbuild/$os-$arch/RUBY_STANDALONE_SVM/* "$release_home"
79+
cp -R mxbuild/$os-$arch/RUBY_STANDALONE_SVM*/* "$release_home"
8180

8281
# Create archive
8382
cd "$PREFIX"

0 commit comments

Comments
 (0)