Author: sammccall Date: Wed Nov 15 13:33:56 2017 New Revision: 318337 URL: http://llvm.org/viewvc/llvm-project?rev=318337&view=rev Log: [clangd] Revert broken r318329 and disable tests on PS4
(Clearly this is not a permanent solution) Added: clang-tools-extra/trunk/test/clangd/lit.local.cfg Modified: clang-tools-extra/trunk/clangd/GlobalCompilationDatabase.cpp Modified: clang-tools-extra/trunk/clangd/GlobalCompilationDatabase.cpp URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/clangd/GlobalCompilationDatabase.cpp?rev=318337&r1=318336&r2=318337&view=diff ============================================================================== --- clang-tools-extra/trunk/clangd/GlobalCompilationDatabase.cpp (original) +++ clang-tools-extra/trunk/clangd/GlobalCompilationDatabase.cpp Wed Nov 15 13:33:56 2017 @@ -31,11 +31,7 @@ static void addExtraFlags(tooling::Compi } tooling::CompileCommand getDefaultCompileCommand(PathRef File) { - // We don't specify --std because we want to infer it from the filename. - // We force PC because PS4 will change --std from under us. - // FIXME: there must be a more principled way to do this! - std::vector<std::string> CommandLine{ - "clang", "-fsyntax-only", "-target=unknown-pc-unknown", File.str()}; + std::vector<std::string> CommandLine{"clang", "-fsyntax-only", File.str()}; return tooling::CompileCommand(llvm::sys::path::parent_path(File), llvm::sys::path::filename(File), CommandLine, /*Output=*/""); Added: clang-tools-extra/trunk/test/clangd/lit.local.cfg URL: http://llvm.org/viewvc/llvm-project/clang-tools-extra/trunk/test/clangd/lit.local.cfg?rev=318337&view=auto ============================================================================== --- clang-tools-extra/trunk/test/clangd/lit.local.cfg (added) +++ clang-tools-extra/trunk/test/clangd/lit.local.cfg Wed Nov 15 13:33:56 2017 @@ -0,0 +1,6 @@ +import re +# We rely on the default -std being derived from the filetype. +# PS4 sets a different -std, and many tests break. +# FIXME: make our tests less brittle instead. +if re.match(r'.*-scei-ps4', config.target_triple): + config.unsupported = True _______________________________________________ cfe-commits mailing list cfe-commits@lists.llvm.org http://lists.llvm.org/cgi-bin/mailman/listinfo/cfe-commits