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

Unified Diff: SConstruct

Issue 7631010: NaCl Proxy for graphics3d. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client/
Patch Set: '' Created 9 years, 4 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 | « DEPS ('k') | src/shared/ppapi_proxy/browser_globals.h » ('j') | no next file with comments »
Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
Index: SConstruct
===================================================================
--- SConstruct (revision 6482)
+++ SConstruct (working copy)
@@ -1217,7 +1217,15 @@
pre_base_env.AddMethod(PPAPIBrowserTesterIsBroken)
+# 3D disabled for arm, newlib & pnacl
+def PPAPIGraphics3DIsBroken(env):
+ return (env.Bit('target_arm') or
+ not env.Bit('nacl_glibc') or
+ env.Bit('bitcode'))
+pre_base_env.AddMethod(PPAPIGraphics3DIsBroken)
+
+
def PyAutoTester(env, target, test, files=[], log_verbosity=2,
extra_chrome_flags=[], args=[]):
if 'TRUSTED_ENV' not in env:
@@ -2738,6 +2746,7 @@
'tests/ppapi_browser/ppb_dev/nacl.scons',
'tests/ppapi_browser/ppb_file_system/nacl.scons',
'tests/ppapi_browser/ppb_graphics2d/nacl.scons',
+ 'tests/ppapi_browser/ppb_graphics3d/nacl.scons',
'tests/ppapi_browser/ppb_image_data/nacl.scons',
'tests/ppapi_browser/ppb_instance/nacl.scons',
'tests/ppapi_browser/ppb_memory/nacl.scons',
@@ -2755,14 +2764,12 @@
'tests/ppapi_example_audio/nacl.scons',
'tests/ppapi_example_events/nacl.scons',
'tests/ppapi_example_font/nacl.scons',
- # TODO(dspringer): re-enable these once the 3D ABI has stabilized. See
- # http://code.google.com/p/nativeclient/issues/detail?id=2060
+ # TODO(dspringer): re-enable test once the 3D ABI has stabilized. See
+ # http://code.google.com/p/nativeclient/issues/detail?id=2060
# 'tests/ppapi_example_gles2/nacl.scons',
'tests/ppapi_example_post_message/nacl.scons',
'tests/ppapi_geturl/nacl.scons',
- # TODO(dspringer): re-enable these once the 3D ABI has stabilized. See
- # http://code.google.com/p/nativeclient/issues/detail?id=2060
- # 'tests/ppapi_gles_book/nacl.scons',
+ 'tests/ppapi_gles_book/nacl.scons',
'tests/ppapi_messaging/nacl.scons',
'tests/ppapi_simple_tests/nacl.scons',
« no previous file with comments | « DEPS ('k') | src/shared/ppapi_proxy/browser_globals.h » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698