filters/need_kconfig.rb: load kconfigs yaml inside check_all

Signed-off-by: Philip Li <[email protected]>
mjmartineau · Feb 23, 2023 · 63cfc2f · 63cfc2f
1 parent cdac705
commit 63cfc2f
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 6 deletions.
diff --git a/filters/need_kconfig.rb b/filters/need_kconfig.rb
@@ -78,8 +78,9 @@ def check_all(kernel_kconfigs, needed_kconfigs)
   kernel_version = context['rc_tag']
   kernel_arch = context['kconfig'].split('-').first
 
-  if File.exist? KCONFIGS_YAML
-    kconfig_constraints = YAML.load_file KCONFIGS_YAML
+  kconfigs_yaml = KernelTag.kconfigs_yaml
+  if File.exist? kconfigs_yaml
+    kconfig_constraints = YAML.load_file kconfigs_yaml
     kconfig_constraints = kconfig_constraints.transform_values { |constraints| split_constraints(constraints) }
   end
 

diff --git a/lib/kernel_tag.rb b/lib/kernel_tag.rb
@@ -4,8 +4,6 @@
 
 require "#{LKP_SRC}/lib/lkp_path"
 
-KCONFIGS_YAML = LKP::Path.src('etc', 'kconfigs.yaml').freeze
-
 class KernelTag
   include Comparable
   attr_reader :kernel_tag
@@ -35,6 +33,12 @@ def <=>(other)
 
     numerized_kernel_version1 <=> numerized_kernel_version2
   end
+
+  class << self
+    def kconfigs_yaml
+      LKP::Path.src('etc', 'kconfigs.yaml')
+    end
+  end
 end
 
 def kernel_match_version?(kernel_version, expected_kernel_versions)

diff --git a/spec/filter_need_kconfig_spec.rb b/spec/filter_need_kconfig_spec.rb
@@ -17,15 +17,15 @@
       f.write("CONFIG_X=y\nCONFIG_Y=200\nCONFIG_Z1=m\nCONFIG_Z2=y\nCONFIG_H=0x1000000")
     end
 
-    stub_const 'KCONFIGS_YAML', File.join(@tmp_dir, 'kconfigs.yaml')
+    allow(KernelTag).to receive(:kconfigs_yaml).and_return(File.join(@tmp_dir, 'kconfigs.yaml'))
   end
 
   after(:each) do
     FileUtils.remove_entry @tmp_dir
   end
 
   def generate_kconfigs_yaml(kconfigs_kernel_versions)
-    File.open(KCONFIGS_YAML, 'w') do |f|
+    File.open(KernelTag.kconfigs_yaml, 'w') do |f|
       f.puts kconfigs_kernel_versions
     end
   end