[med-svn] [opensurgsim] 01/02: Fix FTBFS on architectures where ASSERT_DEATH is not supported.
Ghislain Vaillant
ghisvail-guest at moszumanska.debian.org
Tue Dec 6 11:07:52 UTC 2016
This is an automated email from the git hooks/post-receive script.
ghisvail-guest pushed a commit to branch master
in repository opensurgsim.
commit e1e18e728ed06576787354e33cd74cba4f8253cd
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date: Mon Dec 5 22:02:24 2016 +0000
Fix FTBFS on architectures where ASSERT_DEATH is not supported.
- New patch Assert-death-only-if-supported.patch.
Gbp-Dch: full
---
.../patches/Assert-death-only-if-supported.patch | 30 ++++++++++++++++++++++
debian/patches/series | 1 +
2 files changed, 31 insertions(+)
diff --git a/debian/patches/Assert-death-only-if-supported.patch b/debian/patches/Assert-death-only-if-supported.patch
new file mode 100644
index 0000000..bcbc93f
--- /dev/null
+++ b/debian/patches/Assert-death-only-if-supported.patch
@@ -0,0 +1,30 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Mon, 5 Dec 2016 22:00:05 +0000
+Subject: Assert death only if supported.
+
+---
+ SurgSim/Framework/UnitTests/RuntimeTest.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/SurgSim/Framework/UnitTests/RuntimeTest.cpp b/SurgSim/Framework/UnitTests/RuntimeTest.cpp
+index d62918f..8293e25 100644
+--- a/SurgSim/Framework/UnitTests/RuntimeTest.cpp
++++ b/SurgSim/Framework/UnitTests/RuntimeTest.cpp
+@@ -63,7 +63,7 @@ TEST(RuntimeTest, InitFailureDeathTest)
+ runtime->addManager(managerSucceeds);
+ runtime->addManager(managerFails);
+
+- ASSERT_DEATH(runtime->start(), "");
++ ASSERT_DEATH_IF_SUPPORTED(runtime->start(), "");
+ }
+
+ TEST(RuntimeTest, StartupFailureDeathTest)
+@@ -75,7 +75,7 @@ TEST(RuntimeTest, StartupFailureDeathTest)
+ runtime->addManager(managerSucceeds);
+ runtime->addManager(managerFails);
+
+- ASSERT_DEATH(runtime->start(), "");
++ ASSERT_DEATH_IF_SUPPORTED(runtime->start(), "");
+ }
+
+ TEST(RuntimeTest, SceneInitialization)
diff --git a/debian/patches/series b/debian/patches/series
index c488a3c..c123bef 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ fix-hurd-build.patch
fix-rigid-representation-test.patch
fix-matrix-tests.patch
disable-thread-pool-on-armel.patch
+Assert-death-only-if-supported.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/opensurgsim.git
More information about the debian-med-commit
mailing list