diff options
author | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-03 11:47:25 +0000 |
---|---|---|
committer | nagachika <nagachika@b2dd03c8-39d4-4d8f-98ff-823fe69b080e> | 2013-08-03 11:47:25 +0000 |
commit | 65fcd2e73881b48c587433a5fbebc6c2794c1ebd (patch) | |
tree | 61108784c440e3fdf3bf288b03710eb6b7e4f300 /test/rubygems | |
parent | 6cd7a039a0077b88f775aeece93b41d80866633d (diff) |
merge revision(s) 42322:
nmake doesn't out put targets
git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/branches/ruby_2_0_0@42353 b2dd03c8-39d4-4d8f-98ff-823fe69b080e
Diffstat (limited to 'test/rubygems')
-rw-r--r-- | test/rubygems/test_gem_ext_builder.rb | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/test/rubygems/test_gem_ext_builder.rb b/test/rubygems/test_gem_ext_builder.rb index 14a77b8db3..6e34ee7e46 100644 --- a/test/rubygems/test_gem_ext_builder.rb +++ b/test/rubygems/test_gem_ext_builder.rb @@ -50,8 +50,10 @@ install: refute_match %r%"DESTDIR=#{ENV['DESTDIR']}" install$%, results end - assert_match %r%^all: destination$%, results - assert_match %r%^install: destination$%, results + if /nmake/ !~ results + assert_match %r%^all: destination$%, results + assert_match %r%^install: destination$%, results + end end end |