diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2017-03-30 22:59:53 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-03-30 22:59:53 +0200 |
| commit | 84157bb8bf2c610584e0836047da4c710f8eaf76 (patch) | |
| tree | be5d8c7238e32802221db55a3ee83e7f6a58affb /gnu/packages/patches/ceph-skip-unittest_blockdev.patch | |
| parent | fa63939acba69e11df44073a7eb687bd2ba48349 (diff) | |
| parent | 03d0aa8b22223b67ec9bbd363c4d5800efdbaf82 (diff) | |
| download | guix-84157bb8bf2c610584e0836047da4c710f8eaf76.tar.gz | |
Merge branch 'master' into core-updates
Most conflicts are from 6fd52309b8f52c9bb59fccffac53e029ce94b698.
Diffstat (limited to 'gnu/packages/patches/ceph-skip-unittest_blockdev.patch')
| -rw-r--r-- | gnu/packages/patches/ceph-skip-unittest_blockdev.patch | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/gnu/packages/patches/ceph-skip-unittest_blockdev.patch b/gnu/packages/patches/ceph-skip-unittest_blockdev.patch new file mode 100644 index 0000000000..43b9984862 --- /dev/null +++ b/gnu/packages/patches/ceph-skip-unittest_blockdev.patch @@ -0,0 +1,28 @@ +This test tries to walk a sysfs path and hits a null pointer exception. + +/tmp/guix-build-ceph-12.0.0.drv-0/ceph-12.0.0/src/test/common/test_blkdev.cc:32: Failure +Expected: (dir) != (nullptr), actual: NULL vs 8-byte object <00-00 00-00 00-00 00-00> + +diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt +index 5172663898..ac84085eaa 100644 +--- a/src/test/common/CMakeLists.txt ++++ b/src/test/common/CMakeLists.txt +@@ -12,15 +12,6 @@ target_link_libraries(get_command_descriptions + ${CMAKE_DL_LIBS} + ) + +-if(HAVE_BLKID) +-# unittest_blkdev +-add_executable(unittest_blkdev +- test_blkdev.cc +- ) +-add_ceph_unittest(unittest_blkdev ${CMAKE_RUNTIME_OUTPUT_DIRECTORY}/unittest_blkdev) +-target_link_libraries(unittest_blkdev global ${BLKID_LIBRARIES}) +-endif(HAVE_BLKID) +- + # unittest_bloom_filter + add_executable(unittest_bloom_filter + test_bloom_filter.cc +-- +2.11.1 + |