[llvm] 6c1a9fb - Make llvm_source_root in llvm-lit relative too.

[Hubert Tong via llvm-commits]

A bot hit the following (see
http://lab.llvm.org:8011/builders/sanitizer-x86_64-linux-autoconf/builds/49206
):
Traceback (most recent call last):
  File
"/b/sanitizer-x86_64-linux-autoconf/build/tsan_debug_build/bin/llvm-lit",
line 26, in <module>
    llvm_source_root = path("../../llvm-project/llvm")
NameError: name 'path' is not defined

This commit has been reverted by 3185881d69022e03b300e189838b0599ed417be5.

On Mon, Apr 6, 2020 at 4:47 PM Nico Weber via llvm-commits <
llvm-commits at lists.llvm.org> wrote:

>
> Author: Nico Weber
> Date: 2020-04-06T16:47:25-04:00
> New Revision: 6c1a9fb174ac3cf66bfdbab5a327957a0a35ad85
>
> URL:
> https://github.com/llvm/llvm-project/commit/6c1a9fb174ac3cf66bfdbab5a327957a0a35ad85
> DIFF:
> https://github.com/llvm/llvm-project/commit/6c1a9fb174ac3cf66bfdbab5a327957a0a35ad85.diff
>
> LOG: Make llvm_source_root in llvm-lit relative too.
>
> No intended behavior change.
>
> Added:
>
>
> Modified:
>     llvm/utils/llvm-lit/CMakeLists.txt
>     llvm/utils/llvm-lit/llvm-lit.in
>
> Removed:
>
>
>
>
> ################################################################################
> diff  --git a/llvm/utils/llvm-lit/CMakeLists.txt
> b/llvm/utils/llvm-lit/CMakeLists.txt
> index 5c00f39ab4a5..1d4cbe43fede 100644
> --- a/llvm/utils/llvm-lit/CMakeLists.txt
> +++ b/llvm/utils/llvm-lit/CMakeLists.txt
> @@ -4,12 +4,16 @@ math(EXPR file_last "${file_len} - 1")
>
>  get_llvm_lit_path(LIT_BASE_DIR LIT_FILE_NAME)
>
> +set(LLVM_SOURCE_DIR ${LLVM_MAIN_SRC_DIR})
> +
>  # LLVM_LIT_CONFIG_FILES contains interleaved main config (in the source
> tree)
>  # and site config (in the build tree) pairs. Make them relative to
>  # llvm-lit and then convert them to map_config() calls.
>  if("${CMAKE_CFG_INTDIR}" STREQUAL ".")
>    make_paths_relative(
> -      LLVM_LIT_CONFIG_FILES "${LIT_BASE_DIR}" "${LLVM_LIT_CONFIG_FILES}")
> +    LLVM_LIT_CONFIG_FILES "${LIT_BASE_DIR}" "${LLVM_LIT_CONFIG_FILES}")
> +  make_paths_relative(
> +    LLVM_SOURCE_DIR "${LIT_BASE_DIR}" "${LLVM_SOURCE_DIR}")
>  endif()
>
>  set(LLVM_LIT_CONFIG_MAP "${LLVM_LIT_PATH_FUNCTION}\n")
> @@ -23,8 +27,6 @@ if (${file_last} GREATER -1)
>    endforeach()
>  endif()
>
> -set(LLVM_SOURCE_DIR ${LLVM_MAIN_SRC_DIR})
> -
>  if(NOT "${CMAKE_CFG_INTDIR}" STREQUAL ".")
>    foreach(BUILD_MODE ${CMAKE_CONFIGURATION_TYPES})
>      string(REPLACE ${CMAKE_CFG_INTDIR} ${BUILD_MODE} bi ${LIT_BASE_DIR})
>
> diff  --git a/llvm/utils/llvm-lit/llvm-lit.in b/llvm/utils/llvm-lit/
> llvm-lit.in
> index 805e590814fb..bb510b4bc400 100755
> --- a/llvm/utils/llvm-lit/llvm-lit.in
> +++ b/llvm/utils/llvm-lit/llvm-lit.in
> @@ -13,12 +13,6 @@ def map_config(source_dir, site_config):
>      site_config = os.path.normpath(site_config)
>      config_map[source_dir] = site_config
>
> -# Variables configured at build time.
> -llvm_source_root = "@LLVM_SOURCE_DIR@"
> -
> -# Make sure we can find the lit package.
> -sys.path.insert(0, 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_mode' : "@BUILD_MODE@" }
> @@ -27,6 +21,10 @@ builtin_parameters = { 'build_mode' : "@BUILD_MODE@" }
>
>  builtin_parameters['config_map'] = config_map
>
> +# Make sure we can find the lit package.
> +llvm_source_root = path("@LLVM_SOURCE_DIR@")
> +sys.path.insert(0, os.path.join(llvm_source_root, 'utils', 'lit'))
> +
>  if __name__=='__main__':
>      from lit.main import main
>      main(builtin_parameters)
>
>
>
> _______________________________________________
> llvm-commits mailing list
> llvm-commits at lists.llvm.org
> https://lists.llvm.org/cgi-bin/mailman/listinfo/llvm-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/llvm-commits/attachments/20200406/f28a2c49/attachment.html>