mirrors/cdt
1
0
Fork 0
mirror of https://github.com/eclipse-cdt/cdt synced 2025-06-07 17:56:01 +02:00
Code Issues Wiki Activity

bug 292005: JUnit failure: managedbuilder BuildSystem40Tests.test40 does not check benchmarks properly

Browse source 
added missing benchmarks, corrected some
This commit is contained in:
Andrew Gvozdev 2010-01-05 04:58:28 +00:00
parent 2e858cbee3
commit 4ee2d59c6c
3 changed files with 27 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/objects.mk
View file

@ -4,4 +4,5 @@
LIBS := -llib1 LIBS := -llib1
USER_OBJS := uo1 USER_OBJS := uo1

18
build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/sources.mk
View file

@ -2,22 +2,22 @@
# Automatically-generated file. Do not edit! # Automatically-generated file. Do not edit!
################################################################################ ################################################################################
O_SRCS :=
CPP_SRCS :=
C_UPPER_SRCS := C_UPPER_SRCS :=
C_SRCS := C_SRCS :=
CPP_SRCS := S_UPPER_SRCS :=
O_SRCS :=
ASM_SRCS :=
S_SRCS :=
C++_SRCS :=
CXX_SRCS :=
CC_SRCS :=
OBJ_SRCS := OBJ_SRCS :=
ASM_SRCS :=
CXX_SRCS :=
C++_SRCS :=
CC_SRCS :=
OBJS := OBJS :=
C++_DEPS := C++_DEPS :=
EXECUTABLES :=
CC_DEPS :=
C_DEPS := C_DEPS :=
CC_DEPS :=
CPP_DEPS := CPP_DEPS :=
EXECUTABLES :=
CXX_DEPS := CXX_DEPS :=
C_UPPER_DEPS := C_UPPER_DEPS :=

24
build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/BuildSystem40Tests.java
View file

@ -61,7 +61,15 @@ public class BuildSystem40Tests extends TestCase {
"makefile", "makefile",
"objects.mk", "objects.mk",
"sources.mk", "sources.mk",
"subdir.mk"}; "d1/subdir.mk",
"d1/d2/subdir.mk",
"d1/d2/d3/subdir.mk",
"d1_1/subdir.mk",
"d1_1/d2_1/subdir.mk",
"dir1/dd/excluded_c/subdir.mk",
"dir1/dd/excluded_c/asd/subdir.mk",
"dir1/dd/ff/subdir.mk",
};
// doTest("test_40", "dbg 2"); // doTest("test_40", "dbg 2");
IProject[] projects = createProjects("test_40", null, null, true); IProject[] projects = createProjects("test_40", null, null, true);
ICProjectDescriptionManager mngr = CoreModel.getDefault().getProjectDescriptionManager(); ICProjectDescriptionManager mngr = CoreModel.getDefault().getProjectDescriptionManager();
@ -87,7 +95,7 @@ public class BuildSystem40Tests extends TestCase {
ICLanguageSetting ls = foDes.getLanguageSettingForFile("foo.cpp"); ICLanguageSetting ls = foDes.getLanguageSettingForFile("foo.cpp");
IFolderInfo foInfo = cfg.getRootFolderInfo(); IFolderInfo foInfo = cfg.getRootFolderInfo();
Tool tool = (Tool)foInfo.getToolFromInputExtension("cpp"); Tool tool = (Tool)foInfo.getToolFromInputExtension("cpp");
IOption option = ((Tool)tool).getOptionsOfType(IOption.INCLUDE_PATH)[0]; IOption option = tool.getOptionsOfType(IOption.INCLUDE_PATH)[0];
OptionStringValue[] value = option.getBasicStringListValueElements(); OptionStringValue[] value = option.getBasicStringListValueElements();
ICLanguageSettingEntry[] entries = ls.getSettingEntries(ICSettingEntry.INCLUDE_PATH); ICLanguageSettingEntry[] entries = ls.getSettingEntries(ICSettingEntry.INCLUDE_PATH);
ICLanguageSettingEntry[] expectedEntries = new ICLanguageSettingEntry[] { ICLanguageSettingEntry[] expectedEntries = new ICLanguageSettingEntry[] {
@ -311,7 +319,7 @@ public class BuildSystem40Tests extends TestCase {
ICLanguageSetting ls = foDes.getLanguageSettingForFile("foo.cpp"); ICLanguageSetting ls = foDes.getLanguageSettingForFile("foo.cpp");
IFolderInfo foInfo = cfg.getRootFolderInfo(); IFolderInfo foInfo = cfg.getRootFolderInfo();
Tool tool = (Tool)foInfo.getToolFromInputExtension("cpp"); Tool tool = (Tool)foInfo.getToolFromInputExtension("cpp");
IOption option = ((Tool)tool).getOptionsOfType(IOption.INCLUDE_PATH)[0]; IOption option = tool.getOptionsOfType(IOption.INCLUDE_PATH)[0];
OptionStringValue[] value = option.getBasicStringListValueElements(); OptionStringValue[] value = option.getBasicStringListValueElements();
ICLanguageSettingEntry[] entries = ls.getSettingEntries(ICSettingEntry.INCLUDE_PATH); ICLanguageSettingEntry[] entries = ls.getSettingEntries(ICSettingEntry.INCLUDE_PATH);
@ -329,7 +337,7 @@ public class BuildSystem40Tests extends TestCase {
BuildSystemTestHelper.checkDiff(expectedEntries, entries); BuildSystemTestHelper.checkDiff(expectedEntries, entries);
ls.setSettingEntries(ICLanguageSettingEntry.INCLUDE_PATH, entries); ls.setSettingEntries(ICLanguageSettingEntry.INCLUDE_PATH, entries);
assertTrue(option == ((Tool)tool).getOptionsOfType(IOption.INCLUDE_PATH)[0]); assertTrue(option == tool.getOptionsOfType(IOption.INCLUDE_PATH)[0]);
value = option.getBasicStringListValueElements(); value = option.getBasicStringListValueElements();
entries = ls.getSettingEntries(ICSettingEntry.INCLUDE_PATH); entries = ls.getSettingEntries(ICSettingEntry.INCLUDE_PATH);
@ -349,7 +357,7 @@ public class BuildSystem40Tests extends TestCase {
ls.setSettingEntries(ICLanguageSettingEntry.INCLUDE_PATH, list); ls.setSettingEntries(ICLanguageSettingEntry.INCLUDE_PATH, list);
assertTrue(option == ((Tool)tool).getOptionsOfType(IOption.INCLUDE_PATH)[0]); assertTrue(option == tool.getOptionsOfType(IOption.INCLUDE_PATH)[0]);
value = option.getBasicStringListValueElements(); value = option.getBasicStringListValueElements();
entries = ls.getSettingEntries(ICSettingEntry.INCLUDE_PATH); entries = ls.getSettingEntries(ICSettingEntry.INCLUDE_PATH);
@ -361,7 +369,7 @@ public class BuildSystem40Tests extends TestCase {
//testing one-way converter //testing one-way converter
ls = foDes.getLanguageSettingForFile("foo.c"); ls = foDes.getLanguageSettingForFile("foo.c");
tool = (Tool)foInfo.getToolFromInputExtension("c"); tool = (Tool)foInfo.getToolFromInputExtension("c");
option = ((Tool)tool).getOptionsOfType(IOption.INCLUDE_PATH)[0]; option = tool.getOptionsOfType(IOption.INCLUDE_PATH)[0];
value = option.getBasicStringListValueElements(); value = option.getBasicStringListValueElements();
entries = ls.getSettingEntries(ICSettingEntry.INCLUDE_PATH); entries = ls.getSettingEntries(ICSettingEntry.INCLUDE_PATH);
@ -379,7 +387,7 @@ public class BuildSystem40Tests extends TestCase {
BuildSystemTestHelper.checkDiff(expectedEntries, entries); BuildSystemTestHelper.checkDiff(expectedEntries, entries);
ls.setSettingEntries(ICLanguageSettingEntry.INCLUDE_PATH, entries); ls.setSettingEntries(ICLanguageSettingEntry.INCLUDE_PATH, entries);
assertTrue(option == ((Tool)tool).getOptionsOfType(IOption.INCLUDE_PATH)[0]); assertTrue(option == tool.getOptionsOfType(IOption.INCLUDE_PATH)[0]);
value = option.getBasicStringListValueElements(); value = option.getBasicStringListValueElements();
entries = ls.getSettingEntries(ICSettingEntry.INCLUDE_PATH); entries = ls.getSettingEntries(ICSettingEntry.INCLUDE_PATH);
@ -404,7 +412,7 @@ public class BuildSystem40Tests extends TestCase {
ls.setSettingEntries(ICLanguageSettingEntry.INCLUDE_PATH, list); ls.setSettingEntries(ICLanguageSettingEntry.INCLUDE_PATH, list);
assertTrue(option == ((Tool)tool).getOptionsOfType(IOption.INCLUDE_PATH)[0]); assertTrue(option == tool.getOptionsOfType(IOption.INCLUDE_PATH)[0]);
value = option.getBasicStringListValueElements(); value = option.getBasicStringListValueElements();
entries = ls.getSettingEntries(ICSettingEntry.INCLUDE_PATH); entries = ls.getSettingEntries(ICSettingEntry.INCLUDE_PATH);