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

Side by Side Diff: SConstruct

Issue 7470034: Enabled PyAuto on the Mac 10.6 bots. (Closed) Base URL: svn://svn.chromium.org/native_client/trunk/src/native_client
Patch Set: Fixes Created 9 years, 5 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 unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « no previous file | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
1 # -*- python -*- 1 # -*- python -*-
2 # Copyright (c) 2011 The Native Client Authors. All rights reserved. 2 # Copyright (c) 2011 The Native Client Authors. All rights reserved.
3 # Use of this source code is governed by a BSD-style license that can be 3 # Use of this source code is governed by a BSD-style license that can be
4 # found in the LICENSE file. 4 # found in the LICENSE file.
5 5
6 import atexit 6 import atexit
7 import glob 7 import glob
8 import os 8 import os
9 import platform 9 import platform
10 import stat 10 import stat
(...skipping 1273 matching lines...) Expand 10 before | Expand all | Expand 10 after
1284 osenv=osenv, 1284 osenv=osenv,
1285 extra_deps=extra_deps) 1285 extra_deps=extra_deps)
1286 1286
1287 pre_base_env.AddMethod(PyAutoTester) 1287 pre_base_env.AddMethod(PyAutoTester)
1288 1288
1289 1289
1290 # Disabled for ARM (because Chrome binaries for ARM are not available), on the 1290 # Disabled for ARM (because Chrome binaries for ARM are not available), on the
1291 # Chrome bots (because PyAuto is not expected to be available on them) and when 1291 # Chrome bots (because PyAuto is not expected to be available on them) and when
1292 # 32-bit test binaries are run on a 64-bit machine (because 32-bit python is not 1292 # 32-bit test binaries are run on a 64-bit machine (because 32-bit python is not
1293 # available on 64-bit machines). 1293 # available on 64-bit machines).
1294 # However, our Mac bots will have 32-bit versions of Python 2.5, even if they
Mark Seaborn 2011/07/27 00:44:27 Please spell out the cases: * Mac OS X 10.5 bots
1295 # are 64-bit machines.
1296 # TODO(ncbray): check the architechture of the Python that we plan to run,
Mark Seaborn 2011/07/27 00:44:27 sp: architecture
1297 # rather than the architechture of Python currently running.
Mark Seaborn 2011/07/27 00:44:27 ditto
1294 def PyAutoTesterIsBroken(env): 1298 def PyAutoTesterIsBroken(env):
1295 return (PPAPIBrowserTesterIsBroken(env) or 1299 return (PPAPIBrowserTesterIsBroken(env)
1296 (env.Bit('build_x86_32') and platform.architecture()[0] == '64bit')) 1300 or (not env.Bit('host_mac')
1301 and env.Bit('build_x86_32')
1302 and platform.architecture()[0] == '64bit'))
1297 1303
1298 pre_base_env.AddMethod(PyAutoTesterIsBroken) 1304 pre_base_env.AddMethod(PyAutoTesterIsBroken)
1299 1305
1300 1306
1301 # Disable async surfaway pyauto test suite on newlib until issues it raises on 1307 # Disable async surfaway pyauto test suite on newlib until issues it raises on
1302 # bots are fixed. TODO(nfullagar): re-enable when this suite for newlib when it 1308 # bots are fixed. TODO(nfullagar): re-enable when this suite for newlib when it
1303 # won't break the bots. 1309 # won't break the bots.
1304 def PyAutoTesterSurfawayAsyncIsBroken(env): 1310 def PyAutoTesterSurfawayAsyncIsBroken(env):
1305 return not env.Bit('nacl_glibc') 1311 return not env.Bit('nacl_glibc')
1306 1312
(...skipping 1852 matching lines...) Expand 10 before | Expand all | Expand 10 after
3159 nacl_env.ValidateSdk() 3165 nacl_env.ValidateSdk()
3160 3166
3161 if BROKEN_TEST_COUNT > 0: 3167 if BROKEN_TEST_COUNT > 0:
3162 msg = "There are %d broken tests." % BROKEN_TEST_COUNT 3168 msg = "There are %d broken tests." % BROKEN_TEST_COUNT
3163 if GetOption('brief_comstr'): 3169 if GetOption('brief_comstr'):
3164 msg += " Add --verbose to the command line for more information." 3170 msg += " Add --verbose to the command line for more information."
3165 print msg 3171 print msg
3166 3172
3167 # separate warnings from actual build output 3173 # separate warnings from actual build output
3168 Banner('B U I L D - O U T P U T:') 3174 Banner('B U I L D - O U T P U T:')
OLDNEW
« no previous file with comments | « no previous file | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698