[med-svn] [ismrmrd] 02/07: Add patch fixing FTBFS in testsuite. File: Use-explicit-64-bit-shifts-in-testsuite.patch

Ghislain Vaillant ghisvail-guest at moszumanska.debian.org
Wed Feb 3 19:35:49 UTC 2016


This is an automated email from the git hooks/post-receive script.

ghisvail-guest pushed a commit to branch master
in repository ismrmrd.

commit 15263a1e9853fcbf63554ddea01573f1a00914a1
Author: Ghislain Antony Vaillant <ghisvail at gmail.com>
Date:   Wed Feb 3 17:32:04 2016 +0000

    Add patch fixing FTBFS in testsuite.
    File: Use-explicit-64-bit-shifts-in-testsuite.patch
    
    Gbp-Dch: Short
    Closes: #802172
    Thanks: Emilio Pozuelo Monfort
---
 .../Use-explicit-64-bit-shifts-in-testsuite.patch  | 30 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 2 files changed, 31 insertions(+)

diff --git a/debian/patches/Use-explicit-64-bit-shifts-in-testsuite.patch b/debian/patches/Use-explicit-64-bit-shifts-in-testsuite.patch
new file mode 100644
index 0000000..fde8a86
--- /dev/null
+++ b/debian/patches/Use-explicit-64-bit-shifts-in-testsuite.patch
@@ -0,0 +1,30 @@
+From: Ghislain Antony Vaillant <ghisvail at gmail.com>
+Date: Wed, 3 Feb 2016 17:31:14 +0000
+Subject: Use explicit 64-bit shifts in testsuite.
+
+---
+ tests/test_channels.cpp | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/tests/test_channels.cpp b/tests/test_channels.cpp
+index 54a1c8a..ec110f5 100644
+--- a/tests/test_channels.cpp
++++ b/tests/test_channels.cpp
+@@ -38,7 +38,7 @@ BOOST_AUTO_TEST_CASE(test_set_channel_on)
+ 
+     for (int chan = 0; chan < 64 * ISMRMRD_CHANNEL_MASKS; chan++) {
+         BOOST_CHECK_EQUAL(ismrmrd_set_channel_on(channel_mask, chan), ISMRMRD_NOERROR);
+-        uint64_t bitmask = 1 << (chan % 64);
++        uint64_t bitmask = (uint64_t)1 << (chan % 64);
+         size_t offset = chan / 64;
+         BOOST_REQUIRE((channel_mask[offset] & bitmask) != 0);
+     }
+@@ -54,7 +54,7 @@ BOOST_AUTO_TEST_CASE(test_set_channel_off)
+     for (int chan = 0; chan < 64 * ISMRMRD_CHANNEL_MASKS; chan++) {
+         BOOST_CHECK_EQUAL(ismrmrd_set_channel_off(channel_mask, chan), ISMRMRD_NOERROR);
+ 
+-        uint64_t bitmask = 1 << (chan % 64);
++        uint64_t bitmask = (uint64_t)1 << (chan % 64);
+         size_t offset = chan / 64;
+         BOOST_REQUIRE((channel_mask[offset] & bitmask) == 0);
+     }
diff --git a/debian/patches/series b/debian/patches/series
index e073a99..6d66102 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 Disable-HTML-timestamps.patch
 Explicit-64-bit-shifts-for-flags.patch
+Use-explicit-64-bit-shifts-in-testsuite.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/ismrmrd.git



More information about the debian-med-commit mailing list