Enables death tests on Cygwin and Mac (by Vlad Losev); fixes a python test on Mac.
This commit is contained in:
@@ -41,6 +41,7 @@
|
||||
#include <direct.h> // For chdir().
|
||||
#else
|
||||
#include <unistd.h>
|
||||
#include <sys/wait.h> // For waitpid.
|
||||
#include <limits> // For std::numeric_limits.
|
||||
#endif // GTEST_OS_WINDOWS
|
||||
|
||||
@@ -414,7 +415,7 @@ void SetPthreadFlag() {
|
||||
|
||||
} // namespace
|
||||
|
||||
#if !GTEST_OS_WINDOWS
|
||||
#if GTEST_HAS_CLONE
|
||||
|
||||
TEST_F(TestForDeathTest, DoesNotExecuteAtforkHooks) {
|
||||
if (!testing::GTEST_FLAG(death_test_use_fork)) {
|
||||
@@ -426,7 +427,7 @@ TEST_F(TestForDeathTest, DoesNotExecuteAtforkHooks) {
|
||||
}
|
||||
}
|
||||
|
||||
#endif // !GTEST_OS_WINDOWS
|
||||
#endif // GTEST_HAS_CLONE
|
||||
|
||||
// Tests that a method of another class can be used in a death test.
|
||||
TEST_F(TestForDeathTest, MethodOfAnotherClass) {
|
||||
|
||||
@@ -202,7 +202,7 @@ class GTestFilterUnitTest(unittest.TestCase):
|
||||
for slice_var in list_of_sets:
|
||||
full_partition.extend(slice_var)
|
||||
self.assertEqual(len(set_var), len(full_partition))
|
||||
self.assertEqual(sorted(set_var), sorted(full_partition))
|
||||
self.assertEqual(sets.Set(set_var), sets.Set(full_partition))
|
||||
|
||||
def RunAndVerify(self, gtest_filter, tests_to_run):
|
||||
"""Runs gtest_flag_unittest_ with the given filter, and verifies
|
||||
|
||||
Reference in New Issue
Block a user