[PATCH 5/5] tests: Remove 'qemucapsfixreplies'

The 'qemucapabilitiesnumbering' tool now replaces the role of this script and provides way to programmatically modify the replies file on top. Signed-off-by: Peter Krempa <pkrempa(a)redhat.com&gt; --- tests/domaincapstest.c | 3 ++- tests/qemucapabilitiestest.c | 4 +++- tests/qemucapsfixreplies | 26 -------------------------- 3 files changed, 5 insertions(+), 28 deletions(-) delete mode 100755 tests/qemucapsfixreplies diff --git a/tests/domaincapstest.c b/tests/domaincapstest.c index 479bcb1c35..da5c629fd4 100644 --- a/tests/domaincapstest.c +++ b/tests/domaincapstest.c @@ -422,7 +422,8 @@ mymain(void) * to generate updated or new *.replies data files. * * If you manually edit replies files you can run - * "tests/qemucapsfixreplies foo.replies" to fix the replies ids. + * VIR_TEST_REGENERATE_OUTPUT=1 tests/qemucapabilitiesnumbering + * to fix the replies ids. * * Once a replies file has been generated and tweaked if necessary, * you can drop it into tests/qemucapabilitiesdata/ (with a sensible diff --git a/tests/qemucapabilitiestest.c b/tests/qemucapabilitiestest.c index 99534ab9a1..ae208f442c 100644 --- a/tests/qemucapabilitiestest.c +++ b/tests/qemucapabilitiestest.c @@ -212,7 +212,9 @@ mymain(void) * to generate updated or new *.replies data files. * * If you manually edit replies files you can run - * "tests/qemucapsfixreplies foo.replies" to fix the replies ids. + * VIR_TEST_REGENERATE_OUTPUT=1 tests/qemucapabilitiesnumbering + * to fix the replies ids. The tool also allows for programatic modification + * of the replies file. * * Once a replies file has been generated and tweaked if necessary, * you can drop it into tests/qemucapabilitiesdata/ (with a sensible diff --git a/tests/qemucapsfixreplies b/tests/qemucapsfixreplies deleted file mode 100755 index 597f9ecd6e..0000000000 --- a/tests/qemucapsfixreplies +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -if [ "$#" -ne 1 ] || [ "$1" = "--help" ] || [ ! -f "$1" ]; then - echo "This script fixes replies ids in QEMU replies files." - echo "" - echo " Usage: $0 path/to/qemu.replies" - exit 0 -fi - -awk -i inplace \ - 'BEGIN {last=0; pattern="libvirt-[0-9]+"} - { - if (match($0, "libvirt-1[^0-9]")) { - count=1; - } - if (match($0, pattern)) { - str="libvirt-" count; - sub(pattern, str, $0); - if (last != count) { - last=count; - } else { - count++; - } - } - print - }' "$1" -- 2.31.1