From e03c1e50653584b7bb4b2173e991164f41329e10 Mon Sep 17 00:00:00 2001
From: "A. Wilcox" <AWilcox@Wilcox-Tech.com>
Date: Sat, 19 Oct 2019 23:29:38 -0500
Subject: tests: Rework RSpec stuff entirely

---
 .gitlab-ci.yml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

(limited to '.gitlab-ci.yml')

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:
-- 
cgit v1.2.3-70-g09d2