Addressed Tavis's comments in http://codereview.chromium.org/3023041/....

test/SConstruct

Index: test/SConstruct
===================================================================
--- test/SConstruct	(revision 34)
+++ test/SConstruct	(working copy)
@@ -8,7 +8,7 @@
 
 # Since the validator-checker tool might handle malicious font files, all hardening options for recent g++/ld are enabled just in case.
 # See http://wiki.debian.org/Hardening for details.
-env = Environment(CCFLAGS = ['-O2', '-I../include', '-I/usr/include/freetype2', '-ggdb', '-Wall', '-W', '-Wno-unused-parameter', '-fno-strict-aliasing', '-fPIE', '-fstack-protector', '-D_FORTIFY_SOURCE=2', '-DOTS_DEBUG'], LINKFLAGS = ['-ggdb', '-Wl,-z,relro', '-Wl,-z,now', '-pie', '-lz'])
+env = Environment(CCFLAGS = ['-O2', '-I../include', '-I../src', '-I/usr/include/freetype2', '-ggdb', '-Wall', '-W', '-Wno-unused-parameter', '-fno-strict-aliasing', '-fPIE', '-fstack-protector', '-D_FORTIFY_SOURCE=2', '-DOTS_DEBUG'], LINKFLAGS = ['-ggdb', '-Wl,-z,relro', '-Wl,-z,now', '-pie', '-lz'])
 # TODO(yusukes): better to use pkg-config freetype2 --cflags
  
 env.Library('../src/libots.a',
@@ -35,7 +35,8 @@
 	    '../src/vdmx.cc',
 	    '../src/vorg.cc'
             ])
- 
+
+env.Program('../test/cff_type2_charstring_test.cc', LIBS = ['ots', 'gtest_main'], LIBPATH = '../src')
 env.Program('../test/ot-sanitise.cc', LIBS = ['ots'], LIBPATH='../src')
 env.Program('../test/idempotent.cc', LIBS = ['ots', 'freetype', 'z', 'm'], LIBPATH='../src')
 env.Program('../test/perf.cc', LIBS = ['ots'], LIBPATH='../src')