diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2016-12-27 21:40:41 +0100 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2017-03-28 16:35:37 +0200 |
| commit | dcfe44cbce97e887d033b6adefd7669f47c36e4f (patch) | |
| tree | 6d10bdf0e0af66c7e28b80e60eef62136457ea31 /gnu/packages/patches/ceph-skip-unittest_blockdev.patch | |
| parent | 22ea02351f4fed0789d7d1c379690c1b08039fe8 (diff) | |
| download | guix-dcfe44cbce97e887d033b6adefd7669f47c36e4f.tar.gz | |
gnu: Add ceph.
* gnu/packages/storage.scm, gnu/packages/patches/ceph-disable-cpu-optimizations.patch, gnu/packages/patches/ceph-skip-collect-sys-info-test.patch, gnu/packages/patches/ceph-skip-unittest_blockdev.patch: New files. * gnu/local.mk (GNU_SYSTEM_MODULES, dist_patch_DATA): Register it.
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 + |