From: Jason Dillaman <dillaman@redhat.com>
Date: Wed, 20 Feb 2019 20:00:18 +0000 (-0500)
Subject: Revert "qa: update test_envlibrados_for_rocksdb.sh for libradospp split"
X-Git-Tag: v14.1.0~20^2
X-Git-Url: http://git-server-git.apps.pok.os.sepia.ceph.com/?a=commitdiff_plain;h=9683869442c4f6b51f262fbbb1c9c4c0b155ed71;p=ceph.git

Revert "qa: update test_envlibrados_for_rocksdb.sh for libradospp split"

This reverts commit 0475dfdea315e5208abc201355523c8dab78469f.

Signed-off-by: Jason Dillaman <dillaman@redhat.com>
---

diff --git a/qa/workunits/rados/0001-cmake-add-Findrados.cmake-and-use-it.patch b/qa/workunits/rados/0001-cmake-add-Findrados.cmake-and-use-it.patch
deleted file mode 100644
index 60feef9de9b7..000000000000
--- a/qa/workunits/rados/0001-cmake-add-Findrados.cmake-and-use-it.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-From 7535e5f47353658f966eb4dce344154678463e04 Mon Sep 17 00:00:00 2001
-From: Kefu Chai <tchaikov@gmail.com>
-Date: Mon, 29 Oct 2018 19:14:54 +0800
-Subject: [PATCH] cmake: add Findrados.cmake and use it
-
-ceph has extracted libradospp out from librados. the former offers the
-C++ API, while the latter offers the C API.
-
-Signed-off-by: Kefu Chai <tchaikov@gmail.com>
----
- CMakeLists.txt                  |  3 ++-
- cmake/modules/Findradospp.cmake | 31 +++++++++++++++++++++++++++++++
- 2 files changed, 33 insertions(+), 1 deletion(-)
- create mode 100644 cmake/modules/Findradospp.cmake
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 2a4bdb6..96972a2 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -731,7 +731,8 @@ option(WITH_LIBRADOS "Build with librados" OFF)
- if(WITH_LIBRADOS)
-   list(APPEND SOURCES
-     utilities/env_librados.cc)
--  list(APPEND THIRDPARTY_LIBS rados)
-+  find_package(radospp REQUIRED)
-+  list(APPEND THIRDPARTY_LIBS rados::radospp)
- endif()
- 
- if(WIN32)
-diff --git a/cmake/modules/Findradospp.cmake b/cmake/modules/Findradospp.cmake
-new file mode 100644
-index 0000000..4f1672a
---- /dev/null
-+++ b/cmake/modules/Findradospp.cmake
-@@ -0,0 +1,31 @@
-+# - Find RADOS
-+# Find librados library and includes
-+#
-+# RADOSPP_INCLUDE_DIR - where to find librados.hpp.
-+# RADOSPP_LIBRARIES - List of libraries when using radospp.
-+# radospp_FOUND - True if radospp found.
-+
-+find_path(RADOSPP_INCLUDE_DIR
-+  NAMES rados/librados.hpp
-+  HINTS ${LIBRADOS_ROOT}/include)
-+
-+find_library(RADOSPP_LIBRARIES
-+  NAMES radospp
-+  HINTS ${LIBRADOS_ROOT}/lib)
-+
-+include(FindPackageHandleStandardArgs)
-+find_package_handle_standard_args(radospp
-+  FOUND_VAR radospp_FOUND
-+  REQUIRED_VARS RADOSPP_LIBRARIES RADOSPP_INCLUDE_DIR)
-+
-+mark_as_advanced(
-+  RADOSPP_INCLUDE_DIR
-+  RADOSPP_LIBRARIES)
-+
-+if(radospp_FOUND AND NOT (TARGET rados::radospp))
-+  add_library(rados::radospp UNKNOWN IMPORTED)
-+  set_target_properties(rados::radospp PROPERTIES
-+    INTERFACE_INCLUDE_DIRECTORIES "${RADOSPP_INCLUDE_DIR}"
-+    IMPORTED_LINK_INTERFACE_LANGUAGES "CXX"
-+    IMPORTED_LOCATION "${RADOSPP_LIBRARIES}")
-+endif()
--- 
-2.19.1
-
diff --git a/qa/workunits/rados/test_envlibrados_for_rocksdb.sh b/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
index cd8cfbb8b93e..31bb775fec5c 100755
--- a/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
+++ b/qa/workunits/rados/test_envlibrados_for_rocksdb.sh
@@ -73,8 +73,6 @@ git clone https://github.com/facebook/rocksdb.git --depth 1
 
 # compile code
 cd rocksdb
-patch -p1 <$(dirname $0)/0001-cmake-add-Findrados.cmake-and-use-it.patch
-
 mkdir build && cd build && cmake -DWITH_LIBRADOS=ON -DWITH_SNAPPY=ON -DWITH_GFLAGS=OFF -DFAIL_ON_WARNINGS=OFF ..
 make rocksdb_env_librados_test -j8