Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
yangql
googletest
Commits
17e48608
Commit
17e48608
authored
Mar 23, 2010
by
zhanyong.wan
Browse files
Enables death tests on AIX, by Hady Zalek.
parent
e9f093ae
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
with
6 additions
and
1 deletion
+6
-1
include/gtest/internal/gtest-port.h
include/gtest/internal/gtest-port.h
+2
-1
src/gtest.cc
src/gtest.cc
+4
-0
No files found.
include/gtest/internal/gtest-port.h
View file @
17e48608
...
@@ -478,7 +478,8 @@
...
@@ -478,7 +478,8 @@
// abort() in a VC 7.1 application compiled as GUI in debug config
// abort() in a VC 7.1 application compiled as GUI in debug config
// pops up a dialog window that cannot be suppressed programmatically.
// pops up a dialog window that cannot be suppressed programmatically.
#if (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \
#if (GTEST_OS_LINUX || GTEST_OS_MAC || GTEST_OS_CYGWIN || GTEST_OS_SOLARIS || \
(GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || GTEST_OS_WINDOWS_MINGW)
(GTEST_OS_WINDOWS_DESKTOP && _MSC_VER >= 1400) || \
GTEST_OS_WINDOWS_MINGW || GTEST_OS_AIX)
#define GTEST_HAS_DEATH_TEST 1
#define GTEST_HAS_DEATH_TEST 1
#include <vector> // NOLINT
#include <vector> // NOLINT
#endif
#endif
...
...
src/gtest.cc
View file @
17e48608
...
@@ -1805,6 +1805,8 @@ TestResult::~TestResult() {
...
@@ -1805,6 +1805,8 @@ TestResult::~TestResult() {
// range from 0 to total_part_count() - 1. If i is not in that range,
// range from 0 to total_part_count() - 1. If i is not in that range,
// aborts the program.
// aborts the program.
const
TestPartResult
&
TestResult
::
GetTestPartResult
(
int
i
)
const
{
const
TestPartResult
&
TestResult
::
GetTestPartResult
(
int
i
)
const
{
if
(
i
<
0
||
i
>=
total_part_count
())
internal
::
posix
::
Abort
();
return
test_part_results_
.
at
(
i
);
return
test_part_results_
.
at
(
i
);
}
}
...
@@ -1812,6 +1814,8 @@ const TestPartResult& TestResult::GetTestPartResult(int i) const {
...
@@ -1812,6 +1814,8 @@ const TestPartResult& TestResult::GetTestPartResult(int i) const {
// test_property_count() - 1. If i is not in that range, aborts the
// test_property_count() - 1. If i is not in that range, aborts the
// program.
// program.
const
TestProperty
&
TestResult
::
GetTestProperty
(
int
i
)
const
{
const
TestProperty
&
TestResult
::
GetTestProperty
(
int
i
)
const
{
if
(
i
<
0
||
i
>=
test_property_count
())
internal
::
posix
::
Abort
();
return
test_properties_
.
at
(
i
);
return
test_properties_
.
at
(
i
);
}
}
...
...
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