Allow the test suite to be checked out into projects/test-suite.

We will keep the old projects/llvm-test working for existing installs.

The changes to configure are made manually, since I lack autoconf-2.6. Someone
might want to run AutoGen.sh to see if that changes anything.

git-svn-id: https://llvm.org/svn/llvm-project/llvm/trunk@52675 91177308-0d34-0410-b5e6-96231b3b80d8

diff --git a/autoconf/configure.ac b/autoconf/configure.ac
index 15cfa347c3d63c44149f9db24a87268422364512..42d2985d535cea9a80ff83e86f31fd544eb005f1 100644 (file)
--- a/autoconf/configure.ac
+++ b/autoconf/configure.ac
@@ -70,7 +70,10 @@ do
       sample)       AC_CONFIG_SUBDIRS([projects/sample])    ;;
       privbracket)  AC_CONFIG_SUBDIRS([projects/privbracket]) ;;
       llvm-stacker) AC_CONFIG_SUBDIRS([projects/llvm-stacker]) ;;
+      # llvm-test is the old name of the test-suite, kept here for backwards
+      # compatibility
       llvm-test)    AC_CONFIG_SUBDIRS([projects/llvm-test]) ;;
+      test-suite)   AC_CONFIG_SUBDIRS([projects/test-suite]) ;;
       llvm-reopt)   AC_CONFIG_SUBDIRS([projects/llvm-reopt]);;
       llvm-gcc)     AC_CONFIG_SUBDIRS([projects/llvm-gcc])  ;;
       llvm-java)    AC_CONFIG_SUBDIRS([projects/llvm-java]) ;;

diff --git a/configure b/configure
index 820f66f12e31aa54b30685e71f5e8322285b8d46..83a44a05af1d93f61e483774b01a16439bad2a57 100755 (executable)
--- a/configure
+++ b/configure
@@ -951,6 +951,7 @@ ac_subdirs_all='projects/sample
 projects/privbracket
 projects/llvm-stacker
 projects/llvm-test
+projects/test-suite
 projects/llvm-reopt
 projects/llvm-gcc
 projects/llvm-java
@@ -2090,6 +2091,8 @@ do
       llvm-stacker) subdirs="$subdirs projects/llvm-stacker"
  ;;
       llvm-test)    subdirs="$subdirs projects/llvm-test"
+ ;;
+      test-suite)   subdirs="$subdirs projects/test-suite"
  ;;
       llvm-reopt)   subdirs="$subdirs projects/llvm-reopt"
 ;;

diff --git a/projects/Makefile b/projects/Makefile
index b6228b87f9127b4ac32278cfb644a9327ad21f2d..b966fc7f780c15f16bdf52a1b5477a54a1ec1d79 100644 (file)
--- a/projects/Makefile
+++ b/projects/Makefile
@@ -10,7 +10,9 @@ LEVEL=..
 
 include $(LEVEL)/Makefile.config
 
-DIRS:= $(filter-out llvm-test,$(patsubst $(PROJ_SRC_DIR)/%/Makefile,%,$(wildcard $(PROJ_SRC_DIR)/*/Makefile)))
+# Compile all subdirs, except for the test suite, which lives in test-suite.
+# Before 2008.06.24 it lived in llvm-test, so exclude that as well for now.
+DIRS:= $(filter-out llvm-test test-suite,$(patsubst $(PROJ_SRC_DIR)/%/Makefile,%,$(wildcard $(PROJ_SRC_DIR)/*/Makefile)))
 
 # Sparc cannot link shared libraries (libtool problem?)
 ifeq ($(ARCH), Sparc)