From bc1f0e9f108076db3452b24fb2469f77bb82877d Mon Sep 17 00:00:00 2001 From: Andrew Gvozdev Date: Sat, 10 Oct 2009 02:11:38 +0000 Subject: [PATCH] bug 212596: JUnit failures in cdt.managedbuilder.test.suite moved Benchmarks/ out of archives --- .../oldTypeProjects/1.2/Benchmarks/makefile | 58 +++++++++++++++++ .../oldTypeProjects/1.2/Benchmarks/objects.mk | 7 +++ .../oldTypeProjects/1.2/Benchmarks/sources.mk | 27 ++++++++ .../oldTypeProjects/1.2/Benchmarks/subdir.mk | 24 +++++++ .../resources/oldTypeProjects/1.2/test12.zip | Bin 3752 -> 1844 bytes .../oldTypeProjects/2.0/Benchmarks/makefile | 58 +++++++++++++++++ .../oldTypeProjects/2.0/Benchmarks/objects.mk | 7 +++ .../oldTypeProjects/2.0/Benchmarks/sources.mk | 27 ++++++++ .../oldTypeProjects/2.0/Benchmarks/subdir.mk | 24 +++++++ .../resources/oldTypeProjects/2.0/test20.zip | Bin 3689 -> 1964 bytes .../2.1/Benchmarks/Functions/subdir.mk | 24 +++++++ .../oldTypeProjects/2.1/Benchmarks/makefile | 44 +++++++++++++ .../oldTypeProjects/2.1/Benchmarks/objects.mk | 7 +++ .../oldTypeProjects/2.1/Benchmarks/sources.mk | 18 ++++++ .../oldTypeProjects/2.1/Benchmarks/subdir.mk | 24 +++++++ .../resources/oldTypeProjects/2.1/test21.zip | Bin 4293 -> 2046 bytes .../2.1CPP/Benchmarks/Functions/subdir.mk | 24 +++++++ .../2.1CPP/Benchmarks/makefile | 59 ++++++++++++++++++ .../2.1CPP/Benchmarks/objects.mk | 7 +++ .../2.1CPP/Benchmarks/sources.mk | 28 +++++++++ .../2.1CPP/Benchmarks/subdir.mk | 24 +++++++ .../oldTypeProjects/2.1CPP/Test21CXX.zip | Bin 4408 -> 2051 bytes .../core/tests/ManagedProjectUpdateTests.java | 9 ++- 23 files changed, 497 insertions(+), 3 deletions(-) create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/Benchmarks/makefile create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/Benchmarks/objects.mk create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/Benchmarks/sources.mk create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/Benchmarks/subdir.mk create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/makefile create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/objects.mk create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/sources.mk create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/subdir.mk create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/Functions/subdir.mk create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/makefile create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/objects.mk create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/sources.mk create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/subdir.mk create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/Functions/subdir.mk create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/makefile create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/objects.mk create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/sources.mk create mode 100644 build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/subdir.mk diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/Benchmarks/makefile new file mode 100644 index 00000000000..89d5eb53138 --- /dev/null +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/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 objects.mk + +ifneq ($(MAKECMDGOALS),clean) +ifneq ($(strip $(C++_DEPS)),) +-include $(C++_DEPS) +endif +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: test12.exe + +# Tool invocations +test12.exe: $(OBJS) $(USER_OBJS) + @echo 'Building target: $@' + @echo 'Invoking: Cygwin C++ Linker' + g++ -o"test12.exe" $(OBJS) $(USER_OBJS) $(LIBS) + @echo 'Finished building target: $@' + @echo ' ' + +# Other Targets +clean: + -$(RM) $(C++_DEPS)$(OBJS)$(C_DEPS)$(CC_DEPS)$(CPP_DEPS)$(EXECUTABLES)$(CXX_DEPS)$(C_UPPER_DEPS) test12.exe + -@echo ' ' + +.PHONY: all clean dependents +.SECONDARY: + +-include ../makefile.targets diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/Benchmarks/objects.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/Benchmarks/objects.mk new file mode 100644 index 00000000000..224ef688d0b --- /dev/null +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/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/oldTypeProjects/1.2/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/Benchmarks/sources.mk new file mode 100644 index 00000000000..c1514fd5b49 --- /dev/null +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/Benchmarks/sources.mk @@ -0,0 +1,27 @@ +################################################################################ +# Automatically-generated file. Do not edit! +################################################################################ + +O_SRCS := +CPP_SRCS := +C_UPPER_SRCS := +C_SRCS := +S_UPPER_SRCS := +OBJ_SRCS := +ASM_SRCS := +CXX_SRCS := +C++_SRCS := +CC_SRCS := +C++_DEPS := +OBJS := +C_DEPS := +CC_DEPS := +CPP_DEPS := +EXECUTABLES := +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/oldTypeProjects/1.2/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/Benchmarks/subdir.mk new file mode 100644 index 00000000000..298d03f64d5 --- /dev/null +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/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 +CPP_SRCS += \ +../test.cpp + +OBJS += \ +./test.o + +CPP_DEPS += \ +./test.d + + +# Each subdirectory must supply rules for building sources it contributes +%.o: ../%.cpp + @echo 'Building file: $<' + @echo 'Invoking: Cygwin C++ Compiler' + g++ -O3 -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/oldTypeProjects/1.2/test12.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/1.2/test12.zip index 933775dc24ec2fd75be4777b3b9789c8cee92859..5dfa0f3900ffdf27647a45f16ab3dafb3b0e8c41 100644 GIT binary patch delta 42 vcmZ1>yM=Fq59{P`KB3L^+^vj2h8&X<>*R7iWj+=L76t`I28MsE3_t(?{P_tg delta 1908 zcmdnOw?cM<538O{{s}V%B*4uuiNPr~FF7MOu_(J(KiH*~fq@Yy&%vNvB)~j*Et5`t zA~&BGmFP}O~DKarI zq_Q$F2m|d$xT#)0H!(XkEi)%|?PTBlTMhzk=Qlq2Z@}wu(CdwsWz;GWgS^>nN!-mY zeixJYHynL)>8n-lzuM#S63bUv9u@`sNQgO z*NxzvnOsG@RoxR##vGk-uu)TMzWfT#jf{F;&$XUsGWjT~lq^}$wr$0Rsq4b5f5+aQ zv0iB1z1vS-sUNe_?p=29I#d0@1@<%eCGN*1-xl3mXlr#YBVH`= z#d)hQx#`7jwp*_G+-A7AG~Lv|)5%AsXfC5L=ZToqhMzdC zAL!wGQYVmQ)iR?8Pai$y;w|It`d||C{-_`*^)sb-Ucu=bS%8&&s|D*nTSE@s{@4Md=%=40!kHB|bEY zU^jK@-e$P!o4D0tN3WELOIH8cn(O~;!}s`KXhGr6YPKK(Shy?%289S}WE7VsrDPU? zLSj;E_8|k2w)NpJ>Md4xNngsV-(VeB5Z20j#E5;jWY4T6xe>F2KRtZ0|GsBx$L?<} zEl+CwPfVW7!*;#bK;ppW%{QKeZQ8SL_YM)S7k9Y$TGzNTX|uG7u}uFqZPR+0#0$a& zd_h~!Nu3a7FWELBlVPt-fW#dgmem5syz9C5pPydC zb@=9wH+wHE-G6en)2*rYL5@~49lCtISKfL)b&F45xxYaDh2M^66!fGLed4-yh^^Xk z^^f4Aw`H!*ZneU^@5O?dX7&r!$xrbBm0RxoKr;{SvJ`T0M{3M?vI% z9U~}RPQJ?~u{n;lm9ZYPA`k>d2?z)<{C9K$7Q=`l7+5W^fUAYj5LQSb9^lQ$Bm#^? zT*WuY97YBOAo&;7Bv@Hqk8A?AoQg2Pp994$h*)Xh diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/makefile new file mode 100644 index 00000000000..3e66885e717 --- /dev/null +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/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 objects.mk + +ifneq ($(MAKECMDGOALS),clean) +ifneq ($(strip $(C++_DEPS)),) +-include $(C++_DEPS) +endif +ifneq ($(strip $(CC_DEPS)),) +-include $(CC_DEPS) +endif +ifneq ($(strip $(C_DEPS)),) +-include $(C_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: test20.exe + +# Tool invocations +test20.exe: $(OBJS) $(USER_OBJS) + @echo 'Building target: $@' + @echo 'Invoking: GCC C++ Linker' + g++ -o"test20.exe" $(OBJS) $(USER_OBJS) $(LIBS) + @echo 'Finished building target: $@' + @echo ' ' + +# Other Targets +clean: + -$(RM) $(OBJS)$(C++_DEPS)$(EXECUTABLES)$(CC_DEPS)$(C_DEPS)$(CPP_DEPS)$(CXX_DEPS)$(C_UPPER_DEPS) test20.exe + -@echo ' ' + +.PHONY: all clean dependents +.SECONDARY: + +-include ../makefile.targets diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/objects.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/objects.mk new file mode 100644 index 00000000000..eae6a31b65d --- /dev/null +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/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/oldTypeProjects/2.0/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/sources.mk new file mode 100644 index 00000000000..6c7070aa49d --- /dev/null +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/sources.mk @@ -0,0 +1,27 @@ +################################################################################ +# Automatically-generated file. Do not edit! +################################################################################ + +C_UPPER_SRCS := +C_SRCS := +CPP_SRCS := +O_SRCS := +ASM_SRCS := +S_SRCS := +C++_SRCS := +CXX_SRCS := +CC_SRCS := +OBJ_SRCS := +OBJS := +C++_DEPS := +EXECUTABLES := +CC_DEPS := +C_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/oldTypeProjects/2.0/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/Benchmarks/subdir.mk new file mode 100644 index 00000000000..9e1a2ae104e --- /dev/null +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/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 +CPP_SRCS += \ +../Test1.cpp + +OBJS += \ +./Test1.o + +CPP_DEPS += \ +./Test1.d + + +# Each subdirectory must supply rules for building sources it contributes +%.o: ../%.cpp + @echo 'Building file: $<' + @echo 'Invoking: GCC C++ Compiler' + g++ -O2 -g1 -pedantic -pedantic-errors -Wall -Werror -c -fmessage-length=0 -v -MMD -MP -MF"$(@:%.o=%.d)" -MT"$(@:%.o=%.d)" -o"$@" "$<" + @echo 'Finished building: $<' + @echo ' ' + + diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/test20.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.0/test20.zip index 5b4569ee01677155f25066d975a17002bde7fe74..609156097a4b6f2548962488f3eb10e72034e875 100644 GIT binary patch delta 49 zcmaDUvxa|zJnQCJTwfU{`|xl~zR4@cB+WYcC$AIJ7S_qOd~$rO46F>nj0_CUYz#mE E0EQ9^)c^nh delta 1777 zcmZ3(|59dyJZn7{0|>M^%`pKppaeINc1q1l&d5zH$}ZLq@MdNa0Sa+21OXN9+UMZM z%*4Qu#LB=RjH)m-y%=@nt9XIihnD@W*nnr+O zuV#vkySSTB%asPr>+%}E=C)_fXglmWX}V_9>$*D|b+7G;DTr;{%vlld@b*Ap9#=9GrsW%~cz!cUfM zk-L6hn`iK+Bm1tf8cb}`DcxItZpxidH%);pQ!HC;PPfRYxH_`ya@!goy{V->e=d(j zdRA{rz%L`Y44p5}{q_DGbUyIM)#|c^YsHmwB|mJpWyT%361>;2ceS;TnGoAyuT4c8 z*NJNU$t!S@*LXQCfd5@H!wCn2XGz_wxFRp}$yC-}+Eo|YZT7f5G5WK1?Y1Q6dij*n zKpD37Z_7$dUsW()iO#L*KQw2b>FgW5X{YbkYR9x4OnS$EJdu~>?9a@LJ65Mo6MtV< zb~gN6WMJNx++RPQFxs+T`Fdgg{mJ$LA)>nqC4A)F|Ghc+dP{fSt)J|ObaN^#)I|3} zsiq$=y}SluQE0lUho-Rnq^#8Bl48Bw?BK9vdJmokg%#-No;>fXbJEA}%*mBkeErXQ z>w4*U`UZNOKI3^cxZq^?iPQRl9=<1a0$ElqGkWm!(bG>KOSr-|Y+^NZZjNn!^mpza zhZ+Wi3qUD%&#Ri9=YcjW0#h%<1@-VWUYuWAl$;83!P<$Zxegf!xPEW^ci3ZklD$L0 zMR&2TOBbSEI8Cr~lg^O#2s*mo+-||+dyNNdC!h3Hd;I%9Z~spLzcAjZQ+=;~@4qVQ zer4)WF}+R48H89DZ)#Y(g**K3^A9tQKPpyaIe)HF?D>X!2eh5H2($#%FFO3kL1TIP zG;gm|&(2xPFTR`J;dtoi^oo;@A4#}X+f|?0ZGX#l+JxORuGQX}W4!+SbMq_w2Eli| zdV53p-d!q7xUxjL=KO&J29n&SPTk8cZYtaSGGOuRogI^Mzm-{UJfPce%ZLbrNQOBk zeDW`6Wim1_oCb!02tz$eJ})j!O35q&1wl}3_G1Hq8oTEIhp%{gcu%-}FF8YD?d56O zQ`)j0#_@F}X>MDw*7O(0ll$dw%~(F&VbxtdGtwj~)8yApkI900$qT~Rf=?~G+3gkm zHsu0W^yL>a+D%It*7{f^f8}?d#lttHX=5yp+$F9003PSPrB{@$+{$KI)TU~!byFkq zyu1K1XWDy+?a>vVZIdJoeIP!tKSqb_SP9&&uh2YtKJfD`~W?Y55B;HeUx%GmFig zj=xQ2J~3gxJ?l&Tv`bH}2TeCktSW!;db!>4A8A!j{(abMKV$aejT!-G(ll1Qjd)%a zc(nTCC+S7I+Fop#G;RK;2+p@Mmi!<4=THBh7M2+k;y+eKc}5+jp`rPrk==-?RV45=T$w8vLEb^iqAZH0w{s zdJzWPB{49?0)YS!O9P8slyaGoNdy>+xJqV_Hbw>oAnAgt5mrtIctZ`S2bS&F@+iWD z3U(B$5g8V42DExW&twQAexe$I$Z-MQ4hWB6CQ^_IFpvD^Kyd~<#ZDGr*J7H+HQ9#U ZiAkS(as#^@9~Ur4rvg*?K2UAO0022Y&~5+# diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/Functions/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/Functions/subdir.mk new file mode 100644 index 00000000000..500634fc951 --- /dev/null +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/Functions/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 += \ +../Functions/Func1.c + +OBJS += \ +./Functions/Func1.o + +C_DEPS += \ +./Functions/Func1.d + + +# Each subdirectory must supply rules for building sources it contributes +Functions/%.o: ../Functions/%.c + @echo 'Building file: $<' + @echo 'Invoking: GCC C Compiler' + gcc -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/oldTypeProjects/2.1/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/makefile new file mode 100644 index 00000000000..badaeb12869 --- /dev/null +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/makefile @@ -0,0 +1,44 @@ +################################################################################ +# 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 Functions/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: MBS2dot1.exe + +# Tool invocations +MBS2dot1.exe: $(OBJS) $(USER_OBJS) + @echo 'Building target: $@' + @echo 'Invoking: GCC C Linker' + gcc -o"MBS2dot1.exe" $(OBJS) $(USER_OBJS) $(LIBS) + @echo 'Finished building target: $@' + @echo ' ' + +# Other Targets +clean: + -$(RM) $(OBJS)$(C_DEPS)$(EXECUTABLES) MBS2dot1.exe + -@echo ' ' + +.PHONY: all clean dependents +.SECONDARY: + +-include ../makefile.targets diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/objects.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/objects.mk new file mode 100644 index 00000000000..224ef688d0b --- /dev/null +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/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/oldTypeProjects/2.1/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/sources.mk new file mode 100644 index 00000000000..c84afeb85b6 --- /dev/null +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/sources.mk @@ -0,0 +1,18 @@ +################################################################################ +# 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 := \ +. \ +Functions \ + diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/Benchmarks/subdir.mk new file mode 100644 index 00000000000..aecd3355aa7 --- /dev/null +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/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 -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/oldTypeProjects/2.1/test21.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1/test21.zip index 84fa5bd816b0f114978da453a647070c040f3a98..4986dd6b009a50f1b3a5ac43086821048f3c156f 100644 GIT binary patch delta 52 zcmX@A_>X^sEbC@rp1+KfAM&d)3A0Y-6mVt=V4dtI;Kg*1b@D6$Sw1!fHir3(3=E!Z H3_t(?mJJLA delta 2337 zcmZ`*3piA1A3ugM!;EW#a`&_%mm!ofBA3Dp#-+w(7r8UW{T|DSK9{i35F)#o*)5Sv zZktLPB7@vnYDI3fZiy|jXpijoiO;_0dCzms^S-~|`M=Nq|NH&VCSS8mg#;Wd0d8mj zUkw!WY~bPV=I!SaObt=7G-c=D{<2)YXQR;WjYeVqZlRO_|7{2cT0{a#5JXtLy2+Le z0G`7DK=S_~;5H^C%+;L|jP;|I(j2Lcs+h!b+qWRDL`c)<;SVE1aIb-Taq=M*`Ek{R z7l}1mG(INS(3jFG{!qP8_R$;4k_MqXVt6`QCo)_(zk`@P@IhB0K@eXRZzw|*Xu{|h z!kNF+A6aXBzJh1()Gscr;#6y9E0}LdXyF8XWz&FEy91SmM)V>y+z%csN9BEJ)~-~Z zz&2{CIlB_d6LENTX?!(y0WP ze5;xo#rK1HHf_H4)ur&#b8&0Z3S=(M0#6JPg}yeR7GZO6R9m?x{aD=jnT^~}uLkVE z3T_uwtf>d1KBh$K`0iXNG()_bOYfarP{+(U-XB7I)C~PeH^beGKtA@#a`188o4=P@soYySVi=y ztwdq~7?c%Q8gQS{-G!G?Pp1u^4zI&Br<*=H}jVV3C|d(AktQCpGf-YfQtHscJc z&wdG1wFp3UX)`9RlHG>FEQ9r*@;xi^R1y}L;~ftqt-pK~`s5qLfY@K>DFbMFDAMRo z9#N7^@DY&XPMeH!|F$B`JnwOGy=&AZcg|8{q`kxUQ*GaKEncn`U$@)%tvjscxJ*#T zgj9m@8^^0ysk!DbT}S6Sa-b+5mZ$7cs=<^9cw1$dnipa`%wI<15VS+q8R}qs+XSE3 z%DLUm)VwEu|Na$J@5-TNT6W3HUV|Z_3nJo3FX`OOK+%s186AUd84o`74XcSo+7pet zZdLthoA-MuJ@TsH{QHYd4EA?1%VQs-V?(511XQicypO39L*qXf423q@!I;uv*1K&u zfhQC;5xZ-HT|OqB1eL@*H1~)+z}3gYEi?qu=~Vn?NOHR+qUF%Z${)y3=oN z@!V9Is6;TgGHLH144e&Q*|xT;Secl!l&m<4Z>fzgE1!y zq|Jcc5nyc$=?|c<7eW=fCxVcGuwXZjtq4jj+qoN6`5z&c_!MyW+pmgSV5btm}-Ma3lqR78IF!c4{Ai)bUW>p2NqVF2V zuPkusR=>cVb7w>zoO$wc3=PCtBhi zscFh`#S@>#oSs}h#q`FdN{f={Rn0_-hhh|ZLw^M?lC6h#{0!gjY?+b>;VKpQEE|Xc zw)@#n1FxKS*8l(j diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/Functions/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/Functions/subdir.mk new file mode 100644 index 00000000000..645dd3914c6 --- /dev/null +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/Functions/subdir.mk @@ -0,0 +1,24 @@ +################################################################################ +# Automatically-generated file. Do not edit! +################################################################################ + +# Add inputs and outputs from these tool invocations to the build variables +CPP_SRCS += \ +../Functions/Func1.cpp + +OBJS += \ +./Functions/Func1.o + +CPP_DEPS += \ +./Functions/Func1.d + + +# Each subdirectory must supply rules for building sources it contributes +Functions/%.o: ../Functions/%.cpp + @echo 'Building file: $<' + @echo 'Invoking: GCC C++ Compiler' + g++ -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/oldTypeProjects/2.1CPP/Benchmarks/makefile b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/makefile new file mode 100644 index 00000000000..f855acee915 --- /dev/null +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/makefile @@ -0,0 +1,59 @@ +################################################################################ +# 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 Functions/subdir.mk +-include objects.mk + +ifneq ($(MAKECMDGOALS),clean) +ifneq ($(strip $(C++_DEPS)),) +-include $(C++_DEPS) +endif +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: Test21CXX + +# Tool invocations +Test21CXX: $(OBJS) $(USER_OBJS) + @echo 'Building target: $@' + @echo 'Invoking: GCC C++ Linker' + g++ -o"Test21CXX" $(OBJS) $(USER_OBJS) $(LIBS) + @echo 'Finished building target: $@' + @echo ' ' + +# Other Targets +clean: + -$(RM) $(OBJS)$(C++_DEPS)$(C_DEPS)$(CC_DEPS)$(CPP_DEPS)$(EXECUTABLES)$(CXX_DEPS)$(C_UPPER_DEPS) Test21CXX + -@echo ' ' + +.PHONY: all clean dependents +.SECONDARY: + +-include ../makefile.targets diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/objects.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/objects.mk new file mode 100644 index 00000000000..224ef688d0b --- /dev/null +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/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/oldTypeProjects/2.1CPP/Benchmarks/sources.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/sources.mk new file mode 100644 index 00000000000..89b098e5f87 --- /dev/null +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/sources.mk @@ -0,0 +1,28 @@ +################################################################################ +# Automatically-generated file. Do not edit! +################################################################################ + +O_SRCS := +CPP_SRCS := +C_UPPER_SRCS := +C_SRCS := +S_UPPER_SRCS := +OBJ_SRCS := +ASM_SRCS := +CXX_SRCS := +C++_SRCS := +CC_SRCS := +OBJS := +C++_DEPS := +C_DEPS := +CC_DEPS := +CPP_DEPS := +EXECUTABLES := +CXX_DEPS := +C_UPPER_DEPS := + +# Every subdirectory with source files must be described here +SUBDIRS := \ +. \ +Functions \ + diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/subdir.mk b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Benchmarks/subdir.mk new file mode 100644 index 00000000000..995afc24ebf --- /dev/null +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/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' + g++ -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/oldTypeProjects/2.1CPP/Test21CXX.zip b/build/org.eclipse.cdt.managedbuilder.core.tests/resources/oldTypeProjects/2.1CPP/Test21CXX.zip index 74108f2b8de50ca762a9e142b7e4d9b580dcedbe..6c9cac6395d2e82f5a1ff34e57f16944225294c1 100644 GIT binary patch delta 52 zcmdm?)GV+;j&*Yr&ws|rK>}(_BCM0E1e}=yStsuo@L@W_I+<5cmXD2rjbR}p1A`A6 H0}ucJiQNmu delta 2427 zcmZ`*4LH+lA6{%GZQ6S*Q4J+hhsYdF$w!!pG1OGZcbTs--#S{ycaly%6B4~PLcWH^ za150pM9JqQN)89JC?7df?|YcH_qnd;fBmoPdG7mp{?Gk;?)x7Odvc&e3PhHFkgf*U z)OPURPrGW^odVPn$d4s|LPG-7Vh(L9N z?KS|QR{#Kz`dgisTU~Al{0*@+I;%YMj_FAF~Mu)srrZW^`^gu-5 z$Am&?rG}g|^J^_N`Pf+ovNNIX1A#N5bC0?Ht0?i#nY+=Ql7O^|;4S3sw7R7lQVH=o+2#Dr6?lt!vy zyKK%IdnV61SGk7GXV5%rBcYl7QB$dp)#dhqen$03g~e5cAQ&VcT9#u{7o5#C%naE_ zMzkg83BM~CIzOa=J;sojaj#-n&e)`n%6Hr`lYgF1NGnI2(nmzdP}vob?! zEPBpaLXpYG0?FQ)ncXWF=gLi@4CfD@Y)7YQnxcZgrr}gG4q>8pw+uVw-wN2p&K+Ws zgB({X!n4-pgaZV4+5m&rPB7hBWJh_PFu#HT05N`XJRRI!E)zUlijvsG939xREMw-H ziWT+zfqQSLmm|#=n{0`J1k&0n^Z_P))H2v7Ep29Hv^?O1-SQhe zc!_@J|7gBe4 ziG1*bd^N+J^nUdyh#F81853y}(rvYo%X8>}S9C0@MVuGho$H%6uLz>REY2KueE>b; zk#sVzcBqojmU`G~#&eO5fux>hPnt1EU%+Ayjc<6)CI3<1`RBsZRjP`_PHFj7^Qpmu zlB#dXYJ>d>brkW<)p#ZULb&{VszhAG>el4cS#U{ zvM%WTMAiLuF#@V;fU8ci^u->xP5b!n{~3@N0qo94(7zYtGUv45(w%5OY)M(E(>HafH=c z-7`+jeU1v**906b9XmCoSDRg9IZS!ouVWBfqmg~{qCD1Yt^*H5t0}L^%9Qp|(V1sos7=3y}-qG4JD*2OBFN-Dgbnj(uqcFTrt@dTT;g z9R(w^g=$d{`Hse~+{kJV-Q0`npfxamZ3!xbhMDq8YMR%#SOwA1&Be*jmv`GO@np); zk#P&Wx1v%@2UfAg#I&s?zXxm9Zme`h(FkjfX>BulW$E2w^}JQt9D{99GzUJSsE&+} zj*CD8ps|aA91(m;8E7t4GgHO{z`uj3mv(pAyw#Ds0^hO&U!p(B$z^>94k`b zEZx`aHMiT3zV?S?s2Pe`lj*&qBE0WkBd#Bh<`Zo)d@8jk(XK&3z!wn~8VKuL=lLsT zZlCI>>q1`8a<8>x{A^9r$yn0^;oKHS`5SKe;;gH8^f(Nb^C5#}JYJa;oGM!EKIa~i zxuP$l-DM}!P_YpZ^-M=aCQc%*O7F}>gp@|N=Q-_Pdfma5k%9xw zeZTwrVoqIQ^Pfo^Hu9h)&yDZ#&Sc%APm?#SezOO=GuJ)XYJ!X^h~4|rtE47pr0|3~ z%tbT+`Ma9YK#4kaOmCJwLsMSAq!5P9fCW4!@XOf~Q&-H)g`Hm$IxSxI(9|zbpzAzbk%y_|rQw(_Zj#0zOQyFn=s2L*Lw5z*c~6 zRdHPw89QDPz^7ZF_PLt@nhbIZU~rLXzh@=nt@0u81k1{dVsV(cImfI zbR3!#{T_I$DjqZN`jAT9K)H_Z08_fqT3;TQl&K(Lx#b`7c$QHTe z#<}MkTeT~&JyN*+UFGpnf%8e4mmlg68tQ9({V6VLUO4BiT6IuiGQKj0on1e9X@Vt& zq5i48u0x_USfX47G`)=s2Ye6JAEhr(7G8t#I-Fm1tvGQ6kv|Ks?lPH@KG$Tr6bUz%)iZ3pvxh$s0!;j)!st7&X7*l*`! z*szeT6kBio2F2SA3f%gy&4vkV<=A>lHaO;avTai2pQA{W1RoIyf+QM%^#m&*fJ85l ccw#pA7Xbxm;u|nR6bgU>NP+-B33Q$6Z|rB+%K!iX diff --git a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProjectUpdateTests.java b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProjectUpdateTests.java index f0b91244305..5e689610869 100644 --- a/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProjectUpdateTests.java +++ b/build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedProjectUpdateTests.java @@ -41,6 +41,8 @@ import org.eclipse.core.runtime.jobs.Job; import org.eclipse.ui.dialogs.IOverwriteQuery; public class ManagedProjectUpdateTests extends TestCase { + private IPath resourcesLocation = new Path(CTestPlugin.getFileInPlugin(new Path("resources/oldTypeProjects/")).getAbsolutePath()); + public ManagedProjectUpdateTests(String name) { super(name); } @@ -49,7 +51,7 @@ public class ManagedProjectUpdateTests extends TestCase { TestSuite suite = new TestSuite(ManagedProjectUpdateTests.class.getName()); suite.addTest(new ManagedProjectUpdateTests("testProjectUpdate12_Update")); -// suite.addTest(new ManagedProjectUpdateTests("testProjectUpdate20_Update")); + suite.addTest(new ManagedProjectUpdateTests("testProjectUpdate20_Update")); suite.addTest(new ManagedProjectUpdateTests("testProjectUpdate21_Update")); // suite.addTest(new ManagedProjectUpdateTests("testProjectUpdate12_NoUpdate")); // suite.addTest(new ManagedProjectUpdateTests("testProjectUpdate20_NoUpdate")); @@ -184,8 +186,9 @@ public class ManagedProjectUpdateTests extends TestCase { if (files != null && files.length > 0) { if (i == 0) { String configName = info.getDefaultConfiguration().getName(); - IPath buildDir = Path.fromOSString(configName); - ManagedBuildTestHelper.compareBenchmarks(curProject, buildDir, files); + IPath benchmarkLocationBase = resourcesLocation.append(version); + IPath buildLocation = curProject.getLocation().append(configName); + ManagedBuildTestHelper.compareBenchmarks(curProject, buildLocation, files, benchmarkLocationBase); } } }