Permalink
Browse files

Clean up `jenkins_run_tests.bat`

This change ensures the bat file is in sync with what we have in
opscode/chef.
Conflicts:
	ci/jenkins_run_tests.bat
  • Loading branch information...
1 parent a8237fb commit f6ee8d5bc79b9cab15d618158a0c301a54d3f5c2 @schisamo schisamo committed Dec 5, 2013
Showing with 11 additions and 4 deletions.
  1. +11 −4 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/unit
+
+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%

0 comments on commit f6ee8d5

Please sign in to comment.