The test scons target is now aware of the result of running the test suite.

2 files changed, 16 insertions, 5 deletions

diff --git a/SConstruct b/SConstruct
index 05393a7..5422ccd 100644
--- a/SConstruct
+++ b/SConstruct
@@ -27,11 +27,7 @@ def build_doc():
 
 def run_tests():
     _fiddle_with_pythonpath()
-    from test.TestsRunner import run_unit_tests
-    # FIXME: this is not really well integrated as scons is not informed
-    # whether the unit tests passed or failed.
-    # http://www.scons.org/wiki/UnitTests may be of use.
-    result = run_unit_tests()
+    SConscript('test/SConscript')
 
 if not BUILD_TARGETS:
     # Default target: lib
@@ -44,5 +40,6 @@ else:
         # module to be in the python path.
         build_doc()
     if 'test' in BUILD_TARGETS:
+        # Note: running the unit tests requires the lib to be built.
         run_tests()
 
diff --git a/test/SConscript b/test/SConscript
new file mode 100644
index 0000000..f1efb4e
--- /dev/null
+++ b/test/SConscript
@@ -0,0 +1,14 @@
+# -*- coding: utf-8 -*-
+
+from TestsRunner import run_unit_tests
+
+def tests_builder(target, source, env):
+    result = run_unit_tests()
+    if result.wasSuccessful():
+        return None
+    else:
+        return result.errors + result.failures
+
+env = Environment()
+env.Command('test', None, tests_builder)
+