aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGennadiy Civil <misterg@google.com>2018-08-02 17:32:43 -0400
committerGennadiy Civil <misterg@google.com>2018-08-02 17:32:43 -0400
commit0d29f9702df3a9b8fd4771e5725dc301f9797539 (patch)
tree7609e93132c374f31a42fd23d715ebefd76f8284
parent95c313e68541a1a63adbb6639a5e5745360bfd06 (diff)
downloadgoogletest-0d29f9702df3a9b8fd4771e5725dc301f9797539.tar.gz
googletest-0d29f9702df3a9b8fd4771e5725dc301f9797539.tar.bz2
googletest-0d29f9702df3a9b8fd4771e5725dc301f9797539.zip
more fixes
-rw-r--r--googletest/CMakeLists.txt2
-rwxr-xr-xgoogletest/test/googletest-catch-exceptions-test.py4
2 files changed, 3 insertions, 3 deletions
diff --git a/googletest/CMakeLists.txt b/googletest/CMakeLists.txt
index 615b0712..4f340bb5 100644
--- a/googletest/CMakeLists.txt
+++ b/googletest/CMakeLists.txt
@@ -262,7 +262,7 @@ if (gtest_build_tests)
endif()
cxx_executable_with_flags(
- gtest_catch_exceptions_ex_test_
+ googletest-catch-exceptions-ex-test_
"${cxx_exception}"
gtest_main
test/googletest-catch-exceptions-test_.cc)
diff --git a/googletest/test/googletest-catch-exceptions-test.py b/googletest/test/googletest-catch-exceptions-test.py
index 0bd43661..5f13efa1 100755
--- a/googletest/test/googletest-catch-exceptions-test.py
+++ b/googletest/test/googletest-catch-exceptions-test.py
@@ -31,7 +31,7 @@
"""Tests Google Test's exception catching behavior.
This script invokes googletest-catch-exceptions-test_ and
-gtest_catch_exceptions_ex_test_ (programs written with
+googletest-catch-exceptions-ex-test_ (programs written with
Google Test) and verifies their output.
"""
@@ -45,7 +45,7 @@ LIST_TESTS_FLAG = FLAG_PREFIX + 'list_tests'
NO_CATCH_EXCEPTIONS_FLAG = FLAG_PREFIX + 'catch_exceptions=0'
FILTER_FLAG = FLAG_PREFIX + 'filter'
-# Path to the gtest_catch_exceptions_ex_test_ binary, compiled with
+# Path to the googletest-catch-exceptions-ex-test_ binary, compiled with
# exceptions enabled.
EX_EXE_PATH = gtest_test_utils.GetTestExecutablePath(
'googletest-catch-exceptions-ex-test_')