This unifies the naming between the manual and automatic
selection cases, clarifies the contents of the tests and makes
room for more tests being added in the future.
Signed-off-by: Andrea Bolognani <abolo...@redhat.com>
---
...ware-auto-efi-loader-path-nonstandard.x86_64-latest.err} | 0
...th.xml => firmware-auto-efi-loader-path-nonstandard.xml} | 0
...=> firmware-manual-efi-loader-no-path.x86_64-latest.err} | 0
...i-no-path.xml => firmware-manual-efi-loader-no-path.xml} | 0
...=> firmware-manual-efi-loader-secure.x86_64-latest.args} | 0
...efi-secure.xml => firmware-manual-efi-loader-secure.xml} | 0
tests/qemuxml2argvtest.c | 6 +++---
... => firmware-manual-efi-loader-secure.x86_64-latest.xml} | 0
tests/qemuxml2xmltest.c | 2 +-
9 files changed, 4 insertions(+), 4 deletions(-)
rename tests/qemuxml2argvdata/{firmware-auto-efi-loader-path.x86_64-latest.err
=> firmware-auto-efi-loader-path-nonstandard.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{firmware-auto-efi-loader-path.xml =>
firmware-auto-efi-loader-path-nonstandard.xml} (100%)
rename tests/qemuxml2argvdata/{firmware-manual-efi-no-path.x86_64-latest.err
=> firmware-manual-efi-loader-no-path.x86_64-latest.err} (100%)
rename tests/qemuxml2argvdata/{firmware-manual-efi-no-path.xml =>
firmware-manual-efi-loader-no-path.xml} (100%)
rename tests/qemuxml2argvdata/{firmware-manual-efi-secure.x86_64-latest.args
=> firmware-manual-efi-loader-secure.x86_64-latest.args} (100%)
rename tests/qemuxml2argvdata/{firmware-manual-efi-secure.xml =>
firmware-manual-efi-loader-secure.xml} (100%)
rename tests/qemuxml2xmloutdata/{firmware-manual-efi-secure.x86_64-latest.xml
=> firmware-manual-efi-loader-secure.x86_64-latest.xml} (100%)
diff --git
a/tests/qemuxml2argvdata/firmware-auto-efi-loader-path.x86_64-latest.err
b/tests/qemuxml2argvdata/firmware-auto-efi-loader-path-nonstandard.x86_64-latest.err
similarity index 100%
rename from
tests/qemuxml2argvdata/firmware-auto-efi-loader-path.x86_64-latest.err
rename to
tests/qemuxml2argvdata/firmware-auto-efi-loader-path-nonstandard.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/firmware-auto-efi-loader-path.xml
b/tests/qemuxml2argvdata/firmware-auto-efi-loader-path-nonstandard.xml
similarity index 100%
rename from tests/qemuxml2argvdata/firmware-auto-efi-loader-path.xml
rename to tests/qemuxml2argvdata/firmware-auto-efi-loader-path-nonstandard.xml
diff --git
a/tests/qemuxml2argvdata/firmware-manual-efi-no-path.x86_64-latest.err
b/tests/qemuxml2argvdata/firmware-manual-efi-loader-no-path.x86_64-latest.err
similarity index 100%
rename from tests/qemuxml2argvdata/firmware-manual-efi-no-path.x86_64-latest.err
rename to
tests/qemuxml2argvdata/firmware-manual-efi-loader-no-path.x86_64-latest.err
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-no-path.xml
b/tests/qemuxml2argvdata/firmware-manual-efi-loader-no-path.xml
similarity index 100%
rename from tests/qemuxml2argvdata/firmware-manual-efi-no-path.xml
rename to tests/qemuxml2argvdata/firmware-manual-efi-loader-no-path.xml
diff --git
a/tests/qemuxml2argvdata/firmware-manual-efi-secure.x86_64-latest.args
b/tests/qemuxml2argvdata/firmware-manual-efi-loader-secure.x86_64-latest.args
similarity index 100%
rename from tests/qemuxml2argvdata/firmware-manual-efi-secure.x86_64-latest.args
rename to
tests/qemuxml2argvdata/firmware-manual-efi-loader-secure.x86_64-latest.args
diff --git a/tests/qemuxml2argvdata/firmware-manual-efi-secure.xml
b/tests/qemuxml2argvdata/firmware-manual-efi-loader-secure.xml
similarity index 100%
rename from tests/qemuxml2argvdata/firmware-manual-efi-secure.xml
rename to tests/qemuxml2argvdata/firmware-manual-efi-loader-secure.xml
diff --git a/tests/qemuxml2argvtest.c b/tests/qemuxml2argvtest.c
index 293aea60d5..9a2950f8ad 100644
--- a/tests/qemuxml2argvtest.c
+++ b/tests/qemuxml2argvtest.c
@@ -1084,11 +1084,11 @@ mymain(void)
DO_TEST_CAPS_LATEST("firmware-manual-bios-stateless");
DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-bios-not-stateless");
DO_TEST_CAPS_LATEST("firmware-manual-efi");
- DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-no-path");
DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-features");
DO_TEST_CAPS_LATEST("firmware-manual-efi-rw");
DO_TEST_CAPS_LATEST("firmware-manual-efi-rw-implicit");
- DO_TEST_CAPS_LATEST("firmware-manual-efi-secure");
+ DO_TEST_CAPS_LATEST("firmware-manual-efi-loader-secure");
+ DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-loader-no-path");
DO_TEST_CAPS_LATEST("firmware-manual-efi-stateless");
DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-template");
DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-manual-efi-nvram-template-stateless");
@@ -1116,7 +1116,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("firmware-auto-efi-nvram");
DO_TEST_CAPS_LATEST("firmware-auto-efi-loader-secure");
DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-efi-loader-insecure");
- DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-efi-loader-path");
+
DO_TEST_CAPS_LATEST_PARSE_ERROR("firmware-auto-efi-loader-path-nonstandard");
DO_TEST_CAPS_LATEST("firmware-auto-efi-secboot");
DO_TEST_CAPS_LATEST("firmware-auto-efi-no-secboot");
DO_TEST_CAPS_LATEST("firmware-auto-efi-enrolled-keys");
diff --git
a/tests/qemuxml2xmloutdata/firmware-manual-efi-secure.x86_64-latest.xml
b/tests/qemuxml2xmloutdata/firmware-manual-efi-loader-secure.x86_64-latest.xml
similarity index 100%
rename from
tests/qemuxml2xmloutdata/firmware-manual-efi-secure.x86_64-latest.xml
rename to
tests/qemuxml2xmloutdata/firmware-manual-efi-loader-secure.x86_64-latest.xml
diff --git a/tests/qemuxml2xmltest.c b/tests/qemuxml2xmltest.c
index 3d4c038c70..73bcfcc8b7 100644
--- a/tests/qemuxml2xmltest.c
+++ b/tests/qemuxml2xmltest.c
@@ -924,7 +924,7 @@ mymain(void)
DO_TEST_CAPS_LATEST("firmware-manual-efi");
DO_TEST_CAPS_LATEST("firmware-manual-efi-rw");
DO_TEST_CAPS_LATEST("firmware-manual-efi-rw-implicit");
- DO_TEST_CAPS_LATEST("firmware-manual-efi-secure");
+ DO_TEST_CAPS_LATEST("firmware-manual-efi-loader-secure");
DO_TEST_CAPS_LATEST("firmware-manual-efi-stateless");
DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-template");
DO_TEST_CAPS_LATEST("firmware-manual-efi-nvram-network-iscsi");
--
2.39.2
