summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authork0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-20 14:40:55 +0000
committerk0kubun <k0kubun@b2dd03c8-39d4-4d8f-98ff-823fe69b080e>2018-11-20 14:40:55 +0000
commitc6d0892fa2296586d4ab614cd8c4748dfaba7d64 (patch)
tree89450015d0485af0ecfe456cb7ec2be236ac5198
parent52007caea0c8a568cb598c92647e133bd3b02fd2 (diff)
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
-rw-r--r--appveyor.yml8
-rw-r--r--configure.ac13
-rw-r--r--test/excludes/_appveyor/TestArray.rb (renamed from test/excludes/_appveyor/msys2/TestArray.rb)0
-rw-r--r--test/excludes/_appveyor/msys2/TestEnumerable.rb2
-rw-r--r--test/excludes/_appveyor/vs/TestArray.rb5
5 files changed, 11 insertions, 17 deletions
diff --git a/appveyor.yml b/appveyor.yml
index ab9b267b3db..542699ce0d9 100644
--- a/appveyor.yml
+++ b/appveyor.yml
@@ -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
diff --git a/configure.ac b/configure.ac
index dcbaf0d623d..5a221f6bf7d 100644
--- a/configure.ac
+++ b/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)
]
diff --git a/test/excludes/_appveyor/msys2/TestArray.rb b/test/excludes/_appveyor/TestArray.rb
index 4917b54ba76..4917b54ba76 100644
--- a/test/excludes/_appveyor/msys2/TestArray.rb
+++ b/test/excludes/_appveyor/TestArray.rb
diff --git a/test/excludes/_appveyor/msys2/TestEnumerable.rb b/test/excludes/_appveyor/msys2/TestEnumerable.rb
deleted file mode 100644
index 2d69b3ff554..00000000000
--- a/test/excludes/_appveyor/msys2/TestEnumerable.rb
+++ /dev/null
@@ -1,2 +0,0 @@
-# https://ci.appveyor.com/project/ruby/ruby/builds/20431217/job/97no5h1gqv50k1vf
-exclude(/^test_/, 'This has been broken after native-fiber')
diff --git a/test/excludes/_appveyor/vs/TestArray.rb b/test/excludes/_appveyor/vs/TestArray.rb
deleted file mode 100644
index 4917b54ba76..00000000000
--- a/test/excludes/_appveyor/vs/TestArray.rb
+++ /dev/null
@@ -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')