Francois Gouget : winetest: Don't parse the test list if 'test --list' failed.

Alexandre Julliard julliard at winehq.org
Tue Mar 16 16:39:03 CDT 2021


Module: wine
Branch: master
Commit: 100b81e8a8f5ea33c73d06d8c69ba4cd44361d40
URL:    https://source.winehq.org/git/wine.git/?a=commit;h=100b81e8a8f5ea33c73d06d8c69ba4cd44361d40

Author: Francois Gouget <fgouget at codeweavers.com>
Date:   Tue Mar 16 10:34:17 2021 +0100

winetest: Don't parse the test list if 'test --list' failed.

Any non-zero exit code is grounds for ignoring the 'test --list'
output.
This also causes get_subtests() to return the actual process exit code
rather than a generic internal error when it fails to parse the test
list.

Signed-off-by: Francois Gouget <fgouget at codeweavers.com>
Signed-off-by: Alexandre Julliard <julliard at winehq.org>

---

 programs/winetest/main.c | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

diff --git a/programs/winetest/main.c b/programs/winetest/main.c
index 8f80aca9919..225e9a2548b 100644
--- a/programs/winetest/main.c
+++ b/programs/winetest/main.c
@@ -735,9 +735,12 @@ get_subtests (const char *tempdir, struct wine_test *test, LPSTR res_name)
     }
     heap_free (cmd);
 
-    if (status == -2)
+    if (status)
     {
-        report (R_ERROR, "Cannot run %s error %u", test->exename, err);
+        if (status == -2)
+            report (R_ERROR, "Cannot run %s error %u", test->exename, err);
+        else
+            err = status;
         CloseHandle( subfile );
         goto quit;
     }




More information about the wine-cvs mailing list