summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--test/rubygems/test_gem_commands_install_command.rb6
-rw-r--r--test/rubygems/test_gem_commands_update_command.rb6
2 files changed, 10 insertions, 2 deletions
diff --git a/test/rubygems/test_gem_commands_install_command.rb b/test/rubygems/test_gem_commands_install_command.rb
index 4fb7a04fb1..72ca9d8262 100644
--- a/test/rubygems/test_gem_commands_install_command.rb
+++ b/test/rubygems/test_gem_commands_install_command.rb
@@ -1609,7 +1609,11 @@ ERROR: Possible alternatives: non_existent_with_hint
end
gem_make_out = File.read(File.join(gemspec.extension_dir, "gem_make.out"))
- assert_includes(gem_make_out, "make -j4")
+ if vc_windows? && nmake_found?
+ refute_includes(gem_make_out, "-j4")
+ else
+ assert_includes(gem_make_out, "make -j4")
+ end
end
def test_execute_bindir_with_nonexistent_parent_dirs
diff --git a/test/rubygems/test_gem_commands_update_command.rb b/test/rubygems/test_gem_commands_update_command.rb
index 9051640c0b..3bb4a72c41 100644
--- a/test/rubygems/test_gem_commands_update_command.rb
+++ b/test/rubygems/test_gem_commands_update_command.rb
@@ -721,7 +721,11 @@ class TestGemCommandsUpdateCommand < Gem::TestCase
end
gem_make_out = File.read(File.join(gemspec.extension_dir, "gem_make.out"))
- assert_includes(gem_make_out, "make -j2")
+ if vc_windows? && nmake_found?
+ refute_includes(gem_make_out, "-j2")
+ else
+ assert_includes(gem_make_out, "make -j2")
+ end
end
def test_handle_options_system