diff options
-rw-r--r-- | .gitlab-ci.yml | 5 | ||||
-rw-r--r-- | tests/spec/simulator_spec.rb (renamed from tests/spec/simulator.rb) | 15 | ||||
-rw-r--r-- | tests/spec/spec_helper.rb | 13 | ||||
-rw-r--r-- | tests/spec/validator_spec.rb (renamed from tests/spec/validator.rb) | 15 | ||||
-rw-r--r-- | tools/hscript-simulate/CMakeLists.txt | 2 | ||||
-rw-r--r-- | tools/hscript-validate/CMakeLists.txt | 2 |
6 files changed, 17 insertions, 35 deletions
diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index b27d5f0..2b0e4b9 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -15,8 +15,7 @@ test: stage: test script: - cd tests - - PATH=../build/tools/hscript-validate:$PATH rspec --format RspecJunitFormatter --out rspec-validator.xml spec/validator.rb - - PATH=../build/tools/hscript-simulate:$PATH rspec --format RspecJunitFormatter --out rspec-simulator.xml spec/simulator.rb + - PATH=../build/tools/hscript-validate:../build/tools/hscript-simulate:$PATH rspec --format RspecJunitFormatter --out rspec.xml - cd .. - lcov --exclude '/usr/include/c++/*' --exclude '*/3rdparty/*' --capture --directory build --output-file coverage.info - genhtml coverage.info --output-directory cov_html @@ -26,7 +25,7 @@ test: paths: - cov_html reports: - junit: tests/rspec-*.xml + junit: tests/rspec.xml metrics: metrics.txt valgrind: diff --git a/tests/spec/simulator.rb b/tests/spec/simulator_spec.rb index 2fc3273..cc1951a 100644 --- a/tests/spec/simulator.rb +++ b/tests/spec/simulator_spec.rb @@ -1,22 +1,7 @@ -require 'aruba/rspec' - -IFILE_PATH = 'installfile' - def run_simulate(extra = '') run_command 'hscript-simulate ' + IFILE_PATH + extra end -def use_fixture(fixture) - copy '%/' + fixture, IFILE_PATH -end - -Aruba.configure do |config| - config.fixtures_directory = "fixtures" if respond_to? :fixtures_directory= - config.fixtures_directories = %w(fixtures) if respond_to? :fixtures_directories= - config.keep_ansi = true if respond_to? :keep_ansi= - config.remove_ansi_escape_sequences = false if respond_to? :remove_ansi_escape_sequences= -end - RSpec.describe 'HorizonScript Simulator', :type => :aruba do context "argument passing" do it "requires an installfile to be specified" do diff --git a/tests/spec/spec_helper.rb b/tests/spec/spec_helper.rb index 886ed85..bc2a7b3 100644 --- a/tests/spec/spec_helper.rb +++ b/tests/spec/spec_helper.rb @@ -1,3 +1,5 @@ +require 'aruba/rspec' + # See http://rubydoc.info/gems/rspec-core/RSpec/Core/Configuration RSpec.configure do |config| config.expect_with :rspec do |expectations| @@ -50,3 +52,14 @@ RSpec.configure do |config| # as the one that triggered the failure. Kernel.srand config.seed end + +Aruba.configure do |config| + config.fixtures_directories = %w(fixtures) + config.remove_ansi_escape_sequences = false if respond_to? :remove_ansi_escape_sequences= +end + +IFILE_PATH = 'installfile' + +def use_fixture(fixture) + copy '%/' + fixture, IFILE_PATH +end diff --git a/tests/spec/validator.rb b/tests/spec/validator_spec.rb index de43cbb..36af73a 100644 --- a/tests/spec/validator.rb +++ b/tests/spec/validator_spec.rb @@ -1,22 +1,7 @@ -require 'aruba/rspec' - -IFILE_PATH = 'installfile' - def run_validate(extra = '') run_command 'hscript-validate ' + IFILE_PATH + extra end -def use_fixture(fixture) - copy '%/' + fixture, IFILE_PATH -end - -Aruba.configure do |config| - config.fixtures_directory = "fixtures" if respond_to? :fixtures_directory= - config.fixtures_directories = %w(fixtures) if respond_to? :fixtures_directories= - config.keep_ansi = true if respond_to? :keep_ansi= - config.remove_ansi_escape_sequences = false if respond_to? :remove_ansi_escape_sequences= -end - PARSER_SUCCESS = /parser: 0 error\(s\), 0 warning\(s\)/ VALIDATOR_SUCCESS = /validator: 0 failure\(s\)/ diff --git a/tools/hscript-simulate/CMakeLists.txt b/tools/hscript-simulate/CMakeLists.txt index 439563b..ee0c46c 100644 --- a/tools/hscript-simulate/CMakeLists.txt +++ b/tools/hscript-simulate/CMakeLists.txt @@ -7,7 +7,7 @@ target_link_libraries(hscript-simulate hscript) install(TARGETS hscript-simulate DESTINATION bin) add_test(NAME "RSpecSimulator" - COMMAND rspec spec/simulator.rb + 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") diff --git a/tools/hscript-validate/CMakeLists.txt b/tools/hscript-validate/CMakeLists.txt index 07fec53..aed5be5 100644 --- a/tools/hscript-validate/CMakeLists.txt +++ b/tools/hscript-validate/CMakeLists.txt @@ -7,7 +7,7 @@ target_link_libraries(hscript-validate hscript) install(TARGETS hscript-validate DESTINATION bin) add_test(NAME "RSpecValidator" - COMMAND rspec spec/validator.rb + 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") |