From c9b3950d30336bf437bdd8903884fffff3c00316 Mon Sep 17 00:00:00 2001 From: nobu Date: Mon, 5 Jan 2015 15:14:54 +0000 Subject: [PATCH] ext/-test-/dln/empty: move from ext/-test-/win32/dln git-svn-id: svn+ssh://ci.ruby-lang.org/ruby/trunk@49154 b2dd03c8-39d4-4d8f-98ff-823fe69b080e --- ext/-test-/{win32 => }/dln/empty/empty.c | 0 ext/-test-/dln/empty/extconf.rb | 1 + ext/-test-/win32/dln/empty/extconf.rb | 3 --- test/-ext-/win32/test_dln.rb | 2 +- 4 files changed, 2 insertions(+), 4 deletions(-) rename ext/-test-/{win32 => }/dln/empty/empty.c (100%) create mode 100644 ext/-test-/dln/empty/extconf.rb delete mode 100644 ext/-test-/win32/dln/empty/extconf.rb diff --git a/ext/-test-/win32/dln/empty/empty.c b/ext/-test-/dln/empty/empty.c similarity index 100% rename from ext/-test-/win32/dln/empty/empty.c rename to ext/-test-/dln/empty/empty.c diff --git a/ext/-test-/dln/empty/extconf.rb b/ext/-test-/dln/empty/extconf.rb new file mode 100644 index 0000000000..6110887b3d --- /dev/null +++ b/ext/-test-/dln/empty/extconf.rb @@ -0,0 +1 @@ +create_makefile("-test-/dln/empty") diff --git a/ext/-test-/win32/dln/empty/extconf.rb b/ext/-test-/win32/dln/empty/extconf.rb deleted file mode 100644 index a4efed90c9..0000000000 --- a/ext/-test-/win32/dln/empty/extconf.rb +++ /dev/null @@ -1,3 +0,0 @@ -if $mingw or $mswin - create_makefile("-test-/win32/dln/empty") -end diff --git a/test/-ext-/win32/test_dln.rb b/test/-ext-/win32/test_dln.rb index 2801ebe3c9..fe289d150f 100644 --- a/test/-ext-/win32/test_dln.rb +++ b/test/-ext-/win32/test_dln.rb @@ -12,7 +12,7 @@ module Bug def test_nonascii_load bug9699 = '[ruby-core:61845] [Bug #9699]' - so = "-test-/win32/dln/empty." + RbConfig::CONFIG["DLEXT"] + so = "-test-/dln/empty." + RbConfig::CONFIG["DLEXT"] so = $:.find {|d| d = ::File.join(d, so); break d if ::File.exist?(d)} assert_not_nil(so) Dir.mkdir(dir = ::File.join(testdir = Dir.mktmpdir("test"), "\u{30c6 30b9 30c8}"))