From: Peter Krempa <pkrempa@redhat.com>
Date: Thu, 9 Sep 2021 07:53:30 +0000 (+0200)
Subject: virstoragetest: Remove pointless goto from mymain
X-Git-Tag: v7.8.0-rc1~270
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=12906d1985c4b82d788c110a6ea82242fc8ab6ef;p=thirdparty%2Flibvirt.git

virstoragetest: Remove pointless goto from mymain

Improve the error message and abort the test. Continuing here is not
desired as without chdiring into the appropriate directory the test
would fail anyways and worse could attempt stat-ing random files on the
host.

Signed-off-by: Peter Krempa <pkrempa@redhat.com>
Reviewed-by: Ján Tomko <jtomko@redhat.com>
---

diff --git a/tests/virstoragetest.c b/tests/virstoragetest.c
index bbeb5ecd88..513ffdeb41 100644
--- a/tests/virstoragetest.c
+++ b/tests/virstoragetest.c
@@ -502,8 +502,9 @@ mymain(void)
 
     /* setup data for backing chain lookup testing */
     if (chdir(abs_srcdir "/virstoragetestdata/lookup") < 0) {
-        fprintf(stderr, "unable to test relative backing chains\n");
-        goto cleanup;
+        VIR_TEST_VERBOSE("failed to chdir into '%s'\n",
+                         abs_srcdir "/virstoragetestdata/lookup");
+        return EXIT_FAILURE;
     }
 
     memset(fakeChain, 0, sizeof(fakeChain));
@@ -1171,7 +1172,6 @@ mymain(void)
 
 #endif /* WITH_YAJL */
 
- cleanup:
     return ret == 0 ? EXIT_SUCCESS : EXIT_FAILURE;
 }