diff options
| author | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-12-19 11:58:24 +0100 |
|---|---|---|
| committer | Nikolai Kosjar <nikolai.kosjar@qt.io> | 2019-12-20 22:46:02 +0000 |
| commit | 26693e82126de15145a04c3428a10f6c15120532 (patch) | |
| tree | 271d565fff685b47a02645c487b8d1fed8e53687 /tests/unit | |
| parent | 4fdd9446179df772c86b0e022712595004272dc8 (diff) | |
| download | qt-creator-26693e82126de15145a04c3428a10f6c15120532.tar.gz | |
Revert "Clang: Stop enabling exceptions explicitly"
This reverts commit b114f77d8a633341b617a5cadd04e5977beae65d as
"--driver-mode=cl" apparently still disables exceptions.
Task-number: QTCREATORBUG-23000
Change-Id: I9c49d971fafda5e1aca8445f8921e50f323d368f
Reviewed-by: Cristian Adam <cristian.adam@qt.io>
Diffstat (limited to 'tests/unit')
| -rw-r--r-- | tests/unit/unittest/compileroptionsbuilder-test.cpp | 20 |
1 files changed, 20 insertions, 0 deletions
diff --git a/tests/unit/unittest/compileroptionsbuilder-test.cpp b/tests/unit/unittest/compileroptionsbuilder-test.cpp index df11072707..2a6bfd8462 100644 --- a/tests/unit/unittest/compileroptionsbuilder-test.cpp +++ b/tests/unit/unittest/compileroptionsbuilder-test.cpp @@ -444,6 +444,22 @@ TEST_F(CompilerOptionsBuilder, AddTargetTriple) ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("--target=x86_64-apple-darwin10")); } +TEST_F(CompilerOptionsBuilder, EnableCExceptions) +{ + projectPart.languageVersion = Utils::LanguageVersion::C99; + + compilerOptionsBuilder.enableExceptions(); + + ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-fexceptions")); +} + +TEST_F(CompilerOptionsBuilder, EnableCXXExceptions) +{ + compilerOptionsBuilder.enableExceptions(); + + ASSERT_THAT(compilerOptionsBuilder.options(), ElementsAre("-fcxx-exceptions", "-fexceptions")); +} + TEST_F(CompilerOptionsBuilder, InsertWrappedQtHeaders) { CppTools::CompilerOptionsBuilder compilerOptionsBuilder{projectPart, @@ -601,6 +617,8 @@ TEST_F(CompilerOptionsBuilder, BuildAllOptions) "-x", "c++", "-std=c++17", + "-fcxx-exceptions", + "-fexceptions", "-DprojectFoo=projectBar", "-I", IsPartOfHeader("wrappedQtHeaders"), "-I", IsPartOfHeader(toNative("wrappedQtHeaders/QtCore").toStdString()), @@ -632,6 +650,8 @@ TEST_F(CompilerOptionsBuilder, BuildAllOptionsCl) "--target=x86_64-apple-darwin10", "/TP", "/std:c++17", + "-fcxx-exceptions", + "-fexceptions", "-fms-compatibility-version=19.00", "-DprojectFoo=projectBar", "-D__FUNCSIG__=\"\"", |