Skip to content

Commit 0e9d487

Browse files
trancexpressiloveeclipse
authored andcommitted
Ignore test if not on Linux, with plain return
Fixes: #843
1 parent 13c2eac commit 0e9d487

File tree

1 file changed

+8
-3
lines changed

1 file changed

+8
-3
lines changed

org.eclipse.jdt.debug.tests/tests/org/eclipse/jdt/debug/tests/core/MultiReleaseLaunchTests.java

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,6 @@
1313
*******************************************************************************/
1414
package org.eclipse.jdt.debug.tests.core;
1515

16-
import static org.junit.Assume.assumeTrue;
17-
1816
import java.io.File;
1917
import java.io.StringReader;
2018
import java.util.ArrayList;
@@ -65,6 +63,10 @@ public MultiReleaseLaunchTests(String name) {
6563
@Override
6664
protected void setUp() throws Exception {
6765
super.setUp();
66+
// see https://github.com/eclipse-jdt/eclipse.jdt.debug/issues/843
67+
if (!Platform.OS.isLinux()) { // JUnit 3, don't use assumeTrue, the thrown AssumptionViolatedException is treated as an error
68+
return;
69+
}
6870
final Set<File> existingLocations = new HashSet<>();
6971
List<RequiredJavaVersion> requiredJavaVersions = new ArrayList<>(List.of(JAVA_11, JAVA_17, JAVA_21));
7072
removeExistingJavaVersions(requiredJavaVersions, existingLocations);
@@ -115,7 +117,10 @@ protected IJavaProject getProjectContext() {
115117
}
116118

117119
public void testMultiReleaseLaunch() throws Exception {
118-
assumeTrue("Not on Linux", Platform.OS.isLinux());
120+
// see https://github.com/eclipse-jdt/eclipse.jdt.debug/issues/843
121+
if (!Platform.OS.isLinux()) { // JUnit 3, don't use assumeTrue, the thrown AssumptionViolatedException is treated as an error
122+
return;
123+
}
119124
ILaunchConfiguration config = getLaunchConfiguration("p.Main");
120125
Properties result = launchAndReadResult(config, 11);
121126
assertTrue("Was not launched with a proper Java installation " + result, JAVA_11.matches(result.getProperty("Java")));

0 commit comments

Comments
 (0)