ruby-changes:42137
From: nobu <ko1@a...>
Date: Mon, 21 Mar 2016 20:18:35 +0900 (JST)
Subject: [ruby-changes:42137] nobu:r54211 (trunk): suppress msys2 pathname conversion
nobu 2016-03-21 20:18:31 +0900 (Mon, 21 Mar 2016) New Revision: 54211 https://svn.ruby-lang.org/cgi-bin/viewvc.cgi?view=revision&revision=54211 Log: 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] Modified files: trunk/ChangeLog trunk/common.mk trunk/cygwin/GNUmakefile.in Index: ChangeLog =================================================================== --- ChangeLog (revision 54210) +++ ChangeLog (revision 54211) @@ -1,3 +1,11 @@ https://github.com/ruby/ruby/blob/trunk/ChangeLog#L1 +Mon Mar 21 20:18:29 2016 Nobuyoshi Nakada <nobu@r...> + + * 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@r...> * string.c (enc_succ_alnum_char): try to skip an invalid character Index: common.mk =================================================================== --- common.mk (revision 54210) +++ common.mk (revision 54211) @@ -154,8 +154,8 @@ PRE_LIBRUBY_UPDATE = $(MINIRUBY) -e 'ARG https://github.com/ruby/ruby/blob/trunk/common.mk#L154 $(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) Index: cygwin/GNUmakefile.in =================================================================== --- cygwin/GNUmakefile.in (revision 54210) +++ cygwin/GNUmakefile.in (revision 54211) @@ -88,6 +88,13 @@ $(OBJS) $(MAINOBJ): win32.h https://github.com/ruby/ruby/blob/trunk/cygwin/GNUmakefile.in#L88 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) -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/