Skip to content

Commit

Permalink
Skip some tests that fail on verification builds
Browse files Browse the repository at this point in the history
  • Loading branch information
laeubi committed Nov 24, 2023
1 parent f852f66 commit ac6f701
Show file tree
Hide file tree
Showing 5 changed files with 22 additions and 2 deletions.
6 changes: 4 additions & 2 deletions build/org.eclipse.pde.build.tests/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
<versionRange>0.0.0</versionRange>
</requirement>
</extraRequirements>

</dependency-resolution>
</configuration>
</plugin>
Expand All @@ -47,6 +46,7 @@
<testClass>org.eclipse.pde.build.tests.PDEBuildTestSuite</testClass>
<systemProperties>
<pde.build.includeP2>false</pde.build.includeP2>
<pde.build.skipPlatformDependent>true</pde.build.skipPlatformDependent>
</systemProperties>
</configuration>
<executions>
Expand All @@ -57,7 +57,9 @@
</goals>
<configuration>
<testClass>org.eclipse.pde.build.tests.P2TestSuite</testClass>
<systemProperties />
<systemProperties>
<pde.build.skipPlatformDependent>true</pde.build.skipPlatformDependent>
</systemProperties>
</configuration>
</execution>
</executions>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@
public class AssembleTests extends PDETestCase {
@Test
public void testCustomAssembly() throws Exception {
assumeExecutePlatformDependent();
IFolder buildFolder = newTest("customAssembly");

File executable = Utils.findExecutable();
Expand Down Expand Up @@ -59,6 +60,7 @@ public void testCustomAssembly() throws Exception {

@Test
public void testBug179612_default() throws Exception {
assumeExecutePlatformDependent();
IFolder buildFolder = newTest("179612");

File executable = Utils.findExecutable();
Expand Down Expand Up @@ -86,6 +88,7 @@ public void testBug179612_default() throws Exception {

@Test
public void testBug179612_custom() throws Exception {
assumeExecutePlatformDependent();
// we have a custom allElements.xml coming from the resources folder
IFolder buildFolder = newTest("179612_custom");

Expand Down Expand Up @@ -119,6 +122,7 @@ public void testBug179612_custom() throws Exception {

@Test
public void testBug196754() throws Exception {
assumeExecutePlatformDependent();
IFolder buildFolder = newTest("196754");

// pde.build and equinox.launcher.win32.win32.x86 exist as signed folders in the
Expand Down Expand Up @@ -149,6 +153,7 @@ public void testBug196754() throws Exception {

@Test
public void testBug211605() throws Exception {
assumeExecutePlatformDependent();
IFolder buildFolder = newTest("211605");

File executable = Utils.findExecutable();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -142,6 +142,7 @@ public void test218878() throws Exception {

@Test
public void test234032() throws Exception {
assumeExecutePlatformDependent();
IFolder buildFolder = newTest("234032");

File executable = Utils.findExecutable();
Expand Down Expand Up @@ -245,6 +246,7 @@ public void test315792() throws Exception {

@Test
public void test237747() throws Exception {
assumeExecutePlatformDependent();
IFolder buildFolder = newTest("237747");

File executable = Utils.findExecutable();
Expand Down Expand Up @@ -608,6 +610,7 @@ public void testBug266056_2() throws Exception {

@Test
public void testBug269540() throws Exception {
assumeExecutePlatformDependent();
IFolder buildFolder = newTest("269540");

File executable = Utils.findExecutable();
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -830,6 +830,7 @@ public void testBug248767_212467() throws Exception {

@Test
public void testBug238177() throws Exception {
assumeExecutePlatformDependent();
IFolder buildFolder = newTest("238177");
IFolder a = Utils.createFolder(buildFolder, "plugins/A");
IFolder b = Utils.createFolder(buildFolder, "plugins/B");
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -16,6 +16,7 @@
import static org.junit.Assert.assertEquals;
import static org.junit.Assert.assertNotNull;
import static org.junit.Assert.assertTrue;
import static org.junit.Assume.assumeFalse;

import java.io.BufferedReader;
import java.io.ByteArrayOutputStream;
Expand Down Expand Up @@ -491,4 +492,12 @@ public void assertZipPermissions(IFile zip, String file, String permissions) thr
}
}
}

/**
* Some PDE tests assume platform dependent name, this can be used to at least
* run all other tests
*/
protected static void assumeExecutePlatformDependent() {
assumeFalse(Boolean.getBoolean("pde.build.skipPlatformDependent"));
}
}

0 comments on commit ac6f701

Please sign in to comment.