diff options
author | Sravan Kumar Lakkimsetti | 2020-10-05 09:34:55 +0000 |
---|---|---|
committer | Sravan Kumar Lakkimsetti | 2020-10-05 09:53:55 +0000 |
commit | 41d612bab16408c82f25f02d1d786187a092888f (patch) | |
tree | d65c1242f9fa619bd4ac0cf228b5778b0f547824 | |
parent | cdbbb5159f81811b3c340a8888a7255c74543e5d (diff) | |
download | rt.equinox.p2-41d612bab16408c82f25f02d1d786187a092888f.tar.gz rt.equinox.p2-41d612bab16408c82f25f02d1d786187a092888f.tar.xz rt.equinox.p2-41d612bab16408c82f25f02d1d786187a092888f.zip |
Bug 567593 - [Tests] About 50 p2 tests failed on MacY20201008-1200Y20201006-1200S4_18_0_M1aS4_18_0_M1I20201012-0320I20201007-1800I20201007-1320I20201007-0600I20201006-1800I20201006-0840I20201006-0600I20201005-1800I20201005-0600
Change-Id: I48c7b7a8bb26993b47c435aac10f3de2393ab404
Signed-off-by: Sravan Kumar Lakkimsetti <sravankumarl@in.ibm.com>
-rw-r--r-- | bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java | 15 |
1 files changed, 14 insertions, 1 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java index 620c68af0..f1b090aa9 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AbstractReconcilerTest.java @@ -1,5 +1,5 @@ /******************************************************************************* - * Copyright (c) 2008, 2017 IBM Corporation and others. + * Copyright (c) 2008, 2020 IBM Corporation and others. * * This program and the accompanying materials * are made available under the terms of the Eclipse Public License 2.0 @@ -112,6 +112,8 @@ public class AbstractReconcilerTest extends AbstractProvisioningTest { } catch (IOException e) { fail("0.99", e); } + } else if (file.getName().toLowerCase().endsWith(".dmg")) { + extractDmg("1.1", file); } else { untar("1.0", file); } @@ -183,6 +185,17 @@ public class AbstractReconcilerTest extends AbstractProvisioningTest { } /* + * extract dmg given file in the output directory. + */ + private void extractDmg(String message, File file) { + output.mkdirs(); + run(message, new String[] { "hdiutil", "attach", file.getAbsolutePath() }); + run(message, new String[] { "cp", "-r", "/Volumes/Eclipse/Eclipse.app", output.getAbsolutePath() + "/" }); + run(message, new String[] { "hdiutil", "detach", "/Volumes/Eclipse" }); + run(message, new String[] { "xattr", "-rc", output.getAbsolutePath() + "/Eclipse.app" }); + } + + /* * Return a file object with a unique name in a temporary location. */ public static File getUniqueFolder() { |