From 0c6833315636a1ba3c2d55d2ece258270c458541 Mon Sep 17 00:00:00 2001 From: Samuel Antao Date: Tue, 27 Oct 2015 22:20:26 +0000 Subject: [PATCH] Minor fix in ToolChainTest.cpp to allow user defined GCC toolchain. If the user configured clang with a custom GCC toolchain that will take precedence on what the ToolChainTest.cpp expects to evaluate. This is fixed here by passing --gcc-toolchain= to the driver, in order to override any user defined GCC toolchain. git-svn-id: https://llvm.org/svn/llvm-project/cfe/trunk@251459 91177308-0d34-0410-b5e6-96231b3b80d8 --- unittests/Driver/ToolChainTest.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/unittests/Driver/ToolChainTest.cpp b/unittests/Driver/ToolChainTest.cpp index 5159e80cc7..ef21e2d17c 100644 --- a/unittests/Driver/ToolChainTest.cpp +++ b/unittests/Driver/ToolChainTest.cpp @@ -58,8 +58,8 @@ TEST(ToolChainTest, VFSGCCInstallation) { InMemoryFileSystem->addFile(Path, 0, llvm::MemoryBuffer::getMemBuffer("\n")); - std::unique_ptr C( - TheDriver.BuildCompilation({"-fsyntax-only", "foo.cpp"})); + std::unique_ptr C(TheDriver.BuildCompilation( + {"-fsyntax-only", "--gcc-toolchain=", "foo.cpp"})); std::string S; { @@ -97,8 +97,8 @@ TEST(ToolChainTest, VFSGCCInstallationRelativeDir) { InMemoryFileSystem->addFile(Path, 0, llvm::MemoryBuffer::getMemBuffer("\n")); - std::unique_ptr C( - TheDriver.BuildCompilation({"-fsyntax-only", "foo.cpp"})); + std::unique_ptr C(TheDriver.BuildCompilation( + {"-fsyntax-only", "--gcc-toolchain=", "foo.cpp"})); std::string S; { -- 2.50.1