[llvm-commits] CVS: llvm-test/Makefile Makefile.dummylib Makefile.programs README.txt TEST.aa.Makefile TEST.buildrepo.Makefile TEST.dsgraph.Makefile TEST.example.Makefile TEST.jit.Makefile TEST.llc.Makefile TEST.nightly.Makefile TEST.typesafe.Makefile TEST.vtl.Makefile
Reid Spencer
reid at x10sys.com
Sun Sep 5 00:57:04 PDT 2004
Changes in directory llvm-test:
Makefile updated: 1.23 -> 1.24
Makefile.dummylib updated: 1.4 -> 1.5
Makefile.programs updated: 1.135 -> 1.136
README.txt updated: 1.1 -> 1.2
TEST.aa.Makefile updated: 1.4 -> 1.5
TEST.buildrepo.Makefile updated: 1.3 -> 1.4
TEST.dsgraph.Makefile updated: 1.11 -> 1.12
TEST.example.Makefile updated: 1.6 -> 1.7
TEST.jit.Makefile updated: 1.4 -> 1.5
TEST.llc.Makefile updated: 1.3 -> 1.4
TEST.nightly.Makefile updated: 1.32 -> 1.33
TEST.typesafe.Makefile updated: 1.4 -> 1.5
TEST.vtl.Makefile updated: 1.4 -> 1.5
---
Log message:
Rid llvm-test of the last vestiges of its "test/Programs" inheritance.
---
Diffs of the changes: (+33 -30)
Index: llvm-test/Makefile
diff -u llvm-test/Makefile:1.23 llvm-test/Makefile:1.24
--- llvm-test/Makefile:1.23 Wed Sep 1 09:33:16 2004
+++ llvm-test/Makefile Sun Sep 5 02:56:51 2004
@@ -23,5 +23,5 @@
#
# Include the Master Makefile that knows how to build all.
#
-include $(LEVEL)/Makefile.common
+include $(LEVEL)/Makefile.programs
Index: llvm-test/Makefile.dummylib
diff -u llvm-test/Makefile.dummylib:1.4 llvm-test/Makefile.dummylib:1.5
--- llvm-test/Makefile.dummylib:1.4 Fri Aug 22 15:38:47 2003
+++ llvm-test/Makefile.dummylib Sun Sep 5 02:56:51 2004
@@ -1,4 +1,4 @@
-##===- test/Programs/Makefile.dummylib ---------------------*- Makefile -*-===##
+##===- Makefile.dummylib -----------------------------------*- Makefile -*-===##
#
# This makefile fragment is to be used by program tests which require the
# program to be linked with libdummy. The output program is named:
Index: llvm-test/Makefile.programs
diff -u llvm-test/Makefile.programs:1.135 llvm-test/Makefile.programs:1.136
--- llvm-test/Makefile.programs:1.135 Wed Sep 1 09:33:16 2004
+++ llvm-test/Makefile.programs Sun Sep 5 02:56:51 2004
@@ -1,7 +1,7 @@
-##===- test/Programs/Makefile.programs ---------------------*- Makefile -*-===##
+##===- llvm-test/Makefile.programs -------------------------*- Makefile -*-===##
#
# This makefile contains all of the makefile machinery that is common to
-# building stuff in the Programs directory. This script can be used in two
+# building stuff in this directory. This script can be used in two
# different ways. The main job of this is to take executables for the following
# targets:
#
@@ -29,7 +29,7 @@
#
# This makefile provides facilities for defining custom tests that are to be run
# on all of the programs in the test suite. In order to define one of these
-# tests, create a llvm/test/Programs/Makefile.TEST.<testname> file. This file
+# tests, create a llvm-test/Makefile.TEST.<testname> file. This file
# should define a rule 'test.<testname>.%' which is run once for each program in
# the suite (the % passed in is the program name). For a simple example, see
# Makefile.TEST.example.
@@ -49,7 +49,7 @@
PROGDIR = $(BUILD_SRC_ROOT)
#
-# Scripts in the Programs directory...
+# Scripts in the this directory...
#
# TIMEPROG - The program used to get timing results for a program
@@ -498,7 +498,7 @@
# relative to BYTECODE_REPOSITORY and the current directory this program is in.
#
CURDIR := $(shell cd .; pwd)
-PROGDIR := $(shell cd $(LEVEL)/test/Programs; pwd)
+PROGDIR := $(shell cd $(LEVEL); pwd)
SRCDIR := $(BYTECODE_REPOSITORY)/$(subst $(PROGDIR),,$(CURDIR))
# Because we don't have source code, we cannot build a native version of the
@@ -550,11 +550,11 @@
# test.<testname>.% given input from Output/%.llvm.bc
#
ifdef TEST
-TestMakefile := $(wildcard $(LEVEL)/test/Programs/TEST.$(TEST).Makefile) \
+TestMakefile := $(wildcard $(PROGDIR)/TEST.$(TEST).Makefile) \
$(wildcard $(LEVEL)/projects/*/test/TEST.$(TEST).Makefile)
-TestReport := $(wildcard $(LEVEL)/test/Programs/TEST.$(TEST).report) \
+TestReport := $(wildcard $(PROGDIR)/TEST.$(TEST).report) \
$(wildcard $(BUILD_SRC_ROOT)/projects/*/test/TEST.$(TEST).report)
-TestGnuPlot := $(wildcard $(LEVEL)/test/Programs/TEST.$(TEST).gnuplot) \
+TestGnuPlot := $(wildcard $(PROGDIR)/TEST.$(TEST).gnuplot) \
$(wildcard $(BUILD_SRC_ROOT)/projects/*/test/TEST.$(TEST).gnuplot)
ifneq ($(strip $(TestMakefile)),)
-include $(TestMakefile)
@@ -564,7 +564,10 @@
@echo
@echo "***************************************************************"
@echo " ERROR: Test '$(TEST)' is not a known test!"
- @echo " Tests available: $(AVAILABLE_TESTS)"
+ @echo " Tests Available: $(AVAILABLE_TESTS)"
+ @echo " Test Program: $*"
+ @echo " Test Makefile: $(TestMakefile)"
+ @echo " Test Report: $(TestReport)"
@echo "***************************************************************"
@echo
@exit 1
@@ -574,7 +577,7 @@
#
# Rules for building a report from 'make report TEST=<x>'
#
-GENERATEREPORT := $(LLVM_SRC_ROOT)/test/Programs/GenerateReport.pl
+GENERATEREPORT := $(BUILD_SRC_ROOT)/GenerateReport.pl
report.$(TEST).raw.out: $(REPORT_DEPENDENCIES) $(TestMakefile)
gmake TEST=$(TEST) 2>&1 | tee $@
Index: llvm-test/README.txt
diff -u llvm-test/README.txt:1.1 llvm-test/README.txt:1.2
--- llvm-test/README.txt:1.1 Wed Jan 23 15:41:22 2002
+++ llvm-test/README.txt Sun Sep 5 02:56:51 2004
@@ -1,5 +1,5 @@
-test/Programs Heirarchy
------------------------
+llvm-test Heirarchy
+-------------------
Files in this heirarchy comprise complete programs that are to be compiled from
source, linked (optionally), and then compiled to machine code. Since these
Index: llvm-test/TEST.aa.Makefile
diff -u llvm-test/TEST.aa.Makefile:1.4 llvm-test/TEST.aa.Makefile:1.5
--- llvm-test/TEST.aa.Makefile:1.4 Wed Jul 2 18:49:06 2003
+++ llvm-test/TEST.aa.Makefile Sun Sep 5 02:56:51 2004
@@ -1,4 +1,4 @@
-##===- test/Programs/TEST.aa.Makefile ----------------------*- Makefile -*-===##
+##===- TEST.aa.Makefile ------------------------------------*- Makefile -*-===##
#
# This recursively traverses the programs, computing the precision of various
# alias analysis passes on the programs.
@@ -6,7 +6,7 @@
##===----------------------------------------------------------------------===##
# We require the programs to be linked with libdummy
-include $(LEVEL)/test/Programs/Makefile.dummylib
+include $(LEVEL)/Makefile.dummylib
AA_IMPLS := basic steens-fi steens ds-fi ds
Index: llvm-test/TEST.buildrepo.Makefile
diff -u llvm-test/TEST.buildrepo.Makefile:1.3 llvm-test/TEST.buildrepo.Makefile:1.4
--- llvm-test/TEST.buildrepo.Makefile:1.3 Fri Jan 17 16:58:49 2003
+++ llvm-test/TEST.buildrepo.Makefile Sun Sep 5 02:56:51 2004
@@ -1,4 +1,4 @@
-##===- test/Programs/TEST.buildrepo.Makefile ---------------*- Makefile -*-===##
+##===- TEST.buildrepo.Makefile -----------------------------*- Makefile -*-===##
#
# This "test" is used to copy all compiled bytecode files into the repository.
#
@@ -12,7 +12,7 @@
# relative to BYTECODE_REPOSITORY and the current directory this program is in.
#
CURDIR := $(shell cd .; pwd)
-PROGDIR := $(shell cd $(LEVEL)/test/Programs; pwd)
+PROGDIR := $(BUILD_SRC_ROOT)
DESTDIR := $(BYTECODE_REPOSITORY)/$(subst $(PROGDIR),,$(CURDIR))
.PRECIOUS: $(DESTDIR)/.dir $(DESTDIR)/%.bc
Index: llvm-test/TEST.dsgraph.Makefile
diff -u llvm-test/TEST.dsgraph.Makefile:1.11 llvm-test/TEST.dsgraph.Makefile:1.12
--- llvm-test/TEST.dsgraph.Makefile:1.11 Fri Aug 22 15:54:41 2003
+++ llvm-test/TEST.dsgraph.Makefile Sun Sep 5 02:56:51 2004
@@ -1,4 +1,4 @@
-##===- test/Programs/TEST.dsgraph.Makefile -----------------*- Makefile -*-===##
+##===- TEST.dsgraph.Makefile -------------------------------*- Makefile -*-===##
#
# This recursively traverses the programs, computing DSGraphs for each of the
# programs in the testsuite.
@@ -6,11 +6,11 @@
##===----------------------------------------------------------------------===##
CURDIR := $(shell cd .; pwd)
-PROGDIR := $(shell cd $(LEVEL)/test/Programs; pwd)/
+PROGDIR := $(BUILD_SRC_ROOT)
RELDIR := $(subst $(PROGDIR),,$(CURDIR))
# We require the programs to be linked with libdummy
-include $(LEVEL)/test/Programs/Makefile.dummylib
+include $(LEVEL)/Makefile.dummylib
# PASS - The dsgraph pass to run: ds, bu, td
PASS := td
Index: llvm-test/TEST.example.Makefile
diff -u llvm-test/TEST.example.Makefile:1.6 llvm-test/TEST.example.Makefile:1.7
--- llvm-test/TEST.example.Makefile:1.6 Fri Jan 17 16:58:49 2003
+++ llvm-test/TEST.example.Makefile Sun Sep 5 02:56:51 2004
@@ -1,4 +1,4 @@
-##===- test/Programs/TEST.example.Makefile -----------------*- Makefile -*-===##
+##===- TEST.example.Makefile -------------------------------*- Makefile -*-===##
#
# Example to show a custom test. This test just prints the size of the bytecode
# file for each program.
Index: llvm-test/TEST.jit.Makefile
diff -u llvm-test/TEST.jit.Makefile:1.4 llvm-test/TEST.jit.Makefile:1.5
--- llvm-test/TEST.jit.Makefile:1.4 Mon Jun 16 10:52:21 2003
+++ llvm-test/TEST.jit.Makefile Sun Sep 5 02:56:51 2004
@@ -1,4 +1,4 @@
-##===- test/Programs/TEST.jit.Makefile ---------------------*- Makefile -*-===##
+##===- TEST.jit.Makefile ----------------------------------*- Makefile -*-===##
#
# This test tries running the Just-In-Time compiler on all of the programs to
# see which ones work and which ones don't. It provides a report to tabulate
@@ -8,7 +8,7 @@
JIT_OPTS = -force-interpreter=false -stats -time-passes
CURDIR := $(shell cd .; pwd)
-PROGDIR := $(shell cd $(LEVEL)/test/Programs; pwd)/
+PROGDIR := $(BUILD_SRC_ROOT)
RELDIR := $(subst $(PROGDIR),,$(CURDIR))
$(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \
Index: llvm-test/TEST.llc.Makefile
diff -u llvm-test/TEST.llc.Makefile:1.3 llvm-test/TEST.llc.Makefile:1.4
--- llvm-test/TEST.llc.Makefile:1.3 Sun Feb 1 09:45:48 2004
+++ llvm-test/TEST.llc.Makefile Sun Sep 5 02:56:51 2004
@@ -1,4 +1,4 @@
-##===- test/Programs/TEST.llc.Makefile ---------------------*- Makefile -*-===##
+##===- TEST.llc.Makefile -----------------------------------*- Makefile -*-===##
#
# This test tries running the compiler on all of the programs and
# reports on detailed pass execution times and register allocation and
@@ -8,7 +8,7 @@
LLC_OPTS = -f -o=/dev/null -stats -time-passes -regalloc=linearscan
CURDIR := $(shell cd .; pwd)
-PROGDIR := $(shell cd $(LEVEL)/test/Programs; pwd)/
+PROGDIR := $(BUILD_SRC_ROOT)
RELDIR := $(subst $(PROGDIR),,$(CURDIR))
$(PROGRAMS_TO_TEST:%=Output/%.$(TEST).report.txt): \
Index: llvm-test/TEST.nightly.Makefile
diff -u llvm-test/TEST.nightly.Makefile:1.32 llvm-test/TEST.nightly.Makefile:1.33
--- llvm-test/TEST.nightly.Makefile:1.32 Fri Jul 23 01:49:31 2004
+++ llvm-test/TEST.nightly.Makefile Sun Sep 5 02:56:51 2004
@@ -1,4 +1,4 @@
-##===- test/Programs/TEST.nightly.Makefile ----------------*- Makefile -*--===##
+##===- TEST.nightly.Makefile ------------------------------*- Makefile -*--===##
#
# This test is used in conjunction with the llvm/utils/NightlyTest* stuff to
# generate information about program status for the nightly report.
@@ -6,7 +6,7 @@
##===----------------------------------------------------------------------===##
CURDIR := $(shell cd .; pwd)
-PROGDIR := $(shell cd $(LEVEL)/test/Programs; pwd)/
+PROGDIR := $(BUILD_SRC_ROOT)
RELDIR := $(subst $(PROGDIR),,$(CURDIR))
CFLAGS := -O3
Index: llvm-test/TEST.typesafe.Makefile
diff -u llvm-test/TEST.typesafe.Makefile:1.4 llvm-test/TEST.typesafe.Makefile:1.5
--- llvm-test/TEST.typesafe.Makefile:1.4 Fri Jan 17 16:58:49 2003
+++ llvm-test/TEST.typesafe.Makefile Sun Sep 5 02:56:51 2004
@@ -1,4 +1,4 @@
-##===- test/Programs/TEST.typesafe.Makefile ----------------*- Makefile -*-===##
+##===- TEST.typesafe.Makefile ------------------------------*- Makefile -*-===##
#
# This test simply checks to see if programs are typesafe according to the
# -unsafepointertypes analysis.
Index: llvm-test/TEST.vtl.Makefile
diff -u llvm-test/TEST.vtl.Makefile:1.4 llvm-test/TEST.vtl.Makefile:1.5
--- llvm-test/TEST.vtl.Makefile:1.4 Tue Mar 2 09:52:04 2004
+++ llvm-test/TEST.vtl.Makefile Sun Sep 5 02:56:51 2004
@@ -1,4 +1,4 @@
-##===- test/Programs/TEST.vtl.Makefile ---------------------*- Makefile -*-===##
+##===- TEST.vtl.Makefile -----------------------------------*- Makefile -*-===##
#
# Makefile for getting performance metrics using Intel's VTune.
#
More information about the llvm-commits
mailing list