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

Unified 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 side-by-side diff with in-line comments
Download patch
Index: test/errors/gyptest-errors.py
diff --git a/test/errors/gyptest-errors.py b/test/errors/gyptest-errors.py
index 0296f800f53424ae8d8b07d06f07eebf9a122c25..d3ae2ef9df67c0d50c63d24900fccf4f7510a2c6 100755
--- a/test/errors/gyptest-errors.py
+++ b/test/errors/gyptest-errors.py
@@ -39,11 +39,14 @@ stderr = ("gyp: Key 'targets' repeated at level 1 with key path '' while "
test.run_gyp('duplicate_node.gyp', '--check', status=1, stderr=stderr,
match=TestCmd.match_re_dotall)
-stderr = (".*target0.*target1.*target2.*target0.*")
+stderr = (".*(target0.*target1.*target2.*target0|"
+ "target1.*target2.*target0.*target1|"
+ "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:
test.run_gyp('dependency_cycle.gyp', status=1, stderr=stderr,
match=TestCmd.match_re_dotall)
-stderr = (".*file_cycle0.*file_cycle1.*file_cycle0.*")
+stderr = (".*(file_cycle0.*file_cycle1.*file_cycle0|"
+ "file_cycle1.*file_cycle0.*file_cycle1).*")
test.run_gyp('file_cycle0.gyp', status=1, stderr=stderr,
match=TestCmd.match_re_dotall)

Powered by Google App Engine
This is Rietveld 408576698