Merge pull request chef#236 from opscode/fix-windows-tests

Clean up `jenkins_run_tests.bat`
prein · Dec 5, 2013 · 94302c3 · 94302c3
2 parents 0f40633 + 968d29d
commit 94302c3
Showing 1 changed file with 11 additions and 4 deletions.
diff --git 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%