From 5f8de423f190bbb79a62f804151bc24824fa32d8 Mon Sep 17 00:00:00 2001 From: "Matt A. Tobin" Date: Fri, 2 Feb 2018 04:16:08 -0500 Subject: Add m-esr52 at 52.6.0 --- .../gyp/test/configurations/invalid/actions.gyp | 18 +++++++++++ .../invalid/all_dependent_settings.gyp | 18 +++++++++++ .../test/configurations/invalid/configurations.gyp | 18 +++++++++++ .../test/configurations/invalid/dependencies.gyp | 18 +++++++++++ .../invalid/direct_dependent_settings.gyp | 18 +++++++++++ .../invalid/gyptest-configurations.py | 36 ++++++++++++++++++++++ .../gyp/test/configurations/invalid/libraries.gyp | 18 +++++++++++ .../test/configurations/invalid/link_settings.gyp | 18 +++++++++++ .../gyp/test/configurations/invalid/sources.gyp | 18 +++++++++++ .../invalid/standalone_static_library.gyp | 17 ++++++++++ .../test/configurations/invalid/target_name.gyp | 18 +++++++++++ .../tools/gyp/test/configurations/invalid/type.gyp | 18 +++++++++++ 12 files changed, 233 insertions(+) create mode 100644 media/webrtc/trunk/tools/gyp/test/configurations/invalid/actions.gyp create mode 100644 media/webrtc/trunk/tools/gyp/test/configurations/invalid/all_dependent_settings.gyp create mode 100644 media/webrtc/trunk/tools/gyp/test/configurations/invalid/configurations.gyp create mode 100644 media/webrtc/trunk/tools/gyp/test/configurations/invalid/dependencies.gyp create mode 100644 media/webrtc/trunk/tools/gyp/test/configurations/invalid/direct_dependent_settings.gyp create mode 100755 media/webrtc/trunk/tools/gyp/test/configurations/invalid/gyptest-configurations.py create mode 100644 media/webrtc/trunk/tools/gyp/test/configurations/invalid/libraries.gyp create mode 100644 media/webrtc/trunk/tools/gyp/test/configurations/invalid/link_settings.gyp create mode 100644 media/webrtc/trunk/tools/gyp/test/configurations/invalid/sources.gyp create mode 100644 media/webrtc/trunk/tools/gyp/test/configurations/invalid/standalone_static_library.gyp create mode 100644 media/webrtc/trunk/tools/gyp/test/configurations/invalid/target_name.gyp create mode 100644 media/webrtc/trunk/tools/gyp/test/configurations/invalid/type.gyp (limited to 'media/webrtc/trunk/tools/gyp/test/configurations/invalid') diff --git a/media/webrtc/trunk/tools/gyp/test/configurations/invalid/actions.gyp b/media/webrtc/trunk/tools/gyp/test/configurations/invalid/actions.gyp new file mode 100644 index 000000000..a6e42089e --- /dev/null +++ b/media/webrtc/trunk/tools/gyp/test/configurations/invalid/actions.gyp @@ -0,0 +1,18 @@ +# Copyright (c) 2010 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': 'configurations', + 'type': 'none', + 'configurations': { + 'Debug': { + 'actions': [ + ], + }, + } + }, + ], +} diff --git a/media/webrtc/trunk/tools/gyp/test/configurations/invalid/all_dependent_settings.gyp b/media/webrtc/trunk/tools/gyp/test/configurations/invalid/all_dependent_settings.gyp new file mode 100644 index 000000000..b16a245df --- /dev/null +++ b/media/webrtc/trunk/tools/gyp/test/configurations/invalid/all_dependent_settings.gyp @@ -0,0 +1,18 @@ +# Copyright (c) 2010 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': 'configurations', + 'type': 'none', + 'configurations': { + 'Debug': { + 'all_dependent_settings': [ + ], + }, + } + }, + ], +} diff --git a/media/webrtc/trunk/tools/gyp/test/configurations/invalid/configurations.gyp b/media/webrtc/trunk/tools/gyp/test/configurations/invalid/configurations.gyp new file mode 100644 index 000000000..2cfc96004 --- /dev/null +++ b/media/webrtc/trunk/tools/gyp/test/configurations/invalid/configurations.gyp @@ -0,0 +1,18 @@ +# Copyright (c) 2010 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': 'configurations', + 'type': 'none', + 'configurations': { + 'Debug': { + 'configurations': [ + ], + }, + } + }, + ], +} diff --git a/media/webrtc/trunk/tools/gyp/test/configurations/invalid/dependencies.gyp b/media/webrtc/trunk/tools/gyp/test/configurations/invalid/dependencies.gyp new file mode 100644 index 000000000..74633f3f1 --- /dev/null +++ b/media/webrtc/trunk/tools/gyp/test/configurations/invalid/dependencies.gyp @@ -0,0 +1,18 @@ +# Copyright (c) 2010 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': 'configurations', + 'type': 'none', + 'configurations': { + 'Debug': { + 'dependencies': [ + ], + }, + } + }, + ], +} diff --git a/media/webrtc/trunk/tools/gyp/test/configurations/invalid/direct_dependent_settings.gyp b/media/webrtc/trunk/tools/gyp/test/configurations/invalid/direct_dependent_settings.gyp new file mode 100644 index 000000000..8a0f2e95e --- /dev/null +++ b/media/webrtc/trunk/tools/gyp/test/configurations/invalid/direct_dependent_settings.gyp @@ -0,0 +1,18 @@ +# Copyright (c) 2010 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': 'configurations', + 'type': 'none', + 'configurations': { + 'Debug': { + 'direct_dependent_settings': [ + ], + }, + } + }, + ], +} diff --git a/media/webrtc/trunk/tools/gyp/test/configurations/invalid/gyptest-configurations.py b/media/webrtc/trunk/tools/gyp/test/configurations/invalid/gyptest-configurations.py new file mode 100755 index 000000000..bd844b95d --- /dev/null +++ b/media/webrtc/trunk/tools/gyp/test/configurations/invalid/gyptest-configurations.py @@ -0,0 +1,36 @@ +#!/usr/bin/env python + +# Copyright (c) 2010 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. + +""" +Verifies build of an executable in three different configurations. +""" + +import TestGyp + +# Keys that do not belong inside a configuration dictionary. +invalid_configuration_keys = [ + 'actions', + 'all_dependent_settings', + 'configurations', + 'dependencies', + 'direct_dependent_settings', + 'libraries', + 'link_settings', + 'sources', + 'standalone_static_library', + 'target_name', + 'type', +] + +test = TestGyp.TestGyp() + +for test_key in invalid_configuration_keys: + test.run_gyp('%s.gyp' % test_key, status=1, stderr=None) + expect = ['%s not allowed in the Debug configuration, found in target ' + '%s.gyp:configurations#target' % (test_key, test_key)] + test.must_contain_all_lines(test.stderr(), expect) + +test.pass_test() diff --git a/media/webrtc/trunk/tools/gyp/test/configurations/invalid/libraries.gyp b/media/webrtc/trunk/tools/gyp/test/configurations/invalid/libraries.gyp new file mode 100644 index 000000000..c4014ed40 --- /dev/null +++ b/media/webrtc/trunk/tools/gyp/test/configurations/invalid/libraries.gyp @@ -0,0 +1,18 @@ +# Copyright (c) 2010 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': 'configurations', + 'type': 'none', + 'configurations': { + 'Debug': { + 'libraries': [ + ], + }, + } + }, + ], +} diff --git a/media/webrtc/trunk/tools/gyp/test/configurations/invalid/link_settings.gyp b/media/webrtc/trunk/tools/gyp/test/configurations/invalid/link_settings.gyp new file mode 100644 index 000000000..2f0e1c46f --- /dev/null +++ b/media/webrtc/trunk/tools/gyp/test/configurations/invalid/link_settings.gyp @@ -0,0 +1,18 @@ +# Copyright (c) 2010 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': 'configurations', + 'type': 'none', + 'configurations': { + 'Debug': { + 'link_settings': [ + ], + }, + } + }, + ], +} diff --git a/media/webrtc/trunk/tools/gyp/test/configurations/invalid/sources.gyp b/media/webrtc/trunk/tools/gyp/test/configurations/invalid/sources.gyp new file mode 100644 index 000000000..b38cca038 --- /dev/null +++ b/media/webrtc/trunk/tools/gyp/test/configurations/invalid/sources.gyp @@ -0,0 +1,18 @@ +# Copyright (c) 2010 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': 'configurations', + 'type': 'none', + 'configurations': { + 'Debug': { + 'sources': [ + ], + }, + } + }, + ], +} diff --git a/media/webrtc/trunk/tools/gyp/test/configurations/invalid/standalone_static_library.gyp b/media/webrtc/trunk/tools/gyp/test/configurations/invalid/standalone_static_library.gyp new file mode 100644 index 000000000..2edb9febd --- /dev/null +++ b/media/webrtc/trunk/tools/gyp/test/configurations/invalid/standalone_static_library.gyp @@ -0,0 +1,17 @@ +# 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. + +{ + 'targets': [ + { + 'target_name': 'configurations', + 'type': 'none', + 'configurations': { + 'Debug': { + 'standalone_static_library': 1, + }, + } + }, + ], +} diff --git a/media/webrtc/trunk/tools/gyp/test/configurations/invalid/target_name.gyp b/media/webrtc/trunk/tools/gyp/test/configurations/invalid/target_name.gyp new file mode 100644 index 000000000..83baad95d --- /dev/null +++ b/media/webrtc/trunk/tools/gyp/test/configurations/invalid/target_name.gyp @@ -0,0 +1,18 @@ +# Copyright (c) 2010 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': 'configurations', + 'type': 'none', + 'configurations': { + 'Debug': { + 'target_name': [ + ], + }, + } + }, + ], +} diff --git a/media/webrtc/trunk/tools/gyp/test/configurations/invalid/type.gyp b/media/webrtc/trunk/tools/gyp/test/configurations/invalid/type.gyp new file mode 100644 index 000000000..bc55898b8 --- /dev/null +++ b/media/webrtc/trunk/tools/gyp/test/configurations/invalid/type.gyp @@ -0,0 +1,18 @@ +# Copyright (c) 2010 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': 'configurations', + 'type': 'none', + 'configurations': { + 'Debug': { + 'type': [ + ], + }, + } + }, + ], +} -- cgit v1.2.3