Skip to content

Commit 7e93058

Browse files
committed
Correctly restore bin/rake after the blog test
* Rename variable for clarity.
1 parent 93cd250 commit 7e93058

File tree

1 file changed

+6
-8
lines changed

1 file changed

+6
-8
lines changed

test/truffle/ecosystem/blog.sh

Lines changed: 6 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,10 @@ done
1515
ecosystem=$(dirname "$SELF_PATH")
1616
truffle=$(dirname "$ecosystem")
1717
test=$(dirname "$truffle")
18-
home=$(dirname "$test")
18+
repo=$(dirname "$test")
1919

2020
function jt {
21-
ruby "${home}/tool/jt.rb" "$@"
21+
ruby "${repo}/tool/jt.rb" "$@"
2222
}
2323

2424
function truffleruby {
@@ -30,9 +30,6 @@ set -xe
3030
gem_test_pack="$(jt gem-test-pack)"
3131
truffleruby gem install "$gem_test_pack/gem-cache/bundler-1.16.5.gem" --local --no-document
3232

33-
# backup bin/rake, which gets overwritten
34-
cp bin/rake bin/rake-original
35-
3633
cd test/truffle/ecosystem/blog
3734

3835
truffleruby bundle config --local cache_path "$gem_test_pack/gem-cache"
@@ -72,6 +69,7 @@ test "$(curl -s "$url")" = '[]'
7269

7370
kill_server
7471

75-
# put back the original
76-
cd "$home"
77-
mv -f bin/rake-original bin/rake
72+
# put back the original bin/rake, as it gets overwritten by bundle install
73+
cp $repo/bin/rake $repo/mxbuild/graalvm/bin/rake
74+
cp $repo/bin/rake $repo/mxbuild/graalvm/jre/bin/rake
75+
cp $repo/bin/rake $repo/mxbuild/graalvm/jre/languages/ruby/bin/rake

0 commit comments

Comments
 (0)