Skip to content

Commit 9873f8a

Browse files
utkarsh2102sorah
authored andcommitted
Add patch to fix some autopkgtests
1 parent a1b54ac commit 9873f8a

File tree

2 files changed

+55
-0
lines changed

2 files changed

+55
-0
lines changed
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
From c48006c7b8dee9547b433ebd79d78cdc29002ab3 Mon Sep 17 00:00:00 2001
2+
From: =?UTF-8?q?David=20Rodr=C3=ADguez?= <[email protected]>
3+
Date: Tue, 6 Oct 2020 19:11:05 +0200
4+
Subject: [PATCH] Make lib/ and test/ more independent from each other
5+
6+
---
7+
lib/rubygems/test_case.rb | 2 --
8+
test/rubygems/test_gem_commands_build_command.rb | 2 +-
9+
test/rubygems/test_gem_stub_specification.rb | 8 ++++----
10+
3 files changed, 5 insertions(+), 7 deletions(-)
11+
12+
--- a/lib/rubygems/test_case.rb
13+
+++ b/lib/rubygems/test_case.rb
14+
@@ -96,8 +96,6 @@
15+
16+
TEST_PATH = ENV.fetch('RUBYGEMS_TEST_PATH', File.expand_path('../../../test/rubygems', __FILE__))
17+
18+
- SPECIFICATIONS = File.expand_path(File.join(TEST_PATH, "specifications"), __FILE__)
19+
-
20+
def assert_activate(expected, *specs)
21+
specs.each do |spec|
22+
case spec
23+
--- a/test/rubygems/test_gem_commands_build_command.rb
24+
+++ b/test/rubygems/test_gem_commands_build_command.rb
25+
@@ -123,7 +123,7 @@
26+
end
27+
28+
def test_execute_rubyforge_project_warning
29+
- rubyforge_gemspec = File.join SPECIFICATIONS, "rubyforge-0.0.1.gemspec"
30+
+ rubyforge_gemspec = File.expand_path File.join("specifications", "rubyforge-0.0.1.gemspec"), __dir__
31+
32+
@cmd.options[:args] = [rubyforge_gemspec]
33+
34+
--- a/test/rubygems/test_gem_stub_specification.rb
35+
+++ b/test/rubygems/test_gem_stub_specification.rb
36+
@@ -4,14 +4,14 @@
37+
38+
class TestStubSpecification < Gem::TestCase
39+
40+
- FOO = File.join SPECIFICATIONS, "foo-0.0.1-x86-mswin32.gemspec"
41+
- BAR = File.join SPECIFICATIONS, "bar-0.0.2.gemspec"
42+
+ FOO = File.expand_path File.join("specifications", "foo-0.0.1-x86-mswin32.gemspec"), __dir__
43+
+ BAR = File.expand_path File.join("specifications", "bar-0.0.2.gemspec"), __dir__
44+
45+
def setup
46+
super
47+
48+
- @base_dir = File.dirname(SPECIFICATIONS)
49+
- @gems_dir = File.join File.dirname(SPECIFICATIONS), 'gem'
50+
+ @base_dir = __dir__
51+
+ @gems_dir = File.join __dir__, 'gem'
52+
@foo = Gem::StubSpecification.gemspec_stub FOO, @base_dir, @gems_dir
53+
end
54+

debian/patches/series

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,3 +6,4 @@
66
0006-Fix-priority-order-of-paths-in-I-option.patch
77
0007-Fix-FTBFS-on-x32-misdetected-as-i386-or-amd64.patch
88
0010-Fix-IRBTestIRBHistory-tests.patch
9+
0012-Dont-use-relative-path.patch

0 commit comments

Comments
 (0)