From c41d0e50f3a4d27e2bd7da1c2c0f2cbe83c97ae1 Mon Sep 17 00:00:00 2001 From: Alexander Kurtakov Date: Fri, 4 Dec 2015 03:22:15 -0500 Subject: [PATCH] Revert "autotools: Make tests fragments." This reverts commit 375b162ea201b7dd931ee2fe55a75ec7ace6ace6. Change-Id: I3638f4baebd0b7975da77f95af8c436bec9d9af2 --- .../META-INF/MANIFEST.MF | 6 ++++- .../autotools/tests/UpdateConfigureTest.java | 22 +++++++++---------- .../META-INF/MANIFEST.MF | 22 ++++++++++++++++--- 3 files changed, 35 insertions(+), 15 deletions(-) diff --git a/build/org.eclipse.cdt.autotools.tests/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.autotools.tests/META-INF/MANIFEST.MF index c23c6f03010..d0307d22d88 100644 --- a/build/org.eclipse.cdt.autotools.tests/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.autotools.tests/META-INF/MANIFEST.MF @@ -7,17 +7,21 @@ Bundle-Vendor: %provider Bundle-Localization: plugin Require-Bundle: org.eclipse.ui, org.eclipse.core.runtime, + org.eclipse.cdt.autotools.core;bundle-version="1.0.2", org.eclipse.core.resources, org.eclipse.cdt.managedbuilder.core, org.eclipse.cdt.ui, org.junit, org.eclipse.ui.ide, org.eclipse.jface.text, + org.eclipse.ui.editors, + org.eclipse.cdt.make.core, + org.eclipse.cdt.make.ui, + org.eclipse.ui.workbench.texteditor, org.eclipse.cdt.core, org.eclipse.cdt.autotools.ui;bundle-version="1.0.0", org.eclipse.cdt.core.tests Bundle-ActivationPolicy: lazy -Fragment-Host: org.eclipse.cdt.autotools.core Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Export-Package: org.eclipse.cdt.autotools.tests, org.eclipse.cdt.autotools.tests.autoconf, diff --git a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/UpdateConfigureTest.java b/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/UpdateConfigureTest.java index 80b1765fa5b..bfa5596d055 100644 --- a/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/UpdateConfigureTest.java +++ b/build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/UpdateConfigureTest.java @@ -26,10 +26,10 @@ import javax.xml.parsers.DocumentBuilderFactory; import javax.xml.parsers.ParserConfigurationException; import org.eclipse.cdt.autotools.core.AutotoolsOptionConstants; +import org.eclipse.cdt.autotools.core.AutotoolsPlugin; import org.eclipse.cdt.autotools.core.IAutotoolsOption; import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; -import org.eclipse.cdt.internal.autotools.core.configure.AutotoolsConfigurationManager; import org.eclipse.cdt.managedbuilder.core.IConfiguration; import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature; @@ -80,13 +80,13 @@ public class UpdateConfigureTest { ICConfigurationDescription cfgDes = CoreModel.getDefault().getProjectDescription(testProject).getActiveConfiguration(); IConfiguration cfg = ManagedBuildManager.getConfigurationForDescription(cfgDes); assertTrue(cfg.getName().equals("Build (GNU)")); - Map opts = AutotoolsConfigurationManager.getInstance().getAutotoolsCfgOptions(testProject, cfg.getId()); + Map opts = AutotoolsPlugin.getDefault().getAutotoolCfgOptions(testProject, cfg.getId()); IAutotoolsOption k = opts.get(AutotoolsOptionConstants.OPT_CFLAGS_GPROF); k.setValue("true"); // Now update the options we changed - AutotoolsConfigurationManager.getInstance().updateAutotoolCfgOptions(testProject, cfg.getId(), opts); + AutotoolsPlugin.getDefault().updateAutotoolCfgOptions(testProject, cfg.getId(), opts); // Rebuild project assertTrue(ProjectTools.build()); @@ -106,7 +106,7 @@ public class UpdateConfigureTest { } // Reset gprof opt and set gcov opt - opts = AutotoolsConfigurationManager.getInstance().getAutotoolsCfgOptions(testProject, cfg.getId()); + opts = AutotoolsPlugin.getDefault().getAutotoolCfgOptions(testProject, cfg.getId()); k = opts.get(AutotoolsOptionConstants.OPT_CFLAGS_GPROF); k.setValue("false"); @@ -114,7 +114,7 @@ public class UpdateConfigureTest { k.setValue("true"); // Now update the options we changed - AutotoolsConfigurationManager.getInstance().updateAutotoolCfgOptions(testProject, cfg.getId(), opts); + AutotoolsPlugin.getDefault().updateAutotoolCfgOptions(testProject, cfg.getId(), opts); // Rebuild project assertTrue(ProjectTools.build()); @@ -130,7 +130,7 @@ public class UpdateConfigureTest { } // Reset gcov opt and set debug opt - opts = AutotoolsConfigurationManager.getInstance().getAutotoolsCfgOptions(testProject, cfg.getId()); + opts = AutotoolsPlugin.getDefault().getAutotoolCfgOptions(testProject, cfg.getId()); k = opts.get(AutotoolsOptionConstants.OPT_CFLAGS_GCOV); k.setValue("false"); @@ -138,7 +138,7 @@ public class UpdateConfigureTest { k.setValue("true"); // Now update the options we changed - AutotoolsConfigurationManager.getInstance().updateAutotoolCfgOptions(testProject, cfg.getId(), opts); + AutotoolsPlugin.getDefault().updateAutotoolCfgOptions(testProject, cfg.getId(), opts); // Rebuild project assertTrue(ProjectTools.build()); @@ -168,7 +168,7 @@ public class UpdateConfigureTest { ICConfigurationDescription cfgDes = CoreModel.getDefault().getProjectDescription(testProject).getActiveConfiguration(); IConfiguration cfg = ManagedBuildManager.getConfigurationForDescription(cfgDes); assertTrue(cfg.getName().equals("Build (GNU)")); - Map opts = AutotoolsConfigurationManager.getInstance().getAutotoolsCfgOptions(testProject, cfg.getId()); + Map opts = AutotoolsPlugin.getDefault().getAutotoolCfgOptions(testProject, cfg.getId()); IAutotoolsOption configdir = opts.get(AutotoolsOptionConstants.OPT_CONFIGDIR); assertEquals(configdir.getType(), IAutotoolsOption.INTERNAL); assertTrue(configdir.getValue().equals("src")); @@ -412,13 +412,13 @@ public class UpdateConfigureTest { // Verify last option changed has changed in our copy, but not // in the actual options assertEquals(k.getValue(), "true"); - Map opts2 = AutotoolsConfigurationManager.getInstance().getAutotoolsCfgOptions(testProject, cfg.getId()); + Map opts2 = AutotoolsPlugin.getDefault().getAutotoolCfgOptions(testProject, cfg.getId()); IAutotoolsOption k2 = opts2.get(AutotoolsOptionConstants.OPT_VERSION); assertEquals(k2.getValue(), "false"); // Now update the options we changed - AutotoolsConfigurationManager.getInstance().updateAutotoolCfgOptions(testProject, cfg.getId(), opts); - opts2 = AutotoolsConfigurationManager.getInstance().getAutotoolsCfgOptions(testProject, cfg.getId()); + AutotoolsPlugin.getDefault().updateAutotoolCfgOptions(testProject, cfg.getId(), opts); + opts2 = AutotoolsPlugin.getDefault().getAutotoolCfgOptions(testProject, cfg.getId()); // Verify new option values k = opts2.get(AutotoolsOptionConstants.TOOL_AUTOGEN); diff --git a/build/org.eclipse.cdt.autotools.ui.tests/META-INF/MANIFEST.MF b/build/org.eclipse.cdt.autotools.ui.tests/META-INF/MANIFEST.MF index 65197c5e277..d3889c55783 100644 --- a/build/org.eclipse.cdt.autotools.ui.tests/META-INF/MANIFEST.MF +++ b/build/org.eclipse.cdt.autotools.ui.tests/META-INF/MANIFEST.MF @@ -4,10 +4,26 @@ Bundle-Name: %bundleName Bundle-SymbolicName: org.eclipse.cdt.autotools.ui.tests Bundle-Version: 1.0.0.qualifier Bundle-Localization: plugin -Require-Bundle: org.eclipse.swtbot.go, +Require-Bundle: org.eclipse.ui, + org.eclipse.core.runtime, + org.eclipse.swtbot.eclipse.core, + org.eclipse.swtbot.eclipse.finder, + org.eclipse.swtbot.junit4_x, + org.eclipse.swtbot.swt.finder, + org.eclipse.swtbot.go, + org.apache.log4j, org.eclipse.core.resources, - org.eclipse.cdt.core + org.eclipse.cdt.autotools.core, + org.eclipse.cdt.autotools.ui, + org.eclipse.cdt.core, + org.eclipse.cdt.core.native, + org.eclipse.cdt.launch, + org.eclipse.cdt.make.core, + org.eclipse.cdt.make.ui, + org.eclipse.cdt.managedbuilder.core, + org.eclipse.cdt.managedbuilder.gnu.ui, + org.eclipse.cdt.managedbuilder.ui, + org.eclipse.cdt.ui Bundle-ActivationPolicy: lazy -Fragment-Host: org.eclipse.cdt.autotools.ui Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-Vendor: %provider