From 4756c9009aa873696073794bbb0d68f17cd3e1da Mon Sep 17 00:00:00 2001 From: Alexey Andreev Date: Tue, 11 Apr 2023 09:46:45 +0200 Subject: [PATCH] Fix running tests from Gradle plugin --- .../src/main/java/org/teavm/gradle/TeaVMTestConfigurator.java | 4 ++-- .../junit/src/main/java/org/teavm/junit/TeaVMTestRunner.java | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/tools/gradle/src/main/java/org/teavm/gradle/TeaVMTestConfigurator.java b/tools/gradle/src/main/java/org/teavm/gradle/TeaVMTestConfigurator.java index 30eb82e0b..353cf59b1 100644 --- a/tools/gradle/src/main/java/org/teavm/gradle/TeaVMTestConfigurator.java +++ b/tools/gradle/src/main/java/org/teavm/gradle/TeaVMTestConfigurator.java @@ -31,14 +31,14 @@ class TeaVMTestConfigurator { new File(project.getBuildDir(), "tests/teavm")); test.getSystemProperties().putIfAbsent("teavm.junit.threads", "1"); - test.getSystemProperties().putIfAbsent("teavm.junit.js.enabled", + test.getSystemProperties().putIfAbsent("teavm.junit.js", tests.getJs().getEnabled().get()); test.getSystemProperties().putIfAbsent("teavm.junit.js.runner", tests.getJs().getRunner().map(TeaVMTestConfigurator::runnerToString).get()); test.getSystemProperties().putIfAbsent("teavm.junit.js.decodeStack", tests.getJs().getDecodeStack().get()); - test.getSystemProperties().putIfAbsent("teavm.junit.wasm.enabled", + test.getSystemProperties().putIfAbsent("teavm.junit.wasm", tests.getWasm().getEnabled().get()); test.getSystemProperties().putIfAbsent("teavm.junit.wasm.runner", tests.getWasm().getRunner().map(TeaVMTestConfigurator::runnerToString).get()); diff --git a/tools/junit/src/main/java/org/teavm/junit/TeaVMTestRunner.java b/tools/junit/src/main/java/org/teavm/junit/TeaVMTestRunner.java index bdd5a6d74..728e21370 100644 --- a/tools/junit/src/main/java/org/teavm/junit/TeaVMTestRunner.java +++ b/tools/junit/src/main/java/org/teavm/junit/TeaVMTestRunner.java @@ -119,7 +119,6 @@ public class TeaVMTestRunner extends Runner implements Filterable { private static final String OPTIMIZED = "teavm.junit.optimized"; private static final String FAST_ANALYSIS = "teavm.junit.fastAnalysis"; - private static final int stopTimeout = 15000; private Class testClass; private boolean isWholeClassCompilation; private ClassHolderSource classSource;