forked from qt-creator/qt-creator
CppEditor: Fix tests
Amends 8fb258b85e
.
Change-Id: I0b9339a60da459557c0335b0680f258ce689b45f
Reviewed-by: David Schulz <david.schulz@qt.io>
This commit is contained in:
@@ -593,6 +593,7 @@ void CompilerOptionsBuilderTest::testBuildAllOptions()
|
|||||||
(QStringList{"-nostdinc", "-nostdinc++", "-arch", "x86_64", "-fsyntax-only", "-m64",
|
(QStringList{"-nostdinc", "-nostdinc++", "-arch", "x86_64", "-fsyntax-only", "-m64",
|
||||||
"--target=x86_64-apple-darwin10", "-x", "c++", "-std=c++17",
|
"--target=x86_64-apple-darwin10", "-x", "c++", "-std=c++17",
|
||||||
"-DprojectFoo=projectBar",
|
"-DprojectFoo=projectBar",
|
||||||
|
"-DQT_ANNOTATE_FUNCTION(x)=__attribute__((annotate(#x)))",
|
||||||
wrappedQtHeadersPath, // contains -I already
|
wrappedQtHeadersPath, // contains -I already
|
||||||
wrappedQtCoreHeadersPath, // contains -I already
|
wrappedQtCoreHeadersPath, // contains -I already
|
||||||
"-I" + t.toNative("/tmp/path"),
|
"-I" + t.toNative("/tmp/path"),
|
||||||
@@ -621,6 +622,7 @@ void CompilerOptionsBuilderTest::testBuildAllOptionsMsvc()
|
|||||||
"-D__FUNCSIG__=\"void __cdecl someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580(void)\"",
|
"-D__FUNCSIG__=\"void __cdecl someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580(void)\"",
|
||||||
"-D__FUNCTION__=\"someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580\"",
|
"-D__FUNCTION__=\"someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580\"",
|
||||||
"-D__FUNCDNAME__=\"?someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580@@YAXXZ\"",
|
"-D__FUNCDNAME__=\"?someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580@@YAXXZ\"",
|
||||||
|
"-DQT_ANNOTATE_FUNCTION(x)=__attribute__((annotate(#x)))",
|
||||||
wrappedQtHeadersPath, // contains -I already
|
wrappedQtHeadersPath, // contains -I already
|
||||||
wrappedQtCoreHeadersPath, // contains -I already
|
wrappedQtCoreHeadersPath, // contains -I already
|
||||||
"-I" + t.toNative("/tmp/path"),
|
"-I" + t.toNative("/tmp/path"),
|
||||||
@@ -651,6 +653,7 @@ void CompilerOptionsBuilderTest::testBuildAllOptionsMsvcWithExceptions()
|
|||||||
"-D__FUNCSIG__=\"void __cdecl someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580(void)\"",
|
"-D__FUNCSIG__=\"void __cdecl someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580(void)\"",
|
||||||
"-D__FUNCTION__=\"someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580\"",
|
"-D__FUNCTION__=\"someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580\"",
|
||||||
"-D__FUNCDNAME__=\"?someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580@@YAXXZ\"",
|
"-D__FUNCDNAME__=\"?someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580@@YAXXZ\"",
|
||||||
|
"-DQT_ANNOTATE_FUNCTION(x)=__attribute__((annotate(#x)))",
|
||||||
wrappedQtHeadersPath, // contains -I already
|
wrappedQtHeadersPath, // contains -I already
|
||||||
wrappedQtCoreHeadersPath, // contains -I already
|
wrappedQtCoreHeadersPath, // contains -I already
|
||||||
"-I" + t.toNative("/tmp/path"),
|
"-I" + t.toNative("/tmp/path"),
|
||||||
|
Reference in New Issue
Block a user