Bug 443655 - 2 Junit failures due to removal of Mac 32 bit platform
Change-Id: Ib61ced95f0144c2c023fd1a31ee9e2fbea030de4
diff --git a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/PublishingTests.java b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/PublishingTests.java
index f0ef3e1..26d771f 100644
--- a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/PublishingTests.java
+++ b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/p2/PublishingTests.java
@@ -1599,7 +1599,7 @@
properties.put("product", product.getLocation().toOSString());
if (!delta.equals(new File((String) properties.get("baseLocation"))))
properties.put("pluginPath", delta.getAbsolutePath());
- properties.put("configs", "macosx, cocoa, x86");
+ properties.put("configs", "macosx, cocoa, x86_64");
properties.put("p2.gathering", "true");
Utils.storeBuildProperties(buildFolder, properties);
@@ -1607,12 +1607,12 @@
IFile ini = buildFolder.getFile("eclipse.ini");
boolean lowerCase = true;
- if (!Utils.extractFromZip(buildFolder, "I.TestBuild/eclipse-macosx.cocoa.x86.zip", "eclipse/eclipse.app/Contents/MacOS/eclipse.ini", ini)) {
+ if (!Utils.extractFromZip(buildFolder, "I.TestBuild/eclipse-macosx.cocoa.x86_64.zip", "eclipse/eclipse.app/Contents/MacOS/eclipse.ini", ini)) {
lowerCase = false;
- Utils.extractFromZip(buildFolder, "I.TestBuild/eclipse-macosx.cocoa.x86.zip", "eclipse/Eclipse.app/Contents/MacOS/eclipse.ini", ini);
+ Utils.extractFromZip(buildFolder, "I.TestBuild/eclipse-macosx.cocoa.x86_64.zip", "eclipse/Eclipse.app/Contents/MacOS/eclipse.ini", ini);
}
- IFile zip = buildFolder.getFile("I.TestBuild/eclipse-macosx.cocoa.x86.zip");
+ IFile zip = buildFolder.getFile("I.TestBuild/eclipse-macosx.cocoa.x86_64.zip");
String exeString = (lowerCase ? "eclipse/eclipse.app/" : "eclipse/Eclipse.app/") + "Contents/MacOS/eclipse";
assertZipPermissions(zip, exeString, "-rwxr-xr-x");
@@ -1635,7 +1635,7 @@
assertFalse(duplicate);
IMetadataRepository repo = loadMetadataRepository(buildFolder.getFolder("buildRepo").getLocationURI());
- IInstallableUnit iu = getIU(repo, "toolingcocoa.macosx.x86org.eclipse.equinox.common");
+ IInstallableUnit iu = getIU(repo, "toolingcocoa.macosx.x86_64org.eclipse.equinox.common");
assertEquals(iu.getVersion().toString(), "1.0.0");
IInstallableUnit common = getIU(repo, EQUINOX_COMMON);
