From: Rui Ueyama Date: Mon, 2 May 2016 18:16:14 +0000 (+0000) Subject: Attempt to fix Windows bots. X-Git-Tag: llvmorg-3.9.0-rc1~7239 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ff12f230809162a7e8e5c3846cba2addfca8a844;p=platform%2Fupstream%2Fllvm.git Attempt to fix Windows bots. llvm-svn: 268275 --- diff --git a/lld/ELF/DriverUtils.cpp b/lld/ELF/DriverUtils.cpp index bbcaacc..763dda5 100644 --- a/lld/ELF/DriverUtils.cpp +++ b/lld/ELF/DriverUtils.cpp @@ -100,7 +100,7 @@ static std::string relativeToRoot(StringRef Path) { // (e.g. "c:") or a UNC name (//net). We want to keep it as part // of the result. SmallString<128> Res; - StringRef Root = path::root_name(Path); + StringRef Root = path::root_name(Abs); if (Root.endswith(":")) Res = Root.drop_back(); else if (Root.startswith("//")) diff --git a/lld/test/ELF/reproduce.s b/lld/test/ELF/reproduce.s index b3014a7..33c3353 100644 --- a/lld/test/ELF/reproduce.s +++ b/lld/test/ELF/reproduce.s @@ -9,8 +9,8 @@ # RUN: FileCheck %s --check-prefix=RSP < repro/response.txt # RSP: {{^}}--hash-style gnu{{$}} -# RSP-NOT: repro/ -# RSP-NEXT: /foo.o +# RSP-NOT: repro{{[/\\]}} +# RSP-NEXT: {{[/\\]}}foo.o # RSP-NEXT: -o bar # RSP-NEXT: -shared # RSP-NEXT: --as-needed