Chromium Code Reviews| Index: SConstruct |
| diff --git a/SConstruct b/SConstruct |
| index 04b3b62ac631a303f6a7d33409b73f440f99f1c2..af3ea9afd7db458de6e814888275bc2e42f0c6b3 100644 |
| --- a/SConstruct |
| +++ b/SConstruct |
| @@ -9,6 +9,8 @@ SOURCES=['chromeos/dbus/abstract_dbus_service.cc', |
| 'chromeos/dbus/dbus.cc', |
| 'chromeos/dbus/service_constants.cc', |
| 'chromeos/string.cc', |
| + 'chromeos/process.cc', |
|
petkov
2011/02/25 19:20:16
sort?
kmixter1
2011/02/26 00:54:31
Done.
|
| + 'chromeos/syslog_logging.cc', |
| 'chromeos/utility.cc'] |
| env = Environment( |
| @@ -40,7 +42,7 @@ if ARGUMENTS.get('debug', 0): |
| env_test = env.Clone() |
| env_test.Append( |
| - LIBS = ['gtest', 'chromeos', 'base', 'rt'], |
| + LIBS = ['gtest', 'base', 'rt'], |
| LIBPATH = ['.', '../third_party/chrome'], |
| ) |
| for key in Split('CC CXX AR RANLIB LD NM CFLAGS CCFLAGS'): |
| @@ -48,7 +50,11 @@ for key in Split('CC CXX AR RANLIB LD NM CFLAGS CCFLAGS'): |
| if value: |
| env_test[key] = Split(value) |
| -unittest_sources =['chromeos/glib/object_unittest.cc'] |
| +# Use libchromeos instead of passing in LIBS in order to always |
| +# get the version we just built, not what was previously installed. |
| +unittest_sources =['chromeos/glib/object_unittest.cc', |
| + 'chromeos/process_test.cc', |
|
petkov
2011/02/25 19:20:16
s/tab/spaces/ -- switch emacs to python-mode :-)
kmixter1
2011/02/26 00:54:31
Done.
|
| + 'libchromeos.a'] |
| unittest_main = ['testrunner.cc'] |
| unittest_cmd = env_test.Program('unittests', |
| unittest_sources + unittest_main) |