added some fastbuf tests

diff --git a/lib/Makefile b/lib/Makefile
index 80d1c3a2322197d0e512b90e7ce8278aa316fd59..6ef3ef7eb2661ba8b43f9fd012a79232b14b0839 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -99,7 +99,7 @@ $(o)/lib/kmp-test: $(o)/lib/kmp-test.o $(LIBUCW) $(LIBCHARSET)
 $(o)/lib/ipaccess-test: $(o)/lib/ipaccess-test.o $(LIBUCW)
 
 TESTS+=$(addprefix $(o)/lib/,regex.test unicode-utf8.test hash-test.test mempool.test stkstring.test \
-    slists.test kmp-test.test bbuf.test getopt.test fb-pool.test)
+    slists.test kmp-test.test bbuf.test getopt.test fastbuf.test)
 
 $(o)/lib/regex.test: $(o)/lib/regex-t
 $(o)/lib/unicode-utf8.test: $(o)/lib/unicode-utf8-t
@@ -111,7 +111,7 @@ $(o)/lib/slists.test: $(o)/lib/slists-t
 $(o)/lib/kmp-test.test: $(o)/lib/kmp-test
 $(o)/lib/bbuf.test: $(o)/lib/bbuf-t
 $(o)/lib/getopt.test: $(o)/lib/getopt-t
-$(o)/lib/fb-pool.test: $(o)/lib/fb-pool-t
+$(o)/lib/fastbuf.test: $(o)/lib/fb-grow-t $(o)/lib/fb-pool-t
 
 ifdef CONFIG_UCW_THREADS
 TESTS+=$(addprefix $(o)/lib/,asio.test)

diff --git a/lib/fastbuf.t b/lib/fastbuf.t
new file mode 100644 (file)
index 0000000..f861f63
--- /dev/null
+++ b/lib/fastbuf.t
@@ -0,0 +1,10 @@
+# Tests for fastbufs
+
+Run:   obj/lib/fb-grow-t
+Out:   <10><10><0>1234512345<10><9>5<10>
+       <30><30><0>1234512345<10><9>5<10>
+       <20><20><0>1234512345<10><9>5<10>
+       <20><20><0>1234512345<10><9>5<10>
+       <20><20><0>1234512345<10><9>5<10>
+
+Run:   obj/lib/fb-pool-t

diff --git a/lib/fb-grow.c b/lib/fb-grow.c
index a5ed4d685a0c7c5adf1a43d0ba0c40942545ea73..80b296f97616a520b945bab2a7898c10c41ad29a 100644 (file)
--- a/lib/fb-grow.c
+++ b/lib/fb-grow.c
@@ -109,12 +109,11 @@ fbgrow_rewind(struct fastbuf *b)
 int main(void)
 {
   struct fastbuf *f;
-  int t;
+  uns t;
 
   f = fbgrow_create(3);
   for (uns i=0; i<5; i++)
     {
-      fbgrow_write(f);
       bwrite(f, "12345", 5);
       bwrite(f, "12345", 5);
       printf("<%d>", (int)btell(f));
@@ -122,13 +121,13 @@ int main(void)
       printf("<%d>", (int)btell(f));
       fbgrow_rewind(f);
       printf("<%d>", (int)btell(f));
-      while ((t = bgetc(f)) >= 0)
+      while ((t = bgetc(f)) != ~0U)
        putchar(t);
       printf("<%d>", (int)btell(f));
       fbgrow_rewind(f);
       bseek(f, -1, SEEK_END);
       printf("<%d>", (int)btell(f));
-      while ((t = bgetc(f)) >= 0)
+      while ((t = bgetc(f)) != ~0U)
        putchar(t);
       printf("<%d>\n", (int)btell(f));
     }

diff --git a/lib/fb-pool.t b/lib/fb-pool.t
deleted file mode 100644 (file)
index 8cf7938..0000000
--- a/lib/fb-pool.t
+++ /dev/null
@@ -1,3 +0,0 @@
-# Tests for fastbufs on memory pools
-
-Run:   obj/lib/fb-pool-t