lca2011: enhance test/run to use ccan/foreach

diff --git a/ccan/oserver/_info b/ccan/oserver/_info
index e73e85555272a8ed3abc6eccf2108893206f8964..a05fa035f169a7a11923c79d0be639fcc18e10f8 100644 (file)
--- a/ccan/oserver/_info
+++ b/ccan/oserver/_info
@@ -38,6 +38,7 @@ int main(int argc, char *argv[])
                printf("ccan/compiler\n");
                printf("ccan/read_write_all\n");
                printf("ccan/str\n");
+               printf("ccan/foreach\n");
                return 0;
        }
 

diff --git a/ccan/oserver/test/run.c b/ccan/oserver/test/run.c
index f6c5b45762ff30a413fd840baaa1577e1321c671..dc6031b9de547e715a4e6f54c80389afcc62fc4c 100644 (file)
--- a/ccan/oserver/test/run.c
+++ b/ccan/oserver/test/run.c
@@ -1,7 +1,7 @@
 #include <ccan/oserver/oserver.h>
 #include <ccan/oserver/oserver.c>
 #include <ccan/str/str.h>
-#include <ccan/array_size/array_size.h>
+#include <ccan/foreach/foreach.h>
 #include <ccan/tap/tap.h>
 #include <sys/types.h>
 #include <sys/stat.h>
@@ -11,23 +11,24 @@
 
 int main(void)
 {
-       int fd, i;
+       int fd;
        int status;
        char buf[200];
-       const char *input[] = { "This is a test\n",
-                               "This is a test\r",
-                               "This is a test\r\n",
-                               "This is a test\nWith extra",
-                               "This is a test\rWith extra",
-                               "This is a test\r\nWith extra" };
+       const char *input;
 
        /* This is how many tests you plan to run */
-       plan_tests(4 * ARRAY_SIZE(input));
-
-       for (i = 0; i < ARRAY_SIZE(input); i++) {
+       plan_tests(4 * 6);
+
+       foreach_ptr(input,
+                   "This is a test\n",
+                   "This is a test\r",
+                   "This is a test\r\n",
+                   "This is a test\nWith extra",
+                   "This is a test\rWith extra",
+                   "This is a test\r\nWith extra") {
                fd = open("run-fd", O_RDWR|O_CREAT|O_TRUNC, 0600);
 
-               write(fd, input[i], strlen(input[i]));
+               write(fd, input, strlen(input));
                lseek(fd, 0, SEEK_SET);
 
                if (fork() == 0)
@@ -41,11 +42,11 @@ int main(void)
                lseek(fd, 0, SEEK_SET);
                buf[read(fd, buf, sizeof(buf)-1)] = '\0';
 
-               ok1(strncmp(buf, input[i], strlen("This is a test")) == 0);
+               ok1(strncmp(buf, input, strlen("This is a test")) == 0);
                ok1(streq(buf + strlen("This is a test") + 1,
                          "Louder, like this: 'THIS IS A TEST'\r\n"));
        }
-               
+
        /* This exits depending on whether all tests passed */
        return exit_status();
 }