[Lldb-commits] [lldb] r327519 - [dotest] Rename llvm-dotest -> lldb-dotest and make it a custom target

[Jonas Devlieghere via lldb-commits]

Author: jdevlieghere
Date: Wed Mar 14 08:36:32 2018
New Revision: 327519

URL: http://llvm.org/viewvc/llvm-project?rev=327519&view=rev
Log:
[dotest] Rename llvm-dotest -> lldb-dotest and make it a custom target

This renames llvm-dotest to lldb-dotest and makes it a custom target so
you can run `ninja lldb-dotest` to rebuild whatever is necessary before
rerunning the tests.

Differential revision: https://reviews.llvm.org/D44473

Added:
    lldb/trunk/test/lldb-dotest.in
      - copied, changed from r327512, lldb/trunk/test/llvm-dotest.in
Removed:
    lldb/trunk/test/llvm-dotest.in
Modified:
    lldb/trunk/test/CMakeLists.txt

Modified: lldb/trunk/test/CMakeLists.txt
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/CMakeLists.txt?rev=327519&r1=327518&r2=327519&view=diff
==============================================================================
--- lldb/trunk/test/CMakeLists.txt (original)
+++ lldb/trunk/test/CMakeLists.txt Wed Mar 14 08:36:32 2018
@@ -137,16 +137,19 @@ add_python_test_target(check-lldb
 string (REPLACE ";" " " LLDB_DOTEST_ARGS_STR  "${LLDB_DOTEST_ARGS}")
 # We need this to substitute variables.
 configure_file(
-  llvm-dotest.in
-  ${CMAKE_CURRENT_BINARY_DIR}/llvm-dotest.configured
+  lldb-dotest.in
+  ${CMAKE_CURRENT_BINARY_DIR}/lldb-dotest.configured
   )
 # We need this to expand the generator expressions.
 file(GENERATE
   OUTPUT
-  $<TARGET_FILE_DIR:lldb>/llvm-dotest
+  $<TARGET_FILE_DIR:lldb>/lldb-dotest
   INPUT
-  ${CMAKE_CURRENT_BINARY_DIR}/llvm-dotest.configured
+  ${CMAKE_CURRENT_BINARY_DIR}/lldb-dotest.configured
   )
+# Make this a custom target.
+add_custom_target(lldb-dotest)
+add_dependencies(lldb-dotest ${LLDB_TEST_DEPS})
 
 # If we're building with an in-tree clang, then list clang as a dependency
 # to run tests.

Copied: lldb/trunk/test/lldb-dotest.in (from r327512, lldb/trunk/test/llvm-dotest.in)
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/lldb-dotest.in?p2=lldb/trunk/test/lldb-dotest.in&p1=lldb/trunk/test/llvm-dotest.in&r1=327512&r2=327519&rev=327519&view=diff
==============================================================================
    (empty)

Removed: lldb/trunk/test/llvm-dotest.in
URL: http://llvm.org/viewvc/llvm-project/lldb/trunk/test/llvm-dotest.in?rev=327518&view=auto
==============================================================================
--- lldb/trunk/test/llvm-dotest.in (original)
+++ lldb/trunk/test/llvm-dotest.in (removed)
@@ -1,14 +0,0 @@
-#!/usr/bin/env python
-import sys
-import os
-
-dotest_path = '@LLDB_SOURCE_DIR@/test/dotest.py'
-dotest_args = '@LLDB_DOTEST_ARGS_STR@'
-
-if __name__ == '__main__':
-    # FIXME: It would be nice if we can mimic the approach taken by llvm-lit
-    # and pass a python configuration straight to dotest, rather than going
-    # through the operating system.
-    command = '{} -q {} {}'.format(dotest_path, dotest_args, ' '.join(
-        sys.argv[1:]))
-    os.system(command)