include: move test suite specific files to programs dir

Signed-off-by: Philip Li <[email protected]>
intel · Nov 28, 2024 · e0077dd · e0077dd
1 parent 49c30a6
commit e0077dd
Show file tree

Hide file tree

Showing 51 changed files with 20 additions and 8 deletions.
diff --git a/include/perf-stat b/include/perf-stat
diff --git a/lib/job.rb b/lib/job.rb
@@ -269,13 +269,21 @@ def include_files
     Dir["#{lkp_src}/include/*"].map do |d|
       key = File.basename d
       @include_files[key] = {}
+
       Dir["#{lkp_src}/include/#{key}",
           "#{lkp_src}/include/#{key}/*"].each do |f|
-            next if File.directory? f
+        next if File.directory? f
 
-            @include_files[key][File.basename(f)] = f
-          end
+        @include_files[key][File.basename(f)] = f
+      end
     end
+
+    Dir["#{lkp_src}/programs/*/include"].map do |f|
+      key = File.basename(File.dirname(f))
+      @include_files[key] = {}
+      @include_files[key][key] = f
+    end
+
     @include_files
   end
 

diff --git a/include/analyze-suspend → programs/analyze-suspend/include b/include/analyze-suspend → programs/analyze-suspend/include
diff --git a/include/avocado → programs/avocado/include b/include/avocado → programs/avocado/include
diff --git a/include/blktests → programs/blktests/include b/include/blktests → programs/blktests/include
diff --git a/include/bpfcc-tools → programs/bpfcc-tools/include b/include/bpfcc-tools → programs/bpfcc-tools/include
diff --git a/include/fsmark → programs/fsmark/include b/include/fsmark → programs/fsmark/include
diff --git a/include/ftrace-onoff → programs/ftrace-onoff/include b/include/ftrace-onoff → programs/ftrace-onoff/include
diff --git a/include/fxmark → programs/fxmark/include b/include/fxmark → programs/fxmark/include
diff --git a/include/hpcc → programs/hpcc/include b/include/hpcc → programs/hpcc/include
diff --git a/include/hwsim → programs/hwsim/include b/include/hwsim → programs/hwsim/include
diff --git a/include/iozone → programs/iozone/include b/include/iozone → programs/iozone/include
diff --git a/programs/kernel-selftests-bpf b/programs/kernel-selftests-bpf
diff --git a/include/kernel-selftests-bpf → programs/kernel-selftests-bpf/include b/include/kernel-selftests-bpf → programs/kernel-selftests-bpf/include
diff --git a/programs/kernel-selftests-bpf/parse b/programs/kernel-selftests-bpf/parse
@@ -0,0 +1 @@
+../kernel-selftests/parse
diff --git a/programs/kernel-selftests-bpf/pkg b/programs/kernel-selftests-bpf/pkg
@@ -0,0 +1 @@
+../kernel-selftests/pkg
diff --git a/programs/kernel-selftests-bpf/run b/programs/kernel-selftests-bpf/run
@@ -0,0 +1 @@
+../kernel-selftests/run
diff --git a/programs/kernel-selftests-rust b/programs/kernel-selftests-rust
diff --git a/include/kernel-selftests-rust → programs/kernel-selftests-rust/include b/include/kernel-selftests-rust → programs/kernel-selftests-rust/include
diff --git a/programs/kernel-selftests-rust/parse b/programs/kernel-selftests-rust/parse
@@ -0,0 +1 @@
+../kernel-selftests/parse
diff --git a/programs/kernel-selftests-rust/pkg b/programs/kernel-selftests-rust/pkg
@@ -0,0 +1 @@
+../kernel-selftests/pkg
diff --git a/programs/kernel-selftests-rust/run b/programs/kernel-selftests-rust/run
@@ -0,0 +1 @@
+../kernel-selftests/run
diff --git a/include/kernel-selftests → programs/kernel-selftests/include b/include/kernel-selftests → programs/kernel-selftests/include
diff --git a/include/kunit → programs/kunit/include b/include/kunit → programs/kunit/include
diff --git a/include/kvm-unit-tests → programs/kvm-unit-tests/include b/include/kvm-unit-tests → programs/kvm-unit-tests/include
diff --git a/include/lkvs → programs/lkvs/include b/include/lkvs → programs/lkvs/include
diff --git a/include/locktorture → programs/locktorture/include b/include/locktorture → programs/locktorture/include
diff --git a/include/ltp → programs/ltp/include b/include/ltp → programs/ltp/include
diff --git a/include/mce-log → programs/mce-log/include b/include/mce-log → programs/mce-log/include
diff --git a/include/mce-test → programs/mce-test/include b/include/mce-test → programs/mce-test/include
diff --git a/include/mdadm-selftests → programs/mdadm-selftests/include b/include/mdadm-selftests → programs/mdadm-selftests/include
diff --git a/include/ndctl → programs/ndctl/include b/include/ndctl → programs/ndctl/include
diff --git a/include/nvml → programs/nvml/include b/include/nvml → programs/nvml/include
diff --git a/include/ocfs2test → programs/ocfs2test/include b/include/ocfs2test → programs/ocfs2test/include
diff --git a/include/packetdrill → programs/packetdrill/include b/include/packetdrill → programs/packetdrill/include
diff --git a/include/perf-profile → programs/perf-profile/include b/include/perf-profile → programs/perf-profile/include
diff --git a/programs/perf-stat/include b/programs/perf-stat/include
@@ -0,0 +1 @@
+../perf-profile/include
diff --git a/include/qat → programs/qat/include b/include/qat → programs/qat/include
diff --git a/include/rcurefscale → programs/rcurefscale/include b/include/rcurefscale → programs/rcurefscale/include
diff --git a/include/rcuscale → programs/rcuscale/include b/include/rcuscale → programs/rcuscale/include
diff --git a/include/rcutorture → programs/rcutorture/include b/include/rcutorture → programs/rcutorture/include
diff --git a/include/reaim → programs/reaim/include b/include/reaim → programs/reaim/include
diff --git a/include/stress-ng → programs/stress-ng/include b/include/stress-ng → programs/stress-ng/include
diff --git a/include/suspend-stress → programs/suspend-stress/include b/include/suspend-stress → programs/suspend-stress/include
diff --git a/include/suspend → programs/suspend/include b/include/suspend → programs/suspend/include
diff --git a/include/tcrypt → programs/tcrypt/include b/include/tcrypt → programs/tcrypt/include
diff --git a/include/test-bpf → programs/test-bpf/include b/include/test-bpf → programs/test-bpf/include
diff --git a/include/v4l2 → programs/v4l2/include b/include/v4l2 → programs/v4l2/include
diff --git a/include/vm-scalability → programs/vm-scalability/include b/include/vm-scalability → programs/vm-scalability/include
diff --git a/include/xfstests → programs/xfstests/include b/include/xfstests → programs/xfstests/include
diff --git a/spec/need_kconfig_format_spec.rb b/spec/need_kconfig_format_spec.rb
@@ -49,8 +49,8 @@ def is_erb_file(file_path)
 
 describe 'Check need_kconfig from' do
   # Check the config format in include/ dir
-  files = Dir.glob("#{LKP_SRC}/include/**/*").select { |file| File.file?(file) }
-  files.each do |file|
+  Dir["#{LKP_SRC}/include/**/*", "#{LKP_SRC}/programs/*/include"].select { |file| File.file?(file) }
+                                                                 .each do |file|
     begin
       yaml_data = load_yaml_with_conditionals(file)
       # next if yaml_data.nil? || !yaml_data.is_a?(Hash) || is_erb_file(file)