[cfe-commits] r81472 - in /cfe/trunk/test: Makefile lit.cfg

[Daniel Dunbar]

Author: ddunbar
Date: Thu Sep 10 18:00:15 2009
New Revision: 81472

URL: http://llvm.org/viewvc/llvm-project?rev=81472&view=rev
Log:
Teach LIT2 how to run Clang tests in the objdir for srcdir != objdir builds.

Modified:
    cfe/trunk/test/Makefile
    cfe/trunk/test/lit.cfg

Modified: cfe/trunk/test/Makefile
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/Makefile?rev=81472&r1=81471&r2=81472&view=diff

==============================================================================
--- cfe/trunk/test/Makefile (original)
+++ cfe/trunk/test/Makefile Thu Sep 10 18:00:15 2009
@@ -8,6 +8,9 @@
 TESTDIRS ?= $(PROJ_SRC_DIR)
 endif
 
+# LIT2 wants objdir paths, so it will pick up the lit.site.cfg.
+LIT2_TESTDIRS := $(TESTDIRS:$(PROJ_SRC_DIR)%=$(PROJ_OBJ_DIR)%)
+
 ifndef TESTARGS
 ifdef VERBOSE
 TESTARGS = -v
@@ -23,12 +26,12 @@
 endif
 
 ifdef LIT2
-all::
+all:: lit.site.cfg
 	@ echo '--- Running clang tests for $(TARGET_TRIPLE) ---'
 	@ $(LLVM_SRC_ROOT)/utils/lit/lit.py \
 	  --path $(ToolDir) \
 	  --path $(LLVM_SRC_ROOT)/test/Scripts \
-	  $(TESTARGS) $(TESTDIRS) $(VGARG)
+	  $(TESTARGS) $(LIT2_TESTDIRS) $(VGARG)
 else
 all::
 	@ echo '--- Running clang tests for $(TARGET_TRIPLE) ---'
@@ -39,6 +42,19 @@
 	  $(TESTARGS) $(TESTDIRS) $(VGARG)
 endif
 
+FORCE:
+
+lit.site.cfg: FORCE
+	@echo "Making 'lit.site.cfg' file..."
+	@echo "## Autogenerated by Makefile ##" > $@
+	@echo "# Do not edit!" >> $@
+	@echo >> $@
+	@echo "# Preserve some key paths for use by main LLVM test suite config." >> $@
+	@echo "config.clang_obj_root = \"\"\"$(PROJ_OBJ_DIR)/..\"\"\"" >> $@
+	@echo >> $@
+	@echo "# Let the main config do the real work." >> $@
+	@echo "lit.load_config(config, \"\"\"$(PROJ_SRC_DIR)/lit.cfg\"\"\")" >> $@
+
 clean::
 	@ rm -rf Output/
 

Modified: cfe/trunk/test/lit.cfg
URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/lit.cfg?rev=81472&r1=81471&r2=81472&view=diff

==============================================================================
--- cfe/trunk/test/lit.cfg (original)
+++ cfe/trunk/test/lit.cfg Thu Sep 10 18:00:15 2009
@@ -1,6 +1,8 @@
 # -*- Python -*-
 
 def config_new():
+    import os
+
     # Configuration file for the 'lit' test runner.
 
     # name: The name of this test suite.
@@ -16,6 +18,57 @@
     # suffixes: A list of file extensions to treat as test files.
     config.suffixes = ['.c', '.cpp', '.m', '.mm']
 
+    # test_source_root: The root path where tests are located.
+    config.test_source_root = os.path.dirname(__file__)
+
+    # test_exec_root: The root path where tests should be run.
+    clang_obj_root = getattr(config, 'clang_obj_root', None)
+    if clang_obj_root is not None:
+        config.test_exec_root = os.path.join(clang_obj_root, 'test')
+
+    ###
+
+    # Check that the object root is known.
+    if config.test_exec_root is None:
+        # Otherwise, we haven't loaded the site specific configuration (the user is
+        # probably trying to run on a test file directly, and either the site
+        # configuration hasn't been created by the build system, or we are in an
+        # out-of-tree build situation).
+
+        # Try to detect the situation where we are using an out-of-tree build by
+        # looking for 'llvm-config'.
+        #
+        # FIXME: I debated (i.e., wrote and threw away) adding logic to
+        # automagically generate the lit.site.cfg if we are in some kind of fresh
+        # build situation. This means knowing how to invoke the build system
+        # though, and I decided it was too much magic.
+
+        llvm_config = lit.util.which('llvm-config', config.environment['PATH'])
+        if not llvm_config:
+            lit.fatal('No site specific configuration available!')
+
+        # Get the source and object roots.
+        llvm_src_root = lit.util.capture(['llvm-config', '--src-root']).strip()
+        llvm_obj_root = lit.util.capture(['llvm-config', '--obj-root']).strip()
+        clang_src_root = os.path.join(llvm_src_root, "tools", "clang")
+        clang_obj_root = os.path.join(llvm_obj_root, "tools", "clang")
+
+        # Validate that we got a tree which points to here, using the standard
+        # tools/clang layout.
+        this_src_root = os.path.dirname(config.test_source_root)
+        if os.path.realpath(clang_src_root) != os.path.realpath(this_src_root):
+            lit.fatal('No site specific configuration available!')
+
+        # Check that the site specific configuration exists.
+        site_cfg = os.path.join(clang_obj_root, 'test', 'lit.site.cfg')
+        if not os.path.exists(site_cfg):
+            lit.fatal('No site specific configuration available!')
+
+        # Okay, that worked. Notify the user of the automagic, and reconfigure.
+        lit.note('using out-of-tree build at %r' % clang_obj_root)
+        lit.load_config(config, site_cfg)
+        raise SystemExit
+
     ###
 
     # Discover the 'clang' and 'clangcc' to use.