diff options
Diffstat (limited to 'test/errors/gyptest-errors.py')
| -rwxr-xr-x | test/errors/gyptest-errors.py | 19 |
1 files changed, 7 insertions, 12 deletions
diff --git a/test/errors/gyptest-errors.py b/test/errors/gyptest-errors.py index 5f66bac0..d5446227 100755 --- a/test/errors/gyptest-errors.py +++ b/test/errors/gyptest-errors.py @@ -39,18 +39,13 @@ 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 = 'gyp: Duplicate basenames in sources section, see list above\n' -test.run_gyp('duplicate_basenames.gyp', status=1, stderr=stderr) - -# Check if '--no-duplicate-basename-check' works. -if ((test.format == 'make' and sys.platform == 'darwin') or - (test.format == 'msvs' and - int(os.environ.get('GYP_MSVS_VERSION', 2010)) < 2010)): - stderr = 'gyp: Duplicate basenames in sources section, see list above\n' - test.run_gyp('duplicate_basenames.gyp', '--no-duplicate-basename-check', - status=1, stderr=stderr) -else: - test.run_gyp('duplicate_basenames.gyp', '--no-duplicate-basename-check') +stderr = (".*target0.*target1.*target2.*target0.*") +test.run_gyp('dependency_cycle.gyp', status=1, stderr=stderr, + match=TestCmd.match_re_dotall) + +stderr = (".*file_cycle0.*file_cycle1.*file_cycle0.*") +test.run_gyp('file_cycle0.gyp', status=1, stderr=stderr, + match=TestCmd.match_re_dotall) stderr = ("gyp: Dependency '.*missing_dep.gyp:missing.gyp#target' not found " "while trying to load target .*missing_dep.gyp:foo#target\n") |