26 files changed, 9 insertions, 1 deletions

diff --git a/build.conf b/build.conf
index 09efc01..a8c76aa 100644
--- a/build.conf
+++ b/build.conf
@@ -13,7 +13,7 @@ set "CXXFLAGS" += "-ggdb"
         set "CXXFLAGS" += "-Isrc -fPIC",
         input filesIn("src") filter regexp("^.*\\.cpp$")
 
-directoriesIn("src/test","tests/"):
+directoriesIn("src/tests","tests/"):
         rule "exe",
         target file,
         requires "libbu++.a",
@@ -21,6 +21,14 @@ directoriesIn("src/test","tests/"):
         set "LDFLAGS" += "-L. -lbu++",
         input filesIn("{fulldir}") filter regexp("^.*\\.cpp$")
 
+filesIn("src/tests") filter regexp("^src/tests/(.*)\\.cpp$", "tests/{re:1}"):
+        rule "exe",
+        target file,
+        requires "libbu++.a",
+        set "CXXFLAGS" += "-Isrc",
+        set "LDFLAGS" += "-L. -lbu++",
+        input "src/{target}.cpp"
+
 "tests/plugin": set "LDFLAGS" += "-ldl"
 
 rule "exe":
diff --git a/src/test/clistress/main.cpp b/src/tests/clistress/main.cpp
index 6b0ac66..6b0ac66 100644
--- a/src/test/clistress/main.cpp
+++ b/src/tests/clistress/main.cpp
diff --git a/src/test/connect/main.cpp b/src/tests/connect/main.cpp
index a9fca64..a9fca64 100644
--- a/src/test/connect/main.cpp
+++ b/src/tests/connect/main.cpp
diff --git a/src/test/exception/exception.cpp b/src/tests/exception/exception.cpp
index 6417692..6417692 100644
--- a/src/test/exception/exception.cpp
+++ b/src/tests/exception/exception.cpp
diff --git a/src/test/hash/main.cpp b/src/tests/hash/main.cpp
index d0f5fa6..d0f5fa6 100644
--- a/src/test/hash/main.cpp
+++ b/src/tests/hash/main.cpp
diff --git a/src/test/hashtest/hashtest.cpp b/src/tests/hashtest/hashtest.cpp
index f31a3f8..f31a3f8 100644
--- a/src/test/hashtest/hashtest.cpp
+++ b/src/tests/hashtest/hashtest.cpp
diff --git a/src/test/httpsrv/httpconnectionmonitor.cpp b/src/tests/httpsrv/httpconnectionmonitor.cpp
index ee1eab3..ee1eab3 100644
--- a/src/test/httpsrv/httpconnectionmonitor.cpp
+++ b/src/tests/httpsrv/httpconnectionmonitor.cpp
diff --git a/src/test/httpsrv/httpconnectionmonitor.h b/src/tests/httpsrv/httpconnectionmonitor.h
index 30c0afd..30c0afd 100644
--- a/src/test/httpsrv/httpconnectionmonitor.h
+++ b/src/tests/httpsrv/httpconnectionmonitor.h
diff --git a/src/test/httpsrv/main.cpp b/src/tests/httpsrv/main.cpp
index 2f1563c..2f1563c 100644
--- a/src/test/httpsrv/main.cpp
+++ b/src/tests/httpsrv/main.cpp
diff --git a/src/test/log/log.cpp b/src/tests/log/log.cpp
index d7cfa0b..d7cfa0b 100644
--- a/src/test/log/log.cpp
+++ b/src/tests/log/log.cpp
diff --git a/src/test/md5test/md5test.cpp b/src/tests/md5test/md5test.cpp
index 6f832df..6f832df 100644
--- a/src/test/md5test/md5test.cpp
+++ b/src/tests/md5test/md5test.cpp
diff --git a/src/test/param/param.cpp b/src/tests/param/param.cpp
index a4d2824..a4d2824 100644
--- a/src/test/param/param.cpp
+++ b/src/tests/param/param.cpp
diff --git a/src/test/param/param.h b/src/tests/param/param.h
index 2756b69..2756b69 100644
--- a/src/test/param/param.h
+++ b/src/tests/param/param.h
diff --git a/src/test/plugin/main.cpp b/src/tests/plugin/main.cpp
index 51c8390..51c8390 100644
--- a/src/test/plugin/main.cpp
+++ b/src/tests/plugin/main.cpp
diff --git a/src/test/plugin/plugin.cpp b/src/tests/plugin/plugin.cpp
index ea558fd..ea558fd 100644
--- a/src/test/plugin/plugin.cpp
+++ b/src/tests/plugin/plugin.cpp
diff --git a/src/test/plugin/plugin.h b/src/tests/plugin/plugin.h
index f726867..f726867 100644
--- a/src/test/plugin/plugin.h
+++ b/src/tests/plugin/plugin.h
diff --git a/src/test/serialize/serialize.cpp b/src/tests/serialize/serialize.cpp
index e233704..e233704 100644
--- a/src/test/serialize/serialize.cpp
+++ b/src/tests/serialize/serialize.cpp
diff --git a/src/test/serializetext/serializetext.cpp b/src/tests/serializetext/serializetext.cpp
index f6be7d3..f6be7d3 100644
--- a/src/test/serializetext/serializetext.cpp
+++ b/src/tests/serializetext/serializetext.cpp
diff --git a/src/test/srvstress/main.cpp b/src/tests/srvstress/main.cpp
index 7fe7657..7fe7657 100644
--- a/src/test/srvstress/main.cpp
+++ b/src/tests/srvstress/main.cpp
diff --git a/src/test/strhash/main.cpp b/src/tests/strhash/main.cpp
index 790c5b6..790c5b6 100644
--- a/src/test/strhash/main.cpp
+++ b/src/tests/strhash/main.cpp
diff --git a/src/test/teltest/main.cpp b/src/tests/teltest/main.cpp
index 5d3ec26..5d3ec26 100644
--- a/src/test/teltest/main.cpp
+++ b/src/tests/teltest/main.cpp
diff --git a/src/test/teltest/telnetmonitor.cpp b/src/tests/teltest/telnetmonitor.cpp
index 32c2924..32c2924 100644
--- a/src/test/teltest/telnetmonitor.cpp
+++ b/src/tests/teltest/telnetmonitor.cpp
diff --git a/src/test/teltest/telnetmonitor.h b/src/tests/teltest/telnetmonitor.h
index ba5761e..ba5761e 100644
--- a/src/test/teltest/telnetmonitor.h
+++ b/src/tests/teltest/telnetmonitor.h
diff --git a/src/test/xmlreadtest/xmlreadtest.cpp b/src/tests/xmlreadtest/xmlreadtest.cpp
index 98d8a9e..98d8a9e 100644
--- a/src/test/xmlreadtest/xmlreadtest.cpp
+++ b/src/tests/xmlreadtest/xmlreadtest.cpp
diff --git a/src/test/xmlrepltest/xmlrepltest.cpp b/src/tests/xmlrepltest/xmlrepltest.cpp
index 1fe9ec2..1fe9ec2 100644
--- a/src/test/xmlrepltest/xmlrepltest.cpp
+++ b/src/tests/xmlrepltest/xmlrepltest.cpp
diff --git a/src/test/xmlwritetest/xmlwritetest.cpp b/src/tests/xmlwritetest.cpp
index 54c7a80..54c7a80 100644
--- a/src/test/xmlwritetest/xmlwritetest.cpp
+++ b/src/tests/xmlwritetest.cpp