diff options
| author | Marius Bakke <mbakke@fastmail.com> | 2018-04-25 15:53:41 +0200 |
|---|---|---|
| committer | Marius Bakke <mbakke@fastmail.com> | 2018-04-25 15:53:41 +0200 |
| commit | a9fe3882b9400d6a49ca95e136e78477b3e81a07 (patch) | |
| tree | b724ec1ed54d4a2c1b617a63eb05b98721f5d48a /gnu/packages/patches/ceph-skip-collect-sys-info-test.patch | |
| parent | 68c4759baa4c1bb87e1c7c5568d5cdf4e1434fb1 (diff) | |
| parent | 0afeda65218ed0c82ab18762111c52a9fedd2582 (diff) | |
| download | guix-a9fe3882b9400d6a49ca95e136e78477b3e81a07.tar guix-a9fe3882b9400d6a49ca95e136e78477b3e81a07.tar.gz | |
Merge branch 'master' into staging
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 | 11 |
1 files changed, 3 insertions, 8 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 index f210799254..429087c661 100644 --- a/gnu/packages/patches/ceph-skip-collect-sys-info-test.patch +++ b/gnu/packages/patches/ceph-skip-collect-sys-info-test.patch @@ -1,14 +1,13 @@ 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 +index 64eace923c..6daf4aa514 100644 --- a/src/test/common/test_util.cc +++ b/src/test/common/test_util.cc -@@ -31,19 +31,3 @@ TEST(util, unit_to_bytesize) - +@@ -32,17 +32,3 @@ TEST(util, unit_to_bytesize) ASSERT_EQ(65536ll, unit_to_bytesize(" 64K", &cerr)); } -- + -#if defined(__linux__) -TEST(util, collect_sys_info) -{ @@ -18,12 +17,8 @@ index 288dd37db1..95b6cd4b30 100644 - 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 - |