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

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

Browse source 
Benchmarks/ moved out of archive
This commit is contained in:
Andrew Gvozdev 2009-10-10 15:58:17 +00:00
parent 0c776079d1
commit 07339a8260
37 changed files with 571 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/func1.d Normal file
View file

@ -0,0 +1 @@
Sources/func1.d Sources/func1.o: ../Sources/func1.c

4
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/func2.d Normal file
View file

@ -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:

6
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/func4.d Normal file
View file

@ -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:

2
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/sub sources/func 3.d Normal file
View file

@ -0,0 +1,2 @@
Sources/sub\ sources/func\ 3.d Sources/sub\ sources/func\ 3.o: \
../Sources/sub\ sources/func\ 3.c

24
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/sub sources/subdir.mk Normal file
View file

@ -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 ' '

37
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/Sources/subdir.mk Normal file
View file

@ -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 ' '

8
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/main.d Normal file
View file

@ -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:

45
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/makefile Normal file
View file

@ -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

7
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/objects.mk Normal file
View file

@ -0,0 +1,7 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
USER_OBJS :=
LIBS :=

19
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/sources.mk Normal file
View file

@ -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 \

24
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/Benchmarks/subdir.mk Normal file
View file

@ -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 ' '

BIN
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc2/test1DepCalc2.zip
View file

Binary file not shown.

6
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/func1.d Normal file
View file

@ -0,0 +1,6 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
Sources/func1.d Sources/func1.o: ../Sources/func1.c

8
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/func2.d Normal file
View file

@ -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:

10
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/func4.d Normal file
View file

@ -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:

6
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/sub sources/func 3.d Normal file
View file

@ -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

26
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/sub sources/subdir.mk Normal file
View file

@ -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 ' '

32
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/Sources/subdir.mk Normal file
View file

@ -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 ' '

13
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/main.d Normal file
View file

@ -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:

45
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/makefile Normal file
View file

@ -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

7
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/objects.mk Normal file
View file

@ -0,0 +1,7 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
USER_OBJS :=
LIBS :=

19
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/sources.mk Normal file
View file

@ -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 \

26
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/Benchmarks/subdir.mk Normal file
View file

@ -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 ' '

BIN
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalc3/test1DepCalc3.zip
View file

Binary file not shown.

1
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/func1.d Normal file
View file

@ -0,0 +1 @@
Sources/func1.d Sources/func1.o: ../Sources/func1.c

4
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/func2.d Normal file
View file

@ -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:

6
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/func4.d Normal file
View file

@ -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:

2
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/sub sources/func 3.d Normal file
View file

@ -0,0 +1,2 @@
Sources/sub\ sources/func\ 3.d Sources/sub\ sources/func\ 3.o: \
../Sources/sub\ sources/func\ 3.c

29
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/sub sources/subdir.mk Normal file
View file

@ -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 ' '

35
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/Sources/subdir.mk Normal file
View file

@ -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 ' '

8
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/main.d Normal file
View file

@ -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:

45
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/makefile Normal file
View file

@ -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

7
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/objects.mk Normal file
View file

@ -0,0 +1,7 @@
################################################################################
# Automatically-generated file. Do not edit!
################################################################################
USER_OBJS :=
LIBS :=

19
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/sources.mk Normal file
View file

@ -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 \

29
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/Benchmarks/subdir.mk Normal file
View file

@ -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 ' '

BIN
build/org.eclipse.cdt.managedbuilder.core.tests/resources/depCalcProjects/test1DepCalcPreBuild/test1DepCalcPreBuild.zip
View file

Binary file not shown.

22
build/org.eclipse.cdt.managedbuilder.core.tests/tests/org/eclipse/cdt/managedbuilder/core/tests/ManagedBuildDependencyCalculatorTests.java
View file

@ -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,14 +148,17 @@ 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);
}
}
}
}
}
if (succeeded) { // Otherwise leave the projects around for comparison
for (int i = 0; i < projects.length; i++)