Re: [igt-dev] [PATCH i-g-t v3 1/3] intel-ci: update blacklists to work with the Xe driver

[Mauro Carvalho Chehab <mauro.chehab@linux.intel.com>]

On Thu, 23 Mar 2023 08:50:25 +0100
Mauro Carvalho Chehab <mauro.chehab@linux.intel.com> wrote:

> On Wed, 22 Mar 2023 18:44:46 +0100
> Kamil Konieczny <kamil.konieczny@linux.intel.com> wrote:
> 
> > Hi Mauro,
> > 
> > On 2023-03-22 at 15:00:28 +0100, Mauro Carvalho Chehab wrote:
> > > From: Mauro Carvalho Chehab <mchehab@kernel.org>
> > > 
> > > It doesn't make sense to run i915 tests with Xe driver and
> > > vice-versa. Update testlists to make it clear.
> > > 
> > > In order to avoid disrupts at exiting intel-ci tests, keep a
> > > symlink:
> > > 	i915-blacklist.txt -> blacklist.txt
> > > 
> > > Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>
> > > ---
> > >  tests/intel-ci/blacklist.txt      | 130 +----------------------------
> > >  tests/intel-ci/i915-blacklist.txt | 133 ++++++++++++++++++++++++++++++  
> > 
> > Why not just git mv oldfile newfile ?
> 
> I did that. Then, I created a link:
> 	ln -s blacklist.txt tests/intel-ci/i915-blacklist.txt 
> 
> The rationale is to avoid breaking any existing CI pipelines that would
> be expecting to find the i915 blacklist as "blacklist.txt.".
> 
> > But that aside, imho better solution would be to just
> > add xe_* to blacklist. 
> 
> That is what I did: once renamed: I added "igt@xe_.*" to the blacklist
> file.
> 
> Unfortunately, git diff output is weird when there is a rename and
> a symlink to the same name at the same patch. If you prefer, I can
> split it on two patches to make easier to view the differences.
> 
> > I am also not sure you can include
> > one blacklist into another.
> 
> There's no such thing. Both blacklist files are independent. You
> probably got tricked by the weird output git produced with the rename
> + symlink at the same patch.

Btw, if I remove the symlink, the diff becomes nice and clean:

[PATCH] intel-ci: update blacklists to work with the Xe driver
    
It doesn't make sense to run i915 tests with Xe driver and
vice-versa. Update testlists to make it clear.
    
Signed-off-by: Mauro Carvalho Chehab <mchehab@kernel.org>

diff --git a/tests/intel-ci/blacklist.txt b/tests/intel-ci/i915-blacklist.txt
similarity index 97%
rename from tests/intel-ci/blacklist.txt
rename to tests/intel-ci/i915-blacklist.txt
index 6e5cc43667cf..389a2acb7f44 100644
--- a/tests/intel-ci/blacklist.txt
+++ b/tests/intel-ci/i915-blacklist.txt
@@ -84,6 +84,10 @@ igt@kms_chamelium_frames@hdmi-.*-planes-random
 igt@vc4_.*
 igt@v3d_.*
 ###############################################
+# Intel Xe
+###############################################
+igt@xe/.*
+###############################################
 # AMD
 ###############################################
 igt@amdgpu/.*
diff --git a/tests/intel-ci/xe-blacklist.txt b/tests/intel-ci/xe-blacklist.txt
new file mode 100644
index 000000000000..986e91a67069
--- /dev/null
+++ b/tests/intel-ci/xe-blacklist.txt
@@ -0,0 +1,21 @@
+###############################################
+# Broadcom
+###############################################
+igt@vc4_.*
+igt@v3d_.*
+###############################################
+# Intel i915
+###############################################
+igt@i915/.*
+###############################################
+# AMD
+###############################################
+igt@amdgpu/.*
+###############################################
+# Panfrost
+###############################################
+igt@panfrost_.*
+###############################################
+# Qualcomm
+###############################################
+igt@msm_.*