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

Side by Side Diff: chrome/chrome_tests.gypi

Issue 8774018: Add psutil build step to fix pyauto media issues. Upgrade psutil to 0.4.0. (Closed) Base URL: http://git.chromium.org/chromium/src.git@master
Patch Set: Created 9 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 unified diff | Download patch
« no previous file with comments | « no previous file | third_party/psutil/HISTORY » ('j') | third_party/psutil/build.py » ('J')
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # Copyright (c) 2011 The Chromium Authors. All rights reserved. 1 # Copyright (c) 2011 The Chromium Authors. All rights reserved.
2 # Use of this source code is governed by a BSD-style license that can be 2 # Use of this source code is governed by a BSD-style license that can be
3 # found in the LICENSE file. 3 # found in the LICENSE file.
4 { 4 {
5 'variables' : { 5 'variables' : {
6 'pyautolib_sources': [ 6 'pyautolib_sources': [
7 'app/chrome_command_ids.h', 7 'app/chrome_command_ids.h',
8 'app/chrome_dll_resource.h', 8 'app/chrome_dll_resource.h',
9 'common/automation_constants.h', 9 'common/automation_constants.h',
10 'common/pref_names.cc', 10 'common/pref_names.cc',
(...skipping 426 matching lines...) Expand 10 before | Expand all | Expand 10 after
437 # Needed for the following #include chain: 437 # Needed for the following #include chain:
438 # test/base/run_all_unittests.cc 438 # test/base/run_all_unittests.cc
439 # test/base/chrome_test_suite.h 439 # test/base/chrome_test_suite.h
440 # gtk/gtk.h 440 # gtk/gtk.h
441 '../build/linux/system.gyp:gtk', 441 '../build/linux/system.gyp:gtk',
442 ], 442 ],
443 }], 443 }],
444 ], 444 ],
445 }, 445 },
446 { 446 {
447 'target_name': 'test_support_psutil',
448 'type': 'static_library',
449 'actions': [
450 {
451 'action_name': 'psutil_build',
452 'inputs': [
453 '../third_party/psutil/psutil/_psutil_bsd.c',
454 '../third_party/psutil/psutil/_psutil_common.c',
455 '../third_party/psutil/psutil/_psutil_linux.c',
456 '../third_party/psutil/psutil/_psutil_mswindows.c',
457 '../third_party/psutil/psutil/_psutil_osx.c',
458 '../third_party/psutil/psutil/_psutil_posix.c',
459 '../third_party/psutil/psutil/_psutil_bsd.h',
460 '../third_party/psutil/psutil/_psutil_common.h',
461 '../third_party/psutil/psutil/_psutil_linux.h',
462 '../third_party/psutil/psutil/_psutil_mswindows.h',
463 '../third_party/psutil/psutil/_psutil_osx.h',
464 '../third_party/psutil/psutil/_psutil_posix.h',
465 ],
466 'conditions': [
467 ['OS=="linux"', {
468 'outputs': [
469 '<(PRODUCT_DIR)/_psutil_linux.so',
470 '<(PRODUCT_DIR)/psutil',
471 '<(PRODUCT_DIR)/psutil/_compat.py',
472 '<(PRODUCT_DIR)/psutil/_psosx.py',
473 '<(PRODUCT_DIR)/psutil/__init__.py',
474 '<(PRODUCT_DIR)/psutil/_pslinux.py',
475 '<(PRODUCT_DIR)/psutil/_common.py',
476 '<(PRODUCT_DIR)/psutil/error.py',
477 '<(PRODUCT_DIR)/psutil/_psmswindows.py',
478 '<(PRODUCT_DIR)/psutil/_psbsd.py',
479 '<(PRODUCT_DIR)/psutil/_psposix.py',
480 '<(PRODUCT_DIR)/_psutil_posix.so',
481 ],
482 },],
483 ],
484 'action': ['python',
485 '../third_party/psutil/build.py',
486 '<(PRODUCT_DIR)'
487 ],
488 'message': 'Generating psutil binary',
489 },
490 ], # actions
491 },
492 {
447 'target_name': 'automated_ui_tests', 493 'target_name': 'automated_ui_tests',
448 'type': 'executable', 494 'type': 'executable',
449 'dependencies': [ 495 'dependencies': [
450 'browser', 496 'browser',
451 'chrome_resources.gyp:theme_resources', 497 'chrome_resources.gyp:theme_resources',
452 'renderer', 498 'renderer',
453 'test_support_common', 499 'test_support_common',
454 'test_support_ui', 500 'test_support_ui',
455 '../base/base.gyp:base', 501 '../base/base.gyp:base',
456 '../skia/skia.gyp:skia', 502 '../skia/skia.gyp:skia',
(...skipping 3552 matching lines...) Expand 10 before | Expand all | Expand 10 after
4009 'chrome_resources.gyp:chrome_strings', 4055 'chrome_resources.gyp:chrome_strings',
4010 'chrome_resources.gyp:theme_resources', 4056 'chrome_resources.gyp:theme_resources',
4011 'debugger', 4057 'debugger',
4012 'syncapi_core', 4058 'syncapi_core',
4013 'test_support_common', 4059 'test_support_common',
4014 '../skia/skia.gyp:skia', 4060 '../skia/skia.gyp:skia',
4015 '../testing/gtest.gyp:gtest', 4061 '../testing/gtest.gyp:gtest',
4016 ], 4062 ],
4017 'export_dependent_settings': [ 4063 'export_dependent_settings': [
4018 'test_support_common', 4064 'test_support_common',
4065 'test_support_psutil',
Nirnimesh 2011/12/07 00:30:41 where did you specify this dep on linux only? FWI
DaleCurtis 2011/12/07 01:26:08 In the conditions section above, I only provided o
4019 ], 4066 ],
4020 'include_dirs': [ 4067 'include_dirs': [
4021 '..', 4068 '..',
4022 ], 4069 ],
4023 'cflags': [ 4070 'cflags': [
4024 '-Wno-uninitialized', 4071 '-Wno-uninitialized',
4025 '-Wno-self-assign', # to keep clang happy for generated code. 4072 '-Wno-self-assign', # to keep clang happy for generated code.
4026 ], 4073 ],
4027 'libraries': [ 4074 'libraries': [
4028 '<@(pyautolib_libraries)', 4075 '<@(pyautolib_libraries)',
(...skipping 264 matching lines...) Expand 10 before | Expand all | Expand 10 after
4293 # Use outputs of this action as inputs for the main target build. 4340 # Use outputs of this action as inputs for the main target build.
4294 # Seems as a misnomer but makes this happy on Linux (scons). 4341 # Seems as a misnomer but makes this happy on Linux (scons).
4295 'process_outputs_as_sources': 1, 4342 'process_outputs_as_sources': 1,
4296 }, 4343 },
4297 ], # 'actions' 4344 ], # 'actions'
4298 }, 4345 },
4299 ] 4346 ]
4300 }], # 'coverage!=0' 4347 }], # 'coverage!=0'
4301 ], # 'conditions' 4348 ], # 'conditions'
4302 } 4349 }
OLDNEW
« no previous file with comments | « no previous file | third_party/psutil/HISTORY » ('j') | third_party/psutil/build.py » ('J')

Powered by Google App Engine
This is Rietveld 408576698