Commit f19facd3 authored by Nikolai Kosjar's avatar Nikolai Kosjar

Clang: Add more CLANG-UPGRADE-CHECK markers

Change-Id: I9ee553f29fa7a7f60291e2d7d2a56062dc722b9d
Reviewed-by: Ivan Donchevskii's avatarIvan Donchevskii <ivan.donchevskii@qt.io>
Reviewed-by: 's avatarDavid Schulz <david.schulz@qt.io>
parent 0c0c10b1
var Environment = require("qbs.Environment") var Environment = require("qbs.Environment")
var File = require("qbs.File") var File = require("qbs.File")
var FileInfo = require("qbs.FileInfo") var FileInfo = require("qbs.FileInfo")
var MinimumLLVMVersion = "3.9.0" var MinimumLLVMVersion = "3.9.0" // CLANG-UPGRADE-CHECK: Adapt minimum version numbers.
var Process = require("qbs.Process") var Process = require("qbs.Process")
function readOutput(executable, args) function readOutput(executable, args)
......
...@@ -237,14 +237,14 @@ void CompilerOptionsBuilder::addOptionsForLanguage(bool checkForBorlandExtension ...@@ -237,14 +237,14 @@ void CompilerOptionsBuilder::addOptionsForLanguage(bool checkForBorlandExtension
opts << (gnuExtensions ? QLatin1String("-std=gnu++98") : QLatin1String("-std=c++98")); opts << (gnuExtensions ? QLatin1String("-std=gnu++98") : QLatin1String("-std=c++98"));
break; break;
case ProjectPart::CXX03: case ProjectPart::CXX03:
// Clang 3.6 does not know -std=gnu++03. // CLANG-UPGRADE-CHECK: Clang 3.6/3.9 does not know -std=gnu++03, but 5.0 does.
opts << QLatin1String("-std=c++03"); opts << QLatin1String("-std=c++03");
break; break;
case ProjectPart::CXX14: case ProjectPart::CXX14:
opts << (gnuExtensions ? QLatin1String("-std=gnu++14") : QLatin1String("-std=c++14")); opts << (gnuExtensions ? QLatin1String("-std=gnu++14") : QLatin1String("-std=c++14"));
break; break;
case ProjectPart::CXX17: case ProjectPart::CXX17:
// TODO: Change to (probably) "gnu++17"/"c++17" at some point in the future. // CLANG-UPGRADE-CHECK: Change to "gnu++17"/"c++17" for clang 5.0.
opts << (gnuExtensions ? QLatin1String("-std=gnu++1z") : QLatin1String("-std=c++1z")); opts << (gnuExtensions ? QLatin1String("-std=gnu++1z") : QLatin1String("-std=c++1z"));
break; break;
} }
......
...@@ -1169,7 +1169,7 @@ TEST_F(HighlightingMarks, PreprocessorInclusionDirectiveWithKeyword) ...@@ -1169,7 +1169,7 @@ TEST_F(HighlightingMarks, PreprocessorInclusionDirectiveWithKeyword)
ASSERT_THAT(infos[3], HasOnlyType(HighlightingType::StringLiteral)); ASSERT_THAT(infos[3], HasOnlyType(HighlightingType::StringLiteral));
} }
// This test should pass once https://bugs.llvm.org//show_bug.cgi?id=12972 is resolved. // CLANG-UPGRADE-CHECK: Enable once https://bugs.llvm.org//show_bug.cgi?id=12972 is resolved.
TEST_F(HighlightingMarks, DISABLED_VariableInOperatorFunctionCall) TEST_F(HighlightingMarks, DISABLED_VariableInOperatorFunctionCall)
{ {
const auto infos = translationUnit.highlightingMarksInRange(sourceRange(566, 12)); const auto infos = translationUnit.highlightingMarksInRange(sourceRange(566, 12));
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment