diff --git a/clang-tools-extra/clangd/test/check-fail.test b/clang-tools-extra/clangd/test/check-fail.test --- a/clang-tools-extra/clangd/test/check-fail.test +++ b/clang-tools-extra/clangd/test/check-fail.test @@ -1,5 +1,5 @@ // RUN: cp %s %t.cpp -// RUN: not clangd -check=%t.cpp 2>&1 | FileCheck -strict-whitespace %s +// RUN: not clangd -enable-config=0 -check=%t.cpp 2>&1 | FileCheck -strict-whitespace %s // CHECK: Testing on source file {{.*}}check-fail.test // CHECK: internal (cc1) args are: -cc1 diff --git a/clang-tools-extra/clangd/test/check-lines.test b/clang-tools-extra/clangd/test/check-lines.test --- a/clang-tools-extra/clangd/test/check-lines.test +++ b/clang-tools-extra/clangd/test/check-lines.test @@ -1,6 +1,6 @@ // RUN: cp %s %t.cpp -// RUN: not clangd -check=%t.cpp -check-lines=6-14 2>&1 | FileCheck -strict-whitespace %s -// RUN: not clangd -check=%t.cpp -check-lines=14 2>&1 | FileCheck -strict-whitespace %s +// RUN: not clangd -enable-config=0 -check=%t.cpp -check-lines=6-14 2>&1 | FileCheck -strict-whitespace %s +// RUN: not clangd -enable-config=0 -check=%t.cpp -check-lines=14 2>&1 | FileCheck -strict-whitespace %s // CHECK: Testing on source file {{.*}}check-lines.test // CHECK: internal (cc1) args are: -cc1 diff --git a/clang-tools-extra/clangd/test/check.test b/clang-tools-extra/clangd/test/check.test --- a/clang-tools-extra/clangd/test/check.test +++ b/clang-tools-extra/clangd/test/check.test @@ -1,5 +1,5 @@ // RUN: cp %s %t.cpp -// RUN: clangd -log=verbose -check=%t.cpp 2>&1 | FileCheck -strict-whitespace %s +// RUN: clangd -enable-config=0 -log=verbose -check=%t.cpp 2>&1 | FileCheck -strict-whitespace %s // CHECK: Testing on source file // CHECK: internal (cc1) args are: -cc1 diff --git a/clang-tools-extra/clangd/tool/Check.cpp b/clang-tools-extra/clangd/tool/Check.cpp --- a/clang-tools-extra/clangd/tool/Check.cpp +++ b/clang-tools-extra/clangd/tool/Check.cpp @@ -272,7 +272,10 @@ auto ContextProvider = ClangdServer::createConfiguredContextProvider( Opts.ConfigProvider, nullptr); - WithContext Ctx(ContextProvider("")); + WithContext Ctx(ContextProvider( + FakeFile.empty() + ? File + : /*Don't turn on local configs for an arbitrary temp path.*/ "")); Checker C(File, Opts); if (!C.buildCommand(TFS) || !C.buildInvocation(TFS, Contents) || !C.buildAST())