[llvm-commits] CVS: poolalloc/test/TEST.cputrack.Makefile TEST.p4perf.Makefile TEST.pavtl.Makefile TEST.perf.Makefile TEST.poolalloc.Makefile TEST.strace.Makefile

[John Criswell]

Changes in directory poolalloc/test:

TEST.cputrack.Makefile updated: 1.6 -> 1.7
TEST.p4perf.Makefile updated: 1.6 -> 1.7
TEST.pavtl.Makefile updated: 1.10 -> 1.11
TEST.perf.Makefile updated: 1.10 -> 1.11
TEST.poolalloc.Makefile updated: 1.26 -> 1.27
TEST.strace.Makefile updated: 1.6 -> 1.7

---
Log message:

Switch PROGDIR to point to the source tree instead of the object tree
(as Makefile.programs in the LLVM test suite now does).  This allows
Makefiles within llvm-test to find programs like Sandbox.sh relative to
PROGDIR.

Add another entry for which pool allocation runtime to use.  Currently
disabled by default.


---
Diffs of the changes:  (+7 -6)

Index: poolalloc/test/TEST.cputrack.Makefile
diff -u poolalloc/test/TEST.cputrack.Makefile:1.6 poolalloc/test/TEST.cputrack.Makefile:1.7
--- poolalloc/test/TEST.cputrack.Makefile:1.6	Wed Nov  3 13:10:42 2004
+++ poolalloc/test/TEST.cputrack.Makefile	Fri Nov  5 12:08:50 2004
@@ -6,7 +6,7 @@
 
 TESTNAME = $*
 CURDIR  := $(shell cd .; pwd)
-PROGDIR := $(shell cd $(LLVM_OBJ_ROOT)/projects/llvm-test; pwd)/
+PROGDIR := $(shell cd $(LLVM_SRC_ROOT)/projects/llvm-test; pwd)/
 RELDIR  := $(subst $(PROGDIR),,$(CURDIR))
 
 


Index: poolalloc/test/TEST.p4perf.Makefile
diff -u poolalloc/test/TEST.p4perf.Makefile:1.6 poolalloc/test/TEST.p4perf.Makefile:1.7
--- poolalloc/test/TEST.p4perf.Makefile:1.6	Thu Oct 28 13:17:37 2004
+++ poolalloc/test/TEST.p4perf.Makefile	Fri Nov  5 12:08:50 2004
@@ -6,7 +6,7 @@
 
 TESTNAME = $*
 CURDIR  := $(shell cd .; pwd)
-PROGDIR := $(shell cd $(LLVM_OBJ_ROOT)/projects/llvm-test; pwd)/
+PROGDIR := $(shell cd $(LLVM_SRC_ROOT)/projects/llvm-test; pwd)/
 RELDIR  := $(subst $(PROGDIR),,$(CURDIR))
 
 PERFEX := /home/vadve/criswell/local/Linux/bin/perfex


Index: poolalloc/test/TEST.pavtl.Makefile
diff -u poolalloc/test/TEST.pavtl.Makefile:1.10 poolalloc/test/TEST.pavtl.Makefile:1.11
--- poolalloc/test/TEST.pavtl.Makefile:1.10	Thu Oct 28 13:17:37 2004
+++ poolalloc/test/TEST.pavtl.Makefile	Fri Nov  5 12:08:50 2004
@@ -6,7 +6,7 @@
 
 TESTNAME = $*
 CURDIR  := $(shell cd .; pwd)
-PROGDIR := $(shell cd $(LLVM_OBJ_ROOT)/projects/llvm-test; pwd)/
+PROGDIR := $(shell cd $(LLVM_SRC_ROOT)/projects/llvm-test; pwd)/
 RELDIR  := $(subst $(PROGDIR),,$(CURDIR))
 
 VTL := /opt/intel/vtune/bin/vtl


Index: poolalloc/test/TEST.perf.Makefile
diff -u poolalloc/test/TEST.perf.Makefile:1.10 poolalloc/test/TEST.perf.Makefile:1.11
--- poolalloc/test/TEST.perf.Makefile:1.10	Thu Oct 28 13:17:37 2004
+++ poolalloc/test/TEST.perf.Makefile	Fri Nov  5 12:08:50 2004
@@ -6,7 +6,7 @@
 
 TESTNAME = $*
 CURDIR  := $(shell cd .; pwd)
-PROGDIR := $(shell cd $(LLVM_OBJ_ROOT)/projects/llvm-test; pwd)/
+PROGDIR := $(shell cd $(LLVM_SRC_ROOT)/projects/llvm-test; pwd)/
 RELDIR  := $(subst $(PROGDIR),,$(CURDIR))
 
 PERFEX := /home/vadve/criswell/local/Linux/bin/perfex


Index: poolalloc/test/TEST.poolalloc.Makefile
diff -u poolalloc/test/TEST.poolalloc.Makefile:1.26 poolalloc/test/TEST.poolalloc.Makefile:1.27
--- poolalloc/test/TEST.poolalloc.Makefile:1.26	Wed Nov  3 23:07:29 2004
+++ poolalloc/test/TEST.poolalloc.Makefile	Fri Nov  5 12:08:50 2004
@@ -17,7 +17,7 @@
 
 
 CURDIR  := $(shell cd .; pwd)
-PROGDIR := $(shell cd $(LLVM_OBJ_ROOT)/projects/llvm-test; pwd)/
+PROGDIR := $(shell cd $(LLVM_SRC_ROOT)/projects/llvm-test; pwd)/
 RELDIR  := $(subst $(PROGDIR),,$(CURDIR))
 
 # Pool allocator pass shared object
@@ -25,6 +25,7 @@
 
 # Pool allocator runtime library
 #PA_RT    := $(PROJECT_DIR)/lib/Bytecode/libpoolalloc_fl_rt.bc
+#PA_RT_O  := $(PROJECT_DIR)/lib/$(CONFIGURATION)/poolalloc_rt.o
 PA_RT_O  := $(PROJECT_DIR)/lib/Release/poolalloc_rt.o
 #PA_RT_O  := $(PROJECT_DIR)/lib/Release/poolalloc_fl_rt.o
 


Index: poolalloc/test/TEST.strace.Makefile
diff -u poolalloc/test/TEST.strace.Makefile:1.6 poolalloc/test/TEST.strace.Makefile:1.7
--- poolalloc/test/TEST.strace.Makefile:1.6	Thu Oct 28 16:11:48 2004
+++ poolalloc/test/TEST.strace.Makefile	Fri Nov  5 12:08:50 2004
@@ -6,7 +6,7 @@
 
 TESTNAME = $*
 CURDIR  := $(shell cd .; pwd)
-PROGDIR := $(shell cd $(LLVM_OBJ_ROOT)/projects/llvm-test; pwd)/
+PROGDIR := $(shell cd $(LLVM_SRC_ROOT)/projects/llvm-test; pwd)/
 RELDIR  := $(subst $(PROGDIR),,$(CURDIR))
 
 STRACE := strace -c -f