test: return error from loop

diff --git a/test/Makefile b/test/Makefile
index b4117bf4be4102f5d74c3cb136e0d83e2166f1dc..4c7ab3003f4290f2e1842e54706f18970c8632f9 100644 (file)
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,4 +1,11 @@
-CFLAGS         += -std=gnu99 -Wall -Wextra -g -Wno-unused-parameter -D_GNU_SOURCE
+CFLAGS         += -std=gnu99 -Wall -Wextra -g \
+                  -D_GNU_SOURCE \
+                  -Wno-unused-parameter \
+                  -Wmaybe-uninitialized \
+                  -Wredundant-decls \
+                  -Wcast-align \
+                  -Wsign-compare \
+                  -Wno-missing-field-initializers
 TEST_COMMON    := kdbus-enum.o kdbus-util.o
 CC             := $(CROSS_COMPILE)gcc
 

diff --git a/test/test-kdbus.c b/test/test-kdbus.c
index de1cefc12dbd31144242490cb3392b68a8b922f5..9a516eb5cac99a84eb30749a88e53472ea5b463e 100644 (file)
--- a/test/test-kdbus.c
+++ b/test/test-kdbus.c
@@ -1198,7 +1198,8 @@ static int arg_loop = 0;
 
 int main(int argc, char *argv[])
 {
-       int c, ret = -EINVAL;
+       int c;
+       int r, ret = 0;
 
        enum {
                ARG_VERSION = 0x100,
@@ -1207,13 +1208,12 @@ int main(int argc, char *argv[])
        static const struct option options[] = {
                { "count",      required_argument,      NULL, 'c'       },
                { "loop",       no_argument,            NULL, 'l'       },
-               { NULL,         0,                      NULL, 0         }
+               {}
        };
 
        while ((c = getopt_long(argc, argv, "c:l", options, NULL)) >= 0) {
 
                switch (c) {
-
                case 'c':
                        arg_count = atoi(optarg);
                        break;
@@ -1224,7 +1224,7 @@ int main(int argc, char *argv[])
 
                default:
                        printf("Unknown option code %c", c);
-                       return ret;
+                       return EXIT_FAILURE;
                }
        }
 
@@ -1232,8 +1232,11 @@ int main(int argc, char *argv[])
                for(;;)
                        run_tests();
 
-       for (c = 0; c < arg_count; c++)
-               ret = run_tests();
+       for (c = 0; c < arg_count; c++) {
+               r = run_tests();
+               if (r < 0)
+                       ret = r;
+       }
 
        return ret;
 }