r318722 - Re-revert "Refactor debuginfo-tests."

[Don Hinton via cfe-commits]

On Mon, Nov 20, 2017 at 5:20 PM, Zachary Turner via cfe-commits <
cfe-commits at lists.llvm.org> wrote:

> Author: zturner
> Date: Mon Nov 20 17:20:28 2017
> New Revision: 318722
>
> URL: http://llvm.org/viewvc/llvm-project?rev=318722&view=rev
> Log:
> Re-revert "Refactor debuginfo-tests."
>
> This is still breaking greendragon.
>
> At this point I give up until someone can fix the greendragon
> bots, and I will probably abandon this effort in favor of using
> a private github repository.
>
> Modified:
>     cfe/trunk/test/CMakeLists.txt
>     cfe/trunk/test/lit.cfg.py
>
> Modified: cfe/trunk/test/CMakeLists.txt
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/
> CMakeLists.txt?rev=318722&r1=318721&r2=318722&view=diff
> ============================================================
> ==================
> --- cfe/trunk/test/CMakeLists.txt (original)
> +++ cfe/trunk/test/CMakeLists.txt Mon Nov 20 17:20:28 2017
> @@ -88,14 +88,6 @@ set(CLANG_TEST_PARAMS
>    clang_site_config=${CMAKE_CURRENT_BINARY_DIR}/lit.site.cfg
>    )
>
> -if (EXISTS "${CMAKE_CURRENT_SOURCE_DIR}/debuginfo-tests/CMakeLists.txt")
> -  # This is a hack to keep existing build build infrastructure working
> while we
> -  # can migrate to the new standard workflow of checking out
> debuginfo-tests into
> -  # llvm/projects or using it in a mono-repo
> -  set(DEBUGINFO_TESTS_EXCLUDE_FROM_ALL ON)
> -  add_subdirectory(debuginfo-tests)
> -endif()
> -
>

I think this is your problem.  Essentially, you are adding the tests twice,
once by recursing tree (this is the original behavior and picks up all the
tests in the new test subdir), and once explicitly by including the
debuginfo-tests subdirectory, which has a CMakeLists.txt file that adds the
tests again.


>  if( NOT CLANG_BUILT_STANDALONE )
>    list(APPEND CLANG_TEST_DEPS
>      llvm-config
>
> Modified: cfe/trunk/test/lit.cfg.py
> URL: http://llvm.org/viewvc/llvm-project/cfe/trunk/test/lit.
> cfg.py?rev=318722&r1=318721&r2=318722&view=diff
> ============================================================
> ==================
> --- cfe/trunk/test/lit.cfg.py (original)
> +++ cfe/trunk/test/lit.cfg.py Mon Nov 20 17:20:28 2017
> @@ -58,6 +58,8 @@ tool_dirs = [config.clang_tools_dir, con
>
>  tools = [
>      'c-index-test', 'clang-check', 'clang-diff', 'clang-format', 'opt',
> +    ToolSubst('%test_debuginfo', command=os.path.join(
> +        config.llvm_src_root, 'utils', 'test_debuginfo.pl')),
>      ToolSubst('%clang_func_map', command=FindTool(
>          'clang-func-mapping'), unresolved='ignore'),
>  ]
>
>
> _______________________________________________
> cfe-commits mailing list
> cfe-commits at lists.llvm.org
> http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits
>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.llvm.org/pipermail/cfe-commits/attachments/20171120/588bab30/attachment.html>