[llvm] r268806 - CMake: generate check targets for lit suites without their own lit.cfgs

[Justin Bogner via llvm-commits]

Author: bogner
Date: Fri May  6 16:57:30 2016
New Revision: 268806

URL: http://llvm.org/viewvc/llvm-project?rev=268806&view=rev
Log:
CMake: generate check targets for lit suites without their own lit.cfgs

Currently our cmake generates targets like check-llvm-unit and
check-llvm-transforms-loopunroll-x86, but not check-llvm-transforms or
check-llvm-transforms-adce. This is because the search for test suites
only lists the ones with a custom lit.cfg or lit.local.cfg.

Instead, we can do something a little smarter - any directory under
test that isn't called Inputs or inside a directory called Inputs is a
test suite.

Modified:
    llvm/trunk/cmake/modules/AddLLVM.cmake

Modified: llvm/trunk/cmake/modules/AddLLVM.cmake
URL: http://llvm.org/viewvc/llvm-project/llvm/trunk/cmake/modules/AddLLVM.cmake?rev=268806&r1=268805&r2=268806&view=diff
==============================================================================
--- llvm/trunk/cmake/modules/AddLLVM.cmake (original)
+++ llvm/trunk/cmake/modules/AddLLVM.cmake Fri May  6 16:57:30 2016
@@ -1050,13 +1050,28 @@ endfunction()
 function(add_lit_testsuites project directory)
   if (NOT CMAKE_CONFIGURATION_TYPES)
     cmake_parse_arguments(ARG "" "" "PARAMS;DEPENDS;ARGS" ${ARGN})
-    file(GLOB_RECURSE litCfg ${directory}/lit*.cfg)
+
+    # Search recursively for test directories by assuming anything not
+    # in a directory called Inputs contains tests.
     set(lit_suites)
-    foreach(f ${litCfg})
-      get_filename_component(dir ${f} DIRECTORY)
-      set(lit_suites ${lit_suites} ${dir})
-    endforeach()
-    list(REMOVE_DUPLICATES lit_suites)
+    file(GLOB to_process ${directory}/*)
+    while(to_process)
+      set(cur_to_process ${to_process})
+      set(to_process)
+      foreach(lit_suite ${cur_to_process})
+        if(NOT IS_DIRECTORY ${lit_suite})
+          continue()
+        endif()
+        string(FIND ${lit_suite} Inputs is_inputs)
+        if (is_inputs EQUAL -1)
+          list(APPEND lit_suites "${lit_suite}")
+          file(GLOB subdirs ${lit_suite}/*)
+          list(APPEND to_process ${subdirs})
+        endif()
+      endforeach()
+    endwhile()
+
+    # Now create a check- target for each test directory.
     foreach(dir ${lit_suites})
       string(REPLACE ${directory} "" name_slash ${dir})
       if (name_slash)