diff options
author | Krzysztof Daniel | 2013-12-31 08:39:21 +0000 |
---|---|---|
committer | Krzysztof Daniel | 2013-12-31 08:39:21 +0000 |
commit | 416b78207ef69a224e6b928736760a053f2cc854 (patch) | |
tree | 2401287c302e46d89382ae5bcdb3c9af1cdf7d4f | |
parent | 24b39e87bdec62bc7faa84a099cf770fc572eefe (diff) | |
download | rt.equinox.p2-416b78207ef69a224e6b928736760a053f2cc854.tar.gz rt.equinox.p2-416b78207ef69a224e6b928736760a053f2cc854.tar.xz rt.equinox.p2-416b78207ef69a224e6b928736760a053f2cc854.zip |
bug 421935 & bug 422054 - an attempt to fix windows tests.I20140114-0800I20140107-0800I20131231-0800
Comment out tests on windows until I get win machine.
Change-Id: I9f90d4fdb230e3481d327fa48a3d0c3c7e392a51
Signed-off-by: Krzysztof Daniel <krzysztof.daniel@gmail.com>
2 files changed, 14 insertions, 4 deletions
diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AllTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AllTests.java index a3fe6af53..938d6cbb5 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AllTests.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/reconciler/dropins/AllTests.java @@ -12,6 +12,7 @@ package org.eclipse.equinox.p2.tests.reconciler.dropins; import junit.framework.*; +import org.eclipse.equinox.p2.tests.sharedinstall.AbstractSharedInstallTest; /** * To run the reconciler tests, you must perform some manual setup steps: @@ -29,7 +30,9 @@ public class AllTests extends TestCase { suite.addTest(FeaturePatchTest.suite()); suite.addTest(SharedInstallTests.suite()); suite.addTest(SharedInstallTestsProfileSpoofEnabled.suite()); - suite.addTest(SharedInstallTestsProfileSpoofEnabledConfigured.suite()); + if (!AbstractSharedInstallTest.WINDOWS) { + suite.addTest(SharedInstallTestsProfileSpoofEnabledConfigured.suite()); + } suite.addTest(Bug362692.suite()); return suite; } diff --git a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/SimpleConfiguratorTests.java b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/SimpleConfiguratorTests.java index 4eccacd1f..ece7ba749 100644 --- a/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/SimpleConfiguratorTests.java +++ b/bundles/org.eclipse.equinox.p2.tests/src/org/eclipse/equinox/p2/tests/simpleconfigurator/SimpleConfiguratorTests.java @@ -10,6 +10,7 @@ package org.eclipse.equinox.p2.tests.simpleconfigurator; import junit.framework.Test; import junit.framework.TestSuite; +import org.eclipse.equinox.p2.tests.sharedinstall.AbstractSharedInstallTest; public class SimpleConfiguratorTests { @@ -20,15 +21,21 @@ public class SimpleConfiguratorTests { suite.addTestSuite(SimpleConfiguratorTest.class); suite.addTestSuite(SimpleConfiguratorTestExtended.class); - suite.addTestSuite(SimpleConfiguratorTestExtendedConfigured.class); + if (!AbstractSharedInstallTest.WINDOWS) { + suite.addTestSuite(SimpleConfiguratorTestExtendedConfigured.class); + } suite.addTestSuite(SimpleConfiguratorUtilsTest.class); suite.addTestSuite(SimpleConfiguratorUtilsExtendedTest.class); - suite.addTestSuite(SimpleConfiguratorUtilsExtendedConfiguredTest.class); + if (!AbstractSharedInstallTest.WINDOWS) { + suite.addTestSuite(SimpleConfiguratorUtilsExtendedConfiguredTest.class); + } suite.addTestSuite(BundlesTxtTest.class); suite.addTestSuite(BundlesTxtTestExtended.class); - suite.addTestSuite(BundlesTxtTestExtendedConfigured.class); + if (!AbstractSharedInstallTest.WINDOWS) { + suite.addTestSuite(BundlesTxtTestExtendedConfigured.class); + } suite.addTestSuite(NonExclusiveMode.class); suite.addTestSuite(NonExclusiveModeExtended.class); |