[GR-18163] Fix mkmf check_sizeof and run CRuby mkmf tests

PullRequest: truffleruby/2471

Author: eregon

lib/mri/mkmf.rb

@@ -2308,7 +2308,7 @@ def depend_rules(depend)
   def create_makefile(target, srcprefix = nil)
     if defined?(::TruffleRuby) and $LIBRUBYARG.to_s.strip.empty?
       # $LIBRUBYARG was explicitly unset, the built library is not a C extension but used with FFI (e.g., sassc does).
-      # Since $LIBRUBYARG is unset we won't link to libgraalvm-llvm.so, which is wanted.
+      # Since $LIBRUBYARG is unset we won't link to libgraalvm-llvm.so, which is expected.
       # In the case the library uses C++ code, libc++.so/libc++abi.so will be linked and needs to be found by NFI.
       # The toolchain does not pass -rpath automatically for libc++.so/libc++abi.so, so we do it.
       libcxx_dir = ::Truffle::Boot.toolchain_paths(:LD_LIBRARY_PATH)
@@ -2837,9 +2837,13 @@ def MAIN_DOES_NOTHING(*refs)
     "$(CFLAGS) $(src) $(LIBPATH) $(LDFLAGS) $(ARCH_FLAG) $(LOCAL_LIBS) $(LIBS)"
 
   if defined?(::TruffleRuby)
-    # We need to link to libtruffleruby for MakeMakefile#try_link to succeed
+    # We need to link to libtruffleruby for MakeMakefile#try_link to succeed.
+    # The created executable will link against both libgraalvm-llvm.so and libtruffleruby and
+    # might be executed for #try_constant and #try_run so we also need -rpath for both.
     libtruffleruby_dir = File.dirname(RbConfig::CONFIG['libtruffleruby'])
-    TRY_LINK << " -L#{libtruffleruby_dir} -ltruffleruby"
+    TRY_LINK << " -L#{libtruffleruby_dir} -rpath #{libtruffleruby_dir} -ltruffleruby"
+    libgraalvm_llvm_dir = ::Truffle::Boot.toolchain_paths(:LD_LIBRARY_PATH)
+    TRY_LINK << " -rpath #{libgraalvm_llvm_dir}"
   end
 
   ##

lib/truffle/rbconfig.rb

@@ -149,6 +149,7 @@ module RbConfig
     'EXECUTABLE_EXTS'   => '',
     'exeext'            => '',
     'EXEEXT'            => '',
+    'EXTOUT'            => '.ext',
     'extra_bindirs'     => extra_bindirs.join(File::PATH_SEPARATOR),
     'host_alias'        => '',
     'host_cpu'          => host_cpu,

spec/ruby/library/socket/socket/udp_server_loop_spec.rb

@@ -21,7 +21,7 @@
     it 'yields the message and a Socket::UDPSource' do
       msg, src = nil
 
-      Thread.new do
+      thread = Thread.new do
         SocketSpecs::ServerLoopPortFinder.udp_server_loop('127.0.0.1', 0) do |message, source|
           msg = message
           src = source
@@ -52,6 +52,8 @@
 
       msg.should == 'hello'
       src.should be_an_instance_of(Socket::UDPSource)
+
+      thread.join
     end
   end
 end

src/main/c/cext/extconf.rb

@@ -23,4 +23,10 @@ module Truffle::Platform
 # -DRUBY_EXPORT is added in MRI's configure.in.
 $CFLAGS << " -DRUBY_EXPORT"
 
+if Truffle::Platform.darwin?
+  # Set the install_name of libtruffleruby on macOS, so mkmf executables linking to it
+  # will know they need to look at the rpath to find it.
+  $LIBRUBYARG = "-Wl,-install_name,@rpath/libtruffleruby.dylib #{$LIBRUBYARG}"
+end
+
 create_makefile('libtruffleruby')

src/main/ruby/truffleruby/core/kernel.rb

@@ -478,8 +478,13 @@ def putc(int)
   end
   module_function :putc
 
-  def puts(*a)
-    $stdout.puts(*a)
+  def puts(*args)
+    stdout = $stdout
+    if Primitive.object_equal(self, stdout)
+      Truffle::IOOperations.puts(stdout, *args)
+    else
+      stdout.__send__(:puts, *args)
+    end
     nil
   end
   module_function :puts

test/mri/failing.exclude

@@ -125,18 +125,7 @@ minitest/test_minitest_mock.rb
 minitest/test_minitest_spec.rb
 minitest/test_minitest_unit.rb
 misc/test_ruby_mode.rb
-mkmf/test_config.rb
-mkmf/test_constant.rb
-mkmf/test_convertible.rb
-mkmf/test_find_executable.rb
-mkmf/test_flags.rb
-mkmf/test_framework.rb
-mkmf/test_have_func.rb
 mkmf/test_have_library.rb
-mkmf/test_have_macro.rb
-mkmf/test_libs.rb
-mkmf/test_signedness.rb
-mkmf/test_sizeof.rb
 net/http/test_https.rb
 net/imap/test_imap.rb
 net/imap/test_imap_response_parser.rb

test/mri/tests/mkmf/base.rb

@@ -1,11 +1,13 @@
 # frozen_string_literal: false
 $extmk = true
 require 'rbconfig'
-RbConfig.fire_update!("top_srcdir", File.expand_path("../..", __dir__))
-File.foreach(RbConfig::CONFIG["topdir"]+"/Makefile") do |line|
-  if /^CC_WRAPPER\s*=\s*/ =~ line
-    RbConfig.fire_update!('CC_WRAPPER', $'.strip)
-    break
+if RbConfig.respond_to?(:fire_update!)
+  RbConfig.fire_update!("top_srcdir", File.expand_path("../..", __dir__))
+  File.foreach(RbConfig::CONFIG["topdir"]+"/Makefile") do |line|
+    if /^CC_WRAPPER\s*=\s*/ =~ line
+      RbConfig.fire_update!('CC_WRAPPER', $'.strip)
+      break
+    end
   end
 end
 
@@ -122,6 +124,7 @@ def teardown
     }
     Logging.quiet = @quiet
     Logging.log_close
+    # puts nil, MKMFLOG[], nil # TruffleRuby: useful to debug if a test fails
     FileUtils.rm_f("mkmf.log")
     Dir.chdir(@curdir)
     FileUtils.rm_rf(@tmpdir)

test/mri/tests/mkmf/test_have_func.rb

@@ -5,13 +5,13 @@
 class TestMkmf
   class TestHaveFunc < TestMkmf
     def test_have_func
-      assert_equal(true, have_func("ruby_init"), MKMFLOG)
-      assert_include($defs, '-DHAVE_RUBY_INIT')
+      assert_equal(true, have_func("rb_intern"), MKMFLOG)
+      assert_include($defs, '-DHAVE_RB_INTERN')
     end
 
     def test_not_have_func
-      assert_equal(false, have_func("no_ruby_init"), MKMFLOG)
-      assert_not_include($defs, '-DHAVE_RUBY_INIT')
+      assert_equal(false, have_func("no_rb_intern"), MKMFLOG)
+      assert_not_include($defs, '-DHAVE_RB_INTERN')
     end
   end
 end

tool/jt.rb

@@ -1094,7 +1094,13 @@ def test(*args)
       elsif !pattern.start_with?(MRI_TEST_PREFIX)
         pattern = "#{MRI_TEST_PREFIX}/#{pattern}"
       end
-      glob = Dir.glob(pattern)
+      glob = Dir.glob(pattern).flat_map do |path|
+        if File.directory?(path)
+          Dir.glob("#{path}/**/test_*.rb")
+        else
+          path
+        end
+      end
       abort "pattern #{pattern} matched no files" if glob.empty?
       glob.map { |path| mri_test_name(path) }
     end.sort