diff options
| author | Daniel Dunbar <daniel@zuster.org> | 2009-09-17 19:55:53 +0000 |
|---|---|---|
| committer | Daniel Dunbar <daniel@zuster.org> | 2009-09-17 19:55:53 +0000 |
| commit | 7af18d359f6eff022a7a55335705b018a3c191d7 (patch) | |
| tree | dbafdd212411851a8cd31fbe6235d08dc2bc9f0b /test/Makefile | |
| parent | d85cef5a54074a5f647f45c2218675f7774a909d (diff) | |
Tweak clang testing.
- Move CMake to using the new test runner.
- Switch Makefiles to use the lit.site.cfg.in template.
- Remove explicit --path arguments, instead this gets written into the site
configuration. This means running lit from the command line should use the
exact same configuration as is used in 'make test', assuming it can find the
site configuration file. You still need to run 'make test' (or the cmake
build target equivalent) at least once.
git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@82160 91177308-0d34-0410-b5e6-96231b3b80d8
Diffstat (limited to 'test/Makefile')
| -rw-r--r-- | test/Makefile | 14 |
1 files changed, 4 insertions, 10 deletions
diff --git a/test/Makefile b/test/Makefile index 1a109758ba..223fd8380b 100644 --- a/test/Makefile +++ b/test/Makefile @@ -29,8 +29,6 @@ ifdef LIT2 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) $(LIT2_TESTDIRS) $(VGARG) else all:: @@ -46,14 +44,10 @@ 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\"\"\")" >> $@ + @sed -e "s#@CLANG_SOURCE_DIR@#$(PROJ_SRC_DIR)/..#g" \ + -e "s#@CLANG_BINARY_DIR@#$(PROJ_OBJ_DIR)/..#g" \ + -e "s#@LLVM_TOOLS_DIR@#$(ToolDir)#g" \ + $(PROJ_SRC_DIR)/lit.site.cfg.in > $@ clean:: @ rm -rf Output/ |