diff options
Diffstat (limited to 'deps/gyp/test/errors')
-rw-r--r-- | deps/gyp/test/errors/dependency_cycle.gyp | 23 | ||||
-rw-r--r-- | deps/gyp/test/errors/duplicate_basenames.gyp | 13 | ||||
-rw-r--r-- | deps/gyp/test/errors/duplicate_node.gyp | 12 | ||||
-rw-r--r-- | deps/gyp/test/errors/duplicate_rule.gyp | 22 | ||||
-rw-r--r-- | deps/gyp/test/errors/duplicate_targets.gyp | 14 | ||||
-rw-r--r-- | deps/gyp/test/errors/error_command.gyp | 12 | ||||
-rw-r--r-- | deps/gyp/test/errors/file_cycle0.gyp | 17 | ||||
-rw-r--r-- | deps/gyp/test/errors/file_cycle1.gyp | 13 | ||||
-rwxr-xr-x | deps/gyp/test/errors/gyptest-errors.py | 80 | ||||
-rw-r--r-- | deps/gyp/test/errors/missing_command.gyp | 12 | ||||
-rw-r--r-- | deps/gyp/test/errors/missing_dep.gyp | 15 | ||||
-rw-r--r-- | deps/gyp/test/errors/missing_targets.gyp | 8 |
12 files changed, 0 insertions, 241 deletions
diff --git a/deps/gyp/test/errors/dependency_cycle.gyp b/deps/gyp/test/errors/dependency_cycle.gyp deleted file mode 100644 index eef44bc9eb..0000000000 --- a/deps/gyp/test/errors/dependency_cycle.gyp +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2014 Google Inc. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'targets': [ - { - 'target_name': 'target0', - 'type': 'none', - 'dependencies': [ 'target1' ], - }, - { - 'target_name': 'target1', - 'type': 'none', - 'dependencies': [ 'target2' ], - }, - { - 'target_name': 'target2', - 'type': 'none', - 'dependencies': [ 'target0' ], - }, - ], -} diff --git a/deps/gyp/test/errors/duplicate_basenames.gyp b/deps/gyp/test/errors/duplicate_basenames.gyp deleted file mode 100644 index b3dceb3949..0000000000 --- a/deps/gyp/test/errors/duplicate_basenames.gyp +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) 2009 Google Inc. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'targets': [ - { - 'target_name': 'foo', - 'type': 'static_library', - 'sources': ['foo.c', 'foo.cc'], - }, - ] -} diff --git a/deps/gyp/test/errors/duplicate_node.gyp b/deps/gyp/test/errors/duplicate_node.gyp deleted file mode 100644 index d6096096bd..0000000000 --- a/deps/gyp/test/errors/duplicate_node.gyp +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2011 Google Inc. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'targets': [ - { 'target_name' : 'foo', 'type': 'executable' }, - ], - 'targets': [ - { 'target_name' : 'bar', 'type': 'executable' }, - ] -} diff --git a/deps/gyp/test/errors/duplicate_rule.gyp b/deps/gyp/test/errors/duplicate_rule.gyp deleted file mode 100644 index dab98e96c2..0000000000 --- a/deps/gyp/test/errors/duplicate_rule.gyp +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (c) 2011 Google Inc. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'targets': [ - { - 'target_name': 'foo', - 'type': 'executable', - 'rules': [ - { - 'rule_name': 'bar', - 'extension': '', - }, - { - 'rule_name': 'bar', - 'extension': '', - }, - ], - }, - ], -} diff --git a/deps/gyp/test/errors/duplicate_targets.gyp b/deps/gyp/test/errors/duplicate_targets.gyp deleted file mode 100644 index aec470eefa..0000000000 --- a/deps/gyp/test/errors/duplicate_targets.gyp +++ /dev/null @@ -1,14 +0,0 @@ -# Copyright (c) 2009 Google Inc. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'targets': [ - { - 'target_name': 'foo' - }, - { - 'target_name': 'foo' - }, - ] -} diff --git a/deps/gyp/test/errors/error_command.gyp b/deps/gyp/test/errors/error_command.gyp deleted file mode 100644 index 1736fc9882..0000000000 --- a/deps/gyp/test/errors/error_command.gyp +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2015 Google Inc. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'targets': [ - { - 'target_name': 'foo', - 'type': '<!(["python", "-c", "import sys; sys.exit(3)"])', - }, - ] -} diff --git a/deps/gyp/test/errors/file_cycle0.gyp b/deps/gyp/test/errors/file_cycle0.gyp deleted file mode 100644 index 3bfafb6cb3..0000000000 --- a/deps/gyp/test/errors/file_cycle0.gyp +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright 2014 Google Inc. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'targets': [ - { - 'target_name': 'top', - 'type': 'none', - 'dependencies': [ 'file_cycle1.gyp:middle' ], - }, - { - 'target_name': 'bottom', - 'type': 'none', - }, - ], -} diff --git a/deps/gyp/test/errors/file_cycle1.gyp b/deps/gyp/test/errors/file_cycle1.gyp deleted file mode 100644 index fbd7a0d167..0000000000 --- a/deps/gyp/test/errors/file_cycle1.gyp +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright 2014 Google Inc. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'targets': [ - { - 'target_name': 'middle', - 'type': 'none', - 'dependencies': [ 'file_cycle0.gyp:bottom' ], - }, - ], -} diff --git a/deps/gyp/test/errors/gyptest-errors.py b/deps/gyp/test/errors/gyptest-errors.py deleted file mode 100755 index 0296f800f5..0000000000 --- a/deps/gyp/test/errors/gyptest-errors.py +++ /dev/null @@ -1,80 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2012 Google Inc. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -""" -Test that two targets with the same name generates an error. -""" - -import os -import sys - -import TestGyp -import TestCmd - -# TODO(sbc): Remove the use of match_re below, done because scons -# error messages were not consistent with other generators. -# Also remove input.py:generator_wants_absolute_build_file_paths. - -test = TestGyp.TestGyp() - -stderr = ('gyp: Duplicate target definitions for ' - '.*duplicate_targets.gyp:foo#target\n') -test.run_gyp('duplicate_targets.gyp', status=1, stderr=stderr, - match=TestCmd.match_re) - -stderr = ('.*: Unable to find targets in build file .*missing_targets.gyp.*') -test.run_gyp('missing_targets.gyp', status=1, stderr=stderr, - match=TestCmd.match_re_dotall) - -stderr = ('gyp: rule bar exists in duplicate, target ' - '.*duplicate_rule.gyp:foo#target\n') -test.run_gyp('duplicate_rule.gyp', status=1, stderr=stderr, - match=TestCmd.match_re) - -stderr = ("gyp: Key 'targets' repeated at level 1 with key path '' while " - "reading .*duplicate_node.gyp.*") -test.run_gyp('duplicate_node.gyp', '--check', status=1, stderr=stderr, - match=TestCmd.match_re_dotall) - -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: 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 = ("gyp: Dependency '.*missing_dep.gyp:missing.gyp#target' not found " - "while trying to load target .*missing_dep.gyp:foo#target\n") -test.run_gyp('missing_dep.gyp', status=1, stderr=stderr, - match=TestCmd.match_re) - -# Make sure invalid <!() command invocations say what command it was and -# mention the gyp file name. Use a "random" command name to trigger an ENOENT. -stderr = (".*invalid-command-name-egtyevNif3.*netDurj9.*missing_command.gyp.*") -test.run_gyp('missing_command.gyp', status=1, stderr=stderr, - match=TestCmd.match_re_dotall) - -# Make sure <!() commands that error out result in a message that mentions -# the command and gyp file name -stderr = (".*python.*-c.*import sys.*sys.exit.*3.*error_command.gyp.*") -test.run_gyp('error_command.gyp', status=1, stderr=stderr, - match=TestCmd.match_re_dotall) - -test.pass_test() diff --git a/deps/gyp/test/errors/missing_command.gyp b/deps/gyp/test/errors/missing_command.gyp deleted file mode 100644 index c93d9542c6..0000000000 --- a/deps/gyp/test/errors/missing_command.gyp +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 2015 Google Inc. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'targets': [ - { - 'target_name': 'foo', - 'type': '<!(["invalid-command-name-egtyevNif3", "netDurj9"])', - }, - ] -} diff --git a/deps/gyp/test/errors/missing_dep.gyp b/deps/gyp/test/errors/missing_dep.gyp deleted file mode 100644 index 08746be3d7..0000000000 --- a/deps/gyp/test/errors/missing_dep.gyp +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2011 Google Inc. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'targets': [ - { - 'target_name': 'foo', - 'type': 'static_library', - 'dependencies': [ - 'missing.gyp' - ] - }, - ] -} diff --git a/deps/gyp/test/errors/missing_targets.gyp b/deps/gyp/test/errors/missing_targets.gyp deleted file mode 100644 index 13d4f924c1..0000000000 --- a/deps/gyp/test/errors/missing_targets.gyp +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2011 Google Inc. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'target_defaults': { - }, -} |