summaryrefslogtreecommitdiffstats
path: root/o3d/tests/build.scons
diff options
context:
space:
mode:
authorapatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-03 19:49:35 +0000
committerapatrick@google.com <apatrick@google.com@0039d316-1c4b-4281-b951-d872f2087c98>2009-08-03 19:49:35 +0000
commit91240c947358b33cc19c0923a06d116ab36737dd (patch)
tree7897c99ad9b41d7735c7a42e0ea75fe6f76760b3 /o3d/tests/build.scons
parent2e25a9f4152a90a179ad37206bff79e1198379d7 (diff)
downloadchromium_src-91240c947358b33cc19c0923a06d116ab36737dd.zip
chromium_src-91240c947358b33cc19c0923a06d116ab36737dd.tar.gz
chromium_src-91240c947358b33cc19c0923a06d116ab36737dd.tar.bz2
Asynchronous tick now uses NPN_PluginAsyncCall.URL streaming callbacks are now also asynchronous.Implemented NPN_PluginAsyncCall for IE.Allowed WM_PAINT handler to be reentered because it no longer calls into the browser (except to schedule an asynchronous tick if none is pending).Fixed a bug where the EventManager would crash if an event callback called cleanUp on the client.Cleanup destroys all the packs. Doing this in NPP_Destroy seems to make Chrome timeout and fail to load the next page.Tar and GZ decoding happens on a new thread.
Review URL: http://codereview.chromium.org/155733 git-svn-id: svn://svn.chromium.org/chrome/trunk/src@22305 0039d316-1c4b-4281-b951-d872f2087c98
Diffstat (limited to 'o3d/tests/build.scons')
-rw-r--r--o3d/tests/build.scons24
1 files changed, 22 insertions, 2 deletions
diff --git a/o3d/tests/build.scons b/o3d/tests/build.scons
index ee252a2..7b4be1c 100644
--- a/o3d/tests/build.scons
+++ b/o3d/tests/build.scons
@@ -110,7 +110,7 @@ env.Prepend(
'technique',
'antlr3c',
'gtest',
- 'skia'
+ 'skia',
] + env['ICU_LIBS'],
)
@@ -123,6 +123,22 @@ env.Append(
LIBS = env['RENDERER_LIBS'],
)
+# Add libevent on posix platforms.
+if env.Bit('mac') or env.Bit('linux'):
+ env.Append(
+ LIBS = [
+ 'event',
+ ],
+ )
+
+# Add cocoa framework on mac.
+if env.Bit('mac'):
+ env.Append(
+ FRAMEWORKS = [
+ 'Cocoa',
+ ],
+ )
+
run_env = env.Clone()
if env.Bit('linux'):
run_env.Append(ENV = os.environ)
@@ -181,6 +197,7 @@ tests = [
'core/cross/draw_pass_test.cc',
'core/cross/effect_test.cc',
'core/cross/element_test.cc',
+ 'core/cross/event_manager_test.cc',
'core/cross/fake_vertex_source.cc',
'core/cross/features_test.cc',
'core/cross/field_test.cc',
@@ -223,6 +240,7 @@ tests = [
'import/cross/gz_compressor_test.cc',
'import/cross/gz_decompressor_test.cc',
'import/cross/json_object_test.cc',
+ 'import/cross/main_thread_archive_callback_client_test.cc',
'import/cross/memory_buffer_test.cc',
'import/cross/memory_stream_test.cc',
'import/cross/raw_data_test.cc',
@@ -230,6 +248,7 @@ tests = [
'import/cross/tar_processor_test.cc',
'import/cross/targz_generator_test.cc',
'import/cross/targz_processor_test.cc',
+ 'import/cross/threaded_stream_processor_test.cc',
'serializer/cross/serializer_test.cc',
'tests/common/cross/test_utils.cc',
'utils/cross/file_path_utils_test.cc',
@@ -743,7 +762,8 @@ pulse_tests = [env.Alias('presubmit')]
# OpenGL tests don't work with selenium yet.
if 'RENDERER_D3D9' in env['CPPDEFINES']:
pulse_tests += [env.Alias('selenium_firefox'),
- env.Alias('selenium_ie')]
+ env.Alias('selenium_ie'),
+ env.Alias('selenium_chrome')]
# Add selenium for mac.
if env.Bit('mac'):
pulse_tests += [env.Alias('selenium')]