ruby-changes:71326
From: Nobuyoshi <ko1@a...>
Date: Fri, 4 Mar 2022 15:57:46 +0900 (JST)
Subject: [ruby-changes:71326] c757c4e054 (master): sitelibdir makes no sense in ruby itself
https://git.ruby-lang.org/ruby.git/commit/?id=c757c4e054 From c757c4e054397142ffa1b3e8110e5f799cd7075f Mon Sep 17 00:00:00 2001 From: Nobuyoshi Nakada <nobu@r...> Date: Fri, 4 Mar 2022 15:56:03 +0900 Subject: sitelibdir makes no sense in ruby itself --- spec/default.mspec | 2 ++ spec/ruby/language/predefined_spec.rb | 2 ++ 2 files changed, 4 insertions(+) diff --git a/spec/default.mspec b/spec/default.mspec index 2dbaeb83d3..0dba98306c 100644 --- a/spec/default.mspec +++ b/spec/default.mspec @@ -7,6 +7,8 @@ require "./rbconfig" unless defined?(RbConfig) https://github.com/ruby/ruby/blob/trunk/spec/default.mspec#L7 load File.dirname(__FILE__) + '/ruby/default.mspec' OBJDIR = File.expand_path("spec/ruby/optional/capi/ext") class MSpecScript + @testing_ruby = true + builddir = Dir.pwd srcdir = ENV['SRCDIR'] srcdir ||= File.read("Makefile", encoding: "US-ASCII")[/^\s*srcdir\s*=\s*(.+)/i, 1] rescue nil diff --git a/spec/ruby/language/predefined_spec.rb b/spec/ruby/language/predefined_spec.rb index 8eb7511c0e..d04dfcf251 100644 --- a/spec/ruby/language/predefined_spec.rb +++ b/spec/ruby/language/predefined_spec.rb @@ -854,6 +854,8 @@ describe "Execution variable $:" do https://github.com/ruby/ruby/blob/trunk/spec/ruby/language/predefined_spec.rb#L854 end it "default $LOAD_PATH entries until sitelibdir included have @gem_prelude_index set" do + skip "no sense in ruby itself" if MSpecScript.instance_variable_defined?(:@testing_ruby) + $:.should.include?(RbConfig::CONFIG['sitelibdir']) idx = $:.index(RbConfig::CONFIG['sitelibdir']) -- cgit v1.2.1 -- ML: ruby-changes@q... Info: http://www.atdot.net/~ko1/quickml/