diff options
| author | Lamont Granquist <lamont@scriptkiddie.org> | 2016-03-18 12:49:51 -0700 |
|---|---|---|
| committer | Lamont Granquist <lamont@scriptkiddie.org> | 2016-03-18 12:49:51 -0700 |
| commit | ec2d10cb64c7af7ae9040694f1515a485bb38f7d (patch) | |
| tree | 35e45c91234c6683a3897133bb3af2c8c1b61545 | |
| parent | f71e7f9d421927428e08f64852bceb1c5b1eb52e (diff) | |
| parent | e4aec32e8935dd168ced6d6f1b797c7365580b70 (diff) | |
| download | chef-ec2d10cb64c7af7ae9040694f1515a485bb38f7d.tar.gz | |
Merge pull request #4721 from chef/lcg/force-ffi-windows
set FORCE_FFI_YAJL on windows spec tests
| -rwxr-xr-x | ci/verify-chef.bat | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/ci/verify-chef.bat b/ci/verify-chef.bat index 1f839c91a6..1f8be56ef1 100755 --- a/ci/verify-chef.bat +++ b/ci/verify-chef.bat @@ -55,6 +55,10 @@ IF NOT EXIST "Gemfile.lock" ( ) IF "%PIPELINE_NAME%" == "chef-fips" ( - set CHEF_FIPS=1 + set CHEF_FIPS=1 ) + +REM ; ffi-yajl must run in c-extension mode for perf, so force it so we don't accidentally fall back to ffi +set FORCE_FFI_YAJL=ext + call bundle exec rspec -r rspec_junit_formatter -f RspecJunitFormatter -o %WORKSPACE%\test.xml -f documentation spec/functional |