Chromium Code Reviews| Index: chrome/chrome_tests.gypi |
| diff --git a/chrome/chrome_tests.gypi b/chrome/chrome_tests.gypi |
| index fff4f33958441803c807d5ff96c6c86fecdca974..7987057e62e63eb9fc82f8f5d07d8c6622b3ac68 100644 |
| --- a/chrome/chrome_tests.gypi |
| +++ b/chrome/chrome_tests.gypi |
| @@ -444,6 +444,65 @@ |
| ], |
| }, |
| { |
|
Nirnimesh
2011/12/08 00:23:41
I forgot to point out earlier: the gyp rule for ps
DaleCurtis
2011/12/08 22:04:38
Hurm. So I'm having trouble getting this working w
Nirnimesh
2011/12/08 22:40:56
Can you upload your latest CL?
You could take othe
DaleCurtis
2011/12/08 23:03:36
Done. I looked there, but psutil is a unique in th
|
| + 'target_name': 'test_support_psutil', |
| + 'type': 'static_library', |
| + 'actions': [ |
| + { |
| + 'action_name': 'psutil_build', |
| + 'inputs': [ |
| + '../third_party/psutil/psutil/_psutil_bsd.c', |
| + '../third_party/psutil/psutil/_psutil_common.c', |
| + '../third_party/psutil/psutil/_psutil_linux.c', |
| + '../third_party/psutil/psutil/_psutil_mswindows.c', |
| + '../third_party/psutil/psutil/_psutil_osx.c', |
| + '../third_party/psutil/psutil/_psutil_posix.c', |
| + '../third_party/psutil/psutil/_psutil_bsd.h', |
| + '../third_party/psutil/psutil/_psutil_common.h', |
| + '../third_party/psutil/psutil/_psutil_linux.h', |
| + '../third_party/psutil/psutil/_psutil_mswindows.h', |
| + '../third_party/psutil/psutil/_psutil_osx.h', |
| + '../third_party/psutil/psutil/_psutil_posix.h', |
|
Nirnimesh
2011/12/08 00:23:41
please include setup.py as well, since we want to
DaleCurtis
2011/12/08 22:04:38
Done.
|
| + ], |
| + 'outputs': [ |
| + '<(PRODUCT_DIR)/psutil', |
| + '<(PRODUCT_DIR)/psutil/_compat.py', |
| + '<(PRODUCT_DIR)/psutil/_psosx.py', |
| + '<(PRODUCT_DIR)/psutil/__init__.py', |
| + '<(PRODUCT_DIR)/psutil/_pslinux.py', |
| + '<(PRODUCT_DIR)/psutil/_common.py', |
| + '<(PRODUCT_DIR)/psutil/error.py', |
| + '<(PRODUCT_DIR)/psutil/_psmswindows.py', |
| + '<(PRODUCT_DIR)/psutil/_psbsd.py', |
| + '<(PRODUCT_DIR)/psutil/_psposix.py', |
| + ], |
| + 'conditions': [ |
| + ['OS=="linux"', { |
| + 'outputs': [ |
| + '<(PRODUCT_DIR)/_psutil_linux.so', |
| + '<(PRODUCT_DIR)/_psutil_posix.so', |
| + ], |
| + },], |
|
Nirnimesh
2011/12/08 00:23:41
nit: first , not necessary
DaleCurtis
2011/12/08 22:04:38
Done.
|
| + ['OS=="mac"', { |
| + 'outputs': [ |
| + '<(PRODUCT_DIR)/_psutil_osx.so', |
| + '<(PRODUCT_DIR)/_psutil_posix.so', |
| + ], |
| + },], |
| + ['OS=="win"', { |
| + 'outputs': [ |
| + '<(PRODUCT_DIR)/_psutil_mswindows.pyd', |
| + ], |
| + },], |
| + ], |
| + 'action': ['python', |
| + '../third_party/psutil/build.py', |
| + '<(PRODUCT_DIR)' |
| + ], |
| + 'message': 'Generating psutil binary', |
|
Nirnimesh
2011/12/08 00:23:41
s/binary/binaries/
DaleCurtis
2011/12/08 22:04:38
Done.
|
| + }, |
| + ], # actions |
| + }, |
| + { |
| 'target_name': 'automated_ui_tests', |
| 'type': 'executable', |
| 'dependencies': [ |
| @@ -4029,6 +4088,7 @@ |
| 'debugger', |
| 'syncapi_core', |
| 'test_support_common', |
| + 'test_support_psutil', |
| '../skia/skia.gyp:skia', |
| '../testing/gtest.gyp:gtest', |
| ], |