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-collect-sys-info-test.patch | |
| parent | 22ea02351f4fed0789d7d1c379690c1b08039fe8 (diff) | |
| download | guix-dcfe44cbce97e887d033b6adefd7669f47c36e4f.tar 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-collect-sys-info-test.patch')
| -rw-r--r-- | gnu/packages/patches/ceph-skip-collect-sys-info-test.patch | 29 |
1 files changed, 29 insertions, 0 deletions
diff --git a/gnu/packages/patches/ceph-skip-collect-sys-info-test.patch b/gnu/packages/patches/ceph-skip-collect-sys-info-test.patch new file mode 100644 index 0000000000..f210799254 --- /dev/null +++ b/gnu/packages/patches/ceph-skip-collect-sys-info-test.patch @@ -0,0 +1,29 @@ +This test fails because /etc/os-release is not available. + +diff --git a/src/test/common/test_util.cc b/src/test/common/test_util.cc +index 288dd37db1..95b6cd4b30 100644 +--- a/src/test/common/test_util.cc ++++ b/src/test/common/test_util.cc +@@ -31,19 +31,3 @@ TEST(util, unit_to_bytesize) + + ASSERT_EQ(65536ll, unit_to_bytesize(" 64K", &cerr)); + } +- +-#if defined(__linux__) +-TEST(util, collect_sys_info) +-{ +- map<string, string> sys_info; +- +- CephContext *cct = (new CephContext(CEPH_ENTITY_TYPE_CLIENT))->get(); +- collect_sys_info(&sys_info, cct); +- +- ASSERT_TRUE(sys_info.find("distro") != sys_info.end()); +- ASSERT_TRUE(sys_info.find("distro_version") != sys_info.end()); +- ASSERT_TRUE(sys_info.find("distro_description") != sys_info.end()); +- +- cct->put(); +-} +-#endif +-- +2.11.1 + |