Skip to content

Commit 9dceec0

Browse files
committed
Move concurrent execution preventing test dependencies to build.props
In the build.properties we can add a proper comment to explain the purpose of these difficult to understand dependencies.
1 parent 2300b0f commit 9dceec0

File tree

6 files changed

+16
-6
lines changed

6 files changed

+16
-6
lines changed

tests/org.eclipse.swt.tests.cocoa/META-INF/MANIFEST.MF

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ Bundle-Version: 3.108.100.qualifier
66
Bundle-Vendor: Eclipse.org
77
Bundle-Localization: plugin
88
Require-Bundle: org.junit;bundle-version="4.12.0",
9-
org.eclipse.swt,
10-
org.eclipse.swt.tests
9+
org.eclipse.swt
1110
Eclipse-BundleShape: dir
1211
Bundle-RequiredExecutionEnvironment: JavaSE-17
1312
Automatic-Module-Name: org.eclipse.swt.tests.cocoa

tests/org.eclipse.swt.tests.cocoa/build.properties

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ source..=JUnit Tests/
1616
bin.includes = .,\
1717
META-INF/
1818

19+
# The following dependency prevents parallel execution of this and the referenced test-project.
20+
# Both use the same not-shareable resources and therefore cannot run in parallel.
21+
additional.bundles = org.eclipse.swt.tests
22+
1923
pom.model.groupId = org.eclipse.swt
2024
tycho.pomless.parent = ../../local-build/local-build-parent
2125
pom.model.packaging = eclipse-test-plugin

tests/org.eclipse.swt.tests.gtk/META-INF/MANIFEST.MF

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,7 @@ Bundle-SymbolicName: org.eclipse.swt.tests.gtk
55
Bundle-Version: 3.109.0.qualifier
66
Bundle-Vendor: Eclipse.org
77
Require-Bundle: org.junit;bundle-version="4.12.0",
8-
org.eclipse.swt,
9-
org.eclipse.swt.tests
8+
org.eclipse.swt
109
Eclipse-BundleShape: dir
1110
Bundle-RequiredExecutionEnvironment: JavaSE-17
1211
Automatic-Module-Name: org.eclipse.swt.tests.gtk

tests/org.eclipse.swt.tests.gtk/build.properties

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,10 @@ source.. = JUnit Tests/,\
1616
bin.includes = .,\
1717
META-INF/
1818

19+
# The following dependency prevents parallel execution of this and the referenced test-project.
20+
# Both use the same not-shareable resources and therefore cannot run in parallel.
21+
additional.bundles = org.eclipse.swt.tests
22+
1923
pom.model.groupId = org.eclipse.swt
2024
tycho.pomless.parent = ../../local-build/local-build-parent
2125
pom.model.packaging = eclipse-test-plugin

tests/org.eclipse.swt.tests.win32/META-INF/MANIFEST.MF

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,8 +6,7 @@ Bundle-Version: 3.108.100.qualifier
66
Bundle-Vendor: Eclipse.org
77
Bundle-Localization: plugin
88
Require-Bundle: org.junit;bundle-version="4.12.0",
9-
org.eclipse.swt,
10-
org.eclipse.swt.tests
9+
org.eclipse.swt
1110
Eclipse-BundleShape: dir
1211
Bundle-RequiredExecutionEnvironment: JavaSE-17
1312
Automatic-Module-Name: org.eclipse.swt.tests.win32

tests/org.eclipse.swt.tests.win32/build.properties

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,11 @@ source..=JUnit Tests/
1616
bin.includes = .,\
1717
META-INF/
1818

19+
20+
# The following dependency prevents parallel execution of this and the referenced test-project.
21+
# Both use the same not-shareable resources and therefore cannot run in parallel.
22+
additional.bundles = org.eclipse.swt.tests
23+
1924
pom.model.groupId = org.eclipse.swt
2025
tycho.pomless.parent = ../../local-build/local-build-parent
2126
pom.model.packaging = eclipse-test-plugin

0 commit comments

Comments
 (0)