Copy -u option support to bsdtar_test and bsdcpio_test.

Fill in a variable initialization.

SVN-Revision: 3901

diff --git a/cpio/test/main.c b/cpio/test/main.c
index 361b2bfc54ab1b45176d8682d3b47a8b07618631..17d53cfb49499a418972df8b6e273be2c74472ba 100644 (file)
--- a/cpio/test/main.c
+++ b/cpio/test/main.c
@@ -192,6 +192,8 @@ invalid_parameter_handler(const wchar_t * expression,
 static int dump_on_failure = 0;
 /* Default is to remove temp dirs and log data for successful tests. */
 static int keep_temp_files = 0;
+/* Default is to run the specified tests once and report errors. */
+static int until_failure = 0;
 /* Default is to just report pass/fail for each test. */
 static int verbosity = 0;
 #define        VERBOSITY_SUMMARY_ONLY -1 /* -q */
@@ -468,6 +470,8 @@ _utf8_to_unicode(uint32_t *pwc, const char *s, size_t n)
        int cnt;
        uint32_t wc;
 
+       *pwc = 0;
+
        /* Sanity check. */
        if (n == 0)
                return (0);
@@ -2138,6 +2142,7 @@ usage(const char *program)
        printf("  -q  Quiet.\n");
        printf("  -r <dir>   Path to dir containing reference files.\n");
        printf("      Default: Current directory.\n");
+       printf("  -u  Keep running specifies tests until one fails.\n");
        printf("  -v  Verbose.\n");
        printf("Available tests:\n");
        for (i = 0; i < limit; i++)
@@ -2239,6 +2244,7 @@ main(int argc, char **argv)
        time_t now;
        char *refdir_alloc = NULL;
        const char *progname;
+       char **saved_argv;
        const char *tmp, *option_arg, *p;
        char tmpdir[256], *pwd, *testprogdir, *tmp2 = NULL;
        char tmpdir_timestamp[256];
@@ -2369,6 +2375,9 @@ main(int argc, char **argv)
                        case 'r':
                                refdir = option_arg;
                                break;
+                       case 'u':
+                               until_failure++;
+                               break;
                        case 'v':
                                verbosity++;
                                break;
@@ -2480,72 +2489,84 @@ main(int argc, char **argv)
        /*
         * Run some or all of the individual tests.
         */
-       if (*argv == NULL) {
-               /* Default: Run all tests. */
-               for (i = 0; i < limit; i++) {
-                       if (test_run(i, tmpdir))
-                               tests_failed++;
-                       tests_run++;
-               }
-       } else {
-               while (*(argv) != NULL) {
-                       if (**argv >= '0' && **argv <= '9') {
-                               char *p = *argv;
-                               start = 0;
-                               while (*p >= '0' && *p <= '9') {
-                                       start *= 10;
-                                       start += *p - '0';
-                                       ++p;
+       saved_argv = argv;
+       do {
+               argv = saved_argv;
+               if (*argv == NULL) {
+                       /* Default: Run all tests. */
+                       for (i = 0; i < limit; i++) {
+                               tests_run++;
+                               if (test_run(i, tmpdir)) {
+                                       tests_failed++;
+                                       if (until_failure)
+                                               goto finish;
                                }
-                               if (*p == '\0') {
-                                       end = start;
-                               } else if (*p == '-') {
-                                       ++p;
+                       }
+               } else {
+                       while (*(argv) != NULL) {
+                               if (**argv >= '0' && **argv <= '9') {
+                                       char *p = *argv;
+                                       start = 0;
+                                       while (*p >= '0' && *p <= '9') {
+                                               start *= 10;
+                                               start += *p - '0';
+                                               ++p;
+                                       }
                                        if (*p == '\0') {
-                                               end = limit - 1;
-                                       } else {
-                                               end = 0;
-                                               while (*p >= '0' && *p <= '9') {
-                                                       end *= 10;
-                                                       end += *p - '0';
-                                                       ++p;
+                                               end = start;
+                                       } else if (*p == '-') {
+                                               ++p;
+                                               if (*p == '\0') {
+                                                       end = limit - 1;
+                                               } else {
+                                                       end = 0;
+                                                       while (*p >= '0' && *p <= '9') {
+                                                               end *= 10;
+                                                               end += *p - '0';
+                                                               ++p;
+                                                       }
                                                }
+                                       } else {
+                                               printf("*** INVALID Test %s\n", *argv);
+                                               free(refdir_alloc);
+                                               usage(progname);
+                                               return (1);
+                                       }
+                                       if (start < 0 || end >= limit || start > end) {
+                                               printf("*** INVALID Test %s\n", *argv);
+                                               free(refdir_alloc);
+                                               usage(progname);
+                                               return (1);
                                        }
                                } else {
-                                       printf("*** INVALID Test %s\n", *argv);
-                                       free(refdir_alloc);
-                                       usage(progname);
-                                       return (1);
-                               }
-                               if (start < 0 || end >= limit || start > end) {
-                                       printf("*** INVALID Test %s\n", *argv);
-                                       free(refdir_alloc);
-                                       usage(progname);
-                                       return (1);
-                               }
-                       } else {
-                               for (start = 0; start < limit; ++start) {
-                                       if (strcmp(*argv, tests[start].name) == 0)
-                                               break;
+                                       for (start = 0; start < limit; ++start) {
+                                               if (strcmp(*argv, tests[start].name) == 0)
+                                                       break;
+                                       }
+                                       end = start;
+                                       if (start >= limit) {
+                                               printf("*** INVALID Test ``%s''\n",
+                                                   *argv);
+                                               free(refdir_alloc);
+                                               usage(progname);
+                                               /* usage() never returns */
+                                       }
                                }
-                               end = start;
-                               if (start >= limit) {
-                                       printf("*** INVALID Test ``%s''\n",
-                                              *argv);
-                                       free(refdir_alloc);
-                                       usage(progname);
-                                       /* usage() never returns */
+                               while (start <= end) {
+                                       tests_run++;
+                                       if (test_run(start, tmpdir)) {
+                                               tests_failed++;
+                                               if (until_failure)
+                                                       goto finish;
+                                       }
+                                       ++start;
                                }
+                               argv++;
                        }
-                       while (start <= end) {
-                               if (test_run(start, tmpdir))
-                                       tests_failed++;
-                               tests_run++;
-                               ++start;
-                       }
-                       argv++;
                }
-       }
+       } while (until_failure);
+
+finish:
        /* Must be freed after all tests run */
        free(tmp2);
        free(testprogdir);

diff --git a/libarchive/test/main.c b/libarchive/test/main.c
index 04ad9f2be19353b457fd98b33fdf74d9a05d16d0..d12078f8bdfd45f98e9784800655fcb76855bec1 100644 (file)
--- a/libarchive/test/main.c
+++ b/libarchive/test/main.c
@@ -468,6 +468,8 @@ _utf8_to_unicode(uint32_t *pwc, const char *s, size_t n)
        int cnt;
        uint32_t wc;
 
+       *pwc = 0;
+
        /* Sanity check. */
        if (n == 0)
                return (0);

diff --git a/tar/test/main.c b/tar/test/main.c
index 5d5dd8d902fbe7442c545274c89e4b618623748d..3d9ee3b6160cb2f01a49935bb1e0f28251e81361 100644 (file)
--- a/tar/test/main.c
+++ b/tar/test/main.c
@@ -192,6 +192,8 @@ invalid_parameter_handler(const wchar_t * expression,
 static int dump_on_failure = 0;
 /* Default is to remove temp dirs and log data for successful tests. */
 static int keep_temp_files = 0;
+/* Default is to run the specified tests once and report errors. */
+static int until_failure = 0;
 /* Default is to just report pass/fail for each test. */
 static int verbosity = 0;
 #define        VERBOSITY_SUMMARY_ONLY -1 /* -q */
@@ -468,6 +470,8 @@ _utf8_to_unicode(uint32_t *pwc, const char *s, size_t n)
        int cnt;
        uint32_t wc;
 
+       *pwc = 0;
+
        /* Sanity check. */
        if (n == 0)
                return (0);
@@ -2138,6 +2142,7 @@ usage(const char *program)
        printf("  -q  Quiet.\n");
        printf("  -r <dir>   Path to dir containing reference files.\n");
        printf("      Default: Current directory.\n");
+       printf("  -u  Keep running specifies tests until one fails.\n");
        printf("  -v  Verbose.\n");
        printf("Available tests:\n");
        for (i = 0; i < limit; i++)
@@ -2239,6 +2244,7 @@ main(int argc, char **argv)
        time_t now;
        char *refdir_alloc = NULL;
        const char *progname;
+       char **saved_argv;
        const char *tmp, *option_arg, *p;
        char tmpdir[256], *pwd, *testprogdir, *tmp2 = NULL;
        char tmpdir_timestamp[256];
@@ -2369,6 +2375,9 @@ main(int argc, char **argv)
                        case 'r':
                                refdir = option_arg;
                                break;
+                       case 'u':
+                               until_failure++;
+                               break;
                        case 'v':
                                verbosity++;
                                break;
@@ -2480,72 +2489,84 @@ main(int argc, char **argv)
        /*
         * Run some or all of the individual tests.
         */
-       if (*argv == NULL) {
-               /* Default: Run all tests. */
-               for (i = 0; i < limit; i++) {
-                       if (test_run(i, tmpdir))
-                               tests_failed++;
-                       tests_run++;
-               }
-       } else {
-               while (*(argv) != NULL) {
-                       if (**argv >= '0' && **argv <= '9') {
-                               char *p = *argv;
-                               start = 0;
-                               while (*p >= '0' && *p <= '9') {
-                                       start *= 10;
-                                       start += *p - '0';
-                                       ++p;
+       saved_argv = argv;
+       do {
+               argv = saved_argv;
+               if (*argv == NULL) {
+                       /* Default: Run all tests. */
+                       for (i = 0; i < limit; i++) {
+                               tests_run++;
+                               if (test_run(i, tmpdir)) {
+                                       tests_failed++;
+                                       if (until_failure)
+                                               goto finish;
                                }
-                               if (*p == '\0') {
-                                       end = start;
-                               } else if (*p == '-') {
-                                       ++p;
+                       }
+               } else {
+                       while (*(argv) != NULL) {
+                               if (**argv >= '0' && **argv <= '9') {
+                                       char *p = *argv;
+                                       start = 0;
+                                       while (*p >= '0' && *p <= '9') {
+                                               start *= 10;
+                                               start += *p - '0';
+                                               ++p;
+                                       }
                                        if (*p == '\0') {
-                                               end = limit - 1;
-                                       } else {
-                                               end = 0;
-                                               while (*p >= '0' && *p <= '9') {
-                                                       end *= 10;
-                                                       end += *p - '0';
-                                                       ++p;
+                                               end = start;
+                                       } else if (*p == '-') {
+                                               ++p;
+                                               if (*p == '\0') {
+                                                       end = limit - 1;
+                                               } else {
+                                                       end = 0;
+                                                       while (*p >= '0' && *p <= '9') {
+                                                               end *= 10;
+                                                               end += *p - '0';
+                                                               ++p;
+                                                       }
                                                }
+                                       } else {
+                                               printf("*** INVALID Test %s\n", *argv);
+                                               free(refdir_alloc);
+                                               usage(progname);
+                                               return (1);
+                                       }
+                                       if (start < 0 || end >= limit || start > end) {
+                                               printf("*** INVALID Test %s\n", *argv);
+                                               free(refdir_alloc);
+                                               usage(progname);
+                                               return (1);
                                        }
                                } else {
-                                       printf("*** INVALID Test %s\n", *argv);
-                                       free(refdir_alloc);
-                                       usage(progname);
-                                       return (1);
-                               }
-                               if (start < 0 || end >= limit || start > end) {
-                                       printf("*** INVALID Test %s\n", *argv);
-                                       free(refdir_alloc);
-                                       usage(progname);
-                                       return (1);
-                               }
-                       } else {
-                               for (start = 0; start < limit; ++start) {
-                                       if (strcmp(*argv, tests[start].name) == 0)
-                                               break;
+                                       for (start = 0; start < limit; ++start) {
+                                               if (strcmp(*argv, tests[start].name) == 0)
+                                                       break;
+                                       }
+                                       end = start;
+                                       if (start >= limit) {
+                                               printf("*** INVALID Test ``%s''\n",
+                                                   *argv);
+                                               free(refdir_alloc);
+                                               usage(progname);
+                                               /* usage() never returns */
+                                       }
                                }
-                               end = start;
-                               if (start >= limit) {
-                                       printf("*** INVALID Test ``%s''\n",
-                                              *argv);
-                                       free(refdir_alloc);
-                                       usage(progname);
-                                       /* usage() never returns */
+                               while (start <= end) {
+                                       tests_run++;
+                                       if (test_run(start, tmpdir)) {
+                                               tests_failed++;
+                                               if (until_failure)
+                                                       goto finish;
+                                       }
+                                       ++start;
                                }
+                               argv++;
                        }
-                       while (start <= end) {
-                               if (test_run(start, tmpdir))
-                                       tests_failed++;
-                               tests_run++;
-                               ++start;
-                       }
-                       argv++;
                }
-       }
+       } while (until_failure);
+
+finish:
        /* Must be freed after all tests run */
        free(tmp2);
        free(testprogdir);