From 968d29d2e9b6fc5dc3fcba6eb134a2202204237a Mon Sep 17 00:00:00 2001
From: Seth Chisamore <schisamo@opscode.com>
Date: Thu, 5 Dec 2013 16:32:53 -0500
Subject: Clean up `jenkins_run_tests.bat`

This change ensures the bat file is in sync with what we have in
opscode/chef.
---
 ci/jenkins_run_tests.bat | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

(limited to 'ci')

diff --git a/ci/jenkins_run_tests.bat b/ci/jenkins_run_tests.bat
index 4d1b1d14..d87e1e72 100644
--- a/ci/jenkins_run_tests.bat
+++ b/ci/jenkins_run_tests.bat
@@ -1,9 +1,16 @@
-set PATH=C:\Ruby192\bin;%PATH%
-
 ruby -v
-call bundle install --binstubs --without docgen --path vendor/bundle || ( call rm Gemfile.lock && call bundle install --binstubs --path vendor/bundle )
-ruby bin\rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f documentation spec/functional spec/unit spec/stress
+
+call bundle check
+
+if %ERRORLEVEL% NEQ 0 (
+   call rm Gemfile.lock
+   call bundle install --without docgen --path vendor/bundle
+)
+
+bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o test.xml -f documentation spec
+
 set RSPEC_ERRORLVL=%ERRORLEVEL%
 
+set RSPEC_ERRORLVL=%ERRORLEVEL%
 REM Return the error level from rspec
 exit /B %RSPEC_ERRORLVL%
-- 
cgit v1.2.1