From: Kefu Chai <kchai@redhat.com>
Date: Thu, 2 May 2019 15:48:56 +0000 (+0800)
Subject: test/common/test_util: skip it if /etc/os-release does not exist
X-Git-Tag: v15.1.0~2769^2~3
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=61e4a521b29c7bfb5d479f2cd2807c50a9f9cfd2;p=ceph.git

test/common/test_util: skip it if /etc/os-release does not exist

some GNU/Linux distros do not ship this file, and we should not fail the
test on them.

inspired by
http://git.savannah.gnu.org/cgit/guix.git/tree/gnu/packages/patches/ceph-skip-collect-sys-info-test.patch?id=48f19e60c4677e392ee2c23f28098cfcaf9d1710

Signed-off-by: Kefu Chai <kchai@redhat.com>
---

diff --git a/src/test/common/CMakeLists.txt b/src/test/common/CMakeLists.txt
index 3906920d9e9a..f64960a05322 100644
--- a/src/test/common/CMakeLists.txt
+++ b/src/test/common/CMakeLists.txt
@@ -128,7 +128,7 @@ add_executable(unittest_util
   ${CMAKE_SOURCE_DIR}/src/common/util.cc
   )
 add_ceph_unittest(unittest_util)
-target_link_libraries(unittest_util global)
+target_link_libraries(unittest_util global StdFilesystem::filesystem)
 
 # unittest_random
 add_executable(unittest_random
diff --git a/src/test/common/test_util.cc b/src/test/common/test_util.cc
index b47bec688e76..cf589bafc843 100644
--- a/src/test/common/test_util.cc
+++ b/src/test/common/test_util.cc
@@ -16,11 +16,15 @@
 #include "include/util.h"
 #include "gtest/gtest.h"
 
-#include <sstream>
+#include <experimental/filesystem>
 
 #if defined(__linux__)
 TEST(util, collect_sys_info)
 {
+  if (!std::experimental::filesystem::exists("/etc/os-release")) {
+    GTEST_SKIP() << "skipping as '/etc/os-release' does not exist";
+  }
+
   map<string, string> sys_info;
 
   CephContext *cct = (new CephContext(CEPH_ENTITY_TYPE_CLIENT))->get();