1 files changed, 70 insertions, 0 deletions
diff --git a/bootstraptest/test_autoload.rb b/bootstraptest/test_autoload.rb
new file mode 100644
index 0000000000..de66f1f3ee
--- /dev/null
+++ b/bootstraptest/test_autoload.rb
@@ -0,0 +1,70 @@
+assert_equal 'ok', %q{
+  File.unlink('zzz1.rb') if File.file?('zzz1.rb')
+  instance_eval do
+    autoload :ZZZ, './zzz1.rb'
+    begin
+      ZZZ
+    rescue LoadError
+      :ok
+    end
+  end
+}, '[ruby-dev:43816]'
+
+assert_equal 'ok', %q{
+  File.write('zzz2.rb', '')
+  instance_eval do
+    autoload :ZZZ, './zzz2.rb'
+    begin
+      ZZZ
+    rescue NameError
+      :ok
+    end
+  end
+}, '[ruby-dev:43816]'
+
+assert_equal 'ok', %q{
+  File.write('zzz3.rb', "class ZZZ; def self.ok;:ok;end;end\n")
+  instance_eval do
+    autoload :ZZZ, './zzz3.rb'
+    ZZZ.ok
+  end
+}, '[ruby-dev:43816]'
+
+assert_equal 'ok', %q{
+  File.write("zzz4.rb", "class ZZZ; def self.ok;:ok;end;end\n")
+  autoload :ZZZ, "./zzz4.rb"
+  ZZZ.ok
+}
+
+assert_equal 'ok', %q{
+  File.write("zzz5.rb", "class ZZZ; def self.ok;:ok;end;end\n")
+  autoload :ZZZ, "./zzz5.rb"
+  require "./zzz5.rb"
+  ZZZ.ok
+}
+
+assert_equal 'okok', %q{
+  File.write("zzz6.rb", "class ZZZ; def self.ok;:ok;end;end\n")
+  autoload :ZZZ, "./zzz6.rb"
+  t1 = Thread.new {ZZZ.ok}
+  t2 = Thread.new {ZZZ.ok}
+  [t1.value, t2.value].join
+}
+
+assert_finish 5, %q{
+  autoload :ZZZ, File.expand_path(__FILE__)
+  begin
+    ZZZ
+  rescue NameError
+  end
+}, '[ruby-core:21696]'
+
+assert_equal 'A::C', %q{
+  File.write("zzz7.rb", "")
+  class A
+    autoload :C, "./zzz7"
+    class C
+    end
+    C
+  end
+}