Skip to content

Commit ce3bbd0

Browse files
committed
[Build] Run Maven build in parallel and only up until the verify phase
Because the swt.tests and some platform specific tests (a.t.m. only windows) use the same not-shareable resources during their execution they must not run in parallel. In order to ensure that (as hacky solution), add a dependency from each platform-specific test to org.eclipse.swt.tests.
1 parent 31e1414 commit ce3bbd0

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed

.github/workflows/maven.yml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,7 @@ jobs:
6363
with:
6464
run: >-
6565
mvn --batch-mode -V -U
66+
--threads 1C
6667
-DforkCount=1
6768
-Dnative=${{ matrix.config.native }}
6869
-Dcompare-version-with-baselines.skip=true
@@ -71,7 +72,7 @@ jobs:
7172
--fail-at-end
7273
-DskipNativeTests=false
7374
-DfailIfNoTests=false
74-
clean install
75+
clean verify
7576
- name: Performance tests
7677
if: contains(github.event.pull_request.labels.*.name, 'performance')
7778
uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 # v1.0.1

Jenkinsfile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -299,7 +299,7 @@ pipeline {
299299
dir('eclipse.platform.swt') {
300300
sh '''
301301
mvn clean verify \
302-
--batch-mode -DforkCount=0 \
302+
--batch-mode --threads 1C -DforkCount=0 \
303303
-Dcompare-version-with-baselines.skip=false -Dmaven.compiler.failOnWarning=true \
304304
-Dorg.eclipse.swt.tests.junit.disable.test_isLocal=true \
305305
-Dmaven.test.failure.ignore=true -Dmaven.test.error.ignore=true

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ 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
9+
org.eclipse.swt,
10+
org.eclipse.swt.tests
1011
Eclipse-BundleShape: dir
1112
Bundle-RequiredExecutionEnvironment: JavaSE-17
1213
Automatic-Module-Name: org.eclipse.swt.tests.cocoa

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,8 @@ 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
8+
org.eclipse.swt,
9+
org.eclipse.swt.tests
910
Eclipse-BundleShape: dir
1011
Bundle-RequiredExecutionEnvironment: JavaSE-17
1112
Automatic-Module-Name: org.eclipse.swt.tests.gtk

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ 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
9+
org.eclipse.swt,
10+
org.eclipse.swt.tests
1011
Eclipse-BundleShape: dir
1112
Bundle-RequiredExecutionEnvironment: JavaSE-17
1213
Automatic-Module-Name: org.eclipse.swt.tests.win32

0 commit comments

Comments
 (0)