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

Unified Diff: net/SConscript

Issue 6080: This makes net_perftests build and run on Linux. (Closed) Base URL: http://src.chromium.org/svn/trunk/src/
Patch Set: '' Created 12 years, 3 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 | net/disk_cache/disk_cache_perftest.cc » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: net/SConscript
===================================================================
--- net/SConscript (revision 2786)
+++ net/SConscript (working copy)
@@ -282,6 +282,22 @@
install_targets = net_unittests[:]
+if env['PLATFORM'] in ('posix', 'win32'):
+
+ net_perftests = env_tests.ChromeTestProgram(
+ 'net_perftests',
+ ['disk_cache/disk_cache_test_util.cc',
+ 'disk_cache/disk_cache_perftest.cc',
+ 'base/cookie_monster_perftest.cc',
+ # TODO(sgk): avoid using .cc from base directly
+ '$BASE_DIR/run_all_perftests$OBJSUFFIX',
+ '$BASE_DIR/perftimer$OBJSUFFIX']
+ )
+
+ install_targets.extend([
+ net_perftests
+ ])
+
if env['PLATFORM'] == 'win32':
stress_cache = env_tests.ChromeTestProgram(
'stress_cache',
@@ -295,20 +311,9 @@
'disk_cache/disk_cache_test_util.cc']
)
- net_perftests = env_tests.ChromeTestProgram(
- 'net_perftests',
- ['disk_cache/disk_cache_test_util.cc',
- 'disk_cache/disk_cache_perftest.cc',
- 'base/cookie_monster_perftest.cc',
- # TODO(sgk): avoid using .cc from base directly
- '$BASE_DIR/run_all_perftests$OBJSUFFIX',
- '$BASE_DIR/perftimer$OBJSUFFIX']
- )
-
install_targets.extend([
stress_cache,
crash_cache,
- net_perftests,
])
« no previous file with comments | « no previous file | net/disk_cache/disk_cache_perftest.cc » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698