refactor: cl arguments always map to regular arguments #1004
+244
−31
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,184 @@ | ||
| // | ||
| // Licensed under the Apache License v2.0 with LLVM Exceptions. | ||
| // See https://llvm.org/LICENSE.txt for license information. | ||
| // SPDX-License-Identifier: Apache-2.0 WITH LLVM-exception | ||
| // | ||
| // Copyright (c) 2023 Vinnie Falco ([email protected]) | ||
| // | ||
| // Official repository: https://github.com/cppalliance/mrdocs | ||
| // | ||
|
|
||
| #include "lib/ConfigImpl.hpp" | ||
| #include "lib/MrDocsCompilationDatabase.hpp" | ||
| #include "lib/SingleFileDB.hpp" | ||
| #include <mrdocs/Support/Path.hpp> | ||
| #include <mrdocs/Support/ThreadPool.hpp> | ||
| #include <test_suite/test_suite.hpp> | ||
|
|
||
| namespace clang { | ||
| namespace mrdocs { | ||
|
|
||
| namespace { | ||
| /** Compilation database for a single .cpp file. | ||
| */ | ||
| class SingleFileTestDB | ||
|
There was a problem hiding this comment. Can't you can just use the existing one? |
||
| : public tooling::CompilationDatabase | ||
| { | ||
| tooling::CompileCommand cc_; | ||
|
|
||
| public: | ||
| explicit | ||
| SingleFileTestDB( | ||
| tooling::CompileCommand cc) | ||
| : cc_(std::move(cc)) | ||
| {} | ||
|
|
||
| std::vector<tooling::CompileCommand> | ||
| getCompileCommands( | ||
| llvm::StringRef FilePath) const override | ||
| { | ||
| if (FilePath != cc_.Filename) | ||
| return {}; | ||
| return { cc_ }; | ||
| } | ||
|
|
||
| std::vector<std::string> | ||
| getAllFiles() const override | ||
| { | ||
| return { cc_.Filename }; | ||
| } | ||
|
|
||
| std::vector<tooling::CompileCommand> | ||
| getAllCompileCommands() const override | ||
| { | ||
| return { cc_ }; | ||
| } | ||
| }; | ||
| } | ||
|
|
||
| struct MrDocsCompilationDatabase_test | ||
| { | ||
| Config::Settings fileSettings_; | ||
| ThreadPool threadPool_; | ||
| ReferenceDirectories dirs_; | ||
|
|
||
| std::shared_ptr<ConfigImpl const> config_ = | ||
| ConfigImpl::load(fileSettings_, dirs_, threadPool_).value(); | ||
|
|
||
| auto adjustCompileCommand(std::vector<std::string> CommandLine) const | ||
| { | ||
| tooling::CompileCommand cc; | ||
| cc.Directory = "."; | ||
| cc.Filename = "test.cpp"; // file does not exist | ||
| cc.CommandLine = std::move(CommandLine); | ||
| cc.CommandLine.push_back(cc.Filename); | ||
| cc.Heuristic = "unit test"; | ||
|
|
||
| // Create an adjusted MrDocsDatabase | ||
| std::unordered_map<std::string, std::vector<std::string>> defaultIncludePaths; | ||
| MrDocsCompilationDatabase compilations( | ||
| llvm::StringRef(cc.Directory), SingleFileTestDB(cc), config_, defaultIncludePaths); | ||
| return compilations.getCompileCommands(cc.Filename).front().CommandLine; | ||
| } | ||
|
|
||
| static bool has(std::vector<std::string> const& commandLine, std::string_view flag) | ||
|
There was a problem hiding this comment. We already have a |
||
| { | ||
| return std::find(commandLine.begin(), commandLine.end(), flag) != commandLine.end(); | ||
| } | ||
| static bool has(std::vector<std::string> const& commandLine, std::initializer_list<std::string_view> flags) | ||
| { | ||
| MRDOCS_ASSERT(flags.size() > 0); | ||
| return std::search(commandLine.begin(), commandLine.end(), flags.begin(), flags.end()) != commandLine.end(); | ||
| } | ||
|
|
||
| void testClangCLStdFlag() | ||
| { | ||
| // /std:c++14 -> -std=c++14 | ||
| { | ||
| auto adjusted = adjustCompileCommand({ "clang-cl", "/std:c++14"}); | ||
| BOOST_TEST_GE(adjusted.size(), 2); | ||
| BOOST_TEST(has(adjusted, "-std=c++14")); | ||
| } | ||
|
|
||
| // /std:c++17 -> -std=c++17 | ||
| { | ||
| auto adjusted = adjustCompileCommand({ "clang-cl", "/std:c++17"}); | ||
| BOOST_TEST_GE(adjusted.size(), 2); | ||
| BOOST_TEST(has(adjusted, "-std=c++17")); | ||
| } | ||
|
|
||
| // /std:c++20 -> -std=c++20 | ||
| { | ||
| auto adjusted = adjustCompileCommand({ "clang-cl", "/std:c++20"}); | ||
| BOOST_TEST_GE(adjusted.size(), 2); | ||
| BOOST_TEST(has(adjusted, "-std=c++20")); | ||
| } | ||
|
|
||
| // /std:c++23preview -> -std=c++23 | ||
| { | ||
| auto adjusted = adjustCompileCommand({ "clang-cl", "/std:c++23preview"}); | ||
| BOOST_TEST_GE(adjusted.size(), 2); | ||
| BOOST_TEST(has(adjusted, "-std=c++23")); | ||
| } | ||
|
|
||
| // /std:c++latest -> -std=c++23 | ||
| { | ||
| auto adjusted = adjustCompileCommand({ "clang-cl", "/std:c++latest"}); | ||
| BOOST_TEST_GE(adjusted.size(), 2); | ||
| BOOST_TEST(has(adjusted, "-std=c++23")); | ||
| } | ||
|
|
||
| // /std:c11 -> -std=c11 | ||
| { | ||
| auto adjusted = adjustCompileCommand({ "clang-cl", "/std:c11"}); | ||
| BOOST_TEST_GE(adjusted.size(), 2); | ||
| BOOST_TEST(has(adjusted, "-std=c11")); | ||
| } | ||
|
|
||
| // /std:c17 -> -std=c17 | ||
| { | ||
| auto adjusted = adjustCompileCommand({ "clang-cl", "/std:c17"}); | ||
| BOOST_TEST_GE(adjusted.size(), 2); | ||
| BOOST_TEST(has(adjusted, "-std=c17")); | ||
| } | ||
| } | ||
|
|
||
| void testClangCLIncludeFlag() | ||
| { | ||
| // /I<path> -> -I<path> | ||
| { | ||
| auto adjusted = adjustCompileCommand({ "clang-cl", "/I<path>"}); | ||
| BOOST_TEST_GE(adjusted.size(), 2); | ||
| BOOST_TEST(has(adjusted, {"-I", "<path>"})); | ||
| } | ||
|
|
||
| // /external:I<path> -> -isystem<path> | ||
| { | ||
| auto adjusted = adjustCompileCommand({ "clang-cl", "/external:I<path>"}); | ||
| BOOST_TEST_GE(adjusted.size(), 2); | ||
| BOOST_TEST(has(adjusted, {"-isystem", "<path>"})); | ||
| } | ||
| } | ||
|
|
||
| void testClangCL() | ||
| { | ||
| auto adjusted = adjustCompileCommand({ "clang-cl"}); | ||
| BOOST_TEST_GE(adjusted.size(), 1); | ||
| BOOST_TEST_EQ(adjusted[0], "clang"); | ||
|
|
||
| testClangCLStdFlag(); | ||
| testClangCLIncludeFlag(); | ||
| } | ||
|
|
||
| void run() | ||
| { | ||
| testClangCL(); | ||
| } | ||
| }; | ||
|
|
||
| TEST_SUITE( | ||
|
There was a problem hiding this comment. Your test suite is great. You had nothing to worry about. |
||
| MrDocsCompilationDatabase_test, | ||
| "clang.mrdocs.MrDocsCompilationDatabase"); | ||
|
|
||
| } // mrdocs | ||
| } // clang | ||
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Uh oh!
There was an error while loading. Please reload this page.