From a183b1abbdb3938b89ac1c6ef49f03fe0af929e4 Mon Sep 17 00:00:00 2001
From: Andrew Gvozdev <angvoz.dev@gmail.com>
Date: Sun, 11 Oct 2009 01:30:45 +0000
Subject: [PATCH] bug 212596: JUnit failures in cdt.managedbuilder.test.suite
 Benchmarks/ moved out of archive

---
 .../linkedLib/Benchmarks/makefile             |  43 +++++++++++++
 .../linkedLib/Benchmarks/objects.mk           |   7 +++
 .../linkedLib/Benchmarks/sources.mk           |  15 +++++
 .../linkedLib/Benchmarks/subdir.mk            |  38 ++++++++++++
 .../test21Projects/linkedLib/linkedLib.zip    | Bin 3189 -> 1462 bytes
 .../multiResConfig/Benchmarks/makefile        |  58 ++++++++++++++++++
 .../multiResConfig/Benchmarks/objects.mk      |   7 +++
 .../Benchmarks/source1/subdir.mk              |  26 ++++++++
 .../Benchmarks/source2/source21/subdir.mk     |  26 ++++++++
 .../Benchmarks/source2/subdir.mk              |  26 ++++++++
 .../multiResConfig/Benchmarks/sources.mk      |  26 ++++++++
 .../multiResConfig/Benchmarks/subdir.mk       |  26 ++++++++
 .../multiResConfig/testResCfg.zip             | Bin 6888 -> 3182 bytes
 .../singleFileExe/Benchmarks/makefile         |  43 +++++++++++++
 .../singleFileExe/Benchmarks/objects.mk       |   7 +++
 .../singleFileExe/Benchmarks/sources.mk       |  15 +++++
 .../singleFileExe/Benchmarks/subdir.mk        |  26 ++++++++
 .../singleFileExe/testSingleExe.zip           | Bin 3230 -> 1593 bytes
 .../twoFileSO/Benchmarks/makefile             |  55 +++++++++++++++++
 .../twoFileSO/Benchmarks/objects.mk           |   7 +++
 .../twoFileSO/Benchmarks/sources.mk           |  23 +++++++
 .../twoFileSO/Benchmarks/subdir.mk            |  29 +++++++++
 .../test21Projects/twoFileSO/testDoubleSO.zip | Bin 3582 -> 1848 bytes
 .../tests/ManagedProject21MakefileTests.java  |  38 ++++++------
 24 files changed, 523 insertions(+), 18 deletions(-)
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/makefile
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/objects.mk
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/sources.mk
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/subdir.mk
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/makefile
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/objects.mk
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/source1/subdir.mk
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/source2/source21/subdir.mk
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/source2/subdir.mk
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/sources.mk
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/subdir.mk
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/Benchmarks/makefile
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/Benchmarks/objects.mk
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/Benchmarks/sources.mk
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/Benchmarks/subdir.mk
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/Benchmarks/makefile
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/Benchmarks/objects.mk
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/Benchmarks/sources.mk
 create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/Benchmarks/subdir.mk

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/makefile
new file mode 100644
index 00000000000..7ae697e5039
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/makefile
@@ -0,0 +1,43 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+-include ../makefile.init
+
+RM := rm -rf
+
+# All of the sources participating in the build are defined here
+-include sources.mk
+-include 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: liblinkedLib.a
+
+# Tool invocations
+liblinkedLib.a: $(OBJS) $(USER_OBJS)
+	@echo 'Building target: $@'
+	@echo 'Invoking: archiver.gnu'
+	ar -r "liblinkedLib.a" $(OBJS) $(USER_OBJS) $(LIBS)
+	@echo 'Finished building target: $@'
+	@echo ' '
+
+# Other Targets
+clean:
+	-$(RM) $(OBJS)$(C_DEPS) liblinkedLib.a
+	-@echo ' '
+
+.PHONY: all clean dependents
+.SECONDARY:
+
+-include ../makefile.targets
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/objects.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/objects.mk
new file mode 100644
index 00000000000..eae6a31b65d
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/objects.mk
@@ -0,0 +1,7 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+LIBS :=
+
+USER_OBJS :=
\ No newline at end of file
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/sources.mk
new file mode 100644
index 00000000000..a7659979874
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/sources.mk
@@ -0,0 +1,15 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+C_SRCS := 
+S_UPPER_SRCS := 
+O_SRCS := 
+S_SRCS := 
+OBJS := 
+C_DEPS := 
+
+# Every subdirectory with source files must be described here
+SUBDIRS := \
+. \
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/subdir.mk
new file mode 100644
index 00000000000..ae866de74b0
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/Benchmarks/subdir.mk
@@ -0,0 +1,38 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+C_SRCS += \
+C:/Documents\ and\ Settings/ltreggia/CDTMBSTest/f1.c \
+C:/Documents\ and\ Settings/ltreggia/CDTMBSTest/f2.c 
+
+OBJS += \
+./f1.o \
+./f2.o 
+
+C_DEPS += \
+./f1.d \
+./f2.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+f1.o: C:/Documents\ and\ Settings/agvozdev/CDTMBSTest/f1.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: compiler.gnu.c'
+	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 ' '
+
+f2.o: C:/Documents\ and\ Settings/agvozdev/CDTMBSTest/f2.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: compiler.gnu.c'
+	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/resources/test21Projects/linkedLib/linkedLib.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/linkedLib/linkedLib.zip
index 8b7f7484ee0137939216ff274c530ac95331f8fc..f33607388fb3597b816a572dcaf55d02aa88ff80 100644
GIT binary patch
delta 32
hcmew=v5kAfRhG%FTxUgC*%*L;83@k;>B}r29srqv2G9Ti

delta 1777
zcmdnS{Z(SaRhD{Y7A^)5xX3Wu1k8XE+(6nXH7_|MH?b(YSU<p<nMDLB#K8~%R9InE
z8M%*<f#EAN1A{QC!ra8{)U?c;)U`pU^KKgm*tj?ROO%%0!0PfU)}isoRkO9StYK9r
zG#4D1y4BQmmq>l;g8KPW-&hn){vr~m@vg7T!dQmKuI%SM2DM(}sRdKGm;P&$zLL@E
z%*m?RlaS{i&8~5>Ht7qy{{7E;CzPy{>J)IDuf6eT-*l6m+jhn|{$b5wU8sA@I6hp{
zfOUt^LbKkp8{6h?sHwfRkz+68rC8%^4^IIx$4?$-o4mH%SZw{TUN-c0-NutDH$Trh
zS(p5d&*A=Jr^oUV{Kr?HJbyID^#3%UX_*C6wMDF6Y|T#3WIz1zP2s*B-pvoRUi8{b
zt>xdk<k6PB$?V=M`admAY2AJ7s=^kQ%RAof-moky^*YBniK7$tp1jGwI9u-v&rNP`
zrQkQWy61jBlsDn+Gj@UIMLrYn)h~((66<7s@o)abedT>!kpV`3C$jDN?<M~F_`3(y
z;@4+PXLGweZP(djr9M3S<@T23SA3YZ+i>~R>08{Tb4xBWwLHD^@Y9?(pL~t%bn=(g
zURwXB?bW2>^Z!osEp9&6V!O#*J0f9v`k4&{7IEvF($57KtgqR{ah}bs{Ql(I?9-0?
zt1sL9L-L(P%9XcYG-A(8y8ScdufYD<JFEAd5=KP%wYmah-3z6fzQCw{4aA~Ah?F++
zld@8iON#Y!vqM8T8JMTcsdg5gTkRZL!NPDh^8f$fuw{A=o(6>#=;)q2@2hjt$M4L^
zl~;WI&wA^6>C}7r26~)6<9Ri>;AHrT)B1rPz9)48SynCE^><H<-8{d8Tw&W3(lRz=
z2khBDS-gXv0pY5EoKTbW8FP0m2D+#Om>5M-6Jl|GX;E@2$W?3m&vP{!@Em*Jy3e`o
z`A>#s*=O?)m(7gW!+T^~{Y{+}t!8&WyuIGZUjDuLz;u1ZhtpMlcWq|TYkYHKV&Gka
zGsngKURXKt`Wq*3wYHuVT3}Yvaof7v_}r(kD?1x5OIir$28X8Z^?X-<*>~REu<6@f
zBiH^r9=z}3*$2&6jxAJ@p54DtZV#{D!=|T+Jo6lsGQOOWlq{?+k%%{mEL>YZJ)3{p
zu}5#XA^u_lX0SbL{#)68S=_!G=qE;21_n^JLkjKU(xjBkBA~b41|Q6lHWaW;PyC;l
zmH((^(`&Q6x`hRM{k)mg7V>>b;@Gt0YS%k2H>sUF;_qLyI=Yr$wMAz2WrO^*dG{`7
zSk&B|tmgcqUgAO-k7;`D?$c9EE*VZ?%DQ`s>6uuM>jbCA(yQv8PFDNN+rp4*#%ODx
ze1PrE<6AfRHcX6Tin<+i@><cZ6{hoq1RF~)tZmROp0zgmrK0bu<4><=aptRU@LE-5
zv)!iT(t`M-7quh2Tym$#Z-22QXjbp)pNEsS)l85({`Gg${v~hgC*4{!Y4^>y!o`B=
zk+WP6s<H~Mm3wafz5dZ7bG<4XtHQ$-%yw&9%O))@wSLj$ek#Z8EniHBRQBs{yFA$|
zq-B;baeHuW!R6NtmzH}j(SI1vX0Uaued`@L=?QA;!6&7;7e|_yPdehOp}1R0c7y&G
zvHP6bo!f2;yyHrBI+)z~NT&YN?(zw%`6tvbUfVQBs8oG#y4SO{CS0>QAC^t<Wj8pn
zj;)}~Ep5)1Jv$o%%j|UhxvedAj~wOLRQ!o~(@WMEdFS8z<`r&isQD=Qsrp2{O?UnI
znp&IB3ZEvM-7^0o`pfk7)qkl>6QVZFlKa6LcKMRbjDOL8byi<~A|Bw)$Ry4zGWizE
ziF!sR5eD3)FfjUoKmdp@v!J8|kP#x_<bl0Z25DntPymvDP&LBJXs8?Nfhsr{Ff%zX
zP#k0e1H*yF*K8<OBWHP5NR|(+U;t)LBo|@Ho)GgCfK&rJ!n{;q{esA?Ff(vv1&|pG
gU|)rCAj|+60m~Qx-mE~^g8an6Aj8DK;0z910ND7;Bme*a

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/makefile
new file mode 100644
index 00000000000..465c6dbf866
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/makefile
@@ -0,0 +1,58 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+-include ../makefile.init
+
+RM := rm -rf
+
+# All of the sources participating in the build are defined here
+-include sources.mk
+-include subdir.mk
+-include source2/source21/subdir.mk
+-include source2/subdir.mk
+-include source1/subdir.mk
+-include objects.mk
+
+ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(strip $(C_DEPS)),)
+-include $(C_DEPS)
+endif
+ifneq ($(strip $(CC_DEPS)),)
+-include $(CC_DEPS)
+endif
+ifneq ($(strip $(CPP_DEPS)),)
+-include $(CPP_DEPS)
+endif
+ifneq ($(strip $(CXX_DEPS)),)
+-include $(CXX_DEPS)
+endif
+ifneq ($(strip $(C_UPPER_DEPS)),)
+-include $(C_UPPER_DEPS)
+endif
+endif
+
+-include ../makefile.defs
+
+# Add inputs and outputs from these tool invocations to the build variables 
+
+# All Target
+all: testResCfg
+
+# Tool invocations
+testResCfg: $(OBJS) $(USER_OBJS)
+	@echo 'Building target: $@'
+	@echo 'Invoking: linker.gnu.cpp'
+	g++ --strip-all -o"testResCfg" $(OBJS) $(USER_OBJS) $(LIBS)
+	@echo 'Finished building target: $@'
+	@echo ' '
+
+# Other Targets
+clean:
+	-$(RM) $(OBJS)$(C_DEPS)$(CC_DEPS)$(CPP_DEPS)$(CXX_DEPS)$(C_UPPER_DEPS) testResCfg
+	-@echo ' '
+
+.PHONY: all clean dependents
+.SECONDARY:
+
+-include ../makefile.targets
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/objects.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/objects.mk
new file mode 100644
index 00000000000..224ef688d0b
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/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/test21Projects/multiResConfig/Benchmarks/source1/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/source1/subdir.mk
new file mode 100644
index 00000000000..52cd28b513e
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/source1/subdir.mk
@@ -0,0 +1,26 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+CPP_SRCS += \
+../source1/Class1.cpp 
+
+OBJS += \
+./source1/Class1.o 
+
+CPP_DEPS += \
+./source1/Class1.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+source1/%.o: ../source1/%.cpp
+	@echo 'Building file: $<'
+	@echo 'Invoking: compiler.gnu.cpp'
+	g++ -I../headers -O0 -g3 -Wall -c -fmessage-length=0 -o"$@" "$<" && \
+	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
+	g++ -MM -MG -P -w -I../headers -O0 -g3 -Wall -c -fmessage-length=0  "$<" >> '$(@:%.o=%.d)'
+	@echo 'Finished building: $<'
+	@echo ' '
+
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/source2/source21/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/source2/source21/subdir.mk
new file mode 100644
index 00000000000..5215ac5718c
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/source2/source21/subdir.mk
@@ -0,0 +1,26 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+CPP_SRCS += \
+../source2/source21/Class21.cpp 
+
+OBJS += \
+./source2/source21/Class21.o 
+
+CPP_DEPS += \
+./source2/source21/Class21.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+source2/source21/Class21.o: ../source2/source21/Class21.cpp
+	@echo 'Building file: $<'
+	@echo 'Invoking: compiler.gnu.cpp'
+	g++ -DRESSPEC -I../headers -O0 -g3 -Wall -c -o"$@" "$<" && \
+	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
+	g++ -MM -MG -P -w -DRESSPEC -I../headers -O0 -g3 -Wall -c  "$<" >> '$(@:%.o=%.d)'
+	@echo 'Finished building: $<'
+	@echo ' '
+
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/source2/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/source2/subdir.mk
new file mode 100644
index 00000000000..14cf6aa02a2
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/source2/subdir.mk
@@ -0,0 +1,26 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+# Add inputs and outputs from these tool invocations to the build variables 
+CPP_SRCS += \
+../source2/Class2.cpp 
+
+OBJS += \
+./source2/Class2.o 
+
+CPP_DEPS += \
+./source2/Class2.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+source2/%.o: ../source2/%.cpp
+	@echo 'Building file: $<'
+	@echo 'Invoking: compiler.gnu.cpp'
+	g++ -I../headers -O0 -g3 -Wall -c -fmessage-length=0 -o"$@" "$<" && \
+	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
+	g++ -MM -MG -P -w -I../headers -O0 -g3 -Wall -c -fmessage-length=0  "$<" >> '$(@:%.o=%.d)'
+	@echo 'Finished building: $<'
+	@echo ' '
+
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/sources.mk
new file mode 100644
index 00000000000..ec9602a24e5
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/sources.mk
@@ -0,0 +1,26 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+O_SRCS := 
+CPP_SRCS := 
+C_UPPER_SRCS := 
+C_SRCS := 
+S_UPPER_SRCS := 
+S_SRCS := 
+CXX_SRCS := 
+CC_SRCS := 
+OBJS := 
+C_DEPS := 
+CC_DEPS := 
+CPP_DEPS := 
+CXX_DEPS := 
+C_UPPER_DEPS := 
+
+# Every subdirectory with source files must be described here
+SUBDIRS := \
+source2/source21 \
+source2 \
+source1 \
+. \
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/Benchmarks/subdir.mk
new file mode 100644
index 00000000000..1e8f6f62f42
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/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 
+CPP_SRCS += \
+../main.cpp 
+
+OBJS += \
+./main.o 
+
+CPP_DEPS += \
+./main.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+%.o: ../%.cpp
+	@echo 'Building file: $<'
+	@echo 'Invoking: compiler.gnu.cpp'
+	g++ -I../headers -O0 -g3 -Wall -c -fmessage-length=0 -o"$@" "$<" && \
+	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
+	g++ -MM -MG -P -w -I../headers -O0 -g3 -Wall -c -fmessage-length=0  "$<" >> '$(@:%.o=%.d)'
+	@echo 'Finished building: $<'
+	@echo ' '
+
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/testResCfg.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/multiResConfig/testResCfg.zip
index 6e5ea4005cd21c0a3dd6a67ae8bfd4099e472353..8d05bfc970f2b09e0b467cd74ce70671b8ba297d 100644
GIT binary patch
delta 91
zcmaE1`c7iQe74Q;f`QDFOGO_|?v>=2>@Ok3G?Q&|wuB8+0{i5ZK<YR9<mVE0OlcgG
p)g|qiE^<uXC@DR;Nm7@|ofF8E6Jcdz00J%`%wl3-c*hCi0RUrk7?uD4

delta 3838
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
IV|xLA0c>~>3jhEB

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/Benchmarks/makefile
new file mode 100644
index 00000000000..bd10bd41a8d
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/Benchmarks/makefile
@@ -0,0 +1,43 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+-include ../makefile.init
+
+RM := rm -rf
+
+# All of the sources participating in the build are defined here
+-include sources.mk
+-include 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: testSingleExe
+
+# Tool invocations
+testSingleExe: $(OBJS) $(USER_OBJS)
+	@echo 'Building target: $@'
+	@echo 'Invoking: linker.gnu.c'
+	gcc  -o"testSingleExe" $(OBJS) $(USER_OBJS) $(LIBS)
+	@echo 'Finished building target: $@'
+	@echo ' '
+
+# Other Targets
+clean:
+	-$(RM) $(OBJS)$(C_DEPS) testSingleExe
+	-@echo ' '
+
+.PHONY: all clean dependents
+.SECONDARY:
+
+-include ../makefile.targets
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/Benchmarks/objects.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/Benchmarks/objects.mk
new file mode 100644
index 00000000000..224ef688d0b
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/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/test21Projects/singleFileExe/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/Benchmarks/sources.mk
new file mode 100644
index 00000000000..2d6bdf5df20
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/Benchmarks/sources.mk
@@ -0,0 +1,15 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+O_SRCS := 
+C_SRCS := 
+S_UPPER_SRCS := 
+S_SRCS := 
+OBJS := 
+C_DEPS := 
+
+# Every subdirectory with source files must be described here
+SUBDIRS := \
+. \
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/Benchmarks/subdir.mk
new file mode 100644
index 00000000000..8a52fed13c6
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/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: compiler.gnu.c'
+	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/resources/test21Projects/singleFileExe/testSingleExe.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/singleFileExe/testSingleExe.zip
index f4fde51b5be149ab865eb13c780b9fd7a86f3bee..f62e0141268f38b38e1b3b334d819bcd3d9d6a74 100644
GIT binary patch
delta 32
hcmbOyxszvuH|yj)u3I9kYz#oa0))4Kv?nWw2LOW}1+f4C

delta 1680
zcmdnVGf#4ZH)}mJiwFY~0|&#$ivL!<6%SXPV`O0X#LU1T%)r3ll$w{Ek(*eQU96v*
zn4OxInUlJ9l5hTP1D>|?rVsufFlCft-db*Mu;Ay1ZF#=2N8T=6?ldvOy;~=BQcTYO
zx-FBI`dz%Ys#|B$v(?`hx-IUHEi`G$eC~UC&l8`O`!k!RbU$m<FPO$<93gSx7&F&P
z`@pa4>n*w#hh(j@YMhWdKYH8I1=?G`)D~@R`NMrfEGYVW`mS|B30WVcS<<aeUp&|s
zxoh8@iJW&Et|;z&w?ycGPSb*Evv_hZJaTyVq5N82`@uZjCAPgYzv@4^*P0-6GU{>u
zj2`vVFV83Ki>c9GZXQ~6Qq-t^F3+WN(L0+zru^HY@otsM&LvMSzA}_?U(u?P-JTm@
ze8f@g&cS^GPYSMAvioow%;mqo)igK%wqixH$W$9?KbxL15ebIMw6INEm9q3L-p|aP
zP;i;~#KFa%MGHeB{wT)Se)=6Q`}oBY4fW|y-?&e`@Gn4g_40y_#hbOCNHdFXuB#XN
zn^JRO;iuKz)8ClhE%Cl7Gv!M3mdM4sd%m;sK4(~IX)kD9AKcSqetmP7z<=?-Uiv3;
zGhRKE-Lslc<w~?p=iF9X4kg)TGlRF6*hK19Cm+0An6qAU?o#&kzw2(^{r>5jAv+V-
zLeaekWql>KE`Jsodgk=)qa|NGxZd;B^mldruV)PKMot3E8nsP+z^H!<#G<H4AU`Q9
zHMyi%FE=|lY?<DJr$J!_I=Uy%`|6zZ@jG*J<rQE5v);O1I-b6P9;eTEUJWid8Ghol
zexQf%Nu5BJRm+SXJbm<(i?@uo>wEbpuCNW8SU=X<%&k}OVL)}ku?a5}7XxiB0VYH=
z7Zm507A2>GT(GwPELXFEK+F5aJ%`24e`Vydy)xgqI*{ic%f*yv<}8JqTYh}=UHawu
zyE$poZ>H|kxD__Xwcu0Avc4^Ejuqa#U*L9IP;194!Q>P5JZIV%rY?*1$k#b%p&b>t
zl!?#%fzIELi`JetTK~`Ne#*ocJM+l6eSf>v_b-k;@G~y6dy<cY+$^?&W6_=3)0$6O
zH_16JoE-L@vD~41PN&t$b60<@O*AxFcwZRRTU}ot>?s0z={pkxg9svE>p_{TxHKsx
zvk2s^pjdBZLy_9Dgnx%O&W%d-6#2F`;$>89;X;jH8}yr&cv=aUscnDa{Br;Ib5mTu
zoMfLoz2Mwg+vj&uZ2sK~6-)kes?%!foUq*8!dt(Ztw`ZDTenpxoW-B>+K!SFSMTpR
zl~j<xGw1#@k%fC0pPI}uZ?sxcf6T4h<x0^>?o2Z;JEIH65$V^Z_N;htW!F~0)QvTD
zH4%1?j?4JBPFX&;C@$;R=|}HAov*Lqzs#UNfBm}m_Cje2Rq5Bg%sVP`V>Va?-dK3r
z&~Ve;ZPqP!vhy_F)LO(V2l35voW9`X@(0%}Z$^j-dm3+;-+3jqaKnaOiaz?)-~ZOH
zt-E3z^89l7yJ?62CFdQh-KG24@tU3Y-RW1NobSwaykf8T@6%>SgAFfpdRA>)v~{1~
z**TR`q1}RRSATN2yW31?b_}oZS^fBEkL_9YOLKezWs4m`x`ktEmVNuqcJwM&QYmvG
z|HogdfA@Ym`h4Dd#d_=aNr&rmD~>C^ZC7l#{7w5eFDRb4fHA_r;M+Xg1k8XE+&~(s
z44mxAdZ(U|Ndy>wxJpcrMn(n&AnD19q8C<v26&?yfS%tF26(We7y!+E^}tkuZU%ae
zL6~t8)eJ=bK{o<Dbs~(I&w=8M2zXkB7=b(BKt?by2mrA&P!Uov26(fwfuuNrPzIPA
Ia=>N)09!b*NB{r;

diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/Benchmarks/makefile
new file mode 100644
index 00000000000..415290e42de
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/Benchmarks/makefile
@@ -0,0 +1,55 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+-include ../makefile.init
+
+RM := rm -rf
+
+# All of the sources participating in the build are defined here
+-include sources.mk
+-include subdir.mk
+-include objects.mk
+
+ifneq ($(MAKECMDGOALS),clean)
+ifneq ($(strip $(C_DEPS)),)
+-include $(C_DEPS)
+endif
+ifneq ($(strip $(CC_DEPS)),)
+-include $(CC_DEPS)
+endif
+ifneq ($(strip $(CPP_DEPS)),)
+-include $(CPP_DEPS)
+endif
+ifneq ($(strip $(CXX_DEPS)),)
+-include $(CXX_DEPS)
+endif
+ifneq ($(strip $(C_UPPER_DEPS)),)
+-include $(C_UPPER_DEPS)
+endif
+endif
+
+-include ../makefile.defs
+
+# Add inputs and outputs from these tool invocations to the build variables 
+
+# All Target
+all: libtestDoubleSO.so
+
+# Tool invocations
+libtestDoubleSO.so: $(OBJS) $(USER_OBJS)
+	@echo 'Building target: $@'
+	@echo 'Invoking: linker.gnu.cpp'
+	g++ -shared -o"libtestDoubleSO.so" $(OBJS) $(USER_OBJS) $(LIBS)
+	@echo 'Finished building target: $@'
+	@echo ' '
+
+# Other Targets
+clean:
+	-$(RM) $(OBJS)$(C_DEPS)$(CC_DEPS)$(CPP_DEPS)$(CXX_DEPS)$(C_UPPER_DEPS) libtestDoubleSO.so
+	-@echo ' '
+
+.PHONY: all clean dependents
+.SECONDARY:
+
+-include ../makefile.targets
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/Benchmarks/objects.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/Benchmarks/objects.mk
new file mode 100644
index 00000000000..224ef688d0b
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/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/test21Projects/twoFileSO/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/Benchmarks/sources.mk
new file mode 100644
index 00000000000..71808421af0
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/Benchmarks/sources.mk
@@ -0,0 +1,23 @@
+################################################################################
+# Automatically-generated file. Do not edit!
+################################################################################
+
+O_SRCS := 
+CPP_SRCS := 
+C_UPPER_SRCS := 
+C_SRCS := 
+S_UPPER_SRCS := 
+S_SRCS := 
+CXX_SRCS := 
+CC_SRCS := 
+OBJS := 
+C_DEPS := 
+CC_DEPS := 
+CPP_DEPS := 
+CXX_DEPS := 
+C_UPPER_DEPS := 
+
+# Every subdirectory with source files must be described here
+SUBDIRS := \
+. \
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/Benchmarks/subdir.mk
new file mode 100644
index 00000000000..efc2ceb1da7
--- /dev/null
+++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/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 += \
+../so1.c \
+../so2.c 
+
+OBJS += \
+./so1.o \
+./so2.o 
+
+C_DEPS += \
+./so1.d \
+./so2.d 
+
+
+# Each subdirectory must supply rules for building sources it contributes
+%.o: ../%.c
+	@echo 'Building file: $<'
+	@echo 'Invoking: compiler.gnu.cpp'
+	g++ -DXXX -O0 -g3 -Wall -c -o"$@" "$<" && \
+	echo -n '$(@:%.o=%.d)' $(dir $@) > '$(@:%.o=%.d)' && \
+	g++ -MM -MG -P -w -DXXX -O0 -g3 -Wall -c  "$<" >> '$(@:%.o=%.d)'
+	@echo 'Finished building: $<'
+	@echo ' '
+
+
diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/testDoubleSO.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/test21Projects/twoFileSO/testDoubleSO.zip
index bfd8451d139b9dc60012bc45c240a243c2f64f6b..b498b49d03cd0588867a8ebede535f7306495ff9 100644
GIT binary patch
delta 33
icmew-y@PLq1l#60+&qjTtZWQGzzT#sj0_B7U>*Q_7zAek

delta 1779
zcmdnN_fL9*1Y12biwFY~0|&#T>i<@nGZPDWnHU&MSQ!|E85kIxQuC5CaubWPi}iC8
zvs2SDb5hq%j?SNLAkr|u`$)Y-wvy?J*1hhtuH4yHn$5+v_KIC7+kBNcnb|j&UHbQz
zuO(pHG@Gg7Z;JQV$nn^H`@EOY$7}ibGo5ohf2!YE;B;7~D1y7bQ}B$b##@G+1@lk*
zYPP@sd2hgqm}xSKU3Twp^1a^U#2Ky`?k!QzxVinpn$^}*wN+o3?$B+zy7c5lr-M9G
z^|`W~avfGg&7A5~l)%;)?BU9rdoe*h_Oa~S^4P?gg^B;BzI-G8?A$e{`@-3+`x8xM
zbk*&}H$VLoZL`z2d3B6ZaJ{2@?p#4u9{0`9e=2!4Kj@m0yL#=7?*WC5Yqusw@3%Yd
zR(HtQv#Ll=RJ}%CzPhHrOL*UTe$P!2Uw@QO&FxwC^IXa<feVjvHkX{sT<`i)$Ka^r
z^mTUYd+&vx-p1jV?Wv}3rOvfwlgf*P4~KdZW~zk6Deg*7Yi5y5v}e;aYQI*0w$w8$
zQzo+3V9$U3HShOsmAO3a@ymXb1^=DBm{;iUD=+K)8Fu*S7Nw0!m#<2m{PXKkXtlHH
zdynX=3(7JU^=d8NqoFnV>{Hd2GH-!mj;}v&UwQt1ncBm*XH8Te^r_Y?{hqR2WNDq~
z-mMI(Ywtz)7@HPI2;?qEtM<8g=wZgzHMi>5Sm!7%b7oeZ+t+jPV~0=b4adiK6X&;{
z-NI+;a`O9+cbPm}WL8|htgY7}7ShMnb?K<izS;g^{vo0KHtmU%KgI`mBc~u{joKzZ
zV9I$5#G<GvC_gDHHMyi%FE=|lY?<DJr$J!_I=Uz8&-?0}^zl1$a^)3Y|Fhn@UOJw>
zfgY#NcwP-II2nH8w0@w6?@66NmQ~A)9z1>Yl#92Fx9fZPC$6v!n^-^A+RRn(VL)}k
zyYgfI_W^Bw#fag8;{4L0<W!Ig)=oIh)odW(`n|FK&tZ}4UzxdLuN+@=SAwUB+p)$c
z+ksbQ<I(;3TB5<bO2dlN^orYGSN;}Lm5WhRZa>wr?A7m|KMn|nrfz86{o-P~#~}^g
z1nn~iSC#8|X?S|gYm@OyU!an5W~ouKj$ggn>}mgVcdkBDJl%<X(t~ZcrUst5W><3X
z-@`R;bldmsyIucea?&3c)8=`v!ZdPvwtNs;#;mJ;^?}f`w!}+pSuJ9vi(PV^-vubD
z+Hfz*-enUcAkQ`Xlr*ZB%ko9eR06&G8<=%PPy@ZVG$|#s2;}1+Uw>&s5u44I{<UXr
zQe1E%&pTgm!IYNzFa_5IMHzfkFB~f~3p20Nt`B&6|9ho!m%}UG-=Dsuy_xy(bHR^&
zt99Cb%u;&$DkJpnw(5%#={2&w$Bu1tOL8m_N!-#aKjZJY)jCz|QHOWw9c{Rk8PHX`
z_v04lJF^l5I-{1^OiWt*gvs2fsdUrYW5I88_vZOJM4pkCuR9}eu(STadZ$zUjdtE&
zW9Ajk6n(!gZ@#2$qfz5(V^3SV`k0ve`;%VO^V~Jw^!jyFuHdDp==>0s{m1oMPt0AH
z{r!XH@0%0sE4Hk2T<}EHJhw$jd~fXX45!E*72kt#?m<(JUOclxH?d~w<fp-vJi#H)
zAB(?flYeBM9K0|6y5YOj$CE;0>!*93O<~#?u{KPge7?dgeF6K*EdpFkY*%v{982vE
zd^AkAdUdqr@D8h)zBf-C^>}sJaFwuMYgSp;>FpOD#^`T~anjlEe8>6E&-qUr-+X#&
zs-L(oGX3zh|IzlR?XIrg@W7|?KPxD<xPbA(z%XaQY!fg8N^mpqqLi|m#n|{5>lv9u
zfboc{PzGsbWKaN-Vr(dyVMTO+H>v^Xc@kkj2nUJ*&>UJ1OfKkVpyw)t8COxwK;$uW
zBhXVR!iZy>D9(t0Ct8RRxPlI300;;GaUnN~5dq$;z_4Lp-~vKFV6K=2lxAQ60A=jT
AP5=M^

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 bf297aea7a9..6daf021f6ea 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
@@ -38,6 +38,7 @@ import org.eclipse.core.runtime.Path;
 import org.eclipse.ui.dialogs.IOverwriteQuery;
 
 public class ManagedProject21MakefileTests extends TestCase {
+	private IPath resourcesLocation = new Path(CTestPlugin.getFileInPlugin(new Path("resources/test21Projects/")).getAbsolutePath());
 	public static final String MBS_TEMP_DIR = "MBSTemp";
 
 	static boolean pathVariableCreated = false;
@@ -56,7 +57,7 @@ public class ManagedProject21MakefileTests extends TestCase {
 		//  TODO: testLinkedFolder fails intermittently saying that it cannot find
 		//        the makefiles to compare.  This appears to be a test set issue,
 		//        rather than an MBS functionality issue
-		//suite.addTest(new ManagedProject21MakefileTests("testLinkedFolder"));
+		suite.addTest(new ManagedProject21MakefileTests("testLinkedFolder"));
 		
 		return suite;
 	}
@@ -69,7 +70,7 @@ public class ManagedProject21MakefileTests extends TestCase {
 			return null;
 		}
 
-		ArrayList projectList = null;
+		ArrayList<IProject> projectList = null;
 		if (containsZip) {
 			File projectZips[] = testDir.listFiles(new FileFilter(){
 				public boolean accept(File pathname){
@@ -79,7 +80,7 @@ public class ManagedProject21MakefileTests 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();
@@ -104,12 +105,12 @@ public class ManagedProject21MakefileTests 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) {
@@ -119,10 +120,6 @@ public class ManagedProject21MakefileTests 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);
@@ -131,7 +128,7 @@ public class ManagedProject21MakefileTests extends TestCase {
 		return projects;
 	}
 		
-	private boolean buildProjects(IProject projects[], IPath[] files) {	
+	private boolean buildProjects(String benchmarkDir, IProject projects[], IPath[] files) {	
 		if(projects == null || projects.length == 0)
 			return false;
 				
@@ -162,8 +159,11 @@ public class ManagedProject21MakefileTests extends TestCase {
 					if (i == 0) {
 						String configName = info.getDefaultConfiguration().getName();
 						IPath buildDir = Path.fromOSString(configName);
-						succeeded = ManagedBuildTestHelper.compareBenchmarks(curProject, buildDir, files);
-					}
+//						succeeded = ManagedBuildTestHelper.compareBenchmarks(curProject, buildDir, files);
+						IPath benchmarkLocationBase = resourcesLocation.append(benchmarkDir);
+						IPath buildLocation = curProject.getLocation().append(buildDir);
+						succeeded = ManagedBuildTestHelper.compareBenchmarks(curProject, buildLocation, files, benchmarkLocationBase);
+		}
 				}
 			}
 		}
@@ -207,7 +207,9 @@ public class ManagedProject21MakefileTests extends TestCase {
 			} else {
 				fail("could not create the link to " + name);
 			}
-		} catch (Exception e) {fail("could not create the link to " + name);}		
+		} catch (Exception e) {
+			fail("could not create the link to " + name + ": " + e);
+		}		
 	}
 	
 	/* (non-Javadoc)
@@ -220,7 +222,7 @@ public class ManagedProject21MakefileTests extends TestCase {
 				 Path.fromOSString("sources.mk"), 
 				 Path.fromOSString("subdir.mk")};
 		IProject[] projects = createProjects("singleFileExe", null, null, true);
-		buildProjects(projects, makefiles);
+		buildProjects("singleFileExe", projects, makefiles);
 	}
 	
 	/* (non-Javadoc)
@@ -233,7 +235,7 @@ public class ManagedProject21MakefileTests extends TestCase {
 				 Path.fromOSString("sources.mk"), 
 				 Path.fromOSString("subdir.mk")};
 		IProject[] projects = createProjects("twoFileSO", null, null, true);
-		buildProjects(projects, makefiles);
+		buildProjects("twoFileSO", projects, makefiles);
 	}
 
 	/* (non-Javadoc)
@@ -249,7 +251,7 @@ public class ManagedProject21MakefileTests extends TestCase {
 				 Path.fromOSString("source2/subdir.mk"),
 				 Path.fromOSString("source2/source21/subdir.mk")};
 		IProject[] projects = createProjects("multiResConfig", null, null, true);
-		buildProjects(projects, makefiles);
+		buildProjects("multiResConfig", projects, makefiles);
 	}
 	
 	/* (non-Javadoc)
@@ -278,7 +280,7 @@ public class ManagedProject21MakefileTests extends TestCase {
 			createFileLink(project, tmpDir, "f2link.c", "f2.c");
 			createFileLink(project, tmpDir, "test_ar.h", "test_ar.h");
 			//  Build the project
-			succeeded = buildProjects(projects, makefiles);
+			succeeded = buildProjects("linkedLib", projects, makefiles);
 		} finally {
 			if (succeeded)
 				ManagedBuildTestHelper.deleteTempDir(tmpSubDir, linkedFiles);
@@ -315,7 +317,7 @@ public class ManagedProject21MakefileTests extends TestCase {
 			IPath location = Path.fromOSString(MBS_TEMP_DIR);
 			IProject[] projects = createProjects("linkedFolder", location, "cdt.managedbuild.target.testgnu21.lib", false);
 			//  Build the project
-			succeeded = buildProjects(projects, makefiles);
+			succeeded = buildProjects("linkedFolder", projects, makefiles);
 		} finally {
 			if (succeeded)
 				ManagedBuildTestHelper.deleteTempDir(tmpSubDir, linkedFiles);