Rid llvm-test of the last vestiges of its "test/Programs" inheritance.

Reid Spencer · Reid Spencer · commit d988cd3aa908 · 2004-09-05T07:56:52.000Z
llvm-svn: 16180
diff --git a/External/Makefile.external b/External/Makefile.external
@@ -1,4 +1,4 @@
-##===- test/Programs/SingleSource/Makefile.external --------*- Makefile -*-===##
+##===- External/Makefile.external --------------------------*- Makefile -*-===##
 #
 # This makefile is used to build programs that are not directly in the LLVM
 # build system.  It relies on a set of external makefiles to build the program,
diff --git a/External/SPEC/CINT2000/Makefile b/External/SPEC/CINT2000/Makefile
@@ -21,4 +21,4 @@ ifeq ($(ARCH), Sparc)
 PARALLEL_DIRS := $(filter-out 186.crafty, $(PARALLEL_DIRS))
 endif
 
-include ${LEVEL}/test/Programs/Makefile.programs
+include ${LEVEL}/Makefile.programs
diff --git a/External/SPEC/CINT95/Makefile b/External/SPEC/CINT95/Makefile
@@ -11,4 +11,4 @@ PARALLEL_DIRS := \
 
 # Get the $(ARCH) setting
 include $(LEVEL)/Makefile.config
-include ${LEVEL}/test/Programs/Makefile.programs
+include ${LEVEL}/Makefile.programs
diff --git a/External/SPEC/Makefile.spec b/External/SPEC/Makefile.spec
@@ -44,7 +44,7 @@ LCCFLAGS  := -O3
 LCXXFLAGS := -O3
 
 CPPFLAGS += -I $(SPEC_BENCH_DIR)/src/
-SPEC_SANDBOX := $(LLVM_SRC_ROOT)/test/Programs/External/SPEC/Sandbox.sh
+SPEC_SANDBOX := $(LLVM_SRC_ROOT)/External/SPEC/Sandbox.sh
 
 # Information about testing the program...
 REF_IN_DIR  := $(SPEC_BENCH_DIR)/data/$(RUN_TYPE)/input/
diff --git a/LLVMSource/Makefile b/LLVMSource/Makefile
@@ -1,4 +1,4 @@
-#                  test/Programs/LLVMSource/Makefile
+#                  LLVMSource/Makefile
 #
 # This directory contains regression tests for LLVM backends written in LLVM
 # assembly language.
@@ -9,7 +9,7 @@ PROGRAM_REQUIRED_TO_EXIT_OK := 1
 REQUIRES_EH_SUPPORT := 1
 
 PROGRAMS_TO_TEST := $(basename $(wildcard *.ll))
-include $(LEVEL)/test/Programs/Makefile.programs
+include $(LEVEL)/Makefile.programs
 
 LLVM_SOURCE_BYTECODES := $(PROGRAMS_TO_TEST:%=Output/%.llvm.bc)
 
diff --git a/Makefile b/Makefile
@@ -23,5 +23,5 @@ PARALLEL_DIRS = SingleSource MultiSource External
 #
 # Include the Master Makefile that knows how to build all.
 #
-include $(LEVEL)/Makefile.common
+include $(LEVEL)/Makefile.programs
 
diff --git a/Makefile.dummylib b/Makefile.dummylib
@@ -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:
diff --git a/Makefile.programs b/Makefile.programs
@@ -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 @@ include $(LEVEL)/Makefile.tests
 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 @@ ifdef USE_PRECOMPILED_BYTECODE
 # 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..%:
 # 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 @@ test.$(TEST).%:
 	@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 @@ endif
 #
 # 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 $@
diff --git a/MultiSource/Makefile.multisrc b/MultiSource/Makefile.multisrc
@@ -1,4 +1,4 @@
-##==- test/Programs/MultiSource/Makefile.multisrc ----------*- Makefile -*-===##
+##==- MultiSource/Makefile.multisrc ------------------------*- Makefile -*-===##
 #
 # This makefile should be used by subdirectories that have multiple source files
 # to be linked together.  This contains all of the common makefile code required
diff --git a/README.txt b/README.txt
@@ -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
diff --git a/SingleSource/Makefile.singlesrc b/SingleSource/Makefile.singlesrc
@@ -1,4 +1,4 @@
-##===- test/Programs/SingleSource/Makefile.singlesrc -------*- Makefile -*-===##
+##===- SingleSource/Makefile.singlesrc --------------------*- Makefile -*-===##
 #
 # This makefile builds all of the C programs in this directory in three
 # different configurations:
diff --git a/SingleSource/Regression/C++/Makefile b/SingleSource/Regression/C++/Makefile
@@ -1,4 +1,4 @@
-#                   test/Programs/SingleSource/Regression/C++
+#                   SingleSource/Regression/C++
 #
 # This directory contains regression tests for the GCC C++ front-end for LLVM.  
 # These tests are C++ source files that are input to GCC and compiled to .ll
diff --git a/SingleSource/UnitTests/Makefile b/SingleSource/UnitTests/Makefile
@@ -1,4 +1,4 @@
-# Programs/SingleSource/UnitTests/Makefile
+# SingleSource/UnitTests/Makefile
 
 DIRS = SetjmpLongjmp
 LEVEL = ../..
diff --git a/SingleSource/UnitTests/SetjmpLongjmp/C++/Makefile b/SingleSource/UnitTests/SetjmpLongjmp/C++/Makefile
@@ -1,4 +1,4 @@
-# Programs/SingleSource/UnitTests/SetjmpLongjmp/Makefile
+# SingleSource/UnitTests/SetjmpLongjmp/Makefile
 LEVEL = ../../../..
 REQUIRES_EH_SUPPORT = 1
 LIBS = -lstdc++
diff --git a/SingleSource/UnitTests/SetjmpLongjmp/C/Makefile b/SingleSource/UnitTests/SetjmpLongjmp/C/Makefile
@@ -1,4 +1,4 @@
-# Programs/SingleSource/UnitTests/SetjmpLongjmp/Makefile
+# SingleSource/UnitTests/SetjmpLongjmp/Makefile
 LEVEL = ../../../..
 REQUIRES_EH_SUPPORT = 1
 include $(LEVEL)/SingleSource/Makefile.singlesrc
diff --git a/SingleSource/UnitTests/SetjmpLongjmp/Makefile b/SingleSource/UnitTests/SetjmpLongjmp/Makefile
@@ -1,4 +1,4 @@
-# Programs/SingleSource/UnitTests/SetjmpLongjmp/Makefile
+# SingleSource/UnitTests/SetjmpLongjmp/Makefile
 
 DIRS = C C++
 LEVEL = ../../..
diff --git a/TEST.aa.Makefile b/TEST.aa.Makefile
@@ -1,12 +1,12 @@
-##===- 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.
 #
 ##===----------------------------------------------------------------------===##
 
 # 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
 
diff --git a/TEST.buildrepo.Makefile b/TEST.buildrepo.Makefile
@@ -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 @@ endif
 # 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
diff --git a/TEST.dsgraph.Makefile b/TEST.dsgraph.Makefile
@@ -1,16 +1,16 @@
-##===- 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.
 #
 ##===----------------------------------------------------------------------===##
 
 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
diff --git a/TEST.example.Makefile b/TEST.example.Makefile
@@ -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.
diff --git a/TEST.jit.Makefile b/TEST.jit.Makefile
@@ -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): \
diff --git a/TEST.llc.Makefile b/TEST.llc.Makefile
@@ -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): \
diff --git a/TEST.nightly.Makefile b/TEST.nightly.Makefile
@@ -1,12 +1,12 @@
-##===- 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.
 #
 ##===----------------------------------------------------------------------===##
 
 CURDIR  := $(shell cd .; pwd)
-PROGDIR := $(shell cd $(LEVEL)/test/Programs; pwd)/
+PROGDIR := $(BUILD_SRC_ROOT)
 RELDIR  := $(subst $(PROGDIR),,$(CURDIR))
 CFLAGS  := -O3
 
diff --git a/TEST.typesafe.Makefile b/TEST.typesafe.Makefile
@@ -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.
diff --git a/TEST.vtl.Makefile b/TEST.vtl.Makefile
@@ -1,4 +1,4 @@
-##===- test/Programs/TEST.vtl.Makefile ---------------------*- Makefile -*-===##
+##===- TEST.vtl.Makefile -----------------------------------*- Makefile -*-===##
 #
 # Makefile for getting performance metrics using Intel's VTune.
 #

Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-##===- test/Programs/SingleSource/Makefile.external --------- Makefile --===##`
	`1`	`+##===- External/Makefile.external --------------------------- Makefile --===##`
`2`	`2`	`#`
`3`	`3`	`# This makefile is used to build programs that are not directly in the LLVM`
`4`	`4`	`# build system. It relies on a set of external makefiles to build the program,`
Original file line number	Diff line number	Diff line change
`@@ -23,5 +23,5 @@ PARALLEL_DIRS = SingleSource MultiSource External`
`23`	`23`	`#`
`24`	`24`	`# Include the Master Makefile that knows how to build all.`
`25`	`25`	`#`
`26`		`-include $(LEVEL)/Makefile.common`
	`26`	`+include $(LEVEL)/Makefile.programs`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-##===- test/Programs/Makefile.dummylib ---------------------- Makefile --===##`
	`1`	`+##===- Makefile.dummylib ------------------------------------ Makefile --===##`
`2`	`2`	`#`
`3`	`3`	`# This makefile fragment is to be used by program tests which require the`
`4`	`4`	`# program to be linked with libdummy. The output program is named:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-##==- test/Programs/MultiSource/Makefile.multisrc ----------- Makefile --===##`
	`1`	`+##==- MultiSource/Makefile.multisrc ------------------------- Makefile --===##`
`2`	`2`	`#`
`3`	`3`	`# This makefile should be used by subdirectories that have multiple source files`
`4`	`4`	`# to be linked together. This contains all of the common makefile code required`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-##===- test/Programs/SingleSource/Makefile.singlesrc -------- Makefile --===##`
	`1`	`+##===- SingleSource/Makefile.singlesrc --------------------- Makefile --===##`
`2`	`2`	`#`
`3`	`3`	`# This makefile builds all of the C programs in this directory in three`
`4`	`4`	`# different configurations:`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# test/Programs/SingleSource/Regression/C++`
	`1`	`+# SingleSource/Regression/C++`
`2`	`2`	`#`
`3`	`3`	`# This directory contains regression tests for the GCC C++ front-end for LLVM.`
`4`	`4`	`# These tests are C++ source files that are input to GCC and compiled to .ll`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Programs/SingleSource/UnitTests/Makefile`
	`1`	`+# SingleSource/UnitTests/Makefile`
`2`	`2`
`3`	`3`	`DIRS = SetjmpLongjmp`
`4`	`4`	`LEVEL = ../..`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-# Programs/SingleSource/UnitTests/SetjmpLongjmp/Makefile`
	`1`	`+# SingleSource/UnitTests/SetjmpLongjmp/Makefile`
`2`	`2`	`LEVEL = ../../../..`
`3`	`3`	`REQUIRES_EH_SUPPORT = 1`
`4`	`4`	`LIBS = -lstdc++`
Original file line number	Diff line number	Diff line change
`@@ -1,12 +1,12 @@`
`1`		`-##===- test/Programs/TEST.aa.Makefile ----------------------- Makefile --===##`
	`1`	`+##===- TEST.aa.Makefile ------------------------------------- Makefile --===##`
`2`	`2`	`#`
`3`	`3`	`# This recursively traverses the programs, computing the precision of various`
`4`	`4`	`# alias analysis passes on the programs.`
`5`	`5`	`#`
`6`	`6`	`##===----------------------------------------------------------------------===##`
`7`	`7`
`8`	`8`	`# We require the programs to be linked with libdummy`
`9`		`-include $(LEVEL)/test/Programs/Makefile.dummylib`
	`9`	`+include $(LEVEL)/Makefile.dummylib`
`10`	`10`
`11`	`11`	`AA_IMPLS := basic steens-fi steens ds-fi ds`
`12`	`12`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-##===- test/Programs/TEST.buildrepo.Makefile ---------------- Makefile --===##`
	`1`	`+##===- TEST.buildrepo.Makefile ------------------------------ Makefile --===##`
`2`	`2`	`#`
`3`	`3`	`# This "test" is used to copy all compiled bytecode files into the repository.`
`4`	`4`	`#`
`@@ -12,7 +12,7 @@ endif`
`12`	`12`	`# relative to BYTECODE_REPOSITORY and the current directory this program is in.`
`13`	`13`	`#`
`14`	`14`	`CURDIR := $(shell cd .; pwd)`
`15`		`-PROGDIR := $(shell cd $(LEVEL)/test/Programs; pwd)`
	`15`	`+PROGDIR := $(BUILD_SRC_ROOT)`
`16`	`16`	`DESTDIR := $(BYTECODE_REPOSITORY)/$(subst $(PROGDIR),,$(CURDIR))`
`17`	`17`
`18`	`18`	`.PRECIOUS: $(DESTDIR)/.dir $(DESTDIR)/%.bc`