summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorSeth Chisamore <schisamo@opscode.com>2013-12-05 16:41:24 -0500
committerSeth Chisamore <schisamo@opscode.com>2013-12-05 16:41:24 -0500
commitc81d678ee378ddc797be3b7d0fc29b294777d1e4 (patch)
tree77be0538e94fd96922c059bc1fd12320c201e2aa /ci
parent73d847fd4e51a46d7f79d0bc847da91988834ce5 (diff)
downloadmixlib-shellout-c81d678ee378ddc797be3b7d0fc29b294777d1e4.tar.gz
Clean up `jenkins_run_tests.bat`
This change ensures the bat file is in sync with what we have in opscode/chef.
Diffstat (limited to 'ci')
-rw-r--r--ci/jenkins_run_tests.bat15
1 files changed, 10 insertions, 5 deletions
diff --git a/ci/jenkins_run_tests.bat b/ci/jenkins_run_tests.bat
index 4d1b1d1..9483952 100644
--- a/ci/jenkins_run_tests.bat
+++ b/ci/jenkins_run_tests.bat
@@ -1,9 +1,14 @@
-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
-set RSPEC_ERRORLVL=%ERRORLEVEL%
+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%
REM Return the error level from rspec
exit /B %RSPEC_ERRORLVL%