Use new setup for unit tests

1 files changed, 35 insertions, 8 deletions

diff --git a/bbot/buildfile b/bbot/buildfile
index dbb32c6..3925585 100644
--- a/bbot/buildfile
+++ b/bbot/buildfile
@@ -28,22 +28,49 @@ if ($cxx.target.class == "linux")
 {
   ./: exe{bbot-agent} service{'bbot-agent@'}
 
-  exe{bbot-agent}: agent/{hxx ixx txx cxx}{* -agent-options} \
-                   agent/{hxx ixx cxx}{agent-options} libue{bbot}
+  exe{bbot-agent}: agent/cxx{agent} agent/libue{bbot}
+
+  agent/
+  {
+    libue{bbot}: {hxx ixx txx cxx}{* -agent -agent-options -*.test...} \
+                 {hxx ixx cxx}{agent-options}                   \
+                 ../libue{bbot}
+  }
 }
 
-./: exe{bbot-worker}
+./: exe{bbot-worker}: worker/cxx{worker} worker/libue{bbot}
 
-exe{bbot-worker}: worker/{hxx ixx txx cxx}{* -worker-options} \
-                  worker/{hxx ixx cxx}{worker-options} libue{bbot}
+ worker/
+{
+  libue{bbot}: {hxx ixx txx cxx}{* -worker -worker-options -*.test...} \
+               {hxx ixx cxx}{worker-options}                           \
+               ../libue{bbot}
+}
 
-libue{bbot}: bin.whole = false
-libue{bbot}: {hxx ixx txx cxx}{* -common-options -version} \
-             {hxx ixx cxx}{common-options} {hxx}{version}  \
+libue{bbot}: {hxx ixx txx cxx}{* -common-options -version -*.test...} \
+             {hxx ixx cxx}{common-options}                            \
+             {hxx}{version}                                           \
              $libs
 
 hxx{version}: in{version} $src_root/manifest
 
+# Unit tests.
+#
+exe{*.test}:
+{
+  test = true
+  install = false
+}
+
+for t: cxx{**.test...}
+{
+  d = $directory($t)
+  n = $name($t)...
+
+  ./: $d/exe{$n}: $t $d/{hxx ixx txx}{+$n} $d/testscript{+$n}
+  $d/exe{$n}: $d/libue{bbot}: bin.whole = false
+}
+
 # Generated options parser.
 #
 if $cli.configured