mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-04-22 06:02:11 +02:00
Code Issues Wiki Activity

Revert "autotools: Make tests fragments."

Browse source 
This reverts commit 375b162ea2.

Change-Id: I3638f4baebd0b7975da77f95af8c436bec9d9af2
This commit is contained in:
Alexander Kurtakov 2015-12-04 03:22:15 -05:00
parent 226dd80cf6
commit c41d0e50f3
3 changed files with 35 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
build/org.eclipse.cdt.autotools.tests/META-INF/MANIFEST.MF
View file

@ -7,17 +7,21 @@ Bundle-Vendor: %provider
Bundle-Localization: plugin Bundle-Localization: plugin
Require-Bundle: org.eclipse.ui, Require-Bundle: org.eclipse.ui,
org.eclipse.core.runtime, org.eclipse.core.runtime,
org.eclipse.cdt.autotools.core;bundle-version="1.0.2",
org.eclipse.core.resources, org.eclipse.core.resources,
org.eclipse.cdt.managedbuilder.core, org.eclipse.cdt.managedbuilder.core,
org.eclipse.cdt.ui, org.eclipse.cdt.ui,
org.junit, org.junit,
org.eclipse.ui.ide, org.eclipse.ui.ide,
org.eclipse.jface.text, 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.core,
org.eclipse.cdt.autotools.ui;bundle-version="1.0.0", org.eclipse.cdt.autotools.ui;bundle-version="1.0.0",
org.eclipse.cdt.core.tests org.eclipse.cdt.core.tests
Bundle-ActivationPolicy: lazy Bundle-ActivationPolicy: lazy
Fragment-Host: org.eclipse.cdt.autotools.core
Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Export-Package: org.eclipse.cdt.autotools.tests, Export-Package: org.eclipse.cdt.autotools.tests,
org.eclipse.cdt.autotools.tests.autoconf, org.eclipse.cdt.autotools.tests.autoconf,

22
build/org.eclipse.cdt.autotools.tests/src/org/eclipse/cdt/autotools/tests/UpdateConfigureTest.java
View file

@ -26,10 +26,10 @@ import javax.xml.parsers.DocumentBuilderFactory;
import javax.xml.parsers.ParserConfigurationException; import javax.xml.parsers.ParserConfigurationException;
import org.eclipse.cdt.autotools.core.AutotoolsOptionConstants; 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.autotools.core.IAutotoolsOption;
import org.eclipse.cdt.core.model.CoreModel; import org.eclipse.cdt.core.model.CoreModel;
import org.eclipse.cdt.core.settings.model.ICConfigurationDescription; 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.IConfiguration;
import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager; import org.eclipse.cdt.managedbuilder.core.ManagedBuildManager;
import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature; import org.eclipse.cdt.managedbuilder.core.ManagedCProjectNature;
@ -80,13 +80,13 @@ public class UpdateConfigureTest {
ICConfigurationDescription cfgDes = CoreModel.getDefault().getProjectDescription(testProject).getActiveConfiguration(); ICConfigurationDescription cfgDes = CoreModel.getDefault().getProjectDescription(testProject).getActiveConfiguration();
IConfiguration cfg = ManagedBuildManager.getConfigurationForDescription(cfgDes); IConfiguration cfg = ManagedBuildManager.getConfigurationForDescription(cfgDes);
assertTrue(cfg.getName().equals("Build (GNU)")); assertTrue(cfg.getName().equals("Build (GNU)"));
Map<String, IAutotoolsOption> opts = AutotoolsConfigurationManager.getInstance().getAutotoolsCfgOptions(testProject, cfg.getId()); Map<String, IAutotoolsOption> opts = AutotoolsPlugin.getDefault().getAutotoolCfgOptions(testProject, cfg.getId());
IAutotoolsOption k = opts.get(AutotoolsOptionConstants.OPT_CFLAGS_GPROF); IAutotoolsOption k = opts.get(AutotoolsOptionConstants.OPT_CFLAGS_GPROF);
k.setValue("true"); k.setValue("true");
// Now update the options we changed // Now update the options we changed
AutotoolsConfigurationManager.getInstance().updateAutotoolCfgOptions(testProject, cfg.getId(), opts); AutotoolsPlugin.getDefault().updateAutotoolCfgOptions(testProject, cfg.getId(), opts);
// Rebuild project // Rebuild project
assertTrue(ProjectTools.build()); assertTrue(ProjectTools.build());
@ -106,7 +106,7 @@ public class UpdateConfigureTest {
} }
// Reset gprof opt and set gcov opt // 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 = opts.get(AutotoolsOptionConstants.OPT_CFLAGS_GPROF);
k.setValue("false"); k.setValue("false");
@ -114,7 +114,7 @@ public class UpdateConfigureTest {
k.setValue("true"); k.setValue("true");
// Now update the options we changed // Now update the options we changed
AutotoolsConfigurationManager.getInstance().updateAutotoolCfgOptions(testProject, cfg.getId(), opts); AutotoolsPlugin.getDefault().updateAutotoolCfgOptions(testProject, cfg.getId(), opts);
// Rebuild project // Rebuild project
assertTrue(ProjectTools.build()); assertTrue(ProjectTools.build());
@ -130,7 +130,7 @@ public class UpdateConfigureTest {
} }
// Reset gcov opt and set debug opt // 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 = opts.get(AutotoolsOptionConstants.OPT_CFLAGS_GCOV);
k.setValue("false"); k.setValue("false");
@ -138,7 +138,7 @@ public class UpdateConfigureTest {
k.setValue("true"); k.setValue("true");
// Now update the options we changed // Now update the options we changed
AutotoolsConfigurationManager.getInstance().updateAutotoolCfgOptions(testProject, cfg.getId(), opts); AutotoolsPlugin.getDefault().updateAutotoolCfgOptions(testProject, cfg.getId(), opts);
// Rebuild project // Rebuild project
assertTrue(ProjectTools.build()); assertTrue(ProjectTools.build());
@ -168,7 +168,7 @@ public class UpdateConfigureTest {
ICConfigurationDescription cfgDes = CoreModel.getDefault().getProjectDescription(testProject).getActiveConfiguration(); ICConfigurationDescription cfgDes = CoreModel.getDefault().getProjectDescription(testProject).getActiveConfiguration();
IConfiguration cfg = ManagedBuildManager.getConfigurationForDescription(cfgDes); IConfiguration cfg = ManagedBuildManager.getConfigurationForDescription(cfgDes);
assertTrue(cfg.getName().equals("Build (GNU)")); assertTrue(cfg.getName().equals("Build (GNU)"));
Map<String, IAutotoolsOption> opts = AutotoolsConfigurationManager.getInstance().getAutotoolsCfgOptions(testProject, cfg.getId()); Map<String, IAutotoolsOption> opts = AutotoolsPlugin.getDefault().getAutotoolCfgOptions(testProject, cfg.getId());
IAutotoolsOption configdir = opts.get(AutotoolsOptionConstants.OPT_CONFIGDIR); IAutotoolsOption configdir = opts.get(AutotoolsOptionConstants.OPT_CONFIGDIR);
assertEquals(configdir.getType(), IAutotoolsOption.INTERNAL); assertEquals(configdir.getType(), IAutotoolsOption.INTERNAL);
assertTrue(configdir.getValue().equals("src")); assertTrue(configdir.getValue().equals("src"));
@ -412,13 +412,13 @@ public class UpdateConfigureTest {
// Verify last option changed has changed in our copy, but not // Verify last option changed has changed in our copy, but not
// in the actual options // in the actual options
assertEquals(k.getValue(), "true"); assertEquals(k.getValue(), "true");
Map<String, IAutotoolsOption> opts2 = AutotoolsConfigurationManager.getInstance().getAutotoolsCfgOptions(testProject, cfg.getId()); Map<String, IAutotoolsOption> opts2 = AutotoolsPlugin.getDefault().getAutotoolCfgOptions(testProject, cfg.getId());
IAutotoolsOption k2 = opts2.get(AutotoolsOptionConstants.OPT_VERSION); IAutotoolsOption k2 = opts2.get(AutotoolsOptionConstants.OPT_VERSION);
assertEquals(k2.getValue(), "false"); assertEquals(k2.getValue(), "false");
// Now update the options we changed // Now update the options we changed
AutotoolsConfigurationManager.getInstance().updateAutotoolCfgOptions(testProject, cfg.getId(), opts); AutotoolsPlugin.getDefault().updateAutotoolCfgOptions(testProject, cfg.getId(), opts);
opts2 = AutotoolsConfigurationManager.getInstance().getAutotoolsCfgOptions(testProject, cfg.getId()); opts2 = AutotoolsPlugin.getDefault().getAutotoolCfgOptions(testProject, cfg.getId());
// Verify new option values // Verify new option values
k = opts2.get(AutotoolsOptionConstants.TOOL_AUTOGEN); k = opts2.get(AutotoolsOptionConstants.TOOL_AUTOGEN);

22
build/org.eclipse.cdt.autotools.ui.tests/META-INF/MANIFEST.MF
View file

@ -4,10 +4,26 @@ Bundle-Name: %bundleName
Bundle-SymbolicName: org.eclipse.cdt.autotools.ui.tests Bundle-SymbolicName: org.eclipse.cdt.autotools.ui.tests
Bundle-Version: 1.0.0.qualifier Bundle-Version: 1.0.0.qualifier
Bundle-Localization: plugin 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.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 Bundle-ActivationPolicy: lazy
Fragment-Host: org.eclipse.cdt.autotools.ui
Bundle-RequiredExecutionEnvironment: JavaSE-1.8 Bundle-RequiredExecutionEnvironment: JavaSE-1.8
Bundle-Vendor: %provider Bundle-Vendor: %provider