[llvm-commits] [poolalloc] r124334 - in /poolalloc/trunk/test: TEST.calltargets.Makefile TEST.pacompiletime.Makefile

[Arushi Aggarwal]

Author: aggarwa4
Date: Wed Jan 26 17:35:21 2011
New Revision: 124334

URL: http://llvm.org/viewvc/llvm-project?rev=124334&view=rev
Log:
Fix path to test cases; Use Configuration setting;

Modified:
    poolalloc/trunk/test/TEST.calltargets.Makefile
    poolalloc/trunk/test/TEST.pacompiletime.Makefile

Modified: poolalloc/trunk/test/TEST.calltargets.Makefile
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/TEST.calltargets.Makefile?rev=124334&r1=124333&r2=124334&view=diff
==============================================================================
--- poolalloc/trunk/test/TEST.calltargets.Makefile (original)
+++ poolalloc/trunk/test/TEST.calltargets.Makefile Wed Jan 26 17:35:21 2011
@@ -53,8 +53,8 @@
 	-$(LLVMLD) -link-as-library $< $(PA_PRE_RT) -o $@
 
 $(PROGRAMS_TO_TEST:%=Output/%.base.bc): \
-Output/%.base.bc: Output/%.temp.bc $(LOPT) $(ASSIST_SO)
-	-$(LOPT) -load $(ASSIST_SO) -instnamer -internalize -indclone -funcspec -ipsccp -deadargelim -instcombine -globaldce -stats $< -f -o $@ 
+Output/%.base.bc: Output/%.temp.bc $(LOPT) $(ASSIST_SO) $(DSA_SO)
+	-$(LOPT) -load $(DSA_SO) -load $(ASSIST_SO) -instnamer -internalize -indclone -funcspec -ipsccp -deadargelim -instcombine -globaldce -stats $< -f -o $@ 
 
 # This rule runs the pool allocator on the .base.bc file to produce a new .bc
 # file

Modified: poolalloc/trunk/test/TEST.pacompiletime.Makefile
URL: http://llvm.org/viewvc/llvm-project/poolalloc/trunk/test/TEST.pacompiletime.Makefile?rev=124334&r1=124333&r2=124334&view=diff
==============================================================================
--- poolalloc/trunk/test/TEST.pacompiletime.Makefile (original)
+++ poolalloc/trunk/test/TEST.pacompiletime.Makefile Wed Jan 26 17:35:21 2011
@@ -10,14 +10,14 @@
 EXTRA_PA_FLAGS := 
 
 CURDIR  := $(shell cd .; pwd)
-PROGDIR := $(shell cd $(LLVM_SRC_ROOT)/projects/llvm-test; pwd)/
+PROGDIR := $(shell cd $(LLVM_SRC_ROOT)/projects/test-suite/; pwd)/
 RELDIR  := $(subst $(PROGDIR),,$(CURDIR))
 
 # Pool allocator pass shared object
-PA_SO    := $(PROJECT_DIR)/Release/lib/libpoolalloc$(SHLIBEXT)
+PA_SO    := $(PROJECT_DIR)/$(CONFIGURATION)/lib/libpoolalloc$(SHLIBEXT)
 
 # Command to run opt with the pool allocator pass loaded
-OPT_PA := $(LOPT) -load $(PA_SO)
+OPT_PA := $(RUNTOOLSAFELY) $(WATCHDOG) $(LOPT) -load $(DSA_SO) -load $(PA_SO)
 
 # OPT_PA_STATS - Run opt with the -stats and -time-passes options, capturing the
 # output to a file.