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

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

Browse source 
Added heuristics to handle absolute workspace path
This commit is contained in:
Andrew Gvozdev 2010-01-05 17:21:36 +00:00
parent 5b9ed737e6
commit bf9d9817ed
8 changed files with 41 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/d1/d2/subdir.mk
View file

@ -20,14 +20,14 @@ CPP_DEPS += \
d1/d2/e.o: ../d1/d2/e.cpp d1/d2/e.o: ../d1/d2/e.cpp
@echo 'Building file: $<' @echo 'Building file: $<'
@echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp' @echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp'
g++ -Id2_ecpp_rel/path -I../d2_ecpp_proj/rel/path -I/d2_ecpp_abs/path -Ic:/d2_ecpp_abs/path -Id2_rel/path -I../d2_proj/rel/path -I/d2_abs/path -Ic:/d2_abs/path -Id1_rel/path -I../d1_proj/rel/path -I/d1_abs/path -Ic:/d1_abs/path -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -Iv_rel/path -I/v_abs/path -Ic:/v_abs/path -I"D:\docs\incs" -I"D:\d1_docs\incs" -I"D:\d2_docs\incs" -I"D:\d2_ecpp_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"d1/d2/e.d" -o"$@" "$<" g++ -Id2_ecpp_rel/path -I../d2_ecpp_proj/rel/path -I/d2_ecpp_abs/path -Ic:/d2_ecpp_abs/path -Id2_rel/path -I../d2_proj/rel/path -I/d2_abs/path -Ic:/d2_abs/path -Id1_rel/path -I../d1_proj/rel/path -I/d1_abs/path -Ic:/d1_abs/path -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -I"${WorkspaceDirPath}/test_40/dir1/dir2/dir3" -I"${WorkspaceDirPath}/test_40" -I"D:\docs\incs" -I"D:\d1_docs\incs" -I"D:\d2_docs\incs" -I"D:\d2_ecpp_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"d1/d2/e.d" -o"$@" "$<"
@echo 'Finished building: $<' @echo 'Finished building: $<'
@echo ' ' @echo ' '
d1/d2/%.o: ../d1/d2/%.cpp d1/d2/%.o: ../d1/d2/%.cpp
@echo 'Building file: $<' @echo 'Building file: $<'
@echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp' @echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp'
g++ -Id2_rel/path -I../d2_proj/rel/path -I/d2_abs/path -Ic:/d2_abs/path -Id1_rel/path -I../d1_proj/rel/path -I/d1_abs/path -Ic:/d1_abs/path -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -Iv_rel/path -I/v_abs/path -Ic:/v_abs/path -I"D:\docs\incs" -I"D:\d1_docs\incs" -I"D:\d2_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<" g++ -Id2_rel/path -I../d2_proj/rel/path -I/d2_abs/path -Ic:/d2_abs/path -Id1_rel/path -I../d1_proj/rel/path -I/d1_abs/path -Ic:/d1_abs/path -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -I"${WorkspaceDirPath}/test_40/dir1/dir2/dir3" -I"${WorkspaceDirPath}/test_40" -I"D:\docs\incs" -I"D:\d1_docs\incs" -I"D:\d2_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<' @echo 'Finished building: $<'
@echo ' ' @echo ' '

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

@ -23,7 +23,7 @@ CPP_DEPS += \
d1/%.o: ../d1/%.cpp d1/%.o: ../d1/%.cpp
@echo 'Building file: $<' @echo 'Building file: $<'
@echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp' @echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp'
g++ -Id1_rel/path -I../d1_proj/rel/path -I/d1_abs/path -Ic:/d1_abs/path -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -Iv_rel/path -I/v_abs/path -Ic:/v_abs/path -I"D:\docs\incs" -I"D:\d1_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<" g++ -Id1_rel/path -I../d1_proj/rel/path -I/d1_abs/path -Ic:/d1_abs/path -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -I"${WorkspaceDirPath}/test_40/dir1/dir2/dir3" -I"${WorkspaceDirPath}/test_40" -I"D:\docs\incs" -I"D:\d1_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<' @echo 'Finished building: $<'
@echo ' ' @echo ' '

2
build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/d1_1/d2_1/subdir.mk
View file

@ -20,7 +20,7 @@ CPP_DEPS += \
d1_1/d2_1/%.o: ../d1_1/d2_1/%.cpp d1_1/d2_1/%.o: ../d1_1/d2_1/%.cpp
@echo 'Building file: $<' @echo 'Building file: $<'
@echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp' @echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp'
g++ -Id2_1_rel/path -I/d2_1_abs/path -Ic:/d2_1_abs/path -Id1_1_rel/path -I/d1_1_abs/path -Ic:/d1_1_abs/path -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -Iv_rel/path -I/v_abs/path -Ic:/v_abs/path -I"D:\docs\incs" -I"D:\d1_1_docs\incs" -I"D:\d2_1_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<" g++ -Id2_1_rel/path -I/d2_1_abs/path -Ic:/d2_1_abs/path -Id1_1_rel/path -I/d1_1_abs/path -Ic:/d1_1_abs/path -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -I"${WorkspaceDirPath}/test_40/dir1/dir2/dir3" -I"${WorkspaceDirPath}/test_40" -I"D:\docs\incs" -I"D:\d1_1_docs\incs" -I"D:\d2_1_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<' @echo 'Finished building: $<'
@echo ' ' @echo ' '

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

@ -20,7 +20,7 @@ CPP_DEPS += \
d1_1/%.o: ../d1_1/%.cpp d1_1/%.o: ../d1_1/%.cpp
@echo 'Building file: $<' @echo 'Building file: $<'
@echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp' @echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp'
g++ -Id1_1_rel/path -I/d1_1_abs/path -Ic:/d1_1_abs/path -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -Iv_rel/path -I/v_abs/path -Ic:/v_abs/path -I"D:\docs\incs" -I"D:\d1_1_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<" g++ -Id1_1_rel/path -I/d1_1_abs/path -Ic:/d1_1_abs/path -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -I"${WorkspaceDirPath}/test_40/dir1/dir2/dir3" -I"${WorkspaceDirPath}/test_40" -I"D:\docs\incs" -I"D:\d1_1_docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<' @echo 'Finished building: $<'
@echo ' ' @echo ' '

2
build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/dir1/dd/excluded_c/asd/subdir.mk
View file

@ -17,7 +17,7 @@ CPP_DEPS += \
dir1/dd/excluded_c/asd/%.o: ../dir1/dd/excluded_c/asd/%.cpp dir1/dd/excluded_c/asd/%.o: ../dir1/dd/excluded_c/asd/%.cpp
@echo 'Building file: $<' @echo 'Building file: $<'
@echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp' @echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp'
g++ -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -Iv_rel/path -I/v_abs/path -Ic:/v_abs/path -I"D:\docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<" g++ -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -I"${WorkspaceDirPath}/test_40/dir1/dir2/dir3" -I"${WorkspaceDirPath}/test_40" -I"D:\docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<' @echo 'Finished building: $<'
@echo ' ' @echo ' '

2
build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/dir1/dd/excluded_c/subdir.mk
View file

@ -17,7 +17,7 @@ CPP_DEPS += \
dir1/dd/excluded_c/%.o: ../dir1/dd/excluded_c/%.cpp dir1/dd/excluded_c/%.o: ../dir1/dd/excluded_c/%.cpp
@echo 'Building file: $<' @echo 'Building file: $<'
@echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp' @echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp'
g++ -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -Iv_rel/path -I/v_abs/path -Ic:/v_abs/path -I"D:\docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<" g++ -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -I"${WorkspaceDirPath}/test_40/dir1/dir2/dir3" -I"${WorkspaceDirPath}/test_40" -I"D:\docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<' @echo 'Finished building: $<'
@echo ' ' @echo ' '

2
build/org.eclipse.cdt.managedbuilder.core.tests/resources/test40Projects/test_40/Benchmarks/Test 4.0 ConfigName.Dbg/dir1/dd/ff/subdir.mk
View file

@ -31,7 +31,7 @@ dir1/dd/ff/%.o: ../dir1/dd/ff/%.c
dir1/dd/ff/%.o: ../dir1/dd/ff/%.cpp dir1/dd/ff/%.o: ../dir1/dd/ff/%.cpp
@echo 'Building file: $<' @echo 'Building file: $<'
@echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp' @echo 'Invoking: Test 4.0 ToolName.compiler.gnu.cpp'
g++ -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -Iv_rel/path -I/v_abs/path -Ic:/v_abs/path -I"D:\docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<" g++ -Irel/path -I../proj/rel/path -I/abs/path -Ic:/abs/path -I"${WorkspaceDirPath}/test_40/dir1/dir2/dir3" -I"${WorkspaceDirPath}/test_40" -I"D:\docs\incs" -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
@echo 'Finished building: $<' @echo 'Finished building: $<'
@echo ' ' @echo ' '

33
build/org.eclipse.cdt.managedbuilder.core.tests/suite/org/eclipse/cdt/managedbuilder/testplugin/ManagedBuildTestHelper.java
View file

@ -488,6 +488,7 @@ public class ManagedBuildTestHelper {
final String INCLUDE_PATTERN = "-include \\$\\(.*\\)"; final String INCLUDE_PATTERN = "-include \\$\\(.*\\)";
final String MACRO_PATTERN = "\\S* [:+]=.*"; final String MACRO_PATTERN = "\\S* [:+]=.*";
final String EMPTY_MACRO_PATTERN = "\\S* :="; final String EMPTY_MACRO_PATTERN = "\\S* :=";
final String WORKSPACE_DIR_STR = "${WorkspaceDirPath}";
ArrayList<String> testArray = mergeContinuationLines(getContents(testFile)); ArrayList<String> testArray = mergeContinuationLines(getContents(testFile));
ArrayList<String> benchmarkArray = mergeContinuationLines(getContents(benchmarkFile)); ArrayList<String> benchmarkArray = mergeContinuationLines(getContents(benchmarkFile));
@ -541,6 +542,38 @@ public class ManagedBuildTestHelper {
// accommodate for variable order of macros // accommodate for variable order of macros
testNotMatchingLines.add(testLine); testNotMatchingLines.add(testLine);
benchNotMatchingLines.add(benchmarkLine); benchNotMatchingLines.add(benchmarkLine);
} else if (benchmarkLine.contains(WORKSPACE_DIR_STR)) {
String[] benchmarkSubstrings = benchmarkLine.split(" ");
String[] testSubstrings = testLine.split(" ");
if (testSubstrings.length!=benchmarkSubstrings.length) {
System.out.println("Following lines do not match ("+testFile.lastSegment()+"):");
System.out.println("actual : ["+testLine+"], file "+testFile);
System.out.println("expected: ["+benchmarkLine+"], file "+benchmarkFile);
return false;
}
final IWorkspace workspace = ResourcesPlugin.getWorkspace();
final IWorkspaceRoot root = workspace.getRoot();
final String workspaceLocation = root.getLocation().toOSString();
final String platformFileSeparator = System.getProperty("file.separator", Character.toString(IPath.SEPARATOR)); //$NON-NLS-1$
for (int j=0;j<testSubstrings.length;j++) {
String testSubstring = testSubstrings[j];
String benchmarkSubstring = benchmarkSubstrings[j];
if (benchmarkSubstring.contains(WORKSPACE_DIR_STR)) {
benchmarkSubstring = benchmarkSubstring
.replace("/", platformFileSeparator)
.replace(WORKSPACE_DIR_STR,workspaceLocation);
}
if (!testSubstring.equals(benchmarkSubstring)) {
System.out.println("Following lines do not match ("+testFile.lastSegment()+"):");
System.out.println("actual : ["+testLine+"], file "+testFile);
System.out.println("expected: ["+benchmarkLine+"], file "+benchmarkFile);
System.out.println("substring actual : ["+testSubstring+"], file "+testFile);
System.out.println("substring expected: ["+benchmarkSubstring+"], file "+benchmarkFile);
return false;
}
}
} else { } else {
System.out.println("Following lines do not match ("+testFile.lastSegment()+"):"); System.out.println("Following lines do not match ("+testFile.lastSegment()+"):");
System.out.println("actual : ["+testLine+"], file "+testFile); System.out.println("actual : ["+testLine+"], file "+testFile);