[LLVMbugs] [Bug 11054] New: avoid substituting -clang in lit

[bugzilla-daemon at llvm.org]

http://llvm.org/bugs/show_bug.cgi?id=11054

           Summary: avoid substituting -clang in lit
           Product: Test Suite
           Version: trunk
          Platform: All
        OS/Version: Linux
            Status: NEW
          Severity: normal
          Priority: P
         Component: lit
        AssignedTo: unassignedbugs at nondot.org
        ReportedBy: patrik.h.hagglund at ericsson.com
                CC: llvmbugs at cs.uiuc.edu, daniel at zuster.org


Created an attachment (id=7397)
 --> (http://llvm.org/bugs/attachment.cgi?id=7397)
patch

I tried to build in a subdirectory 'build-clang'. That made 'make check' fail:

/local/scratch/uabpath/master/build-clang/test/BugPoint/Output/metadata.ll.script:
line 2:
/local/scratch/uabpath/master/build-/local/scratch/uabpath/master/build-clang/Debug+Asserts/bin/clang/Debug+Asserts/bin/bugpoint:
No such file or directory

Here is a patch:

diff --git a/test/lit.cfg b/test/lit.cfg
index c588efa..85f54d8 100644
--- a/test/lit.cfg
+++ b/test/lit.cfg
@@ -177,12 +177,12 @@ for sub in ['llvmgcc', 'llvmgxx', 'emitir',
'compile_cxx', 'compile_c',
 # includes every tool placed in $(LLVM_OBJ_ROOT)/$(BuildMode)/bin
 # (llvm_tools_dir in lit parlance).
                 # Don't match 'bugpoint-' or 'clang-'.
-                                        # Don't match '/clang'.
+                                        # Don't match '/clang' or '-clang'.
 if os.pathsep == ';':
     pathext = os.environ.get('PATHEXT', '').split(';')
 else:
     pathext = ['']
-for pattern in [r"\bbugpoint\b(?!-)",   r"(?<!/)\bclang\b(?!-)",
+for pattern in [r"\bbugpoint\b(?!-)",   r"(?<!/|-)\bclang\b(?!-)",
                 r"\bgold\b",
                 r"\bllc\b",             r"\blli\b",
                 r"\bllvm-ar\b",         r"\bllvm-as\b",

-- 
Configure bugmail: http://llvm.org/bugs/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are on the CC list for the bug.