aboutsummaryrefslogtreecommitdiffstats
path: root/main/gtest/gtest-1.8.1-null-pointer.patch
diff options
context:
space:
mode:
authorLuca Weiss <luca@z3ntu.xyz>2018-09-26 16:19:01 +0200
committerNatanael Copa <ncopa@alpinelinux.org>2018-09-26 17:04:11 +0000
commitc192b978fa520ce25cc5586d3a766719d253b69f (patch)
tree23dab47f7220b32ac084ee1ce2b39405fcf543af /main/gtest/gtest-1.8.1-null-pointer.patch
parentcb8c901d59cadc7442b9a588fda3fa9b6c8908f3 (diff)
downloadaports-c192b978fa520ce25cc5586d3a766719d253b69f.tar.bz2
aports-c192b978fa520ce25cc5586d3a766719d253b69f.tar.xz
main/gtest: Upgrade to 1.8.1 and more
Diffstat (limited to 'main/gtest/gtest-1.8.1-null-pointer.patch')
-rw-r--r--main/gtest/gtest-1.8.1-null-pointer.patch17
1 files changed, 17 insertions, 0 deletions
diff --git a/main/gtest/gtest-1.8.1-null-pointer.patch b/main/gtest/gtest-1.8.1-null-pointer.patch
new file mode 100644
index 0000000000..d062baca40
--- /dev/null
+++ b/main/gtest/gtest-1.8.1-null-pointer.patch
@@ -0,0 +1,17 @@
+diff --git a/googletest/src/gtest.cc b/googletest/src/gtest.cc
+index 96b07c6..4af3e5a 100644
+--- a/googletest/src/gtest.cc
++++ b/googletest/src/gtest.cc
+@@ -2693,10 +2693,12 @@ void TestInfo::Run() {
+ test->Run();
+ }
+
++ if (test != NULL) {
+ // Deletes the test object.
+ impl->os_stack_trace_getter()->UponLeavingGTest();
+ internal::HandleExceptionsInMethodIfSupported(
+ test, &Test::DeleteSelf_, "the test fixture's destructor");
++ }
+
+ result_.set_elapsed_time(internal::GetTimeInMillis() - start);
+