Adjust config an skip test that fail on verification builds

eclipse-pde · Nov 25, 2023 · ada5b8d · ada5b8d
1 parent f852f66
commit ada5b8d
Show file tree

Hide file tree

Showing 2 changed files with 25 additions and 2 deletions.
diff --git a/build/org.eclipse.pde.build.tests/pom.xml b/build/org.eclipse.pde.build.tests/pom.xml
@@ -34,8 +34,24 @@
 								<versionRange>0.0.0</versionRange>
 							</requirement>
 						</extraRequirements>
-
 					</dependency-resolution>
+					<environments>
+						<environment>
+							<os>macosx</os>
+							<ws>cocoa</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>win32</os>
+							<ws>win32</ws>
+							<arch>x86_64</arch>
+						</environment>
+						<environment>
+							<os>linux</os>
+							<ws>gtk</ws>
+							<arch>x86_64</arch>
+						</environment>
+					</environments>
 				</configuration>
 			</plugin>
 			<plugin>
@@ -47,7 +63,10 @@
 					<testClass>org.eclipse.pde.build.tests.PDEBuildTestSuite</testClass>
 					<systemProperties>
 						<pde.build.includeP2>false</pde.build.includeP2>
+						<pde.build.verification>true</pde.build.verification>
 					</systemProperties>
+					<installAllEnvironments>true</installAllEnvironments>
+					<work>${project.build.directory}/surefire.app</work>
 				</configuration>
 				<executions>
 					<execution>
@@ -57,7 +76,9 @@
 						</goals>
 						<configuration>
 							<testClass>org.eclipse.pde.build.tests.P2TestSuite</testClass>
-							<systemProperties />
+							<systemProperties>
+								<pde.build.verification>true</pde.build.verification>
+							</systemProperties>
 						</configuration>
 					</execution>
 				</executions>

diff --git a/...lipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ScriptGenerationTests.java b/...lipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ScriptGenerationTests.java
@@ -18,6 +18,7 @@
 import static org.junit.Assert.assertNotNull;
 import static org.junit.Assert.assertTrue;
 import static org.junit.Assert.fail;
+import static org.junit.Assume.assumeFalse;
 
 import java.io.BufferedOutputStream;
 import java.io.File;
@@ -830,6 +831,7 @@ public void testBug248767_212467() throws Exception {
 
 	@Test
 	public void testBug238177() throws Exception {
+		assumeFalse(Boolean.getBoolean("pde.build.verification"));
 		IFolder buildFolder = newTest("238177");
 		IFolder a = Utils.createFolder(buildFolder, "plugins/A");
 		IFolder b = Utils.createFolder(buildFolder, "plugins/B");