From 07339a8260a4857722b25fec69965935f66c55c3 Mon Sep 17 00:00:00 2001
From: Andrew Gvozdev <angvoz.dev@gmail.com>
Date: Sat, 10 Oct 2009 15:58:17 +0000
Subject: [PATCH] bug 212596: JUnit failures in cdt.managedbuilder.test.suite
 Benchmarks/ moved out of archive

---
 .../test1DepCalc2/Benchmarks/Sources/func1.d  |   1 +
 .../test1DepCalc2/Benchmarks/Sources/func2.d  |   4 ++
 .../test1DepCalc2/Benchmarks/Sources/func4.d  |   6 +++
 .../Benchmarks/Sources/sub sources/func 3.d   |   2 +
 .../Benchmarks/Sources/sub sources/subdir.mk  |  24 ++++++++++
 .../Benchmarks/Sources/subdir.mk              |  37 ++++++++++++++
 .../test1DepCalc2/Benchmarks/main.d           |   8 ++++
 .../test1DepCalc2/Benchmarks/makefile         |  45 ++++++++++++++++++
 .../test1DepCalc2/Benchmarks/objects.mk       |   7 +++
 .../test1DepCalc2/Benchmarks/sources.mk       |  19 ++++++++
 .../test1DepCalc2/Benchmarks/subdir.mk        |  24 ++++++++++
 .../test1DepCalc2/test1DepCalc2.zip           | Bin 7078 -> 3169 bytes
 .../test1DepCalc3/Benchmarks/Sources/func1.d  |   6 +++
 .../test1DepCalc3/Benchmarks/Sources/func2.d  |   8 ++++
 .../test1DepCalc3/Benchmarks/Sources/func4.d  |  10 ++++
 .../Benchmarks/Sources/sub sources/func 3.d   |   6 +++
 .../Benchmarks/Sources/sub sources/subdir.mk  |  26 ++++++++++
 .../Benchmarks/Sources/subdir.mk              |  32 +++++++++++++
 .../test1DepCalc3/Benchmarks/main.d           |  13 +++++
 .../test1DepCalc3/Benchmarks/makefile         |  45 ++++++++++++++++++
 .../test1DepCalc3/Benchmarks/objects.mk       |   7 +++
 .../test1DepCalc3/Benchmarks/sources.mk       |  19 ++++++++
 .../test1DepCalc3/Benchmarks/subdir.mk        |  26 ++++++++++
 .../test1DepCalc3/test1DepCalc3.zip           | Bin 7453 -> 3197 bytes
 .../Benchmarks/Sources/func1.d                |   1 +
 .../Benchmarks/Sources/func2.d                |   4 ++
 .../Benchmarks/Sources/func4.d                |   6 +++
 .../Benchmarks/Sources/sub sources/func 3.d   |   2 +
 .../Benchmarks/Sources/sub sources/subdir.mk  |  29 +++++++++++
 .../Benchmarks/Sources/subdir.mk              |  35 ++++++++++++++
 .../test1DepCalcPreBuild/Benchmarks/main.d    |   8 ++++
 .../test1DepCalcPreBuild/Benchmarks/makefile  |  45 ++++++++++++++++++
 .../Benchmarks/objects.mk                     |   7 +++
 .../Benchmarks/sources.mk                     |  19 ++++++++
 .../test1DepCalcPreBuild/Benchmarks/subdir.mk |  29 +++++++++++
 .../test1DepCalcPreBuild.zip                  | Bin 7117 -> 3165 bytes
 ...ManagedBuildDependencyCalculatorTests.java |  22 ++++-----
 37 files changed, 571 insertions(+), 11 deletions(-)
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/func1.d
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/func2.d
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/func4.d
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/sub sources/func 3.d
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/sub sources/subdir.mk
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/subdir.mk
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/main.d
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/makefile
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/objects.mk
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/sources.mk
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/subdir.mk
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/func1.d
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/func2.d
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/func4.d
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/sub sources/func 3.d
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/sub sources/subdir.mk
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/subdir.mk
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/main.d
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/makefile
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/objects.mk
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/sources.mk
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/subdir.mk
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/func1.d
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/func2.d
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/func4.d
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/sub sources/func 3.d
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/sub sources/subdir.mk
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/subdir.mk
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/main.d
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/makefile
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/objects.mk
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/sources.mk
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/subdir.mk

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/func1.d b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/func1.d
new file mode 100644
index 00000000000..332e0415912
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/func1.d
@@ -0,0 +1 @@
+Sources/func1.d Sources/func1.o: ../Sources/func1.c
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/func2.d b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/func2.d
new file mode 100644
index 00000000000..338960f7410
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/func2.d
@@ -0,0 +1,4 @@
+Sources/func2.d Sources/func2.o: ../Sources/func2.c \
+  ../Sources/sub\ sources/func\ 3.h
+
+../Sources/sub\ sources/func\ 3.h:
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/func4.d b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/func4.d
new file mode 100644
index 00000000000..c8eca74565f
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/func4.d
@@ -0,0 +1,6 @@
+Sources/func4.d Sources/func4.o: ../Sources/func4.c ../Headers/func1.h \
+  ../Headers/func2.h
+
+../Headers/func1.h:
+
+../Headers/func2.h:
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/sub sources/func 3.d b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/sub sources/func 3.d
new file mode 100644
index 00000000000..fedbbb90f6b
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/sub sources/func 3.d	
@@ -0,0 +1,2 @@
+Sources/sub\ sources/func\ 3.d Sources/sub\ sources/func\ 3.o:  \
+ ../Sources/sub\ sources/func\ 3.c
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/sub sources/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/sub sources/subdir.mk
new file mode 100644
index 00000000000..b803d8dca87
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/sub sources/subdir.mk	
@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../Sources/sub\ sources/func\ 3.c 
+
+OBJS += \
+./Sources/sub\ sources/func\ 3.o 
+
+C_DEPS += \
+./Sources/sub\ sources/func\ 3.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+Sources/sub\ sources/func\ 3.o: ../Sources/sub\ sources/func\ 3.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: GCC C Compiler'
+	gcc -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"Sources/sub\ sources/func\ 3.d" -o"$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/subdir.mk
new file mode 100644
index 00000000000..4f572ad44b2
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/subdir.mk
@@ -0,0 +1,37 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../Sources/func1.c \
+../Sources/func2.c \
+../Sources/func4.c 
+
+OBJS += \
+./Sources/func1.o \
+./Sources/func2.o \
+./Sources/func4.o 
+
+C_DEPS += \
+./Sources/func1.d \
+./Sources/func2.d \
+./Sources/func4.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+Sources/%.o: ../Sources/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: GCC C Compiler'
+	gcc -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+Sources/func2.o: ../Sources/func2.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: GCC C Compiler'
+	gcc -I../Headers -I../Sources/sub\ sources -O3 -g3 -Wall -c -MMD -MP -MF"$(@:%.o=%.d)" -MT"Sources/func2.d" -o"$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/main.d b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/main.d
new file mode 100644
index 00000000000..6b637378945
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/main.d
@@ -0,0 +1,8 @@
+main.d main.o: ../main.c ../Headers/func1.h ../Headers/func2.h \
+  ../Headers/func2.h
+
+../Headers/func1.h:
+
+../Headers/func2.h:
+
+../Headers/func2.h:
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/makefile
new file mode 100644
index 00000000000..4b8de9ced8b
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/makefile
@@ -0,0 +1,45 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+-include ../makefile.init
+
+RM := rm
+
+# All of the sources participating in the build are defined here
+-include sources.mk
+-include subdir.mk
+-include Sources/sub\ sources/subdir.mk
+-include Sources/subdir.mk
+-include objects.mk
+
+ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(strip $(C_DEPS)),)
+-include $(C_DEPS)
+endif
+endif
+
+-include ../makefile.defs
+
+# Add inputs and outputs from these tool invocations to the build variables 
+
+# All Target
+all: test1DepCalc2
+
+# Tool invocations
+test1DepCalc2: $(OBJS) $(USER_OBJS)
+	@echo 'Building target: $@'
+	@echo 'Invoking: GCC C Linker'
+	gcc  -o"test1DepCalc2" $(OBJS) $(USER_OBJS) $(LIBS)
+	@echo 'Finished building target: $@'
+	@echo ' '
+
+# Other Targets
+clean:
+	-$(RM) $(OBJS)$(C_DEPS)$(EXECUTABLES) test1DepCalc2
+	-@echo ' '
+
+.PHONY: all clean dependents
+.SECONDARY:
+
+-include ../makefile.targets
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/objects.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/objects.mk
new file mode 100644
index 00000000000..224ef688d0b
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/objects.mk
@@ -0,0 +1,7 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+USER_OBJS :=
+
+LIBS :=
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/sources.mk
new file mode 100644
index 00000000000..13cf73bde18
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/sources.mk
@@ -0,0 +1,19 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+O_SRCS := 
+C_SRCS := 
+S_UPPER_SRCS := 
+OBJ_SRCS := 
+ASM_SRCS := 
+OBJS := 
+C_DEPS := 
+EXECUTABLES := 
+
+# Every subdirectory with source files must be described here
+SUBDIRS := \
+. \
+Sources/sub\ sources \
+Sources \
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/subdir.mk
new file mode 100644
index 00000000000..616488bf767
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/subdir.mk
@@ -0,0 +1,24 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../main.c 
+
+OBJS += \
+./main.o 
+
+C_DEPS += \
+./main.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+%.o: ../%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: GCC C Compiler'
+	gcc -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0 -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/test1DepCalc2.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/test1DepCalc2.zip
index 33838f72a962d6584e100f3b542d90545ccfa8a6..a600287b3011182b1a3f5a18a2745dd894cf6496 100755
GIT binary patch
delta 156
zcmZ2x{!n5<@8)mZ8#yL_;}+pz00Kq^1t8hXFnO_rHPc^)$q#^3I^$$nNfV}C#>v5w
z)=c*qCr<!U0Zfz60;!2ilNa!bO;(W7Vmb_B%1+Ld(q@uo1~TO)Zvl$-Gf#dXWx}+T
ud9s+aDbpdg$-dI&N`KfH81xE?^0QKtO9H%E*+4e)0iiE51H(TK5Dx(1Mk!JN

delta 3953
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
R<pi=Be9MExdUMVP<p0BP%hdn?

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/func1.d b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/func1.d
new file mode 100644
index 00000000000..2d435ef8bbc
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/func1.d
@@ -0,0 +1,6 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+Sources/func1.d Sources/func1.o: ../Sources/func1.c
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/func2.d b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/func2.d
new file mode 100644
index 00000000000..4c8a01a75ee
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/func2.d
@@ -0,0 +1,8 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+Sources/func2.d Sources/func2.o: ../Sources/func2.c ../Sources/sub\ sources/func\ 3.h
+
+../Sources/sub\ sources/func\ 3.h:
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/func4.d b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/func4.d
new file mode 100644
index 00000000000..f13ac39d74a
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/func4.d
@@ -0,0 +1,10 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+Sources/func4.d Sources/func4.o: ../Sources/func4.c ../Headers/func1.h ../Headers/func2.h
+
+../Headers/func1.h:
+
+../Headers/func2.h:
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/sub sources/func 3.d b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/sub sources/func 3.d
new file mode 100644
index 00000000000..9905549349e
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/sub sources/func 3.d	
@@ -0,0 +1,6 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+Sources/sub sources/func 3.d Sources/ sources/ ./func\ 3.o: ../Sources/sub\ sources/func\ 3.c
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/sub sources/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/sub sources/subdir.mk
new file mode 100644
index 00000000000..e917abfc5f1
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/sub sources/subdir.mk	
@@ -0,0 +1,26 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../Sources/sub\ sources/func\ 3.c 
+
+OBJS += \
+./Sources/sub\ sources/func\ 3.o 
+
+C_DEPS += \
+./Sources/sub\ sources/func\ 3.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+Sources/sub\ sources/func\ 3.o: ../Sources/sub\ sources/func\ 3.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: GCC C Compiler'
+	gcc -DFUN3 -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0 -o"$@" "$<" && \
+	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
+	gcc -MM -MG -P -w -DFUN3 -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0  "$<" >> '$(@:%.o=%.d)'
+	@echo 'Finished building: $<'
+	@echo ' '
+
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/subdir.mk
new file mode 100644
index 00000000000..29c1af6df2d
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/subdir.mk
@@ -0,0 +1,32 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../Sources/func1.c \
+../Sources/func2.c \
+../Sources/func4.c 
+
+OBJS += \
+./Sources/func1.o \
+./Sources/func2.o \
+./Sources/func4.o 
+
+C_DEPS += \
+./Sources/func1.d \
+./Sources/func2.d \
+./Sources/func4.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+Sources/%.o: ../Sources/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: GCC C Compiler'
+	gcc -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0 -o"$@" "$<" && \
+	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
+	gcc -MM -MG -P -w -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0  "$<" >> '$(@:%.o=%.d)'
+	@echo 'Finished building: $<'
+	@echo ' '
+
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/main.d b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/main.d
new file mode 100644
index 00000000000..664bc3d2068
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/main.d
@@ -0,0 +1,13 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+main.d ./main.o: ../main.c ../Headers/func1.h ../Headers/func2.h \
+  ../Headers/func2.h
+
+../Headers/func1.h:
+
+../Headers/func2.h:
+
+../Headers/func2.h:
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/makefile
new file mode 100644
index 00000000000..2bb855d9a5d
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/makefile
@@ -0,0 +1,45 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+-include ../makefile.init
+
+RM := rm
+
+# All of the sources participating in the build are defined here
+-include sources.mk
+-include subdir.mk
+-include Sources/sub\ sources/subdir.mk
+-include Sources/subdir.mk
+-include objects.mk
+
+ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(strip $(C_DEPS)),)
+-include $(C_DEPS)
+endif
+endif
+
+-include ../makefile.defs
+
+# Add inputs and outputs from these tool invocations to the build variables 
+
+# All Target
+all: test1DepCalc3
+
+# Tool invocations
+test1DepCalc3: $(OBJS) $(USER_OBJS)
+	@echo 'Building target: $@'
+	@echo 'Invoking: GCC C Linker'
+	gcc  -o"test1DepCalc3" $(OBJS) $(USER_OBJS) $(LIBS)
+	@echo 'Finished building target: $@'
+	@echo ' '
+
+# Other Targets
+clean:
+	-$(RM) $(OBJS)$(C_DEPS)$(EXECUTABLES) test1DepCalc3
+	-@echo ' '
+
+.PHONY: all clean dependents
+.SECONDARY:
+
+-include ../makefile.targets
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/objects.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/objects.mk
new file mode 100644
index 00000000000..224ef688d0b
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/objects.mk
@@ -0,0 +1,7 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+USER_OBJS :=
+
+LIBS :=
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/sources.mk
new file mode 100644
index 00000000000..13cf73bde18
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/sources.mk
@@ -0,0 +1,19 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+O_SRCS := 
+C_SRCS := 
+S_UPPER_SRCS := 
+OBJ_SRCS := 
+ASM_SRCS := 
+OBJS := 
+C_DEPS := 
+EXECUTABLES := 
+
+# Every subdirectory with source files must be described here
+SUBDIRS := \
+. \
+Sources/sub\ sources \
+Sources \
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/subdir.mk
new file mode 100644
index 00000000000..c825697de65
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/subdir.mk
@@ -0,0 +1,26 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../main.c 
+
+OBJS += \
+./main.o 
+
+C_DEPS += \
+./main.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+%.o: ../%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: GCC C Compiler'
+	gcc -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0 -o"$@" "$<" && \
+	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
+	gcc -MM -MG -P -w -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0  "$<" >> '$(@:%.o=%.d)'
+	@echo 'Finished building: $<'
+	@echo ' '
+
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/test1DepCalc3.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/test1DepCalc3.zip
index 131506183de2fadfffc8908804f551729ff73ffe..6ac4388506c95b2231d137a9fb47c119399acc4f 100755
GIT binary patch
delta 150
zcmbPh^;cp-@8&?>vmBFuNy;%bGfb9}vS#|rFgYAZWin2lB4xtV&p7!MkoS;rGP|@j
zQxMZ+7a%p6X>y~q1Jh9uB{tcYjeYV1X>BH1W;j<%Mw@98^W<<D6Q&)^lY3=MneMVp
mJ|bhTB*DSJpjS|opOu<i65!3s#sCC-K<LZNz#zp5;sF3<Vka>G

delta 4310
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
F{{c@xT$BI+

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/func1.d b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/func1.d
new file mode 100644
index 00000000000..332e0415912
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/func1.d
@@ -0,0 +1 @@
+Sources/func1.d Sources/func1.o: ../Sources/func1.c
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/func2.d b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/func2.d
new file mode 100644
index 00000000000..338960f7410
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/func2.d
@@ -0,0 +1,4 @@
+Sources/func2.d Sources/func2.o: ../Sources/func2.c \
+  ../Sources/sub\ sources/func\ 3.h
+
+../Sources/sub\ sources/func\ 3.h:
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/func4.d b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/func4.d
new file mode 100644
index 00000000000..c8eca74565f
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/func4.d
@@ -0,0 +1,6 @@
+Sources/func4.d Sources/func4.o: ../Sources/func4.c ../Headers/func1.h \
+  ../Headers/func2.h
+
+../Headers/func1.h:
+
+../Headers/func2.h:
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/sub sources/func 3.d b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/sub sources/func 3.d
new file mode 100644
index 00000000000..fedbbb90f6b
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/sub sources/func 3.d	
@@ -0,0 +1,2 @@
+Sources/sub\ sources/func\ 3.d Sources/sub\ sources/func\ 3.o:  \
+ ../Sources/sub\ sources/func\ 3.c
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/sub sources/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/sub sources/subdir.mk
new file mode 100644
index 00000000000..011e215450b
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/sub sources/subdir.mk	
@@ -0,0 +1,29 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../Sources/sub\ sources/func\ 3.c 
+
+OBJS += \
+./Sources/sub\ sources/func\ 3.o 
+
+C_DEPS += \
+./Sources/sub\ sources/func\ 3.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+Sources/sub\ sources/func\ 3.o: ../Sources/sub\ sources/func\ 3.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: GCC C Compiler'
+	gcc -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0 -o"$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+Sources/sub\ sources/func\ 3.d: ../Sources/sub\ sources/func\ 3.c
+	@echo 'Regenerating dependency file: $@'
+	gcc -w -MM -MP -MT"Sources/sub\ sources/func\ 3.d" -MT"Sources/sub\ sources/func\ 3.o" -I../Headers -I../Sources/sub\ sources -MF"$@" "$<"
+	@echo ' '
+
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/subdir.mk
new file mode 100644
index 00000000000..5d672a7552e
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/subdir.mk
@@ -0,0 +1,35 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../Sources/func1.c \
+../Sources/func2.c \
+../Sources/func4.c 
+
+OBJS += \
+./Sources/func1.o \
+./Sources/func2.o \
+./Sources/func4.o 
+
+C_DEPS += \
+./Sources/func1.d \
+./Sources/func2.d \
+./Sources/func4.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+Sources/%.o: ../Sources/%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: GCC C Compiler'
+	gcc -I../Headers -I../Sources/sub\ sources -O0 -g3 -Wall -c -fmessage-length=0 -o"$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+Sources/%.d: ../Sources/%.c
+	@echo 'Regenerating dependency file: $@'
+	gcc -w -MM -MP -MT"$@" -MT"$(@:%.d=%.o)" -I../Headers -I../Sources/sub\ sources -MF"$@" "$<"
+	@echo ' '
+
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/main.d b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/main.d
new file mode 100644
index 00000000000..6b637378945
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/main.d
@@ -0,0 +1,8 @@
+main.d main.o: ../main.c ../Headers/func1.h ../Headers/func2.h \
+  ../Headers/func2.h
+
+../Headers/func1.h:
+
+../Headers/func2.h:
+
+../Headers/func2.h:
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/makefile
new file mode 100644
index 00000000000..381d40af0ee
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/makefile
@@ -0,0 +1,45 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+-include ../makefile.init
+
+RM := rm
+
+# All of the sources participating in the build are defined here
+-include sources.mk
+-include subdir.mk
+-include Sources/sub\ sources/subdir.mk
+-include Sources/subdir.mk
+-include objects.mk
+
+ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(strip $(C_DEPS)),)
+include $(C_DEPS)
+endif
+endif
+
+-include ../makefile.defs
+
+# Add inputs and outputs from these tool invocations to the build variables 
+
+# All Target
+all: test1DepCalcPreBuild
+
+# Tool invocations
+test1DepCalcPreBuild: $(OBJS) $(USER_OBJS)
+	@echo 'Building target: $@'
+	@echo 'Invoking: GCC C Linker'
+	gcc  -o"test1DepCalcPreBuild" $(OBJS) $(USER_OBJS) $(LIBS)
+	@echo 'Finished building target: $@'
+	@echo ' '
+
+# Other Targets
+clean:
+	-$(RM) $(OBJS)$(C_DEPS)$(EXECUTABLES) test1DepCalcPreBuild
+	-@echo ' '
+
+.PHONY: all clean dependents
+.SECONDARY:
+
+-include ../makefile.targets
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/objects.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/objects.mk
new file mode 100644
index 00000000000..224ef688d0b
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/objects.mk
@@ -0,0 +1,7 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+USER_OBJS :=
+
+LIBS :=
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/sources.mk
new file mode 100644
index 00000000000..13cf73bde18
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/sources.mk
@@ -0,0 +1,19 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+O_SRCS := 
+C_SRCS := 
+S_UPPER_SRCS := 
+OBJ_SRCS := 
+ASM_SRCS := 
+OBJS := 
+C_DEPS := 
+EXECUTABLES := 
+
+# Every subdirectory with source files must be described here
+SUBDIRS := \
+. \
+Sources/sub\ sources \
+Sources \
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/subdir.mk
new file mode 100644
index 00000000000..f047872e5e7
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/subdir.mk
@@ -0,0 +1,29 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+../main.c 
+
+OBJS += \
+./main.o 
+
+C_DEPS += \
+./main.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+main.o: ../main.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: GCC C Compiler'
+	gcc -I../Headers -I../Sources/sub\ sources -O0 -g3 -c -o"$@" "$<"
+	@echo 'Finished building: $<'
+	@echo ' '
+
+main.d: ../main.c
+	@echo 'Regenerating dependency file: $@'
+	gcc -w -MM -MP -MT"main.d" -MT"main.o" -I../Headers -I../Sources/sub\ sources -MF"$@" "$<"
+	@echo ' '
+
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/test1DepCalcPreBuild.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/test1DepCalcPreBuild.zip
index 9fb45fe8365bd81312235c5ab6319b417178f70b..9dfd7aaddec39167bbd5460ff5d617a872971e75 100755
GIT binary patch
delta 166
zcmX?WepiAez?+$6a)E@@=1tr$I3|}#$T2Z6Or9oT%~ZuO`7)4t#xPkx(u9eJak87F
zHB%hp<Ypjso^kR4ASJ*w`2erPWKk&%CMOV6Y;po0`{WoYZKhc;F305MQd&&>%#$xm
znJ}3$Pv(?1WwKzK>>zE<RKz~HQrbkJoP&WOH!(9$FFC-Qm5l)i_<+!tnStRKP=<j4
E0MHRAng9R*

delta 4008
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

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildDependencyCalculatorTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildDependencyCalculatorTests.java
index dc022112e4d..176412b4952 100755
--- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildDependencyCalculatorTests.java
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildDependencyCalculatorTests.java
@@ -37,6 +37,7 @@ import org.eclipse.core.runtime.Path;
 import org.eclipse.ui.dialogs.IOverwriteQuery;
 
 public class ManagedBuildDependencyCalculatorTests extends TestCase {
+	private IPath resourcesLocation = new Path(CTestPlugin.getFileInPlugin(new Path("resources/depCalcProjects/")).getAbsolutePath());
 	
 	public ManagedBuildDependencyCalculatorTests(String name) {
 		super(name);
@@ -52,7 +53,7 @@ public class ManagedBuildDependencyCalculatorTests extends TestCase {
 	}
 
 	private IProject[] createProject(String projName, IPath location, String projectTypeId, boolean containsZip){
-		ArrayList projectList = null;
+		ArrayList<IProject> projectList = null;
 		if (containsZip) {
 			File testDir = CTestPlugin.getFileInPlugin(new Path("resources/depCalcProjects/" + projName));
 			if(testDir == null) {
@@ -68,7 +69,7 @@ public class ManagedBuildDependencyCalculatorTests extends TestCase {
 				}
 			});
 			
-			projectList = new ArrayList(projectZips.length);
+			projectList = new ArrayList<IProject>(projectZips.length);
 			for(int i = 0; i < projectZips.length; i++){
 				try{
 					String projectName = projectZips[i].getName();
@@ -93,12 +94,12 @@ public class ManagedBuildDependencyCalculatorTests extends TestCase {
 			try{
 				IProject project = ManagedBuildTestHelper.createProject(projName, null, location, projectTypeId);
 				if(project != null)
-					projectList = new ArrayList(1);
+					projectList = new ArrayList<IProject>(1);
 					projectList.add(project);
 			} catch(Exception e){}
 		}
 		
-		return (IProject[])projectList.toArray(new IProject[projectList.size()]);
+		return projectList.toArray(new IProject[projectList.size()]);
 	}
 	
 	private IProject[] createProjects(String projName, IPath location, String projectTypeId, boolean containsZip) {
@@ -108,10 +109,6 @@ public class ManagedBuildDependencyCalculatorTests extends TestCase {
 			public String queryOverwrite(String file) {
 				return ALL;
 			}};
-		IOverwriteQuery queryNOALL = new IOverwriteQuery(){
-			public String queryOverwrite(String file) {
-				return NO_ALL;
-			}};
 		
 		UpdateManagedProjectManager.setBackupFileOverwriteQuery(queryALL);
 		UpdateManagedProjectManager.setUpdateProjectQuery(queryALL);
@@ -151,10 +148,13 @@ public class ManagedBuildDependencyCalculatorTests extends TestCase {
 					if (i == 0) {
 						String configName = info.getDefaultConfiguration().getName();
 						IPath buildDir = Path.fromOSString(configName);
-						if (compareBenchmark)
-						    succeeded = ManagedBuildTestHelper.compareBenchmarks(curProject, buildDir, files);
-						else
+						if (compareBenchmark) {
+							IPath benchmarkLocationBase = resourcesLocation.append(curProject.getName());
+							IPath buildLocation = curProject.getLocation().append(buildDir);
+							succeeded = ManagedBuildTestHelper.compareBenchmarks(curProject, buildLocation, files, benchmarkLocationBase);
+						} else {
 							succeeded = ManagedBuildTestHelper.verifyFilesDoNotExist(curProject, buildDir, files);
+						}
 					}
 				}
 			}