[llvm-branch-commits] [clang] efcacdb - [Driver][unittest] Unbreak ToolChainTest.cpp compilation with -Werror

Tobias Hieta via llvm-branch-commits llvm-branch-commits at lists.llvm.org
Mon Aug 21 22:51:26 PDT 2023


Author: Rainer Orth
Date: 2023-08-22T07:43:58+02:00
New Revision: efcacdb0f9c71bd631aba3ee896a1c54306ad0be

URL: https://github.com/llvm/llvm-project/commit/efcacdb0f9c71bd631aba3ee896a1c54306ad0be
DIFF: https://github.com/llvm/llvm-project/commit/efcacdb0f9c71bd631aba3ee896a1c54306ad0be.diff

LOG: [Driver][unittest] Unbreak ToolChainTest.cpp compilation with -Werror

D157275 broke some buildbots that run with -Werror:

	https://lab.llvm.org/buildbot#builders/36/builds/36604
	https://lab.llvm.org/buildbot#builders/57/builds/29201

Avoid this by using an overlong line rather than appeasing `clang-format`.

(cherry picked from commit 18252e6c8e2b1bb9901b5cca9e9a75edfeda2c4e)

Added: 
    

Modified: 
    clang/unittests/Driver/ToolChainTest.cpp

Removed: 
    


################################################################################
diff  --git a/clang/unittests/Driver/ToolChainTest.cpp b/clang/unittests/Driver/ToolChainTest.cpp
index bf61d428448289..ae567abb81a9bb 100644
--- a/clang/unittests/Driver/ToolChainTest.cpp
+++ b/clang/unittests/Driver/ToolChainTest.cpp
@@ -183,8 +183,7 @@ TEST(ToolChainTest, VFSSolarisMultiGCCInstallation) {
       "/usr/gcc/7/lib/gcc/x86_64-pc-solaris2.11/7.5.0/32/crtbegin.o",
       "/usr/gcc/7/lib/gcc/x86_64-pc-solaris2.11/7.5.0/crtbegin.o",
       "/usr/gcc/11/lib/gcc/sparcv9-sun-solaris2.11/11.4.0/crtbegin.o",
-      "/usr/gcc/11/lib/gcc/sparcv9-sun-solaris2.11/11.4.0/sparcv8plus/"
-      "crtbegin.o",
+      "/usr/gcc/11/lib/gcc/sparcv9-sun-solaris2.11/11.4.0/sparcv8plus/crtbegin.o",
       "/usr/gcc/11/lib/gcc/x86_64-pc-solaris2.11/11.4.0/32/crtbegin.o",
       "/usr/gcc/11/lib/gcc/x86_64-pc-solaris2.11/11.4.0/crtbegin.o",
       "/usr/gcc/4.7/lib/gcc/i386-pc-solaris2.11/4.7.3/amd64/crtbegin.o",


        


More information about the llvm-branch-commits mailing list