From 990aa5e45b63a1136609d44aa14c2254feb4673b Mon Sep 17 00:00:00 2001 From: Christian Kandeler Date: Mon, 30 Nov 2020 17:43:33 +0100 Subject: [PATCH] CppTools: Adapt autotest Amends 370804c2ab. Change-Id: I054a44948cd4a473ae22284d7669c4a7adb2fc86 Reviewed-by: Christian Stenger --- .../unit/unittest/compileroptionsbuilder-test.cpp | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/tests/unit/unittest/compileroptionsbuilder-test.cpp b/tests/unit/unittest/compileroptionsbuilder-test.cpp index ba12feb9065..5cc01800a4a 100644 --- a/tests/unit/unittest/compileroptionsbuilder-test.cpp +++ b/tests/unit/unittest/compileroptionsbuilder-test.cpp @@ -582,7 +582,8 @@ TEST_F(CompilerOptionsBuilder, AddDefineFunctionMacrosMsvc) compilerOptionsBuilder.addDefineFunctionMacrosMsvc(); - ASSERT_THAT(compilerOptionsBuilder.options(), Contains(QString{"-D__FUNCTION__=\"\""})); + ASSERT_THAT(compilerOptionsBuilder.options(), + Contains(QString{"-D__FUNCTION__=\"someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580\""})); } TEST_F(CompilerOptionsBuilder, AddProjectConfigFileInclude) @@ -683,9 +684,9 @@ TEST_F(CompilerOptionsBuilder, BuildAllOptionsCl) "/std:c++17", "-fms-compatibility-version=19.00", "-DprojectFoo=projectBar", - "-D__FUNCSIG__=\"\"", - "-D__FUNCTION__=\"\"", - "-D__FUNCDNAME__=\"\"", + "-D__FUNCSIG__=\"void __cdecl someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580(void)\"", + "-D__FUNCTION__=\"someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580\"", + "-D__FUNCDNAME__=\"?someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580@@YAXXZ\"", "-I", IsPartOfHeader("wrappedQtHeaders"), "-I", IsPartOfHeader(toNative("wrappedQtHeaders/QtCore").toStdString()), "-I", toNative("/tmp/path"), @@ -723,9 +724,9 @@ TEST_F(CompilerOptionsBuilder, BuildAllOptionsClWithExceptions) "-fexceptions", "-fms-compatibility-version=19.00", "-DprojectFoo=projectBar", - "-D__FUNCSIG__=\"\"", - "-D__FUNCTION__=\"\"", - "-D__FUNCDNAME__=\"\"", + "-D__FUNCSIG__=\"void __cdecl someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580(void)\"", + "-D__FUNCTION__=\"someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580\"", + "-D__FUNCDNAME__=\"?someLegalAndLongishFunctionNameThatWorksAroundQTCREATORBUG-24580@@YAXXZ\"", "-I", IsPartOfHeader("wrappedQtHeaders"), "-I", IsPartOfHeader(toNative("wrappedQtHeaders/QtCore").toStdString()), "-I", toNative("/tmp/path"),