commiting changes for test case of grab_file

diff --git a/ccan/string/test/run-grab.c b/ccan/string/test/run-grab.c
index cfd8b9b43abf63b90436676ad67a11b86cfe765b..96b9dac852b428224171563e608c6126ec1e1f0f 100644 (file)
--- a/ccan/string/test/run-grab.c
+++ b/ccan/string/test/run-grab.c
@@ -1,6 +1,5 @@
-/* This is test for grab_file() function */
-
-/*
+/* This is test for grab_file() function
+ *

  * Example:
  * 
  * void *grab_file(const void *ctx, const char *filename)
  * Example:
  * 
  * void *grab_file(const void *ctx, const char *filename)


@@ -22,4 +21,34 @@
  *     }
  */
 
  *     }
  */
 

+#include       <stdlib.h>
+#include       <stdio.h>
+#include       <err.h>
+#include       <sys/stat.h>
+#include       "string/string.h"
+#include       "string/string.c"
+#include       "tap/tap.h"
+
+int 
+main(int argc, char *argv[])
+{
+       unsigned int    i;
+       char            **split, *str;
+       int             length;
+       struct          stat st;
+
+       str = grab_file(NULL, "ccan/string/test/run-grab.c");
+       split = strsplit(NULL, str, "\n", NULL);
+       length = strlen(split[0]);
+       ok1(streq(split[0], "/* This is test for grab_file() function"));
+       for (i = 1; split[i]; i++)      
+               length += strlen(split[i]);
+       ok1(streq(split[i-1], "/* End of grab_file() test */"));
+       if (stat("ccan/string/test/run-grab.c", &st) != 0) 
+               err(1, "Could not stat self");
+       ok1(st.st_size == length + i);
+       
+       return 0;
+}
+

 /* End of grab_file() test */
 /* End of grab_file() test */

diff --git a/ccan/string/test/run.c b/ccan/string/test/run.c
index f68e7ec56c5c886293be9b5f8e4c086e6076ebfb..c50854ab61c5d996e5365af50bbbce9158c1ad93 100644 (file)
--- a/ccan/string/test/run.c
+++ b/ccan/string/test/run.c
@@ -27,9 +27,7 @@ int main(int argc, char *argv[])
        char **split, *str;
        void *ctx;
        char *strings[NUM_SUBSTRINGS * NUM_SUBSTRINGS];
        char **split, *str;
        void *ctx;
        char *strings[NUM_SUBSTRINGS * NUM_SUBSTRINGS];

-       int length;
-       struct stat st;
-
+       

        n = 0;
        for (i = 0; i < NUM_SUBSTRINGS; i++) {
                for (j = 0; j < NUM_SUBSTRINGS; j++) {
        n = 0;
        for (i = 0; i < NUM_SUBSTRINGS; i++) {
                for (j = 0; j < NUM_SUBSTRINGS; j++) {


@@ -117,16 +115,5 @@ int main(int argc, char *argv[])
        ok1(talloc_parent(str) == ctx);
        talloc_free(ctx);
 
        ok1(talloc_parent(str) == ctx);
        talloc_free(ctx);
 

-       str = grab_file(NULL, "ccan/string/test/run-grab.c");
-       split = strsplit(NULL, str, "\n", NULL);
-       length = strlen(split[0]);
-       ok1(streq(split[0], "/* This is test for grab_file() function */"));
-       for(i = 1; split[i]; i++)       
-               length += strlen(split[i]);
-       ok1(streq(split[i-1], "/* End of grab_file() test */"));
-       if (stat("ccan/string/test/run-grab.c", &st) != 0) 
-               err(1, "Could not stat self");
-       ok1(st.st_size == length);
-               

        return exit_status();
 }                              
        return exit_status();
 }