summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorA. Wilcox <AWilcox@Wilcox-Tech.com>2019-10-19 23:45:23 -0500
committerA. Wilcox <AWilcox@Wilcox-Tech.com>2019-10-19 23:45:23 -0500
commitf4202f7fcf0484b31e36db187de8557a8eba3065 (patch)
tree6c4846938728caa602517b3cd59ca1bc64c4b05b /tools
parent037319203f1bd26431e69ef1e2b825fffb98ee80 (diff)
downloadhorizon-f4202f7fcf0484b31e36db187de8557a8eba3065.tar.gz
horizon-f4202f7fcf0484b31e36db187de8557a8eba3065.tar.bz2
horizon-f4202f7fcf0484b31e36db187de8557a8eba3065.tar.xz
horizon-f4202f7fcf0484b31e36db187de8557a8eba3065.zip
tests: Fix Valgrind running (incl. CI job) and PATH for RSpec
Diffstat (limited to 'tools')
-rw-r--r--tools/hscript-simulate/CMakeLists.txt4
-rw-r--r--tools/hscript-validate/CMakeLists.txt4
2 files changed, 4 insertions, 4 deletions
diff --git a/tools/hscript-simulate/CMakeLists.txt b/tools/hscript-simulate/CMakeLists.txt
index ee0c46c..98ec9e4 100644
--- a/tools/hscript-simulate/CMakeLists.txt
+++ b/tools/hscript-simulate/CMakeLists.txt
@@ -10,8 +10,8 @@ add_test(NAME "RSpecSimulator"
COMMAND rspec spec/simulator_spec.rb
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
set_property(TEST "RSpecSimulator"
- PROPERTY ENVIRONMENT "PATH=$PATH:${CMAKE_CURRENT_BINARY_DIR}/tools/hscript-simulate")
+ PROPERTY ENVIRONMENT "PATH=$PATH:${CMAKE_CURRENT_BINARY_DIR}")
IF(VALGRIND)
add_test(NAME "ValgrindSimulator"
- COMMAND valgrind ${CMAKE_CURRENT_BINARY_DIR}/tools/hscript-simulate/hscript-simulate tests/fixtures/0001-basic.installfile)
+ COMMAND valgrind ${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 aed5be5..a02d90b 100644
--- a/tools/hscript-validate/CMakeLists.txt
+++ b/tools/hscript-validate/CMakeLists.txt
@@ -10,8 +10,8 @@ add_test(NAME "RSpecValidator"
COMMAND rspec spec/validator_spec.rb
WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/tests)
set_property(TEST "RSpecValidator"
- PROPERTY ENVIRONMENT "PATH=$PATH:${CMAKE_CURRENT_BINARY_DIR}/tools/hscript-validate")
+ PROPERTY ENVIRONMENT "PATH=$PATH:${CMAKE_CURRENT_BINARY_DIR}")
IF(VALGRIND)
add_test(NAME "ValgrindValidator"
- COMMAND valgrind ${CMAKE_CURRENT_BINARY_DIR}/tools/hscript-validate/hscript-validate tests/fixtures/0001-basic.installfile)
+ COMMAND valgrind ${CMAKE_CURRENT_BINARY_DIR}/hscript-validate ${CMAKE_SOURCE_DIR}/tests/fixtures/0001-basic.installfile)
ENDIF(VALGRIND)