Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 5 additions & 10 deletions .github/workflows/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -1575,8 +1575,8 @@ jobs:
- name: debugger.jpda.projectsui
run: ant $OPTS -f java/debugger.jpda.projectsui test

# - name: debugger.jpda.truffle
# run: ant $OPTS -f java/debugger.jpda.truffle test
- name: debugger.jpda.truffle
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1, I am really glad to see the tests being run regularly!

run: ant $OPTS -f java/debugger.jpda.truffle test

- name: debugger.jpda.ui
run: ant $OPTS -f java/debugger.jpda.ui test-unit
Expand Down Expand Up @@ -2560,9 +2560,7 @@ jobs:
timeout-minutes: 60
strategy:
matrix:
# TODO uses GraalVM 17 / 22.3.1 which is the last known release which offers all required language extensions
# GraalVM based on JDK 21+ doesn't support the 'gu' tool anymore - extensions are now regular application dependencies
graal: [ '22.3.1' ]
graal: [ '21.0.2' ]
fail-fast: false

steps:
Expand All @@ -2581,14 +2579,11 @@ jobs:

- name: Setup GraalVM ${{ matrix.graal }}
run: |
URL=https://github.com/graalvm/graalvm-ce-builds/releases/download/vm-${{ matrix.graal }}/graalvm-ce-java17-linux-amd64-${{ matrix.graal }}.tar.gz
URL=https://github.com/graalvm/graalvm-ce-builds/releases/download/jdk-${{ matrix.graal }}/graalvm-community-jdk-${{ matrix.graal }}_linux-x64_bin.tar.gz
curl -L $URL | tar -xz
GRAALVM=`pwd`/graalvm-ce-java17-${{ matrix.graal }}
GRAALVM=$(realpath graalvm-community-openjdk-*)
echo "JAVA_HOME=$GRAALVM" >> $GITHUB_ENV

- name: Setup GraalVM Languages (python, R, ruby and js)
run: $JAVA_HOME/bin/gu install --no-progress python R ruby js

- name: platform/core.network
run: ant $OPTS -f platform/core.network test

Expand Down
21 changes: 12 additions & 9 deletions java/debugger.jpda.truffle/nbproject/project.xml
Original file line number Diff line number Diff line change
Expand Up @@ -258,6 +258,12 @@
<test-dependencies>
<test-type>
<name>unit</name>
<test-dependency>
<code-name-base>org.netbeans.api.debugger.jpda</code-name-base>
<recursive/>
<compile-dependency/>
<test/>
</test-dependency>
<test-dependency>
<code-name-base>org.netbeans.core.startup</code-name-base>
<recursive/>
Expand All @@ -266,25 +272,22 @@
<code-name-base>org.netbeans.libs.freemarker</code-name-base>
<recursive/>
</test-dependency>
<test-dependency>
<code-name-base>org.netbeans.libs.graaljs</code-name-base>
Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Graal.js is packaged as NetBeans module, so reusing it is a great idea.

</test-dependency>
<test-dependency>
<code-name-base>org.netbeans.libs.javacapi</code-name-base>
<recursive/>
</test-dependency>
<test-dependency>
<code-name-base>org.netbeans.modules.debugger.jpda</code-name-base>
<compile-dependency/>
<test/>
<code-name-base>org.netbeans.libs.junit4</code-name-base>
<compile-dependency/>
</test-dependency>
<test-dependency>
<code-name-base>org.netbeans.api.debugger.jpda</code-name-base>
<recursive/>
<code-name-base>org.netbeans.modules.debugger.jpda</code-name-base>
<compile-dependency/>
<test/>
</test-dependency>
<test-dependency>
<code-name-base>org.netbeans.libs.junit4</code-name-base>
<compile-dependency/>
</test-dependency>
<test-dependency>
<code-name-base>org.netbeans.modules.nbjunit</code-name-base>
<recursive/>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -63,18 +63,6 @@ public void testBreakpoints_JS() throws Exception {
runBreakpointsTest(JS_LAUNCHER);
}

public void testBreakpoints_Python() throws Exception {
runBreakpointsTest(PYTHON_LAUNCHER);
}

public void testBreakpoints_R() throws Exception {
runBreakpointsTest(RSCRIPT_LAUNCHER);
}

public void testBreakpoints_Ruby() throws Exception {
runBreakpointsTest(RUBY_LAUNCHER);
}

private void runBreakpointsTest(String launcher) throws Exception {
File source = getScriptSourceFileForLauncher(launcher);
DebuggerManager dm = DebuggerManager.getDebuggerManager();
Expand All @@ -99,18 +87,6 @@ public void testBreakpointsConditional_JS() throws Exception {
runBreakpointsConditionalTest(JS_LAUNCHER);
}

public void testBreakpointsConditional_Python() throws Exception {
runBreakpointsConditionalTest(PYTHON_LAUNCHER);
}

public void testBreakpointsConditional_R() throws Exception {
runBreakpointsConditionalTest(RSCRIPT_LAUNCHER);
}

public void testBreakpointsConditional_Ruby() throws Exception {
runBreakpointsConditionalTest(RUBY_LAUNCHER);
}

public void runBreakpointsConditionalTest(String launcher) throws Exception {
File source = getScriptSourceFileForLauncher(launcher);
DebuggerManager dm = DebuggerManager.getDebuggerManager();
Expand Down Expand Up @@ -141,18 +117,6 @@ public void testSteps_JS() throws Exception {
runStepsTest(JS_LAUNCHER);
}

public void testSteps_Python() throws Exception {
runStepsTest(PYTHON_LAUNCHER);
}

public void testSteps_R() throws Exception {
runStepsTest(RSCRIPT_LAUNCHER);
}

public void testSteps_Ruby() throws Exception {
runStepsTest(RUBY_LAUNCHER);
}

public void runStepsTest(String launcher) throws Exception {
File source = getScriptSourceFileForLauncher(launcher);
DebuggerManager dm = DebuggerManager.getDebuggerManager();
Expand All @@ -177,18 +141,6 @@ public void testEval_JS() throws Exception {
runEvalTest(JS_LAUNCHER);
}

public void testEval_Python() throws Exception {
runEvalTest(PYTHON_LAUNCHER);
}

public void testEval_R() throws Exception {
runEvalTest(RSCRIPT_LAUNCHER);
}

public void testEval_Ruby() throws Exception {
runEvalTest(RUBY_LAUNCHER);
}

public void runEvalTest(String launcher) throws Exception {
File source = getScriptSourceFileForLauncher(launcher);
DebuggerManager dm = DebuggerManager.getDebuggerManager();
Expand Down Expand Up @@ -226,18 +178,6 @@ public void testLocalVariables_JS() throws Exception {
runLocalVariablesTest(JS_LAUNCHER);
}

public void testLocalVariables_Python() throws Exception {
runLocalVariablesTest(PYTHON_LAUNCHER);
}

public void testLocalVariables_R() throws Exception {
runLocalVariablesTest(RSCRIPT_LAUNCHER);
}

public void testLocalVariables_Ruby() throws Exception {
runLocalVariablesTest(RUBY_LAUNCHER);
}

public void runLocalVariablesTest(String launcher) throws Exception {
File source = getScriptSourceFileForLauncher(launcher);
DebuggerManager dm = DebuggerManager.getDebuggerManager();
Expand Down Expand Up @@ -286,18 +226,6 @@ public void testObjectProperties_JS() throws Exception {
runObjectPropertiesTest(JS_LAUNCHER);
}

public void testObjectProperties_Python() throws Exception {
runObjectPropertiesTest(PYTHON_LAUNCHER);
}

public void testObjectProperties_R() throws Exception {
runObjectPropertiesTest(RSCRIPT_LAUNCHER);
}

public void testObjectProperties_Ruby() throws Exception {
runObjectPropertiesTest(RUBY_LAUNCHER);
}

public void runObjectPropertiesTest(String launcher) throws Exception {
File source = getScriptSourceFileForLauncher(launcher);
DebuggerManager dm = DebuggerManager.getDebuggerManager();
Expand Down

This file was deleted.

This file was deleted.

Loading
Loading