Mesa (main): xmlconfig_test: add unit test for executable_regexp
GitLab Mirror
gitlab-mirror at kemper.freedesktop.org
Tue Nov 2 02:58:21 UTC 2021
Module: Mesa
Branch: main
Commit: 4098607870125dacc40ea484c879035cc9a173be
URL: http://cgit.freedesktop.org/mesa/mesa/commit/?id=4098607870125dacc40ea484c879035cc9a173be
Author: Qiang Yu <yuq825 at gmail.com>
Date: Wed Oct 13 11:15:22 2021 +0800
xmlconfig_test: add unit test for executable_regexp
Reviewed-by: Emma Anholt <emma at anholt.net>
Signed-off-by: Qiang Yu <yuq825 at gmail.com>
Part-of: <https://gitlab.freedesktop.org/mesa/mesa/-/merge_requests/13304>
---
src/util/tests/drirc_configdir/00-test.conf | 8 ++++++++
src/util/tests/drirc_configdir/01-unused | 1 +
src/util/tests/drirc_home/.drirc | 1 +
src/util/tests/xmlconfig.cpp | 10 ++++++++++
4 files changed, 20 insertions(+)
diff --git a/src/util/tests/drirc_configdir/00-test.conf b/src/util/tests/drirc_configdir/00-test.conf
index fcc7208772d..a8692d16177 100644
--- 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 dfdc4eb75ec..b0c538879a3 100644
--- 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 695fe0e5757..a3b7f838013 100644
--- 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 cd2445a3467..377d598e412 100644
--- 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
More information about the mesa-commit
mailing list