From: Kay Sievers Date: Sun, 5 Jan 2014 15:10:35 +0000 (+0400) Subject: test: return error from loop X-Git-Tag: upstream/0.20140120.123719~56 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=5cad3a15326b12a86dc8d7e5dd4c7da40f80f61e;p=platform%2Fcore%2Fsystem%2Fkdbus-bus.git test: return error from loop --- diff --git a/test/Makefile b/test/Makefile index b4117bf..4c7ab30 100644 --- 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 de1cefc..9a516eb 100644 --- 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; }