From be88dc4a60943783fdea75d50f2d339bfb049777 Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Sun, 11 Oct 2009 17:34:03 +0000 Subject: [PATCH] bug 212596: JUnit failures in cdt.managedbuilder.test.suite updated benchmarks to match CDT 6.0 --- .../linkedFolder/Benchmarks/makefile | 26 +++++++++---------- .../linkedFolder/Benchmarks/sources.mk | 4 +-- .../linkedFolder/Benchmarks/subdir.mk | 21 +++++++-------- .../tests/ManagedProject21MakefileTests.java | 16 +++++------- 4 files changed, 30 insertions(+), 37 deletions(-) diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/makefile index 35ecf0d02bc..9cd66ec9731 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/makefile +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/makefile @@ -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 diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/sources.mk index 754c6cdd840..2d6bdf5df20 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/sources.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/sources.mk @@ -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 := \ diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/subdir.mk index 5cf8f316d2b..3f48b625117 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/subdir.mk +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedFolder/Benchmarks/subdir.mk @@ -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 ' ' diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject21MakefileTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject21MakefileTests.java index 6daf021f6ea..40200be44da 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject21MakefileTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProject21MakefileTests.java @@ -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); } }