From c8e91af6c8bf7566829a9812f5ff047f1f1e9570 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sun, 20 Oct 2019 01:36:46 -0500
Subject: CMake: Make lcov and RSpec first-class targets

---
 tools/hscript-simulate/CMakeLists.txt | 7 +++++--
 tools/hscript-validate/CMakeLists.txt | 7 +++++--
 2 files changed, 10 insertions(+), 4 deletions(-)

(limited to 'tools')

diff --git a/tools/hscript-simulate/CMakeLists.txt b/tools/hscript-simulate/CMakeLists.txt
index 98ec9e4..45e8d95 100644
--- a/tools/hscript-simulate/CMakeLists.txt
+++ b/tools/hscript-simulate/CMakeLists.txt
@@ -6,12 +6,15 @@ target_link_libraries(hscript-simulate hscript)
 
 install(TARGETS hscript-simulate DESTINATION bin)
 
+IF(RSPEC_EXECUTABLE)
 add_test(NAME "RSpecSimulator"
-    COMMAND rspec spec/simulator_spec.rb
+    COMMAND ${RSPEC_EXECUTABLE} spec/simulator_spec.rb
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
 set_property(TEST "RSpecSimulator"
     PROPERTY ENVIRONMENT "PATH=$PATH:${CMAKE_CURRENT_BINARY_DIR}")
+ENDIF(RSPEC_EXECUTABLE)
+
 IF(VALGRIND)
 add_test(NAME "ValgrindSimulator"
-    COMMAND valgrind ${CMAKE_CURRENT_BINARY_DIR}/hscript-simulate ${CMAKE_SOURCE_DIR}/tests/fixtures/0001-basic.installfile)
+    COMMAND ${VALGRIND_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/hscript-simulate ${CMAKE_SOURCE_DIR}/tests/fixtures/0001-basic.installfile)
 ENDIF(VALGRIND)
diff --git a/tools/hscript-validate/CMakeLists.txt b/tools/hscript-validate/CMakeLists.txt
index a02d90b..f8b579a 100644
--- a/tools/hscript-validate/CMakeLists.txt
+++ b/tools/hscript-validate/CMakeLists.txt
@@ -6,12 +6,15 @@ target_link_libraries(hscript-validate hscript)
 
 install(TARGETS hscript-validate DESTINATION bin)
 
+IF(RSPEC_EXECUTABLE)
 add_test(NAME "RSpecValidator"
-    COMMAND rspec spec/validator_spec.rb
+    COMMAND ${RSPEC_EXECUTABLE} spec/validator_spec.rb
     WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
 set_property(TEST "RSpecValidator"
     PROPERTY ENVIRONMENT "PATH=$PATH:${CMAKE_CURRENT_BINARY_DIR}")
+ENDIF(RSPEC_EXECUTABLE)
+
 IF(VALGRIND)
 add_test(NAME "ValgrindValidator"
-    COMMAND valgrind ${CMAKE_CURRENT_BINARY_DIR}/hscript-validate ${CMAKE_SOURCE_DIR}/tests/fixtures/0001-basic.installfile)
+    COMMAND ${VALGRIND_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/hscript-validate ${CMAKE_SOURCE_DIR}/tests/fixtures/0001-basic.installfile)
 ENDIF(VALGRIND)
-- 
cgit v1.2.3-60-g2f50