diff options
| author | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-01 22:30:03 +0000 |
|---|---|---|
| committer | gspencer@google.com <gspencer@google.com@0039d316-1c4b-4281-b951-d872f2087c98> | 2009-07-01 22:30:03 +0000 |
| commit | 30eb751d1a778b73e20c238ec2f54b7293eb1b6f (patch) | |
| tree | 64f775e2bf824492b8d1e3e2680d05592a0abb57 /o3d/build | |
| parent | 5d3d854522bf38df112ca73e3bb6e9c4adb627ae (diff) | |
| download | chromium_src-30eb751d1a778b73e20c238ec2f54b7293eb1b6f.zip chromium_src-30eb751d1a778b73e20c238ec2f54b7293eb1b6f.tar.gz chromium_src-30eb751d1a778b73e20c238ec2f54b7293eb1b6f.tar.bz2 | |
Adding in most of the unit tests. This adds 406 of our unit tests
into the gyp build. 21 of them fail, but that is only because they don't
have test input yet -- I haven't added the build code that copies
the test inputs into the build dir yet.
Review URL: http://codereview.chromium.org/147129
git-svn-id: svn://svn.chromium.org/chrome/trunk/src@19778 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/build')
| -rw-r--r-- | o3d/build/all.gyp | 1 | ||||
| -rw-r--r-- | o3d/build/nacl.gyp | 4 |
2 files changed, 3 insertions, 2 deletions
diff --git a/o3d/build/all.gyp b/o3d/build/all.gyp index 6ca0803..43ea2ae 100644 --- a/o3d/build/all.gyp +++ b/o3d/build/all.gyp @@ -23,6 +23,7 @@ '../converter/converter.gyp:*', '../core/core.gyp:*', '../import/import.gyp:*', + '../tests/tests.gyp:*', '../plugin/idl/idl.gyp:*', '../plugin/plugin.gyp:*', '../serializer/serializer.gyp:*', diff --git a/o3d/build/nacl.gyp b/o3d/build/nacl.gyp index 99ed5ec..8b84e89 100644 --- a/o3d/build/nacl.gyp +++ b/o3d/build/nacl.gyp @@ -34,7 +34,7 @@ 'dummy_file_that_never_gets_built_so_scons_always_runs', ], 'action': [ - 'python', + 'C:/Python24/python.exe', '<@(_inputs)', '--output="<(nacl_output_dir)"', '--configuration="<(CONFIGURATION)"', @@ -43,7 +43,7 @@ ], }, ], - 'direct_dependent_settings': { + 'all_dependent_settings': { 'include_dirs': [ '<(nacldir)', ], |