commit c014997cdb05f8bb15f175a27eee62d88418487e
author Sameer Agarwal <sameeragarwal@google.com> Tue Sep 18 13:55:18 2012 -0700
committer Sameer Agarwal <sameeragarwal@google.com> Tue Sep 18 13:55:18 2012 -0700
tree cd737120e05f5c608d9163bbf2a7c3c52c96092c
parent 44714e3c318330f642d818a119da43208496385c

Replace EXPECT/ASSERT_DEATH with EXPECT_DEATH_IF_SUPPORTED.

This allows us to remove all the WIN32/MSVC ifdefs in the
various tests.

http://code.google.com/p/ceres-solver/issues/detail?id=55

Change-Id: Ida053e44ea84b6915758318403f3db05325f1226

internal/ceres/parameter_block_test.cc

diff --git a/internal/ceres/parameter_block_test.cc b/internal/ceres/parameter_block_test.cc
index b1d69b0..35998dc 100644
--- a/internal/ceres/parameter_block_test.cc
+++ b/internal/ceres/parameter_block_test.cc
@@ -36,8 +36,6 @@
 namespace ceres {
 namespace internal {
 
-// TODO(keir): Figure out how to enable the death tests on Windows.
-
 TEST(ParameterBlock, SetLocalParameterization) {
   double x[3] = { 1.0, 2.0, 3.0 };
   ParameterBlock parameter_block(x, 3);
@@ -48,13 +46,12 @@
 
   // Can't set the parameterization if the sizes don't match.
   SubsetParameterization subset_wrong_size(4, indices);
-#ifndef _WIN32
-  ASSERT_DEATH(parameter_block.SetParameterization(&subset_wrong_size),
-               "global");
+  EXPECT_DEATH_IF_SUPPORTED(
+      parameter_block.SetParameterization(&subset_wrong_size), "global");
 
   // Can't set parameterization to NULL from NULL.
-  ASSERT_DEATH(parameter_block.SetParameterization(NULL), "NULL");
-#endif  // _WIN32
+  EXPECT_DEATH_IF_SUPPORTED
+      (parameter_block.SetParameterization(NULL), "NULL");
 
   // Now set the parameterization.
   SubsetParameterization subset(3, indices);
@@ -63,15 +60,13 @@
   // Re-setting the parameterization to the same value is supported.
   parameter_block.SetParameterization(&subset);
 
-#ifndef _WIN32
   // Can't set parameterization to NULL from another parameterization.
-  ASSERT_DEATH(parameter_block.SetParameterization(NULL), "NULL");
+  EXPECT_DEATH_IF_SUPPORTED(parameter_block.SetParameterization(NULL), "NULL");
 
   // Can't set the parameterization more than once.
   SubsetParameterization subset_different(3, indices);
-  ASSERT_DEATH(parameter_block.SetParameterization(&subset_different),
-               "re-set");
-#endif  // _WIN32
+  EXPECT_DEATH_IF_SUPPORTED
+      (parameter_block.SetParameterization(&subset_different), "re-set");
 
   // Ensure the local parameterization jacobian result is correctly computed.
   ConstMatrixRef local_parameterization_jacobian(