mirror of
https://github.com/ruby/ruby.git
synced 2022-11-09 12:17:21 -05:00
configure.ac: disable native-fiber for MinGW
because it had already been SEGV-ed in pull request'S CI https://ci.appveyor.com/project/ruby/ruby/builds/20427065/job/32oahrcd58b8ubb1 and has never worked on trunk either. Please make sure it does not SEGVs on your MinGW environment or pull request before enabling native fiber on MinGW. appveyor.yml: reverted commits to make CI green with native fiber test/excludes/_appveyor/msys2/TestArray.rb: ditto test/excludes/_appveyor/msys2/TestEnumerable.rb: ditto test/excludes/_appveyor/vs/TestArray.rb: ditto git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@65892 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
This commit is contained in:
parent
52007caea0
commit
c6d0892fa2
5 changed files with 11 additions and 17 deletions
|
@ -93,9 +93,9 @@ for:
|
|||
- set /a JOBS=%NUMBER_OF_PROCESSORS%
|
||||
- nmake -l "TESTOPTS=-v -q" btest
|
||||
- nmake -l "TESTOPTS=-v -q" test-basic
|
||||
- nmake -l "TESTOPTS=-q --subprocess-timeout-scale=3.0 --excludes=../test/excludes/_appveyor/vs -j%JOBS% --exclude win32ole --exclude test_bignum --exclude test_syntax --exclude test_open-uri --exclude test_bundled_ca" test-all
|
||||
- nmake -l "TESTOPTS=-q --subprocess-timeout-scale=3.0 --excludes=../test/excludes/_appveyor -j%JOBS% --exclude win32ole --exclude test_bignum --exclude test_syntax --exclude test_open-uri --exclude test_bundled_ca" test-all
|
||||
# separately execute tests without -j which may crash worker with -j.
|
||||
- nmake -l "TESTOPTS=-v --subprocess-timeout-scale=3.0 --excludes=../test/excludes/_appveyor/vs" test-all TESTS="../test/win32ole ../test/ruby/test_bignum.rb ../test/ruby/test_syntax.rb ../test/open-uri/test_open-uri.rb ../test/rubygems/test_bundled_ca.rb"
|
||||
- nmake -l "TESTOPTS=-v --subprocess-timeout-scale=3.0 --excludes=../test/excludes/_appveyor" test-all TESTS="../test/win32ole ../test/ruby/test_bignum.rb ../test/ruby/test_syntax.rb ../test/open-uri/test_open-uri.rb ../test/rubygems/test_bundled_ca.rb"
|
||||
- nmake -l test-spec MSPECOPT=-fs # not using `-j` because sometimes `mspec -j` silently dies on Windows
|
||||
-
|
||||
matrix:
|
||||
|
@ -136,7 +136,7 @@ for:
|
|||
- mingw32-make DESTDIR=../install install-nodoc
|
||||
test_script:
|
||||
- mingw32-make test
|
||||
- mingw32-make test-all TESTOPTS="--retry --job-status=normal --show-skip --subprocess-timeout-scale=1.5 --excludes=../ruby/test/excludes/_appveyor/msys2 -j %JOBS% --exclude test_enumerator --exclude win32ole --exclude test_open-uri"
|
||||
- mingw32-make test-all TESTOPTS="--retry --job-status=normal --show-skip --subprocess-timeout-scale=1.5 --excludes=../ruby/test/excludes/_appveyor -j %JOBS% --exclude win32ole --exclude test_open-uri"
|
||||
# separately execute tests without -j which may crash worker with -j.
|
||||
- mingw32-make test-all TESTOPTS="--retry --job-status=normal --show-skip --subprocess-timeout-scale=1.5 --excludes=../ruby/test/excludes/_appveyor/msys2" TESTS="../ruby/test/ruby/test_enumerator.rb ../ruby/test/win32ole ../ruby/test/open-uri/test_open-uri.rb"
|
||||
- mingw32-make test-all TESTOPTS="--retry --job-status=normal --show-skip --subprocess-timeout-scale=1.5 --excludes=../ruby/test/excludes/_appveyor" TESTS="../ruby/test/win32ole ../ruby/test/open-uri/test_open-uri.rb"
|
||||
- mingw32-make test-spec MSPECOPT=-fs # not using `-j` because sometimes `mspec -j` silently dies on Windows
|
||||
|
|
13
configure.ac
13
configure.ac
|
@ -2345,12 +2345,13 @@ AS_CASE(["$target_cpu-$target_os"],
|
|||
AC_DEFINE_UNQUOTED(FIBER_USE_COROUTINE, ["$COROUTINE_H"])
|
||||
AC_LIBOBJ([coroutine/x86/Context])
|
||||
],
|
||||
[x64-mingw32], [
|
||||
AC_MSG_RESULT(win64)
|
||||
COROUTINE_H=coroutine/win64/Context.h
|
||||
AC_DEFINE_UNQUOTED(FIBER_USE_COROUTINE, ["$COROUTINE_H"])
|
||||
AC_LIBOBJ([coroutine/win64/Context])
|
||||
],
|
||||
# TODO: Enable this after AppVeyor msys2 build succeeds
|
||||
# [x64-mingw32], [
|
||||
# AC_MSG_RESULT(win64)
|
||||
# COROUTINE_H=coroutine/win64/Context.h
|
||||
# AC_DEFINE_UNQUOTED(FIBER_USE_COROUTINE, ["$COROUTINE_H"])
|
||||
# AC_LIBOBJ([coroutine/win64/Context])
|
||||
# ],
|
||||
[*], [
|
||||
AC_MSG_RESULT(no)
|
||||
]
|
||||
|
|
|
@ -1,2 +0,0 @@
|
|||
# https://ci.appveyor.com/project/ruby/ruby/builds/20431217/job/97no5h1gqv50k1vf
|
||||
exclude(/^test_/, 'This has been broken after native-fiber')
|
|
@ -1,5 +0,0 @@
|
|||
# https://ci.appveyor.com/project/ruby/ruby/builds/20339189/job/ltdpffep976xtj85
|
||||
# `test_push_over_ary_max': failed to allocate memory (NoMemoryError)
|
||||
exclude(:test_push_over_ary_max, 'Sometimes AppVeyor has insufficient memory to run this test')
|
||||
# https://ci.appveyor.com/project/ruby/ruby/builds/20427662/job/prq9i2lkfxv2j0uy
|
||||
exclude(:test_splice_over_ary_max, 'Sometimes AppVeyor has insufficient memory to run this test')
|
Loading…
Reference in a new issue