diff options
| author | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-21 11:18:31 +0000 |
|---|---|---|
| committer | nobu <nobu@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-03-21 11:18:31 +0000 |
| commit | 61cefc13595ac89d7686df343823adb1bbc798c3 (patch) | |
| tree | 847974b72de16af26ec51d09a9d6342578f7dc26 | |
| parent | 0f327839763d5cc64d52b1e9fc432c8dfee5ddac (diff) | |
suppress msys2 pathname conversion
* common.mk (TEST_EXCLUDES, EXCLUDE_TESTFRAMEWORK): use full spell
long option.
* cygwin/GNUmakefile.in (MSYS2_ARG_CONV_EXCL): suppress path name
conversions by msys2. [ruby-dev:49525] [Bug #12199]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@54211 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
| -rw-r--r-- | ChangeLog | 8 | ||||
| -rw-r--r-- | common.mk | 4 | ||||
| -rw-r--r-- | cygwin/GNUmakefile.in | 7 |
3 files changed, 17 insertions, 2 deletions
@@ -1,3 +1,11 @@ +Mon Mar 21 20:18:29 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> + + * common.mk (TEST_EXCLUDES, EXCLUDE_TESTFRAMEWORK): use full spell + long option. + + * cygwin/GNUmakefile.in (MSYS2_ARG_CONV_EXCL): suppress path name + conversions by msys2. [ruby-dev:49525] [Bug #12199] + Mon Mar 21 19:09:31 2016 Nobuyoshi Nakada <nobu@ruby-lang.org> * string.c (enc_succ_alnum_char): try to skip an invalid character @@ -154,8 +154,8 @@ PRE_LIBRUBY_UPDATE = $(MINIRUBY) -e 'ARGV[1] or File.unlink(ARGV[0]) rescue nil' $(LIBRUBY_EXTS) $(LIBRUBY_SO_UPDATE) TESTSDIR = $(srcdir)/test -TEST_EXCLUDES = --excludes=$(TESTSDIR)/excludes --name=!/memory_leak/ -EXCLUDE_TESTFRAMEWORK = -x /testunit/ -x /minitest/ +TEST_EXCLUDES = --excludes-dir=$(TESTSDIR)/excludes --name=!/memory_leak/ +EXCLUDE_TESTFRAMEWORK = --exclude=/testunit/ --exclude=/minitest/ TESTWORKDIR = testwork TESTOPTS = $(RUBY_TESTOPTS) diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index d02b476c6d..678ff803ab 100644 --- a/cygwin/GNUmakefile.in +++ b/cygwin/GNUmakefile.in @@ -88,6 +88,13 @@ $(OBJS) $(MAINOBJ): win32.h dir.$(OBJEXT) win32/win32.$(OBJEXT): win32/dir.h file.$(OBJEXT) win32/win32.$(OBJEXT): win32/file.h + +MSYS2_ARG_CONV_EXCL=--exclude=;--excludes-dir=;--name= + +yes-test-ruby: export MSYS2_ARG_CONV_EXCL="$MSYS2_ARG_CONV_EXCL" +yes-test-all: export MSYS2_ARG_CONV_EXCL="$MSYS2_ARG_CONV_EXCL" +yes-test-almost: export MSYS2_ARG_CONV_EXCL="$MSYS2_ARG_CONV_EXCL" + endif $(LIBRUBY_SO): $(RUBYDEF) |