~hjd/ubuntu/wily/gyp/debian-merged

« back to all changes in this revision

Viewing changes to test/mac/gyptest-app-error.py

  • Committer: Hans Joachim Desserud
  • Date: 2015-10-31 12:46:59 UTC
  • mfrom: (6.2.6 sid)
  • Revision ID: hans_joachim_desserud-20151031124659-lzxekr6woskh4k0b
Merge latest Debian version

Show diffs side-by-side

added added

removed removed

Lines of Context:
14
14
import sys
15
15
 
16
16
if sys.platform == 'darwin':
 
17
  print "This test is currently disabled: https://crbug.com/483696."
 
18
  sys.exit(0)
 
19
 
17
20
  expected_error = 'Old-style plist parser: missing semicolon in dictionary'
18
21
  saw_expected_error = [False]  # Python2 has no "nonlocal" keyword.
19
22
  def match(a, b):
34
37
  test.build('test-error.gyp', test.ALL, chdir='app-bundle')
35
38
 
36
39
  # Ninja pipes stderr of subprocesses to stdout.
37
 
  if test.format == 'ninja' and expected_error in test.stdout():
 
40
  if test.format in ['ninja', 'xcode-ninja'] \
 
41
      and expected_error in test.stdout():
38
42
    saw_expected_error[0] = True
39
43
 
40
44
  if saw_expected_error[0]: