Bug 1018270 - Part 1: Cherrypick -Wunused-private-field warning fix from upstream gtest. r=ted
authorChris Peterson <cpeterson@mozilla.com>
Mon, 02 Jun 2014 20:17:00 -0700
changeset 205459 a456dc7f19c4bdb85151f997a0cc533aa710651d
parent 205458 29d2b976dcb5cf015c30665a7206d4a6797e76bf
child 205460 2bf38fef6ff2a7c15d947d74ddc0970a2a173c14
push id3741
push userasasaki@mozilla.com
push dateMon, 21 Jul 2014 20:25:18 +0000
treeherdermozilla-beta@4d6f46f5af68 [default view] [failures only]
perfherder[talos] [build metrics] [platform microbench] (compared to previous push)
reviewersted
bugs1018270
milestone32.0a1
first release with
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
last release without
nightly linux32
nightly linux64
nightly mac
nightly win32
nightly win64
Bug 1018270 - Part 1: Cherrypick -Wunused-private-field warning fix from upstream gtest. r=ted
testing/gtest/gtest/src/gtest-internal-inl.h
testing/gtest/mozilla/GTestRunner.cpp
--- a/testing/gtest/gtest/src/gtest-internal-inl.h
+++ b/testing/gtest/gtest/src/gtest-internal-inl.h
@@ -198,17 +198,16 @@ class GTestFlagSaver {
   String color_;
   String death_test_style_;
   bool death_test_use_fork_;
   String filter_;
   String internal_run_death_test_;
   bool list_tests_;
   String output_;
   bool print_time_;
-  bool pretty_;
   internal::Int32 random_seed_;
   internal::Int32 repeat_;
   bool shuffle_;
   internal::Int32 stack_trace_depth_;
   String stream_result_to_;
   bool throw_on_failure_;
 } GTEST_ATTRIBUTE_UNUSED_;
 
--- a/testing/gtest/mozilla/GTestRunner.cpp
+++ b/testing/gtest/mozilla/GTestRunner.cpp
@@ -96,17 +96,17 @@ int RunGTestFunc()
       std::cerr << "Setting up crash reporting" << std::endl;
 
       nsCOMPtr<nsIProperties> dirsvc =
           do_GetService(NS_DIRECTORY_SERVICE_CONTRACTID);
       nsCOMPtr<nsIFile> cwd;
       nsresult rv = dirsvc->Get(NS_OS_CURRENT_WORKING_DIR,
                        NS_GET_IID(nsIFile),
                        getter_AddRefs(cwd));
-      MOZ_ASSERT(NS_SUCCEEDED(rv));
+      MOZ_RELEASE_ASSERT(NS_SUCCEEDED(rv));
       crashreporter->SetEnabled(true);
       crashreporter->SetMinidumpPath(cwd);
     }
   }
 #endif
 
   return RUN_ALL_TESTS();
 }