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

Side by Side Diff: test/errors/gyptest-errors.py

Issue 1454433002: Python 3 compatibility Base URL: https://chromium.googlesource.com/external/gyp.git@master
Patch Set: Rebase with master (4ec6c4e3a94bd04a6da2858163d40b2429b8aad1) Created 4 years, 8 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
OLDNEW
1 #!/usr/bin/env python 1 #!/usr/bin/env python
2 2
3 # Copyright (c) 2012 Google Inc. All rights reserved. 3 # Copyright (c) 2012 Google Inc. All rights reserved.
4 # Use of this source code is governed by a BSD-style license that can be 4 # Use of this source code is governed by a BSD-style license that can be
5 # found in the LICENSE file. 5 # found in the LICENSE file.
6 6
7 """ 7 """
8 Test that two targets with the same name generates an error. 8 Test that two targets with the same name generates an error.
9 """ 9 """
10 10
(...skipping 21 matching lines...) Expand all
32 stderr = ('gyp: rule bar exists in duplicate, target ' 32 stderr = ('gyp: rule bar exists in duplicate, target '
33 '.*duplicate_rule.gyp:foo#target\n') 33 '.*duplicate_rule.gyp:foo#target\n')
34 test.run_gyp('duplicate_rule.gyp', status=1, stderr=stderr, 34 test.run_gyp('duplicate_rule.gyp', status=1, stderr=stderr,
35 match=TestCmd.match_re) 35 match=TestCmd.match_re)
36 36
37 stderr = ("gyp: Key 'targets' repeated at level 1 with key path '' while " 37 stderr = ("gyp: Key 'targets' repeated at level 1 with key path '' while "
38 "reading .*duplicate_node.gyp.*") 38 "reading .*duplicate_node.gyp.*")
39 test.run_gyp('duplicate_node.gyp', '--check', status=1, stderr=stderr, 39 test.run_gyp('duplicate_node.gyp', '--check', status=1, stderr=stderr,
40 match=TestCmd.match_re_dotall) 40 match=TestCmd.match_re_dotall)
41 41
42 stderr = (".*target0.*target1.*target2.*target0.*") 42 stderr = (".*(target0.*target1.*target2.*target0|"
43 "target1.*target2.*target0.*target1|"
44 "target2.*target0.*target1.*target2).*")
Nico 2016/07/29 22:22:06 why this change?
AWhetter 2016/11/05 23:59:50 To quote the commit message:
43 test.run_gyp('dependency_cycle.gyp', status=1, stderr=stderr, 45 test.run_gyp('dependency_cycle.gyp', status=1, stderr=stderr,
44 match=TestCmd.match_re_dotall) 46 match=TestCmd.match_re_dotall)
45 47
46 stderr = (".*file_cycle0.*file_cycle1.*file_cycle0.*") 48 stderr = (".*(file_cycle0.*file_cycle1.*file_cycle0|"
49 "file_cycle1.*file_cycle0.*file_cycle1).*")
47 test.run_gyp('file_cycle0.gyp', status=1, stderr=stderr, 50 test.run_gyp('file_cycle0.gyp', status=1, stderr=stderr,
48 match=TestCmd.match_re_dotall) 51 match=TestCmd.match_re_dotall)
49 52
50 stderr = 'gyp: Duplicate basenames in sources section, see list above\n' 53 stderr = 'gyp: Duplicate basenames in sources section, see list above\n'
51 test.run_gyp('duplicate_basenames.gyp', status=1, stderr=stderr) 54 test.run_gyp('duplicate_basenames.gyp', status=1, stderr=stderr)
52 55
53 # Check if '--no-duplicate-basename-check' works. 56 # Check if '--no-duplicate-basename-check' works.
54 if ((test.format == 'make' and sys.platform == 'darwin') or 57 if ((test.format == 'make' and sys.platform == 'darwin') or
55 (test.format == 'msvs' and 58 (test.format == 'msvs' and
56 int(os.environ.get('GYP_MSVS_VERSION', 2010)) < 2010)): 59 int(os.environ.get('GYP_MSVS_VERSION', 2010)) < 2010)):
(...skipping 14 matching lines...) Expand all
71 test.run_gyp('missing_command.gyp', status=1, stderr=stderr, 74 test.run_gyp('missing_command.gyp', status=1, stderr=stderr,
72 match=TestCmd.match_re_dotall) 75 match=TestCmd.match_re_dotall)
73 76
74 # Make sure <!() commands that error out result in a message that mentions 77 # Make sure <!() commands that error out result in a message that mentions
75 # the command and gyp file name 78 # the command and gyp file name
76 stderr = (".*python.*-c.*import sys.*sys.exit.*3.*error_command.gyp.*") 79 stderr = (".*python.*-c.*import sys.*sys.exit.*3.*error_command.gyp.*")
77 test.run_gyp('error_command.gyp', status=1, stderr=stderr, 80 test.run_gyp('error_command.gyp', status=1, stderr=stderr,
78 match=TestCmd.match_re_dotall) 81 match=TestCmd.match_re_dotall)
79 82
80 test.pass_test() 83 test.pass_test()
OLDNEW

Powered by Google App Engine
This is Rietveld 408576698