[xen stable-4.17] tools/tests: let test-xenstore exit with non-0 status in case of error

[patchbot@xxxxxxx]

commit 16bc1d8becdb5e998b5fc857e2b1ce01f174327d
Author:     Juergen Gross <jgross@xxxxxxxx>
AuthorDate: Thu Jul 4 14:18:05 2024 +0200
Commit:     Jan Beulich <jbeulich@xxxxxxxx>
CommitDate: Thu Jul 4 14:18:05 2024 +0200

    tools/tests: let test-xenstore exit with non-0 status in case of error
    
    In case a test is failing in test-xenstore, let the tool exit with an
    exit status other than 0.
    
    Fix a typo in an error message.
    
    Reported-by: Andrew Cooper <andrew.cooper3@xxxxxxxxxx>
    Fixes: 3afc5e4a5b75 ("tools/tests: add xenstore testing framework")
    Signed-off-by: Juergen Gross <jgross@xxxxxxxx>
    master commit: 2d4ba205591ba64f31149ae31051678159ee9e11
    master date: 2024-05-02 18:15:46 +0100
---
 tools/tests/xenstore/test-xenstore.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/tools/tests/xenstore/test-xenstore.c 
b/tools/tests/xenstore/test-xenstore.c
index 0e2a83ba5d..23fe3f0c28 100644
--- a/tools/tests/xenstore/test-xenstore.c
+++ b/tools/tests/xenstore/test-xenstore.c
@@ -506,14 +506,14 @@ int main(int argc, char *argv[])
         stop = time(NULL) + randtime;
         srandom((unsigned int)stop);
 
-        while ( time(NULL) < stop )
+        while ( time(NULL) < stop && !ret )
         {
             t = random() % ARRAY_SIZE(tests);
             ret = call_test(tests + t, iters, true);
         }
     }
     else
-        for ( t = 0; t < ARRAY_SIZE(tests); t++ )
+        for ( t = 0; t < ARRAY_SIZE(tests) && !ret; t++ )
         {
             if ( !test || !strcmp(test, tests[t].name) )
                 ret = call_test(tests + t, iters, false);
@@ -525,10 +525,10 @@ int main(int argc, char *argv[])
     xs_close(xsh);
 
     if ( ta_loops )
-        printf("Exhaustive transaction retries (%d) occurrred %d times.\n",
+        printf("Exhaustive transaction retries (%d) occurred %d times.\n",
                MAX_TA_LOOPS, ta_loops);
 
-    return 0;
+    return ret ? 3 : 0;
 }
 
 /*
--
generated by git-patchbot for /home/xen/git/xen.git#stable-4.17