diff options
| author | Seth Chisamore <schisamo@opscode.com> | 2013-12-05 13:55:40 -0800 |
|---|---|---|
| committer | Seth Chisamore <schisamo@opscode.com> | 2013-12-05 13:55:40 -0800 |
| commit | 834cfbdb98975845a44e9a11a4b8477386cf3ec8 (patch) | |
| tree | 164bee139d3370e38d6e292145928a3bb83dd367 | |
| parent | 73d847fd4e51a46d7f79d0bc847da91988834ce5 (diff) | |
| parent | 6af6a847139900353c986a8284067fbc7aaa38f2 (diff) | |
| download | mixlib-shellout-834cfbdb98975845a44e9a11a4b8477386cf3ec8.tar.gz | |
Merge pull request #32 from opscode/fix-windows-tests
Fix windows tests
| -rw-r--r-- | Gemfile | 3 | ||||
| -rw-r--r-- | ci/jenkins_run_tests.bat | 15 |
2 files changed, 12 insertions, 6 deletions
@@ -1,4 +1,5 @@ -source :rubygems +source 'https://rubygems.org' + gemspec :name => "mixlib-shellout" group(:test) do 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% |