eaglercraft/eagler-teavm-fork
1
0
Fork 0
mirror of https://github.com/Eaglercraft-TeaVM-Fork/eagler-teavm.git synced 2024-12-22 16:14:10 -08:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix running tests from Gradle plugin

Browse Source
This commit is contained in:
Alexey Andreev 2023-04-11 09:46:45 +02:00
parent fcb750675c
commit 4756c9009a
2 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
tools/gradle/src/main/java/org/teavm/gradle/TeaVMTestConfigurator.java
View File

@ -31,14 +31,14 @@ class TeaVMTestConfigurator {
new File(project.getBuildDir(), "tests/teavm")); new File(project.getBuildDir(), "tests/teavm"));
test.getSystemProperties().putIfAbsent("teavm.junit.threads", "1"); test.getSystemProperties().putIfAbsent("teavm.junit.threads", "1");
test.getSystemProperties().putIfAbsent("teavm.junit.js.enabled", test.getSystemProperties().putIfAbsent("teavm.junit.js",
tests.getJs().getEnabled().get()); tests.getJs().getEnabled().get());
test.getSystemProperties().putIfAbsent("teavm.junit.js.runner", test.getSystemProperties().putIfAbsent("teavm.junit.js.runner",
tests.getJs().getRunner().map(TeaVMTestConfigurator::runnerToString).get()); tests.getJs().getRunner().map(TeaVMTestConfigurator::runnerToString).get());
test.getSystemProperties().putIfAbsent("teavm.junit.js.decodeStack", test.getSystemProperties().putIfAbsent("teavm.junit.js.decodeStack",
tests.getJs().getDecodeStack().get()); tests.getJs().getDecodeStack().get());
test.getSystemProperties().putIfAbsent("teavm.junit.wasm.enabled", test.getSystemProperties().putIfAbsent("teavm.junit.wasm",
tests.getWasm().getEnabled().get()); tests.getWasm().getEnabled().get());
test.getSystemProperties().putIfAbsent("teavm.junit.wasm.runner", test.getSystemProperties().putIfAbsent("teavm.junit.wasm.runner",
tests.getWasm().getRunner().map(TeaVMTestConfigurator::runnerToString).get()); tests.getWasm().getRunner().map(TeaVMTestConfigurator::runnerToString).get());

1
tools/junit/src/main/java/org/teavm/junit/TeaVMTestRunner.java
View File

@ -119,7 +119,6 @@ public class TeaVMTestRunner extends Runner implements Filterable {
private static final String OPTIMIZED = "teavm.junit.optimized"; private static final String OPTIMIZED = "teavm.junit.optimized";
private static final String FAST_ANALYSIS = "teavm.junit.fastAnalysis"; private static final String FAST_ANALYSIS = "teavm.junit.fastAnalysis";
private static final int stopTimeout = 15000;
private Class<?> testClass; private Class<?> testClass;
private boolean isWholeClassCompilation; private boolean isWholeClassCompilation;
private ClassHolderSource classSource; private ClassHolderSource classSource;