<div dir="ltr">On Tue, Jul 23, 2013 at 4:42 PM, Nick Kledzik <span dir="ltr"><<a href="mailto:kledzik@apple.com" target="_blank">kledzik@apple.com</a>></span> wrote:<br><div class="gmail_extra"><div class="gmail_quote">
<blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">Author: kledzik<br>
Date: Tue Jul 23 18:42:17 2013<br>
New Revision: 187005<br>
<br>
URL: <a href="http://llvm.org/viewvc/llvm-project?rev=187005&view=rev" target="_blank">http://llvm.org/viewvc/llvm-project?rev=187005&view=rev</a><br>
Log:<br>
Add lit magic so that lld unittests are run as part of lld test suite<br></blockquote><div><br></div><div>Very nice. Thank you for doing that.</div><div> </div><blockquote class="gmail_quote" style="margin:0 0 0 .8ex;border-left:1px #ccc solid;padding-left:1ex">
<br>
Added:<br>
lld/trunk/test/Unit/<br>
lld/trunk/test/Unit/lit.cfg<br>
lld/trunk/test/Unit/<a href="http://lit.site.cfg.in" target="_blank">lit.site.cfg.in</a><br>
Modified:<br>
lld/trunk/test/CMakeLists.txt<br>
<br>
Modified: lld/trunk/test/CMakeLists.txt<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/CMakeLists.txt?rev=187005&r1=187004&r2=187005&view=diff" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/CMakeLists.txt?rev=187005&r1=187004&r2=187005&view=diff</a><br>
==============================================================================<br>
--- lld/trunk/test/CMakeLists.txt (original)<br>
+++ lld/trunk/test/CMakeLists.txt Tue Jul 23 18:42:17 2013<br>
@@ -14,6 +14,10 @@ endif(BUILD_SHARED_LIBS)<br>
configure_lit_site_cfg(<br>
${CMAKE_CURRENT_SOURCE_DIR}/<a href="http://lit.site.cfg.in" target="_blank">lit.site.cfg.in</a><br>
${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg)<br>
+configure_lit_site_cfg(<br>
+ ${CMAKE_CURRENT_SOURCE_DIR}/Unit/<a href="http://lit.site.cfg.in" target="_blank">lit.site.cfg.in</a><br>
+ ${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg<br>
+ )<br>
<br>
if ( NOT LLD_BUILT_STANDALONE )<br>
<br>
@@ -28,9 +32,10 @@ if ( NOT LLD_BUILT_STANDALONE )<br>
lld_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg<br>
)<br>
<br>
- add_lit_testsuite(check-lld "Running lld regression tests"<br>
+ add_lit_testsuite(check-lld "Running lld test suite"<br>
${CMAKE_CURRENT_BINARY_DIR}<br>
- PARAMS ${LLD_TEST_PARAMS}<br>
+ PARAMS lld_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg<br>
+ lld_unit_site_config=${CMAKE_CURRENT_BINARY_DIR}/Unit/lit.site.cfg<br>
DEPENDS ${LLD_TEST_DEPS}<br>
)<br>
<br>
<br>
Added: lld/trunk/test/Unit/lit.cfg<br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/Unit/lit.cfg?rev=187005&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/Unit/lit.cfg?rev=187005&view=auto</a><br>
==============================================================================<br>
--- lld/trunk/test/Unit/lit.cfg (added)<br>
+++ lld/trunk/test/Unit/lit.cfg Tue Jul 23 18:42:17 2013<br>
@@ -0,0 +1,21 @@<br>
+# -*- Python -*-<br>
+<br>
+# Configuration file for the 'lit' test runner.<br>
+<br>
+import os<br>
+<br>
+# name: The name of this test suite.<br>
+<a href="http://config.name" target="_blank">config.name</a> = 'lld-Unit'<br>
+<br>
+# suffixes: A list of file extensions to treat as test files.<br>
+config.suffixes = []<br>
+<br>
+# test_source_root: The root path where unit test binaries are located.<br>
+# test_exec_root: The root path where tests should be run.<br>
+config.test_source_root = os.path.join(config.lld_obj_root, 'unittests')<br>
+config.test_exec_root = config.test_source_root<br>
+<br>
+# testFormat: The test format to use to interpret tests.<br>
+if not hasattr(config, 'llvm_build_mode'):<br>
+ lit.fatal("unable to find llvm_build_mode value on config")<br>
+config.test_format = lit.formats.GoogleTest(config.llvm_build_mode, 'Tests')<br>
<br>
Added: lld/trunk/test/Unit/<a href="http://lit.site.cfg.in" target="_blank">lit.site.cfg.in</a><br>
URL: <a href="http://llvm.org/viewvc/llvm-project/lld/trunk/test/Unit/lit.site.cfg.in?rev=187005&view=auto" target="_blank">http://llvm.org/viewvc/llvm-project/lld/trunk/test/Unit/lit.site.cfg.in?rev=187005&view=auto</a><br>
==============================================================================<br>
--- lld/trunk/test/Unit/<a href="http://lit.site.cfg.in" target="_blank">lit.site.cfg.in</a> (added)<br>
+++ lld/trunk/test/Unit/<a href="http://lit.site.cfg.in" target="_blank">lit.site.cfg.in</a> Tue Jul 23 18:42:17 2013<br>
@@ -0,0 +1,25 @@<br>
+## Autogenerated by LLVM/lld configuration.<br>
+# Do not edit!<br>
+config.llvm_src_root = "@LLVM_SOURCE_DIR@"<br>
+config.llvm_obj_root = "@LLVM_BINARY_DIR@"<br>
+config.llvm_tools_dir = "@LLVM_TOOLS_DIR@"<br>
+config.llvm_libs_dir = "@LLVM_LIBS_DIR@"<br>
+config.llvm_build_mode = "@LLVM_BUILD_MODE@"<br>
+config.lit_tools_dir = "@LLVM_LIT_TOOLS_DIR@"<br>
+config.lld_obj_root = "@LLD_BINARY_DIR@"<br>
+config.lld_src_root = "@LLD_SOURCE_DIR@"<br>
+config.target_triple = "@TARGET_TRIPLE@"<br>
+config.python_executable = "@PYTHON_EXECUTABLE@"<br>
+<br>
+# Support substitution of the tools and libs dirs with user parameters. This is<br>
+# used when we can't determine the tool dir at configuration time.<br>
+try:<br>
+ config.llvm_tools_dir = config.llvm_tools_dir % lit.params<br>
+ config.llvm_libs_dir = config.llvm_libs_dir % lit.params<br>
+ config.llvm_build_mode = config.llvm_build_mode % lit.params<br>
+except KeyError,e:<br>
+ key, = e.args<br>
+ lit.fatal("unable to find %r parameter, use '--param=%s=VALUE'" % (key,key))<br>
+<br>
+# Let the main config do the real work.<br>
+lit.load_config(config, "@LLD_SOURCE_DIR@/test/Unit/lit.cfg")<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@cs.uiuc.edu">llvm-commits@cs.uiuc.edu</a><br>
<a href="http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits" target="_blank">http://lists.cs.uiuc.edu/mailman/listinfo/llvm-commits</a><br>
</blockquote></div><br></div></div>