lib/programs.rb: remove legacy LKP_SRC search paths

The tests/monitors/setup/daemon directory under LKP_SRC is deprecated. Update program lookup
logic to only search within PROGRAMS_ROOT.

Signed-off-by: Philip Li <philip.li@intel.com>

Author: rli9

lib/programs.rb

@@ -10,7 +10,7 @@ class Programs
 
     class << self
       def collect_programs(lkp_src_pattern, programs_pattern, executable_only: false)
-        lkp_files = Dir["#{LKP_SRC}/#{lkp_src_pattern}"]
+        lkp_files = lkp_src_pattern ? Dir["#{LKP_SRC}/#{lkp_src_pattern}"] : []
         prog_files = Dir["#{PROGRAMS_ROOT}/#{programs_pattern}"]
 
         if executable_only
@@ -22,10 +22,9 @@ def collect_programs(lkp_src_pattern, programs_pattern, executable_only: false)
       end
 
       def find_executable(program, lkp_dir, *prog_names)
-        [
-          *prog_names.map { |n| "#{PROGRAMS_ROOT}/#{program}/#{n}" },
-          "#{LKP_SRC}/#{lkp_dir}/#{program}"
-        ].find { |file| File.exist?(file) }
+        candidates = prog_names.map { |n| "#{PROGRAMS_ROOT}/#{program}/#{n}" }
+        candidates << "#{LKP_SRC}/#{lkp_dir}/#{program}" if lkp_dir
+        candidates.find { |file| File.exist?(file) }
       end
 
       def all_stats
@@ -35,21 +34,21 @@ def all_stats
       alias all_parser_names all_stats
 
       def all_tests
-        collect_programs('tests/**/*', '*/run')
+        collect_programs(nil, '*/run')
       end
 
       alias all_runner_names all_tests
 
       def all_monitors
-        collect_programs('monitors/*', '*/{monitor,no-stdout-monitor,one-shot-monitor}', executable_only: true)
+        collect_programs(nil, '*/{monitor,no-stdout-monitor,one-shot-monitor}', executable_only: true)
       end
 
       def all_setups
-        collect_programs('setup/**/*', '*/setup', executable_only: true)
+        collect_programs(nil, '*/setup', executable_only: true)
       end
 
       def all_daemons
-        collect_programs('daemon/**/*', '*/daemon', executable_only: true)
+        collect_programs(nil, '*/daemon', executable_only: true)
       end
 
       def all_tests_and_daemons
@@ -61,13 +60,12 @@ def all_tests_set
       end
 
       def all_metas
-        Dir["#{LKP_SRC}/tests/*.yaml"] + Dir["#{PROGRAMS_ROOT}/*/meta.yaml"]
+        Dir["#{PROGRAMS_ROOT}/*/meta.yaml"]
       end
 
       def find_meta(program)
         [
-          "#{PROGRAMS_ROOT}/#{program}/meta.yaml",
-          "#{LKP_SRC}/tests/#{program}.yaml"
+          "#{PROGRAMS_ROOT}/#{program}/meta.yaml"
         ].find { |file| File.exist?(file) }
       end
 
@@ -76,19 +74,19 @@ def find_parser(program)
       end
 
       def find_setup(program)
-        find_executable(program, 'setup', 'setup')
+        find_executable(program, nil, 'setup')
       end
 
       def find_monitor(program)
-        find_executable(program, 'monitors', 'monitor', 'no-stdout-monitor', 'one-shot-monitor')
+        find_executable(program, nil, 'monitor', 'no-stdout-monitor', 'one-shot-monitor')
       end
 
       def find_daemon(program)
-        find_executable(program, 'daemon', 'daemon')
+        find_executable(program, nil, 'daemon')
       end
 
       def find_runner(program)
-        find_executable(program, 'tests', 'run')
+        find_executable(program, nil, 'run')
       end
 
       # program: turbostat, turbostat-dev

spec/programs_spec.rb

@@ -41,18 +41,20 @@
   end
 
   describe '.all_tests' do
-    it 'finds all tests from tests/ and programs/*/run' do
-      expect(described_class.all_tests).to include('mytest', 'progtest')
+    it 'finds all tests from programs/*/run' do
+      expect(described_class.all_tests).to include('progtest')
+      expect(described_class.all_tests).not_to include('mytest')
     end
   end
 
   describe '.all_tests_and_daemons' do
     it 'finds all tests' do
-      expect(described_class.all_tests_and_daemons).to include('mytest', 'progtest')
+      expect(described_class.all_tests_and_daemons).to include('progtest')
+      expect(described_class.all_tests_and_daemons).not_to include('mytest')
     end
 
-    it 'finds daemons in daemon/' do
-      expect(described_class.all_tests_and_daemons).to include('olddaemon')
+    it 'ignores daemons in legacy daemon/' do
+      expect(described_class.all_tests_and_daemons).not_to include('olddaemon')
     end
 
     it 'finds daemons in programs/*/daemon' do