summaryrefslogtreecommitdiff
path: root/ci
diff options
context:
space:
mode:
authorsersut <serdar@opscode.com>2013-10-21 21:45:02 -0700
committersersut <serdar@opscode.com>2013-10-31 15:13:38 -0700
commit6767d88d9dbba41da91afef8d102dfec7ac36fdf (patch)
tree6da5cf3cde1633b71551767ed41486f312ebf890 /ci
parentce4cb2562af999347e26fa290d2d1ddf8deafd92 (diff)
downloadchef-6767d88d9dbba41da91afef8d102dfec7ac36fdf.tar.gz
Enable integration tests.
Use bundle exec to run rspec. Launch chef-client with ruby so that it launches correctly on windows.
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 4d1b1d1477..ba9cedd5e2 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/functional spec/unit spec/stress spec/integration
+
+set RSPEC_ERRORLVL=%ERRORLEVEL%
REM Return the error level from rspec
exit /B %RSPEC_ERRORLVL%