Bug 539363 - 11 pde.build test failures with I20180923-1800I20181007-1800I20181007-0600I20181006-1800I20181006-0600I20181005-1800I20181004-1800

Adjust x86 to x86_64 in even more places.

Change-Id: Ica0e60cdd5c42600ee51541ec8ee38ac4a572e74
Signed-off-by: Alexander Kurtakov <akurtako@redhat.com>

3 files changed, 30 insertions, 34 deletions

diff --git a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/AssembleTests.java b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/AssembleTests.java
index 5249e09d..5ce860b3 100644
--- a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/AssembleTests.java
+++ b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/AssembleTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2017 IBM Corporation and others.
+ * Copyright (c) 2007, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which accompanies this distribution,
@@ -43,13 +43,13 @@ public class AssembleTests extends PDETestCase {
 		assertNotNull(executable);
 
 		Utils.generateFeature(buildFolder, "sdk", null, new String[] { "org.eclipse.swt;unpack=\"false\"",
-				"org.eclipse.swt.win32.win32.x86;unpack=\"false\";os=\"win32\";ws=\"win32\";arch=\"x86\"" });
+				"org.eclipse.swt.win32.win32.x86_64;unpack=\"false\";os=\"win32\";ws=\"win32\";arch=\"x86_64\"" });
 
 		Properties buildProperties = BuildConfiguration.getBuilderProperties(buildFolder);
 		buildProperties.put("topLevelElementId", "sdk");
 		if (!executable.equals(new File((String) buildProperties.get("baseLocation"))))
 			buildProperties.put("pluginPath", executable.getAbsolutePath());
-		buildProperties.put("configs", "win32, win32, x86");
+		buildProperties.put("configs", "win32, win32, x86_64");
 
 		Utils.storeBuildProperties(buildFolder, buildProperties);
 		Utils.generateAllElements(buildFolder, "sdk");
@@ -59,8 +59,8 @@ public class AssembleTests extends PDETestCase {
 		String[] log = new String[] { "post.gather.bin.parts", "eclipse.base: " + buildLocation + "/tmp/eclipse",
 				"post.jarUp", "plugins: " + buildLocation + "/tmp/eclipse/plugins",
 				"features: " + buildLocation + "/tmp/eclipse/features", "pre.archive",
-				"rootFolder: " + buildLocation + "/tmp/eclipse/win32.win32.x86/eclipse",
-				"archiveFullPath: " + buildLocation + "/I.TestBuild/eclipse-win32.win32.x86.zip" };
+				"rootFolder: " + buildLocation + "/tmp/eclipse/win32.win32.x86_64/eclipse",
+				"archiveFullPath: " + buildLocation + "/I.TestBuild/eclipse-win32.win32.x86_64.zip" };
 		assertLogContainsLines(buildFolder.getFile("log.log"), log);
 	}
 
@@ -86,8 +86,8 @@ public class AssembleTests extends PDETestCase {
 		runBuild(buildFolder);
 
 		assertResourceFile(buildFolder, "I.TestBuild/sdk-TestBuild.zip");
-		assertResourceFile(buildFolder, "I.TestBuild/sdk-TestBuild-linux.gtk.x86.zip");
-		assertResourceFile(buildFolder, "I.TestBuild/sdk-TestBuild-win32.win32.x86.zip");
+		assertResourceFile(buildFolder, "I.TestBuild/sdk-TestBuild-linux.gtk.x86_64.zip");
+		assertResourceFile(buildFolder, "I.TestBuild/sdk-TestBuild-win32.win32.x86_64.zip");
 	}
 
 	public void testBug179612_custom() throws Exception {
@@ -129,7 +129,7 @@ public class AssembleTests extends PDETestCase {
 		// base location,
 		// jar them up in the build and assert they still verify
 		Utils.generateFeature(buildFolder, "sdk", null, new String[] { "org.eclipse.pde.build;unpack=\"false\"",
-				"org.eclipse.equinox.launcher.win32.win32.x86;unpack=\"false\"" });
+				"org.eclipse.equinox.launcher.win32.win32.x86_64;unpack=\"false\"" });
 
 		File executable = Utils.findExecutable();
 		assertNotNull(executable);
@@ -158,14 +158,14 @@ public class AssembleTests extends PDETestCase {
 
 		Utils.generateFeature(buildFolder, "sdk", null,
 				new String[] { "org.eclipse.swt;unpack=\"false\"",
-						"org.eclipse.swt.win32.win32.x86;unpack=\"false\";os=\"win32\";ws=\"win32\";arch=\"x86\"",
-						"org.eclipse.swt.gtk.linux.x86;unpack=\"false\";os=\"linux\";ws=\"gtk\";arch=\"x86\"" });
+						"org.eclipse.swt.win32.win32.x86_64;unpack=\"false\";os=\"win32\";ws=\"win32\";arch=\"x86_64\"",
+						"org.eclipse.swt.gtk.linux.x86_64;unpack=\"false\";os=\"linux\";ws=\"gtk\";arch=\"x86_64\"" });
 
 		Properties buildProperties = BuildConfiguration.getBuilderProperties(buildFolder);
 		buildProperties.put("topLevelElementId", "sdk");
 		if (!executable.equals(new File((String) buildProperties.get("baseLocation"))))
 			buildProperties.put("pluginPath", executable.getAbsolutePath());
-		buildProperties.put("configs", "win32, win32, x86 & linux, gtk, x86");
+		buildProperties.put("configs", "win32, win32, x86_64 & linux, gtk, x86_64");
 		buildProperties.put("archivesFormat", "group,group,group-folder");
 		buildProperties.put("groupConfigurations", "true");
 
diff --git a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ProductTests.java b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ProductTests.java
index d49f886a..4dd33240 100644
--- a/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ProductTests.java
+++ b/org.eclipse.pde.build.tests/src/org/eclipse/pde/build/internal/tests/ProductTests.java
@@ -1,5 +1,5 @@
 /*******************************************************************************
- * Copyright (c) 2007, 2017 IBM Corporation and others.
+ * Copyright (c) 2007, 2018 IBM Corporation and others.
  *
  * This program and the accompanying materials are made available under the
  * terms of the Eclipse Public License 2.0 which accompanies this distribution,
@@ -245,13 +245,9 @@ public class ProductTests extends PDETestCase {
 		FilenameFilter filter = (dir, name) -> name.startsWith("org.eclipse.equinox.executable");
 		File[] files = new File(executable, "features").listFiles(filter);
 
-		File win32Exe = new File(files[0], "bin/win32/win32/x86/launcher.exe");
-		assertTrue(win32Exe.exists());
 		File win64Exe = new File(files[0], "bin/win32/win32/x86_64/launcher.exe");
 		assertTrue(win64Exe.exists());
 
-		IFile win32File = buildFolder.getFile("win32.exe");
-		win32File.create(new BufferedInputStream(new FileInputStream(win32Exe)), IResource.FORCE, null);
 		IFile win64File = buildFolder.getFile("win64.exe");
 		win64File.create(new BufferedInputStream(new FileInputStream(win64Exe)), IResource.FORCE, null);
 
@@ -266,7 +262,6 @@ public class ProductTests extends PDETestCase {
 		try (PrintStream newErr = new PrintStream(
 				new FileOutputStream(buildFolder.getLocation().toOSString() + "/out.out"))) {
 			System.setErr(newErr);
-			IconExe.main(new String[] { win32File.getLocation().toOSString(), icoFile.getLocation().toOSString() });
 			IconExe.main(new String[] { win64File.getLocation().toOSString(), icoFile.getLocation().toOSString() });
 			System.setErr(oldErr);
 		}
@@ -330,7 +325,8 @@ public class ProductTests extends PDETestCase {
 
 		IFile product = buildFolder.getFile("foo.product");
 		Utils.generateProduct(product, null, "1.0.0", null, new String[] { "A",
-				"org.eclipse.equinox.simpleconfigurator", "org.eclipse.swt", "org.eclipse.swt.gtk.linux.x86" }, false);
+				"org.eclipse.equinox.simpleconfigurator", "org.eclipse.swt", "org.eclipse.swt.gtk.linux.x86_64" },
+				false);
 
 		IFolder A1 = Utils.createFolder(buildFolder, "plugins/A1");
 		IFolder A2 = Utils.createFolder(buildFolder, "plugins/A2");
@@ -343,7 +339,7 @@ public class ProductTests extends PDETestCase {
 		Properties properties = BuildConfiguration.getBuilderProperties(buildFolder);
 		properties.put("product", product.getLocation().toOSString());
 		properties.put("includeLaunchers", "false");
-		properties.put("configs", "win32,win32,x86 & linux,gtk,x86");
+		properties.put("configs", "win32,win32,x86_64 & linux,gtk,x86_64");
 		// properties.put("archivesFormat", "win32,win32,x86-folder");
 		if (!executable.equals(new File((String) properties.get("baseLocation"))))
 			properties.put("pluginPath", executable.getAbsolutePath());
@@ -352,7 +348,7 @@ public class ProductTests extends PDETestCase {
 		runProductBuild(buildFolder);
 
 		IFolder tmp = Utils.createFolder(buildFolder, "tmp");
-		FileUtils.unzipFile(buildFolder.getFile("I.TestBuild/eclipse-win32.win32.x86.zip").getLocation().toFile(),
+		FileUtils.unzipFile(buildFolder.getFile("I.TestBuild/eclipse-win32.win32.x86_64.zip").getLocation().toFile(),
 				tmp.getLocation().toFile());
 
 		File file = buildFolder.getFolder("tmp/eclipse/plugins").getLocation().toFile();
@@ -366,7 +362,7 @@ public class ProductTests extends PDETestCase {
 		assertLogContainsLine(info, bundleString);
 		boolean swtNotThere = true;
 		try {
-			assertLogContainsLine(info, "org.eclipse.swt.gtk.linux.x86");
+			assertLogContainsLine(info, "org.eclipse.swt.gtk.linux.x86_64");
 			swtNotThere = false;
 		} catch (AssertionFailedError e) {
 			// good
@@ -374,9 +370,9 @@ public class ProductTests extends PDETestCase {
 		assertTrue(swtNotThere);
 
 		IFile gtkInfo = buildFolder.getFile("gtk.info");
-		Utils.extractFromZip(buildFolder, "I.TestBuild/eclipse-linux.gtk.x86.zip",
+		Utils.extractFromZip(buildFolder, "I.TestBuild/eclipse-linux.gtk.x86_64.zip",
 				"eclipse/configuration/org.eclipse.equinox.simpleconfigurator/bundles.info", gtkInfo);
-		assertLogContainsLine(gtkInfo, "org.eclipse.swt.gtk.linux.x86");
+		assertLogContainsLine(gtkInfo, "org.eclipse.swt.gtk.linux.x86_64");
 	}
 
 	public void testBug271373() throws Exception {
@@ -581,7 +577,7 @@ public class ProductTests extends PDETestCase {
 		Utils.generateBundle(a, "A");
 		Attributes manifestAdditions = new Attributes();
 		manifestAdditions.put(new Attributes.Name("Eclipse-PlatformFilter"),
-				"(& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=x86))");
+				"(& (osgi.ws=win32) (osgi.os=win32) (osgi.arch=x86_64))");
 		Utils.generateBundleManifest(a, "A", "1.0.0", manifestAdditions);
 		Utils.generatePluginBuildProperties(a, null);
 		Utils.writeBuffer(a.getFile("src/a.java"), new StringBuffer("class A {}"));
@@ -605,7 +601,7 @@ public class ProductTests extends PDETestCase {
 		buildProperties.put("product", product.getLocation().toOSString());
 		buildProperties.put("filteredDependencies", "true");
 		buildProperties.put("pluginPath", executable.getAbsolutePath());
-		buildProperties.put("configs", "win32, win32, x86");
+		buildProperties.put("configs", "win32, win32, x86_64");
 		// buildProperties.put("archivesFormat", "win32,win32,x86 - folder");
 
 		Utils.storeBuildProperties(buildFolder, buildProperties);
@@ -615,6 +611,6 @@ public class ProductTests extends PDETestCase {
 		Set<String> entries = new HashSet<>();
 		entries.add("eclipse/plugins/A_1.0.0.jar");
 		entries.add("eclipse/rcp.exe");
-		assertZipContents(buildFolder, "I.TestBuild/eclipse-win32.win32.x86.zip", entries);
+		assertZipContents(buildFolder, "I.TestBuild/eclipse-win32.win32.x86_64.zip", entries);
 	}
 }
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 8254ab9c..03568cee 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
@@ -1195,13 +1195,13 @@ public class PublishingTests extends P2TestCase {
 
 		IFile productFile = buildFolder.getFile("rcp.product");
 		Utils.generateProduct(productFile, "rcp.product", "1.0.0.qualifier", new String[] { OSGI, EQUINOX_COMMON,
-				"org.eclipse.swt", "org.eclipse.swt.win32.win32.x86", "org.eclipse.swt.gtk.linux.x86" }, false);
+				"org.eclipse.swt", "org.eclipse.swt.win32.win32.x86_64", "org.eclipse.swt.gtk.linux.x86_64" }, false);
 		Properties p2Inf = new Properties(); // bug 268223
 		p2Inf.put("org.eclipse.pde.build.append.startlevels", "false");
 		Utils.storeProperties(buildFolder.getFile("p2.inf"), p2Inf);
 
 		Properties properties = BuildConfiguration.getBuilderProperties(buildFolder);
-		properties.put("configs", "win32,win32,x86");
+		properties.put("configs", "win32,win32,x86_64");
 		if (!executable.equals(new File((String) properties.get("baseLocation"))))
 			properties.put("pluginPath", executable.getAbsolutePath());
 		properties.put("product", productFile.getLocation().toOSString());
@@ -1227,7 +1227,7 @@ public class PublishingTests extends P2TestCase {
 		assertNull(getIU(metadata, "toolingorg.eclipse.equinox.common", false));
 
 		// bug 271141
-		assertFalse(buildFolder.getFile("I.TestBuild/eclipse-win32.win32.x86.zip").exists());
+		assertFalse(buildFolder.getFile("I.TestBuild/eclipse-win32.win32.x86_64.zip").exists());
 		assertFalse(buildFolder.getFolder("finalRepo").exists());
 	}
 
@@ -1519,7 +1519,7 @@ public class PublishingTests extends P2TestCase {
 		properties = BuildConfiguration.getBuilderProperties(buildFolder);
 		if (!executable.equals(new File((String) properties.get("baseLocation"))))
 			properties.put("pluginPath", executable.getAbsolutePath());
-		properties.put("configs", "win32,win32,x86");
+		properties.put("configs", "win32,win32,x86_64");
 		properties.put("product", productFile.getLocation().toOSString());
 		properties.put("filteredDependencyCheck", "true");
 		properties.put("p2.gathering", "true");
@@ -1539,8 +1539,8 @@ public class PublishingTests extends P2TestCase {
 				.append("      <p2.mirror destination=\"" + finalRepo.getLocation().toOSString() + "\"			\n");
 		customBuffer
 				.append("                 source=\"${p2.build.repo}\" >											\n");
-		customBuffer
-				.append("          <slicingOptions platformFilter=\"win32,win32,x86\" 							\n");
+		customBuffer.append(
+				"          <slicingOptions platformFilter=\"win32,win32,x86_64\" 							\n");
 		customBuffer
 				.append("                          followStrict=\"true\" /> 									\n");
 		customBuffer
@@ -1556,14 +1556,14 @@ public class PublishingTests extends P2TestCase {
 		runProductBuild(buildFolder);
 
 		assertResourceFile(finalRepo, "binary/f_root_1.0.0");
-		assertResourceFile(finalRepo, "binary/rcp.product_root.win32.win32.x86_1.0.0");
+		assertResourceFile(finalRepo, "binary/rcp.product_root.win32.win32.x86_64_1.0.0");
 		assertResourceFile(finalRepo, "features/f_1.0.0.jar");
 
 		HashSet<String> entries = new HashSet<>();
 		entries.add("eclipse/eclipse.exe");
 		entries.add("eclipse/features/f_1.0.0/feature.xml");
 		entries.add("eclipse/sub/important.txt");
-		assertZipContents(buildFolder, "I.TestBuild/eclipse-win32.win32.x86.zip", entries);
+		assertZipContents(buildFolder, "I.TestBuild/eclipse-win32.win32.x86_64.zip", entries);
 	}
 
 	public void testDirectorLogging() throws Exception {