From 926247002b62abe8416c4ce4f48b4ca3c8214147 Mon Sep 17 00:00:00 2001
From: Eryn Wells <eryn@erynwells.me>
Date: Sun, 8 Sep 2013 12:21:24 -0700
Subject: [PATCH] Add test directory to SCons

---
 SConstruct      | 11 +++++++----
 test/SConscript |  3 +--
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/SConstruct b/SConstruct
index 8ba517e..9c0d233 100644
--- a/SConstruct
+++ b/SConstruct
@@ -28,6 +28,7 @@ lib_directories = Split("""
 # added here.
 source_directories = lib_directories + Split("""
         #src
+        #test
 """)
 
 # Include directories. Where should scons look for headers during preprocessing
@@ -70,9 +71,11 @@ if not BUILD_CMDS:
 
 
 # Build source subdirectories
-env.SConscript([os.path.join(sdir, 'SConscript') for sdir in source_directories],
-               exports='env',
-               variant_dir='build',
-               duplicate=0)
+for sdir in source_directories:
+    out_dir = os.path.join('build', Dir(sdir).path)
+    env.SConscript(os.path.join(sdir, 'SConscript'),
+                   exports='env',
+                   variant_dir=out_dir,
+                   duplicate=0)
 
 Default('charles')
diff --git a/test/SConscript b/test/SConscript
index 9cf7fc1..30147c2 100644
--- a/test/SConscript
+++ b/test/SConscript
@@ -11,6 +11,5 @@ files = Split("""
 
 """)
 
-
 test = env.Program('test_charles', files)
-env.alias('test', test)
+env.Alias('test', test)