feedc0de/qt-creator
1
0
Fork 0
forked from qt-creator/qt-creator
Code Pull Requests Activity

CppEditor: Fix test expectations

Browse Source 
Amends ec1905c6fa.

Change-Id: I6fc886ed87ddad46396fd728ca09f430cc3a4d65
Reviewed-by: Christian Kandeler <christian.kandeler@qt.io>
This commit is contained in:
Christian Stenger
2022-09-15 15:56:36 +02:00
parent 57c5dfa840
commit 1e3e41da52
1 changed files with 21 additions and 20 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
src/plugins/cppeditor/compileroptionsbuilder_test.cpp
View File

@@ -213,8 +213,8 @@ void CompilerOptionsBuilderTest::testHeaderPathOptionsOrder()
compilerOptionsBuilder.addHeaderPathOptions(); compilerOptionsBuilder.addHeaderPathOptions();
QCOMPARE(compilerOptionsBuilder.options(), QCOMPARE(compilerOptionsBuilder.options(),
(QStringList{"-nostdinc", "-nostdinc++", "-I", t.toNative("/tmp/path"), (QStringList{"-nostdinc", "-nostdinc++", "-I" + t.toNative("/tmp/path"),
"-I", t.toNative("/tmp/system_path"), "-isystem", t.toNative("/dummy"), "-I" + t.toNative("/tmp/system_path"), "-isystem", t.toNative("/dummy"),
"-isystem", t.toNative("/tmp/builtin_path")})); "-isystem", t.toNative("/tmp/builtin_path")}));
} }
@@ -229,8 +229,8 @@ void CompilerOptionsBuilderTest::testHeaderPathOptionsOrderMsvc()
compilerOptionsBuilder.addHeaderPathOptions(); compilerOptionsBuilder.addHeaderPathOptions();
QCOMPARE(compilerOptionsBuilder.options(), QCOMPARE(compilerOptionsBuilder.options(),
(QStringList{"-nostdinc", "-nostdinc++", "-I", t.toNative("/tmp/path"), (QStringList{"-nostdinc", "-nostdinc++", "-I" + t.toNative("/tmp/path"),
"-I", t.toNative("/tmp/system_path"), "/clang:-isystem", "-I" + t.toNative("/tmp/system_path"), "/clang:-isystem",
"/clang:" + t.toNative("/dummy"), "/clang:-isystem", "/clang:" + t.toNative("/dummy"), "/clang:-isystem",
"/clang:" + t.toNative("/tmp/builtin_path")})); "/clang:" + t.toNative("/tmp/builtin_path")}));
} }
@@ -244,7 +244,7 @@ void CompilerOptionsBuilderTest::testUseSystemHeader()
compilerOptionsBuilder.addHeaderPathOptions(); compilerOptionsBuilder.addHeaderPathOptions();
QCOMPARE(compilerOptionsBuilder.options(), QCOMPARE(compilerOptionsBuilder.options(),
(QStringList{"-nostdinc", "-nostdinc++", "-I", t.toNative("/tmp/path"), (QStringList{"-nostdinc", "-nostdinc++", "-I" + t.toNative("/tmp/path"),
"-isystem", t.toNative("/tmp/system_path"), "-isystem", t.toNative("/tmp/system_path"),
"-isystem", t.toNative("/dummy"), "-isystem", t.toNative("/dummy"),
"-isystem", t.toNative("/tmp/builtin_path")})); "-isystem", t.toNative("/tmp/builtin_path")}));
@@ -257,7 +257,7 @@ void CompilerOptionsBuilderTest::testNoClangHeadersPath()
t.compilerOptionsBuilder->addHeaderPathOptions(); t.compilerOptionsBuilder->addHeaderPathOptions();
QCOMPARE(t.compilerOptionsBuilder->options(), QCOMPARE(t.compilerOptionsBuilder->options(),
(QStringList{"-I", t.toNative("/tmp/path"), "-I", t.toNative("/tmp/system_path")})); (QStringList{"-I" + t.toNative("/tmp/path"), "-I" + t.toNative("/tmp/system_path")}));
} }
void CompilerOptionsBuilderTest::testClangHeadersAndCppIncludePathsOrderMacOs() void CompilerOptionsBuilderTest::testClangHeadersAndCppIncludePathsOrderMacOs()
@@ -277,8 +277,8 @@ void CompilerOptionsBuilderTest::testClangHeadersAndCppIncludePathsOrderMacOs()
compilerOptionsBuilder.addHeaderPathOptions(); compilerOptionsBuilder.addHeaderPathOptions();
QCOMPARE(compilerOptionsBuilder.options(), QCOMPARE(compilerOptionsBuilder.options(),
(QStringList{"-nostdinc", "-nostdinc++", "-I", t.toNative("/tmp/path"), (QStringList{"-nostdinc", "-nostdinc++", "-I" + t.toNative("/tmp/path"),
"-I", t.toNative("/tmp/system_path"), "-I" + t.toNative("/tmp/system_path"),
"-isystem", t.toNative("/usr/include/c++/4.2.1"), "-isystem", t.toNative("/usr/include/c++/4.2.1"),
"-isystem", t.toNative("/usr/include/c++/4.2.1/backward"), "-isystem", t.toNative("/usr/include/c++/4.2.1/backward"),
"-isystem", t.toNative("/usr/local/include"), "-isystem", t.toNative("/usr/local/include"),
@@ -610,10 +610,11 @@ void CompilerOptionsBuilderTest::testBuildAllOptions()
QCOMPARE(compilerOptionsBuilder.options(), QCOMPARE(compilerOptionsBuilder.options(),
(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", "-I", wrappedQtHeadersPath, "-DprojectFoo=projectBar",
"-I", wrappedQtCoreHeadersPath, wrappedQtHeadersPath, // contains -I already
"-I", t.toNative("/tmp/path"), wrappedQtCoreHeadersPath, // contains -I already
"-I", t.toNative("/tmp/system_path"), "-I" + t.toNative("/tmp/path"),
"-I" + t.toNative("/tmp/system_path"),
"-isystem", t.toNative("/dummy"), "-isystem", t.toNative("/dummy"),
"-isystem", t.toNative("/tmp/builtin_path")})); "-isystem", t.toNative("/tmp/builtin_path")}));
} }
@@ -638,10 +639,10 @@ 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\"",
"-I", wrappedQtHeadersPath, wrappedQtHeadersPath, // contains -I already
"-I", wrappedQtCoreHeadersPath, wrappedQtCoreHeadersPath, // contains -I already
"-I", t.toNative("/tmp/path"), "-I" + t.toNative("/tmp/path"),
"-I", t.toNative("/tmp/system_path"), "-I" + t.toNative("/tmp/system_path"),
"/clang:-isystem", "/clang:" + t.toNative("/dummy"), "/clang:-isystem", "/clang:" + t.toNative("/dummy"),
"/clang:-isystem", "/clang:" + t.toNative("/tmp/builtin_path")})); "/clang:-isystem", "/clang:" + t.toNative("/tmp/builtin_path")}));
} }
@@ -668,10 +669,10 @@ 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\"",
"-I", wrappedQtHeadersPath, wrappedQtHeadersPath, // contains -I already
"-I", wrappedQtCoreHeadersPath, wrappedQtCoreHeadersPath, // contains -I already
"-I", t.toNative("/tmp/path"), "-I" + t.toNative("/tmp/path"),
"-I", t.toNative("/tmp/system_path"), "-I" + t.toNative("/tmp/system_path"),
"/clang:-isystem", "/clang:" + t.toNative("/dummy"), "/clang:-isystem", "/clang:" + t.toNative("/dummy"),
"/clang:-isystem", "/clang:" + t.toNative("/tmp/builtin_path")})); "/clang:-isystem", "/clang:" + t.toNative("/tmp/builtin_path")}));
} }