Skip to content

Commit 5b0fefe

Browse files
hsbtmatzbot
authored andcommitted
[ruby/rubygems] Added assertion for Windows and nmake
ruby/rubygems@be5c4e27d9
1 parent e4797e9 commit 5b0fefe

File tree

2 files changed

+10
-2
lines changed

2 files changed

+10
-2
lines changed

test/rubygems/test_gem_commands_install_command.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1609,7 +1609,11 @@ def test_pass_down_the_job_option_to_make
16091609
end
16101610

16111611
gem_make_out = File.read(File.join(gemspec.extension_dir, "gem_make.out"))
1612-
assert_includes(gem_make_out, "make -j4")
1612+
if vc_windows? && nmake_found?
1613+
refute_includes(gem_make_out, "-j4")
1614+
else
1615+
assert_includes(gem_make_out, "make -j4")
1616+
end
16131617
end
16141618

16151619
def test_execute_bindir_with_nonexistent_parent_dirs

test/rubygems/test_gem_commands_update_command.rb

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -721,7 +721,11 @@ def test_pass_down_the_job_option_to_make
721721
end
722722

723723
gem_make_out = File.read(File.join(gemspec.extension_dir, "gem_make.out"))
724-
assert_includes(gem_make_out, "make -j2")
724+
if vc_windows? && nmake_found?
725+
refute_includes(gem_make_out, "-j2")
726+
else
727+
assert_includes(gem_make_out, "make -j2")
728+
end
725729
end
726730

727731
def test_handle_options_system

0 commit comments

Comments
 (0)