Skip to content

Commit 86a809d

Browse files
committed
Test that the post-install message is printed in Docker tests using gu
1 parent 120c3b4 commit 86a809d

File tree

1 file changed

+9
-2
lines changed

1 file changed

+9
-2
lines changed

tool/jt.rb

Lines changed: 9 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1996,12 +1996,18 @@ def dockerfile(*args)
19961996
graalvm_version = graalvm_version.gsub(/-b\d+\Z/, '')
19971997
end
19981998

1999+
check_post_install_message = [
2000+
"RUN grep 'The Ruby openssl C extension needs to be recompiled on your system to work with the installed libssl' install.log",
2001+
"RUN grep '/jre/languages/ruby/lib/truffle/post_install_hook.sh' install.log"
2002+
]
2003+
19992004
case install_method
20002005
when :public
20012006
lines.push "RUN curl -OL https://github.com/oracle/graal/releases/download/vm-#{public_version}/graalvm-ce-#{public_version}-linux-amd64.tar.gz"
20022007
lines.push "RUN tar -zxf graalvm-ce-#{public_version}-linux-amd64.tar.gz"
20032008
lines.push "ENV D_GRAALVM_BASE=/test/graalvm-ce-#{public_version}"
2004-
lines.push "RUN $D_GRAALVM_BASE/bin/gu install org.graalvm.ruby"
2009+
lines.push "RUN $D_GRAALVM_BASE/bin/gu install org.graalvm.ruby | tee install.log"
2010+
lines.push(*check_post_install_message)
20052011
lines.push "ENV D_RUBY_BASE=$D_GRAALVM_BASE/jre/languages/ruby"
20062012
lines.push "ENV D_RUBY_BIN=$D_GRAALVM_BASE/bin"
20072013
lines.push "RUN PATH=$D_RUBY_BIN:$PATH $D_RUBY_BASE/lib/truffle/post_install_hook.sh" if run_post_install_hook
@@ -2014,7 +2020,8 @@ def dockerfile(*args)
20142020
lines.push "COPY #{graalvm_component} /test/"
20152021
lines.push "RUN tar -zxf #{graalvm_tarball}"
20162022
lines.push "ENV D_GRAALVM_BASE=/test/graalvm-#{graalvm_version}"
2017-
lines.push "RUN $D_GRAALVM_BASE/bin/gu install --file /test/#{graalvm_component}"
2023+
lines.push "RUN $D_GRAALVM_BASE/bin/gu install --file /test/#{graalvm_component} | tee install.log"
2024+
lines.push(*check_post_install_message)
20182025
lines.push "ENV D_RUBY_BASE=$D_GRAALVM_BASE/jre/languages/ruby"
20192026
lines.push "ENV D_RUBY_BIN=$D_GRAALVM_BASE/bin"
20202027
lines.push "RUN PATH=$D_RUBY_BIN:$PATH $D_RUBY_BASE/lib/truffle/post_install_hook.sh" if run_post_install_hook

0 commit comments

Comments
 (0)