Skip to content

Commit 1a42ca5

Browse files
committed
Replace tests depending on the polyglot launcher and libpolyglot (through --polyglot in native mode)
* Remove the redundant ones which already run in JVM mode.
1 parent 40daebe commit 1a42ca5

File tree

6 files changed

+8
-21
lines changed

6 files changed

+8
-21
lines changed

vm/tests/all/agentscript/agent-exception.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ good you are?
5959
.*at <js> log.log.js:1-6:.*
6060
.*at <js> areYouBad.log.js:26:.*
6161
.*at <js> :program.<eval_script>:1:0-10.
62-
>[1] js --polyglot --jvm --insight=agent-error2.rb log.js
62+
>[1] js --jvm --polyglot --insight=agent-error2.rb log.js
6363
insight: Unknown attribute misnamedAttribute
6464
>[1] js --jvm --insight=agent-error3.js log.js
6565
insight: Unknown event type 'enterOrLeave'.*

vm/tests/all/agentscript/agent-lli.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@
2323
#
2424
>[0?] export TOOLCHAIN_PATH=`lli --print-toolchain-path`
2525
>[0?] ${TOOLCHAIN_PATH}/clang agent-sieve.c -g -O0 -lm -o ${TMP_DIR}/sieve
26-
>[1] lli --polyglot --insight=agent-limit.js --experimental-options ${TMP_DIR}/sieve
26+
>[1] lli --jvm --polyglot --insight=agent-limit.js --experimental-options ${TMP_DIR}/sieve
2727
found new prime number (<unavailable>|2)
2828
found new prime number (<unavailable>|3)
2929
found new prime number (<unavailable>|5)

vm/tests/all/agentscript/agent-python.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Python: Insight version 1.2 is launching
2828
Python: Hooks are ready!
2929
Python: observed loading of test.py
3030
Ahoj
31-
> js --polyglot --insight=agent-python.py --experimental-options agent-fib.js
31+
> js --jvm --polyglot --insight=agent-python.py --experimental-options agent-fib.js
3232
Python: Insight version 1.2 is launching
3333
Python: Hooks are ready!
3434
Python: observed loading of agent-fib.js

vm/tests/all/agentscript/agent-r.test

Lines changed: 2 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -53,28 +53,15 @@ Ahoj
5353
2 calls to cat
5454
2 calls to stdout
5555
===================
56-
> Rscript --polyglot --insight=agent-histogram.js ${TMP_DIR}/fib.R
57-
8
58-
==== Histogram ====
59-
15 calls to fib
60-
3 calls to <repl wrapper>
61-
2 calls to cat
62-
2 calls to stdout
63-
===================
6456
> cat > ${TMP_DIR}/test.js
6557
< print('hi js!')
66-
> polyglot --jvm --agentscript=agent-r.R --experimental-options ${TMP_DIR}/test.js
58+
> js --jvm --polyglot --agentscript=agent-r.R --experimental-options ${TMP_DIR}/test.js
6759
Warning.*agentscript.*deprecated.*insight.*
6860
R: Initializing GraalVM Insight script
6961
R: Hooks are ready!
7062
R: observed loading of.*test.js
7163
hi js!
72-
> polyglot --jvm --insight=agent-r.R ${TMP_DIR}/test.js
73-
R: Initializing GraalVM Insight script
74-
R: Hooks are ready!
75-
R: observed loading of.*test.js
76-
hi js!
77-
> polyglot --insight=agent-r.R ${TMP_DIR}/test.js
64+
> js --jvm --polyglot --insight=agent-r.R ${TMP_DIR}/test.js
7865
R: Initializing GraalVM Insight script
7966
R: Hooks are ready!
8067
R: observed loading of.*test.js

vm/tests/all/agentscript/agent-ruby-dump.test

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
>[0] javac -cp $CP HeapQuery.java
2626
#> export TMP_DIR=/tmp
2727
> rm -rf /tmp/ruby*hprof*
28-
> truffleruby --polyglot --heap.dump=$TMP_DIR/ruby.hprof --insight=agent-ruby-dump.js hello-world.rb
28+
> truffleruby --jvm --polyglot --heap.dump=$TMP_DIR/ruby.hprof --insight=agent-ruby-dump.js hello-world.rb
2929
dumping state of Ruby memory when executing Welcome#welcome
3030
Hello World!
3131
# check one frame was captured

vm/tests/all/agentscript/agent-ruby.test

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ Ruby: Insight version 1.2 is launching
2828
Ruby: Hooks are ready!
2929
Ruby: observed loading of .*test.rb
3030
Ahoj
31-
> js --polyglot --insight=agent-ruby.rb --experimental-options agent-fib.js
31+
> js --jvm --polyglot --insight=agent-ruby.rb --experimental-options agent-fib.js
3232
Ruby: Insight version 1.2 is launching
3333
Ruby: Hooks are ready!
3434
Ruby: observed loading of agent-fib.js
@@ -37,4 +37,4 @@ minusOne 3
3737
minusOne 2
3838
minusOne 2
3939
Three is the result 3
40-
# >[0?] node --js.print --polyglot --insight=agent-ruby.rb --experimental-options agent-fib.js
40+
# >[0?] node --js.print --jvm --polyglot --insight=agent-ruby.rb --experimental-options agent-fib.js

0 commit comments

Comments
 (0)