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
diff --git a/internal/ceres/local_parameterization_test.cc b/internal/ceres/local_parameterization_test.cc
index 55c765b..9b775b4 100644
--- a/internal/ceres/local_parameterization_test.cc
+++ b/internal/ceres/local_parameterization_test.cc
@@ -62,30 +62,28 @@
}
}
-// Death tests are not working on Windows yet.
-// TODO(keir): Figure out how to enable these.
-#ifndef _WIN32
-
TEST(SubsetParameterization, DeathTests) {
vector<int> constant_parameters;
- EXPECT_DEATH(SubsetParameterization parameterization(1, constant_parameters),
- "at least");
+ EXPECT_DEATH_IF_SUPPORTED(
+ SubsetParameterization parameterization(1, constant_parameters),
+ "at least");
constant_parameters.push_back(0);
- EXPECT_DEATH(SubsetParameterization parameterization(1, constant_parameters),
- "Number of parameters");
+ EXPECT_DEATH_IF_SUPPORTED(
+ SubsetParameterization parameterization(1, constant_parameters),
+ "Number of parameters");
constant_parameters.push_back(1);
- EXPECT_DEATH(SubsetParameterization parameterization(2, constant_parameters),
- "Number of parameters");
+ EXPECT_DEATH_IF_SUPPORTED(
+ SubsetParameterization parameterization(2, constant_parameters),
+ "Number of parameters");
constant_parameters.push_back(1);
- EXPECT_DEATH(SubsetParameterization parameterization(2, constant_parameters),
- "duplicates");
+ EXPECT_DEATH_IF_SUPPORTED(
+ SubsetParameterization parameterization(2, constant_parameters),
+ "duplicates");
}
-#endif // _WIN32
-
TEST(SubsetParameterization, NormalFunctionTest) {
double x[4] = {1.0, 2.0, 3.0, 4.0};
for (int i = 0; i < 4; ++i) {