From 6be100e28afafea9fcd5ce005d9cef75094fa8a1 Mon Sep 17 00:00:00 2001 From: Eryn Wells Date: Thu, 12 Sep 2013 15:54:17 -0700 Subject: [PATCH] Update testing makefile --- SConstruct | 2 +- test/SConscript | 6 +----- 2 files changed, 2 insertions(+), 6 deletions(-) diff --git a/SConstruct b/SConstruct index 9490734..bbd5505 100644 --- a/SConstruct +++ b/SConstruct @@ -77,7 +77,7 @@ if not BUILD_CMDS: # Build charles src_dir = Dir('#src') charles_lib = env.SConscript(os.path.join(src_dir.path, 'SConscript'), - exports='env', + exports=['env'], variant_dir=os.path.join('build', src_dir.path), duplicate=0) diff --git a/test/SConscript b/test/SConscript index 07faa20..db2c354 100644 --- a/test/SConscript +++ b/test/SConscript @@ -10,11 +10,7 @@ Import('gtest') Import('charles_lib') files = Split(""" - test_asserts.c - test_basics.c - test_charles.c - test_object.c """) -prog = env.Program('test_charles', [gtest, charles_lib, files]) +prog = env.Program('test_charles', [gtest, charles, files]) env.Alias('test', prog)