From b40d070ab9aa3280ee703be2e8b04e762868aa7c Mon Sep 17 00:00:00 2001
From: Emma Anholt <emma@anholt.net>
Date: Thu, 30 Sep 2021 09:34:00 -0700
Subject: [PATCH] freedreno: Move the headergen2 test to be meson unit tests.

Now all the freedreno build-time testing is just "meson test -C build"

Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/6360>
---
 .gitlab-ci.yml                          |  1 -
 src/freedreno/.gitlab-ci/README.rst     | 33 -------------------------
 src/freedreno/.gitlab-ci/run-fdtools.sh | 10 --------
 src/freedreno/rnn/meson.build           | 10 ++++++++
 4 files changed, 10 insertions(+), 44 deletions(-)
 delete mode 100644 src/freedreno/.gitlab-ci/README.rst
 delete mode 100755 src/freedreno/.gitlab-ci/run-fdtools.sh

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index ea910256ac2..dbedc3a2fc3 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -754,7 +754,6 @@ debian-gallium:
   script:
     - .gitlab-ci/meson/build.sh
     - .gitlab-ci/run-shader-db.sh
-    - src/freedreno/.gitlab-ci/run-fdtools.sh
 
 # Test a release build with -Werror so new warnings don't sneak in.
 debian-release:
diff --git a/src/freedreno/.gitlab-ci/README.rst b/src/freedreno/.gitlab-ci/README.rst
deleted file mode 100644
index b232bc50d47..00000000000
--- a/src/freedreno/.gitlab-ci/README.rst
+++ /dev/null
@@ -1,33 +0,0 @@
-Continuous Integration
-======================
-
-In addition to a build step, the CI setup has a basic test stage
-to ensure that we don't break functionality of various tools.  The
-basic idea is to decode various files and compare the output to a
-reference.  This means that some changes, like renaming registers
-or bitfields in the rnndb xml requires updating the reference
-output.
-
-Layout:
- - .gitlab-ci/
-
-   - traces/ - reference devcoredump and cmdstream traces.  The trace files should be kept small, and .rd files (which are already binary) should be compressed.
-
-   - reference/ - reference output
-
-   - genoutput.sh - script to generate output from the traces, used both by the CI test job, but it can also be used to update the reference output
-
-Note on paths:
---------------
-
-Gitlab CI uses an install-path of \`pwd\`/install.  If you use something
-different, then setup a symlink.  Once that is done, to update reference
-decodes (ie. to account for register .xml changes) run:
-
-  ./src/freedreno/.gitlab-ci/genoutput.sh --update
-
-TODO
-----
-- Maybe we could filter out some differences, like a new definition of a previously unknown register?
-- It would be nice to add a test for afuc.. we probably cannot add a "real" fw file to this tree, but maybe could either fetch it from the linux-firmware git tree, or create our own dummy fw.
-
diff --git a/src/freedreno/.gitlab-ci/run-fdtools.sh b/src/freedreno/.gitlab-ci/run-fdtools.sh
deleted file mode 100755
index 15c8d7d9730..00000000000
--- a/src/freedreno/.gitlab-ci/run-fdtools.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-set -e
-set -x
-
-# Also, while we are still using headergen2 for generating kernel
-# headers, make sure that doesn't break:
-headergen="_build/src/freedreno/rnn/headergen2"
-$headergen adreno.xml
-$headergen msm.xml
diff --git a/src/freedreno/rnn/meson.build b/src/freedreno/rnn/meson.build
index b9379e6e239..a01f7419464 100644
--- a/src/freedreno/rnn/meson.build
+++ b/src/freedreno/rnn/meson.build
@@ -57,3 +57,13 @@ headergen2 = executable(
   build_by_default: with_tools.contains('freedreno'),
   install: false
 )
+
+if with_tests
+  foreach xml : ['adreno.xml', 'msm.xml']
+    test('headergen2-' + xml,
+      headergen2,
+      args: [xml],
+      suite: 'freedreno',
+    )
+  endforeach
+endif