[rubygems/rubygems] install rust extensions into expected directory nesting

https://github.com/rubygems/rubygems/commit/85ea86d348

6 files changed, 7 insertions, 6 deletions

diff --git a/test/rubygems/test_gem_ext_cargo_builder.rb b/test/rubygems/test_gem_ext_cargo_builder.rb
index 5ffe5f0b6f..df50150d50 100644
--- a/test/rubygems/test_gem_ext_cargo_builder.rb
+++ b/test/rubygems/test_gem_ext_cargo_builder.rb
@@ -32,7 +32,7 @@ class TestGemExtCargoBuilder < Gem::TestCase
     Dir.chdir @ext do
       ENV.update(@rust_envs)
       builder = Gem::Ext::CargoBuilder.new
-      builder.build nil, @dest_path, output
+      builder.build "Cargo.toml", @dest_path, output
     end
 
     output = output.join "\n"
@@ -58,7 +58,7 @@ class TestGemExtCargoBuilder < Gem::TestCase
     Dir.chdir @ext do
       ENV.update(@rust_envs)
       builder = Gem::Ext::CargoBuilder.new
-      builder.build nil, @dest_path, output
+      builder.build "Cargo.toml", @dest_path, output
     end
 
     output = output.join "\n"
@@ -83,7 +83,7 @@ class TestGemExtCargoBuilder < Gem::TestCase
       Dir.chdir @ext do
         ENV.update(@rust_envs)
         builder = Gem::Ext::CargoBuilder.new
-        builder.build nil, @dest_path, []
+        builder.build "Cargo.toml", @dest_path, []
       end
     end
 
@@ -130,7 +130,7 @@ class TestGemExtCargoBuilder < Gem::TestCase
         Open3.capture2e(*gem, "install", "--verbose", "--local", built_gem, *ARGV)
       end
 
-      stdout_and_stderr_str, status = Open3.capture2e(env_for_subprocess, *ruby_with_rubygems_in_load_path, "-rcustom_name_ext", "-e", "puts 'Result: ' + CustomName.say_hello")
+      stdout_and_stderr_str, status = Open3.capture2e(env_for_subprocess, *ruby_with_rubygems_in_load_path, "-rcustom_name", "-e", "puts 'Result: ' + CustomName.say_hello")
 
       assert status.success?, stdout_and_stderr_str
       assert_match "Result: Hello world!", stdout_and_stderr_str
diff --git a/test/rubygems/test_gem_ext_cargo_builder/custom_name/custom_name.gemspec b/test/rubygems/test_gem_ext_cargo_builder/custom_name/custom_name.gemspec
index 95332ec84f..43dddac243 100644
--- a/test/rubygems/test_gem_ext_cargo_builder/custom_name/custom_name.gemspec
+++ b/test/rubygems/test_gem_ext_cargo_builder/custom_name/custom_name.gemspec
@@ -2,7 +2,7 @@ Gem::Specification.new do |s|
   s.name          = "custom_name"
   s.version       = "0.1.0"
   s.summary       = "A Rust extension for Ruby"
-  s.extensions    = ["Cargo.toml"]
+  s.extensions    = ["ext/custom_name_lib/Cargo.toml"]
   s.authors       = ["Ian Ker-Seymer"]
-  s.files         = ["Cargo.toml", "Cargo.lock", "src/lib.rs"]
+  s.files         = ["lib/custom_name.rb", "ext/custom_name_lib/Cargo.toml", "ext/custom_name_lib/Cargo.lock", "ext/custom_name_lib/src/lib.rs"]
 end
diff --git a/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.lock b/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.lock
index 25905d8cf6..25905d8cf6 100644
--- a/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.lock
+++ b/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.lock
diff --git a/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.toml b/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.toml
index 0777be730e..0777be730e 100644
--- a/test/rubygems/test_gem_ext_cargo_builder/custom_name/Cargo.toml
+++ b/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/Cargo.toml
diff --git a/test/rubygems/test_gem_ext_cargo_builder/custom_name/src/lib.rs b/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/src/lib.rs
index 28ba3be564..28ba3be564 100644
--- a/test/rubygems/test_gem_ext_cargo_builder/custom_name/src/lib.rs
+++ b/test/rubygems/test_gem_ext_cargo_builder/custom_name/ext/custom_name_lib/src/lib.rs
diff --git a/test/rubygems/test_gem_ext_cargo_builder/custom_name/lib/custom_name.rb b/test/rubygems/test_gem_ext_cargo_builder/custom_name/lib/custom_name.rb
new file mode 100644
index 0000000000..5ae8b00a5f
--- /dev/null
+++ b/test/rubygems/test_gem_ext_cargo_builder/custom_name/lib/custom_name.rb
@@ -0,0 +1 @@
+require "custom_name_lib/custom_name_ext"