Fix tests in libs-only distribution

diff --git a/free/libs/Makefile b/free/libs/Makefile
index c08913f8a3f22f12e98a39f925d17ba67fff5094..7ee57edd82dafd311d62264d26637537f93acbe8 100644 (file)
--- a/free/libs/Makefile
+++ b/free/libs/Makefile
@@ -24,6 +24,8 @@ include $(s)/ucw/Makefile
 # Stripped down version
 ifndef CONFIG_UCW_ONLY
 
+TESTING_DEPS=$(LIBSH)
+
 # Install config files
 FREE_CONFIGS=sherlock local
 CONFIGS+=$(FREE_CONFIGS)

diff --git a/ucw/Makefile b/ucw/Makefile
index 8f2be3f6e36047239d43990468e1f0b0ba799807..6e7ca42c29de794234545a49ab82779baf8cd798 100644 (file)
--- a/ucw/Makefile
+++ b/ucw/Makefile
@@ -94,11 +94,15 @@ $(o)/ucw/ipaccess-test: $(o)/ucw/ipaccess-test.o $(LIBUCW)
 $(o)/ucw/trie-test: $(o)/ucw/trie-test.o $(LIBUCW)
 
 TESTS+=$(addprefix $(o)/ucw/,regex.test unicode.test hash-test.test mempool.test stkstring.test \
-    slists.test kmp-test.test bbuf.test getopt.test ff-unicode.test eltpool.test \
+    slists.test bbuf.test getopt.test ff-unicode.test eltpool.test \
     fb-socket.test trie-test.test string.test sha1.test asort-test.test binheap-test.test \
     redblack-test.test fb-file.test fb-grow.test fb-pool.test fb-atomic.test \
     fb-limfd.test fb-temp.test fb-mem.test fb-buffer.test fb-mmap.test url.test)
 
+ifdef LIBCHARSET
+TESTS+=$(o)/ucw/kmp-test.test
+endif
+
 $(o)/ucw/regex.test: $(o)/ucw/regex-t
 $(o)/ucw/unicode.test: $(o)/ucw/unicode-t
 $(o)/ucw/hash-test.test: $(o)/ucw/hash-test