Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
0d29f970
Commit
0d29f970
authored
Aug 02, 2018
by
Gennadiy Civil
Browse files
more fixes
parent
95c313e6
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
3 additions
and
3 deletions
+3
-3
googletest/CMakeLists.txt
googletest/CMakeLists.txt
+1
-1
googletest/test/googletest-catch-exceptions-test.py
googletest/test/googletest-catch-exceptions-test.py
+2
-2
No files found.
googletest/CMakeLists.txt
View file @
0d29f970
...
@@ -262,7 +262,7 @@ if (gtest_build_tests)
...
@@ -262,7 +262,7 @@ if (gtest_build_tests)
endif
()
endif
()
cxx_executable_with_flags
(
cxx_executable_with_flags
(
gtest
_
catch
_
exceptions
_
ex
_
test_
g
oogle
test
-
catch
-
exceptions
-
ex
-
test_
"
${
cxx_exception
}
"
"
${
cxx_exception
}
"
gtest_main
gtest_main
test/googletest-catch-exceptions-test_.cc
)
test/googletest-catch-exceptions-test_.cc
)
...
...
googletest/test/googletest-catch-exceptions-test.py
View file @
0d29f970
...
@@ -31,7 +31,7 @@
...
@@ -31,7 +31,7 @@
"""Tests Google Test's exception catching behavior.
"""Tests Google Test's exception catching behavior.
This script invokes googletest-catch-exceptions-test_ and
This script invokes googletest-catch-exceptions-test_ and
gtest
_
catch
_
exceptions
_
ex
_
test_ (programs written with
g
oogle
test
-
catch
-
exceptions
-
ex
-
test_ (programs written with
Google Test) and verifies their output.
Google Test) and verifies their output.
"""
"""
...
@@ -45,7 +45,7 @@ LIST_TESTS_FLAG = FLAG_PREFIX + 'list_tests'
...
@@ -45,7 +45,7 @@ LIST_TESTS_FLAG = FLAG_PREFIX + 'list_tests'
NO_CATCH_EXCEPTIONS_FLAG
=
FLAG_PREFIX
+
'catch_exceptions=0'
NO_CATCH_EXCEPTIONS_FLAG
=
FLAG_PREFIX
+
'catch_exceptions=0'
FILTER_FLAG
=
FLAG_PREFIX
+
'filter'
FILTER_FLAG
=
FLAG_PREFIX
+
'filter'
# Path to the gtest
_
catch
_
exceptions
_
ex
_
test_ binary, compiled with
# Path to the g
oogle
test
-
catch
-
exceptions
-
ex
-
test_ binary, compiled with
# exceptions enabled.
# exceptions enabled.
EX_EXE_PATH
=
gtest_test_utils
.
GetTestExecutablePath
(
EX_EXE_PATH
=
gtest_test_utils
.
GetTestExecutablePath
(
'googletest-catch-exceptions-ex-test_'
)
'googletest-catch-exceptions-ex-test_'
)
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
.
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment