[llvm-commits] [llvm] r52675 - in /llvm/trunk: autoconf/configure.ac configure projects/Makefile

[Matthijs Kooijman]

Author: matthijs
Date: Tue Jun 24 08:01:57 2008
New Revision: 52675

URL: http://llvm.org/viewvc/llvm-project?rev=52675&view=rev
Log:
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.

Modified:
    llvm/trunk/autoconf/configure.ac
    llvm/trunk/configure
    llvm/trunk/projects/Makefile

Modified: llvm/trunk/autoconf/configure.ac
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/autoconf/configure.ac?rev=52675&r1=52674&r2=52675&view=diff

==============================================================================
--- llvm/trunk/autoconf/configure.ac (original)
+++ llvm/trunk/autoconf/configure.ac Tue Jun 24 08:01:57 2008
@@ -70,7 +70,10 @@
       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]) ;;

Modified: llvm/trunk/configure
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/configure?rev=52675&r1=52674&r2=52675&view=diff

==============================================================================
--- llvm/trunk/configure (original)
+++ llvm/trunk/configure Tue Jun 24 08:01:57 2008
@@ -951,6 +951,7 @@
 projects/privbracket
 projects/llvm-stacker
 projects/llvm-test
+projects/test-suite
 projects/llvm-reopt
 projects/llvm-gcc
 projects/llvm-java
@@ -2091,6 +2092,8 @@
  ;;
       llvm-test)    subdirs="$subdirs projects/llvm-test"
  ;;
+      test-suite)   subdirs="$subdirs projects/test-suite"
+ ;;
       llvm-reopt)   subdirs="$subdirs projects/llvm-reopt"
 ;;
       llvm-gcc)     subdirs="$subdirs projects/llvm-gcc"

Modified: llvm/trunk/projects/Makefile
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/projects/Makefile?rev=52675&r1=52674&r2=52675&view=diff

==============================================================================
--- llvm/trunk/projects/Makefile (original)
+++ llvm/trunk/projects/Makefile Tue Jun 24 08:01:57 2008
@@ -10,7 +10,9 @@
 
 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)