Skip to content

Commit b6572c8

Browse files
EcljpseB0Tjukzi
authored andcommitted
debug.tests: org.eclipse.urischeme/skipAutoRegistration #2245
IOConsoleTests complained about still running AutoRegisterSchemeHandlersJob on macOS eclipse-platform/eclipse.platform.ui#2245
1 parent e3664ce commit b6572c8

File tree

2 files changed

+4
-3
lines changed

2 files changed

+4
-3
lines changed

debug/org.eclipse.debug.tests/src/org/eclipse/debug/tests/TestUtil.java

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,6 @@
1919
import java.lang.management.ManagementFactory;
2020
import java.lang.management.ThreadInfo;
2121
import java.util.ArrayList;
22-
import java.util.Collections;
2322
import java.util.LinkedHashSet;
2423
import java.util.List;
2524
import java.util.Set;
@@ -223,8 +222,9 @@ public static boolean waitForJobs(String owner, long minTimeMs, long maxTimeMs,
223222
}
224223
jobs.forEach(Job::wakeUp);
225224

226-
if (!Collections.disjoint(runningJobs, jobs)) {
227-
// There is a job which runs already quite some time, don't wait for it to avoid test timeouts
225+
if (runningJobs.containsAll(jobs)) {
226+
// There are only jobs which runs already quite some time, don't
227+
// wait for them to avoid test timeouts
228228
dumpRunningOrWaitingJobs(owner, jobs);
229229
return true;
230230
}

debug/org.eclipse.debug.tests/test.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@
3737
<target name="suite">
3838
<property name="platform-debug-folder"
3939
value="${eclipse-home}/platform_debug_folder"/>
40+
<property name="org.eclipse.urischeme/skipAutoRegistration" value="true"></property>
4041
<delete dir="${platform-debug-folder}" quiet="true"/>
4142
<ant target="ui-test" antfile="${library-file}" dir="${eclipse-home}">
4243
<property name="data-dir" value="${platform-debug-folder}"/>

0 commit comments

Comments
 (0)