diff options
| author | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-18 04:57:25 +0000 |
|---|---|---|
| committer | naruse <naruse@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2016-04-18 04:57:25 +0000 |
| commit | ffcad81c191fdebce7fbafc56907464537273c75 (patch) | |
| tree | 618a69c191dcbcc5d412c17579f55300044470c6 /cygwin | |
| parent | b118f5d82f9d23f388ff951dd0574bb18d7cf18a (diff) | |
merge revision(s) 54086,54211,54233: [Backport #12199]
* test/lib/test/unit.rb (Options#non_options): make regexp name
options prefixed with "!" negative filters.
* common.mk (TEST_EXCLUDES): use negative filter to exclude memory
leak tests. -x option excludes test files, not test methods.
* 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]
* cygwin/GNUmakefile.in (MSYS2_ARG_CONV_EXCL_PARAM):
* add missing parentheses and remove double quotes.
* rename to get rid of recursive references.
* as --excludes-dir option is for a path name, its argument
should be converted.
[ruby-dev:49526] [Bug #12199]
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_3@54627 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'cygwin')
| -rw-r--r-- | cygwin/GNUmakefile.in | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/cygwin/GNUmakefile.in b/cygwin/GNUmakefile.in index 14ffd1db85..edf02242ee 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_PARAM = --exclude=;--name= + +yes-test-ruby: export MSYS2_ARG_CONV_EXCL=$(MSYS2_ARG_CONV_EXCL_PARAM) +yes-test-all: export MSYS2_ARG_CONV_EXCL=$(MSYS2_ARG_CONV_EXCL_PARAM) +yes-test-almost: export MSYS2_ARG_CONV_EXCL=$(MSYS2_ARG_CONV_EXCL_PARAM) + endif $(LIBRUBY_SO): $(RUBYDEF) |