On 12/21/21 10:21, Thomas Huth wrote:
Instead of failing the tests, we should rather skip them if ncat is
not available.
While we're at it, also mention ncat in the README.md file as a
requirement for the migration tests.
Resolves: https://gitlab.com/kvm-unit-tests/kvm-unit-tests/-/issues/4
Signed-off-by: Thomas Huth <thuth@xxxxxxxxxx>
---
README.md | 4 ++++
scripts/arch-run.bash | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/README.md b/README.md
index 6e6a9d0..a82da56 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,10 @@ ACCEL=name environment variable:
ACCEL=kvm ./x86-run ./x86/msr.flat
+For running tests that involve migration from one QEMU instance to another
+you also need to have the "ncat" binary (from the nmap.org project) installed,
+otherwise the related tests will be skipped.
+
# Tests configuration file
The test case may need specific runtime configurations, for
diff --git a/scripts/arch-run.bash b/scripts/arch-run.bash
index 43da998..cd92ed9 100644
--- a/scripts/arch-run.bash
+++ b/scripts/arch-run.bash
@@ -108,7 +108,7 @@ run_migration ()
{
if ! command -v ncat >/dev/null 2>&1; then
echo "${FUNCNAME[0]} needs ncat (netcat)" >&2
- return 2
+ return 77
fi
migsock=$(mktemp -u -t mig-helper-socket.XXXXXXXXXX)
Queued, thanks.
Paolo
