X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=inline;f=ucw%2Fkmp-test.c;h=59c61ff02ae337f09088d8bf1615045bae01bce7;hb=44255962ee197743a9c3e867cb7fdf17ae1678b3;hp=4e8e3ca88255a617e19d8f0d609149564b93f3ed;hpb=031256ad2e123eec58521f8e3eb9496c197641d2;p=libucw.git

diff --git a/ucw/kmp-test.c b/ucw/kmp-test.c
index 4e8e3ca8..59c61ff0 100644
--- a/ucw/kmp-test.c
+++ b/ucw/kmp-test.c
@@ -4,12 +4,12 @@
  *      (c) 2006, Pavel Charvat <pchar@ucw.cz>
  */
 
-#include "ucw/lib.h"
-#include "ucw/mempool.h"
+#include <ucw/lib.h>
+#include <ucw/mempool.h>
 #include <string.h>
 
 #if 0
-#define TRACE(x...) do{log(L_DEBUG, x);}while(0)
+#define TRACE(x...) do{msg(L_DEBUG, x);}while(0)
 #else
 #define TRACE(x...) do{}while(0)
 #endif
@@ -18,18 +18,18 @@
 
 #define KMP_PREFIX(x) kmp1_##x
 #define KMP_WANT_CLEANUP
-#include "ucw/kmp.h"
+#include <ucw/kmp.h>
 #define KMPS_PREFIX(x) kmp1s1_##x
 #define KMPS_KMP_PREFIX(x) kmp1_##x
 #define KMPS_WANT_BEST
 #define KMPS_EXIT(kmp,src,s) TRACE("Best match has %d characters", s->best->len)
-#include "ucw/kmp-search.h"
+#include <ucw/kmp-search.h>
 #define KMPS_PREFIX(x) kmp1s2_##x
 #define KMPS_KMP_PREFIX(x) kmp1_##x
 #define KMPS_VARS uns count;
 #define KMPS_INIT(kmp,src,s) s->u.count = 0
 #define KMPS_FOUND(kmp,src,s) s->u.count++
-#include "ucw/kmp-search.h"
+#include <ucw/kmp-search.h>
 
 static void
 test1(void)
@@ -50,6 +50,8 @@ test1(void)
   kmp1_cleanup(&kmp);
 }
 
+#ifdef CONFIG_CHARSET		/* This one depends on libucw-charset */
+
 /* TEST2 - various tracing */
 
 #define KMP_PREFIX(x) kmp2_##x
@@ -69,7 +71,7 @@ test1(void)
 #define KMPS_MERGE_CONTROLS
 #define KMPS_FOUND(kmp,src,s) TRACE("String %s with id %d found", s->out->u.str, s->out->u.id)
 #define KMPS_STEP(kmp,src,s) TRACE("Got to state %p after reading %d", s->s, s->c)
-#include "ucw/kmp.h"
+#include <ucw/kmp.h>
 
 static void
 test2(void)
@@ -89,6 +91,8 @@ test2(void)
   kmp2_cleanup(&kmp);
 }
 
+#endif
+
 /* TEST3 - random tests */
 
 #define KMP_PREFIX(x) kmp3_##x
@@ -102,7 +106,7 @@ test2(void)
 #define KMP_WANT_SEARCH
 #define KMPS_VARS uns sum, *cnt;
 #define KMPS_FOUND(kmp,src,s) do{ ASSERT(s->u.cnt[s->out->u.index]); s->u.cnt[s->out->u.index]--; s->u.sum--; }while(0)
-#include "ucw/kmp.h"
+#include <ucw/kmp.h>
 
 static void
 test3(void)
@@ -181,7 +185,7 @@ kmp4_hash(struct kmp4_struct *kmp UNUSED, struct kmp4_state *s, byte *c)
 #define KMPS_FOUND(kmp,src,s) TRACE("found")
 #define KMPS_ADD_CONTROLS
 #define KMPS_MERGE_CONTROLS
-#include "ucw/kmp.h"
+#include <ucw/kmp.h>
 
 static void
 test4(void)
@@ -199,7 +203,9 @@ int
 main(void)
 {
   test1();
+#ifdef CONFIG_CHARSET
   test2();
+#endif
   test3();
   test4();
   return 0;