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

Unified Diff: src/platform/minijail/SConstruct

Issue 542124: Update minijail tests with real mocks and packaging testing deps (Closed)
Patch Set: integrate notes from cmasone Created 10 years, 11 months 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 | « no previous file | src/platform/minijail/debian/control » ('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 606fbeec5899e016f9ee152ac350d0f0dee17c53..1f4ed1fe388146a4e42f56bf3e16e2fb31b58ae3 100644
--- a/src/platform/minijail/SConstruct
+++ b/src/platform/minijail/SConstruct
@@ -15,6 +15,7 @@ lib_sources = env.Split("""env.cc
options.cc""")
bin_sources = env.Split("""minijail_main.cc""")
test_sources = env.Split("""minijail_unittest.cc
+ options_unittest.cc
minijail_testrunner.cc""")
benchmark_sources = glob.glob("*_microbenchmark.cc")
@@ -36,7 +37,7 @@ env_bin = env.Clone()
env_bin.Program('minijail', lib_sources + bin_sources)
env_test = env.Clone()
-env_test.Append(LIBS=['gtest'])
+env_test.Append(LIBS=['gtest', 'gmock'])
env_test.Program('minijail_unittests', lib_sources + test_sources)
env_benchmarks = env.Clone()
@@ -44,6 +45,5 @@ env_benchmarks = env.Clone()
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'])
+ File('/usr/lib/libgtest.a')])
env_benchmarks.Program('minijail_benchmarks', benchmark_sources)
« no previous file with comments | « no previous file | src/platform/minijail/debian/control » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698