[llvm-commits] [PATCH] utils/llvm-lit Improvement

[NAKAMURA Takumi]

Hello Daniel,

I have tweaked llvm-lit for clang tests and CMake environment.
Checked on x86_64-centos5/{autoconf/cmake}, cygwin17 and msys/{autoconf/cmake}.
(not tested yet on msvc. It would be harder...)

On msys, env(1) is located to /bin. I have to invoke llvm-lit as eg.
$ python Release+Asserts/bin/llvm-lit {tests}.

Please take a look, thank you.

* 0001-llvm-lit-may-be-able-to-invoke-clang-tests.patch.txt

  llvm-lit may be aware $(llvm_obj_root)/tools/clang/test/lit.site.cfg.

* 0002-llvm-lit-may-be-available-with-CMake.patch.txt

  I will add +x(755) to utils/llvm-lit.in, for generated bin/llvm-lit
to be executable.
  On CMake, two extra parameters would be needed for lit.


...Takumi
-------------- next part --------------
From 14736c3c2646cc0517fac586497b7cb9bd2c8c13 Mon Sep 17 00:00:00 2001
From: NAKAMURA Takumi <geek4civic at gmail.com>
Date: Wed, 2 Feb 2011 15:05:28 +0900
Subject: [PATCH 1/2] llvm-lit may be able to invoke clang tests.

---
 utils/llvm-lit/llvm-lit.in |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

diff --git a/utils/llvm-lit/llvm-lit.in b/utils/llvm-lit/llvm-lit.in
index 3ff2c24..a16e664 100644
--- a/utils/llvm-lit/llvm-lit.in
+++ b/utils/llvm-lit/llvm-lit.in
@@ -16,6 +16,10 @@ builtin_parameters = {
     'llvm_site_config' : os.path.join(llvm_obj_root, 'test', 'lit.site.cfg')
     }
 
+clang_site_config = os.path.join(llvm_obj_root, 'tools', 'clang', 'test', 'lit.site.cfg')
+if os.path.exists(clang_site_config):
+    builtin_parameters['clang_site_config'] = clang_site_config
+
 if __name__=='__main__':
     import lit
     lit.main(builtin_parameters)
-- 
1.7.1.GIT

-------------- next part --------------
From f4741d3e70c29fd9548e474574692eac3549efe8 Mon Sep 17 00:00:00 2001
From: NAKAMURA Takumi <geek4civic at gmail.com>
Date: Wed, 2 Feb 2011 14:21:19 +0900
Subject: [PATCH 2/2] llvm-lit may be available with CMake.

---
 utils/llvm-lit/llvm-lit.in |    2 ++
 1 files changed, 2 insertions(+), 0 deletions(-)
 mode change 100644 => 100755 utils/llvm-lit/llvm-lit.in

diff --git a/utils/llvm-lit/llvm-lit.in b/utils/llvm-lit/llvm-lit.in
old mode 100644
new mode 100755
index a16e664..1df1747
--- a/utils/llvm-lit/llvm-lit.in
+++ b/utils/llvm-lit/llvm-lit.in
@@ -13,6 +13,8 @@ sys.path.append(os.path.join(llvm_source_root, 'utils', 'lit'))
 # Set up some builtin parameters, so that by default the LLVM test suite
 # configuration file knows how to find the object tree.
 builtin_parameters = {
+    'build_config' : "@CMAKE_CFG_INTDIR@",
+    'build_mode' : "@RUNTIME_BUILD_MODE@",
     'llvm_site_config' : os.path.join(llvm_obj_root, 'test', 'lit.site.cfg')
     }
 
-- 
1.7.1.GIT