Igt-dev Archive on lore.kernel.org
 help / color / mirror / Atom feed
From: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
To: igt-dev@lists.freedesktop.org, mauro.chehab@linux.intel.com
Subject: [igt-dev] [i-g-t V5 6/7] tests/meson.build: Split intel targets based on their nature
Date: Thu, 31 Aug 2023 20:26:21 +0530	[thread overview]
Message-ID: <20230831145622.1158622-7-bhanuprakash.modem@intel.com> (raw)
In-Reply-To: <20230831145622.1158622-1-bhanuprakash.modem@intel.com>

Instead of having all intel specific programs in a single list,
split those into multiple lists based on their nature.

Example:
 - intel_i915_xe_progs: List of tests those supports both i915 & xe
 - intel_i915_progs: List of i915 specific tests
 - intel_kms_progs: List of intel specific kms tests
 - intel_xe_progs: List of xe specific tests

As a side effect, this would help if we ever need to add option
to enable/disable i915 and/or kms test builds.

Cc: Mauro Carvalho Chehab <mchehab@kernel.org>
Signed-off-by: Bhanuprakash Modem <bhanuprakash.modem@intel.com>
---
 tests/meson.build | 55 +++++++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 31 deletions(-)

diff --git a/tests/meson.build b/tests/meson.build
index 211ecd513..aa27fd9af 100644
--- a/tests/meson.build
+++ b/tests/meson.build
@@ -82,8 +82,11 @@ test_progs = [
 	'vgem_slow',
 ]
 
-intel_progs = [
+intel_i915_xe_progs = [
 	'api_intel_allocator',
+]
+
+intel_i915_progs = [
 	'api_intel_bb',
 	'debugfs_test',
 	'drm_fdinfo',
@@ -230,6 +233,18 @@ intel_progs = [
 	'i915_query',
 	'i915_selftest',
 	'i915_suspend',
+	'prime_busy',
+	'prime_mmap',
+	'prime_mmap_coherency',
+	'prime_mmap_kms',
+	'prime_self_import',
+	'sysfs_defaults',
+	'sysfs_heartbeat_interval',
+	'sysfs_preempt_timeout',
+	'sysfs_timeslice_duration',
+]
+
+intel_kms_progs = [
 	'kms_big_fb',
 	'kms_big_joiner' ,
 	'kms_busy',
@@ -252,18 +267,9 @@ intel_progs = [
 	'kms_psr2_su',
 	'kms_psr_stress_test',
 	'kms_pwrite_crc',
-	'prime_busy',
-	'prime_mmap',
-	'prime_mmap_coherency',
-	'prime_mmap_kms',
-	'prime_self_import',
-	'sysfs_defaults',
-	'sysfs_heartbeat_interval',
-	'sysfs_preempt_timeout',
-	'sysfs_timeslice_duration',
 ]
 
-xe_progs = [
+intel_xe_progs = [
 	'xe_ccs',
 	'xe_create',
 	'xe_compute',
@@ -383,6 +389,13 @@ foreach prog : test_progs
 		     output : name + '.testlist')
 endforeach
 
+intel_progs = intel_i915_xe_progs
+intel_progs += intel_i915_progs + intel_kms_progs
+if build_xe
+	build_info += 'Xe **experimental** tests enabled.'
+	intel_progs += intel_xe_progs
+endif
+
 foreach prog : intel_progs
 	testexe = executable(prog,
 		   [join_paths('intel', prog + '.c')] + extra_sources.get(prog, []),
@@ -400,26 +413,6 @@ foreach prog : intel_progs
 		     output : name + '.testlist')
 endforeach
 
-if build_xe
-	foreach prog : xe_progs
-		testexe = executable(prog,
-			   [join_paths('intel', prog + '.c')] + extra_sources.get(prog, []),
-			   dependencies : test_deps + extra_dependencies.get(prog, []),
-			   install_dir : libexecdir,
-			   install_rpath : libexecdir_rpathdir,
-			   install : true)
-		test_list += prog
-		test_executables += testexe
-		name = prog.split('/').get(-1)
-		testlist_files += custom_target(name + '.testlist',
-			     build_by_default : true,
-			     command : [testexe, '--show-testlist'],
-			     capture : true,
-			     output : name + '.testlist')
-	endforeach
-	build_info += 'Xe **experimental** tests enabled.'
-endif
-
 foreach prog : msm_progs
 	test_executables += executable(prog, join_paths('msm', prog + '.c'),
 				       dependencies : test_deps,
-- 
2.40.0



  parent reply	other threads:[~2023-08-31 15:05 UTC|newest]

Thread overview: 18+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2023-08-31 14:56 [igt-dev] [i-g-t V5 0/7] New dir structure for intel specific tests Bhanuprakash Modem
2023-08-31 14:56 ` [igt-dev] [i-g-t V5 1/7] testplan/i915: Exclude non-i915 tests from i915 testplan Bhanuprakash Modem
2023-08-31 14:56 ` [igt-dev] [i-g-t V5 2/7] testplan/kms: Move kms testplan to intel dir Bhanuprakash Modem
2023-08-31 15:56   ` Mauro Carvalho Chehab
2023-08-31 14:56 ` [igt-dev] [i-g-t V5 3/7] tests/i915/prime_mmap_kms: Add missing documentation Bhanuprakash Modem
2023-08-31 17:09   ` Kamil Konieczny
2023-08-31 14:56 ` [igt-dev] [i-g-t V5 4/7] tests/meson.build: Simplify builds for Chamelium targets Bhanuprakash Modem
2023-08-31 15:57   ` Mauro Carvalho Chehab
2023-08-31 14:56 ` [igt-dev] [i-g-t V5 5/7] tests: Move intel specific tests to new directory Bhanuprakash Modem
2023-08-31 16:00   ` Mauro Carvalho Chehab
2023-08-31 14:56 ` Bhanuprakash Modem [this message]
2023-08-31 16:01   ` [igt-dev] [i-g-t V5 6/7] tests/meson.build: Split intel targets based on their nature Mauro Carvalho Chehab
2023-08-31 14:56 ` [igt-dev] [i-g-t V5 7/7] tests: Rename all intel specific tests Bhanuprakash Modem
2023-08-31 16:05   ` Mauro Carvalho Chehab
2023-08-31 18:45   ` [igt-dev] [i-g-t V6 " Bhanuprakash Modem
2023-08-31 22:05 ` [igt-dev] ✗ GitLab.Pipeline: warning for New dir structure for intel specific tests (rev9) Patchwork
2023-08-31 22:41 ` [igt-dev] ✗ Fi.CI.BAT: failure " Patchwork
2023-08-31 23:09 ` [igt-dev] ✓ CI.xeBAT: success " Patchwork

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20230831145622.1158622-7-bhanuprakash.modem@intel.com \
    --to=bhanuprakash.modem@intel.com \
    --cc=igt-dev@lists.freedesktop.org \
    --cc=mauro.chehab@linux.intel.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox