mgr/prometheus: update promtool testcase location

Signed-off-by: Paul Cuzner <pcuzner@redhat.com>
 Conflicts:
	src/test/CMakeLists.txt

diff --git a/src/test/CMakeLists.txt b/src/test/CMakeLists.txt
index 3c7625d93eba5e9270b03e7139baec3a90052562..a82423ddab283bebbba723ebe87cdf6182ce5681 100644 (file)
--- a/src/test/CMakeLists.txt
+++ b/src/test/CMakeLists.txt
@@ -157,7 +157,7 @@ endif()
 add_executable(ceph_test_mutate
   test_mutate.cc
   )
-target_link_libraries(ceph_test_mutate global librados ${BLKID_LIBRARIES} 
+target_link_libraries(ceph_test_mutate global librados ${BLKID_LIBRARIES}
   ${CMAKE_DL_LIBS})
 
 if(NOT WIN32)
@@ -599,8 +599,8 @@ if(PROMTOOL_EXECUTABLE)
     OUTPUT_QUIET)
   if(NOT rc)
     add_ceph_test(run-promtool-unittests
-      ${PROMTOOL_EXECUTABLE} test rules ${CMAKE_SOURCE_DIR}/monitoring/prometheus/alerts/test_alerts.yml)
-  else()
+      ${PROMTOOL_EXECUTABLE} test rules ${CMAKE_SOURCE_DIR}/monitoring/prometheus/tests/test_alerts.yml)
+  elseif(NOT promtool_executable_checked)
     message(WARNING "'${PROMTOOL_EXECUTABLE} test rules' does not work, "
       "please use a newer prometheus")
   endif()