Make the tests work with CONFIG_UCW_ONLY

diff --git a/free/libs/Makefile b/free/libs/Makefile
index 6135235d0b05cd907da24a0a1122c43f335648b5..5b69935473f6129c1ec796988981b9b87d64a19b 100644 (file)
--- a/free/libs/Makefile
+++ b/free/libs/Makefile
@@ -56,6 +56,10 @@ LIBIMAGES=$(o)/images/libimages.pc
 include $(s)/images/Makefile
 endif
 
+else
+
+TESTING_DEPS=$(LIBUCW)
+
 endif
 
 # Build documentation by default?

diff --git a/ucw/kmp-test.c b/ucw/kmp-test.c
index 92b91c762742de87d825c0de05bcc070863ca604..cb18d03229234f6db7ffe44f24cb491eeeaf0633 100644 (file)
--- a/ucw/kmp-test.c
+++ b/ucw/kmp-test.c
@@ -50,6 +50,8 @@ test1(void)
   kmp1_cleanup(&kmp);
 }
 
+#ifndef CONFIG_UCW_ONLY                /* This one depends on LIBCHARSET */
+
 /* TEST2 - various tracing */
 
 #define KMP_PREFIX(x) kmp2_##x
@@ -89,6 +91,8 @@ test2(void)
   kmp2_cleanup(&kmp);
 }
 
+#endif
+
 /* TEST3 - random tests */
 
 #define KMP_PREFIX(x) kmp3_##x
@@ -199,7 +203,9 @@ int
 main(void)
 {
   test1();
+#ifndef CONFIG_UCW_ONLY
   test2();
+#endif
   test3();
   test4();
   return 0;