Skip to content

Commit 547423a

Browse files
committed
TestProcess: --disable-gems to disable rubygems_integration
rubygems-integration might fail during build when the installed rubygems-integration is not the latest one. Some tests in TestProcess removes $DEBIAN_DISABLE_RUBYGEMS_INTEGRATION so rubygems-integration lets such test fail. Gbp-Pq: Name TestProcess-disable-gems-to-disable-rubygems_integration.patch
1 parent adfb2cc commit 547423a

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

test/ruby/test_process.rb

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -292,7 +292,7 @@ def test_overwrite_ENV
292292
end
293293
PREENVARG = ['-e', "%w[#{MANDATORY_ENVS.join(' ')}].each{|e|ENV.delete(e)}"]
294294
ENVARG = ['-e', 'ENV.each {|k,v| puts "#{k}=#{v}" }']
295-
ENVCOMMAND = [RUBY].concat(PREENVARG).concat(ENVARG)
295+
ENVCOMMAND = [RUBY, '--disable-gems'].concat(PREENVARG).concat(ENVARG)
296296

297297
def test_execopts_env
298298
assert_raise(ArgumentError) {
@@ -311,7 +311,7 @@ def test_execopts_env
311311
assert_equal(prog, e.message.sub(/.* - /, ''))
312312
}
313313
h = {}
314-
cmd = [h, RUBY]
314+
cmd = [h, RUBY, '--disable-gems']
315315
(ENV.keys + MANDATORY_ENVS).each do |k|
316316
case k
317317
when /\APATH\z/i
@@ -404,7 +404,7 @@ def test_execopts_env_popen_string
404404
with_tmpchdir do |d|
405405
File.open('test-script', 'w') do |f|
406406
ENVCOMMAND.each_with_index do |cmd, i|
407-
next if i.zero? or cmd == "-e"
407+
next if i.zero? or cmd == "-e" or cmd == "--disable-gems"
408408
f.puts cmd
409409
end
410410
end

0 commit comments

Comments
 (0)