Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(2197)

Unified Diff: src/platform/minijail/SConstruct

Issue 492005: Overhaul microbenchmark so that it can be pulled in easily by any package (Closed)
Patch Set: fix cmasone's comments Created 11 years ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View side-by-side diff with in-line comments
Download patch
« no previous file with comments | « src/platform/microbenchmark/microbenchmark.cc ('k') | src/platform/minijail/debian/rules » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: src/platform/minijail/SConstruct
diff --git a/src/platform/minijail/SConstruct b/src/platform/minijail/SConstruct
index 6ffe69f5e46d9758b7afbb32c949ef0d95ff38dd..464514c6c6e5721027ff97d556ac0972793e53e2 100644
--- a/src/platform/minijail/SConstruct
+++ b/src/platform/minijail/SConstruct
@@ -4,6 +4,7 @@
# Use of this source code is governed by a BSD-style license that can be
# found in the LICENSE file.
+import glob
import os
env = Environment()
@@ -15,8 +16,7 @@ lib_sources = env.Split("""env.cc
bin_sources = env.Split("""minijail_main.cc""")
test_sources = env.Split("""minijail_unittest.cc
minijail_testrunner.cc""")
-
-#test_sources = env.Split("""../base/strutil.cc""")
+benchmark_sources = glob.glob("*_microbenchmark.cc")
env.Append(
CPPPATH=['..', '../../third_party/chrome/files', '../../common'],
@@ -32,5 +32,14 @@ env_bin = env.Clone()
env_bin.Program('minijail', lib_sources + bin_sources)
env_test = env.Clone()
-env_test.Append(LIBS=['gtest', 'pcrecpp'])
+env_test.Append(LIBS=['gtest'])
env_test.Program('minijail_unittests', lib_sources + test_sources)
+
+env_benchmarks = env.Clone()
+# Note, LIBS needs to have: 'gtest', 'base', 'rt', 'pthread'
+env_benchmarks.Append(LIBS=['microbenchmark_main.a',
+ # Since we want to run this on a prod image,
+ # we just statically pull in gtest.a.
+ File('/usr/lib/libgtest.a')],
+ LIBPATH=['../microbenchmark'])
+env_benchmarks.Program('minijail_benchmarks', benchmark_sources)
« no previous file with comments | « src/platform/microbenchmark/microbenchmark.cc ('k') | src/platform/minijail/debian/rules » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698