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

bug 212596: JUnit failures in cdt.managedbuilder.test.suite

Browse source 
updated benchmarks to match CDT 6.0
This commit is contained in:
Andrew Gvozdev 2009-10-11 17:34:03 +00:00
parent be4c1f9cf2
commit be88dc4a60
4 changed files with 30 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

26
build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/makefile
View file

@ -2,42 +2,42 @@
# Automatically-generated file. Do not edit!
################################################################################
ROOT := ..
-include $(ROOT)/makefile.init
-include ../makefile.init
RM := rm -rf
# All of the sources participating in the build are defined here
-include sources.mk
-include $(SUBDIRS:%=%/subdir.mk)
-include subdir.mk
-include objects.mk
ifneq ($(strip $(DEPS)),)
-include $(DEPS)
ifneq ($(MAKECMDGOALS),clean)
ifneq ($(strip $(C_DEPS)),)
-include $(C_DEPS)
endif
endif
-include $(ROOT)/makefile.defs
-include ../makefile.defs
# Add inputs and outputs from these tool invocations to the build variables
# All Target
all: lib.a
all: liblinkedFolder.a
# Tool invocations
lib.a: $(OBJS) $(USER_OBJS)
liblinkedFolder.a: $(OBJS) $(USER_OBJS)
@echo 'Building target: $@'
@echo 'Invoking: archiver.gnu'
@echo ar -r lib.a $(OBJS) $(USER_OBJS) $(LIBS)
@ar -r lib.a $(OBJS) $(USER_OBJS) $(LIBS)
ar -r "liblinkedFolder.a" $(OBJS) $(USER_OBJS) $(LIBS)
@echo 'Finished building target: $@'
@echo ' '
# Other Targets
clean:
-$(RM) $(OBJS)$(DEPS) lib.a
-$(RM) $(OBJS)$(C_DEPS) liblinkedFolder.a
-@echo ' '
.PHONY: all clean dependents
.SECONDARY:
-include $(ROOT)/makefile.targets
-include ../makefile.targets

4
build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/sources.mk
View file

@ -2,12 +2,12 @@
# Automatically-generated file. Do not edit!
################################################################################
O_SRCS :=
C_SRCS :=
S_UPPER_SRCS :=
O_SRCS :=
S_SRCS :=
OBJS :=
DEPS :=
C_DEPS :=
# Every subdirectory with source files must be described here
SUBDIRS := \

21
build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/subdir.mk
View file

@ -4,28 +4,25 @@
# Add inputs and outputs from these tool invocations to the build variables
C_SRCS += \
$(ROOT)/f1.c \
$(ROOT)/f2.c
../f1.c \
../f2.c
OBJS += \
./f1.o \
./f2.o
DEPS += \
${addprefix ./, \
f1.d \
f2.d \
}
C_DEPS += \
./f1.d \
./f2.d
# Each subdirectory must supply rules for building sources it contributes
%.o: $(ROOT)/%.c
%.o: ../%.c
@echo 'Building file: $<'
@echo 'Invoking: compiler.gnu.c'
@echo gcc -O0 -g3 -Wall -c -fmessage-length=0 -o$@ $<
@gcc -O0 -g3 -Wall -c -fmessage-length=0 -o$@ $< && \
echo -n $(@:%.o=%.d) $(dir $@) > $(@:%.o=%.d) && \
gcc -MM -MG -P -w -O0 -g3 -Wall -c -fmessage-length=0 $< >> $(@:%.o=%.d)
gcc -O0 -g3 -Wall -c -fmessage-length=0 -o"$@" "$<" && \
echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
gcc -MM -MG -P -w -O0 -g3 -Wall -c -fmessage-length=0 "$<" >> '$(@:%.o=%.d)'
@echo 'Finished building: $<'
@echo ' '

16
build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject21MakefileTests.java
View file

@ -163,7 +163,7 @@ public class ManagedProject21MakefileTests extends TestCase {
IPath benchmarkLocationBase = resourcesLocation.append(benchmarkDir);
IPath buildLocation = curProject.getLocation().append(buildDir);
succeeded = ManagedBuildTestHelper.compareBenchmarks(curProject, buildLocation, files, benchmarkLocationBase);
}
}
}
}
}
@ -313,14 +313,10 @@ public class ManagedProject21MakefileTests extends TestCase {
createPathVariable(tmpDir);
pathVariableCreated = true;
}
try {
IPath location = Path.fromOSString(MBS_TEMP_DIR);
IProject[] projects = createProjects("linkedFolder", location, "cdt.managedbuild.target.testgnu21.lib", false);
// Build the project
succeeded = buildProjects("linkedFolder", projects, makefiles);
} finally {
if (succeeded)
ManagedBuildTestHelper.deleteTempDir(tmpSubDir, linkedFiles);
}
IPath location = Path.fromOSString(MBS_TEMP_DIR);
IProject[] projects = createProjects("linkedFolder", location, "cdt.managedbuild.target.testgnu21.lib", false);
// Build the project
succeeded = buildProjects("linkedFolder", projects, makefiles);
assertTrue(succeeded);
}
}