<div dir="ltr">A bot hit the following (see <a href="http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-autoconf/builds/49206">http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-autoconf/builds/49206</a>):<br>Traceback (most recent call last):<br>  File "/b/sanitizer-x86_64-linux-autoconf/build/tsan_debug_build/bin/llvm-lit", line 26, in <module><br>    llvm_source_root = path("../../llvm-project/llvm")<br><div>NameError: name 'path' is not defined</div><div><br></div><div>This commit has been reverted by 3185881d69022e03b300e189838b0599ed417be5.</div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Mon, Apr 6, 2020 at 4:47 PM Nico Weber via llvm-commits <<a href="mailto:llvm-commits@lists.llvm.org">llvm-commits@lists.llvm.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex"><br>
Author: Nico Weber<br>
Date: 2020-04-06T16:47:25-04:00<br>
New Revision: 6c1a9fb174ac3cf66bfdbab5a327957a0a35ad85<br>
<br>
URL: <a href="https://github.com/llvm/llvm-project/commit/6c1a9fb174ac3cf66bfdbab5a327957a0a35ad85" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/6c1a9fb174ac3cf66bfdbab5a327957a0a35ad85</a><br>
DIFF: <a href="https://github.com/llvm/llvm-project/commit/6c1a9fb174ac3cf66bfdbab5a327957a0a35ad85.diff" rel="noreferrer" target="_blank">https://github.com/llvm/llvm-project/commit/6c1a9fb174ac3cf66bfdbab5a327957a0a35ad85.diff</a><br>
<br>
LOG: Make llvm_source_root in llvm-lit relative too.<br>
<br>
No intended behavior change.<br>
<br>
Added: <br>
<br>
<br>
Modified: <br>
    llvm/utils/llvm-lit/CMakeLists.txt<br>
    llvm/utils/llvm-lit/<a href="http://llvm-lit.in" rel="noreferrer" target="_blank">llvm-lit.in</a><br>
<br>
Removed: <br>
<br>
<br>
<br>
################################################################################<br>
diff  --git a/llvm/utils/llvm-lit/CMakeLists.txt b/llvm/utils/llvm-lit/CMakeLists.txt<br>
index 5c00f39ab4a5..1d4cbe43fede 100644<br>
--- a/llvm/utils/llvm-lit/CMakeLists.txt<br>
+++ b/llvm/utils/llvm-lit/CMakeLists.txt<br>
@@ -4,12 +4,16 @@ math(EXPR file_last "${file_len} - 1")<br>
<br>
 get_llvm_lit_path(LIT_BASE_DIR LIT_FILE_NAME)<br>
<br>
+set(LLVM_SOURCE_DIR ${LLVM_MAIN_SRC_DIR})<br>
+<br>
 # LLVM_LIT_CONFIG_FILES contains interleaved main config (in the source tree)<br>
 # and site config (in the build tree) pairs. Make them relative to<br>
 # llvm-lit and then convert them to map_config() calls.<br>
 if("${CMAKE_CFG_INTDIR}" STREQUAL ".")<br>
   make_paths_relative(<br>
-      LLVM_LIT_CONFIG_FILES "${LIT_BASE_DIR}" "${LLVM_LIT_CONFIG_FILES}")<br>
+    LLVM_LIT_CONFIG_FILES "${LIT_BASE_DIR}" "${LLVM_LIT_CONFIG_FILES}")<br>
+  make_paths_relative(<br>
+    LLVM_SOURCE_DIR "${LIT_BASE_DIR}" "${LLVM_SOURCE_DIR}")<br>
 endif()<br>
<br>
 set(LLVM_LIT_CONFIG_MAP "${LLVM_LIT_PATH_FUNCTION}\n")<br>
@@ -23,8 +27,6 @@ if (${file_last} GREATER -1)<br>
   endforeach()<br>
 endif()<br>
<br>
-set(LLVM_SOURCE_DIR ${LLVM_MAIN_SRC_DIR})<br>
-<br>
 if(NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".")<br>
   foreach(BUILD_MODE ${CMAKE_CONFIGURATION_TYPES})<br>
     string(REPLACE ${CMAKE_CFG_INTDIR} ${BUILD_MODE} bi ${LIT_BASE_DIR})<br>
<br>
diff  --git a/llvm/utils/llvm-lit/<a href="http://llvm-lit.in" rel="noreferrer" target="_blank">llvm-lit.in</a> b/llvm/utils/llvm-lit/<a href="http://llvm-lit.in" rel="noreferrer" target="_blank">llvm-lit.in</a><br>
index 805e590814fb..bb510b4bc400 100755<br>
--- a/llvm/utils/llvm-lit/<a href="http://llvm-lit.in" rel="noreferrer" target="_blank">llvm-lit.in</a><br>
+++ b/llvm/utils/llvm-lit/<a href="http://llvm-lit.in" rel="noreferrer" target="_blank">llvm-lit.in</a><br>
@@ -13,12 +13,6 @@ def map_config(source_dir, site_config):<br>
     site_config = os.path.normpath(site_config)<br>
     config_map[source_dir] = site_config<br>
<br>
-# Variables configured at build time.<br>
-llvm_source_root = "@LLVM_SOURCE_DIR@"<br>
-<br>
-# Make sure we can find the lit package.<br>
-sys.path.insert(0, os.path.join(llvm_source_root, 'utils', 'lit'))<br>
-<br>
 # Set up some builtin parameters, so that by default the LLVM test suite<br>
 # configuration file knows how to find the object tree.<br>
 builtin_parameters = { 'build_mode' : "@BUILD_MODE@" }<br>
@@ -27,6 +21,10 @@ builtin_parameters = { 'build_mode' : "@BUILD_MODE@" }<br>
<br>
 builtin_parameters['config_map'] = config_map<br>
<br>
+# Make sure we can find the lit package.<br>
+llvm_source_root = path("@LLVM_SOURCE_DIR@")<br>
+sys.path.insert(0, os.path.join(llvm_source_root, 'utils', 'lit'))<br>
+<br>
 if __name__=='__main__':<br>
     from lit.main import main<br>
     main(builtin_parameters)<br>
<br>
<br>
<br>
_______________________________________________<br>
llvm-commits mailing list<br>
<a href="mailto:llvm-commits@lists.llvm.org" target="_blank">llvm-commits@lists.llvm.org</a><br>
<a href="https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits" rel="noreferrer" target="_blank">https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits</a><br>
</blockquote></div>