xmlconfig_test: add unit test for executable_regexp

Reviewed-by: Emma Anholt <emma@anholt.net>
Signed-off-by: Qiang Yu <yuq825@gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13304>

diff --git a/src/util/tests/drirc_configdir/00-test.conf b/src/util/tests/drirc_configdir/00-test.conf
index fcc7208..a8692d1 100644 (file)
--- a/src/util/tests/drirc_configdir/00-test.conf
+++ b/src/util/tests/drirc_configdir/00-test.conf
@@ -6,6 +6,7 @@
    <!ELEMENT application  (option+)>
    <!ATTLIST application  name CDATA #REQUIRED
                           executable CDATA #IMPLIED
+                          executable_regexp CDATA #IMPLIED
                           sha1 CDATA #IMPLIED
                           application_name_match CDATA #IMPLIED
                           application_versions CDATA #IMPLIED>
@@ -47,5 +48,12 @@
         <engine engine_name_match="Versioned Engine.*" engine_versions="2:3">
             <option name="mesa_drirc_option" value="6" />
         </engine>
+
+        <application name="Application 2" executable_regexp="app2v[0-4]">
+            <option name="mesa_drirc_option" value="7" />
+        </application>
+        <application name="Application 2" executable_regexp="app2v[5-9]">
+            <option name="mesa_drirc_option" value="8" />
+        </application>
     </device>
 </driconf>

diff --git a/src/util/tests/drirc_configdir/01-unused b/src/util/tests/drirc_configdir/01-unused
index dfdc4eb..b0c5388 100644 (file)
--- a/src/util/tests/drirc_configdir/01-unused
+++ b/src/util/tests/drirc_configdir/01-unused
@@ -6,6 +6,7 @@
    <!ELEMENT application  (option+)>
    <!ATTLIST application  name CDATA #REQUIRED
                           executable CDATA #IMPLIED
+                          executable_regexp CDATA #IMPLIED
                           sha1 CDATA #IMPLIED
                           application_name_match CDATA #IMPLIED
                           application_versions CDATA #IMPLIED>

diff --git a/src/util/tests/drirc_home/.drirc b/src/util/tests/drirc_home/.drirc
index 695fe0e..a3b7f83 100644 (file)
--- a/src/util/tests/drirc_home/.drirc
+++ b/src/util/tests/drirc_home/.drirc
@@ -6,6 +6,7 @@
    <!ELEMENT application  (option+)>
    <!ATTLIST application  name CDATA #REQUIRED
                           executable CDATA #IMPLIED
+                          executable_regexp CDATA #IMPLIED
                           sha1 CDATA #IMPLIED
                           application_name_match CDATA #IMPLIED
                           application_versions CDATA #IMPLIED>

diff --git a/src/util/tests/xmlconfig.cpp b/src/util/tests/xmlconfig.cpp
index cd2445a..377d598 100644 (file)
--- a/src/util/tests/xmlconfig.cpp
+++ b/src/util/tests/xmlconfig.cpp
@@ -278,4 +278,14 @@ TEST_F(xmlconfig_test, drirc_engine_versioned)
    EXPECT_EQ(driQueryOptioni(&cache, "mesa_drirc_option"), 5);
    driDestroyOptionCache(&cache);
 }
+
+TEST_F(xmlconfig_test, drirc_exec_regexp)
+{
+   driOptionCache cache = drirc_init("driver", "drm",
+                                     "app2v4",
+                                     NULL, 0,
+                                     NULL, 0);
+   EXPECT_EQ(driQueryOptioni(&cache, "mesa_drirc_option"), 7);
+   driDestroyOptionCache(&cache);
+}
 #endif