[GR-40333] Ruby 3.1 $LOAD_PATH.path_resolve_features_path does not raise

PullRequest: truffleruby/3685

Author: andrykonchin

CHANGELOG.md

@@ -87,6 +87,7 @@ Compatibility:
 * Add `Integer.try_convert` (#2733, @moste00, @eregon).
 * Support optional `:in` keyword argument for `Time.now` and `Time.new` (#2733, @andrykonchin).
 * Add optional `Hash` argument to `Enumerable#tally` (#2733, @andrykonchin).
+* Update `$LOAD_PATH.resolve_feature_path` to return `nil` instead of raising `LoadError` when feature isn't found (#2733, @andrykonchin).
 
 Performance:
 

spec/tags/language/predefined_tags.txt

@@ -6,4 +6,3 @@ slow:The predefined global constant ARGV contains Strings encoded in locale Enco
 slow:Global variable $0 is the path given as the main script and the same as __FILE__
 slow:Global variable $? is thread-local
 slow:Global variable $0 actually sets the program name
-fails:$LOAD_PATH.resolve_feature_path return nil if feature cannot be found

src/main/ruby/truffleruby/core/truffle/kernel_operations.rb

@@ -55,12 +55,10 @@ def self.define_read_only_global(name, getter)
 
     def $LOAD_PATH.resolve_feature_path(file_name)
       path = Truffle::Type.coerce_to_path(file_name)
-      _status, path, ext = Truffle::FeatureLoader.find_feature_or_file(path, false)
-      if Primitive.nil?(ext)
-        raise Truffle::KernelOperations.load_error(file_name)
-      else
-        [ext, path]
-      end
+      status, path, ext = Truffle::FeatureLoader.find_feature_or_file(path, false)
+
+      return nil if status == :not_found
+      [ext, path]
     end
 
     # The runtime needs to access these values, so we want them to be set in the variable storage.

test/mri/excludes/TestRequire.rb

@@ -1,20 +1,16 @@
-exclude :test_load, "needs investigation"
-exclude :test_race_exception, "needs investigation"
-exclude :test_require_changed_home, "needs investigation"
-exclude :test_require_invalid_shared_object, "needs investigation"
-exclude :test_require_path_home_1, "needs investigation"
-exclude :test_require_path_home_2, "needs investigation"
-exclude :test_require_path_home_3, "needs investigation"
-exclude :test_require_to_path_redefined_in_load_path, "needs investigation"
-exclude :test_require_to_str_redefined_in_load_path, "needs investigation"
-exclude :test_require_too_long_filename, "needs investigation"
-exclude :test_throw_while_loading, "needs investigation"
-exclude :test_load_ospath, "needs investigation"
-exclude :test_loading_fifo_fd_leak, "needs investigation"
-exclude :test_loading_fifo_threading_raise, "needs investigation"
-exclude :test_loading_fifo_threading_success, "needs investigation"
-exclude :test_require_nonascii_path, "needs investigation"
-exclude :test_require_nonascii_path_shift_jis, "needs investigation"
+exclude :test_require_path_home_2, "pid 90932 exit 1"
+exclude :test_race_exception, "Expected /circular require/ to match \"\"."
+exclude :test_require_invalid_shared_object, "[LoadError] exception expected, not #<NameError: undefined local variable or method `dummy' for main:Object>."
+exclude :test_require_to_path_redefined_in_load_path, "[ruby-core:47970]"
+exclude :test_require_changed_home, "[ruby-core:47970]"
+exclude :test_require_path_home_1, "pid 90994 exit 1"
 exclude :test_relative_symlink_realpath, "bug17885 [ruby-core:104010]."
-exclude :test_load_into_module, "<[:b]> expected but was"
-exclude :test_resolve_feature_path_with_missing_feature, "LoadError: cannot load such file -- superkalifragilisticoespialidoso"
+exclude :test_require_path_home_3, "pid 90997 exit 1"
+exclude :test_require_too_long_filename, "Expected 2 to be <= 1."
+exclude :test_require_to_str_redefined_in_load_path, "[ruby-core:47970]"
+exclude :test_require_nonascii_path_shift_jis, "LoadError: cannot load such file -- enc/trans/single_byte"
+exclude :test_load_ospath, "Encoding::CompatibilityError: incompatible encoding regexp match (Windows-31J regexp with UTF-8 string)"
+exclude :test_loading_fifo_threading_raise, "Timeout::Error: execution of assert_separately expired (took longer than 9 seconds)"
+exclude :test_loading_fifo_threading_success, "Timeout::Error: execution of assert_separately expired (took longer than 9 seconds)"
+exclude :test_loading_fifo_fd_leak, "Timeout::Error: execution of assert_separately expired (took longer than 9 seconds)"
+exclude :test_require_nonascii_path, "LoadError: cannot load such file -- enc/trans/single_byte"

tool/parse_mri_errors.rb

@@ -55,7 +55,9 @@
 
   FileUtils.mkdir_p(File.dirname(file))
   lines = File.exist?(file) ? File.readlines(file) : []
-  if i = lines.index { |line| line.start_with?(prefix) }
+
+  # we need the ',' to handle a case when one test name is a substring of another test name
+  if i = lines.index { |line| line.start_with?(prefix + ",") }
     puts "already excluded: #{class_name}##{test_method}"
     lines[i] = new_line
   else