Skip to content

Commit

Permalink
[Build] Run Maven build in parallel and only up until the verify phase
Browse files Browse the repository at this point in the history
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.
  • Loading branch information
HannesWell committed Jan 29, 2024
1 parent 31e1414 commit ce3bbd0
Show file tree
Hide file tree
Showing 5 changed files with 9 additions and 5 deletions.
3 changes: 2 additions & 1 deletion .github/workflows/maven.yml
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ jobs:
with:
run: >-
mvn --batch-mode -V -U
--threads 1C
-DforkCount=1
-Dnative=${{ matrix.config.native }}
-Dcompare-version-with-baselines.skip=true
Expand All @@ -71,7 +72,7 @@ jobs:
--fail-at-end
-DskipNativeTests=false
-DfailIfNoTests=false
clean install
clean verify
- name: Performance tests
if: contains(github.event.pull_request.labels.*.name, 'performance')
uses: coactions/setup-xvfb@b6b4fcfb9f5a895edadc3bc76318fae0ac17c8b3 # v1.0.1
Expand Down
2 changes: 1 addition & 1 deletion Jenkinsfile
Original file line number Diff line number Diff line change
Expand Up @@ -299,7 +299,7 @@ pipeline {
dir('eclipse.platform.swt') {
sh '''
mvn clean verify \
--batch-mode -DforkCount=0 \
--batch-mode --threads 1C -DforkCount=0 \
-Dcompare-version-with-baselines.skip=false -Dmaven.compiler.failOnWarning=true \
-Dorg.eclipse.swt.tests.junit.disable.test_isLocal=true \
-Dmaven.test.failure.ignore=true -Dmaven.test.error.ignore=true
Expand Down
3 changes: 2 additions & 1 deletion tests/org.eclipse.swt.tests.cocoa/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ Bundle-Version: 3.108.100.qualifier
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
Require-Bundle: org.junit;bundle-version="4.12.0",
org.eclipse.swt
org.eclipse.swt,
org.eclipse.swt.tests
Eclipse-BundleShape: dir
Bundle-RequiredExecutionEnvironment: JavaSE-17
Automatic-Module-Name: org.eclipse.swt.tests.cocoa
3 changes: 2 additions & 1 deletion tests/org.eclipse.swt.tests.gtk/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ Bundle-SymbolicName: org.eclipse.swt.tests.gtk
Bundle-Version: 3.109.0.qualifier
Bundle-Vendor: Eclipse.org
Require-Bundle: org.junit;bundle-version="4.12.0",
org.eclipse.swt
org.eclipse.swt,
org.eclipse.swt.tests
Eclipse-BundleShape: dir
Bundle-RequiredExecutionEnvironment: JavaSE-17
Automatic-Module-Name: org.eclipse.swt.tests.gtk
3 changes: 2 additions & 1 deletion tests/org.eclipse.swt.tests.win32/META-INF/MANIFEST.MF
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,8 @@ Bundle-Version: 3.108.100.qualifier
Bundle-Vendor: Eclipse.org
Bundle-Localization: plugin
Require-Bundle: org.junit;bundle-version="4.12.0",
org.eclipse.swt
org.eclipse.swt,
org.eclipse.swt.tests
Eclipse-BundleShape: dir
Bundle-RequiredExecutionEnvironment: JavaSE-17
Automatic-Module-Name: org.eclipse.swt.tests.win32

0 comments on commit ce3bbd0

Please sign in to comment.