[GR-14565] Add JVM in the VM string like in AbstractLanguageLauncher#printVersion() and fix JS backtraces test

PullRequest: truffleruby/742

Author: eregon

spec/truffle/identity_spec.rb

@@ -39,7 +39,7 @@
 
   guard -> { !TruffleRuby.native? } do
     it "RUBY_DESCRIPTION indicates which VM TruffleRuby runs on and which edition" do
-      RUBY_DESCRIPTION.should =~ /\b(Interpreted|GraalVM CE|GraalVM EE)\b/
+      RUBY_DESCRIPTION.should =~ /\b(Interpreted JVM|GraalVM CE JVM|GraalVM EE JVM)\b/
       RUBY_DESCRIPTION.should_not include("Native")
       RUBY_DESCRIPTION.should_not include("native")
     end

src/shared/java/org/truffleruby/shared/TruffleRuby.java

@@ -30,7 +30,7 @@ public static String getVersionString(String implementationName, boolean isAOT)
         if (isAOT) {
             vm = implementationName + " Native";
         } else {
-            vm = implementationName;
+            vm = implementationName + " JVM";
         }
 
         return String.format(

test/truffle/integration/backtraces.sh

@@ -5,9 +5,11 @@ source test/truffle/common.sh.inc
 for f in test/truffle/integration/backtraces/*.rb
 do
   echo "$f"
-  options=""
-  if [ "$(basename "$f")" = "javascript.rb" ]; then
-    options="--polyglot --experimental-options --single_threaded"
+  if [ "$(basename "$f")" != "javascript.rb" ]; then
+    jt ruby --no-core-load-path "$f"
   fi
-  jt ruby --no-core-load-path $options "$f"
 done
+
+if [ "$(jt ruby -e 'p TruffleRuby.native?')" = "false" ]; then
+  jt ruby --no-core-load-path --polyglot --experimental-options --single_threaded test/truffle/integration/backtraces/javascript.rb
+fi