diff --git a/tools/gyp/test/actions-bare/gyptest-bare.py b/tools/gyp/test/actions-bare/gyptest-bare.py deleted file mode 100755 index e3d6db1029b39f65ffc26dd937dfaf1722fd1b90..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions-bare/gyptest-bare.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies actions which are not depended on by other targets get executed. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('bare.gyp', chdir='src') - -test.relocate('src', 'relocate/src') -test.build('bare.gyp', chdir='relocate/src') - -file_content = 'Hello from bare.py\n' - -test.built_file_must_match('out.txt', file_content, chdir='relocate/src') - -test.pass_test() diff --git a/tools/gyp/test/actions-bare/src/bare.gyp b/tools/gyp/test/actions-bare/src/bare.gyp deleted file mode 100644 index 3d28f099d44789a3254600cc961823d629b27456..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions-bare/src/bare.gyp +++ /dev/null @@ -1,25 +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': 'bare', - 'type': 'none', - 'actions': [ - { - 'action_name': 'action1', - 'inputs': [ - 'bare.py', - ], - 'outputs': [ - '<(PRODUCT_DIR)/out.txt', - ], - 'action': ['python', 'bare.py', '<(PRODUCT_DIR)/out.txt'], - 'msvs_cygwin_shell': 0, - }, - ], - }, - ], -} diff --git a/tools/gyp/test/actions-bare/src/bare.py b/tools/gyp/test/actions-bare/src/bare.py deleted file mode 100755 index 12307500f2dbc496d162c8a02afb3e3183b43e72..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions-bare/src/bare.py +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env python - -# 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. - -import sys - -f = open(sys.argv[1], 'wb') -f.write('Hello from bare.py\n') -f.close() diff --git a/tools/gyp/test/actions-depfile/depfile.gyp b/tools/gyp/test/actions-depfile/depfile.gyp deleted file mode 100644 index dc2397de0544c7499e99c2dd8586e4d2c12c83d6..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions-depfile/depfile.gyp +++ /dev/null @@ -1,25 +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': 'depfile_target', - 'type': 'none', - 'actions': [ - { - 'action_name': 'depfile_action', - 'inputs': [ - 'input.txt', - ], - 'outputs': [ - 'output.txt', - ], - 'depfile': 'depfile.d', - 'action': [ ] - }, - ], - }, - ], -} diff --git a/tools/gyp/test/actions-depfile/gyptest-all.py b/tools/gyp/test/actions-depfile/gyptest-all.py deleted file mode 100644 index 23f6f4a056707b79995973e9c27ddaf01a26fd3b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions-depfile/gyptest-all.py +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -"""Verifies that depfile fields are output in ninja rules.""" - -import TestGyp - -test = TestGyp.TestGyp() - -if test.format == 'ninja': - test.run_gyp('depfile.gyp') - contents = open(test.built_file_path('obj/depfile_target.ninja')).read() - - expected = 'depfile = depfile.d' - if expected not in contents: - test.fail_test() - test.pass_test() diff --git a/tools/gyp/test/actions-depfile/input.txt b/tools/gyp/test/actions-depfile/input.txt deleted file mode 100644 index 3f9177e45e805cac9e76b5a2131ba3484367200b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions-depfile/input.txt +++ /dev/null @@ -1 +0,0 @@ -input diff --git a/tools/gyp/test/actions-multiple/gyptest-all.py b/tools/gyp/test/actions-multiple/gyptest-all.py deleted file mode 100755 index 2a083de9b054a497bde61fb5d6cb45802f8147a0..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions-multiple/gyptest-all.py +++ /dev/null @@ -1,72 +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. - -""" -Verifies two actions can be attached to the same input files. -""" - -import sys - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('actions.gyp', chdir='src') - -test.relocate('src', 'relocate/src') - -# Test of fine-grained dependencies for generators that can build individual -# files on demand. -# In particular: -# - TargetA depends on TargetB. -# - TargetA and TargetB are 'none' type with actions attached. -# - TargetA has multiple actions. -# - An output from one of the actions in TargetA (not the first listed), -# is requested as the build target. -# Ensure that TargetB gets built. -# -# This sub-test can only be done with generators/build tools that can -# be asked to build individual files rather than whole targets (make, ninja). -if test.format in ['make', 'ninja']: - # Select location of target based on generator. - if test.format == 'make': - target = 'multi2.txt' - elif test.format == 'ninja': - if sys.platform in ['win32', 'cygwin']: - target = '..\\..\\multi2.txt' - else: - target = '../../multi2.txt' - else: - assert False - test.build('actions.gyp', chdir='relocate/src', target=target) - test.must_contain('relocate/src/multi2.txt', 'hello there') - test.must_contain('relocate/src/multi_dep.txt', 'hello there') - - -# Test that two actions can be attached to the same inputs. -test.build('actions.gyp', test.ALL, chdir='relocate/src') -test.must_contain('relocate/src/output1.txt', 'hello there') -test.must_contain('relocate/src/output2.txt', 'hello there') -test.must_contain('relocate/src/output3.txt', 'hello there') -test.must_contain('relocate/src/output4.txt', 'hello there') - -# Test that process_outputs_as_sources works in conjuction with merged -# actions. -test.run_built_executable( - 'multiple_action_source_filter', - chdir='relocate/src', - stdout=( - '{\n' - 'bar\n' - 'car\n' - 'dar\n' - 'ear\n' - '}\n' - ), -) - - -test.pass_test() diff --git a/tools/gyp/test/actions-multiple/src/actions.gyp b/tools/gyp/test/actions-multiple/src/actions.gyp deleted file mode 100644 index c70a58f702ff38ed2e82b3ce26a7dfd3eabe9bff..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions-multiple/src/actions.gyp +++ /dev/null @@ -1,226 +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. - -{ - 'variables': { - # Have a long string so that actions will exceed xp 512 character - # command limit on xp. - 'long_string': - 'abcdefghijklmnopqrstuvwxyz0123456789' - 'abcdefghijklmnopqrstuvwxyz0123456789' - 'abcdefghijklmnopqrstuvwxyz0123456789' - 'abcdefghijklmnopqrstuvwxyz0123456789' - 'abcdefghijklmnopqrstuvwxyz0123456789' - 'abcdefghijklmnopqrstuvwxyz0123456789' - 'abcdefghijklmnopqrstuvwxyz0123456789' - 'abcdefghijklmnopqrstuvwxyz0123456789' - 'abcdefghijklmnopqrstuvwxyz0123456789' - 'abcdefghijklmnopqrstuvwxyz0123456789' - 'abcdefghijklmnopqrstuvwxyz0123456789' - }, - 'targets': [ - { - 'target_name': 'multiple_action_target', - 'type': 'none', - 'actions': [ - { - 'action_name': 'action1', - 'inputs': [ - 'copy.py', - 'input.txt', - ], - 'outputs': [ - 'output1.txt', - ], - 'action': [ - 'python', '<@(_inputs)', '<(_outputs)', '<(long_string)', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - { - 'action_name': 'action2', - 'inputs': [ - 'copy.py', - 'input.txt', - ], - 'outputs': [ - 'output2.txt', - ], - 'action': [ - 'python', '<@(_inputs)', '<(_outputs)', '<(long_string)', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - { - 'action_name': 'action3', - 'inputs': [ - 'copy.py', - 'input.txt', - ], - 'outputs': [ - 'output3.txt', - ], - 'action': [ - 'python', '<@(_inputs)', '<(_outputs)', '<(long_string)', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - { - 'action_name': 'action4', - 'inputs': [ - 'copy.py', - 'input.txt', - ], - 'outputs': [ - 'output4.txt', - ], - 'action': [ - 'python', '<@(_inputs)', '<(_outputs)', '<(long_string)', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - ], - }, - { - 'target_name': 'multiple_action_source_filter', - 'type': 'executable', - 'sources': [ - 'main.c', - # TODO(bradnelson): add foo.c here once this issue is fixed: - # http://code.google.com/p/gyp/issues/detail?id=175 - ], - 'actions': [ - { - 'action_name': 'action1', - 'inputs': [ - 'foo.c', - 'filter.py', - ], - 'outputs': [ - '<(INTERMEDIATE_DIR)/output1.c', - ], - 'process_outputs_as_sources': 1, - 'action': [ - 'python', 'filter.py', 'foo', 'bar', 'foo.c', '<@(_outputs)', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - { - 'action_name': 'action2', - 'inputs': [ - 'foo.c', - 'filter.py', - ], - 'outputs': [ - '<(INTERMEDIATE_DIR)/output2.c', - ], - 'process_outputs_as_sources': 1, - 'action': [ - 'python', 'filter.py', 'foo', 'car', 'foo.c', '<@(_outputs)', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - { - 'action_name': 'action3', - 'inputs': [ - 'foo.c', - 'filter.py', - ], - 'outputs': [ - '<(INTERMEDIATE_DIR)/output3.c', - ], - 'process_outputs_as_sources': 1, - 'action': [ - 'python', 'filter.py', 'foo', 'dar', 'foo.c', '<@(_outputs)', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - { - 'action_name': 'action4', - 'inputs': [ - 'foo.c', - 'filter.py', - ], - 'outputs': [ - '<(INTERMEDIATE_DIR)/output4.c', - ], - 'process_outputs_as_sources': 1, - 'action': [ - 'python', 'filter.py', 'foo', 'ear', 'foo.c', '<@(_outputs)', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - ], - }, - { - 'target_name': 'multiple_dependent_target', - 'type': 'none', - 'actions': [ - { - 'action_name': 'action1', - 'inputs': [ - 'copy.py', - 'input.txt', - ], - 'outputs': [ - 'multi1.txt', - ], - 'action': [ - 'python', '<@(_inputs)', '<(_outputs)', '<(long_string)', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - { - 'action_name': 'action2', - 'inputs': [ - 'copy.py', - 'input.txt', - ], - 'outputs': [ - 'multi2.txt', - ], - 'action': [ - 'python', '<@(_inputs)', '<(_outputs)', '<(long_string)', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - ], - 'dependencies': [ - 'multiple_required_target', - ], - }, - { - 'target_name': 'multiple_required_target', - 'type': 'none', - 'actions': [ - { - 'action_name': 'multi_dep', - 'inputs': [ - 'copy.py', - 'input.txt', - ], - 'outputs': [ - 'multi_dep.txt', - ], - 'process_outputs_as_sources': 1, - 'action': [ - 'python', '<@(_inputs)', '<(_outputs)', '<(long_string)', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - ], - }, - ], -} diff --git a/tools/gyp/test/actions-multiple/src/copy.py b/tools/gyp/test/actions-multiple/src/copy.py deleted file mode 100755 index 0774679380649321ad96ce96317f3b68b48da6f5..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions-multiple/src/copy.py +++ /dev/null @@ -1,9 +0,0 @@ -#!/usr/bin/env python -# 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. - -import shutil -import sys - -shutil.copyfile(sys.argv[1], sys.argv[2]) diff --git a/tools/gyp/test/actions-multiple/src/filter.py b/tools/gyp/test/actions-multiple/src/filter.py deleted file mode 100755 index f61a5fa59a9f1f9c7616706a9346c53ea1189fba..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions-multiple/src/filter.py +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env python -# 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. - - -import sys - -data = open(sys.argv[3], 'r').read() -fh = open(sys.argv[4], 'w') -fh.write(data.replace(sys.argv[1], sys.argv[2])) -fh.close() diff --git a/tools/gyp/test/actions-multiple/src/foo.c b/tools/gyp/test/actions-multiple/src/foo.c deleted file mode 100644 index 23c4ef7f26fc479376f2511648ed5bc1ca0dd57b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions-multiple/src/foo.c +++ /dev/null @@ -1,11 +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. - */ - -#include - -void foo(void) { - printf("foo\n"); -} diff --git a/tools/gyp/test/actions-multiple/src/input.txt b/tools/gyp/test/actions-multiple/src/input.txt deleted file mode 100644 index c7c7da3c64e86c3270f2639a1379e67e14891b6a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions-multiple/src/input.txt +++ /dev/null @@ -1 +0,0 @@ -hello there diff --git a/tools/gyp/test/actions-multiple/src/main.c b/tools/gyp/test/actions-multiple/src/main.c deleted file mode 100644 index 0a420b9034369f60a83372f75e21589c1aa8f5a5..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions-multiple/src/main.c +++ /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. - */ - -#include - -void bar(void); -void car(void); -void dar(void); -void ear(void); - -int main() { - printf("{\n"); - bar(); - car(); - dar(); - ear(); - printf("}\n"); - return 0; -} diff --git a/tools/gyp/test/actions-none/gyptest-none.py b/tools/gyp/test/actions-none/gyptest-none.py deleted file mode 100755 index 933cfad30c6619c5a5381f69807521c646cb4da2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions-none/gyptest-none.py +++ /dev/null @@ -1,24 +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. - -""" -Verifies actions can be in 'none' type targets with source files. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('none_with_source_files.gyp', chdir='src') - -test.relocate('src', 'relocate/src') -test.build('none_with_source_files.gyp', chdir='relocate/src') - -file_content = 'foo.cc\n' - -test.built_file_must_match('fake.out', file_content, chdir='relocate/src') - -test.pass_test() diff --git a/tools/gyp/test/actions-none/src/fake_cross.py b/tools/gyp/test/actions-none/src/fake_cross.py deleted file mode 100644 index 2913f66a68d22935902a701fbb708f9dceffd85a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions-none/src/fake_cross.py +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/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. - - -import sys - -fh = open(sys.argv[-1], 'wb') -for filename in sys.argv[1:-1]: - fh.write(open(filename).read()) -fh.close() diff --git a/tools/gyp/test/actions-none/src/foo.cc b/tools/gyp/test/actions-none/src/foo.cc deleted file mode 100644 index c6c61745badb78edccd78c114f75f55c15e62531..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions-none/src/foo.cc +++ /dev/null @@ -1 +0,0 @@ -foo.cc diff --git a/tools/gyp/test/actions-none/src/none_with_source_files.gyp b/tools/gyp/test/actions-none/src/none_with_source_files.gyp deleted file mode 100644 index e2aaebc10a6d5e1ee29861d00ee437bb12692c02..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions-none/src/none_with_source_files.gyp +++ /dev/null @@ -1,35 +0,0 @@ -# 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 'none' type targets can have .cc files in them. - -{ - 'targets': [ - { - 'target_name': 'none_with_sources', - 'type': 'none', - 'msvs_cygwin_shell': 0, - 'sources': [ - 'foo.cc', - ], - 'actions': [ - { - 'action_name': 'fake_cross', - 'inputs': [ - 'fake_cross.py', - '<@(_sources)', - ], - 'outputs': [ - '<(PRODUCT_DIR)/fake.out', - ], - 'action': [ - 'python', '<@(_inputs)', '<@(_outputs)', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - } - ], - }, - ], -} diff --git a/tools/gyp/test/actions-subdir/gyptest-action.py b/tools/gyp/test/actions-subdir/gyptest-action.py deleted file mode 100755 index 09cfef1893d56f17dbaa35bbe59ddc0dd1db468f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions-subdir/gyptest-action.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Test actions that output to PRODUCT_DIR. -""" - -import TestGyp - -# TODO fix this for xcode: http://code.google.com/p/gyp/issues/detail?id=88 -test = TestGyp.TestGyp(formats=['!xcode']) - -test.run_gyp('none.gyp', chdir='src') - -test.build('none.gyp', test.ALL, chdir='src') - -file_content = 'Hello from make-file.py\n' -subdir_file_content = 'Hello from make-subdir-file.py\n' - -test.built_file_must_match('file.out', file_content, chdir='src') -test.built_file_must_match('subdir_file.out', subdir_file_content, chdir='src') - -test.pass_test() diff --git a/tools/gyp/test/actions-subdir/src/make-file.py b/tools/gyp/test/actions-subdir/src/make-file.py deleted file mode 100755 index 74e55811d233b066090c3d4e4e7f862f3b8ba128..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions-subdir/src/make-file.py +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env python - -# 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. - -import sys - -contents = 'Hello from make-file.py\n' - -open(sys.argv[1], 'wb').write(contents) diff --git a/tools/gyp/test/actions-subdir/src/none.gyp b/tools/gyp/test/actions-subdir/src/none.gyp deleted file mode 100644 index 23f8d25a53e44aef9b0439945a89b898638fb808..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions-subdir/src/none.gyp +++ /dev/null @@ -1,31 +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': 'file', - 'type': 'none', - 'msvs_cygwin_shell': 0, - 'actions': [ - { - 'action_name': 'make-file', - 'inputs': [ - 'make-file.py', - ], - 'outputs': [ - '<(PRODUCT_DIR)/file.out', - ], - 'action': [ - 'python', '<(_inputs)', '<@(_outputs)', - ], - 'process_outputs_as_sources': 1, - } - ], - 'dependencies': [ - 'subdir/subdir.gyp:subdir_file', - ], - }, - ], -} diff --git a/tools/gyp/test/actions-subdir/src/subdir/make-subdir-file.py b/tools/gyp/test/actions-subdir/src/subdir/make-subdir-file.py deleted file mode 100755 index 80ce19ae0ea0b708b3d3c65d97d01709fbe77638..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions-subdir/src/subdir/make-subdir-file.py +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env python - -# 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. - -import sys - -contents = 'Hello from make-subdir-file.py\n' - -open(sys.argv[1], 'wb').write(contents) diff --git a/tools/gyp/test/actions-subdir/src/subdir/subdir.gyp b/tools/gyp/test/actions-subdir/src/subdir/subdir.gyp deleted file mode 100644 index 0315d4eb83fefc3fdaddd3fcd65b5673f18e9cfb..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions-subdir/src/subdir/subdir.gyp +++ /dev/null @@ -1,28 +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': 'subdir_file', - 'type': 'none', - 'msvs_cygwin_shell': 0, - 'actions': [ - { - 'action_name': 'make-subdir-file', - 'inputs': [ - 'make-subdir-file.py', - ], - 'outputs': [ - '<(PRODUCT_DIR)/subdir_file.out', - ], - 'action': [ - 'python', '<(_inputs)', '<@(_outputs)', - ], - 'process_outputs_as_sources': 1, - } - ], - }, - ], -} diff --git a/tools/gyp/test/actions/generated-header/action.py b/tools/gyp/test/actions/generated-header/action.py deleted file mode 100644 index 9be98798d629cd533f34cbbbf2def55713c6d530..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions/generated-header/action.py +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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. - -import os -import sys - -outfile = sys.argv[1] -open(outfile, 'w').write('const char kFoo[] = "%s";' % sys.argv[2]) diff --git a/tools/gyp/test/actions/generated-header/main.cc b/tools/gyp/test/actions/generated-header/main.cc deleted file mode 100644 index 7973781bc6e500027d8653fbdca3a2ed19c2665f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions/generated-header/main.cc +++ /dev/null @@ -1,7 +0,0 @@ -#include - -#include "MyHeader.h" - -int main() { - printf("%s\n", kFoo); -} diff --git a/tools/gyp/test/actions/generated-header/test.gyp b/tools/gyp/test/actions/generated-header/test.gyp deleted file mode 100644 index 209b951ef6cb621b1e1fdba753694aa7c26d3bcd..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions/generated-header/test.gyp +++ /dev/null @@ -1,34 +0,0 @@ -# Copyright (c) 2013 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': 'generate_header', - 'type': 'none', - 'actions': [ - { - 'inputs': [ ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/MyHeader.h', - ], - 'action_name': 'generate header', - 'action': ['python', './action.py', - '<(SHARED_INTERMEDIATE_DIR)/MyHeader.h', 'foobar output' ], - }, - ], - 'msvs_cygwin_shell': 0, - }, - { - 'target_name': 'program', - 'type': 'executable', - 'dependencies': [ - 'generate_header', - ], - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)', - ], - 'sources': [ 'main.cc' ], - }, - ], -} diff --git a/tools/gyp/test/actions/gyptest-all.py b/tools/gyp/test/actions/gyptest-all.py deleted file mode 100755 index ea555550a2080481b3224cfdfa794a993af85d87..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions/gyptest-all.py +++ /dev/null @@ -1,102 +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. - -""" -Verifies simple actions when using an explicit build target of 'all'. -""" - -import glob -import os -import TestGyp - -test = TestGyp.TestGyp(workdir='workarea_all') - -test.run_gyp('actions.gyp', chdir='src') - -test.relocate('src', 'relocate/src') - -# Some gyp files use an action that mentions an output but never -# writes it as a means to making the action run on every build. That -# doesn't mesh well with ninja's semantics. TODO(evan): figure out -# how to work always-run actions in to ninja. -# Android also can't do this as it doesn't have order-only dependencies. -if test.format in ['ninja', 'android', 'xcode-ninja']: - test.build('actions.gyp', test.ALL, chdir='relocate/src') -else: - # Test that an "always run" action increases a counter on multiple - # invocations, and that a dependent action updates in step. - test.build('actions.gyp', test.ALL, chdir='relocate/src') - test.must_match('relocate/src/subdir1/actions-out/action-counter.txt', '1') - test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '1') - test.build('actions.gyp', test.ALL, chdir='relocate/src') - test.must_match('relocate/src/subdir1/actions-out/action-counter.txt', '2') - test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '2') - - # The "always run" action only counts to 2, but the dependent target - # will count forever if it's allowed to run. This verifies that the - # dependent target only runs when the "always run" action generates - # new output, not just because the "always run" ran. - test.build('actions.gyp', test.ALL, chdir='relocate/src') - test.must_match('relocate/src/subdir1/actions-out/action-counter.txt', '2') - test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '2') - -expect = """\ -Hello from program.c -Hello from make-prog1.py -Hello from make-prog2.py -""" - -if test.format == 'xcode': - chdir = 'relocate/src/subdir1' -else: - chdir = 'relocate/src' -test.run_built_executable('program', chdir=chdir, stdout=expect) - - -test.must_match('relocate/src/subdir2/file.out', "Hello from make-file.py\n") - - -expect = "Hello from generate_main.py\n" - -if test.format == 'xcode': - chdir = 'relocate/src/subdir3' -else: - chdir = 'relocate/src' -test.run_built_executable('null_input', chdir=chdir, stdout=expect) - - -# Clean out files which may have been created if test.ALL was run. -def clean_dep_files(): - for file in (glob.glob('relocate/src/dep_*.txt') + - glob.glob('relocate/src/deps_all_done_*.txt')): - if os.path.exists(file): - os.remove(file) - -# Confirm our clean. -clean_dep_files() -test.must_not_exist('relocate/src/dep_1.txt') -test.must_not_exist('relocate/src/deps_all_done_first_123.txt') - -# Make sure all deps finish before an action is run on a 'None' target. -# If using the Make builder, add -j to make things more difficult. -arguments = [] -if test.format == 'make': - arguments = ['-j'] -test.build('actions.gyp', 'action_with_dependencies_123', chdir='relocate/src', - arguments=arguments) -test.must_exist('relocate/src/deps_all_done_first_123.txt') - -# Try again with a target that has deps in reverse. Output files from -# previous tests deleted. Confirm this execution did NOT run the ALL -# target which would mess up our dep tests. -clean_dep_files() -test.build('actions.gyp', 'action_with_dependencies_321', chdir='relocate/src', - arguments=arguments) -test.must_exist('relocate/src/deps_all_done_first_321.txt') -test.must_not_exist('relocate/src/deps_all_done_first_123.txt') - - -test.pass_test() diff --git a/tools/gyp/test/actions/gyptest-default.py b/tools/gyp/test/actions/gyptest-default.py deleted file mode 100755 index ae8d6b3f19f8dc6a6068a78d73a72e009180ee3d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions/gyptest-default.py +++ /dev/null @@ -1,69 +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. - -""" -Verifies simple actions when using the default build target. -""" - -import TestGyp - -test = TestGyp.TestGyp(workdir='workarea_default') - -test.run_gyp('actions.gyp', chdir='src') - -test.relocate('src', 'relocate/src') - -# Some gyp files use an action that mentions an output but never -# writes it as a means to making the action run on every build. That -# doesn't mesh well with ninja's semantics. TODO(evan): figure out -# how to work always-run actions in to ninja. -# Android also can't do this as it doesn't have order-only dependencies. -if test.format in ['ninja', 'android', 'xcode-ninja']: - test.build('actions.gyp', test.ALL, chdir='relocate/src') -else: - # Test that an "always run" action increases a counter on multiple - # invocations, and that a dependent action updates in step. - test.build('actions.gyp', chdir='relocate/src') - test.must_match('relocate/src/subdir1/actions-out/action-counter.txt', '1') - test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '1') - test.build('actions.gyp', chdir='relocate/src') - test.must_match('relocate/src/subdir1/actions-out/action-counter.txt', '2') - test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '2') - - # The "always run" action only counts to 2, but the dependent target - # will count forever if it's allowed to run. This verifies that the - # dependent target only runs when the "always run" action generates - # new output, not just because the "always run" ran. - test.build('actions.gyp', test.ALL, chdir='relocate/src') - test.must_match('relocate/src/subdir1/actions-out/action-counter.txt', '2') - test.must_match('relocate/src/subdir1/actions-out/action-counter_2.txt', '2') - -expect = """\ -Hello from program.c -Hello from make-prog1.py -Hello from make-prog2.py -""" - -if test.format == 'xcode': - chdir = 'relocate/src/subdir1' -else: - chdir = 'relocate/src' -test.run_built_executable('program', chdir=chdir, stdout=expect) - - -test.must_match('relocate/src/subdir2/file.out', "Hello from make-file.py\n") - - -expect = "Hello from generate_main.py\n" - -if test.format == 'xcode': - chdir = 'relocate/src/subdir3' -else: - chdir = 'relocate/src' -test.run_built_executable('null_input', chdir=chdir, stdout=expect) - - -test.pass_test() diff --git a/tools/gyp/test/actions/gyptest-errors.py b/tools/gyp/test/actions/gyptest-errors.py deleted file mode 100755 index e1ef883e1e852d79fac04c0f859a9e57f811ab9b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions/gyptest-errors.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies behavior for different action configuration errors: -exit status of 1, and the expected error message must be in stderr. -""" - -import TestGyp - -test = TestGyp.TestGyp(workdir='workarea_errors') - - -test.run_gyp('action_missing_name.gyp', chdir='src', status=1, stderr=None) -expect = [ - "Anonymous action in target broken_actions2. An action must have an 'action_name' field.", -] -test.must_contain_all_lines(test.stderr(), expect) - - -test.pass_test() diff --git a/tools/gyp/test/actions/gyptest-generated-header.py b/tools/gyp/test/actions/gyptest-generated-header.py deleted file mode 100644 index fa680ab3bea477ad27223105a1c355b8afaed08e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions/gyptest-generated-header.py +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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 that dependencies on generated headers work, even if the header has -a mixed-case file name. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -if test.format == 'android': - # This test currently fails on android. Investigate why, fix the issues - # responsible, and reenable this test on android. See bug: - # https://code.google.com/p/gyp/issues/detail?id=436 - test.skip_test(message='Test fails on android. Fix and reenable.\n') - -CHDIR = 'generated-header' - -test.run_gyp('test.gyp', chdir=CHDIR) -test.build('test.gyp', 'program', chdir=CHDIR) -test.up_to_date('test.gyp', 'program', chdir=CHDIR) - -expect = 'foobar output\n' -test.run_built_executable('program', chdir=CHDIR, stdout=expect) - -# Change what's written to the generated header, regyp and rebuild, and check -# that the change makes it to the executable and that the build is clean. -test.sleep() -test.write('generated-header/test.gyp', - test.read('generated-header/test.gyp').replace('foobar', 'barbaz')) - -test.run_gyp('test.gyp', chdir=CHDIR) -test.build('test.gyp', 'program', chdir=CHDIR) -test.up_to_date('test.gyp', 'program', chdir=CHDIR) - -expect = 'barbaz output\n' -test.run_built_executable('program', chdir=CHDIR, stdout=expect) - -test.pass_test() diff --git a/tools/gyp/test/actions/src/action_missing_name.gyp b/tools/gyp/test/actions/src/action_missing_name.gyp deleted file mode 100644 index 00424c35a1150292beefe153e733f07a9ea858e6..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions/src/action_missing_name.gyp +++ /dev/null @@ -1,24 +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': 'broken_actions2', - 'type': 'none', - 'actions': [ - { - 'inputs': [ - 'no_name.input', - ], - 'action': [ - 'python', - '-c', - 'print \'missing name\'', - ], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/actions/src/actions.gyp b/tools/gyp/test/actions/src/actions.gyp deleted file mode 100644 index 5d2db1955e2db1d8c4eab8c38ef0560340d07ab1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions/src/actions.gyp +++ /dev/null @@ -1,114 +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': 'pull_in_all_actions', - 'type': 'none', - 'dependencies': [ - 'subdir1/executable.gyp:*', - 'subdir2/none.gyp:*', - 'subdir3/null_input.gyp:*', - ], - }, - { - 'target_name': 'depend_on_always_run_action', - 'type': 'none', - 'dependencies': [ 'subdir1/executable.gyp:counter' ], - 'actions': [ - { - 'action_name': 'use_always_run_output', - 'inputs': [ - 'subdir1/actions-out/action-counter.txt', - 'subdir1/counter.py', - ], - 'outputs': [ - 'subdir1/actions-out/action-counter_2.txt', - ], - 'action': [ - 'python', 'subdir1/counter.py', '<(_outputs)', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - ], - }, - - # Three deps which don't finish immediately. - # Each one has a small delay then creates a file. - # Delays are 1.0, 1.1, and 2.0 seconds. - { - 'target_name': 'dep_1', - 'type': 'none', - 'actions': [{ - 'inputs': [ 'actions.gyp' ], - 'outputs': [ 'dep_1.txt' ], - 'action_name': 'dep_1', - 'action': [ 'python', '-c', - 'import time; time.sleep(1); open(\'dep_1.txt\', \'w\')' ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }], - }, - { - 'target_name': 'dep_2', - 'type': 'none', - 'actions': [{ - 'inputs': [ 'actions.gyp' ], - 'outputs': [ 'dep_2.txt' ], - 'action_name': 'dep_2', - 'action': [ 'python', '-c', - 'import time; time.sleep(1.1); open(\'dep_2.txt\', \'w\')' ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }], - }, - { - 'target_name': 'dep_3', - 'type': 'none', - 'actions': [{ - 'inputs': [ 'actions.gyp' ], - 'outputs': [ 'dep_3.txt' ], - 'action_name': 'dep_3', - 'action': [ 'python', '-c', - 'import time; time.sleep(2.0); open(\'dep_3.txt\', \'w\')' ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }], - }, - - # An action which assumes the deps have completed. - # Does NOT list the output files of it's deps as inputs. - # On success create the file deps_all_done_first.txt. - { - 'target_name': 'action_with_dependencies_123', - 'type': 'none', - 'dependencies': [ 'dep_1', 'dep_2', 'dep_3' ], - 'actions': [{ - 'inputs': [ 'actions.gyp' ], - 'outputs': [ 'deps_all_done_first_123.txt' ], - 'action_name': 'action_with_dependencies_123', - 'action': [ 'python', 'confirm-dep-files.py', '<(_outputs)' ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }], - }, - # Same as above but with deps in reverse. - { - 'target_name': 'action_with_dependencies_321', - 'type': 'none', - 'dependencies': [ 'dep_3', 'dep_2', 'dep_1' ], - 'actions': [{ - 'inputs': [ 'actions.gyp' ], - 'outputs': [ 'deps_all_done_first_321.txt' ], - 'action_name': 'action_with_dependencies_321', - 'action': [ 'python', 'confirm-dep-files.py', '<(_outputs)' ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }], - }, - - ], -} diff --git a/tools/gyp/test/actions/src/confirm-dep-files.py b/tools/gyp/test/actions/src/confirm-dep-files.py deleted file mode 100755 index 3b8463057df50d7b304314849eff64c018732949..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions/src/confirm-dep-files.py +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env python - -# 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. - -"""Confirms presence of files generated by our targets we depend on. -If they exist, create a new file. - -Note target's input files are explicitly NOT defined in the gyp file -so they can't easily be passed to this script as args. -""" - -import os -import sys - -outfile = sys.argv[1] # Example value we expect: deps_all_done_first_123.txt -if (os.path.exists("dep_1.txt") and - os.path.exists("dep_2.txt") and - os.path.exists("dep_3.txt")): - open(outfile, "w") diff --git a/tools/gyp/test/actions/src/subdir1/counter.py b/tools/gyp/test/actions/src/subdir1/counter.py deleted file mode 100755 index d888f2e803bc94f1b5bd0a280614e6753004fa78..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions/src/subdir1/counter.py +++ /dev/null @@ -1,44 +0,0 @@ -#!/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. - -import sys -import time - -output = sys.argv[1] -persistoutput = "%s.persist" % sys.argv[1] - -count = 0 -try: - count = open(persistoutput, 'r').read() -except: - pass -count = int(count) + 1 - -if len(sys.argv) > 2: - max_count = int(sys.argv[2]) - if count > max_count: - count = max_count - -oldcount = 0 -try: - oldcount = open(output, 'r').read() -except: - pass - -# Save the count in a file that is undeclared, and thus hidden, to gyp. We need -# to do this because, prior to running commands, some build systems deletes -# any declared outputs, so we would lose our count if we just wrote to the -# given output file. -open(persistoutput, 'w').write('%d' % (count)) - -# Only write the given output file if the count has changed. -if int(oldcount) != count: - open(output, 'w').write('%d' % (count)) - # Sleep so the next run changes the file time sufficiently to make the build - # detect the file as changed. - time.sleep(1) - -sys.exit(0) diff --git a/tools/gyp/test/actions/src/subdir1/executable.gyp b/tools/gyp/test/actions/src/subdir1/executable.gyp deleted file mode 100644 index 6a1ce4f91e0faab5667abdfa746bbb21cc67deb7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions/src/subdir1/executable.gyp +++ /dev/null @@ -1,74 +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': 'program', - 'type': 'executable', - 'msvs_cygwin_shell': 0, - 'sources': [ - 'program.c', - ], - 'actions': [ - { - 'action_name': 'make-prog1', - 'inputs': [ - 'make-prog1.py', - ], - 'outputs': [ - '<(INTERMEDIATE_DIR)/prog1.c', - ], - 'action': [ - 'python', '<(_inputs)', '<@(_outputs)', - ], - 'process_outputs_as_sources': 1, - }, - { - 'action_name': 'make-prog2', - 'inputs': [ - 'make-prog2.py', - ], - 'outputs': [ - 'actions-out/prog2.c', - ], - 'action': [ - 'python', '<(_inputs)', '<@(_outputs)', - ], - 'process_outputs_as_sources': 1, - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - ], - }, - { - 'target_name': 'counter', - 'type': 'none', - 'actions': [ - { - # This action should always run, regardless of whether or not it's - # inputs or the command-line change. We do this by creating a dummy - # first output, which is always missing, thus causing the build to - # always try to recreate it. Actual output files should be listed - # after the dummy one, and dependent targets should list the real - # output(s) in their inputs - # (see '../actions.gyp:depend_on_always_run_action'). - 'action_name': 'action_counter', - 'inputs': [ - 'counter.py', - ], - 'outputs': [ - 'actions-out/action-counter.txt.always', - 'actions-out/action-counter.txt', - ], - 'action': [ - 'python', '<(_inputs)', 'actions-out/action-counter.txt', '2', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - ], - }, - ], -} diff --git a/tools/gyp/test/actions/src/subdir1/make-prog1.py b/tools/gyp/test/actions/src/subdir1/make-prog1.py deleted file mode 100755 index 7ea1d8a2d487083ef0f92c094db48dfe6952cb1d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions/src/subdir1/make-prog1.py +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python - -# 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. - -import sys - -contents = r""" -#include - -void prog1(void) -{ - printf("Hello from make-prog1.py\n"); -} -""" - -open(sys.argv[1], 'w').write(contents) - -sys.exit(0) diff --git a/tools/gyp/test/actions/src/subdir1/make-prog2.py b/tools/gyp/test/actions/src/subdir1/make-prog2.py deleted file mode 100755 index 0bfe4973c24c152ead14f789f0b48ff58bbb7308..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions/src/subdir1/make-prog2.py +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python - -# 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. - -import sys - -contents = r""" -#include - -void prog2(void) -{ - printf("Hello from make-prog2.py\n"); -} -""" - -open(sys.argv[1], 'w').write(contents) - -sys.exit(0) diff --git a/tools/gyp/test/actions/src/subdir1/program.c b/tools/gyp/test/actions/src/subdir1/program.c deleted file mode 100644 index 15f0f94ee57f47c9b4d2e6a727c2519c9293b37d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions/src/subdir1/program.c +++ /dev/null @@ -1,12 +0,0 @@ -#include - -extern void prog1(void); -extern void prog2(void); - -int main(void) -{ - printf("Hello from program.c\n"); - prog1(); - prog2(); - return 0; -} diff --git a/tools/gyp/test/actions/src/subdir2/make-file.py b/tools/gyp/test/actions/src/subdir2/make-file.py deleted file mode 100755 index fff0653144745a9837ac4d3e6b109655665557c7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions/src/subdir2/make-file.py +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env python - -# 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. - -import sys - -contents = "Hello from make-file.py\n" - -open(sys.argv[1], 'wb').write(contents) diff --git a/tools/gyp/test/actions/src/subdir2/none.gyp b/tools/gyp/test/actions/src/subdir2/none.gyp deleted file mode 100644 index 2caa97d55c90e0f6b2871d4af583b0aeac45cae6..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions/src/subdir2/none.gyp +++ /dev/null @@ -1,33 +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': 'file', - 'type': 'none', - 'msvs_cygwin_shell': 0, - 'actions': [ - { - 'action_name': 'make-file', - 'inputs': [ - 'make-file.py', - ], - 'outputs': [ - 'file.out', - # TODO: enhance testing infrastructure to test this - # without having to hard-code the intermediate dir paths. - #'<(INTERMEDIATE_DIR)/file.out', - ], - 'action': [ - 'python', '<(_inputs)', '<@(_outputs)', - ], - 'process_outputs_as_sources': 1, - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - } - ], - }, - ], -} diff --git a/tools/gyp/test/actions/src/subdir3/generate_main.py b/tools/gyp/test/actions/src/subdir3/generate_main.py deleted file mode 100755 index 804d38df3181ac934ac1f8e02050c3f4576fc241..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions/src/subdir3/generate_main.py +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env python - -# 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. - -import sys - -contents = """ -#include - -int main(void) -{ - printf("Hello from generate_main.py\\n"); - return 0; -} -""" - -open(sys.argv[1], 'w').write(contents) - -sys.exit(0) diff --git a/tools/gyp/test/actions/src/subdir3/null_input.gyp b/tools/gyp/test/actions/src/subdir3/null_input.gyp deleted file mode 100644 index 9b0bea5fdb40b818141cf72ef9ca06247f0a60e6..0000000000000000000000000000000000000000 --- a/tools/gyp/test/actions/src/subdir3/null_input.gyp +++ /dev/null @@ -1,29 +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': 'null_input', - 'type': 'executable', - 'msvs_cygwin_shell': 0, - 'actions': [ - { - 'action_name': 'generate_main', - 'process_outputs_as_sources': 1, - 'inputs': [], - 'outputs': [ - '<(INTERMEDIATE_DIR)/main.c', - ], - 'action': [ - # TODO: we can't just use <(_outputs) here?! - 'python', 'generate_main.py', '<(INTERMEDIATE_DIR)/main.c', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - ], - }, - ], -} diff --git a/tools/gyp/test/additional-targets/gyptest-additional.py b/tools/gyp/test/additional-targets/gyptest-additional.py deleted file mode 100755 index fcea0d573c10ffe8e0c0a0a7a5e08be96697f1a8..0000000000000000000000000000000000000000 --- a/tools/gyp/test/additional-targets/gyptest-additional.py +++ /dev/null @@ -1,63 +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. - -""" -Verifies simple actions when using an explicit build target of 'all'. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('all.gyp', - '-G', 'xcode_ninja_target_pattern=^all_targets$', - chdir='src') - -test.relocate('src', 'relocate/src') - -# Build all. -test.build('all.gyp', chdir='relocate/src') - -if test.format=='xcode': - chdir = 'relocate/src/dir1' -else: - chdir = 'relocate/src' - -# Output is as expected. -file_content = 'Hello from emit.py\n' -test.built_file_must_match('out2.txt', file_content, chdir=chdir) - -test.built_file_must_not_exist('out.txt', chdir='relocate/src') -test.built_file_must_not_exist('foolib1', - type=test.SHARED_LIB, - chdir=chdir) - -# xcode-ninja doesn't generate separate workspaces for sub-gyps by design -if test.format == 'xcode-ninja': - test.pass_test() - -# TODO(mmoss) Make consistent with msvs, with 'dir1' before 'out/Default'? -if test.format in ('make', 'ninja', 'android', 'cmake'): - chdir='relocate/src' -else: - chdir='relocate/src/dir1' - -# Build the action explicitly. -test.build('actions.gyp', 'action1_target', chdir=chdir) - -# Check that things got run. -file_content = 'Hello from emit.py\n' -test.built_file_must_exist('out.txt', chdir=chdir) - -# Build the shared library explicitly. -test.build('actions.gyp', 'foolib1', chdir=chdir) - -test.built_file_must_exist('foolib1', - type=test.SHARED_LIB, - chdir=chdir, - subdir='dir1') - -test.pass_test() diff --git a/tools/gyp/test/additional-targets/src/all.gyp b/tools/gyp/test/additional-targets/src/all.gyp deleted file mode 100644 index 21c83080aaffef48c89be904d210b955646335e2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/additional-targets/src/all.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': 'all_targets', - 'type': 'none', - 'dependencies': ['dir1/actions.gyp:*'], - }, - ], -} diff --git a/tools/gyp/test/additional-targets/src/dir1/actions.gyp b/tools/gyp/test/additional-targets/src/dir1/actions.gyp deleted file mode 100644 index 5089c809131cb97efa0550fd3991be9d6ec113a6..0000000000000000000000000000000000000000 --- a/tools/gyp/test/additional-targets/src/dir1/actions.gyp +++ /dev/null @@ -1,56 +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': 'action1_target', - 'type': 'none', - 'suppress_wildcard': 1, - 'actions': [ - { - 'action_name': 'action1', - 'inputs': [ - 'emit.py', - ], - 'outputs': [ - '<(PRODUCT_DIR)/out.txt', - ], - 'action': ['python', 'emit.py', '<(PRODUCT_DIR)/out.txt'], - 'msvs_cygwin_shell': 0, - }, - ], - }, - { - 'target_name': 'action2_target', - 'type': 'none', - 'actions': [ - { - 'action_name': 'action2', - 'inputs': [ - 'emit.py', - ], - 'outputs': [ - '<(PRODUCT_DIR)/out2.txt', - ], - 'action': ['python', 'emit.py', '<(PRODUCT_DIR)/out2.txt'], - 'msvs_cygwin_shell': 0, - }, - ], - }, - { - 'target_name': 'foolib1', - 'type': 'shared_library', - 'suppress_wildcard': 1, - 'sources': ['lib1.c'], - }, - ], - 'conditions': [ - ['OS=="linux"', { - 'target_defaults': { - 'cflags': ['-fPIC'], - }, - }], - ], -} diff --git a/tools/gyp/test/additional-targets/src/dir1/emit.py b/tools/gyp/test/additional-targets/src/dir1/emit.py deleted file mode 100755 index fd3138738ed4a8bdba65edfab2f5159906b108cf..0000000000000000000000000000000000000000 --- a/tools/gyp/test/additional-targets/src/dir1/emit.py +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env python - -# 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. - -import sys - -f = open(sys.argv[1], 'wb') -f.write('Hello from emit.py\n') -f.close() diff --git a/tools/gyp/test/additional-targets/src/dir1/lib1.c b/tools/gyp/test/additional-targets/src/dir1/lib1.c deleted file mode 100644 index df4cb10f796e29858e9c989abc50357d4bec19d8..0000000000000000000000000000000000000000 --- a/tools/gyp/test/additional-targets/src/dir1/lib1.c +++ /dev/null @@ -1,6 +0,0 @@ -#ifdef _WIN32 -__declspec(dllexport) -#endif -int func1(void) { - return 42; -} diff --git a/tools/gyp/test/analyzer/common.gypi b/tools/gyp/test/analyzer/common.gypi deleted file mode 100644 index 7c664e40dabf4d407a239ca3c1613b9ebab9c886..0000000000000000000000000000000000000000 --- a/tools/gyp/test/analyzer/common.gypi +++ /dev/null @@ -1,6 +0,0 @@ -# Copyright (c) 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. - -{ -} diff --git a/tools/gyp/test/analyzer/gyptest-analyzer.py b/tools/gyp/test/analyzer/gyptest-analyzer.py deleted file mode 100644 index 537d1c80b6bfefd37cd4248d15987a34357735c9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/analyzer/gyptest-analyzer.py +++ /dev/null @@ -1,356 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 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. - -"""Tests for analyzer -""" - -import json -import TestGyp - -found = 'Found dependency' -found_all = 'Found dependency (all)' -not_found = 'No dependencies' - - -def _CreateConfigFile(files, targets): - """Creates the analyzer conflig file, which is used as the input to analyzer. - See description of analyzer.py for description of the arguments.""" - f = open('test_file', 'w') - to_write = {'files': files, 'targets': targets } - json.dump(to_write, f) - f.close() - - -def _CreateBogusConfigFile(): - f = open('test_file','w') - f.write('bogus') - f.close() - - -def _ReadOutputFileContents(): - f = open('analyzer_output', 'r') - result = json.load(f) - f.close() - return result - - -# NOTE: this would be clearer if it subclassed TestGypCustom, but that trips -# over a bug in pylint (E1002). -test = TestGyp.TestGypCustom(format='analyzer') - -def CommonArgs(): - return ('-Gconfig_path=test_file', - '-Ganalyzer_output_path=analyzer_output') - - -def run_analyzer(*args, **kw): - """Runs the test specifying a particular config and output path.""" - args += CommonArgs() - test.run_gyp('test.gyp', *args, **kw) - - -def run_analyzer2(*args, **kw): - """Same as run_analyzer(), but passes in test2.gyp instead of test.gyp.""" - args += CommonArgs() - test.run_gyp('test2.gyp', *args, **kw) - - -def run_analyzer3(*args, **kw): - """Same as run_analyzer(), but passes in test3.gyp instead of test.gyp.""" - args += CommonArgs() - test.run_gyp('test3.gyp', *args, **kw) - - -def run_analyzer4(*args, **kw): - """Same as run_analyzer(), but passes in test3.gyp instead of test.gyp.""" - args += CommonArgs() - test.run_gyp('test4.gyp', *args, **kw) - - -def EnsureContains(targets=set(), matched=False, build_targets=set()): - """Verifies output contains |targets|.""" - result = _ReadOutputFileContents() - if result.get('error', None): - print 'unexpected error', result.get('error') - test.fail_test() - - if result.get('invalid_targets', None): - print 'unexpected invalid_targets', result.get('invalid_targets') - test.fail_test() - - actual_targets = set(result['targets']) - if actual_targets != targets: - print 'actual targets:', actual_targets, '\nexpected targets:', targets - test.fail_test() - - actual_build_targets = set(result['build_targets']) - if actual_build_targets != build_targets: - print 'actual build_targets:', actual_build_targets, \ - '\nexpected build_targets:', build_targets - test.fail_test() - - if matched and result['status'] != found: - print 'expected', found, 'got', result['status'] - test.fail_test() - elif not matched and result['status'] != not_found: - print 'expected', not_found, 'got', result['status'] - test.fail_test() - - -def EnsureMatchedAll(targets): - result = _ReadOutputFileContents() - if result.get('error', None): - print 'unexpected error', result.get('error') - test.fail_test() - - if result.get('invalid_targets', None): - print 'unexpected invalid_targets', result.get('invalid_targets') - test.fail_test() - - if result['status'] != found_all: - print 'expected', found_all, 'got', result['status'] - test.fail_test() - - actual_targets = set(result['targets']) - if actual_targets != targets: - print 'actual targets:', actual_targets, '\nexpected targets:', targets - test.fail_test() - - -def EnsureError(expected_error_string): - """Verifies output contains the error string.""" - result = _ReadOutputFileContents() - if result.get('error', '').find(expected_error_string) == -1: - print 'actual error:', result.get('error', ''), '\nexpected error:', \ - expected_error_string - test.fail_test() - - -def EnsureStdoutContains(expected_error_string): - if test.stdout().find(expected_error_string) == -1: - print 'actual stdout:', test.stdout(), '\nexpected stdout:', \ - expected_error_string - test.fail_test() - - -def EnsureInvalidTargets(expected_invalid_targets): - """Verifies output contains invalid_targets.""" - result = _ReadOutputFileContents() - actual_invalid_targets = set(result['invalid_targets']) - if actual_invalid_targets != expected_invalid_targets: - print 'actual invalid_targets:', actual_invalid_targets, \ - '\nexpected :', expected_invalid_targets - test.fail_test() - -# Verifies config_path must be specified. -test.run_gyp('test.gyp') -EnsureStdoutContains('Must specify files to analyze via config_path') - -# Verifies config_path must point to a valid file. -test.run_gyp('test.gyp', '-Gconfig_path=bogus_file', - '-Ganalyzer_output_path=analyzer_output') -EnsureError('Unable to open file bogus_file') - -# Verify 'invalid_targets' is present when bad target is specified. -_CreateConfigFile(['exe2.c'], ['bad_target']) -run_analyzer() -EnsureInvalidTargets({'bad_target'}) - -# Verifies config_path must point to a valid json file. -_CreateBogusConfigFile() -run_analyzer() -EnsureError('Unable to parse config file test_file') - -# Trivial test of a source. -_CreateConfigFile(['foo.c'], []) -run_analyzer() -EnsureContains(matched=True, build_targets={'exe'}) - -# Conditional source that is excluded. -_CreateConfigFile(['conditional_source.c'], []) -run_analyzer() -EnsureContains(matched=False) - -# Conditional source that is included by way of argument. -_CreateConfigFile(['conditional_source.c'], []) -run_analyzer('-Dtest_variable=1') -EnsureContains(matched=True, build_targets={'exe'}) - -# Two unknown files. -_CreateConfigFile(['unknown1.c', 'unoknow2.cc'], []) -run_analyzer() -EnsureContains() - -# Two unknown files. -_CreateConfigFile(['unknown1.c', 'subdir/subdir_sourcex.c'], []) -run_analyzer() -EnsureContains() - -# Included dependency -_CreateConfigFile(['unknown1.c', 'subdir/subdir_source.c'], []) -run_analyzer() -EnsureContains(matched=True, build_targets={'exe', 'exe3'}) - -# Included inputs to actions. -_CreateConfigFile(['action_input.c'], []) -run_analyzer() -EnsureContains(matched=True, build_targets={'exe'}) - -# Don't consider outputs. -_CreateConfigFile(['action_output.c'], []) -run_analyzer() -EnsureContains(matched=False) - -# Rule inputs. -_CreateConfigFile(['rule_input.c'], []) -run_analyzer() -EnsureContains(matched=True, build_targets={'exe'}) - -# Ignore path specified with PRODUCT_DIR. -_CreateConfigFile(['product_dir_input.c'], []) -run_analyzer() -EnsureContains(matched=False) - -# Path specified via a variable. -_CreateConfigFile(['subdir/subdir_source2.c'], []) -run_analyzer() -EnsureContains(matched=True, build_targets={'exe'}) - -# Verifies paths with // are fixed up correctly. -_CreateConfigFile(['parent_source.c'], []) -run_analyzer() -EnsureContains(matched=True, build_targets={'exe', 'exe3'}) - -# Verifies relative paths are resolved correctly. -_CreateConfigFile(['subdir/subdir_source.h'], []) -run_analyzer() -EnsureContains(matched=True, build_targets={'exe'}) - -# Various permutations when passing in targets. -_CreateConfigFile(['exe2.c', 'subdir/subdir2b_source.c'], ['exe', 'exe3']) -run_analyzer() -EnsureContains(matched=True, targets={'exe3'}, build_targets={'exe2', 'exe3'}) - -_CreateConfigFile(['exe2.c', 'subdir/subdir2b_source.c'], ['exe']) -run_analyzer() -EnsureContains(matched=True, build_targets={'exe2', 'exe3'}) - -# Verifies duplicates are ignored. -_CreateConfigFile(['exe2.c', 'subdir/subdir2b_source.c'], ['exe', 'exe']) -run_analyzer() -EnsureContains(matched=True, build_targets={'exe2', 'exe3'}) - -_CreateConfigFile(['exe2.c'], ['exe']) -run_analyzer() -EnsureContains(matched=True, build_targets={'exe2'}) - -_CreateConfigFile(['exe2.c'], []) -run_analyzer() -EnsureContains(matched=True, build_targets={'exe2'}) - -_CreateConfigFile(['subdir/subdir2b_source.c', 'exe2.c'], []) -run_analyzer() -EnsureContains(matched=True, build_targets={'exe2', 'exe3'}) - -_CreateConfigFile(['subdir/subdir2b_source.c'], ['exe3']) -run_analyzer() -EnsureContains(matched=True, targets={'exe3'}, build_targets={'exe3'}) - -_CreateConfigFile(['exe2.c'], []) -run_analyzer() -EnsureContains(matched=True, build_targets={'exe2'}) - -_CreateConfigFile(['foo.c'], []) -run_analyzer() -EnsureContains(matched=True, build_targets={'exe'}) - -# Assertions when modifying build (gyp/gypi) files, especially when said files -# are included. -_CreateConfigFile(['subdir2/d.cc'], ['exe', 'exe2', 'foo', 'exe3']) -run_analyzer2() -EnsureContains(matched=True, targets={'exe', 'foo'}, build_targets={'exe'}) - -_CreateConfigFile(['subdir2/subdir.includes.gypi'], - ['exe', 'exe2', 'foo', 'exe3']) -run_analyzer2() -EnsureContains(matched=True, targets={'exe', 'foo'}, build_targets={'exe'}) - -_CreateConfigFile(['subdir2/subdir.gyp'], ['exe', 'exe2', 'foo', 'exe3']) -run_analyzer2() -EnsureContains(matched=True, targets={'exe', 'foo'}, build_targets={'exe'}) - -_CreateConfigFile(['test2.includes.gypi'], ['exe', 'exe2', 'foo', 'exe3']) -run_analyzer2() -EnsureContains(matched=True, targets={'exe', 'exe2', 'exe3'}, - build_targets={'exe', 'exe2', 'exe3'}) - -# Verify modifying a file included makes all targets dirty. -_CreateConfigFile(['common.gypi'], ['exe', 'exe2', 'foo', 'exe3']) -run_analyzer2('-Icommon.gypi') -EnsureMatchedAll({'exe', 'exe2', 'foo', 'exe3'}) - -# Assertions from test3.gyp. -_CreateConfigFile(['d.c', 'f.c'], ['a']) -run_analyzer3() -EnsureContains(matched=True, targets={'a'}, build_targets={'a', 'b'}) - -_CreateConfigFile(['f.c'], ['a']) -run_analyzer3() -EnsureContains(matched=True, targets={'a'}, build_targets={'a', 'b'}) - -_CreateConfigFile(['f.c'], []) -run_analyzer3() -EnsureContains(matched=True, build_targets={'a', 'b'}) - -_CreateConfigFile(['c.c', 'e.c'], []) -run_analyzer3() -EnsureContains(matched=True, build_targets={'a', 'b', 'c', 'e'}) - -_CreateConfigFile(['d.c'], ['a']) -run_analyzer3() -EnsureContains(matched=True, targets={'a'}, build_targets={'a', 'b'}) - -_CreateConfigFile(['a.c'], ['a', 'b']) -run_analyzer3() -EnsureContains(matched=True, targets={'a'}, build_targets={'a'}) - -_CreateConfigFile(['a.c'], ['a', 'b']) -run_analyzer3() -EnsureContains(matched=True, targets={'a'}, build_targets={'a'}) - -_CreateConfigFile(['d.c'], ['a', 'b']) -run_analyzer3() -EnsureContains(matched=True, targets={'a', 'b'}, build_targets={'a', 'b'}) - -_CreateConfigFile(['f.c'], ['a']) -run_analyzer3() -EnsureContains(matched=True, targets={'a'}, build_targets={'a', 'b'}) - -_CreateConfigFile(['a.c'], ['a']) -run_analyzer3() -EnsureContains(matched=True, targets={'a'}, build_targets={'a'}) - -_CreateConfigFile(['a.c'], []) -run_analyzer3() -EnsureContains(matched=True, build_targets={'a'}) - -_CreateConfigFile(['d.c'], []) -run_analyzer3() -EnsureContains(matched=True, build_targets={'a', 'b'}) - -# Assertions around test4.gyp. -_CreateConfigFile(['f.c'], []) -run_analyzer4() -EnsureContains(matched=True, build_targets={'e', 'f'}) - -_CreateConfigFile(['d.c'], []) -run_analyzer4() -EnsureContains(matched=True, build_targets={'a', 'b', 'c', 'd'}) - -_CreateConfigFile(['i.c'], []) -run_analyzer4() -EnsureContains(matched=True, build_targets={'h'}) - -test.pass_test() diff --git a/tools/gyp/test/analyzer/subdir/subdir.gyp b/tools/gyp/test/analyzer/subdir/subdir.gyp deleted file mode 100644 index bfa2df48e15b07dd6b39665279c04ff712f5d236..0000000000000000000000000000000000000000 --- a/tools/gyp/test/analyzer/subdir/subdir.gyp +++ /dev/null @@ -1,36 +0,0 @@ -# Copyright (c) 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. - -{ - 'variables': { - 'trailing_dir_path': '../', - }, - 'targets': [ - { - 'target_name': 'foo', - 'type': 'static_library', - 'sources': [ - 'subdir_source.c', - '<(trailing_dir_path)/parent_source.c', - ], - }, - { - 'target_name': 'subdir2a', - 'type': 'static_library', - 'sources': [ - 'subdir2_source.c', - ], - 'dependencies': [ - 'subdir2b', - ], - }, - { - 'target_name': 'subdir2b', - 'type': 'static_library', - 'sources': [ - 'subdir2b_source.c', - ], - }, - ], -} diff --git a/tools/gyp/test/analyzer/subdir/subdir2/subdir2.gyp b/tools/gyp/test/analyzer/subdir/subdir2/subdir2.gyp deleted file mode 100644 index e5aaa92b18c6b4e92eca3981a6a19350dc024d39..0000000000000000000000000000000000000000 --- a/tools/gyp/test/analyzer/subdir/subdir2/subdir2.gyp +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 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': 'subdir2', - 'type': 'static_library', - 'sources': [ - '../subdir_source.h', - ], - }, - ], -} diff --git a/tools/gyp/test/analyzer/subdir2/subdir.gyp b/tools/gyp/test/analyzer/subdir2/subdir.gyp deleted file mode 100644 index d6c709c9ef44082704ad5aef356d2e57e8f90b56..0000000000000000000000000000000000000000 --- a/tools/gyp/test/analyzer/subdir2/subdir.gyp +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 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': 'foo', - 'type': 'static_library', - 'sources': [ - 'subdir_source.c', - ], - 'includes': [ - 'subdir.includes.gypi', - ], - }, - ], -} diff --git a/tools/gyp/test/analyzer/subdir2/subdir.includes.gypi b/tools/gyp/test/analyzer/subdir2/subdir.includes.gypi deleted file mode 100644 index 324e92bcd43c021e91964468f07e54ca14465e12..0000000000000000000000000000000000000000 --- a/tools/gyp/test/analyzer/subdir2/subdir.includes.gypi +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 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. - -{ - 'sources': [ - 'd.cc' - ], -} diff --git a/tools/gyp/test/analyzer/test.gyp b/tools/gyp/test/analyzer/test.gyp deleted file mode 100644 index cb3612fc436a4142fdc064d976c293958b14e4d0..0000000000000000000000000000000000000000 --- a/tools/gyp/test/analyzer/test.gyp +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright (c) 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. - -# These gyp files create the following dependencies: -# -# test.gyp: -# #exe -> subdir/subdir.gyp#foo, subdir/subdir2/subdir2.gyp#subdir2 -# foo.c -# subdir/subdir_source2.c -# conditional_source.c (if test_variable==1) -# action_input.c -# action_output.c -# rule_input.c -# rule_output.pdf -# #exe2 -# exe2.c -# #exe3 -> subdir/subdir.gyp#foo, subdir/subdir.gyp#subdir2a -# exe3.c -# #all (type none) -> exe, exe3 -# -# subdir/subdir.gyp -# #foo -# subdir/subdir_source.c -# parent_source.c -# #subdir2a -> subdir2b -# subdir/subdir2_source.c -# #subdir2b -# subdir/subdir2b_source.c -# -# subdir/subdir2/subdir2.gyp -# #subdir2 -# subdir/subdir_source.h - -{ - 'variables': { - 'test_variable%': 0, - 'variable_path': 'subdir', - }, - 'targets': [ - { - 'target_name': 'exe', - 'type': 'executable', - 'dependencies': [ - 'subdir/subdir.gyp:foo', - 'subdir/subdir2/subdir2.gyp:subdir2', - ], - 'sources': [ - 'foo.c', - '<(variable_path)/subdir_source2.c', - ], - 'conditions': [ - ['test_variable==1', { - 'sources': [ - 'conditional_source.c', - ], - }], - ], - 'actions': [ - { - 'action_name': 'action', - 'inputs': [ - '<(PRODUCT_DIR)/product_dir_input.c', - 'action_input.c', - '../bad_path1.h', - '../../bad_path2.h', - ], - 'outputs': [ - 'action_output.c', - ], - }, - ], - 'rules': [ - { - 'rule_name': 'rule', - 'extension': 'pdf', - 'inputs': [ - 'rule_input.c', - ], - 'outputs': [ - 'rule_output.pdf', - ], - }, - ], - }, - { - 'target_name': 'exe2', - 'type': 'executable', - 'sources': [ - 'exe2.c', - ], - }, - { - 'target_name': 'exe3', - 'type': 'executable', - 'dependencies': [ - 'subdir/subdir.gyp:foo', - 'subdir/subdir.gyp:subdir2a', - ], - 'sources': [ - 'exe3.c', - ], - }, - { - 'target_name': 'all', - 'type': 'none', - 'dependencies': [ - 'exe', - 'exe3', - ], - }, - ], -} diff --git a/tools/gyp/test/analyzer/test2.gyp b/tools/gyp/test/analyzer/test2.gyp deleted file mode 100644 index 782b6e6428a7bf4346499e03fc166ac5ed193a9e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/analyzer/test2.gyp +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (c) 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': 'exe', - 'type': 'executable', - 'dependencies': [ - 'subdir2/subdir.gyp:foo', - ], - }, - { - 'target_name': 'exe2', - 'type': 'executable', - 'includes': [ - 'test2.includes.gypi', - ], - }, - ], - 'includes': [ - 'test2.toplevel_includes.gypi', - ], -} diff --git a/tools/gyp/test/analyzer/test2.includes.gypi b/tools/gyp/test/analyzer/test2.includes.gypi deleted file mode 100644 index 3e21de23cbe64df28ec5e19686902f58aae8e307..0000000000000000000000000000000000000000 --- a/tools/gyp/test/analyzer/test2.includes.gypi +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) 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. - -{ - 'sources': [ - 'a.cc', - 'b.cc' - ], - 'includes': [ - 'test2.includes.includes.gypi', - ], -} diff --git a/tools/gyp/test/analyzer/test2.includes.includes.gypi b/tools/gyp/test/analyzer/test2.includes.includes.gypi deleted file mode 100644 index de3a025dbb607d771394b67428b0363fd8454357..0000000000000000000000000000000000000000 --- a/tools/gyp/test/analyzer/test2.includes.includes.gypi +++ /dev/null @@ -1,9 +0,0 @@ -# Copyright (c) 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. - -{ - 'sources': [ - 'c.cc' - ], -} diff --git a/tools/gyp/test/analyzer/test2.toplevel_includes.gypi b/tools/gyp/test/analyzer/test2.toplevel_includes.gypi deleted file mode 100644 index 54fa453b085691afe42c17589a43922f6b2263e9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/analyzer/test2.toplevel_includes.gypi +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 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': 'exe3', - 'type': 'executable', - 'sources': [ - 'e.cc', - ], - }, - ], -} diff --git a/tools/gyp/test/analyzer/test3.gyp b/tools/gyp/test/analyzer/test3.gyp deleted file mode 100644 index 40c7534ca4ec79a5a21d6b641d69fc3fe5b5cc6a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/analyzer/test3.gyp +++ /dev/null @@ -1,77 +0,0 @@ -# Copyright (c) 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': 'all', - 'type': 'none', - 'dependencies': [ - 'a', - 'b', - ], - }, - { - 'target_name': 'a', - 'type': 'executable', - 'sources': [ - 'a.c', - ], - 'dependencies': [ - 'c', - 'd', - ], - }, - { - 'target_name': 'b', - 'type': 'executable', - 'sources': [ - 'b.c', - ], - 'dependencies': [ - 'd', - 'e', - ], - }, - { - 'target_name': 'c', - 'type': 'executable', - 'sources': [ - 'c.c', - ], - }, - { - 'target_name': 'd', - 'type': 'none', - 'sources': [ - 'd.c', - ], - 'dependencies': [ - 'f', - 'g', - ], - }, - { - 'target_name': 'e', - 'type': 'executable', - 'sources': [ - 'e.c', - ], - }, - { - 'target_name': 'f', - 'type': 'static_library', - 'sources': [ - 'f.c', - ], - }, - { - 'target_name': 'g', - 'type': 'executable', - 'sources': [ - 'g.c', - ], - }, - ], -} diff --git a/tools/gyp/test/analyzer/test4.gyp b/tools/gyp/test/analyzer/test4.gyp deleted file mode 100644 index 91cea56c1fe35f6973b3d5d850ad4b23e03d78f2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/analyzer/test4.gyp +++ /dev/null @@ -1,80 +0,0 @@ -# Copyright (c) 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': 'a', - 'type': 'executable', - 'sources': [ - 'a.c', - ], - 'dependencies': [ - 'b', - 'c', - ], - }, - { - 'target_name': 'b', - 'type': 'executable', - 'sources': [ - 'b.c', - ], - 'dependencies': [ - 'd', - ], - }, - { - 'target_name': 'c', - 'type': 'executable', - 'sources': [ - 'c.c', - ], - 'dependencies': [ - 'b', - 'd', - ], - }, - { - 'target_name': 'd', - 'type': 'executable', - 'sources': [ - 'd.c', - ], - }, - { - 'target_name': 'e', - 'type': 'executable', - 'dependencies': [ - 'test5.gyp:f', - ], - }, - { - 'target_name': 'h', - 'type': 'none', - 'dependencies': [ - 'i', - ], - 'rules': [ - { - 'rule_name': 'rule', - 'extension': 'pdf', - 'inputs': [ - 'rule_input.c', - ], - 'outputs': [ - 'rule_output.pdf', - ], - }, - ], - }, - { - 'target_name': 'i', - 'type': 'static_library', - 'sources': [ - 'i.c', - ], - }, - ], -} diff --git a/tools/gyp/test/analyzer/test5.gyp b/tools/gyp/test/analyzer/test5.gyp deleted file mode 100644 index f3ea5b00612d086d83f6607cfb357749b3c586dd..0000000000000000000000000000000000000000 --- a/tools/gyp/test/analyzer/test5.gyp +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (c) 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': 'f', - 'type': 'executable', - 'sources': [ - 'f.c', - ], - }, - { - 'target_name': 'g', - 'type': 'executable', - 'sources': [ - 'g.c', - ], - 'dependencies': [ - 'f', - ], - }, - ], -} diff --git a/tools/gyp/test/android/32or64.c b/tools/gyp/test/android/32or64.c deleted file mode 100644 index 3ea81692bde47a65456b38b929e21fbb331eae8c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/android/32or64.c +++ /dev/null @@ -1,13 +0,0 @@ -/* Copyright (c) 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. - */ - -const char* getString() -{ -#ifdef __LP64__ - return "Hello, 64-bit world!\n"; -#else - return "Hello, 32-bit world!\n"; -#endif -} diff --git a/tools/gyp/test/android/file.in b/tools/gyp/test/android/file.in deleted file mode 100644 index 68016f01c00f7d84f81046f4bec588c02f6d57f3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/android/file.in +++ /dev/null @@ -1 +0,0 @@ -A boring test file diff --git a/tools/gyp/test/android/gyptest-host-multilib.py b/tools/gyp/test/android/gyptest-host-multilib.py deleted file mode 100755 index 4fb7919540e6eb3546293d7d683bfafa40a0e513..0000000000000000000000000000000000000000 --- a/tools/gyp/test/android/gyptest-host-multilib.py +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Verifies that it's possible to build host targets correctly in a multilib -configuration, explicitly forcing either 32 or 64 bit. -""" - -import TestGyp - -test = TestGyp.TestGyp(formats=['android']) - -test.run_gyp('host_32or64.gyp') - -# Force building as 32-bit -test.build('host_32or64.gyp', 'generate_output', - arguments=['GYP_HOST_VAR_PREFIX=$(HOST_2ND_ARCH_VAR_PREFIX)', - 'GYP_HOST_MULTILIB=32']) - -test.built_file_must_match('host_32or64.output', 'Hello, 32-bit world!\n') - -# Force building as 64-bit -test.build('host_32or64.gyp', 'generate_output', - arguments=['GYP_HOST_VAR_PREFIX=', - 'GYP_HOST_MULTILIB=64']) - -test.built_file_must_match('host_32or64.output', 'Hello, 64-bit world!\n') - -test.pass_test() diff --git a/tools/gyp/test/android/gyptest-make-functions.py b/tools/gyp/test/android/gyptest-make-functions.py deleted file mode 100755 index cdf0e0ed29b44c59e2e57a01aa45f6f15b921ce2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/android/gyptest-make-functions.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Verifies that it's possible for gyp actions to use the result of calling a make -function with "$()". -""" - -import TestGyp - -test = TestGyp.TestGyp(formats=['android']) - -test.run_gyp('make_functions.gyp') - -test.build('make_functions.gyp', test.ALL) - -file_content = 'A boring test file\n' -test.built_file_must_match('file.in', file_content) -test.built_file_must_match('file.out', file_content) - -test.pass_test() diff --git a/tools/gyp/test/android/gyptest-noalias.py b/tools/gyp/test/android/gyptest-noalias.py deleted file mode 100755 index 4840c4c79f2597f9eb506f4500af2a6b43198f10..0000000000000000000000000000000000000000 --- a/tools/gyp/test/android/gyptest-noalias.py +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Verifies that disabling target aliases works. -""" - -import TestGyp - -test = TestGyp.TestGyp(formats=['android']) - -test.run_gyp('hello.gyp', '-G', 'write_alias_targets=0') - -test.build('hello.gyp', 'hello', status=2, stderr=None) - -test.build('hello.gyp', 'gyp_all_modules', status=2, stderr=None) - -test.pass_test() diff --git a/tools/gyp/test/android/gyptest-settings-list.py b/tools/gyp/test/android/gyptest-settings-list.py deleted file mode 100755 index 5850d47ad92e484fd7bbe4f25eba72ba25b673ab..0000000000000000000000000000000000000000 --- a/tools/gyp/test/android/gyptest-settings-list.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Verifies that it's possible to set Android build system settings using the -aosp_build_settings key, with list values. -""" - -import TestGyp - -test = TestGyp.TestGyp(formats=['android']) - -test.run_gyp('settings-list.gyp') - -test.build('settings-list.gyp', 'hello') - -test.run_built_executable('hello.foo', stdout="Hello, world!\n") - -test.up_to_date('settings-list.gyp', test.DEFAULT) - -test.pass_test() diff --git a/tools/gyp/test/android/gyptest-settings.py b/tools/gyp/test/android/gyptest-settings.py deleted file mode 100755 index f4e89d1bb48b8acdf8613a2ef55d9521629383c9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/android/gyptest-settings.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Verifies that it's possible to set Android build system settings using the -aosp_build_settings key. -""" - -import TestGyp - -test = TestGyp.TestGyp(formats=['android']) - -test.run_gyp('settings.gyp') - -test.build('settings.gyp', 'hello') - -test.run_built_executable('hello.foo', stdout="Hello, world!\n") - -test.up_to_date('settings.gyp', test.DEFAULT) - -test.pass_test() diff --git a/tools/gyp/test/android/gyptest-space-filenames.py b/tools/gyp/test/android/gyptest-space-filenames.py deleted file mode 100755 index c6caf264665a2bf93865eb06b1b975e444d45928..0000000000000000000000000000000000000000 --- a/tools/gyp/test/android/gyptest-space-filenames.py +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Verifies that action input/output filenames with spaces are rejected. -""" - -import TestGyp - -test = TestGyp.TestGyp(formats=['android']) - -stderr = ('gyp: Action input filename "name with spaces" in target do_actions ' - 'contains a space\n') -test.run_gyp('space_filenames.gyp', status=1, stderr=stderr) - -test.pass_test() diff --git a/tools/gyp/test/android/hello.c b/tools/gyp/test/android/hello.c deleted file mode 100644 index e6bf622aaa411c1ac8b1f16be4a4c690421d5bd9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/android/hello.c +++ /dev/null @@ -1,12 +0,0 @@ -/* Copyright (c) 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. - */ - -#include - -int main() -{ - printf("Hello, world!\n"); - return 0; -} diff --git a/tools/gyp/test/android/hello.gyp b/tools/gyp/test/android/hello.gyp deleted file mode 100644 index da58a2b707f8f15d4402ff4889fef052800c55f4..0000000000000000000000000000000000000000 --- a/tools/gyp/test/android/hello.gyp +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 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': 'hello', - 'type': 'executable', - 'sources': [ - 'hello.c', - ], - }, - ], -} diff --git a/tools/gyp/test/android/host_32or64.gyp b/tools/gyp/test/android/host_32or64.gyp deleted file mode 100644 index e8ca79f5dbc8155b83b29a45a7fac9aa7b1cf91f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/android/host_32or64.gyp +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright (c) 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': 'lib32or64', - 'type': 'static_library', - 'toolsets': [ 'host' ], - 'sources': [ - '32or64.c', - ], - }, - { - 'target_name': 'host_32or64', - 'type': 'executable', - 'toolsets': [ 'host' ], - 'dependencies': [ 'lib32or64#host' ], - 'sources': [ - 'writefile.c', - ], - }, - { - 'target_name': 'generate_output', - 'type': 'none', - 'dependencies': [ 'host_32or64#host' ], - 'actions': [ - { - 'action_name': 'generate', - 'inputs': [ '<(PRODUCT_DIR)/host_32or64' ], - 'outputs': [ '<(PRODUCT_DIR)/host_32or64.output' ], - 'action': [ '<@(_inputs)', '<@(_outputs)' ], - } - ], - }, - ], -} diff --git a/tools/gyp/test/android/make_functions.gyp b/tools/gyp/test/android/make_functions.gyp deleted file mode 100644 index 4b617cc932d349db9457607b63b32787903e96c8..0000000000000000000000000000000000000000 --- a/tools/gyp/test/android/make_functions.gyp +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) 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': 'file-in', - 'type': 'none', - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)', - 'files': [ 'file.in' ], - }, - ], - }, - { - 'target_name': 'file-out', - 'type': 'none', - 'dependencies': [ 'file-in' ], - 'actions': [ - { - 'action_name': 'copy-file', - 'inputs': [ '$(strip <(PRODUCT_DIR)/file.in)' ], - 'outputs': [ '<(PRODUCT_DIR)/file.out' ], - 'action': [ 'cp', '$(strip <(PRODUCT_DIR)/file.in)', '<(PRODUCT_DIR)/file.out' ], - } - ], - }, - ], -} diff --git a/tools/gyp/test/android/settings-list.gyp b/tools/gyp/test/android/settings-list.gyp deleted file mode 100644 index b392ce2bda3770c2a3d0cffa8424df6d6bff0ee5..0000000000000000000000000000000000000000 --- a/tools/gyp/test/android/settings-list.gyp +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 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': 'hello', - 'type': 'executable', - 'sources': [ - 'hello.c', - ], - 'aosp_build_settings': { - 'LOCAL_MODULE_SUFFIX': ['.foo'], - } - }, - ], -} diff --git a/tools/gyp/test/android/settings.gyp b/tools/gyp/test/android/settings.gyp deleted file mode 100644 index 2f8ce7f5404af7e0a2880be19cc2741dcc1c0738..0000000000000000000000000000000000000000 --- a/tools/gyp/test/android/settings.gyp +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 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': 'hello', - 'type': 'executable', - 'sources': [ - 'hello.c', - ], - 'aosp_build_settings': { - 'LOCAL_MODULE_SUFFIX': '.foo', - } - }, - ], -} diff --git a/tools/gyp/test/android/space_filenames.gyp b/tools/gyp/test/android/space_filenames.gyp deleted file mode 100644 index 487ac551db2131b34ad5ecdbb09e8a44bf9e8cae..0000000000000000000000000000000000000000 --- a/tools/gyp/test/android/space_filenames.gyp +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 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': 'do_actions', - 'type': 'none', - 'actions': [{ - 'action_name': 'should_be_forbidden', - 'inputs': [ 'name with spaces' ], - 'outputs': [ '<(SHARED_INTERMEDIATE_DIR)/name with spaces' ], - 'action': [ 'true' ], - }], - }, - ], -} diff --git a/tools/gyp/test/android/writefile.c b/tools/gyp/test/android/writefile.c deleted file mode 100644 index 3f5960f8915e689aef8ac7e6557fe23dddcb4dc6..0000000000000000000000000000000000000000 --- a/tools/gyp/test/android/writefile.c +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright (c) 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. - */ - -#include - -extern const char* getString(void); - -int main(int argc, char* argv[]) -{ - if (argc < 2) return 2; - FILE* f = fopen(argv[1], "w"); - if (f == NULL) return 1; - fprintf(f, "%s", getString()); - fclose(f); - return 0; -} diff --git a/tools/gyp/test/arflags/gyptest-arflags.py b/tools/gyp/test/arflags/gyptest-arflags.py deleted file mode 100644 index 5ee1339a41668c750589ec9880d5d8b9c0dfafa3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/arflags/gyptest-arflags.py +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Verifies that building a target with invalid arflags fails. -""" - -import os -import sys -import TestGyp - -test = TestGyp.TestGyp(formats=['ninja']) -test.run_gyp('test.gyp') -expected_status = 0 if sys.platform in ['darwin', 'win32'] else 1 -test.build('test.gyp', target='lib', status=expected_status) -test.pass_test() diff --git a/tools/gyp/test/arflags/lib.cc b/tools/gyp/test/arflags/lib.cc deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tools/gyp/test/arflags/test.gyp b/tools/gyp/test/arflags/test.gyp deleted file mode 100644 index f7430fae2d1359d2ad690d68ecdf586f21f846a2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/arflags/test.gyp +++ /dev/null @@ -1,10 +0,0 @@ -{ - 'targets': [ - { - 'target_name': 'lib', - 'type': 'static_library', - 'sources': ['lib.cc'], - 'arflags': ['--nonexistent'], - }, - ], -} diff --git a/tools/gyp/test/assembly/gyptest-assembly.py b/tools/gyp/test/assembly/gyptest-assembly.py deleted file mode 100755 index 8a84310544afc97e28c517c0b6af0a9605f8b4db..0000000000000000000000000000000000000000 --- a/tools/gyp/test/assembly/gyptest-assembly.py +++ /dev/null @@ -1,31 +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. - -""" -A basic test of compiling assembler files. -""" - -import sys -import TestGyp - -if sys.platform != 'win32': - # TODO(bradnelson): get this working for windows. - test = TestGyp.TestGyp(formats=['!msvs']) - - test.run_gyp('assembly.gyp', chdir='src') - - test.relocate('src', 'relocate/src') - - test.build('assembly.gyp', test.ALL, chdir='relocate/src') - - expect = """\ -Hello from program.c -Got 42. -""" - test.run_built_executable('program', chdir='relocate/src', stdout=expect) - - - test.pass_test() diff --git a/tools/gyp/test/assembly/gyptest-override.py b/tools/gyp/test/assembly/gyptest-override.py deleted file mode 100644 index e84a23e855ac21d212f549dca89a96107da5031f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/assembly/gyptest-override.py +++ /dev/null @@ -1,24 +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. - -""" -Make sure that manual rules on Windows override the built in ones. -""" - -import sys -import TestGyp - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - CHDIR = 'src' - test.run_gyp('override.gyp', chdir=CHDIR) - test.build('override.gyp', test.ALL, chdir=CHDIR) - expect = """\ -Hello from program.c -Got 42. -""" - test.run_built_executable('program', chdir=CHDIR, stdout=expect) - test.pass_test() diff --git a/tools/gyp/test/assembly/src/as.bat b/tools/gyp/test/assembly/src/as.bat deleted file mode 100644 index 5ac229fbd2e1cc6c298cc469a13c5da257d25d2d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/assembly/src/as.bat +++ /dev/null @@ -1,3 +0,0 @@ -@echo off -:: Mock windows assembler. -cl /MD /c %1 /Fo"%2" diff --git a/tools/gyp/test/assembly/src/assembly.gyp b/tools/gyp/test/assembly/src/assembly.gyp deleted file mode 100644 index 565cb0fa0e3888d2bc427c18e6de0be25457b45b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/assembly/src/assembly.gyp +++ /dev/null @@ -1,62 +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. - -{ - 'target_defaults': { - 'conditions': [ - ['OS=="win"', { - 'defines': ['PLATFORM_WIN'], - }], - ['OS=="mac" or OS=="ios"', { - 'defines': ['PLATFORM_MAC'], - }], - ['OS=="linux"', { - 'defines': ['PLATFORM_LINUX'], - }], - ['OS=="android"', { - 'defines': ['PLATFORM_ANDROID'], - }], - ], - }, - 'targets': [ - { - 'target_name': 'program', - 'type': 'executable', - 'dependencies': ['lib1'], - 'sources': [ - 'program.c', - ], - }, - { - 'target_name': 'lib1', - 'type': 'static_library', - 'sources': [ - 'lib1.S', - ], - }, - ], - 'conditions': [ - ['OS=="win"', { - 'target_defaults': { - 'rules': [ - { - 'rule_name': 'assembler', - 'msvs_cygwin_shell': 0, - 'extension': 'S', - 'inputs': [ - 'as.bat', - ], - 'outputs': [ - '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).obj', - ], - 'action': - ['as.bat', 'lib1.c', '<(_outputs)'], - 'message': 'Building assembly file <(RULE_INPUT_PATH)', - 'process_outputs_as_sources': 1, - }, - ], - }, - },], - ], -} diff --git a/tools/gyp/test/assembly/src/lib1.S b/tools/gyp/test/assembly/src/lib1.S deleted file mode 100644 index 7de9f19cf97383fccc05dca2a51236cf177b2d43..0000000000000000000000000000000000000000 --- a/tools/gyp/test/assembly/src/lib1.S +++ /dev/null @@ -1,15 +0,0 @@ -#if PLATFORM_WINDOWS || PLATFORM_MAC -# define IDENTIFIER(n) _##n -#else /* Linux */ -# define IDENTIFIER(n) n -#endif - -.globl IDENTIFIER(lib1_function) -IDENTIFIER(lib1_function): -#if !defined(PLATFORM_ANDROID) - movl $42, %eax - ret -#else /* Android (assuming ARM) */ - mov r0, #42 - bx lr -#endif diff --git a/tools/gyp/test/assembly/src/lib1.c b/tools/gyp/test/assembly/src/lib1.c deleted file mode 100644 index be21ecd5f6a765327cf45546e032f602ad2a20d2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/assembly/src/lib1.c +++ /dev/null @@ -1,3 +0,0 @@ -int lib1_function(void) { - return 42; -} diff --git a/tools/gyp/test/assembly/src/override.gyp b/tools/gyp/test/assembly/src/override.gyp deleted file mode 100644 index 39a4072effc5cf9053a5f6b8bd34f29248ba65ee..0000000000000000000000000000000000000000 --- a/tools/gyp/test/assembly/src/override.gyp +++ /dev/null @@ -1,34 +0,0 @@ -# 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': 'program', - 'type': 'executable', - 'sources': [ - 'program.c', - 'override_asm.asm', - ], - 'rules': [ - { - # Test that if there's a specific .asm rule, it overrides the - # built in one on Windows. - 'rule_name': 'assembler', - 'msvs_cygwin_shell': 0, - 'extension': 'asm', - 'inputs': [ - 'as.bat', - ], - 'outputs': [ - 'output.obj', - ], - 'action': ['as.bat', 'lib1.c', '<(_outputs)'], - 'message': 'Building assembly file <(RULE_INPUT_PATH)', - 'process_outputs_as_sources': 1, - }, - ], - }, - ], -} diff --git a/tools/gyp/test/assembly/src/override_asm.asm b/tools/gyp/test/assembly/src/override_asm.asm deleted file mode 100644 index be93b23baac3f580146bc298eb67af097e82aea7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/assembly/src/override_asm.asm +++ /dev/null @@ -1,8 +0,0 @@ -; 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. - -; This is a placeholder. It should not be referenced if overrides work -; correctly. - -Bad stuff that shouldn't assemble. diff --git a/tools/gyp/test/assembly/src/program.c b/tools/gyp/test/assembly/src/program.c deleted file mode 100644 index eee862712e19163080434ffa93023e95939d13dc..0000000000000000000000000000000000000000 --- a/tools/gyp/test/assembly/src/program.c +++ /dev/null @@ -1,12 +0,0 @@ -#include - -extern int lib1_function(void); - -int main(void) -{ - fprintf(stdout, "Hello from program.c\n"); - fflush(stdout); - fprintf(stdout, "Got %d.\n", lib1_function()); - fflush(stdout); - return 0; -} diff --git a/tools/gyp/test/build-option/gyptest-build.py b/tools/gyp/test/build-option/gyptest-build.py deleted file mode 100755 index 773d409ce5efc1371e80a1c2d64b7a25fffc39d0..0000000000000000000000000000000000000000 --- a/tools/gyp/test/build-option/gyptest-build.py +++ /dev/null @@ -1,33 +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. - -""" -Verifies simplest-possible build of a "Hello, world!" program -using the default build target. -""" - -import TestGyp - -test = TestGyp.TestGyp(workdir='workarea_default') - -if test.format == 'android': - # This test currently fails on android. Investigate why, fix the issues - # responsible, and reenable this test on android. See bug: - # https://code.google.com/p/gyp/issues/detail?id=436 - test.skip_test(message='Test fails on android. Fix and reenable.\n') - -if test.format == 'xcode-ninja': - # The xcode-ninja generator doesn't support --build - # cf. https://code.google.com/p/gyp/issues/detail?id=453 - test.skip_test() - -test.run_gyp('hello.gyp', '--build=Default') - -test.run_built_executable('hello', stdout="Hello, world!\n") - -test.up_to_date('hello.gyp', test.DEFAULT) - -test.pass_test() diff --git a/tools/gyp/test/build-option/hello.c b/tools/gyp/test/build-option/hello.c deleted file mode 100644 index f6ad129fd7a3db6381e0d65a6064a6fec380b94f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/build-option/hello.c +++ /dev/null @@ -1,13 +0,0 @@ -/* - * 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. - */ - -#include - -int main(void) -{ - printf("Hello, world!\n"); - return 0; -} diff --git a/tools/gyp/test/build-option/hello.gyp b/tools/gyp/test/build-option/hello.gyp deleted file mode 100644 index 1974d51ccd1934cfc0841f26e7118448b2fb1c98..0000000000000000000000000000000000000000 --- a/tools/gyp/test/build-option/hello.gyp +++ /dev/null @@ -1,15 +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': 'hello', - 'type': 'executable', - 'sources': [ - 'hello.c', - ], - }, - ], -} diff --git a/tools/gyp/test/builddir/gyptest-all.py b/tools/gyp/test/builddir/gyptest-all.py deleted file mode 100755 index f7294b570e2d193311252cd752179c1f4eb9c82e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/builddir/gyptest-all.py +++ /dev/null @@ -1,85 +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. - -""" -Verify the settings that cause a set of programs to be created in -a specific build directory, and that no intermediate built files -get created outside of that build directory hierarchy even when -referred to with deeply-nested ../../.. paths. -""" - -import TestGyp - -# TODO(mmoss): Make only supports (theoretically) a single, global build -# directory (through GYP_GENERATOR_FLAGS 'output_dir'), rather than -# gyp-file-specific settings (e.g. the stuff in builddir.gypi) that the other -# generators support, so this doesn't work yet for make. -# TODO(mmoss) Make also has the issue that the top-level Makefile is written to -# the "--depth" location, which is one level above 'src', but then this test -# moves 'src' somewhere else, leaving the Makefile behind, so make can't find -# its sources. I'm not sure if make is wrong for writing outside the current -# directory, or if the test is wrong for assuming everything generated is under -# the current directory. -# Android, Ninja, and CMake do not support setting the build directory. -test = TestGyp.TestGyp(formats=['!make', '!ninja', '!android', '!cmake']) - -test.run_gyp('prog1.gyp', '--depth=..', chdir='src') -if test.format == 'msvs': - if test.uses_msbuild: - test.must_contain('src/prog1.vcxproj', - '..\\builddir\\Default\\') - else: - test.must_contain('src/prog1.vcproj', - 'OutputDirectory="..\\builddir\\Default\\"') - -test.relocate('src', 'relocate/src') - -test.subdir('relocate/builddir') - -# Make sure that all the built ../../etc. files only get put under builddir, -# by making all of relocate read-only and then making only builddir writable. -test.writable('relocate', False) -test.writable('relocate/builddir', True) - -# Suppress the test infrastructure's setting SYMROOT on the command line. -test.build('prog1.gyp', test.ALL, SYMROOT=None, chdir='relocate/src') - -expect1 = """\ -Hello from prog1.c -Hello from func1.c -""" - -expect2 = """\ -Hello from subdir2/prog2.c -Hello from func2.c -""" - -expect3 = """\ -Hello from subdir2/subdir3/prog3.c -Hello from func3.c -""" - -expect4 = """\ -Hello from subdir2/subdir3/subdir4/prog4.c -Hello from func4.c -""" - -expect5 = """\ -Hello from subdir2/subdir3/subdir4/subdir5/prog5.c -Hello from func5.c -""" - -def run_builddir(prog, expect): - dir = 'relocate/builddir/Default/' - test.run(program=test.workpath(dir + prog), stdout=expect) - -run_builddir('prog1', expect1) -run_builddir('prog2', expect2) -run_builddir('prog3', expect3) -run_builddir('prog4', expect4) -run_builddir('prog5', expect5) - -test.pass_test() diff --git a/tools/gyp/test/builddir/gyptest-default.py b/tools/gyp/test/builddir/gyptest-default.py deleted file mode 100755 index 1b47443fff46c18ed4b2c470cad75d43127dee09..0000000000000000000000000000000000000000 --- a/tools/gyp/test/builddir/gyptest-default.py +++ /dev/null @@ -1,85 +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. - -""" -Verify the settings that cause a set of programs to be created in -a specific build directory, and that no intermediate built files -get created outside of that build directory hierarchy even when -referred to with deeply-nested ../../.. paths. -""" - -import TestGyp - -# TODO(mmoss): Make only supports (theoretically) a single, global build -# directory (through GYP_GENERATOR_FLAGS 'output_dir'), rather than -# gyp-file-specific settings (e.g. the stuff in builddir.gypi) that the other -# generators support, so this doesn't work yet for make. -# TODO(mmoss) Make also has the issue that the top-level Makefile is written to -# the "--depth" location, which is one level above 'src', but then this test -# moves 'src' somewhere else, leaving the Makefile behind, so make can't find -# its sources. I'm not sure if make is wrong for writing outside the current -# directory, or if the test is wrong for assuming everything generated is under -# the current directory. -# Android, Ninja, and CMake do not support setting the build directory. -test = TestGyp.TestGyp(formats=['!make', '!ninja', '!android', '!cmake']) - -test.run_gyp('prog1.gyp', '--depth=..', chdir='src') -if test.format == 'msvs': - if test.uses_msbuild: - test.must_contain('src/prog1.vcxproj', - '..\\builddir\\Default\\') - else: - test.must_contain('src/prog1.vcproj', - 'OutputDirectory="..\\builddir\\Default\\"') - -test.relocate('src', 'relocate/src') - -test.subdir('relocate/builddir') - -# Make sure that all the built ../../etc. files only get put under builddir, -# by making all of relocate read-only and then making only builddir writable. -test.writable('relocate', False) -test.writable('relocate/builddir', True) - -# Suppress the test infrastructure's setting SYMROOT on the command line. -test.build('prog1.gyp', SYMROOT=None, chdir='relocate/src') - -expect1 = """\ -Hello from prog1.c -Hello from func1.c -""" - -expect2 = """\ -Hello from subdir2/prog2.c -Hello from func2.c -""" - -expect3 = """\ -Hello from subdir2/subdir3/prog3.c -Hello from func3.c -""" - -expect4 = """\ -Hello from subdir2/subdir3/subdir4/prog4.c -Hello from func4.c -""" - -expect5 = """\ -Hello from subdir2/subdir3/subdir4/subdir5/prog5.c -Hello from func5.c -""" - -def run_builddir(prog, expect): - dir = 'relocate/builddir/Default/' - test.run(program=test.workpath(dir + prog), stdout=expect) - -run_builddir('prog1', expect1) -run_builddir('prog2', expect2) -run_builddir('prog3', expect3) -run_builddir('prog4', expect4) -run_builddir('prog5', expect5) - -test.pass_test() diff --git a/tools/gyp/test/builddir/src/builddir.gypi b/tools/gyp/test/builddir/src/builddir.gypi deleted file mode 100644 index ce175db8f84dcb8e1a1b1fc333eda21860bce91b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/builddir/src/builddir.gypi +++ /dev/null @@ -1,18 +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. - -{ - 'target_defaults': { - 'configurations': { - 'Default': { - 'msvs_configuration_attributes': { - 'OutputDirectory': '<(DEPTH)\\builddir/Default', - }, - }, - }, - }, - 'xcode_settings': { - 'SYMROOT': '<(DEPTH)/builddir', - }, -} diff --git a/tools/gyp/test/builddir/src/func1.c b/tools/gyp/test/builddir/src/func1.c deleted file mode 100644 index b8e6a06951c98722599128e0c3fbad49e3d16d68..0000000000000000000000000000000000000000 --- a/tools/gyp/test/builddir/src/func1.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -void func1(void) -{ - printf("Hello from func1.c\n"); -} diff --git a/tools/gyp/test/builddir/src/func2.c b/tools/gyp/test/builddir/src/func2.c deleted file mode 100644 index 14aabac475ad2f5504594309c8373a8b48b77682..0000000000000000000000000000000000000000 --- a/tools/gyp/test/builddir/src/func2.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -void func2(void) -{ - printf("Hello from func2.c\n"); -} diff --git a/tools/gyp/test/builddir/src/func3.c b/tools/gyp/test/builddir/src/func3.c deleted file mode 100644 index 3b4edeae6ddbfc8364afbb20ef99e402cb555b4b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/builddir/src/func3.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -void func3(void) -{ - printf("Hello from func3.c\n"); -} diff --git a/tools/gyp/test/builddir/src/func4.c b/tools/gyp/test/builddir/src/func4.c deleted file mode 100644 index 732891b79a999c835aed3e34279fa2fbc19244bb..0000000000000000000000000000000000000000 --- a/tools/gyp/test/builddir/src/func4.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -void func4(void) -{ - printf("Hello from func4.c\n"); -} diff --git a/tools/gyp/test/builddir/src/func5.c b/tools/gyp/test/builddir/src/func5.c deleted file mode 100644 index 18fdfabbbed858efee0199cc98b847556cd942e9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/builddir/src/func5.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -void func5(void) -{ - printf("Hello from func5.c\n"); -} diff --git a/tools/gyp/test/builddir/src/prog1.c b/tools/gyp/test/builddir/src/prog1.c deleted file mode 100644 index a32aaf04f9dcc72be8d8000fd473434859974d4e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/builddir/src/prog1.c +++ /dev/null @@ -1,10 +0,0 @@ -#include - -extern void func1(void); - -int main(void) -{ - printf("Hello from prog1.c\n"); - func1(); - return 0; -} diff --git a/tools/gyp/test/builddir/src/prog1.gyp b/tools/gyp/test/builddir/src/prog1.gyp deleted file mode 100644 index 5b96f035ec707c1eba23dd1e7c2dd141fa085078..0000000000000000000000000000000000000000 --- a/tools/gyp/test/builddir/src/prog1.gyp +++ /dev/null @@ -1,30 +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. - -{ - 'includes': [ - 'builddir.gypi', - ], - 'targets': [ - { - 'target_name': 'pull_in_all', - 'type': 'none', - 'dependencies': [ - 'prog1', - 'subdir2/prog2.gyp:prog2', - 'subdir2/subdir3/prog3.gyp:prog3', - 'subdir2/subdir3/subdir4/prog4.gyp:prog4', - 'subdir2/subdir3/subdir4/subdir5/prog5.gyp:prog5', - ], - }, - { - 'target_name': 'prog1', - 'type': 'executable', - 'sources': [ - 'prog1.c', - 'func1.c', - ], - }, - ], -} diff --git a/tools/gyp/test/builddir/src/subdir2/prog2.c b/tools/gyp/test/builddir/src/subdir2/prog2.c deleted file mode 100644 index 9d682cd783c8ad954c5fef8e5766c0284c75bc52..0000000000000000000000000000000000000000 --- a/tools/gyp/test/builddir/src/subdir2/prog2.c +++ /dev/null @@ -1,10 +0,0 @@ -#include - -extern void func2(void); - -int main(void) -{ - printf("Hello from subdir2/prog2.c\n"); - func2(); - return 0; -} diff --git a/tools/gyp/test/builddir/src/subdir2/prog2.gyp b/tools/gyp/test/builddir/src/subdir2/prog2.gyp deleted file mode 100644 index 96299b646d21163078c3757bfbae36d0fac8ffa5..0000000000000000000000000000000000000000 --- a/tools/gyp/test/builddir/src/subdir2/prog2.gyp +++ /dev/null @@ -1,19 +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. - -{ - 'includes': [ - '../builddir.gypi', - ], - 'targets': [ - { - 'target_name': 'prog2', - 'type': 'executable', - 'sources': [ - 'prog2.c', - '../func2.c', - ], - }, - ], -} diff --git a/tools/gyp/test/builddir/src/subdir2/subdir3/prog3.c b/tools/gyp/test/builddir/src/subdir2/subdir3/prog3.c deleted file mode 100644 index da74965985e56c55b95a73567dafda079119cda5..0000000000000000000000000000000000000000 --- a/tools/gyp/test/builddir/src/subdir2/subdir3/prog3.c +++ /dev/null @@ -1,10 +0,0 @@ -#include - -extern void func3(void); - -int main(void) -{ - printf("Hello from subdir2/subdir3/prog3.c\n"); - func3(); - return 0; -} diff --git a/tools/gyp/test/builddir/src/subdir2/subdir3/prog3.gyp b/tools/gyp/test/builddir/src/subdir2/subdir3/prog3.gyp deleted file mode 100644 index d7df43c7bde92f1767db88ab4872f173cb3453f6..0000000000000000000000000000000000000000 --- a/tools/gyp/test/builddir/src/subdir2/subdir3/prog3.gyp +++ /dev/null @@ -1,19 +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. - -{ - 'includes': [ - '../../builddir.gypi', - ], - 'targets': [ - { - 'target_name': 'prog3', - 'type': 'executable', - 'sources': [ - 'prog3.c', - '../../func3.c', - ], - }, - ], -} diff --git a/tools/gyp/test/builddir/src/subdir2/subdir3/subdir4/prog4.c b/tools/gyp/test/builddir/src/subdir2/subdir3/subdir4/prog4.c deleted file mode 100644 index 5787d5fa4368bc71b1cf3e2cae4f4aef42f4d310..0000000000000000000000000000000000000000 --- a/tools/gyp/test/builddir/src/subdir2/subdir3/subdir4/prog4.c +++ /dev/null @@ -1,10 +0,0 @@ -#include - -extern void func4(void); - -int main(void) -{ - printf("Hello from subdir2/subdir3/subdir4/prog4.c\n"); - func4(); - return 0; -} diff --git a/tools/gyp/test/builddir/src/subdir2/subdir3/subdir4/prog4.gyp b/tools/gyp/test/builddir/src/subdir2/subdir3/subdir4/prog4.gyp deleted file mode 100644 index 862a8a18cd70f8d69d41064e59507a71dfb78c21..0000000000000000000000000000000000000000 --- a/tools/gyp/test/builddir/src/subdir2/subdir3/subdir4/prog4.gyp +++ /dev/null @@ -1,19 +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. - -{ - 'includes': [ - '../../../builddir.gypi', - ], - 'targets': [ - { - 'target_name': 'prog4', - 'type': 'executable', - 'sources': [ - 'prog4.c', - '../../../func4.c', - ], - }, - ], -} diff --git a/tools/gyp/test/builddir/src/subdir2/subdir3/subdir4/subdir5/prog5.c b/tools/gyp/test/builddir/src/subdir2/subdir3/subdir4/subdir5/prog5.c deleted file mode 100644 index c6e2ab521f4333bcf6c11bb76a28275eb1df69a9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/builddir/src/subdir2/subdir3/subdir4/subdir5/prog5.c +++ /dev/null @@ -1,10 +0,0 @@ -#include - -extern void func5(void); - -int main(void) -{ - printf("Hello from subdir2/subdir3/subdir4/subdir5/prog5.c\n"); - func5(); - return 0; -} diff --git a/tools/gyp/test/builddir/src/subdir2/subdir3/subdir4/subdir5/prog5.gyp b/tools/gyp/test/builddir/src/subdir2/subdir3/subdir4/subdir5/prog5.gyp deleted file mode 100644 index fe1c9cbf50f49ab3bfcd6ca0a21b56a7376fe9f4..0000000000000000000000000000000000000000 --- a/tools/gyp/test/builddir/src/subdir2/subdir3/subdir4/subdir5/prog5.gyp +++ /dev/null @@ -1,19 +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. - -{ - 'includes': [ - '../../../../builddir.gypi', - ], - 'targets': [ - { - 'target_name': 'prog5', - 'type': 'executable', - 'sources': [ - 'prog5.c', - '../../../../func5.c', - ], - }, - ], -} diff --git a/tools/gyp/test/cflags/cflags.c b/tools/gyp/test/cflags/cflags.c deleted file mode 100644 index 0a02ba90745e80767923be8fe5217c9e0dd01b7b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/cflags/cflags.c +++ /dev/null @@ -1,15 +0,0 @@ -/* 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. */ - -#include - -int main(void) -{ -#ifdef FOO - printf("FOO defined\n"); -#else - printf("FOO not defined\n"); -#endif - return 0; -} diff --git a/tools/gyp/test/cflags/cflags.gyp b/tools/gyp/test/cflags/cflags.gyp deleted file mode 100644 index 2840dc63185d04a8816b22bc188f8898cb3260cf..0000000000000000000000000000000000000000 --- a/tools/gyp/test/cflags/cflags.gyp +++ /dev/null @@ -1,23 +0,0 @@ -# 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': 'cflags', - 'type': 'executable', - 'sources': [ - 'cflags.c', - ], - }, - { - 'target_name': 'cflags_host', - 'toolsets': ['host'], - 'type': 'executable', - 'sources': [ - 'cflags.c', - ], - }, - ], -} diff --git a/tools/gyp/test/cflags/gyptest-cflags.py b/tools/gyp/test/cflags/gyptest-cflags.py deleted file mode 100755 index 0a87ed871bec685d7606025335c2b34a6b0ad78f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/cflags/gyptest-cflags.py +++ /dev/null @@ -1,64 +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. - -""" -Verifies the use of the environment during regeneration when the gyp file -changes, specifically via build of an executable with C preprocessor -definition specified by CFLAGS. - -In this test, gyp and build both run in same local environment. -""" - -import TestGyp - -# CPPFLAGS works in ninja but not make; CFLAGS works in both -FORMATS = ('make', 'ninja') - -test = TestGyp.TestGyp(formats=FORMATS) - -# First set CFLAGS to blank in case the platform doesn't support unsetenv. -with TestGyp.LocalEnv({'CFLAGS': '', - 'GYP_CROSSCOMPILE': '1'}): - test.run_gyp('cflags.gyp') - test.build('cflags.gyp') - -expect = """FOO not defined\n""" -test.run_built_executable('cflags', stdout=expect) -test.run_built_executable('cflags_host', stdout=expect) - -test.sleep() - -with TestGyp.LocalEnv({'CFLAGS': '-DFOO=1', - 'GYP_CROSSCOMPILE': '1'}): - test.run_gyp('cflags.gyp') - test.build('cflags.gyp') - -expect = """FOO defined\n""" -test.run_built_executable('cflags', stdout=expect) - -# Environment variables shouldn't influence the flags for the host. -expect = """FOO not defined\n""" -test.run_built_executable('cflags_host', stdout=expect) - -test.sleep() - -with TestGyp.LocalEnv({'CFLAGS': ''}): - test.run_gyp('cflags.gyp') - test.build('cflags.gyp') - -expect = """FOO not defined\n""" -test.run_built_executable('cflags', stdout=expect) - -test.sleep() - -with TestGyp.LocalEnv({'CFLAGS': '-DFOO=1'}): - test.run_gyp('cflags.gyp') - test.build('cflags.gyp') - -expect = """FOO defined\n""" -test.run_built_executable('cflags', stdout=expect) - -test.pass_test() diff --git a/tools/gyp/test/compilable/gyptest-headers.py b/tools/gyp/test/compilable/gyptest-headers.py deleted file mode 100755 index 91760216fbb55f1f30c3ce121122ddac5ab72a06..0000000000000000000000000000000000000000 --- a/tools/gyp/test/compilable/gyptest-headers.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies that .hpp files are ignored when included in the source list on all -platforms. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('headers.gyp', chdir='src') - -test.relocate('src', 'relocate/src') - -test.build('headers.gyp', test.ALL, chdir='relocate/src') - -expect = """\ -Hello from program.c -Hello from lib1.c -""" -test.run_built_executable('program', chdir='relocate/src', stdout=expect) - - -test.pass_test() diff --git a/tools/gyp/test/compilable/src/headers.gyp b/tools/gyp/test/compilable/src/headers.gyp deleted file mode 100644 index b6c2a8857be94029c4e2e69a284b4e46074891db..0000000000000000000000000000000000000000 --- a/tools/gyp/test/compilable/src/headers.gyp +++ /dev/null @@ -1,26 +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': 'program', - 'type': 'executable', - 'dependencies': [ - 'lib1' - ], - 'sources': [ - 'program.cpp', - ], - }, - { - 'target_name': 'lib1', - 'type': 'static_library', - 'sources': [ - 'lib1.hpp', - 'lib1.cpp', - ], - }, - ], -} diff --git a/tools/gyp/test/compilable/src/lib1.cpp b/tools/gyp/test/compilable/src/lib1.cpp deleted file mode 100644 index 51bc31a40b86fa7d19447bb42353d19e0c8f82a3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/compilable/src/lib1.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#include -#include "lib1.hpp" - -void lib1_function(void) { - fprintf(stdout, "Hello from lib1.c\n"); - fflush(stdout); -} diff --git a/tools/gyp/test/compilable/src/lib1.hpp b/tools/gyp/test/compilable/src/lib1.hpp deleted file mode 100644 index 72e63e8acdbd7040005b64805be2c7b0c718851d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/compilable/src/lib1.hpp +++ /dev/null @@ -1,6 +0,0 @@ -#ifndef _lib1_hpp -#define _lib1_hpp - -extern void lib1_function(void); - -#endif diff --git a/tools/gyp/test/compilable/src/program.cpp b/tools/gyp/test/compilable/src/program.cpp deleted file mode 100644 index 8af2c9b6ffcb2291ddd8f96620c1bbbed6f78b4b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/compilable/src/program.cpp +++ /dev/null @@ -1,9 +0,0 @@ -#include -#include "lib1.hpp" - -int main(void) { - fprintf(stdout, "Hello from program.c\n"); - fflush(stdout); - lib1_function(); - return 0; -} diff --git a/tools/gyp/test/compiler-override/compiler-exe.gyp b/tools/gyp/test/compiler-override/compiler-exe.gyp deleted file mode 100644 index c2f3002f20724d1c40baf9e6300c6f0a3baa6c60..0000000000000000000000000000000000000000 --- a/tools/gyp/test/compiler-override/compiler-exe.gyp +++ /dev/null @@ -1,16 +0,0 @@ -# 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': 'hello', - 'type': 'executable', - 'sources': [ - 'test.c', - 'cxxtest.cc', - ], - }, - ], -} diff --git a/tools/gyp/test/compiler-override/compiler-global-settings.gyp.in b/tools/gyp/test/compiler-override/compiler-global-settings.gyp.in deleted file mode 100644 index ca13a53e8d88bb7ed7f4ef7b73bcb966ddbffb20..0000000000000000000000000000000000000000 --- a/tools/gyp/test/compiler-override/compiler-global-settings.gyp.in +++ /dev/null @@ -1,34 +0,0 @@ -# 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. - -{ - # PYTHON and PWD are replaced by the test code before this - # gyp file runs - 'make_global_settings': [ - ['CC', r'$PYTHON $PWD/my_cc.py FOO'], - ['CXX', r'$PYTHON $PWD/my_cxx.py FOO'], - ['CC.host', r'$PYTHON $PWD/my_cc.py BAR'], - ['CXX.host', r'$PYTHON $PWD/my_cxx.py BAR'], - - ['LD', r'$PYTHON $PWD/my_ld.py FOO_LINK'], - ['LD.host', r'$PYTHON $PWD/my_ld.py BAR_LINK'], - ['LINK', r'$PYTHON $PWD/my_ld.py FOO_LINK'], - ['LINK.host', r'$PYTHON $PWD/my_ld.py BAR_LINK'], - ], - - # The above global settings should mean that - # that these targets are built using the fake - # toolchain above. - 'targets': [ - { - 'toolset': '$TOOLSET', - 'target_name': 'hello', - 'type': 'executable', - 'sources': [ - 'test.c', - 'cxxtest.cc', - ], - }, - ], -} diff --git a/tools/gyp/test/compiler-override/compiler-host.gyp b/tools/gyp/test/compiler-override/compiler-host.gyp deleted file mode 100644 index ab3d247e0bfe19f01d283a71c5bc5db38a54890c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/compiler-override/compiler-host.gyp +++ /dev/null @@ -1,17 +0,0 @@ -# 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': [ - { - 'toolset': 'host', - 'target_name': 'hello', - 'type': 'executable', - 'sources': [ - 'test.c', - 'cxxtest.cc', - ], - }, - ], -} diff --git a/tools/gyp/test/compiler-override/compiler-shared-lib.gyp b/tools/gyp/test/compiler-override/compiler-shared-lib.gyp deleted file mode 100644 index d3e4316135db0698cefd5acb33d41a8a7c1bf300..0000000000000000000000000000000000000000 --- a/tools/gyp/test/compiler-override/compiler-shared-lib.gyp +++ /dev/null @@ -1,16 +0,0 @@ -# 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': 'hello-lib', - 'type': 'shared_library', - 'sources': [ - 'test.c', - 'cxxtest.cc', - ], - }, - ], -} diff --git a/tools/gyp/test/compiler-override/cxxtest.cc b/tools/gyp/test/compiler-override/cxxtest.cc deleted file mode 100644 index 517a35361962839546d9977c032e221fff9e7bf7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/compiler-override/cxxtest.cc +++ /dev/null @@ -1,7 +0,0 @@ -// 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. - -// Deliberate C syntax error as this file should never be passed to -// the actual compiler -#error Should not be passed to a real compiler diff --git a/tools/gyp/test/compiler-override/gyptest-compiler-env-toolchain.py b/tools/gyp/test/compiler-override/gyptest-compiler-env-toolchain.py deleted file mode 100644 index 2361d0c7c2a4c406ad2b529356af00f7e3e0151a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/compiler-override/gyptest-compiler-env-toolchain.py +++ /dev/null @@ -1,78 +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. -""" -Verifies that the user can override the compiler and linker using -CC/CXX/NM/READELF environment variables. -""" - -import TestGyp -import os -import copy -import sys - -here = os.path.dirname(os.path.abspath(__file__)) - -if sys.platform == 'win32': - # cross compiling not supported by ninja on windows - # and make not supported on windows at all. - sys.exit(0) - -# Clear any existing compiler related env vars. -for key in ['CC', 'CXX', 'LINK', 'CC_host', 'CXX_host', 'LINK_host', - 'NM_target', 'READELF_target']: - if key in os.environ: - del os.environ[key] - - -def CheckCompiler(test, gypfile, check_for, run_gyp): - if run_gyp: - test.run_gyp(gypfile) - test.build(gypfile) - - test.must_contain_all_lines(test.stdout(), check_for) - - -test = TestGyp.TestGyp(formats=['ninja']) -# Must set the test format to something with a flavor (the part after the '-') -# in order to test the desired behavior. Since we want to run a non-host -# toolchain, we have to set the flavor to something that the ninja generator -# doesn't know about, so it doesn't default to the host-specific tools (e.g., -# 'otool' on mac to generate the .TOC). -# -# Note that we can't just pass format=['ninja-some_toolchain'] to the -# constructor above, because then this test wouldn't be recognized as a ninja -# format test. -test.formats = ['ninja-my_flavor' if f == 'ninja' else f for f in test.formats] - - -def TestTargetOverideSharedLib(): - # The std output from nm and readelf is redirected to files, so we can't - # expect their output to appear. Instead, check for the files they create to - # see if they actually ran. - expected = ['my_cc.py', 'my_cxx.py', 'FOO'] - - # Check that CC, CXX, NM, READELF, set target compiler - env = {'CC': 'python %s/my_cc.py FOO' % here, - 'CXX': 'python %s/my_cxx.py FOO' % here, - 'NM': 'python %s/my_nm.py' % here, - 'READELF': 'python %s/my_readelf.py' % here} - - with TestGyp.LocalEnv(env): - CheckCompiler(test, 'compiler-shared-lib.gyp', expected, True) - test.must_contain(test.built_file_path('RAN_MY_NM'), 'RAN_MY_NM') - test.must_contain(test.built_file_path('RAN_MY_READELF'), 'RAN_MY_READELF') - test.unlink(test.built_file_path('RAN_MY_NM')) - test.unlink(test.built_file_path('RAN_MY_READELF')) - - # Run the same tests once the eviron has been restored. The generated - # projects should have embedded all the settings in the project files so the - # results should be the same. - CheckCompiler(test, 'compiler-shared-lib.gyp', expected, False) - test.must_contain(test.built_file_path('RAN_MY_NM'), 'RAN_MY_NM') - test.must_contain(test.built_file_path('RAN_MY_READELF'), 'RAN_MY_READELF') - - -TestTargetOverideSharedLib() -test.pass_test() diff --git a/tools/gyp/test/compiler-override/gyptest-compiler-env.py b/tools/gyp/test/compiler-override/gyptest-compiler-env.py deleted file mode 100755 index bb38b6e55bea9b66ab17393aa4f31475a2b69b7a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/compiler-override/gyptest-compiler-env.py +++ /dev/null @@ -1,110 +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. -""" -Verifies that the user can override the compiler and linker using CC/CXX/LD -environment variables. -""" - -import TestGyp -import os -import copy -import sys - -here = os.path.dirname(os.path.abspath(__file__)) - -if sys.platform == 'win32': - # cross compiling not supported by ninja on windows - # and make not supported on windows at all. - sys.exit(0) - -# Clear any existing compiler related env vars. -for key in ['CC', 'CXX', 'LINK', 'CC_host', 'CXX_host', 'LINK_host']: - if key in os.environ: - del os.environ[key] - - -def CheckCompiler(test, gypfile, check_for, run_gyp): - if run_gyp: - test.run_gyp(gypfile) - test.build(gypfile) - - test.must_contain_all_lines(test.stdout(), check_for) - - -test = TestGyp.TestGyp(formats=['ninja', 'make']) - -def TestTargetOveride(): - expected = ['my_cc.py', 'my_cxx.py', 'FOO' ] - - # ninja just uses $CC / $CXX as linker. - if test.format not in ['ninja', 'xcode-ninja']: - expected.append('FOO_LINK') - - # Check that CC, CXX and LD set target compiler - oldenv = os.environ.copy() - try: - os.environ['CC'] = 'python %s/my_cc.py FOO' % here - os.environ['CXX'] = 'python %s/my_cxx.py FOO' % here - os.environ['LINK'] = 'python %s/my_ld.py FOO_LINK' % here - - CheckCompiler(test, 'compiler-exe.gyp', expected, True) - finally: - os.environ.clear() - os.environ.update(oldenv) - - # Run the same tests once the eviron has been restored. The - # generated should have embedded all the settings in the - # project files so the results should be the same. - CheckCompiler(test, 'compiler-exe.gyp', expected, False) - - -def TestTargetOverideCompilerOnly(): - # Same test again but with that CC, CXX and not LD - oldenv = os.environ.copy() - try: - os.environ['CC'] = 'python %s/my_cc.py FOO' % here - os.environ['CXX'] = 'python %s/my_cxx.py FOO' % here - - CheckCompiler(test, 'compiler-exe.gyp', - ['my_cc.py', 'my_cxx.py', 'FOO'], - True) - finally: - os.environ.clear() - os.environ.update(oldenv) - - # Run the same tests once the eviron has been restored. The - # generated should have embedded all the settings in the - # project files so the results should be the same. - CheckCompiler(test, 'compiler-exe.gyp', - ['my_cc.py', 'my_cxx.py', 'FOO'], - False) - - -def TestHostOveride(): - expected = ['my_cc.py', 'my_cxx.py', 'HOST' ] - if test.format != 'ninja': # ninja just uses $CC / $CXX as linker. - expected.append('HOST_LINK') - - # Check that CC_host sets host compilee - oldenv = os.environ.copy() - try: - os.environ['CC_host'] = 'python %s/my_cc.py HOST' % here - os.environ['CXX_host'] = 'python %s/my_cxx.py HOST' % here - os.environ['LINK_host'] = 'python %s/my_ld.py HOST_LINK' % here - CheckCompiler(test, 'compiler-host.gyp', expected, True) - finally: - os.environ.clear() - os.environ.update(oldenv) - - # Run the same tests once the eviron has been restored. The - # generated should have embedded all the settings in the - # project files so the results should be the same. - CheckCompiler(test, 'compiler-host.gyp', expected, False) - - -TestTargetOveride() -TestTargetOverideCompilerOnly() - -test.pass_test() diff --git a/tools/gyp/test/compiler-override/gyptest-compiler-global-settings.py b/tools/gyp/test/compiler-override/gyptest-compiler-global-settings.py deleted file mode 100755 index d58fc7c2f995d617fc28a7697b6ff3cd494a1113..0000000000000000000000000000000000000000 --- a/tools/gyp/test/compiler-override/gyptest-compiler-global-settings.py +++ /dev/null @@ -1,78 +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. -""" -Verifies that make_global_settings can be used to override the -compiler settings. -""" - -import TestGyp -import os -import copy -import sys -from string import Template - - -if sys.platform == 'win32': - # cross compiling not support by ninja on windows - # and make not supported on windows at all. - sys.exit(0) - -test = TestGyp.TestGyp(formats=['ninja', 'make']) - -gypfile = 'compiler-global-settings.gyp' - -replacements = { 'PYTHON': '/usr/bin/python', 'PWD': os.getcwd()} - -# Process the .in gyp file to produce the final gyp file -# since we need to include absolute paths in the make_global_settings -# section. -replacements['TOOLSET'] = 'target' -s = Template(open(gypfile + '.in').read()) -output = open(gypfile, 'w') -output.write(s.substitute(replacements)) -output.close() - -old_env = dict(os.environ) -os.environ['GYP_CROSSCOMPILE'] = '1' -test.run_gyp(gypfile) -os.environ.clear() -os.environ.update(old_env) - -test.build(gypfile) -test.must_contain_all_lines(test.stdout(), ['my_cc.py', 'my_cxx.py', 'FOO']) - -# The xcode generator chokes on the 'host' toolset. Skip the rest of -# this test (cf. https://code.google.com/p/gyp/issues/detail?id=454). -if test.format == 'xcode-ninja': - test.pass_test() - -# Same again but with the host toolset. -replacements['TOOLSET'] = 'host' -s = Template(open(gypfile + '.in').read()) -output = open(gypfile, 'w') -output.write(s.substitute(replacements)) -output.close() - -old_env = dict(os.environ) -os.environ['GYP_CROSSCOMPILE'] = '1' -test.run_gyp(gypfile) -os.environ.clear() -os.environ.update(old_env) - -test.build(gypfile) -test.must_contain_all_lines(test.stdout(), ['my_cc.py', 'my_cxx.py', 'BAR']) - -# Check that CC_host overrides make_global_settings -old_env = dict(os.environ) -os.environ['CC_host'] = '%s %s/my_cc.py SECRET' % (replacements['PYTHON'], - replacements['PWD']) -test.run_gyp(gypfile) -os.environ.clear() -os.environ.update(old_env) - -test.build(gypfile) -test.must_contain_all_lines(test.stdout(), ['SECRET', 'my_cxx.py', 'BAR']) - -test.pass_test() diff --git a/tools/gyp/test/compiler-override/my_cc.py b/tools/gyp/test/compiler-override/my_cc.py deleted file mode 100755 index e2f0bdd51c7c55a4aadbb2206e4d5911b23b12a2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/compiler-override/my_cc.py +++ /dev/null @@ -1,6 +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. -import sys -print sys.argv diff --git a/tools/gyp/test/compiler-override/my_cxx.py b/tools/gyp/test/compiler-override/my_cxx.py deleted file mode 100755 index e2f0bdd51c7c55a4aadbb2206e4d5911b23b12a2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/compiler-override/my_cxx.py +++ /dev/null @@ -1,6 +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. -import sys -print sys.argv diff --git a/tools/gyp/test/compiler-override/my_ld.py b/tools/gyp/test/compiler-override/my_ld.py deleted file mode 100755 index e2f0bdd51c7c55a4aadbb2206e4d5911b23b12a2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/compiler-override/my_ld.py +++ /dev/null @@ -1,6 +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. -import sys -print sys.argv diff --git a/tools/gyp/test/compiler-override/my_nm.py b/tools/gyp/test/compiler-override/my_nm.py deleted file mode 100755 index f0f1efcf73bd7c341765c6b41f0f5db85427eb75..0000000000000000000000000000000000000000 --- a/tools/gyp/test/compiler-override/my_nm.py +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 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. -import sys -print sys.argv -with open('RAN_MY_NM', 'w') as f: - f.write('RAN_MY_NM') diff --git a/tools/gyp/test/compiler-override/my_readelf.py b/tools/gyp/test/compiler-override/my_readelf.py deleted file mode 100755 index 40e303cd76f74e4b73d59e5b07097a0b7822288e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/compiler-override/my_readelf.py +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 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. -import sys -print sys.argv -with open('RAN_MY_READELF', 'w') as f: - f.write('RAN_MY_READELF') diff --git a/tools/gyp/test/compiler-override/test.c b/tools/gyp/test/compiler-override/test.c deleted file mode 100644 index 517a35361962839546d9977c032e221fff9e7bf7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/compiler-override/test.c +++ /dev/null @@ -1,7 +0,0 @@ -// 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. - -// Deliberate C syntax error as this file should never be passed to -// the actual compiler -#error Should not be passed to a real compiler diff --git a/tools/gyp/test/conditions/elseif/elseif.gyp b/tools/gyp/test/conditions/elseif/elseif.gyp deleted file mode 100644 index 6367ff7d7afef580e47d50e4ff8f632106c196f1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/conditions/elseif/elseif.gyp +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright (c) 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -{ - 'targets': [ - { - 'variables': { 'test_var': 0 }, - 'target_name': 'program0', - 'type': 'executable', - 'sources': [ 'program.cc' ], - 'includes': [ 'elseif_conditions.gypi' ], - }, - { - 'variables': { 'test_var': 1 }, - 'target_name': 'program1', - 'type': 'executable', - 'sources': [ 'program.cc' ], - 'includes': [ 'elseif_conditions.gypi' ], - }, - { - 'variables': { 'test_var': 2 }, - 'target_name': 'program2', - 'type': 'executable', - 'sources': [ 'program.cc' ], - 'includes': [ 'elseif_conditions.gypi' ], - }, - { - 'variables': { 'test_var': 3 }, - 'target_name': 'program3', - 'type': 'executable', - 'sources': [ 'program.cc' ], - 'includes': [ 'elseif_conditions.gypi' ], - }, - { - 'variables': { 'test_var': 4 }, - 'target_name': 'program4', - 'type': 'executable', - 'sources': [ 'program.cc' ], - 'includes': [ 'elseif_conditions.gypi' ], - }, - ], -} diff --git a/tools/gyp/test/conditions/elseif/elseif_bad1.gyp b/tools/gyp/test/conditions/elseif/elseif_bad1.gyp deleted file mode 100644 index 35c8455ccae177b7dcc75e0f14ef9db117bdd31a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/conditions/elseif/elseif_bad1.gyp +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# Trigger an error because of two consecutive string conditions. - -{ - 'targets': [ - { - 'variables': { 'test_var': 0 }, - 'target_name': 'program', - 'type': 'executable', - 'sources': [ 'program.cc' ], - 'conditions': [ - ['test_var==0', 'test_var==1', { - }], - ], - }, - ], -} diff --git a/tools/gyp/test/conditions/elseif/elseif_bad2.gyp b/tools/gyp/test/conditions/elseif/elseif_bad2.gyp deleted file mode 100644 index b529f292c06f980a46061c73dbe38a09145b4ef6..0000000000000000000000000000000000000000 --- a/tools/gyp/test/conditions/elseif/elseif_bad2.gyp +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (c) 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# Trigger an error because of two consecutive string conditions, even if the -# conditions are not actually evaluated. - -{ - 'targets': [ - { - 'variables': { 'test_var': 0 }, - 'target_name': 'program', - 'type': 'executable', - 'sources': [ 'program.cc' ], - 'conditions': [ - ['test_var==0', { - }, 'test_var==1', 'test_var==2', { - }], - ], - }, - ], -} diff --git a/tools/gyp/test/conditions/elseif/elseif_bad3.gyp b/tools/gyp/test/conditions/elseif/elseif_bad3.gyp deleted file mode 100644 index 126e18605373b71e7447fb832264948bbd7bf744..0000000000000000000000000000000000000000 --- a/tools/gyp/test/conditions/elseif/elseif_bad3.gyp +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (c) 2014 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# Trigger an error because there are unexpected trailing items in a condition. - -{ - 'targets': [ - { - 'variables': { 'test_var': 0 }, - 'target_name': 'program', - 'type': 'executable', - 'sources': [ 'program.cc' ], - 'conditions': [ - ['test_var==0' { - }, 'test_var==1', { - }, { - }, 'test_var==2', { - }], - ], - }, - ], -} diff --git a/tools/gyp/test/conditions/elseif/elseif_conditions.gypi b/tools/gyp/test/conditions/elseif/elseif_conditions.gypi deleted file mode 100644 index 4310ccc0312890c05b7f31f85d83e35f766e8b6f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/conditions/elseif/elseif_conditions.gypi +++ /dev/null @@ -1,15 +0,0 @@ -{ - 'conditions': [ - ['test_var==0', { - 'defines': ['FOO="first_if"'], - }, 'test_var==1', { - 'defines': ['FOO="first_else_if"'], - }, 'test_var==2', { - 'defines': ['FOO="second_else_if"'], - }, 'test_var==3', { - 'defines': ['FOO="third_else_if"'], - }, { - 'defines': ['FOO="last_else"'], - }], - ], -} diff --git a/tools/gyp/test/conditions/elseif/gyptest_elseif.py b/tools/gyp/test/conditions/elseif/gyptest_elseif.py deleted file mode 100644 index 9d030cf3fe0a8a0efea353fe9539075e16ba2ecb..0000000000000000000000000000000000000000 --- a/tools/gyp/test/conditions/elseif/gyptest_elseif.py +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Verify that "else-if" conditions work. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('elseif.gyp') -test.build('elseif.gyp', test.ALL) -test.run_built_executable( - 'program0', stdout='first_if\n') -test.run_built_executable( - 'program1', stdout='first_else_if\n') -test.run_built_executable( - 'program2', stdout='second_else_if\n') -test.run_built_executable( - 'program3', stdout='third_else_if\n') -test.run_built_executable( - 'program4', stdout='last_else\n') - -# Verify that bad condition blocks fail at gyp time. -test.run_gyp('elseif_bad1.gyp', status=1, stderr=None) -test.run_gyp('elseif_bad2.gyp', status=1, stderr=None) -test.run_gyp('elseif_bad3.gyp', status=1, stderr=None) - -test.pass_test() diff --git a/tools/gyp/test/conditions/elseif/program.cc b/tools/gyp/test/conditions/elseif/program.cc deleted file mode 100644 index 147fe2f75e46943b49f33420133adbb610d1e09d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/conditions/elseif/program.cc +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) 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. - -#include - -int main() { - printf("%s\n", FOO); - return 0; -} diff --git a/tools/gyp/test/configurations/basics/configurations.c b/tools/gyp/test/configurations/basics/configurations.c deleted file mode 100644 index 39e13c9c83fb0f3f07df2a328b0e8bbf2625bb02..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/basics/configurations.c +++ /dev/null @@ -1,15 +0,0 @@ -#include - -int main(void) -{ -#ifdef FOO - printf("Foo configuration\n"); -#endif -#ifdef DEBUG - printf("Debug configuration\n"); -#endif -#ifdef RELEASE - printf("Release configuration\n"); -#endif - return 0; -} diff --git a/tools/gyp/test/configurations/basics/configurations.gyp b/tools/gyp/test/configurations/basics/configurations.gyp deleted file mode 100644 index 93f1d8d5c7fe099bbf33f7c8ea17b4fb672039f2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/basics/configurations.gyp +++ /dev/null @@ -1,32 +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': 'configurations', - 'type': 'executable', - 'sources': [ - 'configurations.c', - ], - 'configurations': { - 'Debug': { - 'defines': [ - 'DEBUG', - ], - }, - 'Release': { - 'defines': [ - 'RELEASE', - ], - }, - 'Foo': { - 'defines': [ - 'FOO', - ], - }, - } - }, - ], -} diff --git a/tools/gyp/test/configurations/basics/gyptest-configurations.py b/tools/gyp/test/configurations/basics/gyptest-configurations.py deleted file mode 100755 index 1cf1995db78c16e626c42e229b8052e989267906..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/basics/gyptest-configurations.py +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies build of an executable in three different configurations. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -if test.format == 'android': - # This test currently fails on android. Investigate why, fix the issues - # responsible, and reenable this test on android. See bug: - # https://code.google.com/p/gyp/issues/detail?id=436 - test.skip_test(message='Test fails on android. Fix and reenable.\n') - -test.run_gyp('configurations.gyp') - -test.set_configuration('Release') -test.build('configurations.gyp') -test.run_built_executable('configurations', stdout="Release configuration\n") - -test.set_configuration('Debug') -test.build('configurations.gyp') -test.run_built_executable('configurations', stdout="Debug configuration\n") - -test.set_configuration('Foo') -test.build('configurations.gyp') -test.run_built_executable('configurations', stdout="Foo configuration\n") - -test.pass_test() diff --git a/tools/gyp/test/configurations/inheritance/configurations.c b/tools/gyp/test/configurations/inheritance/configurations.c deleted file mode 100644 index ebb9f8450e2722703ff69c1b50b49f61dd8e8963..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/inheritance/configurations.c +++ /dev/null @@ -1,21 +0,0 @@ -#include - -int main(void) -{ -#ifdef BASE - printf("Base configuration\n"); -#endif -#ifdef COMMON - printf("Common configuration\n"); -#endif -#ifdef COMMON2 - printf("Common2 configuration\n"); -#endif -#ifdef DEBUG - printf("Debug configuration\n"); -#endif -#ifdef RELEASE - printf("Release configuration\n"); -#endif - return 0; -} diff --git a/tools/gyp/test/configurations/inheritance/configurations.gyp b/tools/gyp/test/configurations/inheritance/configurations.gyp deleted file mode 100644 index 9441376b4d1b2b76f9c4fae9fc8bc77e2ba1801a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/inheritance/configurations.gyp +++ /dev/null @@ -1,40 +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. - -{ - 'target_defaults': { - 'configurations': { - 'Base': { - 'abstract': 1, - 'defines': ['BASE'], - }, - 'Common': { - 'abstract': 1, - 'inherit_from': ['Base'], - 'defines': ['COMMON'], - }, - 'Common2': { - 'abstract': 1, - 'defines': ['COMMON2'], - }, - 'Debug': { - 'inherit_from': ['Common', 'Common2'], - 'defines': ['DEBUG'], - }, - 'Release': { - 'inherit_from': ['Common', 'Common2'], - 'defines': ['RELEASE'], - }, - }, - }, - 'targets': [ - { - 'target_name': 'configurations', - 'type': 'executable', - 'sources': [ - 'configurations.c', - ], - }, - ], -} diff --git a/tools/gyp/test/configurations/inheritance/duplicates.gyp b/tools/gyp/test/configurations/inheritance/duplicates.gyp deleted file mode 100644 index 6930ce3b39a12b7a45dfad28636abe86b5434615..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/inheritance/duplicates.gyp +++ /dev/null @@ -1,27 +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. - -{ - 'target_defaults': { - 'default_configuration': 'A', - 'configurations': { - 'A': { - 'defines': ['SOMETHING'], - }, - 'B': { - 'inherit_from': ['A'], - }, - }, - 'cflags': ['-g'], - }, - 'targets': [ - { - 'target_name': 'configurations', - 'type': 'executable', - 'sources': [ - 'configurations.c', - ], - }, - ], -} diff --git a/tools/gyp/test/configurations/inheritance/duplicates.gypd.golden b/tools/gyp/test/configurations/inheritance/duplicates.gypd.golden deleted file mode 100644 index 719b70861e326f841ae9299e16b987fcd5779e10..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/inheritance/duplicates.gypd.golden +++ /dev/null @@ -1,12 +0,0 @@ -{'_DEPTH': '.', - 'included_files': ['duplicates.gyp'], - 'targets': [{'configurations': {'A': {'cflags': ['-g'], - 'defines': ['SOMETHING']}, - 'B': {'cflags': ['-g'], - 'defines': ['SOMETHING'], - 'inherit_from': ['A']}}, - 'default_configuration': 'A', - 'sources': ['configurations.c'], - 'target_name': 'configurations', - 'toolset': 'target', - 'type': 'executable'}]} diff --git a/tools/gyp/test/configurations/inheritance/gyptest-duplicates.py b/tools/gyp/test/configurations/inheritance/gyptest-duplicates.py deleted file mode 100755 index 46687b4549b3a55b50db3eccae26c30c68b6647a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/inheritance/gyptest-duplicates.py +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies that configurations do not duplicate other settings. -""" - -import TestGyp - -test = TestGyp.TestGyp(format='gypd') - -test.run_gyp('duplicates.gyp') - -# Verify the duplicates.gypd against the checked-in expected contents. -# -# Normally, we should canonicalize line endings in the expected -# contents file setting the Subversion svn:eol-style to native, -# but that would still fail if multiple systems are sharing a single -# workspace on a network-mounted file system. Consequently, we -# massage the Windows line endings ('\r\n') in the output to the -# checked-in UNIX endings ('\n'). - -contents = test.read('duplicates.gypd').replace( - '\r', '').replace('\\\\', '/') -expect = test.read('duplicates.gypd.golden').replace('\r', '') -if not test.match(contents, expect): - print "Unexpected contents of `duplicates.gypd'" - test.diff(expect, contents, 'duplicates.gypd ') - test.fail_test() - -test.pass_test() diff --git a/tools/gyp/test/configurations/inheritance/gyptest-inheritance.py b/tools/gyp/test/configurations/inheritance/gyptest-inheritance.py deleted file mode 100755 index ecc9d08345864a4b7d289ad2fa04ebaf725155bc..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/inheritance/gyptest-inheritance.py +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies build of an executable in three different configurations. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -if test.format == 'android': - # This test currently fails on android. Investigate why, fix the issues - # responsible, and reenable this test on android. See bug: - # https://code.google.com/p/gyp/issues/detail?id=436 - test.skip_test(message='Test fails on android. Fix and reenable.\n') - -test.run_gyp('configurations.gyp') - -test.set_configuration('Release') -test.build('configurations.gyp') -test.run_built_executable('configurations', - stdout=('Base configuration\n' - 'Common configuration\n' - 'Common2 configuration\n' - 'Release configuration\n')) - -test.set_configuration('Debug') -test.build('configurations.gyp') -test.run_built_executable('configurations', - stdout=('Base configuration\n' - 'Common configuration\n' - 'Common2 configuration\n' - 'Debug configuration\n')) - -test.pass_test() diff --git a/tools/gyp/test/configurations/invalid/actions.gyp b/tools/gyp/test/configurations/invalid/actions.gyp deleted file mode 100644 index a6e42089ebaf3c76a38681b0d89313fd31420ae8..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/invalid/actions.gyp +++ /dev/null @@ -1,18 +0,0 @@ -# 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/tools/gyp/test/configurations/invalid/all_dependent_settings.gyp b/tools/gyp/test/configurations/invalid/all_dependent_settings.gyp deleted file mode 100644 index b16a245df5468c6ffd41cf142d030a33892e965c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/invalid/all_dependent_settings.gyp +++ /dev/null @@ -1,18 +0,0 @@ -# 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/tools/gyp/test/configurations/invalid/configurations.gyp b/tools/gyp/test/configurations/invalid/configurations.gyp deleted file mode 100644 index 2cfc9600498ec84603ed3d4c0871f7f188b88b01..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/invalid/configurations.gyp +++ /dev/null @@ -1,18 +0,0 @@ -# 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/tools/gyp/test/configurations/invalid/dependencies.gyp b/tools/gyp/test/configurations/invalid/dependencies.gyp deleted file mode 100644 index 74633f3f111337141b3a2971c9c25552dd873083..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/invalid/dependencies.gyp +++ /dev/null @@ -1,18 +0,0 @@ -# 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/tools/gyp/test/configurations/invalid/direct_dependent_settings.gyp b/tools/gyp/test/configurations/invalid/direct_dependent_settings.gyp deleted file mode 100644 index 8a0f2e95ea71389c28d8b7d1466c433883cbd52e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/invalid/direct_dependent_settings.gyp +++ /dev/null @@ -1,18 +0,0 @@ -# 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/tools/gyp/test/configurations/invalid/gyptest-configurations.py b/tools/gyp/test/configurations/invalid/gyptest-configurations.py deleted file mode 100755 index bd844b95dd8a330a237123acbaf741c1c816187d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/invalid/gyptest-configurations.py +++ /dev/null @@ -1,36 +0,0 @@ -#!/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/tools/gyp/test/configurations/invalid/libraries.gyp b/tools/gyp/test/configurations/invalid/libraries.gyp deleted file mode 100644 index c4014ed4065dc0826552f9ec358fb6f8fa1d0cb8..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/invalid/libraries.gyp +++ /dev/null @@ -1,18 +0,0 @@ -# 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/tools/gyp/test/configurations/invalid/link_settings.gyp b/tools/gyp/test/configurations/invalid/link_settings.gyp deleted file mode 100644 index 2f0e1c46f5c98c26bda925142336a5d795f829e6..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/invalid/link_settings.gyp +++ /dev/null @@ -1,18 +0,0 @@ -# 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/tools/gyp/test/configurations/invalid/sources.gyp b/tools/gyp/test/configurations/invalid/sources.gyp deleted file mode 100644 index b38cca038189678bbce85b8793d0b3b4926aa987..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/invalid/sources.gyp +++ /dev/null @@ -1,18 +0,0 @@ -# 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/tools/gyp/test/configurations/invalid/standalone_static_library.gyp b/tools/gyp/test/configurations/invalid/standalone_static_library.gyp deleted file mode 100644 index 2edb9febd64ab5f36d86268744228692760fc539..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/invalid/standalone_static_library.gyp +++ /dev/null @@ -1,17 +0,0 @@ -# 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/tools/gyp/test/configurations/invalid/target_name.gyp b/tools/gyp/test/configurations/invalid/target_name.gyp deleted file mode 100644 index 83baad95d60069f4d63ac86b02415e78679dd650..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/invalid/target_name.gyp +++ /dev/null @@ -1,18 +0,0 @@ -# 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/tools/gyp/test/configurations/invalid/type.gyp b/tools/gyp/test/configurations/invalid/type.gyp deleted file mode 100644 index bc55898b89e0633270912ebc636b6fef138b0e1a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/invalid/type.gyp +++ /dev/null @@ -1,18 +0,0 @@ -# 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': [ - ], - }, - } - }, - ], -} diff --git a/tools/gyp/test/configurations/target_platform/configurations.gyp b/tools/gyp/test/configurations/target_platform/configurations.gyp deleted file mode 100644 index d15429f4e5d7eb3342369fe0f939a38ec1cd8fbf..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/target_platform/configurations.gyp +++ /dev/null @@ -1,58 +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. - -{ - 'target_defaults': { - 'configurations': { - 'Debug_Win32': { - 'msvs_configuration_platform': 'Win32', - }, - 'Debug_x64': { - 'msvs_configuration_platform': 'x64', - }, - }, - }, - 'targets': [ - { - 'target_name': 'left', - 'type': 'static_library', - 'sources': [ - 'left.c', - ], - 'configurations': { - 'Debug_Win32': { - 'msvs_target_platform': 'x64', - }, - }, - }, - { - 'target_name': 'right', - 'type': 'static_library', - 'sources': [ - 'right.c', - ], - }, - { - 'target_name': 'front_left', - 'type': 'executable', - 'dependencies': ['left'], - 'sources': [ - 'front.c', - ], - 'configurations': { - 'Debug_Win32': { - 'msvs_target_platform': 'x64', - }, - }, - }, - { - 'target_name': 'front_right', - 'type': 'executable', - 'dependencies': ['right'], - 'sources': [ - 'front.c', - ], - }, - ], -} diff --git a/tools/gyp/test/configurations/target_platform/front.c b/tools/gyp/test/configurations/target_platform/front.c deleted file mode 100644 index 7a91689ff5c13095c5cd7169ab18261224ef19f3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/target_platform/front.c +++ /dev/null @@ -1,8 +0,0 @@ -#include - -const char *message(void); - -int main(void) { - printf("%s\n", message()); - return 0; -} diff --git a/tools/gyp/test/configurations/target_platform/gyptest-target_platform.py b/tools/gyp/test/configurations/target_platform/gyptest-target_platform.py deleted file mode 100755 index ae4e9e5a2dffe2149b8c31d08f1016a4a99e401b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/target_platform/gyptest-target_platform.py +++ /dev/null @@ -1,40 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Tests the msvs specific msvs_target_platform option. -""" - -import TestGyp -import TestCommon - - -def RunX64(exe, stdout): - try: - test.run_built_executable(exe, stdout=stdout) - except WindowsError, e: - # Assume the exe is 64-bit if it can't load on 32-bit systems. - # Both versions of the error are required because different versions - # of python seem to return different errors for invalid exe type. - if e.errno != 193 and '[Error 193]' not in str(e): - raise - - -test = TestGyp.TestGyp(formats=['msvs']) - -test.run_gyp('configurations.gyp') - -test.set_configuration('Debug|x64') -test.build('configurations.gyp', rebuild=True) -RunX64('front_left', stdout=('left\n')) -RunX64('front_right', stdout=('right\n')) - -test.set_configuration('Debug|Win32') -test.build('configurations.gyp', rebuild=True) -RunX64('front_left', stdout=('left\n')) -test.run_built_executable('front_right', stdout=('right\n')) - -test.pass_test() diff --git a/tools/gyp/test/configurations/target_platform/left.c b/tools/gyp/test/configurations/target_platform/left.c deleted file mode 100644 index 1ce2ea1227218f8f35774b6fcb9c0bf5697ceeb4..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/target_platform/left.c +++ /dev/null @@ -1,3 +0,0 @@ -const char *message(void) { - return "left"; -} diff --git a/tools/gyp/test/configurations/target_platform/right.c b/tools/gyp/test/configurations/target_platform/right.c deleted file mode 100644 index b1578492fe407d37c244ee91ad6e3b0d382f47b7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/target_platform/right.c +++ /dev/null @@ -1,3 +0,0 @@ -const char *message(void) { - return "right"; -} diff --git a/tools/gyp/test/configurations/x64/configurations.c b/tools/gyp/test/configurations/x64/configurations.c deleted file mode 100644 index 37018438fc7bfe57c32931ee0c648242d1c2075b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/x64/configurations.c +++ /dev/null @@ -1,12 +0,0 @@ -#include - -int main(void) { - if (sizeof(void*) == 4) { - printf("Running Win32\n"); - } else if (sizeof(void*) == 8) { - printf("Running x64\n"); - } else { - printf("Unexpected platform\n"); - } - return 0; -} diff --git a/tools/gyp/test/configurations/x64/configurations.gyp b/tools/gyp/test/configurations/x64/configurations.gyp deleted file mode 100644 index 8b0139f1418904c862c8bbeae23a68dedb56aad0..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/x64/configurations.gyp +++ /dev/null @@ -1,38 +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. - -{ - 'target_defaults': { - 'configurations': { - 'Debug': { - 'msvs_configuration_platform': 'Win32', - }, - 'Debug_x64': { - 'inherit_from': ['Debug'], - 'msvs_configuration_platform': 'x64', - }, - }, - }, - 'targets': [ - { - 'target_name': 'configurations', - 'type': 'executable', - 'sources': [ - 'configurations.c', - ], - }, - { - 'target_name': 'configurations64', - 'type': 'executable', - 'sources': [ - 'configurations.c', - ], - 'configurations': { - 'Debug': { - 'msvs_target_platform': 'x64', - }, - }, - }, - ], -} diff --git a/tools/gyp/test/configurations/x64/gyptest-x86.py b/tools/gyp/test/configurations/x64/gyptest-x86.py deleted file mode 100755 index 8675d8f7e76b99469c77f2d6ecfbbffae3dd88ec..0000000000000000000000000000000000000000 --- a/tools/gyp/test/configurations/x64/gyptest-x86.py +++ /dev/null @@ -1,31 +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. - -""" -Verifies build of an executable in three different configurations. -""" - -import TestGyp - -import sys - -formats = ['msvs'] -if sys.platform == 'win32': - formats += ['ninja'] -test = TestGyp.TestGyp(formats=formats) - -test.run_gyp('configurations.gyp') -test.set_configuration('Debug|Win32') -test.build('configurations.gyp', test.ALL) - -for machine, suffix in [('14C machine (x86)', ''), - ('8664 machine (x64)', '64')]: - output = test.run_dumpbin( - '/headers', test.built_file_path('configurations%s.exe' % suffix)) - if machine not in output: - test.fail_test() - -test.pass_test() diff --git a/tools/gyp/test/copies/gyptest-all.py b/tools/gyp/test/copies/gyptest-all.py deleted file mode 100755 index aeccf3324c1c2e5d618b74f1b8a3d5a050d8faad..0000000000000000000000000000000000000000 --- a/tools/gyp/test/copies/gyptest-all.py +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies file copies using an explicit build target of 'all'. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('copies.gyp', - '-G', 'xcode_ninja_target_pattern=^(?!copies_null)', - chdir='src') - -test.relocate('src', 'relocate/src') - -test.build('copies.gyp', test.ALL, chdir='relocate/src') - -test.must_match(['relocate', 'src', 'copies-out', 'file1'], 'file1 contents\n') - -test.built_file_must_match('copies-out/file2', - 'file2 contents\n', - chdir='relocate/src') - -test.built_file_must_match('copies-out/directory/file3', - 'file3 contents\n', - chdir='relocate/src') -test.built_file_must_match('copies-out/directory/file4', - 'file4 contents\n', - chdir='relocate/src') -test.built_file_must_match('copies-out/directory/subdir/file5', - 'file5 contents\n', - chdir='relocate/src') -test.built_file_must_match('copies-out/subdir/file6', - 'file6 contents\n', - chdir='relocate/src') - -test.pass_test() diff --git a/tools/gyp/test/copies/gyptest-attribs.py b/tools/gyp/test/copies/gyptest-attribs.py deleted file mode 100644 index 70d717a45ecf60f67fe8eb8d2266314c4fa51aff..0000000000000000000000000000000000000000 --- a/tools/gyp/test/copies/gyptest-attribs.py +++ /dev/null @@ -1,41 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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 that copying files preserves file attributes. -""" - -import TestGyp - -import os -import stat -import sys - - -def check_attribs(path, expected_exec_bit): - out_path = test.built_file_path(path, chdir='src') - - in_stat = os.stat(os.path.join('src', path)) - out_stat = os.stat(out_path) - if out_stat.st_mode & stat.S_IXUSR != expected_exec_bit: - test.fail_test() - - -test = TestGyp.TestGyp() - -test.run_gyp('copies-attribs.gyp', chdir='src') - -test.build('copies-attribs.gyp', chdir='src') - -if sys.platform != 'win32': - out_path = test.built_file_path('executable-file.sh', chdir='src') - test.must_contain(out_path, - '#!/bin/bash\n' - '\n' - 'echo echo echo echo cho ho o o\n') - check_attribs('executable-file.sh', expected_exec_bit=stat.S_IXUSR) - -test.pass_test() diff --git a/tools/gyp/test/copies/gyptest-default.py b/tools/gyp/test/copies/gyptest-default.py deleted file mode 100755 index a916869f0dbd3c8571dc1e5ba7c69a6e4e0d7637..0000000000000000000000000000000000000000 --- a/tools/gyp/test/copies/gyptest-default.py +++ /dev/null @@ -1,42 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies file copies using the build tool default. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('copies.gyp', - '-G', 'xcode_ninja_target_pattern=^(?!copies_null)', - chdir='src') - -test.relocate('src', 'relocate/src') - -test.build('copies.gyp', chdir='relocate/src') - -test.must_match(['relocate', 'src', 'copies-out', 'file1'], 'file1 contents\n') - -test.built_file_must_match('copies-out/file2', - 'file2 contents\n', - chdir='relocate/src') - -test.built_file_must_match('copies-out/directory/file3', - 'file3 contents\n', - chdir='relocate/src') -test.built_file_must_match('copies-out/directory/file4', - 'file4 contents\n', - chdir='relocate/src') -test.built_file_must_match('copies-out/directory/subdir/file5', - 'file5 contents\n', - chdir='relocate/src') -test.built_file_must_match('copies-out/subdir/file6', - 'file6 contents\n', - chdir='relocate/src') - -test.pass_test() diff --git a/tools/gyp/test/copies/gyptest-samedir.py b/tools/gyp/test/copies/gyptest-samedir.py deleted file mode 100755 index 16547f48d8b70d0a67acdd66e10311a79412c100..0000000000000000000000000000000000000000 --- a/tools/gyp/test/copies/gyptest-samedir.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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 file copies where two copies sections in the same target have the -same destination directory. -""" - -import TestGyp - -# The Android build system doesn't allow output to go to arbitrary places. -test = TestGyp.TestGyp(formats=['!android']) -test.run_gyp('copies-samedir.gyp', chdir='src') - -test.relocate('src', 'relocate/src') -test.build('copies-samedir.gyp', 'copies_samedir', chdir='relocate/src') - -test.built_file_must_match('copies-out-samedir/file1', - 'file1 contents\n', - chdir='relocate/src') - -test.built_file_must_match('copies-out-samedir/file2', - 'file2 contents\n', - chdir='relocate/src') - -test.pass_test() diff --git a/tools/gyp/test/copies/gyptest-slash.py b/tools/gyp/test/copies/gyptest-slash.py deleted file mode 100755 index f7a2e549ebe65f3d21854bc91e36fbd49491a673..0000000000000000000000000000000000000000 --- a/tools/gyp/test/copies/gyptest-slash.py +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies file copies with a trailing slash in the destination directory. -""" - -import TestGyp - -test = TestGyp.TestGyp() -test.run_gyp('copies-slash.gyp', chdir='src') - -test.relocate('src', 'relocate/src') -test.build('copies-slash.gyp', chdir='relocate/src') - -test.built_file_must_match('copies-out-slash/directory/file3', - 'file3 contents\n', - chdir='relocate/src') -test.built_file_must_match('copies-out-slash/directory/file4', - 'file4 contents\n', - chdir='relocate/src') -test.built_file_must_match('copies-out-slash/directory/subdir/file5', - 'file5 contents\n', - chdir='relocate/src') - -test.built_file_must_match('copies-out-slash-2/directory/file3', - 'file3 contents\n', - chdir='relocate/src') -test.built_file_must_match('copies-out-slash-2/directory/file4', - 'file4 contents\n', - chdir='relocate/src') -test.built_file_must_match('copies-out-slash-2/directory/subdir/file5', - 'file5 contents\n', - chdir='relocate/src') - -test.pass_test() diff --git a/tools/gyp/test/copies/gyptest-updir.py b/tools/gyp/test/copies/gyptest-updir.py deleted file mode 100755 index afd3abcc76c24f77ff553361f64b58425c4f9c14..0000000000000000000000000000000000000000 --- a/tools/gyp/test/copies/gyptest-updir.py +++ /dev/null @@ -1,25 +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. - -""" -Verifies file copies where the destination is one level above an expansion that -yields a make variable. -""" - -import TestGyp - -# The Android build system doesn't allow output to go to arbitrary places. -test = TestGyp.TestGyp(formats=['!android']) -test.run_gyp('copies-updir.gyp', chdir='src') - -test.relocate('src', 'relocate/src') -test.build('copies-updir.gyp', 'copies_up', chdir='relocate/src') - -test.built_file_must_match('../copies-out-updir/file1', - 'file1 contents\n', - chdir='relocate/src') - -test.pass_test() diff --git a/tools/gyp/test/copies/src/copies-attribs.gyp b/tools/gyp/test/copies/src/copies-attribs.gyp deleted file mode 100644 index 073e0d0cf677d484894d10d383592c257c473110..0000000000000000000000000000000000000000 --- a/tools/gyp/test/copies/src/copies-attribs.gyp +++ /dev/null @@ -1,20 +0,0 @@ -# Copyright (c) 2013 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': 'copies1', - 'type': 'none', - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)', - 'files': [ - 'executable-file.sh', - ], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/copies/src/copies-samedir.gyp b/tools/gyp/test/copies/src/copies-samedir.gyp deleted file mode 100644 index 2919ce503eda42fd919ac9a76e0531b4026c4d3f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/copies/src/copies-samedir.gyp +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (c) 2013 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': 'copies_samedir', - 'type': 'none', - 'dependencies': [ - 'copies_samedir_dependency', - ], - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/copies-out-samedir', - 'files': [ - 'file1', - ], - }, - ], - }, - { - 'target_name': 'copies_samedir_dependency', - 'type': 'none', - 'direct_dependent_settings': { - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/copies-out-samedir', - 'files': [ - 'file2', - ], - }, - ], - }, - }, - ], -} diff --git a/tools/gyp/test/copies/src/copies-slash.gyp b/tools/gyp/test/copies/src/copies-slash.gyp deleted file mode 100644 index 9b8ac4239d54f2b52613f76701a32a1405a6242c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/copies/src/copies-slash.gyp +++ /dev/null @@ -1,35 +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': [ - # A trailing slash on the destination directory should be ignored. - { - 'target_name': 'copies_recursive_trailing_slash', - 'type': 'none', - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/copies-out-slash/', - 'files': [ - 'directory/', - ], - }, - ], - }, - # Even if the source directory is below <(PRODUCT_DIR). - { - 'target_name': 'copies_recursive_trailing_slash_in_product_dir', - 'type': 'none', - 'dependencies': [ ':copies_recursive_trailing_slash' ], - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/copies-out-slash-2/', - 'files': [ - '<(PRODUCT_DIR)/copies-out-slash/directory/', - ], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/copies/src/copies-updir.gyp b/tools/gyp/test/copies/src/copies-updir.gyp deleted file mode 100644 index ee8f51d91ed5df001f0da1f11dad0aaddc4bf56d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/copies/src/copies-updir.gyp +++ /dev/null @@ -1,20 +0,0 @@ -# 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': 'copies_up', - 'type': 'none', - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/../copies-out-updir', - 'files': [ - 'file1', - ], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/copies/src/copies.gyp b/tools/gyp/test/copies/src/copies.gyp deleted file mode 100644 index ce2e0cabca54313613c22828f21baa95500656b5..0000000000000000000000000000000000000000 --- a/tools/gyp/test/copies/src/copies.gyp +++ /dev/null @@ -1,70 +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': 'copies1', - 'type': 'none', - 'copies': [ - { - 'destination': 'copies-out', - 'files': [ - 'file1', - ], - }, - ], - }, - { - 'target_name': 'copies2', - 'type': 'none', - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/copies-out', - 'files': [ - 'file2', - ], - }, - ], - }, - # Copy a directory tree. - { - 'target_name': 'copies_recursive', - 'type': 'none', - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/copies-out', - 'files': [ - 'directory/', - ], - }, - ], - }, - # Copy a directory from deeper in the tree (this should not reproduce the - # entire directory path in the destination, only the final directory). - { - 'target_name': 'copies_recursive_depth', - 'type': 'none', - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/copies-out', - 'files': [ - 'parentdir/subdir/', - ], - }, - ], - }, - # Verify that a null 'files' list doesn't gag the generators. - { - 'target_name': 'copies_null', - 'type': 'none', - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/copies-null', - 'files': [], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/copies/src/directory/file3 b/tools/gyp/test/copies/src/directory/file3 deleted file mode 100644 index 43f16f352206578a052fd87264a9d67b81a00195..0000000000000000000000000000000000000000 --- a/tools/gyp/test/copies/src/directory/file3 +++ /dev/null @@ -1 +0,0 @@ -file3 contents diff --git a/tools/gyp/test/copies/src/directory/file4 b/tools/gyp/test/copies/src/directory/file4 deleted file mode 100644 index 5f7270a0847cc6d0840e5b8af8fd93ec4b519986..0000000000000000000000000000000000000000 --- a/tools/gyp/test/copies/src/directory/file4 +++ /dev/null @@ -1 +0,0 @@ -file4 contents diff --git a/tools/gyp/test/copies/src/directory/subdir/file5 b/tools/gyp/test/copies/src/directory/subdir/file5 deleted file mode 100644 index 41f47186bd219729aeb77b4616055bb37fa279f9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/copies/src/directory/subdir/file5 +++ /dev/null @@ -1 +0,0 @@ -file5 contents diff --git a/tools/gyp/test/copies/src/executable-file.sh b/tools/gyp/test/copies/src/executable-file.sh deleted file mode 100755 index 796953a1a2cf23ca0c63e5842905351355ac0358..0000000000000000000000000000000000000000 --- a/tools/gyp/test/copies/src/executable-file.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -echo echo echo echo cho ho o o diff --git a/tools/gyp/test/copies/src/file1 b/tools/gyp/test/copies/src/file1 deleted file mode 100644 index 84d55c5759cf6b954e16c54527ca94af4c1bce69..0000000000000000000000000000000000000000 --- a/tools/gyp/test/copies/src/file1 +++ /dev/null @@ -1 +0,0 @@ -file1 contents diff --git a/tools/gyp/test/copies/src/file2 b/tools/gyp/test/copies/src/file2 deleted file mode 100644 index af1b8ae35db461adac8325dc7a70144c1efb1cc3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/copies/src/file2 +++ /dev/null @@ -1 +0,0 @@ -file2 contents diff --git a/tools/gyp/test/copies/src/parentdir/subdir/file6 b/tools/gyp/test/copies/src/parentdir/subdir/file6 deleted file mode 100644 index f5d57573486772c2acc93417fde9bfc9ae293de3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/copies/src/parentdir/subdir/file6 +++ /dev/null @@ -1 +0,0 @@ -file6 contents diff --git a/tools/gyp/test/custom-generator/gyptest-custom-generator.py b/tools/gyp/test/custom-generator/gyptest-custom-generator.py deleted file mode 100755 index 85fd0724a13fc5b1ea5e92bc039bb687e8fc63f1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/custom-generator/gyptest-custom-generator.py +++ /dev/null @@ -1,18 +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 custom generators can be passed to --format -""" - -import TestGyp - -test = TestGyp.TestGypCustom(format='mygenerator.py') -test.run_gyp('test.gyp') - -# mygenerator.py should generate a file called MyBuildFile containing -# "Testing..." alongside the gyp file. -test.must_match('MyBuildFile', 'Testing...\n') - -test.pass_test() diff --git a/tools/gyp/test/custom-generator/mygenerator.py b/tools/gyp/test/custom-generator/mygenerator.py deleted file mode 100644 index 8eb4c2de1b3a02b332fbbb3d4c873c7549f81754..0000000000000000000000000000000000000000 --- a/tools/gyp/test/custom-generator/mygenerator.py +++ /dev/null @@ -1,14 +0,0 @@ -# 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. - -"""Custom gyp generator that doesn't do much.""" - -import gyp.common - -generator_default_variables = {} - -def GenerateOutput(target_list, target_dicts, data, params): - f = open("MyBuildFile", "wb") - f.write("Testing...\n") - f.close() diff --git a/tools/gyp/test/custom-generator/test.gyp b/tools/gyp/test/custom-generator/test.gyp deleted file mode 100644 index aa5f864a3b7bfada5cfc9f5faf3b3213bc811677..0000000000000000000000000000000000000000 --- a/tools/gyp/test/custom-generator/test.gyp +++ /dev/null @@ -1,15 +0,0 @@ -# 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': 'exe', - 'type': 'executable', - 'sources': [ - 'main.c', - ], - }, - ], -} diff --git a/tools/gyp/test/cxxflags/cxxflags.cc b/tools/gyp/test/cxxflags/cxxflags.cc deleted file mode 100644 index e70e39dfd35d02996c852749cc51267278fdf57f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/cxxflags/cxxflags.cc +++ /dev/null @@ -1,15 +0,0 @@ -/* 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. */ - -#include - -int main(void) -{ -#ifdef ABC - printf("With define\n"); -#else - printf("No define\n"); -#endif - return 0; -} diff --git a/tools/gyp/test/cxxflags/cxxflags.gyp b/tools/gyp/test/cxxflags/cxxflags.gyp deleted file mode 100644 index a082d494924f94d529aa957875c1e24838f7e38f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/cxxflags/cxxflags.gyp +++ /dev/null @@ -1,15 +0,0 @@ -# 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': 'cxxflags', - 'type': 'executable', - 'sources': [ - 'cxxflags.cc', - ], - }, - ], -} diff --git a/tools/gyp/test/cxxflags/gyptest-cxxflags.py b/tools/gyp/test/cxxflags/gyptest-cxxflags.py deleted file mode 100755 index 117a1800de49d3202a0244a9822140c80585940d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/cxxflags/gyptest-cxxflags.py +++ /dev/null @@ -1,45 +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. - -""" -Verifies the use of the environment during regeneration when the gyp file -changes, specifically via build of an executable with C++ flags specified by -CXXFLAGS. - -In this test, gyp happens within a local environment, but build outside of it. -""" - -import TestGyp - -FORMATS = ('ninja',) - -test = TestGyp.TestGyp(formats=FORMATS) - -# We reset the environ after calling gyp. When the auto-regeneration happens, -# the same define should be reused anyway. -with TestGyp.LocalEnv({'CXXFLAGS': ''}): - test.run_gyp('cxxflags.gyp') - -test.build('cxxflags.gyp') - -expect = """\ -No define -""" -test.run_built_executable('cxxflags', stdout=expect) - -test.sleep() - -with TestGyp.LocalEnv({'CXXFLAGS': '-DABC'}): - test.run_gyp('cxxflags.gyp') - -test.build('cxxflags.gyp') - -expect = """\ -With define -""" -test.run_built_executable('cxxflags', stdout=expect) - -test.pass_test() diff --git a/tools/gyp/test/defines-escaping/defines-escaping.c b/tools/gyp/test/defines-escaping/defines-escaping.c deleted file mode 100644 index a0aa4c286d9fad7cfd8943650d51f1c3bebf1e79..0000000000000000000000000000000000000000 --- a/tools/gyp/test/defines-escaping/defines-escaping.c +++ /dev/null @@ -1,11 +0,0 @@ -/* 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. */ - -#include - -int main(void) -{ - printf(TEST_FORMAT, TEST_ARGS); - return 0; -} diff --git a/tools/gyp/test/defines-escaping/defines-escaping.gyp b/tools/gyp/test/defines-escaping/defines-escaping.gyp deleted file mode 100644 index 6f0f3fde41fdcdaa5699c8f42f4a533497d1ee74..0000000000000000000000000000000000000000 --- a/tools/gyp/test/defines-escaping/defines-escaping.gyp +++ /dev/null @@ -1,19 +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': 'defines_escaping', - 'type': 'executable', - 'sources': [ - 'defines-escaping.c', - ], - 'defines': [ - 'TEST_FORMAT="<(test_format)"', - 'TEST_ARGS=<(test_args)', - ], - }, - ], -} diff --git a/tools/gyp/test/defines-escaping/gyptest-defines-escaping.py b/tools/gyp/test/defines-escaping/gyptest-defines-escaping.py deleted file mode 100755 index eb18a3d369f48d7c266d421158d79cb3f616ed11..0000000000000000000000000000000000000000 --- a/tools/gyp/test/defines-escaping/gyptest-defines-escaping.py +++ /dev/null @@ -1,184 +0,0 @@ -#!/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 with C++ define specified by a gyp define using -various special characters such as quotes, commas, etc. -""" - -import os -import TestGyp - -test = TestGyp.TestGyp() - -# Tests string literals, percents, and backslash escapes. -try: - os.environ['GYP_DEFINES'] = ( - r"""test_format='\n%s\n' """ - r"""test_args='"Simple test of %s with a literal"'""") - test.run_gyp('defines-escaping.gyp') -finally: - del os.environ['GYP_DEFINES'] - -test.build('defines-escaping.gyp') - -expect = """ -Simple test of %s with a literal -""" -test.run_built_executable('defines_escaping', stdout=expect) - - -# Test multiple comma-and-space-separated string literals. -try: - os.environ['GYP_DEFINES'] = \ - r"""test_format='\n%s and %s\n' test_args='"foo", "bar"'""" - test.run_gyp('defines-escaping.gyp') -finally: - del os.environ['GYP_DEFINES'] - -test.sleep() -test.touch('defines-escaping.c') -test.build('defines-escaping.gyp') - -expect = """ -foo and bar -""" -test.run_built_executable('defines_escaping', stdout=expect) - - -# Test string literals containing quotes. -try: - os.environ['GYP_DEFINES'] = ( - r"""test_format='\n%s %s %s %s %s\n' """ - r"""test_args='"\"These,\"",""" - r""" "\"words,\"",""" - r""" "\"are,\"",""" - r""" "\"in,\"",""" - r""" "\"quotes.\""'""") - test.run_gyp('defines-escaping.gyp') -finally: - del os.environ['GYP_DEFINES'] - -test.sleep() -test.touch('defines-escaping.c') -test.build('defines-escaping.gyp') - -expect = """ -"These," "words," "are," "in," "quotes." -""" -test.run_built_executable('defines_escaping', stdout=expect) - - -# Test string literals containing single quotes. -try: - os.environ['GYP_DEFINES'] = ( - r"""test_format='\n%s %s %s %s %s\n' """ - r"""test_args="\"'These,'\",""" - r""" \"'words,'\",""" - r""" \"'are,'\",""" - r""" \"'in,'\",""" - r""" \"'quotes.'\"" """) - test.run_gyp('defines-escaping.gyp') -finally: - del os.environ['GYP_DEFINES'] - -test.sleep() -test.touch('defines-escaping.c') -test.build('defines-escaping.gyp') - -expect = """ -'These,' 'words,' 'are,' 'in,' 'quotes.' -""" -test.run_built_executable('defines_escaping', stdout=expect) - - -# Test string literals containing different numbers of backslashes before quotes -# (to exercise Windows' quoting behaviour). -try: - os.environ['GYP_DEFINES'] = ( - r"""test_format='\n%s\n%s\n%s\n' """ - r"""test_args='"\\\"1 visible slash\\\"",""" - r""" "\\\\\"2 visible slashes\\\\\"",""" - r""" "\\\\\\\"3 visible slashes\\\\\\\""'""") - test.run_gyp('defines-escaping.gyp') -finally: - del os.environ['GYP_DEFINES'] - -test.sleep() -test.touch('defines-escaping.c') -test.build('defines-escaping.gyp') - -expect = r""" -\"1 visible slash\" -\\"2 visible slashes\\" -\\\"3 visible slashes\\\" -""" -test.run_built_executable('defines_escaping', stdout=expect) - - -# Test that various scary sequences are passed unfettered. -try: - os.environ['GYP_DEFINES'] = ( - r"""test_format='\n%s\n' """ - r"""test_args='"$foo, " `foo`;"'""") - test.run_gyp('defines-escaping.gyp') -finally: - del os.environ['GYP_DEFINES'] - -test.sleep() -test.touch('defines-escaping.c') -test.build('defines-escaping.gyp') - -expect = """ -$foo, " `foo`; -""" -test.run_built_executable('defines_escaping', stdout=expect) - - -# VisualStudio 2010 can't handle passing %PATH% -if not (test.format == 'msvs' and test.uses_msbuild): - try: - os.environ['GYP_DEFINES'] = ( - """test_format='%s' """ - """test_args='"%PATH%"'""") - test.run_gyp('defines-escaping.gyp') - finally: - del os.environ['GYP_DEFINES'] - - test.sleep() - test.touch('defines-escaping.c') - test.build('defines-escaping.gyp') - - expect = "%PATH%" - test.run_built_executable('defines_escaping', stdout=expect) - - -# Test commas and semi-colons preceded by backslashes (to exercise Windows' -# quoting behaviour). -try: - os.environ['GYP_DEFINES'] = ( - r"""test_format='\n%s\n%s\n' """ - r"""test_args='"\\, \\\\;",""" - # Same thing again, but enclosed in visible quotes. - r""" "\"\\, \\\\;\""'""") - test.run_gyp('defines-escaping.gyp') -finally: - del os.environ['GYP_DEFINES'] - -test.sleep() -test.touch('defines-escaping.c') -test.build('defines-escaping.gyp') - -expect = r""" -\, \\; -"\, \\;" -""" -test.run_built_executable('defines_escaping', stdout=expect) - -# We deliberately do not test having an odd number of quotes in a string -# literal because that isn't feasible in MSVS. - -test.pass_test() diff --git a/tools/gyp/test/defines/defines-env.gyp b/tools/gyp/test/defines/defines-env.gyp deleted file mode 100644 index 5d3c3b1e4c2d6d0061324fbcbdd3920931e27e90..0000000000000000000000000000000000000000 --- a/tools/gyp/test/defines/defines-env.gyp +++ /dev/null @@ -1,21 +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. - -{ - 'variables': { - 'value%': '5', - }, - 'targets': [ - { - 'target_name': 'defines', - 'type': 'executable', - 'sources': [ - 'defines.c', - ], - 'defines': [ - 'VALUE=<(value)', - ], - }, - ], -} diff --git a/tools/gyp/test/defines/defines.c b/tools/gyp/test/defines/defines.c deleted file mode 100644 index dda139275df9453b08c6a0b2b64e82a1a6b7e2a3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/defines/defines.c +++ /dev/null @@ -1,23 +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. */ - -#include - -int main(void) -{ -#ifdef FOO - printf("FOO is defined\n"); -#endif - printf("VALUE is %d\n", VALUE); - -#ifdef PAREN_VALUE - printf("2*PAREN_VALUE is %d\n", 2*PAREN_VALUE); -#endif - -#ifdef HASH_VALUE - printf("HASH_VALUE is %s\n", HASH_VALUE); -#endif - - return 0; -} diff --git a/tools/gyp/test/defines/defines.gyp b/tools/gyp/test/defines/defines.gyp deleted file mode 100644 index 90a755eb84afe89354562e6eeaa300478e083d17..0000000000000000000000000000000000000000 --- a/tools/gyp/test/defines/defines.gyp +++ /dev/null @@ -1,38 +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': 'defines', - 'type': 'executable', - 'sources': [ - 'defines.c', - ], - 'defines': [ - 'FOO', - 'VALUE=1', - 'PAREN_VALUE=(1+2+3)', - 'HASH_VALUE="a#1"', - ], - }, - ], - 'conditions': [ - ['OS=="fakeos"', { - 'targets': [ - { - 'target_name': 'fakeosprogram', - 'type': 'executable', - 'sources': [ - 'defines.c', - ], - 'defines': [ - 'FOO', - 'VALUE=1', - ], - }, - ], - }], - ], -} diff --git a/tools/gyp/test/defines/gyptest-define-override.py b/tools/gyp/test/defines/gyptest-define-override.py deleted file mode 100755 index 9730455b67163fe75fe359816b661f2dac5002e9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/defines/gyptest-define-override.py +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies that a default gyp define can be overridden. -""" - -import os -import TestGyp - -test = TestGyp.TestGyp() - -# CMake loudly warns about passing '#' to the compiler and drops the define. -expect_stderr = '' -if test.format == 'cmake': - expect_stderr = ( -"""WARNING: Preprocessor definitions containing '#' may not be passed on the""" -""" compiler command line because many compilers do not support it.\n""" -"""CMake is dropping a preprocessor definition: HASH_VALUE="a#1"\n""" -"""Consider defining the macro in a (configured) header file.\n\n""") - -# Command-line define -test.run_gyp('defines.gyp', '-D', 'OS=fakeos') -test.build('defines.gyp', stderr=expect_stderr) -test.built_file_must_exist('fakeosprogram', type=test.EXECUTABLE) -# Clean up the exe so subsequent tests don't find an old exe. -os.remove(test.built_file_path('fakeosprogram', type=test.EXECUTABLE)) - -# Without "OS" override, fokeosprogram shouldn't be built. -test.run_gyp('defines.gyp') -test.build('defines.gyp', stderr=expect_stderr) -test.built_file_must_not_exist('fakeosprogram', type=test.EXECUTABLE) - -# Environment define -os.environ['GYP_DEFINES'] = 'OS=fakeos' -test.run_gyp('defines.gyp') -test.build('defines.gyp', stderr=expect_stderr) -test.built_file_must_exist('fakeosprogram', type=test.EXECUTABLE) - -test.pass_test() diff --git a/tools/gyp/test/defines/gyptest-defines-env-regyp.py b/tools/gyp/test/defines/gyptest-defines-env-regyp.py deleted file mode 100755 index f2d931c2f7d7680ce041ed64467757a2ad03393c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/defines/gyptest-defines-env-regyp.py +++ /dev/null @@ -1,51 +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. - -""" -Verifies build of an executable with C++ define specified by a gyp define, and -the use of the environment during regeneration when the gyp file changes. -""" - -import os -import TestGyp - -# Regenerating build files when a gyp file changes is currently only supported -# by the make generator. -test = TestGyp.TestGyp(formats=['make']) - -try: - os.environ['GYP_DEFINES'] = 'value=50' - test.run_gyp('defines.gyp') -finally: - # We clear the environ after calling gyp. When the auto-regeneration happens, - # the same define should be reused anyway. Reset to empty string first in - # case the platform doesn't support unsetenv. - os.environ['GYP_DEFINES'] = '' - del os.environ['GYP_DEFINES'] - -test.build('defines.gyp') - -expect = """\ -FOO is defined -VALUE is 1 -2*PAREN_VALUE is 12 -HASH_VALUE is a#1 -""" -test.run_built_executable('defines', stdout=expect) - -# Sleep so that the changed gyp file will have a newer timestamp than the -# previously generated build files. -test.sleep() -test.write('defines.gyp', test.read('defines-env.gyp')) - -test.build('defines.gyp', test.ALL) - -expect = """\ -VALUE is 50 -""" -test.run_built_executable('defines', stdout=expect) - -test.pass_test() diff --git a/tools/gyp/test/defines/gyptest-defines-env.py b/tools/gyp/test/defines/gyptest-defines-env.py deleted file mode 100755 index 6b4e7175a6d4d7ad00df0eaaf163e67bb24a3baf..0000000000000000000000000000000000000000 --- a/tools/gyp/test/defines/gyptest-defines-env.py +++ /dev/null @@ -1,85 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies build of an executable with C++ define specified by a gyp define. -""" - -import os -import TestGyp - -test = TestGyp.TestGyp() - -# With the value only given in environment, it should be used. -try: - os.environ['GYP_DEFINES'] = 'value=10' - test.run_gyp('defines-env.gyp') -finally: - del os.environ['GYP_DEFINES'] - -test.build('defines-env.gyp') - -expect = """\ -VALUE is 10 -""" -test.run_built_executable('defines', stdout=expect) - - -# With the value given in both command line and environment, -# command line should take precedence. -try: - os.environ['GYP_DEFINES'] = 'value=20' - test.run_gyp('defines-env.gyp', '-Dvalue=25') -finally: - del os.environ['GYP_DEFINES'] - -test.sleep() -test.touch('defines.c') -test.build('defines-env.gyp') - -expect = """\ -VALUE is 25 -""" -test.run_built_executable('defines', stdout=expect) - - -# With the value only given in environment, it should be ignored if -# --ignore-environment is specified. -try: - os.environ['GYP_DEFINES'] = 'value=30' - test.run_gyp('defines-env.gyp', '--ignore-environment') -finally: - del os.environ['GYP_DEFINES'] - -test.sleep() -test.touch('defines.c') -test.build('defines-env.gyp') - -expect = """\ -VALUE is 5 -""" -test.run_built_executable('defines', stdout=expect) - - -# With the value given in both command line and environment, and -# --ignore-environment also specified, command line should still be used. -try: - os.environ['GYP_DEFINES'] = 'value=40' - test.run_gyp('defines-env.gyp', '--ignore-environment', '-Dvalue=45') -finally: - del os.environ['GYP_DEFINES'] - -test.sleep() -test.touch('defines.c') -test.build('defines-env.gyp') - -expect = """\ -VALUE is 45 -""" -test.run_built_executable('defines', stdout=expect) - - -test.pass_test() diff --git a/tools/gyp/test/defines/gyptest-defines.py b/tools/gyp/test/defines/gyptest-defines.py deleted file mode 100755 index 77a3af53b989bb5116936ded0a26195e09569a8a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/defines/gyptest-defines.py +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies build of an executable with C++ defines. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('defines.gyp') - -expect = """\ -FOO is defined -VALUE is 1 -2*PAREN_VALUE is 12 -""" - -#CMake loudly warns about passing '#' to the compiler and drops the define. -expect_stderr = '' -if test.format == 'cmake': - expect_stderr = ( -"""WARNING: Preprocessor definitions containing '#' may not be passed on the""" -""" compiler command line because many compilers do not support it.\n""" -"""CMake is dropping a preprocessor definition: HASH_VALUE="a#1"\n""" -"""Consider defining the macro in a (configured) header file.\n\n""") -else: - expect += """HASH_VALUE is a#1 -""" - -test.build('defines.gyp', stderr=expect_stderr) - -test.run_built_executable('defines', stdout=expect) - -test.pass_test() diff --git a/tools/gyp/test/dependencies/a.c b/tools/gyp/test/dependencies/a.c deleted file mode 100755 index 3bba111d24eefd83f4955fb010ce83ba6e9d883b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/dependencies/a.c +++ /dev/null @@ -1,9 +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. */ - -extern int funcB(); - -int funcA() { - return funcB(); -} diff --git a/tools/gyp/test/dependencies/b/b.c b/tools/gyp/test/dependencies/b/b.c deleted file mode 100755 index b5e771bcc77b0bd9e38f1383917c20c6456639cf..0000000000000000000000000000000000000000 --- a/tools/gyp/test/dependencies/b/b.c +++ /dev/null @@ -1,3 +0,0 @@ -int funcB() { - return 2; -} diff --git a/tools/gyp/test/dependencies/b/b.gyp b/tools/gyp/test/dependencies/b/b.gyp deleted file mode 100755 index 893dc64d652418af1c87fe35f95132f4b0e0132c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/dependencies/b/b.gyp +++ /dev/null @@ -1,22 +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': 'b', - 'type': 'static_library', - 'sources': [ - 'b.c', - ], - }, - { - 'target_name': 'b3', - 'type': 'static_library', - 'sources': [ - 'b3.c', - ], - }, - ], -} diff --git a/tools/gyp/test/dependencies/b/b3.c b/tools/gyp/test/dependencies/b/b3.c deleted file mode 100755 index 287f67ff3151e38b25578d3753c585245356d2bc..0000000000000000000000000000000000000000 --- a/tools/gyp/test/dependencies/b/b3.c +++ /dev/null @@ -1,9 +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. - */ - -int funcB() { - return 3; -} diff --git a/tools/gyp/test/dependencies/c/c.c b/tools/gyp/test/dependencies/c/c.c deleted file mode 100644 index 4949daf3ee1fe197e61f2013c27a8704bc089c6d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/dependencies/c/c.c +++ /dev/null @@ -1,4 +0,0 @@ -int funcC() { - return 3 - // Intentional syntax error. This file should never be compiled, so this - // shouldn't be a problem. diff --git a/tools/gyp/test/dependencies/c/c.gyp b/tools/gyp/test/dependencies/c/c.gyp deleted file mode 100644 index eabebea9efbf41f655af257154e25d776f2c2658..0000000000000000000000000000000000000000 --- a/tools/gyp/test/dependencies/c/c.gyp +++ /dev/null @@ -1,22 +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': 'c_unused', - 'type': 'static_library', - 'sources': [ - 'c.c', - ], - }, - { - 'target_name': 'd', - 'type': 'static_library', - 'sources': [ - 'd.c', - ], - }, - ], -} diff --git a/tools/gyp/test/dependencies/c/d.c b/tools/gyp/test/dependencies/c/d.c deleted file mode 100644 index 05465fc1af7d0c22eec3036fd9f6cb761e66c1ff..0000000000000000000000000000000000000000 --- a/tools/gyp/test/dependencies/c/d.c +++ /dev/null @@ -1,3 +0,0 @@ -int funcD() { - return 4; -} diff --git a/tools/gyp/test/dependencies/double_dependency.gyp b/tools/gyp/test/dependencies/double_dependency.gyp deleted file mode 100644 index ca2bf1cd892fd97e6c7631a0ba9baca245a5747b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/dependencies/double_dependency.gyp +++ /dev/null @@ -1,22 +0,0 @@ -# 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': 'double_dependency', - 'type': 'shared_library', - 'dependencies': [ - 'double_dependent.gyp:double_dependent', - ], - 'conditions': [ - ['1==1', { - 'dependencies': [ - 'double_dependent.gyp:*', - ], - }], - ], - }, - ], -} diff --git a/tools/gyp/test/dependencies/double_dependent.gyp b/tools/gyp/test/dependencies/double_dependent.gyp deleted file mode 100644 index 334caff723ce8e2722e5a07c129e3658d04543b1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/dependencies/double_dependent.gyp +++ /dev/null @@ -1,12 +0,0 @@ -# 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': 'double_dependent', - 'type': 'none', - }, - ], -} diff --git a/tools/gyp/test/dependencies/extra_targets.gyp b/tools/gyp/test/dependencies/extra_targets.gyp deleted file mode 100644 index c1a26de42281badde2177dcfa07eabb66f0c6767..0000000000000000000000000000000000000000 --- a/tools/gyp/test/dependencies/extra_targets.gyp +++ /dev/null @@ -1,18 +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': 'a', - 'type': 'static_library', - 'sources': [ - 'a.c', - ], - # This only depends on the "d" target; other targets in c.gyp - # should not become part of the build (unlike with 'c/c.gyp:*'). - 'dependencies': ['c/c.gyp:d'], - }, - ], -} diff --git a/tools/gyp/test/dependencies/gyptest-double-dependency.py b/tools/gyp/test/dependencies/gyptest-double-dependency.py deleted file mode 100644 index 7692740c54deb474de81fe08c47fde097e27961b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/dependencies/gyptest-double-dependency.py +++ /dev/null @@ -1,19 +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. - -""" -Verify that pulling in a dependency a second time in a conditional works for -shared_library targets. Regression test for http://crbug.com/122588 -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('double_dependency.gyp') - -# If running gyp worked, all is well. -test.pass_test() diff --git a/tools/gyp/test/dependencies/gyptest-extra-targets.py b/tools/gyp/test/dependencies/gyptest-extra-targets.py deleted file mode 100755 index 09b00d958ba1755c40d5351e953e398a3e86e0fd..0000000000000000000000000000000000000000 --- a/tools/gyp/test/dependencies/gyptest-extra-targets.py +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verify that dependencies don't pull unused targets into the build. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('extra_targets.gyp', - '-G', 'xcode_ninja_target_pattern=^a$') - -# This should fail if it tries to build 'c_unused' since 'c/c.c' has a syntax -# error and won't compile. -test.build('extra_targets.gyp', test.ALL) - -test.pass_test() diff --git a/tools/gyp/test/dependencies/gyptest-lib-only.py b/tools/gyp/test/dependencies/gyptest-lib-only.py deleted file mode 100755 index 3a99a7f4aa61e0305a75026de386614a3daf27db..0000000000000000000000000000000000000000 --- a/tools/gyp/test/dependencies/gyptest-lib-only.py +++ /dev/null @@ -1,39 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verify that a link time only dependency will get pulled into the set of built -targets, even if no executable uses it. -""" - -import TestGyp - -import sys - -test = TestGyp.TestGyp() - -test.run_gyp('lib_only.gyp') - -test.build('lib_only.gyp', test.ALL) - -test.built_file_must_exist('a', type=test.STATIC_LIB) - -# TODO(bradnelson/mark): -# On linux and windows a library target will at least pull its link dependencies -# into the generated project, since not doing so confuses users. -# This is not currently implemented on mac, which has the opposite behavior. -if sys.platform == 'darwin': - if test.format == 'xcode': - test.built_file_must_not_exist('b', type=test.STATIC_LIB) - else: - assert test.format in ('make', 'ninja', 'xcode-ninja') - test.built_file_must_exist('b', type=test.STATIC_LIB) -else: - # Make puts the resulting library in a directory matching the input gyp file; - # for the 'b' library, that is in the 'b' subdirectory. - test.built_file_must_exist('b', type=test.STATIC_LIB, subdir='b') - -test.pass_test() diff --git a/tools/gyp/test/dependencies/gyptest-none-traversal.py b/tools/gyp/test/dependencies/gyptest-none-traversal.py deleted file mode 100755 index c09063dad3acbf442eddb3e33b5a905e915311af..0000000000000000000000000000000000000000 --- a/tools/gyp/test/dependencies/gyptest-none-traversal.py +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verify that static library dependencies don't traverse none targets, unless -explicitly specified. -""" - -import TestGyp - -import sys - -test = TestGyp.TestGyp() - -test.run_gyp('none_traversal.gyp') - -test.build('none_traversal.gyp', test.ALL) - -test.run_built_executable('needs_chain', stdout="2\n") -test.run_built_executable('doesnt_need_chain', stdout="3\n") - -test.pass_test() diff --git a/tools/gyp/test/dependencies/gyptest-sharedlib-linksettings.py b/tools/gyp/test/dependencies/gyptest-sharedlib-linksettings.py deleted file mode 100644 index 87428af459126a24c9ce46424a3aaccbb34b8517..0000000000000000000000000000000000000000 --- a/tools/gyp/test/dependencies/gyptest-sharedlib-linksettings.py +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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. - -""" -Verify that link_settings in a shared_library are not propagated to targets -that depend on the shared_library, but are used in the shared_library itself. -""" - -import TestGyp -import sys - -CHDIR='sharedlib-linksettings' - -test = TestGyp.TestGyp() -test.run_gyp('test.gyp', chdir=CHDIR) -test.build('test.gyp', test.ALL, chdir=CHDIR) -test.run_built_executable('program', stdout="1\n2\n", chdir=CHDIR) -test.pass_test() diff --git a/tools/gyp/test/dependencies/lib_only.gyp b/tools/gyp/test/dependencies/lib_only.gyp deleted file mode 100755 index f6c84dea64ffb899b8a11de1d5154aec66f695f0..0000000000000000000000000000000000000000 --- a/tools/gyp/test/dependencies/lib_only.gyp +++ /dev/null @@ -1,16 +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': 'a', - 'type': 'static_library', - 'sources': [ - 'a.c', - ], - 'dependencies': ['b/b.gyp:b'], - }, - ], -} diff --git a/tools/gyp/test/dependencies/main.c b/tools/gyp/test/dependencies/main.c deleted file mode 100644 index 185bd482f2b784669cf6d84fb2bd0cd4d10ae3fd..0000000000000000000000000000000000000000 --- a/tools/gyp/test/dependencies/main.c +++ /dev/null @@ -1,14 +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. - */ - -#include - -extern int funcA(); - -int main() { - printf("%d\n", funcA()); - return 0; -} diff --git a/tools/gyp/test/dependencies/none_traversal.gyp b/tools/gyp/test/dependencies/none_traversal.gyp deleted file mode 100755 index 3d8ab30aff5a19e81547f576439f47e72028f8f3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/dependencies/none_traversal.gyp +++ /dev/null @@ -1,46 +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': 'needs_chain', - 'type': 'executable', - 'sources': [ - 'a.c', - 'main.c', - ], - 'dependencies': ['chain'], - }, - { - 'target_name': 'chain', - 'type': 'none', - 'dependencies': ['b/b.gyp:b'], - }, - { - 'target_name': 'doesnt_need_chain', - 'type': 'executable', - 'sources': [ - 'main.c', - ], - 'dependencies': ['no_chain', 'other_chain'], - }, - { - 'target_name': 'no_chain', - 'type': 'none', - 'sources': [ - ], - 'dependencies': ['b/b.gyp:b'], - 'dependencies_traverse': 0, - }, - { - 'target_name': 'other_chain', - 'type': 'static_library', - 'sources': [ - 'a.c', - ], - 'dependencies': ['b/b.gyp:b3'], - }, - ], -} diff --git a/tools/gyp/test/dependencies/sharedlib-linksettings/program.c b/tools/gyp/test/dependencies/sharedlib-linksettings/program.c deleted file mode 100644 index b7c15edcd6d55c67b6a09de72176ead7cb8d065f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/dependencies/sharedlib-linksettings/program.c +++ /dev/null @@ -1,25 +0,0 @@ -/* - * Copyright (c) 2013 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. - */ - -#include - -/* - * This will fail to compile if TEST_DEFINE was propagated from sharedlib to - * program. - */ -#ifdef TEST_DEFINE -#error TEST_DEFINE is already defined! -#endif - -#define TEST_DEFINE 2 - -extern int staticLibFunc(); - -int main() { - printf("%d\n", staticLibFunc()); - printf("%d\n", TEST_DEFINE); - return 0; -} diff --git a/tools/gyp/test/dependencies/sharedlib-linksettings/sharedlib.c b/tools/gyp/test/dependencies/sharedlib-linksettings/sharedlib.c deleted file mode 100644 index 3199bccd6654078e2a1f5da5aa937482388c8548..0000000000000000000000000000000000000000 --- a/tools/gyp/test/dependencies/sharedlib-linksettings/sharedlib.c +++ /dev/null @@ -1,16 +0,0 @@ -/* - * Copyright (c) 2013 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. - */ - -#ifdef _WIN32 -__declspec(dllexport) -#endif -int sharedLibFunc() { - /* - * This will fail to compile if TEST_DEFINE was not obtained from sharedlib's - * link_settings. - */ - return TEST_DEFINE; -} diff --git a/tools/gyp/test/dependencies/sharedlib-linksettings/staticlib.c b/tools/gyp/test/dependencies/sharedlib-linksettings/staticlib.c deleted file mode 100644 index e889b419fdd8f25090177fbb0f9f949c0f5a47ba..0000000000000000000000000000000000000000 --- a/tools/gyp/test/dependencies/sharedlib-linksettings/staticlib.c +++ /dev/null @@ -1,24 +0,0 @@ -/* - * Copyright (c) 2013 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. - */ - -/* - * This will fail to compile if TEST_DEFINE was propagated from sharedlib to - * staticlib. - */ -#ifdef TEST_DEFINE -#error TEST_DEFINE is defined! -#endif - -#ifdef _WIN32 -__declspec(dllimport) -#else -extern -#endif -int sharedLibFunc(); - -int staticLibFunc() { - return sharedLibFunc(); -} diff --git a/tools/gyp/test/dependencies/sharedlib-linksettings/test.gyp b/tools/gyp/test/dependencies/sharedlib-linksettings/test.gyp deleted file mode 100644 index 830ce3236d6662acec21d4c23127f3e0f5a15bbb..0000000000000000000000000000000000000000 --- a/tools/gyp/test/dependencies/sharedlib-linksettings/test.gyp +++ /dev/null @@ -1,37 +0,0 @@ -# Copyright (c) 2013 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': { - 'allow_sharedlib_linksettings_propagation': 0, - }, - 'targets': [ - { - 'target_name': 'sharedlib', - 'type': 'shared_library', - 'sources': [ 'sharedlib.c' ], - 'link_settings': { - 'defines': [ 'TEST_DEFINE=1' ], - }, - 'conditions': [ - ['OS=="linux"', { - # Support 64-bit shared libs (also works fine for 32-bit). - 'cflags': ['-fPIC'], - }], - ], - }, - { - 'target_name': 'staticlib', - 'type': 'static_library', - 'sources': [ 'staticlib.c' ], - 'dependencies': [ 'sharedlib' ], - }, - { - 'target_name': 'program', - 'type': 'executable', - 'sources': [ 'program.c' ], - 'dependencies': [ 'staticlib' ], - }, - ], -} diff --git a/tools/gyp/test/dependency-copy/gyptest-copy.py b/tools/gyp/test/dependency-copy/gyptest-copy.py deleted file mode 100755 index 5ba7c73d41327af978226224a0d13c130f693776..0000000000000000000000000000000000000000 --- a/tools/gyp/test/dependency-copy/gyptest-copy.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies dependencies do the copy step. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('copies.gyp', chdir='src') - -test.build('copies.gyp', 'proj2', chdir='src') - -test.run_built_executable('proj1', - chdir='src', - stdout="Hello from file1.c\n") -test.run_built_executable('proj2', - chdir='src', - stdout="Hello from file2.c\n") - -test.pass_test() diff --git a/tools/gyp/test/dependency-copy/src/copies.gyp b/tools/gyp/test/dependency-copy/src/copies.gyp deleted file mode 100644 index 4176b18787bea3bd69f2dfcfcf89842d22d0208b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/dependency-copy/src/copies.gyp +++ /dev/null @@ -1,25 +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': 'proj1', - 'type': 'executable', - 'sources': [ - 'file1.c', - ], - }, - { - 'target_name': 'proj2', - 'type': 'executable', - 'sources': [ - 'file2.c', - ], - 'dependencies': [ - 'proj1', - ] - }, - ], -} diff --git a/tools/gyp/test/dependency-copy/src/file1.c b/tools/gyp/test/dependency-copy/src/file1.c deleted file mode 100644 index d7c3159186f04a0d89eb0ff013fed5ca7160004c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/dependency-copy/src/file1.c +++ /dev/null @@ -1,7 +0,0 @@ -#include - -int main(void) -{ - printf("Hello from file1.c\n"); - return 0; -} diff --git a/tools/gyp/test/dependency-copy/src/file2.c b/tools/gyp/test/dependency-copy/src/file2.c deleted file mode 100644 index cf40f57f949bfe2da99027e0e461e5ea956772e3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/dependency-copy/src/file2.c +++ /dev/null @@ -1,7 +0,0 @@ -#include - -int main(void) -{ - printf("Hello from file2.c\n"); - return 0; -} diff --git a/tools/gyp/test/empty-target/empty-target.gyp b/tools/gyp/test/empty-target/empty-target.gyp deleted file mode 100644 index feefa2805899cb26e65ec938e76cf5f90f1935f3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/empty-target/empty-target.gyp +++ /dev/null @@ -1,12 +0,0 @@ -# Copyright (c) 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': 'empty_target', - 'type': 'none', - }, - ], -} diff --git a/tools/gyp/test/empty-target/gyptest-empty-target.py b/tools/gyp/test/empty-target/gyptest-empty-target.py deleted file mode 100644 index ecadd4a87f97e3b435d94d109403f9ad23364172..0000000000000000000000000000000000000000 --- a/tools/gyp/test/empty-target/gyptest-empty-target.py +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Verifies building a target with nothing succeeds. -""" - -import os -import sys -import TestGyp - -test = TestGyp.TestGyp() -test.run_gyp('empty-target.gyp') -test.build('empty-target.gyp', target='empty_target') -test.pass_test() diff --git a/tools/gyp/test/errors/dependency_cycle.gyp b/tools/gyp/test/errors/dependency_cycle.gyp deleted file mode 100644 index eef44bc9eb20e9e5d661feca7250e1bb41216bc3..0000000000000000000000000000000000000000 --- a/tools/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/tools/gyp/test/errors/duplicate_node.gyp b/tools/gyp/test/errors/duplicate_node.gyp deleted file mode 100644 index d6096096bd804e7b59cce3f2ba7fb2fcf6eae484..0000000000000000000000000000000000000000 --- a/tools/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/tools/gyp/test/errors/duplicate_rule.gyp b/tools/gyp/test/errors/duplicate_rule.gyp deleted file mode 100644 index dab98e96c2b442a5dc9b5ce2ca7f6910ecd7890a..0000000000000000000000000000000000000000 --- a/tools/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/tools/gyp/test/errors/duplicate_targets.gyp b/tools/gyp/test/errors/duplicate_targets.gyp deleted file mode 100644 index aec470eefa8a3b94f02f08cb103296efdbb1fb32..0000000000000000000000000000000000000000 --- a/tools/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/tools/gyp/test/errors/file_cycle0.gyp b/tools/gyp/test/errors/file_cycle0.gyp deleted file mode 100644 index 3bfafb6cb393781e848ce737545c6e3cf9fccde3..0000000000000000000000000000000000000000 --- a/tools/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/tools/gyp/test/errors/file_cycle1.gyp b/tools/gyp/test/errors/file_cycle1.gyp deleted file mode 100644 index fbd7a0d1672bfdbd5c6d8191d37f4723022ca0d6..0000000000000000000000000000000000000000 --- a/tools/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/tools/gyp/test/errors/gyptest-errors.py b/tools/gyp/test/errors/gyptest-errors.py deleted file mode 100755 index d544622765832e6daef6a48039f773bb890346af..0000000000000000000000000000000000000000 --- a/tools/gyp/test/errors/gyptest-errors.py +++ /dev/null @@ -1,55 +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: 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) - -test.pass_test() diff --git a/tools/gyp/test/errors/missing_dep.gyp b/tools/gyp/test/errors/missing_dep.gyp deleted file mode 100644 index 08746be3d7a2799a9af9ee0c3ca2506c32f004af..0000000000000000000000000000000000000000 --- a/tools/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/tools/gyp/test/errors/missing_targets.gyp b/tools/gyp/test/errors/missing_targets.gyp deleted file mode 100644 index 13d4f924c1989560f83dc4a38fc99de2a57cb496..0000000000000000000000000000000000000000 --- a/tools/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': { - }, -} diff --git a/tools/gyp/test/escaping/colon/test.gyp b/tools/gyp/test/escaping/colon/test.gyp deleted file mode 100644 index 715f95490e4b80f186dd75ec5bdfde9dc976e50f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/escaping/colon/test.gyp +++ /dev/null @@ -1,21 +0,0 @@ -# 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': 'colon', - 'type': 'executable', - 'sources': [ - 'a:b.c', - ], - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/', - # MSVS2008 gets confused if the same file is in 'sources' and 'copies' - 'files': [ 'a:b.c-d', ], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/escaping/gyptest-colon.py b/tools/gyp/test/escaping/gyptest-colon.py deleted file mode 100644 index f5275db6afc950fbba0c4ec5a272ec7f2acbc3e7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/escaping/gyptest-colon.py +++ /dev/null @@ -1,43 +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. - -""" -Tests that filenames that contain colons are handled correctly. -(This is important for absolute paths on Windows.) -""" - -import os -import sys -import TestGyp - -# TODO: Make colons in filenames work with make, if required. -test = TestGyp.TestGyp(formats=['!make', '!android']) -CHDIR = 'colon' - -source_name = 'colon/a:b.c' -copies_name = 'colon/a:b.c-d' -if sys.platform == 'win32': - # Windows uses : as drive separator and doesn't allow it in regular filenames. - # Use abspath() to create a path that contains a colon instead. - abs_source = os.path.abspath('colon/file.c') - test.write('colon/test.gyp', - test.read('colon/test.gyp').replace("'a:b.c'", repr(abs_source))) - source_name = abs_source - - abs_copies = os.path.abspath('colon/file.txt') - test.write('colon/test.gyp', - test.read('colon/test.gyp').replace("'a:b.c-d'", repr(abs_copies))) - copies_name = abs_copies - -# Create the file dynamically, Windows is unhappy if a file with a colon in -# its name is checked in. -test.write(source_name, 'int main() {}') -test.write(copies_name, 'foo') - -test.run_gyp('test.gyp', chdir=CHDIR) -test.build('test.gyp', test.ALL, chdir=CHDIR) -test.built_file_must_exist(os.path.basename(copies_name), chdir=CHDIR) -test.pass_test() diff --git a/tools/gyp/test/exclusion/exclusion.gyp b/tools/gyp/test/exclusion/exclusion.gyp deleted file mode 100644 index 1232dabaef933181abf464dea201370a371bb36d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/exclusion/exclusion.gyp +++ /dev/null @@ -1,23 +0,0 @@ -# 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': 'hello', - 'type': 'executable', - 'sources': [ - 'hello.c', - 'bogus.c', - 'also/not/real.c', - 'also/not/real2.c', - ], - 'sources!': [ - 'bogus.c', - 'also/not/real.c', - 'also/not/real2.c', - ], - }, - ], -} diff --git a/tools/gyp/test/exclusion/gyptest-exclusion.py b/tools/gyp/test/exclusion/gyptest-exclusion.py deleted file mode 100755 index 1fc32bf871a22ac579fd36b597e0615df7a5ef0f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/exclusion/gyptest-exclusion.py +++ /dev/null @@ -1,22 +0,0 @@ -#!/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 that exclusions (e.g. sources!) are respected. Excluded sources -that do not exist should not prevent the build from succeeding. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('exclusion.gyp') -test.build('exclusion.gyp') - -# executables -test.built_file_must_exist('hello' + test._exe, test.EXECUTABLE, bare=True) - -test.pass_test() diff --git a/tools/gyp/test/exclusion/hello.c b/tools/gyp/test/exclusion/hello.c deleted file mode 100644 index 6e7dc8e419a842bc15bdeb62b5fe039e3bb759de..0000000000000000000000000000000000000000 --- a/tools/gyp/test/exclusion/hello.c +++ /dev/null @@ -1,15 +0,0 @@ -/* 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. */ - -#include - -int func1(void) { - return 42; -} - -int main(void) { - printf("Hello, world!\n"); - printf("%d\n", func1()); - return 0; -} diff --git a/tools/gyp/test/external-cross-compile/gyptest-cross.py b/tools/gyp/test/external-cross-compile/gyptest-cross.py deleted file mode 100755 index a837ec57dc7447b97cfa98f28f242afa5909ce26..0000000000000000000000000000000000000000 --- a/tools/gyp/test/external-cross-compile/gyptest-cross.py +++ /dev/null @@ -1,31 +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. - -""" -Verifies that actions can be + a source scanner can be used to implement, -cross-compiles (for Native Client at this point). -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('cross.gyp', chdir='src') - -test.relocate('src', 'relocate/src') - -test.build('cross.gyp', test.ALL, chdir='relocate/src') - -expect = """\ -From test1.cc -From test2.c -From test3.cc -From test4.c -""" -test.run_built_executable('program', chdir='relocate/src', stdout=expect) - - -test.pass_test() diff --git a/tools/gyp/test/external-cross-compile/src/bogus1.cc b/tools/gyp/test/external-cross-compile/src/bogus1.cc deleted file mode 100644 index 1b8d01199b5ba82850f402f0171478b6db9f7767..0000000000000000000000000000000000000000 --- a/tools/gyp/test/external-cross-compile/src/bogus1.cc +++ /dev/null @@ -1 +0,0 @@ -From bogus1.cc diff --git a/tools/gyp/test/external-cross-compile/src/bogus2.c b/tools/gyp/test/external-cross-compile/src/bogus2.c deleted file mode 100644 index cbf4a123c46e77fb16e2d1485b4e290f1ef816eb..0000000000000000000000000000000000000000 --- a/tools/gyp/test/external-cross-compile/src/bogus2.c +++ /dev/null @@ -1 +0,0 @@ -From bogus2.c diff --git a/tools/gyp/test/external-cross-compile/src/cross.gyp b/tools/gyp/test/external-cross-compile/src/cross.gyp deleted file mode 100644 index aeda76b5bdf88d104077acac471ac84b28b13b08..0000000000000000000000000000000000000000 --- a/tools/gyp/test/external-cross-compile/src/cross.gyp +++ /dev/null @@ -1,83 +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. - -{ - 'includes': ['cross_compile.gypi'], - 'target_defaults': { - 'variables': { - 'nix_lame%': 0, - }, - 'target_conditions': [ - ['nix_lame==1', { - 'sources/': [ - ['exclude', 'lame'], - ], - }], - ], - }, - 'targets': [ - { - 'target_name': 'program', - 'type': 'executable', - 'dependencies': [ - 'program_inc', - ], - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)', - ], - 'sources': [ - 'program.cc', - ], - }, - { - 'target_name': 'program_inc', - 'type': 'none', - 'dependencies': ['cross_program'], - 'actions': [ - { - 'action_name': 'program_inc', - 'inputs': ['<(SHARED_INTERMEDIATE_DIR)/cross_program.fake'], - 'outputs': ['<(SHARED_INTERMEDIATE_DIR)/cross_program.h'], - 'action': ['python', 'tochar.py', '<@(_inputs)', '<@(_outputs)'], - }, - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - { - 'target_name': 'cross_program', - 'type': 'none', - 'variables': { - 'cross': 1, - 'nix_lame': 1, - }, - 'dependencies': ['cross_lib'], - 'sources': [ - 'test1.cc', - 'test2.c', - 'very_lame.cc', - '<(SHARED_INTERMEDIATE_DIR)/cross_lib.fake', - ], - }, - { - 'target_name': 'cross_lib', - 'type': 'none', - 'variables': { - 'cross': 1, - 'nix_lame': 1, - }, - 'sources': [ - 'test3.cc', - 'test4.c', - 'bogus1.cc', - 'bogus2.c', - 'sort_of_lame.cc', - ], - 'sources!': [ - 'bogus1.cc', - 'bogus2.c', - ], - }, - ], -} diff --git a/tools/gyp/test/external-cross-compile/src/cross_compile.gypi b/tools/gyp/test/external-cross-compile/src/cross_compile.gypi deleted file mode 100644 index 36e651903f5ade9cf5508889d9e2a0d3d1aee940..0000000000000000000000000000000000000000 --- a/tools/gyp/test/external-cross-compile/src/cross_compile.gypi +++ /dev/null @@ -1,23 +0,0 @@ -{ - 'target_defaults': { - 'variables': { - 'cross%': 0, - }, - 'target_conditions': [ - ['cross==1', { - 'actions': [ - { - 'action_name': 'cross compile >(_target_name)', - 'inputs': ['^@(_sources)'], - 'outputs': ['<(SHARED_INTERMEDIATE_DIR)/>(_target_name).fake'], - 'action': [ - 'python', 'fake_cross.py', '>@(_outputs)', '^@(_sources)', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - ], - }], - ], - }, -} diff --git a/tools/gyp/test/external-cross-compile/src/fake_cross.py b/tools/gyp/test/external-cross-compile/src/fake_cross.py deleted file mode 100644 index 05eacc6a6323b6c3c50fc1f80e6be57e823ac322..0000000000000000000000000000000000000000 --- a/tools/gyp/test/external-cross-compile/src/fake_cross.py +++ /dev/null @@ -1,18 +0,0 @@ -#!/usr/bin/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. - -import sys - -fh = open(sys.argv[1], 'w') - -filenames = sys.argv[2:] - -for filename in filenames: - subfile = open(filename) - data = subfile.read() - subfile.close() - fh.write(data) - -fh.close() diff --git a/tools/gyp/test/external-cross-compile/src/program.cc b/tools/gyp/test/external-cross-compile/src/program.cc deleted file mode 100644 index 5172ae90fefbed4dd319c2004284a12f87439880..0000000000000000000000000000000000000000 --- a/tools/gyp/test/external-cross-compile/src/program.cc +++ /dev/null @@ -1,16 +0,0 @@ -/* - * 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. - */ - -#include - -static char data[] = { -#include "cross_program.h" -}; - -int main(void) { - fwrite(data, 1, sizeof(data), stdout); - return 0; -} diff --git a/tools/gyp/test/external-cross-compile/src/test1.cc b/tools/gyp/test/external-cross-compile/src/test1.cc deleted file mode 100644 index b584c31d1530151fffb23ca79b11034bcc4df013..0000000000000000000000000000000000000000 --- a/tools/gyp/test/external-cross-compile/src/test1.cc +++ /dev/null @@ -1 +0,0 @@ -From test1.cc diff --git a/tools/gyp/test/external-cross-compile/src/test2.c b/tools/gyp/test/external-cross-compile/src/test2.c deleted file mode 100644 index 367ae19ea0c8368ed9bc476659ad589834ba8ed7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/external-cross-compile/src/test2.c +++ /dev/null @@ -1 +0,0 @@ -From test2.c diff --git a/tools/gyp/test/external-cross-compile/src/test3.cc b/tools/gyp/test/external-cross-compile/src/test3.cc deleted file mode 100644 index 9eb64735b8a0fecc478c20462057d299b5c75282..0000000000000000000000000000000000000000 --- a/tools/gyp/test/external-cross-compile/src/test3.cc +++ /dev/null @@ -1 +0,0 @@ -From test3.cc diff --git a/tools/gyp/test/external-cross-compile/src/test4.c b/tools/gyp/test/external-cross-compile/src/test4.c deleted file mode 100644 index 8ecc33ec16d57a8dea2d09bf20b852380d8f6314..0000000000000000000000000000000000000000 --- a/tools/gyp/test/external-cross-compile/src/test4.c +++ /dev/null @@ -1 +0,0 @@ -From test4.c diff --git a/tools/gyp/test/external-cross-compile/src/tochar.py b/tools/gyp/test/external-cross-compile/src/tochar.py deleted file mode 100644 index c0780d984f0e5ec5f3c57187111be83c6ae3ff07..0000000000000000000000000000000000000000 --- a/tools/gyp/test/external-cross-compile/src/tochar.py +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/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. - -import sys - -src = open(sys.argv[1]) -dst = open(sys.argv[2], 'w') -for ch in src.read(): - dst.write('%d,\n' % ord(ch)) -src.close() -dst.close() diff --git a/tools/gyp/test/generator-output/actions/actions.gyp b/tools/gyp/test/generator-output/actions/actions.gyp deleted file mode 100644 index dded59aff3e34f0e46137b1abddbfe0558e6d226..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/actions/actions.gyp +++ /dev/null @@ -1,16 +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': 'pull_in_all_actions', - 'type': 'none', - 'dependencies': [ - 'subdir1/executable.gyp:*', - 'subdir2/none.gyp:*', - ], - }, - ], -} diff --git a/tools/gyp/test/generator-output/actions/build/README.txt b/tools/gyp/test/generator-output/actions/build/README.txt deleted file mode 100644 index 90ef886193148535de226dcf1205e63acb04a316..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/actions/build/README.txt +++ /dev/null @@ -1,4 +0,0 @@ -A place-holder for this Xcode build output directory, so that the -test script can verify that .xcodeproj files are not created in -their normal location by making the src/ read-only, and then -selectively making this build directory writable. diff --git a/tools/gyp/test/generator-output/actions/subdir1/actions-out/README.txt b/tools/gyp/test/generator-output/actions/subdir1/actions-out/README.txt deleted file mode 100644 index 90ef886193148535de226dcf1205e63acb04a316..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/actions/subdir1/actions-out/README.txt +++ /dev/null @@ -1,4 +0,0 @@ -A place-holder for this Xcode build output directory, so that the -test script can verify that .xcodeproj files are not created in -their normal location by making the src/ read-only, and then -selectively making this build directory writable. diff --git a/tools/gyp/test/generator-output/actions/subdir1/build/README.txt b/tools/gyp/test/generator-output/actions/subdir1/build/README.txt deleted file mode 100644 index 90ef886193148535de226dcf1205e63acb04a316..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/actions/subdir1/build/README.txt +++ /dev/null @@ -1,4 +0,0 @@ -A place-holder for this Xcode build output directory, so that the -test script can verify that .xcodeproj files are not created in -their normal location by making the src/ read-only, and then -selectively making this build directory writable. diff --git a/tools/gyp/test/generator-output/actions/subdir1/executable.gyp b/tools/gyp/test/generator-output/actions/subdir1/executable.gyp deleted file mode 100644 index 6bdd60a1fb79f321760fe300befd76d149664ef3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/actions/subdir1/executable.gyp +++ /dev/null @@ -1,44 +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': 'program', - 'type': 'executable', - 'msvs_cygwin_shell': 0, - 'sources': [ - 'program.c', - ], - 'actions': [ - { - 'action_name': 'make-prog1', - 'inputs': [ - 'make-prog1.py', - ], - 'outputs': [ - '<(INTERMEDIATE_DIR)/prog1.c', - ], - 'action': [ - 'python', '<(_inputs)', '<@(_outputs)', - ], - 'process_outputs_as_sources': 1, - }, - { - 'action_name': 'make-prog2', - 'inputs': [ - 'make-prog2.py', - ], - 'outputs': [ - 'actions-out/prog2.c', - ], - 'action': [ - 'python', '<(_inputs)', '<@(_outputs)', - ], - 'process_outputs_as_sources': 1, - }, - ], - }, - ], -} diff --git a/tools/gyp/test/generator-output/actions/subdir1/make-prog1.py b/tools/gyp/test/generator-output/actions/subdir1/make-prog1.py deleted file mode 100755 index 7ea1d8a2d487083ef0f92c094db48dfe6952cb1d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/actions/subdir1/make-prog1.py +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python - -# 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. - -import sys - -contents = r""" -#include - -void prog1(void) -{ - printf("Hello from make-prog1.py\n"); -} -""" - -open(sys.argv[1], 'w').write(contents) - -sys.exit(0) diff --git a/tools/gyp/test/generator-output/actions/subdir1/make-prog2.py b/tools/gyp/test/generator-output/actions/subdir1/make-prog2.py deleted file mode 100755 index 0bfe4973c24c152ead14f789f0b48ff58bbb7308..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/actions/subdir1/make-prog2.py +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python - -# 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. - -import sys - -contents = r""" -#include - -void prog2(void) -{ - printf("Hello from make-prog2.py\n"); -} -""" - -open(sys.argv[1], 'w').write(contents) - -sys.exit(0) diff --git a/tools/gyp/test/generator-output/actions/subdir1/program.c b/tools/gyp/test/generator-output/actions/subdir1/program.c deleted file mode 100644 index 15f0f94ee57f47c9b4d2e6a727c2519c9293b37d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/actions/subdir1/program.c +++ /dev/null @@ -1,12 +0,0 @@ -#include - -extern void prog1(void); -extern void prog2(void); - -int main(void) -{ - printf("Hello from program.c\n"); - prog1(); - prog2(); - return 0; -} diff --git a/tools/gyp/test/generator-output/actions/subdir2/actions-out/README.txt b/tools/gyp/test/generator-output/actions/subdir2/actions-out/README.txt deleted file mode 100644 index 90ef886193148535de226dcf1205e63acb04a316..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/actions/subdir2/actions-out/README.txt +++ /dev/null @@ -1,4 +0,0 @@ -A place-holder for this Xcode build output directory, so that the -test script can verify that .xcodeproj files are not created in -their normal location by making the src/ read-only, and then -selectively making this build directory writable. diff --git a/tools/gyp/test/generator-output/actions/subdir2/build/README.txt b/tools/gyp/test/generator-output/actions/subdir2/build/README.txt deleted file mode 100644 index 90ef886193148535de226dcf1205e63acb04a316..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/actions/subdir2/build/README.txt +++ /dev/null @@ -1,4 +0,0 @@ -A place-holder for this Xcode build output directory, so that the -test script can verify that .xcodeproj files are not created in -their normal location by making the src/ read-only, and then -selectively making this build directory writable. diff --git a/tools/gyp/test/generator-output/actions/subdir2/make-file.py b/tools/gyp/test/generator-output/actions/subdir2/make-file.py deleted file mode 100755 index fff0653144745a9837ac4d3e6b109655665557c7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/actions/subdir2/make-file.py +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env python - -# 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. - -import sys - -contents = "Hello from make-file.py\n" - -open(sys.argv[1], 'wb').write(contents) diff --git a/tools/gyp/test/generator-output/actions/subdir2/none.gyp b/tools/gyp/test/generator-output/actions/subdir2/none.gyp deleted file mode 100644 index f98f52753d0ffe9dc78e590eb05c259d624e1e2b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/actions/subdir2/none.gyp +++ /dev/null @@ -1,31 +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': 'file', - 'type': 'none', - 'msvs_cygwin_shell': 0, - 'actions': [ - { - 'action_name': 'make-file', - 'inputs': [ - 'make-file.py', - ], - 'outputs': [ - 'actions-out/file.out', - # TODO: enhance testing infrastructure to test this - # without having to hard-code the intermediate dir paths. - #'<(INTERMEDIATE_DIR)/file.out', - ], - 'action': [ - 'python', '<(_inputs)', '<@(_outputs)', - ], - 'process_outputs_as_sources': 1, - } - ], - }, - ], -} diff --git a/tools/gyp/test/generator-output/copies/build/README.txt b/tools/gyp/test/generator-output/copies/build/README.txt deleted file mode 100644 index 90ef886193148535de226dcf1205e63acb04a316..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/copies/build/README.txt +++ /dev/null @@ -1,4 +0,0 @@ -A place-holder for this Xcode build output directory, so that the -test script can verify that .xcodeproj files are not created in -their normal location by making the src/ read-only, and then -selectively making this build directory writable. diff --git a/tools/gyp/test/generator-output/copies/copies-out/README.txt b/tools/gyp/test/generator-output/copies/copies-out/README.txt deleted file mode 100644 index 90ef886193148535de226dcf1205e63acb04a316..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/copies/copies-out/README.txt +++ /dev/null @@ -1,4 +0,0 @@ -A place-holder for this Xcode build output directory, so that the -test script can verify that .xcodeproj files are not created in -their normal location by making the src/ read-only, and then -selectively making this build directory writable. diff --git a/tools/gyp/test/generator-output/copies/copies.gyp b/tools/gyp/test/generator-output/copies/copies.gyp deleted file mode 100644 index 479a3d9b6e8b0de53c45910ada11710212329f3b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/copies/copies.gyp +++ /dev/null @@ -1,50 +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': 'pull_in_subdir', - 'type': 'none', - 'dependencies': [ - 'subdir/subdir.gyp:*', - ], - }, - { - 'target_name': 'copies1', - 'type': 'none', - 'copies': [ - { - 'destination': 'copies-out', - 'files': [ - 'file1', - ], - }, - ], - }, - { - 'target_name': 'copies2', - 'type': 'none', - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/copies-out', - 'files': [ - 'file2', - ], - }, - ], - }, - # Verify that a null 'files' list doesn't gag the generators. - { - 'target_name': 'copies_null', - 'type': 'none', - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/copies-null', - 'files': [], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/generator-output/copies/file1 b/tools/gyp/test/generator-output/copies/file1 deleted file mode 100644 index 84d55c5759cf6b954e16c54527ca94af4c1bce69..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/copies/file1 +++ /dev/null @@ -1 +0,0 @@ -file1 contents diff --git a/tools/gyp/test/generator-output/copies/file2 b/tools/gyp/test/generator-output/copies/file2 deleted file mode 100644 index af1b8ae35db461adac8325dc7a70144c1efb1cc3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/copies/file2 +++ /dev/null @@ -1 +0,0 @@ -file2 contents diff --git a/tools/gyp/test/generator-output/copies/subdir/build/README.txt b/tools/gyp/test/generator-output/copies/subdir/build/README.txt deleted file mode 100644 index 90ef886193148535de226dcf1205e63acb04a316..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/copies/subdir/build/README.txt +++ /dev/null @@ -1,4 +0,0 @@ -A place-holder for this Xcode build output directory, so that the -test script can verify that .xcodeproj files are not created in -their normal location by making the src/ read-only, and then -selectively making this build directory writable. diff --git a/tools/gyp/test/generator-output/copies/subdir/copies-out/README.txt b/tools/gyp/test/generator-output/copies/subdir/copies-out/README.txt deleted file mode 100644 index 90ef886193148535de226dcf1205e63acb04a316..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/copies/subdir/copies-out/README.txt +++ /dev/null @@ -1,4 +0,0 @@ -A place-holder for this Xcode build output directory, so that the -test script can verify that .xcodeproj files are not created in -their normal location by making the src/ read-only, and then -selectively making this build directory writable. diff --git a/tools/gyp/test/generator-output/copies/subdir/file3 b/tools/gyp/test/generator-output/copies/subdir/file3 deleted file mode 100644 index 43f16f352206578a052fd87264a9d67b81a00195..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/copies/subdir/file3 +++ /dev/null @@ -1 +0,0 @@ -file3 contents diff --git a/tools/gyp/test/generator-output/copies/subdir/file4 b/tools/gyp/test/generator-output/copies/subdir/file4 deleted file mode 100644 index 5f7270a0847cc6d0840e5b8af8fd93ec4b519986..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/copies/subdir/file4 +++ /dev/null @@ -1 +0,0 @@ -file4 contents diff --git a/tools/gyp/test/generator-output/copies/subdir/subdir.gyp b/tools/gyp/test/generator-output/copies/subdir/subdir.gyp deleted file mode 100644 index af031d283ae452bd44e4f38e515c2ce447ddb4f4..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/copies/subdir/subdir.gyp +++ /dev/null @@ -1,32 +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': 'copies3', - 'type': 'none', - 'copies': [ - { - 'destination': 'copies-out', - 'files': [ - 'file3', - ], - }, - ], - }, - { - 'target_name': 'copies4', - 'type': 'none', - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/copies-out', - 'files': [ - 'file4', - ], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/generator-output/gyptest-actions.py b/tools/gyp/test/generator-output/gyptest-actions.py deleted file mode 100755 index 2bd09c887b5b93ebbb0671c3aca58a43160c139b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/gyptest-actions.py +++ /dev/null @@ -1,58 +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. - -""" -Verifies --generator-output= behavior when using actions. -""" - -import TestGyp - -# Android doesn't support --generator-output. -test = TestGyp.TestGyp(formats=['!android']) - -# All the generated files should go under 'gypfiles'. The source directory -# ('actions') should be untouched. -test.writable(test.workpath('actions'), False) -test.run_gyp('actions.gyp', - '--generator-output=' + test.workpath('gypfiles'), - chdir='actions') - -test.writable(test.workpath('actions'), True) - -test.relocate('actions', 'relocate/actions') -test.relocate('gypfiles', 'relocate/gypfiles') - -test.writable(test.workpath('relocate/actions'), False) - -# Some of the action outputs use "pure" relative paths (i.e. without prefixes -# like <(INTERMEDIATE_DIR) or <(PROGRAM_DIR)). Even though we are building under -# 'gypfiles', such outputs will still be created relative to the original .gyp -# sources. Projects probably wouldn't normally do this, since it kind of defeats -# the purpose of '--generator-output', but it is supported behaviour. -test.writable(test.workpath('relocate/actions/build'), True) -test.writable(test.workpath('relocate/actions/subdir1/build'), True) -test.writable(test.workpath('relocate/actions/subdir1/actions-out'), True) -test.writable(test.workpath('relocate/actions/subdir2/build'), True) -test.writable(test.workpath('relocate/actions/subdir2/actions-out'), True) - -test.build('actions.gyp', test.ALL, chdir='relocate/gypfiles') - -expect = """\ -Hello from program.c -Hello from make-prog1.py -Hello from make-prog2.py -""" - -if test.format == 'xcode': - chdir = 'relocate/actions/subdir1' -else: - chdir = 'relocate/gypfiles' -test.run_built_executable('program', chdir=chdir, stdout=expect) - -test.must_match('relocate/actions/subdir2/actions-out/file.out', - "Hello from make-file.py\n") - -test.pass_test() diff --git a/tools/gyp/test/generator-output/gyptest-copies.py b/tools/gyp/test/generator-output/gyptest-copies.py deleted file mode 100755 index 909aebf85f8a698540645aa6ff87609df74b32d0..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/gyptest-copies.py +++ /dev/null @@ -1,60 +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. - -""" -Verifies file copies with --generator-output using an explicit build -target of 'all'. -""" - -import TestGyp - -# Android doesn't support --generator-output. -test = TestGyp.TestGyp(formats=['!android']) - -test.writable(test.workpath('copies'), False) - -test.run_gyp('copies.gyp', - '--generator-output=' + test.workpath('gypfiles'), - '-G', 'xcode_ninja_target_pattern=^(?!copies_null)', - chdir='copies') - -test.writable(test.workpath('copies'), True) - -test.relocate('copies', 'relocate/copies') -test.relocate('gypfiles', 'relocate/gypfiles') - -test.writable(test.workpath('relocate/copies'), False) - -test.writable(test.workpath('relocate/copies/build'), True) -test.writable(test.workpath('relocate/copies/copies-out'), True) -test.writable(test.workpath('relocate/copies/subdir/build'), True) -test.writable(test.workpath('relocate/copies/subdir/copies-out'), True) - -test.build('copies.gyp', test.ALL, chdir='relocate/gypfiles') - -test.must_match(['relocate', 'copies', 'copies-out', 'file1'], - "file1 contents\n") - -if test.format == 'xcode': - chdir = 'relocate/copies/build' -elif test.format in ['make', 'ninja', 'xcode-ninja', 'cmake']: - chdir = 'relocate/gypfiles/out' -else: - chdir = 'relocate/gypfiles' -test.must_match([chdir, 'Default', 'copies-out', 'file2'], "file2 contents\n") - -test.must_match(['relocate', 'copies', 'subdir', 'copies-out', 'file3'], - "file3 contents\n") - -if test.format == 'xcode': - chdir = 'relocate/copies/subdir/build' -elif test.format in ['make', 'ninja', 'xcode-ninja', 'cmake']: - chdir = 'relocate/gypfiles/out' -else: - chdir = 'relocate/gypfiles' -test.must_match([chdir, 'Default', 'copies-out', 'file4'], "file4 contents\n") - -test.pass_test() diff --git a/tools/gyp/test/generator-output/gyptest-depth.py b/tools/gyp/test/generator-output/gyptest-depth.py deleted file mode 100755 index ee59a11f045df7370f36001afde69aab969e4f4f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/gyptest-depth.py +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies building a project hierarchy created when the --generator-output= -and --depth= options is used to put the build configuration files in a separate -directory tree. -""" - -import TestGyp -import os - -# This is a regression test for the make generator only. -test = TestGyp.TestGyp(formats=['make']) - -test.writable(test.workpath('src'), False) - -toplevel_dir = os.path.basename(test.workpath()) - -test.run_gyp(os.path.join(toplevel_dir, 'src', 'prog1.gyp'), - '-Dset_symroot=1', - '--generator-output=gypfiles', - depth=toplevel_dir, - chdir='..') - -test.writable(test.workpath('src/build'), True) -test.writable(test.workpath('src/subdir2/build'), True) -test.writable(test.workpath('src/subdir3/build'), True) - -test.build('prog1.gyp', test.ALL, chdir='gypfiles') - -chdir = 'gypfiles' - -expect = """\ -Hello from %s -Hello from inc.h -Hello from inc1/include1.h -Hello from inc2/include2.h -Hello from inc3/include3.h -Hello from subdir2/deeper/deeper.h -""" - -if test.format == 'xcode': - chdir = 'src' -test.run_built_executable('prog1', chdir=chdir, stdout=expect % 'prog1.c') - -if test.format == 'xcode': - chdir = 'src/subdir2' -test.run_built_executable('prog2', chdir=chdir, stdout=expect % 'prog2.c') - -if test.format == 'xcode': - chdir = 'src/subdir3' -test.run_built_executable('prog3', chdir=chdir, stdout=expect % 'prog3.c') - -test.pass_test() diff --git a/tools/gyp/test/generator-output/gyptest-mac-bundle.py b/tools/gyp/test/generator-output/gyptest-mac-bundle.py deleted file mode 100644 index 840e1ec81fe998ff3d4400354b3056478b438954..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/gyptest-mac-bundle.py +++ /dev/null @@ -1,28 +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. - -""" -Verifies mac bundles work with --generator-output. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=[]) - - MAC_BUNDLE_DIR = 'mac-bundle' - GYPFILES_DIR = 'gypfiles' - test.writable(test.workpath(MAC_BUNDLE_DIR), False) - test.run_gyp('test.gyp', - '--generator-output=' + test.workpath(GYPFILES_DIR), - chdir=MAC_BUNDLE_DIR) - test.writable(test.workpath(MAC_BUNDLE_DIR), True) - - test.build('test.gyp', test.ALL, chdir=GYPFILES_DIR) - - test.pass_test() diff --git a/tools/gyp/test/generator-output/gyptest-relocate.py b/tools/gyp/test/generator-output/gyptest-relocate.py deleted file mode 100755 index 4d60a1ea52fb85b5bd33d285888c82c75458d016..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/gyptest-relocate.py +++ /dev/null @@ -1,60 +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. - -""" -Verifies that a project hierarchy created with the --generator-output= -option can be built even when it's relocated to a different path. -""" - -import TestGyp - -# Android doesn't support --generator-output. -test = TestGyp.TestGyp(formats=['!android']) - -test.writable(test.workpath('src'), False) - -test.run_gyp('prog1.gyp', - '-Dset_symroot=1', - '--generator-output=' + test.workpath('gypfiles'), - chdir='src') - -test.writable(test.workpath('src'), True) - -test.relocate('src', 'relocate/src') -test.relocate('gypfiles', 'relocate/gypfiles') - -test.writable(test.workpath('relocate/src'), False) - -test.writable(test.workpath('relocate/src/build'), True) -test.writable(test.workpath('relocate/src/subdir2/build'), True) -test.writable(test.workpath('relocate/src/subdir3/build'), True) - -test.build('prog1.gyp', test.ALL, chdir='relocate/gypfiles') - -chdir = 'relocate/gypfiles' - -expect = """\ -Hello from %s -Hello from inc.h -Hello from inc1/include1.h -Hello from inc2/include2.h -Hello from inc3/include3.h -Hello from subdir2/deeper/deeper.h -""" - -if test.format == 'xcode': - chdir = 'relocate/src' -test.run_built_executable('prog1', chdir=chdir, stdout=expect % 'prog1.c') - -if test.format == 'xcode': - chdir = 'relocate/src/subdir2' -test.run_built_executable('prog2', chdir=chdir, stdout=expect % 'prog2.c') - -if test.format == 'xcode': - chdir = 'relocate/src/subdir3' -test.run_built_executable('prog3', chdir=chdir, stdout=expect % 'prog3.c') - -test.pass_test() diff --git a/tools/gyp/test/generator-output/gyptest-rules.py b/tools/gyp/test/generator-output/gyptest-rules.py deleted file mode 100755 index 324d5c2bb54d01646071dbab8f47bdce8209be24..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/gyptest-rules.py +++ /dev/null @@ -1,59 +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. - -""" -Verifies --generator-output= behavior when using rules. -""" - -import TestGyp - -# Android doesn't support --generator-output. -test = TestGyp.TestGyp(formats=['!android']) - -test.writable(test.workpath('rules'), False) - -test.run_gyp('rules.gyp', - '--generator-output=' + test.workpath('gypfiles'), - chdir='rules') - -test.writable(test.workpath('rules'), True) - -test.relocate('rules', 'relocate/rules') -test.relocate('gypfiles', 'relocate/gypfiles') - -test.writable(test.workpath('relocate/rules'), False) - -test.writable(test.workpath('relocate/rules/build'), True) -test.writable(test.workpath('relocate/rules/subdir1/build'), True) -test.writable(test.workpath('relocate/rules/subdir2/build'), True) -test.writable(test.workpath('relocate/rules/subdir2/rules-out'), True) - -test.build('rules.gyp', test.ALL, chdir='relocate/gypfiles') - -expect = """\ -Hello from program.c -Hello from function1.in1 -Hello from function2.in1 -Hello from define3.in0 -Hello from define4.in0 -""" - -if test.format == 'xcode': - chdir = 'relocate/rules/subdir1' -else: - chdir = 'relocate/gypfiles' -test.run_built_executable('program', chdir=chdir, stdout=expect) - -test.must_match('relocate/rules/subdir2/rules-out/file1.out', - "Hello from file1.in0\n") -test.must_match('relocate/rules/subdir2/rules-out/file2.out', - "Hello from file2.in0\n") -test.must_match('relocate/rules/subdir2/rules-out/file3.out', - "Hello from file3.in1\n") -test.must_match('relocate/rules/subdir2/rules-out/file4.out', - "Hello from file4.in1\n") - -test.pass_test() diff --git a/tools/gyp/test/generator-output/gyptest-subdir2-deep.py b/tools/gyp/test/generator-output/gyptest-subdir2-deep.py deleted file mode 100755 index 305e178d412efeaafe4f421fbef9bd460a2f7fa2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/gyptest-subdir2-deep.py +++ /dev/null @@ -1,37 +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. - -""" -Verifies building a target from a .gyp file a few subdirectories -deep when the --generator-output= option is used to put the build -configuration files in a separate directory tree. -""" - -import TestGyp - -# Android doesn't support --generator-output. -test = TestGyp.TestGyp(formats=['!android']) - -test.writable(test.workpath('src'), False) - -test.writable(test.workpath('src/subdir2/deeper/build'), True) - -test.run_gyp('deeper.gyp', - '-Dset_symroot=1', - '--generator-output=' + test.workpath('gypfiles'), - chdir='src/subdir2/deeper') - -test.build('deeper.gyp', test.ALL, chdir='gypfiles') - -chdir = 'gypfiles' - -if test.format == 'xcode': - chdir = 'src/subdir2/deeper' -test.run_built_executable('deeper', - chdir=chdir, - stdout="Hello from deeper.c\n") - -test.pass_test() diff --git a/tools/gyp/test/generator-output/gyptest-symlink.py b/tools/gyp/test/generator-output/gyptest-symlink.py deleted file mode 100755 index 7390fcd37f15d0434618ea287fe608c643e5293a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/gyptest-symlink.py +++ /dev/null @@ -1,43 +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. - -""" -Verifies building a target when the --generator-output= option is used to put -the build configuration files in a separate directory tree referenced by a -symlink. -""" - -import TestGyp -import os - -# Android doesn't support --generator-output. -test = TestGyp.TestGyp(formats=['!android']) -if not hasattr(os, 'symlink'): - test.skip_test('Missing os.symlink -- skipping test.\n') - -test.writable(test.workpath('src'), False) - -test.writable(test.workpath('src/subdir2/deeper/build'), True) - -test.subdir(test.workpath('build')) -test.subdir(test.workpath('build/deeper')) -test.symlink('build/deeper', test.workpath('symlink')) - -test.writable(test.workpath('build/deeper'), True) -test.run_gyp('deeper.gyp', - '-Dset_symroot=2', - '--generator-output=' + test.workpath('symlink'), - chdir='src/subdir2/deeper') - -chdir = 'symlink' -test.build('deeper.gyp', test.ALL, chdir=chdir) - -if test.format == 'xcode': - chdir = 'src/subdir2/deeper' -test.run_built_executable('deeper', - chdir=chdir, - stdout="Hello from deeper.c\n") -test.pass_test() diff --git a/tools/gyp/test/generator-output/gyptest-top-all.py b/tools/gyp/test/generator-output/gyptest-top-all.py deleted file mode 100755 index c1d9f60d66953ad327d40c64b1417a803d0cbe38..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/gyptest-top-all.py +++ /dev/null @@ -1,54 +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. - -""" -Verifies building a project hierarchy created when the --generator-output= -option is used to put the build configuration files in a separate -directory tree. -""" - -import TestGyp - -# Android doesn't support --generator-output. -test = TestGyp.TestGyp(formats=['!android']) - -test.writable(test.workpath('src'), False) - -test.run_gyp('prog1.gyp', - '-Dset_symroot=1', - '--generator-output=' + test.workpath('gypfiles'), - chdir='src') - -test.writable(test.workpath('src/build'), True) -test.writable(test.workpath('src/subdir2/build'), True) -test.writable(test.workpath('src/subdir3/build'), True) - -test.build('prog1.gyp', test.ALL, chdir='gypfiles') - -chdir = 'gypfiles' - -expect = """\ -Hello from %s -Hello from inc.h -Hello from inc1/include1.h -Hello from inc2/include2.h -Hello from inc3/include3.h -Hello from subdir2/deeper/deeper.h -""" - -if test.format == 'xcode': - chdir = 'src' -test.run_built_executable('prog1', chdir=chdir, stdout=expect % 'prog1.c') - -if test.format == 'xcode': - chdir = 'src/subdir2' -test.run_built_executable('prog2', chdir=chdir, stdout=expect % 'prog2.c') - -if test.format == 'xcode': - chdir = 'src/subdir3' -test.run_built_executable('prog3', chdir=chdir, stdout=expect % 'prog3.c') - -test.pass_test() diff --git a/tools/gyp/test/generator-output/mac-bundle/Info.plist b/tools/gyp/test/generator-output/mac-bundle/Info.plist deleted file mode 100644 index 8cb142e9f5aa52091f9af7abb5eacc8cc6159de7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/mac-bundle/Info.plist +++ /dev/null @@ -1,32 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - - CFBundleIdentifier - com.google.${PRODUCT_NAME} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ause - CFBundleVersion - 1 - LSMinimumSystemVersion - ${MACOSX_DEPLOYMENT_TARGET} - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - - diff --git a/tools/gyp/test/generator-output/mac-bundle/app.order b/tools/gyp/test/generator-output/mac-bundle/app.order deleted file mode 100644 index 4eb9e89d39c8b5ccd7521b445ac896ab050181c4..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/mac-bundle/app.order +++ /dev/null @@ -1 +0,0 @@ -_main diff --git a/tools/gyp/test/generator-output/mac-bundle/header.h b/tools/gyp/test/generator-output/mac-bundle/header.h deleted file mode 100644 index 7ed777512290417bcbd91b14c2c91f6a3f58da0e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/mac-bundle/header.h +++ /dev/null @@ -1 +0,0 @@ -int f(); diff --git a/tools/gyp/test/generator-output/mac-bundle/main.c b/tools/gyp/test/generator-output/mac-bundle/main.c deleted file mode 100644 index 237c8ce181774d991a9dbdd8cacf1a5fb9f199f1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/mac-bundle/main.c +++ /dev/null @@ -1 +0,0 @@ -int main() {} diff --git a/tools/gyp/test/generator-output/mac-bundle/resource.sb b/tools/gyp/test/generator-output/mac-bundle/resource.sb deleted file mode 100644 index 731befc4570d2078bfe60b5ebe5b5fad6373dd00..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/mac-bundle/resource.sb +++ /dev/null @@ -1 +0,0 @@ -A text file. diff --git a/tools/gyp/test/generator-output/mac-bundle/test.gyp b/tools/gyp/test/generator-output/mac-bundle/test.gyp deleted file mode 100644 index 35ac674f6d7d83c1491b9296100ff6898fb77863..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/mac-bundle/test.gyp +++ /dev/null @@ -1,25 +0,0 @@ -# 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': 'test_app', - 'product_name': 'Test App Gyp', - 'type': 'executable', - 'mac_bundle': 1, - 'sources': [ - 'main.c', - ], - 'mac_bundle_resources': [ - 'resource.sb', - ], - 'xcode_settings': { - 'INFOPLIST_FILE': 'Info.plist', - 'ORDER_FILE': 'app.order', - 'GCC_PREFIX_HEADER': 'header.h', - 'GCC_PRECOMPILE_PREFIX_HEADER': 'YES', - }, - }, - ], -} diff --git a/tools/gyp/test/generator-output/rules/build/README.txt b/tools/gyp/test/generator-output/rules/build/README.txt deleted file mode 100644 index 90ef886193148535de226dcf1205e63acb04a316..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/rules/build/README.txt +++ /dev/null @@ -1,4 +0,0 @@ -A place-holder for this Xcode build output directory, so that the -test script can verify that .xcodeproj files are not created in -their normal location by making the src/ read-only, and then -selectively making this build directory writable. diff --git a/tools/gyp/test/generator-output/rules/copy-file.py b/tools/gyp/test/generator-output/rules/copy-file.py deleted file mode 100755 index 938c336adb01e500fbab51a96ded33827a436057..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/rules/copy-file.py +++ /dev/null @@ -1,12 +0,0 @@ -#!/usr/bin/env python - -# 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. - -import sys - -contents = open(sys.argv[1], 'r').read() -open(sys.argv[2], 'wb').write(contents) - -sys.exit(0) diff --git a/tools/gyp/test/generator-output/rules/rules.gyp b/tools/gyp/test/generator-output/rules/rules.gyp deleted file mode 100644 index dded59aff3e34f0e46137b1abddbfe0558e6d226..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/rules/rules.gyp +++ /dev/null @@ -1,16 +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': 'pull_in_all_actions', - 'type': 'none', - 'dependencies': [ - 'subdir1/executable.gyp:*', - 'subdir2/none.gyp:*', - ], - }, - ], -} diff --git a/tools/gyp/test/generator-output/rules/subdir1/build/README.txt b/tools/gyp/test/generator-output/rules/subdir1/build/README.txt deleted file mode 100644 index 90ef886193148535de226dcf1205e63acb04a316..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/rules/subdir1/build/README.txt +++ /dev/null @@ -1,4 +0,0 @@ -A place-holder for this Xcode build output directory, so that the -test script can verify that .xcodeproj files are not created in -their normal location by making the src/ read-only, and then -selectively making this build directory writable. diff --git a/tools/gyp/test/generator-output/rules/subdir1/define3.in0 b/tools/gyp/test/generator-output/rules/subdir1/define3.in0 deleted file mode 100644 index cc29c643f397ce496395f4f4f956325b29c3e3ec..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/rules/subdir1/define3.in0 +++ /dev/null @@ -1 +0,0 @@ -#define STRING3 "Hello from define3.in0\n" diff --git a/tools/gyp/test/generator-output/rules/subdir1/define4.in0 b/tools/gyp/test/generator-output/rules/subdir1/define4.in0 deleted file mode 100644 index c9b0467b3287f165b9634435d4911206aa8fc813..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/rules/subdir1/define4.in0 +++ /dev/null @@ -1 +0,0 @@ -#define STRING4 "Hello from define4.in0\n" diff --git a/tools/gyp/test/generator-output/rules/subdir1/executable.gyp b/tools/gyp/test/generator-output/rules/subdir1/executable.gyp deleted file mode 100644 index 42bee4d7467f3e2997088b738ce1d2ded8ae533d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/rules/subdir1/executable.gyp +++ /dev/null @@ -1,59 +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': 'program', - 'type': 'executable', - 'msvs_cygwin_shell': 0, - 'sources': [ - 'program.c', - 'function1.in1', - 'function2.in1', - 'define3.in0', - 'define4.in0', - ], - 'include_dirs': [ - '<(INTERMEDIATE_DIR)', - ], - 'rules': [ - { - 'rule_name': 'copy_file_0', - 'extension': 'in0', - 'inputs': [ - '../copy-file.py', - ], - 'outputs': [ - # TODO: fix Make to support generated files not - # in a variable-named path like <(INTERMEDIATE_DIR) - #'<(RULE_INPUT_ROOT).c', - '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).h', - ], - 'action': [ - 'python', '<(_inputs)', '<(RULE_INPUT_PATH)', '<@(_outputs)', - ], - 'process_outputs_as_sources': 0, - }, - { - 'rule_name': 'copy_file_1', - 'extension': 'in1', - 'inputs': [ - '../copy-file.py', - ], - 'outputs': [ - # TODO: fix Make to support generated files not - # in a variable-named path like <(INTERMEDIATE_DIR) - #'<(RULE_INPUT_ROOT).c', - '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).c', - ], - 'action': [ - 'python', '<(_inputs)', '<(RULE_INPUT_PATH)', '<@(_outputs)', - ], - 'process_outputs_as_sources': 1, - }, - ], - }, - ], -} diff --git a/tools/gyp/test/generator-output/rules/subdir1/function1.in1 b/tools/gyp/test/generator-output/rules/subdir1/function1.in1 deleted file mode 100644 index 545e7ca16bb273559563aef109fac976891bf65c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/rules/subdir1/function1.in1 +++ /dev/null @@ -1,6 +0,0 @@ -#include - -void function1(void) -{ - printf("Hello from function1.in1\n"); -} diff --git a/tools/gyp/test/generator-output/rules/subdir1/function2.in1 b/tools/gyp/test/generator-output/rules/subdir1/function2.in1 deleted file mode 100644 index 6bad43f9cf45b25b83437c4c6b1c764ff62ec3ae..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/rules/subdir1/function2.in1 +++ /dev/null @@ -1,6 +0,0 @@ -#include - -void function2(void) -{ - printf("Hello from function2.in1\n"); -} diff --git a/tools/gyp/test/generator-output/rules/subdir1/program.c b/tools/gyp/test/generator-output/rules/subdir1/program.c deleted file mode 100644 index 56b320632a75cb4cfaded48ba28a941df0c1c130..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/rules/subdir1/program.c +++ /dev/null @@ -1,18 +0,0 @@ -#include -#include "define3.h" -#include "define4.h" - -extern void function1(void); -extern void function2(void); -extern void function3(void); -extern void function4(void); - -int main(void) -{ - printf("Hello from program.c\n"); - function1(); - function2(); - printf("%s", STRING3); - printf("%s", STRING4); - return 0; -} diff --git a/tools/gyp/test/generator-output/rules/subdir2/build/README.txt b/tools/gyp/test/generator-output/rules/subdir2/build/README.txt deleted file mode 100644 index 90ef886193148535de226dcf1205e63acb04a316..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/rules/subdir2/build/README.txt +++ /dev/null @@ -1,4 +0,0 @@ -A place-holder for this Xcode build output directory, so that the -test script can verify that .xcodeproj files are not created in -their normal location by making the src/ read-only, and then -selectively making this build directory writable. diff --git a/tools/gyp/test/generator-output/rules/subdir2/file1.in0 b/tools/gyp/test/generator-output/rules/subdir2/file1.in0 deleted file mode 100644 index 7aca64f4ce0fb883446dd73c61523cd938600dbd..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/rules/subdir2/file1.in0 +++ /dev/null @@ -1 +0,0 @@ -Hello from file1.in0 diff --git a/tools/gyp/test/generator-output/rules/subdir2/file2.in0 b/tools/gyp/test/generator-output/rules/subdir2/file2.in0 deleted file mode 100644 index 80a281a2a9a19d038aec3a227a4d727071f6e6d0..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/rules/subdir2/file2.in0 +++ /dev/null @@ -1 +0,0 @@ -Hello from file2.in0 diff --git a/tools/gyp/test/generator-output/rules/subdir2/file3.in1 b/tools/gyp/test/generator-output/rules/subdir2/file3.in1 deleted file mode 100644 index 60ae2e7931136d63e8a6b43805e915a72ac94ed5..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/rules/subdir2/file3.in1 +++ /dev/null @@ -1 +0,0 @@ -Hello from file3.in1 diff --git a/tools/gyp/test/generator-output/rules/subdir2/file4.in1 b/tools/gyp/test/generator-output/rules/subdir2/file4.in1 deleted file mode 100644 index 5a3c30720e7af0b1e430db65c0102b1d9adcbb70..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/rules/subdir2/file4.in1 +++ /dev/null @@ -1 +0,0 @@ -Hello from file4.in1 diff --git a/tools/gyp/test/generator-output/rules/subdir2/none.gyp b/tools/gyp/test/generator-output/rules/subdir2/none.gyp deleted file mode 100644 index 664cbd9cb75f6c904aeb97cfa4c5f9b005696bdd..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/rules/subdir2/none.gyp +++ /dev/null @@ -1,49 +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': 'files', - 'type': 'none', - 'msvs_cygwin_shell': 0, - 'sources': [ - 'file1.in0', - 'file2.in0', - 'file3.in1', - 'file4.in1', - ], - 'rules': [ - { - 'rule_name': 'copy_file_0', - 'extension': 'in0', - 'inputs': [ - '../copy-file.py', - ], - 'outputs': [ - 'rules-out/<(RULE_INPUT_ROOT).out', - ], - 'action': [ - 'python', '<(_inputs)', '<(RULE_INPUT_PATH)', '<@(_outputs)', - ], - 'process_outputs_as_sources': 0, - }, - { - 'rule_name': 'copy_file_1', - 'extension': 'in1', - 'inputs': [ - '../copy-file.py', - ], - 'outputs': [ - 'rules-out/<(RULE_INPUT_ROOT).out', - ], - 'action': [ - 'python', '<(_inputs)', '<(RULE_INPUT_PATH)', '<@(_outputs)', - ], - 'process_outputs_as_sources': 1, - }, - ], - }, - ], -} diff --git a/tools/gyp/test/generator-output/rules/subdir2/rules-out/README.txt b/tools/gyp/test/generator-output/rules/subdir2/rules-out/README.txt deleted file mode 100644 index 90ef886193148535de226dcf1205e63acb04a316..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/rules/subdir2/rules-out/README.txt +++ /dev/null @@ -1,4 +0,0 @@ -A place-holder for this Xcode build output directory, so that the -test script can verify that .xcodeproj files are not created in -their normal location by making the src/ read-only, and then -selectively making this build directory writable. diff --git a/tools/gyp/test/generator-output/src/build/README.txt b/tools/gyp/test/generator-output/src/build/README.txt deleted file mode 100644 index 90ef886193148535de226dcf1205e63acb04a316..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/src/build/README.txt +++ /dev/null @@ -1,4 +0,0 @@ -A place-holder for this Xcode build output directory, so that the -test script can verify that .xcodeproj files are not created in -their normal location by making the src/ read-only, and then -selectively making this build directory writable. diff --git a/tools/gyp/test/generator-output/src/inc.h b/tools/gyp/test/generator-output/src/inc.h deleted file mode 100644 index 57aa1a5a7443fbd2aa74a3ad918705e249d20d10..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/src/inc.h +++ /dev/null @@ -1 +0,0 @@ -#define INC_STRING "inc.h" diff --git a/tools/gyp/test/generator-output/src/inc1/include1.h b/tools/gyp/test/generator-output/src/inc1/include1.h deleted file mode 100644 index 1d59065fc90a7215403665417f0b59b64bd5494a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/src/inc1/include1.h +++ /dev/null @@ -1 +0,0 @@ -#define INCLUDE1_STRING "inc1/include1.h" diff --git a/tools/gyp/test/generator-output/src/prog1.c b/tools/gyp/test/generator-output/src/prog1.c deleted file mode 100644 index bf7c2a17bd3a8fd051302709f9a0c894cc5f519b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/src/prog1.c +++ /dev/null @@ -1,18 +0,0 @@ -#include - -#include "inc.h" -#include "include1.h" -#include "include2.h" -#include "include3.h" -#include "deeper.h" - -int main(void) -{ - printf("Hello from prog1.c\n"); - printf("Hello from %s\n", INC_STRING); - printf("Hello from %s\n", INCLUDE1_STRING); - printf("Hello from %s\n", INCLUDE2_STRING); - printf("Hello from %s\n", INCLUDE3_STRING); - printf("Hello from %s\n", DEEPER_STRING); - return 0; -} diff --git a/tools/gyp/test/generator-output/src/prog1.gyp b/tools/gyp/test/generator-output/src/prog1.gyp deleted file mode 100644 index d50e6fb0a7edd71a1989cdd425db8b27454fffbb..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/src/prog1.gyp +++ /dev/null @@ -1,28 +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. - -{ - 'includes': [ - 'symroot.gypi', - ], - 'targets': [ - { - 'target_name': 'prog1', - 'type': 'executable', - 'dependencies': [ - 'subdir2/prog2.gyp:prog2', - ], - 'include_dirs': [ - '.', - 'inc1', - 'subdir2/inc2', - 'subdir3/inc3', - 'subdir2/deeper', - ], - 'sources': [ - 'prog1.c', - ], - }, - ], -} diff --git a/tools/gyp/test/generator-output/src/subdir2/build/README.txt b/tools/gyp/test/generator-output/src/subdir2/build/README.txt deleted file mode 100644 index 90ef886193148535de226dcf1205e63acb04a316..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/src/subdir2/build/README.txt +++ /dev/null @@ -1,4 +0,0 @@ -A place-holder for this Xcode build output directory, so that the -test script can verify that .xcodeproj files are not created in -their normal location by making the src/ read-only, and then -selectively making this build directory writable. diff --git a/tools/gyp/test/generator-output/src/subdir2/deeper/build/README.txt b/tools/gyp/test/generator-output/src/subdir2/deeper/build/README.txt deleted file mode 100644 index 90ef886193148535de226dcf1205e63acb04a316..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/src/subdir2/deeper/build/README.txt +++ /dev/null @@ -1,4 +0,0 @@ -A place-holder for this Xcode build output directory, so that the -test script can verify that .xcodeproj files are not created in -their normal location by making the src/ read-only, and then -selectively making this build directory writable. diff --git a/tools/gyp/test/generator-output/src/subdir2/deeper/deeper.c b/tools/gyp/test/generator-output/src/subdir2/deeper/deeper.c deleted file mode 100644 index 843505cd11cd8bd0c5ffb1667ab225e6befda5dc..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/src/subdir2/deeper/deeper.c +++ /dev/null @@ -1,7 +0,0 @@ -#include - -int main(void) -{ - printf("Hello from deeper.c\n"); - return 0; -} diff --git a/tools/gyp/test/generator-output/src/subdir2/deeper/deeper.gyp b/tools/gyp/test/generator-output/src/subdir2/deeper/deeper.gyp deleted file mode 100644 index 8648770872377094cd570a368ad784c11be0e038..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/src/subdir2/deeper/deeper.gyp +++ /dev/null @@ -1,18 +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. - -{ - 'includes': [ - '../../symroot.gypi', - ], - 'targets': [ - { - 'target_name': 'deeper', - 'type': 'executable', - 'sources': [ - 'deeper.c', - ], - }, - ], -} diff --git a/tools/gyp/test/generator-output/src/subdir2/deeper/deeper.h b/tools/gyp/test/generator-output/src/subdir2/deeper/deeper.h deleted file mode 100644 index f6484a0fe58666c7e4ed7d742a410dac4f76f33a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/src/subdir2/deeper/deeper.h +++ /dev/null @@ -1 +0,0 @@ -#define DEEPER_STRING "subdir2/deeper/deeper.h" diff --git a/tools/gyp/test/generator-output/src/subdir2/inc2/include2.h b/tools/gyp/test/generator-output/src/subdir2/inc2/include2.h deleted file mode 100644 index 1ccfa5dea79fea3d5229544717ecc673c00597b2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/src/subdir2/inc2/include2.h +++ /dev/null @@ -1 +0,0 @@ -#define INCLUDE2_STRING "inc2/include2.h" diff --git a/tools/gyp/test/generator-output/src/subdir2/prog2.c b/tools/gyp/test/generator-output/src/subdir2/prog2.c deleted file mode 100644 index d80d8719843767ac5caa2c855616f83fba7e6d53..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/src/subdir2/prog2.c +++ /dev/null @@ -1,18 +0,0 @@ -#include - -#include "inc.h" -#include "include1.h" -#include "include2.h" -#include "include3.h" -#include "deeper.h" - -int main(void) -{ - printf("Hello from prog2.c\n"); - printf("Hello from %s\n", INC_STRING); - printf("Hello from %s\n", INCLUDE1_STRING); - printf("Hello from %s\n", INCLUDE2_STRING); - printf("Hello from %s\n", INCLUDE3_STRING); - printf("Hello from %s\n", DEEPER_STRING); - return 0; -} diff --git a/tools/gyp/test/generator-output/src/subdir2/prog2.gyp b/tools/gyp/test/generator-output/src/subdir2/prog2.gyp deleted file mode 100644 index 7176ed8be74ef1f796366a9ea67a8b21f7749795..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/src/subdir2/prog2.gyp +++ /dev/null @@ -1,28 +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. - -{ - 'includes': [ - '../symroot.gypi', - ], - 'targets': [ - { - 'target_name': 'prog2', - 'type': 'executable', - 'include_dirs': [ - '..', - '../inc1', - 'inc2', - '../subdir3/inc3', - 'deeper', - ], - 'dependencies': [ - '../subdir3/prog3.gyp:prog3', - ], - 'sources': [ - 'prog2.c', - ], - }, - ], -} diff --git a/tools/gyp/test/generator-output/src/subdir3/build/README.txt b/tools/gyp/test/generator-output/src/subdir3/build/README.txt deleted file mode 100644 index 90ef886193148535de226dcf1205e63acb04a316..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/src/subdir3/build/README.txt +++ /dev/null @@ -1,4 +0,0 @@ -A place-holder for this Xcode build output directory, so that the -test script can verify that .xcodeproj files are not created in -their normal location by making the src/ read-only, and then -selectively making this build directory writable. diff --git a/tools/gyp/test/generator-output/src/subdir3/inc3/include3.h b/tools/gyp/test/generator-output/src/subdir3/inc3/include3.h deleted file mode 100644 index bf53bf1f0070d9a6cccdee4a47c736103afc8630..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/src/subdir3/inc3/include3.h +++ /dev/null @@ -1 +0,0 @@ -#define INCLUDE3_STRING "inc3/include3.h" diff --git a/tools/gyp/test/generator-output/src/subdir3/prog3.c b/tools/gyp/test/generator-output/src/subdir3/prog3.c deleted file mode 100644 index c72233da193ca234723f093ff3052dfc140304e6..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/src/subdir3/prog3.c +++ /dev/null @@ -1,18 +0,0 @@ -#include - -#include "inc.h" -#include "include1.h" -#include "include2.h" -#include "include3.h" -#include "deeper.h" - -int main(void) -{ - printf("Hello from prog3.c\n"); - printf("Hello from %s\n", INC_STRING); - printf("Hello from %s\n", INCLUDE1_STRING); - printf("Hello from %s\n", INCLUDE2_STRING); - printf("Hello from %s\n", INCLUDE3_STRING); - printf("Hello from %s\n", DEEPER_STRING); - return 0; -} diff --git a/tools/gyp/test/generator-output/src/subdir3/prog3.gyp b/tools/gyp/test/generator-output/src/subdir3/prog3.gyp deleted file mode 100644 index 46c5e000a272472e67bf4432559340df8af2112a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/src/subdir3/prog3.gyp +++ /dev/null @@ -1,25 +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. - -{ - 'includes': [ - '../symroot.gypi', - ], - 'targets': [ - { - 'target_name': 'prog3', - 'type': 'executable', - 'include_dirs': [ - '..', - '../inc1', - '../subdir2/inc2', - 'inc3', - '../subdir2/deeper', - ], - 'sources': [ - 'prog3.c', - ], - }, - ], -} diff --git a/tools/gyp/test/generator-output/src/symroot.gypi b/tools/gyp/test/generator-output/src/symroot.gypi deleted file mode 100644 index 519916427c9f134b81079de4d338cb81bb4bbeb2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/generator-output/src/symroot.gypi +++ /dev/null @@ -1,16 +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. - -{ - 'variables': { - 'set_symroot%': 0, - }, - 'conditions': [ - ['set_symroot == 1', { - 'xcode_settings': { - 'SYMROOT': '<(DEPTH)/build', - }, - }], - ], -} diff --git a/tools/gyp/test/gyp-defines/defines.gyp b/tools/gyp/test/gyp-defines/defines.gyp deleted file mode 100644 index f59bbd20d299a5fef80c12a809c11400d3724925..0000000000000000000000000000000000000000 --- a/tools/gyp/test/gyp-defines/defines.gyp +++ /dev/null @@ -1,26 +0,0 @@ -# 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': 'test_target', - 'type': 'none', - 'actions': [ - { - 'action_name': 'test_action', - 'inputs': [], - 'outputs': [ 'action.txt' ], - 'action': [ - 'python', - 'echo.py', - '<(key)', - '<(_outputs)', - ], - 'msvs_cygwin_shell': 0, - } - ], - }, - ], -} diff --git a/tools/gyp/test/gyp-defines/echo.py b/tools/gyp/test/gyp-defines/echo.py deleted file mode 100644 index b85add12f68b3a6940387a7f7b3126e52ed00760..0000000000000000000000000000000000000000 --- a/tools/gyp/test/gyp-defines/echo.py +++ /dev/null @@ -1,11 +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. - -import sys - -f = open(sys.argv[2], 'w+') -f.write(sys.argv[1]) -f.close() diff --git a/tools/gyp/test/gyp-defines/gyptest-multiple-values.py b/tools/gyp/test/gyp-defines/gyptest-multiple-values.py deleted file mode 100644 index 6764dbd545dcdc6055e5739f52770df9ae895818..0000000000000000000000000000000000000000 --- a/tools/gyp/test/gyp-defines/gyptest-multiple-values.py +++ /dev/null @@ -1,42 +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. - -""" -Verifies that when multiple values are supplied for a gyp define, the last one -is used. -""" - -import os -import TestGyp - -test = TestGyp.TestGyp() - -os.environ['GYP_DEFINES'] = 'key=value1 key=value2 key=value3' -test.run_gyp('defines.gyp') - -test.build('defines.gyp') -test.must_contain('action.txt', 'value3') - -# The last occurrence of a repeated set should take precedence over other -# values. -os.environ['GYP_DEFINES'] = 'key=repeated_value key=value1 key=repeated_value' -test.run_gyp('defines.gyp') - -if test.format == 'msvs' and not test.uses_msbuild: - # msvs versions before 2010 don't detect build rule changes not reflected - # in file system timestamps. Rebuild to see differences. - test.build('defines.gyp', rebuild=True) -elif test.format == 'android': - # The Android build system doesn't currently have a way to get files whose - # build rules have changed (but whose timestamps haven't) to be rebuilt. - # See bug http://code.google.com/p/gyp/issues/detail?id=308 - test.unlink('action.txt') - test.build('defines.gyp') -else: - test.build('defines.gyp') -test.must_contain('action.txt', 'repeated_value') - -test.pass_test() diff --git a/tools/gyp/test/gyp-defines/gyptest-regyp.py b/tools/gyp/test/gyp-defines/gyptest-regyp.py deleted file mode 100644 index 0895d81d4f559e5849cf1724f679ebda5811b7ab..0000000000000000000000000000000000000000 --- a/tools/gyp/test/gyp-defines/gyptest-regyp.py +++ /dev/null @@ -1,40 +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. - -""" -Verifies that when the same value is repeated for a gyp define, duplicates are -stripped from the regeneration rule. -""" - -import os -import TestGyp - -# Regenerating build files when a gyp file changes is currently only supported -# by the make generator. -test = TestGyp.TestGyp(formats=['make']) - -os.environ['GYP_DEFINES'] = 'key=repeated_value key=value1 key=repeated_value' -test.run_gyp('defines.gyp') -test.build('defines.gyp') - -# The last occurrence of a repeated set should take precedence over other -# values. See gyptest-multiple-values.py. -test.must_contain('action.txt', 'repeated_value') - -# So the regeneration rule needs to use the correct order. -test.must_not_contain( - 'Makefile', '"-Dkey=repeated_value" "-Dkey=value1" "-Dkey=repeated_value"') -test.must_contain('Makefile', '"-Dkey=value1" "-Dkey=repeated_value"') - -# Sleep so that the changed gyp file will have a newer timestamp than the -# previously generated build files. -test.sleep() -os.utime("defines.gyp", None) - -test.build('defines.gyp') -test.must_contain('action.txt', 'repeated_value') - -test.pass_test() diff --git a/tools/gyp/test/hard_dependency/gyptest-exported-hard-dependency.py b/tools/gyp/test/hard_dependency/gyptest-exported-hard-dependency.py deleted file mode 100755 index ba51528800419985d0aa57116a33fa532cf13da8..0000000000000000000000000000000000000000 --- a/tools/gyp/test/hard_dependency/gyptest-exported-hard-dependency.py +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verify that a hard_dependency that is exported is pulled in as a dependency -for a target if the target is a static library and if the generator will -remove dependencies between static libraries. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -if test.format == 'dump_dependency_json': - test.skip_test('Skipping test; dependency JSON does not adjust ' \ - 'static libraries.\n') - -test.run_gyp('hard_dependency.gyp', chdir='src') - -chdir = 'relocate/src' -test.relocate('src', chdir) - -test.build('hard_dependency.gyp', 'c', chdir=chdir) - -# The 'a' static library should be built, as it has actions with side-effects -# that are necessary to compile 'c'. Even though 'c' does not directly depend -# on 'a', because 'a' is a hard_dependency that 'b' exports, 'c' should import -# it as a hard_dependency and ensure it is built before building 'c'. -test.built_file_must_exist('a', type=test.STATIC_LIB, chdir=chdir) -test.built_file_must_not_exist('b', type=test.STATIC_LIB, chdir=chdir) -test.built_file_must_exist('c', type=test.STATIC_LIB, chdir=chdir) -test.built_file_must_not_exist('d', type=test.STATIC_LIB, chdir=chdir) - -test.pass_test() diff --git a/tools/gyp/test/hard_dependency/gyptest-no-exported-hard-dependency.py b/tools/gyp/test/hard_dependency/gyptest-no-exported-hard-dependency.py deleted file mode 100755 index 10774ca2a0025fd583629dddd31a094d9f0042fd..0000000000000000000000000000000000000000 --- a/tools/gyp/test/hard_dependency/gyptest-no-exported-hard-dependency.py +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verify that a hard_dependency that is not exported is not pulled in as a -dependency for a target if the target does not explicitly specify a dependency -and none of its dependencies export the hard_dependency. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -if test.format == 'dump_dependency_json': - test.skip_test('Skipping test; dependency JSON does not adjust ' \ - 'static libaries.\n') - -test.run_gyp('hard_dependency.gyp', chdir='src') - -chdir = 'relocate/src' -test.relocate('src', chdir) - -test.build('hard_dependency.gyp', 'd', chdir=chdir) - -# Because 'c' does not export a hard_dependency, only the target 'd' should -# be built. This is because the 'd' target does not need the generated headers -# in order to be compiled. -test.built_file_must_not_exist('a', type=test.STATIC_LIB, chdir=chdir) -test.built_file_must_not_exist('b', type=test.STATIC_LIB, chdir=chdir) -test.built_file_must_not_exist('c', type=test.STATIC_LIB, chdir=chdir) -test.built_file_must_exist('d', type=test.STATIC_LIB, chdir=chdir) - -test.pass_test() diff --git a/tools/gyp/test/hard_dependency/src/a.c b/tools/gyp/test/hard_dependency/src/a.c deleted file mode 100644 index 0fa0223c979c9646868d8463e6adf220b7cb56af..0000000000000000000000000000000000000000 --- a/tools/gyp/test/hard_dependency/src/a.c +++ /dev/null @@ -1,9 +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. */ - -#include "a.h" - -int funcA() { - return 42; -} diff --git a/tools/gyp/test/hard_dependency/src/a.h b/tools/gyp/test/hard_dependency/src/a.h deleted file mode 100644 index 854a06504ad3d062d256212790f0069595e9f3db..0000000000000000000000000000000000000000 --- a/tools/gyp/test/hard_dependency/src/a.h +++ /dev/null @@ -1,12 +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. */ - -#ifndef A_H_ -#define A_H_ - -#include "generated.h" - -int funcA(); - -#endif // A_H_ diff --git a/tools/gyp/test/hard_dependency/src/b.c b/tools/gyp/test/hard_dependency/src/b.c deleted file mode 100644 index 0baace929e95b99bc7f36b20d98a2276f0c932ff..0000000000000000000000000000000000000000 --- a/tools/gyp/test/hard_dependency/src/b.c +++ /dev/null @@ -1,9 +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. */ - -#include "a.h" - -int funcB() { - return funcA(); -} diff --git a/tools/gyp/test/hard_dependency/src/b.h b/tools/gyp/test/hard_dependency/src/b.h deleted file mode 100644 index 22b48cefe206ff8813f790bd723098cdfa8eaf22..0000000000000000000000000000000000000000 --- a/tools/gyp/test/hard_dependency/src/b.h +++ /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. */ - -#ifndef B_H_ -#define B_H_ - -#include "a.h" - -int funcB(); - -#endif // B_H_ diff --git a/tools/gyp/test/hard_dependency/src/c.c b/tools/gyp/test/hard_dependency/src/c.c deleted file mode 100644 index 7d0068208ec64b40af9629bb1adadd5d5fa08133..0000000000000000000000000000000000000000 --- a/tools/gyp/test/hard_dependency/src/c.c +++ /dev/null @@ -1,10 +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. */ - -#include "b.h" -#include "c.h" - -int funcC() { - return funcB(); -} diff --git a/tools/gyp/test/hard_dependency/src/c.h b/tools/gyp/test/hard_dependency/src/c.h deleted file mode 100644 index f4ea7fefa2beb58a183e33a20605c96cfaeb97e0..0000000000000000000000000000000000000000 --- a/tools/gyp/test/hard_dependency/src/c.h +++ /dev/null @@ -1,10 +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. */ - -#ifndef C_H_ -#define C_H_ - -int funcC(); - -#endif // C_H_ diff --git a/tools/gyp/test/hard_dependency/src/d.c b/tools/gyp/test/hard_dependency/src/d.c deleted file mode 100644 index d016c3ce71899f8f6f629301fac98187a630612e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/hard_dependency/src/d.c +++ /dev/null @@ -1,9 +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. */ - -#include "c.h" - -int funcD() { - return funcC(); -} diff --git a/tools/gyp/test/hard_dependency/src/emit.py b/tools/gyp/test/hard_dependency/src/emit.py deleted file mode 100755 index 2df74b79a12c561129f397c7b676378dbb96a6ba..0000000000000000000000000000000000000000 --- a/tools/gyp/test/hard_dependency/src/emit.py +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env python - -# 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. - -import sys - -f = open(sys.argv[1], 'wb') -f.write('/* Hello World */\n') -f.close() diff --git a/tools/gyp/test/hard_dependency/src/hard_dependency.gyp b/tools/gyp/test/hard_dependency/src/hard_dependency.gyp deleted file mode 100644 index 4479c5f0452e15c35ebc6ad1028e5b12ecbd6564..0000000000000000000000000000000000000000 --- a/tools/gyp/test/hard_dependency/src/hard_dependency.gyp +++ /dev/null @@ -1,78 +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': 'a', - 'type': 'static_library', - 'sources': [ - 'a.c', - 'a.h', - ], - 'hard_dependency': 1, - 'actions': [ - { - 'action_name': 'generate_headers', - 'inputs': [ - 'emit.py' - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/generated.h' - ], - 'action': [ - 'python', - 'emit.py', - '<(SHARED_INTERMEDIATE_DIR)/generated.h', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - ], - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)', - ], - }, - }, - { - 'target_name': 'b', - 'type': 'static_library', - 'sources': [ - 'b.c', - 'b.h', - ], - 'dependencies': [ - 'a', - ], - 'export_dependent_settings': [ - 'a', - ], - }, - { - 'target_name': 'c', - 'type': 'static_library', - 'sources': [ - 'c.c', - 'c.h', - ], - 'dependencies': [ - 'b', - ], - }, - { - 'target_name': 'd', - 'type': 'static_library', - 'sources': [ - 'd.c', - ], - 'dependencies': [ - 'c', - ], - } - ], -} diff --git a/tools/gyp/test/hello/gyptest-all.py b/tools/gyp/test/hello/gyptest-all.py deleted file mode 100755 index 1739b6886e9fb0955ce2163ebe94de75ef1e5b9b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/hello/gyptest-all.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies simplest-possible build of a "Hello, world!" program -using an explicit build target of 'all'. -""" - -import TestGyp - -test = TestGyp.TestGyp(workdir='workarea_all') - -test.run_gyp('hello.gyp') - -test.build('hello.gyp', test.ALL) - -test.run_built_executable('hello', stdout="Hello, world!\n") - -test.up_to_date('hello.gyp', test.ALL) - -test.pass_test() diff --git a/tools/gyp/test/hello/gyptest-default.py b/tools/gyp/test/hello/gyptest-default.py deleted file mode 100755 index 22377e7ac50433fd6995a5d7bb68796749fc09c9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/hello/gyptest-default.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies simplest-possible build of a "Hello, world!" program -using the default build target. -""" - -import TestGyp - -test = TestGyp.TestGyp(workdir='workarea_default') - -test.run_gyp('hello.gyp') - -test.build('hello.gyp') - -test.run_built_executable('hello', stdout="Hello, world!\n") - -test.up_to_date('hello.gyp', test.DEFAULT) - -test.pass_test() diff --git a/tools/gyp/test/hello/gyptest-disable-regyp.py b/tools/gyp/test/hello/gyptest-disable-regyp.py deleted file mode 100755 index 1e4b306674862c3e13cc562091060538d7bed904..0000000000000000000000000000000000000000 --- a/tools/gyp/test/hello/gyptest-disable-regyp.py +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies that Makefiles don't get rebuilt when a source gyp file changes and -the disable_regeneration generator flag is set. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('hello.gyp', '-Gauto_regeneration=0') - -test.build('hello.gyp', test.ALL) - -test.run_built_executable('hello', stdout="Hello, world!\n") - -# Sleep so that the changed gyp file will have a newer timestamp than the -# previously generated build files. -test.sleep() -test.write('hello.gyp', test.read('hello2.gyp')) - -test.build('hello.gyp', test.ALL) - -# Should still be the old executable, as regeneration was disabled. -test.run_built_executable('hello', stdout="Hello, world!\n") - -test.pass_test() diff --git a/tools/gyp/test/hello/gyptest-regyp-output.py b/tools/gyp/test/hello/gyptest-regyp-output.py deleted file mode 100644 index 5e698b1e1148bd65e521f17f737b5e9117442e0d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/hello/gyptest-regyp-output.py +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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 that Makefiles get rebuilt when a source gyp file changes and ---generator-output is used. -""" - -import TestGyp - -# Regenerating build files when a gyp file changes is currently only supported -# by the make and Android generators, and --generator-output is not supported -# by Android and ninja, so we can only test for make. -test = TestGyp.TestGyp(formats=['make']) - -CHDIR='generator-output' - -test.run_gyp('hello.gyp', '--generator-output=%s' % CHDIR) - -test.build('hello.gyp', test.ALL, chdir=CHDIR) - -test.run_built_executable('hello', stdout="Hello, world!\n", chdir=CHDIR) - -# Sleep so that the changed gyp file will have a newer timestamp than the -# previously generated build files. -test.sleep() -test.write('hello.gyp', test.read('hello2.gyp')) - -test.build('hello.gyp', test.ALL, chdir=CHDIR) - -test.run_built_executable('hello', stdout="Hello, two!\n", chdir=CHDIR) - -test.pass_test() diff --git a/tools/gyp/test/hello/gyptest-regyp.py b/tools/gyp/test/hello/gyptest-regyp.py deleted file mode 100755 index b513edcd07cda6919d2ff95b129a060a541eaa45..0000000000000000000000000000000000000000 --- a/tools/gyp/test/hello/gyptest-regyp.py +++ /dev/null @@ -1,32 +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. - -""" -Verifies that Makefiles get rebuilt when a source gyp file changes. -""" - -import TestGyp - -# Regenerating build files when a gyp file changes is currently only supported -# by the make generator. -test = TestGyp.TestGyp(formats=['make']) - -test.run_gyp('hello.gyp') - -test.build('hello.gyp', test.ALL) - -test.run_built_executable('hello', stdout="Hello, world!\n") - -# Sleep so that the changed gyp file will have a newer timestamp than the -# previously generated build files. -test.sleep() -test.write('hello.gyp', test.read('hello2.gyp')) - -test.build('hello.gyp', test.ALL) - -test.run_built_executable('hello', stdout="Hello, two!\n") - -test.pass_test() diff --git a/tools/gyp/test/hello/gyptest-target.py b/tools/gyp/test/hello/gyptest-target.py deleted file mode 100755 index 1abaf7057bf8ffc1da9437fd5adb17412000a6d7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/hello/gyptest-target.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies simplest-possible build of a "Hello, world!" program -using an explicit build target of 'hello'. -""" - -import TestGyp - -test = TestGyp.TestGyp(workdir='workarea_target') - -test.run_gyp('hello.gyp') - -test.build('hello.gyp', 'hello') - -test.run_built_executable('hello', stdout="Hello, world!\n") - -test.up_to_date('hello.gyp', 'hello') - -test.pass_test() diff --git a/tools/gyp/test/hello/hello.c b/tools/gyp/test/hello/hello.c deleted file mode 100644 index 0a4c806019e86416cad8dda7ee87a6bcad66f888..0000000000000000000000000000000000000000 --- a/tools/gyp/test/hello/hello.c +++ /dev/null @@ -1,11 +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. */ - -#include - -int main(void) -{ - printf("Hello, world!\n"); - return 0; -} diff --git a/tools/gyp/test/hello/hello.gyp b/tools/gyp/test/hello/hello.gyp deleted file mode 100644 index 1974d51ccd1934cfc0841f26e7118448b2fb1c98..0000000000000000000000000000000000000000 --- a/tools/gyp/test/hello/hello.gyp +++ /dev/null @@ -1,15 +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': 'hello', - 'type': 'executable', - 'sources': [ - 'hello.c', - ], - }, - ], -} diff --git a/tools/gyp/test/hello/hello2.c b/tools/gyp/test/hello/hello2.c deleted file mode 100644 index b14299cae0d4589033c6d15dcfe847df6adb6354..0000000000000000000000000000000000000000 --- a/tools/gyp/test/hello/hello2.c +++ /dev/null @@ -1,11 +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. */ - -#include - -int main(void) -{ - printf("Hello, two!\n"); - return 0; -} diff --git a/tools/gyp/test/hello/hello2.gyp b/tools/gyp/test/hello/hello2.gyp deleted file mode 100644 index 25b08caf3cad0ebe0bfc5eceff247996652e113f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/hello/hello2.gyp +++ /dev/null @@ -1,15 +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': 'hello', - 'type': 'executable', - 'sources': [ - 'hello2.c', - ], - }, - ], -} diff --git a/tools/gyp/test/home_dot_gyp/gyptest-home-includes-config-arg.py b/tools/gyp/test/home_dot_gyp/gyptest-home-includes-config-arg.py deleted file mode 100755 index 82e39f9d073a419263abb5635c95e534a5e4858c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/home_dot_gyp/gyptest-home-includes-config-arg.py +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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 inclusion of $HOME/.gyp/include.gypi works when --config-dir is -specified. -""" - -import os -import TestGyp - -test = TestGyp.TestGyp() - -os.environ['HOME'] = os.path.abspath('home2') - -test.run_gyp('all.gyp', '--config-dir=~/.gyp_new', chdir='src') - -# After relocating, we should still be able to build (build file shouldn't -# contain relative reference to ~/.gyp/include.gypi) -test.relocate('src', 'relocate/src') - -test.build('all.gyp', test.ALL, chdir='relocate/src') - -test.run_built_executable('printfoo', - chdir='relocate/src', - stdout='FOO is fromhome3\n') - -test.pass_test() diff --git a/tools/gyp/test/home_dot_gyp/gyptest-home-includes-config-env.py b/tools/gyp/test/home_dot_gyp/gyptest-home-includes-config-env.py deleted file mode 100755 index 6f4b299ede4c743922daf7989001898901b5c753..0000000000000000000000000000000000000000 --- a/tools/gyp/test/home_dot_gyp/gyptest-home-includes-config-env.py +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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 inclusion of $HOME/.gyp_new/include.gypi works when GYP_CONFIG_DIR -is set. -""" - -import os -import TestGyp - -test = TestGyp.TestGyp() - -os.environ['HOME'] = os.path.abspath('home') -os.environ['GYP_CONFIG_DIR'] = os.path.join(os.path.abspath('home2'), - '.gyp_new') - -test.run_gyp('all.gyp', chdir='src') - -# After relocating, we should still be able to build (build file shouldn't -# contain relative reference to ~/.gyp_new/include.gypi) -test.relocate('src', 'relocate/src') - -test.build('all.gyp', test.ALL, chdir='relocate/src') - -test.run_built_executable('printfoo', - chdir='relocate/src', - stdout='FOO is fromhome3\n') - -test.pass_test() diff --git a/tools/gyp/test/home_dot_gyp/gyptest-home-includes-regyp.py b/tools/gyp/test/home_dot_gyp/gyptest-home-includes-regyp.py deleted file mode 100755 index fdf8b144648380b6a3378aea3ce2fcdb5ea3c195..0000000000000000000000000000000000000000 --- a/tools/gyp/test/home_dot_gyp/gyptest-home-includes-regyp.py +++ /dev/null @@ -1,44 +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. - -""" -Verifies inclusion of $HOME/.gyp/include.gypi works properly with relocation -and with regeneration. -""" - -import os -import TestGyp - -# Regenerating build files when a gyp file changes is currently only supported -# by the make generator. -test = TestGyp.TestGyp(formats=['make']) - -os.environ['HOME'] = os.path.abspath('home') - -test.run_gyp('all.gyp', chdir='src') - -# After relocating, we should still be able to build (build file shouldn't -# contain relative reference to ~/.gyp/include.gypi) -test.relocate('src', 'relocate/src') - -test.build('all.gyp', test.ALL, chdir='relocate/src') - -test.run_built_executable('printfoo', - chdir='relocate/src', - stdout='FOO is fromhome\n') - -# Building should notice any changes to ~/.gyp/include.gypi and regyp. -test.sleep() - -test.write('home/.gyp/include.gypi', test.read('home2/.gyp/include.gypi')) - -test.build('all.gyp', test.ALL, chdir='relocate/src') - -test.run_built_executable('printfoo', - chdir='relocate/src', - stdout='FOO is fromhome2\n') - -test.pass_test() diff --git a/tools/gyp/test/home_dot_gyp/gyptest-home-includes.py b/tools/gyp/test/home_dot_gyp/gyptest-home-includes.py deleted file mode 100755 index 8ad52556becc0f1e112ad91231a4b8f548e96022..0000000000000000000000000000000000000000 --- a/tools/gyp/test/home_dot_gyp/gyptest-home-includes.py +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies inclusion of $HOME/.gyp/include.gypi works. -""" - -import os -import TestGyp - -test = TestGyp.TestGyp() - -os.environ['HOME'] = os.path.abspath('home') - -test.run_gyp('all.gyp', chdir='src') - -# After relocating, we should still be able to build (build file shouldn't -# contain relative reference to ~/.gyp/include.gypi) -test.relocate('src', 'relocate/src') - -test.build('all.gyp', test.ALL, chdir='relocate/src') - -test.run_built_executable('printfoo', - chdir='relocate/src', - stdout='FOO is fromhome\n') - -test.pass_test() diff --git a/tools/gyp/test/home_dot_gyp/home/.gyp/include.gypi b/tools/gyp/test/home_dot_gyp/home/.gyp/include.gypi deleted file mode 100644 index fcfb39befd841c0ef8db7472e41fe17a39492f21..0000000000000000000000000000000000000000 --- a/tools/gyp/test/home_dot_gyp/home/.gyp/include.gypi +++ /dev/null @@ -1,5 +0,0 @@ -{ - 'variables': { - 'foo': '"fromhome"', - }, -} diff --git a/tools/gyp/test/home_dot_gyp/home2/.gyp/include.gypi b/tools/gyp/test/home_dot_gyp/home2/.gyp/include.gypi deleted file mode 100644 index f0d84b31ad50a4e7bb2d3e28367c722f554650b3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/home_dot_gyp/home2/.gyp/include.gypi +++ /dev/null @@ -1,5 +0,0 @@ -{ - 'variables': { - 'foo': '"fromhome2"', - }, -} diff --git a/tools/gyp/test/home_dot_gyp/home2/.gyp_new/include.gypi b/tools/gyp/test/home_dot_gyp/home2/.gyp_new/include.gypi deleted file mode 100644 index 4094dfd2f8f946e93884addf348d5dc652165d1c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/home_dot_gyp/home2/.gyp_new/include.gypi +++ /dev/null @@ -1,5 +0,0 @@ -{ - 'variables': { - 'foo': '"fromhome3"', - }, -} diff --git a/tools/gyp/test/home_dot_gyp/src/all.gyp b/tools/gyp/test/home_dot_gyp/src/all.gyp deleted file mode 100644 index 09d4e11cdced52abf6a1f55e15c9a31979b777b7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/home_dot_gyp/src/all.gyp +++ /dev/null @@ -1,21 +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. - -{ - 'variables': { - 'foo%': '"fromdefault"', - }, - 'targets': [ - { - 'target_name': 'printfoo', - 'type': 'executable', - 'sources': [ - 'printfoo.c', - ], - 'defines': [ - 'FOO=<(foo)', - ], - }, - ], -} diff --git a/tools/gyp/test/home_dot_gyp/src/printfoo.c b/tools/gyp/test/home_dot_gyp/src/printfoo.c deleted file mode 100644 index 9bb67181b99a080cd0a784b868ab2a6ca8d6b9ab..0000000000000000000000000000000000000000 --- a/tools/gyp/test/home_dot_gyp/src/printfoo.c +++ /dev/null @@ -1,7 +0,0 @@ -#include - -int main(void) -{ - printf("FOO is %s\n", FOO); - return 0; -} diff --git a/tools/gyp/test/include_dirs/gyptest-all.py b/tools/gyp/test/include_dirs/gyptest-all.py deleted file mode 100755 index d64bc6a9cadb9f1b8d678c94312003856c3e0966..0000000000000000000000000000000000000000 --- a/tools/gyp/test/include_dirs/gyptest-all.py +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies use of include_dirs when using an explicit build target of 'all'. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('includes.gyp', chdir='src') - -test.relocate('src', 'relocate/src') - -test.build('includes.gyp', test.ALL, chdir='relocate/src') - -expect = """\ -Hello from includes.c -Hello from inc.h -Hello from include1.h -Hello from subdir/inc2/include2.h -Hello from shadow2/shadow.h -""" -test.run_built_executable('includes', stdout=expect, chdir='relocate/src') - -if test.format == 'xcode': - chdir='relocate/src/subdir' -else: - chdir='relocate/src' - -expect = """\ -Hello from subdir/subdir_includes.c -Hello from subdir/inc.h -Hello from include1.h -Hello from subdir/inc2/include2.h -""" -test.run_built_executable('subdir_includes', stdout=expect, chdir=chdir) - -test.pass_test() diff --git a/tools/gyp/test/include_dirs/gyptest-default.py b/tools/gyp/test/include_dirs/gyptest-default.py deleted file mode 100755 index fc6141587e10be1573c886d8561470ecf46a45a0..0000000000000000000000000000000000000000 --- a/tools/gyp/test/include_dirs/gyptest-default.py +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies use of include_dirs when using the default build target. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('includes.gyp', chdir='src') - -test.relocate('src', 'relocate/src') - -test.build('includes.gyp', test.ALL, chdir='relocate/src') - -expect = """\ -Hello from includes.c -Hello from inc.h -Hello from include1.h -Hello from subdir/inc2/include2.h -Hello from shadow2/shadow.h -""" -test.run_built_executable('includes', stdout=expect, chdir='relocate/src') - -if test.format == 'xcode': - chdir='relocate/src/subdir' -else: - chdir='relocate/src' - -expect = """\ -Hello from subdir/subdir_includes.c -Hello from subdir/inc.h -Hello from include1.h -Hello from subdir/inc2/include2.h -""" -test.run_built_executable('subdir_includes', stdout=expect, chdir=chdir) - -test.pass_test() diff --git a/tools/gyp/test/include_dirs/src/inc.h b/tools/gyp/test/include_dirs/src/inc.h deleted file mode 100644 index 0398d6915f9a72c53660344683e10f19a7c45ad9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/include_dirs/src/inc.h +++ /dev/null @@ -1 +0,0 @@ -#define INC_STRING "inc.h" diff --git a/tools/gyp/test/include_dirs/src/inc1/include1.h b/tools/gyp/test/include_dirs/src/inc1/include1.h deleted file mode 100644 index 43356b5f47a57c7730945c17422ec92e1c9dc4a5..0000000000000000000000000000000000000000 --- a/tools/gyp/test/include_dirs/src/inc1/include1.h +++ /dev/null @@ -1 +0,0 @@ -#define INCLUDE1_STRING "include1.h" diff --git a/tools/gyp/test/include_dirs/src/includes.c b/tools/gyp/test/include_dirs/src/includes.c deleted file mode 100644 index 6e2a23cdffcd1dbdd2d29e24d5350bd0ff2344fc..0000000000000000000000000000000000000000 --- a/tools/gyp/test/include_dirs/src/includes.c +++ /dev/null @@ -1,19 +0,0 @@ -#include - -#include "inc.h" -#include "include1.h" -#include "include2.h" -#include "shadow.h" - -int main(void) -{ - printf("Hello from includes.c\n"); - printf("Hello from %s\n", INC_STRING); - printf("Hello from %s\n", INCLUDE1_STRING); - printf("Hello from %s\n", INCLUDE2_STRING); - /* Test that include_dirs happen first: The gyp file has a -Ishadow1 - cflag and an include_dir of shadow2. Including shadow.h should get - the shadow.h from the include_dir. */ - printf("Hello from %s\n", SHADOW_STRING); - return 0; -} diff --git a/tools/gyp/test/include_dirs/src/includes.gyp b/tools/gyp/test/include_dirs/src/includes.gyp deleted file mode 100644 index 3592690208aad2c457dfeeab8a4119e07515a27a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/include_dirs/src/includes.gyp +++ /dev/null @@ -1,27 +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': 'includes', - 'type': 'executable', - 'dependencies': [ - 'subdir/subdir_includes.gyp:subdir_includes', - ], - 'cflags': [ - '-Ishadow1', - ], - 'include_dirs': [ - '.', - 'inc1', - 'shadow2', - 'subdir/inc2', - ], - 'sources': [ - 'includes.c', - ], - }, - ], -} diff --git a/tools/gyp/test/include_dirs/src/shadow1/shadow.h b/tools/gyp/test/include_dirs/src/shadow1/shadow.h deleted file mode 100644 index 80f6de20b86c755dff4f9b93817736d26e7c1cff..0000000000000000000000000000000000000000 --- a/tools/gyp/test/include_dirs/src/shadow1/shadow.h +++ /dev/null @@ -1 +0,0 @@ -#define SHADOW_STRING "shadow1/shadow.h" diff --git a/tools/gyp/test/include_dirs/src/shadow2/shadow.h b/tools/gyp/test/include_dirs/src/shadow2/shadow.h deleted file mode 100644 index fad5ccd0856154521e50f0173d4d806795356ba2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/include_dirs/src/shadow2/shadow.h +++ /dev/null @@ -1 +0,0 @@ -#define SHADOW_STRING "shadow2/shadow.h" diff --git a/tools/gyp/test/include_dirs/src/subdir/inc.h b/tools/gyp/test/include_dirs/src/subdir/inc.h deleted file mode 100644 index 0a68d7b36ad71eae1844eee353206fc3ecf9c52a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/include_dirs/src/subdir/inc.h +++ /dev/null @@ -1 +0,0 @@ -#define INC_STRING "subdir/inc.h" diff --git a/tools/gyp/test/include_dirs/src/subdir/inc2/include2.h b/tools/gyp/test/include_dirs/src/subdir/inc2/include2.h deleted file mode 100644 index 721577effbdffd485c60629b31ac4516ca5cf642..0000000000000000000000000000000000000000 --- a/tools/gyp/test/include_dirs/src/subdir/inc2/include2.h +++ /dev/null @@ -1 +0,0 @@ -#define INCLUDE2_STRING "subdir/inc2/include2.h" diff --git a/tools/gyp/test/include_dirs/src/subdir/subdir_includes.c b/tools/gyp/test/include_dirs/src/subdir/subdir_includes.c deleted file mode 100644 index 4623543c430bc5133e0f8f02ac5706b22887e394..0000000000000000000000000000000000000000 --- a/tools/gyp/test/include_dirs/src/subdir/subdir_includes.c +++ /dev/null @@ -1,14 +0,0 @@ -#include - -#include "inc.h" -#include "include1.h" -#include "include2.h" - -int main(void) -{ - printf("Hello from subdir/subdir_includes.c\n"); - printf("Hello from %s\n", INC_STRING); - printf("Hello from %s\n", INCLUDE1_STRING); - printf("Hello from %s\n", INCLUDE2_STRING); - return 0; -} diff --git a/tools/gyp/test/include_dirs/src/subdir/subdir_includes.gyp b/tools/gyp/test/include_dirs/src/subdir/subdir_includes.gyp deleted file mode 100644 index 257d052c3c920c276ea75036ce35a6dd5c5d02b8..0000000000000000000000000000000000000000 --- a/tools/gyp/test/include_dirs/src/subdir/subdir_includes.gyp +++ /dev/null @@ -1,20 +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': 'subdir_includes', - 'type': 'executable', - 'include_dirs': [ - '.', - '../inc1', - 'inc2', - ], - 'sources': [ - 'subdir_includes.c', - ], - }, - ], -} diff --git a/tools/gyp/test/intermediate_dir/gyptest-intermediate-dir.py b/tools/gyp/test/intermediate_dir/gyptest-intermediate-dir.py deleted file mode 100755 index bf4b91a2fcd93724d1f7525afcae8d43350cf26c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/intermediate_dir/gyptest-intermediate-dir.py +++ /dev/null @@ -1,44 +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. - -""" -Verifies that targets have independent INTERMEDIATE_DIRs. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('test.gyp', chdir='src') - -test.build('test.gyp', 'target1', chdir='src') -# Check stuff exists. -intermediate_file1 = test.read('src/outfile.txt') -test.must_contain(intermediate_file1, 'target1') - -shared_intermediate_file1 = test.read('src/shared_outfile.txt') -test.must_contain(shared_intermediate_file1, 'shared_target1') - -test.run_gyp('test2.gyp', chdir='src') - -# Force the shared intermediate to be rebuilt. -test.sleep() -test.touch('src/shared_infile.txt') -test.build('test2.gyp', 'target2', chdir='src') -# Check INTERMEDIATE_DIR file didn't get overwritten but SHARED_INTERMEDIATE_DIR -# file did. -intermediate_file2 = test.read('src/outfile.txt') -test.must_contain(intermediate_file1, 'target1') -test.must_contain(intermediate_file2, 'target2') - -shared_intermediate_file2 = test.read('src/shared_outfile.txt') -if shared_intermediate_file1 != shared_intermediate_file2: - test.fail_test(shared_intermediate_file1 + ' != ' + shared_intermediate_file2) - -test.must_contain(shared_intermediate_file1, 'shared_target2') -test.must_contain(shared_intermediate_file2, 'shared_target2') - -test.pass_test() diff --git a/tools/gyp/test/intermediate_dir/src/script.py b/tools/gyp/test/intermediate_dir/src/script.py deleted file mode 100755 index 7abc7ee14583d988d0d8eb40989053c70467510e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/intermediate_dir/src/script.py +++ /dev/null @@ -1,24 +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. - -# Takes 3 arguments. Writes the 1st argument to the file in the 2nd argument, -# and writes the absolute path to the file in the 2nd argument to the file in -# the 3rd argument. - -import os -import shlex -import sys - -if len(sys.argv) == 3 and ' ' in sys.argv[2]: - sys.argv[2], fourth = shlex.split(sys.argv[2].replace('\\', '\\\\')) - sys.argv.append(fourth) - -#print >>sys.stderr, sys.argv - -with open(sys.argv[2], 'w') as f: - f.write(sys.argv[1]) - -with open(sys.argv[3], 'w') as f: - f.write(os.path.abspath(sys.argv[2])) diff --git a/tools/gyp/test/intermediate_dir/src/shared_infile.txt b/tools/gyp/test/intermediate_dir/src/shared_infile.txt deleted file mode 100644 index e2aba15d040934a931fe56b493352549cc7388f1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/intermediate_dir/src/shared_infile.txt +++ /dev/null @@ -1 +0,0 @@ -dummy input diff --git a/tools/gyp/test/intermediate_dir/src/test.gyp b/tools/gyp/test/intermediate_dir/src/test.gyp deleted file mode 100644 index b61e7e8ea5834287ea78d9de71d7b4543cd9b436..0000000000000000000000000000000000000000 --- a/tools/gyp/test/intermediate_dir/src/test.gyp +++ /dev/null @@ -1,42 +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': 'target1', - 'type': 'none', - 'actions': [ - { - 'action_name': 'intermediate', - 'inputs': [], - 'outputs': [ - '<(INTERMEDIATE_DIR)/intermediate_out.txt', - 'outfile.txt', - ], - 'action': [ - 'python', 'script.py', 'target1', '<(_outputs)', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - { - 'action_name': 'shared_intermediate', - 'inputs': [ - 'shared_infile.txt', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/intermediate_out.txt', - 'shared_outfile.txt', - ], - 'action': [ - 'python', 'script.py', 'shared_target1', '<(_outputs)', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - ], - }, - ], -} diff --git a/tools/gyp/test/intermediate_dir/src/test2.gyp b/tools/gyp/test/intermediate_dir/src/test2.gyp deleted file mode 100644 index 41f5564663e5e1e180b6b34c739e240cc68719a6..0000000000000000000000000000000000000000 --- a/tools/gyp/test/intermediate_dir/src/test2.gyp +++ /dev/null @@ -1,42 +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': 'target2', - 'type': 'none', - 'actions': [ - { - 'action_name': 'intermediate', - 'inputs': [], - 'outputs': [ - '<(INTERMEDIATE_DIR)/intermediate_out.txt', - 'outfile.txt', - ], - 'action': [ - 'python', 'script.py', 'target2', '<(_outputs)', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - { - 'action_name': 'shared_intermediate', - 'inputs': [ - 'shared_infile.txt', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/intermediate_out.txt', - 'shared_outfile.txt', - ], - 'action': [ - 'python', 'script.py', 'shared_target2', '<(_outputs)', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - ], - }, - ], -} diff --git a/tools/gyp/test/ios/app-bundle/TestApp/English.lproj/InfoPlist-error.strings b/tools/gyp/test/ios/app-bundle/TestApp/English.lproj/InfoPlist-error.strings deleted file mode 100644 index 452e7fabf9dc84a983768c28d1d5d0869e13f979..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/app-bundle/TestApp/English.lproj/InfoPlist-error.strings +++ /dev/null @@ -1,3 +0,0 @@ -/* Localized versions of Info.plist keys */ - -NSHumanReadableCopyright = "Copyright ©2011 Google Inc." diff --git a/tools/gyp/test/ios/app-bundle/TestApp/English.lproj/InfoPlist.strings b/tools/gyp/test/ios/app-bundle/TestApp/English.lproj/InfoPlist.strings deleted file mode 100644 index 35bd33a96e6a305910a5e716c158adc3e1b013c0..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/app-bundle/TestApp/English.lproj/InfoPlist.strings +++ /dev/null @@ -1,3 +0,0 @@ -/* Localized versions of Info.plist keys */ - -NSHumanReadableCopyright = "Copyright ©2011 Google Inc."; diff --git a/tools/gyp/test/ios/app-bundle/TestApp/English.lproj/MainMenu.xib b/tools/gyp/test/ios/app-bundle/TestApp/English.lproj/MainMenu.xib deleted file mode 100644 index 4524596787a8bde088b943a6eb0f9b3be220915f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/app-bundle/TestApp/English.lproj/MainMenu.xib +++ /dev/null @@ -1,4119 +0,0 @@ - - - - 1060 - 10A324 - 719 - 1015 - 418.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 719 - - - YES - - - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - - YES - - YES - - - YES - - - - YES - - NSApplication - - - FirstResponder - - - NSApplication - - - AMainMenu - - YES - - - TestApp - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - TestApp - - YES - - - About TestApp - - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Preferences… - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Services - - 1048576 - 2147483647 - - - submenuAction: - - Services - - YES - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Hide TestApp - h - 1048576 - 2147483647 - - - - - - Hide Others - h - 1572864 - 2147483647 - - - - - - Show All - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Quit TestApp - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - File - - 1048576 - 2147483647 - - - submenuAction: - - File - - YES - - - New - n - 1048576 - 2147483647 - - - - - - Open… - o - 1048576 - 2147483647 - - - - - - Open Recent - - 1048576 - 2147483647 - - - submenuAction: - - Open Recent - - YES - - - Clear Menu - - 1048576 - 2147483647 - - - - - _NSRecentDocumentsMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Close - w - 1048576 - 2147483647 - - - - - - Save - s - 1048576 - 2147483647 - - - - - - Save As… - S - 1179648 - 2147483647 - - - - - - Revert to Saved - - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Page Setup... - P - 1179648 - 2147483647 - - - - - - - Print… - p - 1048576 - 2147483647 - - - - - - - - - Edit - - 1048576 - 2147483647 - - - submenuAction: - - Edit - - YES - - - Undo - z - 1048576 - 2147483647 - - - - - - Redo - Z - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Cut - x - 1048576 - 2147483647 - - - - - - Copy - c - 1048576 - 2147483647 - - - - - - Paste - v - 1048576 - 2147483647 - - - - - - Paste and Match Style - V - 1572864 - 2147483647 - - - - - - Delete - - 1048576 - 2147483647 - - - - - - Select All - a - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Find - - 1048576 - 2147483647 - - - submenuAction: - - Find - - YES - - - Find… - f - 1048576 - 2147483647 - - - 1 - - - - Find Next - g - 1048576 - 2147483647 - - - 2 - - - - Find Previous - G - 1179648 - 2147483647 - - - 3 - - - - Use Selection for Find - e - 1048576 - 2147483647 - - - 7 - - - - Jump to Selection - j - 1048576 - 2147483647 - - - - - - - - - Spelling and Grammar - - 1048576 - 2147483647 - - - submenuAction: - - Spelling and Grammar - - YES - - - Show Spelling and Grammar - : - 1048576 - 2147483647 - - - - - - Check Document Now - ; - 1048576 - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Check Spelling While Typing - - 1048576 - 2147483647 - - - - - - Check Grammar With Spelling - - 1048576 - 2147483647 - - - - - - Correct Spelling Automatically - - 2147483647 - - - - - - - - - Substitutions - - 1048576 - 2147483647 - - - submenuAction: - - Substitutions - - YES - - - Show Substitutions - - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Smart Copy/Paste - f - 1048576 - 2147483647 - - - 1 - - - - Smart Quotes - g - 1048576 - 2147483647 - - - 2 - - - - Smart Dashes - - 2147483647 - - - - - - Smart Links - G - 1179648 - 2147483647 - - - 3 - - - - Text Replacement - - 2147483647 - - - - - - - - - Transformations - - 2147483647 - - - submenuAction: - - Transformations - - YES - - - Make Upper Case - - 2147483647 - - - - - - Make Lower Case - - 2147483647 - - - - - - Capitalize - - 2147483647 - - - - - - - - - Speech - - 1048576 - 2147483647 - - - submenuAction: - - Speech - - YES - - - Start Speaking - - 1048576 - 2147483647 - - - - - - Stop Speaking - - 1048576 - 2147483647 - - - - - - - - - - - - Format - - 2147483647 - - - submenuAction: - - Format - - YES - - - Font - - 2147483647 - - - submenuAction: - - Font - - YES - - - Show Fonts - t - 1048576 - 2147483647 - - - - - - Bold - b - 1048576 - 2147483647 - - - 2 - - - - Italic - i - 1048576 - 2147483647 - - - 1 - - - - Underline - u - 1048576 - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Bigger - + - 1048576 - 2147483647 - - - 3 - - - - Smaller - - - 1048576 - 2147483647 - - - 4 - - - - YES - YES - - - 2147483647 - - - - - - Kern - - 2147483647 - - - submenuAction: - - Kern - - YES - - - Use Default - - 2147483647 - - - - - - Use None - - 2147483647 - - - - - - Tighten - - 2147483647 - - - - - - Loosen - - 2147483647 - - - - - - - - - Ligature - - 2147483647 - - - submenuAction: - - Ligature - - YES - - - Use Default - - 2147483647 - - - - - - Use None - - 2147483647 - - - - - - Use All - - 2147483647 - - - - - - - - - Baseline - - 2147483647 - - - submenuAction: - - Baseline - - YES - - - Use Default - - 2147483647 - - - - - - Superscript - - 2147483647 - - - - - - Subscript - - 2147483647 - - - - - - Raise - - 2147483647 - - - - - - Lower - - 2147483647 - - - - - - - - - YES - YES - - - 2147483647 - - - - - - Show Colors - C - 1048576 - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Copy Style - c - 1572864 - 2147483647 - - - - - - Paste Style - v - 1572864 - 2147483647 - - - - - _NSFontMenu - - - - - Text - - 2147483647 - - - submenuAction: - - Text - - YES - - - Align Left - { - 1048576 - 2147483647 - - - - - - Center - | - 1048576 - 2147483647 - - - - - - Justify - - 2147483647 - - - - - - Align Right - } - 1048576 - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Writing Direction - - 2147483647 - - - submenuAction: - - Writing Direction - - YES - - - YES - Paragraph - - 2147483647 - - - - - - CURlZmF1bHQ - - 2147483647 - - - - - - CUxlZnQgdG8gUmlnaHQ - - 2147483647 - - - - - - CVJpZ2h0IHRvIExlZnQ - - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - YES - Selection - - 2147483647 - - - - - - CURlZmF1bHQ - - 2147483647 - - - - - - CUxlZnQgdG8gUmlnaHQ - - 2147483647 - - - - - - CVJpZ2h0IHRvIExlZnQ - - 2147483647 - - - - - - - - - YES - YES - - - 2147483647 - - - - - - Show Ruler - - 2147483647 - - - - - - Copy Ruler - c - 1310720 - 2147483647 - - - - - - Paste Ruler - v - 1310720 - 2147483647 - - - - - - - - - - - - View - - 1048576 - 2147483647 - - - submenuAction: - - View - - YES - - - Show Toolbar - t - 1572864 - 2147483647 - - - - - - Customize Toolbar… - - 1048576 - 2147483647 - - - - - - - - - Window - - 1048576 - 2147483647 - - - submenuAction: - - Window - - YES - - - Minimize - m - 1048576 - 2147483647 - - - - - - Zoom - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Bring All to Front - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Help - - 2147483647 - - - submenuAction: - - Help - - YES - - - TestApp Help - ? - 1048576 - 2147483647 - - - - - _NSHelpMenu - - - - _NSMainMenu - - - 15 - 2 - {{335, 390}, {480, 360}} - 1954021376 - TestApp - NSWindow - - {1.79769e+308, 1.79769e+308} - - - 256 - {480, 360} - - - {{0, 0}, {1920, 1178}} - {1.79769e+308, 1.79769e+308} - - - TestAppAppDelegate - - - NSFontManager - - - - - YES - - - performMiniaturize: - - - - 37 - - - - arrangeInFront: - - - - 39 - - - - print: - - - - 86 - - - - runPageLayout: - - - - 87 - - - - clearRecentDocuments: - - - - 127 - - - - orderFrontStandardAboutPanel: - - - - 142 - - - - performClose: - - - - 193 - - - - toggleContinuousSpellChecking: - - - - 222 - - - - undo: - - - - 223 - - - - copy: - - - - 224 - - - - checkSpelling: - - - - 225 - - - - paste: - - - - 226 - - - - stopSpeaking: - - - - 227 - - - - cut: - - - - 228 - - - - showGuessPanel: - - - - 230 - - - - redo: - - - - 231 - - - - selectAll: - - - - 232 - - - - startSpeaking: - - - - 233 - - - - delete: - - - - 235 - - - - performZoom: - - - - 240 - - - - performFindPanelAction: - - - - 241 - - - - centerSelectionInVisibleArea: - - - - 245 - - - - toggleGrammarChecking: - - - - 347 - - - - toggleSmartInsertDelete: - - - - 355 - - - - toggleAutomaticQuoteSubstitution: - - - - 356 - - - - toggleAutomaticLinkDetection: - - - - 357 - - - - saveDocument: - - - - 362 - - - - saveDocumentAs: - - - - 363 - - - - revertDocumentToSaved: - - - - 364 - - - - runToolbarCustomizationPalette: - - - - 365 - - - - toggleToolbarShown: - - - - 366 - - - - hide: - - - - 367 - - - - hideOtherApplications: - - - - 368 - - - - unhideAllApplications: - - - - 370 - - - - newDocument: - - - - 373 - - - - openDocument: - - - - 374 - - - - addFontTrait: - - - - 421 - - - - addFontTrait: - - - - 422 - - - - modifyFont: - - - - 423 - - - - orderFrontFontPanel: - - - - 424 - - - - modifyFont: - - - - 425 - - - - raiseBaseline: - - - - 426 - - - - lowerBaseline: - - - - 427 - - - - copyFont: - - - - 428 - - - - subscript: - - - - 429 - - - - superscript: - - - - 430 - - - - tightenKerning: - - - - 431 - - - - underline: - - - - 432 - - - - orderFrontColorPanel: - - - - 433 - - - - useAllLigatures: - - - - 434 - - - - loosenKerning: - - - - 435 - - - - pasteFont: - - - - 436 - - - - unscript: - - - - 437 - - - - useStandardKerning: - - - - 438 - - - - useStandardLigatures: - - - - 439 - - - - turnOffLigatures: - - - - 440 - - - - turnOffKerning: - - - - 441 - - - - terminate: - - - - 449 - - - - toggleAutomaticSpellingCorrection: - - - - 456 - - - - orderFrontSubstitutionsPanel: - - - - 458 - - - - toggleAutomaticDashSubstitution: - - - - 461 - - - - toggleAutomaticTextReplacement: - - - - 463 - - - - uppercaseWord: - - - - 464 - - - - capitalizeWord: - - - - 467 - - - - lowercaseWord: - - - - 468 - - - - pasteAsPlainText: - - - - 486 - - - - performFindPanelAction: - - - - 487 - - - - performFindPanelAction: - - - - 488 - - - - performFindPanelAction: - - - - 489 - - - - showHelp: - - - - 493 - - - - delegate - - - - 495 - - - - alignCenter: - - - - 518 - - - - pasteRuler: - - - - 519 - - - - toggleRuler: - - - - 520 - - - - alignRight: - - - - 521 - - - - copyRuler: - - - - 522 - - - - alignJustified: - - - - 523 - - - - alignLeft: - - - - 524 - - - - makeBaseWritingDirectionNatural: - - - - 525 - - - - makeBaseWritingDirectionLeftToRight: - - - - 526 - - - - makeBaseWritingDirectionRightToLeft: - - - - 527 - - - - makeTextWritingDirectionNatural: - - - - 528 - - - - makeTextWritingDirectionLeftToRight: - - - - 529 - - - - makeTextWritingDirectionRightToLeft: - - - - 530 - - - - window - - - - 532 - - - - - YES - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - YES - - - - - - - - - - - - 19 - - - YES - - - - - - 56 - - - YES - - - - - - 217 - - - YES - - - - - - 83 - - - YES - - - - - - 81 - - - YES - - - - - - - - - - - - - - - - 75 - - - - - 80 - - - - - 78 - - - - - 72 - - - - - 82 - - - - - 124 - - - YES - - - - - - 77 - - - - - 73 - - - - - 79 - - - - - 112 - - - - - 74 - - - - - 125 - - - YES - - - - - - 126 - - - - - 205 - - - YES - - - - - - - - - - - - - - - - - - - - 202 - - - - - 198 - - - - - 207 - - - - - 214 - - - - - 199 - - - - - 203 - - - - - 197 - - - - - 206 - - - - - 215 - - - - - 218 - - - YES - - - - - - 216 - - - YES - - - - - - 200 - - - YES - - - - - - - - - - - 219 - - - - - 201 - - - - - 204 - - - - - 220 - - - YES - - - - - - - - - - 213 - - - - - 210 - - - - - 221 - - - - - 208 - - - - - 209 - - - - - 57 - - - YES - - - - - - - - - - - - - - - - 58 - - - - - 134 - - - - - 150 - - - - - 136 - - - - - 144 - - - - - 129 - - - - - 143 - - - - - 236 - - - - - 131 - - - YES - - - - - - 149 - - - - - 145 - - - - - 130 - - - - - 24 - - - YES - - - - - - - - - 92 - - - - - 5 - - - - - 239 - - - - - 23 - - - - - 295 - - - YES - - - - - - 296 - - - YES - - - - - - - 297 - - - - - 298 - - - - - 211 - - - YES - - - - - - 212 - - - YES - - - - - - - 195 - - - - - 196 - - - - - 346 - - - - - 348 - - - YES - - - - - - 349 - - - YES - - - - - - - - - - - - 350 - - - - - 351 - - - - - 354 - - - - - 371 - - - YES - - - - - - 372 - - - - - 375 - - - YES - - - - - - 376 - - - YES - - - - - - - 377 - - - YES - - - - - - 388 - - - YES - - - - - - - - - - - - - - - - - - - - - 389 - - - - - 390 - - - - - 391 - - - - - 392 - - - - - 393 - - - - - 394 - - - - - 395 - - - - - 396 - - - - - 397 - - - YES - - - - - - 398 - - - YES - - - - - - 399 - - - YES - - - - - - 400 - - - - - 401 - - - - - 402 - - - - - 403 - - - - - 404 - - - - - 405 - - - YES - - - - - - - - - - 406 - - - - - 407 - - - - - 408 - - - - - 409 - - - - - 410 - - - - - 411 - - - YES - - - - - - - - 412 - - - - - 413 - - - - - 414 - - - - - 415 - - - YES - - - - - - - - - 416 - - - - - 417 - - - - - 418 - - - - - 419 - - - - - 420 - - - - - 450 - - - YES - - - - - - 451 - - - YES - - - - - - - - 452 - - - - - 453 - - - - - 454 - - - - - 457 - - - - - 459 - - - - - 460 - - - - - 462 - - - - - 465 - - - - - 466 - - - - - 485 - - - - - 490 - - - YES - - - - - - 491 - - - YES - - - - - - 492 - - - - - 494 - - - - - 496 - - - YES - - - - - - 497 - - - YES - - - - - - - - - - - - - - - 498 - - - - - 499 - - - - - 500 - - - - - 501 - - - - - 502 - - - - - 503 - - - YES - - - - - - 504 - - - - - 505 - - - - - 506 - - - - - 507 - - - - - 508 - - - YES - - - - - - - - - - - - - - 509 - - - - - 510 - - - - - 511 - - - - - 512 - - - - - 513 - - - - - 514 - - - - - 515 - - - - - 516 - - - - - 517 - - - - - - - YES - - YES - -3.IBPluginDependency - 112.IBPluginDependency - 112.ImportedFromIB2 - 124.IBPluginDependency - 124.ImportedFromIB2 - 125.IBPluginDependency - 125.ImportedFromIB2 - 125.editorWindowContentRectSynchronizationRect - 126.IBPluginDependency - 126.ImportedFromIB2 - 129.IBPluginDependency - 129.ImportedFromIB2 - 130.IBPluginDependency - 130.ImportedFromIB2 - 130.editorWindowContentRectSynchronizationRect - 131.IBPluginDependency - 131.ImportedFromIB2 - 134.IBPluginDependency - 134.ImportedFromIB2 - 136.IBPluginDependency - 136.ImportedFromIB2 - 143.IBPluginDependency - 143.ImportedFromIB2 - 144.IBPluginDependency - 144.ImportedFromIB2 - 145.IBPluginDependency - 145.ImportedFromIB2 - 149.IBPluginDependency - 149.ImportedFromIB2 - 150.IBPluginDependency - 150.ImportedFromIB2 - 19.IBPluginDependency - 19.ImportedFromIB2 - 195.IBPluginDependency - 195.ImportedFromIB2 - 196.IBPluginDependency - 196.ImportedFromIB2 - 197.IBPluginDependency - 197.ImportedFromIB2 - 198.IBPluginDependency - 198.ImportedFromIB2 - 199.IBPluginDependency - 199.ImportedFromIB2 - 200.IBEditorWindowLastContentRect - 200.IBPluginDependency - 200.ImportedFromIB2 - 200.editorWindowContentRectSynchronizationRect - 201.IBPluginDependency - 201.ImportedFromIB2 - 202.IBPluginDependency - 202.ImportedFromIB2 - 203.IBPluginDependency - 203.ImportedFromIB2 - 204.IBPluginDependency - 204.ImportedFromIB2 - 205.IBEditorWindowLastContentRect - 205.IBPluginDependency - 205.ImportedFromIB2 - 205.editorWindowContentRectSynchronizationRect - 206.IBPluginDependency - 206.ImportedFromIB2 - 207.IBPluginDependency - 207.ImportedFromIB2 - 208.IBPluginDependency - 208.ImportedFromIB2 - 209.IBPluginDependency - 209.ImportedFromIB2 - 210.IBPluginDependency - 210.ImportedFromIB2 - 211.IBPluginDependency - 211.ImportedFromIB2 - 212.IBPluginDependency - 212.ImportedFromIB2 - 212.editorWindowContentRectSynchronizationRect - 213.IBPluginDependency - 213.ImportedFromIB2 - 214.IBPluginDependency - 214.ImportedFromIB2 - 215.IBPluginDependency - 215.ImportedFromIB2 - 216.IBPluginDependency - 216.ImportedFromIB2 - 217.IBPluginDependency - 217.ImportedFromIB2 - 218.IBPluginDependency - 218.ImportedFromIB2 - 219.IBPluginDependency - 219.ImportedFromIB2 - 220.IBEditorWindowLastContentRect - 220.IBPluginDependency - 220.ImportedFromIB2 - 220.editorWindowContentRectSynchronizationRect - 221.IBPluginDependency - 221.ImportedFromIB2 - 23.IBPluginDependency - 23.ImportedFromIB2 - 236.IBPluginDependency - 236.ImportedFromIB2 - 239.IBPluginDependency - 239.ImportedFromIB2 - 24.IBEditorWindowLastContentRect - 24.IBPluginDependency - 24.ImportedFromIB2 - 24.editorWindowContentRectSynchronizationRect - 29.IBEditorWindowLastContentRect - 29.IBPluginDependency - 29.ImportedFromIB2 - 29.WindowOrigin - 29.editorWindowContentRectSynchronizationRect - 295.IBPluginDependency - 296.IBEditorWindowLastContentRect - 296.IBPluginDependency - 296.editorWindowContentRectSynchronizationRect - 297.IBPluginDependency - 298.IBPluginDependency - 346.IBPluginDependency - 346.ImportedFromIB2 - 348.IBPluginDependency - 348.ImportedFromIB2 - 349.IBEditorWindowLastContentRect - 349.IBPluginDependency - 349.ImportedFromIB2 - 349.editorWindowContentRectSynchronizationRect - 350.IBPluginDependency - 350.ImportedFromIB2 - 351.IBPluginDependency - 351.ImportedFromIB2 - 354.IBPluginDependency - 354.ImportedFromIB2 - 371.IBEditorWindowLastContentRect - 371.IBPluginDependency - 371.IBWindowTemplateEditedContentRect - 371.NSWindowTemplate.visibleAtLaunch - 371.editorWindowContentRectSynchronizationRect - 371.windowTemplate.maxSize - 372.IBPluginDependency - 375.IBPluginDependency - 376.IBEditorWindowLastContentRect - 376.IBPluginDependency - 377.IBPluginDependency - 388.IBEditorWindowLastContentRect - 388.IBPluginDependency - 389.IBPluginDependency - 390.IBPluginDependency - 391.IBPluginDependency - 392.IBPluginDependency - 393.IBPluginDependency - 394.IBPluginDependency - 395.IBPluginDependency - 396.IBPluginDependency - 397.IBPluginDependency - 398.IBPluginDependency - 399.IBPluginDependency - 400.IBPluginDependency - 401.IBPluginDependency - 402.IBPluginDependency - 403.IBPluginDependency - 404.IBPluginDependency - 405.IBPluginDependency - 406.IBPluginDependency - 407.IBPluginDependency - 408.IBPluginDependency - 409.IBPluginDependency - 410.IBPluginDependency - 411.IBPluginDependency - 412.IBPluginDependency - 413.IBPluginDependency - 414.IBPluginDependency - 415.IBPluginDependency - 416.IBPluginDependency - 417.IBPluginDependency - 418.IBPluginDependency - 419.IBPluginDependency - 450.IBPluginDependency - 451.IBEditorWindowLastContentRect - 451.IBPluginDependency - 452.IBPluginDependency - 453.IBPluginDependency - 454.IBPluginDependency - 457.IBPluginDependency - 459.IBPluginDependency - 460.IBPluginDependency - 462.IBPluginDependency - 465.IBPluginDependency - 466.IBPluginDependency - 485.IBPluginDependency - 490.IBPluginDependency - 491.IBEditorWindowLastContentRect - 491.IBPluginDependency - 492.IBPluginDependency - 496.IBPluginDependency - 497.IBEditorWindowLastContentRect - 497.IBPluginDependency - 498.IBPluginDependency - 499.IBPluginDependency - 5.IBPluginDependency - 5.ImportedFromIB2 - 500.IBPluginDependency - 501.IBPluginDependency - 502.IBPluginDependency - 503.IBPluginDependency - 504.IBPluginDependency - 505.IBPluginDependency - 506.IBPluginDependency - 507.IBPluginDependency - 508.IBEditorWindowLastContentRect - 508.IBPluginDependency - 509.IBPluginDependency - 510.IBPluginDependency - 511.IBPluginDependency - 512.IBPluginDependency - 513.IBPluginDependency - 514.IBPluginDependency - 515.IBPluginDependency - 516.IBPluginDependency - 517.IBPluginDependency - 56.IBPluginDependency - 56.ImportedFromIB2 - 57.IBEditorWindowLastContentRect - 57.IBPluginDependency - 57.ImportedFromIB2 - 57.editorWindowContentRectSynchronizationRect - 58.IBPluginDependency - 58.ImportedFromIB2 - 72.IBPluginDependency - 72.ImportedFromIB2 - 73.IBPluginDependency - 73.ImportedFromIB2 - 74.IBPluginDependency - 74.ImportedFromIB2 - 75.IBPluginDependency - 75.ImportedFromIB2 - 77.IBPluginDependency - 77.ImportedFromIB2 - 78.IBPluginDependency - 78.ImportedFromIB2 - 79.IBPluginDependency - 79.ImportedFromIB2 - 80.IBPluginDependency - 80.ImportedFromIB2 - 81.IBEditorWindowLastContentRect - 81.IBPluginDependency - 81.ImportedFromIB2 - 81.editorWindowContentRectSynchronizationRect - 82.IBPluginDependency - 82.ImportedFromIB2 - 83.IBPluginDependency - 83.ImportedFromIB2 - 92.IBPluginDependency - 92.ImportedFromIB2 - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{522, 812}, {146, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{436, 809}, {64, 6}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{753, 187}, {275, 113}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{608, 612}, {275, 83}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{547, 180}, {254, 283}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{187, 434}, {243, 243}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{608, 612}, {167, 43}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{753, 217}, {238, 103}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{608, 612}, {241, 103}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{654, 239}, {194, 73}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{525, 802}, {197, 73}} - {{380, 836}, {512, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {74, 862} - {{6, 978}, {478, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - {{604, 269}, {231, 43}} - com.apple.InterfaceBuilder.CocoaPlugin - {{475, 832}, {234, 43}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{746, 287}, {220, 133}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{608, 612}, {215, 63}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{380, 496}, {480, 360}} - com.apple.InterfaceBuilder.CocoaPlugin - {{380, 496}, {480, 360}} - - {{33, 99}, {480, 360}} - {3.40282e+38, 3.40282e+38} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{591, 420}, {83, 43}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{523, 2}, {178, 283}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{753, 197}, {170, 63}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{725, 289}, {246, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{674, 260}, {204, 183}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{878, 180}, {164, 173}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - {{286, 129}, {275, 183}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{23, 794}, {245, 183}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{452, 109}, {196, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{145, 474}, {199, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - YES - - - YES - - - - - YES - - - YES - - - - 532 - - - - YES - - TestAppAppDelegate - NSObject - - window - NSWindow - - - IBProjectSource - TestAppAppDelegate.h - - - - - YES - - NSApplication - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSApplication.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSApplicationScripting.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSColorPanel.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSHelpManager.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSPageLayout.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSUserInterfaceItemSearching.h - - - - NSBrowser - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSBrowser.h - - - - NSControl - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSControl.h - - - - NSDocument - NSObject - - YES - - YES - printDocument: - revertDocumentToSaved: - runPageLayout: - saveDocument: - saveDocumentAs: - saveDocumentTo: - - - YES - id - id - id - id - id - id - - - - IBFrameworkSource - AppKit.framework/Headers/NSDocument.h - - - - NSDocument - - IBFrameworkSource - AppKit.framework/Headers/NSDocumentScripting.h - - - - NSDocumentController - NSObject - - YES - - YES - clearRecentDocuments: - newDocument: - openDocument: - saveAllDocuments: - - - YES - id - id - id - id - - - - IBFrameworkSource - AppKit.framework/Headers/NSDocumentController.h - - - - NSFontManager - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontManager.h - - - - NSFormatter - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFormatter.h - - - - NSMatrix - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSMatrix.h - - - - NSMenu - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSMenu.h - - - - NSMenuItem - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSMenuItem.h - - - - NSMovieView - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSMovieView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSAccessibility.h - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDictionaryController.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDragging.h - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontPanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSKeyValueBinding.h - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSNibLoading.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSOutlineView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSPasteboard.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSSavePanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSTableView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSToolbarItem.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSView.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObjectScripting.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSPortCoder.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptObjectSpecifiers.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptWhoseTests.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLDownload.h - - - - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSInterfaceStyle.h - - - - NSResponder - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSResponder.h - - - - NSTableView - NSControl - - - - NSText - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSText.h - - - - NSTextView - NSText - - IBFrameworkSource - AppKit.framework/Headers/NSTextView.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSClipView.h - - - - NSView - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSRulerView.h - - - - NSView - NSResponder - - - - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSDrawer.h - - - - NSWindow - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSWindow.h - - - - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSWindowScripting.h - - - - - 0 - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - ../TestApp.xcodeproj - 3 - - diff --git a/tools/gyp/test/ios/app-bundle/TestApp/English.lproj/Main_iPhone.storyboard b/tools/gyp/test/ios/app-bundle/TestApp/English.lproj/Main_iPhone.storyboard deleted file mode 100644 index 723bc851227aac16d3d55ac66eb776c8ca2c94fe..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/app-bundle/TestApp/English.lproj/Main_iPhone.storyboard +++ /dev/null @@ -1,27 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tools/gyp/test/ios/app-bundle/TestApp/Images.xcassets/AppIcon.appiconset/Contents.json b/tools/gyp/test/ios/app-bundle/TestApp/Images.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 2db2b1c7c6c316500a7a34807648434289494ba1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/app-bundle/TestApp/Images.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "size" : "16x16", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "16x16", - "scale" : "2x" - }, - { - "idiom" : "mac", - "size" : "32x32", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "32x32", - "scale" : "2x" - }, - { - "idiom" : "mac", - "size" : "128x128", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "128x128", - "scale" : "2x" - }, - { - "idiom" : "mac", - "size" : "256x256", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "256x256", - "scale" : "2x" - }, - { - "idiom" : "mac", - "size" : "512x512", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "512x512", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/tools/gyp/test/ios/app-bundle/TestApp/Images.xcassets/image.imageset/Contents.json b/tools/gyp/test/ios/app-bundle/TestApp/Images.xcassets/image.imageset/Contents.json deleted file mode 100644 index 0a87b6edc67517d95ef8080c415bf62a6e55b1b8..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/app-bundle/TestApp/Images.xcassets/image.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "super_sylvain.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "super_sylvain@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x", - "filename" : "super_sylvain@3x.png" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/tools/gyp/test/ios/app-bundle/TestApp/Images.xcassets/image.imageset/super_sylvain.png b/tools/gyp/test/ios/app-bundle/TestApp/Images.xcassets/image.imageset/super_sylvain.png deleted file mode 100644 index 0ba769182f117a972f76280a19bd69d6e81b68f7..0000000000000000000000000000000000000000 Binary files a/tools/gyp/test/ios/app-bundle/TestApp/Images.xcassets/image.imageset/super_sylvain.png and /dev/null differ diff --git a/tools/gyp/test/ios/app-bundle/TestApp/Images.xcassets/image.imageset/super_sylvain@2x.png b/tools/gyp/test/ios/app-bundle/TestApp/Images.xcassets/image.imageset/super_sylvain@2x.png deleted file mode 100644 index edfa6a5682f108afb4d7f23ff53e6897a24959c5..0000000000000000000000000000000000000000 Binary files a/tools/gyp/test/ios/app-bundle/TestApp/Images.xcassets/image.imageset/super_sylvain@2x.png and /dev/null differ diff --git a/tools/gyp/test/ios/app-bundle/TestApp/Images.xcassets/image.imageset/super_sylvain@3x.png b/tools/gyp/test/ios/app-bundle/TestApp/Images.xcassets/image.imageset/super_sylvain@3x.png deleted file mode 100644 index e0652efc729dcf260f02468e2d49c635bfae9d42..0000000000000000000000000000000000000000 Binary files a/tools/gyp/test/ios/app-bundle/TestApp/Images.xcassets/image.imageset/super_sylvain@3x.png and /dev/null differ diff --git a/tools/gyp/test/ios/app-bundle/TestApp/TestApp-Info.plist b/tools/gyp/test/ios/app-bundle/TestApp/TestApp-Info.plist deleted file mode 100644 index 8cb142e9f5aa52091f9af7abb5eacc8cc6159de7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/app-bundle/TestApp/TestApp-Info.plist +++ /dev/null @@ -1,32 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - - CFBundleIdentifier - com.google.${PRODUCT_NAME} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ause - CFBundleVersion - 1 - LSMinimumSystemVersion - ${MACOSX_DEPLOYMENT_TARGET} - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - - diff --git a/tools/gyp/test/ios/app-bundle/TestApp/check_no_signature.py b/tools/gyp/test/ios/app-bundle/TestApp/check_no_signature.py deleted file mode 100644 index 4f6e340072130b0a313bf5af1a9c73173ed1b19b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/app-bundle/TestApp/check_no_signature.py +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/python - -import os -import subprocess -import sys - -p = os.path.join(os.environ['BUILT_PRODUCTS_DIR'],os.environ['EXECUTABLE_PATH']) -proc = subprocess.Popen(['codesign', '-v', p], - stderr=subprocess.STDOUT, stdout=subprocess.PIPE) -o = proc.communicate()[0].strip() -if "code object is not signed at all" not in o: - sys.stderr.write('File should not already be signed.') - sys.exit(1) diff --git a/tools/gyp/test/ios/app-bundle/TestApp/main.m b/tools/gyp/test/ios/app-bundle/TestApp/main.m deleted file mode 100644 index ec93e0e237a18ffa831c285a82981a4dab1d96f2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/app-bundle/TestApp/main.m +++ /dev/null @@ -1,13 +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. - -#import - -int main(int argc, char *argv[]) -{ - NSAutoreleasePool* pool = [[NSAutoreleasePool alloc] init]; - int retVal = UIApplicationMain(argc, argv, nil, nil); - [pool release]; - return retVal; -} diff --git a/tools/gyp/test/ios/app-bundle/TestApp/only-compile-in-32-bits.m b/tools/gyp/test/ios/app-bundle/TestApp/only-compile-in-32-bits.m deleted file mode 100644 index 28bb11778816063c92eea65666a5d75bdfd8a17b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/app-bundle/TestApp/only-compile-in-32-bits.m +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2013 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. - -#if defined(__LP64__) -# error 64-bit build -#endif diff --git a/tools/gyp/test/ios/app-bundle/TestApp/only-compile-in-64-bits.m b/tools/gyp/test/ios/app-bundle/TestApp/only-compile-in-64-bits.m deleted file mode 100644 index e6d255841875eb77bfd9b6fa7524899588406e11..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/app-bundle/TestApp/only-compile-in-64-bits.m +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2013 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. - -#if !defined(__LP64__) -# error 32-bit build -#endif diff --git a/tools/gyp/test/ios/app-bundle/test-archs.gyp b/tools/gyp/test/ios/app-bundle/test-archs.gyp deleted file mode 100644 index b1558c94becc80e9e539f597ce52e2bc61321987..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/app-bundle/test-archs.gyp +++ /dev/null @@ -1,110 +0,0 @@ -# Copyright (c) 2013 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. -{ - 'make_global_settings': [ - ['CC', '/usr/bin/clang'], - ], - 'target_defaults': { - 'product_extension': 'bundle', - 'mac_bundle_resources': [ - 'TestApp/English.lproj/InfoPlist.strings', - 'TestApp/English.lproj/MainMenu.xib', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', - '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', - ], - }, - 'xcode_settings': { - 'OTHER_CFLAGS': [ - '-fobjc-abi-version=2', - ], - 'CODE_SIGNING_REQUIRED': 'NO', - 'SDKROOT': 'iphonesimulator', # -isysroot - 'TARGETED_DEVICE_FAMILY': '1,2', - 'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist', - 'IPHONEOS_DEPLOYMENT_TARGET': '7.0', - 'CONFIGURATION_BUILD_DIR':'build/Default', - }, - }, - 'targets': [ - { - 'target_name': 'TestNoArchs', - 'product_name': 'TestNoArchs', - 'type': 'executable', - 'mac_bundle': 1, - 'sources': [ - 'TestApp/main.m', - 'TestApp/only-compile-in-32-bits.m', - ], - 'xcode_settings': { - 'VALID_ARCHS': [ - 'i386', - 'x86_64', - 'arm64', - 'armv7', - ], - } - }, - { - 'target_name': 'TestArch32Bits', - 'product_name': 'TestArch32Bits', - 'type': 'executable', - 'mac_bundle': 1, - 'sources': [ - 'TestApp/main.m', - 'TestApp/only-compile-in-32-bits.m', - ], - 'xcode_settings': { - 'ARCHS': [ - '$(ARCHS_STANDARD)', - ], - 'VALID_ARCHS': [ - 'i386', - 'armv7', - ], - }, - }, - { - 'target_name': 'TestArch64Bits', - 'product_name': 'TestArch64Bits', - 'type': 'executable', - 'mac_bundle': 1, - 'sources': [ - 'TestApp/main.m', - 'TestApp/only-compile-in-64-bits.m', - ], - 'xcode_settings': { - 'ARCHS': [ - '$(ARCHS_STANDARD_INCLUDING_64_BIT)', - ], - 'VALID_ARCHS': [ - 'x86_64', - 'arm64', - ], - }, - }, - { - 'target_name': 'TestMultiArchs', - 'product_name': 'TestMultiArchs', - 'type': 'executable', - 'mac_bundle': 1, - 'sources': [ - 'TestApp/main.m', - ], - 'xcode_settings': { - 'ARCHS': [ - '$(ARCHS_STANDARD_INCLUDING_64_BIT)', - ], - 'VALID_ARCHS': [ - 'x86_64', - 'i386', - 'arm64', - 'armv7', - ], - } - }, - ], -} diff --git a/tools/gyp/test/ios/app-bundle/test-assets-catalog.gyp b/tools/gyp/test/ios/app-bundle/test-assets-catalog.gyp deleted file mode 100644 index 9a12d07af7be9e4c34b7a6424defcc45631b4a41..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/app-bundle/test-assets-catalog.gyp +++ /dev/null @@ -1,45 +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. -{ - 'conditions': [ - ['"<(GENERATOR)"=="ninja"', { - 'make_global_settings': [ - ['CC', '/usr/bin/clang'], - ['CXX', '/usr/bin/clang++'], - ], - }], - ], - 'targets': [ - { - 'target_name': 'test_app', - 'product_name': 'Test App Assets Catalog Gyp', - 'type': 'executable', - 'mac_bundle': 1, - 'sources': [ - 'TestApp/main.m', - ], - 'mac_bundle_resources': [ - 'TestApp/English.lproj/InfoPlist.strings', - 'TestApp/English.lproj/MainMenu.xib', - 'TestApp/English.lproj/Main_iPhone.storyboard', - 'TestApp/Images.xcassets', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', - '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', - ], - }, - 'xcode_settings': { - 'OTHER_CFLAGS': [ - '-fobjc-abi-version=2', - ], - 'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist', - 'SDKROOT': 'iphonesimulator', # -isysroot - 'IPHONEOS_DEPLOYMENT_TARGET': '7.0', - 'CONFIGURATION_BUILD_DIR':'build/Default', - }, - }, - ], -} diff --git a/tools/gyp/test/ios/app-bundle/test-crosscompile.gyp b/tools/gyp/test/ios/app-bundle/test-crosscompile.gyp deleted file mode 100644 index d9049588ba3ec9340856d73e5d3334fece69b2a6..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/app-bundle/test-crosscompile.gyp +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright (c) 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. -{ - 'make_global_settings': [ - ['CC', '/usr/bin/clang'], - ], - 'targets': [ - # This target will not be built, but is here so that ninja Xcode emulation - # understand this is a multi-platform (ios + mac) build. - { - 'target_name': 'TestDummy', - 'product_name': 'TestDummy', - 'toolsets': ['target'], - 'type': 'executable', - 'mac_bundle': 1, - 'sources': [ - 'tool_main.cc', - ], - 'xcode_settings': { - 'SDKROOT': 'iphonesimulator', # -isysroot - 'TARGETED_DEVICE_FAMILY': '1,2', - 'IPHONEOS_DEPLOYMENT_TARGET': '7.0', - }, - }, - { - 'target_name': 'TestHost', - 'product_name': 'TestHost', - 'toolsets': ['host'], - 'type': 'executable', - 'mac_bundle': 0, - 'sources': [ - 'tool_main.cc', - ], - 'xcode_settings': { - 'SDKROOT': 'macosx', - 'ARCHS': [ - '$(ARCHS_STANDARD)', - 'x86_64', - ], - 'VALID_ARCHS': [ - 'x86_64', - ], - } - } - ], -} diff --git a/tools/gyp/test/ios/app-bundle/test-device.gyp b/tools/gyp/test/ios/app-bundle/test-device.gyp deleted file mode 100644 index 28cdbb3af58af33b5725c15e68de09e5409e2f69..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/app-bundle/test-device.gyp +++ /dev/null @@ -1,79 +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. -{ - 'make_global_settings': [ - ['CC', '/usr/bin/clang'], - ], - 'targets': [ - { - 'target_name': 'test_app', - 'product_name': 'Test App Gyp', - 'type': 'executable', - 'product_extension': 'bundle', - 'mac_bundle': 1, - 'sources': [ - 'TestApp/main.m', - ], - 'mac_bundle_resources': [ - 'TestApp/English.lproj/InfoPlist.strings', - 'TestApp/English.lproj/MainMenu.xib', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', - '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', - ], - }, - 'xcode_settings': { - 'OTHER_CFLAGS': [ - '-fobjc-abi-version=2', - ], - 'SDKROOT': 'iphonesimulator', # -isysroot - 'TARGETED_DEVICE_FAMILY': '1,2', - 'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist', - 'IPHONEOS_DEPLOYMENT_TARGET': '4.2', - 'CONFIGURATION_BUILD_DIR':'build/Default', - }, - }, - { - 'target_name': 'sig_test', - 'product_name': 'sig_test', - 'type': 'executable', - 'product_extension': 'bundle', - 'mac_bundle': 1, - 'sources': [ - 'TestApp/main.m', - ], - 'mac_bundle_resources': [ - 'TestApp/English.lproj/InfoPlist.strings', - 'TestApp/English.lproj/MainMenu.xib', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', - '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', - ], - }, - 'postbuilds': [ - { - 'postbuild_name': 'Verify no signature', - 'action': [ - 'python', - 'TestApp/check_no_signature.py' - ], - }, - ], - 'xcode_settings': { - 'OTHER_CFLAGS': [ - '-fobjc-abi-version=2', - ], - 'SDKROOT': 'iphonesimulator', # -isysroot - 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': 'iPhone Developer', - 'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist', - 'IPHONEOS_DEPLOYMENT_TARGET': '4.2', - 'CONFIGURATION_BUILD_DIR':'buildsig/Default', - }, - }, - ], -} diff --git a/tools/gyp/test/ios/app-bundle/test.gyp b/tools/gyp/test/ios/app-bundle/test.gyp deleted file mode 100644 index b60474df8a38b3cdb8e6676e57c704bbb770daf0..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/app-bundle/test.gyp +++ /dev/null @@ -1,74 +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. -{ - 'conditions': [ - ['"<(GENERATOR)"=="ninja"', { - 'make_global_settings': [ - ['CC', '/usr/bin/clang'], - ['CXX', '/usr/bin/clang++'], - ], - }], - ], - 'targets': [ - { - 'target_name': 'test_app', - 'product_name': 'Test App Gyp', - 'type': 'executable', - 'mac_bundle': 1, - 'sources': [ - 'TestApp/main.m', - ], - 'mac_bundle_resources': [ - 'TestApp/English.lproj/InfoPlist.strings', - 'TestApp/English.lproj/MainMenu.xib', - 'TestApp/English.lproj/Main_iPhone.storyboard', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', - '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', - ], - }, - 'xcode_settings': { - 'OTHER_CFLAGS': [ - '-fobjc-abi-version=2', - ], - 'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist', - 'SDKROOT': 'iphonesimulator', # -isysroot - 'IPHONEOS_DEPLOYMENT_TARGET': '5.0', - 'CONFIGURATION_BUILD_DIR':'build/Default', - }, - }, - { - 'target_name': 'test_app_xml', - 'product_name': 'Test App Gyp XML', - 'type': 'executable', - 'mac_bundle': 1, - 'sources': [ - 'TestApp/main.m', - ], - 'mac_bundle_resources': [ - 'TestApp/English.lproj/InfoPlist.strings', - 'TestApp/English.lproj/MainMenu.xib', - 'TestApp/English.lproj/Main_iPhone.storyboard', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', - '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', - ], - }, - 'xcode_settings': { - 'OTHER_CFLAGS': [ - '-fobjc-abi-version=2', - ], - 'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist', - 'INFOPLIST_OUTPUT_FORMAT':'xml', - 'SDKROOT': 'iphonesimulator', # -isysroot - 'IPHONEOS_DEPLOYMENT_TARGET': '5.0', - 'CONFIGURATION_BUILD_DIR':'build/Default', - }, - }, - ], -} diff --git a/tools/gyp/test/ios/app-bundle/tool_main.cc b/tools/gyp/test/ios/app-bundle/tool_main.cc deleted file mode 100644 index 9dc3c94f3431be00adb755f6515b995d734e089b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/app-bundle/tool_main.cc +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 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. - -int main() { - return 0; -} diff --git a/tools/gyp/test/ios/deployment-target/check-version-min.c b/tools/gyp/test/ios/deployment-target/check-version-min.c deleted file mode 100644 index 6b05a27f0aea0d24c21c22b6859fabdfb5e8ad7f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/deployment-target/check-version-min.c +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright (c) 2013 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. */ - -#include - -/* GYPTEST_MAC_VERSION_MIN: should be set to the corresponding value of - * xcode setting 'MACOSX_DEPLOYMENT_TARGET', otherwise both should be - * left undefined. - * - * GYPTEST_IOS_VERSION_MIN: should be set to the corresponding value of - * xcode setting 'IPHONEOS_DEPLOYMENT_TARGET', otherwise both should be - * left undefined. - */ - -#if defined(GYPTEST_MAC_VERSION_MIN) -# if GYPTEST_MAC_VERSION_MIN != __MAC_OS_X_VERSION_MIN_REQUIRED -# error __MAC_OS_X_VERSION_MIN_REQUIRED has wrong value -# endif -#elif defined(__MAC_OS_X_VERSION_MIN_REQUIRED) -# error __MAC_OS_X_VERSION_MIN_REQUIRED should be undefined -#endif - -#if defined(GYPTEST_IOS_VERSION_MIN) -# if GYPTEST_IOS_VERSION_MIN != __IPHONE_OS_VERSION_MIN_REQUIRED -# error __IPHONE_OS_VERSION_MIN_REQUIRED has wrong value -# endif -#elif defined(__IPHONE_OS_VERSION_MIN_REQUIRED) -# error __IPHONE_OS_VERSION_MIN_REQUIRED should be undefined -#endif - -int main() { return 0; } diff --git a/tools/gyp/test/ios/deployment-target/deployment-target.gyp b/tools/gyp/test/ios/deployment-target/deployment-target.gyp deleted file mode 100644 index 53cfaa38d1a8ca00284ded06f232a82b1e938f96..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/deployment-target/deployment-target.gyp +++ /dev/null @@ -1,57 +0,0 @@ -# Copyright (c) 2013 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. -{ - 'make_global_settings': [ - ['CC', '/usr/bin/clang'], - ['CXX', '/usr/bin/clang++'], - ], - 'targets': [ - { - 'target_name': 'iphoneos-version-min-4.3', - 'type': 'static_library', - 'sources': [ 'check-version-min.c', ], - 'defines': [ 'GYPTEST_IOS_VERSION_MIN=40300', ], - 'xcode_settings': { - 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', - 'ARCHS': [ 'armv7' ], - 'SDKROOT': 'iphoneos', - 'IPHONEOS_DEPLOYMENT_TARGET': '4.3', - }, - }, - { - 'target_name': 'iphoneos-version-min-5.0', - 'type': 'static_library', - 'sources': [ 'check-version-min.c', ], - 'defines': [ 'GYPTEST_IOS_VERSION_MIN=50000', ], - 'xcode_settings': { - 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', - 'ARCHS': [ 'armv7' ], - 'SDKROOT': 'iphoneos', - 'IPHONEOS_DEPLOYMENT_TARGET': '5.0', - }, - }, - { - 'target_name': 'iphonesimulator-version-min-4.3', - 'type': 'static_library', - 'sources': [ 'check-version-min.c', ], - 'defines': [ 'GYPTEST_IOS_VERSION_MIN=40300', ], - 'xcode_settings': { - 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', - 'SDKROOT': 'iphonesimulator', - 'IPHONEOS_DEPLOYMENT_TARGET': '4.3', - }, - }, - { - 'target_name': 'iphonesimulator-version-min-5.0', - 'type': 'static_library', - 'sources': [ 'check-version-min.c', ], - 'defines': [ 'GYPTEST_IOS_VERSION_MIN=50000', ], - 'xcode_settings': { - 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', - 'SDKROOT': 'iphonesimulator', - 'IPHONEOS_DEPLOYMENT_TARGET': '5.0', - }, - }, - ], -} diff --git a/tools/gyp/test/ios/extension/ActionExtension/ActionViewController.h b/tools/gyp/test/ios/extension/ActionExtension/ActionViewController.h deleted file mode 100644 index 1c9250902961835864d540a38e19ebe03a6c9f38..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/extension/ActionExtension/ActionViewController.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) 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. - -#import - -@interface ActionViewController : UIViewController - -@end diff --git a/tools/gyp/test/ios/extension/ActionExtension/ActionViewController.m b/tools/gyp/test/ios/extension/ActionExtension/ActionViewController.m deleted file mode 100644 index d37bacdae1764c8c2c18b694ada4e9c957453a85..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/extension/ActionExtension/ActionViewController.m +++ /dev/null @@ -1,31 +0,0 @@ -// Copyright (c) 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. - -#import "ActionViewController.h" -#import - -@interface ActionViewController () - -@end - -@implementation ActionViewController - -- (void)viewDidLoad { - [super viewDidLoad]; -} - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -- (IBAction)done { - // Return any edited content to the host app. - // This template doesn't do anything, so we just echo the passed in items. - [self.extensionContext - completeRequestReturningItems:self.extensionContext.inputItems - completionHandler:nil]; -} - -@end diff --git a/tools/gyp/test/ios/extension/ActionExtension/Info.plist b/tools/gyp/test/ios/extension/ActionExtension/Info.plist deleted file mode 100644 index f89cd790bc23b1b07f5b551a76e3d683edda2493..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/extension/ActionExtension/Info.plist +++ /dev/null @@ -1,42 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleDisplayName - ActionExtension - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - com.google.gyptest.extension.ActionExtension - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - XPC! - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - NSExtension - - NSExtensionAttributes - - NSExtensionActivationRule - TRUEPREDICATE - NSExtensionPointName - com.apple.ui-services - NSExtensionPointVersion - 1.0 - - NSExtensionMainStoryboard - MainInterface - NSExtensionPointIdentifier - com.apple.ui-services - - - diff --git a/tools/gyp/test/ios/extension/ActionExtension/MainInterface.storyboard b/tools/gyp/test/ios/extension/ActionExtension/MainInterface.storyboard deleted file mode 100644 index 5aa58184e80bba378703715e381351e62df3fe14..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/extension/ActionExtension/MainInterface.storyboard +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tools/gyp/test/ios/extension/ExtensionContainer/AppDelegate.h b/tools/gyp/test/ios/extension/ExtensionContainer/AppDelegate.h deleted file mode 100644 index 526cb31614abb6852e70b3e67b38c5bb88a40f30..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/extension/ExtensionContainer/AppDelegate.h +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) 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. - -#import - -@interface AppDelegate : UIResponder - -@property (strong, nonatomic) UIWindow *window; - -@end diff --git a/tools/gyp/test/ios/extension/ExtensionContainer/AppDelegate.m b/tools/gyp/test/ios/extension/ExtensionContainer/AppDelegate.m deleted file mode 100644 index 1197bc1bbc0ca7f94597e9b7ccca111b1e7a9861..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/extension/ExtensionContainer/AppDelegate.m +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) 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. - -#import "AppDelegate.h" - -@interface AppDelegate () - -@end - -@implementation AppDelegate - -- (BOOL)application:(UIApplication*)application - didFinishLaunchingWithOptions:(NSDictionary*)launchOptions { - // Override point for customization after application launch. - return YES; -} - -@end diff --git a/tools/gyp/test/ios/extension/ExtensionContainer/Base.lproj/Main.storyboard b/tools/gyp/test/ios/extension/ExtensionContainer/Base.lproj/Main.storyboard deleted file mode 100644 index e8f3cfb40c36f8af0fd34428801a7343264ec404..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/extension/ExtensionContainer/Base.lproj/Main.storyboard +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tools/gyp/test/ios/extension/ExtensionContainer/Images.xcassets/AppIcon.appiconset/Contents.json b/tools/gyp/test/ios/extension/ExtensionContainer/Images.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index f697f61f4aaf5c61e3187cb5ccb77d049de80a0b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/extension/ExtensionContainer/Images.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "images" : [ - { - "idiom" : "iphone", - "size" : "29x29", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "40x40", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "60x60", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "29x29", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "29x29", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "40x40", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "40x40", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "76x76", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "76x76", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} diff --git a/tools/gyp/test/ios/extension/ExtensionContainer/Images.xcassets/LaunchImage.launchimage/Contents.json b/tools/gyp/test/ios/extension/ExtensionContainer/Images.xcassets/LaunchImage.launchimage/Contents.json deleted file mode 100644 index 4458b40c0558598e94f1001e2e01fa81ebf5506d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/extension/ExtensionContainer/Images.xcassets/LaunchImage.launchimage/Contents.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "images" : [ - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "subtype" : "retina4", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "1x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} diff --git a/tools/gyp/test/ios/extension/ExtensionContainer/Info.plist b/tools/gyp/test/ios/extension/ExtensionContainer/Info.plist deleted file mode 100644 index 31ccf4cc82e14910765fafc13615617c724078b6..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/extension/ExtensionContainer/Info.plist +++ /dev/null @@ -1,32 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - ExtensionContainer - CFBundleIdentifier - com.google.gyptest.extension - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - LSRequiresIPhoneOS - - UIMainStoryboardFile - Main - UIRequiredDeviceCapabilities - - armv7 - - - diff --git a/tools/gyp/test/ios/extension/ExtensionContainer/ViewController.h b/tools/gyp/test/ios/extension/ExtensionContainer/ViewController.h deleted file mode 100644 index fa12f5ba67c67a153f05b19c0950091920d93a46..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/extension/ExtensionContainer/ViewController.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) 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. - -#import - -@interface ViewController : UIViewController - - -@end diff --git a/tools/gyp/test/ios/extension/ExtensionContainer/ViewController.m b/tools/gyp/test/ios/extension/ExtensionContainer/ViewController.m deleted file mode 100644 index 3810fa9cba82c26b57f07bd011d49218991455d6..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/extension/ExtensionContainer/ViewController.m +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (c) 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. - -#import "ViewController.h" - -@interface ViewController () - - -@end - -@implementation ViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - // Do any additional setup after loading the view, typically from a nib. -} - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -@end diff --git a/tools/gyp/test/ios/extension/ExtensionContainer/main.m b/tools/gyp/test/ios/extension/ExtensionContainer/main.m deleted file mode 100644 index 47aecb514839c4b87ad5ae72045f5cb54e1cf5a9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/extension/ExtensionContainer/main.m +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 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. -// -#import -#import "AppDelegate.h" - -int main(int argc, char* argv[]) { - @autoreleasepool { - return UIApplicationMain(argc, argv, nil, - NSStringFromClass([AppDelegate class])); - } -} diff --git a/tools/gyp/test/ios/extension/extension.gyp b/tools/gyp/test/ios/extension/extension.gyp deleted file mode 100644 index fe27cb24afc4a291f116152f9ed7bd0a2978f4e1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/extension/extension.gyp +++ /dev/null @@ -1,84 +0,0 @@ -# Copyright (c) 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. - -{ - 'make_global_settings': [ - ['CC', '/usr/bin/clang'], - ['CXX', '/usr/bin/clang++'], - ], - 'targets': [ - { - 'target_name': 'ExtensionContainer', - 'product_name': 'ExtensionContainer', - 'type': 'executable', - 'mac_bundle': 1, - 'mac_bundle_resources': [ - 'ExtensionContainer/Base.lproj/Main.storyboard', - ], - 'sources': [ - 'ExtensionContainer/AppDelegate.h', - 'ExtensionContainer/AppDelegate.m', - 'ExtensionContainer/ViewController.h', - 'ExtensionContainer/ViewController.m', - 'ExtensionContainer/main.m', - ], - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/ExtensionContainer.app/PlugIns', - 'files': [ - '<(PRODUCT_DIR)/ActionExtension.appex', - ]}], - 'dependencies': [ - 'ActionExtension' - ], - - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', - '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', - ], - }, - 'xcode_settings': { - 'OTHER_CFLAGS': [ - '-fobjc-abi-version=2', - ], - 'INFOPLIST_FILE': 'ExtensionContainer/Info.plist', - 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', - 'ARCHS': [ 'armv7' ], - 'SDKROOT': 'iphoneos', - 'IPHONEOS_DEPLOYMENT_TARGET': '7.0', - 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': 'iPhone Developer', - }, - }, - { - 'target_name': 'ActionExtension', - 'product_name': 'ActionExtension', - 'type': 'executable', - 'mac_bundle': 1, - 'ios_app_extension': 1, - 'sources': [ - 'ActionExtension/ActionViewController.h', - 'ActionExtension/ActionViewController.m', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', - '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', - '$(SDKROOT)/System/Library/Frameworks/MobileCoreServices.framework', - ], - }, - 'xcode_settings': { - 'OTHER_CFLAGS': [ - '-fobjc-abi-version=2', - ], - 'INFOPLIST_FILE': 'ActionExtension/Info.plist', - 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', - 'ARCHS': [ 'armv7' ], - 'SDKROOT': 'iphoneos', - 'IPHONEOS_DEPLOYMENT_TARGET': '7.0', - 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': 'iPhone Developer', - }, - }, - ], -} diff --git a/tools/gyp/test/ios/gyptest-app-ios-assets-catalog.py b/tools/gyp/test/ios/gyptest-app-ios-assets-catalog.py deleted file mode 100755 index efd96ac752f02833b9a7825567f7833c0ccf9565..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/gyptest-app-ios-assets-catalog.py +++ /dev/null @@ -1,57 +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. - -""" -Verifies that ios app bundles are built correctly. -""" - -import TestGyp -import TestMac - -import os.path -import sys - -# Xcode supports for assets catalog was introduced in Xcode 6.0 -if sys.platform == 'darwin' and TestMac.Xcode.Version() >= '0600': - test_gyp_path = 'test-assets-catalog.gyp' - test_app_path = 'Test App Assets Catalog Gyp.app' - - test = TestGyp.TestGyp(formats=['xcode', 'ninja']) - test.run_gyp(test_gyp_path, chdir='app-bundle') - test.build(test_gyp_path, test.ALL, chdir='app-bundle') - - # Test that the extension is .bundle - test.built_file_must_exist( - os.path.join(test_app_path, 'Test App Assets Catalog Gyp'), - chdir='app-bundle') - - # Info.plist - info_plist = test.built_file_path( - os.path.join(test_app_path, 'Info.plist'), - chdir='app-bundle') - # Resources - test.built_file_must_exist( - os.path.join(test_app_path, 'English.lproj/InfoPlist.strings'), - chdir='app-bundle') - test.built_file_must_exist( - os.path.join(test_app_path, 'English.lproj/MainMenu.nib'), - chdir='app-bundle') - test.built_file_must_exist( - os.path.join(test_app_path, 'English.lproj/Main_iPhone.storyboardc'), - chdir='app-bundle') - test.built_file_must_exist( - os.path.join(test_app_path, 'Assets.car'), - chdir='app-bundle') - - # Packaging - test.built_file_must_exist( - os.path.join(test_app_path, 'PkgInfo'), - chdir='app-bundle') - test.built_file_must_match( - os.path.join(test_app_path, 'PkgInfo'), 'APPLause', - chdir='app-bundle') - - test.pass_test() diff --git a/tools/gyp/test/ios/gyptest-app-ios.py b/tools/gyp/test/ios/gyptest-app-ios.py deleted file mode 100755 index f5fd5f93f7424f444a67f4e2115a9bf28cfcd44c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/gyptest-app-ios.py +++ /dev/null @@ -1,71 +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. - -""" -Verifies that ios app bundles are built correctly. -""" - -import TestGyp - -import subprocess -import sys - -def CheckFileXMLPropertyList(file): - output = subprocess.check_output(['file', file]) - # The double space after XML is intentional. - if not 'XML document text' in output: - print 'File: Expected XML document text, got %s' % output - test.fail_test() - -def CheckFileBinaryPropertyList(file): - output = subprocess.check_output(['file', file]) - if not 'Apple binary property list' in output: - print 'File: Expected Apple binary property list, got %s' % output - test.fail_test() - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['xcode', 'ninja']) - - test.run_gyp('test.gyp', chdir='app-bundle') - - test.build('test.gyp', test.ALL, chdir='app-bundle') - - # Test that the extension is .bundle - test.built_file_must_exist('Test App Gyp.app/Test App Gyp', - chdir='app-bundle') - - # Info.plist - info_plist = test.built_file_path('Test App Gyp.app/Info.plist', - chdir='app-bundle') - test.built_file_must_exist(info_plist) - CheckFileBinaryPropertyList(info_plist) - - # XML Info.plist - info_plist = test.built_file_path('Test App Gyp XML.app/Info.plist', - chdir='app-bundle') - CheckFileXMLPropertyList(info_plist) - - # Resources - strings_file = test.built_file_path( - 'Test App Gyp.app/English.lproj/InfoPlist.strings', - chdir='app-bundle') - test.built_file_must_exist(strings_file) - CheckFileBinaryPropertyList(strings_file) - - test.built_file_must_exist( - 'Test App Gyp.app/English.lproj/MainMenu.nib', - chdir='app-bundle') - test.built_file_must_exist( - 'Test App Gyp.app/English.lproj/Main_iPhone.storyboardc', - chdir='app-bundle') - - # Packaging - test.built_file_must_exist('Test App Gyp.app/PkgInfo', - chdir='app-bundle') - test.built_file_must_match('Test App Gyp.app/PkgInfo', 'APPLause', - chdir='app-bundle') - - test.pass_test() diff --git a/tools/gyp/test/ios/gyptest-archs.py b/tools/gyp/test/ios/gyptest-archs.py deleted file mode 100644 index 38c5c61fd8f388d14fcb9debdc3c3c68369e245c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/gyptest-archs.py +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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 that device and simulator bundles are built correctly. -""" - -import TestGyp -import TestMac - -import collections -import sys - - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'xcode']) - - test_cases = [ - ('Default', 'TestArch32Bits', ['i386']), - ('Default-iphoneos', 'TestArch32Bits', ['armv7']), - ] - - if TestMac.Xcode.Version() < '0510': - test_cases.extend([ - ('Default', 'TestNoArchs', ['i386']), - ('Default-iphoneos', 'TestNoArchs', ['armv7'])]) - - if TestMac.Xcode.Version() >= '0500': - test_cases.extend([ - ('Default', 'TestArch64Bits', ['x86_64']), - ('Default', 'TestMultiArchs', ['i386', 'x86_64']), - ('Default-iphoneos', 'TestArch64Bits', ['arm64']), - ('Default-iphoneos', 'TestMultiArchs', ['armv7', 'arm64'])]) - - test.run_gyp('test-archs.gyp', chdir='app-bundle') - for configuration, target, archs in test_cases: - is_device_build = configuration.endswith('-iphoneos') - - kwds = collections.defaultdict(list) - if test.format == 'xcode': - if is_device_build: - configuration, sdk = configuration.split('-') - kwds['arguments'].extend(['-sdk', sdk]) - if TestMac.Xcode.Version() < '0500': - kwds['arguments'].extend(['-arch', archs[0]]) - - test.set_configuration(configuration) - filename = '%s.bundle/%s' % (target, target) - test.build('test-archs.gyp', target, chdir='app-bundle', **kwds) - result_file = test.built_file_path(filename, chdir='app-bundle') - - test.must_exist(result_file) - TestMac.CheckFileType(test, result_file, archs) - - test.pass_test() diff --git a/tools/gyp/test/ios/gyptest-crosscompile.py b/tools/gyp/test/ios/gyptest-crosscompile.py deleted file mode 100644 index a0816836e577f46793bf89b00a0a392fab3761f7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/gyptest-crosscompile.py +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Verifies that tools are built correctly. -""" - -import TestGyp -import TestMac - -import sys -import os - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'xcode']) - - oldenv = os.environ.copy() - try: - os.environ['GYP_CROSSCOMPILE'] = '1' - test.run_gyp('test-crosscompile.gyp', chdir='app-bundle') - finally: - os.environ.clear() - os.environ.update(oldenv) - - test.set_configuration('Default') - test.build('test-crosscompile.gyp', 'TestHost', chdir='app-bundle') - result_file = test.built_file_path('TestHost', chdir='app-bundle') - test.must_exist(result_file) - TestMac.CheckFileType(test, result_file, ['x86_64']) - - test.pass_test() diff --git a/tools/gyp/test/ios/gyptest-deployment-target.py b/tools/gyp/test/ios/gyptest-deployment-target.py deleted file mode 100644 index 526c136e4e4274e672b0861ea1323fc72a272254..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/gyptest-deployment-target.py +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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 that IPHONEOS_DEPLOYMENT_TARGET works. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['make', 'ninja', 'xcode']) - - test.run_gyp('deployment-target.gyp', chdir='deployment-target') - - test.build('deployment-target.gyp', test.ALL, chdir='deployment-target') - - test.pass_test() diff --git a/tools/gyp/test/ios/gyptest-extension.py b/tools/gyp/test/ios/gyptest-extension.py deleted file mode 100755 index 8f421310650d55541338a91eced621376d150770..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/gyptest-extension.py +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Verifies that ios app extensions are built correctly. -""" - -import TestGyp -import TestMac - -import sys -if sys.platform == 'darwin' and TestMac.Xcode.Version()>="0600": - test = TestGyp.TestGyp(formats=['ninja', 'xcode']) - - test.run_gyp('extension.gyp', chdir='extension') - - test.build('extension.gyp', 'ExtensionContainer', chdir='extension') - - # Test that the extension is .appex - test.built_file_must_exist( - 'ExtensionContainer.app/PlugIns/ActionExtension.appex', - chdir='extension') - - test.pass_test() diff --git a/tools/gyp/test/ios/gyptest-per-config-settings.py b/tools/gyp/test/ios/gyptest-per-config-settings.py deleted file mode 100644 index d15907e721e0746b615f1343502a904b93f5b38b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/gyptest-per-config-settings.py +++ /dev/null @@ -1,147 +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. - -""" -Verifies that device and simulator bundles are built correctly. -""" - -import plistlib -import TestGyp -import os -import struct -import subprocess -import sys -import tempfile - - -def CheckFileType(file, expected): - proc = subprocess.Popen(['lipo', '-info', file], stdout=subprocess.PIPE) - o = proc.communicate()[0].strip() - assert not proc.returncode - if not expected in o: - print 'File: Expected %s, got %s' % (expected, o) - test.fail_test() - -def HasCerts(): - # Because the bots do not have certs, don't check them if there are no - # certs available. - proc = subprocess.Popen(['security','find-identity','-p', 'codesigning', - '-v'], stdout=subprocess.PIPE) - return "0 valid identities found" not in proc.communicate()[0].strip() - -def CheckSignature(file): - proc = subprocess.Popen(['codesign', '-v', file], stdout=subprocess.PIPE) - o = proc.communicate()[0].strip() - assert not proc.returncode - if "code object is not signed at all" in o: - print 'File %s not properly signed.' % (file) - test.fail_test() - -def CheckEntitlements(file, expected_entitlements): - with tempfile.NamedTemporaryFile() as temp: - proc = subprocess.Popen(['codesign', '--display', '--entitlements', - temp.name, file], stdout=subprocess.PIPE) - o = proc.communicate()[0].strip() - assert not proc.returncode - data = temp.read() - entitlements = ParseEntitlements(data) - if not entitlements: - print 'No valid entitlements found in %s.' % (file) - test.fail_test() - if entitlements != expected_entitlements: - print 'Unexpected entitlements found in %s.' % (file) - test.fail_test() - -def ParseEntitlements(data): - if len(data) < 8: - return None - magic, length = struct.unpack('>II', data[:8]) - if magic != 0xfade7171 or length != len(data): - return None - return data[8:] - -def GetProductVersion(): - args = ['xcodebuild','-version','-sdk','iphoneos','ProductVersion'] - job = subprocess.Popen(args, stdout=subprocess.PIPE) - return job.communicate()[0].strip() - -def CheckPlistvalue(plist, key, expected): - if key not in plist: - print '%s not set in plist' % key - test.fail_test() - return - actual = plist[key] - if actual != expected: - print 'File: Expected %s, got %s for %s' % (expected, actual, key) - test.fail_test() - -def CheckPlistNotSet(plist, key): - if key in plist: - print '%s should not be set in plist' % key - test.fail_test() - return - -def ConvertBinaryPlistToXML(path): - proc = subprocess.call(['plutil', '-convert', 'xml1', path], - stdout=subprocess.PIPE) - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'xcode']) - - test.run_gyp('test-device.gyp', chdir='app-bundle') - - test_configs = ['Default-iphoneos', 'Default'] - # TODO(justincohen): Disabling 'Default-iphoneos' for xcode until bots are - # configured with signing certs. - if test.format == 'xcode': - test_configs.remove('Default-iphoneos') - - for configuration in test_configs: - test.set_configuration(configuration) - test.build('test-device.gyp', 'test_app', chdir='app-bundle') - result_file = test.built_file_path('Test App Gyp.bundle/Test App Gyp', - chdir='app-bundle') - test.must_exist(result_file) - - info_plist = test.built_file_path('Test App Gyp.bundle/Info.plist', - chdir='app-bundle') - - # plistlib doesn't support binary plists, but that's what Xcode creates. - if test.format == 'xcode': - ConvertBinaryPlistToXML(info_plist) - plist = plistlib.readPlist(info_plist) - - CheckPlistvalue(plist, 'UIDeviceFamily', [1, 2]) - - if configuration == 'Default-iphoneos': - CheckFileType(result_file, 'armv7') - CheckPlistvalue(plist, 'DTPlatformVersion', GetProductVersion()) - CheckPlistvalue(plist, 'CFBundleSupportedPlatforms', ['iPhoneOS']) - CheckPlistvalue(plist, 'DTPlatformName', 'iphoneos') - else: - CheckFileType(result_file, 'i386') - CheckPlistNotSet(plist, 'DTPlatformVersion') - CheckPlistvalue(plist, 'CFBundleSupportedPlatforms', ['iPhoneSimulator']) - CheckPlistvalue(plist, 'DTPlatformName', 'iphonesimulator') - - if HasCerts() and configuration == 'Default-iphoneos': - test.build('test-device.gyp', 'sig_test', chdir='app-bundle') - result_file = test.built_file_path('sig_test.bundle/sig_test', - chdir='app-bundle') - CheckSignature(result_file) - info_plist = test.built_file_path('sig_test.bundle/Info.plist', - chdir='app-bundle') - - plist = plistlib.readPlist(info_plist) - CheckPlistvalue(plist, 'UIDeviceFamily', [1]) - - entitlements_file = test.built_file_path('sig_test.xcent', - chdir='app-bundle') - if os.path.isfile(entitlements_file): - expected_entitlements = open(entitlements_file).read() - CheckEntitlements(result_file, expected_entitlements) - - test.pass_test() diff --git a/tools/gyp/test/ios/gyptest-watch.py b/tools/gyp/test/ios/gyptest-watch.py deleted file mode 100755 index 3a0a8b5e93aff197646b11c402b7a8cf6dc9337a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/gyptest-watch.py +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Verifies that ios watch extensions and apps are built correctly. -""" - -import TestGyp -import TestMac - -import sys -if sys.platform == 'darwin' and TestMac.Xcode.Version() >= "0620": - test = TestGyp.TestGyp(formats=['ninja', 'xcode']) - - test.run_gyp('watch.gyp', chdir='watch') - - test.build( - 'watch.gyp', - 'WatchContainer', - chdir='watch') - - # Test that the extension exists - test.built_file_must_exist( - 'WatchContainer.app/PlugIns/WatchKitExtension.appex', - chdir='watch') - - # Test that the watch app exists - test.built_file_must_exist( - 'WatchContainer.app/PlugIns/WatchKitExtension.appex/WatchApp.app', - chdir='watch') - - test.pass_test() diff --git a/tools/gyp/test/ios/gyptest-xcode-ninja.py b/tools/gyp/test/ios/gyptest-xcode-ninja.py deleted file mode 100644 index 609db8c98f56f53aa3ba2a3dd228ab5080810b35..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/gyptest-xcode-ninja.py +++ /dev/null @@ -1,25 +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. - -""" -Verify that the xcode-ninja GYP_GENERATOR runs and builds correctly. -""" - -import TestGyp - -import os -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['xcode']) - - # Run ninja and xcode-ninja - test.formats = ['ninja', 'xcode-ninja'] - test.run_gyp('test.gyp', chdir='app-bundle') - - # If it builds the target, it works. - test.build('test.ninja.gyp', chdir='app-bundle') - test.pass_test() diff --git a/tools/gyp/test/ios/watch/WatchApp/Images.xcassets/AppIcon.appiconset/Contents.json b/tools/gyp/test/ios/watch/WatchApp/Images.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 562c5eff9792f1a950a6431030ea86214435f074..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/watch/WatchApp/Images.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,62 +0,0 @@ -{ - "images" : [ - { - "size" : "14.5x14.5", - "idiom" : "watch", - "scale" : "2x", - "role" : "notificationCenter", - "subtype" : "38mm" - }, - { - "size" : "18x18", - "idiom" : "watch", - "scale" : "2x", - "role" : "notificationCenter", - "subtype" : "42mm" - }, - { - "size" : "29x29", - "idiom" : "watch", - "role" : "companionSettings", - "scale" : "2x" - }, - { - "size" : "29.3x29.3", - "idiom" : "watch", - "role" : "companionSettings", - "scale" : "3x" - }, - { - "size" : "40x40", - "idiom" : "watch", - "scale" : "2x", - "role" : "appLauncher", - "subtype" : "38mm" - }, - { - "size" : "44x44", - "idiom" : "watch", - "scale" : "2x", - "role" : "appLauncher", - "subtype" : "42mm" - }, - { - "size" : "86x86", - "idiom" : "watch", - "scale" : "2x", - "role" : "quickLook", - "subtype" : "38mm" - }, - { - "size" : "98x98", - "idiom" : "watch", - "scale" : "2x", - "role" : "quickLook", - "subtype" : "42mm" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} diff --git a/tools/gyp/test/ios/watch/WatchApp/Images.xcassets/LaunchImage.launchimage/Contents.json b/tools/gyp/test/ios/watch/WatchApp/Images.xcassets/LaunchImage.launchimage/Contents.json deleted file mode 100644 index ed123feff6c4e153d569a08f2b5bb9a0c44ac18c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/watch/WatchApp/Images.xcassets/LaunchImage.launchimage/Contents.json +++ /dev/null @@ -1,24 +0,0 @@ -{ - "images" : [ - { - "orientation" : "portrait", - "idiom" : "watch", - "extent" : "full-screen", - "minimum-system-version" : "8.0", - "subtype" : "38mm", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "watch", - "extent" : "full-screen", - "minimum-system-version" : "8.0", - "subtype" : "42mm", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} diff --git a/tools/gyp/test/ios/watch/WatchApp/Info.plist b/tools/gyp/test/ios/watch/WatchApp/Info.plist deleted file mode 100644 index 3cf65b8285016009ed7d7090941f650dd195c0ac..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/watch/WatchApp/Info.plist +++ /dev/null @@ -1,35 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleDisplayName - WatchApp - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - com.google.gyptest.watch.watchapp - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - UISupportedInterfaceOrientations - - UIInterfaceOrientationPortrait - UIInterfaceOrientationPortraitUpsideDown - - WKCompanionAppBundleIdentifier - com.google.gyptest.watch - WKWatchKitApp - - - diff --git a/tools/gyp/test/ios/watch/WatchApp/Interface.storyboard b/tools/gyp/test/ios/watch/WatchApp/Interface.storyboard deleted file mode 100644 index 5f52cb6c9078dbacbe453f109c5f0d0201bcae43..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/watch/WatchApp/Interface.storyboard +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - - - - - - - - - - diff --git a/tools/gyp/test/ios/watch/WatchContainer/AppDelegate.h b/tools/gyp/test/ios/watch/WatchContainer/AppDelegate.h deleted file mode 100644 index 526cb31614abb6852e70b3e67b38c5bb88a40f30..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/watch/WatchContainer/AppDelegate.h +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) 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. - -#import - -@interface AppDelegate : UIResponder - -@property (strong, nonatomic) UIWindow *window; - -@end diff --git a/tools/gyp/test/ios/watch/WatchContainer/AppDelegate.m b/tools/gyp/test/ios/watch/WatchContainer/AppDelegate.m deleted file mode 100644 index 1197bc1bbc0ca7f94597e9b7ccca111b1e7a9861..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/watch/WatchContainer/AppDelegate.m +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) 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. - -#import "AppDelegate.h" - -@interface AppDelegate () - -@end - -@implementation AppDelegate - -- (BOOL)application:(UIApplication*)application - didFinishLaunchingWithOptions:(NSDictionary*)launchOptions { - // Override point for customization after application launch. - return YES; -} - -@end diff --git a/tools/gyp/test/ios/watch/WatchContainer/Base.lproj/Main.storyboard b/tools/gyp/test/ios/watch/WatchContainer/Base.lproj/Main.storyboard deleted file mode 100644 index e8f3cfb40c36f8af0fd34428801a7343264ec404..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/watch/WatchContainer/Base.lproj/Main.storyboard +++ /dev/null @@ -1,25 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tools/gyp/test/ios/watch/WatchContainer/Images.xcassets/AppIcon.appiconset/Contents.json b/tools/gyp/test/ios/watch/WatchContainer/Images.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index f697f61f4aaf5c61e3187cb5ccb77d049de80a0b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/watch/WatchContainer/Images.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,53 +0,0 @@ -{ - "images" : [ - { - "idiom" : "iphone", - "size" : "29x29", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "40x40", - "scale" : "2x" - }, - { - "idiom" : "iphone", - "size" : "60x60", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "29x29", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "29x29", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "40x40", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "40x40", - "scale" : "2x" - }, - { - "idiom" : "ipad", - "size" : "76x76", - "scale" : "1x" - }, - { - "idiom" : "ipad", - "size" : "76x76", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} diff --git a/tools/gyp/test/ios/watch/WatchContainer/Images.xcassets/LaunchImage.launchimage/Contents.json b/tools/gyp/test/ios/watch/WatchContainer/Images.xcassets/LaunchImage.launchimage/Contents.json deleted file mode 100644 index 4458b40c0558598e94f1001e2e01fa81ebf5506d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/watch/WatchContainer/Images.xcassets/LaunchImage.launchimage/Contents.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "images" : [ - { - "orientation" : "portrait", - "idiom" : "iphone", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "iphone", - "subtype" : "retina4", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "1x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "1x" - }, - { - "orientation" : "portrait", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - }, - { - "orientation" : "landscape", - "idiom" : "ipad", - "extent" : "full-screen", - "minimum-system-version" : "7.0", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} diff --git a/tools/gyp/test/ios/watch/WatchContainer/Info.plist b/tools/gyp/test/ios/watch/WatchContainer/Info.plist deleted file mode 100644 index a40319c78eac0954f0db727a9ceb21519361c91c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/watch/WatchContainer/Info.plist +++ /dev/null @@ -1,32 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleExecutable - WatchContainer - CFBundleIdentifier - com.google.gyptest.watch - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - LSRequiresIPhoneOS - - UIMainStoryboardFile - Main - UIRequiredDeviceCapabilities - - armv7 - - - diff --git a/tools/gyp/test/ios/watch/WatchContainer/ViewController.h b/tools/gyp/test/ios/watch/WatchContainer/ViewController.h deleted file mode 100644 index fa12f5ba67c67a153f05b19c0950091920d93a46..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/watch/WatchContainer/ViewController.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) 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. - -#import - -@interface ViewController : UIViewController - - -@end diff --git a/tools/gyp/test/ios/watch/WatchContainer/ViewController.m b/tools/gyp/test/ios/watch/WatchContainer/ViewController.m deleted file mode 100644 index 3810fa9cba82c26b57f07bd011d49218991455d6..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/watch/WatchContainer/ViewController.m +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (c) 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. - -#import "ViewController.h" - -@interface ViewController () - - -@end - -@implementation ViewController - -- (void)viewDidLoad { - [super viewDidLoad]; - // Do any additional setup after loading the view, typically from a nib. -} - -- (void)didReceiveMemoryWarning { - [super didReceiveMemoryWarning]; - // Dispose of any resources that can be recreated. -} - -@end diff --git a/tools/gyp/test/ios/watch/WatchContainer/main.m b/tools/gyp/test/ios/watch/WatchContainer/main.m deleted file mode 100644 index 47aecb514839c4b87ad5ae72045f5cb54e1cf5a9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/watch/WatchContainer/main.m +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright (c) 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. -// -#import -#import "AppDelegate.h" - -int main(int argc, char* argv[]) { - @autoreleasepool { - return UIApplicationMain(argc, argv, nil, - NSStringFromClass([AppDelegate class])); - } -} diff --git a/tools/gyp/test/ios/watch/WatchKitExtension/Images.xcassets/MyImage.imageset/Contents.json b/tools/gyp/test/ios/watch/WatchKitExtension/Images.xcassets/MyImage.imageset/Contents.json deleted file mode 100644 index f80d9508688cad3cde3e1b311091433d7a8d5551..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/watch/WatchKitExtension/Images.xcassets/MyImage.imageset/Contents.json +++ /dev/null @@ -1,20 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x" - }, - { - "idiom" : "universal", - "scale" : "2x" - }, - { - "idiom" : "universal", - "scale" : "3x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} diff --git a/tools/gyp/test/ios/watch/WatchKitExtension/Info.plist b/tools/gyp/test/ios/watch/WatchKitExtension/Info.plist deleted file mode 100644 index 7a354643ef4ef2c39a1f8b8275b50b94d483167a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/watch/WatchKitExtension/Info.plist +++ /dev/null @@ -1,38 +0,0 @@ - - - - - CFBundleDevelopmentRegion - en - CFBundleDisplayName - WatchContainer WatchKit Extension - CFBundleExecutable - $(EXECUTABLE_NAME) - CFBundleIdentifier - com.google.gyptest.watch.watchkitextension - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - $(PRODUCT_NAME) - CFBundlePackageType - XPC! - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1.0 - NSExtension - - NSExtensionAttributes - - WKAppBundleIdentifier - com.google.gyptest.watch.watchapp - - NSExtensionPointIdentifier - com.apple.watchkit - - RemoteInterfacePrincipalClass - InterfaceController - - diff --git a/tools/gyp/test/ios/watch/WatchKitExtension/InterfaceController.h b/tools/gyp/test/ios/watch/WatchKitExtension/InterfaceController.h deleted file mode 100644 index 18fcb10fb098f6005e37558b4897b3aa5df1240e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/watch/WatchKitExtension/InterfaceController.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) 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. - -#import -#import - -@interface InterfaceController : WKInterfaceController -@end diff --git a/tools/gyp/test/ios/watch/WatchKitExtension/InterfaceController.m b/tools/gyp/test/ios/watch/WatchKitExtension/InterfaceController.m deleted file mode 100644 index b667c834d6053bf0fb9f8a53ad9505e8b091d3c4..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/watch/WatchKitExtension/InterfaceController.m +++ /dev/null @@ -1,24 +0,0 @@ -// Copyright (c) 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. - -#import "InterfaceController.h" - -@implementation InterfaceController - -- (instancetype)initWithContext:(id)context { - if ((self = [super initWithContext:context])) { - // -initWithContext: - } - return self; -} - -- (void)willActivate { - // -willActivate -} - -- (void)didDeactivate { - // -didDeactivate -} - -@end diff --git a/tools/gyp/test/ios/watch/WatchKitExtension/MainInterface.storyboard b/tools/gyp/test/ios/watch/WatchKitExtension/MainInterface.storyboard deleted file mode 100644 index 5aa58184e80bba378703715e381351e62df3fe14..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/watch/WatchKitExtension/MainInterface.storyboard +++ /dev/null @@ -1,63 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tools/gyp/test/ios/watch/watch.gyp b/tools/gyp/test/ios/watch/watch.gyp deleted file mode 100644 index ac26f63eee0daa50f65259d6aedd4b8729f16e53..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ios/watch/watch.gyp +++ /dev/null @@ -1,104 +0,0 @@ -# Copyright (c) 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. - -{ - 'make_global_settings': [ - ['CC', '/usr/bin/clang'], - ['CXX', '/usr/bin/clang++'], - ], - 'target_defaults': { - 'xcode_settings': { - 'OTHER_CFLAGS': [ - '-fobjc-abi-version=2', - ], - 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', - 'SDKROOT': 'iphoneos', - 'IPHONEOS_DEPLOYMENT_TARGET': '8.2', - 'CODE_SIGN_IDENTITY[sdk=iphoneos*]': 'iPhone Developer', - } - }, - 'targets': [ - { - 'target_name': 'WatchContainer', - 'product_name': 'WatchContainer', - 'type': 'executable', - 'mac_bundle': 1, - 'mac_bundle_resources': [ - 'WatchContainer/Base.lproj/Main.storyboard', - ], - 'sources': [ - 'WatchContainer/AppDelegate.h', - 'WatchContainer/AppDelegate.m', - 'WatchContainer/ViewController.h', - 'WatchContainer/ViewController.m', - 'WatchContainer/main.m', - ], - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/WatchContainer.app/PlugIns', - 'files': [ - '<(PRODUCT_DIR)/WatchKitExtension.appex', - ]}], - 'dependencies': [ - 'WatchKitExtension' - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', - '$(SDKROOT)/System/Library/Frameworks/UIKit.framework', - ], - }, - 'xcode_settings': { - 'INFOPLIST_FILE': 'WatchContainer/Info.plist', - }, - }, - { - 'target_name': 'WatchKitExtension', - 'product_name': 'WatchKitExtension', - 'type': 'executable', - 'mac_bundle': 1, - 'ios_watchkit_extension': 1, - 'sources': [ - 'WatchKitExtension/InterfaceController.h', - 'WatchKitExtension/InterfaceController.m', - ], - 'mac_bundle_resources': [ - 'WatchKitExtension/Images.xcassets', - '<(PRODUCT_DIR)/WatchApp.app', - ], - 'dependencies': [ - 'WatchApp' - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', - '$(SDKROOT)/System/Library/Frameworks/WatchKit.framework', - ], - }, - 'xcode_settings': { - 'INFOPLIST_FILE': 'WatchKitExtension/Info.plist', - 'SKIP_INSTALL': 'YES', - 'COPY_PHASE_STRIP': 'NO', - }, - }, - { - 'target_name': 'WatchApp', - 'product_name': 'WatchApp', - 'type': 'executable', - 'mac_bundle': 1, - 'ios_watch_app': 1, - 'mac_bundle_resources': [ - 'WatchApp/Images.xcassets', - 'WatchApp/Interface.storyboard', - ], - 'xcode_settings': { - 'INFOPLIST_FILE': 'WatchApp/Info.plist', - 'SKIP_INSTALL': 'YES', - 'COPY_PHASE_STRIP': 'NO', - 'TARGETED_DEVICE_FAMILY': '4', - 'TARGETED_DEVICE_FAMILY[sdk=iphonesimulator*]': '1,4', - }, - }, - ], -} diff --git a/tools/gyp/test/lib/README.txt b/tools/gyp/test/lib/README.txt deleted file mode 100644 index b3d724574e63770d3c67beb5b541290b1e053f5f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/lib/README.txt +++ /dev/null @@ -1,17 +0,0 @@ -Supporting modules for GYP testing. - - TestCmd.py - TestCommon.py - - Modules for generic testing of command-line utilities, - specifically including the ability to copy a test configuration - to temporary directories (with default cleanup on exit) as part - of running test scripts that invoke commands, compare actual - against expected output, etc. - - Our copies of these come from the SCons project, - http://www.scons.org/. - - TestGyp.py - - Modules for GYP-specific tests, of course. diff --git a/tools/gyp/test/lib/TestCmd.py b/tools/gyp/test/lib/TestCmd.py deleted file mode 100644 index 10f45f6cfa11cea26edd22a4eec107e81cc32183..0000000000000000000000000000000000000000 --- a/tools/gyp/test/lib/TestCmd.py +++ /dev/null @@ -1,1597 +0,0 @@ -""" -TestCmd.py: a testing framework for commands and scripts. - -The TestCmd module provides a framework for portable automated testing -of executable commands and scripts (in any language, not just Python), -especially commands and scripts that require file system interaction. - -In addition to running tests and evaluating conditions, the TestCmd -module manages and cleans up one or more temporary workspace -directories, and provides methods for creating files and directories in -those workspace directories from in-line data, here-documents), allowing -tests to be completely self-contained. - -A TestCmd environment object is created via the usual invocation: - - import TestCmd - test = TestCmd.TestCmd() - -There are a bunch of keyword arguments available at instantiation: - - test = TestCmd.TestCmd(description = 'string', - program = 'program_or_script_to_test', - interpreter = 'script_interpreter', - workdir = 'prefix', - subdir = 'subdir', - verbose = Boolean, - match = default_match_function, - diff = default_diff_function, - combine = Boolean) - -There are a bunch of methods that let you do different things: - - test.verbose_set(1) - - test.description_set('string') - - test.program_set('program_or_script_to_test') - - test.interpreter_set('script_interpreter') - test.interpreter_set(['script_interpreter', 'arg']) - - test.workdir_set('prefix') - test.workdir_set('') - - test.workpath('file') - test.workpath('subdir', 'file') - - test.subdir('subdir', ...) - - test.rmdir('subdir', ...) - - test.write('file', "contents\n") - test.write(['subdir', 'file'], "contents\n") - - test.read('file') - test.read(['subdir', 'file']) - test.read('file', mode) - test.read(['subdir', 'file'], mode) - - test.writable('dir', 1) - test.writable('dir', None) - - test.preserve(condition, ...) - - test.cleanup(condition) - - test.command_args(program = 'program_or_script_to_run', - interpreter = 'script_interpreter', - arguments = 'arguments to pass to program') - - test.run(program = 'program_or_script_to_run', - interpreter = 'script_interpreter', - arguments = 'arguments to pass to program', - chdir = 'directory_to_chdir_to', - stdin = 'input to feed to the program\n') - universal_newlines = True) - - p = test.start(program = 'program_or_script_to_run', - interpreter = 'script_interpreter', - arguments = 'arguments to pass to program', - universal_newlines = None) - - test.finish(self, p) - - test.pass_test() - test.pass_test(condition) - test.pass_test(condition, function) - - test.fail_test() - test.fail_test(condition) - test.fail_test(condition, function) - test.fail_test(condition, function, skip) - - test.no_result() - test.no_result(condition) - test.no_result(condition, function) - test.no_result(condition, function, skip) - - test.stdout() - test.stdout(run) - - test.stderr() - test.stderr(run) - - test.symlink(target, link) - - test.banner(string) - test.banner(string, width) - - test.diff(actual, expected) - - test.match(actual, expected) - - test.match_exact("actual 1\nactual 2\n", "expected 1\nexpected 2\n") - test.match_exact(["actual 1\n", "actual 2\n"], - ["expected 1\n", "expected 2\n"]) - - test.match_re("actual 1\nactual 2\n", regex_string) - test.match_re(["actual 1\n", "actual 2\n"], list_of_regexes) - - test.match_re_dotall("actual 1\nactual 2\n", regex_string) - test.match_re_dotall(["actual 1\n", "actual 2\n"], list_of_regexes) - - test.tempdir() - test.tempdir('temporary-directory') - - test.sleep() - test.sleep(seconds) - - test.where_is('foo') - test.where_is('foo', 'PATH1:PATH2') - test.where_is('foo', 'PATH1;PATH2', '.suffix3;.suffix4') - - test.unlink('file') - test.unlink('subdir', 'file') - -The TestCmd module provides pass_test(), fail_test(), and no_result() -unbound functions that report test results for use with the Aegis change -management system. These methods terminate the test immediately, -reporting PASSED, FAILED, or NO RESULT respectively, and exiting with -status 0 (success), 1 or 2 respectively. This allows for a distinction -between an actual failed test and a test that could not be properly -evaluated because of an external condition (such as a full file system -or incorrect permissions). - - import TestCmd - - TestCmd.pass_test() - TestCmd.pass_test(condition) - TestCmd.pass_test(condition, function) - - TestCmd.fail_test() - TestCmd.fail_test(condition) - TestCmd.fail_test(condition, function) - TestCmd.fail_test(condition, function, skip) - - TestCmd.no_result() - TestCmd.no_result(condition) - TestCmd.no_result(condition, function) - TestCmd.no_result(condition, function, skip) - -The TestCmd module also provides unbound functions that handle matching -in the same way as the match_*() methods described above. - - import TestCmd - - test = TestCmd.TestCmd(match = TestCmd.match_exact) - - test = TestCmd.TestCmd(match = TestCmd.match_re) - - test = TestCmd.TestCmd(match = TestCmd.match_re_dotall) - -The TestCmd module provides unbound functions that can be used for the -"diff" argument to TestCmd.TestCmd instantiation: - - import TestCmd - - test = TestCmd.TestCmd(match = TestCmd.match_re, - diff = TestCmd.diff_re) - - test = TestCmd.TestCmd(diff = TestCmd.simple_diff) - -The "diff" argument can also be used with standard difflib functions: - - import difflib - - test = TestCmd.TestCmd(diff = difflib.context_diff) - - test = TestCmd.TestCmd(diff = difflib.unified_diff) - -Lastly, the where_is() method also exists in an unbound function -version. - - import TestCmd - - TestCmd.where_is('foo') - TestCmd.where_is('foo', 'PATH1:PATH2') - TestCmd.where_is('foo', 'PATH1;PATH2', '.suffix3;.suffix4') -""" - -# Copyright 2000-2010 Steven Knight -# This module is free software, and you may redistribute it and/or modify -# it under the same terms as Python itself, so long as this copyright message -# and disclaimer are retained in their original form. -# -# IN NO EVENT SHALL THE AUTHOR BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, -# SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF -# THIS CODE, EVEN IF THE AUTHOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -# DAMAGE. -# -# THE AUTHOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -# PARTICULAR PURPOSE. THE CODE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, -# AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, -# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - -__author__ = "Steven Knight " -__revision__ = "TestCmd.py 0.37.D001 2010/01/11 16:55:50 knight" -__version__ = "0.37" - -import errno -import os -import os.path -import re -import shutil -import stat -import string -import sys -import tempfile -import time -import traceback -import types -import UserList - -__all__ = [ - 'diff_re', - 'fail_test', - 'no_result', - 'pass_test', - 'match_exact', - 'match_re', - 'match_re_dotall', - 'python_executable', - 'TestCmd' -] - -try: - import difflib -except ImportError: - __all__.append('simple_diff') - -def is_List(e): - return type(e) is types.ListType \ - or isinstance(e, UserList.UserList) - -try: - from UserString import UserString -except ImportError: - class UserString: - pass - -if hasattr(types, 'UnicodeType'): - def is_String(e): - return type(e) is types.StringType \ - or type(e) is types.UnicodeType \ - or isinstance(e, UserString) -else: - def is_String(e): - return type(e) is types.StringType or isinstance(e, UserString) - -tempfile.template = 'testcmd.' -if os.name in ('posix', 'nt'): - tempfile.template = 'testcmd.' + str(os.getpid()) + '.' -else: - tempfile.template = 'testcmd.' - -re_space = re.compile('\s') - -_Cleanup = [] - -_chain_to_exitfunc = None - -def _clean(): - global _Cleanup - cleanlist = filter(None, _Cleanup) - del _Cleanup[:] - cleanlist.reverse() - for test in cleanlist: - test.cleanup() - if _chain_to_exitfunc: - _chain_to_exitfunc() - -try: - import atexit -except ImportError: - # TODO(1.5): atexit requires python 2.0, so chain sys.exitfunc - try: - _chain_to_exitfunc = sys.exitfunc - except AttributeError: - pass - sys.exitfunc = _clean -else: - atexit.register(_clean) - -try: - zip -except NameError: - def zip(*lists): - result = [] - for i in xrange(min(map(len, lists))): - result.append(tuple(map(lambda l, i=i: l[i], lists))) - return result - -class Collector: - def __init__(self, top): - self.entries = [top] - def __call__(self, arg, dirname, names): - pathjoin = lambda n, d=dirname: os.path.join(d, n) - self.entries.extend(map(pathjoin, names)) - -def _caller(tblist, skip): - string = "" - arr = [] - for file, line, name, text in tblist: - if file[-10:] == "TestCmd.py": - break - arr = [(file, line, name, text)] + arr - atfrom = "at" - for file, line, name, text in arr[skip:]: - if name in ("?", ""): - name = "" - else: - name = " (" + name + ")" - string = string + ("%s line %d of %s%s\n" % (atfrom, line, file, name)) - atfrom = "\tfrom" - return string - -def fail_test(self = None, condition = 1, function = None, skip = 0): - """Cause the test to fail. - - By default, the fail_test() method reports that the test FAILED - and exits with a status of 1. If a condition argument is supplied, - the test fails only if the condition is true. - """ - if not condition: - return - if not function is None: - function() - of = "" - desc = "" - sep = " " - if not self is None: - if self.program: - of = " of " + self.program - sep = "\n\t" - if self.description: - desc = " [" + self.description + "]" - sep = "\n\t" - - at = _caller(traceback.extract_stack(), skip) - sys.stderr.write("FAILED test" + of + desc + sep + at) - - sys.exit(1) - -def no_result(self = None, condition = 1, function = None, skip = 0): - """Causes a test to exit with no valid result. - - By default, the no_result() method reports NO RESULT for the test - and exits with a status of 2. If a condition argument is supplied, - the test fails only if the condition is true. - """ - if not condition: - return - if not function is None: - function() - of = "" - desc = "" - sep = " " - if not self is None: - if self.program: - of = " of " + self.program - sep = "\n\t" - if self.description: - desc = " [" + self.description + "]" - sep = "\n\t" - - if os.environ.get('TESTCMD_DEBUG_SKIPS'): - at = _caller(traceback.extract_stack(), skip) - sys.stderr.write("NO RESULT for test" + of + desc + sep + at) - else: - sys.stderr.write("NO RESULT\n") - - sys.exit(2) - -def pass_test(self = None, condition = 1, function = None): - """Causes a test to pass. - - By default, the pass_test() method reports PASSED for the test - and exits with a status of 0. If a condition argument is supplied, - the test passes only if the condition is true. - """ - if not condition: - return - if not function is None: - function() - sys.stderr.write("PASSED\n") - sys.exit(0) - -def match_exact(lines = None, matches = None): - """ - """ - if not is_List(lines): - lines = string.split(lines, "\n") - if not is_List(matches): - matches = string.split(matches, "\n") - if len(lines) != len(matches): - return - for i in range(len(lines)): - if lines[i] != matches[i]: - return - return 1 - -def match_re(lines = None, res = None): - """ - """ - if not is_List(lines): - lines = string.split(lines, "\n") - if not is_List(res): - res = string.split(res, "\n") - if len(lines) != len(res): - return - for i in range(len(lines)): - s = "^" + res[i] + "$" - try: - expr = re.compile(s) - except re.error, e: - msg = "Regular expression error in %s: %s" - raise re.error, msg % (repr(s), e[0]) - if not expr.search(lines[i]): - return - return 1 - -def match_re_dotall(lines = None, res = None): - """ - """ - if not type(lines) is type(""): - lines = string.join(lines, "\n") - if not type(res) is type(""): - res = string.join(res, "\n") - s = "^" + res + "$" - try: - expr = re.compile(s, re.DOTALL) - except re.error, e: - msg = "Regular expression error in %s: %s" - raise re.error, msg % (repr(s), e[0]) - if expr.match(lines): - return 1 - -try: - import difflib -except ImportError: - pass -else: - def simple_diff(a, b, fromfile='', tofile='', - fromfiledate='', tofiledate='', n=3, lineterm='\n'): - """ - A function with the same calling signature as difflib.context_diff - (diff -c) and difflib.unified_diff (diff -u) but which prints - output like the simple, unadorned 'diff" command. - """ - sm = difflib.SequenceMatcher(None, a, b) - def comma(x1, x2): - return x1+1 == x2 and str(x2) or '%s,%s' % (x1+1, x2) - result = [] - for op, a1, a2, b1, b2 in sm.get_opcodes(): - if op == 'delete': - result.append("%sd%d" % (comma(a1, a2), b1)) - result.extend(map(lambda l: '< ' + l, a[a1:a2])) - elif op == 'insert': - result.append("%da%s" % (a1, comma(b1, b2))) - result.extend(map(lambda l: '> ' + l, b[b1:b2])) - elif op == 'replace': - result.append("%sc%s" % (comma(a1, a2), comma(b1, b2))) - result.extend(map(lambda l: '< ' + l, a[a1:a2])) - result.append('---') - result.extend(map(lambda l: '> ' + l, b[b1:b2])) - return result - -def diff_re(a, b, fromfile='', tofile='', - fromfiledate='', tofiledate='', n=3, lineterm='\n'): - """ - A simple "diff" of two sets of lines when the expected lines - are regular expressions. This is a really dumb thing that - just compares each line in turn, so it doesn't look for - chunks of matching lines and the like--but at least it lets - you know exactly which line first didn't compare correctl... - """ - result = [] - diff = len(a) - len(b) - if diff < 0: - a = a + ['']*(-diff) - elif diff > 0: - b = b + ['']*diff - i = 0 - for aline, bline in zip(a, b): - s = "^" + aline + "$" - try: - expr = re.compile(s) - except re.error, e: - msg = "Regular expression error in %s: %s" - raise re.error, msg % (repr(s), e[0]) - if not expr.search(bline): - result.append("%sc%s" % (i+1, i+1)) - result.append('< ' + repr(a[i])) - result.append('---') - result.append('> ' + repr(b[i])) - i = i+1 - return result - -if os.name == 'java': - - python_executable = os.path.join(sys.prefix, 'jython') - -else: - - python_executable = sys.executable - -if sys.platform == 'win32': - - default_sleep_seconds = 2 - - def where_is(file, path=None, pathext=None): - if path is None: - path = os.environ['PATH'] - if is_String(path): - path = string.split(path, os.pathsep) - if pathext is None: - pathext = os.environ['PATHEXT'] - if is_String(pathext): - pathext = string.split(pathext, os.pathsep) - for ext in pathext: - if string.lower(ext) == string.lower(file[-len(ext):]): - pathext = [''] - break - for dir in path: - f = os.path.join(dir, file) - for ext in pathext: - fext = f + ext - if os.path.isfile(fext): - return fext - return None - -else: - - def where_is(file, path=None, pathext=None): - if path is None: - path = os.environ['PATH'] - if is_String(path): - path = string.split(path, os.pathsep) - for dir in path: - f = os.path.join(dir, file) - if os.path.isfile(f): - try: - st = os.stat(f) - except OSError: - continue - if stat.S_IMODE(st[stat.ST_MODE]) & 0111: - return f - return None - - default_sleep_seconds = 1 - - - -try: - import subprocess -except ImportError: - # The subprocess module doesn't exist in this version of Python, - # so we're going to cobble up something that looks just enough - # like its API for our purposes below. - import new - - subprocess = new.module('subprocess') - - subprocess.PIPE = 'PIPE' - subprocess.STDOUT = 'STDOUT' - subprocess.mswindows = (sys.platform == 'win32') - - try: - import popen2 - popen2.Popen3 - except AttributeError: - class Popen3: - universal_newlines = 1 - def __init__(self, command, **kw): - if sys.platform == 'win32' and command[0] == '"': - command = '"' + command + '"' - (stdin, stdout, stderr) = os.popen3(' ' + command) - self.stdin = stdin - self.stdout = stdout - self.stderr = stderr - def close_output(self): - self.stdout.close() - self.resultcode = self.stderr.close() - def wait(self): - resultcode = self.resultcode - if os.WIFEXITED(resultcode): - return os.WEXITSTATUS(resultcode) - elif os.WIFSIGNALED(resultcode): - return os.WTERMSIG(resultcode) - else: - return None - - else: - try: - popen2.Popen4 - except AttributeError: - # A cribbed Popen4 class, with some retrofitted code from - # the Python 1.5 Popen3 class methods to do certain things - # by hand. - class Popen4(popen2.Popen3): - childerr = None - - def __init__(self, cmd, bufsize=-1): - p2cread, p2cwrite = os.pipe() - c2pread, c2pwrite = os.pipe() - self.pid = os.fork() - if self.pid == 0: - # Child - os.dup2(p2cread, 0) - os.dup2(c2pwrite, 1) - os.dup2(c2pwrite, 2) - for i in range(3, popen2.MAXFD): - try: - os.close(i) - except: pass - try: - os.execvp(cmd[0], cmd) - finally: - os._exit(1) - # Shouldn't come here, I guess - os._exit(1) - os.close(p2cread) - self.tochild = os.fdopen(p2cwrite, 'w', bufsize) - os.close(c2pwrite) - self.fromchild = os.fdopen(c2pread, 'r', bufsize) - popen2._active.append(self) - - popen2.Popen4 = Popen4 - - class Popen3(popen2.Popen3, popen2.Popen4): - universal_newlines = 1 - def __init__(self, command, **kw): - if kw.get('stderr') == 'STDOUT': - apply(popen2.Popen4.__init__, (self, command, 1)) - else: - apply(popen2.Popen3.__init__, (self, command, 1)) - self.stdin = self.tochild - self.stdout = self.fromchild - self.stderr = self.childerr - def wait(self, *args, **kw): - resultcode = apply(popen2.Popen3.wait, (self,)+args, kw) - if os.WIFEXITED(resultcode): - return os.WEXITSTATUS(resultcode) - elif os.WIFSIGNALED(resultcode): - return os.WTERMSIG(resultcode) - else: - return None - - subprocess.Popen = Popen3 - - - -# From Josiah Carlson, -# ASPN : Python Cookbook : Module to allow Asynchronous subprocess use on Windows and Posix platforms -# http://aspn.activestate.com/ASPN/Cookbook/Python/Recipe/440554 - -PIPE = subprocess.PIPE - -if subprocess.mswindows: - from win32file import ReadFile, WriteFile - from win32pipe import PeekNamedPipe - import msvcrt -else: - import select - import fcntl - - try: fcntl.F_GETFL - except AttributeError: fcntl.F_GETFL = 3 - - try: fcntl.F_SETFL - except AttributeError: fcntl.F_SETFL = 4 - -class Popen(subprocess.Popen): - def recv(self, maxsize=None): - return self._recv('stdout', maxsize) - - def recv_err(self, maxsize=None): - return self._recv('stderr', maxsize) - - def send_recv(self, input='', maxsize=None): - return self.send(input), self.recv(maxsize), self.recv_err(maxsize) - - def get_conn_maxsize(self, which, maxsize): - if maxsize is None: - maxsize = 1024 - elif maxsize < 1: - maxsize = 1 - return getattr(self, which), maxsize - - def _close(self, which): - getattr(self, which).close() - setattr(self, which, None) - - if subprocess.mswindows: - def send(self, input): - if not self.stdin: - return None - - try: - x = msvcrt.get_osfhandle(self.stdin.fileno()) - (errCode, written) = WriteFile(x, input) - except ValueError: - return self._close('stdin') - except (subprocess.pywintypes.error, Exception), why: - if why[0] in (109, errno.ESHUTDOWN): - return self._close('stdin') - raise - - return written - - def _recv(self, which, maxsize): - conn, maxsize = self.get_conn_maxsize(which, maxsize) - if conn is None: - return None - - try: - x = msvcrt.get_osfhandle(conn.fileno()) - (read, nAvail, nMessage) = PeekNamedPipe(x, 0) - if maxsize < nAvail: - nAvail = maxsize - if nAvail > 0: - (errCode, read) = ReadFile(x, nAvail, None) - except ValueError: - return self._close(which) - except (subprocess.pywintypes.error, Exception), why: - if why[0] in (109, errno.ESHUTDOWN): - return self._close(which) - raise - - #if self.universal_newlines: - # read = self._translate_newlines(read) - return read - - else: - def send(self, input): - if not self.stdin: - return None - - if not select.select([], [self.stdin], [], 0)[1]: - return 0 - - try: - written = os.write(self.stdin.fileno(), input) - except OSError, why: - if why[0] == errno.EPIPE: #broken pipe - return self._close('stdin') - raise - - return written - - def _recv(self, which, maxsize): - conn, maxsize = self.get_conn_maxsize(which, maxsize) - if conn is None: - return None - - try: - flags = fcntl.fcntl(conn, fcntl.F_GETFL) - except TypeError: - flags = None - else: - if not conn.closed: - fcntl.fcntl(conn, fcntl.F_SETFL, flags| os.O_NONBLOCK) - - try: - if not select.select([conn], [], [], 0)[0]: - return '' - - r = conn.read(maxsize) - if not r: - return self._close(which) - - #if self.universal_newlines: - # r = self._translate_newlines(r) - return r - finally: - if not conn.closed and not flags is None: - fcntl.fcntl(conn, fcntl.F_SETFL, flags) - -disconnect_message = "Other end disconnected!" - -def recv_some(p, t=.1, e=1, tr=5, stderr=0): - if tr < 1: - tr = 1 - x = time.time()+t - y = [] - r = '' - pr = p.recv - if stderr: - pr = p.recv_err - while time.time() < x or r: - r = pr() - if r is None: - if e: - raise Exception(disconnect_message) - else: - break - elif r: - y.append(r) - else: - time.sleep(max((x-time.time())/tr, 0)) - return ''.join(y) - -# TODO(3.0: rewrite to use memoryview() -def send_all(p, data): - while len(data): - sent = p.send(data) - if sent is None: - raise Exception(disconnect_message) - data = buffer(data, sent) - - - -try: - object -except NameError: - class object: - pass - - - -class TestCmd(object): - """Class TestCmd - """ - - def __init__(self, description = None, - program = None, - interpreter = None, - workdir = None, - subdir = None, - verbose = None, - match = None, - diff = None, - combine = 0, - universal_newlines = 1): - self._cwd = os.getcwd() - self.description_set(description) - self.program_set(program) - self.interpreter_set(interpreter) - if verbose is None: - try: - verbose = max( 0, int(os.environ.get('TESTCMD_VERBOSE', 0)) ) - except ValueError: - verbose = 0 - self.verbose_set(verbose) - self.combine = combine - self.universal_newlines = universal_newlines - if match is not None: - self.match_function = match - else: - self.match_function = match_re - if diff is not None: - self.diff_function = diff - else: - try: - difflib - except NameError: - pass - else: - self.diff_function = simple_diff - #self.diff_function = difflib.context_diff - #self.diff_function = difflib.unified_diff - self._dirlist = [] - self._preserve = {'pass_test': 0, 'fail_test': 0, 'no_result': 0} - if os.environ.has_key('PRESERVE') and not os.environ['PRESERVE'] is '': - self._preserve['pass_test'] = os.environ['PRESERVE'] - self._preserve['fail_test'] = os.environ['PRESERVE'] - self._preserve['no_result'] = os.environ['PRESERVE'] - else: - try: - self._preserve['pass_test'] = os.environ['PRESERVE_PASS'] - except KeyError: - pass - try: - self._preserve['fail_test'] = os.environ['PRESERVE_FAIL'] - except KeyError: - pass - try: - self._preserve['no_result'] = os.environ['PRESERVE_NO_RESULT'] - except KeyError: - pass - self._stdout = [] - self._stderr = [] - self.status = None - self.condition = 'no_result' - self.workdir_set(workdir) - self.subdir(subdir) - - def __del__(self): - self.cleanup() - - def __repr__(self): - return "%x" % id(self) - - banner_char = '=' - banner_width = 80 - - def banner(self, s, width=None): - if width is None: - width = self.banner_width - return s + self.banner_char * (width - len(s)) - - if os.name == 'posix': - - def escape(self, arg): - "escape shell special characters" - slash = '\\' - special = '"$' - - arg = string.replace(arg, slash, slash+slash) - for c in special: - arg = string.replace(arg, c, slash+c) - - if re_space.search(arg): - arg = '"' + arg + '"' - return arg - - else: - - # Windows does not allow special characters in file names - # anyway, so no need for an escape function, we will just quote - # the arg. - def escape(self, arg): - if re_space.search(arg): - arg = '"' + arg + '"' - return arg - - def canonicalize(self, path): - if is_List(path): - path = apply(os.path.join, tuple(path)) - if not os.path.isabs(path): - path = os.path.join(self.workdir, path) - return path - - def chmod(self, path, mode): - """Changes permissions on the specified file or directory - path name.""" - path = self.canonicalize(path) - os.chmod(path, mode) - - def cleanup(self, condition = None): - """Removes any temporary working directories for the specified - TestCmd environment. If the environment variable PRESERVE was - set when the TestCmd environment was created, temporary working - directories are not removed. If any of the environment variables - PRESERVE_PASS, PRESERVE_FAIL, or PRESERVE_NO_RESULT were set - when the TestCmd environment was created, then temporary working - directories are not removed if the test passed, failed, or had - no result, respectively. Temporary working directories are also - preserved for conditions specified via the preserve method. - - Typically, this method is not called directly, but is used when - the script exits to clean up temporary working directories as - appropriate for the exit status. - """ - if not self._dirlist: - return - os.chdir(self._cwd) - self.workdir = None - if condition is None: - condition = self.condition - if self._preserve[condition]: - for dir in self._dirlist: - print "Preserved directory", dir - else: - list = self._dirlist[:] - list.reverse() - for dir in list: - self.writable(dir, 1) - shutil.rmtree(dir, ignore_errors = 1) - self._dirlist = [] - - try: - global _Cleanup - _Cleanup.remove(self) - except (AttributeError, ValueError): - pass - - def command_args(self, program = None, - interpreter = None, - arguments = None): - if program: - if type(program) == type('') and not os.path.isabs(program): - program = os.path.join(self._cwd, program) - else: - program = self.program - if not interpreter: - interpreter = self.interpreter - if not type(program) in [type([]), type(())]: - program = [program] - cmd = list(program) - if interpreter: - if not type(interpreter) in [type([]), type(())]: - interpreter = [interpreter] - cmd = list(interpreter) + cmd - if arguments: - if type(arguments) == type(''): - arguments = string.split(arguments) - cmd.extend(arguments) - return cmd - - def description_set(self, description): - """Set the description of the functionality being tested. - """ - self.description = description - - try: - difflib - except NameError: - def diff(self, a, b, name, *args, **kw): - print self.banner('Expected %s' % name) - print a - print self.banner('Actual %s' % name) - print b - else: - def diff(self, a, b, name, *args, **kw): - print self.banner(name) - args = (a.splitlines(), b.splitlines()) + args - lines = apply(self.diff_function, args, kw) - for l in lines: - print l - - def fail_test(self, condition = 1, function = None, skip = 0): - """Cause the test to fail. - """ - if not condition: - return - self.condition = 'fail_test' - fail_test(self = self, - condition = condition, - function = function, - skip = skip) - - def interpreter_set(self, interpreter): - """Set the program to be used to interpret the program - under test as a script. - """ - self.interpreter = interpreter - - def match(self, lines, matches): - """Compare actual and expected file contents. - """ - return self.match_function(lines, matches) - - def match_exact(self, lines, matches): - """Compare actual and expected file contents. - """ - return match_exact(lines, matches) - - def match_re(self, lines, res): - """Compare actual and expected file contents. - """ - return match_re(lines, res) - - def match_re_dotall(self, lines, res): - """Compare actual and expected file contents. - """ - return match_re_dotall(lines, res) - - def no_result(self, condition = 1, function = None, skip = 0): - """Report that the test could not be run. - """ - if not condition: - return - self.condition = 'no_result' - no_result(self = self, - condition = condition, - function = function, - skip = skip) - - def pass_test(self, condition = 1, function = None): - """Cause the test to pass. - """ - if not condition: - return - self.condition = 'pass_test' - pass_test(self = self, condition = condition, function = function) - - def preserve(self, *conditions): - """Arrange for the temporary working directories for the - specified TestCmd environment to be preserved for one or more - conditions. If no conditions are specified, arranges for - the temporary working directories to be preserved for all - conditions. - """ - if conditions is (): - conditions = ('pass_test', 'fail_test', 'no_result') - for cond in conditions: - self._preserve[cond] = 1 - - def program_set(self, program): - """Set the executable program or script to be tested. - """ - if program and not os.path.isabs(program): - program = os.path.join(self._cwd, program) - self.program = program - - def read(self, file, mode = 'rb'): - """Reads and returns the contents of the specified file name. - The file name may be a list, in which case the elements are - concatenated with the os.path.join() method. The file is - assumed to be under the temporary working directory unless it - is an absolute path name. The I/O mode for the file may - be specified; it must begin with an 'r'. The default is - 'rb' (binary read). - """ - file = self.canonicalize(file) - if mode[0] != 'r': - raise ValueError, "mode must begin with 'r'" - with open(file, mode) as f: - result = f.read() - return result - - def rmdir(self, dir): - """Removes the specified dir name. - The dir name may be a list, in which case the elements are - concatenated with the os.path.join() method. The dir is - assumed to be under the temporary working directory unless it - is an absolute path name. - The dir must be empty. - """ - dir = self.canonicalize(dir) - os.rmdir(dir) - - def start(self, program = None, - interpreter = None, - arguments = None, - universal_newlines = None, - **kw): - """ - Starts a program or script for the test environment. - - The specified program will have the original directory - prepended unless it is enclosed in a [list]. - """ - cmd = self.command_args(program, interpreter, arguments) - cmd_string = string.join(map(self.escape, cmd), ' ') - if self.verbose: - sys.stderr.write(cmd_string + "\n") - if universal_newlines is None: - universal_newlines = self.universal_newlines - - # On Windows, if we make stdin a pipe when we plan to send - # no input, and the test program exits before - # Popen calls msvcrt.open_osfhandle, that call will fail. - # So don't use a pipe for stdin if we don't need one. - stdin = kw.get('stdin', None) - if stdin is not None: - stdin = subprocess.PIPE - - combine = kw.get('combine', self.combine) - if combine: - stderr_value = subprocess.STDOUT - else: - stderr_value = subprocess.PIPE - - return Popen(cmd, - stdin=stdin, - stdout=subprocess.PIPE, - stderr=stderr_value, - universal_newlines=universal_newlines) - - def finish(self, popen, **kw): - """ - Finishes and waits for the process being run under control of - the specified popen argument, recording the exit status, - standard output and error output. - """ - popen.stdin.close() - self.status = popen.wait() - if not self.status: - self.status = 0 - self._stdout.append(popen.stdout.read()) - if popen.stderr: - stderr = popen.stderr.read() - else: - stderr = '' - self._stderr.append(stderr) - - def run(self, program = None, - interpreter = None, - arguments = None, - chdir = None, - stdin = None, - universal_newlines = None): - """Runs a test of the program or script for the test - environment. Standard output and error output are saved for - future retrieval via the stdout() and stderr() methods. - - The specified program will have the original directory - prepended unless it is enclosed in a [list]. - """ - if chdir: - oldcwd = os.getcwd() - if not os.path.isabs(chdir): - chdir = os.path.join(self.workpath(chdir)) - if self.verbose: - sys.stderr.write("chdir(" + chdir + ")\n") - os.chdir(chdir) - p = self.start(program, - interpreter, - arguments, - universal_newlines, - stdin=stdin) - if stdin: - if is_List(stdin): - for line in stdin: - p.stdin.write(line) - else: - p.stdin.write(stdin) - p.stdin.close() - - out = p.stdout.read() - if p.stderr is None: - err = '' - else: - err = p.stderr.read() - try: - close_output = p.close_output - except AttributeError: - p.stdout.close() - if not p.stderr is None: - p.stderr.close() - else: - close_output() - - self._stdout.append(out) - self._stderr.append(err) - - self.status = p.wait() - if not self.status: - self.status = 0 - - if chdir: - os.chdir(oldcwd) - if self.verbose >= 2: - write = sys.stdout.write - write('============ STATUS: %d\n' % self.status) - out = self.stdout() - if out or self.verbose >= 3: - write('============ BEGIN STDOUT (len=%d):\n' % len(out)) - write(out) - write('============ END STDOUT\n') - err = self.stderr() - if err or self.verbose >= 3: - write('============ BEGIN STDERR (len=%d)\n' % len(err)) - write(err) - write('============ END STDERR\n') - - def sleep(self, seconds = default_sleep_seconds): - """Sleeps at least the specified number of seconds. If no - number is specified, sleeps at least the minimum number of - seconds necessary to advance file time stamps on the current - system. Sleeping more seconds is all right. - """ - time.sleep(seconds) - - def stderr(self, run = None): - """Returns the error output from the specified run number. - If there is no specified run number, then returns the error - output of the last run. If the run number is less than zero, - then returns the error output from that many runs back from the - current run. - """ - if not run: - run = len(self._stderr) - elif run < 0: - run = len(self._stderr) + run - run = run - 1 - return self._stderr[run] - - def stdout(self, run = None): - """Returns the standard output from the specified run number. - If there is no specified run number, then returns the standard - output of the last run. If the run number is less than zero, - then returns the standard output from that many runs back from - the current run. - """ - if not run: - run = len(self._stdout) - elif run < 0: - run = len(self._stdout) + run - run = run - 1 - return self._stdout[run] - - def subdir(self, *subdirs): - """Create new subdirectories under the temporary working - directory, one for each argument. An argument may be a list, - in which case the list elements are concatenated using the - os.path.join() method. Subdirectories multiple levels deep - must be created using a separate argument for each level: - - test.subdir('sub', ['sub', 'dir'], ['sub', 'dir', 'ectory']) - - Returns the number of subdirectories actually created. - """ - count = 0 - for sub in subdirs: - if sub is None: - continue - if is_List(sub): - sub = apply(os.path.join, tuple(sub)) - new = os.path.join(self.workdir, sub) - try: - os.mkdir(new) - except OSError: - pass - else: - count = count + 1 - return count - - def symlink(self, target, link): - """Creates a symlink to the specified target. - The link name may be a list, in which case the elements are - concatenated with the os.path.join() method. The link is - assumed to be under the temporary working directory unless it - is an absolute path name. The target is *not* assumed to be - under the temporary working directory. - """ - link = self.canonicalize(link) - os.symlink(target, link) - - def tempdir(self, path=None): - """Creates a temporary directory. - A unique directory name is generated if no path name is specified. - The directory is created, and will be removed when the TestCmd - object is destroyed. - """ - if path is None: - try: - path = tempfile.mktemp(prefix=tempfile.template) - except TypeError: - path = tempfile.mktemp() - os.mkdir(path) - - # Symlinks in the path will report things - # differently from os.getcwd(), so chdir there - # and back to fetch the canonical path. - cwd = os.getcwd() - try: - os.chdir(path) - path = os.getcwd() - finally: - os.chdir(cwd) - - # Uppercase the drive letter since the case of drive - # letters is pretty much random on win32: - drive,rest = os.path.splitdrive(path) - if drive: - path = string.upper(drive) + rest - - # - self._dirlist.append(path) - global _Cleanup - try: - _Cleanup.index(self) - except ValueError: - _Cleanup.append(self) - - return path - - def touch(self, path, mtime=None): - """Updates the modification time on the specified file or - directory path name. The default is to update to the - current time if no explicit modification time is specified. - """ - path = self.canonicalize(path) - atime = os.path.getatime(path) - if mtime is None: - mtime = time.time() - os.utime(path, (atime, mtime)) - - def unlink(self, file): - """Unlinks the specified file name. - The file name may be a list, in which case the elements are - concatenated with the os.path.join() method. The file is - assumed to be under the temporary working directory unless it - is an absolute path name. - """ - file = self.canonicalize(file) - os.unlink(file) - - def verbose_set(self, verbose): - """Set the verbose level. - """ - self.verbose = verbose - - def where_is(self, file, path=None, pathext=None): - """Find an executable file. - """ - if is_List(file): - file = apply(os.path.join, tuple(file)) - if not os.path.isabs(file): - file = where_is(file, path, pathext) - return file - - def workdir_set(self, path): - """Creates a temporary working directory with the specified - path name. If the path is a null string (''), a unique - directory name is created. - """ - if (path != None): - if path == '': - path = None - path = self.tempdir(path) - self.workdir = path - - def workpath(self, *args): - """Returns the absolute path name to a subdirectory or file - within the current temporary working directory. Concatenates - the temporary working directory name with the specified - arguments using the os.path.join() method. - """ - return apply(os.path.join, (self.workdir,) + tuple(args)) - - def readable(self, top, read=1): - """Make the specified directory tree readable (read == 1) - or not (read == None). - - This method has no effect on Windows systems, which use a - completely different mechanism to control file readability. - """ - - if sys.platform == 'win32': - return - - if read: - def do_chmod(fname): - try: st = os.stat(fname) - except OSError: pass - else: os.chmod(fname, stat.S_IMODE(st[stat.ST_MODE]|stat.S_IREAD)) - else: - def do_chmod(fname): - try: st = os.stat(fname) - except OSError: pass - else: os.chmod(fname, stat.S_IMODE(st[stat.ST_MODE]&~stat.S_IREAD)) - - if os.path.isfile(top): - # If it's a file, that's easy, just chmod it. - do_chmod(top) - elif read: - # It's a directory and we're trying to turn on read - # permission, so it's also pretty easy, just chmod the - # directory and then chmod every entry on our walk down the - # tree. Because os.path.walk() is top-down, we'll enable - # read permission on any directories that have it disabled - # before os.path.walk() tries to list their contents. - do_chmod(top) - - def chmod_entries(arg, dirname, names, do_chmod=do_chmod): - for n in names: - do_chmod(os.path.join(dirname, n)) - - os.path.walk(top, chmod_entries, None) - else: - # It's a directory and we're trying to turn off read - # permission, which means we have to chmod the directoreis - # in the tree bottom-up, lest disabling read permission from - # the top down get in the way of being able to get at lower - # parts of the tree. But os.path.walk() visits things top - # down, so we just use an object to collect a list of all - # of the entries in the tree, reverse the list, and then - # chmod the reversed (bottom-up) list. - col = Collector(top) - os.path.walk(top, col, None) - col.entries.reverse() - for d in col.entries: do_chmod(d) - - def writable(self, top, write=1): - """Make the specified directory tree writable (write == 1) - or not (write == None). - """ - - if sys.platform == 'win32': - - if write: - def do_chmod(fname): - try: os.chmod(fname, stat.S_IWRITE) - except OSError: pass - else: - def do_chmod(fname): - try: os.chmod(fname, stat.S_IREAD) - except OSError: pass - - else: - - if write: - def do_chmod(fname): - try: st = os.stat(fname) - except OSError: pass - else: os.chmod(fname, stat.S_IMODE(st[stat.ST_MODE]|0200)) - else: - def do_chmod(fname): - try: st = os.stat(fname) - except OSError: pass - else: os.chmod(fname, stat.S_IMODE(st[stat.ST_MODE]&~0200)) - - if os.path.isfile(top): - do_chmod(top) - else: - col = Collector(top) - os.path.walk(top, col, None) - for d in col.entries: do_chmod(d) - - def executable(self, top, execute=1): - """Make the specified directory tree executable (execute == 1) - or not (execute == None). - - This method has no effect on Windows systems, which use a - completely different mechanism to control file executability. - """ - - if sys.platform == 'win32': - return - - if execute: - def do_chmod(fname): - try: st = os.stat(fname) - except OSError: pass - else: os.chmod(fname, stat.S_IMODE(st[stat.ST_MODE]|stat.S_IEXEC)) - else: - def do_chmod(fname): - try: st = os.stat(fname) - except OSError: pass - else: os.chmod(fname, stat.S_IMODE(st[stat.ST_MODE]&~stat.S_IEXEC)) - - if os.path.isfile(top): - # If it's a file, that's easy, just chmod it. - do_chmod(top) - elif execute: - # It's a directory and we're trying to turn on execute - # permission, so it's also pretty easy, just chmod the - # directory and then chmod every entry on our walk down the - # tree. Because os.path.walk() is top-down, we'll enable - # execute permission on any directories that have it disabled - # before os.path.walk() tries to list their contents. - do_chmod(top) - - def chmod_entries(arg, dirname, names, do_chmod=do_chmod): - for n in names: - do_chmod(os.path.join(dirname, n)) - - os.path.walk(top, chmod_entries, None) - else: - # It's a directory and we're trying to turn off execute - # permission, which means we have to chmod the directories - # in the tree bottom-up, lest disabling execute permission from - # the top down get in the way of being able to get at lower - # parts of the tree. But os.path.walk() visits things top - # down, so we just use an object to collect a list of all - # of the entries in the tree, reverse the list, and then - # chmod the reversed (bottom-up) list. - col = Collector(top) - os.path.walk(top, col, None) - col.entries.reverse() - for d in col.entries: do_chmod(d) - - def write(self, file, content, mode = 'wb'): - """Writes the specified content text (second argument) to the - specified file name (first argument). The file name may be - a list, in which case the elements are concatenated with the - os.path.join() method. The file is created under the temporary - working directory. Any subdirectories in the path must already - exist. The I/O mode for the file may be specified; it must - begin with a 'w'. The default is 'wb' (binary write). - """ - file = self.canonicalize(file) - if mode[0] != 'w': - raise ValueError, "mode must begin with 'w'" - with open(file, mode) as f: - f.write(content) - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/tools/gyp/test/lib/TestCommon.py b/tools/gyp/test/lib/TestCommon.py deleted file mode 100644 index c54530c9802195c3c94b640dbc6038831436fc4b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/lib/TestCommon.py +++ /dev/null @@ -1,570 +0,0 @@ -""" -TestCommon.py: a testing framework for commands and scripts - with commonly useful error handling - -The TestCommon module provides a simple, high-level interface for writing -tests of executable commands and scripts, especially commands and scripts -that interact with the file system. All methods throw exceptions and -exit on failure, with useful error messages. This makes a number of -explicit checks unnecessary, making the test scripts themselves simpler -to write and easier to read. - -The TestCommon class is a subclass of the TestCmd class. In essence, -TestCommon is a wrapper that handles common TestCmd error conditions in -useful ways. You can use TestCommon directly, or subclass it for your -program and add additional (or override) methods to tailor it to your -program's specific needs. Alternatively, the TestCommon class serves -as a useful example of how to define your own TestCmd subclass. - -As a subclass of TestCmd, TestCommon provides access to all of the -variables and methods from the TestCmd module. Consequently, you can -use any variable or method documented in the TestCmd module without -having to explicitly import TestCmd. - -A TestCommon environment object is created via the usual invocation: - - import TestCommon - test = TestCommon.TestCommon() - -You can use all of the TestCmd keyword arguments when instantiating a -TestCommon object; see the TestCmd documentation for details. - -Here is an overview of the methods and keyword arguments that are -provided by the TestCommon class: - - test.must_be_writable('file1', ['file2', ...]) - - test.must_contain('file', 'required text\n') - - test.must_contain_all_lines(output, lines, ['title', find]) - - test.must_contain_any_line(output, lines, ['title', find]) - - test.must_exist('file1', ['file2', ...]) - - test.must_match('file', "expected contents\n") - - test.must_not_be_writable('file1', ['file2', ...]) - - test.must_not_contain('file', 'banned text\n') - - test.must_not_contain_any_line(output, lines, ['title', find]) - - test.must_not_exist('file1', ['file2', ...]) - - test.run(options = "options to be prepended to arguments", - stdout = "expected standard output from the program", - stderr = "expected error output from the program", - status = expected_status, - match = match_function) - -The TestCommon module also provides the following variables - - TestCommon.python_executable - TestCommon.exe_suffix - TestCommon.obj_suffix - TestCommon.shobj_prefix - TestCommon.shobj_suffix - TestCommon.lib_prefix - TestCommon.lib_suffix - TestCommon.dll_prefix - TestCommon.dll_suffix - -""" - -# Copyright 2000-2010 Steven Knight -# This module is free software, and you may redistribute it and/or modify -# it under the same terms as Python itself, so long as this copyright message -# and disclaimer are retained in their original form. -# -# IN NO EVENT SHALL THE AUTHOR BE LIABLE TO ANY PARTY FOR DIRECT, INDIRECT, -# SPECIAL, INCIDENTAL, OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE USE OF -# THIS CODE, EVEN IF THE AUTHOR HAS BEEN ADVISED OF THE POSSIBILITY OF SUCH -# DAMAGE. -# -# THE AUTHOR SPECIFICALLY DISCLAIMS ANY WARRANTIES, INCLUDING, BUT NOT -# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -# PARTICULAR PURPOSE. THE CODE PROVIDED HEREUNDER IS ON AN "AS IS" BASIS, -# AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE, -# SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS. - -__author__ = "Steven Knight " -__revision__ = "TestCommon.py 0.37.D001 2010/01/11 16:55:50 knight" -__version__ = "0.37" - -import copy -import os -import os.path -import stat -import string -import sys -import types -import UserList - -from TestCmd import * -from TestCmd import __all__ - -__all__.extend([ 'TestCommon', - 'exe_suffix', - 'obj_suffix', - 'shobj_prefix', - 'shobj_suffix', - 'lib_prefix', - 'lib_suffix', - 'dll_prefix', - 'dll_suffix', - ]) - -# Variables that describe the prefixes and suffixes on this system. -if sys.platform == 'win32': - exe_suffix = '.exe' - obj_suffix = '.obj' - shobj_suffix = '.obj' - shobj_prefix = '' - lib_prefix = '' - lib_suffix = '.lib' - dll_prefix = '' - dll_suffix = '.dll' -elif sys.platform == 'cygwin': - exe_suffix = '.exe' - obj_suffix = '.o' - shobj_suffix = '.os' - shobj_prefix = '' - lib_prefix = 'lib' - lib_suffix = '.a' - dll_prefix = '' - dll_suffix = '.dll' -elif string.find(sys.platform, 'irix') != -1: - exe_suffix = '' - obj_suffix = '.o' - shobj_suffix = '.o' - shobj_prefix = '' - lib_prefix = 'lib' - lib_suffix = '.a' - dll_prefix = 'lib' - dll_suffix = '.so' -elif string.find(sys.platform, 'darwin') != -1: - exe_suffix = '' - obj_suffix = '.o' - shobj_suffix = '.os' - shobj_prefix = '' - lib_prefix = 'lib' - lib_suffix = '.a' - dll_prefix = 'lib' - dll_suffix = '.dylib' -elif string.find(sys.platform, 'sunos') != -1: - exe_suffix = '' - obj_suffix = '.o' - shobj_suffix = '.os' - shobj_prefix = 'so_' - lib_prefix = 'lib' - lib_suffix = '.a' - dll_prefix = 'lib' - dll_suffix = '.dylib' -else: - exe_suffix = '' - obj_suffix = '.o' - shobj_suffix = '.os' - shobj_prefix = '' - lib_prefix = 'lib' - lib_suffix = '.a' - dll_prefix = 'lib' - dll_suffix = '.so' - -def is_List(e): - return type(e) is types.ListType \ - or isinstance(e, UserList.UserList) - -def is_writable(f): - mode = os.stat(f)[stat.ST_MODE] - return mode & stat.S_IWUSR - -def separate_files(flist): - existing = [] - missing = [] - for f in flist: - if os.path.exists(f): - existing.append(f) - else: - missing.append(f) - return existing, missing - -def _failed(self, status = 0): - if self.status is None or status is None: - return None - try: - return _status(self) not in status - except TypeError: - # status wasn't an iterable - return _status(self) != status - -def _status(self): - return self.status - -class TestCommon(TestCmd): - - # Additional methods from the Perl Test::Cmd::Common module - # that we may wish to add in the future: - # - # $test->subdir('subdir', ...); - # - # $test->copy('src_file', 'dst_file'); - - def __init__(self, **kw): - """Initialize a new TestCommon instance. This involves just - calling the base class initialization, and then changing directory - to the workdir. - """ - apply(TestCmd.__init__, [self], kw) - os.chdir(self.workdir) - - def must_be_writable(self, *files): - """Ensures that the specified file(s) exist and are writable. - An individual file can be specified as a list of directory names, - in which case the pathname will be constructed by concatenating - them. Exits FAILED if any of the files does not exist or is - not writable. - """ - files = map(lambda x: is_List(x) and apply(os.path.join, x) or x, files) - existing, missing = separate_files(files) - unwritable = filter(lambda x, iw=is_writable: not iw(x), existing) - if missing: - print "Missing files: `%s'" % string.join(missing, "', `") - if unwritable: - print "Unwritable files: `%s'" % string.join(unwritable, "', `") - self.fail_test(missing + unwritable) - - def must_contain(self, file, required, mode = 'rb'): - """Ensures that the specified file contains the required text. - """ - file_contents = self.read(file, mode) - contains = (string.find(file_contents, required) != -1) - if not contains: - print "File `%s' does not contain required string." % file - print self.banner('Required string ') - print required - print self.banner('%s contents ' % file) - print file_contents - self.fail_test(not contains) - - def must_contain_all_lines(self, output, lines, title=None, find=None): - """Ensures that the specified output string (first argument) - contains all of the specified lines (second argument). - - An optional third argument can be used to describe the type - of output being searched, and only shows up in failure output. - - An optional fourth argument can be used to supply a different - function, of the form "find(line, output), to use when searching - for lines in the output. - """ - if find is None: - find = lambda o, l: string.find(o, l) != -1 - missing = [] - for line in lines: - if not find(output, line): - missing.append(line) - - if missing: - if title is None: - title = 'output' - sys.stdout.write("Missing expected lines from %s:\n" % title) - for line in missing: - sys.stdout.write(' ' + repr(line) + '\n') - sys.stdout.write(self.banner(title + ' ')) - sys.stdout.write(output) - self.fail_test() - - def must_contain_any_line(self, output, lines, title=None, find=None): - """Ensures that the specified output string (first argument) - contains at least one of the specified lines (second argument). - - An optional third argument can be used to describe the type - of output being searched, and only shows up in failure output. - - An optional fourth argument can be used to supply a different - function, of the form "find(line, output), to use when searching - for lines in the output. - """ - if find is None: - find = lambda o, l: string.find(o, l) != -1 - for line in lines: - if find(output, line): - return - - if title is None: - title = 'output' - sys.stdout.write("Missing any expected line from %s:\n" % title) - for line in lines: - sys.stdout.write(' ' + repr(line) + '\n') - sys.stdout.write(self.banner(title + ' ')) - sys.stdout.write(output) - self.fail_test() - - def must_contain_lines(self, lines, output, title=None): - # Deprecated; retain for backwards compatibility. - return self.must_contain_all_lines(output, lines, title) - - def must_exist(self, *files): - """Ensures that the specified file(s) must exist. An individual - file be specified as a list of directory names, in which case the - pathname will be constructed by concatenating them. Exits FAILED - if any of the files does not exist. - """ - files = map(lambda x: is_List(x) and apply(os.path.join, x) or x, files) - missing = filter(lambda x: not os.path.exists(x), files) - if missing: - print "Missing files: `%s'" % string.join(missing, "', `") - self.fail_test(missing) - - def must_match(self, file, expect, mode = 'rb'): - """Matches the contents of the specified file (first argument) - against the expected contents (second argument). The expected - contents are a list of lines or a string which will be split - on newlines. - """ - file_contents = self.read(file, mode) - try: - self.fail_test(not self.match(file_contents, expect)) - except KeyboardInterrupt: - raise - except: - print "Unexpected contents of `%s'" % file - self.diff(expect, file_contents, 'contents ') - raise - - def must_not_contain(self, file, banned, mode = 'rb'): - """Ensures that the specified file doesn't contain the banned text. - """ - file_contents = self.read(file, mode) - contains = (string.find(file_contents, banned) != -1) - if contains: - print "File `%s' contains banned string." % file - print self.banner('Banned string ') - print banned - print self.banner('%s contents ' % file) - print file_contents - self.fail_test(contains) - - def must_not_contain_any_line(self, output, lines, title=None, find=None): - """Ensures that the specified output string (first argument) - does not contain any of the specified lines (second argument). - - An optional third argument can be used to describe the type - of output being searched, and only shows up in failure output. - - An optional fourth argument can be used to supply a different - function, of the form "find(line, output), to use when searching - for lines in the output. - """ - if find is None: - find = lambda o, l: string.find(o, l) != -1 - unexpected = [] - for line in lines: - if find(output, line): - unexpected.append(line) - - if unexpected: - if title is None: - title = 'output' - sys.stdout.write("Unexpected lines in %s:\n" % title) - for line in unexpected: - sys.stdout.write(' ' + repr(line) + '\n') - sys.stdout.write(self.banner(title + ' ')) - sys.stdout.write(output) - self.fail_test() - - def must_not_contain_lines(self, lines, output, title=None): - return self.must_not_contain_any_line(output, lines, title) - - def must_not_exist(self, *files): - """Ensures that the specified file(s) must not exist. - An individual file be specified as a list of directory names, in - which case the pathname will be constructed by concatenating them. - Exits FAILED if any of the files exists. - """ - files = map(lambda x: is_List(x) and apply(os.path.join, x) or x, files) - existing = filter(os.path.exists, files) - if existing: - print "Unexpected files exist: `%s'" % string.join(existing, "', `") - self.fail_test(existing) - - def must_not_be_writable(self, *files): - """Ensures that the specified file(s) exist and are not writable. - An individual file can be specified as a list of directory names, - in which case the pathname will be constructed by concatenating - them. Exits FAILED if any of the files does not exist or is - writable. - """ - files = map(lambda x: is_List(x) and apply(os.path.join, x) or x, files) - existing, missing = separate_files(files) - writable = filter(is_writable, existing) - if missing: - print "Missing files: `%s'" % string.join(missing, "', `") - if writable: - print "Writable files: `%s'" % string.join(writable, "', `") - self.fail_test(missing + writable) - - def _complete(self, actual_stdout, expected_stdout, - actual_stderr, expected_stderr, status, match): - """ - Post-processes running a subcommand, checking for failure - status and displaying output appropriately. - """ - if _failed(self, status): - expect = '' - if status != 0: - expect = " (expected %s)" % str(status) - print "%s returned %s%s" % (self.program, str(_status(self)), expect) - print self.banner('STDOUT ') - print actual_stdout - print self.banner('STDERR ') - print actual_stderr - self.fail_test() - if not expected_stdout is None and not match(actual_stdout, expected_stdout): - self.diff(expected_stdout, actual_stdout, 'STDOUT ') - if actual_stderr: - print self.banner('STDERR ') - print actual_stderr - self.fail_test() - if not expected_stderr is None and not match(actual_stderr, expected_stderr): - print self.banner('STDOUT ') - print actual_stdout - self.diff(expected_stderr, actual_stderr, 'STDERR ') - self.fail_test() - - def start(self, program = None, - interpreter = None, - arguments = None, - universal_newlines = None, - **kw): - """ - Starts a program or script for the test environment. - - This handles the "options" keyword argument and exceptions. - """ - options = kw.pop('options', None) - if options: - if arguments is None: - arguments = options - else: - arguments = options + " " + arguments - - try: - return apply(TestCmd.start, - (self, program, interpreter, arguments, universal_newlines), - kw) - except KeyboardInterrupt: - raise - except Exception, e: - print self.banner('STDOUT ') - try: - print self.stdout() - except IndexError: - pass - print self.banner('STDERR ') - try: - print self.stderr() - except IndexError: - pass - cmd_args = self.command_args(program, interpreter, arguments) - sys.stderr.write('Exception trying to execute: %s\n' % cmd_args) - raise e - - def finish(self, popen, stdout = None, stderr = '', status = 0, **kw): - """ - Finishes and waits for the process being run under control of - the specified popen argument. Additional arguments are similar - to those of the run() method: - - stdout The expected standard output from - the command. A value of None means - don't test standard output. - - stderr The expected error output from - the command. A value of None means - don't test error output. - - status The expected exit status from the - command. A value of None means don't - test exit status. - """ - apply(TestCmd.finish, (self, popen,), kw) - match = kw.get('match', self.match) - self._complete(self.stdout(), stdout, - self.stderr(), stderr, status, match) - - def run(self, options = None, arguments = None, - stdout = None, stderr = '', status = 0, **kw): - """Runs the program under test, checking that the test succeeded. - - The arguments are the same as the base TestCmd.run() method, - with the addition of: - - options Extra options that get appended to the beginning - of the arguments. - - stdout The expected standard output from - the command. A value of None means - don't test standard output. - - stderr The expected error output from - the command. A value of None means - don't test error output. - - status The expected exit status from the - command. A value of None means don't - test exit status. - - By default, this expects a successful exit (status = 0), does - not test standard output (stdout = None), and expects that error - output is empty (stderr = ""). - """ - if options: - if arguments is None: - arguments = options - else: - arguments = options + " " + arguments - kw['arguments'] = arguments - match = kw.pop('match', self.match) - apply(TestCmd.run, [self], kw) - self._complete(self.stdout(), stdout, - self.stderr(), stderr, status, match) - - def skip_test(self, message="Skipping test.\n"): - """Skips a test. - - Proper test-skipping behavior is dependent on the external - TESTCOMMON_PASS_SKIPS environment variable. If set, we treat - the skip as a PASS (exit 0), and otherwise treat it as NO RESULT. - In either case, we print the specified message as an indication - that the substance of the test was skipped. - - (This was originally added to support development under Aegis. - Technically, skipping a test is a NO RESULT, but Aegis would - treat that as a test failure and prevent the change from going to - the next step. Since we ddn't want to force anyone using Aegis - to have to install absolutely every tool used by the tests, we - would actually report to Aegis that a skipped test has PASSED - so that the workflow isn't held up.) - """ - if message: - sys.stdout.write(message) - sys.stdout.flush() - pass_skips = os.environ.get('TESTCOMMON_PASS_SKIPS') - if pass_skips in [None, 0, '0']: - # skip=1 means skip this function when showing where this - # result came from. They only care about the line where the - # script called test.skip_test(), not the line number where - # we call test.no_result(). - self.no_result(skip=1) - else: - # We're under the development directory for this change, - # so this is an Aegis invocation; pass the test (exit 0). - self.pass_test() - -# Local Variables: -# tab-width:4 -# indent-tabs-mode:nil -# End: -# vim: set expandtab tabstop=4 shiftwidth=4: diff --git a/tools/gyp/test/lib/TestGyp.py b/tools/gyp/test/lib/TestGyp.py deleted file mode 100644 index e085b7b9a8f074131a2f8ad962537bd8ebaa9e97..0000000000000000000000000000000000000000 --- a/tools/gyp/test/lib/TestGyp.py +++ /dev/null @@ -1,1420 +0,0 @@ -# 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. - -""" -TestGyp.py: a testing framework for GYP integration tests. -""" - -import collections -from contextlib import contextmanager -import itertools -import os -import random -import re -import shutil -import stat -import subprocess -import sys -import tempfile -import time - -import TestCmd -import TestCommon -from TestCommon import __all__ - -__all__.extend([ - 'TestGyp', -]) - - -def remove_debug_line_numbers(contents): - """Function to remove the line numbers from the debug output - of gyp and thus reduce the extreme fragility of the stdout - comparison tests. - """ - lines = contents.splitlines() - # split each line on ":" - lines = [l.split(":", 3) for l in lines] - # join each line back together while ignoring the - # 3rd column which is the line number - lines = [len(l) > 3 and ":".join(l[3:]) or l for l in lines] - return "\n".join(lines) - - -def match_modulo_line_numbers(contents_a, contents_b): - """File contents matcher that ignores line numbers.""" - contents_a = remove_debug_line_numbers(contents_a) - contents_b = remove_debug_line_numbers(contents_b) - return TestCommon.match_exact(contents_a, contents_b) - - -@contextmanager -def LocalEnv(local_env): - """Context manager to provide a local OS environment.""" - old_env = os.environ.copy() - os.environ.update(local_env) - try: - yield - finally: - os.environ.clear() - os.environ.update(old_env) - - -class TestGypBase(TestCommon.TestCommon): - """ - Class for controlling end-to-end tests of gyp generators. - - Instantiating this class will create a temporary directory and - arrange for its destruction (via the TestCmd superclass) and - copy all of the non-gyptest files in the directory hierarchy of the - executing script. - - The default behavior is to test the 'gyp' or 'gyp.bat' file in the - current directory. An alternative may be specified explicitly on - instantiation, or by setting the TESTGYP_GYP environment variable. - - This class should be subclassed for each supported gyp generator - (format). Various abstract methods below define calling signatures - used by the test scripts to invoke builds on the generated build - configuration and to run executables generated by those builds. - """ - - formats = [] - build_tool = None - build_tool_list = [] - - _exe = TestCommon.exe_suffix - _obj = TestCommon.obj_suffix - shobj_ = TestCommon.shobj_prefix - _shobj = TestCommon.shobj_suffix - lib_ = TestCommon.lib_prefix - _lib = TestCommon.lib_suffix - dll_ = TestCommon.dll_prefix - _dll = TestCommon.dll_suffix - - # Constants to represent different targets. - ALL = '__all__' - DEFAULT = '__default__' - - # Constants for different target types. - EXECUTABLE = '__executable__' - STATIC_LIB = '__static_lib__' - SHARED_LIB = '__shared_lib__' - - def __init__(self, gyp=None, *args, **kw): - self.origin_cwd = os.path.abspath(os.path.dirname(sys.argv[0])) - self.extra_args = sys.argv[1:] - - if not gyp: - gyp = os.environ.get('TESTGYP_GYP') - if not gyp: - if sys.platform == 'win32': - gyp = 'gyp.bat' - else: - gyp = 'gyp' - self.gyp = os.path.abspath(gyp) - self.no_parallel = False - - self.formats = [self.format] - - self.initialize_build_tool() - - kw.setdefault('match', TestCommon.match_exact) - - # Put test output in out/testworkarea by default. - # Use temporary names so there are no collisions. - workdir = os.path.join('out', kw.get('workdir', 'testworkarea')) - # Create work area if it doesn't already exist. - if not os.path.isdir(workdir): - os.makedirs(workdir) - - kw['workdir'] = tempfile.mktemp(prefix='testgyp.', dir=workdir) - - formats = kw.pop('formats', []) - - super(TestGypBase, self).__init__(*args, **kw) - - real_format = self.format.split('-')[-1] - excluded_formats = set([f for f in formats if f[0] == '!']) - included_formats = set(formats) - excluded_formats - if ('!'+real_format in excluded_formats or - included_formats and real_format not in included_formats): - msg = 'Invalid test for %r format; skipping test.\n' - self.skip_test(msg % self.format) - - self.copy_test_configuration(self.origin_cwd, self.workdir) - self.set_configuration(None) - - # Set $HOME so that gyp doesn't read the user's actual - # ~/.gyp/include.gypi file, which may contain variables - # and other settings that would change the output. - os.environ['HOME'] = self.workpath() - # Clear $GYP_DEFINES for the same reason. - if 'GYP_DEFINES' in os.environ: - del os.environ['GYP_DEFINES'] - # Override the user's language settings, which could - # otherwise make the output vary from what is expected. - os.environ['LC_ALL'] = 'C' - - def built_file_must_exist(self, name, type=None, **kw): - """ - Fails the test if the specified built file name does not exist. - """ - return self.must_exist(self.built_file_path(name, type, **kw)) - - def built_file_must_not_exist(self, name, type=None, **kw): - """ - Fails the test if the specified built file name exists. - """ - return self.must_not_exist(self.built_file_path(name, type, **kw)) - - def built_file_must_match(self, name, contents, **kw): - """ - Fails the test if the contents of the specified built file name - do not match the specified contents. - """ - return self.must_match(self.built_file_path(name, **kw), contents) - - def built_file_must_not_match(self, name, contents, **kw): - """ - Fails the test if the contents of the specified built file name - match the specified contents. - """ - return self.must_not_match(self.built_file_path(name, **kw), contents) - - def built_file_must_not_contain(self, name, contents, **kw): - """ - Fails the test if the specified built file name contains the specified - contents. - """ - return self.must_not_contain(self.built_file_path(name, **kw), contents) - - def copy_test_configuration(self, source_dir, dest_dir): - """ - Copies the test configuration from the specified source_dir - (the directory in which the test script lives) to the - specified dest_dir (a temporary working directory). - - This ignores all files and directories that begin with - the string 'gyptest', and all '.svn' subdirectories. - """ - for root, dirs, files in os.walk(source_dir): - if '.svn' in dirs: - dirs.remove('.svn') - dirs = [ d for d in dirs if not d.startswith('gyptest') ] - files = [ f for f in files if not f.startswith('gyptest') ] - for dirname in dirs: - source = os.path.join(root, dirname) - destination = source.replace(source_dir, dest_dir) - os.mkdir(destination) - if sys.platform != 'win32': - shutil.copystat(source, destination) - for filename in files: - source = os.path.join(root, filename) - destination = source.replace(source_dir, dest_dir) - shutil.copy2(source, destination) - - def initialize_build_tool(self): - """ - Initializes the .build_tool attribute. - - Searches the .build_tool_list for an executable name on the user's - $PATH. The first tool on the list is used as-is if nothing is found - on the current $PATH. - """ - for build_tool in self.build_tool_list: - if not build_tool: - continue - if os.path.isabs(build_tool): - self.build_tool = build_tool - return - build_tool = self.where_is(build_tool) - if build_tool: - self.build_tool = build_tool - return - - if self.build_tool_list: - self.build_tool = self.build_tool_list[0] - - def relocate(self, source, destination): - """ - Renames (relocates) the specified source (usually a directory) - to the specified destination, creating the destination directory - first if necessary. - - Note: Don't use this as a generic "rename" operation. In the - future, "relocating" parts of a GYP tree may affect the state of - the test to modify the behavior of later method calls. - """ - destination_dir = os.path.dirname(destination) - if not os.path.exists(destination_dir): - self.subdir(destination_dir) - os.rename(source, destination) - - def report_not_up_to_date(self): - """ - Reports that a build is not up-to-date. - - This provides common reporting for formats that have complicated - conditions for checking whether a build is up-to-date. Formats - that expect exact output from the command (make) can - just set stdout= when they call the run_build() method. - """ - print "Build is not up-to-date:" - print self.banner('STDOUT ') - print self.stdout() - stderr = self.stderr() - if stderr: - print self.banner('STDERR ') - print stderr - - def run_gyp(self, gyp_file, *args, **kw): - """ - Runs gyp against the specified gyp_file with the specified args. - """ - - # When running gyp, and comparing its output we use a comparitor - # that ignores the line numbers that gyp logs in its debug output. - if kw.pop('ignore_line_numbers', False): - kw.setdefault('match', match_modulo_line_numbers) - - # TODO: --depth=. works around Chromium-specific tree climbing. - depth = kw.pop('depth', '.') - run_args = ['--depth='+depth] - run_args.extend(['--format='+f for f in self.formats]); - run_args.append(gyp_file) - if self.no_parallel: - run_args += ['--no-parallel'] - # TODO: if extra_args contains a '--build' flag - # we really want that to only apply to the last format (self.format). - run_args.extend(self.extra_args) - # Default xcode_ninja_target_pattern to ^.*$ to fix xcode-ninja tests - xcode_ninja_target_pattern = kw.pop('xcode_ninja_target_pattern', '.*') - run_args.extend( - ['-G', 'xcode_ninja_target_pattern=%s' % xcode_ninja_target_pattern]) - run_args.extend(args) - return self.run(program=self.gyp, arguments=run_args, **kw) - - def run(self, *args, **kw): - """ - Executes a program by calling the superclass .run() method. - - This exists to provide a common place to filter out keyword - arguments implemented in this layer, without having to update - the tool-specific subclasses or clutter the tests themselves - with platform-specific code. - """ - if kw.has_key('SYMROOT'): - del kw['SYMROOT'] - super(TestGypBase, self).run(*args, **kw) - - def set_configuration(self, configuration): - """ - Sets the configuration, to be used for invoking the build - tool and testing potential built output. - """ - self.configuration = configuration - - def configuration_dirname(self): - if self.configuration: - return self.configuration.split('|')[0] - else: - return 'Default' - - def configuration_buildname(self): - if self.configuration: - return self.configuration - else: - return 'Default' - - # - # Abstract methods to be defined by format-specific subclasses. - # - - def build(self, gyp_file, target=None, **kw): - """ - Runs a build of the specified target against the configuration - generated from the specified gyp_file. - - A 'target' argument of None or the special value TestGyp.DEFAULT - specifies the default argument for the underlying build tool. - A 'target' argument of TestGyp.ALL specifies the 'all' target - (if any) of the underlying build tool. - """ - raise NotImplementedError - - def built_file_path(self, name, type=None, **kw): - """ - Returns a path to the specified file name, of the specified type. - """ - raise NotImplementedError - - def built_file_basename(self, name, type=None, **kw): - """ - Returns the base name of the specified file name, of the specified type. - - A bare=True keyword argument specifies that prefixes and suffixes shouldn't - be applied. - """ - if not kw.get('bare'): - if type == self.EXECUTABLE: - name = name + self._exe - elif type == self.STATIC_LIB: - name = self.lib_ + name + self._lib - elif type == self.SHARED_LIB: - name = self.dll_ + name + self._dll - return name - - def run_built_executable(self, name, *args, **kw): - """ - Runs an executable program built from a gyp-generated configuration. - - The specified name should be independent of any particular generator. - Subclasses should find the output executable in the appropriate - output build directory, tack on any necessary executable suffix, etc. - """ - raise NotImplementedError - - def up_to_date(self, gyp_file, target=None, **kw): - """ - Verifies that a build of the specified target is up to date. - - The subclass should implement this by calling build() - (or a reasonable equivalent), checking whatever conditions - will tell it the build was an "up to date" null build, and - failing if it isn't. - """ - raise NotImplementedError - - -class TestGypGypd(TestGypBase): - """ - Subclass for testing the GYP 'gypd' generator (spit out the - internal data structure as pretty-printed Python). - """ - format = 'gypd' - def __init__(self, gyp=None, *args, **kw): - super(TestGypGypd, self).__init__(*args, **kw) - # gypd implies the use of 'golden' files, so parallelizing conflicts as it - # causes ordering changes. - self.no_parallel = True - - -class TestGypCustom(TestGypBase): - """ - Subclass for testing the GYP with custom generator - """ - - def __init__(self, gyp=None, *args, **kw): - self.format = kw.pop("format") - super(TestGypCustom, self).__init__(*args, **kw) - - -class TestGypAndroid(TestGypBase): - """ - Subclass for testing the GYP Android makefile generator. Note that - build/envsetup.sh and lunch must have been run before running tests. - """ - format = 'android' - - # Note that we can't use mmm as the build tool because ... - # - it builds all targets, whereas we need to pass a target - # - it is a function, whereas the test runner assumes the build tool is a file - # Instead we use make and duplicate the logic from mmm. - build_tool_list = ['make'] - - # We use our custom target 'gyp_all_modules', as opposed to the 'all_modules' - # target used by mmm, to build only those targets which are part of the gyp - # target 'all'. - ALL = 'gyp_all_modules' - - def __init__(self, gyp=None, *args, **kw): - # Android requires build and test output to be inside its source tree. - # We use the following working directory for the test's source, but the - # test's build output still goes to $ANDROID_PRODUCT_OUT. - # Note that some tests explicitly set format='gypd' to invoke the gypd - # backend. This writes to the source tree, but there's no way around this. - kw['workdir'] = os.path.join('/tmp', 'gyptest', - kw.get('workdir', 'testworkarea')) - # We need to remove all gyp outputs from out/. Ths is because some tests - # don't have rules to regenerate output, so they will simply re-use stale - # output if present. Since the test working directory gets regenerated for - # each test run, this can confuse things. - # We don't have a list of build outputs because we don't know which - # dependent targets were built. Instead we delete all gyp-generated output. - # This may be excessive, but should be safe. - out_dir = os.environ['ANDROID_PRODUCT_OUT'] - obj_dir = os.path.join(out_dir, 'obj') - shutil.rmtree(os.path.join(obj_dir, 'GYP'), ignore_errors = True) - for x in ['EXECUTABLES', 'STATIC_LIBRARIES', 'SHARED_LIBRARIES']: - for d in os.listdir(os.path.join(obj_dir, x)): - if d.endswith('_gyp_intermediates'): - shutil.rmtree(os.path.join(obj_dir, x, d), ignore_errors = True) - for x in [os.path.join('obj', 'lib'), os.path.join('system', 'lib')]: - for d in os.listdir(os.path.join(out_dir, x)): - if d.endswith('_gyp.so'): - os.remove(os.path.join(out_dir, x, d)) - - super(TestGypAndroid, self).__init__(*args, **kw) - self._adb_path = os.path.join(os.environ['ANDROID_HOST_OUT'], 'bin', 'adb') - self._device_serial = None - adb_devices_out = self._call_adb(['devices']) - devices = [l.split()[0] for l in adb_devices_out.splitlines()[1:-1] - if l.split()[1] == 'device'] - if len(devices) == 0: - self._device_serial = None - else: - if len(devices) > 1: - self._device_serial = random.choice(devices) - else: - self._device_serial = devices[0] - self._call_adb(['root']) - self._to_install = set() - - def target_name(self, target): - if target == self.ALL: - return self.ALL - # The default target is 'droid'. However, we want to use our special target - # to build only the gyp target 'all'. - if target in (None, self.DEFAULT): - return self.ALL - return target - - _INSTALLABLE_PREFIX = 'Install: ' - - def build(self, gyp_file, target=None, **kw): - """ - Runs a build using the Android makefiles generated from the specified - gyp_file. This logic is taken from Android's mmm. - """ - arguments = kw.get('arguments', [])[:] - arguments.append(self.target_name(target)) - arguments.append('-C') - arguments.append(os.environ['ANDROID_BUILD_TOP']) - kw['arguments'] = arguments - chdir = kw.get('chdir', '') - makefile = os.path.join(self.workdir, chdir, 'GypAndroid.mk') - os.environ['ONE_SHOT_MAKEFILE'] = makefile - result = self.run(program=self.build_tool, **kw) - for l in self.stdout().splitlines(): - if l.startswith(TestGypAndroid._INSTALLABLE_PREFIX): - self._to_install.add(os.path.abspath(os.path.join( - os.environ['ANDROID_BUILD_TOP'], - l[len(TestGypAndroid._INSTALLABLE_PREFIX):]))) - del os.environ['ONE_SHOT_MAKEFILE'] - return result - - def android_module(self, group, name, subdir): - if subdir: - name = '%s_%s' % (subdir, name) - if group == 'SHARED_LIBRARIES': - name = 'lib_%s' % name - return '%s_gyp' % name - - def intermediates_dir(self, group, module_name): - return os.path.join(os.environ['ANDROID_PRODUCT_OUT'], 'obj', group, - '%s_intermediates' % module_name) - - def built_file_path(self, name, type=None, **kw): - """ - Returns a path to the specified file name, of the specified type, - as built by Android. Note that we don't support the configuration - parameter. - """ - # Built files are in $ANDROID_PRODUCT_OUT. This requires copying logic from - # the Android build system. - if type == None or type == self.EXECUTABLE: - return os.path.join(os.environ['ANDROID_PRODUCT_OUT'], 'obj', 'GYP', - 'shared_intermediates', name) - subdir = kw.get('subdir') - if type == self.STATIC_LIB: - group = 'STATIC_LIBRARIES' - module_name = self.android_module(group, name, subdir) - return os.path.join(self.intermediates_dir(group, module_name), - '%s.a' % module_name) - if type == self.SHARED_LIB: - group = 'SHARED_LIBRARIES' - module_name = self.android_module(group, name, subdir) - return os.path.join(self.intermediates_dir(group, module_name), 'LINKED', - '%s.so' % module_name) - assert False, 'Unhandled type' - - def _adb_failure(self, command, msg, stdout, stderr): - """ Reports a failed adb command and fails the containing test. - - Args: - command: The adb command that failed. - msg: The error description. - stdout: The standard output. - stderr: The standard error. - """ - print '%s failed%s' % (' '.join(command), ': %s' % msg if msg else '') - print self.banner('STDOUT ') - stdout.seek(0) - print stdout.read() - print self.banner('STDERR ') - stderr.seek(0) - print stderr.read() - self.fail_test() - - def _call_adb(self, command, timeout=15, retry=3): - """ Calls the provided adb command. - - If the command fails, the test fails. - - Args: - command: The adb command to call. - Returns: - The command's output. - """ - with tempfile.TemporaryFile(bufsize=0) as adb_out: - with tempfile.TemporaryFile(bufsize=0) as adb_err: - adb_command = [self._adb_path] - if self._device_serial: - adb_command += ['-s', self._device_serial] - is_shell = (command[0] == 'shell') - if is_shell: - command = [command[0], '%s; echo "\n$?";' % ' '.join(command[1:])] - adb_command += command - - for attempt in xrange(1, retry + 1): - adb_out.seek(0) - adb_out.truncate(0) - adb_err.seek(0) - adb_err.truncate(0) - proc = subprocess.Popen(adb_command, stdout=adb_out, stderr=adb_err) - deadline = time.time() + timeout - timed_out = False - while proc.poll() is None and not timed_out: - time.sleep(1) - timed_out = time.time() > deadline - if timed_out: - print 'Timeout for command %s (attempt %d of %s)' % ( - adb_command, attempt, retry) - try: - proc.kill() - except: - pass - else: - break - - if proc.returncode != 0: # returncode is None in the case of a timeout. - self._adb_failure( - adb_command, 'retcode=%s' % proc.returncode, adb_out, adb_err) - return - - adb_out.seek(0) - output = adb_out.read() - if is_shell: - output = output.splitlines(True) - try: - output[-2] = output[-2].rstrip('\r\n') - output, rc = (''.join(output[:-1]), int(output[-1])) - except ValueError: - self._adb_failure(adb_command, 'unexpected output format', - adb_out, adb_err) - if rc != 0: - self._adb_failure(adb_command, 'exited with %d' % rc, adb_out, - adb_err) - return output - - def run_built_executable(self, name, *args, **kw): - """ - Runs an executable program built from a gyp-generated configuration. - """ - match = kw.pop('match', self.match) - - executable_file = self.built_file_path(name, type=self.EXECUTABLE, **kw) - if executable_file not in self._to_install: - self.fail_test() - - if not self._device_serial: - self.skip_test(message='No devices attached.\n') - - storage = self._call_adb(['shell', 'echo', '$ANDROID_DATA']).strip() - if not len(storage): - self.fail_test() - - installed = set() - try: - for i in self._to_install: - a = os.path.abspath( - os.path.join(os.environ['ANDROID_BUILD_TOP'], i)) - dest = '%s/%s' % (storage, os.path.basename(a)) - self._call_adb(['push', os.path.abspath(a), dest]) - installed.add(dest) - if i == executable_file: - device_executable = dest - self._call_adb(['shell', 'chmod', '755', device_executable]) - - out = self._call_adb( - ['shell', 'LD_LIBRARY_PATH=$LD_LIBRARY_PATH:%s' % storage, - device_executable], - timeout=60, - retry=1) - out = out.replace('\r\n', '\n') - self._complete(out, kw.pop('stdout', None), None, None, None, match) - finally: - if len(installed): - self._call_adb(['shell', 'rm'] + list(installed)) - - def match_single_line(self, lines = None, expected_line = None): - """ - Checks that specified line appears in the text. - """ - for line in lines.split('\n'): - if line == expected_line: - return 1 - return - - def up_to_date(self, gyp_file, target=None, **kw): - """ - Verifies that a build of the specified target is up to date. - """ - kw['stdout'] = ("make: Nothing to be done for `%s'." % - self.target_name(target)) - - # We need to supply a custom matcher, since we don't want to depend on the - # exact stdout string. - kw['match'] = self.match_single_line - return self.build(gyp_file, target, **kw) - - -class TestGypCMake(TestGypBase): - """ - Subclass for testing the GYP CMake generator, using cmake's ninja backend. - """ - format = 'cmake' - build_tool_list = ['cmake'] - ALL = 'all' - - def cmake_build(self, gyp_file, target=None, **kw): - arguments = kw.get('arguments', [])[:] - - self.build_tool_list = ['cmake'] - self.initialize_build_tool() - - chdir = os.path.join(kw.get('chdir', '.'), - 'out', - self.configuration_dirname()) - kw['chdir'] = chdir - - arguments.append('-G') - arguments.append('Ninja') - - kw['arguments'] = arguments - - stderr = kw.get('stderr', None) - if stderr: - kw['stderr'] = stderr.split('$$$')[0] - - self.run(program=self.build_tool, **kw) - - def ninja_build(self, gyp_file, target=None, **kw): - arguments = kw.get('arguments', [])[:] - - self.build_tool_list = ['ninja'] - self.initialize_build_tool() - - # Add a -C output/path to the command line. - arguments.append('-C') - arguments.append(os.path.join('out', self.configuration_dirname())) - - if target not in (None, self.DEFAULT): - arguments.append(target) - - kw['arguments'] = arguments - - stderr = kw.get('stderr', None) - if stderr: - stderrs = stderr.split('$$$') - kw['stderr'] = stderrs[1] if len(stderrs) > 1 else '' - - return self.run(program=self.build_tool, **kw) - - def build(self, gyp_file, target=None, status=0, **kw): - # Two tools must be run to build, cmake and the ninja. - # Allow cmake to succeed when the overall expectation is to fail. - if status is None: - kw['status'] = None - else: - if not isinstance(status, collections.Iterable): status = (status,) - kw['status'] = list(itertools.chain((0,), status)) - self.cmake_build(gyp_file, target, **kw) - kw['status'] = status - self.ninja_build(gyp_file, target, **kw) - - def run_built_executable(self, name, *args, **kw): - # Enclosing the name in a list avoids prepending the original dir. - program = [self.built_file_path(name, type=self.EXECUTABLE, **kw)] - if sys.platform == 'darwin': - configuration = self.configuration_dirname() - os.environ['DYLD_LIBRARY_PATH'] = os.path.join('out', configuration) - return self.run(program=program, *args, **kw) - - def built_file_path(self, name, type=None, **kw): - result = [] - chdir = kw.get('chdir') - if chdir: - result.append(chdir) - result.append('out') - result.append(self.configuration_dirname()) - if type == self.STATIC_LIB: - if sys.platform != 'darwin': - result.append('obj.target') - elif type == self.SHARED_LIB: - if sys.platform != 'darwin' and sys.platform != 'win32': - result.append('lib.target') - subdir = kw.get('subdir') - if subdir and type != self.SHARED_LIB: - result.append(subdir) - result.append(self.built_file_basename(name, type, **kw)) - return self.workpath(*result) - - def up_to_date(self, gyp_file, target=None, **kw): - result = self.ninja_build(gyp_file, target, **kw) - if not result: - stdout = self.stdout() - if 'ninja: no work to do' not in stdout: - self.report_not_up_to_date() - self.fail_test() - return result - - -class TestGypMake(TestGypBase): - """ - Subclass for testing the GYP Make generator. - """ - format = 'make' - build_tool_list = ['make'] - ALL = 'all' - def build(self, gyp_file, target=None, **kw): - """ - Runs a Make build using the Makefiles generated from the specified - gyp_file. - """ - arguments = kw.get('arguments', [])[:] - if self.configuration: - arguments.append('BUILDTYPE=' + self.configuration) - if target not in (None, self.DEFAULT): - arguments.append(target) - # Sub-directory builds provide per-gyp Makefiles (i.e. - # Makefile.gyp_filename), so use that if there is no Makefile. - chdir = kw.get('chdir', '') - if not os.path.exists(os.path.join(chdir, 'Makefile')): - print "NO Makefile in " + os.path.join(chdir, 'Makefile') - arguments.insert(0, '-f') - arguments.insert(1, os.path.splitext(gyp_file)[0] + '.Makefile') - kw['arguments'] = arguments - return self.run(program=self.build_tool, **kw) - def up_to_date(self, gyp_file, target=None, **kw): - """ - Verifies that a build of the specified Make target is up to date. - """ - if target in (None, self.DEFAULT): - message_target = 'all' - else: - message_target = target - kw['stdout'] = "make: Nothing to be done for `%s'.\n" % message_target - return self.build(gyp_file, target, **kw) - def run_built_executable(self, name, *args, **kw): - """ - Runs an executable built by Make. - """ - configuration = self.configuration_dirname() - libdir = os.path.join('out', configuration, 'lib') - # TODO(piman): when everything is cross-compile safe, remove lib.target - if sys.platform == 'darwin': - # Mac puts target shared libraries right in the product directory. - configuration = self.configuration_dirname() - os.environ['DYLD_LIBRARY_PATH'] = ( - libdir + '.host:' + os.path.join('out', configuration)) - else: - os.environ['LD_LIBRARY_PATH'] = libdir + '.host:' + libdir + '.target' - # Enclosing the name in a list avoids prepending the original dir. - program = [self.built_file_path(name, type=self.EXECUTABLE, **kw)] - return self.run(program=program, *args, **kw) - def built_file_path(self, name, type=None, **kw): - """ - Returns a path to the specified file name, of the specified type, - as built by Make. - - Built files are in the subdirectory 'out/{configuration}'. - The default is 'out/Default'. - - A chdir= keyword argument specifies the source directory - relative to which the output subdirectory can be found. - - "type" values of STATIC_LIB or SHARED_LIB append the necessary - prefixes and suffixes to a platform-independent library base name. - - A subdir= keyword argument specifies a library subdirectory within - the default 'obj.target'. - """ - result = [] - chdir = kw.get('chdir') - if chdir: - result.append(chdir) - configuration = self.configuration_dirname() - result.extend(['out', configuration]) - if type == self.STATIC_LIB and sys.platform != 'darwin': - result.append('obj.target') - elif type == self.SHARED_LIB and sys.platform != 'darwin': - result.append('lib.target') - subdir = kw.get('subdir') - if subdir and type != self.SHARED_LIB: - result.append(subdir) - result.append(self.built_file_basename(name, type, **kw)) - return self.workpath(*result) - - -def ConvertToCygpath(path): - """Convert to cygwin path if we are using cygwin.""" - if sys.platform == 'cygwin': - p = subprocess.Popen(['cygpath', path], stdout=subprocess.PIPE) - path = p.communicate()[0].strip() - return path - - -def FindMSBuildInstallation(msvs_version = 'auto'): - """Returns path to MSBuild for msvs_version or latest available. - - Looks in the registry to find install location of MSBuild. - MSBuild before v4.0 will not build c++ projects, so only use newer versions. - """ - import TestWin - registry = TestWin.Registry() - - msvs_to_msbuild = { - '2013': r'12.0', - '2012': r'4.0', # Really v4.0.30319 which comes with .NET 4.5. - '2010': r'4.0'} - - msbuild_basekey = r'HKLM\SOFTWARE\Microsoft\MSBuild\ToolsVersions' - if not registry.KeyExists(msbuild_basekey): - print 'Error: could not find MSBuild base registry entry' - return None - - msbuild_version = None - if msvs_version in msvs_to_msbuild: - msbuild_test_version = msvs_to_msbuild[msvs_version] - if registry.KeyExists(msbuild_basekey + '\\' + msbuild_test_version): - msbuild_version = msbuild_test_version - else: - print ('Warning: Environment variable GYP_MSVS_VERSION specifies "%s" ' - 'but corresponding MSBuild "%s" was not found.' % - (msvs_version, msbuild_version)) - if not msbuild_version: - for msvs_version in sorted(msvs_to_msbuild, reverse=True): - msbuild_test_version = msvs_to_msbuild[msvs_version] - if registry.KeyExists(msbuild_basekey + '\\' + msbuild_test_version): - msbuild_version = msbuild_test_version - break - if not msbuild_version: - print 'Error: could not find MSBuild registry entry' - return None - - msbuild_path = registry.GetValue(msbuild_basekey + '\\' + msbuild_version, - 'MSBuildToolsPath') - if not msbuild_path: - print 'Error: could not get MSBuild registry entry value' - return None - - return os.path.join(msbuild_path, 'MSBuild.exe') - - -def FindVisualStudioInstallation(): - """Returns appropriate values for .build_tool and .uses_msbuild fields - of TestGypBase for Visual Studio. - - We use the value specified by GYP_MSVS_VERSION. If not specified, we - search %PATH% and %PATHEXT% for a devenv.{exe,bat,...} executable. - Failing that, we search for likely deployment paths. - """ - possible_roots = ['%s:\\Program Files%s' % (chr(drive), suffix) - for drive in range(ord('C'), ord('Z') + 1) - for suffix in ['', ' (x86)']] - possible_paths = { - '2013': r'Microsoft Visual Studio 12.0\Common7\IDE\devenv.com', - '2012': r'Microsoft Visual Studio 11.0\Common7\IDE\devenv.com', - '2010': r'Microsoft Visual Studio 10.0\Common7\IDE\devenv.com', - '2008': r'Microsoft Visual Studio 9.0\Common7\IDE\devenv.com', - '2005': r'Microsoft Visual Studio 8\Common7\IDE\devenv.com'} - - possible_roots = [ConvertToCygpath(r) for r in possible_roots] - - msvs_version = 'auto' - for flag in (f for f in sys.argv if f.startswith('msvs_version=')): - msvs_version = flag.split('=')[-1] - msvs_version = os.environ.get('GYP_MSVS_VERSION', msvs_version) - - if msvs_version in possible_paths: - # Check that the path to the specified GYP_MSVS_VERSION exists. - path = possible_paths[msvs_version] - for r in possible_roots: - build_tool = os.path.join(r, path) - if os.path.exists(build_tool): - uses_msbuild = msvs_version >= '2010' - msbuild_path = FindMSBuildInstallation(msvs_version) - return build_tool, uses_msbuild, msbuild_path - else: - print ('Warning: Environment variable GYP_MSVS_VERSION specifies "%s" ' - 'but corresponding "%s" was not found.' % (msvs_version, path)) - # Neither GYP_MSVS_VERSION nor the path help us out. Iterate through - # the choices looking for a match. - for version in sorted(possible_paths, reverse=True): - path = possible_paths[version] - for r in possible_roots: - build_tool = os.path.join(r, path) - if os.path.exists(build_tool): - uses_msbuild = msvs_version >= '2010' - msbuild_path = FindMSBuildInstallation(msvs_version) - return build_tool, uses_msbuild, msbuild_path - print 'Error: could not find devenv' - sys.exit(1) - -class TestGypOnMSToolchain(TestGypBase): - """ - Common subclass for testing generators that target the Microsoft Visual - Studio toolchain (cl, link, dumpbin, etc.) - """ - @staticmethod - def _ComputeVsvarsPath(devenv_path): - devenv_dir = os.path.split(devenv_path)[0] - vsvars_path = os.path.join(devenv_path, '../../Tools/vsvars32.bat') - return vsvars_path - - def initialize_build_tool(self): - super(TestGypOnMSToolchain, self).initialize_build_tool() - if sys.platform in ('win32', 'cygwin'): - build_tools = FindVisualStudioInstallation() - self.devenv_path, self.uses_msbuild, self.msbuild_path = build_tools - self.vsvars_path = TestGypOnMSToolchain._ComputeVsvarsPath( - self.devenv_path) - - def run_dumpbin(self, *dumpbin_args): - """Run the dumpbin tool with the specified arguments, and capturing and - returning stdout.""" - assert sys.platform in ('win32', 'cygwin') - cmd = os.environ.get('COMSPEC', 'cmd.exe') - arguments = [cmd, '/c', self.vsvars_path, '&&', 'dumpbin'] - arguments.extend(dumpbin_args) - proc = subprocess.Popen(arguments, stdout=subprocess.PIPE) - output = proc.communicate()[0] - assert not proc.returncode - return output - -class TestGypNinja(TestGypOnMSToolchain): - """ - Subclass for testing the GYP Ninja generator. - """ - format = 'ninja' - build_tool_list = ['ninja'] - ALL = 'all' - DEFAULT = 'all' - - def run_gyp(self, gyp_file, *args, **kw): - TestGypBase.run_gyp(self, gyp_file, *args, **kw) - - def build(self, gyp_file, target=None, **kw): - arguments = kw.get('arguments', [])[:] - - # Add a -C output/path to the command line. - arguments.append('-C') - arguments.append(os.path.join('out', self.configuration_dirname())) - - if target is None: - target = 'all' - arguments.append(target) - - kw['arguments'] = arguments - return self.run(program=self.build_tool, **kw) - - def run_built_executable(self, name, *args, **kw): - # Enclosing the name in a list avoids prepending the original dir. - program = [self.built_file_path(name, type=self.EXECUTABLE, **kw)] - if sys.platform == 'darwin': - configuration = self.configuration_dirname() - os.environ['DYLD_LIBRARY_PATH'] = os.path.join('out', configuration) - return self.run(program=program, *args, **kw) - - def built_file_path(self, name, type=None, **kw): - result = [] - chdir = kw.get('chdir') - if chdir: - result.append(chdir) - result.append('out') - result.append(self.configuration_dirname()) - if type == self.STATIC_LIB: - if sys.platform != 'darwin': - result.append('obj') - elif type == self.SHARED_LIB: - if sys.platform != 'darwin' and sys.platform != 'win32': - result.append('lib') - subdir = kw.get('subdir') - if subdir and type != self.SHARED_LIB: - result.append(subdir) - result.append(self.built_file_basename(name, type, **kw)) - return self.workpath(*result) - - def up_to_date(self, gyp_file, target=None, **kw): - result = self.build(gyp_file, target, **kw) - if not result: - stdout = self.stdout() - if 'ninja: no work to do' not in stdout: - self.report_not_up_to_date() - self.fail_test() - return result - - -class TestGypMSVS(TestGypOnMSToolchain): - """ - Subclass for testing the GYP Visual Studio generator. - """ - format = 'msvs' - - u = r'=== Build: 0 succeeded, 0 failed, (\d+) up-to-date, 0 skipped ===' - up_to_date_re = re.compile(u, re.M) - - # Initial None element will indicate to our .initialize_build_tool() - # method below that 'devenv' was not found on %PATH%. - # - # Note: we must use devenv.com to be able to capture build output. - # Directly executing devenv.exe only sends output to BuildLog.htm. - build_tool_list = [None, 'devenv.com'] - - def initialize_build_tool(self): - super(TestGypMSVS, self).initialize_build_tool() - self.build_tool = self.devenv_path - - def build(self, gyp_file, target=None, rebuild=False, clean=False, **kw): - """ - Runs a Visual Studio build using the configuration generated - from the specified gyp_file. - """ - configuration = self.configuration_buildname() - if clean: - build = '/Clean' - elif rebuild: - build = '/Rebuild' - else: - build = '/Build' - arguments = kw.get('arguments', [])[:] - arguments.extend([gyp_file.replace('.gyp', '.sln'), - build, configuration]) - # Note: the Visual Studio generator doesn't add an explicit 'all' - # target, so we just treat it the same as the default. - if target not in (None, self.ALL, self.DEFAULT): - arguments.extend(['/Project', target]) - if self.configuration: - arguments.extend(['/ProjectConfig', self.configuration]) - kw['arguments'] = arguments - return self.run(program=self.build_tool, **kw) - def up_to_date(self, gyp_file, target=None, **kw): - """ - Verifies that a build of the specified Visual Studio target is up to date. - - Beware that VS2010 will behave strangely if you build under - C:\USERS\yourname\AppData\Local. It will cause needless work. The ouptut - will be "1 succeeded and 0 up to date". MSBuild tracing reveals that: - "Project 'C:\Users\...\AppData\Local\...vcxproj' not up to date because - 'C:\PROGRAM FILES (X86)\MICROSOFT VISUAL STUDIO 10.0\VC\BIN\1033\CLUI.DLL' - was modified at 02/21/2011 17:03:30, which is newer than '' which was - modified at 01/01/0001 00:00:00. - - The workaround is to specify a workdir when instantiating the test, e.g. - test = TestGyp.TestGyp(workdir='workarea') - """ - result = self.build(gyp_file, target, **kw) - if not result: - stdout = self.stdout() - - m = self.up_to_date_re.search(stdout) - up_to_date = m and int(m.group(1)) > 0 - if not up_to_date: - self.report_not_up_to_date() - self.fail_test() - return result - def run_built_executable(self, name, *args, **kw): - """ - Runs an executable built by Visual Studio. - """ - configuration = self.configuration_dirname() - # Enclosing the name in a list avoids prepending the original dir. - program = [self.built_file_path(name, type=self.EXECUTABLE, **kw)] - return self.run(program=program, *args, **kw) - def built_file_path(self, name, type=None, **kw): - """ - Returns a path to the specified file name, of the specified type, - as built by Visual Studio. - - Built files are in a subdirectory that matches the configuration - name. The default is 'Default'. - - A chdir= keyword argument specifies the source directory - relative to which the output subdirectory can be found. - - "type" values of STATIC_LIB or SHARED_LIB append the necessary - prefixes and suffixes to a platform-independent library base name. - """ - result = [] - chdir = kw.get('chdir') - if chdir: - result.append(chdir) - result.append(self.configuration_dirname()) - if type == self.STATIC_LIB: - result.append('lib') - result.append(self.built_file_basename(name, type, **kw)) - return self.workpath(*result) - - -class TestGypMSVSNinja(TestGypNinja): - """ - Subclass for testing the GYP Visual Studio Ninja generator. - """ - format = 'msvs-ninja' - - def initialize_build_tool(self): - super(TestGypMSVSNinja, self).initialize_build_tool() - # When using '--build', make sure ninja is first in the format list. - self.formats.insert(0, 'ninja') - - def build(self, gyp_file, target=None, rebuild=False, clean=False, **kw): - """ - Runs a Visual Studio build using the configuration generated - from the specified gyp_file. - """ - arguments = kw.get('arguments', [])[:] - if target in (None, self.ALL, self.DEFAULT): - # Note: the Visual Studio generator doesn't add an explicit 'all' target. - # This will build each project. This will work if projects are hermetic, - # but may fail if they are not (a project may run more than once). - # It would be nice to supply an all.metaproj for MSBuild. - arguments.extend([gyp_file.replace('.gyp', '.sln')]) - else: - # MSBuild documentation claims that one can specify a sln but then build a - # project target like 'msbuild a.sln /t:proj:target' but this format only - # supports 'Clean', 'Rebuild', and 'Publish' (with none meaning Default). - # This limitation is due to the .sln -> .sln.metaproj conversion. - # The ':' is not special, 'proj:target' is a target in the metaproj. - arguments.extend([target+'.vcxproj']) - - if clean: - build = 'Clean' - elif rebuild: - build = 'Rebuild' - else: - build = 'Build' - arguments.extend(['/target:'+build]) - configuration = self.configuration_buildname() - config = configuration.split('|') - arguments.extend(['/property:Configuration='+config[0]]) - if len(config) > 1: - arguments.extend(['/property:Platform='+config[1]]) - arguments.extend(['/property:BuildInParallel=false']) - arguments.extend(['/verbosity:minimal']) - - kw['arguments'] = arguments - return self.run(program=self.msbuild_path, **kw) - - -class TestGypXcode(TestGypBase): - """ - Subclass for testing the GYP Xcode generator. - """ - format = 'xcode' - build_tool_list = ['xcodebuild'] - - phase_script_execution = ("\n" - "PhaseScriptExecution /\\S+/Script-[0-9A-F]+\\.sh\n" - " cd /\\S+\n" - " /bin/sh -c /\\S+/Script-[0-9A-F]+\\.sh\n" - "(make: Nothing to be done for `all'\\.\n)?") - - strip_up_to_date_expressions = [ - # Various actions or rules can run even when the overall build target - # is up to date. Strip those phases' GYP-generated output. - re.compile(phase_script_execution, re.S), - - # The message from distcc_pump can trail the "BUILD SUCCEEDED" - # message, so strip that, too. - re.compile('__________Shutting down distcc-pump include server\n', re.S), - ] - - up_to_date_endings = ( - 'Checking Dependencies...\n** BUILD SUCCEEDED **\n', # Xcode 3.0/3.1 - 'Check dependencies\n** BUILD SUCCEEDED **\n\n', # Xcode 3.2 - 'Check dependencies\n\n\n** BUILD SUCCEEDED **\n\n', # Xcode 4.2 - 'Check dependencies\n\n** BUILD SUCCEEDED **\n\n', # Xcode 5.0 - ) - - def build(self, gyp_file, target=None, **kw): - """ - Runs an xcodebuild using the .xcodeproj generated from the specified - gyp_file. - """ - # Be sure we're working with a copy of 'arguments' since we modify it. - # The caller may not be expecting it to be modified. - arguments = kw.get('arguments', [])[:] - arguments.extend(['-project', gyp_file.replace('.gyp', '.xcodeproj')]) - if target == self.ALL: - arguments.append('-alltargets',) - elif target not in (None, self.DEFAULT): - arguments.extend(['-target', target]) - if self.configuration: - arguments.extend(['-configuration', self.configuration]) - symroot = kw.get('SYMROOT', '$SRCROOT/build') - if symroot: - arguments.append('SYMROOT='+symroot) - kw['arguments'] = arguments - - # Work around spurious stderr output from Xcode 4, http://crbug.com/181012 - match = kw.pop('match', self.match) - def match_filter_xcode(actual, expected): - if actual: - if not TestCmd.is_List(actual): - actual = actual.split('\n') - if not TestCmd.is_List(expected): - expected = expected.split('\n') - actual = [a for a in actual - if 'No recorder, buildTask: - -#ifdef _WIN32 -__declspec(dllexport) -#endif -void lib1_function(void) -{ - fprintf(stdout, "Hello from lib1.c\n"); - fflush(stdout); -} diff --git a/tools/gyp/test/library/src/lib1_moveable.c b/tools/gyp/test/library/src/lib1_moveable.c deleted file mode 100644 index 5d3cc1d9aab267e71b49118055b0b350a11b06de..0000000000000000000000000000000000000000 --- a/tools/gyp/test/library/src/lib1_moveable.c +++ /dev/null @@ -1,10 +0,0 @@ -#include - -#ifdef _WIN32 -__declspec(dllexport) -#endif -void moveable_function(void) -{ - fprintf(stdout, "Hello from lib1_moveable.c\n"); - fflush(stdout); -} diff --git a/tools/gyp/test/library/src/lib2.c b/tools/gyp/test/library/src/lib2.c deleted file mode 100644 index 21dda726530fc2adf25a45062e303c3a06cb8ef2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/library/src/lib2.c +++ /dev/null @@ -1,10 +0,0 @@ -#include - -#ifdef _WIN32 -__declspec(dllexport) -#endif -void lib2_function(void) -{ - fprintf(stdout, "Hello from lib2.c\n"); - fflush(stdout); -} diff --git a/tools/gyp/test/library/src/lib2_moveable.c b/tools/gyp/test/library/src/lib2_moveable.c deleted file mode 100644 index f645071d1eb863e0e61b006a7fbb1b849f8d129c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/library/src/lib2_moveable.c +++ /dev/null @@ -1,10 +0,0 @@ -#include - -#ifdef _WIN32 -__declspec(dllexport) -#endif -void moveable_function(void) -{ - fprintf(stdout, "Hello from lib2_moveable.c\n"); - fflush(stdout); -} diff --git a/tools/gyp/test/library/src/library.gyp b/tools/gyp/test/library/src/library.gyp deleted file mode 100644 index bc355164260373a898d8cc8adae7a2b029356967..0000000000000000000000000000000000000000 --- a/tools/gyp/test/library/src/library.gyp +++ /dev/null @@ -1,58 +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. - -{ - 'variables': { - 'moveable_function%': 0, - }, - 'targets': [ - { - 'target_name': 'program', - 'type': 'executable', - 'dependencies': [ - 'lib1', - 'lib2', - ], - 'sources': [ - 'program.c', - ], - }, - { - 'target_name': 'lib1', - 'type': '<(library)', - 'sources': [ - 'lib1.c', - ], - 'conditions': [ - ['moveable_function=="lib1"', { - 'sources': [ - 'lib1_moveable.c', - ], - }], - ], - }, - { - 'target_name': 'lib2', - 'type': '<(library)', - 'sources': [ - 'lib2.c', - ], - 'conditions': [ - ['moveable_function=="lib2"', { - 'sources': [ - 'lib2_moveable.c', - ], - }], - ], - }, - ], - 'conditions': [ - ['OS=="linux"', { - 'target_defaults': { - # Support 64-bit shared libs (also works fine for 32-bit). - 'cflags': ['-fPIC'], - }, - }], - ], -} diff --git a/tools/gyp/test/library/src/program.c b/tools/gyp/test/library/src/program.c deleted file mode 100644 index d460f60e40511f5c33d515090da83bdb0f1f60e2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/library/src/program.c +++ /dev/null @@ -1,15 +0,0 @@ -#include - -extern void lib1_function(void); -extern void lib2_function(void); -extern void moveable_function(void); - -int main(void) -{ - fprintf(stdout, "Hello from program.c\n"); - fflush(stdout); - lib1_function(); - lib2_function(); - moveable_function(); - return 0; -} diff --git a/tools/gyp/test/library/src/shared_dependency.gyp b/tools/gyp/test/library/src/shared_dependency.gyp deleted file mode 100644 index 7d29f5de598551ef730a13d6351a87dd2856e54c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/library/src/shared_dependency.gyp +++ /dev/null @@ -1,33 +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': 'lib1', - 'type': 'shared_library', - 'sources': [ - 'lib1.c', - ], - }, - { - 'target_name': 'lib2', - 'type': 'shared_library', - 'sources': [ - 'lib2.c', - ], - 'dependencies': [ - 'lib1', - ], - }, - ], - 'conditions': [ - ['OS=="linux"', { - 'target_defaults': { - # Support 64-bit shared libs (also works fine for 32-bit). - 'cflags': ['-fPIC'], - }, - }], - ], -} diff --git a/tools/gyp/test/library_dirs/gyptest-library-dirs.py b/tools/gyp/test/library_dirs/gyptest-library-dirs.py deleted file mode 100644 index 5edd6e757918e62d2b579723bbd5ce0a1d713dd2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/library_dirs/gyptest-library-dirs.py +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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 library_dirs (in link_settings) are properly found. -""" - -import sys - -import TestGyp - -test = TestGyp.TestGyp(formats=['!android']) - -lib_dir = test.tempdir('secret_location') - -test.run_gyp('test.gyp', - '-D', 'abs_path_to_secret_library_location={0}'.format(lib_dir), - chdir='subdir') - -# Must build each target independently, since they are not in each others' -# 'dependencies' (test.ALL does NOT work here for some builders, and in any case -# would not ensure the correct ordering). -test.build('test.gyp', 'mylib', chdir='subdir') -test.build('test.gyp', 'libraries-search-path-test', chdir='subdir') - -expect = """Hello world -""" -test.run_built_executable( - 'libraries-search-path-test', chdir='subdir', stdout=expect) - -if sys.platform in ('win32', 'cygwin'): - test.run_gyp('test-win.gyp', - '-D', - 'abs_path_to_secret_library_location={0}'.format(lib_dir), - chdir='subdir') - - test.build('test.gyp', 'mylib', chdir='subdir') - test.build('test-win.gyp', - 'libraries-search-path-test-lib-suffix', - chdir='subdir') - - test.run_built_executable( - 'libraries-search-path-test-lib-suffix', chdir='subdir', stdout=expect) - - -test.pass_test() -test.cleanup() diff --git a/tools/gyp/test/library_dirs/subdir/README.txt b/tools/gyp/test/library_dirs/subdir/README.txt deleted file mode 100644 index 4031ded85f6301250ab8c1f985f9531d9c94db55..0000000000000000000000000000000000000000 --- a/tools/gyp/test/library_dirs/subdir/README.txt +++ /dev/null @@ -1 +0,0 @@ -Make things live in a subdirectory, to make sure that DEPTH works correctly. diff --git a/tools/gyp/test/library_dirs/subdir/hello.cc b/tools/gyp/test/library_dirs/subdir/hello.cc deleted file mode 100644 index 5dbbd48d349c4e5e06c82ff483b94ef3565a04af..0000000000000000000000000000000000000000 --- a/tools/gyp/test/library_dirs/subdir/hello.cc +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) 2013 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. - -#include -#include "mylib.h" - -int main() { - std::cout << "Hello " << my_foo(99) << std::endl; - return 0; -} diff --git a/tools/gyp/test/library_dirs/subdir/mylib.cc b/tools/gyp/test/library_dirs/subdir/mylib.cc deleted file mode 100644 index 654f3d0e6cc8d265e2cc65708811374211a4607d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/library_dirs/subdir/mylib.cc +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) 2013 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. - -#include "mylib.h" - -std::string my_foo(int x) { - return std::string("world"); -} diff --git a/tools/gyp/test/library_dirs/subdir/mylib.h b/tools/gyp/test/library_dirs/subdir/mylib.h deleted file mode 100644 index 84b4022e7b180b7495d7fafd78ec02acec0c965a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/library_dirs/subdir/mylib.h +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2013 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. - -#ifndef TEST_LIBRARY_DIRS_SUBDIR_MYLIB_H -#define TEST_LIBRARY_DIRS_SUBDIR_MYLIB_H - -#include - -std::string my_foo(int); - -#endif // TEST_LIBRARY_DIRS_SUBDIR_MYLIB_H diff --git a/tools/gyp/test/library_dirs/subdir/test-win.gyp b/tools/gyp/test/library_dirs/subdir/test-win.gyp deleted file mode 100644 index 033b6f7fdd03c6652d11c95fa9afa3056bd97ed9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/library_dirs/subdir/test-win.gyp +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright (c) 2013 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': [ - { - # This creates a static library and puts it in a nonstandard location for - # libraries-search-path-test. - 'target_name': 'mylib', - 'type': 'static_library', - 'standalone_static_library': 1, - # This directory is NOT in the default library search locations. It also - # MUST be passed in on the gyp command line: - # - # -D abs_path_to_secret_library_location=/some_absolute_path - # - # The gyptest itself (../gyptest-library-dirs.py) provides this. - 'product_dir': '<(abs_path_to_secret_library_location)', - 'sources': [ - 'mylib.cc', - ], - }, - { - 'target_name': 'libraries-search-path-test-lib-suffix', - 'type': 'executable', - 'dependencies': [ - # It is important to NOT list the mylib as a dependency here, because - # some build systems will track it down based on its product_dir, - # such that the link succeeds even without the library_dirs below. - # - # The point of this weird structuring is to ensure that 'library_dirs' - # works as advertised, such that just '-lmylib' (or its equivalent) - # works based on the directories that library_dirs puts in the library - # link path. - # - # If 'mylib' was listed as a proper dependency here, the build system - # would find it and link with its path on disk. - # - # Note that this implies 'mylib' must already be built when building - # 'libraries-search-path-test' (see ../gyptest-library-dirs.py). - # - #'mylib', - ], - 'sources': [ - 'hello.cc', - ], - # Note that without this, the mylib library would not be found and - # successfully linked. - 'library_dirs': [ - '<(abs_path_to_secret_library_location)', - ], - 'link_settings': { - 'libraries': [ - '-lmylib.lib', - ], - }, - }, - ], -} diff --git a/tools/gyp/test/library_dirs/subdir/test.gyp b/tools/gyp/test/library_dirs/subdir/test.gyp deleted file mode 100644 index f83d7f2bf1f8ff1bf3a51455f5528b8fe0475422..0000000000000000000000000000000000000000 --- a/tools/gyp/test/library_dirs/subdir/test.gyp +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright (c) 2013 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': [ - { - # This creates a static library and puts it in a nonstandard location for - # libraries-search-path-test. - 'target_name': 'mylib', - 'type': 'static_library', - 'standalone_static_library': 1, - # This directory is NOT in the default library search locations. It also - # MUST be passed in on the gyp command line: - # - # -D abs_path_to_secret_library_location=/some_absolute_path - # - # The gyptest itself (../gyptest-library-dirs.py) provides this. - 'product_dir': '<(abs_path_to_secret_library_location)', - 'sources': [ - 'mylib.cc', - ], - }, - { - 'target_name': 'libraries-search-path-test', - 'type': 'executable', - 'dependencies': [ - # It is important to NOT list the mylib as a dependency here, because - # some build systems will track it down based on its product_dir, - # such that the link succeeds even without the library_dirs below. - # - # The point of this weird structuring is to ensure that 'library_dirs' - # works as advertised, such that just '-lmylib' (or its equivalent) - # works based on the directories that library_dirs puts in the library - # link path. - # - # If 'mylib' was listed as a proper dependency here, the build system - # would find it and link with its path on disk. - # - # Note that this implies 'mylib' must already be built when building - # 'libraries-search-path-test' (see ../gyptest-library-dirs.py). - # - #'mylib', - ], - 'sources': [ - 'hello.cc', - ], - # Note that without this, the mylib library would not be found and - # successfully linked. - 'library_dirs': [ - '<(abs_path_to_secret_library_location)', - ], - 'link_settings': { - 'conditions': [ - ['OS=="linux"', { - 'libraries': [ - '-lmylib', - ], - }, { # else - 'libraries': [ - '<(STATIC_LIB_PREFIX)mylib<(STATIC_LIB_SUFFIX)', - ], - }], - ], # conditions - }, - }, - ], -} diff --git a/tools/gyp/test/link-dependency/gyptest-link-dependency.py b/tools/gyp/test/link-dependency/gyptest-link-dependency.py deleted file mode 100755 index 3a8300d44e0031509237b72baaa5882e14e749ac..0000000000000000000000000000000000000000 --- a/tools/gyp/test/link-dependency/gyptest-link-dependency.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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. - -""" -Verify that a target marked as 'link_dependency==1' isn't being pulled into -the 'none' target's dependency (which would otherwise lead to a dependency -cycle in ninja). -""" - -import TestGyp - -# See https://codereview.chromium.org/177043010/#msg15 for why this doesn't -# work with cmake. -test = TestGyp.TestGyp(formats=['!cmake']) - -test.run_gyp('test.gyp') -test.build('test.gyp', 'main') - -# If running gyp worked, all is well. -test.pass_test() diff --git a/tools/gyp/test/link-dependency/main.c b/tools/gyp/test/link-dependency/main.c deleted file mode 100644 index 543d8b6951eecb40ffdf913abe90760b4a60702f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/link-dependency/main.c +++ /dev/null @@ -1,7 +0,0 @@ -#include -#include -int main() { - void *p = malloc(1); - printf("p: %p\n", p); - return 0; -} diff --git a/tools/gyp/test/link-dependency/mymalloc.c b/tools/gyp/test/link-dependency/mymalloc.c deleted file mode 100644 index f80bc02a62682eaf5c01b47af0b950f49eef007b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/link-dependency/mymalloc.c +++ /dev/null @@ -1,12 +0,0 @@ -#include - -// The windows ninja generator is expecting an import library to get generated, -// but it doesn't if there are no exports. -#ifdef _MSC_VER -__declspec(dllexport) void foo() {} -#endif - -void *malloc(size_t size) { - (void)size; - return (void*)0xdeadbeef; -} diff --git a/tools/gyp/test/link-dependency/test.gyp b/tools/gyp/test/link-dependency/test.gyp deleted file mode 100644 index e0ac7f2670c0a3ddebcb7978d60cf99290512994..0000000000000000000000000000000000000000 --- a/tools/gyp/test/link-dependency/test.gyp +++ /dev/null @@ -1,37 +0,0 @@ -{ - 'variables': { - 'custom_malloc%' : 1, - }, - 'target_defaults': { - 'conditions': [ - ['custom_malloc==1', { - 'dependencies': [ - 'malloc', - ], - }], - ], - }, - 'targets': [ - { - 'target_name': 'main', - 'type': 'none', - 'dependencies': [ 'main_initial',], - }, - { - 'target_name': 'main_initial', - 'type': 'executable', - 'product_name': 'main', - 'sources': [ 'main.c' ], - }, - { - 'target_name': 'malloc', - 'type': 'shared_library', - 'variables': { - 'prune_self_dependency': 1, - # Targets with type 'none' won't depend on this target. - 'link_dependency': 1, - }, - 'sources': [ 'mymalloc.c' ], - }, - ], -} diff --git a/tools/gyp/test/link-objects/base.c b/tools/gyp/test/link-objects/base.c deleted file mode 100644 index 332745920522cd84f21393d40d2df326de728cdf..0000000000000000000000000000000000000000 --- a/tools/gyp/test/link-objects/base.c +++ /dev/null @@ -1,6 +0,0 @@ -void extra(); - -int main(void) { - extra(); - return 0; -} diff --git a/tools/gyp/test/link-objects/extra.c b/tools/gyp/test/link-objects/extra.c deleted file mode 100644 index 1d7ee09b1079a6146198907cf0de85cd7cd8f803..0000000000000000000000000000000000000000 --- a/tools/gyp/test/link-objects/extra.c +++ /dev/null @@ -1,5 +0,0 @@ -#include - -void extra() { - printf("PASS\n"); -} diff --git a/tools/gyp/test/link-objects/gyptest-all.py b/tools/gyp/test/link-objects/gyptest-all.py deleted file mode 100755 index 45bd6e1891357d435d14866262244972ffb4d843..0000000000000000000000000000000000000000 --- a/tools/gyp/test/link-objects/gyptest-all.py +++ /dev/null @@ -1,28 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Put an object file on the sources list. -Expect the result to link ok. -""" - -import TestGyp - -import sys - -if sys.platform != 'darwin': - # Currently only works under the linux make build. - test = TestGyp.TestGyp(formats=['make']) - - test.run_gyp('link-objects.gyp') - - test.build('link-objects.gyp', test.ALL) - - test.run_built_executable('link-objects', stdout="PASS\n") - - test.up_to_date('link-objects.gyp', test.ALL) - - test.pass_test() diff --git a/tools/gyp/test/link-objects/link-objects.gyp b/tools/gyp/test/link-objects/link-objects.gyp deleted file mode 100644 index ab72855531ae61f493dd7dddadc1d4d117fa65bd..0000000000000000000000000000000000000000 --- a/tools/gyp/test/link-objects/link-objects.gyp +++ /dev/null @@ -1,24 +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': 'link-objects', - 'type': 'executable', - 'actions': [ - { - 'action_name': 'build extra object', - 'inputs': ['extra.c'], - 'outputs': ['extra.o'], - 'action': ['gcc', '-o', 'extra.o', '-c', 'extra.c'], - 'process_outputs_as_sources': 1, - }, - ], - 'sources': [ - 'base.c', - ], - }, - ], -} diff --git a/tools/gyp/test/linux/gyptest-implicit-rpath.py b/tools/gyp/test/linux/gyptest-implicit-rpath.py deleted file mode 100644 index dd7718c76dbf9209c6cb2fec3a622811abe7230e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/linux/gyptest-implicit-rpath.py +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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 that the implicit rpath is added only when needed. -""" - -import TestGyp - -import re -import subprocess -import sys - -if sys.platform.startswith('linux'): - test = TestGyp.TestGyp(formats=['ninja', 'make']) - - CHDIR = 'implicit-rpath' - test.run_gyp('test.gyp', chdir=CHDIR) - test.build('test.gyp', test.ALL, chdir=CHDIR) - - def GetRpaths(p): - p = test.built_file_path(p, chdir=CHDIR) - r = re.compile(r'Library rpath: \[([^\]]+)\]') - proc = subprocess.Popen(['readelf', '-d', p], stdout=subprocess.PIPE) - o = proc.communicate()[0] - assert not proc.returncode - return r.findall(o) - - if test.format == 'ninja': - expect = '$ORIGIN/lib/' - elif test.format == 'make': - expect = '$ORIGIN/lib.target/' - else: - test.fail_test() - - if GetRpaths('shared_executable') != [expect]: - test.fail_test() - - if GetRpaths('shared_executable_no_so_suffix') != [expect]: - test.fail_test() - - if GetRpaths('static_executable'): - test.fail_test() - - test.pass_test() diff --git a/tools/gyp/test/linux/implicit-rpath/file.c b/tools/gyp/test/linux/implicit-rpath/file.c deleted file mode 100644 index 56757a701bf5cfd58c3d4b546d3444da4cf30711..0000000000000000000000000000000000000000 --- a/tools/gyp/test/linux/implicit-rpath/file.c +++ /dev/null @@ -1 +0,0 @@ -void f() {} diff --git a/tools/gyp/test/linux/implicit-rpath/main.c b/tools/gyp/test/linux/implicit-rpath/main.c deleted file mode 100644 index 237c8ce181774d991a9dbdd8cacf1a5fb9f199f1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/linux/implicit-rpath/main.c +++ /dev/null @@ -1 +0,0 @@ -int main() {} diff --git a/tools/gyp/test/linux/implicit-rpath/test.gyp b/tools/gyp/test/linux/implicit-rpath/test.gyp deleted file mode 100644 index b546106986e19d3b295e117e4712ca16cc35513f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/linux/implicit-rpath/test.gyp +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright (c) 2013 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': 'shared', - 'type': 'shared_library', - 'sources': [ 'file.c' ], - }, - { - 'target_name': 'shared_no_so_suffix', - 'product_extension': 'so.0.1', - 'type': 'shared_library', - 'sources': [ 'file.c' ], - }, - { - 'target_name': 'static', - 'type': 'static_library', - 'sources': [ 'file.c' ], - }, - { - 'target_name': 'shared_executable', - 'type': 'executable', - 'sources': [ 'main.c' ], - 'dependencies': [ - 'shared', - ] - }, - { - 'target_name': 'shared_executable_no_so_suffix', - 'type': 'executable', - 'sources': [ 'main.c' ], - 'dependencies': [ - 'shared_no_so_suffix', - ] - }, - { - 'target_name': 'static_executable', - 'type': 'executable', - 'sources': [ 'main.c' ], - 'dependencies': [ - 'static', - ] - }, - ], -} diff --git a/tools/gyp/test/mac/action-envvars/action/action.gyp b/tools/gyp/test/mac/action-envvars/action/action.gyp deleted file mode 100644 index 443ea3b33c24fd80dd70d170f56f4bcd488ea53c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/action-envvars/action/action.gyp +++ /dev/null @@ -1,33 +0,0 @@ -# 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': 'action', - 'type': 'none', - 'actions': [ - { - 'inputs': [ ], - 'outputs': [ - '<(PRODUCT_DIR)/result', - '<(SHARED_INTERMEDIATE_DIR)/tempfile', - ], - 'action_name': 'Test action', - 'action': ['./action.sh', '<(SHARED_INTERMEDIATE_DIR)/tempfile' ], - }, - { - 'inputs': [ - '<(SHARED_INTERMEDIATE_DIR)/tempfile', - ], - 'outputs': [ - '<(PRODUCT_DIR)/other_result', - ], - 'action_name': 'Other test action', - 'action': ['cp', '<(SHARED_INTERMEDIATE_DIR)/tempfile', - '<(PRODUCT_DIR)/other_result' ], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/mac/action-envvars/action/action.sh b/tools/gyp/test/mac/action-envvars/action/action.sh deleted file mode 100755 index 48d5f6bf86454faa12eee8d95e91b5997a2f06c6..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/action-envvars/action/action.sh +++ /dev/null @@ -1,8 +0,0 @@ -# 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. - -set -e - -echo 'Test output' > "${BUILT_PRODUCTS_DIR}/result" -echo 'Other output' > "$1" diff --git a/tools/gyp/test/mac/app-bundle/TestApp/English.lproj/InfoPlist-error.strings b/tools/gyp/test/mac/app-bundle/TestApp/English.lproj/InfoPlist-error.strings deleted file mode 100644 index 452e7fabf9dc84a983768c28d1d5d0869e13f979..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/app-bundle/TestApp/English.lproj/InfoPlist-error.strings +++ /dev/null @@ -1,3 +0,0 @@ -/* Localized versions of Info.plist keys */ - -NSHumanReadableCopyright = "Copyright ©2011 Google Inc." diff --git a/tools/gyp/test/mac/app-bundle/TestApp/English.lproj/InfoPlist.strings b/tools/gyp/test/mac/app-bundle/TestApp/English.lproj/InfoPlist.strings deleted file mode 100644 index 35bd33a96e6a305910a5e716c158adc3e1b013c0..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/app-bundle/TestApp/English.lproj/InfoPlist.strings +++ /dev/null @@ -1,3 +0,0 @@ -/* Localized versions of Info.plist keys */ - -NSHumanReadableCopyright = "Copyright ©2011 Google Inc."; diff --git a/tools/gyp/test/mac/app-bundle/TestApp/English.lproj/MainMenu.xib b/tools/gyp/test/mac/app-bundle/TestApp/English.lproj/MainMenu.xib deleted file mode 100644 index 4524596787a8bde088b943a6eb0f9b3be220915f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/app-bundle/TestApp/English.lproj/MainMenu.xib +++ /dev/null @@ -1,4119 +0,0 @@ - - - - 1060 - 10A324 - 719 - 1015 - 418.00 - - com.apple.InterfaceBuilder.CocoaPlugin - 719 - - - YES - - - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - - - YES - - YES - - - YES - - - - YES - - NSApplication - - - FirstResponder - - - NSApplication - - - AMainMenu - - YES - - - TestApp - - 1048576 - 2147483647 - - NSImage - NSMenuCheckmark - - - NSImage - NSMenuMixedState - - submenuAction: - - TestApp - - YES - - - About TestApp - - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Preferences… - , - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Services - - 1048576 - 2147483647 - - - submenuAction: - - Services - - YES - - _NSServicesMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Hide TestApp - h - 1048576 - 2147483647 - - - - - - Hide Others - h - 1572864 - 2147483647 - - - - - - Show All - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Quit TestApp - q - 1048576 - 2147483647 - - - - - _NSAppleMenu - - - - - File - - 1048576 - 2147483647 - - - submenuAction: - - File - - YES - - - New - n - 1048576 - 2147483647 - - - - - - Open… - o - 1048576 - 2147483647 - - - - - - Open Recent - - 1048576 - 2147483647 - - - submenuAction: - - Open Recent - - YES - - - Clear Menu - - 1048576 - 2147483647 - - - - - _NSRecentDocumentsMenu - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Close - w - 1048576 - 2147483647 - - - - - - Save - s - 1048576 - 2147483647 - - - - - - Save As… - S - 1179648 - 2147483647 - - - - - - Revert to Saved - - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Page Setup... - P - 1179648 - 2147483647 - - - - - - - Print… - p - 1048576 - 2147483647 - - - - - - - - - Edit - - 1048576 - 2147483647 - - - submenuAction: - - Edit - - YES - - - Undo - z - 1048576 - 2147483647 - - - - - - Redo - Z - 1179648 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Cut - x - 1048576 - 2147483647 - - - - - - Copy - c - 1048576 - 2147483647 - - - - - - Paste - v - 1048576 - 2147483647 - - - - - - Paste and Match Style - V - 1572864 - 2147483647 - - - - - - Delete - - 1048576 - 2147483647 - - - - - - Select All - a - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Find - - 1048576 - 2147483647 - - - submenuAction: - - Find - - YES - - - Find… - f - 1048576 - 2147483647 - - - 1 - - - - Find Next - g - 1048576 - 2147483647 - - - 2 - - - - Find Previous - G - 1179648 - 2147483647 - - - 3 - - - - Use Selection for Find - e - 1048576 - 2147483647 - - - 7 - - - - Jump to Selection - j - 1048576 - 2147483647 - - - - - - - - - Spelling and Grammar - - 1048576 - 2147483647 - - - submenuAction: - - Spelling and Grammar - - YES - - - Show Spelling and Grammar - : - 1048576 - 2147483647 - - - - - - Check Document Now - ; - 1048576 - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Check Spelling While Typing - - 1048576 - 2147483647 - - - - - - Check Grammar With Spelling - - 1048576 - 2147483647 - - - - - - Correct Spelling Automatically - - 2147483647 - - - - - - - - - Substitutions - - 1048576 - 2147483647 - - - submenuAction: - - Substitutions - - YES - - - Show Substitutions - - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Smart Copy/Paste - f - 1048576 - 2147483647 - - - 1 - - - - Smart Quotes - g - 1048576 - 2147483647 - - - 2 - - - - Smart Dashes - - 2147483647 - - - - - - Smart Links - G - 1179648 - 2147483647 - - - 3 - - - - Text Replacement - - 2147483647 - - - - - - - - - Transformations - - 2147483647 - - - submenuAction: - - Transformations - - YES - - - Make Upper Case - - 2147483647 - - - - - - Make Lower Case - - 2147483647 - - - - - - Capitalize - - 2147483647 - - - - - - - - - Speech - - 1048576 - 2147483647 - - - submenuAction: - - Speech - - YES - - - Start Speaking - - 1048576 - 2147483647 - - - - - - Stop Speaking - - 1048576 - 2147483647 - - - - - - - - - - - - Format - - 2147483647 - - - submenuAction: - - Format - - YES - - - Font - - 2147483647 - - - submenuAction: - - Font - - YES - - - Show Fonts - t - 1048576 - 2147483647 - - - - - - Bold - b - 1048576 - 2147483647 - - - 2 - - - - Italic - i - 1048576 - 2147483647 - - - 1 - - - - Underline - u - 1048576 - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Bigger - + - 1048576 - 2147483647 - - - 3 - - - - Smaller - - - 1048576 - 2147483647 - - - 4 - - - - YES - YES - - - 2147483647 - - - - - - Kern - - 2147483647 - - - submenuAction: - - Kern - - YES - - - Use Default - - 2147483647 - - - - - - Use None - - 2147483647 - - - - - - Tighten - - 2147483647 - - - - - - Loosen - - 2147483647 - - - - - - - - - Ligature - - 2147483647 - - - submenuAction: - - Ligature - - YES - - - Use Default - - 2147483647 - - - - - - Use None - - 2147483647 - - - - - - Use All - - 2147483647 - - - - - - - - - Baseline - - 2147483647 - - - submenuAction: - - Baseline - - YES - - - Use Default - - 2147483647 - - - - - - Superscript - - 2147483647 - - - - - - Subscript - - 2147483647 - - - - - - Raise - - 2147483647 - - - - - - Lower - - 2147483647 - - - - - - - - - YES - YES - - - 2147483647 - - - - - - Show Colors - C - 1048576 - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Copy Style - c - 1572864 - 2147483647 - - - - - - Paste Style - v - 1572864 - 2147483647 - - - - - _NSFontMenu - - - - - Text - - 2147483647 - - - submenuAction: - - Text - - YES - - - Align Left - { - 1048576 - 2147483647 - - - - - - Center - | - 1048576 - 2147483647 - - - - - - Justify - - 2147483647 - - - - - - Align Right - } - 1048576 - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - Writing Direction - - 2147483647 - - - submenuAction: - - Writing Direction - - YES - - - YES - Paragraph - - 2147483647 - - - - - - CURlZmF1bHQ - - 2147483647 - - - - - - CUxlZnQgdG8gUmlnaHQ - - 2147483647 - - - - - - CVJpZ2h0IHRvIExlZnQ - - 2147483647 - - - - - - YES - YES - - - 2147483647 - - - - - - YES - Selection - - 2147483647 - - - - - - CURlZmF1bHQ - - 2147483647 - - - - - - CUxlZnQgdG8gUmlnaHQ - - 2147483647 - - - - - - CVJpZ2h0IHRvIExlZnQ - - 2147483647 - - - - - - - - - YES - YES - - - 2147483647 - - - - - - Show Ruler - - 2147483647 - - - - - - Copy Ruler - c - 1310720 - 2147483647 - - - - - - Paste Ruler - v - 1310720 - 2147483647 - - - - - - - - - - - - View - - 1048576 - 2147483647 - - - submenuAction: - - View - - YES - - - Show Toolbar - t - 1572864 - 2147483647 - - - - - - Customize Toolbar… - - 1048576 - 2147483647 - - - - - - - - - Window - - 1048576 - 2147483647 - - - submenuAction: - - Window - - YES - - - Minimize - m - 1048576 - 2147483647 - - - - - - Zoom - - 1048576 - 2147483647 - - - - - - YES - YES - - - 1048576 - 2147483647 - - - - - - Bring All to Front - - 1048576 - 2147483647 - - - - - _NSWindowsMenu - - - - - Help - - 2147483647 - - - submenuAction: - - Help - - YES - - - TestApp Help - ? - 1048576 - 2147483647 - - - - - _NSHelpMenu - - - - _NSMainMenu - - - 15 - 2 - {{335, 390}, {480, 360}} - 1954021376 - TestApp - NSWindow - - {1.79769e+308, 1.79769e+308} - - - 256 - {480, 360} - - - {{0, 0}, {1920, 1178}} - {1.79769e+308, 1.79769e+308} - - - TestAppAppDelegate - - - NSFontManager - - - - - YES - - - performMiniaturize: - - - - 37 - - - - arrangeInFront: - - - - 39 - - - - print: - - - - 86 - - - - runPageLayout: - - - - 87 - - - - clearRecentDocuments: - - - - 127 - - - - orderFrontStandardAboutPanel: - - - - 142 - - - - performClose: - - - - 193 - - - - toggleContinuousSpellChecking: - - - - 222 - - - - undo: - - - - 223 - - - - copy: - - - - 224 - - - - checkSpelling: - - - - 225 - - - - paste: - - - - 226 - - - - stopSpeaking: - - - - 227 - - - - cut: - - - - 228 - - - - showGuessPanel: - - - - 230 - - - - redo: - - - - 231 - - - - selectAll: - - - - 232 - - - - startSpeaking: - - - - 233 - - - - delete: - - - - 235 - - - - performZoom: - - - - 240 - - - - performFindPanelAction: - - - - 241 - - - - centerSelectionInVisibleArea: - - - - 245 - - - - toggleGrammarChecking: - - - - 347 - - - - toggleSmartInsertDelete: - - - - 355 - - - - toggleAutomaticQuoteSubstitution: - - - - 356 - - - - toggleAutomaticLinkDetection: - - - - 357 - - - - saveDocument: - - - - 362 - - - - saveDocumentAs: - - - - 363 - - - - revertDocumentToSaved: - - - - 364 - - - - runToolbarCustomizationPalette: - - - - 365 - - - - toggleToolbarShown: - - - - 366 - - - - hide: - - - - 367 - - - - hideOtherApplications: - - - - 368 - - - - unhideAllApplications: - - - - 370 - - - - newDocument: - - - - 373 - - - - openDocument: - - - - 374 - - - - addFontTrait: - - - - 421 - - - - addFontTrait: - - - - 422 - - - - modifyFont: - - - - 423 - - - - orderFrontFontPanel: - - - - 424 - - - - modifyFont: - - - - 425 - - - - raiseBaseline: - - - - 426 - - - - lowerBaseline: - - - - 427 - - - - copyFont: - - - - 428 - - - - subscript: - - - - 429 - - - - superscript: - - - - 430 - - - - tightenKerning: - - - - 431 - - - - underline: - - - - 432 - - - - orderFrontColorPanel: - - - - 433 - - - - useAllLigatures: - - - - 434 - - - - loosenKerning: - - - - 435 - - - - pasteFont: - - - - 436 - - - - unscript: - - - - 437 - - - - useStandardKerning: - - - - 438 - - - - useStandardLigatures: - - - - 439 - - - - turnOffLigatures: - - - - 440 - - - - turnOffKerning: - - - - 441 - - - - terminate: - - - - 449 - - - - toggleAutomaticSpellingCorrection: - - - - 456 - - - - orderFrontSubstitutionsPanel: - - - - 458 - - - - toggleAutomaticDashSubstitution: - - - - 461 - - - - toggleAutomaticTextReplacement: - - - - 463 - - - - uppercaseWord: - - - - 464 - - - - capitalizeWord: - - - - 467 - - - - lowercaseWord: - - - - 468 - - - - pasteAsPlainText: - - - - 486 - - - - performFindPanelAction: - - - - 487 - - - - performFindPanelAction: - - - - 488 - - - - performFindPanelAction: - - - - 489 - - - - showHelp: - - - - 493 - - - - delegate - - - - 495 - - - - alignCenter: - - - - 518 - - - - pasteRuler: - - - - 519 - - - - toggleRuler: - - - - 520 - - - - alignRight: - - - - 521 - - - - copyRuler: - - - - 522 - - - - alignJustified: - - - - 523 - - - - alignLeft: - - - - 524 - - - - makeBaseWritingDirectionNatural: - - - - 525 - - - - makeBaseWritingDirectionLeftToRight: - - - - 526 - - - - makeBaseWritingDirectionRightToLeft: - - - - 527 - - - - makeTextWritingDirectionNatural: - - - - 528 - - - - makeTextWritingDirectionLeftToRight: - - - - 529 - - - - makeTextWritingDirectionRightToLeft: - - - - 530 - - - - window - - - - 532 - - - - - YES - - 0 - - - - - - -2 - - - File's Owner - - - -1 - - - First Responder - - - -3 - - - Application - - - 29 - - - YES - - - - - - - - - - - - 19 - - - YES - - - - - - 56 - - - YES - - - - - - 217 - - - YES - - - - - - 83 - - - YES - - - - - - 81 - - - YES - - - - - - - - - - - - - - - - 75 - - - - - 80 - - - - - 78 - - - - - 72 - - - - - 82 - - - - - 124 - - - YES - - - - - - 77 - - - - - 73 - - - - - 79 - - - - - 112 - - - - - 74 - - - - - 125 - - - YES - - - - - - 126 - - - - - 205 - - - YES - - - - - - - - - - - - - - - - - - - - 202 - - - - - 198 - - - - - 207 - - - - - 214 - - - - - 199 - - - - - 203 - - - - - 197 - - - - - 206 - - - - - 215 - - - - - 218 - - - YES - - - - - - 216 - - - YES - - - - - - 200 - - - YES - - - - - - - - - - - 219 - - - - - 201 - - - - - 204 - - - - - 220 - - - YES - - - - - - - - - - 213 - - - - - 210 - - - - - 221 - - - - - 208 - - - - - 209 - - - - - 57 - - - YES - - - - - - - - - - - - - - - - 58 - - - - - 134 - - - - - 150 - - - - - 136 - - - - - 144 - - - - - 129 - - - - - 143 - - - - - 236 - - - - - 131 - - - YES - - - - - - 149 - - - - - 145 - - - - - 130 - - - - - 24 - - - YES - - - - - - - - - 92 - - - - - 5 - - - - - 239 - - - - - 23 - - - - - 295 - - - YES - - - - - - 296 - - - YES - - - - - - - 297 - - - - - 298 - - - - - 211 - - - YES - - - - - - 212 - - - YES - - - - - - - 195 - - - - - 196 - - - - - 346 - - - - - 348 - - - YES - - - - - - 349 - - - YES - - - - - - - - - - - - 350 - - - - - 351 - - - - - 354 - - - - - 371 - - - YES - - - - - - 372 - - - - - 375 - - - YES - - - - - - 376 - - - YES - - - - - - - 377 - - - YES - - - - - - 388 - - - YES - - - - - - - - - - - - - - - - - - - - - 389 - - - - - 390 - - - - - 391 - - - - - 392 - - - - - 393 - - - - - 394 - - - - - 395 - - - - - 396 - - - - - 397 - - - YES - - - - - - 398 - - - YES - - - - - - 399 - - - YES - - - - - - 400 - - - - - 401 - - - - - 402 - - - - - 403 - - - - - 404 - - - - - 405 - - - YES - - - - - - - - - - 406 - - - - - 407 - - - - - 408 - - - - - 409 - - - - - 410 - - - - - 411 - - - YES - - - - - - - - 412 - - - - - 413 - - - - - 414 - - - - - 415 - - - YES - - - - - - - - - 416 - - - - - 417 - - - - - 418 - - - - - 419 - - - - - 420 - - - - - 450 - - - YES - - - - - - 451 - - - YES - - - - - - - - 452 - - - - - 453 - - - - - 454 - - - - - 457 - - - - - 459 - - - - - 460 - - - - - 462 - - - - - 465 - - - - - 466 - - - - - 485 - - - - - 490 - - - YES - - - - - - 491 - - - YES - - - - - - 492 - - - - - 494 - - - - - 496 - - - YES - - - - - - 497 - - - YES - - - - - - - - - - - - - - - 498 - - - - - 499 - - - - - 500 - - - - - 501 - - - - - 502 - - - - - 503 - - - YES - - - - - - 504 - - - - - 505 - - - - - 506 - - - - - 507 - - - - - 508 - - - YES - - - - - - - - - - - - - - 509 - - - - - 510 - - - - - 511 - - - - - 512 - - - - - 513 - - - - - 514 - - - - - 515 - - - - - 516 - - - - - 517 - - - - - - - YES - - YES - -3.IBPluginDependency - 112.IBPluginDependency - 112.ImportedFromIB2 - 124.IBPluginDependency - 124.ImportedFromIB2 - 125.IBPluginDependency - 125.ImportedFromIB2 - 125.editorWindowContentRectSynchronizationRect - 126.IBPluginDependency - 126.ImportedFromIB2 - 129.IBPluginDependency - 129.ImportedFromIB2 - 130.IBPluginDependency - 130.ImportedFromIB2 - 130.editorWindowContentRectSynchronizationRect - 131.IBPluginDependency - 131.ImportedFromIB2 - 134.IBPluginDependency - 134.ImportedFromIB2 - 136.IBPluginDependency - 136.ImportedFromIB2 - 143.IBPluginDependency - 143.ImportedFromIB2 - 144.IBPluginDependency - 144.ImportedFromIB2 - 145.IBPluginDependency - 145.ImportedFromIB2 - 149.IBPluginDependency - 149.ImportedFromIB2 - 150.IBPluginDependency - 150.ImportedFromIB2 - 19.IBPluginDependency - 19.ImportedFromIB2 - 195.IBPluginDependency - 195.ImportedFromIB2 - 196.IBPluginDependency - 196.ImportedFromIB2 - 197.IBPluginDependency - 197.ImportedFromIB2 - 198.IBPluginDependency - 198.ImportedFromIB2 - 199.IBPluginDependency - 199.ImportedFromIB2 - 200.IBEditorWindowLastContentRect - 200.IBPluginDependency - 200.ImportedFromIB2 - 200.editorWindowContentRectSynchronizationRect - 201.IBPluginDependency - 201.ImportedFromIB2 - 202.IBPluginDependency - 202.ImportedFromIB2 - 203.IBPluginDependency - 203.ImportedFromIB2 - 204.IBPluginDependency - 204.ImportedFromIB2 - 205.IBEditorWindowLastContentRect - 205.IBPluginDependency - 205.ImportedFromIB2 - 205.editorWindowContentRectSynchronizationRect - 206.IBPluginDependency - 206.ImportedFromIB2 - 207.IBPluginDependency - 207.ImportedFromIB2 - 208.IBPluginDependency - 208.ImportedFromIB2 - 209.IBPluginDependency - 209.ImportedFromIB2 - 210.IBPluginDependency - 210.ImportedFromIB2 - 211.IBPluginDependency - 211.ImportedFromIB2 - 212.IBPluginDependency - 212.ImportedFromIB2 - 212.editorWindowContentRectSynchronizationRect - 213.IBPluginDependency - 213.ImportedFromIB2 - 214.IBPluginDependency - 214.ImportedFromIB2 - 215.IBPluginDependency - 215.ImportedFromIB2 - 216.IBPluginDependency - 216.ImportedFromIB2 - 217.IBPluginDependency - 217.ImportedFromIB2 - 218.IBPluginDependency - 218.ImportedFromIB2 - 219.IBPluginDependency - 219.ImportedFromIB2 - 220.IBEditorWindowLastContentRect - 220.IBPluginDependency - 220.ImportedFromIB2 - 220.editorWindowContentRectSynchronizationRect - 221.IBPluginDependency - 221.ImportedFromIB2 - 23.IBPluginDependency - 23.ImportedFromIB2 - 236.IBPluginDependency - 236.ImportedFromIB2 - 239.IBPluginDependency - 239.ImportedFromIB2 - 24.IBEditorWindowLastContentRect - 24.IBPluginDependency - 24.ImportedFromIB2 - 24.editorWindowContentRectSynchronizationRect - 29.IBEditorWindowLastContentRect - 29.IBPluginDependency - 29.ImportedFromIB2 - 29.WindowOrigin - 29.editorWindowContentRectSynchronizationRect - 295.IBPluginDependency - 296.IBEditorWindowLastContentRect - 296.IBPluginDependency - 296.editorWindowContentRectSynchronizationRect - 297.IBPluginDependency - 298.IBPluginDependency - 346.IBPluginDependency - 346.ImportedFromIB2 - 348.IBPluginDependency - 348.ImportedFromIB2 - 349.IBEditorWindowLastContentRect - 349.IBPluginDependency - 349.ImportedFromIB2 - 349.editorWindowContentRectSynchronizationRect - 350.IBPluginDependency - 350.ImportedFromIB2 - 351.IBPluginDependency - 351.ImportedFromIB2 - 354.IBPluginDependency - 354.ImportedFromIB2 - 371.IBEditorWindowLastContentRect - 371.IBPluginDependency - 371.IBWindowTemplateEditedContentRect - 371.NSWindowTemplate.visibleAtLaunch - 371.editorWindowContentRectSynchronizationRect - 371.windowTemplate.maxSize - 372.IBPluginDependency - 375.IBPluginDependency - 376.IBEditorWindowLastContentRect - 376.IBPluginDependency - 377.IBPluginDependency - 388.IBEditorWindowLastContentRect - 388.IBPluginDependency - 389.IBPluginDependency - 390.IBPluginDependency - 391.IBPluginDependency - 392.IBPluginDependency - 393.IBPluginDependency - 394.IBPluginDependency - 395.IBPluginDependency - 396.IBPluginDependency - 397.IBPluginDependency - 398.IBPluginDependency - 399.IBPluginDependency - 400.IBPluginDependency - 401.IBPluginDependency - 402.IBPluginDependency - 403.IBPluginDependency - 404.IBPluginDependency - 405.IBPluginDependency - 406.IBPluginDependency - 407.IBPluginDependency - 408.IBPluginDependency - 409.IBPluginDependency - 410.IBPluginDependency - 411.IBPluginDependency - 412.IBPluginDependency - 413.IBPluginDependency - 414.IBPluginDependency - 415.IBPluginDependency - 416.IBPluginDependency - 417.IBPluginDependency - 418.IBPluginDependency - 419.IBPluginDependency - 450.IBPluginDependency - 451.IBEditorWindowLastContentRect - 451.IBPluginDependency - 452.IBPluginDependency - 453.IBPluginDependency - 454.IBPluginDependency - 457.IBPluginDependency - 459.IBPluginDependency - 460.IBPluginDependency - 462.IBPluginDependency - 465.IBPluginDependency - 466.IBPluginDependency - 485.IBPluginDependency - 490.IBPluginDependency - 491.IBEditorWindowLastContentRect - 491.IBPluginDependency - 492.IBPluginDependency - 496.IBPluginDependency - 497.IBEditorWindowLastContentRect - 497.IBPluginDependency - 498.IBPluginDependency - 499.IBPluginDependency - 5.IBPluginDependency - 5.ImportedFromIB2 - 500.IBPluginDependency - 501.IBPluginDependency - 502.IBPluginDependency - 503.IBPluginDependency - 504.IBPluginDependency - 505.IBPluginDependency - 506.IBPluginDependency - 507.IBPluginDependency - 508.IBEditorWindowLastContentRect - 508.IBPluginDependency - 509.IBPluginDependency - 510.IBPluginDependency - 511.IBPluginDependency - 512.IBPluginDependency - 513.IBPluginDependency - 514.IBPluginDependency - 515.IBPluginDependency - 516.IBPluginDependency - 517.IBPluginDependency - 56.IBPluginDependency - 56.ImportedFromIB2 - 57.IBEditorWindowLastContentRect - 57.IBPluginDependency - 57.ImportedFromIB2 - 57.editorWindowContentRectSynchronizationRect - 58.IBPluginDependency - 58.ImportedFromIB2 - 72.IBPluginDependency - 72.ImportedFromIB2 - 73.IBPluginDependency - 73.ImportedFromIB2 - 74.IBPluginDependency - 74.ImportedFromIB2 - 75.IBPluginDependency - 75.ImportedFromIB2 - 77.IBPluginDependency - 77.ImportedFromIB2 - 78.IBPluginDependency - 78.ImportedFromIB2 - 79.IBPluginDependency - 79.ImportedFromIB2 - 80.IBPluginDependency - 80.ImportedFromIB2 - 81.IBEditorWindowLastContentRect - 81.IBPluginDependency - 81.ImportedFromIB2 - 81.editorWindowContentRectSynchronizationRect - 82.IBPluginDependency - 82.ImportedFromIB2 - 83.IBPluginDependency - 83.ImportedFromIB2 - 92.IBPluginDependency - 92.ImportedFromIB2 - - - YES - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{522, 812}, {146, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{436, 809}, {64, 6}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{753, 187}, {275, 113}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{608, 612}, {275, 83}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{547, 180}, {254, 283}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{187, 434}, {243, 243}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{608, 612}, {167, 43}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{753, 217}, {238, 103}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{608, 612}, {241, 103}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{654, 239}, {194, 73}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{525, 802}, {197, 73}} - {{380, 836}, {512, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - - {74, 862} - {{6, 978}, {478, 20}} - com.apple.InterfaceBuilder.CocoaPlugin - {{604, 269}, {231, 43}} - com.apple.InterfaceBuilder.CocoaPlugin - {{475, 832}, {234, 43}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{746, 287}, {220, 133}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{608, 612}, {215, 63}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{380, 496}, {480, 360}} - com.apple.InterfaceBuilder.CocoaPlugin - {{380, 496}, {480, 360}} - - {{33, 99}, {480, 360}} - {3.40282e+38, 3.40282e+38} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{591, 420}, {83, 43}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{523, 2}, {178, 283}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{753, 197}, {170, 63}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{725, 289}, {246, 23}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{674, 260}, {204, 183}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - {{878, 180}, {164, 173}} - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - com.apple.InterfaceBuilder.CocoaPlugin - - {{286, 129}, {275, 183}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{23, 794}, {245, 183}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - {{452, 109}, {196, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - {{145, 474}, {199, 203}} - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - com.apple.InterfaceBuilder.CocoaPlugin - - - - - YES - - - YES - - - - - YES - - - YES - - - - 532 - - - - YES - - TestAppAppDelegate - NSObject - - window - NSWindow - - - IBProjectSource - TestAppAppDelegate.h - - - - - YES - - NSApplication - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSApplication.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSApplicationScripting.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSColorPanel.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSHelpManager.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSPageLayout.h - - - - NSApplication - - IBFrameworkSource - AppKit.framework/Headers/NSUserInterfaceItemSearching.h - - - - NSBrowser - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSBrowser.h - - - - NSControl - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSControl.h - - - - NSDocument - NSObject - - YES - - YES - printDocument: - revertDocumentToSaved: - runPageLayout: - saveDocument: - saveDocumentAs: - saveDocumentTo: - - - YES - id - id - id - id - id - id - - - - IBFrameworkSource - AppKit.framework/Headers/NSDocument.h - - - - NSDocument - - IBFrameworkSource - AppKit.framework/Headers/NSDocumentScripting.h - - - - NSDocumentController - NSObject - - YES - - YES - clearRecentDocuments: - newDocument: - openDocument: - saveAllDocuments: - - - YES - id - id - id - id - - - - IBFrameworkSource - AppKit.framework/Headers/NSDocumentController.h - - - - NSFontManager - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontManager.h - - - - NSFormatter - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFormatter.h - - - - NSMatrix - NSControl - - IBFrameworkSource - AppKit.framework/Headers/NSMatrix.h - - - - NSMenu - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSMenu.h - - - - NSMenuItem - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSMenuItem.h - - - - NSMovieView - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSMovieView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSAccessibility.h - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDictionaryController.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSDragging.h - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSFontPanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSKeyValueBinding.h - - - - NSObject - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSNibLoading.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSOutlineView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSPasteboard.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSSavePanel.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSTableView.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSToolbarItem.h - - - - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSView.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSError.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSFileManager.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyValueObserving.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSKeyedArchiver.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObject.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSObjectScripting.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSPortCoder.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSRunLoop.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptClassDescription.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptKeyValueCoding.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptObjectSpecifiers.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSScriptWhoseTests.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSThread.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURL.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLConnection.h - - - - NSObject - - IBFrameworkSource - Foundation.framework/Headers/NSURLDownload.h - - - - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSInterfaceStyle.h - - - - NSResponder - NSObject - - IBFrameworkSource - AppKit.framework/Headers/NSResponder.h - - - - NSTableView - NSControl - - - - NSText - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSText.h - - - - NSTextView - NSText - - IBFrameworkSource - AppKit.framework/Headers/NSTextView.h - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSClipView.h - - - - NSView - - - - NSView - - IBFrameworkSource - AppKit.framework/Headers/NSRulerView.h - - - - NSView - NSResponder - - - - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSDrawer.h - - - - NSWindow - NSResponder - - IBFrameworkSource - AppKit.framework/Headers/NSWindow.h - - - - NSWindow - - IBFrameworkSource - AppKit.framework/Headers/NSWindowScripting.h - - - - - 0 - - com.apple.InterfaceBuilder.CocoaPlugin.macosx - - - - com.apple.InterfaceBuilder.CocoaPlugin.InterfaceBuilder3 - - - YES - ../TestApp.xcodeproj - 3 - - diff --git a/tools/gyp/test/mac/app-bundle/TestApp/English.lproj/utf-16be.strings b/tools/gyp/test/mac/app-bundle/TestApp/English.lproj/utf-16be.strings deleted file mode 100644 index 580783735f59601d6ac9d39cc2c3b21c66162e4a..0000000000000000000000000000000000000000 Binary files a/tools/gyp/test/mac/app-bundle/TestApp/English.lproj/utf-16be.strings and /dev/null differ diff --git a/tools/gyp/test/mac/app-bundle/TestApp/English.lproj/utf-16le.strings b/tools/gyp/test/mac/app-bundle/TestApp/English.lproj/utf-16le.strings deleted file mode 100644 index eeb383784c8b7de5e1c5e76c7d59d72f3befd78d..0000000000000000000000000000000000000000 Binary files a/tools/gyp/test/mac/app-bundle/TestApp/English.lproj/utf-16le.strings and /dev/null differ diff --git a/tools/gyp/test/mac/app-bundle/TestApp/Images.xcassets/AppIcon.appiconset/Contents.json b/tools/gyp/test/mac/app-bundle/TestApp/Images.xcassets/AppIcon.appiconset/Contents.json deleted file mode 100644 index 2db2b1c7c6c316500a7a34807648434289494ba1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/app-bundle/TestApp/Images.xcassets/AppIcon.appiconset/Contents.json +++ /dev/null @@ -1,58 +0,0 @@ -{ - "images" : [ - { - "idiom" : "mac", - "size" : "16x16", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "16x16", - "scale" : "2x" - }, - { - "idiom" : "mac", - "size" : "32x32", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "32x32", - "scale" : "2x" - }, - { - "idiom" : "mac", - "size" : "128x128", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "128x128", - "scale" : "2x" - }, - { - "idiom" : "mac", - "size" : "256x256", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "256x256", - "scale" : "2x" - }, - { - "idiom" : "mac", - "size" : "512x512", - "scale" : "1x" - }, - { - "idiom" : "mac", - "size" : "512x512", - "scale" : "2x" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/tools/gyp/test/mac/app-bundle/TestApp/Images.xcassets/image.imageset/Contents.json b/tools/gyp/test/mac/app-bundle/TestApp/Images.xcassets/image.imageset/Contents.json deleted file mode 100644 index 0a87b6edc67517d95ef8080c415bf62a6e55b1b8..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/app-bundle/TestApp/Images.xcassets/image.imageset/Contents.json +++ /dev/null @@ -1,23 +0,0 @@ -{ - "images" : [ - { - "idiom" : "universal", - "scale" : "1x", - "filename" : "super_sylvain.png" - }, - { - "idiom" : "universal", - "scale" : "2x", - "filename" : "super_sylvain@2x.png" - }, - { - "idiom" : "universal", - "scale" : "3x", - "filename" : "super_sylvain@3x.png" - } - ], - "info" : { - "version" : 1, - "author" : "xcode" - } -} \ No newline at end of file diff --git a/tools/gyp/test/mac/app-bundle/TestApp/Images.xcassets/image.imageset/super_sylvain.png b/tools/gyp/test/mac/app-bundle/TestApp/Images.xcassets/image.imageset/super_sylvain.png deleted file mode 100644 index 0ba769182f117a972f76280a19bd69d6e81b68f7..0000000000000000000000000000000000000000 Binary files a/tools/gyp/test/mac/app-bundle/TestApp/Images.xcassets/image.imageset/super_sylvain.png and /dev/null differ diff --git a/tools/gyp/test/mac/app-bundle/TestApp/Images.xcassets/image.imageset/super_sylvain@2x.png b/tools/gyp/test/mac/app-bundle/TestApp/Images.xcassets/image.imageset/super_sylvain@2x.png deleted file mode 100644 index edfa6a5682f108afb4d7f23ff53e6897a24959c5..0000000000000000000000000000000000000000 Binary files a/tools/gyp/test/mac/app-bundle/TestApp/Images.xcassets/image.imageset/super_sylvain@2x.png and /dev/null differ diff --git a/tools/gyp/test/mac/app-bundle/TestApp/Images.xcassets/image.imageset/super_sylvain@3x.png b/tools/gyp/test/mac/app-bundle/TestApp/Images.xcassets/image.imageset/super_sylvain@3x.png deleted file mode 100644 index e0652efc729dcf260f02468e2d49c635bfae9d42..0000000000000000000000000000000000000000 Binary files a/tools/gyp/test/mac/app-bundle/TestApp/Images.xcassets/image.imageset/super_sylvain@3x.png and /dev/null differ diff --git a/tools/gyp/test/mac/app-bundle/TestApp/TestApp-Info.plist b/tools/gyp/test/mac/app-bundle/TestApp/TestApp-Info.plist deleted file mode 100644 index e005852f9f9bfefa411b4f06bd5eefa3968e429a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/app-bundle/TestApp/TestApp-Info.plist +++ /dev/null @@ -1,34 +0,0 @@ - - - - - BuildMachineOSBuild - Doesn't matter, will be overwritten - CFBundleDevelopmentRegion - English - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - - CFBundleIdentifier - com.google.${PRODUCT_NAME:rfc1034identifier} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ause - CFBundleVersion - 1 - LSMinimumSystemVersion - ${MACOSX_DEPLOYMENT_TARGET} - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - - diff --git a/tools/gyp/test/mac/app-bundle/TestApp/TestAppAppDelegate.h b/tools/gyp/test/mac/app-bundle/TestApp/TestAppAppDelegate.h deleted file mode 100644 index 518645eae9d726fdb810e8496da78cf64578e92a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/app-bundle/TestApp/TestAppAppDelegate.h +++ /dev/null @@ -1,13 +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. - -#import - -@interface TestAppAppDelegate : NSObject { - NSWindow *window; -} - -@property (assign) IBOutlet NSWindow *window; - -@end diff --git a/tools/gyp/test/mac/app-bundle/TestApp/TestAppAppDelegate.m b/tools/gyp/test/mac/app-bundle/TestApp/TestAppAppDelegate.m deleted file mode 100644 index 9aafa420008ce75bf0b82dc3d81c105a94b2c090..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/app-bundle/TestApp/TestAppAppDelegate.m +++ /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. - -#import "TestAppAppDelegate.h" - -@implementation TestAppAppDelegate - -@synthesize window; - -- (void)applicationDidFinishLaunching:(NSNotification *)aNotification { - // Insert code here to initialize your application -} - -@end diff --git a/tools/gyp/test/mac/app-bundle/TestApp/main.m b/tools/gyp/test/mac/app-bundle/TestApp/main.m deleted file mode 100644 index df6a12d065b226df5b93541fe28280005251a6f4..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/app-bundle/TestApp/main.m +++ /dev/null @@ -1,10 +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. - -#import - -int main(int argc, char *argv[]) -{ - return NSApplicationMain(argc, (const char **) argv); -} diff --git a/tools/gyp/test/mac/app-bundle/empty.c b/tools/gyp/test/mac/app-bundle/empty.c deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tools/gyp/test/mac/app-bundle/test-assets-catalog.gyp b/tools/gyp/test/mac/app-bundle/test-assets-catalog.gyp deleted file mode 100644 index 25f94a12d0cf0df1d3c92e741a8816661530205e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/app-bundle/test-assets-catalog.gyp +++ /dev/null @@ -1,43 +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': 'dep_framework', - 'product_name': 'Dependency Framework', - 'type': 'shared_library', - 'mac_bundle': 1, - 'sources': [ 'empty.c', ], - }, - { - 'target_name': 'test_app', - 'product_name': 'Test App Assets Catalog Gyp', - 'type': 'executable', - 'mac_bundle': 1, - 'dependencies': [ 'dep_framework', ], - 'sources': [ - 'TestApp/main.m', - 'TestApp/TestApp_Prefix.pch', - 'TestApp/TestAppAppDelegate.h', - 'TestApp/TestAppAppDelegate.m', - ], - 'mac_bundle_resources': [ - 'TestApp/English.lproj/InfoPlist.strings', # UTF-8 - 'TestApp/English.lproj/utf-16be.strings', - 'TestApp/English.lproj/utf-16le.strings', - 'TestApp/English.lproj/MainMenu.xib', - 'TestApp/Images.xcassets', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', - ], - }, - 'xcode_settings': { - 'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist', - 'MACOSX_DEPLOYMENT_TARGET': '10.9', - }, - }, - ], -} diff --git a/tools/gyp/test/mac/app-bundle/test-error.gyp b/tools/gyp/test/mac/app-bundle/test-error.gyp deleted file mode 100644 index 370772cc31efbbb65a343dae5101b65f68d96edf..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/app-bundle/test-error.gyp +++ /dev/null @@ -1,31 +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': 'test_app', - 'product_name': 'Test App Gyp', - 'type': 'executable', - 'mac_bundle': 1, - 'sources': [ - 'TestApp/main.m', - 'TestApp/TestApp_Prefix.pch', - 'TestApp/TestAppAppDelegate.h', - 'TestApp/TestAppAppDelegate.m', - ], - 'mac_bundle_resources': [ - 'TestApp/English.lproj/InfoPlist-error.strings', - 'TestApp/English.lproj/MainMenu.xib', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', - ], - }, - 'xcode_settings': { - 'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist', - }, - }, - ], -} diff --git a/tools/gyp/test/mac/app-bundle/test.gyp b/tools/gyp/test/mac/app-bundle/test.gyp deleted file mode 100644 index 21973c3623a48295b10ba17bc26fb8708a662ab9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/app-bundle/test.gyp +++ /dev/null @@ -1,41 +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': 'dep_framework', - 'product_name': 'Dependency Framework', - 'type': 'shared_library', - 'mac_bundle': 1, - 'sources': [ 'empty.c', ], - }, - { - 'target_name': 'test_app', - 'product_name': 'Test App Gyp', - 'type': 'executable', - 'mac_bundle': 1, - 'dependencies': [ 'dep_framework', ], - 'sources': [ - 'TestApp/main.m', - 'TestApp/TestApp_Prefix.pch', - 'TestApp/TestAppAppDelegate.h', - 'TestApp/TestAppAppDelegate.m', - ], - 'mac_bundle_resources': [ - 'TestApp/English.lproj/InfoPlist.strings', # UTF-8 - 'TestApp/English.lproj/utf-16be.strings', - 'TestApp/English.lproj/utf-16le.strings', - 'TestApp/English.lproj/MainMenu.xib', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', - ], - }, - 'xcode_settings': { - 'INFOPLIST_FILE': 'TestApp/TestApp-Info.plist', - }, - }, - ], -} diff --git a/tools/gyp/test/mac/archs/empty_main.cc b/tools/gyp/test/mac/archs/empty_main.cc deleted file mode 100644 index 237c8ce181774d991a9dbdd8cacf1a5fb9f199f1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/archs/empty_main.cc +++ /dev/null @@ -1 +0,0 @@ -int main() {} diff --git a/tools/gyp/test/mac/archs/file.mm b/tools/gyp/test/mac/archs/file.mm deleted file mode 100644 index d0b39d1f6d8bb460947b4d38aa09e65c94d170b0..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/archs/file.mm +++ /dev/null @@ -1 +0,0 @@ -MyInt f() { return 0; } diff --git a/tools/gyp/test/mac/archs/file_a.cc b/tools/gyp/test/mac/archs/file_a.cc deleted file mode 100644 index 7307873c8374fbf2c4dec2811ef91a52f929963c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/archs/file_a.cc +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) 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. - -#include "file_a.h" - -void DependentFunctionA() { -} diff --git a/tools/gyp/test/mac/archs/file_a.h b/tools/gyp/test/mac/archs/file_a.h deleted file mode 100644 index 7439d131820b7edf78f80931a5f4dde356f6d2e0..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/archs/file_a.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) 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. - -#ifndef _INCLUDED_TEST_MAC_DEPENDENCIES_FILE_A_H_ -#define _INCLUDED_TEST_MAC_DEPENDENCIES_FILE_A_H_ - -void DependentFunctionA(); - -#endif // _INCLUDED_TEST_MAC_DEPENDENCIES_FILE_A_H_ diff --git a/tools/gyp/test/mac/archs/file_b.cc b/tools/gyp/test/mac/archs/file_b.cc deleted file mode 100644 index 72d59cbfb4661a71445ec573bc7c226e15ee1a7c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/archs/file_b.cc +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) 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. - -#include "file_b.h" - -void DependentFunctionB() { -} diff --git a/tools/gyp/test/mac/archs/file_b.h b/tools/gyp/test/mac/archs/file_b.h deleted file mode 100644 index eb272ece5504e4182a727aeb2982925ceaefd4bd..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/archs/file_b.h +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) 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. - -#ifndef _INCLUDED_TEST_MAC_DEPENDENCIES_FILE_B_H_ -#define _INCLUDED_TEST_MAC_DEPENDENCIES_FILE_B_H_ - -void DependentFunctionB(); - -#endif // _INCLUDED_TEST_MAC_DEPENDENCIES_FILE_B_H_ diff --git a/tools/gyp/test/mac/archs/file_c.cc b/tools/gyp/test/mac/archs/file_c.cc deleted file mode 100644 index ca39f7a6719f077a8821bc9315fdbaf1e5402fbb..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/archs/file_c.cc +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) 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. - -#include "file_a.h" -#include "file_b.h" - -void PublicFunctionC() { - DependentFunctionA(); - DependentFunctionB(); -} diff --git a/tools/gyp/test/mac/archs/file_d.cc b/tools/gyp/test/mac/archs/file_d.cc deleted file mode 100644 index c40911cdca88fe1f950c5c651dce173aa9fa6ca3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/archs/file_d.cc +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) 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. - -#include "file_a.h" -#include "file_b.h" - -void PublicFunctionD() { - DependentFunctionA(); - DependentFunctionB(); -} diff --git a/tools/gyp/test/mac/archs/header.h b/tools/gyp/test/mac/archs/header.h deleted file mode 100644 index 0716e500c5a69de9cd033fa0bc6935b78055ee64..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/archs/header.h +++ /dev/null @@ -1 +0,0 @@ -typedef int MyInt; diff --git a/tools/gyp/test/mac/archs/my_file.cc b/tools/gyp/test/mac/archs/my_file.cc deleted file mode 100644 index 94216a74df6c3691f3abfdf5c5f689064789b80e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/archs/my_file.cc +++ /dev/null @@ -1,4 +0,0 @@ -/* 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. */ -int x = 1; diff --git a/tools/gyp/test/mac/archs/my_main_file.cc b/tools/gyp/test/mac/archs/my_main_file.cc deleted file mode 100644 index 5a4a17b5eb14bdd321097b1ad7bb9b86e50f3edc..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/archs/my_main_file.cc +++ /dev/null @@ -1,8 +0,0 @@ -/* 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. */ -#include -extern int x; -int main() { - printf("hello, world %d\n", x); -} diff --git a/tools/gyp/test/mac/archs/test-archs-multiarch.gyp b/tools/gyp/test/mac/archs/test-archs-multiarch.gyp deleted file mode 100644 index 567e8a6653ce862f80d56193d155963d9767463b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/archs/test-archs-multiarch.gyp +++ /dev/null @@ -1,92 +0,0 @@ -# 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': 'static_32_64', - 'type': 'static_library', - 'sources': [ 'my_file.cc' ], - 'xcode_settings': { - 'ARCHS': [ 'i386', 'x86_64' ], - }, - }, - { - 'target_name': 'shared_32_64', - 'type': 'shared_library', - 'sources': [ 'my_file.cc' ], - 'xcode_settings': { - 'ARCHS': [ 'i386', 'x86_64' ], - }, - }, - { - 'target_name': 'shared_32_64_bundle', - 'product_name': 'My Framework', - 'type': 'shared_library', - 'mac_bundle': 1, - 'sources': [ 'my_file.cc' ], - 'xcode_settings': { - 'ARCHS': [ 'i386', 'x86_64' ], - }, - }, - { - 'target_name': 'module_32_64', - 'type': 'loadable_module', - 'sources': [ 'my_file.cc' ], - 'xcode_settings': { - 'ARCHS': [ 'i386', 'x86_64' ], - }, - }, - { - 'target_name': 'module_32_64_bundle', - 'product_name': 'My Bundle', - 'type': 'loadable_module', - 'mac_bundle': 1, - 'sources': [ 'my_file.cc' ], - 'xcode_settings': { - 'ARCHS': [ 'i386', 'x86_64' ], - }, - }, - { - 'target_name': 'exe_32_64', - 'type': 'executable', - 'sources': [ 'empty_main.cc' ], - 'xcode_settings': { - 'ARCHS': [ 'i386', 'x86_64' ], - }, - }, - { - 'target_name': 'exe_32_64_bundle', - 'product_name': 'Test App', - 'type': 'executable', - 'mac_bundle': 1, - 'sources': [ 'empty_main.cc' ], - 'xcode_settings': { - 'ARCHS': [ 'i386', 'x86_64' ], - }, - }, - # This only needs to compile. - { - 'target_name': 'precompiled_prefix_header_mm_32_64', - 'type': 'shared_library', - 'sources': [ 'file.mm', ], - 'xcode_settings': { - 'GCC_PREFIX_HEADER': 'header.h', - 'GCC_PRECOMPILE_PREFIX_HEADER': 'YES', - }, - }, - # This does not compile but should not cause generation errors. - { - 'target_name': 'exe_32_64_no_sources', - 'type': 'executable', - 'dependencies': [ - 'static_32_64', - ], - 'sources': [], - 'xcode_settings': { - 'ARCHS': ['i386', 'x86_64'], - }, - }, - ] -} diff --git a/tools/gyp/test/mac/archs/test-archs-x86_64.gyp b/tools/gyp/test/mac/archs/test-archs-x86_64.gyp deleted file mode 100644 index d11a896273cab743f164c4ae1c1d5f205f1ba7df..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/archs/test-archs-x86_64.gyp +++ /dev/null @@ -1,27 +0,0 @@ -# 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': 'lib', - 'product_name': 'Test64', - 'type': 'static_library', - 'sources': [ 'my_file.cc' ], - 'xcode_settings': { - 'ARCHS': [ 'x86_64' ], - }, - }, - { - 'target_name': 'exe', - 'product_name': 'Test64', - 'type': 'executable', - 'dependencies': [ 'lib' ], - 'sources': [ 'my_main_file.cc' ], - 'xcode_settings': { - 'ARCHS': [ 'x86_64' ], - }, - }, - ] -} diff --git a/tools/gyp/test/mac/archs/test-dependencies.gyp b/tools/gyp/test/mac/archs/test-dependencies.gyp deleted file mode 100644 index 0431f5f2f4fab2ba5c7bd070eccf5f014579d163..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/archs/test-dependencies.gyp +++ /dev/null @@ -1,92 +0,0 @@ -# Copyright (c) 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. - -{ - 'target_defaults': { - 'xcode_settings': { - 'ARCHS': ['i386', 'x86_64'], - }, - }, - 'targets': [ - { - 'target_name': 'target_a', - 'type': 'static_library', - 'sources': [ - 'file_a.cc', - 'file_a.h', - ], - }, - { - 'target_name': 'target_b', - 'type': 'static_library', - 'sources': [ - 'file_b.cc', - 'file_b.h', - ], - }, - { - 'target_name': 'target_c_standalone_helper', - 'type': 'loadable_module', - 'hard_dependency': 1, - 'dependencies': [ - 'target_a', - 'target_b', - ], - 'sources': [ - 'file_c.cc', - ], - }, - { - 'target_name': 'target_c_standalone', - 'type': 'none', - 'dependencies': [ - 'target_c_standalone_helper', - ], - 'actions': [ - { - 'action_name': 'Package C', - 'inputs': [], - 'outputs': [ - '<(PRODUCT_DIR)/libc_standalone.a', - ], - 'action': [ - 'touch', - '<@(_outputs)', - ], - }, - ], - }, - { - 'target_name': 'target_d_standalone_helper', - 'type': 'shared_library', - 'dependencies': [ - 'target_a', - 'target_b', - ], - 'sources': [ - 'file_d.cc', - ], - }, - { - 'target_name': 'target_d_standalone', - 'type': 'none', - 'dependencies': [ - 'target_d_standalone_helper', - ], - 'actions': [ - { - 'action_name': 'Package D', - 'inputs': [], - 'outputs': [ - '<(PRODUCT_DIR)/libd_standalone.a', - ], - 'action': [ - 'touch', - '<@(_outputs)', - ], - }, - ], - } - ], -} diff --git a/tools/gyp/test/mac/archs/test-no-archs.gyp b/tools/gyp/test/mac/archs/test-no-archs.gyp deleted file mode 100644 index 8f3b6b47cc163fe0754a72991c824be6dd80047b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/archs/test-no-archs.gyp +++ /dev/null @@ -1,21 +0,0 @@ -# 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': 'lib', - 'product_name': 'Test', - 'type': 'static_library', - 'sources': [ 'my_file.cc' ], - }, - { - 'target_name': 'exe', - 'product_name': 'Test', - 'type': 'executable', - 'dependencies': [ 'lib' ], - 'sources': [ 'my_main_file.cc' ], - }, - ] -} diff --git a/tools/gyp/test/mac/archs/test-valid-archs.gyp b/tools/gyp/test/mac/archs/test-valid-archs.gyp deleted file mode 100644 index c90ec1fe9b3b0bde153d177a4bdaa576e8db6592..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/archs/test-valid-archs.gyp +++ /dev/null @@ -1,28 +0,0 @@ -# Copyright (c) 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': 'lib', - 'product_name': 'Test', - 'type': 'static_library', - 'sources': [ 'my_file.cc' ], - 'xcode_settings': { - 'ARCHS': ['i386', 'x86_64', 'unknown-arch'], - 'VALID_ARCHS': ['x86_64'], - }, - }, - { - 'target_name': 'exe', - 'product_name': 'Test', - 'type': 'executable', - 'dependencies': [ 'lib' ], - 'sources': [ 'my_main_file.cc' ], - 'xcode_settings': { - 'ARCHS': ['i386', 'x86_64', 'unknown-arch'], - 'VALID_ARCHS': ['x86_64'], - }, - }] -} diff --git a/tools/gyp/test/mac/bundle-resources/change.sh b/tools/gyp/test/mac/bundle-resources/change.sh deleted file mode 100755 index 6d0fe6c7c279acf081c1064d9284abef706c033e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/bundle-resources/change.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -tr a-z A-Z < "${1}" > "${2}" diff --git a/tools/gyp/test/mac/bundle-resources/executable-file.sh b/tools/gyp/test/mac/bundle-resources/executable-file.sh deleted file mode 100755 index 796953a1a2cf23ca0c63e5842905351355ac0358..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/bundle-resources/executable-file.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -echo echo echo echo cho ho o o diff --git a/tools/gyp/test/mac/bundle-resources/secret.txt b/tools/gyp/test/mac/bundle-resources/secret.txt deleted file mode 100644 index 8baef1b4abc478178b004d62031cf7fe6db6f903..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/bundle-resources/secret.txt +++ /dev/null @@ -1 +0,0 @@ -abc diff --git a/tools/gyp/test/mac/bundle-resources/test.gyp b/tools/gyp/test/mac/bundle-resources/test.gyp deleted file mode 100644 index 98f57a0999e321544e4a08e99b7924f86c3c7d42..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/bundle-resources/test.gyp +++ /dev/null @@ -1,58 +0,0 @@ -# Copyright (c) 2013 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': 'resource', - 'type': 'executable', - 'mac_bundle': 1, - 'mac_bundle_resources': [ - 'secret.txt', - 'executable-file.sh', - ], - }, - # A rule with process_outputs_as_mac_bundle_resources should copy files - # into the Resources folder. - { - 'target_name': 'source_rule', - 'type': 'executable', - 'mac_bundle': 1, - 'sources': [ - 'secret.txt', - ], - 'rules': [ - { - 'rule_name': 'bundlerule', - 'extension': 'txt', - 'outputs': [ - '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).txt', - ], - 'action': ['./change.sh', '<(RULE_INPUT_PATH)', '<@(_outputs)'], - 'message': 'Running rule on <(RULE_INPUT_PATH)', - 'process_outputs_as_mac_bundle_resources': 1, - }, - ], - }, - # So should an ordinary rule acting on mac_bundle_resources. - { - 'target_name': 'resource_rule', - 'type': 'executable', - 'mac_bundle': 1, - 'mac_bundle_resources': [ - 'secret.txt', - ], - 'rules': [ - { - 'rule_name': 'bundlerule', - 'extension': 'txt', - 'outputs': [ - '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).txt', - ], - 'action': ['./change.sh', '<(RULE_INPUT_PATH)', '<@(_outputs)'], - 'message': 'Running rule on <(RULE_INPUT_PATH)', - }, - ], - }, - ], -} diff --git a/tools/gyp/test/mac/cflags/ccfile.cc b/tools/gyp/test/mac/cflags/ccfile.cc deleted file mode 100644 index 1a54d18eec7122b42c1b14bb369296f10a01a3c8..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/cflags/ccfile.cc +++ /dev/null @@ -1,7 +0,0 @@ -#ifdef CFLAG -#error CFLAG should not be set -#endif - -#ifndef CCFLAG -#error CCFLAG should be set -#endif diff --git a/tools/gyp/test/mac/cflags/ccfile_withcflags.cc b/tools/gyp/test/mac/cflags/ccfile_withcflags.cc deleted file mode 100644 index de078a06417628dc5aa9a86a13202f13b5d14ced..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/cflags/ccfile_withcflags.cc +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef CFLAG -#error CFLAG should be set -#endif - -#ifndef CCFLAG -#error CCFLAG should be set -#endif diff --git a/tools/gyp/test/mac/cflags/cfile.c b/tools/gyp/test/mac/cflags/cfile.c deleted file mode 100644 index 0af9d0af5da474f6b11587dc1601377fa574acca..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/cflags/cfile.c +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef CFLAG -#error CFLAG should be set -#endif - -#ifdef CCFLAG -#error CCFLAG should not be set -#endif diff --git a/tools/gyp/test/mac/cflags/cppfile.cpp b/tools/gyp/test/mac/cflags/cppfile.cpp deleted file mode 100644 index 1a54d18eec7122b42c1b14bb369296f10a01a3c8..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/cflags/cppfile.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#ifdef CFLAG -#error CFLAG should not be set -#endif - -#ifndef CCFLAG -#error CCFLAG should be set -#endif diff --git a/tools/gyp/test/mac/cflags/cppfile_withcflags.cpp b/tools/gyp/test/mac/cflags/cppfile_withcflags.cpp deleted file mode 100644 index de078a06417628dc5aa9a86a13202f13b5d14ced..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/cflags/cppfile_withcflags.cpp +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef CFLAG -#error CFLAG should be set -#endif - -#ifndef CCFLAG -#error CCFLAG should be set -#endif diff --git a/tools/gyp/test/mac/cflags/cxxfile.cxx b/tools/gyp/test/mac/cflags/cxxfile.cxx deleted file mode 100644 index 1a54d18eec7122b42c1b14bb369296f10a01a3c8..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/cflags/cxxfile.cxx +++ /dev/null @@ -1,7 +0,0 @@ -#ifdef CFLAG -#error CFLAG should not be set -#endif - -#ifndef CCFLAG -#error CCFLAG should be set -#endif diff --git a/tools/gyp/test/mac/cflags/cxxfile_withcflags.cxx b/tools/gyp/test/mac/cflags/cxxfile_withcflags.cxx deleted file mode 100644 index de078a06417628dc5aa9a86a13202f13b5d14ced..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/cflags/cxxfile_withcflags.cxx +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef CFLAG -#error CFLAG should be set -#endif - -#ifndef CCFLAG -#error CCFLAG should be set -#endif diff --git a/tools/gyp/test/mac/cflags/mfile.m b/tools/gyp/test/mac/cflags/mfile.m deleted file mode 100644 index 0af9d0af5da474f6b11587dc1601377fa574acca..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/cflags/mfile.m +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef CFLAG -#error CFLAG should be set -#endif - -#ifdef CCFLAG -#error CCFLAG should not be set -#endif diff --git a/tools/gyp/test/mac/cflags/mmfile.mm b/tools/gyp/test/mac/cflags/mmfile.mm deleted file mode 100644 index 1a54d18eec7122b42c1b14bb369296f10a01a3c8..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/cflags/mmfile.mm +++ /dev/null @@ -1,7 +0,0 @@ -#ifdef CFLAG -#error CFLAG should not be set -#endif - -#ifndef CCFLAG -#error CCFLAG should be set -#endif diff --git a/tools/gyp/test/mac/cflags/mmfile_withcflags.mm b/tools/gyp/test/mac/cflags/mmfile_withcflags.mm deleted file mode 100644 index de078a06417628dc5aa9a86a13202f13b5d14ced..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/cflags/mmfile_withcflags.mm +++ /dev/null @@ -1,7 +0,0 @@ -#ifndef CFLAG -#error CFLAG should be set -#endif - -#ifndef CCFLAG -#error CCFLAG should be set -#endif diff --git a/tools/gyp/test/mac/cflags/test.gyp b/tools/gyp/test/mac/cflags/test.gyp deleted file mode 100644 index d330a548f647ea5e9190d2cddaf7e1ad116c615f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/cflags/test.gyp +++ /dev/null @@ -1,132 +0,0 @@ -# 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': 'mytarget', - 'type': 'shared_library', - 'sources': [ - 'cfile.c', - 'mfile.m', - 'ccfile.cc', - 'cppfile.cpp', - 'cxxfile.cxx', - 'mmfile.mm', - ], - 'xcode_settings': { - # Normally, defines would go in 'defines' instead. This is just for - # testing. - 'OTHER_CFLAGS': [ - '-DCFLAG', - ], - 'OTHER_CPLUSPLUSFLAGS': [ - '-DCCFLAG', - ], - 'GCC_C_LANGUAGE_STANDARD': 'c99', - }, - }, - { - 'target_name': 'mytarget_reuse_cflags', - 'type': 'shared_library', - 'sources': [ - 'cfile.c', - 'mfile.m', - 'ccfile_withcflags.cc', - 'cppfile_withcflags.cpp', - 'cxxfile_withcflags.cxx', - 'mmfile_withcflags.mm', - ], - 'xcode_settings': { - 'OTHER_CFLAGS': [ - '-DCFLAG', - ], - 'OTHER_CPLUSPLUSFLAGS': [ - '$OTHER_CFLAGS', - '-DCCFLAG', - ], - # This is a C-only flag, to check these don't get added to C++ files. - 'GCC_C_LANGUAGE_STANDARD': 'c99', - }, - }, - { - 'target_name': 'mytarget_inherit_cflags', - 'type': 'shared_library', - 'sources': [ - 'cfile.c', - 'mfile.m', - 'ccfile_withcflags.cc', - 'cppfile_withcflags.cpp', - 'cxxfile_withcflags.cxx', - 'mmfile_withcflags.mm', - ], - 'xcode_settings': { - 'OTHER_CFLAGS': [ - '-DCFLAG', - ], - 'OTHER_CPLUSPLUSFLAGS': [ - '$inherited', - '-DCCFLAG', - ], - 'GCC_C_LANGUAGE_STANDARD': 'c99', - }, - }, - { - 'target_name': 'mytarget_inherit_cflags_parens', - 'type': 'shared_library', - 'sources': [ - 'cfile.c', - 'mfile.m', - 'ccfile_withcflags.cc', - 'cppfile_withcflags.cpp', - 'cxxfile_withcflags.cxx', - 'mmfile_withcflags.mm', - ], - 'xcode_settings': { - 'OTHER_CFLAGS': [ - '-DCFLAG', - ], - 'OTHER_CPLUSPLUSFLAGS': [ - '$(inherited)', - '-DCCFLAG', - ], - 'GCC_C_LANGUAGE_STANDARD': 'c99', - }, - }, - { - 'target_name': 'mytarget_inherit_cflags_braces', - 'type': 'shared_library', - 'sources': [ - 'cfile.c', - 'mfile.m', - 'ccfile_withcflags.cc', - 'cppfile_withcflags.cpp', - 'cxxfile_withcflags.cxx', - 'mmfile_withcflags.mm', - ], - 'xcode_settings': { - 'OTHER_CFLAGS': [ - '-DCFLAG', - ], - 'OTHER_CPLUSPLUSFLAGS': [ - '${inherited}', - '-DCCFLAG', - ], - 'GCC_C_LANGUAGE_STANDARD': 'c99', - }, - }, - { - 'target_name': 'ansi_standard', - 'type': 'shared_library', - 'sources': [ - 'cfile.c', - ], - 'xcode_settings': { - 'OTHER_CFLAGS': [ - '-DCFLAG', - ], - 'GCC_C_LANGUAGE_STANDARD': 'ansi', - }, - }, - ], -} diff --git a/tools/gyp/test/mac/clang-cxx-language-standard/c++11.cc b/tools/gyp/test/mac/clang-cxx-language-standard/c++11.cc deleted file mode 100644 index 4367ff9ff6a3ec5e76dbf57a57152a3e87d17781..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/clang-cxx-language-standard/c++11.cc +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2013 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. - -static_assert(__cplusplus == 201103L, "wrong c++ standard version"); - -int main() { return 0; } diff --git a/tools/gyp/test/mac/clang-cxx-language-standard/c++98.cc b/tools/gyp/test/mac/clang-cxx-language-standard/c++98.cc deleted file mode 100644 index 8ed4e92a71a0a8946ff9ef438e56367588e98328..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/clang-cxx-language-standard/c++98.cc +++ /dev/null @@ -1,23 +0,0 @@ -// Copyright (c) 2013 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. - -#if __cplusplus != 199711L -#error wrong c++ standard version -#endif - -enum cxx11_keywords { - alignas, - alignof, - char16_t, - char32_t, - constexpr, - decltype, - noexcept, - nullptr, - override, - static_assert, - thread_local, -}; - -int main() { return 0; } diff --git a/tools/gyp/test/mac/clang-cxx-language-standard/clang-cxx-language-standard.gyp b/tools/gyp/test/mac/clang-cxx-language-standard/clang-cxx-language-standard.gyp deleted file mode 100644 index 20d06d487485354ddea3e9fc93d68c8c9258180d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/clang-cxx-language-standard/clang-cxx-language-standard.gyp +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2013 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. -{ - 'make_global_settings': [ - ['CC', '/usr/bin/clang'], - ['CXX', '/usr/bin/clang++'], - ], - 'targets': [ - { - 'target_name': 'c++98', - 'type': 'executable', - 'sources': [ 'c++98.cc', ], - 'xcode_settings': { - 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', - 'CLANG_CXX_LANGUAGE_STANDARD': 'c++98', - }, - }, - { - 'target_name': 'c++11', - 'type': 'executable', - 'sources': [ 'c++11.cc', ], - 'xcode_settings': { - 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', - 'CLANG_CXX_LANGUAGE_STANDARD': 'c++0x', - }, - }, - ], -} diff --git a/tools/gyp/test/mac/clang-cxx-library/clang-cxx-library.gyp b/tools/gyp/test/mac/clang-cxx-library/clang-cxx-library.gyp deleted file mode 100644 index 651c1c1891742ffad2884d7ef788f1103c674aa4..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/clang-cxx-library/clang-cxx-library.gyp +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) 2013 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. -{ - 'make_global_settings': [ - ['CC', '/usr/bin/clang'], - ['CXX', '/usr/bin/clang++'], - ], - 'targets': [ - { - 'target_name': 'libc++', - 'type': 'executable', - 'sources': [ 'libc++.cc', ], - 'xcode_settings': { - 'CC': 'clang', - # libc++ requires OS X 10.7+. - 'MACOSX_DEPLOYMENT_TARGET': '10.7', - 'CLANG_CXX_LIBRARY': 'libc++', - }, - }, - { - 'target_name': 'libstdc++', - 'type': 'executable', - 'sources': [ 'libstdc++.cc', ], - 'xcode_settings': { - 'CC': 'clang', - 'CLANG_CXX_LIBRARY': 'libstdc++', - }, - }, - ], -} diff --git a/tools/gyp/test/mac/clang-cxx-library/libc++.cc b/tools/gyp/test/mac/clang-cxx-library/libc++.cc deleted file mode 100644 index 95e4b9cc5899b3013f0776ca1f0d9ef584c2e095..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/clang-cxx-library/libc++.cc +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) 2013 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. - -#include -#ifndef _LIBCPP_VERSION -#error expected std library: libc++ -#endif - -int main() { std::string x; return x.size(); } diff --git a/tools/gyp/test/mac/clang-cxx-library/libstdc++.cc b/tools/gyp/test/mac/clang-cxx-library/libstdc++.cc deleted file mode 100644 index b1a7c88ed47d5cb76f86e1863d4c1e5c1d8f1f4c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/clang-cxx-library/libstdc++.cc +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) 2013 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. - -#include -#ifndef __GLIBCXX__ -#error expected std library: libstdc++ -#endif - -int main() { std::string x; return x.size(); } diff --git a/tools/gyp/test/mac/copy-dylib/empty.c b/tools/gyp/test/mac/copy-dylib/empty.c deleted file mode 100644 index 237c8ce181774d991a9dbdd8cacf1a5fb9f199f1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/copy-dylib/empty.c +++ /dev/null @@ -1 +0,0 @@ -int main() {} diff --git a/tools/gyp/test/mac/copy-dylib/test.gyp b/tools/gyp/test/mac/copy-dylib/test.gyp deleted file mode 100644 index 54fc92293d100833506fca25639e06916e898741..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/copy-dylib/test.gyp +++ /dev/null @@ -1,30 +0,0 @@ -# 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': 'my_dylib', - 'type': 'shared_library', - 'sources': [ 'empty.c', ], - }, - { - 'target_name': 'test_app', - 'product_name': 'Test App', - 'type': 'executable', - 'mac_bundle': 1, - 'dependencies': [ 'my_dylib', ], - 'sources': [ - 'empty.c', - ], - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/Test App.app/Contents/Resources', - 'files': [ - '<(PRODUCT_DIR)/libmy_dylib.dylib', - ], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/mac/debuginfo/file.c b/tools/gyp/test/mac/debuginfo/file.c deleted file mode 100644 index 9cddaf1b0b401b4c7ab5da9072e45c2c5e8cb666..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/debuginfo/file.c +++ /dev/null @@ -1,6 +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. - -void f() {} -int main() {} diff --git a/tools/gyp/test/mac/debuginfo/test.gyp b/tools/gyp/test/mac/debuginfo/test.gyp deleted file mode 100644 index 3faf6b5c76edf37aae51dfb0eca0b0c64888c01e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/debuginfo/test.gyp +++ /dev/null @@ -1,82 +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': 'nonbundle_static_library', - 'type': 'static_library', - 'sources': [ 'file.c', ], - 'xcode_settings': { - 'DEBUG_INFORMATION_FORMAT': 'dwarf-with-dsym', - 'DEPLOYMENT_POSTPROCESSING': 'YES', - 'STRIP_INSTALLED_PRODUCT': 'YES', - }, - }, - { - 'target_name': 'nonbundle_shared_library', - 'type': 'shared_library', - 'sources': [ 'file.c', ], - 'xcode_settings': { - 'DEBUG_INFORMATION_FORMAT': 'dwarf-with-dsym', - 'DEPLOYMENT_POSTPROCESSING': 'YES', - 'STRIP_INSTALLED_PRODUCT': 'YES', - }, - }, - { - 'target_name': 'nonbundle_loadable_module', - 'type': 'loadable_module', - 'sources': [ 'file.c', ], - 'xcode_settings': { - 'DEBUG_INFORMATION_FORMAT': 'dwarf-with-dsym', - 'DEPLOYMENT_POSTPROCESSING': 'YES', - 'STRIP_INSTALLED_PRODUCT': 'YES', - }, - }, - { - 'target_name': 'nonbundle_executable', - 'type': 'executable', - 'sources': [ 'file.c', ], - 'xcode_settings': { - 'DEBUG_INFORMATION_FORMAT': 'dwarf-with-dsym', - 'DEPLOYMENT_POSTPROCESSING': 'YES', - 'STRIP_INSTALLED_PRODUCT': 'YES', - }, - }, - - { - 'target_name': 'bundle_shared_library', - 'type': 'shared_library', - 'mac_bundle': 1, - 'sources': [ 'file.c', ], - 'xcode_settings': { - 'DEBUG_INFORMATION_FORMAT': 'dwarf-with-dsym', - 'DEPLOYMENT_POSTPROCESSING': 'YES', - 'STRIP_INSTALLED_PRODUCT': 'YES', - }, - }, - { - 'target_name': 'bundle_loadable_module', - 'type': 'loadable_module', - 'mac_bundle': 1, - 'sources': [ 'file.c', ], - 'xcode_settings': { - 'DEBUG_INFORMATION_FORMAT': 'dwarf-with-dsym', - 'DEPLOYMENT_POSTPROCESSING': 'YES', - 'STRIP_INSTALLED_PRODUCT': 'YES', - }, - }, - { - 'target_name': 'my_app', - 'product_name': 'My App', - 'type': 'executable', - 'mac_bundle': 1, - 'sources': [ 'file.c', ], - 'xcode_settings': { - 'DEBUG_INFORMATION_FORMAT': 'dwarf-with-dsym', - 'DEPLOYMENT_POSTPROCESSING': 'YES', - 'STRIP_INSTALLED_PRODUCT': 'YES', - }, - }, - ], -} diff --git a/tools/gyp/test/mac/depend-on-bundle/English.lproj/InfoPlist.strings b/tools/gyp/test/mac/depend-on-bundle/English.lproj/InfoPlist.strings deleted file mode 100644 index b92732c79e00cf2fad5ceceb61bbc7a9a9739d2c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/depend-on-bundle/English.lproj/InfoPlist.strings +++ /dev/null @@ -1 +0,0 @@ -/* Localized versions of Info.plist keys */ diff --git a/tools/gyp/test/mac/depend-on-bundle/Info.plist b/tools/gyp/test/mac/depend-on-bundle/Info.plist deleted file mode 100644 index 5e05a5190c89319f64f3b900f19dc1473bb7fdfc..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/depend-on-bundle/Info.plist +++ /dev/null @@ -1,28 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - - CFBundleIdentifier - com.yourcompany.${PRODUCT_NAME} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - NSPrincipalClass - - - diff --git a/tools/gyp/test/mac/depend-on-bundle/bundle.c b/tools/gyp/test/mac/depend-on-bundle/bundle.c deleted file mode 100644 index d64ff8ca23dbf931bfe440e6ea616d19eaef852b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/depend-on-bundle/bundle.c +++ /dev/null @@ -1 +0,0 @@ -int f() { return 42; } diff --git a/tools/gyp/test/mac/depend-on-bundle/executable.c b/tools/gyp/test/mac/depend-on-bundle/executable.c deleted file mode 100644 index 931bce637edaa2ac3d86cc43851db5263d1013df..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/depend-on-bundle/executable.c +++ /dev/null @@ -1,4 +0,0 @@ -int f(); -int main() { - return f(); -} diff --git a/tools/gyp/test/mac/depend-on-bundle/test.gyp b/tools/gyp/test/mac/depend-on-bundle/test.gyp deleted file mode 100644 index 9f77b1f1f51c074e92eca1f827a9e784877a486c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/depend-on-bundle/test.gyp +++ /dev/null @@ -1,27 +0,0 @@ -# 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': 'my_bundle', - 'type': 'shared_library', - 'mac_bundle': 1, - 'sources': [ 'bundle.c' ], - 'mac_bundle_resources': [ - 'English.lproj/InfoPlist.strings', - ], - 'xcode_settings': { - 'INFOPLIST_FILE': 'Info.plist', - } - }, - { - 'target_name': 'dependent_on_bundle', - 'type': 'executable', - 'sources': [ 'executable.c' ], - 'dependencies': [ - 'my_bundle', - ], - }, - ], -} diff --git a/tools/gyp/test/mac/deployment-target/check-version-min.c b/tools/gyp/test/mac/deployment-target/check-version-min.c deleted file mode 100644 index 6b05a27f0aea0d24c21c22b6859fabdfb5e8ad7f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/deployment-target/check-version-min.c +++ /dev/null @@ -1,32 +0,0 @@ -/* Copyright (c) 2013 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. */ - -#include - -/* GYPTEST_MAC_VERSION_MIN: should be set to the corresponding value of - * xcode setting 'MACOSX_DEPLOYMENT_TARGET', otherwise both should be - * left undefined. - * - * GYPTEST_IOS_VERSION_MIN: should be set to the corresponding value of - * xcode setting 'IPHONEOS_DEPLOYMENT_TARGET', otherwise both should be - * left undefined. - */ - -#if defined(GYPTEST_MAC_VERSION_MIN) -# if GYPTEST_MAC_VERSION_MIN != __MAC_OS_X_VERSION_MIN_REQUIRED -# error __MAC_OS_X_VERSION_MIN_REQUIRED has wrong value -# endif -#elif defined(__MAC_OS_X_VERSION_MIN_REQUIRED) -# error __MAC_OS_X_VERSION_MIN_REQUIRED should be undefined -#endif - -#if defined(GYPTEST_IOS_VERSION_MIN) -# if GYPTEST_IOS_VERSION_MIN != __IPHONE_OS_VERSION_MIN_REQUIRED -# error __IPHONE_OS_VERSION_MIN_REQUIRED has wrong value -# endif -#elif defined(__IPHONE_OS_VERSION_MIN_REQUIRED) -# error __IPHONE_OS_VERSION_MIN_REQUIRED should be undefined -#endif - -int main() { return 0; } diff --git a/tools/gyp/test/mac/deployment-target/deployment-target.gyp b/tools/gyp/test/mac/deployment-target/deployment-target.gyp deleted file mode 100644 index 24b87b519a000d5aabb3edcc332bc550ffaf465d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/deployment-target/deployment-target.gyp +++ /dev/null @@ -1,27 +0,0 @@ -# Copyright (c) 2013 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': 'macosx-version-min-10.5', - 'type': 'executable', - 'sources': [ 'check-version-min.c', ], - 'defines': [ 'GYPTEST_MAC_VERSION_MIN=1050', ], - 'xcode_settings': { - 'SDKROOT': 'macosx', - 'MACOSX_DEPLOYMENT_TARGET': '10.5', - }, - }, - { - 'target_name': 'macosx-version-min-10.6', - 'type': 'executable', - 'sources': [ 'check-version-min.c', ], - 'defines': [ 'GYPTEST_MAC_VERSION_MIN=1060', ], - 'xcode_settings': { - 'SDKROOT': 'macosx', - 'MACOSX_DEPLOYMENT_TARGET': '10.6', - }, - }, - ], -} diff --git a/tools/gyp/test/mac/framework-dirs/calculate.c b/tools/gyp/test/mac/framework-dirs/calculate.c deleted file mode 100644 index 4e93bf54304ca73b1e8767cf6eed90893d1421ed..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/framework-dirs/calculate.c +++ /dev/null @@ -1,14 +0,0 @@ -/* 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. - */ - -int CalculatePerformExpression(char* expr, - int significantDigits, - int flags, - char* answer); - -int main() { - char buffer[1024]; - return CalculatePerformExpression("42", 1, 0, buffer); -} diff --git a/tools/gyp/test/mac/framework-dirs/framework-dirs.gyp b/tools/gyp/test/mac/framework-dirs/framework-dirs.gyp deleted file mode 100644 index bf1cbde4defc5ac477ec6780f6492e1f4a8cdb1e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/framework-dirs/framework-dirs.gyp +++ /dev/null @@ -1,21 +0,0 @@ -# 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': 'calculate', - 'type': 'executable', - 'sources': [ - 'calculate.c', - ], - 'libraries': [ - '/System/Library/PrivateFrameworks/Calculate.framework', - ], - 'mac_framework_dirs': [ - '/System/Library/PrivateFrameworks', - ], - }, - ], -} diff --git a/tools/gyp/test/mac/framework-headers/myframework.h b/tools/gyp/test/mac/framework-headers/myframework.h deleted file mode 100644 index 961fc701bc0b51bcae82b7de6e4e629daa70dea8..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/framework-headers/myframework.h +++ /dev/null @@ -1,8 +0,0 @@ -// 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. - -#import - -@interface TestObject : NSObject -@end diff --git a/tools/gyp/test/mac/framework-headers/myframework.m b/tools/gyp/test/mac/framework-headers/myframework.m deleted file mode 100644 index 13d53a37ab716db25f82fb15060d47804db81e06..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/framework-headers/myframework.m +++ /dev/null @@ -1,8 +0,0 @@ -// 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. - -#import "myframework.h" - -@implementation TestObject -@end diff --git a/tools/gyp/test/mac/framework-headers/test.gyp b/tools/gyp/test/mac/framework-headers/test.gyp deleted file mode 100644 index 0c2e02b64434ab8c35b1a60b14af7af0524401ae..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/framework-headers/test.gyp +++ /dev/null @@ -1,44 +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': 'test_framework_headers_framework', - 'product_name': 'TestFramework', - 'type': 'shared_library', - 'mac_bundle': 1, - 'sources': [ - 'myframework.h', - 'myframework.m', - ], - 'mac_framework_headers': [ - 'myframework.h', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', - ], - }, - },{ - 'target_name': 'test_framework_headers_static', - 'product_name': 'TestLibrary', - 'type': 'static_library', - 'xcode_settings': { - 'PUBLIC_HEADERS_FOLDER_PATH': 'include', - }, - 'sources': [ - 'myframework.h', - 'myframework.m', - ], - 'mac_framework_headers': [ - 'myframework.h', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', - ], - }, - }, - ], -} diff --git a/tools/gyp/test/mac/framework/TestFramework/English.lproj/InfoPlist.strings b/tools/gyp/test/mac/framework/TestFramework/English.lproj/InfoPlist.strings deleted file mode 100644 index 2d92facd653be65257bba2526564d57dd4f6ef39..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/framework/TestFramework/English.lproj/InfoPlist.strings +++ /dev/null @@ -1 +0,0 @@ -/* Localized versions of Info.plist keys */ diff --git a/tools/gyp/test/mac/framework/TestFramework/Info.plist b/tools/gyp/test/mac/framework/TestFramework/Info.plist deleted file mode 100644 index a791b3ee48d1e6f1dbe0041aebfba642e5acbbd9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/framework/TestFramework/Info.plist +++ /dev/null @@ -1,28 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - - CFBundleIdentifier - com.yourcompany.${PRODUCT_NAME:identifier} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - NSPrincipalClass - - - diff --git a/tools/gyp/test/mac/framework/TestFramework/ObjCVector.h b/tools/gyp/test/mac/framework/TestFramework/ObjCVector.h deleted file mode 100644 index c2450960cd24c8f66dc92dda2c7fafd83beb10ca..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/framework/TestFramework/ObjCVector.h +++ /dev/null @@ -1,28 +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. - -#import - -#ifdef __cplusplus -struct ObjCVectorImp; -#else -typedef struct _ObjCVectorImpT ObjCVectorImp; -#endif - -@interface ObjCVector : NSObject { - @private - ObjCVectorImp* imp_; -} - -- (id)init; - -- (void)addObject:(id)obj; -- (void)addObject:(id)obj atIndex:(NSUInteger)index; - -- (void)removeObject:(id)obj; -- (void)removeObjectAtIndex:(NSUInteger)index; - -- (id)objectAtIndex:(NSUInteger)index; - -@end diff --git a/tools/gyp/test/mac/framework/TestFramework/ObjCVector.mm b/tools/gyp/test/mac/framework/TestFramework/ObjCVector.mm deleted file mode 100644 index cbf431f28d4d9d1473912e7317d2c2f4ecad92be..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/framework/TestFramework/ObjCVector.mm +++ /dev/null @@ -1,63 +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. - -#import "ObjCVectorInternal.h" -#import "ObjCVector.h" - -#include - -@interface ObjCVector (Private) -- (std::vector::iterator)makeIterator:(NSUInteger)index; -@end - -@implementation ObjCVector - -- (id)init { - if ((self = [super init])) { - imp_ = new ObjCVectorImp(); - } - return self; -} - -- (void)dealloc { - delete imp_; - [super dealloc]; -} - -- (void)addObject:(id)obj { - imp_->v.push_back([obj retain]); -} - -- (void)addObject:(id)obj atIndex:(NSUInteger)index { - imp_->v.insert([self makeIterator:index], [obj retain]); -} - -- (void)removeObject:(id)obj { - for (std::vector::iterator it = imp_->v.begin(); - it != imp_->v.end(); - ++it) { - if ([*it isEqual:obj]) { - [*it autorelease]; - imp_->v.erase(it); - return; - } - } -} - -- (void)removeObjectAtIndex:(NSUInteger)index { - [imp_->v[index] autorelease]; - imp_->v.erase([self makeIterator:index]); -} - -- (id)objectAtIndex:(NSUInteger)index { - return imp_->v[index]; -} - -- (std::vector::iterator)makeIterator:(NSUInteger)index { - std::vector::iterator it = imp_->v.begin(); - it += index; - return it; -} - -@end diff --git a/tools/gyp/test/mac/framework/TestFramework/ObjCVectorInternal.h b/tools/gyp/test/mac/framework/TestFramework/ObjCVectorInternal.h deleted file mode 100644 index fb6c98258b5e2bfc5229810fe01a4153209036c8..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/framework/TestFramework/ObjCVectorInternal.h +++ /dev/null @@ -1,9 +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. - -#include - -struct ObjCVectorImp { - std::vector v; -}; diff --git a/tools/gyp/test/mac/framework/TestFramework/TestFramework_Prefix.pch b/tools/gyp/test/mac/framework/TestFramework/TestFramework_Prefix.pch deleted file mode 100644 index 394f41d9576a62a2e0eac97e10eb853cf606b189..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/framework/TestFramework/TestFramework_Prefix.pch +++ /dev/null @@ -1,7 +0,0 @@ -// -// Prefix header for all source files of the 'TestFramework' target in the 'TestFramework' project. -// - -#ifdef __OBJC__ - #import -#endif diff --git a/tools/gyp/test/mac/framework/empty.c b/tools/gyp/test/mac/framework/empty.c deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tools/gyp/test/mac/framework/framework.gyp b/tools/gyp/test/mac/framework/framework.gyp deleted file mode 100644 index eaaef3fc57b216b9d71f4dc20e22886c0dc02acc..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/framework/framework.gyp +++ /dev/null @@ -1,94 +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': 'dep_framework', - 'product_name': 'Dependency Bundle', - 'type': 'shared_library', - 'mac_bundle': 1, - 'sources': [ 'empty.c', ], - }, - { - 'target_name': 'test_framework', - 'product_name': 'Test Framework', - 'type': 'shared_library', - 'mac_bundle': 1, - 'dependencies': [ 'dep_framework', ], - 'sources': [ - 'TestFramework/ObjCVector.h', - 'TestFramework/ObjCVectorInternal.h', - 'TestFramework/ObjCVector.mm', - ], - 'mac_bundle_resources': [ - 'TestFramework/English.lproj/InfoPlist.strings', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Cocoa.framework', - ], - }, - 'xcode_settings': { - 'INFOPLIST_FILE': 'TestFramework/Info.plist', - 'GCC_DYNAMIC_NO_PIC': 'NO', - }, - 'copies': [ - # Test copying to a file that has envvars in its dest path. - # Needs to be in a mac_bundle target, else CONTENTS_FOLDER_PATH isn't - # set. - { - 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries', - 'files': [ - 'empty.c', - ], - }, - ], - }, - { - 'target_name': 'copy_target', - 'type': 'none', - 'dependencies': [ 'test_framework', 'dep_framework', ], - 'copies': [ - # Test copying directories with spaces in src and dest paths. - { - 'destination': '<(PRODUCT_DIR)/Test Framework.framework/foo', - 'files': [ - '<(PRODUCT_DIR)/Dependency Bundle.framework', - ], - }, - ], - 'actions': [ - { - 'action_name': 'aektschn', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/touched_file'], - 'action': ['touch', '${BUILT_PRODUCTS_DIR}/action_file'], - }, - ], - }, - { - 'target_name': 'copy_target_code_sign', - 'type': 'none', - 'dependencies': [ 'test_framework', 'dep_framework', ], - 'copies': [ - # Test copying directories with spaces in src and dest paths. - { - 'destination': '<(PRODUCT_DIR)/Test Framework.framework/foo', - 'files': [ - '<(PRODUCT_DIR)/Dependency Bundle.framework', - ], - 'xcode_code_sign': 1, - }, - ], - 'actions': [ - { - 'action_name': 'aektschn', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/touched_file'], - 'action': ['touch', '${BUILT_PRODUCTS_DIR}/action_file'], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/mac/global-settings/src/dir1/dir1.gyp b/tools/gyp/test/mac/global-settings/src/dir1/dir1.gyp deleted file mode 100644 index 153e34ddd681ca04c9b6c4f2791858e29ea6004d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/global-settings/src/dir1/dir1.gyp +++ /dev/null @@ -1,11 +0,0 @@ -# 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': 'dir1_target', - 'type': 'none', - }, - ], -} diff --git a/tools/gyp/test/mac/global-settings/src/dir2/dir2.gyp b/tools/gyp/test/mac/global-settings/src/dir2/dir2.gyp deleted file mode 100644 index cda46c839badec158504023ea7e70cf37a7cee04..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/global-settings/src/dir2/dir2.gyp +++ /dev/null @@ -1,22 +0,0 @@ -# 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': 'dir2_target', - 'type': 'none', - 'dependencies': [ - '../dir1/dir1.gyp:dir1_target', - ], - 'actions': [ - { - 'inputs': [ ], - 'outputs': [ '<(PRODUCT_DIR)/file.txt' ], - 'action_name': 'Test action', - 'action': ['cp', 'file.txt', '${BUILT_PRODUCTS_DIR}/file.txt' ], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/mac/global-settings/src/dir2/file.txt b/tools/gyp/test/mac/global-settings/src/dir2/file.txt deleted file mode 100644 index 58da2d8e9acf40efcce01f5f05fe22ed76d91cf2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/global-settings/src/dir2/file.txt +++ /dev/null @@ -1 +0,0 @@ -File. diff --git a/tools/gyp/test/mac/gyptest-action-envvars.py b/tools/gyp/test/mac/gyptest-action-envvars.py deleted file mode 100644 index c84eeaa465ab0e58e690781513ad3d164e28559a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-action-envvars.py +++ /dev/null @@ -1,36 +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. - -""" -Verifies that env vars work with actions, with relative directory paths. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - # The xcode-ninja generator handles gypfiles which are not at the - # project root incorrectly. - # cf. https://code.google.com/p/gyp/issues/detail?id=460 - if test.format == 'xcode-ninja': - test.skip_test() - - CHDIR = 'action-envvars' - test.run_gyp('action/action.gyp', chdir=CHDIR) - test.build('action/action.gyp', 'action', chdir=CHDIR, SYMROOT='../build') - - result_file = test.built_file_path('result', chdir=CHDIR) - test.must_exist(result_file) - test.must_contain(result_file, 'Test output') - - other_result_file = test.built_file_path('other_result', chdir=CHDIR) - test.must_exist(other_result_file) - test.must_contain(other_result_file, 'Other output') - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-app-assets-catalog.py b/tools/gyp/test/mac/gyptest-app-assets-catalog.py deleted file mode 100755 index ecb5a78c8b41d75b1fb5bd47d3fdc03a3ee1dfe7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-app-assets-catalog.py +++ /dev/null @@ -1,120 +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. - -""" -Verifies that app bundles are built correctly. -""" - -import TestGyp -import TestMac - -import os -import plistlib -import subprocess -import sys - - -def ExpectEq(expected, actual): - if expected != actual: - print >>sys.stderr, 'Expected "%s", got "%s"' % (expected, actual) - test.fail_test() - -def ls(path): - '''Returns a list of all files in a directory, relative to the directory.''' - result = [] - for dirpath, _, files in os.walk(path): - for f in files: - result.append(os.path.join(dirpath, f)[len(path) + 1:]) - return result - -# Xcode supports for assets catalog was introduced in Xcode 6.0 -if sys.platform == 'darwin' and TestMac.Xcode.Version() >= '0600': - test_gyp_path = 'test-assets-catalog.gyp' - test_app_path = 'Test App Assets Catalog Gyp.app' - - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - test.run_gyp(test_gyp_path, chdir='app-bundle') - test.build(test_gyp_path, test.ALL, chdir='app-bundle') - - # Binary - test.built_file_must_exist( - os.path.join(test_app_path, 'Contents/MacOS/Test App Assets Catalog Gyp'), - chdir='app-bundle') - - # Info.plist - info_plist = test.built_file_path( - os.path.join(test_app_path, 'Contents/Info.plist'), - chdir='app-bundle') - test.must_exist(info_plist) - test.must_contain( - info_plist, - 'com.google.Test-App-Assets-Catalog-Gyp') # Variable expansion - test.must_not_contain(info_plist, '${MACOSX_DEPLOYMENT_TARGET}'); - - if test.format != 'make': - # TODO: Synthesized plist entries aren't hooked up in the make generator. - machine = subprocess.check_output(['sw_vers', '-buildVersion']).rstrip('\n') - plist = plistlib.readPlist(info_plist) - ExpectEq(machine, plist['BuildMachineOSBuild']) - - expected = '' - version = TestMac.Xcode.SDKVersion() - expected = 'macosx' + version - ExpectEq(expected, plist['DTSDKName']) - sdkbuild = TestMac.Xcode.SDKBuild() - if not sdkbuild: - # Above command doesn't work in Xcode 4.2. - sdkbuild = plist['BuildMachineOSBuild'] - ExpectEq(sdkbuild, plist['DTSDKBuild']) - ExpectEq(TestMac.Xcode.Version(), plist['DTXcode']) - ExpectEq(TestMac.Xcode.Build(), plist['DTXcodeBuild']) - - # Resources - strings_files = ['InfoPlist.strings', 'utf-16be.strings', 'utf-16le.strings'] - for f in strings_files: - strings = test.built_file_path( - os.path.join(test_app_path, 'Contents/Resources/English.lproj', f), - chdir='app-bundle') - test.must_exist(strings) - # Xcodes writes UTF-16LE with BOM. - contents = open(strings, 'rb').read() - if not contents.startswith('\xff\xfe' + '/* Localized'.encode('utf-16le')): - test.fail_test() - - test.built_file_must_exist( - os.path.join( - test_app_path, 'Contents/Resources/English.lproj/MainMenu.nib'), - chdir='app-bundle') - - # make does not supports .xcassets files - extra_content_files = [] - if test.format != 'make': - extra_content_files = ['Contents/Resources/Assets.car'] - for f in extra_content_files: - test.built_file_must_exist( - os.path.join(test_app_path, f), - chdir='app-bundle') - - # Packaging - test.built_file_must_exist( - os.path.join(test_app_path, 'Contents/PkgInfo'), - chdir='app-bundle') - test.built_file_must_match( - os.path.join(test_app_path, 'Contents/PkgInfo'), 'APPLause', - chdir='app-bundle') - - # Check that no other files get added to the bundle. - if set(ls(test.built_file_path(test_app_path, chdir='app-bundle'))) != \ - set(['Contents/MacOS/Test App Assets Catalog Gyp', - 'Contents/Info.plist', - 'Contents/Resources/English.lproj/MainMenu.nib', - 'Contents/PkgInfo', - ] + extra_content_files + - [os.path.join('Contents/Resources/English.lproj', f) - for f in strings_files]): - test.fail_test() - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-app-error.py b/tools/gyp/test/mac/gyptest-app-error.py deleted file mode 100755 index 8f3cef28c11d154979183e5ef29d2e92d93e0c9f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-app-error.py +++ /dev/null @@ -1,44 +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. - -""" -Verifies that invalid strings files cause the build to fail. -""" - -import TestCmd -import TestGyp - -import sys - -if sys.platform == 'darwin': - expected_error = 'Old-style plist parser: missing semicolon in dictionary' - saw_expected_error = [False] # Python2 has no "nonlocal" keyword. - def match(a, b): - if a == b: - return True - if not TestCmd.is_List(a): - a = a.split('\n') - if not TestCmd.is_List(b): - b = b.split('\n') - if expected_error in '\n'.join(a) + '\n'.join(b): - saw_expected_error[0] = True - return True - return False - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode'], match=match) - - test.run_gyp('test-error.gyp', chdir='app-bundle') - - test.build('test-error.gyp', test.ALL, chdir='app-bundle') - - # Ninja pipes stderr of subprocesses to stdout. - if test.format in ['ninja', 'xcode-ninja'] \ - and expected_error in test.stdout(): - saw_expected_error[0] = True - - if saw_expected_error[0]: - test.pass_test() - else: - test.fail_test() diff --git a/tools/gyp/test/mac/gyptest-app.py b/tools/gyp/test/mac/gyptest-app.py deleted file mode 100755 index 5ec4dc29ab08cffe8bdf9ef66400d9642d812cf2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-app.py +++ /dev/null @@ -1,115 +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. - -""" -Verifies that app bundles are built correctly. -""" - -import TestGyp -import TestMac - -import os -import plistlib -import subprocess -import sys - - -def CheckFileXMLPropertyList(file): - output = subprocess.check_output(['file', file]) - # The double space after XML is intentional. - if not 'XML document text' in output: - print 'File: Expected XML document text, got %s' % output - test.fail_test() - -def ExpectEq(expected, actual): - if expected != actual: - print >>sys.stderr, 'Expected "%s", got "%s"' % (expected, actual) - test.fail_test() - -def ls(path): - '''Returns a list of all files in a directory, relative to the directory.''' - result = [] - for dirpath, _, files in os.walk(path): - for f in files: - result.append(os.path.join(dirpath, f)[len(path) + 1:]) - return result - - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - test.run_gyp('test.gyp', chdir='app-bundle') - - test.build('test.gyp', test.ALL, chdir='app-bundle') - - # Binary - test.built_file_must_exist('Test App Gyp.app/Contents/MacOS/Test App Gyp', - chdir='app-bundle') - - # Info.plist - info_plist = test.built_file_path('Test App Gyp.app/Contents/Info.plist', - chdir='app-bundle') - test.must_exist(info_plist) - test.must_contain(info_plist, 'com.google.Test-App-Gyp') # Variable expansion - test.must_not_contain(info_plist, '${MACOSX_DEPLOYMENT_TARGET}'); - CheckFileXMLPropertyList(info_plist) - - if test.format != 'make': - # TODO: Synthesized plist entries aren't hooked up in the make generator. - machine = subprocess.check_output(['sw_vers', '-buildVersion']).rstrip('\n') - plist = plistlib.readPlist(info_plist) - ExpectEq(machine, plist['BuildMachineOSBuild']) - - # Prior to Xcode 5.0.0, SDKROOT (and thus DTSDKName) was only defined if - # set in the Xcode project file. Starting with that version, it is always - # defined. - expected = '' - if TestMac.Xcode.Version() >= '0500': - version = TestMac.Xcode.SDKVersion() - expected = 'macosx' + version - ExpectEq(expected, plist['DTSDKName']) - sdkbuild = TestMac.Xcode.SDKBuild() - if not sdkbuild: - # Above command doesn't work in Xcode 4.2. - sdkbuild = plist['BuildMachineOSBuild'] - ExpectEq(sdkbuild, plist['DTSDKBuild']) - ExpectEq(TestMac.Xcode.Version(), plist['DTXcode']) - ExpectEq(TestMac.Xcode.Build(), plist['DTXcodeBuild']) - - # Resources - strings_files = ['InfoPlist.strings', 'utf-16be.strings', 'utf-16le.strings'] - for f in strings_files: - strings = test.built_file_path( - os.path.join('Test App Gyp.app/Contents/Resources/English.lproj', f), - chdir='app-bundle') - test.must_exist(strings) - # Xcodes writes UTF-16LE with BOM. - contents = open(strings, 'rb').read() - if not contents.startswith('\xff\xfe' + '/* Localized'.encode('utf-16le')): - test.fail_test() - - test.built_file_must_exist( - 'Test App Gyp.app/Contents/Resources/English.lproj/MainMenu.nib', - chdir='app-bundle') - - # Packaging - test.built_file_must_exist('Test App Gyp.app/Contents/PkgInfo', - chdir='app-bundle') - test.built_file_must_match('Test App Gyp.app/Contents/PkgInfo', 'APPLause', - chdir='app-bundle') - - # Check that no other files get added to the bundle. - if set(ls(test.built_file_path('Test App Gyp.app', chdir='app-bundle'))) != \ - set(['Contents/MacOS/Test App Gyp', - 'Contents/Info.plist', - 'Contents/Resources/English.lproj/MainMenu.nib', - 'Contents/PkgInfo', - ] + - [os.path.join('Contents/Resources/English.lproj', f) - for f in strings_files]): - test.fail_test() - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-archs.py b/tools/gyp/test/mac/gyptest-archs.py deleted file mode 100644 index 106a928e9290ef88e1b85df1ed3abb7b42fbf304..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-archs.py +++ /dev/null @@ -1,95 +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. - -""" -Tests things related to ARCHS. -""" - -import TestGyp -import TestMac - -import re -import subprocess -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - test.run_gyp('test-no-archs.gyp', chdir='archs') - test.build('test-no-archs.gyp', test.ALL, chdir='archs') - result_file = test.built_file_path('Test', chdir='archs') - test.must_exist(result_file) - - if TestMac.Xcode.Version() >= '0500': - expected_type = ['x86_64'] - else: - expected_type = ['i386'] - TestMac.CheckFileType(test, result_file, expected_type) - - test.run_gyp('test-valid-archs.gyp', chdir='archs') - test.build('test-valid-archs.gyp', test.ALL, chdir='archs') - result_file = test.built_file_path('Test', chdir='archs') - test.must_exist(result_file) - TestMac.CheckFileType(test, result_file, ['x86_64']) - - test.run_gyp('test-archs-x86_64.gyp', chdir='archs') - test.build('test-archs-x86_64.gyp', test.ALL, chdir='archs') - result_file = test.built_file_path('Test64', chdir='archs') - test.must_exist(result_file) - TestMac.CheckFileType(test, result_file, ['x86_64']) - - test.run_gyp('test-dependencies.gyp', chdir='archs') - test.build('test-dependencies.gyp', target=test.ALL, chdir='archs') - products = ['c_standalone', 'd_standalone'] - for product in products: - result_file = test.built_file_path( - product, chdir='archs', type=test.STATIC_LIB) - test.must_exist(result_file) - - if test.format != 'make': - # Build all targets except 'exe_32_64_no_sources' that does build - # but should not cause error when generating ninja files - targets = [ - 'static_32_64', 'shared_32_64', 'shared_32_64_bundle', - 'module_32_64', 'module_32_64_bundle', - 'exe_32_64', 'exe_32_64_bundle', 'precompiled_prefix_header_mm_32_64', - ] - - test.run_gyp('test-archs-multiarch.gyp', chdir='archs') - - for target in targets: - test.build('test-archs-multiarch.gyp', target=target, chdir='archs') - - result_file = test.built_file_path( - 'static_32_64', chdir='archs', type=test.STATIC_LIB) - test.must_exist(result_file) - TestMac.CheckFileType(test, result_file, ['i386', 'x86_64']) - - result_file = test.built_file_path( - 'shared_32_64', chdir='archs', type=test.SHARED_LIB) - test.must_exist(result_file) - TestMac.CheckFileType(test, result_file, ['i386', 'x86_64']) - - result_file = test.built_file_path('My Framework.framework/My Framework', - chdir='archs') - test.must_exist(result_file) - TestMac.CheckFileType(test, result_file, ['i386', 'x86_64']) - # Check that symbol "_x" made it into both versions of the binary: - if not all(['D _x' in subprocess.check_output( - ['nm', '-arch', arch, result_file]) for arch in ['i386', 'x86_64']]): - # This can only flakily fail, due to process ordering issues. If this - # does fail flakily, then something's broken, it's not the test at fault. - test.fail_test() - - result_file = test.built_file_path( - 'exe_32_64', chdir='archs', type=test.EXECUTABLE) - test.must_exist(result_file) - TestMac.CheckFileType(test, result_file, ['i386', 'x86_64']) - - result_file = test.built_file_path('Test App.app/Contents/MacOS/Test App', - chdir='archs') - test.must_exist(result_file) - TestMac.CheckFileType(test, result_file, ['i386', 'x86_64']) diff --git a/tools/gyp/test/mac/gyptest-bundle-resources.py b/tools/gyp/test/mac/gyptest-bundle-resources.py deleted file mode 100644 index 824b17f6b9bb5ba604476fdce9480a128ca9f273..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-bundle-resources.py +++ /dev/null @@ -1,58 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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 things related to bundle resources. -""" - -import TestGyp - -import os -import stat -import sys - - -def check_attribs(path, expected_exec_bit): - out_path = test.built_file_path( - os.path.join('resource.app/Contents/Resources', path), chdir=CHDIR) - - in_stat = os.stat(os.path.join(CHDIR, path)) - out_stat = os.stat(out_path) - if in_stat.st_mtime == out_stat.st_mtime: - test.fail_test() - if out_stat.st_mode & stat.S_IXUSR != expected_exec_bit: - test.fail_test() - - -if sys.platform == 'darwin': - # set |match| to ignore build stderr output. - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - CHDIR = 'bundle-resources' - test.run_gyp('test.gyp', chdir=CHDIR) - - test.build('test.gyp', test.ALL, chdir=CHDIR) - - test.built_file_must_match('resource.app/Contents/Resources/secret.txt', - 'abc\n', chdir=CHDIR) - test.built_file_must_match('source_rule.app/Contents/Resources/secret.txt', - 'ABC\n', chdir=CHDIR) - - test.built_file_must_match( - 'resource.app/Contents/Resources/executable-file.sh', - '#!/bin/bash\n' - '\n' - 'echo echo echo echo cho ho o o\n', chdir=CHDIR) - - check_attribs('executable-file.sh', expected_exec_bit=stat.S_IXUSR) - check_attribs('secret.txt', expected_exec_bit=0) - - # TODO(thakis): This currently fails with make. - if test.format != 'make': - test.built_file_must_match( - 'resource_rule.app/Contents/Resources/secret.txt', 'ABC\n', chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-cflags.py b/tools/gyp/test/mac/gyptest-cflags.py deleted file mode 100644 index 17afd1566542c08c79dacce9cf649a16d7136ef2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-cflags.py +++ /dev/null @@ -1,21 +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. - -""" -Verifies that compile-time flags work. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - CHDIR = 'cflags' - test.run_gyp('test.gyp', chdir=CHDIR) - - test.build('test.gyp', test.ALL, chdir=CHDIR) - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-clang-cxx-language-standard.py b/tools/gyp/test/mac/gyptest-clang-cxx-language-standard.py deleted file mode 100644 index 48708d84048d1afad72b4c188c8b68f4cefc6b24..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-clang-cxx-language-standard.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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 that CLANG_CXX_LANGUAGE_STANDARD works. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['make', 'ninja', 'xcode']) - - test.run_gyp('clang-cxx-language-standard.gyp', - chdir='clang-cxx-language-standard') - - test.build('clang-cxx-language-standard.gyp', test.ALL, - chdir='clang-cxx-language-standard') - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-clang-cxx-library.py b/tools/gyp/test/mac/gyptest-clang-cxx-library.py deleted file mode 100644 index effb434cba6323d30049eec81df6f35dc7db0cd5..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-clang-cxx-library.py +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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 that CLANG_CXX_LIBRARY works. -""" - -import TestGyp -import TestMac - -import os -import sys - -if sys.platform == 'darwin': - # Xcode 4.2 on OS X 10.6 doesn't install the libc++ headers, don't run this - # test there. - if TestMac.Xcode.Version() <= '0420': - sys.exit(0) - - test = TestGyp.TestGyp(formats=['make', 'ninja', 'xcode']) - test.run_gyp('clang-cxx-library.gyp', chdir='clang-cxx-library') - test.build('clang-cxx-library.gyp', test.ALL, chdir='clang-cxx-library') - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-copies.py b/tools/gyp/test/mac/gyptest-copies.py deleted file mode 100755 index 49685095016cf3b3eedd6067dc41449f0db5c01a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-copies.py +++ /dev/null @@ -1,52 +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. - -""" -Verifies that 'copies' with app bundles are handled correctly. -""" - -import TestGyp - -import os -import sys -import time - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - test.run_gyp('framework.gyp', chdir='framework') - - test.build('framework.gyp', 'copy_target', chdir='framework') - - # Check that the copy succeeded. - test.built_file_must_exist( - 'Test Framework.framework/foo/Dependency Bundle.framework', - chdir='framework') - test.built_file_must_exist( - 'Test Framework.framework/foo/Dependency Bundle.framework/Versions/A', - chdir='framework') - test.built_file_must_exist( - 'Test Framework.framework/Versions/A/Libraries/empty.c', - chdir='framework') - - - # Check that rebuilding the target a few times works. - dep_bundle = test.built_file_path('Dependency Bundle.framework', - chdir='framework') - mtime = os.path.getmtime(dep_bundle) - atime = os.path.getatime(dep_bundle) - for i in range(3): - os.utime(dep_bundle, (atime + i * 1000, mtime + i * 1000)) - test.build('framework.gyp', 'copy_target', chdir='framework') - - - # Check that actions ran. - test.built_file_must_exist('action_file', chdir='framework') - - # Test that a copy with the "Code Sign on Copy" flag on succeeds. - test.build('framework.gyp', 'copy_target_code_sign', chdir='framework') - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-copy-dylib.py b/tools/gyp/test/mac/gyptest-copy-dylib.py deleted file mode 100644 index 253623d1c69dfa5aa575b4a0e09f9f4d423eb8cc..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-copy-dylib.py +++ /dev/null @@ -1,25 +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. - -""" -Verifies that dylibs can be copied into app bundles. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - test.run_gyp('test.gyp', chdir='copy-dylib') - - test.build('test.gyp', 'test_app', chdir='copy-dylib') - - test.built_file_must_exist( - 'Test App.app/Contents/Resources/libmy_dylib.dylib', chdir='copy-dylib') - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-debuginfo.py b/tools/gyp/test/mac/gyptest-debuginfo.py deleted file mode 100755 index a0e9438e2a6bfd93fa78b15a7f40741c01f65f18..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-debuginfo.py +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Tests things related to debug information generation. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - test.run_gyp('test.gyp', chdir='debuginfo') - - test.build('test.gyp', test.ALL, chdir='debuginfo') - - test.built_file_must_exist('libnonbundle_shared_library.dylib.dSYM', - chdir='debuginfo') - test.built_file_must_exist('nonbundle_loadable_module.so.dSYM', - chdir='debuginfo') - test.built_file_must_exist('nonbundle_executable.dSYM', - chdir='debuginfo') - - test.built_file_must_exist('bundle_shared_library.framework.dSYM', - chdir='debuginfo') - test.built_file_must_exist('bundle_loadable_module.bundle.dSYM', - chdir='debuginfo') - test.built_file_must_exist('My App.app.dSYM', - chdir='debuginfo') - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-depend-on-bundle.py b/tools/gyp/test/mac/gyptest-depend-on-bundle.py deleted file mode 100644 index 5cccb03227cbebccd7fc4c97e9b0a0369ab25b39..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-depend-on-bundle.py +++ /dev/null @@ -1,40 +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. - -""" -Verifies that a dependency on a bundle causes the whole bundle to be built. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - test.run_gyp('test.gyp', chdir='depend-on-bundle') - - test.build('test.gyp', 'dependent_on_bundle', chdir='depend-on-bundle') - - # Binary itself. - test.built_file_must_exist('dependent_on_bundle', chdir='depend-on-bundle') - - # Bundle dependency. - test.built_file_must_exist( - 'my_bundle.framework/Versions/A/my_bundle', - chdir='depend-on-bundle') - test.built_file_must_exist( # package_framework - 'my_bundle.framework/my_bundle', - chdir='depend-on-bundle') - test.built_file_must_exist( # plist - 'my_bundle.framework/Versions/A/Resources/Info.plist', - chdir='depend-on-bundle') - test.built_file_must_exist( - 'my_bundle.framework/Versions/A/Resources/English.lproj/' # Resources - 'InfoPlist.strings', - chdir='depend-on-bundle') - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-deployment-target.py b/tools/gyp/test/mac/gyptest-deployment-target.py deleted file mode 100644 index f5812e62db6050e6a995055a5a17e2d73ef5c183..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-deployment-target.py +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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 that MACOSX_DEPLOYMENT_TARGET works. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['make', 'ninja', 'xcode']) - - test.run_gyp('deployment-target.gyp', chdir='deployment-target') - - test.build('deployment-target.gyp', test.ALL, chdir='deployment-target') - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-framework-dirs.py b/tools/gyp/test/mac/gyptest-framework-dirs.py deleted file mode 100644 index a1ae54c57fbeb02c7e701625b334740b3e23dd49..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-framework-dirs.py +++ /dev/null @@ -1,23 +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. - -""" -Verify that it is possible to build an object that depends on a -PrivateFramework. -""" - -import os -import sys -import TestGyp - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - CHDIR = 'framework-dirs' - test.run_gyp('framework-dirs.gyp', chdir=CHDIR) - test.build('framework-dirs.gyp', 'calculate', chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-framework-headers.py b/tools/gyp/test/mac/gyptest-framework-headers.py deleted file mode 100644 index aa13a742cdd3a6c23281cffa2a655ce36029c149..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-framework-headers.py +++ /dev/null @@ -1,38 +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. - -""" -Verifies that mac_framework_headers works properly. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - # TODO(thakis): Make this work with ninja, make. http://crbug.com/129013 - test = TestGyp.TestGyp(formats=['xcode']) - - CHDIR = 'framework-headers' - test.run_gyp('test.gyp', chdir=CHDIR) - - # Test that headers are installed for frameworks - test.build('test.gyp', 'test_framework_headers_framework', chdir=CHDIR) - - test.built_file_must_exist( - 'TestFramework.framework/Versions/A/TestFramework', chdir=CHDIR) - - test.built_file_must_exist( - 'TestFramework.framework/Versions/A/Headers/myframework.h', chdir=CHDIR) - - # Test that headers are installed for static libraries. - test.build('test.gyp', 'test_framework_headers_static', chdir=CHDIR) - - test.built_file_must_exist('libTestLibrary.a', chdir=CHDIR) - - test.built_file_must_exist('include/myframework.h', chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-framework.py b/tools/gyp/test/mac/gyptest-framework.py deleted file mode 100755 index 401bd98d2fba45452856327fa61c451ac1288ba8..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-framework.py +++ /dev/null @@ -1,74 +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. - -""" -Verifies that app bundles are built correctly. -""" - -import TestGyp - -import os -import sys - - -def ls(path): - '''Returns a list of all files in a directory, relative to the directory.''' - result = [] - for dirpath, _, files in os.walk(path): - for f in files: - result.append(os.path.join(dirpath, f)[len(path) + 1:]) - return result - - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - test.run_gyp('framework.gyp', chdir='framework') - - test.build('framework.gyp', 'test_framework', chdir='framework') - - # Binary - test.built_file_must_exist( - 'Test Framework.framework/Versions/A/Test Framework', - chdir='framework') - - # Info.plist - info_plist = test.built_file_path( - 'Test Framework.framework/Versions/A/Resources/Info.plist', - chdir='framework') - test.must_exist(info_plist) - test.must_contain(info_plist, 'com.yourcompany.Test_Framework') - - # Resources - test.built_file_must_exist( - 'Test Framework.framework/Versions/A/Resources/English.lproj/' - 'InfoPlist.strings', - chdir='framework') - - # Symlinks created by packaging process - test.built_file_must_exist('Test Framework.framework/Versions/Current', - chdir='framework') - test.built_file_must_exist('Test Framework.framework/Resources', - chdir='framework') - test.built_file_must_exist('Test Framework.framework/Test Framework', - chdir='framework') - # PkgInfo. - test.built_file_must_not_exist( - 'Test Framework.framework/Versions/A/Resources/PkgInfo', - chdir='framework') - - # Check that no other files get added to the bundle. - if set(ls(test.built_file_path('Test Framework.framework', - chdir='framework'))) != \ - set(['Versions/A/Test Framework', - 'Versions/A/Resources/Info.plist', - 'Versions/A/Resources/English.lproj/InfoPlist.strings', - 'Test Framework', - 'Versions/A/Libraries/empty.c', # Written by a gyp action. - ]): - test.fail_test() - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-global-settings.py b/tools/gyp/test/mac/gyptest-global-settings.py deleted file mode 100644 index f4ed16630e2f731893d615baa3dbd58cb4b5a3c0..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-global-settings.py +++ /dev/null @@ -1,33 +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. - -""" -Verifies that the global xcode_settings processing doesn't throw. -Regression test for http://crbug.com/109163 -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - # The xcode-ninja generator handles gypfiles which are not at the - # project root incorrectly. - # cf. https://code.google.com/p/gyp/issues/detail?id=460 - if test.format == 'xcode-ninja': - test.skip_test() - - test.run_gyp('src/dir2/dir2.gyp', chdir='global-settings', depth='src') - # run_gyp shouldn't throw. - - # Check that BUILT_PRODUCTS_DIR was set correctly, too. - test.build('dir2/dir2.gyp', 'dir2_target', chdir='global-settings/src', - SYMROOT='../build') - test.built_file_must_exist('file.txt', chdir='global-settings/src') - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-identical-name.py b/tools/gyp/test/mac/gyptest-identical-name.py deleted file mode 100644 index 62048256bcdb2051285879165c1f8354f2df52a2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-identical-name.py +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Verifies libraries (in identical-names) are properly handeled by xcode. - -The names for all libraries participating in this build are: -libtestlib.a - identical-name/testlib -libtestlib.a - identical-name/proxy/testlib -libproxy.a - identical-name/proxy -The first two libs produce a hash collision in Xcode when Gyp is executed, -because they have the same name and would be copied to the same directory with -Xcode default settings. -For this scenario to work one needs to change the Xcode variables SYMROOT and -CONFIGURATION_BUILD_DIR. Setting these to per-lib-unique directories, avoids -copying the libs into the same directory. - -The test consists of two steps. The first one verifies that by setting both -vars, there is no hash collision anymore during Gyp execution and that the libs -can actually be be built. The second one verifies that there is still a hash -collision if the vars are not set and thus the current behavior is preserved. -""" - -import TestGyp - -import sys - -def IgnoreOutput(string, expected_string): - return True - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['xcode']) - - - test.run_gyp('test.gyp', chdir='identical-name') - test.build('test.gyp', test.ALL, chdir='identical-name') - - test.run_gyp('test-should-fail.gyp', chdir='identical-name') - test.built_file_must_not_exist('test-should-fail.xcodeproj') - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-infoplist-process.py b/tools/gyp/test/mac/gyptest-infoplist-process.py deleted file mode 100755 index 20874a398af0b84c8c1961950b3cc9ac9dd966d9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-infoplist-process.py +++ /dev/null @@ -1,51 +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. - -""" -Verifies the Info.plist preprocessor functionality. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - CHDIR = 'infoplist-process' - INFO_PLIST_PATH = 'Test.app/Contents/Info.plist' - - # First process both keys. - test.set_configuration('One') - test.run_gyp('test1.gyp', chdir=CHDIR) - test.build('test1.gyp', test.ALL, chdir=CHDIR) - info_plist = test.built_file_path(INFO_PLIST_PATH, chdir=CHDIR) - test.must_exist(info_plist) - test.must_contain(info_plist, 'Foo') - test.must_contain(info_plist, 'Bar') - - # Then process a single key. - test.set_configuration('Two') - test.run_gyp('test2.gyp', chdir=CHDIR) - test.build('test2.gyp', chdir=CHDIR) - info_plist = test.built_file_path(INFO_PLIST_PATH, chdir=CHDIR) - test.must_exist(info_plist) - test.must_contain(info_plist, 'com.google.Test') # Normal expansion works. - test.must_contain(info_plist, 'Foo (Bar)') - test.must_contain(info_plist, 'PROCESSED_KEY2') - - # Then turn off the processor. - test.set_configuration('Three') - test.run_gyp('test3.gyp', chdir=CHDIR) - test.build('test3.gyp', chdir=CHDIR) - info_plist = test.built_file_path('Test App.app/Contents/Info.plist', - chdir=CHDIR) - test.must_exist(info_plist) - test.must_contain(info_plist, 'com.google.Test') # Normal expansion works. - test.must_contain(info_plist, 'PROCESSED_KEY1') - test.must_contain(info_plist, 'PROCESSED_KEY2') - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-installname.py b/tools/gyp/test/mac/gyptest-installname.py deleted file mode 100644 index 8f1f0246a9c714a0ef0c3d4a4f8f8487a97505ba..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-installname.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. - -""" -Verifies that LD_DYLIB_INSTALL_NAME and DYLIB_INSTALL_NAME_BASE are handled -correctly. -""" - -import TestGyp - -import re -import subprocess -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - CHDIR = 'installname' - test.run_gyp('test.gyp', chdir=CHDIR) - - test.build('test.gyp', test.ALL, chdir=CHDIR) - - def GetInstallname(p): - p = test.built_file_path(p, chdir=CHDIR) - r = re.compile(r'cmd LC_ID_DYLIB.*?name (.*?) \(offset \d+\)', re.DOTALL) - proc = subprocess.Popen(['otool', '-l', p], stdout=subprocess.PIPE) - o = proc.communicate()[0] - assert not proc.returncode - m = r.search(o) - assert m - return m.group(1) - - if (GetInstallname('libdefault_installname.dylib') != - '/usr/local/lib/libdefault_installname.dylib'): - test.fail_test() - - if (GetInstallname('My Framework.framework/My Framework') != - '/Library/Frameworks/My Framework.framework/' - 'Versions/A/My Framework'): - test.fail_test() - - if (GetInstallname('libexplicit_installname.dylib') != - 'Trapped in a dynamiclib factory'): - test.fail_test() - - if (GetInstallname('libexplicit_installname_base.dylib') != - '@executable_path/../../../libexplicit_installname_base.dylib'): - test.fail_test() - - if (GetInstallname('My Other Framework.framework/My Other Framework') != - '@executable_path/../../../My Other Framework.framework/' - 'Versions/A/My Other Framework'): - test.fail_test() - - if (GetInstallname('libexplicit_installname_with_base.dylib') != - '/usr/local/lib/libexplicit_installname_with_base.dylib'): - test.fail_test() - - if (GetInstallname('libexplicit_installname_with_explicit_base.dylib') != - '@executable_path/../libexplicit_installname_with_explicit_base.dylib'): - test.fail_test() - - if (GetInstallname('libboth_base_and_installname.dylib') != - 'Still trapped in a dynamiclib factory'): - test.fail_test() - - if (GetInstallname('install_name_with_info_plist.framework/' - 'install_name_with_info_plist') != - '/Library/Frameworks/install_name_with_info_plist.framework/' - 'Versions/A/install_name_with_info_plist'): - test.fail_test() - - if ('DYLIB_INSTALL_NAME_BASE:standardizepath: command not found' in - test.stdout()): - test.fail_test() - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-ldflags-passed-to-libtool.py b/tools/gyp/test/mac/gyptest-ldflags-passed-to-libtool.py deleted file mode 100644 index addd331a73cd571cdad3ebfea688ef88dd428770..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-ldflags-passed-to-libtool.py +++ /dev/null @@ -1,32 +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. - -""" -Verifies that OTHER_LDFLAGS is passed to libtool. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode'], - match = lambda a, b: True) - - build_error_code = { - 'xcode': [1, 65], # 1 for xcode 3, 65 for xcode 4 (see `man sysexits`) - 'make': 2, - 'ninja': 1, - 'xcode-ninja': [1, 65], - }[test.format] - - CHDIR = 'ldflags-libtool' - test.run_gyp('test.gyp', chdir=CHDIR) - - test.build('test.gyp', 'ldflags_passed_to_libtool', chdir=CHDIR, - status=build_error_code) - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-ldflags.py b/tools/gyp/test/mac/gyptest-ldflags.py deleted file mode 100644 index af44b8c5a056a2ef8dce99a9c26096da4f4e16e5..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-ldflags.py +++ /dev/null @@ -1,74 +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. - -""" -Verifies that filenames passed to various linker flags are converted into -build-directory relative paths correctly. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - # The xcode-ninja generator handles gypfiles which are not at the - # project root incorrectly. - # cf. https://code.google.com/p/gyp/issues/detail?id=460 - if test.format == 'xcode-ninja': - test.skip_test() - - CHDIR = 'ldflags' - test.run_gyp('subdirectory/test.gyp', chdir=CHDIR) - - test.build('subdirectory/test.gyp', test.ALL, chdir=CHDIR) - - test.pass_test() - - -# These flags from `man ld` couldl show up in OTHER_LDFLAGS and need path -# translation. -# -# Done: -# -exported_symbols_list filename -# -unexported_symbols_list file -# -reexported_symbols_list file -# -sectcreate segname sectname file -# -# Will be done on demand: -# -weak_library path_to_library -# -reexport_library path_to_library -# -lazy_library path_to_library -# -upward_library path_to_library -# -syslibroot rootdir -# -framework name[,suffix] -# -weak_framework name[,suffix] -# -reexport_framework name[,suffix] -# -lazy_framework name[,suffix] -# -upward_framework name[,suffix] -# -force_load path_to_archive -# -filelist file[,dirname] -# -dtrace file -# -order_file file # should use ORDER_FILE -# -exported_symbols_order file -# -bundle_loader executable # should use BUNDLE_LOADER -# -alias_list filename -# -seg_addr_table filename -# -dylib_file install_name:file_name -# -interposable_list filename -# -object_path_lto filename -# -# -# obsolete: -# -sectorder segname sectname orderfile -# -seg_addr_table_filename path -# -# -# ??: -# -map map_file_path -# -sub_library library_name -# -sub_umbrella framework_name diff --git a/tools/gyp/test/mac/gyptest-libraries.py b/tools/gyp/test/mac/gyptest-libraries.py deleted file mode 100755 index d5b64bda7f4b5cb1e60eaf7b255501c391cea880..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-libraries.py +++ /dev/null @@ -1,28 +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. - -""" -Verifies libraries (in link_settings) are properly found. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - # The xcode-ninja generator handles gypfiles which are not at the - # project root incorrectly. - # cf. https://code.google.com/p/gyp/issues/detail?id=460 - if test.format == 'xcode-ninja': - test.skip_test() - - test.run_gyp('subdir/test.gyp', chdir='libraries') - - test.build('subdir/test.gyp', test.ALL, chdir='libraries') - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-libtool-zero.py b/tools/gyp/test/mac/gyptest-libtool-zero.py deleted file mode 100644 index ae5b7e635b5c1dc80f78a255c26037b81fd5ea73..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-libtool-zero.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Verifies libraries have proper mtime. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - CHDIR = 'libtool-zero' - - test.run_gyp('test.gyp', chdir=CHDIR) - - test.build('test.gyp', 'mylib', chdir=CHDIR) - - test.up_to_date('test.gyp', 'mylib', chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-loadable-module-bundle-product-extension.py b/tools/gyp/test/mac/gyptest-loadable-module-bundle-product-extension.py deleted file mode 100644 index 7a60ca2d177a018f52c58a139b2d665ae7ba393f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-loadable-module-bundle-product-extension.py +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Tests that loadable_modules don't collide when using the same name with -different file extensions. -""" - -import TestGyp - -import os -import struct -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - CHDIR = 'loadable-module-bundle-product-extension' - test.run_gyp('test.gyp', - '-G', 'xcode_ninja_target_pattern=^.*$', - chdir=CHDIR) - - test.build('test.gyp', test.ALL, chdir=CHDIR) - - test.must_exist(test.built_file_path('Collide.foo', chdir=CHDIR)) - test.must_exist(test.built_file_path('Collide.bar', chdir=CHDIR)) - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-loadable-module.py b/tools/gyp/test/mac/gyptest-loadable-module.py deleted file mode 100755 index 7ba3262d71084cfd1a6006792c32c28402835651..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-loadable-module.py +++ /dev/null @@ -1,49 +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. - -""" -Tests that a loadable_module target is built correctly. -""" - -import TestGyp - -import os -import struct -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - CHDIR = 'loadable-module' - test.run_gyp('test.gyp', chdir=CHDIR) - - test.build('test.gyp', test.ALL, chdir=CHDIR) - - # Binary. - binary = test.built_file_path( - 'test_loadable_module.plugin/Contents/MacOS/test_loadable_module', - chdir=CHDIR) - test.must_exist(binary) - MH_BUNDLE = 8 - if struct.unpack('4I', open(binary, 'rb').read(16))[3] != MH_BUNDLE: - test.fail_test() - - # Info.plist. - info_plist = test.built_file_path( - 'test_loadable_module.plugin/Contents/Info.plist', chdir=CHDIR) - test.must_exist(info_plist) - test.must_contain(info_plist, """ - CFBundleExecutable - test_loadable_module -""") - - # PkgInfo. - test.built_file_must_not_exist( - 'test_loadable_module.plugin/Contents/PkgInfo', chdir=CHDIR) - test.built_file_must_not_exist( - 'test_loadable_module.plugin/Contents/Resources', chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-missing-cfbundlesignature.py b/tools/gyp/test/mac/gyptest-missing-cfbundlesignature.py deleted file mode 100644 index ef7a8d1bdcb96e1a68d82030da4241cab4b7a1a6..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-missing-cfbundlesignature.py +++ /dev/null @@ -1,29 +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. - -""" -Verifies that an Info.plist with CFBundleSignature works. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - test.run_gyp('test.gyp', chdir='missing-cfbundlesignature') - test.build('test.gyp', test.ALL, chdir='missing-cfbundlesignature') - - test.built_file_must_match('mytarget.app/Contents/PkgInfo', 'APPL????', - chdir='missing-cfbundlesignature') - - test.built_file_must_match('myothertarget.app/Contents/PkgInfo', 'APPL????', - chdir='missing-cfbundlesignature') - - test.built_file_must_match('thirdtarget.app/Contents/PkgInfo', 'APPL????', - chdir='missing-cfbundlesignature') - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-non-strs-flattened-to-env.py b/tools/gyp/test/mac/gyptest-non-strs-flattened-to-env.py deleted file mode 100644 index 504dcd589b3f82803fee82ab18f635908d6ff69e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-non-strs-flattened-to-env.py +++ /dev/null @@ -1,33 +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. - -""" -Verifies that list xcode_settings are flattened before being exported to the -environment. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - CHDIR = 'non-strs-flattened-to-env' - INFO_PLIST_PATH = 'Test.app/Contents/Info.plist' - - test.run_gyp('test.gyp', chdir=CHDIR) - test.build('test.gyp', test.ALL, chdir=CHDIR) - info_plist = test.built_file_path(INFO_PLIST_PATH, chdir=CHDIR) - test.must_exist(info_plist) - test.must_contain(info_plist, '''\ -\tMy Variable -\tsome expansion''') - test.must_contain(info_plist, '''\ -\tCFlags -\t-fstack-protector-all -fno-strict-aliasing -DS="A Space"''') - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-objc-arc.py b/tools/gyp/test/mac/gyptest-objc-arc.py deleted file mode 100755 index b3192a19dd37e22df0137fae66626aa0bd30be1d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-objc-arc.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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 that ARC objc settings are handled correctly. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - # set |match| to ignore build stderr output. - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode'], - match = lambda a, b: True) - - CHDIR = 'objc-arc' - test.run_gyp('test.gyp', chdir=CHDIR) - - test.build('test.gyp', 'arc_enabled', chdir=CHDIR) - test.build('test.gyp', 'arc_disabled', chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-objc-gc.py b/tools/gyp/test/mac/gyptest-objc-gc.py deleted file mode 100644 index 0cec458983908d2d35d44ee86ea1c76c9057275c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-objc-gc.py +++ /dev/null @@ -1,51 +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. - -""" -Verifies that GC objc settings are handled correctly. -""" - -import TestGyp -import TestMac - -import sys - -if sys.platform == 'darwin': - # set |match| to ignore build stderr output. - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode'], - match = lambda a, b: True) - - # Xcode 5.1 removed support for garbage-collection: - # error: garbage collection is no longer supported - if TestMac.Xcode.Version() < '0510': - - CHDIR = 'objc-gc' - test.run_gyp('test.gyp', chdir=CHDIR) - - build_error_code = { - 'xcode': [1, 65], # 1 for xcode 3, 65 for xcode 4 (see `man sysexits`) - 'make': 2, - 'ninja': 1, - }[test.format] - - test.build('test.gyp', 'gc_exe_fails', chdir=CHDIR, status=build_error_code) - test.build( - 'test.gyp', 'gc_off_exe_req_lib', chdir=CHDIR, status=build_error_code) - - test.build('test.gyp', 'gc_req_exe', chdir=CHDIR) - test.run_built_executable('gc_req_exe', chdir=CHDIR, stdout="gc on: 1\n") - - test.build('test.gyp', 'gc_exe_req_lib', chdir=CHDIR) - test.run_built_executable( - 'gc_exe_req_lib', chdir=CHDIR, stdout="gc on: 1\n") - - test.build('test.gyp', 'gc_exe', chdir=CHDIR) - test.run_built_executable('gc_exe', chdir=CHDIR, stdout="gc on: 1\n") - - test.build('test.gyp', 'gc_off_exe', chdir=CHDIR) - test.run_built_executable('gc_off_exe', chdir=CHDIR, stdout="gc on: 0\n") - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-postbuild-copy-bundle.py b/tools/gyp/test/mac/gyptest-postbuild-copy-bundle.py deleted file mode 100644 index 1f04d1cb36a0738542048ece09e5d66ef69bd022..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-postbuild-copy-bundle.py +++ /dev/null @@ -1,75 +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. - -""" -Verifies that a postbuild copying a dependend framework into an app bundle is -rerun if the resources in the framework change. -""" - -import TestGyp - -import os.path -import sys - -if sys.platform == 'darwin': - # TODO(thakis): Make this pass with the make generator, http://crbug.com/95529 - test = TestGyp.TestGyp(formats=['ninja', 'xcode']) - - CHDIR = 'postbuild-copy-bundle' - test.run_gyp('test.gyp', chdir=CHDIR) - - app_bundle_dir = test.built_file_path('Test App.app', chdir=CHDIR) - bundled_framework_dir = os.path.join( - app_bundle_dir, 'Contents', 'My Framework.framework', 'Resources') - final_plist_path = os.path.join(bundled_framework_dir, 'Info.plist') - final_resource_path = os.path.join(bundled_framework_dir, 'resource_file.sb') - final_copies_path = os.path.join( - app_bundle_dir, 'Contents', 'My Framework.framework', 'Versions', 'A', - 'Libraries', 'copied.txt') - - # Check that the dependency was built and copied into the app bundle: - test.build('test.gyp', 'test_app', chdir=CHDIR) - test.must_exist(final_resource_path) - test.must_match(final_resource_path, - 'This is included in the framework bundle.\n') - - test.must_exist(final_plist_path) - test.must_contain(final_plist_path, '''\ -\tRandomKey -\tRandomValue''') - - # Touch the dependency's bundle resource, and check that the modification - # makes it all the way into the app bundle: - test.sleep() - test.write('postbuild-copy-bundle/resource_file.sb', 'New text\n') - test.build('test.gyp', 'test_app', chdir=CHDIR) - - test.must_exist(final_resource_path) - test.must_match(final_resource_path, 'New text\n') - - # Check the same for the plist file. - test.sleep() - contents = test.read('postbuild-copy-bundle/Framework-Info.plist') - contents = contents.replace('RandomValue', 'NewRandomValue') - test.write('postbuild-copy-bundle/Framework-Info.plist', contents) - test.build('test.gyp', 'test_app', chdir=CHDIR) - - test.must_exist(final_plist_path) - test.must_contain(final_plist_path, '''\ -\tRandomKey -\tNewRandomValue''') - - # Check the same for the copies section, test for http://crbug.com/157077 - test.sleep() - contents = test.read('postbuild-copy-bundle/copied.txt') - contents = contents.replace('old', 'new') - test.write('postbuild-copy-bundle/copied.txt', contents) - test.build('test.gyp', 'test_app', chdir=CHDIR) - - test.must_exist(final_copies_path) - test.must_contain(final_copies_path, 'new copied file') - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-postbuild-defaults.py b/tools/gyp/test/mac/gyptest-postbuild-defaults.py deleted file mode 100644 index 0560904c29414e772cb78b14debca3d2431605f2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-postbuild-defaults.py +++ /dev/null @@ -1,29 +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. - -""" -Verifies that a postbuild invoking |defaults| works. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - CHDIR = 'postbuild-defaults' - test.run_gyp('test.gyp', chdir=CHDIR) - test.build('test.gyp', test.ALL, chdir=CHDIR) - - result_file = test.built_file_path('result', chdir=CHDIR) - test.must_exist(result_file) - test.must_contain(result_file, '''\ -Test -${PRODUCT_NAME} -''') - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-postbuild-fail.py b/tools/gyp/test/mac/gyptest-postbuild-fail.py deleted file mode 100755 index 9cd5d47d28bf3e4ba020de4aea355da73eefdf0b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-postbuild-fail.py +++ /dev/null @@ -1,68 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies that a failing postbuild step lets the build fail. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - # set |match| to ignore build stderr output. - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode'], - match = lambda a, b: True) - - test.run_gyp('test.gyp', chdir='postbuild-fail') - - build_error_code = { - 'xcode': [1, 65], # 1 for xcode 3, 65 for xcode 4 (see `man sysexits`) - 'make': 2, - 'ninja': 1, - 'xcode-ninja': [1, 65], - }[test.format] - - - # If a postbuild fails, all postbuilds should be re-run on the next build. - # In Xcode 3, even if the first postbuild fails the other postbuilds were - # still executed. In Xcode 4, postbuilds are stopped after the first - # failing postbuild. This test checks for the Xcode 4 behavior. - - # Ignore this test on Xcode 3. - import subprocess - job = subprocess.Popen(['xcodebuild', '-version'], - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT) - out, err = job.communicate() - if job.returncode != 0: - print out - raise Exception('Error %d running xcodebuild' % job.returncode) - if out.startswith('Xcode 3.'): - test.pass_test() - - # Non-bundles - test.build('test.gyp', 'nonbundle', chdir='postbuild-fail', - status=build_error_code) - test.built_file_must_not_exist('static_touch', - chdir='postbuild-fail') - # Check for non-up-to-date-ness by checking if building again produces an - # error. - test.build('test.gyp', 'nonbundle', chdir='postbuild-fail', - status=build_error_code) - - - # Bundles - test.build('test.gyp', 'bundle', chdir='postbuild-fail', - status=build_error_code) - test.built_file_must_not_exist('dynamic_touch', - chdir='postbuild-fail') - # Check for non-up-to-date-ness by checking if building again produces an - # error. - test.build('test.gyp', 'bundle', chdir='postbuild-fail', - status=build_error_code) - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-postbuild-multiple-configurations.py b/tools/gyp/test/mac/gyptest-postbuild-multiple-configurations.py deleted file mode 100644 index 84694f36ccadd36f1460ba148d12880a40c0fdf6..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-postbuild-multiple-configurations.py +++ /dev/null @@ -1,26 +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. - -""" -Verifies that a postbuild work in projects with multiple configurations. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - CHDIR = 'postbuild-multiple-configurations' - test.run_gyp('test.gyp', chdir=CHDIR) - - for configuration in ['Debug', 'Release']: - test.set_configuration(configuration) - test.build('test.gyp', test.ALL, chdir=CHDIR) - test.built_file_must_exist('postbuild-file', chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-postbuild-static-library.py b/tools/gyp/test/mac/gyptest-postbuild-static-library.py deleted file mode 100644 index 8f9a6ebcb09de6cd98dff13432d722b201a7fdd7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-postbuild-static-library.py +++ /dev/null @@ -1,28 +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. - -""" -Verifies that a postbuilds on static libraries work, and that sourceless -libraries don't cause failures at gyp time. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['make', 'xcode']) - - CHDIR = 'postbuild-static-library' - test.run_gyp('test.gyp', chdir=CHDIR) - test.build('test.gyp', 'my_lib', chdir=CHDIR) - # Building my_sourceless_lib doesn't work with make. gyp should probably - # forbid sourceless static libraries, since they're pretty pointless. - # But they shouldn't cause gyp time exceptions. - - test.built_file_must_exist('postbuild-file', chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-postbuild.py b/tools/gyp/test/mac/gyptest-postbuild.py deleted file mode 100755 index 684e7b8426d1de9ed87e1e9fecf4db50c78f61b9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-postbuild.py +++ /dev/null @@ -1,53 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies that postbuild steps work. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - test.run_gyp('test.gyp', chdir='postbuilds') - - test.build('test.gyp', test.ALL, chdir='postbuilds') - - # See comment in test/subdirectory/gyptest-subdir-default.py - if test.format == 'xcode': - chdir = 'postbuilds/subdirectory' - else: - chdir = 'postbuilds' - - # Created by the postbuild scripts - test.built_file_must_exist('el.a_touch', - type=test.STATIC_LIB, - chdir='postbuilds') - test.built_file_must_exist('el.a_gyp_touch', - type=test.STATIC_LIB, - chdir='postbuilds') - test.built_file_must_exist('nest_el.a_touch', - type=test.STATIC_LIB, - chdir=chdir) - test.built_file_must_exist( - 'dyna.framework/Versions/A/dyna_touch', - chdir='postbuilds') - test.built_file_must_exist( - 'dyna.framework/Versions/A/dyna_gyp_touch', - chdir='postbuilds') - test.built_file_must_exist( - 'nest_dyna.framework/Versions/A/nest_dyna_touch', - chdir=chdir) - test.built_file_must_exist('dyna_standalone.dylib_gyp_touch', - type=test.SHARED_LIB, - chdir='postbuilds') - test.built_file_must_exist('copied_file.txt', chdir='postbuilds') - test.built_file_must_exist('copied_file_2.txt', chdir=chdir) - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-prefixheader.py b/tools/gyp/test/mac/gyptest-prefixheader.py deleted file mode 100755 index 0cf85f94225bf8d4624a2891e0693f92d1300e18..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-prefixheader.py +++ /dev/null @@ -1,20 +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. - -""" -Verifies that GCC_PREFIX_HEADER works. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - test.run_gyp('test.gyp', chdir='prefixheader') - - test.build('test.gyp', test.ALL, chdir='prefixheader') - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-rebuild.py b/tools/gyp/test/mac/gyptest-rebuild.py deleted file mode 100755 index 0f26e961248302e1f973cb9fdcd1a22dca3a3d94..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-rebuild.py +++ /dev/null @@ -1,41 +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. - -""" -Verifies that app bundles are rebuilt correctly. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - CHDIR = 'rebuild' - test.run_gyp('test.gyp', chdir=CHDIR) - - test.build('test.gyp', 'test_app', chdir=CHDIR) - - # Touch a source file, rebuild, and check that the app target is up-to-date. - test.touch('rebuild/main.c') - test.build('test.gyp', 'test_app', chdir=CHDIR) - - test.up_to_date('test.gyp', 'test_app', chdir=CHDIR) - - # Xcode runs postbuilds on every build, so targets with postbuilds are - # never marked as up_to_date. - if test.format != 'xcode': - # Same for a framework bundle. - test.build('test.gyp', 'test_framework_postbuilds', chdir=CHDIR) - test.up_to_date('test.gyp', 'test_framework_postbuilds', chdir=CHDIR) - - # Test that an app bundle with a postbuild that touches the app binary needs - # to be built only once. - test.build('test.gyp', 'test_app_postbuilds', chdir=CHDIR) - test.up_to_date('test.gyp', 'test_app_postbuilds', chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-rpath.py b/tools/gyp/test/mac/gyptest-rpath.py deleted file mode 100644 index ef415cd7d3122ac0f6330c3a311624af1401ce06..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-rpath.py +++ /dev/null @@ -1,50 +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. - -""" -Verifies that LD_DYLIB_INSTALL_NAME and DYLIB_INSTALL_NAME_BASE are handled -correctly. -""" - -import TestGyp - -import re -import subprocess -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - CHDIR = 'rpath' - test.run_gyp('test.gyp', chdir=CHDIR) - - test.build('test.gyp', test.ALL, chdir=CHDIR) - - def GetRpaths(p): - p = test.built_file_path(p, chdir=CHDIR) - r = re.compile(r'cmd LC_RPATH.*?path (.*?) \(offset \d+\)', re.DOTALL) - proc = subprocess.Popen(['otool', '-l', p], stdout=subprocess.PIPE) - o = proc.communicate()[0] - assert not proc.returncode - return r.findall(o) - - if GetRpaths('libdefault_rpath.dylib') != []: - test.fail_test() - - if GetRpaths('libexplicit_rpath.dylib') != ['@executable_path/.']: - test.fail_test() - - if (GetRpaths('libexplicit_rpaths_escaped.dylib') != - ['First rpath', 'Second rpath']): - test.fail_test() - - if GetRpaths('My Framework.framework/My Framework') != ['@loader_path/.']: - test.fail_test() - - if GetRpaths('executable') != ['@executable_path/.']: - test.fail_test() - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-sdkroot.py b/tools/gyp/test/mac/gyptest-sdkroot.py deleted file mode 100644 index 711726ed87c5b2cfc52ac220dea1f281a9fc6044..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-sdkroot.py +++ /dev/null @@ -1,50 +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. - -""" -Verifies that setting SDKROOT works. -""" - -import TestGyp - -import os -import subprocess -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - def GetSDKPath(sdk): - """Return SDKROOT if the SDK version |sdk| is installed or empty string.""" - DEVNULL = open(os.devnull, 'wb') - try: - proc = subprocess.Popen( - ['xcodebuild', '-version', '-sdk', 'macosx' + sdk, 'Path'], - stdout=subprocess.PIPE, stderr=DEVNULL) - return proc.communicate()[0].rstrip('\n') - finally: - DEVNULL.close() - - def SelectSDK(): - """Select the oldest SDK installed (greater than 10.6).""" - for sdk in ['10.6', '10.7', '10.8', '10.9']: - path = GetSDKPath(sdk) - if path: - return True, sdk, path - return False, '', '' - - # Make sure this works on the bots, which only have the 10.6 sdk, and on - # dev machines which usually don't have the 10.6 sdk. - sdk_found, sdk, sdk_path = SelectSDK() - if not sdk_found: - test.fail_test() - - test.write('sdkroot/test.gyp', test.read('sdkroot/test.gyp') % sdk) - - test.run_gyp('test.gyp', '-D', 'sdk_path=%s' % sdk_path, - chdir='sdkroot') - test.build('test.gyp', test.ALL, chdir='sdkroot') - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-sourceless-module.py b/tools/gyp/test/mac/gyptest-sourceless-module.py deleted file mode 100644 index b56b75ed4f2831e5fd31086573feafab4b2074bb..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-sourceless-module.py +++ /dev/null @@ -1,72 +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. - -""" -Verifies that bundles that have no 'sources' (pure resource containers) work. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - test.run_gyp('test.gyp', chdir='sourceless-module') - - # Just needs to build without errors. - test.build('test.gyp', 'empty_bundle', chdir='sourceless-module') - test.built_file_must_not_exist( - 'empty_bundle.bundle', chdir='sourceless-module') - - # Needs to build, and contain a resource. - test.build('test.gyp', 'resource_bundle', chdir='sourceless-module') - - test.built_file_must_exist( - 'resource_bundle.bundle/Contents/Resources/foo.manifest', - chdir='sourceless-module') - test.built_file_must_not_exist( - 'resource_bundle.bundle/Contents/MacOS/resource_bundle', - chdir='sourceless-module') - - # Build an app containing an actionless bundle. - test.build( - 'test.gyp', - 'bundle_dependent_on_resource_bundle_no_actions', - chdir='sourceless-module') - - test.built_file_must_exist( - 'bundle_dependent_on_resource_bundle_no_actions.app/Contents/Resources/' - 'mac_resource_bundle_no_actions.bundle/Contents/Resources/empty.txt', - chdir='sourceless-module') - - # Needs to build and cause the bundle to be built. - test.build( - 'test.gyp', 'dependent_on_resource_bundle', chdir='sourceless-module') - - test.built_file_must_exist( - 'resource_bundle.bundle/Contents/Resources/foo.manifest', - chdir='sourceless-module') - test.built_file_must_not_exist( - 'resource_bundle.bundle/Contents/MacOS/resource_bundle', - chdir='sourceless-module') - - # TODO(thakis): shared_libraries that have no sources but depend on static - # libraries currently only work with the ninja generator. This is used by - # chrome/mac's components build. - if test.format == 'ninja': - # Check that an executable depending on a resource framework links fine too. - test.build( - 'test.gyp', 'dependent_on_resource_framework', chdir='sourceless-module') - - test.built_file_must_exist( - 'resource_framework.framework/Resources/foo.manifest', - chdir='sourceless-module') - test.built_file_must_exist( - 'resource_framework.framework/resource_framework', - chdir='sourceless-module') - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-strip-default.py b/tools/gyp/test/mac/gyptest-strip-default.py deleted file mode 100644 index f73fa1124cf1d426850b45715f6bb396d2a4bc48..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-strip-default.py +++ /dev/null @@ -1,95 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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 that the default STRIP_STYLEs match between different generators. -""" - -import TestGyp - -import re -import subprocess -import sys -import time - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - CHDIR='strip' - test.run_gyp('test-defaults.gyp', chdir=CHDIR) - - test.build('test-defaults.gyp', test.ALL, chdir=CHDIR) - - # Lightweight check if stripping was done. - def OutPath(s): - return test.built_file_path(s, chdir=CHDIR) - - def CheckNsyms(p, o_expected): - proc = subprocess.Popen(['nm', '-aU', p], stdout=subprocess.PIPE) - o = proc.communicate()[0] - - # Filter out mysterious "00 0000 OPT radr://5614542" symbol which - # is apparently only printed on the bots (older toolchain?). - # Yes, "radr", not "rdar". - o = ''.join(filter(lambda s: 'radr://5614542' not in s, o.splitlines(True))) - - o = o.replace('A', 'T') - o = re.sub(r'^[a-fA-F0-9]+', 'XXXXXXXX', o, flags=re.MULTILINE) - assert not proc.returncode - if o != o_expected: - print 'Stripping: Expected symbols """\n%s""", got """\n%s"""' % ( - o_expected, o) - test.fail_test() - - CheckNsyms(OutPath('libsingle_dylib.dylib'), -"""\ -XXXXXXXX S _ci -XXXXXXXX S _i -XXXXXXXX T _the_function -XXXXXXXX t _the_hidden_function -XXXXXXXX T _the_used_function -XXXXXXXX T _the_visible_function -""") - CheckNsyms(OutPath('single_so.so'), -"""\ -XXXXXXXX S _ci -XXXXXXXX S _i -XXXXXXXX T _the_function -XXXXXXXX t _the_hidden_function -XXXXXXXX T _the_used_function -XXXXXXXX T _the_visible_function -""") - CheckNsyms(OutPath('single_exe'), -"""\ -XXXXXXXX T __mh_execute_header -""") - - CheckNsyms(test.built_file_path( - 'bundle_dylib.framework/Versions/A/bundle_dylib', chdir=CHDIR), -"""\ -XXXXXXXX S _ci -XXXXXXXX S _i -XXXXXXXX T _the_function -XXXXXXXX t _the_hidden_function -XXXXXXXX T _the_used_function -XXXXXXXX T _the_visible_function -""") - CheckNsyms(test.built_file_path( - 'bundle_so.bundle/Contents/MacOS/bundle_so', chdir=CHDIR), -"""\ -XXXXXXXX S _ci -XXXXXXXX S _i -XXXXXXXX T _the_function -XXXXXXXX T _the_used_function -XXXXXXXX T _the_visible_function -""") - CheckNsyms(test.built_file_path( - 'bundle_exe.app/Contents/MacOS/bundle_exe', chdir=CHDIR), -"""\ -XXXXXXXX T __mh_execute_header -""") - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-strip.py b/tools/gyp/test/mac/gyptest-strip.py deleted file mode 100755 index a729521e18459b5bcad40c81a18794d040aa2b34..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-strip.py +++ /dev/null @@ -1,61 +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. - -""" -Verifies that stripping works. -""" - -import TestGyp -import TestMac - -import re -import subprocess -import sys -import time - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - test.run_gyp('test.gyp', chdir='strip') - - test.build('test.gyp', test.ALL, chdir='strip') - - # Lightweight check if stripping was done. - def OutPath(s): - return test.built_file_path(s, type=test.SHARED_LIB, chdir='strip') - - def CheckNsyms(p, n_expected): - r = re.compile(r'nsyms\s+(\d+)') - o = subprocess.check_output(['otool', '-l', p]) - m = r.search(o) - n = int(m.group(1)) - if n != n_expected: - print 'Stripping: Expected %d symbols, got %d' % (n_expected, n) - test.fail_test() - - # Starting with Xcode 5.0, clang adds an additional symbols to the compiled - # file when using a relative path to the input file. So when using ninja - # with Xcode 5.0 or higher, take this additional symbol into consideration - # for unstripped builds (it is stripped by all strip commands). - expected_extra_symbol_count = 0 - if test.format in ['ninja', 'xcode-ninja'] \ - and TestMac.Xcode.Version() >= '0500': - expected_extra_symbol_count = 1 - - # The actual numbers here are not interesting, they just need to be the same - # in both the xcode and the make build. - CheckNsyms(OutPath('no_postprocess'), 29 + expected_extra_symbol_count) - CheckNsyms(OutPath('no_strip'), 29 + expected_extra_symbol_count) - CheckNsyms(OutPath('strip_all'), 0) - CheckNsyms(OutPath('strip_nonglobal'), 6) - CheckNsyms(OutPath('strip_debugging'), 7) - CheckNsyms(OutPath('strip_all_custom_flags'), 0) - CheckNsyms(test.built_file_path( - 'strip_all_bundle.framework/Versions/A/strip_all_bundle', chdir='strip'), - 0) - CheckNsyms(OutPath('strip_save'), 7) - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-swift-library.py b/tools/gyp/test/mac/gyptest-swift-library.py deleted file mode 100644 index 7db24c343f6112d42c7ffdcb7c94440ed17ecb77..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-swift-library.py +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Verifies that a swift framework builds correctly. -""" - -import TestGyp -import TestMac - -import collections -import sys -import subprocess - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['xcode']) - - # Ensures that the given symbol is present in the given file, by running nm. - def CheckHasSymbolName(path, symbol): - output = subprocess.check_output(['nm', '-j', path]) - idx = output.find(symbol) - if idx == -1: - print 'Swift: Could not find symobl: %s' % symbol - test.fail_test() - - test_cases = [] - - # Run this for iOS on XCode 6.0 or greater - if TestMac.Xcode.Version() >= '0600': - test_cases.append(('Default', 'iphoneos')) - test_cases.append(('Default', 'iphonesimulator')) - - # Run it for Mac on XCode 6.1 or greater - if TestMac.Xcode.Version() >= '0610': - test_cases.append(('Default', None)) - - # Generate the project. - test.run_gyp('test.gyp', chdir='swift-library') - - # Build and verify for each configuration. - for configuration, sdk in test_cases: - kwds = collections.defaultdict(list) - if test.format == 'xcode': - if sdk is not None: - kwds['arguments'].extend(['-sdk', sdk]) - - test.set_configuration(configuration) - test.build('test.gyp', 'SwiftFramework', chdir='swift-library', **kwds) - - filename = 'SwiftFramework.framework/SwiftFramework' - result_file = test.built_file_path(filename, chdir='swift-library') - - test.must_exist(result_file) - - # Check to make sure that our swift class (GypSwiftTest) is present in the - # built binary - CheckHasSymbolName(result_file, "C14SwiftFramework12GypSwiftTest") - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-type-envvars.py b/tools/gyp/test/mac/gyptest-type-envvars.py deleted file mode 100755 index a5203c5f1e2050961dac9913a744c1ee9cf0bb3a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-type-envvars.py +++ /dev/null @@ -1,26 +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 MACH_O_TYPE etc are set correctly. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - test.run_gyp('test.gyp', - '-G', 'xcode_ninja_target_pattern=^(?!nonbundle_none).*$', - chdir='type_envvars') - - test.build('test.gyp', test.ALL, chdir='type_envvars') - - # The actual test is done by postbuild scripts during |test.build()|. - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-unicode-settings.py b/tools/gyp/test/mac/gyptest-unicode-settings.py deleted file mode 100644 index a71b3bd9a32eea95be53b3571ed0be2c16cff64e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-unicode-settings.py +++ /dev/null @@ -1,20 +0,0 @@ -#!/usr/bin/env python - -# Copyright 2013 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 that unicode strings in 'xcode_settings' work. -Also checks that ASCII control characters are escaped properly. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['xcode']) - test.run_gyp('test.gyp', chdir='unicode-settings') - test.build('test.gyp', test.ALL, chdir='unicode-settings') - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-xcode-env-order.py b/tools/gyp/test/mac/gyptest-xcode-env-order.py deleted file mode 100755 index e70cf1367c65328e2e869fedb67e6b011e94cf3a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-xcode-env-order.py +++ /dev/null @@ -1,90 +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. - -""" -Verifies that dependent Xcode settings are processed correctly. -""" - -import TestGyp -import TestMac - -import subprocess -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - CHDIR = 'xcode-env-order' - INFO_PLIST_PATH = 'Test.app/Contents/Info.plist' - - test.run_gyp('test.gyp', chdir=CHDIR) - test.build('test.gyp', test.ALL, chdir=CHDIR) - - # Env vars in 'copies' filenames. - test.built_file_must_exist('Test-copy-brace/main.c', chdir=CHDIR) - test.built_file_must_exist('Test-copy-paren/main.c', chdir=CHDIR) - test.built_file_must_exist('Test-copy-bare/main.c', chdir=CHDIR) - - # Env vars in 'actions' filenames and inline actions - test.built_file_must_exist('action-copy-brace.txt', chdir=CHDIR) - test.built_file_must_exist('action-copy-paren.txt', chdir=CHDIR) - test.built_file_must_exist('action-copy-bare.txt', chdir=CHDIR) - - # Env vars in 'rules' filenames and inline actions - test.built_file_must_exist('rule-copy-brace.txt', chdir=CHDIR) - test.built_file_must_exist('rule-copy-paren.txt', chdir=CHDIR) - # TODO: see comment in test.gyp for this file. - #test.built_file_must_exist('rule-copy-bare.txt', chdir=CHDIR) - - # Env vars in Info.plist. - info_plist = test.built_file_path(INFO_PLIST_PATH, chdir=CHDIR) - test.must_exist(info_plist) - - test.must_contain(info_plist, '''\ -\tBraceProcessedKey1 -\tD:/Source/Project/Test''') - test.must_contain(info_plist, '''\ -\tBraceProcessedKey2 -\t/Source/Project/Test''') - test.must_contain(info_plist, '''\ -\tBraceProcessedKey3 -\tcom.apple.product-type.application:D:/Source/Project/Test''') - - test.must_contain(info_plist, '''\ -\tParenProcessedKey1 -\tD:/Source/Project/Test''') - test.must_contain(info_plist, '''\ -\tParenProcessedKey2 -\t/Source/Project/Test''') - test.must_contain(info_plist, '''\ -\tParenProcessedKey3 -\tcom.apple.product-type.application:D:/Source/Project/Test''') - - test.must_contain(info_plist, '''\ -\tBareProcessedKey1 -\tD:/Source/Project/Test''') - test.must_contain(info_plist, '''\ -\tBareProcessedKey2 -\t/Source/Project/Test''') - # NOTE: For bare variables, $PRODUCT_TYPE is not replaced! It _is_ replaced - # if it's not right at the start of the string (e.g. ':$PRODUCT_TYPE'), so - # this looks like an Xcode bug. This bug isn't emulated (yet?), so check this - # only for Xcode. - if test.format == 'xcode' and TestMac.Xcode.Version() < '0500': - test.must_contain(info_plist, '''\ -\tBareProcessedKey3 -\t$PRODUCT_TYPE:D:/Source/Project/Test''') - else: - # The bug has been fixed by Xcode version 5.0.0. - test.must_contain(info_plist, '''\ -\tBareProcessedKey3 -\tcom.apple.product-type.application:D:/Source/Project/Test''') - - test.must_contain(info_plist, '''\ -\tMixedProcessedKey -\t/Source/Project:Test:mh_execute''') - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-xcode-gcc-clang.py b/tools/gyp/test/mac/gyptest-xcode-gcc-clang.py deleted file mode 100644 index 981c3fc564a9d681a3ba540f7437883baca3e78b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-xcode-gcc-clang.py +++ /dev/null @@ -1,40 +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. - -""" -Verifies that xcode-style GCC_... settings that require clang are handled -properly. -""" - -import TestGyp - -import os -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - CHDIR = 'xcode-gcc' - test.run_gyp('test-clang.gyp', chdir=CHDIR) - - test.build('test-clang.gyp', 'aliasing_yes', chdir=CHDIR) - test.run_built_executable('aliasing_yes', chdir=CHDIR, stdout="1\n") - test.build('test-clang.gyp', 'aliasing_no', chdir=CHDIR) - test.run_built_executable('aliasing_no', chdir=CHDIR, stdout="0\n") - - # The default behavior changed: strict aliasing used to be off, now it's on - # by default. The important part is that this is identical for all generators - # (which it is). TODO(thakis): Enable this once the bots have a newer Xcode. - #test.build('test-clang.gyp', 'aliasing_default', chdir=CHDIR) - #test.run_built_executable('aliasing_default', chdir=CHDIR, stdout="1\n") - # For now, just check the generated ninja file: - if test.format == 'ninja': - contents = open(test.built_file_path('obj/aliasing_default.ninja', - chdir=CHDIR)).read() - if 'strict-aliasing' in contents: - test.fail_test() - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-xcode-gcc.py b/tools/gyp/test/mac/gyptest-xcode-gcc.py deleted file mode 100644 index e45d0b5e8bc0c57c06e80966d209d5bab94139e5..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-xcode-gcc.py +++ /dev/null @@ -1,56 +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. - -""" -Verifies that xcode-style GCC_... settings are handled properly. -""" - -import TestGyp - -import os -import subprocess -import sys - -def IgnoreOutput(string, expected_string): - return True - -def CompilerVersion(compiler): - stdout = subprocess.check_output([compiler, '-v'], stderr=subprocess.STDOUT) - return stdout.rstrip('\n') - -def CompilerSupportsWarnAboutInvalidOffsetOfMacro(test): - # "clang" does not support the "-Winvalid-offsetof" flag, and silently - # ignore it. Starting with Xcode 5.0.0, "gcc" is just a "clang" binary with - # some hard-coded include path hack, so use the output of "-v" to detect if - # the compiler supports the flag or not. - return 'clang' not in CompilerVersion('/usr/bin/cc') - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - - CHDIR = 'xcode-gcc' - test.run_gyp('test.gyp', chdir=CHDIR) - - # List of targets that'll pass. It expects targets of the same name with - # '-fail' appended that'll fail to build. - targets = [ - 'warn_about_missing_newline', - ] - - # clang doesn't warn on invalid offsetofs, it silently ignores - # -Wno-invalid-offsetof. - if CompilerSupportsWarnAboutInvalidOffsetOfMacro(test): - targets.append('warn_about_invalid_offsetof_macro') - - for target in targets: - test.build('test.gyp', target, chdir=CHDIR) - test.built_file_must_exist(target, chdir=CHDIR) - fail_target = target + '-fail' - test.build('test.gyp', fail_target, chdir=CHDIR, status=None, - stderr=None, match=IgnoreOutput) - test.built_file_must_not_exist(fail_target, chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-xcode-support-actions.py b/tools/gyp/test/mac/gyptest-xcode-support-actions.py deleted file mode 100755 index ecc1402972cd80a4d4879f3caf36248b64473eeb..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-xcode-support-actions.py +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Verifies that support actions are properly created. -""" - -import TestGyp - -import os -import subprocess -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['xcode']) - - CHDIR = 'xcode-support-actions' - - test.run_gyp('test.gyp', '-Gsupport_target_suffix=_customsuffix', chdir=CHDIR) - test.build('test.gyp', target='target_customsuffix', chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/mac/gyptest-xctest.py b/tools/gyp/test/mac/gyptest-xctest.py deleted file mode 100644 index a46a5fb3db63211b97b3caa3ba9e91b4a105262b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/gyptest-xctest.py +++ /dev/null @@ -1,38 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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 that xctest targets are correctly configured. -""" - -import TestGyp - -import sys - -if sys.platform == 'darwin': - test = TestGyp.TestGyp(formats=['xcode']) - - # Ignore this test if Xcode 5 is not installed - import subprocess - job = subprocess.Popen(['xcodebuild', '-version'], - stdout=subprocess.PIPE, - stderr=subprocess.STDOUT) - out, err = job.communicate() - if job.returncode != 0: - raise Exception('Error %d running xcodebuild' % job.returncode) - xcode_version, build_number = out.splitlines() - # Convert the version string from 'Xcode 5.0' to ['5','0']. - xcode_version = xcode_version.split()[-1].split('.') - if xcode_version < ['5']: - test.pass_test() - - CHDIR = 'xctest' - test.run_gyp('test.gyp', chdir=CHDIR) - test.build('test.gyp', chdir=CHDIR, arguments=['-scheme', 'classes', 'test']) - - test.built_file_must_match('tests.xctest/Contents/Resources/resource.txt', - 'foo\n', chdir=CHDIR) - test.pass_test() diff --git a/tools/gyp/test/mac/identical-name/proxy/proxy.cc b/tools/gyp/test/mac/identical-name/proxy/proxy.cc deleted file mode 100644 index fab17ac780e37516a47cc8b0310cae7caa3a1baf..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/identical-name/proxy/proxy.cc +++ /dev/null @@ -1 +0,0 @@ -// Empty file diff --git a/tools/gyp/test/mac/identical-name/proxy/proxy.gyp b/tools/gyp/test/mac/identical-name/proxy/proxy.gyp deleted file mode 100644 index 38f44af1b57eec4a3b4077d0c0157627bec133bc..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/identical-name/proxy/proxy.gyp +++ /dev/null @@ -1,9 +0,0 @@ -{ - 'includes': ['../test.gypi'], - 'targets': [{ - 'target_name': 'testlib', - 'type': 'none', - 'dependencies': ['testlib/testlib.gyp:testlib'], - 'sources': ['proxy.cc'], - }], -} diff --git a/tools/gyp/test/mac/identical-name/proxy/testlib/testlib.cc b/tools/gyp/test/mac/identical-name/proxy/testlib/testlib.cc deleted file mode 100644 index fab17ac780e37516a47cc8b0310cae7caa3a1baf..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/identical-name/proxy/testlib/testlib.cc +++ /dev/null @@ -1 +0,0 @@ -// Empty file diff --git a/tools/gyp/test/mac/identical-name/proxy/testlib/testlib.gyp b/tools/gyp/test/mac/identical-name/proxy/testlib/testlib.gyp deleted file mode 100644 index ed1c62e982eaf0ee473737aebf30addb85a29121..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/identical-name/proxy/testlib/testlib.gyp +++ /dev/null @@ -1,8 +0,0 @@ -{ - 'includes': ['../../test.gypi'], - 'targets': [{ - 'target_name': 'testlib', - 'type': 'static_library', - 'sources': ['testlib.cc'], - }], -} diff --git a/tools/gyp/test/mac/identical-name/test-should-fail.gyp b/tools/gyp/test/mac/identical-name/test-should-fail.gyp deleted file mode 100644 index 72bfc7af0f8ef0c32fea3702a206a41a363e4cda..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/identical-name/test-should-fail.gyp +++ /dev/null @@ -1,10 +0,0 @@ -{ - 'targets': [{ - 'target_name': 'test', - 'type': 'executable', - 'dependencies': [ - 'testlib/testlib.gyp:proxy', - 'proxy/proxy.gyp:testlib', - ], - }], -} diff --git a/tools/gyp/test/mac/identical-name/test.gyp b/tools/gyp/test/mac/identical-name/test.gyp deleted file mode 100644 index 717220e8666ad97b568f08a3d647643653982dec..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/identical-name/test.gyp +++ /dev/null @@ -1,11 +0,0 @@ -{ - 'includes': ['test.gypi'], - 'targets': [{ - 'target_name': 'test', - 'type': 'executable', - 'dependencies': [ - 'testlib/testlib.gyp:proxy', - 'proxy/proxy.gyp:testlib', - ], - }], -} \ No newline at end of file diff --git a/tools/gyp/test/mac/identical-name/test.gypi b/tools/gyp/test/mac/identical-name/test.gypi deleted file mode 100644 index 61b7c2badf3d6330491f830e7dc23f27589991b9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/identical-name/test.gypi +++ /dev/null @@ -1,7 +0,0 @@ -{ - 'target_defaults': { - 'xcode_settings': { - 'SYMROOT': '<(DEPTH)/$SRCROOT/', - }, - }, -} diff --git a/tools/gyp/test/mac/identical-name/testlib/main.cc b/tools/gyp/test/mac/identical-name/testlib/main.cc deleted file mode 100644 index 5c2fa9bb6a78e27b752659a26b8562d1f33b90f2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/identical-name/testlib/main.cc +++ /dev/null @@ -1,3 +0,0 @@ -int main(int argc, char **argv) { - return 0; -} diff --git a/tools/gyp/test/mac/identical-name/testlib/testlib.gyp b/tools/gyp/test/mac/identical-name/testlib/testlib.gyp deleted file mode 100644 index aa8b851004dc1744dd9ea726f31ae052b512945e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/identical-name/testlib/testlib.gyp +++ /dev/null @@ -1,14 +0,0 @@ -{ - 'includes': ['../test.gypi'], - 'targets': [{ - 'target_name': 'proxy', - 'type': 'static_library', - 'sources': ['void.cc'], - 'dependencies': ['testlib'], - 'export_dependent_settings': ['testlib'], - }, { - 'target_name': 'testlib', - 'type': 'static_library', - 'sources': ['main.cc'], - }], -} diff --git a/tools/gyp/test/mac/identical-name/testlib/void.cc b/tools/gyp/test/mac/identical-name/testlib/void.cc deleted file mode 100644 index fab17ac780e37516a47cc8b0310cae7caa3a1baf..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/identical-name/testlib/void.cc +++ /dev/null @@ -1 +0,0 @@ -// Empty file diff --git a/tools/gyp/test/mac/infoplist-process/Info.plist b/tools/gyp/test/mac/infoplist-process/Info.plist deleted file mode 100644 index cb65721f43b59b8feb0796f300c8b5a8e8790cc1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/infoplist-process/Info.plist +++ /dev/null @@ -1,36 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - - CFBundleIdentifier - com.google.${PRODUCT_NAME} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - LSMinimumSystemVersion - ${MACOSX_DEPLOYMENT_TARGET} - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - ProcessedKey1 - PROCESSED_KEY1 - ProcessedKey2 - PROCESSED_KEY2 - - diff --git a/tools/gyp/test/mac/infoplist-process/main.c b/tools/gyp/test/mac/infoplist-process/main.c deleted file mode 100644 index 1bf4b2a11abd99b0655222eb96624b9abed72423..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/infoplist-process/main.c +++ /dev/null @@ -1,7 +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. - -int main() { - return 0; -} diff --git a/tools/gyp/test/mac/infoplist-process/test1.gyp b/tools/gyp/test/mac/infoplist-process/test1.gyp deleted file mode 100644 index bc625a968be756ed9e162889211e30ee15fed09a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/infoplist-process/test1.gyp +++ /dev/null @@ -1,25 +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': 'test_app', - 'product_name': 'Test', - 'type': 'executable', - 'mac_bundle': 1, - 'sources': [ - 'main.c', - ], - 'configurations': { - 'One': { - }, - }, - 'xcode_settings': { - 'INFOPLIST_FILE': 'Info.plist', - 'INFOPLIST_PREPROCESS': 'YES', - 'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'PROCESSED_KEY1=Foo PROCESSED_KEY2=Bar', - }, - }, - ], -} diff --git a/tools/gyp/test/mac/infoplist-process/test2.gyp b/tools/gyp/test/mac/infoplist-process/test2.gyp deleted file mode 100644 index ecfbc9f64c9cff5423b2e4a074f5716559a13b98..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/infoplist-process/test2.gyp +++ /dev/null @@ -1,25 +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': 'test_app', - 'product_name': 'Test', - 'type': 'executable', - 'mac_bundle': 1, - 'sources': [ - 'main.c', - ], - 'configurations': { - 'Two': { - }, - }, - 'xcode_settings': { - 'INFOPLIST_FILE': 'Info.plist', - 'INFOPLIST_PREPROCESS': 'YES', - 'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'PROCESSED_KEY1="Foo (Bar)"', - }, - }, - ], -} diff --git a/tools/gyp/test/mac/infoplist-process/test3.gyp b/tools/gyp/test/mac/infoplist-process/test3.gyp deleted file mode 100644 index be8fe75a53ec7b596116d9778b7b7116bec6905d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/infoplist-process/test3.gyp +++ /dev/null @@ -1,25 +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': 'test_app', - 'product_name': 'Test App', - 'type': 'executable', - 'mac_bundle': 1, - 'sources': [ - 'main.c', - ], - 'configurations': { - 'Three': { - }, - }, - 'xcode_settings': { - 'INFOPLIST_FILE': 'Info.plist', - 'INFOPLIST_PREPROCESS': 'NO', - 'INFOPLIST_PREPROCESSOR_DEFINITIONS': 'PROCESSED_KEY1=Foo', - }, - }, - ], -} diff --git a/tools/gyp/test/mac/installname/Info.plist b/tools/gyp/test/mac/installname/Info.plist deleted file mode 100644 index 5e05a5190c89319f64f3b900f19dc1473bb7fdfc..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/installname/Info.plist +++ /dev/null @@ -1,28 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - - CFBundleIdentifier - com.yourcompany.${PRODUCT_NAME} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - NSPrincipalClass - - - diff --git a/tools/gyp/test/mac/installname/file.c b/tools/gyp/test/mac/installname/file.c deleted file mode 100644 index a39fce095f2f3a24df55aa72932ac1e5385e655c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/installname/file.c +++ /dev/null @@ -1 +0,0 @@ -int f() { return 0; } diff --git a/tools/gyp/test/mac/installname/main.c b/tools/gyp/test/mac/installname/main.c deleted file mode 100644 index 237c8ce181774d991a9dbdd8cacf1a5fb9f199f1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/installname/main.c +++ /dev/null @@ -1 +0,0 @@ -int main() {} diff --git a/tools/gyp/test/mac/installname/test.gyp b/tools/gyp/test/mac/installname/test.gyp deleted file mode 100644 index 60c867ff122a1b2c3cca90a8cf67343a53fc97cd..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/installname/test.gyp +++ /dev/null @@ -1,93 +0,0 @@ -# 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': 'default_installname', - 'type': 'shared_library', - 'sources': [ 'file.c' ], - }, - { - 'target_name': 'default_bundle_installname', - 'product_name': 'My Framework', - 'type': 'shared_library', - 'mac_bundle': 1, - 'sources': [ 'file.c' ], - }, - { - 'target_name': 'explicit_installname', - 'type': 'shared_library', - 'sources': [ 'file.c' ], - 'xcode_settings': { - 'LD_DYLIB_INSTALL_NAME': 'Trapped in a dynamiclib factory', - }, - }, - { - 'target_name': 'explicit_installname_base', - 'type': 'shared_library', - 'sources': [ 'file.c' ], - 'xcode_settings': { - 'DYLIB_INSTALL_NAME_BASE': '@executable_path/../../..', - - }, - }, - { - 'target_name': 'explicit_installname_base_bundle', - 'product_name': 'My Other Framework', - 'type': 'shared_library', - 'mac_bundle': 1, - 'sources': [ 'file.c' ], - 'xcode_settings': { - 'DYLIB_INSTALL_NAME_BASE': '@executable_path/../../..', - - }, - }, - { - 'target_name': 'both_base_and_installname', - 'type': 'shared_library', - 'sources': [ 'file.c' ], - 'xcode_settings': { - # LD_DYLIB_INSTALL_NAME wins. - 'LD_DYLIB_INSTALL_NAME': 'Still trapped in a dynamiclib factory', - 'DYLIB_INSTALL_NAME_BASE': '@executable_path/../../..', - }, - }, - { - 'target_name': 'explicit_installname_with_base', - 'type': 'shared_library', - 'sources': [ 'file.c' ], - 'xcode_settings': { - 'LD_DYLIB_INSTALL_NAME': '$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)', - }, - }, - { - 'target_name': 'explicit_installname_with_explicit_base', - 'type': 'shared_library', - 'sources': [ 'file.c' ], - 'xcode_settings': { - 'DYLIB_INSTALL_NAME_BASE': '@executable_path/..', - 'LD_DYLIB_INSTALL_NAME': '$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)', - }, - }, - { - 'target_name': 'executable', - 'type': 'executable', - 'sources': [ 'main.c' ], - 'xcode_settings': { - 'LD_DYLIB_INSTALL_NAME': 'Should be ignored for not shared_lib', - }, - }, - # Regression test for http://crbug.com/113918 - { - 'target_name': 'install_name_with_info_plist', - 'type': 'shared_library', - 'mac_bundle': 1, - 'sources': [ 'file.c' ], - 'xcode_settings': { - 'INFOPLIST_FILE': 'Info.plist', - 'LD_DYLIB_INSTALL_NAME': '$(DYLIB_INSTALL_NAME_BASE:standardizepath)/$(EXECUTABLE_PATH)', - }, - }, - ], -} diff --git a/tools/gyp/test/mac/ldflags-libtool/file.c b/tools/gyp/test/mac/ldflags-libtool/file.c deleted file mode 100644 index 56757a701bf5cfd58c3d4b546d3444da4cf30711..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/ldflags-libtool/file.c +++ /dev/null @@ -1 +0,0 @@ -void f() {} diff --git a/tools/gyp/test/mac/ldflags-libtool/test.gyp b/tools/gyp/test/mac/ldflags-libtool/test.gyp deleted file mode 100644 index 4e7aa07106bb53996c5323a6f47bffa63b948a0c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/ldflags-libtool/test.gyp +++ /dev/null @@ -1,17 +0,0 @@ -# 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': 'ldflags_passed_to_libtool', - 'type': 'static_library', - 'sources': [ 'file.c', ], - 'xcode_settings': { - 'OTHER_LDFLAGS': [ - '-fblorfen-horf-does-not-exist', - ], - }, - }, - ], -} diff --git a/tools/gyp/test/mac/ldflags/subdirectory/Info.plist b/tools/gyp/test/mac/ldflags/subdirectory/Info.plist deleted file mode 100644 index 5f5e9abfbb5d52951235921830ac80a959d8223e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/ldflags/subdirectory/Info.plist +++ /dev/null @@ -1,8 +0,0 @@ - - - - - CFBundleSignature - ???? - - diff --git a/tools/gyp/test/mac/ldflags/subdirectory/file.c b/tools/gyp/test/mac/ldflags/subdirectory/file.c deleted file mode 100644 index 90c45543bf62c15e3320e785eb821bdea556e2bf..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/ldflags/subdirectory/file.c +++ /dev/null @@ -1,2 +0,0 @@ -void f() {} -void g() {} diff --git a/tools/gyp/test/mac/ldflags/subdirectory/symbol_list.def b/tools/gyp/test/mac/ldflags/subdirectory/symbol_list.def deleted file mode 100644 index 0ab7543b1fddc341a85a0e7d0488dbe4a4614eac..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/ldflags/subdirectory/symbol_list.def +++ /dev/null @@ -1 +0,0 @@ -_f diff --git a/tools/gyp/test/mac/ldflags/subdirectory/test.gyp b/tools/gyp/test/mac/ldflags/subdirectory/test.gyp deleted file mode 100644 index db00c7465ca05d6606158d86a8f999c9f843fdaf..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/ldflags/subdirectory/test.gyp +++ /dev/null @@ -1,66 +0,0 @@ -# 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': 'raw', - 'type': 'shared_library', - 'sources': [ 'file.c', ], - 'xcode_settings': { - 'OTHER_LDFLAGS': [ - '-exported_symbols_list symbol_list.def', - '-sectcreate __TEXT __info_plist Info.plist', - ], - }, - }, - # TODO(thakis): This form should ideally be supported, too. (But - # -Wlfoo,bar,baz is cleaner so people should use that anyway.) - #{ - # 'target_name': 'raw_sep', - # 'type': 'shared_library', - # 'sources': [ 'file.c', ], - # 'xcode_settings': { - # 'OTHER_LDFLAGS': [ - # '-exported_symbols_list', 'symbol_list.def', - # '-sectcreate', '__TEXT', '__info_plist', 'Info.plist', - # ], - # }, - #}, - { - 'target_name': 'wl_space', - 'type': 'shared_library', - 'sources': [ 'file.c', ], - 'xcode_settings': { - 'OTHER_LDFLAGS': [ - # Works because clang passes unknown files on to the linker. - '-Wl,-exported_symbols_list symbol_list.def', - ], - }, - }, - # TODO(thakis): This form should ideally be supported, too. (But - # -Wlfoo,bar,baz is cleaner so people should use that anyway.) - #{ - # 'target_name': 'wl_space_sep', - # 'type': 'shared_library', - # 'sources': [ 'file.c', ], - # 'xcode_settings': { - # 'OTHER_LDFLAGS': [ - # # Works because clang passes unknown files on to the linker. - # '-Wl,-exported_symbols_list', 'symbol_list.def', - # ], - # }, - #}, - { - 'target_name': 'wl_comma', - 'type': 'shared_library', - 'sources': [ 'file.c', ], - 'xcode_settings': { - 'OTHER_LDFLAGS': [ - '-Wl,-exported_symbols_list,symbol_list.def', - '-Wl,-sectcreate,__TEXT,__info_plist,Info.plist', - ], - }, - }, - ], -} diff --git a/tools/gyp/test/mac/libraries/subdir/README.txt b/tools/gyp/test/mac/libraries/subdir/README.txt deleted file mode 100644 index 4031ded85f6301250ab8c1f985f9531d9c94db55..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/libraries/subdir/README.txt +++ /dev/null @@ -1 +0,0 @@ -Make things live in a subdirectory, to make sure that DEPTH works correctly. diff --git a/tools/gyp/test/mac/libraries/subdir/hello.cc b/tools/gyp/test/mac/libraries/subdir/hello.cc deleted file mode 100644 index a43554c8caf8f096b2b8e5c176e4b7817cbd41ec..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/libraries/subdir/hello.cc +++ /dev/null @@ -1,10 +0,0 @@ -// 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. - -#include - -int main() { - std::cout << "Hello, world!" << std::endl; - return 0; -} diff --git a/tools/gyp/test/mac/libraries/subdir/mylib.c b/tools/gyp/test/mac/libraries/subdir/mylib.c deleted file mode 100644 index e771991e836a6742ad8ae37db6f90659adc25461..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/libraries/subdir/mylib.c +++ /dev/null @@ -1,7 +0,0 @@ -// 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. - -int my_foo(int x) { - return x + 1; -} diff --git a/tools/gyp/test/mac/libraries/subdir/test.gyp b/tools/gyp/test/mac/libraries/subdir/test.gyp deleted file mode 100644 index 59fef51017b5bc13f91bc1d6c72103022ae0c5f3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/libraries/subdir/test.gyp +++ /dev/null @@ -1,65 +0,0 @@ -# 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': 'libraries-test', - 'type': 'executable', - 'sources': [ - 'hello.cc', - ], - 'link_settings': { - 'libraries': [ - 'libcrypto.dylib', - ], - }, - }, - { - # This creates a static library and puts it in a nonstandard location for - # libraries-search-path-test. - 'target_name': 'mylib', - 'type': 'static_library', - 'sources': [ - 'mylib.c', - ], - 'postbuilds': [ - { - 'postbuild_name': 'Make a secret location', - 'action': [ - 'mkdir', - '-p', - '${SRCROOT}/../secret_location', - ], - }, - { - 'postbuild_name': 'Copy to secret location, with secret name', - 'action': [ - 'cp', - '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}', - '${SRCROOT}/../secret_location/libmysecretlib.a', - ], - }, - ], - }, - { - 'target_name': 'libraries-search-path-test', - 'type': 'executable', - 'dependencies': [ 'mylib' ], - 'sources': [ - 'hello.cc', - ], - 'xcode_settings': { - 'LIBRARY_SEARCH_PATHS': [ - '<(DEPTH)/secret_location', - ], - }, - 'link_settings': { - 'libraries': [ - 'libmysecretlib.a', - ], - }, - }, - ], -} diff --git a/tools/gyp/test/mac/libtool-zero/mylib.c b/tools/gyp/test/mac/libtool-zero/mylib.c deleted file mode 100644 index b26d61bd6ba91717a068fb4d6d4056f401473c68..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/libtool-zero/mylib.c +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 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. - -int my_foo(int x) { - return x + 1; -} diff --git a/tools/gyp/test/mac/libtool-zero/test.gyp b/tools/gyp/test/mac/libtool-zero/test.gyp deleted file mode 100644 index 0d6ee5535eede15eea19a8f9fe73e5da83dc88bb..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/libtool-zero/test.gyp +++ /dev/null @@ -1,18 +0,0 @@ -# Copyright (c) 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': 'mylib', - 'type': 'static_library', - 'sources': [ - 'mylib.c', - ], - 'xcode_settings': { - 'ARCHS': [ 'i386', 'x86_64' ], - }, - }, - ], -} diff --git a/tools/gyp/test/mac/loadable-module-bundle-product-extension/src.cc b/tools/gyp/test/mac/loadable-module-bundle-product-extension/src.cc deleted file mode 100644 index 3d878e9697d61b687bb334c2f9127280dcc9c339..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/loadable-module-bundle-product-extension/src.cc +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 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. - -int test() { - return 1337; -} diff --git a/tools/gyp/test/mac/loadable-module-bundle-product-extension/test.gyp b/tools/gyp/test/mac/loadable-module-bundle-product-extension/test.gyp deleted file mode 100644 index 684a2c02aa33c4093041fa7360cd687b7bfddf80..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/loadable-module-bundle-product-extension/test.gyp +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (c) 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': 'test', - 'type': 'none', - 'dependencies': ['child_one', 'child_two'], - }, { - 'target_name': 'child_one', - 'product_name': 'Collide', - 'product_extension': 'bar', - 'sources': ['src.cc'], - 'type': 'loadable_module', - 'mac_bundle': 1, - }, { - 'target_name': 'child_two', - 'product_name': 'Collide', - 'product_extension': 'foo', - 'sources': ['src.cc'], - 'type': 'loadable_module', - 'mac_bundle': 1, - }], -} diff --git a/tools/gyp/test/mac/loadable-module/Info.plist b/tools/gyp/test/mac/loadable-module/Info.plist deleted file mode 100644 index f6607aebd91cae19f8b9d460004eea399a31c3ad..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/loadable-module/Info.plist +++ /dev/null @@ -1,26 +0,0 @@ - - - - - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIdentifier - com.google.test_loadable_module - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - BRPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1.0 - CFPlugInDynamicRegisterFunction - - CFPlugInDynamicRegistration - NO - - diff --git a/tools/gyp/test/mac/loadable-module/module.c b/tools/gyp/test/mac/loadable-module/module.c deleted file mode 100644 index 958453834744cb0af67af7d3996b2faf8327e47d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/loadable-module/module.c +++ /dev/null @@ -1,11 +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. - -int SuperFly() { - return 42; -} - -const char* SuperFoo() { - return "Hello World"; -} diff --git a/tools/gyp/test/mac/loadable-module/test.gyp b/tools/gyp/test/mac/loadable-module/test.gyp deleted file mode 100644 index 3c8a5309d25879ca705c66a4b43ee24b78d70c76..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/loadable-module/test.gyp +++ /dev/null @@ -1,18 +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': 'test_loadable_module', - 'type': 'loadable_module', - 'mac_bundle': 1, - 'sources': [ 'module.c' ], - 'product_extension': 'plugin', - 'xcode_settings': { - 'INFOPLIST_FILE': 'Info.plist', - }, - }, - ], -} diff --git a/tools/gyp/test/mac/missing-cfbundlesignature/Info.plist b/tools/gyp/test/mac/missing-cfbundlesignature/Info.plist deleted file mode 100644 index 0c3167488440d63892f75ec23429e1672af0fa71..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/missing-cfbundlesignature/Info.plist +++ /dev/null @@ -1,10 +0,0 @@ - - - - - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundlePackageType - APPL - - diff --git a/tools/gyp/test/mac/missing-cfbundlesignature/Other-Info.plist b/tools/gyp/test/mac/missing-cfbundlesignature/Other-Info.plist deleted file mode 100644 index 47095281c8a0c892da0a798280c621677fe143b1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/missing-cfbundlesignature/Other-Info.plist +++ /dev/null @@ -1,12 +0,0 @@ - - - - - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundlePackageType - APPL - CFBundleSignature - F - - diff --git a/tools/gyp/test/mac/missing-cfbundlesignature/Third-Info.plist b/tools/gyp/test/mac/missing-cfbundlesignature/Third-Info.plist deleted file mode 100644 index 5b61fe2664ec351f32722d76cea70b0b0ad11a00..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/missing-cfbundlesignature/Third-Info.plist +++ /dev/null @@ -1,12 +0,0 @@ - - - - - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundlePackageType - APPL - CFBundleSignature - some really long string - - diff --git a/tools/gyp/test/mac/missing-cfbundlesignature/file.c b/tools/gyp/test/mac/missing-cfbundlesignature/file.c deleted file mode 100644 index 237c8ce181774d991a9dbdd8cacf1a5fb9f199f1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/missing-cfbundlesignature/file.c +++ /dev/null @@ -1 +0,0 @@ -int main() {} diff --git a/tools/gyp/test/mac/missing-cfbundlesignature/test.gyp b/tools/gyp/test/mac/missing-cfbundlesignature/test.gyp deleted file mode 100644 index b50cc2791a031d443e7b522c9d1a65df5cc34eff..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/missing-cfbundlesignature/test.gyp +++ /dev/null @@ -1,34 +0,0 @@ -# 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': 'mytarget', - 'type': 'executable', - 'mac_bundle': 1, - 'sources': [ 'file.c', ], - 'xcode_settings': { - 'INFOPLIST_FILE': 'Info.plist', - }, - }, - { - 'target_name': 'myothertarget', - 'type': 'executable', - 'mac_bundle': 1, - 'sources': [ 'file.c', ], - 'xcode_settings': { - 'INFOPLIST_FILE': 'Other-Info.plist', - }, - }, - { - 'target_name': 'thirdtarget', - 'type': 'executable', - 'mac_bundle': 1, - 'sources': [ 'file.c', ], - 'xcode_settings': { - 'INFOPLIST_FILE': 'Third-Info.plist', - }, - }, - ], -} diff --git a/tools/gyp/test/mac/non-strs-flattened-to-env/Info.plist b/tools/gyp/test/mac/non-strs-flattened-to-env/Info.plist deleted file mode 100644 index 11fc4b660d77cd6f81463ca428be97f127a64dd5..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/non-strs-flattened-to-env/Info.plist +++ /dev/null @@ -1,15 +0,0 @@ - - - - - - CFBundlePackageType - APPL - CFBundleSignature - ???? - My Variable - ${MY_VAR} - CFlags - ${OTHER_CFLAGS} - - diff --git a/tools/gyp/test/mac/non-strs-flattened-to-env/main.c b/tools/gyp/test/mac/non-strs-flattened-to-env/main.c deleted file mode 100644 index 1711567ef566703fcd9c33e0a236b1b30454df6a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/non-strs-flattened-to-env/main.c +++ /dev/null @@ -1,7 +0,0 @@ -// 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. - -int main() { - return 0; -} diff --git a/tools/gyp/test/mac/non-strs-flattened-to-env/test.gyp b/tools/gyp/test/mac/non-strs-flattened-to-env/test.gyp deleted file mode 100644 index aaf821c92570101e877a650e53e9c54df0420715..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/non-strs-flattened-to-env/test.gyp +++ /dev/null @@ -1,27 +0,0 @@ -# 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': 'test_app', - 'product_name': 'Test', - 'type': 'executable', - 'mac_bundle': 1, - 'sources': [ 'main.c', ], - 'xcode_settings': { - 'INFOPLIST_FILE': 'Info.plist', - 'MY_VAR': 'some expansion', - 'OTHER_CFLAGS': [ - # Just some (more than one) random flags. - '-fstack-protector-all', - '-fno-strict-aliasing', - '-DS="A Space"', # Would normally be in 'defines' - ], - }, - 'include_dirs': [ - '$(SDKROOT)/usr/include/libxml2', - ], - }, - ], -} diff --git a/tools/gyp/test/mac/objc-arc/c-file.c b/tools/gyp/test/mac/objc-arc/c-file.c deleted file mode 100644 index bd6a24eec5929af3a0e218fce598b92752f86973..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/objc-arc/c-file.c +++ /dev/null @@ -1,5 +0,0 @@ -#if __has_feature(objc_arc) -#error "C files shouldn't be ARC'd!" -#endif - -void c_fun() {} diff --git a/tools/gyp/test/mac/objc-arc/cc-file.cc b/tools/gyp/test/mac/objc-arc/cc-file.cc deleted file mode 100644 index 95e14ea3e053f191fa09714c75d03d903f78aa30..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/objc-arc/cc-file.cc +++ /dev/null @@ -1,5 +0,0 @@ -#if __has_feature(objc_arc) -#error "C++ files shouldn't be ARC'd!" -#endif - -void cc_fun() {} diff --git a/tools/gyp/test/mac/objc-arc/m-file-no-arc.m b/tools/gyp/test/mac/objc-arc/m-file-no-arc.m deleted file mode 100644 index 8ffaabfaae513015b540486800cac4d6da9fe0df..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/objc-arc/m-file-no-arc.m +++ /dev/null @@ -1,5 +0,0 @@ -#if __has_feature(objc_arc) -#error "ObjC files without CLANG_ENABLE_OBJC_ARC should not be ARC'd!" -#endif - -void m_fun() {} diff --git a/tools/gyp/test/mac/objc-arc/m-file.m b/tools/gyp/test/mac/objc-arc/m-file.m deleted file mode 100644 index 9689b1f8e5da5ed21ab2d8b2f330fb3678e1a08c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/objc-arc/m-file.m +++ /dev/null @@ -1,5 +0,0 @@ -#if !__has_feature(objc_arc) -#error "ObjC files with CLANG_ENABLE_OBJC_ARC should be ARC'd!" -#endif - -void m_fun() {} diff --git a/tools/gyp/test/mac/objc-arc/mm-file-no-arc.mm b/tools/gyp/test/mac/objc-arc/mm-file-no-arc.mm deleted file mode 100644 index 0dac5394948138f20a1aa14b49016a7b2b9c5c0d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/objc-arc/mm-file-no-arc.mm +++ /dev/null @@ -1,5 +0,0 @@ -#if __has_feature(objc_arc) -#error "ObjC++ files without CLANG_ENABLE_OBJC_ARC should not be ARC'd!" -#endif - -void mm_fun() {} diff --git a/tools/gyp/test/mac/objc-arc/mm-file.mm b/tools/gyp/test/mac/objc-arc/mm-file.mm deleted file mode 100644 index 9467e965633650f96138a963a90c2d72b4d27195..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/objc-arc/mm-file.mm +++ /dev/null @@ -1,5 +0,0 @@ -#if !__has_feature(objc_arc) -#error "ObjC++ files with CLANG_ENABLE_OBJC_ARC should be ARC'd!" -#endif - -void mm_fun() {} diff --git a/tools/gyp/test/mac/objc-arc/test.gyp b/tools/gyp/test/mac/objc-arc/test.gyp deleted file mode 100644 index d4e9ef8932b28491aee21d85020bce12134a6211..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/objc-arc/test.gyp +++ /dev/null @@ -1,44 +0,0 @@ -# Copyright (c) 2013 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. -{ - 'make_global_settings': [ - ['CC', '/usr/bin/clang'], - ['CXX', '/usr/bin/clang++'], - ], - - 'targets': [ - { - 'target_name': 'arc_enabled', - 'type': 'static_library', - 'sources': [ - 'c-file.c', - 'cc-file.cc', - 'm-file.m', - 'mm-file.mm', - ], - 'xcode_settings': { - 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', - 'MACOSX_DEPLOYMENT_TARGET': '10.6', - 'ARCHS': [ 'x86_64' ], # For the non-fragile objc ABI. - 'CLANG_ENABLE_OBJC_ARC': 'YES', - }, - }, - - { - 'target_name': 'arc_disabled', - 'type': 'static_library', - 'sources': [ - 'c-file.c', - 'cc-file.cc', - 'm-file-no-arc.m', - 'mm-file-no-arc.mm', - ], - 'xcode_settings': { - 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', - 'MACOSX_DEPLOYMENT_TARGET': '10.6', - 'ARCHS': [ 'x86_64' ], # For the non-fragile objc ABI. - }, - }, - ], -} diff --git a/tools/gyp/test/mac/objc-gc/c-file.c b/tools/gyp/test/mac/objc-gc/c-file.c deleted file mode 100644 index 2855a00eaaa6933a701e0cd792cf5a0775ffe7ba..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/objc-gc/c-file.c +++ /dev/null @@ -1 +0,0 @@ -void c_fun() {} diff --git a/tools/gyp/test/mac/objc-gc/cc-file.cc b/tools/gyp/test/mac/objc-gc/cc-file.cc deleted file mode 100644 index 71e47a0126fea6c1b2df2fe681e3796a1b4b2370..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/objc-gc/cc-file.cc +++ /dev/null @@ -1 +0,0 @@ -void cc_fun() {} diff --git a/tools/gyp/test/mac/objc-gc/main.m b/tools/gyp/test/mac/objc-gc/main.m deleted file mode 100644 index 1a87f8e70fe29c5981926e81ca7ceb2d4a3a4254..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/objc-gc/main.m +++ /dev/null @@ -1,6 +0,0 @@ -#import - -int main() { - printf("gc on: %d\n", [NSGarbageCollector defaultCollector] != NULL); - return 0; -} diff --git a/tools/gyp/test/mac/objc-gc/needs-gc-mm.mm b/tools/gyp/test/mac/objc-gc/needs-gc-mm.mm deleted file mode 100644 index fc3fee9f34ab7b854cf796b4c88c109636114bfb..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/objc-gc/needs-gc-mm.mm +++ /dev/null @@ -1 +0,0 @@ -void objcpp_fun() { } diff --git a/tools/gyp/test/mac/objc-gc/needs-gc.m b/tools/gyp/test/mac/objc-gc/needs-gc.m deleted file mode 100644 index ca77976b1da1b607aa488960ecadc90c8fa60e92..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/objc-gc/needs-gc.m +++ /dev/null @@ -1 +0,0 @@ -void objc_fun() { } diff --git a/tools/gyp/test/mac/objc-gc/test.gyp b/tools/gyp/test/mac/objc-gc/test.gyp deleted file mode 100644 index 5b6a53bd38c5d3e0e57ada002cc304f1dfaeafd3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/objc-gc/test.gyp +++ /dev/null @@ -1,101 +0,0 @@ -# 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': [ - # For some reason, static_library targets that are built with gc=required - # and then linked to executables that don't use gc, the linker doesn't - # complain. For shared_libraries it does, so use that. - { - 'target_name': 'no_gc_lib', - 'type': 'shared_library', - 'sources': [ - 'c-file.c', - 'cc-file.cc', - 'needs-gc-mm.mm', - 'needs-gc.m', - ], - }, - { - 'target_name': 'gc_lib', - 'type': 'shared_library', - 'sources': [ - 'c-file.c', - 'cc-file.cc', - 'needs-gc-mm.mm', - 'needs-gc.m', - ], - 'xcode_settings': { - 'GCC_ENABLE_OBJC_GC': 'supported', - }, - }, - { - 'target_name': 'gc_req_lib', - 'type': 'shared_library', - 'sources': [ - 'c-file.c', - 'cc-file.cc', - 'needs-gc-mm.mm', - 'needs-gc.m', - ], - 'xcode_settings': { - 'GCC_ENABLE_OBJC_GC': 'required', - }, - }, - - { - 'target_name': 'gc_exe_fails', - 'type': 'executable', - 'sources': [ 'main.m' ], - 'dependencies': [ 'no_gc_lib' ], - 'xcode_settings': { - 'GCC_ENABLE_OBJC_GC': 'required', - }, - 'libraries': [ 'Foundation.framework' ], - }, - { - 'target_name': 'gc_req_exe', - 'type': 'executable', - 'sources': [ 'main.m' ], - 'dependencies': [ 'gc_lib' ], - 'xcode_settings': { - 'GCC_ENABLE_OBJC_GC': 'required', - }, - 'libraries': [ 'Foundation.framework' ], - }, - { - 'target_name': 'gc_exe_req_lib', - 'type': 'executable', - 'sources': [ 'main.m' ], - 'dependencies': [ 'gc_req_lib' ], - 'xcode_settings': { - 'GCC_ENABLE_OBJC_GC': 'supported', - }, - 'libraries': [ 'Foundation.framework' ], - }, - { - 'target_name': 'gc_exe', - 'type': 'executable', - 'sources': [ 'main.m' ], - 'dependencies': [ 'gc_lib' ], - 'xcode_settings': { - 'GCC_ENABLE_OBJC_GC': 'supported', - }, - 'libraries': [ 'Foundation.framework' ], - }, - { - 'target_name': 'gc_off_exe_req_lib', - 'type': 'executable', - 'sources': [ 'main.m' ], - 'dependencies': [ 'gc_req_lib' ], - 'libraries': [ 'Foundation.framework' ], - }, - { - 'target_name': 'gc_off_exe', - 'type': 'executable', - 'sources': [ 'main.m' ], - 'dependencies': [ 'gc_lib' ], - 'libraries': [ 'Foundation.framework' ], - }, - ], -} diff --git a/tools/gyp/test/mac/postbuild-copy-bundle/Framework-Info.plist b/tools/gyp/test/mac/postbuild-copy-bundle/Framework-Info.plist deleted file mode 100644 index ec36829c080546d5d70e30096f0e46f9f3bc09bb..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuild-copy-bundle/Framework-Info.plist +++ /dev/null @@ -1,30 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - - CFBundleIdentifier - com.yourcompany.${PRODUCT_NAME} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - NSPrincipalClass - - RandomKey - RandomValue - - diff --git a/tools/gyp/test/mac/postbuild-copy-bundle/TestApp-Info.plist b/tools/gyp/test/mac/postbuild-copy-bundle/TestApp-Info.plist deleted file mode 100644 index 98fd5152000f7b7d980f67b14a470e335864f00d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuild-copy-bundle/TestApp-Info.plist +++ /dev/null @@ -1,32 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - - CFBundleIdentifier - com.google.${PRODUCT_NAME} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - LSMinimumSystemVersion - ${MACOSX_DEPLOYMENT_TARGET} - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - - diff --git a/tools/gyp/test/mac/postbuild-copy-bundle/copied.txt b/tools/gyp/test/mac/postbuild-copy-bundle/copied.txt deleted file mode 100644 index 178413886a8f4e19b3d4114d419fbfcfa2db26f3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuild-copy-bundle/copied.txt +++ /dev/null @@ -1 +0,0 @@ -old copied file diff --git a/tools/gyp/test/mac/postbuild-copy-bundle/empty.c b/tools/gyp/test/mac/postbuild-copy-bundle/empty.c deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tools/gyp/test/mac/postbuild-copy-bundle/main.c b/tools/gyp/test/mac/postbuild-copy-bundle/main.c deleted file mode 100644 index 21c1963526223324e9d9c78f45151b144fceb9d0..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuild-copy-bundle/main.c +++ /dev/null @@ -1,4 +0,0 @@ -// 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. -int main() {} diff --git a/tools/gyp/test/mac/postbuild-copy-bundle/postbuild-copy-framework.sh b/tools/gyp/test/mac/postbuild-copy-bundle/postbuild-copy-framework.sh deleted file mode 100755 index 930fec66126d07e5aa2121bcbf17a293282af842..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuild-copy-bundle/postbuild-copy-framework.sh +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/bash - -# 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. - -set -e - -rsync -acC --delete "$1" "$2" diff --git a/tools/gyp/test/mac/postbuild-copy-bundle/resource_file.sb b/tools/gyp/test/mac/postbuild-copy-bundle/resource_file.sb deleted file mode 100644 index 42057fa2357faf5b30dfc63ac5605b3cd9d1b368..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuild-copy-bundle/resource_file.sb +++ /dev/null @@ -1 +0,0 @@ -This is included in the framework bundle. diff --git a/tools/gyp/test/mac/postbuild-copy-bundle/test.gyp b/tools/gyp/test/mac/postbuild-copy-bundle/test.gyp deleted file mode 100644 index a03e6432f2a46981a579610155d2303ab87e5497..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuild-copy-bundle/test.gyp +++ /dev/null @@ -1,49 +0,0 @@ -# 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': 'test_bundle', - 'product_name': 'My Framework', - 'type': 'shared_library', - 'mac_bundle': 1, - 'sources': [ 'empty.c', ], - 'xcode_settings': { - 'INFOPLIST_FILE': 'Framework-Info.plist', - }, - 'mac_bundle_resources': [ - 'resource_file.sb', - ], - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/$(CONTENTS_FOLDER_PATH)/Libraries', - 'files': [ 'copied.txt' ], - }, - ], - }, - { - 'target_name': 'test_app', - 'product_name': 'Test App', - 'type': 'executable', - 'mac_bundle': 1, - 'dependencies': [ - 'test_bundle', - ], - 'sources': [ 'main.c', ], - 'xcode_settings': { - 'INFOPLIST_FILE': 'TestApp-Info.plist', - }, - 'postbuilds': [ - { - 'postbuild_name': 'Copy dependent framework into app', - 'action': [ - './postbuild-copy-framework.sh', - '${BUILT_PRODUCTS_DIR}/My Framework.framework', - '${BUILT_PRODUCTS_DIR}/${CONTENTS_FOLDER_PATH}/', - ], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/mac/postbuild-defaults/Info.plist b/tools/gyp/test/mac/postbuild-defaults/Info.plist deleted file mode 100644 index d3f54d76cdc235c0601480cf2dd7c2072e6492a2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuild-defaults/Info.plist +++ /dev/null @@ -1,13 +0,0 @@ - - - - - - CFBundlePackageType - APPL - CFBundleSignature - ???? - CFBundleName - ${PRODUCT_NAME} - - diff --git a/tools/gyp/test/mac/postbuild-defaults/main.c b/tools/gyp/test/mac/postbuild-defaults/main.c deleted file mode 100644 index 1711567ef566703fcd9c33e0a236b1b30454df6a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuild-defaults/main.c +++ /dev/null @@ -1,7 +0,0 @@ -// 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. - -int main() { - return 0; -} diff --git a/tools/gyp/test/mac/postbuild-defaults/postbuild-defaults.sh b/tools/gyp/test/mac/postbuild-defaults/postbuild-defaults.sh deleted file mode 100755 index 56af2a8329bd67df5b990452feb44f9670691a8e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuild-defaults/postbuild-defaults.sh +++ /dev/null @@ -1,15 +0,0 @@ -#!/bin/bash -# 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. - -set -e - -# This is the built Info.plist in the output directory. -PLIST="${BUILT_PRODUCTS_DIR}"/Test.app/Contents/Info # No trailing .plist -echo $(defaults read "${PLIST}" "CFBundleName") > "${BUILT_PRODUCTS_DIR}/result" - -# This is the source Info.plist next to this script file. -PLIST="${SRCROOT}"/Info # No trailing .plist -echo $(defaults read "${PLIST}" "CFBundleName") \ - >> "${BUILT_PRODUCTS_DIR}/result" diff --git a/tools/gyp/test/mac/postbuild-defaults/test.gyp b/tools/gyp/test/mac/postbuild-defaults/test.gyp deleted file mode 100644 index be0a075efc6f0c5b6274a426ab390d5aa58c6d87..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuild-defaults/test.gyp +++ /dev/null @@ -1,26 +0,0 @@ -# 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': 'test_app', - 'product_name': 'Test', - 'type': 'executable', - 'mac_bundle': 1, - 'sources': [ 'main.c', ], - 'xcode_settings': { - 'INFOPLIST_FILE': 'Info.plist', - }, - 'postbuilds': [ - { - 'postbuild_name': 'Postbuild that calls defaults', - 'action': [ - './postbuild-defaults.sh', - '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}', - ], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/mac/postbuild-fail/file.c b/tools/gyp/test/mac/postbuild-fail/file.c deleted file mode 100644 index 91695b10c6f1834d3feb953750586a6e3cab454b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuild-fail/file.c +++ /dev/null @@ -1,6 +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. - -// That's right, this is copyrighted. -void f() {} diff --git a/tools/gyp/test/mac/postbuild-fail/postbuild-fail.sh b/tools/gyp/test/mac/postbuild-fail/postbuild-fail.sh deleted file mode 100755 index dc1a60d987e28849569e103e664fd6c1a45639cd..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuild-fail/postbuild-fail.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/usr/bin/bash -# 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. - -exit 1 diff --git a/tools/gyp/test/mac/postbuild-fail/test.gyp b/tools/gyp/test/mac/postbuild-fail/test.gyp deleted file mode 100644 index e63283db036bdd9511a268ec8088b6c1eb0532dd..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuild-fail/test.gyp +++ /dev/null @@ -1,38 +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': 'nonbundle', - 'type': 'static_library', - 'sources': [ 'file.c', ], - 'postbuilds': [ - { - 'postbuild_name': 'Postbuild Fail', - 'action': [ './postbuild-fail.sh', ], - }, - { - 'postbuild_name': 'Runs after failing postbuild', - 'action': [ './touch-static.sh', ], - }, - ], - }, - { - 'target_name': 'bundle', - 'type': 'shared_library', - 'mac_bundle': 1, - 'sources': [ 'file.c', ], - 'postbuilds': [ - { - 'postbuild_name': 'Postbuild Fail', - 'action': [ './postbuild-fail.sh', ], - }, - { - 'postbuild_name': 'Runs after failing postbuild', - 'action': [ './touch-dynamic.sh', ], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/mac/postbuild-fail/touch-dynamic.sh b/tools/gyp/test/mac/postbuild-fail/touch-dynamic.sh deleted file mode 100755 index a388a64102bf6b13dd2464731ed449a78e1873df..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuild-fail/touch-dynamic.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -# 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. - -set -e -touch "${BUILT_PRODUCTS_DIR}/dynamic_touch" diff --git a/tools/gyp/test/mac/postbuild-fail/touch-static.sh b/tools/gyp/test/mac/postbuild-fail/touch-static.sh deleted file mode 100755 index 97ecaa68682f516bfd0ed72cb4e7c7b597e735ff..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuild-fail/touch-static.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash -# 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. - -set -e -touch "${BUILT_PRODUCTS_DIR}/static_touch" diff --git a/tools/gyp/test/mac/postbuild-multiple-configurations/main.c b/tools/gyp/test/mac/postbuild-multiple-configurations/main.c deleted file mode 100644 index 21c1963526223324e9d9c78f45151b144fceb9d0..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuild-multiple-configurations/main.c +++ /dev/null @@ -1,4 +0,0 @@ -// 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. -int main() {} diff --git a/tools/gyp/test/mac/postbuild-multiple-configurations/postbuild-touch-file.sh b/tools/gyp/test/mac/postbuild-multiple-configurations/postbuild-touch-file.sh deleted file mode 100755 index b6170cf7a7f863140a23657468471af2c9a7d9f7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuild-multiple-configurations/postbuild-touch-file.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -# 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. - -touch "${BUILT_PRODUCTS_DIR}/postbuild-file" diff --git a/tools/gyp/test/mac/postbuild-multiple-configurations/test.gyp b/tools/gyp/test/mac/postbuild-multiple-configurations/test.gyp deleted file mode 100644 index c350b20d6832cf007fe5f9f13c67a595030bdf9e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuild-multiple-configurations/test.gyp +++ /dev/null @@ -1,26 +0,0 @@ -# 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. -{ - 'target_defaults': { - 'configurations': { - 'Debug': {}, - 'Release': {}, - }, - }, - 'targets': [ - { - 'target_name': 'random_target', - 'type': 'executable', - 'sources': [ 'main.c', ], - 'postbuilds': [ - { - 'postbuild_name': 'Touch a file.', - 'action': [ - './postbuild-touch-file.sh', - ], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/mac/postbuild-static-library/empty.c b/tools/gyp/test/mac/postbuild-static-library/empty.c deleted file mode 100644 index 9554336c0c396d50f0ba3571255440d9da34d6e8..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuild-static-library/empty.c +++ /dev/null @@ -1,4 +0,0 @@ -// 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. -void f() {} diff --git a/tools/gyp/test/mac/postbuild-static-library/postbuild-touch-file.sh b/tools/gyp/test/mac/postbuild-static-library/postbuild-touch-file.sh deleted file mode 100755 index 37de4de4f6db9831d19a45eb404fc04490adfbf3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuild-static-library/postbuild-touch-file.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -# 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. - -touch "${BUILT_PRODUCTS_DIR}/$1" diff --git a/tools/gyp/test/mac/postbuild-static-library/test.gyp b/tools/gyp/test/mac/postbuild-static-library/test.gyp deleted file mode 100644 index 9ef55a0afa95f2534efe6342e6ec9410aed56f21..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuild-static-library/test.gyp +++ /dev/null @@ -1,34 +0,0 @@ -# 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': 'my_lib', - 'type': 'static_library', - 'sources': [ 'empty.c', ], - 'postbuilds': [ - { - 'postbuild_name': 'Postbuild that touches a file', - 'action': [ - './postbuild-touch-file.sh', 'postbuild-file' - ], - }, - ], - }, - - { - 'target_name': 'my_sourceless_lib', - 'type': 'static_library', - 'dependencies': [ 'my_lib' ], - 'postbuilds': [ - { - 'postbuild_name': 'Postbuild that touches a file', - 'action': [ - './postbuild-touch-file.sh', 'postbuild-file-sourceless' - ], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/mac/postbuilds/copy.sh b/tools/gyp/test/mac/postbuilds/copy.sh deleted file mode 100755 index ecad0381db854b44a3aa70ab01acef5358b61d8a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuilds/copy.sh +++ /dev/null @@ -1,3 +0,0 @@ -#!/bin/bash - -cp "$@" diff --git a/tools/gyp/test/mac/postbuilds/file.c b/tools/gyp/test/mac/postbuilds/file.c deleted file mode 100644 index 653e71ff7ecc67f3f4690d0e7625029b45f88a2f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuilds/file.c +++ /dev/null @@ -1,4 +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. -void f() {} diff --git a/tools/gyp/test/mac/postbuilds/file_g.c b/tools/gyp/test/mac/postbuilds/file_g.c deleted file mode 100644 index 0f7849d2080fbc4506ebcbd47b4134bdd2ec6e58..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuilds/file_g.c +++ /dev/null @@ -1,4 +0,0 @@ -// 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. -void g() {} diff --git a/tools/gyp/test/mac/postbuilds/file_h.c b/tools/gyp/test/mac/postbuilds/file_h.c deleted file mode 100644 index 521d1f4d56d1be6313a1a97d4a3a2e5c974b7409..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuilds/file_h.c +++ /dev/null @@ -1,4 +0,0 @@ -// 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. -void h() {} diff --git a/tools/gyp/test/mac/postbuilds/script/shared_library_postbuild.sh b/tools/gyp/test/mac/postbuilds/script/shared_library_postbuild.sh deleted file mode 100755 index c623c8bf21870d953a6aa97d0b06277613e3bf1b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuilds/script/shared_library_postbuild.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -# 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. - -set -e - -lib="${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}" -nm ${lib} > /dev/null # Just make sure this works. - -pattern="${1}" - -if [ $pattern != "a|b" ]; then - echo "Parameter quoting is broken" - exit 1 -fi - -if [ "${2}" != "arg with spaces" ]; then - echo "Parameter space escaping is broken" - exit 1 -fi - -touch "${lib}"_touch diff --git a/tools/gyp/test/mac/postbuilds/script/static_library_postbuild.sh b/tools/gyp/test/mac/postbuilds/script/static_library_postbuild.sh deleted file mode 100755 index 2bf09b34e1c998b5b79b8a76dab4be883ca0080b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuilds/script/static_library_postbuild.sh +++ /dev/null @@ -1,23 +0,0 @@ -#!/bin/bash -# 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. - -set -e - -lib="${BUILT_PRODUCTS_DIR}/${FULL_PRODUCT_NAME}" -nm ${lib} > /dev/null # Just make sure this works. - -pattern="${1}" - -if [ $pattern != "a|b" ]; then - echo "Parameter quote escaping is broken" - exit 1 -fi - -if [ "${2}" != "arg with spaces" ]; then - echo "Parameter space escaping is broken" - exit 1 -fi - -touch "${lib}"_touch.a diff --git a/tools/gyp/test/mac/postbuilds/subdirectory/copied_file.txt b/tools/gyp/test/mac/postbuilds/subdirectory/copied_file.txt deleted file mode 100644 index a634f85b6cc452e74cf49c1cda79657cb6c7a7e2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuilds/subdirectory/copied_file.txt +++ /dev/null @@ -1 +0,0 @@ -This file should be copied to the products dir. diff --git a/tools/gyp/test/mac/postbuilds/subdirectory/nested_target.gyp b/tools/gyp/test/mac/postbuilds/subdirectory/nested_target.gyp deleted file mode 100644 index 623de9f625bc15cd74b2f8b9ad6aa6906485e28b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuilds/subdirectory/nested_target.gyp +++ /dev/null @@ -1,52 +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': 'nest_el', - 'type': 'static_library', - 'sources': [ '../file_g.c', ], - 'postbuilds': [ - { - 'postbuild_name': 'Static library postbuild', - 'variables': { - 'some_regex': 'a|b', - }, - 'action': [ - '../script/static_library_postbuild.sh', - '<(some_regex)', - 'arg with spaces', - ], - }, - ], - }, - { - 'target_name': 'nest_dyna', - 'type': 'shared_library', - 'mac_bundle': 1, - 'sources': [ '../file_h.c', ], - 'postbuilds': [ - { - 'postbuild_name': 'Dynamic library postbuild', - 'variables': { - 'some_regex': 'a|b', - }, - 'action': [ - '../script/shared_library_postbuild.sh', - '<(some_regex)', - 'arg with spaces', - ], - }, - { - 'postbuild_name': 'Test paths relative to gyp file', - 'action': [ - '../copy.sh', - './copied_file.txt', - '${BUILT_PRODUCTS_DIR}/copied_file_2.txt', - ], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/mac/postbuilds/test.gyp b/tools/gyp/test/mac/postbuilds/test.gyp deleted file mode 100644 index 7c0b523f86f0e28b10ad6584b12099f9759f0608..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/postbuilds/test.gyp +++ /dev/null @@ -1,93 +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': 'el', - 'type': 'static_library', - 'sources': [ 'file.c', ], - 'postbuilds': [ - { - 'postbuild_name': 'Static library postbuild', - 'variables': { - 'some_regex': 'a|b', - }, - 'action': [ - 'script/static_library_postbuild.sh', - '<(some_regex)', - 'arg with spaces', - ], - }, - { - 'postbuild_name': 'Test variable in gyp file', - 'action': [ - 'cp', - '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}', - '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}_gyp_touch.a', - ], - }, - ], - }, - { - 'target_name': 'dyna', - 'type': 'shared_library', - 'mac_bundle': 1, - 'sources': [ 'file.c', ], - 'dependencies': [ - 'subdirectory/nested_target.gyp:nest_dyna', - 'subdirectory/nested_target.gyp:nest_el', - ], - 'postbuilds': [ - { - 'postbuild_name': 'Dynamic library postbuild', - 'variables': { - 'some_regex': 'a|b', - }, - 'action': [ - 'script/shared_library_postbuild.sh', - '<(some_regex)', - 'arg with spaces', - ], - }, - { - 'postbuild_name': 'Test variable in gyp file', - 'action': [ - 'cp', - '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}', - '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}_gyp_touch', - ], - }, - { - 'postbuild_name': 'Test paths relative to gyp file', - 'action': [ - './copy.sh', - 'subdirectory/copied_file.txt', - '${BUILT_PRODUCTS_DIR}', - ], - }, - ], - }, - { - 'target_name': 'dyna_standalone', - 'type': 'shared_library', - 'sources': [ 'file.c', ], - 'postbuilds': [ - { - 'postbuild_name': 'Test variable in gyp file', - 'action': [ - 'cp', - '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}', - '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}_gyp_touch.dylib', - ], - }, - ], - }, - { - 'target_name': 'EmptyBundle', - 'product_extension': 'bundle', - 'type': 'executable', - 'mac_bundle': 1, - }, - ], -} diff --git a/tools/gyp/test/mac/prefixheader/file.c b/tools/gyp/test/mac/prefixheader/file.c deleted file mode 100644 index d0b39d1f6d8bb460947b4d38aa09e65c94d170b0..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/prefixheader/file.c +++ /dev/null @@ -1 +0,0 @@ -MyInt f() { return 0; } diff --git a/tools/gyp/test/mac/prefixheader/file.cc b/tools/gyp/test/mac/prefixheader/file.cc deleted file mode 100644 index d0b39d1f6d8bb460947b4d38aa09e65c94d170b0..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/prefixheader/file.cc +++ /dev/null @@ -1 +0,0 @@ -MyInt f() { return 0; } diff --git a/tools/gyp/test/mac/prefixheader/file.m b/tools/gyp/test/mac/prefixheader/file.m deleted file mode 100644 index d0b39d1f6d8bb460947b4d38aa09e65c94d170b0..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/prefixheader/file.m +++ /dev/null @@ -1 +0,0 @@ -MyInt f() { return 0; } diff --git a/tools/gyp/test/mac/prefixheader/file.mm b/tools/gyp/test/mac/prefixheader/file.mm deleted file mode 100644 index d0b39d1f6d8bb460947b4d38aa09e65c94d170b0..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/prefixheader/file.mm +++ /dev/null @@ -1 +0,0 @@ -MyInt f() { return 0; } diff --git a/tools/gyp/test/mac/prefixheader/header.h b/tools/gyp/test/mac/prefixheader/header.h deleted file mode 100644 index 0716e500c5a69de9cd033fa0bc6935b78055ee64..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/prefixheader/header.h +++ /dev/null @@ -1 +0,0 @@ -typedef int MyInt; diff --git a/tools/gyp/test/mac/prefixheader/test.gyp b/tools/gyp/test/mac/prefixheader/test.gyp deleted file mode 100644 index 7e6b1af807f258547ee76db870af66c8e5f7db97..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/prefixheader/test.gyp +++ /dev/null @@ -1,82 +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': 'prefix_header_c', - 'type': 'static_library', - 'sources': [ 'file.c', ], - 'xcode_settings': { - 'GCC_PREFIX_HEADER': 'header.h', - }, - }, - { - 'target_name': 'precompiled_prefix_header_c', - 'type': 'shared_library', - 'mac_bundle': 1, - 'sources': [ 'file.c', ], - 'xcode_settings': { - 'GCC_PREFIX_HEADER': 'header.h', - 'GCC_PRECOMPILE_PREFIX_HEADER': 'YES', - }, - }, - - { - 'target_name': 'prefix_header_cc', - 'type': 'static_library', - 'sources': [ 'file.cc', ], - 'xcode_settings': { - 'GCC_PREFIX_HEADER': 'header.h', - }, - }, - { - 'target_name': 'precompiled_prefix_header_cc', - 'type': 'shared_library', - 'mac_bundle': 1, - 'sources': [ 'file.cc', ], - 'xcode_settings': { - 'GCC_PREFIX_HEADER': 'header.h', - 'GCC_PRECOMPILE_PREFIX_HEADER': 'YES', - }, - }, - - { - 'target_name': 'prefix_header_m', - 'type': 'static_library', - 'sources': [ 'file.m', ], - 'xcode_settings': { - 'GCC_PREFIX_HEADER': 'header.h', - }, - }, - { - 'target_name': 'precompiled_prefix_header_m', - 'type': 'shared_library', - 'mac_bundle': 1, - 'sources': [ 'file.m', ], - 'xcode_settings': { - 'GCC_PREFIX_HEADER': 'header.h', - 'GCC_PRECOMPILE_PREFIX_HEADER': 'YES', - }, - }, - - { - 'target_name': 'prefix_header_mm', - 'type': 'static_library', - 'sources': [ 'file.mm', ], - 'xcode_settings': { - 'GCC_PREFIX_HEADER': 'header.h', - }, - }, - { - 'target_name': 'precompiled_prefix_header_mm', - 'type': 'shared_library', - 'mac_bundle': 1, - 'sources': [ 'file.mm', ], - 'xcode_settings': { - 'GCC_PREFIX_HEADER': 'header.h', - 'GCC_PRECOMPILE_PREFIX_HEADER': 'YES', - }, - }, - ], -} diff --git a/tools/gyp/test/mac/rebuild/TestApp-Info.plist b/tools/gyp/test/mac/rebuild/TestApp-Info.plist deleted file mode 100644 index 98fd5152000f7b7d980f67b14a470e335864f00d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/rebuild/TestApp-Info.plist +++ /dev/null @@ -1,32 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - - CFBundleIdentifier - com.google.${PRODUCT_NAME} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - LSMinimumSystemVersion - ${MACOSX_DEPLOYMENT_TARGET} - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - - diff --git a/tools/gyp/test/mac/rebuild/delay-touch.sh b/tools/gyp/test/mac/rebuild/delay-touch.sh deleted file mode 100755 index 7caf105b6e05cbd7718f76975e4748248d5b2527..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/rebuild/delay-touch.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/bash - -set -e - -sleep 1 # mtime resolution is 1 sec on unix. -touch "$1" diff --git a/tools/gyp/test/mac/rebuild/empty.c b/tools/gyp/test/mac/rebuild/empty.c deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tools/gyp/test/mac/rebuild/main.c b/tools/gyp/test/mac/rebuild/main.c deleted file mode 100644 index 237c8ce181774d991a9dbdd8cacf1a5fb9f199f1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/rebuild/main.c +++ /dev/null @@ -1 +0,0 @@ -int main() {} diff --git a/tools/gyp/test/mac/rebuild/test.gyp b/tools/gyp/test/mac/rebuild/test.gyp deleted file mode 100644 index 15b4e4ef2f5b955199b4c2e3fd1c00deea724d3a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/rebuild/test.gyp +++ /dev/null @@ -1,56 +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': 'test_app', - 'product_name': 'Test App', - 'type': 'executable', - 'mac_bundle': 1, - 'sources': [ - 'main.c', - ], - 'xcode_settings': { - 'INFOPLIST_FILE': 'TestApp-Info.plist', - }, - }, - { - 'target_name': 'test_app_postbuilds', - 'product_name': 'Test App 2', - 'type': 'executable', - 'mac_bundle': 1, - 'sources': [ - 'main.c', - ], - 'xcode_settings': { - 'INFOPLIST_FILE': 'TestApp-Info.plist', - }, - 'postbuilds': [ - { - 'postbuild_name': 'Postbuild that touches the app binary', - 'action': [ - './delay-touch.sh', '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}', - ], - }, - ], - }, - { - 'target_name': 'test_framework_postbuilds', - 'product_name': 'Test Framework', - 'type': 'shared_library', - 'mac_bundle': 1, - 'sources': [ - 'empty.c', - ], - 'postbuilds': [ - { - 'postbuild_name': 'Postbuild that touches the framework binary', - 'action': [ - './delay-touch.sh', '${BUILT_PRODUCTS_DIR}/${EXECUTABLE_PATH}', - ], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/mac/rpath/file.c b/tools/gyp/test/mac/rpath/file.c deleted file mode 100644 index 56757a701bf5cfd58c3d4b546d3444da4cf30711..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/rpath/file.c +++ /dev/null @@ -1 +0,0 @@ -void f() {} diff --git a/tools/gyp/test/mac/rpath/main.c b/tools/gyp/test/mac/rpath/main.c deleted file mode 100644 index 237c8ce181774d991a9dbdd8cacf1a5fb9f199f1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/rpath/main.c +++ /dev/null @@ -1 +0,0 @@ -int main() {} diff --git a/tools/gyp/test/mac/rpath/test.gyp b/tools/gyp/test/mac/rpath/test.gyp deleted file mode 100644 index 7255cb7cd20b0aac784d98da5a356559cea2bdd8..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/rpath/test.gyp +++ /dev/null @@ -1,48 +0,0 @@ -# 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': 'default_rpath', - 'type': 'shared_library', - 'sources': [ 'file.c' ], - }, - { - 'target_name': 'explicit_rpath', - 'type': 'shared_library', - 'sources': [ 'file.c' ], - 'xcode_settings': { - 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'], - }, - }, - { - 'target_name': 'explicit_rpaths_escaped', - 'type': 'shared_library', - 'sources': [ 'file.c' ], - 'xcode_settings': { - # Xcode requires spaces to be escaped, else it ends up adding two - # independent rpaths. - 'LD_RUNPATH_SEARCH_PATHS': ['First\\ rpath', 'Second\\ rpath'], - }, - }, - { - 'target_name': 'explicit_rpaths_bundle', - 'product_name': 'My Framework', - 'type': 'shared_library', - 'mac_bundle': 1, - 'sources': [ 'file.c' ], - 'xcode_settings': { - 'LD_RUNPATH_SEARCH_PATHS': ['@loader_path/.'], - }, - }, - { - 'target_name': 'executable', - 'type': 'executable', - 'sources': [ 'main.c' ], - 'xcode_settings': { - 'LD_RUNPATH_SEARCH_PATHS': ['@executable_path/.'], - }, - }, - ], -} diff --git a/tools/gyp/test/mac/sdkroot/file.cc b/tools/gyp/test/mac/sdkroot/file.cc deleted file mode 100644 index 13ae9710402af2ac7f546c57be10d9f86b24cda8..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/sdkroot/file.cc +++ /dev/null @@ -1,5 +0,0 @@ -#include -using std::map; - -int main() { -} diff --git a/tools/gyp/test/mac/sdkroot/test.gyp b/tools/gyp/test/mac/sdkroot/test.gyp deleted file mode 100644 index 2fc11a0280b38902593a37e62559dfd1aa8ed50a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/sdkroot/test.gyp +++ /dev/null @@ -1,35 +0,0 @@ -# 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': 'mytarget', - 'type': 'executable', - 'sources': [ 'file.cc', ], - 'xcode_settings': { - 'SDKROOT': 'macosx%s', - }, - 'postbuilds': [ - { - 'postbuild_name': 'envtest', - 'action': [ './test_shorthand.sh', ], - }, - ], - }, - { - 'target_name': 'absolute', - 'type': 'executable', - 'sources': [ 'file.cc', ], - 'xcode_settings': { - 'SDKROOT': '<(sdk_path)', - }, - 'postbuilds': [ - { - 'postbuild_name': 'envtest', - 'action': [ './test_shorthand.sh', ], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/mac/sdkroot/test_shorthand.sh b/tools/gyp/test/mac/sdkroot/test_shorthand.sh deleted file mode 100755 index ac4ac229aeefa106d8ddf6b09814c9c633f63622..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/sdkroot/test_shorthand.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# 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. - -set -e - -found=false -for sdk in 10.6 10.7 10.8 10.9 ; do - if expected=$(xcodebuild -version -sdk macosx$sdk Path 2>/dev/null) ; then - found=true - break - fi -done -if ! $found ; then - echo >&2 "cannot find installed SDK" - exit 1 -fi - -test $SDKROOT = $expected diff --git a/tools/gyp/test/mac/sourceless-module/empty.c b/tools/gyp/test/mac/sourceless-module/empty.c deleted file mode 100644 index 237c8ce181774d991a9dbdd8cacf1a5fb9f199f1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/sourceless-module/empty.c +++ /dev/null @@ -1 +0,0 @@ -int main() {} diff --git a/tools/gyp/test/mac/sourceless-module/empty.txt b/tools/gyp/test/mac/sourceless-module/empty.txt deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tools/gyp/test/mac/sourceless-module/fun.c b/tools/gyp/test/mac/sourceless-module/fun.c deleted file mode 100644 index d64ff8ca23dbf931bfe440e6ea616d19eaef852b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/sourceless-module/fun.c +++ /dev/null @@ -1 +0,0 @@ -int f() { return 42; } diff --git a/tools/gyp/test/mac/sourceless-module/test.gyp b/tools/gyp/test/mac/sourceless-module/test.gyp deleted file mode 100644 index 6ddefd877d56c1359bda0a5a6dae4fc307027612..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/sourceless-module/test.gyp +++ /dev/null @@ -1,95 +0,0 @@ -# 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': 'empty_bundle', - 'type': 'loadable_module', - 'mac_bundle': 1, - }, - { - 'target_name': 'resource_bundle', - 'type': 'loadable_module', - 'mac_bundle': 1, - 'actions': [ - { - 'action_name': 'Add Resource', - 'inputs': [], - 'outputs': [ - '<(INTERMEDIATE_DIR)/app_manifest/foo.manifest', - ], - 'action': [ - 'touch', '<(INTERMEDIATE_DIR)/app_manifest/foo.manifest', - ], - 'process_outputs_as_mac_bundle_resources': 1, - }, - ], - }, - { - 'target_name': 'dependent_on_resource_bundle', - 'type': 'executable', - 'sources': [ 'empty.c' ], - 'dependencies': [ - 'resource_bundle', - ], - }, - - { - 'target_name': 'alib', - 'type': 'static_library', - 'sources': [ 'fun.c' ] - }, - { # No sources, but depends on a static_library so must be linked. - 'target_name': 'resource_framework', - 'type': 'shared_library', - 'mac_bundle': 1, - 'dependencies': [ - 'alib', - ], - 'actions': [ - { - 'action_name': 'Add Resource', - 'inputs': [], - 'outputs': [ - '<(INTERMEDIATE_DIR)/app_manifest/foo.manifest', - ], - 'action': [ - 'touch', '<(INTERMEDIATE_DIR)/app_manifest/foo.manifest', - ], - 'process_outputs_as_mac_bundle_resources': 1, - }, - ], - }, - { - 'target_name': 'dependent_on_resource_framework', - 'type': 'executable', - 'sources': [ 'empty.c' ], - 'dependencies': [ - 'resource_framework', - ], - }, - - { # No actions, but still have resources. - 'target_name': 'mac_resource_bundle_no_actions', - 'product_extension': 'bundle', - 'type': 'executable', - 'mac_bundle': 1, - 'mac_bundle_resources': [ - 'empty.txt', - ], - }, - { - 'target_name': 'bundle_dependent_on_resource_bundle_no_actions', - 'type': 'executable', - 'mac_bundle': 1, - 'sources': [ 'empty.c' ], - 'dependencies': [ - 'mac_resource_bundle_no_actions', - ], - 'mac_bundle_resources': [ - '<(PRODUCT_DIR)/mac_resource_bundle_no_actions.bundle', - ], - }, - ], -} diff --git a/tools/gyp/test/mac/strip/file.c b/tools/gyp/test/mac/strip/file.c deleted file mode 100644 index a4c504de7170cc280b4785552aa65dc4e500f9b5..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/strip/file.c +++ /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. - -static void the_static_function() {} -__attribute__((used)) void the_used_function() {} - -__attribute__((visibility("hidden"))) __attribute__((used)) - void the_hidden_function() {} -__attribute__((visibility("default"))) __attribute__((used)) - void the_visible_function() {} - -extern const int eci; -__attribute__((used)) int i; -__attribute__((used)) const int ci = 34623; - -void the_function() { - the_static_function(); - the_used_function(); - the_hidden_function(); - the_visible_function(); -} diff --git a/tools/gyp/test/mac/strip/main.c b/tools/gyp/test/mac/strip/main.c deleted file mode 100644 index b2291a6b09ecd3ae0d08976b6a7d975c85c2250b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/strip/main.c +++ /dev/null @@ -1,25 +0,0 @@ -// Copyright (c) 2013 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. - -static void the_static_function() {} -__attribute__((used)) void the_used_function() {} - -__attribute__((visibility("hidden"))) __attribute__((used)) -void the_hidden_function() {} -__attribute__((visibility("default"))) __attribute__((used)) -void the_visible_function() {} - -void the_function() {} - -extern const int eci; -__attribute__((used)) int i; -__attribute__((used)) const int ci = 34623; - -int main() { - the_function(); - the_static_function(); - the_used_function(); - the_hidden_function(); - the_visible_function(); -} diff --git a/tools/gyp/test/mac/strip/strip.saves b/tools/gyp/test/mac/strip/strip.saves deleted file mode 100644 index b60ca62857a217f56ad1b725658bc185b8c24a56..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/strip/strip.saves +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (c) 2011 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# This file would list symbols that should not be stripped. diff --git a/tools/gyp/test/mac/strip/subdirectory/nested_file.c b/tools/gyp/test/mac/strip/subdirectory/nested_file.c deleted file mode 100644 index 50daa6c13b49e73669404fc62edfc33929556e5f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/strip/subdirectory/nested_file.c +++ /dev/null @@ -1 +0,0 @@ -void nested_f() {} diff --git a/tools/gyp/test/mac/strip/subdirectory/nested_strip.saves b/tools/gyp/test/mac/strip/subdirectory/nested_strip.saves deleted file mode 100644 index d434c0ef458870b247bebd24f31b870c0a8a4261..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/strip/subdirectory/nested_strip.saves +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (c) 2012 The Chromium Authors. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -# This file would list symbols that should not be stripped. diff --git a/tools/gyp/test/mac/strip/subdirectory/subdirectory.gyp b/tools/gyp/test/mac/strip/subdirectory/subdirectory.gyp deleted file mode 100644 index 2085cf3cc1c860141b917897ecb33c3eeea126df..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/strip/subdirectory/subdirectory.gyp +++ /dev/null @@ -1,37 +0,0 @@ -# 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': 'nested_strip_save', - 'type': 'shared_library', - 'sources': [ 'nested_file.c', ], - 'xcode_settings': { - 'DEPLOYMENT_POSTPROCESSING': 'YES', - 'STRIP_INSTALLED_PRODUCT': 'YES', - 'STRIPFLAGS': '-s $(CHROMIUM_STRIP_SAVE_FILE)', - 'CHROMIUM_STRIP_SAVE_FILE': 'nested_strip.saves', - }, - }, - { - 'target_name': 'nested_strip_save_postbuild', - 'type': 'shared_library', - 'sources': [ 'nested_file.c', ], - 'xcode_settings': { - 'DEPLOYMENT_POSTPROCESSING': 'YES', - 'STRIP_INSTALLED_PRODUCT': 'YES', - 'STRIPFLAGS': '-s $(CHROMIUM_STRIP_SAVE_FILE)', - 'CHROMIUM_STRIP_SAVE_FILE': 'nested_strip.saves', - }, - 'postbuilds': [ - { - 'postbuild_name': 'Action that reads CHROMIUM_STRIP_SAVE_FILE', - 'action': [ - './test_reading_save_file_from_postbuild.sh', - ], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/mac/strip/subdirectory/test_reading_save_file_from_postbuild.sh b/tools/gyp/test/mac/strip/subdirectory/test_reading_save_file_from_postbuild.sh deleted file mode 100755 index 976943680ee9a9f63aa7f83265a642e1d3946115..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/strip/subdirectory/test_reading_save_file_from_postbuild.sh +++ /dev/null @@ -1,5 +0,0 @@ -#!/bin/bash - -set -e - -test -f ${CHROMIUM_STRIP_SAVE_FILE} diff --git a/tools/gyp/test/mac/strip/test-defaults.gyp b/tools/gyp/test/mac/strip/test-defaults.gyp deleted file mode 100644 index e688b955a742f0edc2c9c6be0ee3fc030a735e75..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/strip/test-defaults.gyp +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright (c) 2013 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. -{ - 'make_global_settings': [ - ['CC', '/usr/bin/clang'], - ], - 'target_defaults': { - 'xcode_settings': { - 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', - 'DEPLOYMENT_POSTPROCESSING': 'YES', - 'STRIP_INSTALLED_PRODUCT': 'YES', - }, - }, - 'targets': [ - { - 'target_name': 'single_dylib', - 'type': 'shared_library', - 'sources': [ 'file.c', ], - }, - { - 'target_name': 'single_so', - 'type': 'loadable_module', - 'sources': [ 'file.c', ], - }, - { - 'target_name': 'single_exe', - 'type': 'executable', - 'sources': [ 'main.c', ], - }, - - { - 'target_name': 'bundle_dylib', - 'type': 'shared_library', - 'mac_bundle': '1', - 'sources': [ 'file.c', ], - }, - { - 'target_name': 'bundle_so', - 'type': 'loadable_module', - 'mac_bundle': '1', - 'sources': [ 'file.c', ], - }, - { - 'target_name': 'bundle_exe', - 'type': 'executable', - 'mac_bundle': '1', - 'sources': [ 'main.c', ], - }, - ], -} diff --git a/tools/gyp/test/mac/strip/test.gyp b/tools/gyp/test/mac/strip/test.gyp deleted file mode 100644 index 2558aa91bbe9542675e9286b78da4c2df05d121c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/strip/test.gyp +++ /dev/null @@ -1,119 +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. - -# These xcode_settings affect stripping: -# "Deployment postprocessing involves stripping the binary, and setting -# its file mode, owner, and group." -#'DEPLOYMENT_POSTPROCESSING': 'YES', - -# "Specifies whether to strip symbol information from the binary. -# Prerequisite: $DEPLOYMENT_POSTPROCESSING = YES" "Default Value: 'NO'" -#'STRIP_INSTALLED_PRODUCT': 'YES', - -# "Values: -# * all: Strips the binary completely, removing the symbol table and -# relocation information -# * non-global: Strips nonglobal symbols but saves external symbols. -# * debugging: Strips debugging symbols but saves local and global -# symbols." -# (maps to no flag, -x, -S in that order) -#'STRIP_STYLE': 'non-global', - -# "Additional strip flags" -#'STRIPFLAGS': '-c', - -# "YES: Copied binaries are stripped of debugging symbols. This does -# not cause the binary produced by the linker to be stripped. Use -# 'STRIP_INSTALLED_PRODUCT (Strip Linked Product)' to have the linker -# strip the binary." -#'COPY_PHASE_STRIP': 'NO', -{ - 'targets': [ - { - 'target_name': 'no_postprocess', - 'type': 'shared_library', - 'sources': [ 'file.c', ], - 'xcode_settings': { - 'DEPLOYMENT_POSTPROCESSING': 'NO', - 'STRIP_INSTALLED_PRODUCT': 'YES', - }, - }, - { - 'target_name': 'no_strip', - 'type': 'shared_library', - 'sources': [ 'file.c', ], - 'xcode_settings': { - 'DEPLOYMENT_POSTPROCESSING': 'YES', - 'STRIP_INSTALLED_PRODUCT': 'NO', - }, - }, - { - 'target_name': 'strip_all', - 'type': 'shared_library', - 'sources': [ 'file.c', ], - 'xcode_settings': { - 'DEPLOYMENT_POSTPROCESSING': 'YES', - 'STRIP_INSTALLED_PRODUCT': 'YES', - 'STRIP_STYLE': 'all', - }, - }, - { - 'target_name': 'strip_nonglobal', - 'type': 'shared_library', - 'sources': [ 'file.c', ], - 'xcode_settings': { - 'DEPLOYMENT_POSTPROCESSING': 'YES', - 'STRIP_INSTALLED_PRODUCT': 'YES', - 'STRIP_STYLE': 'non-global', - }, - }, - { - 'target_name': 'strip_debugging', - 'type': 'shared_library', - 'sources': [ 'file.c', ], - 'xcode_settings': { - 'DEPLOYMENT_POSTPROCESSING': 'YES', - 'STRIP_INSTALLED_PRODUCT': 'YES', - 'STRIP_STYLE': 'debugging', - }, - }, - { - 'target_name': 'strip_all_custom_flags', - 'type': 'shared_library', - 'sources': [ 'file.c', ], - 'xcode_settings': { - 'DEPLOYMENT_POSTPROCESSING': 'YES', - 'STRIP_INSTALLED_PRODUCT': 'YES', - 'STRIP_STYLE': 'all', - 'STRIPFLAGS': '-c', - }, - }, - { - 'target_name': 'strip_all_bundle', - 'type': 'shared_library', - 'mac_bundle': '1', - 'sources': [ 'file.c', ], - 'xcode_settings': { - 'DEPLOYMENT_POSTPROCESSING': 'YES', - 'STRIP_INSTALLED_PRODUCT': 'YES', - 'STRIP_STYLE': 'all', - }, - }, - { - 'target_name': 'strip_save', - 'type': 'shared_library', - 'sources': [ 'file.c', ], - 'dependencies': [ - 'subdirectory/subdirectory.gyp:nested_strip_save', - 'subdirectory/subdirectory.gyp:nested_strip_save_postbuild', - ], - 'xcode_settings': { - 'DEPLOYMENT_POSTPROCESSING': 'YES', - 'STRIP_INSTALLED_PRODUCT': 'YES', - 'STRIPFLAGS': '-s $(CHROMIUM_STRIP_SAVE_FILE)', - 'CHROMIUM_STRIP_SAVE_FILE': 'strip.saves', - }, - }, - ], -} diff --git a/tools/gyp/test/mac/swift-library/Info.plist b/tools/gyp/test/mac/swift-library/Info.plist deleted file mode 100644 index 804990ca5e806235a3a16f0674609746cae08d9e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/swift-library/Info.plist +++ /dev/null @@ -1,28 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - - CFBundleIdentifier - com.yourcompany.${PRODUCT_NAME:identifier} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - FMWK - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - NSPrincipalClass - - - diff --git a/tools/gyp/test/mac/swift-library/file.swift b/tools/gyp/test/mac/swift-library/file.swift deleted file mode 100644 index 88db7da5c6cb105b8845ff30e553ad7481306351..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/swift-library/file.swift +++ /dev/null @@ -1,9 +0,0 @@ -import Foundation - -public class GypSwiftTest { - let myProperty = false - - init() { - self.myProperty = true - } -} \ No newline at end of file diff --git a/tools/gyp/test/mac/swift-library/test.gyp b/tools/gyp/test/mac/swift-library/test.gyp deleted file mode 100644 index 373a677cbd86d6a27791bba40ad50d91d24440e5..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/swift-library/test.gyp +++ /dev/null @@ -1,21 +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': 'SwiftFramework', - 'product_name': 'SwiftFramework', - 'type': 'shared_library', - 'mac_bundle': 1, - 'xcode_settings': { - 'INFOPLIST_FILE': 'Info.plist', - 'CODE_SIGNING_REQUIRED': 'NO', - 'CONFIGURATION_BUILD_DIR':'build/Default', - }, - 'sources': [ - 'file.swift', - ], - }, - ], -} diff --git a/tools/gyp/test/mac/type_envvars/file.c b/tools/gyp/test/mac/type_envvars/file.c deleted file mode 100644 index 9cddaf1b0b401b4c7ab5da9072e45c2c5e8cb666..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/type_envvars/file.c +++ /dev/null @@ -1,6 +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. - -void f() {} -int main() {} diff --git a/tools/gyp/test/mac/type_envvars/test.gyp b/tools/gyp/test/mac/type_envvars/test.gyp deleted file mode 100644 index 465670056bde3875cc2cc5efed556a4e2a43dd21..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/type_envvars/test.gyp +++ /dev/null @@ -1,100 +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': 'my_app', - 'product_name': 'My App', - 'type': 'executable', - 'mac_bundle': 1, - 'sources': [ 'file.c', ], - 'postbuilds': [ - { - 'postbuild_name': 'envtest', - 'action': [ './test_bundle_executable.sh', ], - }, - ], - }, - { - 'target_name': 'bundle_loadable_module', - 'type': 'loadable_module', - 'mac_bundle': 1, - 'sources': [ 'file.c', ], - 'postbuilds': [ - { - 'postbuild_name': 'envtest', - 'action': [ './test_bundle_loadable_module.sh', ], - }, - ], - }, - { - 'target_name': 'bundle_shared_library', - 'type': 'shared_library', - 'mac_bundle': 1, - 'sources': [ 'file.c', ], - 'postbuilds': [ - { - 'postbuild_name': 'envtest', - 'action': [ './test_bundle_shared_library.sh', ], - }, - ], - }, - # Types 'static_library' and 'none' can't exist as bundles. - - { - 'target_name': 'nonbundle_executable', - 'type': 'executable', - 'sources': [ 'file.c', ], - 'postbuilds': [ - { - 'postbuild_name': 'envtest', - 'action': [ './test_nonbundle_executable.sh', ], - }, - ], - }, - { - 'target_name': 'nonbundle_loadable_module', - 'type': 'loadable_module', - 'sources': [ 'file.c', ], - 'postbuilds': [ - { - 'postbuild_name': 'envtest', - 'action': [ './test_nonbundle_loadable_module.sh', ], - }, - ], - }, - { - 'target_name': 'nonbundle_shared_library', - 'type': 'shared_library', - 'sources': [ 'file.c', ], - 'postbuilds': [ - { - 'postbuild_name': 'envtest', - 'action': [ './test_nonbundle_shared_library.sh', ], - }, - ], - }, - { - 'target_name': 'nonbundle_static_library', - 'type': 'static_library', - 'sources': [ 'file.c', ], - 'postbuilds': [ - { - 'postbuild_name': 'envtest', - 'action': [ './test_nonbundle_static_library.sh', ], - }, - ], - }, - { - 'target_name': 'nonbundle_none', - 'type': 'none', - 'postbuilds': [ - { - 'postbuild_name': 'envtest', - 'action': [ './test_nonbundle_none.sh', ], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/mac/type_envvars/test_bundle_executable.sh b/tools/gyp/test/mac/type_envvars/test_bundle_executable.sh deleted file mode 100755 index 5cd740c6baf81e8d790a6c6bdd51c9819566317a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/type_envvars/test_bundle_executable.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# 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. - -set -e - -test $MACH_O_TYPE = mh_execute -test $PRODUCT_TYPE = com.apple.product-type.application -test "${PRODUCT_NAME}" = "My App" -test "${FULL_PRODUCT_NAME}" = "My App.app" - -test "${EXECUTABLE_NAME}" = "My App" -test "${EXECUTABLE_PATH}" = "My App.app/Contents/MacOS/My App" -test "${WRAPPER_NAME}" = "My App.app" - -[[ ! $DYLIB_INSTALL_NAME_BASE && ${DYLIB_INSTALL_NAME_BASE-_} ]] -[[ ! $LD_DYLIB_INSTALL_NAME && ${LD_DYLIB_INSTALL_NAME-_} ]] - -"$(dirname "$0")/test_check_sdkroot.sh" diff --git a/tools/gyp/test/mac/type_envvars/test_bundle_loadable_module.sh b/tools/gyp/test/mac/type_envvars/test_bundle_loadable_module.sh deleted file mode 100755 index ea985f5194e2518527dfbf46dfbeb8e9c72ce16e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/type_envvars/test_bundle_loadable_module.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# 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. - -set -e - -test $MACH_O_TYPE = mh_bundle -test $PRODUCT_TYPE = com.apple.product-type.bundle -test $PRODUCT_NAME = bundle_loadable_module -test $FULL_PRODUCT_NAME = bundle_loadable_module.bundle - -test $EXECUTABLE_NAME = bundle_loadable_module -test $EXECUTABLE_PATH = \ - "bundle_loadable_module.bundle/Contents/MacOS/bundle_loadable_module" -test $WRAPPER_NAME = bundle_loadable_module.bundle - -[[ ! $DYLIB_INSTALL_NAME_BASE && ${DYLIB_INSTALL_NAME_BASE-_} ]] -[[ ! $LD_DYLIB_INSTALL_NAME && ${LD_DYLIB_INSTALL_NAME-_} ]] - -"$(dirname "$0")/test_check_sdkroot.sh" diff --git a/tools/gyp/test/mac/type_envvars/test_bundle_shared_library.sh b/tools/gyp/test/mac/type_envvars/test_bundle_shared_library.sh deleted file mode 100755 index bf49d45ef0a87951853dd0e2e63780ebfa99bd21..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/type_envvars/test_bundle_shared_library.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# 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. - -set -e - -test $MACH_O_TYPE = mh_dylib -test $PRODUCT_TYPE = com.apple.product-type.framework -test $PRODUCT_NAME = bundle_shared_library -test $FULL_PRODUCT_NAME = bundle_shared_library.framework - -test $EXECUTABLE_NAME = bundle_shared_library -test $EXECUTABLE_PATH = \ - "bundle_shared_library.framework/Versions/A/bundle_shared_library" -test $WRAPPER_NAME = bundle_shared_library.framework - -test $DYLIB_INSTALL_NAME_BASE = "/Library/Frameworks" -test $LD_DYLIB_INSTALL_NAME = \ - "/Library/Frameworks/bundle_shared_library.framework/Versions/A/bundle_shared_library" - -"$(dirname "$0")/test_check_sdkroot.sh" diff --git a/tools/gyp/test/mac/type_envvars/test_check_sdkroot.sh b/tools/gyp/test/mac/type_envvars/test_check_sdkroot.sh deleted file mode 100755 index 1297dbeff11bbbeea9296d24621d529d1823f3bc..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/type_envvars/test_check_sdkroot.sh +++ /dev/null @@ -1,47 +0,0 @@ -#!/bin/bash -# Copyright (c) 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. - -set -e - -# `xcodebuild -version` output looks like -# Xcode 4.6.3 -# Build version 4H1503 -# or like -# Xcode 4.2 -# Build version 4C199 -# or like -# Xcode 3.2.6 -# Component versions: DevToolsCore-1809.0; DevToolsSupport-1806.0 -# BuildVersion: 10M2518 -# Convert that to '0463', '0420' and '0326' respectively. -function xcodeversion() { - xcodebuild -version | awk '/Xcode ([0-9]+\.[0-9]+(\.[0-9]+)?)/ { - version = $2 - gsub(/\./, "", version) - if (length(version) < 3) { - version = version "0" - } - if (length(version) < 4) { - version = "0" version - } - } - END { print version }' -} - -# Returns true if |string1| is smaller than |string2|. -# This function assumes that both strings represent Xcode version numbers -# as returned by |xcodeversion|. -function smaller() { - local min="$(echo -ne "${1}\n${2}\n" | sort -n | head -n1)" - test "${min}" != "${2}" -} - -if [[ "$(xcodeversion)" < "0500" ]]; then - # Xcode version is older than 5.0, check that SDKROOT is set but empty. - [[ -z "${SDKROOT}" && -z "${SDKROOT-_}" ]] -else - # Xcode version is newer than 5.0, check that SDKROOT is set. - [[ "${SDKROOT}" == "$(xcodebuild -version -sdk '' Path)" ]] -fi diff --git a/tools/gyp/test/mac/type_envvars/test_nonbundle_executable.sh b/tools/gyp/test/mac/type_envvars/test_nonbundle_executable.sh deleted file mode 100755 index 25afcbe10a51ea61b61f34f8f2d4299e6bcf6355..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/type_envvars/test_nonbundle_executable.sh +++ /dev/null @@ -1,22 +0,0 @@ -#!/bin/bash -# 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. - -set -e - -# For some reason, Xcode doesn't set MACH_O_TYPE for non-bundle executables. -# Check for "not set", not just "empty": -[[ ! $MACH_O_TYPE && ${MACH_O_TYPE-_} ]] -test $PRODUCT_TYPE = com.apple.product-type.tool -test $PRODUCT_NAME = nonbundle_executable -test $FULL_PRODUCT_NAME = nonbundle_executable - -test $EXECUTABLE_NAME = nonbundle_executable -test $EXECUTABLE_PATH = nonbundle_executable -[[ ! $WRAPPER_NAME && ${WRAPPER_NAME-_} ]] - -[[ ! $DYLIB_INSTALL_NAME_BASE && ${DYLIB_INSTALL_NAME_BASE-_} ]] -[[ ! $LD_DYLIB_INSTALL_NAME && ${LD_DYLIB_INSTALL_NAME-_} ]] - -"$(dirname "$0")/test_check_sdkroot.sh" diff --git a/tools/gyp/test/mac/type_envvars/test_nonbundle_loadable_module.sh b/tools/gyp/test/mac/type_envvars/test_nonbundle_loadable_module.sh deleted file mode 100755 index 9b584269ec110c19ca984f3b76e6d77f90e55b5c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/type_envvars/test_nonbundle_loadable_module.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# 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. - -set -e - -test $MACH_O_TYPE = mh_bundle -test $PRODUCT_TYPE = com.apple.product-type.library.dynamic -test $PRODUCT_NAME = nonbundle_loadable_module -test $FULL_PRODUCT_NAME = nonbundle_loadable_module.so - -test $EXECUTABLE_NAME = nonbundle_loadable_module.so -test $EXECUTABLE_PATH = nonbundle_loadable_module.so -[[ ! $WRAPPER_NAME && ${WRAPPER_NAME-_} ]] - -test $DYLIB_INSTALL_NAME_BASE = "/usr/local/lib" -test $LD_DYLIB_INSTALL_NAME = "/usr/local/lib/nonbundle_loadable_module.so" - -"$(dirname "$0")/test_check_sdkroot.sh" diff --git a/tools/gyp/test/mac/type_envvars/test_nonbundle_none.sh b/tools/gyp/test/mac/type_envvars/test_nonbundle_none.sh deleted file mode 100755 index 871af1bbda31d61771bf1f4bf22dce437d1cabdd..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/type_envvars/test_nonbundle_none.sh +++ /dev/null @@ -1,21 +0,0 @@ -#!/bin/bash -# 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. - -set -e - -# Check for "not set", not just "empty": -[[ ! $MACH_O_TYPE && ${MACH_O_TYPE-_} ]] -[[ ! $PRODUCT_TYPE && ${PRODUCT_TYPE-_} ]] -test $PRODUCT_NAME = nonbundle_none -[[ ! $FULL_PRODUCT_NAME && ${FULL_PRODUCT_NAME-_} ]] - -[[ ! $EXECUTABLE_NAME && ${EXECUTABLE_NAME-_} ]] -[[ ! $EXECUTABLE_PATH && ${EXECUTABLE_PATH-_} ]] -[[ ! $WRAPPER_NAME && ${WRAPPER_NAME-_} ]] - -[[ ! $DYLIB_INSTALL_NAME_BASE && ${DYLIB_INSTALL_NAME_BASE-_} ]] -[[ ! $LD_DYLIB_INSTALL_NAME && ${LD_DYLIB_INSTALL_NAME-_} ]] - -"$(dirname "$0")/test_check_sdkroot.sh" diff --git a/tools/gyp/test/mac/type_envvars/test_nonbundle_shared_library.sh b/tools/gyp/test/mac/type_envvars/test_nonbundle_shared_library.sh deleted file mode 100755 index cbb118b7b248caed350aaedf642903a686f1c907..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/type_envvars/test_nonbundle_shared_library.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# 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. - -set -e - -test $MACH_O_TYPE = mh_dylib -test $PRODUCT_TYPE = com.apple.product-type.library.dynamic -test $PRODUCT_NAME = nonbundle_shared_library -test $FULL_PRODUCT_NAME = libnonbundle_shared_library.dylib - -test $EXECUTABLE_NAME = libnonbundle_shared_library.dylib -test $EXECUTABLE_PATH = libnonbundle_shared_library.dylib -[[ ! $WRAPPER_NAME && ${WRAPPER_NAME-_} ]] - -test $DYLIB_INSTALL_NAME_BASE = "/usr/local/lib" -test $LD_DYLIB_INSTALL_NAME = "/usr/local/lib/libnonbundle_shared_library.dylib" - -"$(dirname "$0")/test_check_sdkroot.sh" diff --git a/tools/gyp/test/mac/type_envvars/test_nonbundle_static_library.sh b/tools/gyp/test/mac/type_envvars/test_nonbundle_static_library.sh deleted file mode 100755 index 86c04a913be18b5a9ded1782612fe8f165b2ade7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/type_envvars/test_nonbundle_static_library.sh +++ /dev/null @@ -1,20 +0,0 @@ -#!/bin/bash -# 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. - -set -e - -test $MACH_O_TYPE = staticlib -test $PRODUCT_TYPE = com.apple.product-type.library.static -test $PRODUCT_NAME = nonbundle_static_library -test $FULL_PRODUCT_NAME = libnonbundle_static_library.a - -test $EXECUTABLE_NAME = libnonbundle_static_library.a -test $EXECUTABLE_PATH = libnonbundle_static_library.a -[[ ! $WRAPPER_NAME && ${WRAPPER_NAME-_} ]] - -[[ ! $DYLIB_INSTALL_NAME_BASE && ${DYLIB_INSTALL_NAME_BASE-_} ]] -[[ ! $LD_DYLIB_INSTALL_NAME && ${LD_DYLIB_INSTALL_NAME-_} ]] - -"$(dirname "$0")/test_check_sdkroot.sh" diff --git a/tools/gyp/test/mac/unicode-settings/file.cc b/tools/gyp/test/mac/unicode-settings/file.cc deleted file mode 100644 index b2f997621bea95c08664e45bcbdc81f3c264a051..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/unicode-settings/file.cc +++ /dev/null @@ -1,2 +0,0 @@ -int main() { -} diff --git a/tools/gyp/test/mac/unicode-settings/test.gyp b/tools/gyp/test/mac/unicode-settings/test.gyp deleted file mode 100644 index b331ae453f1954e6d29a06a4e8b685b3cf01ed5e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/unicode-settings/test.gyp +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright 2013 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': 'myapp', - 'type': 'executable', - 'mac_bundle': 1, - 'sources': [ 'file.cc', ], - 'xcode_settings': { - 'BUNDLE_DISPLAY_NAME': 'α\011', - }, - 'postbuilds': [ - { - 'postbuild_name': 'envtest', - 'action': [ './test_bundle_display_name.sh', ], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/mac/unicode-settings/test_bundle_display_name.sh b/tools/gyp/test/mac/unicode-settings/test_bundle_display_name.sh deleted file mode 100755 index 95dd6267a33d02913d1d4cb8209e64225c1963d3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/unicode-settings/test_bundle_display_name.sh +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -# Copyright 2013 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 "${BUNDLE_DISPLAY_NAME}" = 'α ' diff --git a/tools/gyp/test/mac/xcode-env-order/Info.plist b/tools/gyp/test/mac/xcode-env-order/Info.plist deleted file mode 100644 index e11f21e52d13c42cc0002282493e31dbf90fd2a9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/xcode-env-order/Info.plist +++ /dev/null @@ -1,56 +0,0 @@ - - - - - CFBundleDevelopmentRegion - English - CFBundleExecutable - ${EXECUTABLE_NAME} - CFBundleIconFile - - CFBundleIdentifier - com.google.${PRODUCT_NAME} - CFBundleInfoDictionaryVersion - 6.0 - CFBundleName - ${PRODUCT_NAME} - CFBundlePackageType - APPL - CFBundleShortVersionString - 1.0 - CFBundleSignature - ???? - CFBundleVersion - 1 - LSMinimumSystemVersion - ${MACOSX_DEPLOYMENT_TARGET} - NSMainNibFile - MainMenu - NSPrincipalClass - NSApplication - - BraceProcessedKey1 - ${BRACE_DEPENDENT_KEY1} - BraceProcessedKey2 - ${BRACE_DEPENDENT_KEY2} - BraceProcessedKey3 - ${BRACE_DEPENDENT_KEY3} - - ParenProcessedKey1 - ${PAREN_DEPENDENT_KEY1} - ParenProcessedKey2 - ${PAREN_DEPENDENT_KEY2} - ParenProcessedKey3 - ${PAREN_DEPENDENT_KEY3} - - BareProcessedKey1 - ${BARE_DEPENDENT_KEY1} - BareProcessedKey2 - ${BARE_DEPENDENT_KEY2} - BareProcessedKey3 - ${BARE_DEPENDENT_KEY3} - - MixedProcessedKey - ${MIXED_DEPENDENT_KEY} - - diff --git a/tools/gyp/test/mac/xcode-env-order/file.ext1 b/tools/gyp/test/mac/xcode-env-order/file.ext1 deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tools/gyp/test/mac/xcode-env-order/file.ext2 b/tools/gyp/test/mac/xcode-env-order/file.ext2 deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tools/gyp/test/mac/xcode-env-order/file.ext3 b/tools/gyp/test/mac/xcode-env-order/file.ext3 deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tools/gyp/test/mac/xcode-env-order/main.c b/tools/gyp/test/mac/xcode-env-order/main.c deleted file mode 100644 index 1bf4b2a11abd99b0655222eb96624b9abed72423..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/xcode-env-order/main.c +++ /dev/null @@ -1,7 +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. - -int main() { - return 0; -} diff --git a/tools/gyp/test/mac/xcode-env-order/test.gyp b/tools/gyp/test/mac/xcode-env-order/test.gyp deleted file mode 100644 index 8f975f7d6b17feabd001f0c5f5ee55846f0f7124..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/xcode-env-order/test.gyp +++ /dev/null @@ -1,121 +0,0 @@ -# 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': 'test_app', - 'product_name': 'Test', - 'type': 'executable', - 'mac_bundle': 1, - 'sources': [ - 'main.c', - 'file.ext1', - 'file.ext2', - 'file.ext3', - ], - # Env vars in copies. - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/${PRODUCT_NAME}-copy-brace', - 'files': [ 'main.c', ], # ${SOURCE_ROOT} doesn't work with xcode - }, - { - 'destination': '<(PRODUCT_DIR)/$(PRODUCT_NAME)-copy-paren', - 'files': [ '$(SOURCE_ROOT)/main.c', ], - }, - { - 'destination': '<(PRODUCT_DIR)/$PRODUCT_NAME-copy-bare', - 'files': [ 'main.c', ], # $SOURCE_ROOT doesn't work with xcode - }, - ], - # Env vars in actions. The $FOO's are here to test that env vars that - # aren't defined are handled in some way that doesn't break the build. - 'actions': [ - { - 'action_name': 'Action copy braces ${PRODUCT_NAME} ${FOO}', - 'description': 'Action copy braces ${PRODUCT_NAME} ${FOO}', - 'inputs': [ '${SOURCE_ROOT}/main.c' ], - # Referencing ${PRODUCT_NAME} in action outputs doesn't work with - # the Xcode generator (PRODUCT_NAME expands to "Test Support"). - 'outputs': [ '<(PRODUCT_DIR)/action-copy-brace.txt' ], - 'action': [ 'cp', '${SOURCE_ROOT}/main.c', - '<(PRODUCT_DIR)/action-copy-brace.txt' ], - }, - { - 'action_name': 'Action copy parens $(PRODUCT_NAME) $(FOO)', - 'description': 'Action copy parens $(PRODUCT_NAME) $(FOO)', - 'inputs': [ '$(SOURCE_ROOT)/main.c' ], - # Referencing $(PRODUCT_NAME) in action outputs doesn't work with - # the Xcode generator (PRODUCT_NAME expands to "Test Support"). - 'outputs': [ '<(PRODUCT_DIR)/action-copy-paren.txt' ], - 'action': [ 'cp', '$(SOURCE_ROOT)/main.c', - '<(PRODUCT_DIR)/action-copy-paren.txt' ], - }, - { - 'action_name': 'Action copy bare $PRODUCT_NAME $FOO', - 'description': 'Action copy bare $PRODUCT_NAME $FOO', - 'inputs': [ '$SOURCE_ROOT/main.c' ], - # Referencing $PRODUCT_NAME in action outputs doesn't work with - # the Xcode generator (PRODUCT_NAME expands to "Test Support"). - 'outputs': [ '<(PRODUCT_DIR)/action-copy-bare.txt' ], - 'action': [ 'cp', '$SOURCE_ROOT/main.c', - '<(PRODUCT_DIR)/action-copy-bare.txt' ], - }, - ], - # Env vars in xcode_settings. - 'xcode_settings': { - 'INFOPLIST_FILE': 'Info.plist', - 'STRING_KEY': '/Source/Project', - - 'BRACE_DEPENDENT_KEY2': '${STRING_KEY}/${PRODUCT_NAME}', - 'BRACE_DEPENDENT_KEY1': 'D:${BRACE_DEPENDENT_KEY2}', - 'BRACE_DEPENDENT_KEY3': '${PRODUCT_TYPE}:${BRACE_DEPENDENT_KEY1}', - - 'PAREN_DEPENDENT_KEY2': '$(STRING_KEY)/$(PRODUCT_NAME)', - 'PAREN_DEPENDENT_KEY1': 'D:$(PAREN_DEPENDENT_KEY2)', - 'PAREN_DEPENDENT_KEY3': '$(PRODUCT_TYPE):$(PAREN_DEPENDENT_KEY1)', - - 'BARE_DEPENDENT_KEY2': '$STRING_KEY/$PRODUCT_NAME', - 'BARE_DEPENDENT_KEY1': 'D:$BARE_DEPENDENT_KEY2', - 'BARE_DEPENDENT_KEY3': '$PRODUCT_TYPE:$BARE_DEPENDENT_KEY1', - - 'MIXED_DEPENDENT_KEY': '${STRING_KEY}:$(PRODUCT_NAME):$MACH_O_TYPE', - }, - # Env vars in rules. The $FOO's are here to test that env vars that - # aren't defined are handled in some way that doesn't break the build. - 'rules': [ - { - 'rule_name': 'brace_rule', - 'message': 'Rule braces ${PRODUCT_NAME} ${FOO} <(RULE_INPUT_NAME)', - 'extension': 'ext1', - 'inputs': [ '${SOURCE_ROOT}/main.c' ], - 'outputs': [ '<(PRODUCT_DIR)/rule-copy-brace.txt' ], - 'action': [ 'cp', '${SOURCE_ROOT}/main.c', - '<(PRODUCT_DIR)/rule-copy-brace.txt' ], - }, - { - 'rule_name': 'paren_rule', - 'message': 'Rule parens $(PRODUCT_NAME) $(FOO) <(RULE_INPUT_NAME)', - 'extension': 'ext2', - 'inputs': [ '$(SOURCE_ROOT)/main.c' ], - 'outputs': [ '<(PRODUCT_DIR)/rule-copy-paren.txt' ], - 'action': [ 'cp', '$(SOURCE_ROOT)/main.c', - '<(PRODUCT_DIR)/rule-copy-paren.txt' ], - }, - # TODO: Fails in xcode. Looks like a bug in the xcode generator though - # (which uses makefiles for rules, and thinks $PRODUCT_NAME is - # $(P)RODUCT_NAME). - #{ - # 'rule_name': 'bare_rule', - # 'message': 'Rule copy bare $PRODUCT_NAME $FOO', - # 'extension': 'ext3', - # 'inputs': [ '$SOURCE_ROOT/main.c' ], - # 'outputs': [ '<(PRODUCT_DIR)/rule-copy-bare.txt' ], - # 'action': [ 'cp', '$SOURCE_ROOT/main.c', - # '<(PRODUCT_DIR)/rule-copy-bare.txt' ], - #}, - ], - }, - ], -} diff --git a/tools/gyp/test/mac/xcode-gcc/aliasing.cc b/tools/gyp/test/mac/xcode-gcc/aliasing.cc deleted file mode 100644 index 16a41efb15cc331f9f666444c35d5ea962d164ab..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/xcode-gcc/aliasing.cc +++ /dev/null @@ -1,13 +0,0 @@ -#include - -void check(int* h, long* k) { - *h = 1; - *k = 0; - printf("%d\n", *h); -} - -int main(void) { - long k; - check((int*)&k, &k); - return 0; -} diff --git a/tools/gyp/test/mac/xcode-gcc/test-clang.gyp b/tools/gyp/test/mac/xcode-gcc/test-clang.gyp deleted file mode 100644 index e1e71ed3f19a2f206f7b327c4e42136ceb0ed120..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/xcode-gcc/test-clang.gyp +++ /dev/null @@ -1,41 +0,0 @@ -# Copyright (c) 2013 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. -{ - 'make_global_settings': [ - ['CC', '/usr/bin/clang'], - ['CXX', '/usr/bin/clang++'], - ], - - 'targets': [ - { - 'target_name': 'aliasing_yes', - 'type': 'executable', - 'sources': [ 'aliasing.cc', ], - 'xcode_settings': { - 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', - 'GCC_STRICT_ALIASING': 'YES', - 'GCC_OPTIMIZATION_LEVEL': 2, - }, - }, - { - 'target_name': 'aliasing_no', - 'type': 'executable', - 'sources': [ 'aliasing.cc', ], - 'xcode_settings': { - 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', - 'GCC_STRICT_ALIASING': 'NO', - 'GCC_OPTIMIZATION_LEVEL': 2, - }, - }, - { - 'target_name': 'aliasing_default', - 'type': 'executable', - 'sources': [ 'aliasing.cc', ], - 'xcode_settings': { - 'GCC_VERSION': 'com.apple.compilers.llvm.clang.1_0', - 'GCC_OPTIMIZATION_LEVEL': 2, - }, - }, - ], -} diff --git a/tools/gyp/test/mac/xcode-gcc/test.gyp b/tools/gyp/test/mac/xcode-gcc/test.gyp deleted file mode 100644 index 1ca8b215d8763f0b8ebe0acf2ccdf4350fc0a89c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/xcode-gcc/test.gyp +++ /dev/null @@ -1,60 +0,0 @@ -# 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. -{ - 'target_defaults': { - 'xcode_settings': { - 'GCC_TREAT_WARNINGS_AS_ERRORS': 'YES', - }, - }, - - 'variables': { - # Non-failing tests should check that these trivial files in every language - # still compile correctly. - 'valid_sources': [ - 'valid_c.c', - 'valid_cc.cc', - 'valid_m.m', - 'valid_mm.mm', - ], - }, - - # Targets come in pairs: 'foo' and 'foo-fail', with the former building with - # no warnings and the latter not. - 'targets': [ - # GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO (default: YES): - { - 'target_name': 'warn_about_invalid_offsetof_macro', - 'type': 'executable', - 'sources': [ - 'warn_about_invalid_offsetof_macro.cc', - '<@(valid_sources)', - ], - 'xcode_settings': { - 'GCC_WARN_ABOUT_INVALID_OFFSETOF_MACRO': 'NO', - }, - }, - { - 'target_name': 'warn_about_invalid_offsetof_macro-fail', - 'type': 'executable', - 'sources': [ 'warn_about_invalid_offsetof_macro.cc', ], - }, - # GCC_WARN_ABOUT_MISSING_NEWLINE (default: NO): - { - 'target_name': 'warn_about_missing_newline', - 'type': 'executable', - 'sources': [ - 'warn_about_missing_newline.c', - '<@(valid_sources)', - ], - }, - { - 'target_name': 'warn_about_missing_newline-fail', - 'type': 'executable', - 'sources': [ 'warn_about_missing_newline.c', ], - 'xcode_settings': { - 'GCC_WARN_ABOUT_MISSING_NEWLINE': 'YES', - }, - }, - ], -} diff --git a/tools/gyp/test/mac/xcode-gcc/valid_c.c b/tools/gyp/test/mac/xcode-gcc/valid_c.c deleted file mode 100644 index 2b10ac3ed75818842adab67419edb300841ac795..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/xcode-gcc/valid_c.c +++ /dev/null @@ -1,8 +0,0 @@ -// 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. - -// This file exists to test that valid C files compile correctly. - -void FunctionInCFile(void) { -} diff --git a/tools/gyp/test/mac/xcode-gcc/valid_cc.cc b/tools/gyp/test/mac/xcode-gcc/valid_cc.cc deleted file mode 100644 index 31cddc3c9cc37dbeeed13a9db7c166c3e4b1f13c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/xcode-gcc/valid_cc.cc +++ /dev/null @@ -1,8 +0,0 @@ -// 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. - -// This file exists to test that valid C++ files compile correctly. - -void FunctionInCCFile() { -} diff --git a/tools/gyp/test/mac/xcode-gcc/valid_m.m b/tools/gyp/test/mac/xcode-gcc/valid_m.m deleted file mode 100644 index 95bddb27238fd0ce995e3900d11453e800cd552e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/xcode-gcc/valid_m.m +++ /dev/null @@ -1,8 +0,0 @@ -// 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. - -// This file exists to test that valid Objective-C files compile correctly. - -void FunctionInMFile(void) { -} diff --git a/tools/gyp/test/mac/xcode-gcc/valid_mm.mm b/tools/gyp/test/mac/xcode-gcc/valid_mm.mm deleted file mode 100644 index a7db7e3ad6de74464570fd02333620d192552488..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/xcode-gcc/valid_mm.mm +++ /dev/null @@ -1,8 +0,0 @@ -// 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. - -// This file exists to test that valid Objective-C++ files compile correctly. - -void FunctionInMMFile() { -} diff --git a/tools/gyp/test/mac/xcode-gcc/warn_about_invalid_offsetof_macro.cc b/tools/gyp/test/mac/xcode-gcc/warn_about_invalid_offsetof_macro.cc deleted file mode 100644 index 4a4612be0dc9edfbea46521768edc9a593da013a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/xcode-gcc/warn_about_invalid_offsetof_macro.cc +++ /dev/null @@ -1,15 +0,0 @@ -// 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. - -#define offsetof(st, m) ((unsigned)((char*)&((st*)0)->m - (char*)0)) - -struct MyStruct { - virtual void MyFunc() = 0; - int my_member; -}; - -int main() { - unsigned x = offsetof(MyStruct, my_member); - return x ? 0 : 1; -} diff --git a/tools/gyp/test/mac/xcode-gcc/warn_about_missing_newline.c b/tools/gyp/test/mac/xcode-gcc/warn_about_missing_newline.c deleted file mode 100644 index 6faf0895dbb686f04276c8784eed9378a4701064..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/xcode-gcc/warn_about_missing_newline.c +++ /dev/null @@ -1,8 +0,0 @@ -// 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. - -// Important: Don't terminate this file with a newline. -int main() { - return 0; -} \ No newline at end of file diff --git a/tools/gyp/test/mac/xcode-support-actions/source.c b/tools/gyp/test/mac/xcode-support-actions/source.c deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tools/gyp/test/mac/xcode-support-actions/test.gyp b/tools/gyp/test/mac/xcode-support-actions/test.gyp deleted file mode 100644 index ad81b8c456c120a9c27603d2182f14cf2ad785a9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/xcode-support-actions/test.gyp +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 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': 'target', - 'product_name': 'Product', - 'type': 'shared_library', - 'mac_bundle': 1, - 'sources': [ - '<(PRODUCT_DIR)/copy.c', - ], - 'actions': [ - { - 'action_name': 'Helper', - 'description': 'Helps', - 'inputs': [ 'source.c' ], - 'outputs': [ '<(PRODUCT_DIR)/copy.c' ], - 'action': [ 'cp', '${SOURCE_ROOT}/source.c', - '<(PRODUCT_DIR)/copy.c' ], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/mac/xctest/MyClass.h b/tools/gyp/test/mac/xctest/MyClass.h deleted file mode 100644 index dde13aa33d75a0fc8df6b68b0c6df77e188d0d05..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/xctest/MyClass.h +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) 2013 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. - -#import - -@interface MyClass : NSObject -@end diff --git a/tools/gyp/test/mac/xctest/MyClass.m b/tools/gyp/test/mac/xctest/MyClass.m deleted file mode 100644 index df11471b075b79e38b3aa5d4a75a0a71be502f1a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/xctest/MyClass.m +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) 2013 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. - -#import "MyClass.h" - -@implementation MyClass -@end diff --git a/tools/gyp/test/mac/xctest/TestCase.m b/tools/gyp/test/mac/xctest/TestCase.m deleted file mode 100644 index 36846a1fda24b27c8dd10f497be91228b5ae0672..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/xctest/TestCase.m +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) 2013 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. - -#import -#import "MyClass.h" - -@interface TestCase : XCTestCase -@end - -@implementation TestCase -- (void)testFoo { - MyClass *foo = [[MyClass alloc] init]; - XCTAssertNotNil(foo, @"expected non-nil object"); -} -@end diff --git a/tools/gyp/test/mac/xctest/resource.txt b/tools/gyp/test/mac/xctest/resource.txt deleted file mode 100644 index 257cc5642cb1a054f08cc83f2d943e56fd3ebe99..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/xctest/resource.txt +++ /dev/null @@ -1 +0,0 @@ -foo diff --git a/tools/gyp/test/mac/xctest/test.gyp b/tools/gyp/test/mac/xctest/test.gyp deleted file mode 100644 index 9c5515611e159a74fcceee2443a67b25a4aa1c2e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/xctest/test.gyp +++ /dev/null @@ -1,46 +0,0 @@ -# Copyright (c) 2013 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': 'classes', - 'type': 'static_library', - 'sources': [ - 'MyClass.h', - 'MyClass.m', - ], - 'link_settings': { - 'libraries': [ - '$(SDKROOT)/System/Library/Frameworks/Foundation.framework', - ], - }, - }, - { - 'target_name': 'tests', - 'type': 'loadable_module', - 'mac_xctest_bundle': 1, - 'sources': [ - 'TestCase.m', - ], - 'dependencies': [ - 'classes', - ], - 'mac_bundle_resources': [ - 'resource.txt', - ], - 'xcode_settings': { - 'WRAPPER_EXTENSION': 'xctest', - 'FRAMEWORK_SEARCH_PATHS': [ - '$(inherited)', - '$(DEVELOPER_FRAMEWORKS_DIR)', - ], - 'OTHER_LDFLAGS': [ - '$(inherited)', - '-ObjC', - ], - }, - }, - ], -} diff --git a/tools/gyp/test/mac/xctest/test.xcodeproj/xcshareddata/xcschemes/classes.xcscheme b/tools/gyp/test/mac/xctest/test.xcodeproj/xcshareddata/xcschemes/classes.xcscheme deleted file mode 100644 index 6bd1bb9696df345e5671a250e3d762cde0155d32..0000000000000000000000000000000000000000 --- a/tools/gyp/test/mac/xctest/test.xcodeproj/xcshareddata/xcschemes/classes.xcscheme +++ /dev/null @@ -1,69 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tools/gyp/test/make/dependencies.gyp b/tools/gyp/test/make/dependencies.gyp deleted file mode 100644 index e2bee24fcefd9fbf36cab32f8d0253454aed3dde..0000000000000000000000000000000000000000 --- a/tools/gyp/test/make/dependencies.gyp +++ /dev/null @@ -1,15 +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': 'main', - 'type': 'executable', - 'sources': [ - 'main.cc', - ], - }, - ], -} diff --git a/tools/gyp/test/make/gyptest-dependencies.py b/tools/gyp/test/make/gyptest-dependencies.py deleted file mode 100755 index d215f7678252141c37cc21fc58117bc984d2f28e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/make/gyptest-dependencies.py +++ /dev/null @@ -1,26 +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. - -""" -Verifies that .d files and all.deps are properly generated. -""" - -import TestGyp - -# .d files are only used by the make build. -test = TestGyp.TestGyp(formats=['make']) - -test.run_gyp('dependencies.gyp') - -test.build('dependencies.gyp', test.ALL) - -deps_file = test.built_file_path(".deps/out/Default/obj.target/main/main.o.d") -test.must_contain(deps_file, "main.h") - -# Build a second time to make sure we generate all.deps. -test.build('dependencies.gyp', test.ALL) - -test.pass_test() diff --git a/tools/gyp/test/make/gyptest-noload.py b/tools/gyp/test/make/gyptest-noload.py deleted file mode 100755 index 1f5103315cfcc1ca2ef6519e65bec1ed8ccd2730..0000000000000000000000000000000000000000 --- a/tools/gyp/test/make/gyptest-noload.py +++ /dev/null @@ -1,57 +0,0 @@ -#!/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. - -""" -Tests the use of the NO_LOAD flag which makes loading sub .mk files -optional. -""" - -# Python 2.5 needs this for the with statement. -from __future__ import with_statement - -import os -import TestGyp - -test = TestGyp.TestGyp(formats=['make']) - -test.run_gyp('all.gyp', chdir='noload') - -test.relocate('noload', 'relocate/noload') - -test.build('build/all.gyp', test.ALL, chdir='relocate/noload') -test.run_built_executable('exe', chdir='relocate/noload', - stdout='Hello from shared.c.\n') - -# Just sanity test that NO_LOAD=lib doesn't break anything. -test.build('build/all.gyp', test.ALL, chdir='relocate/noload', - arguments=['NO_LOAD=lib']) -test.run_built_executable('exe', chdir='relocate/noload', - stdout='Hello from shared.c.\n') -test.build('build/all.gyp', test.ALL, chdir='relocate/noload', - arguments=['NO_LOAD=z']) -test.run_built_executable('exe', chdir='relocate/noload', - stdout='Hello from shared.c.\n') - -# Make sure we can rebuild without reloading the sub .mk file. -with open('relocate/noload/main.c', 'a') as src_file: - src_file.write("\n") -test.build('build/all.gyp', test.ALL, chdir='relocate/noload', - arguments=['NO_LOAD=lib']) -test.run_built_executable('exe', chdir='relocate/noload', - stdout='Hello from shared.c.\n') - -# Change shared.c, but verify that it doesn't get rebuild if we don't load it. -with open('relocate/noload/lib/shared.c', 'w') as shared_file: - shared_file.write( - '#include "shared.h"\n' - 'const char kSharedStr[] = "modified";\n' - ) -test.build('build/all.gyp', test.ALL, chdir='relocate/noload', - arguments=['NO_LOAD=lib']) -test.run_built_executable('exe', chdir='relocate/noload', - stdout='Hello from shared.c.\n') - -test.pass_test() diff --git a/tools/gyp/test/make/main.cc b/tools/gyp/test/make/main.cc deleted file mode 100644 index 3b9a705c2434445ac50a1ddd2b56e69673636b09..0000000000000000000000000000000000000000 --- a/tools/gyp/test/make/main.cc +++ /dev/null @@ -1,12 +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. */ - -#include - -#include "main.h" - -int main(void) { - printf("hello world\n"); - return 0; -} diff --git a/tools/gyp/test/make/main.h b/tools/gyp/test/make/main.h deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tools/gyp/test/make/noload/all.gyp b/tools/gyp/test/make/noload/all.gyp deleted file mode 100644 index 1617a9e97c94929dd8f6e2db3c2f3b2705d06d57..0000000000000000000000000000000000000000 --- a/tools/gyp/test/make/noload/all.gyp +++ /dev/null @@ -1,18 +0,0 @@ -# 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': 'exe', - 'type': 'executable', - 'sources': [ - 'main.c', - ], - 'dependencies': [ - 'lib/shared.gyp:shared', - ], - }, - ], -} diff --git a/tools/gyp/test/make/noload/lib/shared.c b/tools/gyp/test/make/noload/lib/shared.c deleted file mode 100644 index 51776c5acfab6d16bc1ec35297e6140a7688c199..0000000000000000000000000000000000000000 --- a/tools/gyp/test/make/noload/lib/shared.c +++ /dev/null @@ -1,3 +0,0 @@ -#include "shared.h" - -const char kSharedStr[] = "shared.c"; diff --git a/tools/gyp/test/make/noload/lib/shared.gyp b/tools/gyp/test/make/noload/lib/shared.gyp deleted file mode 100644 index 8a8841b3a06e82fd9fd2b8b419641a0823b05641..0000000000000000000000000000000000000000 --- a/tools/gyp/test/make/noload/lib/shared.gyp +++ /dev/null @@ -1,16 +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': 'shared', - 'type': 'shared_library', - 'sources': [ - 'shared.c', - 'shared.h', - ], - }, - ], -} diff --git a/tools/gyp/test/make/noload/lib/shared.h b/tools/gyp/test/make/noload/lib/shared.h deleted file mode 100644 index a21da7538bf08bf54b1fa35cd6f2bf04c17d61d9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/make/noload/lib/shared.h +++ /dev/null @@ -1 +0,0 @@ -extern const char kSharedStr[]; diff --git a/tools/gyp/test/make/noload/main.c b/tools/gyp/test/make/noload/main.c deleted file mode 100644 index 26ec1889ad3501aea652b80fc528acc787da3fd1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/make/noload/main.c +++ /dev/null @@ -1,9 +0,0 @@ -#include - -#include "lib/shared.h" - -int main(void) -{ - printf("Hello from %s.\n", kSharedStr); - return 0; -} diff --git a/tools/gyp/test/make_global_settings/ar/gyptest-make_global_settings_ar.py b/tools/gyp/test/make_global_settings/ar/gyptest-make_global_settings_ar.py deleted file mode 100644 index b279a129d39dda8ac8f13026a7c9a2a7d0fbbe00..0000000000000000000000000000000000000000 --- a/tools/gyp/test/make_global_settings/ar/gyptest-make_global_settings_ar.py +++ /dev/null @@ -1,123 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Verifies 'AR' in make_global_settings. -""" - -import os -import sys -import TestGyp - -def resolve_path(test, path): - if path is None: - return None - elif test.format == 'make': - return '$(abspath %s)' % path - elif test.format in ['ninja', 'xcode-ninja']: - return os.path.join('..', '..', path) - else: - test.fail_test() - - -def verify_ar_target(test, ar=None, rel_path=False): - if rel_path: - ar_expected = resolve_path(test, ar) - else: - ar_expected = ar - # Resolve default values - if ar_expected is None: - if test.format == 'make': - # Make generator hasn't set the default value for AR. - # You can remove the following assertion as long as it doesn't - # break existing projects. - test.must_not_contain('Makefile', 'AR ?= ') - return - elif test.format in ['ninja', 'xcode-ninja']: - if sys.platform == 'win32': - ar_expected = 'lib.exe' - else: - ar_expected = 'ar' - if test.format == 'make': - test.must_contain('Makefile', 'AR ?= %s' % ar_expected) - elif test.format in ['ninja', 'xcode-ninja']: - test.must_contain('out/Default/build.ninja', 'ar = %s' % ar_expected) - else: - test.fail_test() - - -def verify_ar_host(test, ar=None, rel_path=False): - if rel_path: - ar_expected = resolve_path(test, ar) - else: - ar_expected = ar - # Resolve default values - if ar_expected is None: - ar_expected = 'ar' - if test.format == 'make': - test.must_contain('Makefile', 'AR.host ?= %s' % ar_expected) - elif test.format in ['ninja', 'xcode-ninja']: - test.must_contain('out/Default/build.ninja', 'ar_host = %s' % ar_expected) - else: - test.fail_test() - - -test_format = ['ninja'] -if sys.platform in ('linux2', 'darwin'): - test_format += ['make'] - -test = TestGyp.TestGyp(formats=test_format) - -# Check default values -test.run_gyp('make_global_settings_ar.gyp') -verify_ar_target(test) - - -# Check default values with GYP_CROSSCOMPILE enabled. -with TestGyp.LocalEnv({'GYP_CROSSCOMPILE': '1'}): - test.run_gyp('make_global_settings_ar.gyp') -verify_ar_target(test) -verify_ar_host(test) - - -# Test 'AR' in 'make_global_settings'. -with TestGyp.LocalEnv({'GYP_CROSSCOMPILE': '1'}): - test.run_gyp('make_global_settings_ar.gyp', '-Dcustom_ar_target=my_ar') -verify_ar_target(test, ar='my_ar', rel_path=True) - - -# Test 'AR'/'AR.host' in 'make_global_settings'. -with TestGyp.LocalEnv({'GYP_CROSSCOMPILE': '1'}): - test.run_gyp('make_global_settings_ar.gyp', - '-Dcustom_ar_target=my_ar_target1', - '-Dcustom_ar_host=my_ar_host1') -verify_ar_target(test, ar='my_ar_target1', rel_path=True) -verify_ar_host(test, ar='my_ar_host1', rel_path=True) - - -# Test $AR and $AR_host environment variables. -with TestGyp.LocalEnv({'AR': 'my_ar_target2', - 'AR_host': 'my_ar_host2'}): - test.run_gyp('make_global_settings_ar.gyp') -# Ninja generator resolves $AR in gyp phase. Make generator doesn't. -if test.format == 'ninja': - if sys.platform == 'win32': - # TODO(yukawa): Make sure if this is an expected result or not. - verify_ar_target(test, ar='lib.exe', rel_path=False) - else: - verify_ar_target(test, ar='my_ar_target2', rel_path=False) -verify_ar_host(test, ar='my_ar_host2', rel_path=False) - - -# Test 'AR' in 'make_global_settings' with $AR_host environment variable. -with TestGyp.LocalEnv({'AR_host': 'my_ar_host3'}): - test.run_gyp('make_global_settings_ar.gyp', - '-Dcustom_ar_target=my_ar_target3') -verify_ar_target(test, ar='my_ar_target3', rel_path=True) -verify_ar_host(test, ar='my_ar_host3', rel_path=False) - - -test.pass_test() diff --git a/tools/gyp/test/make_global_settings/ar/make_global_settings_ar.gyp b/tools/gyp/test/make_global_settings/ar/make_global_settings_ar.gyp deleted file mode 100644 index 3430d82a517aec983ecfefec1595399982f3dfb6..0000000000000000000000000000000000000000 --- a/tools/gyp/test/make_global_settings/ar/make_global_settings_ar.gyp +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2014 Google Inc. All rights reserved. -# Use of this source code is governed by a BSD-style licence that can be -# found in the LICENSE file. - -{ - 'variables': { - 'custom_ar_target%': '', - 'custom_ar_host%': '', - }, - 'conditions': [ - ['"<(custom_ar_target)"!=""', { - 'make_global_settings': [ - ['AR', '<(custom_ar_target)'], - ], - }], - ['"<(custom_ar_host)"!=""', { - 'make_global_settings': [ - ['AR.host', '<(custom_ar_host)'], - ], - }], - ], - 'targets': [ - { - 'target_name': 'make_global_settings_ar_test', - 'type': 'static_library', - 'sources': [ 'foo.c' ], - }, - ], -} diff --git a/tools/gyp/test/make_global_settings/basics/gyptest-make_global_settings.py b/tools/gyp/test/make_global_settings/basics/gyptest-make_global_settings.py deleted file mode 100644 index 63d1d0af90facb6f6db39932edf5d297bfe68ce4..0000000000000000000000000000000000000000 --- a/tools/gyp/test/make_global_settings/basics/gyptest-make_global_settings.py +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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 make_global_settings. -""" - -import os -import sys -import TestGyp - -test_format = ['ninja'] -if sys.platform in ('linux2', 'darwin'): - test_format += ['make'] - -test = TestGyp.TestGyp(formats=test_format) - -test.run_gyp('make_global_settings.gyp') - -if test.format == 'make': - cc_expected = """ifneq (,$(filter $(origin CC), undefined default)) - CC = $(abspath clang) -endif -""" - if sys.platform == 'linux2': - link_expected = """ -LINK ?= $(abspath clang) -""" - elif sys.platform == 'darwin': - link_expected = """ -LINK ?= $(abspath clang) -""" - test.must_contain('Makefile', cc_expected) - test.must_contain('Makefile', link_expected) -if test.format == 'ninja': - cc_expected = 'cc = ' + os.path.join('..', '..', 'clang') - ld_expected = 'ld = $cc' - if sys.platform == 'win32': - ld_expected = 'link.exe' - test.must_contain('out/Default/build.ninja', cc_expected) - test.must_contain('out/Default/build.ninja', ld_expected) - -test.pass_test() diff --git a/tools/gyp/test/make_global_settings/basics/make_global_settings.gyp b/tools/gyp/test/make_global_settings/basics/make_global_settings.gyp deleted file mode 100644 index 47dbc8570fe7dc57e76687971cd03edfad72ed38..0000000000000000000000000000000000000000 --- a/tools/gyp/test/make_global_settings/basics/make_global_settings.gyp +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2013 Google Inc. All rights reserved. -# Use of this source code is governed by a BSD-style licence that can be -# found in the LICENSE file. - -{ - 'make_global_settings': [ - ['CC', 'clang'], - ['LINK', 'clang'], - ], - 'targets': [ - { - 'target_name': 'test', - 'type': 'static_library', - 'sources': [ 'foo.c' ], - }, - ], -} diff --git a/tools/gyp/test/make_global_settings/env-wrapper/gyptest-wrapper.py b/tools/gyp/test/make_global_settings/env-wrapper/gyptest-wrapper.py deleted file mode 100644 index 70d6906ccaac8133dc1a48a5a827d2966eb2eb6f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/make_global_settings/env-wrapper/gyptest-wrapper.py +++ /dev/null @@ -1,46 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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 *_wrapper in environment. -""" - -import os -import sys -import TestGyp - -test_format = ['ninja'] - -os.environ['CC_wrapper'] = 'distcc' -os.environ['LINK_wrapper'] = 'distlink' -os.environ['CC.host_wrapper'] = 'ccache' - -test = TestGyp.TestGyp(formats=test_format) - -old_env = dict(os.environ) -os.environ['GYP_CROSSCOMPILE'] = '1' -test.run_gyp('wrapper.gyp') -os.environ.clear() -os.environ.update(old_env) - -if test.format == 'ninja': - cc_expected = ('cc = ' + os.path.join('..', '..', 'distcc') + ' ' + - os.path.join('..', '..', 'clang')) - cc_host_expected = ('cc_host = ' + os.path.join('..', '..', 'ccache') + ' ' + - os.path.join('..', '..', 'clang')) - ld_expected = 'ld = ../../distlink $cc' - if sys.platform != 'win32': - ldxx_expected = 'ldxx = ../../distlink $cxx' - - if sys.platform == 'win32': - ld_expected = 'link.exe' - test.must_contain('out/Default/build.ninja', cc_expected) - test.must_contain('out/Default/build.ninja', cc_host_expected) - test.must_contain('out/Default/build.ninja', ld_expected) - if sys.platform != 'win32': - test.must_contain('out/Default/build.ninja', ldxx_expected) - -test.pass_test() diff --git a/tools/gyp/test/make_global_settings/env-wrapper/wrapper.gyp b/tools/gyp/test/make_global_settings/env-wrapper/wrapper.gyp deleted file mode 100644 index 1698d71dd4a0c9d88478ba277d70706381ab0191..0000000000000000000000000000000000000000 --- a/tools/gyp/test/make_global_settings/env-wrapper/wrapper.gyp +++ /dev/null @@ -1,17 +0,0 @@ -# Copyright (c) 2013 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. - -{ - 'make_global_settings': [ - ['CC', 'clang'], - ['CC.host', 'clang'], - ], - 'targets': [ - { - 'target_name': 'test', - 'type': 'static_library', - 'sources': [ 'foo.c' ], - }, - ], -} diff --git a/tools/gyp/test/make_global_settings/full-toolchain/bar.cc b/tools/gyp/test/make_global_settings/full-toolchain/bar.cc deleted file mode 100644 index afb422ba1a86542c24371f48e9f4ae807c24733d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/make_global_settings/full-toolchain/bar.cc +++ /dev/null @@ -1 +0,0 @@ -#error Not a real source file diff --git a/tools/gyp/test/make_global_settings/full-toolchain/foo.c b/tools/gyp/test/make_global_settings/full-toolchain/foo.c deleted file mode 100644 index afb422ba1a86542c24371f48e9f4ae807c24733d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/make_global_settings/full-toolchain/foo.c +++ /dev/null @@ -1 +0,0 @@ -#error Not a real source file diff --git a/tools/gyp/test/make_global_settings/full-toolchain/gyptest-make_global_settings.py b/tools/gyp/test/make_global_settings/full-toolchain/gyptest-make_global_settings.py deleted file mode 100644 index eebda7d49797a922ad4e4b0c430ac2971796fd92..0000000000000000000000000000000000000000 --- a/tools/gyp/test/make_global_settings/full-toolchain/gyptest-make_global_settings.py +++ /dev/null @@ -1,48 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Verifies make_global_settings works with the full toolchain. -""" - -import os -import sys -import TestGyp - -if sys.platform == 'win32': - # cross compiling not supported by ninja on windows - # and make not supported on windows at all. - sys.exit(0) - -test = TestGyp.TestGyp(formats=['ninja']) -# Must set the test format to something with a flavor (the part after the '-') -# in order to test the desired behavior. Since we want to run a non-host -# toolchain, we have to set the flavor to something that the ninja generator -# doesn't know about, so it doesn't default to the host-specific tools (e.g., -# 'otool' on mac to generate the .TOC). -# -# Note that we can't just pass format=['ninja-some_toolchain'] to the -# constructor above, because then this test wouldn't be recognized as a ninja -# format test. -test.formats = ['ninja-my_flavor' if f == 'ninja' else f for f in test.formats] - -gyp_file = 'make_global_settings.gyp' - -test.run_gyp(gyp_file, - # Teach the .gyp file about the location of my_nm.py and - # my_readelf.py, and the python executable. - '-Dworkdir=%s' % test.workdir, - '-Dpython=%s' % sys.executable) -test.build(gyp_file, - arguments=['-v'] if test.format == 'ninja-my_flavor' else []) - -expected = ['MY_CC', 'MY_CXX'] -test.must_contain_all_lines(test.stdout(), expected) - -test.must_contain(test.built_file_path('RAN_MY_NM'), 'RAN_MY_NM') -test.must_contain(test.built_file_path('RAN_MY_READELF'), 'RAN_MY_READELF') - -test.pass_test() diff --git a/tools/gyp/test/make_global_settings/full-toolchain/make_global_settings.gyp b/tools/gyp/test/make_global_settings/full-toolchain/make_global_settings.gyp deleted file mode 100644 index 2c3266322d4f7690361863d510d4a0e4c4ed4948..0000000000000000000000000000000000000000 --- a/tools/gyp/test/make_global_settings/full-toolchain/make_global_settings.gyp +++ /dev/null @@ -1,22 +0,0 @@ -# Copyright (c) 2013 Google Inc. All rights reserved. -# Use of this source code is governed by a BSD-style licence that can be -# found in the LICENSE file. - -{ - 'make_global_settings': [ - ['CC', '/bin/echo MY_CC'], - ['CXX', '/bin/echo MY_CXX'], - ['NM', '<(python) <(workdir)/my_nm.py'], - ['READELF', '<(python) <(workdir)/my_readelf.py'], - ], - 'targets': [ - { - 'target_name': 'test', - 'type': 'shared_library', - 'sources': [ - 'foo.c', - 'bar.cc', - ], - }, - ], -} diff --git a/tools/gyp/test/make_global_settings/full-toolchain/my_nm.py b/tools/gyp/test/make_global_settings/full-toolchain/my_nm.py deleted file mode 100755 index f0f1efcf73bd7c341765c6b41f0f5db85427eb75..0000000000000000000000000000000000000000 --- a/tools/gyp/test/make_global_settings/full-toolchain/my_nm.py +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 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. -import sys -print sys.argv -with open('RAN_MY_NM', 'w') as f: - f.write('RAN_MY_NM') diff --git a/tools/gyp/test/make_global_settings/full-toolchain/my_readelf.py b/tools/gyp/test/make_global_settings/full-toolchain/my_readelf.py deleted file mode 100755 index 40e303cd76f74e4b73d59e5b07097a0b7822288e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/make_global_settings/full-toolchain/my_readelf.py +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env python -# Copyright (c) 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. -import sys -print sys.argv -with open('RAN_MY_READELF', 'w') as f: - f.write('RAN_MY_READELF') diff --git a/tools/gyp/test/make_global_settings/ld/gyptest-make_global_settings_ld.py b/tools/gyp/test/make_global_settings/ld/gyptest-make_global_settings_ld.py deleted file mode 100644 index c5a2e96422a9c18b3d197c7a2485a6cbf5079268..0000000000000000000000000000000000000000 --- a/tools/gyp/test/make_global_settings/ld/gyptest-make_global_settings_ld.py +++ /dev/null @@ -1,130 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Verifies 'LD' in make_global_settings. -""" - -import os -import sys -import TestGyp - -def resolve_path(test, path): - if path is None: - return None - elif test.format == 'make': - return '$(abspath %s)' % path - elif test.format in ['ninja', 'xcode-ninja']: - return os.path.join('..', '..', path) - else: - test.fail_test() - - -def verify_ld_target(test, ld=None, rel_path=False): - if rel_path: - ld_expected = resolve_path(test, ld) - else: - ld_expected = ld - # Resolve default values - if ld_expected is None: - if test.format == 'make': - # Make generator hasn't set the default value for LD. - # You can remove the following assertion as long as it doesn't - # break existing projects. - test.must_not_contain('Makefile', 'LD ?= ') - return - elif test.format in ['ninja', 'xcode-ninja']: - if sys.platform == 'win32': - ld_expected = 'link.exe' - else: - ld_expected = '$cc' - if test.format == 'make': - test.must_contain('Makefile', 'LD ?= %s' % ld_expected) - elif test.format in ['ninja', 'xcode-ninja']: - test.must_contain('out/Default/build.ninja', 'ld = %s' % ld_expected) - else: - test.fail_test() - - -def verify_ld_host(test, ld=None, rel_path=False): - if rel_path: - ld_expected = resolve_path(test, ld) - else: - ld_expected = ld - # Resolve default values - if ld_expected is None: - if test.format == 'make': - # Make generator hasn't set the default value for LD.host. - # You can remove the following assertion as long as it doesn't - # break existing projects. - test.must_not_contain('Makefile', 'LD.host ?= ') - return - elif test.format in ['ninja', 'xcode-ninja']: - if sys.platform == 'win32': - ld_expected = '$ld' - else: - ld_expected = '$cc_host' - if test.format == 'make': - test.must_contain('Makefile', 'LD.host ?= %s' % ld_expected) - elif test.format in ['ninja', 'xcode-ninja']: - test.must_contain('out/Default/build.ninja', 'ld_host = %s' % ld_expected) - else: - test.fail_test() - - -test_format = ['ninja'] -if sys.platform in ('linux2', 'darwin'): - test_format += ['make'] - -test = TestGyp.TestGyp(formats=test_format) - -# Check default values -test.run_gyp('make_global_settings_ld.gyp') -verify_ld_target(test) - - -# Check default values with GYP_CROSSCOMPILE enabled. -with TestGyp.LocalEnv({'GYP_CROSSCOMPILE': '1'}): - test.run_gyp('make_global_settings_ld.gyp') -verify_ld_target(test) -verify_ld_host(test) - - -# Test 'LD' in 'make_global_settings'. -with TestGyp.LocalEnv({'GYP_CROSSCOMPILE': '1'}): - test.run_gyp('make_global_settings_ld.gyp', '-Dcustom_ld_target=my_ld') -verify_ld_target(test, ld='my_ld', rel_path=True) - - -# Test 'LD'/'LD.host' in 'make_global_settings'. -with TestGyp.LocalEnv({'GYP_CROSSCOMPILE': '1'}): - test.run_gyp('make_global_settings_ld.gyp', - '-Dcustom_ld_target=my_ld_target1', - '-Dcustom_ld_host=my_ld_host1') -verify_ld_target(test, ld='my_ld_target1', rel_path=True) -verify_ld_host(test, ld='my_ld_host1', rel_path=True) - - -# Unlike other environment variables such as $AR/$AR_host, $CC/$CC_host, -# and $CXX/$CXX_host, neither Make generator nor Ninja generator recognizes -# $LD/$LD_host environment variables as of r1935. This may or may not be -# intentional, but here we leave a test case to verify this behavior just for -# the record. -# If you want to support $LD/$LD_host, please revise the following test case as -# well as the generator. -with TestGyp.LocalEnv({'GYP_CROSSCOMPILE': '1', - 'LD': 'my_ld_target2', - 'LD_host': 'my_ld_host2'}): - test.run_gyp('make_global_settings_ld.gyp') -if test.format == 'make': - test.must_not_contain('Makefile', 'my_ld_target2') - test.must_not_contain('Makefile', 'my_ld_host2') -elif test.format == 'ninja': - test.must_not_contain('out/Default/build.ninja', 'my_ld_target2') - test.must_not_contain('out/Default/build.ninja', 'my_ld_host2') - - -test.pass_test() diff --git a/tools/gyp/test/make_global_settings/ld/make_global_settings_ld.gyp b/tools/gyp/test/make_global_settings/ld/make_global_settings_ld.gyp deleted file mode 100644 index 6837c77326153c3afdee418404127c1527af27cf..0000000000000000000000000000000000000000 --- a/tools/gyp/test/make_global_settings/ld/make_global_settings_ld.gyp +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2014 Google Inc. All rights reserved. -# Use of this source code is governed by a BSD-style licence that can be -# found in the LICENSE file. - -{ - 'variables': { - 'custom_ld_target%': '', - 'custom_ld_host%': '', - }, - 'conditions': [ - ['"<(custom_ld_target)"!=""', { - 'make_global_settings': [ - ['LD', '<(custom_ld_target)'], - ], - }], - ['"<(custom_ld_host)"!=""', { - 'make_global_settings': [ - ['LD.host', '<(custom_ld_host)'], - ], - }], - ], - 'targets': [ - { - 'target_name': 'make_global_settings_ld_test', - 'type': 'static_library', - 'sources': [ 'foo.c' ], - }, - ], -} diff --git a/tools/gyp/test/make_global_settings/wrapper/gyptest-wrapper.py b/tools/gyp/test/make_global_settings/wrapper/gyptest-wrapper.py deleted file mode 100644 index eb1ebfd5a9629b7a79b5048faf79f83dfd8b3a98..0000000000000000000000000000000000000000 --- a/tools/gyp/test/make_global_settings/wrapper/gyptest-wrapper.py +++ /dev/null @@ -1,47 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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 *_wrapper in make_global_settings. -""" - -import os -import sys -import TestGyp - -test_format = ['ninja'] -if sys.platform in ('linux2', 'darwin'): - test_format += ['make'] - -test = TestGyp.TestGyp(formats=test_format) - -old_env = dict(os.environ) -os.environ['GYP_CROSSCOMPILE'] = '1' -test.run_gyp('wrapper.gyp') -os.environ.clear() -os.environ.update(old_env) - -if test.format == 'make': - cc_expected = """ifneq (,$(filter $(origin CC), undefined default)) - CC = $(abspath distcc) $(abspath clang) -endif -""" - link_expected = 'LINK ?= $(abspath distlink) $(abspath clang++)' - test.must_contain('Makefile', cc_expected) - test.must_contain('Makefile', link_expected) -if test.format == 'ninja': - cc_expected = ('cc = ' + os.path.join('..', '..', 'distcc') + ' ' + - os.path.join('..', '..', 'clang')) - cc_host_expected = ('cc_host = ' + os.path.join('..', '..', 'ccache') + ' ' + - os.path.join('..', '..', 'clang')) - ld_expected = 'ld = ../../distlink $cc' - if sys.platform == 'win32': - ld_expected = 'link.exe' - test.must_contain('out/Default/build.ninja', cc_expected) - test.must_contain('out/Default/build.ninja', cc_host_expected) - test.must_contain('out/Default/build.ninja', ld_expected) - -test.pass_test() diff --git a/tools/gyp/test/make_global_settings/wrapper/wrapper.gyp b/tools/gyp/test/make_global_settings/wrapper/wrapper.gyp deleted file mode 100644 index 3d4cd04b164532e1eb448f34632b3b69f2564764..0000000000000000000000000000000000000000 --- a/tools/gyp/test/make_global_settings/wrapper/wrapper.gyp +++ /dev/null @@ -1,21 +0,0 @@ -# Copyright (c) 2013 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. - -{ - 'make_global_settings': [ - ['CC', 'clang'], - ['CC_wrapper', 'distcc'], - ['LINK', 'clang++'], - ['LINK_wrapper', 'distlink'], - ['CC.host', 'clang'], - ['CC.host_wrapper', 'ccache'], - ], - 'targets': [ - { - 'target_name': 'test', - 'type': 'static_library', - 'sources': [ 'foo.c' ], - }, - ], -} diff --git a/tools/gyp/test/many-actions/file0 b/tools/gyp/test/many-actions/file0 deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tools/gyp/test/many-actions/file1 b/tools/gyp/test/many-actions/file1 deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tools/gyp/test/many-actions/file2 b/tools/gyp/test/many-actions/file2 deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tools/gyp/test/many-actions/file3 b/tools/gyp/test/many-actions/file3 deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tools/gyp/test/many-actions/file4 b/tools/gyp/test/many-actions/file4 deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tools/gyp/test/many-actions/gyptest-many-actions-unsorted.py b/tools/gyp/test/many-actions/gyptest-many-actions-unsorted.py deleted file mode 100644 index 6e3cc8c24b28610e7afe7ef0c9d01601e5941d46..0000000000000000000000000000000000000000 --- a/tools/gyp/test/many-actions/gyptest-many-actions-unsorted.py +++ /dev/null @@ -1,35 +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. - -""" -Make sure lots of actions in the same target don't cause exceeding command -line length. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('many-actions-unsorted.gyp') - -test.build('many-actions-unsorted.gyp', test.ALL) -for i in range(15): - test.built_file_must_exist('generated_%d.h' % i) - -# Make sure the optimized cygwin setup doesn't cause problems for incremental -# builds. -test.touch('file1') -test.build('many-actions-unsorted.gyp', test.ALL) - -test.touch('file0') -test.build('many-actions-unsorted.gyp', test.ALL) - -test.touch('file2') -test.touch('file3') -test.touch('file4') -test.build('many-actions-unsorted.gyp', test.ALL) - -test.pass_test() diff --git a/tools/gyp/test/many-actions/gyptest-many-actions.py b/tools/gyp/test/many-actions/gyptest-many-actions.py deleted file mode 100644 index 9c71641f3cf16f26e13c71cccb41c4c658d9ecef..0000000000000000000000000000000000000000 --- a/tools/gyp/test/many-actions/gyptest-many-actions.py +++ /dev/null @@ -1,20 +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. - -""" -Make sure lots of actions in the same target don't cause exceeding command -line length. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('many-actions.gyp') -test.build('many-actions.gyp', test.ALL) -for i in range(200): - test.built_file_must_exist('generated_%d.h' % i) -test.pass_test() diff --git a/tools/gyp/test/many-actions/many-actions-unsorted.gyp b/tools/gyp/test/many-actions/many-actions-unsorted.gyp deleted file mode 100644 index eec79fe8d8570ce96804ef4c7c3393e62c4d42fd..0000000000000000000000000000000000000000 --- a/tools/gyp/test/many-actions/many-actions-unsorted.gyp +++ /dev/null @@ -1,154 +0,0 @@ -# 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. - -{ - 'target_defaults': { - 'msvs_cygwin_dirs': ['../../../../<(DEPTH)/third_party/cygwin'], - }, - 'targets': [ - { - 'target_name': 'a', - 'type': 'none', - 'actions': [ - # Notice that the inputs go 0, 1, ..., 0, 1, .... This is to test - # a regression in the msvs generator in _AddActions. - { - 'action_name': 'do_0', - 'inputs': ['file0'], - 'outputs': ['<(PRODUCT_DIR)/generated_0.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_0.h', - ], - }, - { - 'action_name': 'do_1', - 'inputs': ['file1'], - 'outputs': ['<(PRODUCT_DIR)/generated_1.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_1.h', - ], - }, - { - 'action_name': 'do_2', - 'inputs': ['file2'], - 'outputs': ['<(PRODUCT_DIR)/generated_2.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_2.h', - ], - }, - { - 'action_name': 'do_3', - 'inputs': ['file3'], - 'outputs': ['<(PRODUCT_DIR)/generated_3.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_3.h', - ], - }, - { - 'action_name': 'do_4', - 'inputs': ['file4'], - 'outputs': ['<(PRODUCT_DIR)/generated_4.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_4.h', - ], - }, - { - 'action_name': 'do_5', - 'inputs': ['file0'], - 'outputs': ['<(PRODUCT_DIR)/generated_5.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_5.h', - ], - }, - { - 'action_name': 'do_6', - 'inputs': ['file1'], - 'outputs': ['<(PRODUCT_DIR)/generated_6.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_6.h', - ], - }, - { - 'action_name': 'do_7', - 'inputs': ['file2'], - 'outputs': ['<(PRODUCT_DIR)/generated_7.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_7.h', - ], - }, - { - 'action_name': 'do_8', - 'inputs': ['file3'], - 'outputs': ['<(PRODUCT_DIR)/generated_8.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_8.h', - ], - }, - { - 'action_name': 'do_9', - 'inputs': ['file4'], - 'outputs': ['<(PRODUCT_DIR)/generated_9.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_9.h', - ], - }, - { - 'action_name': 'do_10', - 'inputs': ['file0'], - 'outputs': ['<(PRODUCT_DIR)/generated_10.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_10.h', - ], - }, - { - 'action_name': 'do_11', - 'inputs': ['file1'], - 'outputs': ['<(PRODUCT_DIR)/generated_11.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_11.h', - ], - }, - { - 'action_name': 'do_12', - 'inputs': ['file2'], - 'outputs': ['<(PRODUCT_DIR)/generated_12.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_12.h', - ], - }, - { - 'action_name': 'do_13', - 'inputs': ['file3'], - 'outputs': ['<(PRODUCT_DIR)/generated_13.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_13.h', - ], - }, - { - 'action_name': 'do_14', - 'inputs': ['file4'], - 'outputs': ['<(PRODUCT_DIR)/generated_14.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_14.h', - ], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/many-actions/many-actions.gyp b/tools/gyp/test/many-actions/many-actions.gyp deleted file mode 100644 index 38545d2d88565a228d49203eb36a270f62906780..0000000000000000000000000000000000000000 --- a/tools/gyp/test/many-actions/many-actions.gyp +++ /dev/null @@ -1,1817 +0,0 @@ -# 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. - -{ - 'target_defaults': { - 'msvs_cygwin_dirs': ['../../../../<(DEPTH)/third_party/cygwin'], - }, - 'targets': [ - { - 'target_name': 'a', - 'type': 'none', - 'actions': [ - { - 'action_name': 'do_0', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_0.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_0.h', - ], - }, - { - 'action_name': 'do_1', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_1.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_1.h', - ], - }, - { - 'action_name': 'do_2', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_2.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_2.h', - ], - }, - { - 'action_name': 'do_3', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_3.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_3.h', - ], - }, - { - 'action_name': 'do_4', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_4.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_4.h', - ], - }, - { - 'action_name': 'do_5', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_5.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_5.h', - ], - }, - { - 'action_name': 'do_6', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_6.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_6.h', - ], - }, - { - 'action_name': 'do_7', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_7.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_7.h', - ], - }, - { - 'action_name': 'do_8', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_8.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_8.h', - ], - }, - { - 'action_name': 'do_9', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_9.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_9.h', - ], - }, - { - 'action_name': 'do_10', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_10.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_10.h', - ], - }, - { - 'action_name': 'do_11', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_11.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_11.h', - ], - }, - { - 'action_name': 'do_12', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_12.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_12.h', - ], - }, - { - 'action_name': 'do_13', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_13.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_13.h', - ], - }, - { - 'action_name': 'do_14', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_14.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_14.h', - ], - }, - { - 'action_name': 'do_15', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_15.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_15.h', - ], - }, - { - 'action_name': 'do_16', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_16.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_16.h', - ], - }, - { - 'action_name': 'do_17', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_17.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_17.h', - ], - }, - { - 'action_name': 'do_18', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_18.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_18.h', - ], - }, - { - 'action_name': 'do_19', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_19.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_19.h', - ], - }, - { - 'action_name': 'do_20', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_20.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_20.h', - ], - }, - { - 'action_name': 'do_21', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_21.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_21.h', - ], - }, - { - 'action_name': 'do_22', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_22.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_22.h', - ], - }, - { - 'action_name': 'do_23', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_23.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_23.h', - ], - }, - { - 'action_name': 'do_24', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_24.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_24.h', - ], - }, - { - 'action_name': 'do_25', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_25.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_25.h', - ], - }, - { - 'action_name': 'do_26', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_26.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_26.h', - ], - }, - { - 'action_name': 'do_27', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_27.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_27.h', - ], - }, - { - 'action_name': 'do_28', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_28.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_28.h', - ], - }, - { - 'action_name': 'do_29', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_29.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_29.h', - ], - }, - { - 'action_name': 'do_30', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_30.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_30.h', - ], - }, - { - 'action_name': 'do_31', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_31.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_31.h', - ], - }, - { - 'action_name': 'do_32', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_32.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_32.h', - ], - }, - { - 'action_name': 'do_33', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_33.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_33.h', - ], - }, - { - 'action_name': 'do_34', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_34.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_34.h', - ], - }, - { - 'action_name': 'do_35', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_35.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_35.h', - ], - }, - { - 'action_name': 'do_36', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_36.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_36.h', - ], - }, - { - 'action_name': 'do_37', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_37.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_37.h', - ], - }, - { - 'action_name': 'do_38', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_38.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_38.h', - ], - }, - { - 'action_name': 'do_39', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_39.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_39.h', - ], - }, - { - 'action_name': 'do_40', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_40.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_40.h', - ], - }, - { - 'action_name': 'do_41', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_41.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_41.h', - ], - }, - { - 'action_name': 'do_42', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_42.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_42.h', - ], - }, - { - 'action_name': 'do_43', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_43.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_43.h', - ], - }, - { - 'action_name': 'do_44', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_44.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_44.h', - ], - }, - { - 'action_name': 'do_45', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_45.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_45.h', - ], - }, - { - 'action_name': 'do_46', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_46.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_46.h', - ], - }, - { - 'action_name': 'do_47', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_47.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_47.h', - ], - }, - { - 'action_name': 'do_48', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_48.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_48.h', - ], - }, - { - 'action_name': 'do_49', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_49.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_49.h', - ], - }, - { - 'action_name': 'do_50', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_50.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_50.h', - ], - }, - { - 'action_name': 'do_51', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_51.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_51.h', - ], - }, - { - 'action_name': 'do_52', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_52.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_52.h', - ], - }, - { - 'action_name': 'do_53', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_53.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_53.h', - ], - }, - { - 'action_name': 'do_54', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_54.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_54.h', - ], - }, - { - 'action_name': 'do_55', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_55.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_55.h', - ], - }, - { - 'action_name': 'do_56', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_56.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_56.h', - ], - }, - { - 'action_name': 'do_57', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_57.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_57.h', - ], - }, - { - 'action_name': 'do_58', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_58.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_58.h', - ], - }, - { - 'action_name': 'do_59', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_59.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_59.h', - ], - }, - { - 'action_name': 'do_60', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_60.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_60.h', - ], - }, - { - 'action_name': 'do_61', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_61.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_61.h', - ], - }, - { - 'action_name': 'do_62', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_62.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_62.h', - ], - }, - { - 'action_name': 'do_63', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_63.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_63.h', - ], - }, - { - 'action_name': 'do_64', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_64.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_64.h', - ], - }, - { - 'action_name': 'do_65', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_65.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_65.h', - ], - }, - { - 'action_name': 'do_66', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_66.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_66.h', - ], - }, - { - 'action_name': 'do_67', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_67.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_67.h', - ], - }, - { - 'action_name': 'do_68', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_68.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_68.h', - ], - }, - { - 'action_name': 'do_69', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_69.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_69.h', - ], - }, - { - 'action_name': 'do_70', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_70.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_70.h', - ], - }, - { - 'action_name': 'do_71', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_71.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_71.h', - ], - }, - { - 'action_name': 'do_72', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_72.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_72.h', - ], - }, - { - 'action_name': 'do_73', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_73.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_73.h', - ], - }, - { - 'action_name': 'do_74', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_74.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_74.h', - ], - }, - { - 'action_name': 'do_75', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_75.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_75.h', - ], - }, - { - 'action_name': 'do_76', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_76.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_76.h', - ], - }, - { - 'action_name': 'do_77', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_77.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_77.h', - ], - }, - { - 'action_name': 'do_78', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_78.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_78.h', - ], - }, - { - 'action_name': 'do_79', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_79.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_79.h', - ], - }, - { - 'action_name': 'do_80', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_80.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_80.h', - ], - }, - { - 'action_name': 'do_81', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_81.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_81.h', - ], - }, - { - 'action_name': 'do_82', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_82.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_82.h', - ], - }, - { - 'action_name': 'do_83', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_83.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_83.h', - ], - }, - { - 'action_name': 'do_84', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_84.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_84.h', - ], - }, - { - 'action_name': 'do_85', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_85.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_85.h', - ], - }, - { - 'action_name': 'do_86', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_86.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_86.h', - ], - }, - { - 'action_name': 'do_87', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_87.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_87.h', - ], - }, - { - 'action_name': 'do_88', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_88.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_88.h', - ], - }, - { - 'action_name': 'do_89', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_89.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_89.h', - ], - }, - { - 'action_name': 'do_90', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_90.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_90.h', - ], - }, - { - 'action_name': 'do_91', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_91.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_91.h', - ], - }, - { - 'action_name': 'do_92', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_92.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_92.h', - ], - }, - { - 'action_name': 'do_93', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_93.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_93.h', - ], - }, - { - 'action_name': 'do_94', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_94.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_94.h', - ], - }, - { - 'action_name': 'do_95', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_95.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_95.h', - ], - }, - { - 'action_name': 'do_96', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_96.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_96.h', - ], - }, - { - 'action_name': 'do_97', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_97.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_97.h', - ], - }, - { - 'action_name': 'do_98', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_98.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_98.h', - ], - }, - { - 'action_name': 'do_99', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_99.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_99.h', - ], - }, - { - 'action_name': 'do_100', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_100.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_100.h', - ], - }, - { - 'action_name': 'do_101', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_101.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_101.h', - ], - }, - { - 'action_name': 'do_102', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_102.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_102.h', - ], - }, - { - 'action_name': 'do_103', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_103.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_103.h', - ], - }, - { - 'action_name': 'do_104', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_104.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_104.h', - ], - }, - { - 'action_name': 'do_105', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_105.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_105.h', - ], - }, - { - 'action_name': 'do_106', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_106.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_106.h', - ], - }, - { - 'action_name': 'do_107', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_107.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_107.h', - ], - }, - { - 'action_name': 'do_108', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_108.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_108.h', - ], - }, - { - 'action_name': 'do_109', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_109.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_109.h', - ], - }, - { - 'action_name': 'do_110', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_110.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_110.h', - ], - }, - { - 'action_name': 'do_111', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_111.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_111.h', - ], - }, - { - 'action_name': 'do_112', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_112.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_112.h', - ], - }, - { - 'action_name': 'do_113', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_113.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_113.h', - ], - }, - { - 'action_name': 'do_114', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_114.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_114.h', - ], - }, - { - 'action_name': 'do_115', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_115.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_115.h', - ], - }, - { - 'action_name': 'do_116', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_116.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_116.h', - ], - }, - { - 'action_name': 'do_117', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_117.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_117.h', - ], - }, - { - 'action_name': 'do_118', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_118.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_118.h', - ], - }, - { - 'action_name': 'do_119', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_119.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_119.h', - ], - }, - { - 'action_name': 'do_120', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_120.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_120.h', - ], - }, - { - 'action_name': 'do_121', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_121.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_121.h', - ], - }, - { - 'action_name': 'do_122', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_122.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_122.h', - ], - }, - { - 'action_name': 'do_123', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_123.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_123.h', - ], - }, - { - 'action_name': 'do_124', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_124.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_124.h', - ], - }, - { - 'action_name': 'do_125', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_125.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_125.h', - ], - }, - { - 'action_name': 'do_126', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_126.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_126.h', - ], - }, - { - 'action_name': 'do_127', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_127.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_127.h', - ], - }, - { - 'action_name': 'do_128', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_128.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_128.h', - ], - }, - { - 'action_name': 'do_129', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_129.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_129.h', - ], - }, - { - 'action_name': 'do_130', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_130.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_130.h', - ], - }, - { - 'action_name': 'do_131', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_131.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_131.h', - ], - }, - { - 'action_name': 'do_132', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_132.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_132.h', - ], - }, - { - 'action_name': 'do_133', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_133.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_133.h', - ], - }, - { - 'action_name': 'do_134', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_134.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_134.h', - ], - }, - { - 'action_name': 'do_135', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_135.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_135.h', - ], - }, - { - 'action_name': 'do_136', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_136.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_136.h', - ], - }, - { - 'action_name': 'do_137', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_137.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_137.h', - ], - }, - { - 'action_name': 'do_138', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_138.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_138.h', - ], - }, - { - 'action_name': 'do_139', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_139.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_139.h', - ], - }, - { - 'action_name': 'do_140', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_140.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_140.h', - ], - }, - { - 'action_name': 'do_141', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_141.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_141.h', - ], - }, - { - 'action_name': 'do_142', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_142.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_142.h', - ], - }, - { - 'action_name': 'do_143', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_143.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_143.h', - ], - }, - { - 'action_name': 'do_144', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_144.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_144.h', - ], - }, - { - 'action_name': 'do_145', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_145.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_145.h', - ], - }, - { - 'action_name': 'do_146', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_146.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_146.h', - ], - }, - { - 'action_name': 'do_147', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_147.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_147.h', - ], - }, - { - 'action_name': 'do_148', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_148.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_148.h', - ], - }, - { - 'action_name': 'do_149', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_149.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_149.h', - ], - }, - { - 'action_name': 'do_150', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_150.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_150.h', - ], - }, - { - 'action_name': 'do_151', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_151.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_151.h', - ], - }, - { - 'action_name': 'do_152', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_152.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_152.h', - ], - }, - { - 'action_name': 'do_153', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_153.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_153.h', - ], - }, - { - 'action_name': 'do_154', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_154.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_154.h', - ], - }, - { - 'action_name': 'do_155', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_155.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_155.h', - ], - }, - { - 'action_name': 'do_156', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_156.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_156.h', - ], - }, - { - 'action_name': 'do_157', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_157.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_157.h', - ], - }, - { - 'action_name': 'do_158', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_158.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_158.h', - ], - }, - { - 'action_name': 'do_159', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_159.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_159.h', - ], - }, - { - 'action_name': 'do_160', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_160.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_160.h', - ], - }, - { - 'action_name': 'do_161', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_161.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_161.h', - ], - }, - { - 'action_name': 'do_162', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_162.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_162.h', - ], - }, - { - 'action_name': 'do_163', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_163.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_163.h', - ], - }, - { - 'action_name': 'do_164', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_164.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_164.h', - ], - }, - { - 'action_name': 'do_165', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_165.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_165.h', - ], - }, - { - 'action_name': 'do_166', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_166.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_166.h', - ], - }, - { - 'action_name': 'do_167', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_167.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_167.h', - ], - }, - { - 'action_name': 'do_168', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_168.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_168.h', - ], - }, - { - 'action_name': 'do_169', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_169.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_169.h', - ], - }, - { - 'action_name': 'do_170', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_170.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_170.h', - ], - }, - { - 'action_name': 'do_171', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_171.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_171.h', - ], - }, - { - 'action_name': 'do_172', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_172.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_172.h', - ], - }, - { - 'action_name': 'do_173', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_173.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_173.h', - ], - }, - { - 'action_name': 'do_174', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_174.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_174.h', - ], - }, - { - 'action_name': 'do_175', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_175.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_175.h', - ], - }, - { - 'action_name': 'do_176', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_176.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_176.h', - ], - }, - { - 'action_name': 'do_177', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_177.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_177.h', - ], - }, - { - 'action_name': 'do_178', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_178.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_178.h', - ], - }, - { - 'action_name': 'do_179', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_179.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_179.h', - ], - }, - { - 'action_name': 'do_180', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_180.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_180.h', - ], - }, - { - 'action_name': 'do_181', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_181.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_181.h', - ], - }, - { - 'action_name': 'do_182', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_182.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_182.h', - ], - }, - { - 'action_name': 'do_183', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_183.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_183.h', - ], - }, - { - 'action_name': 'do_184', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_184.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_184.h', - ], - }, - { - 'action_name': 'do_185', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_185.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_185.h', - ], - }, - { - 'action_name': 'do_186', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_186.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_186.h', - ], - }, - { - 'action_name': 'do_187', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_187.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_187.h', - ], - }, - { - 'action_name': 'do_188', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_188.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_188.h', - ], - }, - { - 'action_name': 'do_189', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_189.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_189.h', - ], - }, - { - 'action_name': 'do_190', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_190.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_190.h', - ], - }, - { - 'action_name': 'do_191', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_191.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_191.h', - ], - }, - { - 'action_name': 'do_192', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_192.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_192.h', - ], - }, - { - 'action_name': 'do_193', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_193.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_193.h', - ], - }, - { - 'action_name': 'do_194', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_194.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_194.h', - ], - }, - { - 'action_name': 'do_195', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_195.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_195.h', - ], - }, - { - 'action_name': 'do_196', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_196.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_196.h', - ], - }, - { - 'action_name': 'do_197', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_197.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_197.h', - ], - }, - { - 'action_name': 'do_198', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_198.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_198.h', - ], - }, - { - 'action_name': 'do_199', - 'inputs': [], - 'outputs': ['<(PRODUCT_DIR)/generated_199.h'], - 'action': [ - 'touch', - '<(PRODUCT_DIR)/generated_199.h', - ], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/module/gyptest-default.py b/tools/gyp/test/module/gyptest-default.py deleted file mode 100755 index 7be5a72341774ae87e02037b03fe4263245dcd56..0000000000000000000000000000000000000000 --- a/tools/gyp/test/module/gyptest-default.py +++ /dev/null @@ -1,29 +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. - -""" -Verifies simple build of a "Hello, world!" program with loadable modules. The -default for all platforms should be to output the loadable modules to the same -path as the executable. -""" - -import TestGyp - -# Android doesn't support loadable modules -test = TestGyp.TestGyp(formats=['!android']) - -test.run_gyp('module.gyp', chdir='src') - -test.build('module.gyp', test.ALL, chdir='src') - -expect = """\ -Hello from program.c -Hello from lib1.c -Hello from lib2.c -""" -test.run_built_executable('program', chdir='src', stdout=expect) - -test.pass_test() diff --git a/tools/gyp/test/module/src/lib1.c b/tools/gyp/test/module/src/lib1.c deleted file mode 100644 index 8de0e94bee70508485202df3f628c00b670df808..0000000000000000000000000000000000000000 --- a/tools/gyp/test/module/src/lib1.c +++ /dev/null @@ -1,10 +0,0 @@ -#include - -#ifdef _WIN32 -__declspec(dllexport) -#endif -void module_main(void) -{ - fprintf(stdout, "Hello from lib1.c\n"); - fflush(stdout); -} diff --git a/tools/gyp/test/module/src/lib2.c b/tools/gyp/test/module/src/lib2.c deleted file mode 100644 index 266396dc91cc3f6d94f60054e27fed0a13d1b221..0000000000000000000000000000000000000000 --- a/tools/gyp/test/module/src/lib2.c +++ /dev/null @@ -1,10 +0,0 @@ -#include - -#ifdef _WIN32 -__declspec(dllexport) -#endif -void module_main(void) -{ - fprintf(stdout, "Hello from lib2.c\n"); - fflush(stdout); -} diff --git a/tools/gyp/test/module/src/module.gyp b/tools/gyp/test/module/src/module.gyp deleted file mode 100644 index 2bc398bb3bf6b57d9d274cd21131c4073bcccd04..0000000000000000000000000000000000000000 --- a/tools/gyp/test/module/src/module.gyp +++ /dev/null @@ -1,53 +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. - -{ - 'target_defaults': { - 'conditions': [ - ['OS=="win"', { - 'defines': ['PLATFORM_WIN'], - }], - ['OS=="mac" or OS=="ios"', { - 'defines': ['PLATFORM_MAC'], - }], - ['OS=="linux"', { - 'defines': ['PLATFORM_LINUX'], - # Support 64-bit shared libs (also works fine for 32-bit). - 'cflags': ['-fPIC'], - 'libraries': ['-ldl'], - }], - ], - }, - 'targets': [ - { - 'target_name': 'program', - 'type': 'executable', - 'dependencies': [ - 'lib1', - 'lib2', - ], - 'sources': [ - 'program.c', - ], - }, - { - 'target_name': 'lib1', - 'type': 'loadable_module', - 'product_name': 'lib1', - 'product_prefix': '', - 'sources': [ - 'lib1.c', - ], - }, - { - 'target_name': 'lib2', - 'product_name': 'lib2', - 'product_prefix': '', - 'type': 'loadable_module', - 'sources': [ - 'lib2.c', - ], - }, - ], -} diff --git a/tools/gyp/test/module/src/program.c b/tools/gyp/test/module/src/program.c deleted file mode 100644 index 7cc3dd34663f77d170a7f2f64693bdb936c12987..0000000000000000000000000000000000000000 --- a/tools/gyp/test/module/src/program.c +++ /dev/null @@ -1,111 +0,0 @@ -#include -#include - -#if defined(PLATFORM_WIN) -#include -#elif defined(PLATFORM_MAC) || defined(PLATFORM_LINUX) -#include -#include -#include -#include -#define MAX_PATH PATH_MAX -#endif - -#if defined(PLATFORM_WIN) -#define MODULE_SUFFIX ".dll" -#elif defined(PLATFORM_MAC) -#define MODULE_SUFFIX ".so" -#elif defined(PLATFORM_LINUX) -#define MODULE_SUFFIX ".so" -#endif - -typedef void (*module_symbol)(void); -char bin_path[MAX_PATH + 1]; - - -void CallModule(const char* module) { - char module_path[MAX_PATH + 1]; - const char* module_function = "module_main"; - module_symbol funcptr; -#if defined(PLATFORM_WIN) - HMODULE dl; - char drive[_MAX_DRIVE]; - char dir[_MAX_DIR]; - - if (_splitpath_s(bin_path, drive, _MAX_DRIVE, dir, _MAX_DIR, - NULL, 0, NULL, 0)) { - fprintf(stderr, "Failed to split executable path.\n"); - return; - } - if (_makepath_s(module_path, MAX_PATH, drive, dir, module, MODULE_SUFFIX)) { - fprintf(stderr, "Failed to calculate module path.\n"); - return; - } - - dl = LoadLibrary(module_path); - if (!dl) { - fprintf(stderr, "Failed to open module: %s\n", module_path); - return; - } - - funcptr = (module_symbol) GetProcAddress(dl, module_function); - if (!funcptr) { - fprintf(stderr, "Failed to find symbol: %s\n", module_function); - return; - } - funcptr(); - - FreeLibrary(dl); -#elif defined(PLATFORM_MAC) || defined(PLATFORM_LINUX) - void* dl; - char* path_copy = strdup(bin_path); - char* bin_dir = dirname(path_copy); - int path_size = snprintf(module_path, MAX_PATH, "%s/%s%s", bin_dir, module, - MODULE_SUFFIX); - free(path_copy); - if (path_size < 0 || path_size > MAX_PATH) { - fprintf(stderr, "Failed to calculate module path.\n"); - return; - } - module_path[path_size] = 0; - - dl = dlopen(module_path, RTLD_LAZY); - if (!dl) { - fprintf(stderr, "Failed to open module: %s\n", module_path); - return; - } - - funcptr = dlsym(dl, module_function); - if (!funcptr) { - fprintf(stderr, "Failed to find symbol: %s\n", module_function); - return; - } - funcptr(); - - dlclose(dl); -#endif -} - -int main(int argc, char *argv[]) -{ - fprintf(stdout, "Hello from program.c\n"); - fflush(stdout); - -#if defined(PLATFORM_WIN) - if (!GetModuleFileName(NULL, bin_path, MAX_PATH)) { - fprintf(stderr, "Failed to determine executable path.\n"); - return 1; - } -#elif defined(PLATFORM_MAC) || defined(PLATFORM_LINUX) - // Using argv[0] should be OK here since we control how the tests run, and - // can avoid exec and such issues that make it unreliable. - if (!realpath(argv[0], bin_path)) { - fprintf(stderr, "Failed to determine executable path (%s).\n", argv[0]); - return 1; - } -#endif - - CallModule("lib1"); - CallModule("lib2"); - return 0; -} diff --git a/tools/gyp/test/msvs/buildevents/buildevents.gyp b/tools/gyp/test/msvs/buildevents/buildevents.gyp deleted file mode 100644 index e0304dd5c617186f217879569028c0e7f688fc94..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/buildevents/buildevents.gyp +++ /dev/null @@ -1,14 +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': 'main', - 'type': 'executable', - 'sources': [ 'main.cc', ], - 'msvs_prebuild': r'echo starting', - 'msvs_postbuild': r'echo finished', - }, - ], -} diff --git a/tools/gyp/test/msvs/buildevents/gyptest-msbuild-supports-prepostbuild.py b/tools/gyp/test/msvs/buildevents/gyptest-msbuild-supports-prepostbuild.py deleted file mode 100755 index 208f43456041319de5002345b9662ec03441f761..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/buildevents/gyptest-msbuild-supports-prepostbuild.py +++ /dev/null @@ -1,24 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies that msvs_prebuild and msvs_postbuild can be specified in both -VS 2008 and 2010. -""" - -import TestGyp - -test = TestGyp.TestGyp(formats=['msvs'], workdir='workarea_all') - -test.run_gyp('buildevents.gyp', '-G', 'msvs_version=2008') -test.must_contain('main.vcproj', 'Name="VCPreBuildEventTool"') -test.must_contain('main.vcproj', 'Name="VCPostBuildEventTool"') - -test.run_gyp('buildevents.gyp', '-G', 'msvs_version=2010') -test.must_contain('main.vcxproj', '') -test.must_contain('main.vcxproj', '') - -test.pass_test() diff --git a/tools/gyp/test/msvs/buildevents/gyptest-ninja-warnings.py b/tools/gyp/test/msvs/buildevents/gyptest-ninja-warnings.py deleted file mode 100755 index be4ec9921ac20a3b2336140f76d7bee7570c57b2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/buildevents/gyptest-ninja-warnings.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Verifies that ninja errors out when encountering msvs_prebuild/msvs_postbuild. -""" - -import sys -import TestCmd -import TestGyp - - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['ninja']) - - test.run_gyp('buildevents.gyp', - status=1, - stderr=r'.*msvs_prebuild not supported \(target main\).*', - match=TestCmd.match_re_dotall) - - test.run_gyp('buildevents.gyp', - status=1, - stderr=r'.*msvs_postbuild not supported \(target main\).*', - match=TestCmd.match_re_dotall) - - test.pass_test() diff --git a/tools/gyp/test/msvs/buildevents/main.cc b/tools/gyp/test/msvs/buildevents/main.cc deleted file mode 100644 index 03c0285a6cc856103f8adad4d35dc76e42a51042..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/buildevents/main.cc +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright (c) 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. - -int main() {} diff --git a/tools/gyp/test/msvs/config_attrs/gyptest-config_attrs.py b/tools/gyp/test/msvs/config_attrs/gyptest-config_attrs.py deleted file mode 100644 index 15f4b4ef2f1d32b8c8597e238c0d6cb38bea3875..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/config_attrs/gyptest-config_attrs.py +++ /dev/null @@ -1,31 +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. - -""" -Verifies that msvs_configuration_attributes and -msbuild_configuration_attributes are applied by using -them to set the OutputDirectory. -""" - -import TestGyp -import os - -test = TestGyp.TestGyp(workdir='workarea_all',formats=['msvs']) - -vc_version = 'VC90' - -if os.getenv('GYP_MSVS_VERSION'): - vc_version = ['VC90','VC100'][int(os.getenv('GYP_MSVS_VERSION')) >= 2010] - -expected_exe_file = os.path.join(test.workdir, vc_version, 'hello.exe') - -test.run_gyp('hello.gyp') - -test.build('hello.gyp') - -test.must_exist(expected_exe_file) - -test.pass_test() diff --git a/tools/gyp/test/msvs/config_attrs/hello.c b/tools/gyp/test/msvs/config_attrs/hello.c deleted file mode 100644 index faadc75e2c0a5975e50cc6e9a8ee1c83e2c248bb..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/config_attrs/hello.c +++ /dev/null @@ -1,11 +0,0 @@ -/* 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. */ - -#include - -int main(void) -{ - printf("Hello, world!\n"); - return 0; -} diff --git a/tools/gyp/test/msvs/config_attrs/hello.gyp b/tools/gyp/test/msvs/config_attrs/hello.gyp deleted file mode 100644 index 810a80edd8034c363f63ff2be29b4da22d4f1cf3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/config_attrs/hello.gyp +++ /dev/null @@ -1,21 +0,0 @@ -# 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': 'hello', - 'type': 'executable', - 'sources': [ - 'hello.c', - ], - 'msvs_configuration_attributes': { - 'OutputDirectory':'$(SolutionDir)VC90/' - }, - 'msbuild_configuration_attributes': { - 'OutputDirectory':'$(SolutionDir)VC100/', - }, - }, - ], -} diff --git a/tools/gyp/test/msvs/express/base/base.gyp b/tools/gyp/test/msvs/express/base/base.gyp deleted file mode 100644 index b7c9fc6d81f1e9ee487d7d76c2940ac3ad132cea..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/express/base/base.gyp +++ /dev/null @@ -1,22 +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': 'a', - 'type': 'static_library', - 'sources': [ - 'a.c', - ], - }, - { - 'target_name': 'b', - 'type': 'static_library', - 'sources': [ - 'b.c', - ], - }, - ], -} diff --git a/tools/gyp/test/msvs/express/express.gyp b/tools/gyp/test/msvs/express/express.gyp deleted file mode 100644 index 917abe2cc0b17083418b52e615c74b99e1f9cc16..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/express/express.gyp +++ /dev/null @@ -1,19 +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': 'express', - 'type': 'executable', - 'dependencies': [ - 'base/base.gyp:a', - 'base/base.gyp:b', - ], - 'sources': [ - 'main.c', - ], - }, - ], -} diff --git a/tools/gyp/test/msvs/express/gyptest-express.py b/tools/gyp/test/msvs/express/gyptest-express.py deleted file mode 100755 index 54c06f664ae7515f1ca71c08d73e075c5a0d6f7b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/express/gyptest-express.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies that flat solutions get generated for Express versions of -Visual Studio. -""" - -import TestGyp - -test = TestGyp.TestGyp(formats=['msvs']) - -test.run_gyp('express.gyp', '-G', 'msvs_version=2005') -test.must_contain('express.sln', '(base)') - -test.run_gyp('express.gyp', '-G', 'msvs_version=2008') -test.must_contain('express.sln', '(base)') - -test.run_gyp('express.gyp', '-G', 'msvs_version=2005e') -test.must_not_contain('express.sln', '(base)') - -test.run_gyp('express.gyp', '-G', 'msvs_version=2008e') -test.must_not_contain('express.sln', '(base)') - - -test.pass_test() diff --git a/tools/gyp/test/msvs/external_builder/external.gyp b/tools/gyp/test/msvs/external_builder/external.gyp deleted file mode 100644 index abe5b5889c3565a17886ae4ee7284f2031e3e1dc..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/external_builder/external.gyp +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright (c) 2013 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. - -{ - 'variables': { - # the test driver switches this flag when testing external builder - 'use_external_builder%': 0, - }, - 'targets': [ - { - 'target_name': 'external', - 'type': 'executable', - 'sources': [ - 'hello.cpp', - 'hello.z', - ], - 'rules': [ - { - 'rule_name': 'test_rule', - 'extension': 'z', - 'outputs': [ - 'msbuild_rule.out', - ], - 'action': [ - 'python', - 'msbuild_rule.py', - '<(RULE_INPUT_PATH)', - 'a', 'b', 'c', - ], - 'msvs_cygwin_shell': 0, - }, - ], - 'actions': [ - { - 'action_name': 'test action', - 'inputs': [ - 'msbuild_action.py', - ], - 'outputs': [ - 'msbuild_action.out', - ], - 'action': [ - 'python', - '<@(_inputs)', - 'x', 'y', 'z', - ], - 'msvs_cygwin_shell': 0, - }, - ], - 'conditions': [ - ['use_external_builder==1', { - 'msvs_external_builder': 'test', - 'msvs_external_builder_build_cmd': [ - 'python', - 'external_builder.py', - 'build', '1', '2', '3', - ], - 'msvs_external_builder_clean_cmd': [ - 'python', - 'external_builder.py', - 'clean', '4', '5', - ], - }], - ], - }, - ], -} diff --git a/tools/gyp/test/msvs/external_builder/external_builder.py b/tools/gyp/test/msvs/external_builder/external_builder.py deleted file mode 100644 index 0ddf690558891e9c888d1e0e2ef8fcb48f00329c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/external_builder/external_builder.py +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2013 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. - -import sys - -with open('external_builder.out', 'w') as f: - f.write(' '.join(sys.argv)) diff --git a/tools/gyp/test/msvs/external_builder/gyptest-all.py b/tools/gyp/test/msvs/external_builder/gyptest-all.py deleted file mode 100644 index 72faa7ab7f8e19cd9e2f5f27aed3543e553cd830..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/external_builder/gyptest-all.py +++ /dev/null @@ -1,59 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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 that msvs_external_builder being set will invoke the provided -msvs_external_builder_build_cmd and msvs_external_builder_clean_cmd, and will -not invoke MSBuild actions and rules. -""" - -import os -import sys -import TestGyp - -if int(os.environ.get('GYP_MSVS_VERSION', 0)) < 2010: - sys.exit(0) - -test = TestGyp.TestGyp(formats=['msvs'], workdir='workarea_all') - -# without the flag set -test.run_gyp('external.gyp') -test.build('external.gyp', target='external') -test.must_not_exist('external_builder.out') -test.must_exist('msbuild_rule.out') -test.must_exist('msbuild_action.out') -test.must_match('msbuild_rule.out', 'msbuild_rule.py hello.z a b c') -test.must_match('msbuild_action.out', 'msbuild_action.py x y z') -os.remove('msbuild_rule.out') -os.remove('msbuild_action.out') - -# with the flag set, using Build -try: - os.environ['GYP_DEFINES'] = 'use_external_builder=1' - test.run_gyp('external.gyp') - test.build('external.gyp', target='external') -finally: - del os.environ['GYP_DEFINES'] -test.must_not_exist('msbuild_rule.out') -test.must_not_exist('msbuild_action.out') -test.must_exist('external_builder.out') -test.must_match('external_builder.out', 'external_builder.py build 1 2 3') -os.remove('external_builder.out') - -# with the flag set, using Clean -try: - os.environ['GYP_DEFINES'] = 'use_external_builder=1' - test.run_gyp('external.gyp') - test.build('external.gyp', target='external', clean=True) -finally: - del os.environ['GYP_DEFINES'] -test.must_not_exist('msbuild_rule.out') -test.must_not_exist('msbuild_action.out') -test.must_exist('external_builder.out') -test.must_match('external_builder.out', 'external_builder.py clean 4 5') -os.remove('external_builder.out') - -test.pass_test() diff --git a/tools/gyp/test/msvs/external_builder/hello.cpp b/tools/gyp/test/msvs/external_builder/hello.cpp deleted file mode 100644 index bc0c0265b53750cc100156f780cbf0050aaf6048..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/external_builder/hello.cpp +++ /dev/null @@ -1,10 +0,0 @@ -// 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. - -#include - -int main(void) { - printf("Hello, world!\n"); - return 0; -} diff --git a/tools/gyp/test/msvs/external_builder/hello.z b/tools/gyp/test/msvs/external_builder/hello.z deleted file mode 100644 index 547401a3298a72ab05d41e324edb4bc2dac586d8..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/external_builder/hello.z +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (c) 2013 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. - -This file will be passed to the test rule. diff --git a/tools/gyp/test/msvs/external_builder/msbuild_action.py b/tools/gyp/test/msvs/external_builder/msbuild_action.py deleted file mode 100644 index 7b79456a8e1732b94e2eeb0c3e80cd2365d865ba..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/external_builder/msbuild_action.py +++ /dev/null @@ -1,8 +0,0 @@ -# Copyright (c) 2013 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. - -import sys - -with open('msbuild_action.out', 'w') as f: - f.write(' '.join(sys.argv)) diff --git a/tools/gyp/test/msvs/external_builder/msbuild_rule.py b/tools/gyp/test/msvs/external_builder/msbuild_rule.py deleted file mode 100644 index 0b727245df994b4104ddcea7792ade427c9fe91a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/external_builder/msbuild_rule.py +++ /dev/null @@ -1,10 +0,0 @@ -# Copyright (c) 2013 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. - -import sys, os.path - -sys.argv[1] = os.path.basename(sys.argv[1]) - -with open('msbuild_rule.out', 'w') as f: - f.write(' '.join(sys.argv)) diff --git a/tools/gyp/test/msvs/filters/filters.gyp b/tools/gyp/test/msvs/filters/filters.gyp deleted file mode 100644 index a4106dc8eb30be1c1d3562780d1f03ab69f66ea8..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/filters/filters.gyp +++ /dev/null @@ -1,47 +0,0 @@ -# Copyright (c) 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': 'no_source_files', - 'type': 'none', - 'sources': [ ], - }, - { - 'target_name': 'one_source_file', - 'type': 'executable', - 'sources': [ - '../folder/a.c', - ], - }, - { - 'target_name': 'two_source_files', - 'type': 'executable', - 'sources': [ - '../folder/a.c', - '../folder/b.c', - ], - }, - { - 'target_name': 'three_files_in_two_folders', - 'type': 'executable', - 'sources': [ - '../folder1/a.c', - '../folder1/b.c', - '../folder2/c.c', - ], - }, - { - 'target_name': 'nested_folders', - 'type': 'executable', - 'sources': [ - '../folder1/nested/a.c', - '../folder2/d.c', - '../folder1/nested/b.c', - '../folder1/other/c.c', - ], - }, - ], -} diff --git a/tools/gyp/test/msvs/filters/gyptest-filters-2008.py b/tools/gyp/test/msvs/filters/gyptest-filters-2008.py deleted file mode 100644 index 41ca085823a9bdf74056f16d298dcbd46498b47a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/filters/gyptest-filters-2008.py +++ /dev/null @@ -1,68 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Verifies that extra filters are pruned correctly for Visual Studio 2008. -""" - -import re -import TestGyp - - -def strip_ws(str): - return re.sub('^ +', '', str, flags=re.M).replace('\n', '') - - -test = TestGyp.TestGyp(formats=['msvs']) - -test.run_gyp('filters.gyp', '-G', 'standalone', '-G', 'msvs_version=2008') - -test.must_contain('no_source_files.vcproj', '') - -test.must_contain('one_source_file.vcproj', strip_ws('''\ - - - -''')) - -test.must_contain('two_source_files.vcproj', strip_ws('''\ - - - - -''')) - -test.must_contain('three_files_in_two_folders.vcproj', strip_ws('''\ - - - - - - - - - -''')) - -test.must_contain('nested_folders.vcproj', strip_ws('''\ - - - - - - - - - - - - - - -''')) - - -test.pass_test() diff --git a/tools/gyp/test/msvs/filters/gyptest-filters-2010.py b/tools/gyp/test/msvs/filters/gyptest-filters-2010.py deleted file mode 100644 index d8131d5d7bd38e92ef57fb2262c51859a226be05..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/filters/gyptest-filters-2010.py +++ /dev/null @@ -1,57 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Verifies that extra filters are pruned correctly for Visual Studio 2010 -and later. -""" - -import TestGyp - - -test = TestGyp.TestGyp(formats=['msvs']) - -test.run_gyp('filters.gyp', '-G', 'standalone', '-G', 'msvs_version=2010') - -test.must_not_exist('no_source_files.vcxproj.filters') - -test.must_not_exist('one_source_file.vcxproj.filters') - -test.must_not_exist('two_source_files.vcxproj.filters') - -test.must_contain('three_files_in_two_folders.vcxproj.filters', '''\ - - - folder1 - - - folder1 - - - folder2 - - -'''.replace('\n', '\r\n')) - -test.must_contain('nested_folders.vcxproj.filters', '''\ - - - folder1\\nested - - - folder2 - - - folder1\\nested - - - folder1\\other - - -'''.replace('\n', '\r\n')) - - -test.pass_test() diff --git a/tools/gyp/test/msvs/list_excluded/gyptest-all.py b/tools/gyp/test/msvs/list_excluded/gyptest-all.py deleted file mode 100644 index 5a370f6b47643157c53ad506b2152c2199a239a5..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/list_excluded/gyptest-all.py +++ /dev/null @@ -1,51 +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. - -""" -Verifies that msvs_list_excluded_files=0 doesn't list files that would -normally be in _excluded_files, and that if that flag is not set, then they -are still listed. -""" - -import os -import TestGyp - -test = TestGyp.TestGyp(formats=['msvs'], workdir='workarea_all') - - -# with the flag set to 0 -try: - os.environ['GYP_GENERATOR_FLAGS'] = 'msvs_list_excluded_files=0' - test.run_gyp('hello_exclude.gyp') -finally: - del os.environ['GYP_GENERATOR_FLAGS'] -if test.uses_msbuild: - test.must_not_contain('hello.vcxproj', 'hello_mac') -else: - test.must_not_contain('hello.vcproj', 'hello_mac') - - -# with the flag not set -test.run_gyp('hello_exclude.gyp') -if test.uses_msbuild: - test.must_contain('hello.vcxproj', 'hello_mac') -else: - test.must_contain('hello.vcproj', 'hello_mac') - - -# with the flag explicitly set to 1 -try: - os.environ['GYP_GENERATOR_FLAGS'] = 'msvs_list_excluded_files=1' - test.run_gyp('hello_exclude.gyp') -finally: - del os.environ['GYP_GENERATOR_FLAGS'] -if test.uses_msbuild: - test.must_contain('hello.vcxproj', 'hello_mac') -else: - test.must_contain('hello.vcproj', 'hello_mac') - - -test.pass_test() diff --git a/tools/gyp/test/msvs/list_excluded/hello.cpp b/tools/gyp/test/msvs/list_excluded/hello.cpp deleted file mode 100644 index bc0c0265b53750cc100156f780cbf0050aaf6048..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/list_excluded/hello.cpp +++ /dev/null @@ -1,10 +0,0 @@ -// 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. - -#include - -int main(void) { - printf("Hello, world!\n"); - return 0; -} diff --git a/tools/gyp/test/msvs/list_excluded/hello_exclude.gyp b/tools/gyp/test/msvs/list_excluded/hello_exclude.gyp deleted file mode 100644 index aa160f2367a19224886708cedb92c68449e32367..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/list_excluded/hello_exclude.gyp +++ /dev/null @@ -1,19 +0,0 @@ -# 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': 'hello', - 'type': 'executable', - 'sources': [ - 'hello.cpp', - 'hello_mac.cpp', - ], - 'conditions': [ - ['OS!="mac"', {'sources!': ['hello_mac.cpp']}], - ] - }, - ], -} diff --git a/tools/gyp/test/msvs/list_excluded/hello_mac.cpp b/tools/gyp/test/msvs/list_excluded/hello_mac.cpp deleted file mode 100644 index b9f6242c4b3ab590edf1154cc674db818cc75464..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/list_excluded/hello_mac.cpp +++ /dev/null @@ -1,10 +0,0 @@ -// 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. - -#include - -int hello2() { - printf("Hello, two!\n"); - return 0; -} diff --git a/tools/gyp/test/msvs/missing_sources/gyptest-missing.py b/tools/gyp/test/msvs/missing_sources/gyptest-missing.py deleted file mode 100644 index 62a99ef0f105cef60a454217b5d2bc6f4646ae5b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/missing_sources/gyptest-missing.py +++ /dev/null @@ -1,43 +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. - -""" -Verifies that missing 'sources' files are treated as fatal errors when the -the generator flag 'msvs_error_on_missing_sources' is set. -""" - -import TestGyp -import os -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja'], workdir='workarea_all') - - # With the flag not set - test.run_gyp('hello_missing.gyp') - - # With the flag explicitly set to 0 - try: - os.environ['GYP_GENERATOR_FLAGS'] = 'msvs_error_on_missing_sources=0' - test.run_gyp('hello_missing.gyp') - finally: - del os.environ['GYP_GENERATOR_FLAGS'] - - # With the flag explicitly set to 1 - try: - os.environ['GYP_GENERATOR_FLAGS'] = 'msvs_error_on_missing_sources=1' - # Test to make sure GYP raises an exception (exit status 1). Since this will - # also print a backtrace, ensure that TestGyp is not checking that stderr is - # empty by specifying None, which means do not perform any checking. - # Instead, stderr is checked below to ensure it contains the expected - # output. - test.run_gyp('hello_missing.gyp', status=1, stderr=None) - finally: - del os.environ['GYP_GENERATOR_FLAGS'] - test.must_contain_any_line(test.stderr(), - ["Missing input files:"]) - - test.pass_test() diff --git a/tools/gyp/test/msvs/missing_sources/hello_missing.gyp b/tools/gyp/test/msvs/missing_sources/hello_missing.gyp deleted file mode 100644 index c08926bbff4ea3aed30c19d02371d883f0f353f1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/missing_sources/hello_missing.gyp +++ /dev/null @@ -1,15 +0,0 @@ -# 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': 'hello', - 'type': 'executable', - 'sources': [ - 'hello_missing.cpp', - ], - }, - ], -} diff --git a/tools/gyp/test/msvs/multiple_actions_error_handling/action_fail.py b/tools/gyp/test/msvs/multiple_actions_error_handling/action_fail.py deleted file mode 100644 index 286fc4e1329aa9302303cfebe3f80878267e6a45..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/multiple_actions_error_handling/action_fail.py +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 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. - -import sys - -sys.exit(1) diff --git a/tools/gyp/test/msvs/multiple_actions_error_handling/action_succeed.py b/tools/gyp/test/msvs/multiple_actions_error_handling/action_succeed.py deleted file mode 100644 index 35543731976775ce8bfaee0abe082f2b8310d7b9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/multiple_actions_error_handling/action_succeed.py +++ /dev/null @@ -1,7 +0,0 @@ -# Copyright (c) 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. - -import sys - -sys.exit(0) diff --git a/tools/gyp/test/msvs/multiple_actions_error_handling/actions.gyp b/tools/gyp/test/msvs/multiple_actions_error_handling/actions.gyp deleted file mode 100644 index ab99e929e2496628ac3e4e24c8a89e92b634eda8..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/multiple_actions_error_handling/actions.gyp +++ /dev/null @@ -1,40 +0,0 @@ -# Copyright (c) 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': 'actions-test', - 'type': 'none', - 'actions': [ - { - 'action_name': 'first action (fails)', - 'inputs': [ - 'action_fail.py', - ], - 'outputs': [ - 'ALWAYS_OUT_OF_DATE', - ], - 'action': [ - 'python', '<@(_inputs)' - ], - 'msvs_cygwin_shell': 0, - }, - { - 'action_name': 'second action (succeeds)', - 'inputs': [ - 'action_succeed.py', - ], - 'outputs': [ - 'ALWAYS_OUT_OF_DATE', - ], - 'action': [ - 'python', '<@(_inputs)' - ], - 'msvs_cygwin_shell': 0, - }, - ], - }, - ], -} diff --git a/tools/gyp/test/msvs/multiple_actions_error_handling/gyptest.py b/tools/gyp/test/msvs/multiple_actions_error_handling/gyptest.py deleted file mode 100644 index 3aa6b8fdb2b52b9e3f2b6a2f221cf91f8f1a4834..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/multiple_actions_error_handling/gyptest.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Verifies that failing actions make the build fail reliably, even when there -are multiple actions in one project. -""" - -import os -import sys -import TestGyp -import TestCmd - -test = TestGyp.TestGyp(formats=['msvs'], workdir='workarea_all') - -test.run_gyp('actions.gyp') -test.build('actions.gyp', - target='actions-test', - status=1, - stdout=r'.*"cmd\.exe" exited with code 1\..*', - match=TestCmd.match_re_dotall) - -test.pass_test() diff --git a/tools/gyp/test/msvs/props/AppName.props b/tools/gyp/test/msvs/props/AppName.props deleted file mode 100644 index b688f663d588131b0a15e148b7495743ec6efc75..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/props/AppName.props +++ /dev/null @@ -1,14 +0,0 @@ - - - - Greet - - - <_ProjectFileVersion>10.0.40219.1 - - - - $(AppName) - - - diff --git a/tools/gyp/test/msvs/props/AppName.vsprops b/tools/gyp/test/msvs/props/AppName.vsprops deleted file mode 100644 index 84b9af3800c6205727f2ae884650e948fe354dcf..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/props/AppName.vsprops +++ /dev/null @@ -1,11 +0,0 @@ - - - - diff --git a/tools/gyp/test/msvs/props/gyptest-props.py b/tools/gyp/test/msvs/props/gyptest-props.py deleted file mode 100644 index abd4df2241e26762d5fb1fa98890ba56893e764c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/props/gyptest-props.py +++ /dev/null @@ -1,22 +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. - -""" -Verifies props files are added by using a -props file to set the name of the built executable. -""" - -import TestGyp - -test = TestGyp.TestGyp(workdir='workarea_all', formats=['msvs']) - -test.run_gyp('hello.gyp') - -test.build('hello.gyp') - -test.built_file_must_exist('Greet.exe') - -test.pass_test() diff --git a/tools/gyp/test/msvs/props/hello.c b/tools/gyp/test/msvs/props/hello.c deleted file mode 100644 index faadc75e2c0a5975e50cc6e9a8ee1c83e2c248bb..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/props/hello.c +++ /dev/null @@ -1,11 +0,0 @@ -/* 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. */ - -#include - -int main(void) -{ - printf("Hello, world!\n"); - return 0; -} diff --git a/tools/gyp/test/msvs/props/hello.gyp b/tools/gyp/test/msvs/props/hello.gyp deleted file mode 100644 index 0f1c5f453d33726222c2521ea0001c2eecff96d9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/props/hello.gyp +++ /dev/null @@ -1,21 +0,0 @@ -# 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': 'hello', - 'product_name': '$(AppName)', - 'type': 'executable', - 'sources': [ - 'hello.c', - ], - 'msvs_props': [ - '$(SolutionDir)AppName.vsprops' - ], - 'msbuild_props': [ - '$(SolutionDir)AppName.props' - ], - }, - ], -} diff --git a/tools/gyp/test/msvs/shared_output/common.gypi b/tools/gyp/test/msvs/shared_output/common.gypi deleted file mode 100644 index c6fa341d68ca09a8584c0930d0c2a69f13a23eda..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/shared_output/common.gypi +++ /dev/null @@ -1,17 +0,0 @@ -# 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. - -{ - 'target_defaults': { - 'default_configuration': 'Baz', - 'configurations': { - 'Baz': { - 'msvs_configuration_attributes': { - 'OutputDirectory': '<(DEPTH)/foo', - 'IntermediateDirectory': '$(OutDir)/bar', - }, - }, - }, - }, -} diff --git a/tools/gyp/test/msvs/shared_output/gyptest-shared_output.py b/tools/gyp/test/msvs/shared_output/gyptest-shared_output.py deleted file mode 100644 index 270b280e6ba92f597395b6934090d5f6d4c553e3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/shared_output/gyptest-shared_output.py +++ /dev/null @@ -1,41 +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 checking that IntermediateDirectory can be defined in terms of -OutputDirectory. We previously had emitted the definition of -IntermediateDirectory before the definition of OutputDirectory. -This is required so that $(IntDir) can be based on $(OutDir). -""" - -import TestGyp -import os - -# NOTE: This test really is vcbuild/msbuild specific (not applicable to windows -# ninja), as it is testing the msvs output location when opening an .sln -# other than all.sln. -test = TestGyp.TestGyp(workdir='workarea_shared_output', formats=['msvs']) - -test.run_gyp('hello.gyp') -test.set_configuration('Baz') - -test.build('there/there.gyp', test.ALL) -test.must_exist(os.path.join(test.workdir, 'foo', 'there.exe')) -test.must_exist(os.path.join(test.workdir, 'foo', 'bar', 'there.obj')) - -test.build('hello.gyp', test.ALL) -test.must_exist(os.path.join(test.workdir, 'foo', 'hello.exe')) -test.must_exist(os.path.join(test.workdir, 'foo', 'bar', 'hello.obj')) - -if test.format == 'msvs': - if test.uses_msbuild: - test.must_contain('pull_in_there.vcxproj', - '$(OutDir)bar\\') - else: - test.must_contain('pull_in_there.vcproj', - 'IntermediateDirectory="$(OutDir)bar\\"') - -test.pass_test() diff --git a/tools/gyp/test/msvs/shared_output/hello.c b/tools/gyp/test/msvs/shared_output/hello.c deleted file mode 100644 index 698e4fd36c3f4b5d5ed3be32f43650297d11b8ed..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/shared_output/hello.c +++ /dev/null @@ -1,12 +0,0 @@ -/* - * 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. - */ - -#include - -int main(void) { - printf("Hello, world!\n"); - return 0; -} diff --git a/tools/gyp/test/msvs/shared_output/hello.gyp b/tools/gyp/test/msvs/shared_output/hello.gyp deleted file mode 100644 index f80e5cfca1d0f4df56aa61b782356a078eaf8b94..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/shared_output/hello.gyp +++ /dev/null @@ -1,21 +0,0 @@ -# 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. - -{ - 'includes': ['common.gypi'], - 'targets': [ - { - 'target_name': 'pull_in_there', - 'type': 'none', - 'dependencies': ['there/there.gyp:*'], - }, - { - 'target_name': 'hello', - 'type': 'executable', - 'sources': [ - 'hello.c', - ], - }, - ], -} diff --git a/tools/gyp/test/msvs/shared_output/there/there.c b/tools/gyp/test/msvs/shared_output/there/there.c deleted file mode 100644 index 698e4fd36c3f4b5d5ed3be32f43650297d11b8ed..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/shared_output/there/there.c +++ /dev/null @@ -1,12 +0,0 @@ -/* - * 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. - */ - -#include - -int main(void) { - printf("Hello, world!\n"); - return 0; -} diff --git a/tools/gyp/test/msvs/shared_output/there/there.gyp b/tools/gyp/test/msvs/shared_output/there/there.gyp deleted file mode 100644 index 56feff326ce37a943318da0223c0a9ab6c72ad46..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/shared_output/there/there.gyp +++ /dev/null @@ -1,16 +0,0 @@ -# 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. - -{ - 'includes': ['../common.gypi'], - 'targets': [ - { - 'target_name': 'there', - 'type': 'executable', - 'sources': [ - 'there.c', - ], - }, - ], -} diff --git a/tools/gyp/test/msvs/uldi2010/gyptest-all.py b/tools/gyp/test/msvs/uldi2010/gyptest-all.py deleted file mode 100644 index cc248fbd635c49e3721fd4ce6a55bd6e6794698f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/uldi2010/gyptest-all.py +++ /dev/null @@ -1,20 +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. - -""" -Verifies that uldi can be disabled on a per-project-reference basis in vs2010. -""" - -import TestGyp - -test = TestGyp.TestGyp(formats=['msvs'], workdir='workarea_all') - -test.run_gyp('hello.gyp') - -if test.uses_msbuild: - test.must_contain('hello.vcxproj', 'false') - -test.pass_test() diff --git a/tools/gyp/test/msvs/uldi2010/hello.c b/tools/gyp/test/msvs/uldi2010/hello.c deleted file mode 100644 index 06e6a029052bf70e747fd35bb04a08a4aca32644..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/uldi2010/hello.c +++ /dev/null @@ -1,13 +0,0 @@ -/* 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. */ - -#include - -extern int hello2(); - -int main(void) { - printf("Hello, world!\n"); - hello2(); - return 0; -} diff --git a/tools/gyp/test/msvs/uldi2010/hello.gyp b/tools/gyp/test/msvs/uldi2010/hello.gyp deleted file mode 100644 index a2bf2badb18fccf457cbf5175e8abdd5475f37d1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/uldi2010/hello.gyp +++ /dev/null @@ -1,26 +0,0 @@ -# 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': 'hello', - 'type': 'executable', - 'sources': [ - 'hello.c', - ], - 'dependencies': [ - 'hellolib', - ] - }, - { - 'target_name': 'hellolib', - 'type': 'static_library', - 'sources': [ - 'hello2.c', - ], - 'msvs_2010_disable_uldi_when_referenced': 1, - }, - ], -} diff --git a/tools/gyp/test/msvs/uldi2010/hello2.c b/tools/gyp/test/msvs/uldi2010/hello2.c deleted file mode 100644 index e2f23238d1648d1c60eccb53c72ac236c999c876..0000000000000000000000000000000000000000 --- a/tools/gyp/test/msvs/uldi2010/hello2.c +++ /dev/null @@ -1,10 +0,0 @@ -/* 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. */ - -#include - -int hello2() { - printf("Hello, two!\n"); - return 0; -} diff --git a/tools/gyp/test/multiple-targets/gyptest-all.py b/tools/gyp/test/multiple-targets/gyptest-all.py deleted file mode 100755 index 3ef50090d1a0c8ef5436c447adb870dedc1c415d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/multiple-targets/gyptest-all.py +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env python - -# 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. - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('multiple.gyp', chdir='src') - -test.relocate('src', 'relocate/src') - -test.build('multiple.gyp', test.ALL, chdir='relocate/src', stderr=None) - -expect1 = """\ -hello from prog1.c -hello from common.c -""" - -expect2 = """\ -hello from prog2.c -hello from common.c -""" - -test.run_built_executable('prog1', stdout=expect1, chdir='relocate/src') -test.run_built_executable('prog2', stdout=expect2, chdir='relocate/src') - -test.pass_test() diff --git a/tools/gyp/test/multiple-targets/gyptest-default.py b/tools/gyp/test/multiple-targets/gyptest-default.py deleted file mode 100755 index db15d794c376f08e05c4fcb351fa24708dd31728..0000000000000000000000000000000000000000 --- a/tools/gyp/test/multiple-targets/gyptest-default.py +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env python - -# 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. - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('multiple.gyp', chdir='src') - -test.relocate('src', 'relocate/src') - -test.build('multiple.gyp', chdir='relocate/src') - -expect1 = """\ -hello from prog1.c -hello from common.c -""" - -expect2 = """\ -hello from prog2.c -hello from common.c -""" - -test.run_built_executable('prog1', stdout=expect1, chdir='relocate/src') -test.run_built_executable('prog2', stdout=expect2, chdir='relocate/src') - -test.pass_test() diff --git a/tools/gyp/test/multiple-targets/src/common.c b/tools/gyp/test/multiple-targets/src/common.c deleted file mode 100644 index f1df7c1431464bfee76a2bd08aff784de28286d2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/multiple-targets/src/common.c +++ /dev/null @@ -1,7 +0,0 @@ -#include - -void common(void) -{ - printf("hello from common.c\n"); - return; -} diff --git a/tools/gyp/test/multiple-targets/src/multiple.gyp b/tools/gyp/test/multiple-targets/src/multiple.gyp deleted file mode 100644 index 3db4ea30cd0b29bed8fc04272fd36f65d1482821..0000000000000000000000000000000000000000 --- a/tools/gyp/test/multiple-targets/src/multiple.gyp +++ /dev/null @@ -1,24 +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': 'prog1', - 'type': 'executable', - 'sources': [ - 'prog1.c', - 'common.c', - ], - }, - { - 'target_name': 'prog2', - 'type': 'executable', - 'sources': [ - 'prog2.c', - 'common.c', - ], - }, - ], -} diff --git a/tools/gyp/test/multiple-targets/src/prog1.c b/tools/gyp/test/multiple-targets/src/prog1.c deleted file mode 100644 index fbf8d4cd7cce1421d4e79c62abdcded61fa5e990..0000000000000000000000000000000000000000 --- a/tools/gyp/test/multiple-targets/src/prog1.c +++ /dev/null @@ -1,10 +0,0 @@ -#include - -extern void common(void); - -int main(void) -{ - printf("hello from prog1.c\n"); - common(); - return 0; -} diff --git a/tools/gyp/test/multiple-targets/src/prog2.c b/tools/gyp/test/multiple-targets/src/prog2.c deleted file mode 100644 index a94b5c155ed0db56d0355f96283cc4bccb007519..0000000000000000000000000000000000000000 --- a/tools/gyp/test/multiple-targets/src/prog2.c +++ /dev/null @@ -1,10 +0,0 @@ -#include - -extern void common(void); - -int main(void) -{ - printf("hello from prog2.c\n"); - common(); - return 0; -} diff --git a/tools/gyp/test/ninja/action-rule-hash/gyptest-action-rule-hash.py b/tools/gyp/test/ninja/action-rule-hash/gyptest-action-rule-hash.py deleted file mode 100644 index 7147fd2fc31ac64c56dd7123154c11edd0c64120..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/action-rule-hash/gyptest-action-rule-hash.py +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Verify that running gyp in a different directory does not cause actions and -rules to rerun. -""" - -import os -import sys -import TestGyp - -test = TestGyp.TestGyp(formats=['ninja']) -# The xcode-ninja generator handles gypfiles which are not at the -# project root incorrectly. -# cf. https://code.google.com/p/gyp/issues/detail?id=460 -if test.format == 'xcode-ninja': - test.skip_test() - -test.run_gyp('subdir/action-rule-hash.gyp') -test.build('subdir/action-rule-hash.gyp', test.ALL) -test.up_to_date('subdir/action-rule-hash.gyp') - -# Verify that everything is still up-to-date when we re-invoke gyp from a -# different directory. -test.run_gyp('action-rule-hash.gyp', '--depth=../', chdir='subdir') -test.up_to_date('subdir/action-rule-hash.gyp') - -test.pass_test() diff --git a/tools/gyp/test/ninja/action-rule-hash/subdir/action-rule-hash.gyp b/tools/gyp/test/ninja/action-rule-hash/subdir/action-rule-hash.gyp deleted file mode 100644 index 0e88a3019fa881a60e069f7e330620c0cb8b0c5e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/action-rule-hash/subdir/action-rule-hash.gyp +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 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': 'program', - 'type': 'executable', - 'sources': [ - '<(INTERMEDIATE_DIR)/main.cc', - ], - 'actions': [ - { - 'action_name': 'emit_main_cc', - 'inputs': ['emit.py'], - 'outputs': ['<(INTERMEDIATE_DIR)/main.cc'], - 'action': [ - 'python', - 'emit.py', - '<(INTERMEDIATE_DIR)/main.cc', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - ], - }, - ], -} diff --git a/tools/gyp/test/ninja/action-rule-hash/subdir/emit.py b/tools/gyp/test/ninja/action-rule-hash/subdir/emit.py deleted file mode 100644 index fcb715a9fafc97ffac728bae190bb05329f61c27..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/action-rule-hash/subdir/emit.py +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -import sys - -f = open(sys.argv[1], 'wb') -f.write('int main() {\n') -f.write(' return 0;\n') -f.write('}\n') -f.close() diff --git a/tools/gyp/test/ninja/action_dependencies/gyptest-action-dependencies.py b/tools/gyp/test/ninja/action_dependencies/gyptest-action-dependencies.py deleted file mode 100755 index 7fc6cf2fdf7b5032d6fe0d9ee558d3f397fedd1c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/action_dependencies/gyptest-action-dependencies.py +++ /dev/null @@ -1,56 +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. - -""" -Verify that building an object file correctly depends on running actions in -dependent targets, but not the targets themselves. -""" - -import os -import sys -import TestGyp - -# NOTE(piman): This test will not work with other generators because: -# - it explicitly tests the optimization, which is not implemented (yet?) on -# other generators -# - it relies on the exact path to output object files, which is generator -# dependent, and actually, relies on the ability to build only that object file, -# which I don't think is available on all generators. -# TODO(piman): Extend to other generators when possible. -test = TestGyp.TestGyp(formats=['ninja']) -# xcode-ninja doesn't support building single object files by design. -if test.format == 'xcode-ninja': - test.skip_test() - -test.run_gyp('action_dependencies.gyp', chdir='src') - -chdir = 'relocate/src' -test.relocate('src', chdir) - -objext = '.obj' if sys.platform == 'win32' else '.o' - -test.build('action_dependencies.gyp', - os.path.join('obj', 'b.b' + objext), - chdir=chdir) - -# The 'a' actions should be run (letting b.c compile), but the a static library -# should not be built. -test.built_file_must_not_exist('a', type=test.STATIC_LIB, chdir=chdir) -test.built_file_must_not_exist('b', type=test.STATIC_LIB, chdir=chdir) -test.built_file_must_exist(os.path.join('obj', 'b.b' + objext), chdir=chdir) - -test.build('action_dependencies.gyp', - os.path.join('obj', 'c.c' + objext), - chdir=chdir) - -# 'a' and 'b' should be built, so that the 'c' action succeeds, letting c.c -# compile -test.built_file_must_exist('a', type=test.STATIC_LIB, chdir=chdir) -test.built_file_must_exist('b', type=test.EXECUTABLE, chdir=chdir) -test.built_file_must_exist(os.path.join('obj', 'c.c' + objext), chdir=chdir) - - -test.pass_test() diff --git a/tools/gyp/test/ninja/action_dependencies/src/a.c b/tools/gyp/test/ninja/action_dependencies/src/a.c deleted file mode 100644 index 4d7af9b26ca50dd68a792ce89726a028ac17365d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/action_dependencies/src/a.c +++ /dev/null @@ -1,10 +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. - */ - -#include "a.h" - -int funcA() { - return 42; -} diff --git a/tools/gyp/test/ninja/action_dependencies/src/a.h b/tools/gyp/test/ninja/action_dependencies/src/a.h deleted file mode 100644 index 335db5673985dbb201ddd6af9f4519c33e14d982..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/action_dependencies/src/a.h +++ /dev/null @@ -1,13 +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. - */ - -#ifndef A_H_ -#define A_H_ - -#include "a/generated.h" - -int funcA(); - -#endif // A_H_ diff --git a/tools/gyp/test/ninja/action_dependencies/src/action_dependencies.gyp b/tools/gyp/test/ninja/action_dependencies/src/action_dependencies.gyp deleted file mode 100644 index 5baa7a7d47e33463010475d6e5f8466d5ffc0de3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/action_dependencies/src/action_dependencies.gyp +++ /dev/null @@ -1,88 +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': 'a', - 'type': 'static_library', - 'sources': [ - 'a.c', - 'a.h', - ], - 'actions': [ - { - 'action_name': 'generate_headers', - 'inputs': [ - 'emit.py' - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/a/generated.h' - ], - 'action': [ - 'python', - 'emit.py', - '<(SHARED_INTERMEDIATE_DIR)/a/generated.h', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - ], - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)', - ], - }, - }, - { - 'target_name': 'b', - 'type': 'executable', - 'sources': [ - 'b.c', - 'b.h', - ], - 'dependencies': [ - 'a', - ], - }, - { - 'target_name': 'c', - 'type': 'static_library', - 'sources': [ - 'c.c', - 'c.h', - ], - 'dependencies': [ - 'b', - ], - 'actions': [ - { - 'action_name': 'generate_headers', - 'inputs': [ - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/c/generated.h' - ], - 'action': [ - '<(PRODUCT_DIR)/b', - '<(SHARED_INTERMEDIATE_DIR)/c/generated.h', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - ], - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)', - ], - 'direct_dependent_settings': { - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)', - ], - }, - }, - ], -} diff --git a/tools/gyp/test/ninja/action_dependencies/src/b.c b/tools/gyp/test/ninja/action_dependencies/src/b.c deleted file mode 100644 index 824464695a8617f43960f664d39a9261b6e74e7c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/action_dependencies/src/b.c +++ /dev/null @@ -1,18 +0,0 @@ -/* 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. - */ - -#include - -#include "b.h" - -int main(int argc, char** argv) { - FILE* f; - if (argc < 2) - return 1; - f = fopen(argv[1], "wt"); - fprintf(f, "#define VALUE %d\n", funcA()); - fclose(f); - return 0; -} diff --git a/tools/gyp/test/ninja/action_dependencies/src/b.h b/tools/gyp/test/ninja/action_dependencies/src/b.h deleted file mode 100644 index 91362cd899731123908398c78effa436e9643663..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/action_dependencies/src/b.h +++ /dev/null @@ -1,13 +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. - */ - -#ifndef B_H_ -#define B_H_ - -#include "a.h" - -int funcB(); - -#endif // B_H_ diff --git a/tools/gyp/test/ninja/action_dependencies/src/c.c b/tools/gyp/test/ninja/action_dependencies/src/c.c deleted file mode 100644 index b412087ec870e3623c9356a79c1b10a45086354f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/action_dependencies/src/c.c +++ /dev/null @@ -1,10 +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. - */ - -#include "c.h" - -int funcC() { - return VALUE; -} diff --git a/tools/gyp/test/ninja/action_dependencies/src/c.h b/tools/gyp/test/ninja/action_dependencies/src/c.h deleted file mode 100644 index c81a45bbe76fe676891da8d422e24a5aac47b9e6..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/action_dependencies/src/c.h +++ /dev/null @@ -1,13 +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. - */ - -#ifndef C_H_ -#define C_H_ - -#include "c/generated.h" - -int funcC(); - -#endif // C_H_ diff --git a/tools/gyp/test/ninja/action_dependencies/src/emit.py b/tools/gyp/test/ninja/action_dependencies/src/emit.py deleted file mode 100755 index 2df74b79a12c561129f397c7b676378dbb96a6ba..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/action_dependencies/src/emit.py +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env python - -# 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. - -import sys - -f = open(sys.argv[1], 'wb') -f.write('/* Hello World */\n') -f.close() diff --git a/tools/gyp/test/ninja/chained-dependency/chained-dependency.gyp b/tools/gyp/test/ninja/chained-dependency/chained-dependency.gyp deleted file mode 100644 index 3fe68ae85a7ffc629ca3e29742d6657db181252c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/chained-dependency/chained-dependency.gyp +++ /dev/null @@ -1,53 +0,0 @@ -# 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': [ - # This first target generates a header. - { - 'target_name': 'generate_header', - 'type': 'none', - 'msvs_cygwin_shell': '0', - 'actions': [ - { - 'action_name': 'generate header', - 'inputs': [], - 'outputs': ['<(SHARED_INTERMEDIATE_DIR)/generated/header.h'], - 'action': [ - 'python', '-c', 'open(<(_outputs), "w")' - ] - }, - ], - 'all_dependent_settings': { - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)', - ], - }, - }, - - # This intermediate target does nothing other than pull in a - # dependency on the above generated target. - { - 'target_name': 'chain', - 'type': 'none', - 'dependencies': [ - 'generate_header', - ], - }, - - # This final target is: - # - a static library (so gyp doesn't transitively pull in dependencies); - # - that relies on the generated file two dependencies away. - { - 'target_name': 'chained', - 'type': 'static_library', - 'dependencies': [ - 'chain', - ], - 'sources': [ - 'chained.c', - ], - }, - ], -} diff --git a/tools/gyp/test/ninja/chained-dependency/chained.c b/tools/gyp/test/ninja/chained-dependency/chained.c deleted file mode 100644 index c1ff1a7b12010b2b15b7ea099db53acccd121777..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/chained-dependency/chained.c +++ /dev/null @@ -1,5 +0,0 @@ -#include "generated/header.h" - -int main(void) { - return 0; -} diff --git a/tools/gyp/test/ninja/chained-dependency/gyptest-chained-dependency.py b/tools/gyp/test/ninja/chained-dependency/gyptest-chained-dependency.py deleted file mode 100755 index d8763f1d3db5b4b7a3aed37ba339ad1a4f1fb385..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/chained-dependency/gyptest-chained-dependency.py +++ /dev/null @@ -1,30 +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. - -""" -Verifies that files generated by two-steps-removed actions are built before -dependent compile steps. -""" - -import os -import sys -import TestGyp - -# This test is Ninja-specific in that: -# - the bug only showed nondeterministically in parallel builds; -# - it relies on a ninja-specific output file path. - -test = TestGyp.TestGyp(formats=['ninja']) -# xcode-ninja doesn't support building single object files by design. -if test.format == 'xcode-ninja': - test.skip_test() - -test.run_gyp('chained-dependency.gyp') -objext = '.obj' if sys.platform == 'win32' else '.o' -test.build('chained-dependency.gyp', - os.path.join('obj', 'chained.chained' + objext)) -# The test passes if the .o file builds successfully. -test.pass_test() diff --git a/tools/gyp/test/ninja/empty-and-non-empty-duplicate-name/gyptest-empty-and-non-empty-duplicate-name.py b/tools/gyp/test/ninja/empty-and-non-empty-duplicate-name/gyptest-empty-and-non-empty-duplicate-name.py deleted file mode 100644 index 0bdca66cdcc794eaa8ec4f4953e519f62e553b0e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/empty-and-non-empty-duplicate-name/gyptest-empty-and-non-empty-duplicate-name.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Verifies a phony target isn't output if a target exists with the same name that -was output. -""" - -import TestGyp - -test = TestGyp.TestGyp(formats=['ninja']) - -# Reset xcode_ninja_target_pattern to its default for this test. -test.run_gyp('test.gyp', '-G', 'xcode_ninja_target_pattern=^$') - -# Check for both \r and \n to cover both windows and linux. -test.must_not_contain('out/Default/build.ninja', 'build empty_target: phony\r') -test.must_not_contain('out/Default/build.ninja', 'build empty_target: phony\n') - -test.pass_test() diff --git a/tools/gyp/test/ninja/empty-and-non-empty-duplicate-name/subdir/included.gyp b/tools/gyp/test/ninja/empty-and-non-empty-duplicate-name/subdir/included.gyp deleted file mode 100644 index 1b9fc42f3f47190927fe41c194886f5b83b235b0..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/empty-and-non-empty-duplicate-name/subdir/included.gyp +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 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': 'empty_target', - 'type': 'executable', - 'sources': [ - 'test.cc', - ], - }, - { - 'target_name': 'included_empty_target', - 'type': 'none', - }, - ], -} diff --git a/tools/gyp/test/ninja/empty-and-non-empty-duplicate-name/test.gyp b/tools/gyp/test/ninja/empty-and-non-empty-duplicate-name/test.gyp deleted file mode 100644 index 9aa6287c7c9318c7c8bbbf9f0fffb36a8615fbee..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/empty-and-non-empty-duplicate-name/test.gyp +++ /dev/null @@ -1,19 +0,0 @@ -# Copyright (c) 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': 'All', - 'type': 'none', - 'dependencies': [ - 'subdir/included.gyp:included_empty_target' - ] - }, - { - 'target_name': 'empty_target', - 'type': 'none', - }, - ], -} diff --git a/tools/gyp/test/ninja/normalize-paths-win/gyptest-normalize-paths.py b/tools/gyp/test/ninja/normalize-paths-win/gyptest-normalize-paths.py deleted file mode 100644 index f56dbe5921e2e896c55d363e323c59d7f6180159..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/normalize-paths-win/gyptest-normalize-paths.py +++ /dev/null @@ -1,46 +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. - -""" -Make sure paths are normalized with VS macros properly expanded on Windows. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['ninja']) - - test.run_gyp('normalize-paths.gyp') - - # We can't use existence tests because any case will pass, so we check the - # contents of ninja files directly since that's what we're most concerned - # with anyway. - subninja = open(test.built_file_path('obj/some_target.ninja')).read() - if '$!product_dir' in subninja: - test.fail_test() - if 'out\\Default' in subninja: - test.fail_test() - - second = open(test.built_file_path('obj/second.ninja')).read() - if ('..\\..\\things\\AnotherName.exe' in second or - 'AnotherName.exe' not in second): - test.fail_test() - - copytarget = open(test.built_file_path('obj/copy_target.ninja')).read() - if '$(VSInstallDir)' in copytarget: - test.fail_test() - - action = open(test.built_file_path('obj/action.ninja')).read() - if '..\\..\\out\\Default' in action: - test.fail_test() - if '..\\..\\SomethingElse' in action or 'SomethingElse' not in action: - test.fail_test() - if '..\\..\\SomeOtherInput' in action or 'SomeOtherInput' not in action: - test.fail_test() - - test.pass_test() diff --git a/tools/gyp/test/ninja/normalize-paths-win/hello.cc b/tools/gyp/test/ninja/normalize-paths-win/hello.cc deleted file mode 100644 index 1711567ef566703fcd9c33e0a236b1b30454df6a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/normalize-paths-win/hello.cc +++ /dev/null @@ -1,7 +0,0 @@ -// 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. - -int main() { - return 0; -} diff --git a/tools/gyp/test/ninja/normalize-paths-win/normalize-paths.gyp b/tools/gyp/test/ninja/normalize-paths-win/normalize-paths.gyp deleted file mode 100644 index 544d06456d91cc03b46b6dddf1579c78022d2e38..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/normalize-paths-win/normalize-paths.gyp +++ /dev/null @@ -1,68 +0,0 @@ -# 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': 'Some_Target', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'OutputFile': '<(PRODUCT_DIR)/stuff/AnotherName.exe', - }, - }, - 'sources': [ - 'HeLLo.cc', - 'blOrP.idl', - ], - }, - { - 'target_name': 'second', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'OutputFile': '$(OutDir)\\things\\AnotherName.exe', - }, - }, - 'sources': [ - 'HeLLo.cc', - ], - }, - { - 'target_name': 'Copy_Target', - 'type': 'none', - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)', - 'files': [ - '$(VSInstallDir)\\bin\\cl.exe', - ], - }, - ], - }, - { - 'target_name': 'action', - 'type': 'none', - 'msvs_cygwin_shell': '0', - 'actions': [ - { - 'inputs': [ - '$(IntDir)\\SomeInput', - '$(OutDir)\\SomeOtherInput', - ], - 'outputs': [ - '<(PRODUCT_DIR)/ReSuLt', - '<(SHARED_INTERMEDIATE_DIR)/TempFile', - '$(OutDir)\SomethingElse', - ], - 'action_name': 'Test action', - # Unfortunately, we can't normalize this field because it's - # free-form. Fortunately, ninja doesn't inspect it at all (only the - # inputs and outputs) so it's not mandatory. - 'action': [], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/ninja/s-needs-no-depfiles/empty.s b/tools/gyp/test/ninja/s-needs-no-depfiles/empty.s deleted file mode 100644 index 218d8921e515dd953a198cde4ef124ea4554c65e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/s-needs-no-depfiles/empty.s +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank. diff --git a/tools/gyp/test/ninja/s-needs-no-depfiles/gyptest-s-needs-no-depfiles.py b/tools/gyp/test/ninja/s-needs-no-depfiles/gyptest-s-needs-no-depfiles.py deleted file mode 100755 index 77a3245d4625a0fc2afb94b3d1ba5e97fa0635e9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/s-needs-no-depfiles/gyptest-s-needs-no-depfiles.py +++ /dev/null @@ -1,42 +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. - -""" -Verify that .s files don't always trigger a rebuild, as would happen if depfiles -were used for them (since clang & gcc ignore -MMD when building .s->.o on -linux). -""" - -import os -import sys -import TestCommon -import TestGyp - -# NOTE(fischman): Each generator uses depfiles (or not) differently, so this is -# a ninja-specific test. -test = TestGyp.TestGyp(formats=['ninja']) - -if sys.platform == 'win32' or sys.platform == 'win64': - # This test is about clang/gcc vs. depfiles; VS gets a pass. - test.pass_test() - sys.exit(0) - -test.run_gyp('s-needs-no-depfiles.gyp') - -# Build the library, grab its timestamp, rebuild the library, ensure timestamp -# hasn't changed. -test.build('s-needs-no-depfiles.gyp', 'empty') -empty_dll = test.built_file_path('empty', test.SHARED_LIB) -test.built_file_must_exist(empty_dll) -pre_stat = os.stat(test.built_file_path(empty_dll)) -test.sleep() -test.build('s-needs-no-depfiles.gyp', 'empty') -post_stat = os.stat(test.built_file_path(empty_dll)) - -if pre_stat.st_mtime != post_stat.st_mtime: - test.fail_test() -else: - test.pass_test() diff --git a/tools/gyp/test/ninja/s-needs-no-depfiles/s-needs-no-depfiles.gyp b/tools/gyp/test/ninja/s-needs-no-depfiles/s-needs-no-depfiles.gyp deleted file mode 100644 index bd66b1a70a82c34199bf80439ce25be2451c6bf5..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/s-needs-no-depfiles/s-needs-no-depfiles.gyp +++ /dev/null @@ -1,13 +0,0 @@ -# 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': 'empty', - 'type': 'shared_library', - 'sources': [ 'empty.s' ], - }, - ], -} diff --git a/tools/gyp/test/ninja/solibs_avoid_relinking/gyptest-solibs-avoid-relinking.py b/tools/gyp/test/ninja/solibs_avoid_relinking/gyptest-solibs-avoid-relinking.py deleted file mode 100755 index 1b8e812eb228c4d7c5b920ca5ddd6a434bccb4b1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/solibs_avoid_relinking/gyptest-solibs-avoid-relinking.py +++ /dev/null @@ -1,46 +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. - -""" -Verify that relinking a solib doesn't relink a dependent executable if the -solib's public API hasn't changed. -""" - -import os -import sys -import TestCommon -import TestGyp - -# NOTE(fischman): This test will not work with other generators because the -# API-hash-based-mtime-preservation optimization is only implemented in -# ninja.py. It could be extended to the make.py generator as well pretty -# easily, probably. -# (also, it tests ninja-specific out paths, which would have to be generalized -# if this was extended to other generators). -test = TestGyp.TestGyp(formats=['ninja']) - -if not os.environ.get('ProgramFiles(x86)'): - # TODO(scottmg) - print 'Skipping test on x86, http://crbug.com/365833' - test.pass_test() - -test.run_gyp('solibs_avoid_relinking.gyp') - -# Build the executable, grab its timestamp, touch the solib's source, rebuild -# executable, ensure timestamp hasn't changed. -test.build('solibs_avoid_relinking.gyp', 'b') -test.built_file_must_exist('b' + TestCommon.exe_suffix) -pre_stat = os.stat(test.built_file_path('b' + TestCommon.exe_suffix)) -os.utime(os.path.join(test.workdir, 'solib.cc'), - (pre_stat.st_atime, pre_stat.st_mtime + 100)) -test.sleep() -test.build('solibs_avoid_relinking.gyp', 'b') -post_stat = os.stat(test.built_file_path('b' + TestCommon.exe_suffix)) - -if pre_stat.st_mtime != post_stat.st_mtime: - test.fail_test() -else: - test.pass_test() diff --git a/tools/gyp/test/ninja/solibs_avoid_relinking/main.cc b/tools/gyp/test/ninja/solibs_avoid_relinking/main.cc deleted file mode 100644 index 2cd74d3c770a988bda86480e19eb8709a427f2b5..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/solibs_avoid_relinking/main.cc +++ /dev/null @@ -1,5 +0,0 @@ -extern int foo(); - -int main() { - return foo(); -} diff --git a/tools/gyp/test/ninja/solibs_avoid_relinking/solib.cc b/tools/gyp/test/ninja/solibs_avoid_relinking/solib.cc deleted file mode 100644 index 0856cd4e007b2e49c2ecb015f81648aab3f30ec2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/solibs_avoid_relinking/solib.cc +++ /dev/null @@ -1,8 +0,0 @@ -#ifdef _MSC_VER -__declspec(dllexport) -#else -__attribute__((visibility("default"))) -#endif -int foo() { - return 42; -} diff --git a/tools/gyp/test/ninja/solibs_avoid_relinking/solibs_avoid_relinking.gyp b/tools/gyp/test/ninja/solibs_avoid_relinking/solibs_avoid_relinking.gyp deleted file mode 100644 index e816351d684f554986d74562f711be62b3112cea..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/solibs_avoid_relinking/solibs_avoid_relinking.gyp +++ /dev/null @@ -1,38 +0,0 @@ -# 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': 'a', - 'type': 'shared_library', - 'sources': [ 'solib.cc' ], - # Incremental linking enabled so that .lib timestamp is maintained when - # exports are unchanged. - 'msvs_settings': { - 'VCLinkerTool': { - 'LinkIncremental': '2', - } - }, - }, - { - 'target_name': 'b', - 'type': 'executable', - 'sources': [ 'main.cc' ], - 'dependencies': [ 'a' ], - 'msvs_settings': { - 'VCLinkerTool': { - 'LinkIncremental': '2', - } - }, - }, - ], - 'conditions': [ - ['OS=="linux"', { - 'target_defaults': { - 'cflags': ['-fPIC'], - }, - }], - ], -} diff --git a/tools/gyp/test/ninja/use-console/foo.bar b/tools/gyp/test/ninja/use-console/foo.bar deleted file mode 100644 index 07c476a8664bbf222d28a70b1cf8910a4bfcd507..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/use-console/foo.bar +++ /dev/null @@ -1,5 +0,0 @@ -# Copyright (c) 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. - -This is a dummy file for rule/action input. diff --git a/tools/gyp/test/ninja/use-console/gyptest-use-console.py b/tools/gyp/test/ninja/use-console/gyptest-use-console.py deleted file mode 100644 index f76fcd98296eae07279203a5b1fc8742793b014f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/use-console/gyptest-use-console.py +++ /dev/null @@ -1,29 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Make sure 'ninja_use_console' is supported in actions and rules. -""" - -import TestGyp - -test = TestGyp.TestGyp(formats=['ninja']) - -test.run_gyp('use-console.gyp') - -no_pool = open(test.built_file_path('obj/no_pool.ninja')).read() -if 'pool =' in no_pool: - test.fail_test() - -action_pool = open(test.built_file_path('obj/action_pool.ninja')).read() -if 'pool = console' not in action_pool: - test.fail_test() - -rule_pool = open(test.built_file_path('obj/rule_pool.ninja')).read() -if 'pool = console' not in rule_pool: - test.fail_test() - -test.pass_test() diff --git a/tools/gyp/test/ninja/use-console/use-console.gyp b/tools/gyp/test/ninja/use-console/use-console.gyp deleted file mode 100644 index 84e63184c675d731796e3d44fcaf3d84383f362b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/use-console/use-console.gyp +++ /dev/null @@ -1,60 +0,0 @@ -# Copyright (c) 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': 'no_pool', - 'type': 'none', - 'actions': [ - { - 'action_name': 'some_action', - 'action': ['echo', 'hello'], - 'inputs': ['foo.bar'], - 'outputs': ['dummy'], - }, - ], - 'rules': [ - { - 'rule_name': 'some_rule', - 'extension': 'bar', - 'action': ['echo', 'hello'], - 'outputs': ['dummy'], - }, - ], - 'sources': [ - 'foo.bar', - ], - }, - { - 'target_name': 'action_pool', - 'type': 'none', - 'actions': [ - { - 'action_name': 'some_action', - 'action': ['echo', 'hello'], - 'inputs': ['foo.bar'], - 'outputs': ['dummy'], - 'ninja_use_console': 1, - }, - ], - }, - { - 'target_name': 'rule_pool', - 'type': 'none', - 'rules': [ - { - 'rule_name': 'some_rule', - 'extension': 'bar', - 'action': ['echo', 'hello'], - 'outputs': ['dummy'], - 'ninja_use_console': 1, - }, - ], - 'sources': [ - 'foo.bar', - ], - }, - ], -} diff --git a/tools/gyp/test/ninja/use-custom-environment-files/gyptest-use-custom-environment-files.py b/tools/gyp/test/ninja/use-custom-environment-files/gyptest-use-custom-environment-files.py deleted file mode 100644 index 0c44b1d1c9870492b356124e4a4ec5e2406a5d12..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/use-custom-environment-files/gyptest-use-custom-environment-files.py +++ /dev/null @@ -1,28 +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. - -""" -Make sure environment files can be suppressed. -""" - -import TestGyp - -import os -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['ninja']) - - test.run_gyp('use-custom-environment-files.gyp', - '-G', 'ninja_use_custom_environment_files') - - # Make sure environment files do not exist. - if os.path.exists(test.built_file_path('environment.x86')): - test.fail_test() - if os.path.exists(test.built_file_path('environment.x64')): - test.fail_test() - - test.pass_test() diff --git a/tools/gyp/test/ninja/use-custom-environment-files/use-custom-environment-files.cc b/tools/gyp/test/ninja/use-custom-environment-files/use-custom-environment-files.cc deleted file mode 100644 index 1711567ef566703fcd9c33e0a236b1b30454df6a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/use-custom-environment-files/use-custom-environment-files.cc +++ /dev/null @@ -1,7 +0,0 @@ -// 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. - -int main() { - return 0; -} diff --git a/tools/gyp/test/ninja/use-custom-environment-files/use-custom-environment-files.gyp b/tools/gyp/test/ninja/use-custom-environment-files/use-custom-environment-files.gyp deleted file mode 100644 index dbc95a9439c28b13023e0dab1d90ad40215f2fcd..0000000000000000000000000000000000000000 --- a/tools/gyp/test/ninja/use-custom-environment-files/use-custom-environment-files.gyp +++ /dev/null @@ -1,15 +0,0 @@ -# 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': 'test_use_custom_environment_files', - 'type': 'executable', - 'sources': [ - 'use-custom-environment-files.cc', - ], - }, - ], -} diff --git a/tools/gyp/test/no-cpp/gyptest-no-cpp.py b/tools/gyp/test/no-cpp/gyptest-no-cpp.py deleted file mode 100644 index 3f93d42feb0ca66c9b4f559cb22a2d4845a825db..0000000000000000000000000000000000000000 --- a/tools/gyp/test/no-cpp/gyptest-no-cpp.py +++ /dev/null @@ -1,51 +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. - -""" -Checks that C-only targets aren't linked against libstdc++. -""" - -import TestGyp - -import re -import subprocess -import sys - -# set |match| to ignore build stderr output. -test = TestGyp.TestGyp(match = lambda a, b: True) -if sys.platform != 'win32' and test.format not in ('make', 'android'): - # TODO: This doesn't pass with make. - # TODO: Does a test like this make sense with Windows? Android? - - CHDIR = 'src' - test.run_gyp('test.gyp', chdir=CHDIR) - test.build('test.gyp', 'no_cpp', chdir=CHDIR) - - def LinksLibStdCpp(path): - path = test.built_file_path(path, chdir=CHDIR) - if sys.platform == 'darwin': - proc = subprocess.Popen(['otool', '-L', path], stdout=subprocess.PIPE) - else: - proc = subprocess.Popen(['ldd', path], stdout=subprocess.PIPE) - output = proc.communicate()[0] - assert not proc.returncode - return 'libstdc++' in output or 'libc++' in output - - if LinksLibStdCpp('no_cpp'): - test.fail_test() - - build_error_code = { - 'xcode': [1, 65], # 1 for xcode 3, 65 for xcode 4 (see `man sysexits`) - 'make': 2, - 'ninja': 1, - 'cmake': 0, # CMake picks the compiler driver based on transitive checks. - 'xcode-ninja': [1, 65], - }[test.format] - - test.build('test.gyp', 'no_cpp_dep_on_cc_lib', chdir=CHDIR, - status=build_error_code) - - test.pass_test() diff --git a/tools/gyp/test/no-cpp/src/call-f-main.c b/tools/gyp/test/no-cpp/src/call-f-main.c deleted file mode 100644 index 8b95c5910ecc9a8c2253b00e5ee72c3245ba62b1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/no-cpp/src/call-f-main.c +++ /dev/null @@ -1,2 +0,0 @@ -void* f(); -int main() { f(); } diff --git a/tools/gyp/test/no-cpp/src/empty-main.c b/tools/gyp/test/no-cpp/src/empty-main.c deleted file mode 100644 index 237c8ce181774d991a9dbdd8cacf1a5fb9f199f1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/no-cpp/src/empty-main.c +++ /dev/null @@ -1 +0,0 @@ -int main() {} diff --git a/tools/gyp/test/no-cpp/src/f.cc b/tools/gyp/test/no-cpp/src/f.cc deleted file mode 100644 index 02f50f21a0ae32db8a572d94259dc326e478f406..0000000000000000000000000000000000000000 --- a/tools/gyp/test/no-cpp/src/f.cc +++ /dev/null @@ -1,3 +0,0 @@ -extern "C" { void* f(); } - -void* f() { return new int; } diff --git a/tools/gyp/test/no-cpp/src/test.gyp b/tools/gyp/test/no-cpp/src/test.gyp deleted file mode 100644 index 417015ec803225b47892e17e6e0b9967ede45aa7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/no-cpp/src/test.gyp +++ /dev/null @@ -1,25 +0,0 @@ -# Copyright (c) 2013 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': 'no_cpp', - 'type': 'executable', - 'sources': [ 'empty-main.c' ], - }, - # A static_library with a cpp file and a linkable with only .c files - # depending on it causes a linker error: - { - 'target_name': 'cpp_lib', - 'type': 'static_library', - 'sources': [ 'f.cc' ], - }, - { - 'target_name': 'no_cpp_dep_on_cc_lib', - 'type': 'executable', - 'dependencies': [ 'cpp_lib' ], - 'sources': [ 'call-f-main.c' ], - }, - ], -} diff --git a/tools/gyp/test/no-output/gyptest-no-output.py b/tools/gyp/test/no-output/gyptest-no-output.py deleted file mode 100755 index bf9a0b5aaa4c24199d5a30a4b8c4b4d023eaad01..0000000000000000000000000000000000000000 --- a/tools/gyp/test/no-output/gyptest-no-output.py +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verified things don't explode when there are targets without outputs. -""" - -import TestGyp - -# TODO(evan): in ninja when there are no targets, there is no 'all' -# target either. Disabling this test for now. -test = TestGyp.TestGyp(formats=['!ninja']) - -test.run_gyp('nooutput.gyp', chdir='src') -test.relocate('src', 'relocate/src') -test.build('nooutput.gyp', chdir='relocate/src') - -test.pass_test() diff --git a/tools/gyp/test/no-output/src/nooutput.gyp b/tools/gyp/test/no-output/src/nooutput.gyp deleted file mode 100644 index c40124efc1eee90b7fc0b4ba15bb21adbf800d37..0000000000000000000000000000000000000000 --- a/tools/gyp/test/no-output/src/nooutput.gyp +++ /dev/null @@ -1,17 +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': 'no_output', - 'type': 'none', - 'direct_dependent_settings': { - 'defines': [ - 'NADA', - ], - }, - }, - ], -} diff --git a/tools/gyp/test/product/gyptest-product.py b/tools/gyp/test/product/gyptest-product.py deleted file mode 100755 index 955295d7109e5e8b9e1a9a82e962e1aedf84b11e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/product/gyptest-product.py +++ /dev/null @@ -1,44 +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. - -""" -Verifies simplest-possible build of a "Hello, world!" program -using the default build target. -""" - -import TestGyp - -# Android does not support setting the build directory. -test = TestGyp.TestGyp(formats=['!android']) - -test.run_gyp('product.gyp') -test.build('product.gyp') - -# executables -test.built_file_must_exist('alt1' + test._exe, test.EXECUTABLE, bare=True) -test.built_file_must_exist('hello2.stuff', test.EXECUTABLE, bare=True) -test.built_file_must_exist('yoalt3.stuff', test.EXECUTABLE, bare=True) - -# shared libraries -test.built_file_must_exist(test.dll_ + 'alt4' + test._dll, - test.SHARED_LIB, bare=True) -test.built_file_must_exist(test.dll_ + 'hello5.stuff', - test.SHARED_LIB, bare=True) -test.built_file_must_exist('yoalt6.stuff', test.SHARED_LIB, bare=True) - -# static libraries -test.built_file_must_exist(test.lib_ + 'alt7' + test._lib, - test.STATIC_LIB, bare=True) -test.built_file_must_exist(test.lib_ + 'hello8.stuff', - test.STATIC_LIB, bare=True) -test.built_file_must_exist('yoalt9.stuff', test.STATIC_LIB, bare=True) - -# alternate product_dir -test.built_file_must_exist('bob/yoalt10.stuff', test.EXECUTABLE, bare=True) -test.built_file_must_exist('bob/yoalt11.stuff', test.EXECUTABLE, bare=True) -test.built_file_must_exist('bob/yoalt12.stuff', test.EXECUTABLE, bare=True) - -test.pass_test() diff --git a/tools/gyp/test/product/hello.c b/tools/gyp/test/product/hello.c deleted file mode 100644 index 41fdff0e382361da1e120bdc9d0f233c527437cb..0000000000000000000000000000000000000000 --- a/tools/gyp/test/product/hello.c +++ /dev/null @@ -1,15 +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. */ - -#include - -int func1(void) { - return 42; -} - -int main(void) { - printf("Hello, world!\n"); - printf("%d\n", func1()); - return 0; -} diff --git a/tools/gyp/test/product/product.gyp b/tools/gyp/test/product/product.gyp deleted file mode 100644 index c25eaaacb51b516c08a64341832b250feaa75c47..0000000000000000000000000000000000000000 --- a/tools/gyp/test/product/product.gyp +++ /dev/null @@ -1,128 +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': 'hello1', - 'product_name': 'alt1', - 'type': 'executable', - 'sources': [ - 'hello.c', - ], - }, - { - 'target_name': 'hello2', - 'product_extension': 'stuff', - 'type': 'executable', - 'sources': [ - 'hello.c', - ], - }, - { - 'target_name': 'hello3', - 'product_name': 'alt3', - 'product_extension': 'stuff', - 'product_prefix': 'yo', - 'type': 'executable', - 'sources': [ - 'hello.c', - ], - }, - - { - 'target_name': 'hello4', - 'product_name': 'alt4', - 'type': 'shared_library', - 'sources': [ - 'hello.c', - ], - }, - { - 'target_name': 'hello5', - 'product_extension': 'stuff', - 'type': 'shared_library', - 'sources': [ - 'hello.c', - ], - }, - { - 'target_name': 'hello6', - 'product_name': 'alt6', - 'product_extension': 'stuff', - 'product_prefix': 'yo', - 'type': 'shared_library', - 'sources': [ - 'hello.c', - ], - }, - - { - 'target_name': 'hello7', - 'product_name': 'alt7', - 'type': 'static_library', - 'sources': [ - 'hello.c', - ], - }, - { - 'target_name': 'hello8', - 'product_extension': 'stuff', - 'type': 'static_library', - 'sources': [ - 'hello.c', - ], - }, - { - 'target_name': 'hello9', - 'product_name': 'alt9', - 'product_extension': 'stuff', - 'product_prefix': 'yo', - 'type': 'static_library', - 'sources': [ - 'hello.c', - ], - }, - { - 'target_name': 'hello10', - 'product_name': 'alt10', - 'product_extension': 'stuff', - 'product_prefix': 'yo', - 'product_dir': '<(PRODUCT_DIR)/bob', - 'type': 'executable', - 'sources': [ - 'hello.c', - ], - }, - { - 'target_name': 'hello11', - 'product_name': 'alt11', - 'product_extension': 'stuff', - 'product_prefix': 'yo', - 'product_dir': '<(PRODUCT_DIR)/bob', - 'type': 'shared_library', - 'sources': [ - 'hello.c', - ], - }, - { - 'target_name': 'hello12', - 'product_name': 'alt12', - 'product_extension': 'stuff', - 'product_prefix': 'yo', - 'product_dir': '<(PRODUCT_DIR)/bob', - 'type': 'static_library', - 'sources': [ - 'hello.c', - ], - }, - ], - 'conditions': [ - ['OS=="linux"', { - 'target_defaults': { - 'cflags': ['-fPIC'], - }, - }], - ], -} diff --git a/tools/gyp/test/prune_targets/gyptest-prune-targets.py b/tools/gyp/test/prune_targets/gyptest-prune-targets.py deleted file mode 100644 index e54ce6adc28f650b617842af54b05fd1f9c62685..0000000000000000000000000000000000000000 --- a/tools/gyp/test/prune_targets/gyptest-prune-targets.py +++ /dev/null @@ -1,67 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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 --root-target removes the unnecessary targets. -""" - -import TestGyp - -test = TestGyp.TestGyp() -# The xcode-ninja generator has its own logic for which targets to include -if test.format == 'xcode-ninja': - test.skip_test() - -build_error_code = { - 'android': 2, - 'cmake': 1, - 'make': 2, - 'msvs': 1, - 'ninja': 1, - 'xcode': 65, -}[test.format] - -# By default, everything will be included. -test.run_gyp('test1.gyp') -test.build('test2.gyp', 'lib1') -test.build('test2.gyp', 'lib2') -test.build('test2.gyp', 'lib3') -test.build('test2.gyp', 'lib_indirect') -test.build('test1.gyp', 'program1') -test.build('test1.gyp', 'program2') -test.build('test1.gyp', 'program3') - -# With deep dependencies of program1 only. -test.run_gyp('test1.gyp', '--root-target=program1') -test.build('test2.gyp', 'lib1') -test.build('test2.gyp', 'lib2', status=build_error_code, stderr=None) -test.build('test2.gyp', 'lib3', status=build_error_code, stderr=None) -test.build('test2.gyp', 'lib_indirect') -test.build('test1.gyp', 'program1') -test.build('test1.gyp', 'program2', status=build_error_code, stderr=None) -test.build('test1.gyp', 'program3', status=build_error_code, stderr=None) - -# With deep dependencies of program2 only. -test.run_gyp('test1.gyp', '--root-target=program2') -test.build('test2.gyp', 'lib1', status=build_error_code, stderr=None) -test.build('test2.gyp', 'lib2') -test.build('test2.gyp', 'lib3', status=build_error_code, stderr=None) -test.build('test2.gyp', 'lib_indirect') -test.build('test1.gyp', 'program1', status=build_error_code, stderr=None) -test.build('test1.gyp', 'program2') -test.build('test1.gyp', 'program3', status=build_error_code, stderr=None) - -# With deep dependencies of program1 and program2. -test.run_gyp('test1.gyp', '--root-target=program1', '--root-target=program2') -test.build('test2.gyp', 'lib1') -test.build('test2.gyp', 'lib2') -test.build('test2.gyp', 'lib3', status=build_error_code, stderr=None) -test.build('test2.gyp', 'lib_indirect') -test.build('test1.gyp', 'program1') -test.build('test1.gyp', 'program2') -test.build('test1.gyp', 'program3', status=build_error_code, stderr=None) - -test.pass_test() diff --git a/tools/gyp/test/prune_targets/lib1.cc b/tools/gyp/test/prune_targets/lib1.cc deleted file mode 100644 index 692b7de6d82c927503c21607863f671307fa6cd1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/prune_targets/lib1.cc +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (c) 2013 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. - -void libfunc1() { -} diff --git a/tools/gyp/test/prune_targets/lib2.cc b/tools/gyp/test/prune_targets/lib2.cc deleted file mode 100644 index aed394afcff768af538513e67e47170f954a36c3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/prune_targets/lib2.cc +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (c) 2013 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. - -void libfunc2() { -} diff --git a/tools/gyp/test/prune_targets/lib3.cc b/tools/gyp/test/prune_targets/lib3.cc deleted file mode 100644 index af0f717b020e5bebb15a650338520ff2bc9becf9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/prune_targets/lib3.cc +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (c) 2013 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. - -void libfunc3() { -} diff --git a/tools/gyp/test/prune_targets/lib_indirect.cc b/tools/gyp/test/prune_targets/lib_indirect.cc deleted file mode 100644 index 92d9ea40db811b235b37f10542b635a3222d9886..0000000000000000000000000000000000000000 --- a/tools/gyp/test/prune_targets/lib_indirect.cc +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (c) 2013 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. - -void libfunc_indirect() { -} diff --git a/tools/gyp/test/prune_targets/program.cc b/tools/gyp/test/prune_targets/program.cc deleted file mode 100644 index c9ac070ecd97bb7d3dc74b9d4de6dac25a61466b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/prune_targets/program.cc +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2013 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. - -int main() { - return 0; -} diff --git a/tools/gyp/test/prune_targets/test1.gyp b/tools/gyp/test/prune_targets/test1.gyp deleted file mode 100644 index b65ec19fa4c02d28e41447ba91f64e69b087e8fe..0000000000000000000000000000000000000000 --- a/tools/gyp/test/prune_targets/test1.gyp +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2013 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': 'program1', - 'type': 'executable', - 'sources': [ 'program.cc' ], - 'dependencies': [ 'test2.gyp:lib1' ], - }, - { - 'target_name': 'program2', - 'type': 'executable', - 'sources': [ 'program.cc' ], - 'dependencies': [ 'test2.gyp:lib2' ], - }, - { - 'target_name': 'program3', - 'type': 'executable', - 'sources': [ 'program.cc' ], - 'dependencies': [ 'test2.gyp:lib3' ], - }, - ], -} diff --git a/tools/gyp/test/prune_targets/test2.gyp b/tools/gyp/test/prune_targets/test2.gyp deleted file mode 100644 index 16f0fd3290de9c439fd7ccd085ad6cd918014ab9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/prune_targets/test2.gyp +++ /dev/null @@ -1,30 +0,0 @@ -# Copyright (c) 2013 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': 'lib1', - 'type': 'static_library', - 'sources': [ 'lib1.cc' ], - 'dependencies': [ 'lib_indirect' ], - }, - { - 'target_name': 'lib2', - 'type': 'static_library', - 'sources': [ 'lib2.cc' ], - 'dependencies': [ 'lib_indirect' ], - }, - { - 'target_name': 'lib3', - 'type': 'static_library', - 'sources': [ 'lib3.cc' ], - }, - { - 'target_name': 'lib_indirect', - 'type': 'static_library', - 'sources': [ 'lib_indirect.cc' ], - }, - ], -} diff --git a/tools/gyp/test/relative/foo/a/a.cc b/tools/gyp/test/relative/foo/a/a.cc deleted file mode 100644 index 7d1c95344856590d78251205ecc52b7b9a09f884..0000000000000000000000000000000000000000 --- a/tools/gyp/test/relative/foo/a/a.cc +++ /dev/null @@ -1,9 +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. - */ - -int main() { - return 0; -} diff --git a/tools/gyp/test/relative/foo/a/a.gyp b/tools/gyp/test/relative/foo/a/a.gyp deleted file mode 100644 index 66316ac681f809fd432634c4b1d84fba01c7cc7d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/relative/foo/a/a.gyp +++ /dev/null @@ -1,13 +0,0 @@ -{ - 'targets': [ - { - 'target_name': 'a', - 'type': 'executable', - 'sources': ['a.cc'], - 'dependencies': [ - '../../foo/b/b.gyp:b', - 'c/c.gyp:c', - ], - }, - ], -} diff --git a/tools/gyp/test/relative/foo/a/c/c.cc b/tools/gyp/test/relative/foo/a/c/c.cc deleted file mode 100644 index 9d2247168441ecde1939d3524e47769aade1423e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/relative/foo/a/c/c.cc +++ /dev/null @@ -1,9 +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. - */ - -int func() { - return 0; -} diff --git a/tools/gyp/test/relative/foo/a/c/c.gyp b/tools/gyp/test/relative/foo/a/c/c.gyp deleted file mode 100644 index c1f087db9934feac7834f14df15617a9c0007504..0000000000000000000000000000000000000000 --- a/tools/gyp/test/relative/foo/a/c/c.gyp +++ /dev/null @@ -1,12 +0,0 @@ -{ - 'targets': [ - { - 'target_name': 'c', - 'type': 'static_library', - 'sources': ['c.cc'], - 'dependencies': [ - '../../b/b.gyp:b', - ], - }, - ], -} diff --git a/tools/gyp/test/relative/foo/b/b.cc b/tools/gyp/test/relative/foo/b/b.cc deleted file mode 100644 index 011d59cebb323689401c011ee32792297c185970..0000000000000000000000000000000000000000 --- a/tools/gyp/test/relative/foo/b/b.cc +++ /dev/null @@ -1,9 +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. - */ - -int func2() { - return 0; -} diff --git a/tools/gyp/test/relative/foo/b/b.gyp b/tools/gyp/test/relative/foo/b/b.gyp deleted file mode 100644 index 0ebe4533d3f3f7965fdc9943310e7d24a9e3c47f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/relative/foo/b/b.gyp +++ /dev/null @@ -1,9 +0,0 @@ -{ - 'targets': [ - { - 'target_name': 'b', - 'type': 'static_library', - 'sources': ['b.cc'], - }, - ], -} diff --git a/tools/gyp/test/relative/gyptest-default.py b/tools/gyp/test/relative/gyptest-default.py deleted file mode 100755 index 2d657aa675df920114a30ee2aa2a24d947f68fe3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/relative/gyptest-default.py +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies simplest-possible build of a "Hello, world!" program -using the default build target. -""" - -import TestGyp - -test = TestGyp.TestGyp(workdir='workarea_default', formats=['msvs']) - -# Run from down in foo. -test.run_gyp('a.gyp', chdir='foo/a') -sln = test.workpath('foo/a/a.sln') -sln_data = open(sln, 'rb').read() -vcproj = sln_data.count('b.vcproj') -vcxproj = sln_data.count('b.vcxproj') -if (vcproj, vcxproj) not in [(1, 0), (0, 1)]: - test.fail_test() - -test.pass_test() diff --git a/tools/gyp/test/rename/filecase/file.c b/tools/gyp/test/rename/filecase/file.c deleted file mode 100644 index 76e8197013aabca95639bb3d9e5de847b0c0a5fd..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rename/filecase/file.c +++ /dev/null @@ -1 +0,0 @@ -int main() { return 0; } diff --git a/tools/gyp/test/rename/filecase/test-casesensitive.gyp b/tools/gyp/test/rename/filecase/test-casesensitive.gyp deleted file mode 100644 index 48eaa6eb679da9db3e47c7fffc4a5bd0e9aada8a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rename/filecase/test-casesensitive.gyp +++ /dev/null @@ -1,15 +0,0 @@ -# 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': 'filecaserename_sensitive', - 'type': 'executable', - 'sources': [ - 'FiLe.c', - 'fIlE.c', - ], - }, - ], -} diff --git a/tools/gyp/test/rename/filecase/test.gyp b/tools/gyp/test/rename/filecase/test.gyp deleted file mode 100644 index eaee9337b6c0a6c7462d0207c2bd5bb976c8d68f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rename/filecase/test.gyp +++ /dev/null @@ -1,14 +0,0 @@ -# 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': 'filecaserename', - 'type': 'executable', - 'sources': [ - 'file.c', - ], - }, - ], -} diff --git a/tools/gyp/test/rename/gyptest-filecase.py b/tools/gyp/test/rename/gyptest-filecase.py deleted file mode 100644 index daed5180d3e6fee08c08256f700c4267b7109348..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rename/gyptest-filecase.py +++ /dev/null @@ -1,35 +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. - -""" -Checks that files whose file case changes get rebuilt correctly. -""" - -import os -import TestGyp - -test = TestGyp.TestGyp() -CHDIR = 'filecase' -test.run_gyp('test.gyp', chdir=CHDIR) -test.build('test.gyp', test.ALL, chdir=CHDIR) - -os.rename('filecase/file.c', 'filecase/fIlE.c') -test.write('filecase/test.gyp', - test.read('filecase/test.gyp').replace('file.c', 'fIlE.c')) -test.run_gyp('test.gyp', chdir=CHDIR) -test.build('test.gyp', test.ALL, chdir=CHDIR) - - -# Check that having files that differ just in their case still work on -# case-sensitive file systems. -test.write('filecase/FiLe.c', 'int f(); int main() { return f(); }') -test.write('filecase/fIlE.c', 'int f() { return 42; }') -is_case_sensitive = test.read('filecase/FiLe.c') != test.read('filecase/fIlE.c') -if is_case_sensitive: - test.run_gyp('test-casesensitive.gyp', chdir=CHDIR) - test.build('test-casesensitive.gyp', test.ALL, chdir=CHDIR) - -test.pass_test() diff --git a/tools/gyp/test/restat/gyptest-restat.py b/tools/gyp/test/restat/gyptest-restat.py deleted file mode 100644 index 87379044dda4a44319cdbe123ea8be5d9aca37ff..0000000000000000000000000000000000000000 --- a/tools/gyp/test/restat/gyptest-restat.py +++ /dev/null @@ -1,31 +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. - -""" -Verify that dependent rules are executed iff a dependency action modifies its -outputs. -""" - -import TestGyp -import os - -test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode']) - -test.run_gyp('restat.gyp', chdir='src') - -chdir = 'relocate/src' -test.relocate('src', chdir) - -# Building 'dependent' the first time generates 'side_effect', but building it -# the second time doesn't, because 'create_intermediate' doesn't update its -# output. -test.build('restat.gyp', 'dependent', chdir=chdir) -test.built_file_must_exist('side_effect', chdir=chdir) -os.remove(test.built_file_path('side_effect', chdir=chdir)) -test.build('restat.gyp', 'dependent', chdir=chdir) -test.built_file_must_not_exist('side_effect', chdir=chdir) - -test.pass_test() diff --git a/tools/gyp/test/restat/src/create_intermediate.py b/tools/gyp/test/restat/src/create_intermediate.py deleted file mode 100644 index a4d7450371d96f9d7ac1a1cb09576668b1ae2cf8..0000000000000000000000000000000000000000 --- a/tools/gyp/test/restat/src/create_intermediate.py +++ /dev/null @@ -1,17 +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. - -import os -import sys - -""" -Create argv[1] iff it doesn't already exist. -""" - -outfile = sys.argv[1] -if os.path.exists(outfile): - sys.exit() -open(outfile, "wb").close() diff --git a/tools/gyp/test/restat/src/restat.gyp b/tools/gyp/test/restat/src/restat.gyp deleted file mode 100644 index ff020e0ce667b572963f1022c15c2c445eceb479..0000000000000000000000000000000000000000 --- a/tools/gyp/test/restat/src/restat.gyp +++ /dev/null @@ -1,50 +0,0 @@ -# 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': 'create_intermediate', - 'type': 'none', - 'msvs_cygwin_shell': '0', - 'actions': [ - { - 'action_name': 'create_intermediate', - 'inputs': [ - 'create_intermediate.py', - ], - 'outputs': [ - '<(PRODUCT_DIR)/intermediate', - 'ALWAYS.run.ALWAYS', - ], - 'action': [ - 'python', 'create_intermediate.py', '<(PRODUCT_DIR)/intermediate', - ], - }, - ], - }, - { - 'target_name': 'dependent', - 'type': 'none', - 'msvs_cygwin_shell': '0', - 'dependencies': [ - 'create_intermediate', - ], - 'actions': [ - { - 'action_name': 'dependent', - 'inputs': [ - '<(PRODUCT_DIR)/intermediate', - ], - 'outputs': [ - '<(PRODUCT_DIR)/dependent' - ], - 'action': [ - 'python', 'touch.py', '<(PRODUCT_DIR)/dependent', '<(PRODUCT_DIR)/side_effect', - ], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/restat/src/touch.py b/tools/gyp/test/restat/src/touch.py deleted file mode 100644 index 7cd781a90ce67b9868fcbf136beff066d38d07f5..0000000000000000000000000000000000000000 --- a/tools/gyp/test/restat/src/touch.py +++ /dev/null @@ -1,16 +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. - -import os -import sys - -"""Cross-platform touch.""" - -for fname in sys.argv[1:]: - if os.path.exists(fname): - os.utime(fname, None) - else: - open(fname, 'w').close() diff --git a/tools/gyp/test/rules-dirname/gyptest-dirname.py b/tools/gyp/test/rules-dirname/gyptest-dirname.py deleted file mode 100755 index 420b80f05c5f22457df8133f8ee3a3474c66453e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-dirname/gyptest-dirname.py +++ /dev/null @@ -1,50 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies simple rules when using an explicit build target of 'all'. -""" - -import TestGyp -import os -import sys - -test = TestGyp.TestGyp(formats=['make', 'ninja', 'android', 'xcode', 'msvs']) - -test.run_gyp('actions.gyp', chdir='src') - -test.relocate('src', 'relocate/src') - -test.build('actions.gyp', chdir='relocate/src') - -expect = """\ -no dir here -hi c -hello baz -""" -if test.format == 'xcode': - chdir = 'relocate/src/subdir' -else: - chdir = 'relocate/src' -test.run_built_executable('gencc_int_output', chdir=chdir, stdout=expect) -if test.format == 'msvs': - test.run_built_executable('gencc_int_output_external', chdir=chdir, - stdout=expect) - -test.must_match('relocate/src/subdir/foo/bar/baz.dirname', - os.path.join('foo', 'bar')) -test.must_match('relocate/src/subdir/a/b/c.dirname', - os.path.join('a', 'b')) - -# FIXME the xcode and make generators incorrectly convert RULE_INPUT_PATH -# to an absolute path, making the tests below fail! -if test.format != 'xcode' and test.format != 'make': - test.must_match('relocate/src/subdir/foo/bar/baz.path', - os.path.join('foo', 'bar', 'baz.printvars')) - test.must_match('relocate/src/subdir/a/b/c.path', - os.path.join('a', 'b', 'c.printvars')) - -test.pass_test() diff --git a/tools/gyp/test/rules-dirname/src/actions.gyp b/tools/gyp/test/rules-dirname/src/actions.gyp deleted file mode 100644 index c5693c6c9e15cc167a447bdaaaa3ec7548efd5b8..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-dirname/src/actions.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': 'pull_in_all_actions', - 'type': 'none', - 'dependencies': [ - 'subdir/input-rule-dirname.gyp:*', - ], - }, - ], -} diff --git a/tools/gyp/test/rules-dirname/src/copy-file.py b/tools/gyp/test/rules-dirname/src/copy-file.py deleted file mode 100755 index 9774ccc960753239fc2fba5fd6310718ed465e04..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-dirname/src/copy-file.py +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env python - -# 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. -import sys - -contents = open(sys.argv[1], 'r').read() -open(sys.argv[2], 'wb').write(contents) - -sys.exit(0) diff --git a/tools/gyp/test/rules-dirname/src/subdir/a/b/c.gencc b/tools/gyp/test/rules-dirname/src/subdir/a/b/c.gencc deleted file mode 100644 index 29cb5f79ad79421d9787ce6774bfaafdcdf3bd26..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-dirname/src/subdir/a/b/c.gencc +++ /dev/null @@ -1,8 +0,0 @@ -// -*- mode: c++ -*- -#include - -namespace gen { - void c() { - printf("hi c\n"); - } -} diff --git a/tools/gyp/test/rules-dirname/src/subdir/a/b/c.printvars b/tools/gyp/test/rules-dirname/src/subdir/a/b/c.printvars deleted file mode 100644 index cc4561dc41426af2ae144e516a75db0fa5e4a933..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-dirname/src/subdir/a/b/c.printvars +++ /dev/null @@ -1 +0,0 @@ -# Empty file for testing build rules diff --git a/tools/gyp/test/rules-dirname/src/subdir/foo/bar/baz.gencc b/tools/gyp/test/rules-dirname/src/subdir/foo/bar/baz.gencc deleted file mode 100644 index 90b4ce9243c527ef1b66fae67b3430b0836c561a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-dirname/src/subdir/foo/bar/baz.gencc +++ /dev/null @@ -1,8 +0,0 @@ -// -*- mode: c++ -*- -#include - -namespace gen { - void baz() { - printf("hello baz\n"); - } -} diff --git a/tools/gyp/test/rules-dirname/src/subdir/foo/bar/baz.printvars b/tools/gyp/test/rules-dirname/src/subdir/foo/bar/baz.printvars deleted file mode 100644 index cc4561dc41426af2ae144e516a75db0fa5e4a933..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-dirname/src/subdir/foo/bar/baz.printvars +++ /dev/null @@ -1 +0,0 @@ -# Empty file for testing build rules diff --git a/tools/gyp/test/rules-dirname/src/subdir/input-rule-dirname.gyp b/tools/gyp/test/rules-dirname/src/subdir/input-rule-dirname.gyp deleted file mode 100644 index da749a2231fe119b158eb900d0f96fcb458d8206..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-dirname/src/subdir/input-rule-dirname.gyp +++ /dev/null @@ -1,140 +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': 'print_rule_input_dirname', - 'type': 'none', - 'msvs_cygwin_shell': 0, - 'sources': [ - 'foo/bar/baz.printvars', - 'a/b/c.printvars', - ], - 'rules': [ - { - 'rule_name': 'printvars', - 'extension': 'printvars', - 'inputs': [ - 'printvars.py', - ], - 'outputs': [ - '<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).dirname', - ], - 'action': [ - 'python', '<@(_inputs)', '<(RULE_INPUT_DIRNAME)', '<@(_outputs)', - ], - }, - ], - }, - { - 'target_name': 'print_rule_input_path', - 'type': 'none', - 'msvs_cygwin_shell': 0, - 'sources': [ - 'foo/bar/baz.printvars', - 'a/b/c.printvars', - ], - 'rules': [ - { - 'rule_name': 'printvars', - 'extension': 'printvars', - 'inputs': [ - 'printvars.py', - ], - 'outputs': [ - '<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).path', - ], - 'action': [ - 'python', '<@(_inputs)', '<(RULE_INPUT_PATH)', '<@(_outputs)', - ], - }, - ], - }, - { - 'target_name': 'gencc_int_output', - 'type': 'executable', - 'msvs_cygwin_shell': 0, - 'sources': [ - 'nodir.gencc', - 'foo/bar/baz.gencc', - 'a/b/c.gencc', - 'main.cc', - ], - 'rules': [ - { - 'rule_name': 'gencc', - 'extension': 'gencc', - 'inputs': [ - '<(DEPTH)/copy-file.py', - ], - 'outputs': [ - '<(INTERMEDIATE_DIR)/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).cc', - ], - 'action': [ - 'python', '<@(_inputs)', '<(RULE_INPUT_PATH)', '<@(_outputs)', - ], - 'process_outputs_as_sources': 1, - }, - ], - }, - ], - 'conditions': [ - ['OS=="win"', { - 'targets': [ - { - 'target_name': 'gencc_int_output_external', - 'type': 'executable', - 'msvs_cygwin_shell': 0, - 'msvs_cygwin_dirs': ['../../../../../../<(DEPTH)/third_party/cygwin'], - 'sources': [ - 'nodir.gencc', - 'foo/bar/baz.gencc', - 'a/b/c.gencc', - 'main.cc', - ], - 'dependencies': [ - 'cygwin', - ], - 'rules': [ - { - 'rule_name': 'gencc', - 'extension': 'gencc', - 'msvs_external_rule': 1, - 'inputs': [ - '<(DEPTH)/copy-file.py', - ], - 'outputs': [ - '<(INTERMEDIATE_DIR)/<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT).cc', - ], - 'action': [ - 'python', '<@(_inputs)', '<(RULE_INPUT_PATH)', '<@(_outputs)', - ], - 'process_outputs_as_sources': 1, - }, - ], - }, - { - 'target_name': 'cygwin', - 'type': 'none', - 'actions': [ - { - 'action_name': 'setup_mount', - 'msvs_cygwin_shell': 0, - 'inputs': [ - '../../../../../../<(DEPTH)/third_party/cygwin/setup_mount.bat', - ], - # Visual Studio requires an output file, or else the - # custom build step won't run. - 'outputs': [ - '<(INTERMEDIATE_DIR)/_always_run_setup_mount.marker', - ], - 'action': ['<@(_inputs)'], - }, - ], - }, - ], - }], - ], -} diff --git a/tools/gyp/test/rules-dirname/src/subdir/main.cc b/tools/gyp/test/rules-dirname/src/subdir/main.cc deleted file mode 100644 index 3bb8e01395ee83a64777142dd1fb9f86e28c533d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-dirname/src/subdir/main.cc +++ /dev/null @@ -1,14 +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. -namespace gen { - extern void nodir(); - extern void c(); - extern void baz(); -} - -int main() { - gen::nodir(); - gen::c(); - gen::baz(); -} diff --git a/tools/gyp/test/rules-dirname/src/subdir/nodir.gencc b/tools/gyp/test/rules-dirname/src/subdir/nodir.gencc deleted file mode 100644 index 720f589bc2cb8c98dfd8c84636d57a66bf9ce10b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-dirname/src/subdir/nodir.gencc +++ /dev/null @@ -1,8 +0,0 @@ -// -*- mode: c++ -*- -#include - -namespace gen { - void nodir() { - printf("no dir here\n"); - } -} diff --git a/tools/gyp/test/rules-dirname/src/subdir/printvars.py b/tools/gyp/test/rules-dirname/src/subdir/printvars.py deleted file mode 100755 index ef3d92e8cf7ec8bef88396d34dcbca6c0c955acc..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-dirname/src/subdir/printvars.py +++ /dev/null @@ -1,14 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Prints interesting vars -""" - -import sys; - -out = open(sys.argv[2], 'w') -out.write(sys.argv[1]); diff --git a/tools/gyp/test/rules-rebuild/gyptest-all.py b/tools/gyp/test/rules-rebuild/gyptest-all.py deleted file mode 100755 index aaaa2a6e6f908462ff2441d5019c3ca593801a5e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-rebuild/gyptest-all.py +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies that a rule that generates multiple outputs rebuilds -correctly when the inputs change. -""" - -import TestGyp - -test = TestGyp.TestGyp(workdir='workarea_all') - -test.run_gyp('same_target.gyp', chdir='src') - -test.relocate('src', 'relocate/src') - - -test.build('same_target.gyp', test.ALL, chdir='relocate/src') - -expect = """\ -Hello from main.c -Hello from prog1.in! -Hello from prog2.in! -""" - -test.run_built_executable('program', chdir='relocate/src', stdout=expect) - -test.up_to_date('same_target.gyp', 'program', chdir='relocate/src') - - -test.sleep() -contents = test.read(['relocate', 'src', 'prog1.in']) -contents = contents.replace('!', ' AGAIN!') -test.write(['relocate', 'src', 'prog1.in'], contents) - -test.build('same_target.gyp', test.ALL, chdir='relocate/src') - -expect = """\ -Hello from main.c -Hello from prog1.in AGAIN! -Hello from prog2.in! -""" - -test.run_built_executable('program', chdir='relocate/src', stdout=expect) - -test.up_to_date('same_target.gyp', 'program', chdir='relocate/src') - - -test.sleep() -contents = test.read(['relocate', 'src', 'prog2.in']) -contents = contents.replace('!', ' AGAIN!') -test.write(['relocate', 'src', 'prog2.in'], contents) - -test.build('same_target.gyp', test.ALL, chdir='relocate/src') - -expect = """\ -Hello from main.c -Hello from prog1.in AGAIN! -Hello from prog2.in AGAIN! -""" - -test.run_built_executable('program', chdir='relocate/src', stdout=expect) - -test.up_to_date('same_target.gyp', 'program', chdir='relocate/src') - - -test.pass_test() diff --git a/tools/gyp/test/rules-rebuild/gyptest-default.py b/tools/gyp/test/rules-rebuild/gyptest-default.py deleted file mode 100755 index ac3f0209aa042996a3a5a6df01b2059d2288ad44..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-rebuild/gyptest-default.py +++ /dev/null @@ -1,91 +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. - -""" -Verifies that a rule that generates multiple outputs rebuilds -correctly when the inputs change. -""" - -import TestGyp - -test = TestGyp.TestGyp(workdir='workarea_default') - -test.run_gyp('same_target.gyp', chdir='src') - -test.relocate('src', 'relocate/src') - - -test.build('same_target.gyp', chdir='relocate/src') - -expect = """\ -Hello from main.c -Hello from prog1.in! -Hello from prog2.in! -""" - -test.run_built_executable('program', chdir='relocate/src', stdout=expect) - -test.up_to_date('same_target.gyp', 'program', chdir='relocate/src') - - -test.sleep() -contents = test.read(['relocate', 'src', 'prog1.in']) -contents = contents.replace('!', ' AGAIN!') -test.write(['relocate', 'src', 'prog1.in'], contents) - -test.build('same_target.gyp', chdir='relocate/src') - -expect = """\ -Hello from main.c -Hello from prog1.in AGAIN! -Hello from prog2.in! -""" - -test.run_built_executable('program', chdir='relocate/src', stdout=expect) - -test.up_to_date('same_target.gyp', 'program', chdir='relocate/src') - - -test.sleep() -contents = test.read(['relocate', 'src', 'prog2.in']) -contents = contents.replace('!', ' AGAIN!') -test.write(['relocate', 'src', 'prog2.in'], contents) - -test.build('same_target.gyp', chdir='relocate/src') - -expect = """\ -Hello from main.c -Hello from prog1.in AGAIN! -Hello from prog2.in AGAIN! -""" - -test.run_built_executable('program', chdir='relocate/src', stdout=expect) - -test.up_to_date('same_target.gyp', 'program', chdir='relocate/src') - - -# Test that modifying a rule's inputs (specifically, make-sources.py) causes -# the targets to be built. - -test.sleep() -contents = test.read(['relocate', 'src', 'make-sources.py']) -contents = contents.replace('%s', 'the amazing %s') -test.write(['relocate', 'src', 'make-sources.py'], contents) - -test.build('same_target.gyp', chdir='relocate/src') - -expect = """\ -Hello from main.c -Hello from the amazing prog1.in AGAIN! -Hello from the amazing prog2.in AGAIN! -""" - -test.run_built_executable('program', chdir='relocate/src', stdout=expect) - -test.up_to_date('same_target.gyp', 'program', chdir='relocate/src') - - -test.pass_test() diff --git a/tools/gyp/test/rules-rebuild/src/main.c b/tools/gyp/test/rules-rebuild/src/main.c deleted file mode 100644 index bd8fbb20ea313f131d03cc8810b5cebbbc83c3dc..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-rebuild/src/main.c +++ /dev/null @@ -1,12 +0,0 @@ -#include - -extern void prog1(void); -extern void prog2(void); - -int main(void) -{ - printf("Hello from main.c\n"); - prog1(); - prog2(); - return 0; -} diff --git a/tools/gyp/test/rules-rebuild/src/make-sources.py b/tools/gyp/test/rules-rebuild/src/make-sources.py deleted file mode 100755 index 7ec022780c04f17c1a761ae2ebe070c0d2953158..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-rebuild/src/make-sources.py +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env python -# 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. - -import sys - -assert len(sys.argv) == 4, sys.argv - -(in_file, c_file, h_file) = sys.argv[1:] - -def write_file(filename, contents): - open(filename, 'wb').write(contents) - -write_file(c_file, open(in_file, 'rb').read()) - -write_file(h_file, '#define NAME "%s"\n' % in_file) - -sys.exit(0) diff --git a/tools/gyp/test/rules-rebuild/src/prog1.in b/tools/gyp/test/rules-rebuild/src/prog1.in deleted file mode 100644 index 191b00ef1e6a606145215c3e424d2c763fbc0940..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-rebuild/src/prog1.in +++ /dev/null @@ -1,7 +0,0 @@ -#include -#include "prog1.h" - -void prog1(void) -{ - printf("Hello from %s!\n", NAME); -} diff --git a/tools/gyp/test/rules-rebuild/src/prog2.in b/tools/gyp/test/rules-rebuild/src/prog2.in deleted file mode 100644 index 7bfac5104c9ca254bfa3db22f9d8792d0415342b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-rebuild/src/prog2.in +++ /dev/null @@ -1,7 +0,0 @@ -#include -#include "prog2.h" - -void prog2(void) -{ - printf("Hello from %s!\n", NAME); -} diff --git a/tools/gyp/test/rules-rebuild/src/same_target.gyp b/tools/gyp/test/rules-rebuild/src/same_target.gyp deleted file mode 100644 index 22ba56056d2655fe4af657ff0fa6c0a3aeccc750..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-rebuild/src/same_target.gyp +++ /dev/null @@ -1,31 +0,0 @@ -{ - 'targets': [ - { - 'target_name': 'program', - 'type': 'executable', - 'msvs_cygwin_shell': 0, - 'sources': [ - 'main.c', - 'prog1.in', - 'prog2.in', - ], - 'rules': [ - { - 'rule_name': 'make_sources', - 'extension': 'in', - 'inputs': [ - 'make-sources.py', - ], - 'outputs': [ - '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).c', - '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).h', - ], - 'action': [ - 'python', '<(_inputs)', '<(RULE_INPUT_NAME)', '<@(_outputs)', - ], - 'process_outputs_as_sources': 1, - }, - ], - }, - ], -} diff --git a/tools/gyp/test/rules-use-built-dependencies/gyptest-use-built-dependencies.py b/tools/gyp/test/rules-use-built-dependencies/gyptest-use-built-dependencies.py deleted file mode 100755 index a57c36d5b0dda4427eade04e4ad5e8adb928ebac..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-use-built-dependencies/gyptest-use-built-dependencies.py +++ /dev/null @@ -1,23 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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 that rules which use built dependencies work correctly. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('use-built-dependencies-rule.gyp', chdir='src') - -test.relocate('src', 'relocate/src') -test.build('use-built-dependencies-rule.gyp', chdir='relocate/src') - -test.built_file_must_exist('main_output', chdir='relocate/src') -test.built_file_must_match('main_output', 'output', chdir='relocate/src') - -test.pass_test() diff --git a/tools/gyp/test/rules-use-built-dependencies/src/main.cc b/tools/gyp/test/rules-use-built-dependencies/src/main.cc deleted file mode 100644 index 0f879a7d1830986ea8925fc83c13564eccb02f3a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-use-built-dependencies/src/main.cc +++ /dev/null @@ -1,16 +0,0 @@ -// Copyright (c) 2013 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. -#include - -int main(int argc, char *argv[]) { - if (argc < 2) { - return 2; - } - FILE* file; - file = fopen(argv[1], "wb"); - const char output[] = "output"; - fwrite(output, 1, sizeof(output) - 1, file); - fclose(file); - return 0; -} diff --git a/tools/gyp/test/rules-use-built-dependencies/src/use-built-dependencies-rule.gyp b/tools/gyp/test/rules-use-built-dependencies/src/use-built-dependencies-rule.gyp deleted file mode 100644 index 92bfeda39288f1fcf4f6683e6f7c6a58a7f53c4a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-use-built-dependencies/src/use-built-dependencies-rule.gyp +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright (c) 2013 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': 'main', - 'toolsets': ['host'], - 'type': 'executable', - 'sources': [ - 'main.cc', - ], - }, - { - 'target_name': 'post', - 'toolsets': ['host'], - 'type': 'none', - 'dependencies': [ - 'main', - ], - 'sources': [ - # As this test is written it could easily be made into an action. - # An acutal use case would have a number of these 'sources'. - '<(PRODUCT_DIR)/<(EXECUTABLE_PREFIX)main<(EXECUTABLE_SUFFIX)', - ], - 'rules': [ - { - 'rule_name': 'generate_output', - 'extension': '<(EXECUTABLE_SUFFIX)', - 'outputs': [ '<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT)_output', ], - 'msvs_cygwin_shell': 0, - 'action': [ - '<(RULE_INPUT_PATH)', - '<(RULE_INPUT_DIRNAME)/<(RULE_INPUT_ROOT)_output', - ], - 'message': 'Generating output for <(RULE_INPUT_ROOT)' - }, - ], - }, - ], -} diff --git a/tools/gyp/test/rules-variables/gyptest-rules-variables.py b/tools/gyp/test/rules-variables/gyptest-rules-variables.py deleted file mode 100755 index 06ee5ca8382f22284609be23a9534187fc5c1e9b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-variables/gyptest-rules-variables.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies rules related variables are expanded. -""" - -import TestGyp - -test = TestGyp.TestGyp(formats=['ninja']) - -test.relocate('src', 'relocate/src') - -test.run_gyp('variables.gyp', chdir='relocate/src') - -test.build('variables.gyp', chdir='relocate/src') - -test.run_built_executable('all_rule_variables', - chdir='relocate/src', - stdout="input_root\ninput_dirname\ninput_path\n" + - "input_ext\ninput_name\n") - -test.pass_test() diff --git a/tools/gyp/test/rules-variables/src/input_ext.c b/tools/gyp/test/rules-variables/src/input_ext.c deleted file mode 100644 index f41e73ef8adb67680eee5c27074f1ef81874f2bf..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-variables/src/input_ext.c +++ /dev/null @@ -1,9 +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. - -#include - -void input_ext() { - printf("input_ext\n"); -} diff --git a/tools/gyp/test/rules-variables/src/input_name/test.c b/tools/gyp/test/rules-variables/src/input_name/test.c deleted file mode 100644 index e28b74d1158ab560a7f9bd965a839d2150306b0d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-variables/src/input_name/test.c +++ /dev/null @@ -1,9 +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. - -#include - -void input_name() { - printf("input_name\n"); -} diff --git a/tools/gyp/test/rules-variables/src/input_path/subdir/test.c b/tools/gyp/test/rules-variables/src/input_path/subdir/test.c deleted file mode 100644 index 403dbbda4cf3d58a0790ca5eeb3e1bd483705670..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-variables/src/input_path/subdir/test.c +++ /dev/null @@ -1,9 +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. - -#include - -void input_path() { - printf("input_path\n"); -} diff --git a/tools/gyp/test/rules-variables/src/subdir/input_dirname.c b/tools/gyp/test/rules-variables/src/subdir/input_dirname.c deleted file mode 100644 index 40cecd87d9ff3e22838d713aa138b6110b80d431..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-variables/src/subdir/input_dirname.c +++ /dev/null @@ -1,9 +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. - -#include - -void input_dirname() { - printf("input_dirname\n"); -} diff --git a/tools/gyp/test/rules-variables/src/subdir/test.c b/tools/gyp/test/rules-variables/src/subdir/test.c deleted file mode 100644 index 6c0280b8adf9f4c3a121f8fdc7097f1993044261..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-variables/src/subdir/test.c +++ /dev/null @@ -1,18 +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. - -extern void input_root(); -extern void input_dirname(); -extern void input_path(); -extern void input_ext(); -extern void input_name(); - -int main() { - input_root(); - input_dirname(); - input_path(); - input_ext(); - input_name(); - return 0; -} diff --git a/tools/gyp/test/rules-variables/src/test.input_root.c b/tools/gyp/test/rules-variables/src/test.input_root.c deleted file mode 100644 index 33a7740a5cb9394256e4234dfa9f3362ce8f9055..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-variables/src/test.input_root.c +++ /dev/null @@ -1,9 +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. - -#include - -void input_root() { - printf("input_root\n"); -} diff --git a/tools/gyp/test/rules-variables/src/variables.gyp b/tools/gyp/test/rules-variables/src/variables.gyp deleted file mode 100644 index 6debba12e345bb0741b910fd6f54a3ed35174a9c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules-variables/src/variables.gyp +++ /dev/null @@ -1,40 +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': { - # This test shouldn't ever actually need to execute its rules: there's no - # command line that generates any output anyway. However, there's something - # slightly broken in either ninja or (maybe more likely?) on the win32 VM - # gypbots that breaks dependency checking and causes this rule to want to - # run. When it does run, the cygwin path is wrong, so the do-nothing step - # fails. - # TODO: Investigate and fix whatever's actually failing and remove this. - 'msvs_cygwin_dirs': ['../../../../../../<(DEPTH)/third_party/cygwin'], - }, - 'targets': [ - { - 'target_name': 'all_rule_variables', - 'type': 'executable', - 'sources': [ - 'subdir/test.c', - ], - 'rules': [ - { - 'rule_name': 'rule_variable', - 'extension': 'c', - 'outputs': [ - '<(RULE_INPUT_ROOT).input_root.c', - '<(RULE_INPUT_DIRNAME)/input_dirname.c', - 'input_path/<(RULE_INPUT_PATH)', - 'input_ext<(RULE_INPUT_EXT)', - 'input_name/<(RULE_INPUT_NAME)', - ], - 'action': [], - 'process_outputs_as_sources': 1, - }, - ], - }, - ], -} diff --git a/tools/gyp/test/rules/gyptest-all.py b/tools/gyp/test/rules/gyptest-all.py deleted file mode 100755 index 1a1e63f19166eafa4e06ce456eda0185cf7d631a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/gyptest-all.py +++ /dev/null @@ -1,75 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies simple rules when using an explicit build target of 'all'. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('no_action_with_rules_fails.gyp', chdir='src/noaction', status=1, - stderr=None) - -test.run_gyp('actions.gyp', - '-G', 'xcode_ninja_target_pattern=^pull_in_all_actions$', - chdir='src') - -test.relocate('src', 'relocate/src') - -test.build('actions.gyp', test.ALL, chdir='relocate/src') - -expect = """\ -Hello from program.c -Hello from function1.in -Hello from function2.in -""" - -if test.format == 'xcode': - chdir = 'relocate/src/subdir1' -else: - chdir = 'relocate/src' -test.run_built_executable('program', chdir=chdir, stdout=expect) - -expect = """\ -Hello from program.c -Hello from function3.in -""" - -if test.format == 'xcode': - chdir = 'relocate/src/subdir3' -else: - chdir = 'relocate/src' -test.run_built_executable('program2', chdir=chdir, stdout=expect) - -test.must_match('relocate/src/subdir2/file1.out', 'Hello from file1.in\n') -test.must_match('relocate/src/subdir2/file2.out', 'Hello from file2.in\n') - -test.must_match('relocate/src/subdir2/file1.out2', 'Hello from file1.in\n') -test.must_match('relocate/src/subdir2/file2.out2', 'Hello from file2.in\n') - -test.must_match('relocate/src/subdir2/file1.out4', 'Hello from file1.in\n') -test.must_match('relocate/src/subdir2/file2.out4', 'Hello from file2.in\n') -test.must_match('relocate/src/subdir2/file1.copy', 'Hello from file1.in\n') - -test.must_match('relocate/src/external/file1.external_rules.out', - 'Hello from file1.in\n') -test.must_match('relocate/src/external/file2.external_rules.out', - 'Hello from file2.in\n') - -expect = """\ -Hello from program.c -Got 41. -""" - -if test.format == 'xcode': - chdir = 'relocate/src/subdir4' -else: - chdir = 'relocate/src' -test.run_built_executable('program4', chdir=chdir, stdout=expect) - -test.pass_test() diff --git a/tools/gyp/test/rules/gyptest-default.py b/tools/gyp/test/rules/gyptest-default.py deleted file mode 100755 index fa3227eb6ca681a56c432697d76d334ea5ff61fd..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/gyptest-default.py +++ /dev/null @@ -1,61 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies simple rules when using an explicit build target of 'all'. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('actions.gyp', - '-G', 'xcode_ninja_target_pattern=^pull_in_all_actions$', - chdir='src') - -test.relocate('src', 'relocate/src') - -test.build('actions.gyp', chdir='relocate/src') - -expect = """\ -Hello from program.c -Hello from function1.in -Hello from function2.in -""" - -if test.format == 'xcode': - chdir = 'relocate/src/subdir1' -else: - chdir = 'relocate/src' -test.run_built_executable('program', chdir=chdir, stdout=expect) - -expect = """\ -Hello from program.c -Hello from function3.in -""" - -if test.format == 'xcode': - chdir = 'relocate/src/subdir3' -else: - chdir = 'relocate/src' -test.run_built_executable('program2', chdir=chdir, stdout=expect) - -test.must_match('relocate/src/subdir2/file1.out', 'Hello from file1.in\n') -test.must_match('relocate/src/subdir2/file2.out', 'Hello from file2.in\n') - -test.must_match('relocate/src/subdir2/file1.out2', 'Hello from file1.in\n') -test.must_match('relocate/src/subdir2/file2.out2', 'Hello from file2.in\n') - -test.must_match('relocate/src/subdir2/file1.out4', 'Hello from file1.in\n') -test.must_match('relocate/src/subdir2/file2.out4', 'Hello from file2.in\n') -test.must_match('relocate/src/subdir2/file1.copy', 'Hello from file1.in\n') - -test.must_match('relocate/src/external/file1.external_rules.out', - 'Hello from file1.in\n') -test.must_match('relocate/src/external/file2.external_rules.out', - 'Hello from file2.in\n') - -test.pass_test() diff --git a/tools/gyp/test/rules/gyptest-input-root.py b/tools/gyp/test/rules/gyptest-input-root.py deleted file mode 100755 index 92bade6d48be01d8a8a01e4ae35b6e80bd0b894a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/gyptest-input-root.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies that RULE_INPUT_ROOT isn't turned into a path in rule actions -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('input-root.gyp', chdir='src') - -test.relocate('src', 'relocate/src') - -test.build('input-root.gyp', target='test', chdir='relocate/src') - -expect = """\ -Hello somefile -""" - -test.run_built_executable('test', chdir='relocate/src', stdout=expect) -test.pass_test() diff --git a/tools/gyp/test/rules/gyptest-special-variables.py b/tools/gyp/test/rules/gyptest-special-variables.py deleted file mode 100644 index 05ea7cee16e323879f2eb30406bc9ab1ac7a442e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/gyptest-special-variables.py +++ /dev/null @@ -1,18 +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. - -""" Verifies that VS variables that require special variables are expanded -correctly. """ - -import sys -import TestGyp - -if sys.platform == 'win32': - test = TestGyp.TestGyp() - - test.run_gyp('special-variables.gyp', chdir='src') - test.build('special-variables.gyp', test.ALL, chdir='src') - test.pass_test() diff --git a/tools/gyp/test/rules/src/actions.gyp b/tools/gyp/test/rules/src/actions.gyp deleted file mode 100644 index 84376a719378034fa3d982bc9e298c4049541b78..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/actions.gyp +++ /dev/null @@ -1,23 +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': 'pull_in_all_actions', - 'type': 'none', - 'dependencies': [ - 'subdir1/executable.gyp:*', - 'subdir2/both_rule_and_action_input.gyp:*', - 'subdir2/never_used.gyp:*', - 'subdir2/no_inputs.gyp:*', - 'subdir2/no_action.gyp:*', - 'subdir2/none.gyp:*', - 'subdir3/executable2.gyp:*', - 'subdir4/build-asm.gyp:*', - 'external/external.gyp:*', - ], - }, - ], -} diff --git a/tools/gyp/test/rules/src/an_asm.S b/tools/gyp/test/rules/src/an_asm.S deleted file mode 100644 index eeb13455500135532ec2c44981f9cdcbf2091680..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/an_asm.S +++ /dev/null @@ -1,6 +0,0 @@ -// 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. - -// Fake asm file. -int main() {} diff --git a/tools/gyp/test/rules/src/as.bat b/tools/gyp/test/rules/src/as.bat deleted file mode 100644 index 04636c5166d84f2ce9662b01f5c9371b91f38e00..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/as.bat +++ /dev/null @@ -1,7 +0,0 @@ -@echo off -:: 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. - -:: Fake assembler for Windows -cl /TP /c %1 /Fo%2 diff --git a/tools/gyp/test/rules/src/copy-file.py b/tools/gyp/test/rules/src/copy-file.py deleted file mode 100755 index 5a5feae1f21eed4dbd014afa9c51917fb5ecfe51..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/copy-file.py +++ /dev/null @@ -1,11 +0,0 @@ -#!/usr/bin/env python - -# 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. -import sys - -contents = open(sys.argv[1], 'r').read() -open(sys.argv[2], 'wb').write(contents) - -sys.exit(0) diff --git a/tools/gyp/test/rules/src/external/external.gyp b/tools/gyp/test/rules/src/external/external.gyp deleted file mode 100644 index b28174f57c3c9155c67ea5888f7229798ac4c00a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/external/external.gyp +++ /dev/null @@ -1,66 +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. - -# Test that the case where there are no inputs (other than the -# file the rule applies to). -{ - 'target_defaults': { - 'msvs_cygwin_dirs': ['../../../../../../<(DEPTH)/third_party/cygwin'], - }, - 'targets': [ - { - 'target_name': 'external_rules', - 'type': 'none', - 'sources': [ - 'file1.in', - 'file2.in', - ], - 'conditions': [ - ['OS=="win"', { - 'dependencies': [ - 'cygwin', - ], - }], - ], - 'rules': [ - { - 'rule_name': 'copy_file', - 'extension': 'in', - 'msvs_external_rule': 1, - 'outputs': [ - '<(RULE_INPUT_ROOT).external_rules.out', - ], - 'action': [ - 'python', '../copy-file.py', '<(RULE_INPUT_PATH)', '<@(_outputs)', - ], - }, - ], - }, - ], - 'conditions': [ - ['OS=="win"', { - 'targets': [ - { - 'target_name': 'cygwin', - 'type': 'none', - 'actions': [ - { - 'action_name': 'setup_mount', - 'msvs_cygwin_shell': 0, - 'inputs': [ - '../../../../../../<(DEPTH)/third_party/cygwin/setup_mount.bat', - ], - # Visual Studio requires an output file, or else the - # custom build step won't run. - 'outputs': [ - '<(INTERMEDIATE_DIR)/_always_run_setup_mount.marker', - ], - 'action': ['<@(_inputs)'], - }, - ], - }, - ], - }], - ], -} diff --git a/tools/gyp/test/rules/src/external/file1.in b/tools/gyp/test/rules/src/external/file1.in deleted file mode 100644 index 86ac3ad389d0f323bbee5c0e327a1eac429281ab..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/external/file1.in +++ /dev/null @@ -1 +0,0 @@ -Hello from file1.in diff --git a/tools/gyp/test/rules/src/external/file2.in b/tools/gyp/test/rules/src/external/file2.in deleted file mode 100644 index bf83d8ecece5756d51f6bc1e28ea3d7b7cb9ffa7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/external/file2.in +++ /dev/null @@ -1 +0,0 @@ -Hello from file2.in diff --git a/tools/gyp/test/rules/src/input-root.gyp b/tools/gyp/test/rules/src/input-root.gyp deleted file mode 100644 index b6600e767c8ead8db822da0561f1ef5f5bd53fc8..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/input-root.gyp +++ /dev/null @@ -1,24 +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': 'test', - 'type': 'executable', - 'sources': [ 'somefile.ext', ], - 'rules': [{ - 'rule_name': 'rule', - 'extension': 'ext', - 'inputs': [ 'rule.py', ], - 'outputs': [ '<(RULE_INPUT_ROOT).cc', ], - 'action': [ 'python', 'rule.py', '<(RULE_INPUT_ROOT)', ], - 'message': 'Processing <(RULE_INPUT_PATH)', - 'process_outputs_as_sources': 1, - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }], - }, - ], -} diff --git a/tools/gyp/test/rules/src/noaction/file1.in b/tools/gyp/test/rules/src/noaction/file1.in deleted file mode 100644 index 86ac3ad389d0f323bbee5c0e327a1eac429281ab..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/noaction/file1.in +++ /dev/null @@ -1 +0,0 @@ -Hello from file1.in diff --git a/tools/gyp/test/rules/src/noaction/no_action_with_rules_fails.gyp b/tools/gyp/test/rules/src/noaction/no_action_with_rules_fails.gyp deleted file mode 100644 index 9b6a65629f3b86742f8be97cde67e6975eb0dedb..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/noaction/no_action_with_rules_fails.gyp +++ /dev/null @@ -1,37 +0,0 @@ -# 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 the case where there's no action but there are input rules that should -# be processed results in a gyp failure. -{ - 'targets': [ - { - 'target_name': 'extension_does_match_sources_but_no_action', - 'type': 'none', - 'msvs_cygwin_shell': 0, - 'sources': [ - 'file1.in', - ], - 'rules': [ - { - 'rule_name': 'assembled', - 'extension': 'in', - 'outputs': [ - '<(RULE_INPUT_ROOT).in', - ], - 'conditions': [ - # Always fails. - [ '"true"=="false"', { - 'action': [ - 'python', '../copy-file.py', '<(RULE_INPUT_PATH)', '<@(_outputs)', - ], - 'process_outputs_as_sources': 1, - 'message': 'test_rule', - }], - ], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/rules/src/rule.py b/tools/gyp/test/rules/src/rule.py deleted file mode 100755 index 8a1f36dedb18111a724c0d63a7f48f0f9afab9b6..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/rule.py +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env python -# 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. - -import sys - -f = open(sys.argv[1] + ".cc", "w") -f.write("""\ -#include - -int main() { - puts("Hello %s"); - return 0; -} -""" % sys.argv[1]) -f.close() diff --git a/tools/gyp/test/rules/src/somefile.ext b/tools/gyp/test/rules/src/somefile.ext deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tools/gyp/test/rules/src/special-variables.gyp b/tools/gyp/test/rules/src/special-variables.gyp deleted file mode 100644 index d1443af5ba0fd41b81b0f3951d3fbfacac1a6e79..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/special-variables.gyp +++ /dev/null @@ -1,34 +0,0 @@ -# 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': [ - { - 'rules': [ - { - 'rule_name': 'assembler (gnu-compatible)', - 'msvs_cygwin_shell': 0, - 'msvs_quote_cmd': 0, - 'extension': 'S', - 'inputs': [ - 'as.bat', - ], - 'outputs': [ - '$(IntDir)/$(InputName).obj', - ], - 'action': [ - 'as.bat', - '$(InputPath)', - '$(IntDir)/$(InputName).obj', - ], - 'message': 'Building assembly language file $(InputPath)', - 'process_outputs_as_sources': 1, - }, - ], - 'target_name': 'test', - 'type': 'static_library', - 'sources': [ 'an_asm.S' ], - }, - ], -} diff --git a/tools/gyp/test/rules/src/subdir1/executable.gyp b/tools/gyp/test/rules/src/subdir1/executable.gyp deleted file mode 100644 index c34cce5a92e23e8c7d53789f7f0a4d035e21e4d7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/subdir1/executable.gyp +++ /dev/null @@ -1,37 +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': 'program', - 'type': 'executable', - 'msvs_cygwin_shell': 0, - 'sources': [ - 'program.c', - 'function1.in', - 'function2.in', - ], - 'rules': [ - { - 'rule_name': 'copy_file', - 'extension': 'in', - 'inputs': [ - '../copy-file.py', - ], - 'outputs': [ - # TODO: fix Make to support generated files not - # in a variable-named path like <(INTERMEDIATE_DIR) - #'<(RULE_INPUT_ROOT).c', - '<(INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).c', - ], - 'action': [ - 'python', '<(_inputs)', '<(RULE_INPUT_PATH)', '<@(_outputs)', - ], - 'process_outputs_as_sources': 1, - }, - ], - }, - ], -} diff --git a/tools/gyp/test/rules/src/subdir1/function1.in b/tools/gyp/test/rules/src/subdir1/function1.in deleted file mode 100644 index 60ff28949b9af580cfe6838bd2dd4f5fd2f75312..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/subdir1/function1.in +++ /dev/null @@ -1,6 +0,0 @@ -#include - -void function1(void) -{ - printf("Hello from function1.in\n"); -} diff --git a/tools/gyp/test/rules/src/subdir1/function2.in b/tools/gyp/test/rules/src/subdir1/function2.in deleted file mode 100644 index 0fcfc03fdb91ea9e915ad5351c36efe143f1c2aa..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/subdir1/function2.in +++ /dev/null @@ -1,6 +0,0 @@ -#include - -void function2(void) -{ - printf("Hello from function2.in\n"); -} diff --git a/tools/gyp/test/rules/src/subdir1/program.c b/tools/gyp/test/rules/src/subdir1/program.c deleted file mode 100644 index 6b11ff9f6753ced0ecb808814cb2837709705187..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/subdir1/program.c +++ /dev/null @@ -1,12 +0,0 @@ -#include - -extern void function1(void); -extern void function2(void); - -int main(void) -{ - printf("Hello from program.c\n"); - function1(); - function2(); - return 0; -} diff --git a/tools/gyp/test/rules/src/subdir2/both_rule_and_action_input.gyp b/tools/gyp/test/rules/src/subdir2/both_rule_and_action_input.gyp deleted file mode 100644 index e5e6f3ec2b19ec0161be21db13d4f7d124e2cd84..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/subdir2/both_rule_and_action_input.gyp +++ /dev/null @@ -1,50 +0,0 @@ -# Copyright (c) 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. - -# Tests that if a rule input is also an action input, both the rule and action -# are executed -{ - 'targets': [ - { - 'target_name': 'files_both_rule_and_action_input', - 'type': 'executable', - 'msvs_cygwin_shell': 0, - 'sources': [ - 'program.c', - 'file1.in', - 'file2.in', - ], - 'rules': [ - { - 'rule_name': 'copy_file', - 'extension': 'in', - 'inputs': [ - '../copy-file.py', - ], - 'outputs': [ - '<(RULE_INPUT_ROOT).out4', - ], - 'action': [ - 'python', '<(_inputs)', '<(RULE_INPUT_PATH)', '<@(_outputs)', - ], - }, - ], - 'actions': [ - { - 'action_name': 'copy_file1_in', - 'inputs': [ - '../copy-file.py', - 'file1.in', - ], - 'outputs': [ - 'file1.copy', - ], - 'action': [ - 'python', '<@(_inputs)', '<(_outputs)' - ], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/rules/src/subdir2/file1.in b/tools/gyp/test/rules/src/subdir2/file1.in deleted file mode 100644 index 86ac3ad389d0f323bbee5c0e327a1eac429281ab..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/subdir2/file1.in +++ /dev/null @@ -1 +0,0 @@ -Hello from file1.in diff --git a/tools/gyp/test/rules/src/subdir2/file2.in b/tools/gyp/test/rules/src/subdir2/file2.in deleted file mode 100644 index bf83d8ecece5756d51f6bc1e28ea3d7b7cb9ffa7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/subdir2/file2.in +++ /dev/null @@ -1 +0,0 @@ -Hello from file2.in diff --git a/tools/gyp/test/rules/src/subdir2/never_used.gyp b/tools/gyp/test/rules/src/subdir2/never_used.gyp deleted file mode 100644 index 17f6f553710cdd6701abe0a074628584fb232859..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/subdir2/never_used.gyp +++ /dev/null @@ -1,31 +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. - -# Test that the case where there is a rule that doesn't apply to anything. -{ - 'targets': [ - { - 'target_name': 'files_no_input2', - 'type': 'none', - 'msvs_cygwin_shell': 0, - 'sources': [ - 'file1.in', - 'file2.in', - ], - 'rules': [ - { - 'rule_name': 'copy_file3', - 'extension': 'in2', - 'outputs': [ - '<(RULE_INPUT_ROOT).out3', - ], - 'action': [ - 'python', '../copy-file.py', '<(RULE_INPUT_PATH)', '<@(_outputs)', - ], - 'process_outputs_as_sources': 1, - }, - ], - }, - ], -} diff --git a/tools/gyp/test/rules/src/subdir2/no_action.gyp b/tools/gyp/test/rules/src/subdir2/no_action.gyp deleted file mode 100644 index ffa1cefe182f95ab2cb0ebb9b5d3f7e23cddf673..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/subdir2/no_action.gyp +++ /dev/null @@ -1,38 +0,0 @@ -# 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 the case where an action is only specified under a conditional is -# evaluated appropriately. -{ - 'targets': [ - { - 'target_name': 'extension_does_not_match_sources_and_no_action', - 'type': 'none', - 'msvs_cygwin_shell': 0, - 'sources': [ - 'file1.in', - 'file2.in', - ], - 'rules': [ - { - 'rule_name': 'assemble', - 'extension': 'asm', - 'outputs': [ - '<(RULE_INPUT_ROOT).fail', - ], - 'conditions': [ - # Always fails. - [ '"true"=="false"', { - 'action': [ - 'python', '../copy-file.py', '<(RULE_INPUT_PATH)', '<@(_outputs)', - ], - 'process_outputs_as_sources': 1, - 'message': 'test_rule', - }], - ], - }, - ], - }, - ], -} diff --git a/tools/gyp/test/rules/src/subdir2/no_inputs.gyp b/tools/gyp/test/rules/src/subdir2/no_inputs.gyp deleted file mode 100644 index e61a1a3ff674ac45244100403f90c212c028a742..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/subdir2/no_inputs.gyp +++ /dev/null @@ -1,32 +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. - -# Test that the case where there are no inputs (other than the -# file the rule applies to). -{ - 'targets': [ - { - 'target_name': 'files_no_input', - 'type': 'none', - 'msvs_cygwin_shell': 0, - 'sources': [ - 'file1.in', - 'file2.in', - ], - 'rules': [ - { - 'rule_name': 'copy_file2', - 'extension': 'in', - 'outputs': [ - '<(RULE_INPUT_ROOT).out2', - ], - 'action': [ - 'python', '../copy-file.py', '<(RULE_INPUT_PATH)', '<@(_outputs)', - ], - 'process_outputs_as_sources': 1, - }, - ], - }, - ], -} diff --git a/tools/gyp/test/rules/src/subdir2/none.gyp b/tools/gyp/test/rules/src/subdir2/none.gyp deleted file mode 100644 index 38bcdabdf6616e91f676ee4780e764dee9f16316..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/subdir2/none.gyp +++ /dev/null @@ -1,33 +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': 'files', - 'type': 'none', - 'msvs_cygwin_shell': 0, - 'sources': [ - 'file1.in', - 'file2.in', - ], - 'rules': [ - { - 'rule_name': 'copy_file', - 'extension': 'in', - 'inputs': [ - '../copy-file.py', - ], - 'outputs': [ - '<(RULE_INPUT_ROOT).out', - ], - 'action': [ - 'python', '<(_inputs)', '<(RULE_INPUT_PATH)', '<@(_outputs)', - ], - 'process_outputs_as_sources': 1, - }, - ], - }, - ], -} diff --git a/tools/gyp/test/rules/src/subdir2/program.c b/tools/gyp/test/rules/src/subdir2/program.c deleted file mode 100644 index e5db175148e7069017a85c2e47d1f420624d636a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/subdir2/program.c +++ /dev/null @@ -1,12 +0,0 @@ -/* Copyright (c) 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. - */ - -#include - -int main(void) -{ - printf("Hello from program.c\n"); - return 0; -} diff --git a/tools/gyp/test/rules/src/subdir3/executable2.gyp b/tools/gyp/test/rules/src/subdir3/executable2.gyp deleted file mode 100644 index a2a528fc7bea186dc9bf8d9136b370a21bc2592a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/subdir3/executable2.gyp +++ /dev/null @@ -1,37 +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. - -# This one tests that rules are properly written if extensions are different -# between the target's sources (program.c) and the generated files -# (function3.cc) - -{ - 'targets': [ - { - 'target_name': 'program2', - 'type': 'executable', - 'msvs_cygwin_shell': 0, - 'sources': [ - 'program.c', - 'function3.in', - ], - 'rules': [ - { - 'rule_name': 'copy_file', - 'extension': 'in', - 'inputs': [ - '../copy-file.py', - ], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).cc', - ], - 'action': [ - 'python', '<(_inputs)', '<(RULE_INPUT_PATH)', '<@(_outputs)', - ], - 'process_outputs_as_sources': 1, - }, - ], - }, - ], -} diff --git a/tools/gyp/test/rules/src/subdir3/function3.in b/tools/gyp/test/rules/src/subdir3/function3.in deleted file mode 100644 index 99f46ab05e6ec4b182eaa59d05264d67f2c773a1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/subdir3/function3.in +++ /dev/null @@ -1,6 +0,0 @@ -#include - -extern "C" void function3(void) -{ - printf("Hello from function3.in\n"); -} diff --git a/tools/gyp/test/rules/src/subdir3/program.c b/tools/gyp/test/rules/src/subdir3/program.c deleted file mode 100644 index c38eead50e89fadbf9deb7610f270acc63b54780..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/subdir3/program.c +++ /dev/null @@ -1,10 +0,0 @@ -#include - -extern void function3(void); - -int main(void) -{ - printf("Hello from program.c\n"); - function3(); - return 0; -} diff --git a/tools/gyp/test/rules/src/subdir4/asm-function.assem b/tools/gyp/test/rules/src/subdir4/asm-function.assem deleted file mode 100644 index ed47cade95926f3dc2cb1a0b63e0dc390d6de39b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/subdir4/asm-function.assem +++ /dev/null @@ -1,10 +0,0 @@ -#if PLATFORM_WINDOWS || PLATFORM_MAC -# define IDENTIFIER(n) _##n -#else /* Linux */ -# define IDENTIFIER(n) n -#endif - -.globl IDENTIFIER(asm_function) -IDENTIFIER(asm_function): - movl $41, %eax - ret diff --git a/tools/gyp/test/rules/src/subdir4/build-asm.gyp b/tools/gyp/test/rules/src/subdir4/build-asm.gyp deleted file mode 100644 index fe0fe93787e1e753e764753d3ef53627ae0af786..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/subdir4/build-asm.gyp +++ /dev/null @@ -1,49 +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. - -# This one tests that assembly files ended as .s and .S are compiled. - -{ - 'target_defaults': { - 'conditions': [ - ['OS=="win"', { - 'defines': ['PLATFORM_WIN'], - }], - ['OS=="mac"', { - 'defines': ['PLATFORM_MAC'], - }], - ['OS=="linux"', { - 'defines': ['PLATFORM_LINUX'], - }], - ], - }, - 'targets': [ - { - 'target_name': 'program4', - 'type': 'executable', - 'sources': [ - 'asm-function.assem', - 'program.c', - ], - 'conditions': [ - ['OS=="linux" or OS=="mac"', { - 'rules': [ - { - 'rule_name': 'convert_assem', - 'extension': 'assem', - 'inputs': [], - 'outputs': [ - '<(SHARED_INTERMEDIATE_DIR)/<(RULE_INPUT_ROOT).S', - ], - 'action': [ - 'bash', '-c', 'cp <(RULE_INPUT_PATH) <@(_outputs)', - ], - 'process_outputs_as_sources': 1, - }, - ], - }], - ], - }, - ], -} diff --git a/tools/gyp/test/rules/src/subdir4/program.c b/tools/gyp/test/rules/src/subdir4/program.c deleted file mode 100644 index ad647f4eb991b1312a9f35f742802f8eb5ae73b5..0000000000000000000000000000000000000000 --- a/tools/gyp/test/rules/src/subdir4/program.c +++ /dev/null @@ -1,19 +0,0 @@ -#include - -// Use the assembly function in linux and mac where it is built. -#if PLATFORM_LINUX || PLATFORM_MAC -extern int asm_function(void); -#else -int asm_function() { - return 41; -} -#endif - -int main(void) -{ - fprintf(stdout, "Hello from program.c\n"); - fflush(stdout); - fprintf(stdout, "Got %d.\n", asm_function()); - fflush(stdout); - return 0; -} diff --git a/tools/gyp/test/same-gyp-name/gyptest-all.py b/tools/gyp/test/same-gyp-name/gyptest-all.py deleted file mode 100755 index cda1a72d4d1e400444b794e9a8163e33478453e1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-gyp-name/gyptest-all.py +++ /dev/null @@ -1,38 +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. - -""" -Build a .gyp that depends on 2 gyp files with the same name. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('all.gyp', chdir='src') - -test.relocate('src', 'relocate/src') - -test.build('all.gyp', test.ALL, chdir='relocate/src') - -expect1 = """\ -Hello from main1.cc -""" - -expect2 = """\ -Hello from main2.cc -""" - -if test.format == 'xcode': - chdir1 = 'relocate/src/subdir1' - chdir2 = 'relocate/src/subdir2' -else: - chdir1 = chdir2 = 'relocate/src' - -test.run_built_executable('program1', chdir=chdir1, stdout=expect1) -test.run_built_executable('program2', chdir=chdir2, stdout=expect2) - -test.pass_test() diff --git a/tools/gyp/test/same-gyp-name/gyptest-default.py b/tools/gyp/test/same-gyp-name/gyptest-default.py deleted file mode 100755 index 5e4bba0012e5bb639ef94fc1e1571af680f3b1e6..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-gyp-name/gyptest-default.py +++ /dev/null @@ -1,38 +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. - -""" -Build a .gyp that depends on 2 gyp files with the same name. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('all.gyp', chdir='src') - -test.relocate('src', 'relocate/src') - -test.build('all.gyp', chdir='relocate/src') - -expect1 = """\ -Hello from main1.cc -""" - -expect2 = """\ -Hello from main2.cc -""" - -if test.format == 'xcode': - chdir1 = 'relocate/src/subdir1' - chdir2 = 'relocate/src/subdir2' -else: - chdir1 = chdir2 = 'relocate/src' - -test.run_built_executable('program1', chdir=chdir1, stdout=expect1) -test.run_built_executable('program2', chdir=chdir2, stdout=expect2) - -test.pass_test() diff --git a/tools/gyp/test/same-gyp-name/gyptest-library.py b/tools/gyp/test/same-gyp-name/gyptest-library.py deleted file mode 100644 index 957a4a52d64cace4be6b4a4064fc56219b0d37dc..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-gyp-name/gyptest-library.py +++ /dev/null @@ -1,20 +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. - -""" -Verifies that a dependency on two gyp files with the same name do not create a -uid collision in the resulting generated xcode file. -""" - -import TestGyp - -import sys - -test = TestGyp.TestGyp() - -test.run_gyp('test.gyp', chdir='library') - -test.pass_test() diff --git a/tools/gyp/test/same-gyp-name/library/one/sub.gyp b/tools/gyp/test/same-gyp-name/library/one/sub.gyp deleted file mode 100644 index 1bed941e547f3047b55461d447fd62e6b08e2341..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-gyp-name/library/one/sub.gyp +++ /dev/null @@ -1,11 +0,0 @@ -# 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': 'one', - 'type': 'static_library', - }, - ], -} diff --git a/tools/gyp/test/same-gyp-name/library/test.gyp b/tools/gyp/test/same-gyp-name/library/test.gyp deleted file mode 100644 index 552a77ed7eef2aef2a92a66d0ff9dec781794106..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-gyp-name/library/test.gyp +++ /dev/null @@ -1,15 +0,0 @@ -# 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': 'duplicate_names', - 'type': 'shared_library', - 'dependencies': [ - 'one/sub.gyp:one', - 'two/sub.gyp:two', - ], - }, - ], -} diff --git a/tools/gyp/test/same-gyp-name/library/two/sub.gyp b/tools/gyp/test/same-gyp-name/library/two/sub.gyp deleted file mode 100644 index 934c98a496e38b59ec7d1415cef731e617766cfc..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-gyp-name/library/two/sub.gyp +++ /dev/null @@ -1,11 +0,0 @@ -# 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': 'two', - 'type': 'static_library', - }, - ], -} diff --git a/tools/gyp/test/same-gyp-name/src/all.gyp b/tools/gyp/test/same-gyp-name/src/all.gyp deleted file mode 100644 index 229f02ea845c7720910b581076fc669b2804bc60..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-gyp-name/src/all.gyp +++ /dev/null @@ -1,16 +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': 'all_exes', - 'type': 'none', - 'dependencies': [ - 'subdir1/executable.gyp:*', - 'subdir2/executable.gyp:*', - ], - }, - ], -} diff --git a/tools/gyp/test/same-gyp-name/src/subdir1/executable.gyp b/tools/gyp/test/same-gyp-name/src/subdir1/executable.gyp deleted file mode 100644 index 82483b4c69666d082b593d40f22e8b73c2dd9fae..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-gyp-name/src/subdir1/executable.gyp +++ /dev/null @@ -1,15 +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': 'program1', - 'type': 'executable', - 'sources': [ - 'main1.cc', - ], - }, - ], -} diff --git a/tools/gyp/test/same-gyp-name/src/subdir1/main1.cc b/tools/gyp/test/same-gyp-name/src/subdir1/main1.cc deleted file mode 100644 index 3645558324d720f09b010996528bb83a8423dc2b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-gyp-name/src/subdir1/main1.cc +++ /dev/null @@ -1,6 +0,0 @@ -#include - -int main() { - printf("Hello from main1.cc\n"); - return 0; -} diff --git a/tools/gyp/test/same-gyp-name/src/subdir2/executable.gyp b/tools/gyp/test/same-gyp-name/src/subdir2/executable.gyp deleted file mode 100644 index e3537013eb1815e40f8d8f91613c8ff91aad95ee..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-gyp-name/src/subdir2/executable.gyp +++ /dev/null @@ -1,15 +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': 'program2', - 'type': 'executable', - 'sources': [ - 'main2.cc', - ], - }, - ], -} diff --git a/tools/gyp/test/same-gyp-name/src/subdir2/main2.cc b/tools/gyp/test/same-gyp-name/src/subdir2/main2.cc deleted file mode 100644 index 0c724dee35fe00076e0b3f78d5e18d0583224afa..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-gyp-name/src/subdir2/main2.cc +++ /dev/null @@ -1,6 +0,0 @@ -#include - -int main() { - printf("Hello from main2.cc\n"); - return 0; -} diff --git a/tools/gyp/test/same-rule-output-file-name/gyptest-all.py b/tools/gyp/test/same-rule-output-file-name/gyptest-all.py deleted file mode 100644 index 964e6b7721a7029502af18ad6d9e512056c475c4..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-rule-output-file-name/gyptest-all.py +++ /dev/null @@ -1,23 +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. - -""" -Tests the use of rules with the same output file name. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('subdirs.gyp', chdir='src') - -test.relocate('src', 'relocate/src') - -test.build('subdirs.gyp', test.ALL, chdir='relocate/src') -test.must_exist('relocate/src/subdir1/rule.txt') -test.must_exist('relocate/src/subdir2/rule.txt') - -test.pass_test() diff --git a/tools/gyp/test/same-rule-output-file-name/src/subdir1/subdir1.gyp b/tools/gyp/test/same-rule-output-file-name/src/subdir1/subdir1.gyp deleted file mode 100644 index bff381a5a51037f002fdf0a0ee7ec70fc4761109..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-rule-output-file-name/src/subdir1/subdir1.gyp +++ /dev/null @@ -1,30 +0,0 @@ -# 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': 'target1', - 'type': 'none', - 'sources': [ - '../touch.py' - ], - 'rules': [ - { - 'rule_name': 'rule1', - 'extension': 'py', - 'inputs': [], - 'outputs': [ - 'rule.txt', - ], - 'action': [ - 'python', '../touch.py', '<(_outputs)', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - ], - }, - ], -} diff --git a/tools/gyp/test/same-rule-output-file-name/src/subdir2/subdir2.gyp b/tools/gyp/test/same-rule-output-file-name/src/subdir2/subdir2.gyp deleted file mode 100644 index 12a35600a3118c5aecfeb58cd2acbd12fd9eb54f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-rule-output-file-name/src/subdir2/subdir2.gyp +++ /dev/null @@ -1,30 +0,0 @@ -# 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': 'target2', - 'type': 'none', - 'sources': [ - '../touch.py' - ], - 'rules': [ - { - 'rule_name': 'rule2', - 'extension': 'py', - 'inputs': [], - 'outputs': [ - 'rule.txt', - ], - 'action': [ - 'python', '../touch.py', '<(_outputs)', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - ], - }, - ], -} diff --git a/tools/gyp/test/same-rule-output-file-name/src/subdirs.gyp b/tools/gyp/test/same-rule-output-file-name/src/subdirs.gyp deleted file mode 100644 index 25259a38f4e583824dc8413ddd8646834091e1fd..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-rule-output-file-name/src/subdirs.gyp +++ /dev/null @@ -1,16 +0,0 @@ -# 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': 'subdirs', - 'type': 'none', - 'dependencies': [ - 'subdir1/subdir1.gyp:*', - 'subdir2/subdir2.gyp:*', - ], - }, - ], -} diff --git a/tools/gyp/test/same-rule-output-file-name/src/touch.py b/tools/gyp/test/same-rule-output-file-name/src/touch.py deleted file mode 100644 index 2291e9cc560430aceb760210ff10e11f8550bc55..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-rule-output-file-name/src/touch.py +++ /dev/null @@ -1,11 +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. - -import sys - -f = open(sys.argv[1], 'w+') -f.write('Hello from touch.py\n') -f.close() diff --git a/tools/gyp/test/same-source-file-name/gyptest-all.py b/tools/gyp/test/same-source-file-name/gyptest-all.py deleted file mode 100755 index 4c215027c2ae8ac5fa7b2aff5f7c8a529bf4ee72..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-source-file-name/gyptest-all.py +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Build a .gyp with two targets that share a common .c source file. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('all.gyp', chdir='src') - -test.relocate('src', 'relocate/src') - -test.build('all.gyp', test.ALL, chdir='relocate/src') - -expect1 = """\ -Hello from prog1.c -Hello prog1 from func.c -""" - -expect2 = """\ -Hello from prog2.c -Hello prog2 from func.c -""" - -test.run_built_executable('prog1', chdir='relocate/src', stdout=expect1) -test.run_built_executable('prog2', chdir='relocate/src', stdout=expect2) - -test.pass_test() diff --git a/tools/gyp/test/same-source-file-name/gyptest-default.py b/tools/gyp/test/same-source-file-name/gyptest-default.py deleted file mode 100755 index 98757c26971564b1729e4ab1f77d3ae6418ababc..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-source-file-name/gyptest-default.py +++ /dev/null @@ -1,34 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Build a .gyp with two targets that share a common .c source file. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('all.gyp', chdir='src') - -test.relocate('src', 'relocate/src') - -test.build('all.gyp', chdir='relocate/src') - -expect1 = """\ -Hello from prog1.c -Hello prog1 from func.c -""" - -expect2 = """\ -Hello from prog2.c -Hello prog2 from func.c -""" - -test.run_built_executable('prog1', chdir='relocate/src', stdout=expect1) -test.run_built_executable('prog2', chdir='relocate/src', stdout=expect2) - -test.pass_test() diff --git a/tools/gyp/test/same-source-file-name/gyptest-pass-executable.py b/tools/gyp/test/same-source-file-name/gyptest-pass-executable.py deleted file mode 100755 index 1a3dcda23d56690f725f6213a6a72d1ece6d16a7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-source-file-name/gyptest-pass-executable.py +++ /dev/null @@ -1,33 +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. - -""" -Checks that gyp does not fail on executable targets which have several files -with the same basename. -""" - -import TestGyp - -# While MSVS supports building executables that contain several files with the -# same name, the msvs gyp generator does not. -test = TestGyp.TestGyp(formats=['!msvs']) - -test.run_gyp('double-executable.gyp', chdir='src') - -test.relocate('src', 'relocate/src') - -test.build('double-executable.gyp', test.ALL, chdir='relocate/src') - -expect = """\ -Hello from prog3.c -Hello prog3 from func.c -Hello prog3 from subdir1/func.c -Hello prog3 from subdir2/func.c -""" - -test.run_built_executable('prog3', chdir='relocate/src', stdout=expect) - -test.pass_test() diff --git a/tools/gyp/test/same-source-file-name/gyptest-shared.py b/tools/gyp/test/same-source-file-name/gyptest-shared.py deleted file mode 100755 index 4cad63f6a179cc20f94d3a99efee6e0afd9e6a17..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-source-file-name/gyptest-shared.py +++ /dev/null @@ -1,27 +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. - -""" -Checks that gyp succeeds on shared_library targets which have several files with -the same basename. -""" - -import os - -import TestGyp - -test = TestGyp.TestGyp() - -if ((test.format == 'msvs') and - (int(os.environ.get('GYP_MSVS_VERSION', 2010)) < 2010)): - test.run_gyp('double-shared.gyp', - chdir='src', status=0, stderr=None) -else: - test.run_gyp('double-shared.gyp', - chdir='src') - test.build('double-shared.gyp', test.ALL, chdir='src') - -test.pass_test() diff --git a/tools/gyp/test/same-source-file-name/gyptest-static.py b/tools/gyp/test/same-source-file-name/gyptest-static.py deleted file mode 100755 index fc067e9885fbc9a0f11db6119fc1eba0312ad5a4..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-source-file-name/gyptest-static.py +++ /dev/null @@ -1,29 +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. - -""" -Checks that gyp succeeds on static_library targets which have several files with -the same basename. -""" - -import os -import sys - -import TestGyp - -test = TestGyp.TestGyp() - -if ((test.format == 'make' and sys.platform == 'darwin') or - (test.format == 'msvs' and - int(os.environ.get('GYP_MSVS_VERSION', 2010)) < 2010)): - test.run_gyp('double-static.gyp', - chdir='src', status=1, stderr=None) -else: - test.run_gyp('double-static.gyp', - chdir='src') - test.build('double-static.gyp', test.ALL, chdir='src') - -test.pass_test() diff --git a/tools/gyp/test/same-source-file-name/src/all.gyp b/tools/gyp/test/same-source-file-name/src/all.gyp deleted file mode 100644 index 4fe052c66871434f50959cc60a4a49099721f1bd..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-source-file-name/src/all.gyp +++ /dev/null @@ -1,30 +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': 'prog1', - 'type': 'executable', - 'defines': [ - 'PROG="prog1"', - ], - 'sources': [ - 'prog1.c', - 'func.c', - ], - }, - { - 'target_name': 'prog2', - 'type': 'executable', - 'defines': [ - 'PROG="prog2"', - ], - 'sources': [ - 'prog2.c', - 'func.c', - ], - }, - ], -} diff --git a/tools/gyp/test/same-source-file-name/src/double-executable.gyp b/tools/gyp/test/same-source-file-name/src/double-executable.gyp deleted file mode 100644 index 477bd87e0d8c50c327053931692168dc91978714..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-source-file-name/src/double-executable.gyp +++ /dev/null @@ -1,21 +0,0 @@ -# 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': 'prog3', - 'type': 'executable', - 'sources': [ - 'prog3.c', - 'func.c', - 'subdir1/func.c', - 'subdir2/func.c', - ], - 'defines': [ - 'PROG="prog3"', - ], - }, - ], -} diff --git a/tools/gyp/test/same-source-file-name/src/double-shared.gyp b/tools/gyp/test/same-source-file-name/src/double-shared.gyp deleted file mode 100644 index 438b50f3f1168d6c0f9b16310f83bbecd67ac320..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-source-file-name/src/double-shared.gyp +++ /dev/null @@ -1,27 +0,0 @@ -# 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': 'lib', - 'product_name': 'test_shared_lib', - 'type': 'shared_library', - 'sources': [ - 'prog2.c', - 'func.c', - 'subdir1/func.c', - 'subdir2/func.c', - ], - 'defines': [ - 'PROG="prog2"', - ], - 'conditions': [ - ['OS=="linux"', { - 'cflags': ['-fPIC'], - }], - ], - }, - ], -} diff --git a/tools/gyp/test/same-source-file-name/src/double-static.gyp b/tools/gyp/test/same-source-file-name/src/double-static.gyp deleted file mode 100644 index e49c0e1251020ce8c1a5e75cb468c1133af92ecf..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-source-file-name/src/double-static.gyp +++ /dev/null @@ -1,22 +0,0 @@ -# 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': 'lib', - 'product_name': 'test_static_lib', - 'type': 'static_library', - 'sources': [ - 'prog1.c', - 'func.c', - 'subdir1/func.c', - 'subdir2/func.c', - ], - 'defines': [ - 'PROG="prog1"', - ], - }, - ], -} diff --git a/tools/gyp/test/same-source-file-name/src/func.c b/tools/gyp/test/same-source-file-name/src/func.c deleted file mode 100644 index e069c692a69c916e43ed5d0e9e6a182ce76d340e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-source-file-name/src/func.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -void func(void) -{ - printf("Hello %s from func.c\n", PROG); -} diff --git a/tools/gyp/test/same-source-file-name/src/prog1.c b/tools/gyp/test/same-source-file-name/src/prog1.c deleted file mode 100644 index 604e2b9c98f4d13e95c87d20909d1d1a501abf27..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-source-file-name/src/prog1.c +++ /dev/null @@ -1,16 +0,0 @@ -#include - -extern void func(void); - -int main(void) -{ - printf("Hello from prog1.c\n"); - func(); - /* - * Uncomment to test same-named files in different directories, - * which Visual Studio doesn't support. - subdir1_func(); - subdir2_func(); - */ - return 0; -} diff --git a/tools/gyp/test/same-source-file-name/src/prog2.c b/tools/gyp/test/same-source-file-name/src/prog2.c deleted file mode 100644 index 466ee35003c3fc1c675f533cc66a699a7bbc41ed..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-source-file-name/src/prog2.c +++ /dev/null @@ -1,16 +0,0 @@ -#include - -extern void func(void); - -int main(void) -{ - printf("Hello from prog2.c\n"); - func(); - /* - * Uncomment to test same-named files in different directories, - * which Visual Studio doesn't support. - subdir1_func(); - subdir2_func(); - */ - return 0; -} diff --git a/tools/gyp/test/same-source-file-name/src/prog3.c b/tools/gyp/test/same-source-file-name/src/prog3.c deleted file mode 100644 index 34d495ce08d056664e24b5349046ee0ad1a5243f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-source-file-name/src/prog3.c +++ /dev/null @@ -1,18 +0,0 @@ -// 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. - -#include - -extern void func(void); -extern void subdir1_func(void); -extern void subdir2_func(void); - -int main(void) -{ - printf("Hello from prog3.c\n"); - func(); - subdir1_func(); - subdir2_func(); - return 0; -} diff --git a/tools/gyp/test/same-source-file-name/src/subdir1/func.c b/tools/gyp/test/same-source-file-name/src/subdir1/func.c deleted file mode 100644 index b73450d105ef301a41886b471f2edeed5f4fb03e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-source-file-name/src/subdir1/func.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -void subdir1_func(void) -{ - printf("Hello %s from subdir1/func.c\n", PROG); -} diff --git a/tools/gyp/test/same-source-file-name/src/subdir2/func.c b/tools/gyp/test/same-source-file-name/src/subdir2/func.c deleted file mode 100644 index 0248b5720e0c92ed28c253166ecaef05d616fb69..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-source-file-name/src/subdir2/func.c +++ /dev/null @@ -1,6 +0,0 @@ -#include - -void subdir2_func(void) -{ - printf("Hello %s from subdir2/func.c\n", PROG); -} diff --git a/tools/gyp/test/same-target-name-different-directory/gyptest-all.py b/tools/gyp/test/same-target-name-different-directory/gyptest-all.py deleted file mode 100644 index bc9b960ffea9fda4ba2acda29cd4edb5290ac806..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-target-name-different-directory/gyptest-all.py +++ /dev/null @@ -1,41 +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 cases when multiple targets in different directories have the same name. -""" - -import TestGyp - -test = TestGyp.TestGyp(formats=['android', 'ninja', 'make']) - -# xcode-ninja fails to generate a project due to id collisions -# cf. https://code.google.com/p/gyp/issues/detail?id=461 -if test.format == 'xcode-ninja': - test.skip_test() - -test.run_gyp('subdirs.gyp', chdir='src') - -test.relocate('src', 'relocate/src') - -# Test that we build all targets. -test.build('subdirs.gyp', 'target', chdir='relocate/src') -test.must_exist('relocate/src/subdir1/action1.txt') -test.must_exist('relocate/src/subdir2/action2.txt') - -# Test that we build all targets using the correct actions, even if they have -# the same names. -test.build('subdirs.gyp', 'target_same_action_name', chdir='relocate/src') -test.must_exist('relocate/src/subdir1/action.txt') -test.must_exist('relocate/src/subdir2/action.txt') - -# Test that we build all targets using the correct rules, even if they have -# the same names. -test.build('subdirs.gyp', 'target_same_rule_name', chdir='relocate/src') -test.must_exist('relocate/src/subdir1/rule.txt') -test.must_exist('relocate/src/subdir2/rule.txt') - -test.pass_test() diff --git a/tools/gyp/test/same-target-name-different-directory/src/subdir1/subdir1.gyp b/tools/gyp/test/same-target-name-different-directory/src/subdir1/subdir1.gyp deleted file mode 100644 index d4ec2e679acf1624dc4422562d808822af4f8c31..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-target-name-different-directory/src/subdir1/subdir1.gyp +++ /dev/null @@ -1,66 +0,0 @@ -# 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': 'target', - 'type': 'none', - 'actions': [ - { - 'action_name': 'action1', - 'inputs': [], - 'outputs': [ - 'action1.txt', - ], - 'action': [ - 'python', '../touch.py', '<(_outputs)', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - ], - }, - { - 'target_name': 'target_same_action_name', - 'type': 'none', - 'actions': [ - { - 'action_name': 'action', - 'inputs': [], - 'outputs': [ - 'action.txt', - ], - 'action': [ - 'python', '../touch.py', '<(_outputs)', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - ], - }, - { - 'target_name': 'target_same_rule_name', - 'type': 'none', - 'sources': [ - '../touch.py' - ], - 'rules': [ - { - 'rule_name': 'rule', - 'extension': 'py', - 'inputs': [], - 'outputs': [ - 'rule.txt', - ], - 'action': [ - 'python', '../touch.py', '<(_outputs)', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - ], - }, - ], -} diff --git a/tools/gyp/test/same-target-name-different-directory/src/subdir2/subdir2.gyp b/tools/gyp/test/same-target-name-different-directory/src/subdir2/subdir2.gyp deleted file mode 100644 index 9006d450b26218dc3beca6ddbb2f0137544d1039..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-target-name-different-directory/src/subdir2/subdir2.gyp +++ /dev/null @@ -1,66 +0,0 @@ -# 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': 'target', - 'type': 'none', - 'actions': [ - { - 'action_name': 'action2', - 'inputs': [], - 'outputs': [ - 'action2.txt', - ], - 'action': [ - 'python', '../touch.py', '<(_outputs)', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - ], - }, - { - 'target_name': 'target_same_action_name', - 'type': 'none', - 'actions': [ - { - 'action_name': 'action', - 'inputs': [], - 'outputs': [ - 'action.txt', - ], - 'action': [ - 'python', '../touch.py', '<(_outputs)', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - ], - }, - { - 'target_name': 'target_same_rule_name', - 'type': 'none', - 'sources': [ - '../touch.py' - ], - 'rules': [ - { - 'rule_name': 'rule', - 'extension': 'py', - 'inputs': [], - 'outputs': [ - 'rule.txt', - ], - 'action': [ - 'python', '../touch.py', '<(_outputs)', - ], - # Allows the test to run without hermetic cygwin on windows. - 'msvs_cygwin_shell': 0, - }, - ], - }, - ], -} diff --git a/tools/gyp/test/same-target-name-different-directory/src/subdirs.gyp b/tools/gyp/test/same-target-name-different-directory/src/subdirs.gyp deleted file mode 100644 index 65413e73b2b8ca9b7e1dfc318bed24f529a25316..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-target-name-different-directory/src/subdirs.gyp +++ /dev/null @@ -1,16 +0,0 @@ -# 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': 'subdirs', - 'type': 'none', - 'dependencies': [ - 'subdir1/subdir1.gyp:*', - 'subdir2/subdir2.gyp:*', - ], - }, - ], -} diff --git a/tools/gyp/test/same-target-name-different-directory/src/touch.py b/tools/gyp/test/same-target-name-different-directory/src/touch.py deleted file mode 100644 index 2291e9cc560430aceb760210ff10e11f8550bc55..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-target-name-different-directory/src/touch.py +++ /dev/null @@ -1,11 +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. - -import sys - -f = open(sys.argv[1], 'w+') -f.write('Hello from touch.py\n') -f.close() diff --git a/tools/gyp/test/same-target-name/gyptest-same-target-name.py b/tools/gyp/test/same-target-name/gyptest-same-target-name.py deleted file mode 100755 index bfe5540f31223f357b3d0455287bf661d6f9dab6..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-target-name/gyptest-same-target-name.py +++ /dev/null @@ -1,18 +0,0 @@ -#!/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. - -""" -Check that duplicate targets in a directory gives an error. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -# Require that gyp files with duplicate targets spit out an error. -test.run_gyp('all.gyp', chdir='src', status=1, stderr=None) - -test.pass_test() diff --git a/tools/gyp/test/same-target-name/src/all.gyp b/tools/gyp/test/same-target-name/src/all.gyp deleted file mode 100644 index ac16976da6af14a2275133ec4d29270cf72a4fe7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-target-name/src/all.gyp +++ /dev/null @@ -1,16 +0,0 @@ -# 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': 'all_exes', - 'type': 'none', - 'dependencies': [ - 'executable1.gyp:*', - 'executable2.gyp:*', - ], - }, - ], -} diff --git a/tools/gyp/test/same-target-name/src/executable1.gyp b/tools/gyp/test/same-target-name/src/executable1.gyp deleted file mode 100644 index 3c492c1b375603c1c0a88e078616ee0a120222bf..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-target-name/src/executable1.gyp +++ /dev/null @@ -1,15 +0,0 @@ -# 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': 'program', - 'type': 'executable', - 'sources': [ - 'main1.cc', - ], - }, - ], -} diff --git a/tools/gyp/test/same-target-name/src/executable2.gyp b/tools/gyp/test/same-target-name/src/executable2.gyp deleted file mode 100644 index 41e84a61c679bf5f99ee83295de8809a4f041eea..0000000000000000000000000000000000000000 --- a/tools/gyp/test/same-target-name/src/executable2.gyp +++ /dev/null @@ -1,15 +0,0 @@ -# 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': 'program', - 'type': 'executable', - 'sources': [ - 'main2.cc', - ], - }, - ], -} diff --git a/tools/gyp/test/sanitize-rule-names/blah.S b/tools/gyp/test/sanitize-rule-names/blah.S deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tools/gyp/test/sanitize-rule-names/gyptest-sanitize-rule-names.py b/tools/gyp/test/sanitize-rule-names/gyptest-sanitize-rule-names.py deleted file mode 100644 index 968a0ce5ce48e8001091e75953655791dc0982e1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/sanitize-rule-names/gyptest-sanitize-rule-names.py +++ /dev/null @@ -1,17 +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. - -""" -Make sure rule names with non-"normal" characters in them don't cause -broken build files. This test was originally causing broken .ninja files. -""" - -import TestGyp - -test = TestGyp.TestGyp() -test.run_gyp('sanitize-rule-names.gyp') -test.build('sanitize-rule-names.gyp', test.ALL) -test.pass_test() diff --git a/tools/gyp/test/sanitize-rule-names/hello.cc b/tools/gyp/test/sanitize-rule-names/hello.cc deleted file mode 100644 index 1711567ef566703fcd9c33e0a236b1b30454df6a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/sanitize-rule-names/hello.cc +++ /dev/null @@ -1,7 +0,0 @@ -// 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. - -int main() { - return 0; -} diff --git a/tools/gyp/test/sanitize-rule-names/sanitize-rule-names.gyp b/tools/gyp/test/sanitize-rule-names/sanitize-rule-names.gyp deleted file mode 100644 index 184253e966df36a1bd634db76e11492697fe29fd..0000000000000000000000000000000000000000 --- a/tools/gyp/test/sanitize-rule-names/sanitize-rule-names.gyp +++ /dev/null @@ -1,27 +0,0 @@ -# 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': 's_test', - 'type': 'executable', - 'rules': [ - { - # Make sure this rule name doesn't cause an invalid ninja file. - 'rule_name': 'rule name with odd characters ()/', - 'extension': 'S', - 'outputs': ['outfile'], - 'msvs_cygwin_shell': 0, - 'msvs_quote_cmd': 0, - 'action': ['python', 'script.py', '<(RULE_INPUT_PATH)', 'outfile'], - }, - ], - 'sources': [ - 'blah.S', - 'hello.cc', - ], - }, - ], -} diff --git a/tools/gyp/test/sanitize-rule-names/script.py b/tools/gyp/test/sanitize-rule-names/script.py deleted file mode 100644 index ae2efa1df46901a12301687c0c9a555b4c958260..0000000000000000000000000000000000000000 --- a/tools/gyp/test/sanitize-rule-names/script.py +++ /dev/null @@ -1,10 +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. - -import shutil -import sys - -shutil.copyfile(*sys.argv[1:]) diff --git a/tools/gyp/test/self-dependency/common.gypi b/tools/gyp/test/self-dependency/common.gypi deleted file mode 100644 index aae221a5dd01093445a06a9b02409483ad1b5e4d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/self-dependency/common.gypi +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) 2013 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. - -# A common file that other .gyp files include. -# Makes every target in the project depend on dep.gyp:dep. -{ - 'target_defaults': { - 'dependencies': [ - 'dep.gyp:dep', - ], - }, -} diff --git a/tools/gyp/test/self-dependency/dep.gyp b/tools/gyp/test/self-dependency/dep.gyp deleted file mode 100644 index 2b6c9dda854fe3cce100331c9c3a7f1575c5b925..0000000000000000000000000000000000000000 --- a/tools/gyp/test/self-dependency/dep.gyp +++ /dev/null @@ -1,23 +0,0 @@ -# Copyright (c) 2013 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. - -# dep.gyp contains a target dep, on which all the targets in the project -# depend. This means there's a self-dependency of dep on itself, which is -# pruned by setting prune_self_dependency to 1. - -{ - 'includes': [ - 'common.gypi', - ], - 'targets': [ - { - 'target_name': 'dep', - 'type': 'none', - 'variables': { - # Without this GYP will report a cycle in dependency graph. - 'prune_self_dependency': 1, - }, - }, - ], -} diff --git a/tools/gyp/test/self-dependency/gyptest-self-dependency.py b/tools/gyp/test/self-dependency/gyptest-self-dependency.py deleted file mode 100755 index 82fab271c56fa5da83b12f3837d6e792dac00f6a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/self-dependency/gyptest-self-dependency.py +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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. - -""" -Verify that pulling in a dependency a second time in a conditional works for -shared_library targets. Regression test for http://crbug.com/122588 -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('self_dependency.gyp') - -# If running gyp worked, all is well. -test.pass_test() diff --git a/tools/gyp/test/self-dependency/self_dependency.gyp b/tools/gyp/test/self-dependency/self_dependency.gyp deleted file mode 100644 index 0ca76c669b6a686bf686c5b9a4be5e9ebc2b2c41..0000000000000000000000000000000000000000 --- a/tools/gyp/test/self-dependency/self_dependency.gyp +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright (c) 2013 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. - -{ - 'includes': [ - 'common.gypi', - ], - 'targets': [ - { - 'target_name': 'a', - 'type': 'none', - }, - ], -} diff --git a/tools/gyp/test/sibling/gyptest-all.py b/tools/gyp/test/sibling/gyptest-all.py deleted file mode 100755 index 318e1a3d843ba6bc51d448deebee438b4834b488..0000000000000000000000000000000000000000 --- a/tools/gyp/test/sibling/gyptest-all.py +++ /dev/null @@ -1,42 +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. - -import TestGyp - -test = TestGyp.TestGyp() - -# The xcode-ninja generator handles gypfiles which are not at the -# project root incorrectly. -# cf. https://code.google.com/p/gyp/issues/detail?id=460 -if test.format == 'xcode-ninja': - test.skip_test() - -test.run_gyp('build/all.gyp', chdir='src') - -test.build('build/all.gyp', test.ALL, chdir='src') - -chdir = 'src/build' - -# The top-level Makefile is in the directory where gyp was run. -# TODO(mmoss) Should the Makefile go in the directory of the passed in .gyp -# file? What about when passing in multiple .gyp files? Would sub-project -# Makefiles (see http://codereview.chromium.org/340008 comments) solve this? -if test.format in ('make', 'ninja', 'cmake'): - chdir = 'src' - -if test.format == 'xcode': - chdir = 'src/prog1' -test.run_built_executable('program1', - chdir=chdir, - stdout="Hello from prog1.c\n") - -if test.format == 'xcode': - chdir = 'src/prog2' -test.run_built_executable('program2', - chdir=chdir, - stdout="Hello from prog2.c\n") - -test.pass_test() diff --git a/tools/gyp/test/sibling/gyptest-relocate.py b/tools/gyp/test/sibling/gyptest-relocate.py deleted file mode 100755 index 05fa9d96fed11a992e44348128e9910160a57bf3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/sibling/gyptest-relocate.py +++ /dev/null @@ -1,44 +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. - -import TestGyp - -test = TestGyp.TestGyp() - -# The xcode-ninja generator handles gypfiles which are not at the -# project root incorrectly. -# cf. https://code.google.com/p/gyp/issues/detail?id=460 -if test.format == 'xcode-ninja': - test.skip_test() - -test.run_gyp('build/all.gyp', chdir='src') - -test.relocate('src', 'relocate/src') - -test.build('build/all.gyp', test.ALL, chdir='relocate/src') - -chdir = 'relocate/src/build' - -# The top-level Makefile is in the directory where gyp was run. -# TODO(mmoss) Should the Makefile go in the directory of the passed in .gyp -# file? What about when passing in multiple .gyp files? Would sub-project -# Makefiles (see http://codereview.chromium.org/340008 comments) solve this? -if test.format in ('make', 'ninja', 'cmake'): - chdir = 'relocate/src' - -if test.format == 'xcode': - chdir = 'relocate/src/prog1' -test.run_built_executable('program1', - chdir=chdir, - stdout="Hello from prog1.c\n") - -if test.format == 'xcode': - chdir = 'relocate/src/prog2' -test.run_built_executable('program2', - chdir=chdir, - stdout="Hello from prog2.c\n") - -test.pass_test() diff --git a/tools/gyp/test/sibling/src/build/all.gyp b/tools/gyp/test/sibling/src/build/all.gyp deleted file mode 100644 index 79c80c9363524d17fdd3200637b9ceb0110908f4..0000000000000000000000000000000000000000 --- a/tools/gyp/test/sibling/src/build/all.gyp +++ /dev/null @@ -1,16 +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': 'All', - 'type': 'none', - 'dependencies': [ - '../prog1/prog1.gyp:*', - '../prog2/prog2.gyp:*', - ], - }, - ], -} diff --git a/tools/gyp/test/sibling/src/prog1/prog1.c b/tools/gyp/test/sibling/src/prog1/prog1.c deleted file mode 100644 index 218e99401cb2598dddfdd30fed392ef022c7cdf1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/sibling/src/prog1/prog1.c +++ /dev/null @@ -1,7 +0,0 @@ -#include - -int main(void) -{ - printf("Hello from prog1.c\n"); - return 0; -} diff --git a/tools/gyp/test/sibling/src/prog1/prog1.gyp b/tools/gyp/test/sibling/src/prog1/prog1.gyp deleted file mode 100644 index 4532e4be101d0012912d1af348138e9cb842bd57..0000000000000000000000000000000000000000 --- a/tools/gyp/test/sibling/src/prog1/prog1.gyp +++ /dev/null @@ -1,15 +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': 'program1', - 'type': 'executable', - 'sources': [ - 'prog1.c', - ], - }, - ], -} diff --git a/tools/gyp/test/sibling/src/prog2/prog2.c b/tools/gyp/test/sibling/src/prog2/prog2.c deleted file mode 100644 index 12a31883b93a99ca000a872b6ea439902cdc69eb..0000000000000000000000000000000000000000 --- a/tools/gyp/test/sibling/src/prog2/prog2.c +++ /dev/null @@ -1,7 +0,0 @@ -#include - -int main(void) -{ - printf("Hello from prog2.c\n"); - return 0; -} diff --git a/tools/gyp/test/sibling/src/prog2/prog2.gyp b/tools/gyp/test/sibling/src/prog2/prog2.gyp deleted file mode 100644 index 4cf7f6eb2f4f4aee832f55c3ed91d83ce665af73..0000000000000000000000000000000000000000 --- a/tools/gyp/test/sibling/src/prog2/prog2.gyp +++ /dev/null @@ -1,15 +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': 'program2', - 'type': 'executable', - 'sources': [ - 'prog2.c', - ], - }, - ], -} diff --git a/tools/gyp/test/small/gyptest-small.py b/tools/gyp/test/small/gyptest-small.py deleted file mode 100755 index a8d61fb6c545fe7b1673bb70ecc9b308cdef34e6..0000000000000000000000000000000000000000 --- a/tools/gyp/test/small/gyptest-small.py +++ /dev/null @@ -1,55 +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. - -""" -Runs small tests. -""" - -import imp -import os -import sys -import unittest - -import TestGyp - - -test = TestGyp.TestGyp() - -# Add pylib to the import path (so tests can import their dependencies). -# This is consistant with the path.append done in the top file "gyp". -sys.path.append(os.path.join(test._cwd, 'pylib')) - -# Add new test suites here. -files_to_test = [ - 'pylib/gyp/MSVSSettings_test.py', - 'pylib/gyp/easy_xml_test.py', - 'pylib/gyp/generator/msvs_test.py', - 'pylib/gyp/generator/ninja_test.py', - 'pylib/gyp/generator/xcode_test.py', - 'pylib/gyp/common_test.py', - 'pylib/gyp/input_test.py', -] - -# Collect all the suites from the above files. -suites = [] -for filename in files_to_test: - # Carve the module name out of the path. - name = os.path.splitext(os.path.split(filename)[1])[0] - # Find the complete module path. - full_filename = os.path.join(test._cwd, filename) - # Load the module. - module = imp.load_source(name, full_filename) - # Add it to the list of test suites. - suites.append(unittest.defaultTestLoader.loadTestsFromModule(module)) -# Create combined suite. -all_tests = unittest.TestSuite(suites) - -# Run all the tests. -result = unittest.TextTestRunner(verbosity=2).run(all_tests) -if result.failures or result.errors: - test.fail_test() - -test.pass_test() diff --git a/tools/gyp/test/standalone-static-library/gyptest-standalone-static-library.py b/tools/gyp/test/standalone-static-library/gyptest-standalone-static-library.py deleted file mode 100644 index ff12570b605f15b5fd5b48df3cb09be9cab1716b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/standalone-static-library/gyptest-standalone-static-library.py +++ /dev/null @@ -1,52 +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. - -""" -Verifies build of a static_library with the standalone_static_library flag set. -""" - -import os -import subprocess -import sys -import TestGyp - -# standalone_static_library currently means two things: a specific output -# location for the built target and non-thin archive files. The Android gyp -# generator leaves both decisions to the Android build system, so this test -# doesn't work for that format. -test = TestGyp.TestGyp(formats=['!android']) - -# Verify that types other than static_library cause a failure. -test.run_gyp('invalid.gyp', status=1, stderr=None) -target_str = 'invalid.gyp:bad#target' -err = ['gyp: Target %s has type executable but standalone_static_library flag ' - 'is only valid for static_library type.' % target_str] -test.must_contain_all_lines(test.stderr(), err) - -# Build a valid standalone_static_library. -test.run_gyp('mylib.gyp') -test.build('mylib.gyp', target='prog') - -# Verify that the static library is copied to the correct location. -# We expect the library to be copied to $PRODUCT_DIR. -standalone_static_library_dir = test.EXECUTABLE -path_to_lib = os.path.split( - test.built_file_path('mylib', type=standalone_static_library_dir))[0] -lib_name = test.built_file_basename('mylib', type=test.STATIC_LIB) -path = os.path.join(path_to_lib, lib_name) -test.must_exist(path) - -# Verify that the program runs properly. -expect = 'hello from mylib.c\n' -test.run_built_executable('prog', stdout=expect) - -# Verify that libmylib.a contains symbols. "ar -x" fails on a 'thin' archive. -supports_thick = ('make', 'ninja', 'cmake') -if test.format in supports_thick and sys.platform.startswith('linux'): - retcode = subprocess.call(['ar', '-x', path]) - assert retcode == 0 - -test.pass_test() diff --git a/tools/gyp/test/standalone-static-library/invalid.gyp b/tools/gyp/test/standalone-static-library/invalid.gyp deleted file mode 100644 index 54b32117e05ce27691a36649a8ff5b66a4586ed8..0000000000000000000000000000000000000000 --- a/tools/gyp/test/standalone-static-library/invalid.gyp +++ /dev/null @@ -1,16 +0,0 @@ -# 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': 'bad', - 'type': 'executable', - 'standalone_static_library': 1, - 'sources': [ - 'prog.c', - ], - }, - ], -} \ No newline at end of file diff --git a/tools/gyp/test/standalone-static-library/mylib.c b/tools/gyp/test/standalone-static-library/mylib.c deleted file mode 100644 index 108be618c291fd0db73ec29f2d94a72944f023d7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/standalone-static-library/mylib.c +++ /dev/null @@ -1,7 +0,0 @@ -#include - -void print(void) -{ - printf("hello from mylib.c\n"); - return; -} diff --git a/tools/gyp/test/standalone-static-library/mylib.gyp b/tools/gyp/test/standalone-static-library/mylib.gyp deleted file mode 100644 index 2d191de3197ae52b7e191be8bbea304378a67280..0000000000000000000000000000000000000000 --- a/tools/gyp/test/standalone-static-library/mylib.gyp +++ /dev/null @@ -1,26 +0,0 @@ -# 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': 'mylib', - 'type': 'static_library', - 'standalone_static_library': 1, - 'sources': [ - 'mylib.c', - ], - }, - { - 'target_name': 'prog', - 'type': 'executable', - 'sources': [ - 'prog.c', - ], - 'dependencies': [ - 'mylib', - ], - }, - ], -} diff --git a/tools/gyp/test/standalone-static-library/prog.c b/tools/gyp/test/standalone-static-library/prog.c deleted file mode 100644 index 8af5c90844be41631b43a13b53765ad3c92c7dae..0000000000000000000000000000000000000000 --- a/tools/gyp/test/standalone-static-library/prog.c +++ /dev/null @@ -1,7 +0,0 @@ -extern void print(void); - -int main(void) -{ - print(); - return 0; -} diff --git a/tools/gyp/test/standalone/gyptest-standalone.py b/tools/gyp/test/standalone/gyptest-standalone.py deleted file mode 100644 index 87143706ab94cbc2d43095e227a65f9c716c992e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/standalone/gyptest-standalone.py +++ /dev/null @@ -1,33 +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. - -""" -Verifies that a project hierarchy created with the --generator-output= -option can be built even when it's relocated to a different path. -""" - -import TestGyp -import os - -test = TestGyp.TestGyp() - -test.run_gyp('standalone.gyp', '-Gstandalone') - -# Look at all the files in the tree to make sure none -# of them reference the gyp file. -for root, dirs, files in os.walk("."): - for file in files: - # ignore ourself - if os.path.splitext(__file__)[0] in file: - continue - file = os.path.join(root, file) - contents = open(file).read() - if 'standalone.gyp' in contents: - print 'gyp file referenced in generated output: %s' % file - test.fail_test() - - -test.pass_test() diff --git a/tools/gyp/test/standalone/standalone.gyp b/tools/gyp/test/standalone/standalone.gyp deleted file mode 100644 index b2a6785430393caa6a196cbcce00e1a1acf69879..0000000000000000000000000000000000000000 --- a/tools/gyp/test/standalone/standalone.gyp +++ /dev/null @@ -1,12 +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' : 'executable' - }, - ] -} diff --git a/tools/gyp/test/subdirectory/gyptest-SYMROOT-all.py b/tools/gyp/test/subdirectory/gyptest-SYMROOT-all.py deleted file mode 100755 index 9dfb8b05d4ed4125d932be9142f424fab49b1f1e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/subdirectory/gyptest-SYMROOT-all.py +++ /dev/null @@ -1,36 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies building a target and a subsidiary dependent target from a -.gyp file in a subdirectory, without specifying an explicit output build -directory, and using the generated solution or project file at the top -of the tree as the entry point. - -The configuration sets the Xcode SYMROOT variable and uses --depth= -to make Xcode behave like the other build tools--that is, put all -built targets in a single output build directory at the top of the tree. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('prog1.gyp', '-Dset_symroot=1', '--depth=.', chdir='src') - -test.relocate('src', 'relocate/src') - -# Suppress the test infrastructure's setting SYMROOT on the command line. -test.build('prog1.gyp', test.ALL, SYMROOT=None, chdir='relocate/src') - -test.run_built_executable('prog1', - stdout="Hello from prog1.c\n", - chdir='relocate/src') -test.run_built_executable('prog2', - stdout="Hello from prog2.c\n", - chdir='relocate/src') - -test.pass_test() diff --git a/tools/gyp/test/subdirectory/gyptest-SYMROOT-default.py b/tools/gyp/test/subdirectory/gyptest-SYMROOT-default.py deleted file mode 100755 index 8796650905637f86c5882cf61f700731cc293306..0000000000000000000000000000000000000000 --- a/tools/gyp/test/subdirectory/gyptest-SYMROOT-default.py +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies building a target and a subsidiary dependent target from a -.gyp file in a subdirectory, without specifying an explicit output build -directory, and using the generated solution or project file at the top -of the tree as the entry point. - -The configuration sets the Xcode SYMROOT variable and uses --depth= -to make Xcode behave like the other build tools--that is, put all -built targets in a single output build directory at the top of the tree. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('prog1.gyp', '-Dset_symroot=1', '--depth=.', chdir='src') - -test.relocate('src', 'relocate/src') - -# Suppress the test infrastructure's setting SYMROOT on the command line. -test.build('prog1.gyp', SYMROOT=None, chdir='relocate/src') - -test.run_built_executable('prog1', - stdout="Hello from prog1.c\n", - chdir='relocate/src') - -test.run_built_executable('prog2', - stdout="Hello from prog2.c\n", - chdir='relocate/src') - -test.pass_test() diff --git a/tools/gyp/test/subdirectory/gyptest-subdir-all.py b/tools/gyp/test/subdirectory/gyptest-subdir-all.py deleted file mode 100755 index 93a865af6cf0e34502c1fa309c088f99018cd92b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/subdirectory/gyptest-subdir-all.py +++ /dev/null @@ -1,35 +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. - -""" -Verifies building a subsidiary dependent target from a .gyp file in a -subdirectory, without specifying an explicit output build directory, -and using the subdirectory's solution or project file as the entry point. -""" - -import TestGyp - -# Android doesn't support running from subdirectories. -# Ninja doesn't support relocation. -# CMake produces a single CMakeLists.txt in the output directory. -test = TestGyp.TestGyp(formats=['!ninja', '!android', '!cmake']) - -test.run_gyp('prog1.gyp', chdir='src') - -test.relocate('src', 'relocate/src') - -chdir = 'relocate/src/subdir' -target = test.ALL - -test.build('prog2.gyp', target, chdir=chdir) - -test.built_file_must_not_exist('prog1', type=test.EXECUTABLE, chdir=chdir) - -test.run_built_executable('prog2', - chdir=chdir, - stdout="Hello from prog2.c\n") - -test.pass_test() diff --git a/tools/gyp/test/subdirectory/gyptest-subdir-default.py b/tools/gyp/test/subdirectory/gyptest-subdir-default.py deleted file mode 100755 index 5d262f807560ca3fc16a640a664fc9c84a009063..0000000000000000000000000000000000000000 --- a/tools/gyp/test/subdirectory/gyptest-subdir-default.py +++ /dev/null @@ -1,35 +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. - -""" -Verifies building a subsidiary dependent target from a .gyp file in a -subdirectory, without specifying an explicit output build directory, -and using the subdirectory's solution or project file as the entry point. -""" - -import TestGyp -import errno - -# Android doesn't support running from subdirectories. -# Ninja doesn't support relocation. -# CMake produces a single CMakeLists.txt in the output directory. -test = TestGyp.TestGyp(formats=['!ninja', '!android', '!cmake']) - -test.run_gyp('prog1.gyp', chdir='src') - -test.relocate('src', 'relocate/src') - -chdir = 'relocate/src/subdir' - -test.build('prog2.gyp', chdir=chdir) - -test.built_file_must_not_exist('prog1', type=test.EXECUTABLE, chdir=chdir) - -test.run_built_executable('prog2', - chdir=chdir, - stdout="Hello from prog2.c\n") - -test.pass_test() diff --git a/tools/gyp/test/subdirectory/gyptest-subdir2-deep.py b/tools/gyp/test/subdirectory/gyptest-subdir2-deep.py deleted file mode 100755 index 48548982f8c5d4d09d04f687627879298038f225..0000000000000000000000000000000000000000 --- a/tools/gyp/test/subdirectory/gyptest-subdir2-deep.py +++ /dev/null @@ -1,25 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies building a project rooted several layers under src_dir works. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('prog3.gyp', chdir='src/subdir/subdir2') - -test.relocate('src', 'relocate/src') - -test.build('prog3.gyp', test.ALL, chdir='relocate/src/subdir/subdir2') - -test.run_built_executable('prog3', - chdir='relocate/src/subdir/subdir2', - stdout="Hello from prog3.c\n") - -test.pass_test() diff --git a/tools/gyp/test/subdirectory/gyptest-top-all.py b/tools/gyp/test/subdirectory/gyptest-top-all.py deleted file mode 100755 index b3c25b1f8d764b8ccd601d46190cbfd7ca38de68..0000000000000000000000000000000000000000 --- a/tools/gyp/test/subdirectory/gyptest-top-all.py +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies building a target and a subsidiary dependent target from a -.gyp file in a subdirectory, without specifying an explicit output build -directory, and using the generated solution or project file at the top -of the tree as the entry point. - -There is a difference here in the default behavior of the underlying -build tools. Specifically, when building the entire "solution", Xcode -puts the output of each project relative to the .xcodeproj directory, -while Visual Studio (and our implementation of Make) put it -in a build directory relative to the "solution"--that is, the entry-point -from which you built the entire tree. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('prog1.gyp', chdir='src') - -test.relocate('src', 'relocate/src') - -test.build('prog1.gyp', test.ALL, chdir='relocate/src') - -test.run_built_executable('prog1', - stdout="Hello from prog1.c\n", - chdir='relocate/src') - -if test.format == 'xcode': - chdir = 'relocate/src/subdir' -else: - chdir = 'relocate/src' -test.run_built_executable('prog2', - chdir=chdir, - stdout="Hello from prog2.c\n") - -test.pass_test() diff --git a/tools/gyp/test/subdirectory/gyptest-top-default.py b/tools/gyp/test/subdirectory/gyptest-top-default.py deleted file mode 100755 index 2448dd98ea50dc51c2af8a9822a4352aeff174b5..0000000000000000000000000000000000000000 --- a/tools/gyp/test/subdirectory/gyptest-top-default.py +++ /dev/null @@ -1,43 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies building a target and a subsidiary dependent target from a -.gyp file in a subdirectory, without specifying an explicit output build -directory, and using the generated solution or project file at the top -of the tree as the entry point. - -There is a difference here in the default behavior of the underlying -build tools. Specifically, when building the entire "solution", Xcode -puts the output of each project relative to the .xcodeproj directory, -while Visual Studio (and our implementation of Make) put it -in a build directory relative to the "solution"--that is, the entry-point -from which you built the entire tree. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('prog1.gyp', chdir='src') - -test.relocate('src', 'relocate/src') - -test.build('prog1.gyp', chdir='relocate/src') - -test.run_built_executable('prog1', - stdout="Hello from prog1.c\n", - chdir='relocate/src') - -if test.format == 'xcode': - chdir = 'relocate/src/subdir' -else: - chdir = 'relocate/src' -test.run_built_executable('prog2', - chdir=chdir, - stdout="Hello from prog2.c\n") - -test.pass_test() diff --git a/tools/gyp/test/subdirectory/src/prog1.c b/tools/gyp/test/subdirectory/src/prog1.c deleted file mode 100644 index 218e99401cb2598dddfdd30fed392ef022c7cdf1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/subdirectory/src/prog1.c +++ /dev/null @@ -1,7 +0,0 @@ -#include - -int main(void) -{ - printf("Hello from prog1.c\n"); - return 0; -} diff --git a/tools/gyp/test/subdirectory/src/prog1.gyp b/tools/gyp/test/subdirectory/src/prog1.gyp deleted file mode 100644 index 2aa66ce7d7f1fc8e7286f6b74e3a545c837de748..0000000000000000000000000000000000000000 --- a/tools/gyp/test/subdirectory/src/prog1.gyp +++ /dev/null @@ -1,21 +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. - -{ - 'includes': [ - 'symroot.gypi', - ], - 'targets': [ - { - 'target_name': 'prog1', - 'type': 'executable', - 'dependencies': [ - 'subdir/prog2.gyp:prog2', - ], - 'sources': [ - 'prog1.c', - ], - }, - ], -} diff --git a/tools/gyp/test/subdirectory/src/subdir/prog2.c b/tools/gyp/test/subdirectory/src/subdir/prog2.c deleted file mode 100644 index 12a31883b93a99ca000a872b6ea439902cdc69eb..0000000000000000000000000000000000000000 --- a/tools/gyp/test/subdirectory/src/subdir/prog2.c +++ /dev/null @@ -1,7 +0,0 @@ -#include - -int main(void) -{ - printf("Hello from prog2.c\n"); - return 0; -} diff --git a/tools/gyp/test/subdirectory/src/subdir/prog2.gyp b/tools/gyp/test/subdirectory/src/subdir/prog2.gyp deleted file mode 100644 index c6cd35f7f81eff44b75f986791a37cf5791b8395..0000000000000000000000000000000000000000 --- a/tools/gyp/test/subdirectory/src/subdir/prog2.gyp +++ /dev/null @@ -1,18 +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. - -{ - 'includes': [ - '../symroot.gypi', - ], - 'targets': [ - { - 'target_name': 'prog2', - 'type': 'executable', - 'sources': [ - 'prog2.c', - ], - }, - ], -} diff --git a/tools/gyp/test/subdirectory/src/subdir/subdir2/prog3.c b/tools/gyp/test/subdirectory/src/subdir/subdir2/prog3.c deleted file mode 100644 index a326dc61b6a25c90a6eb9fd235bf1f36f5719f25..0000000000000000000000000000000000000000 --- a/tools/gyp/test/subdirectory/src/subdir/subdir2/prog3.c +++ /dev/null @@ -1,7 +0,0 @@ -#include - -int main(void) -{ - printf("Hello from prog3.c\n"); - return 0; -} diff --git a/tools/gyp/test/subdirectory/src/subdir/subdir2/prog3.gyp b/tools/gyp/test/subdirectory/src/subdir/subdir2/prog3.gyp deleted file mode 100644 index b49fb591137bae80ca723baa05cd0afe650cbd7a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/subdirectory/src/subdir/subdir2/prog3.gyp +++ /dev/null @@ -1,18 +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. - -{ - 'includes': [ - '../../symroot.gypi', - ], - 'targets': [ - { - 'target_name': 'prog3', - 'type': 'executable', - 'sources': [ - 'prog3.c', - ], - }, - ], -} diff --git a/tools/gyp/test/subdirectory/src/symroot.gypi b/tools/gyp/test/subdirectory/src/symroot.gypi deleted file mode 100644 index 519916427c9f134b81079de4d338cb81bb4bbeb2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/subdirectory/src/symroot.gypi +++ /dev/null @@ -1,16 +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. - -{ - 'variables': { - 'set_symroot%': 0, - }, - 'conditions': [ - ['set_symroot == 1', { - 'xcode_settings': { - 'SYMROOT': '<(DEPTH)/build', - }, - }], - ], -} diff --git a/tools/gyp/test/target/gyptest-target.py b/tools/gyp/test/target/gyptest-target.py deleted file mode 100644 index 4338db739c2d2624da1bea0b86d96ea7c1daa059..0000000000000000000000000000000000000000 --- a/tools/gyp/test/target/gyptest-target.py +++ /dev/null @@ -1,37 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies simplest-possible build of a "Hello, world!" program -using non-default extension. In particular, verifies how -target_extension is used to avoid MSB8012 for msvs. -""" - -import sys -import TestGyp - -if sys.platform in ('win32', 'cygwin'): - test = TestGyp.TestGyp() - - test.run_gyp('target.gyp') - test.build('target.gyp') - - # executables - test.built_file_must_exist('hello1.stuff', test.EXECUTABLE, bare=True) - test.built_file_must_exist('hello2.exe', test.EXECUTABLE, bare=True) - test.built_file_must_not_exist('hello2.stuff', test.EXECUTABLE, bare=True) - - # check msvs log for errors - if test.format == "msvs": - log_file = "obj\\hello1\\hello1.log" - test.built_file_must_exist(log_file) - test.built_file_must_not_contain(log_file, "MSB8012") - - log_file = "obj\\hello2\\hello2.log" - test.built_file_must_exist(log_file) - test.built_file_must_not_contain(log_file, "MSB8012") - - test.pass_test() diff --git a/tools/gyp/test/target/hello.c b/tools/gyp/test/target/hello.c deleted file mode 100644 index 3d535d3ec6dd386b3d21cad70c3871834ec9f96f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/target/hello.c +++ /dev/null @@ -1,7 +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. */ - -void main(void) { - printf("Hello, world!\n"); -} diff --git a/tools/gyp/test/target/target.gyp b/tools/gyp/test/target/target.gyp deleted file mode 100644 index c87e30f533c6d0d4df72c0456ac4bac72444b2a9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/target/target.gyp +++ /dev/null @@ -1,24 +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': 'hello1', - 'product_extension': 'stuff', - 'type': 'executable', - 'sources': [ - 'hello.c', - ], - }, - { - 'target_name': 'hello2', - 'target_extension': 'stuff', - 'type': 'executable', - 'sources': [ - 'hello.c', - ], - } - ] -} diff --git a/tools/gyp/test/toolsets/gyptest-toolsets.py b/tools/gyp/test/toolsets/gyptest-toolsets.py deleted file mode 100755 index f80fce70a2d0ab673f0d0b2a71067043ae4b592b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/toolsets/gyptest-toolsets.py +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies that toolsets are correctly applied -""" -import os -import sys -import TestGyp - -if sys.platform.startswith('linux'): - - test = TestGyp.TestGyp(formats=['make', 'ninja']) - - oldenv = os.environ.copy() - try: - os.environ['GYP_CROSSCOMPILE'] = '1' - test.run_gyp('toolsets.gyp') - finally: - os.environ.clear() - os.environ.update(oldenv) - - test.build('toolsets.gyp', test.ALL) - - test.run_built_executable('host-main', stdout="Host\nShared: Host\n") - test.run_built_executable('target-main', stdout="Target\nShared: Target\n") - - test.pass_test() diff --git a/tools/gyp/test/toolsets/main.cc b/tools/gyp/test/toolsets/main.cc deleted file mode 100644 index bc47da99787096f3efa9a0eda11e54417d596540..0000000000000000000000000000000000000000 --- a/tools/gyp/test/toolsets/main.cc +++ /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. */ - -#include - -const char *GetToolset(); -const char *GetToolsetShared(); - -int main(void) { - printf("%s\n", GetToolset()); - printf("Shared: %s\n", GetToolsetShared()); -} diff --git a/tools/gyp/test/toolsets/toolsets.cc b/tools/gyp/test/toolsets/toolsets.cc deleted file mode 100644 index a45fa029cb7c03b892fc363faf62e2ad823dc9ad..0000000000000000000000000000000000000000 --- a/tools/gyp/test/toolsets/toolsets.cc +++ /dev/null @@ -1,11 +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. */ - -const char *GetToolset() { -#ifdef TARGET - return "Target"; -#else - return "Host"; -#endif -} diff --git a/tools/gyp/test/toolsets/toolsets.gyp b/tools/gyp/test/toolsets/toolsets.gyp deleted file mode 100644 index 3bc3a784ea8881c05b2fc26f474341d4a70c55db..0000000000000000000000000000000000000000 --- a/tools/gyp/test/toolsets/toolsets.gyp +++ /dev/null @@ -1,62 +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. - -{ - 'target_defaults': { - 'target_conditions': [ - ['_toolset=="target"', {'defines': ['TARGET']}] - ] - }, - 'targets': [ - { - 'target_name': 'toolsets', - 'type': 'static_library', - 'toolsets': ['target', 'host'], - 'sources': [ - 'toolsets.cc', - ], - }, - { - 'target_name': 'host-main', - 'type': 'executable', - 'toolsets': ['host'], - 'dependencies': ['toolsets', 'toolsets_shared'], - 'sources': [ - 'main.cc', - ], - }, - { - 'target_name': 'target-main', - 'type': 'executable', - 'dependencies': ['toolsets', 'toolsets_shared'], - 'sources': [ - 'main.cc', - ], - }, - # This tests that build systems can handle a shared library being build for - # both host and target. - { - 'target_name': 'janus', - 'type': 'shared_library', - 'toolsets': ['target', 'host'], - 'sources': [ - 'toolsets.cc', - ], - 'cflags': [ '-fPIC' ], - }, - { - 'target_name': 'toolsets_shared', - 'type': 'shared_library', - 'toolsets': ['target', 'host'], - 'target_conditions': [ - # Ensure target and host have different shared_library names - ['_toolset=="host"', {'product_extension': 'host'}], - ], - 'sources': [ - 'toolsets_shared.cc', - ], - 'cflags': [ '-fPIC' ], - }, - ], -} diff --git a/tools/gyp/test/toolsets/toolsets_shared.cc b/tools/gyp/test/toolsets/toolsets_shared.cc deleted file mode 100644 index 794af2c0bd69e9eb1779b780a1433c162a16d8bf..0000000000000000000000000000000000000000 --- a/tools/gyp/test/toolsets/toolsets_shared.cc +++ /dev/null @@ -1,11 +0,0 @@ -/* Copyright (c) 2013 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. */ - -const char *GetToolsetShared() { -#ifdef TARGET - return "Target"; -#else - return "Host"; -#endif -} diff --git a/tools/gyp/test/toplevel-dir/gyptest-toplevel-dir.py b/tools/gyp/test/toplevel-dir/gyptest-toplevel-dir.py deleted file mode 100755 index 9e69512dd36cc15500a7dcc166e57b65fda0d0ad..0000000000000000000000000000000000000000 --- a/tools/gyp/test/toplevel-dir/gyptest-toplevel-dir.py +++ /dev/null @@ -1,31 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies building a subsidiary dependent target from a .gyp file in a -subdirectory, without specifying an explicit output build directory, -and using the subdirectory's solution or project file as the entry point. -""" - -import TestGyp -import errno - -test = TestGyp.TestGyp(formats=['ninja', 'make']) - -# We want our Makefile to be one dir up from main.gyp. -test.run_gyp('main.gyp', '--toplevel-dir=..', chdir='src/sub1') - -toplevel_dir = 'src' - -test.build('sub1/main.gyp', test.ALL, chdir=toplevel_dir) - -test.built_file_must_exist('prog1', type=test.EXECUTABLE, chdir=toplevel_dir) - -test.run_built_executable('prog1', - chdir=toplevel_dir, - stdout="Hello from prog1.c\n") - -test.pass_test() diff --git a/tools/gyp/test/toplevel-dir/src/sub1/main.gyp b/tools/gyp/test/toplevel-dir/src/sub1/main.gyp deleted file mode 100644 index 33219010e48dac243a5959c25cdee9e4835e2ada..0000000000000000000000000000000000000000 --- a/tools/gyp/test/toplevel-dir/src/sub1/main.gyp +++ /dev/null @@ -1,18 +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': 'prog1', - 'type': 'executable', - 'dependencies': [ - '<(DEPTH)/../sub2/prog2.gyp:prog2', - ], - 'sources': [ - 'prog1.c', - ], - }, - ], -} diff --git a/tools/gyp/test/toplevel-dir/src/sub1/prog1.c b/tools/gyp/test/toplevel-dir/src/sub1/prog1.c deleted file mode 100644 index 218e99401cb2598dddfdd30fed392ef022c7cdf1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/toplevel-dir/src/sub1/prog1.c +++ /dev/null @@ -1,7 +0,0 @@ -#include - -int main(void) -{ - printf("Hello from prog1.c\n"); - return 0; -} diff --git a/tools/gyp/test/toplevel-dir/src/sub2/prog2.c b/tools/gyp/test/toplevel-dir/src/sub2/prog2.c deleted file mode 100644 index 12a31883b93a99ca000a872b6ea439902cdc69eb..0000000000000000000000000000000000000000 --- a/tools/gyp/test/toplevel-dir/src/sub2/prog2.c +++ /dev/null @@ -1,7 +0,0 @@ -#include - -int main(void) -{ - printf("Hello from prog2.c\n"); - return 0; -} diff --git a/tools/gyp/test/toplevel-dir/src/sub2/prog2.gyp b/tools/gyp/test/toplevel-dir/src/sub2/prog2.gyp deleted file mode 100644 index 59345483692b6c4629c9e08c403c553e3776857c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/toplevel-dir/src/sub2/prog2.gyp +++ /dev/null @@ -1,15 +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': 'prog2', - 'type': 'executable', - 'sources': [ - 'prog2.c', - ], - }, - ], -} diff --git a/tools/gyp/test/variables/commands/commands-repeated.gyp b/tools/gyp/test/variables/commands/commands-repeated.gyp deleted file mode 100644 index 822ae4f05d46b7b6c0973df6d8ee0133276b78a1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/variables/commands/commands-repeated.gyp +++ /dev/null @@ -1,128 +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. - -# This is a simple test file to make sure that variable substitution -# happens correctly. Run "run_tests.py" using python to generate the -# output from this gyp file. - -{ - 'variables': { - 'pi': 'import math; print math.pi', - 'third_letters': "<(other_letters)HIJK", - 'letters_list': 'ABCD', - 'other_letters': '<(letters_list)EFG', - 'check_included': '<(included_variable)', - 'check_lists': [ - '<(included_variable)', - '<(third_letters)', - ], - 'check_int': 5, - 'check_str_int': '6', - 'check_list_int': [ - 7, - '8', - 9, - ], - 'not_int_1': ' 10', - 'not_int_2': '11 ', - 'not_int_3': '012', - 'not_int_4': '13.0', - 'not_int_5': '+14', - 'negative_int': '-15', - 'zero_int': '0', - }, - 'includes': [ - 'commands.gypi', - ], - 'targets': [ - { - 'target_name': 'foo', - 'type': 'none', - 'variables': { - 'var1': ' commands.gyp.stdout -python ../../../gyp --ignore-environment --debug variables --format gypd --depth . commands.gyp > commands.gyp.ignore-env.stdout -cp -f commands.gypd commands.gypd.golden -python ../../../gyp --debug variables --format gypd --depth . commands-repeated.gyp > commands-repeated.gyp.stdout -cp -f commands-repeated.gypd commands-repeated.gypd.golden diff --git a/tools/gyp/test/variables/filelist/filelist.gyp.stdout b/tools/gyp/test/variables/filelist/filelist.gyp.stdout deleted file mode 100644 index 595a19c68483ce7d2b69c7a8b493fd2321bd5e45..0000000000000000000000000000000000000000 --- a/tools/gyp/test/variables/filelist/filelist.gyp.stdout +++ /dev/null @@ -1,26 +0,0 @@ -VARIABLES:input.py:562:ExpandVariables Matches: {'content': 'names.txt <@(names', 'is_array': '', 'replace': '<|(names.txt <@(names)', 'type': '<|', 'command_string': None} -VARIABLES:input.py:562:ExpandVariables Matches: {'content': 'names', 'is_array': '', 'replace': '<@(names)', 'type': '<@', 'command_string': None} -VARIABLES:input.py:797:ExpandVariables Found output 'names.txt John Jacob Jingleheimer Schmidt', recursing. -VARIABLES:input.py:797:ExpandVariables Found output 'names.txt', recursing. -VARIABLES:input.py:562:ExpandVariables Matches: {'content': 'names_listfile', 'is_array': '', 'replace': '<(names_listfile)', 'type': '<', 'command_string': None} -VARIABLES:input.py:797:ExpandVariables Found output 'names.txt', recursing. -VARIABLES:input.py:562:ExpandVariables Matches: {'content': 'names_listfile', 'is_array': '', 'replace': '<(names_listfile)', 'type': '<', 'command_string': None} -VARIABLES:input.py:797:ExpandVariables Found output 'names.txt', recursing. -VARIABLES:input.py:562:ExpandVariables Matches: {'content': 'cat <(names_listfile', 'is_array': '', 'replace': ' filelist.gyp.stdout -cp -f src/filelist.gypd filelist.gypd.golden diff --git a/tools/gyp/test/variables/latelate/gyptest-latelate.py b/tools/gyp/test/variables/latelate/gyptest-latelate.py deleted file mode 100755 index 2d77dfec5e9b8dd91ec70ea348ae1b1d04835b78..0000000000000000000000000000000000000000 --- a/tools/gyp/test/variables/latelate/gyptest-latelate.py +++ /dev/null @@ -1,25 +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. - -""" -Verifies that ^(latelate) style variables work. -""" - -import TestGyp - -test = TestGyp.TestGyp() - -test.run_gyp('latelate.gyp', chdir='src') - -test.relocate('src', 'relocate/src') - -test.build('latelate.gyp', test.ALL, chdir='relocate/src') - -test.run_built_executable( - 'program', chdir='relocate/src', stdout='program.cc\n') - - -test.pass_test() diff --git a/tools/gyp/test/variables/latelate/src/latelate.gyp b/tools/gyp/test/variables/latelate/src/latelate.gyp deleted file mode 100644 index 312f3765b6744f6d9023924c31438e88cae6882f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/variables/latelate/src/latelate.gyp +++ /dev/null @@ -1,34 +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. - -{ - 'target_defaults': { - 'target_conditions': [ - ['has_lame==1', { - 'sources/': [ - ['exclude', 'lame'], - ], - }], - ], - }, - 'targets': [ - { - 'target_name': 'program', - 'type': 'executable', - 'variables': { - 'has_lame': 1, - }, - 'include_dirs': [ - '<(SHARED_INTERMEDIATE_DIR)', - ], - 'defines': [ - 'FOO="^(_sources)"', - ], - 'sources': [ - 'program.cc', - 'this_is_lame.cc', - ], - }, - ], -} diff --git a/tools/gyp/test/variables/latelate/src/program.cc b/tools/gyp/test/variables/latelate/src/program.cc deleted file mode 100644 index 97c98ae5b9d834aaf116981bf1cd1704a79f5974..0000000000000000000000000000000000000000 --- a/tools/gyp/test/variables/latelate/src/program.cc +++ /dev/null @@ -1,13 +0,0 @@ -/* - * 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. - */ - -#include - - -int main(void) { - printf(FOO "\n"); - return 0; -} diff --git a/tools/gyp/test/variables/variable-in-path/C1/hello.cc b/tools/gyp/test/variables/variable-in-path/C1/hello.cc deleted file mode 100644 index 1711567ef566703fcd9c33e0a236b1b30454df6a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/variables/variable-in-path/C1/hello.cc +++ /dev/null @@ -1,7 +0,0 @@ -// 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. - -int main() { - return 0; -} diff --git a/tools/gyp/test/variables/variable-in-path/gyptest-variable-in-path.py b/tools/gyp/test/variables/variable-in-path/gyptest-variable-in-path.py deleted file mode 100644 index b73a279da737fc339543d45ec8a31245d64ccf13..0000000000000000000000000000000000000000 --- a/tools/gyp/test/variables/variable-in-path/gyptest-variable-in-path.py +++ /dev/null @@ -1,23 +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. - -""" -Make sure <(CONFIGURATION_NAME) variable is correctly expanded. -""" - -import TestGyp - -import sys - -test = TestGyp.TestGyp() -test.set_configuration('C1') - -test.run_gyp('variable-in-path.gyp') -test.build('variable-in-path.gyp', 'hello1') -test.build('variable-in-path.gyp', 'hello2') - - -test.pass_test() diff --git a/tools/gyp/test/variables/variable-in-path/variable-in-path.gyp b/tools/gyp/test/variables/variable-in-path/variable-in-path.gyp deleted file mode 100644 index 908d21eb6629087df1fe815ee3e5b39b4b9e2c25..0000000000000000000000000000000000000000 --- a/tools/gyp/test/variables/variable-in-path/variable-in-path.gyp +++ /dev/null @@ -1,31 +0,0 @@ -# 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': 'hello1', - 'type': 'executable', - 'sources': [ - '<(CONFIGURATION_NAME)/hello.cc', - ], - }, - { - 'target_name': 'hello2', - 'type': 'executable', - 'sources': [ - './<(CONFIGURATION_NAME)/hello.cc', - ], - }, - ], - 'target_defaults': { - 'default_configuration': 'C1', - 'configurations': { - 'C1': { - }, - 'C2': { - }, - }, - }, -} diff --git a/tools/gyp/test/win/asm-files/asm-files.gyp b/tools/gyp/test/win/asm-files/asm-files.gyp deleted file mode 100644 index b1f132ceea70a5995ff363f3e3778d7cfd815501..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/asm-files/asm-files.gyp +++ /dev/null @@ -1,17 +0,0 @@ -# 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': 'sources_with_asm', - 'type': 'executable', - 'sources': [ - 'hello.cc', - 'b.s', - 'c.S', - ], - }, - ] -} diff --git a/tools/gyp/test/win/asm-files/b.s b/tools/gyp/test/win/asm-files/b.s deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tools/gyp/test/win/asm-files/c.S b/tools/gyp/test/win/asm-files/c.S deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tools/gyp/test/win/asm-files/hello.cc b/tools/gyp/test/win/asm-files/hello.cc deleted file mode 100644 index 1711567ef566703fcd9c33e0a236b1b30454df6a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/asm-files/hello.cc +++ /dev/null @@ -1,7 +0,0 @@ -// 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. - -int main() { - return 0; -} diff --git a/tools/gyp/test/win/batch-file-action/batch-file-action.gyp b/tools/gyp/test/win/batch-file-action/batch-file-action.gyp deleted file mode 100644 index e4db9af9d3d6c92399107da7dbb3d38585a73b0e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/batch-file-action/batch-file-action.gyp +++ /dev/null @@ -1,21 +0,0 @@ -# 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': 'test_batch', - 'type': 'none', - 'actions': [ - { - 'action_name': 'copy_to_output', - 'inputs': ['infile'], - 'outputs': ['outfile'], - 'action': ['somecmd.bat', 'infile', 'outfile'], - 'msvs_cygwin_shell': 0, - } - ], - }, - ] -} diff --git a/tools/gyp/test/win/batch-file-action/infile b/tools/gyp/test/win/batch-file-action/infile deleted file mode 100644 index 3f9177e45e805cac9e76b5a2131ba3484367200b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/batch-file-action/infile +++ /dev/null @@ -1 +0,0 @@ -input diff --git a/tools/gyp/test/win/batch-file-action/somecmd.bat b/tools/gyp/test/win/batch-file-action/somecmd.bat deleted file mode 100644 index 3b5ae80a42cca8cd6f9085312400c175e64aad74..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/batch-file-action/somecmd.bat +++ /dev/null @@ -1,5 +0,0 @@ -@echo off -:: The redirs to nul are important. %2 can end up being an unterminated "'d -:: string, so the remainder of the command line becomes the target file name, -:: which in turn fails because it's a filename containing >, nul, etc. -copy /y %1 %2 >nul 2>nul diff --git a/tools/gyp/test/win/command-quote/a.S b/tools/gyp/test/win/command-quote/a.S deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tools/gyp/test/win/command-quote/bat with spaces.bat b/tools/gyp/test/win/command-quote/bat with spaces.bat deleted file mode 100644 index dc3508f9a9e06213bd57398a54ded7a7650a39b5..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/command-quote/bat with spaces.bat +++ /dev/null @@ -1,7 +0,0 @@ -@echo off - -:: 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. - -copy %1 %2 diff --git a/tools/gyp/test/win/command-quote/command-quote.gyp b/tools/gyp/test/win/command-quote/command-quote.gyp deleted file mode 100644 index faf724674fc8a5efb103d53c0b4af1a686b9b36c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/command-quote/command-quote.gyp +++ /dev/null @@ -1,79 +0,0 @@ -# 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. - -{ - 'target_defaults': { - 'msvs_cygwin_dirs': ['../../../../../<(DEPTH)/third_party/cygwin'], - }, - 'targets': [ - { - 'target_name': 'test_batch', - 'type': 'none', - 'rules': [ - { - 'rule_name': 'build_with_batch', - 'msvs_cygwin_shell': 0, - 'extension': 'S', - 'outputs': ['output.obj'], - 'action': ['call go.bat', '<(RULE_INPUT_PATH)', 'output.obj'], - },], - 'sources': ['a.S'], - }, - { - 'target_name': 'test_call_separate', - 'type': 'none', - 'rules': [ - { - 'rule_name': 'build_with_batch2', - 'msvs_cygwin_shell': 0, - 'extension': 'S', - 'outputs': ['output2.obj'], - 'action': ['call', 'go.bat', '<(RULE_INPUT_PATH)', 'output2.obj'], - },], - 'sources': ['a.S'], - }, - { - 'target_name': 'test_with_spaces', - 'type': 'none', - 'rules': [ - { - 'rule_name': 'build_with_batch3', - 'msvs_cygwin_shell': 0, - 'extension': 'S', - 'outputs': ['output3.obj'], - 'action': ['bat with spaces.bat', '<(RULE_INPUT_PATH)', 'output3.obj'], - },], - 'sources': ['a.S'], - }, - { - 'target_name': 'test_with_double_quotes', - 'type': 'none', - 'rules': [ - { - 'rule_name': 'build_with_batch3', - 'msvs_cygwin_shell': 1, - 'extension': 'S', - 'outputs': ['output4.obj'], - 'arguments': ['-v'], - 'action': ['python', '-c', 'import shutil; ' - 'shutil.copy("<(RULE_INPUT_PATH)", "output4.obj")'], - },], - 'sources': ['a.S'], - }, - { - 'target_name': 'test_with_single_quotes', - 'type': 'none', - 'rules': [ - { - 'rule_name': 'build_with_batch3', - 'msvs_cygwin_shell': 1, - 'extension': 'S', - 'outputs': ['output5.obj'], - 'action': ['python', '-c', "import shutil; " - "shutil.copy('<(RULE_INPUT_PATH)', 'output5.obj')"], - },], - 'sources': ['a.S'], - }, - ] -} diff --git a/tools/gyp/test/win/command-quote/go.bat b/tools/gyp/test/win/command-quote/go.bat deleted file mode 100644 index dc3508f9a9e06213bd57398a54ded7a7650a39b5..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/command-quote/go.bat +++ /dev/null @@ -1,7 +0,0 @@ -@echo off - -:: 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. - -copy %1 %2 diff --git a/tools/gyp/test/win/command-quote/subdir/and/another/in-subdir.gyp b/tools/gyp/test/win/command-quote/subdir/and/another/in-subdir.gyp deleted file mode 100644 index 3dff4c40b9781ad6fc885ef4e4d45c3344316cee..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/command-quote/subdir/and/another/in-subdir.gyp +++ /dev/null @@ -1,27 +0,0 @@ -# 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': 'test_batch_depth', - 'type': 'none', - 'variables': { - # Taken from native_client/build/common.gypi. Seems unintentional (a - # string in a 1 element list)? But since it works on other generators, - # I guess it should work here too. - 'filepath': [ 'call <(DEPTH)/../../../go.bat' ], - }, - 'rules': [ - { - 'rule_name': 'build_with_batch4', - 'msvs_cygwin_shell': 0, - 'extension': 'S', - 'outputs': ['output4.obj'], - 'action': ['<@(filepath)', '<(RULE_INPUT_PATH)', 'output4.obj'], - },], - 'sources': ['<(DEPTH)\\..\\..\\..\\a.S'], - }, - ] -} diff --git a/tools/gyp/test/win/compiler-flags/additional-include-dirs.cc b/tools/gyp/test/win/compiler-flags/additional-include-dirs.cc deleted file mode 100644 index f1e11dd12d6d7f783bebb1a718c88810dc6c8632..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/additional-include-dirs.cc +++ /dev/null @@ -1,10 +0,0 @@ -// 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. - -// No path qualification to test compiler include dir specification. -#include "header.h" - -int main() { - return 0; -} diff --git a/tools/gyp/test/win/compiler-flags/additional-include-dirs.gyp b/tools/gyp/test/win/compiler-flags/additional-include-dirs.gyp deleted file mode 100644 index 42c7e849f63b4c07d226dad35a8e351e252d67f9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/additional-include-dirs.gyp +++ /dev/null @@ -1,20 +0,0 @@ -# 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': 'test_incs', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'AdditionalIncludeDirectories': [ - 'subdir', - ], - } - }, - 'sources': ['additional-include-dirs.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/compiler-flags/additional-options.cc b/tools/gyp/test/win/compiler-flags/additional-options.cc deleted file mode 100644 index c79572bafad3cbca99d5be6315ccb4063d5799fb..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/additional-options.cc +++ /dev/null @@ -1,10 +0,0 @@ -// 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. - -int main() { - // Generate a warning that will appear at level 4, but not level 1 - // (truncation and unused local). - char c = 123456; - return 0; -} diff --git a/tools/gyp/test/win/compiler-flags/additional-options.gyp b/tools/gyp/test/win/compiler-flags/additional-options.gyp deleted file mode 100644 index 6a365a2062aed56dfe6334313889a3f4e02e89b9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/additional-options.gyp +++ /dev/null @@ -1,31 +0,0 @@ -# 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': 'test_additional_none', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WarningLevel': '4', - 'WarnAsError': 'true', - } - }, - 'sources': ['additional-options.cc'], - }, - { - 'target_name': 'test_additional_one', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WarningLevel': '4', - 'WarnAsError': 'true', - 'AdditionalOptions': [ '/W1' ], - } - }, - 'sources': ['additional-options.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/compiler-flags/analysis.gyp b/tools/gyp/test/win/compiler-flags/analysis.gyp deleted file mode 100644 index 97e942258fbaca3f1ecc26b2ed3f64a3cf5c6936..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/analysis.gyp +++ /dev/null @@ -1,40 +0,0 @@ -# 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': 'test_analysis_on', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'EnablePREfast': 'true', - 'WarnAsError': 'true', - }, - }, - 'sources': ['uninit.cc'], - }, - { - 'target_name': 'test_analysis_off', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'EnablePREfast': 'false', - 'WarnAsError': 'true', - }, - }, - 'sources': ['uninit.cc'], - }, - { - 'target_name': 'test_analysis_unspec', - 'type': 'executable', - 'sources': ['uninit.cc'], - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WarnAsError': 'true', - }, - }, - }, - ] -} diff --git a/tools/gyp/test/win/compiler-flags/buffer-security-check.gyp b/tools/gyp/test/win/compiler-flags/buffer-security-check.gyp deleted file mode 100644 index cc5a12b95367880b68bca63599d6dc02430f1dae..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/buffer-security-check.gyp +++ /dev/null @@ -1,51 +0,0 @@ -# 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': [ - # Turn debug information on so that we can see the name of the buffer - # security check cookie in the disassembly. - { - 'target_name': 'test_bsc_unset', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'DebugInformationFormat': '3', - }, - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - }, - }, - 'sources': ['buffer-security.cc'], - }, - { - 'target_name': 'test_bsc_off', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'BufferSecurityCheck': 'false', - 'DebugInformationFormat': '3', - }, - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - }, - }, - 'sources': ['buffer-security.cc'], - }, - { - 'target_name': 'test_bsc_on', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'BufferSecurityCheck': 'true', - 'DebugInformationFormat': '3', - }, - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - }, - }, - 'sources': ['buffer-security.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/compiler-flags/buffer-security.cc b/tools/gyp/test/win/compiler-flags/buffer-security.cc deleted file mode 100644 index e8a48a2a6741fcecd31968e73839117f2d8f5a7d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/buffer-security.cc +++ /dev/null @@ -1,12 +0,0 @@ -// 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. - -#include -#include - -int main() { - char* stuff = reinterpret_cast(_alloca(256)); - strcpy(stuff, "blah"); - return 0; -} diff --git a/tools/gyp/test/win/compiler-flags/calling-convention-cdecl.def b/tools/gyp/test/win/compiler-flags/calling-convention-cdecl.def deleted file mode 100644 index dc1dba055ac3c512a2dc8ac488bfbca471198421..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/calling-convention-cdecl.def +++ /dev/null @@ -1,6 +0,0 @@ -; Copyright (c) 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. - -EXPORTS - foo diff --git a/tools/gyp/test/win/compiler-flags/calling-convention-fastcall.def b/tools/gyp/test/win/compiler-flags/calling-convention-fastcall.def deleted file mode 100644 index 2c61afe208a4d72f51ce01894bf94612f4c769ae..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/calling-convention-fastcall.def +++ /dev/null @@ -1,6 +0,0 @@ -; Copyright (c) 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. - -EXPORTS - @foo@0 diff --git a/tools/gyp/test/win/compiler-flags/calling-convention-stdcall.def b/tools/gyp/test/win/compiler-flags/calling-convention-stdcall.def deleted file mode 100644 index 6c7e05e9ea6f4bff52f05dbc236308275f2b70e3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/calling-convention-stdcall.def +++ /dev/null @@ -1,6 +0,0 @@ -; Copyright (c) 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. - -EXPORTS - _foo@0 diff --git a/tools/gyp/test/win/compiler-flags/calling-convention-vectorcall.def b/tools/gyp/test/win/compiler-flags/calling-convention-vectorcall.def deleted file mode 100644 index 4ef119c3e37a1c575e87346de720d4e3660b1cc5..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/calling-convention-vectorcall.def +++ /dev/null @@ -1,6 +0,0 @@ -; Copyright (c) 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. - -EXPORTS - foo@@0 diff --git a/tools/gyp/test/win/compiler-flags/calling-convention.cc b/tools/gyp/test/win/compiler-flags/calling-convention.cc deleted file mode 100644 index 0d78a0cc05a251ffe6f9f65e45fbeab1ee061368..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/calling-convention.cc +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright (c) 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. - -extern "C" void foo() { -} diff --git a/tools/gyp/test/win/compiler-flags/calling-convention.gyp b/tools/gyp/test/win/compiler-flags/calling-convention.gyp deleted file mode 100644 index 5069c552bceb85ec98f646d7fca3218a5cca5f2d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/calling-convention.gyp +++ /dev/null @@ -1,66 +0,0 @@ -# Copyright (c) 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': 'test_cdecl', - 'type': 'loadable_module', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'CallingConvention': 0, - }, - }, - 'sources': [ - 'calling-convention.cc', - 'calling-convention-cdecl.def', - ], - }, - { - 'target_name': 'test_fastcall', - 'type': 'loadable_module', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'CallingConvention': 1, - }, - }, - 'sources': [ - 'calling-convention.cc', - 'calling-convention-fastcall.def', - ], - }, - { - 'target_name': 'test_stdcall', - 'type': 'loadable_module', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'CallingConvention': 2, - }, - }, - 'sources': [ - 'calling-convention.cc', - 'calling-convention-stdcall.def', - ], - }, - ], - 'conditions': [ - ['MSVS_VERSION[0:4]>="2013"', { - 'targets': [ - { - 'target_name': 'test_vectorcall', - 'type': 'loadable_module', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'CallingConvention': 3, - }, - }, - 'sources': [ - 'calling-convention.cc', - 'calling-convention-vectorcall.def', - ], - }, - ], - }], - ], -} diff --git a/tools/gyp/test/win/compiler-flags/character-set-mbcs.cc b/tools/gyp/test/win/compiler-flags/character-set-mbcs.cc deleted file mode 100644 index 3286304730d394fcb5e02d2c0a8dc712523436f3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/character-set-mbcs.cc +++ /dev/null @@ -1,11 +0,0 @@ -// 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. - -#ifndef _MBCS -#error -#endif - -int main() { - return 0; -} diff --git a/tools/gyp/test/win/compiler-flags/character-set-unicode.cc b/tools/gyp/test/win/compiler-flags/character-set-unicode.cc deleted file mode 100644 index 32e69724a5097ff4253c3485bee0c9c65ee6175b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/character-set-unicode.cc +++ /dev/null @@ -1,15 +0,0 @@ -// 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. - -#ifndef _UNICODE -#error -#endif - -#ifndef UNICODE -#error -#endif - -int main() { - return 0; -} diff --git a/tools/gyp/test/win/compiler-flags/character-set.gyp b/tools/gyp/test/win/compiler-flags/character-set.gyp deleted file mode 100644 index 3dc45557d9ba689f5b7e1bb02745773c2cf37ff9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/character-set.gyp +++ /dev/null @@ -1,35 +0,0 @@ -# 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': 'test_cs_notset', - 'product_name': 'test_cs_notset', - 'type': 'executable', - 'msvs_configuration_attributes': { - 'CharacterSet': '0' - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_cs_unicode', - 'product_name': 'test_cs_unicode', - 'type': 'executable', - 'msvs_configuration_attributes': { - 'CharacterSet': '1' - }, - 'sources': ['character-set-unicode.cc'], - }, - { - 'target_name': 'test_cs_mbcs', - 'product_name': 'test_cs_mbcs', - 'type': 'executable', - 'msvs_configuration_attributes': { - 'CharacterSet': '2' - }, - 'sources': ['character-set-mbcs.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/compiler-flags/debug-format.gyp b/tools/gyp/test/win/compiler-flags/debug-format.gyp deleted file mode 100644 index daaed23ff1f7c0da2a66dae2e57b8fe2ab46c40c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/debug-format.gyp +++ /dev/null @@ -1,48 +0,0 @@ -# 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': 'test-debug-format-off', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'DebugInformationFormat': '0' - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test-debug-format-oldstyle', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'DebugInformationFormat': '1' - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test-debug-format-pdb', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'DebugInformationFormat': '3' - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test-debug-format-editcontinue', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'DebugInformationFormat': '4' - } - }, - 'sources': ['hello.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/compiler-flags/default-char-is-unsigned.cc b/tools/gyp/test/win/compiler-flags/default-char-is-unsigned.cc deleted file mode 100644 index beeca2aa156f1a729d95d90d09b5bdfb06111b61..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/default-char-is-unsigned.cc +++ /dev/null @@ -1,15 +0,0 @@ -// 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. - -template -struct CompileAssert { -}; - -#define COMPILE_ASSERT(expr, msg) \ - typedef CompileAssert<(bool(expr))> msg[bool(expr) ? 1 : -1] - -int main() { - COMPILE_ASSERT(char(-1) > 0, default_char_is_unsigned); - return 0; -} diff --git a/tools/gyp/test/win/compiler-flags/default-char-is-unsigned.gyp b/tools/gyp/test/win/compiler-flags/default-char-is-unsigned.gyp deleted file mode 100644 index 941e5810dd1d0673193470af3968372df13ba5f7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/default-char-is-unsigned.gyp +++ /dev/null @@ -1,20 +0,0 @@ -# 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': 'test_default_char_is_unsigned', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'DefaultCharIsUnsigned': 'true', - }, - }, - 'sources': [ - 'default-char-is-unsigned.cc', - ], - }, - ], -} diff --git a/tools/gyp/test/win/compiler-flags/disable-specific-warnings.cc b/tools/gyp/test/win/compiler-flags/disable-specific-warnings.cc deleted file mode 100644 index d312f5f48121a135451920b0549ffb45be9bd6ac..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/disable-specific-warnings.cc +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) 2013 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. - -int main() { - // Causes level 1 warning (C4700) - int i; - return i; -} diff --git a/tools/gyp/test/win/compiler-flags/disable-specific-warnings.gyp b/tools/gyp/test/win/compiler-flags/disable-specific-warnings.gyp deleted file mode 100644 index d81d694c62010759807d8959a2ee1244aa0d1cf1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/disable-specific-warnings.gyp +++ /dev/null @@ -1,29 +0,0 @@ -# Copyright (c) 2013 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': 'test_disable_specific_warnings_set', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WarnAsError': 'true', - 'DisableSpecificWarnings': ['4700'] - } - }, - 'sources': ['disable-specific-warnings.cc'] - }, - { - 'target_name': 'test_disable_specific_warnings_unset', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WarnAsError': 'true' - } - }, - 'sources': ['disable-specific-warnings.cc'] - }, - ] -} diff --git a/tools/gyp/test/win/compiler-flags/enable-enhanced-instruction-set.cc b/tools/gyp/test/win/compiler-flags/enable-enhanced-instruction-set.cc deleted file mode 100644 index 432ef54eda2be556c5e43deee232ed23c431315f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/enable-enhanced-instruction-set.cc +++ /dev/null @@ -1,28 +0,0 @@ -// Copyright (c) 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. - -#include - -static const char* GetArchOption() { -#if _M_IX86_FP == 0 - return "IA32"; -#elif _M_IX86_FP == 1 - return "SSE"; -#elif _M_IX86_FP == 2 -# if defined(__AVX2__) - return "AVX2"; -# elif defined(__AVX__) - return "AVX"; -# else - return "SSE2"; -# endif -#else - return "UNSUPPORTED OPTION"; -#endif -} - -int main() { - printf("/arch:%s\n", GetArchOption()); - return 0; -} diff --git a/tools/gyp/test/win/compiler-flags/enable-enhanced-instruction-set.gyp b/tools/gyp/test/win/compiler-flags/enable-enhanced-instruction-set.gyp deleted file mode 100644 index 9c49edc7ffc89c73c9e461dd8e4880f15aeb7489..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/enable-enhanced-instruction-set.gyp +++ /dev/null @@ -1,68 +0,0 @@ -# Copyright (c) 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': 'sse_extensions', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'EnableEnhancedInstructionSet': '1', # StreamingSIMDExtensions - } - }, - 'sources': ['enable-enhanced-instruction-set.cc'], - }, - { - 'target_name': 'sse2_extensions', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'EnableEnhancedInstructionSet': '2', # StreamingSIMDExtensions2 - } - }, - 'sources': ['enable-enhanced-instruction-set.cc'], - }, - ], - 'conditions': [ - ['MSVS_VERSION[0:4]>"2010"', { - 'targets': [ - { - 'target_name': 'avx_extensions', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'EnableEnhancedInstructionSet': '3', # AdvancedVectorExtensions - } - }, - 'sources': ['enable-enhanced-instruction-set.cc'], - }, - { - 'target_name': 'no_extensions', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'EnableEnhancedInstructionSet': '4', # NoExtensions - } - }, - 'sources': ['enable-enhanced-instruction-set.cc'], - }, - ], - }], - ['MSVS_VERSION[0:4]>="2013"', { - 'targets': [ - { - 'target_name': 'avx2_extensions', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'EnableEnhancedInstructionSet': '5', # AdvancedVectorExtensions2 - } - }, - 'sources': ['enable-enhanced-instruction-set.cc'], - }, - ], - }], - ], -} diff --git a/tools/gyp/test/win/compiler-flags/exception-handling-on.cc b/tools/gyp/test/win/compiler-flags/exception-handling-on.cc deleted file mode 100644 index 5d9a3af77ded07e27838e727395232c1c69a0856..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/exception-handling-on.cc +++ /dev/null @@ -1,24 +0,0 @@ -// 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. - -#include -#include - -void fail() { - try { - int i = 0, j = 1; - j /= i; - } catch(...) { - exit(1); - } -} - -int main() { - __try { - fail(); - } __except(EXCEPTION_EXECUTE_HANDLER) { - return 2; - } - return 3; -} diff --git a/tools/gyp/test/win/compiler-flags/exception-handling.gyp b/tools/gyp/test/win/compiler-flags/exception-handling.gyp deleted file mode 100644 index c266768ddae5f3b2440d485037f18fa7d5a14345..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/exception-handling.gyp +++ /dev/null @@ -1,46 +0,0 @@ -# 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': [ - # Optimization disabled so that the exception-causing code is not removed - # (divide by zero was getting optimized away in VS2010). - { - 'target_name': 'test_eh_off', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'ExceptionHandling': '0', - 'WarnAsError': 'true', - 'Optimization': '0', - } - }, - 'sources': ['exception-handling-on.cc'], - }, - { - 'target_name': 'test_eh_s', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'ExceptionHandling': '1', - 'WarnAsError': 'true', - 'Optimization': '0', - } - }, - 'sources': ['exception-handling-on.cc'], - }, - { - 'target_name': 'test_eh_a', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'ExceptionHandling': '2', - 'WarnAsError': 'true', - 'Optimization': '0', - } - }, - 'sources': ['exception-handling-on.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/compiler-flags/floating-point-model-fast.cc b/tools/gyp/test/win/compiler-flags/floating-point-model-fast.cc deleted file mode 100644 index 9d22152f5e5fcd9d6ed78e23fea25889ef4c70bc..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/floating-point-model-fast.cc +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) 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. - -#ifdef _M_FP_PRECISE -#error -#endif - -#ifdef _M_FP_STRICT -#error -#endif - -#ifndef _M_FP_FAST -#error -#endif - -int main() { - return 0; -} diff --git a/tools/gyp/test/win/compiler-flags/floating-point-model-precise.cc b/tools/gyp/test/win/compiler-flags/floating-point-model-precise.cc deleted file mode 100644 index 1191a74ed1a633f3cf869270a6af580e583cb661..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/floating-point-model-precise.cc +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) 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. - -#ifndef _M_FP_PRECISE -#error -#endif - -#ifdef _M_FP_STRICT -#error -#endif - -#ifdef _M_FP_FAST -#error -#endif - -int main() { - return 0; -} diff --git a/tools/gyp/test/win/compiler-flags/floating-point-model-strict.cc b/tools/gyp/test/win/compiler-flags/floating-point-model-strict.cc deleted file mode 100644 index 1ffde36e0c5b083df9d5f48c084bb795a677f23b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/floating-point-model-strict.cc +++ /dev/null @@ -1,19 +0,0 @@ -// Copyright (c) 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. - -#ifdef _M_FP_PRECISE -#error -#endif - -#ifndef _M_FP_STRICT -#error -#endif - -#ifdef _M_FP_FAST -#error -#endif - -int main() { - return 0; -} diff --git a/tools/gyp/test/win/compiler-flags/floating-point-model.gyp b/tools/gyp/test/win/compiler-flags/floating-point-model.gyp deleted file mode 100644 index 857b275a8f9957359b2df597e2bc777cc06a6dbc..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/floating-point-model.gyp +++ /dev/null @@ -1,43 +0,0 @@ -# Copyright (c) 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': 'test-floating-point-model-default', - 'type': 'executable', - 'sources': ['floating-point-model-precise.cc'], - }, - { - 'target_name': 'test-floating-point-model-precise', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'FloatingPointModel': '0' - } - }, - 'sources': ['floating-point-model-precise.cc'], - }, - { - 'target_name': 'test-floating-point-model-strict', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'FloatingPointModel': '1' - } - }, - 'sources': ['floating-point-model-strict.cc'], - }, - { - 'target_name': 'test-floating-point-model-fast', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'FloatingPointModel': '2' - } - }, - 'sources': ['floating-point-model-fast.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/compiler-flags/force-include-files-with-precompiled.cc b/tools/gyp/test/win/compiler-flags/force-include-files-with-precompiled.cc deleted file mode 100644 index 85cb0f32a6f304d73ac65270935c4ca813526ae9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/force-include-files-with-precompiled.cc +++ /dev/null @@ -1,10 +0,0 @@ -// 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. - -#include - -int main() { - std::string s; - return 0; -} diff --git a/tools/gyp/test/win/compiler-flags/force-include-files.cc b/tools/gyp/test/win/compiler-flags/force-include-files.cc deleted file mode 100644 index 4a93de55d4ebfab7e394f872463df92632046cd9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/force-include-files.cc +++ /dev/null @@ -1,8 +0,0 @@ -// 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. - -int main() { - std::list > l; - return 0; -} diff --git a/tools/gyp/test/win/compiler-flags/force-include-files.gyp b/tools/gyp/test/win/compiler-flags/force-include-files.gyp deleted file mode 100644 index 2031546cc57d6d582ab80d0ed1f86187c67d73e0..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/force-include-files.gyp +++ /dev/null @@ -1,36 +0,0 @@ -# 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': 'test_force_include_files', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'ForcedIncludeFiles': ['string', 'vector', 'list'], - }, - }, - 'sources': [ - 'force-include-files.cc', - ], - }, - { - 'target_name': 'test_force_include_with_precompiled', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'ForcedIncludeFiles': ['string'], - }, - }, - 'msvs_precompiled_header': 'stdio.h', - 'msvs_precompiled_source': 'precomp.cc', - 'msvs_disabled_warnings': [ 4530, ], - 'sources': [ - 'force-include-files-with-precompiled.cc', - 'precomp.cc', - ], - }, - ], -} diff --git a/tools/gyp/test/win/compiler-flags/function-level-linking.cc b/tools/gyp/test/win/compiler-flags/function-level-linking.cc deleted file mode 100644 index 49522728170d1a277f142a06f7c07e5bac078739..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/function-level-linking.cc +++ /dev/null @@ -1,11 +0,0 @@ -// 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. - -int comdat_function() { - return 1; -} - -int main() { - return 0; -} diff --git a/tools/gyp/test/win/compiler-flags/function-level-linking.gyp b/tools/gyp/test/win/compiler-flags/function-level-linking.gyp deleted file mode 100644 index 5858586a249a717d37a35da9ede87213ea872b6d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/function-level-linking.gyp +++ /dev/null @@ -1,28 +0,0 @@ -# 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': 'test_fll_off', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'EnableFunctionLevelLinking': 'false' - } - }, - 'sources': ['function-level-linking.cc'], - }, - { - 'target_name': 'test_fll_on', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'EnableFunctionLevelLinking': 'true', - } - }, - 'sources': ['function-level-linking.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/compiler-flags/hello.cc b/tools/gyp/test/win/compiler-flags/hello.cc deleted file mode 100644 index 1711567ef566703fcd9c33e0a236b1b30454df6a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/hello.cc +++ /dev/null @@ -1,7 +0,0 @@ -// 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. - -int main() { - return 0; -} diff --git a/tools/gyp/test/win/compiler-flags/optimizations.gyp b/tools/gyp/test/win/compiler-flags/optimizations.gyp deleted file mode 100644 index e63096f0f70f3f00b38d0198ce0b6d996583f3bc..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/optimizations.gyp +++ /dev/null @@ -1,207 +0,0 @@ -# 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': 'test_opt_off', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'Optimization': '0' - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_opt_lev_size', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'Optimization': '1' - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_opt_lev_speed', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'Optimization': '2' - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_opt_lev_max', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'Optimization': '3' - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_opt_unset', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_opt_fpo', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'OmitFramePointers': 'true' - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_opt_fpo_off', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'OmitFramePointers': 'false' - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_opt_intrinsic', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'EnableIntrinsicFunctions': 'true' - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_opt_intrinsic_off', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'EnableIntrinsicFunctions': 'false' - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_opt_inline_off', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'InlineFunctionExpansion': '0' - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_opt_inline_manual', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'InlineFunctionExpansion': '1' - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_opt_inline_auto', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'InlineFunctionExpansion': '2' - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_opt_neither', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'FavorSizeOrSpeed': '0' - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_opt_speed', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'FavorSizeOrSpeed': '1' - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_opt_size', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'FavorSizeOrSpeed': '2' - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_opt_wpo', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WholeProgramOptimization': 'true' - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_opt_sp', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'StringPooling': 'true' - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_opt_sp_off', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'StringPooling': 'false' - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_opt_fso', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'EnableFiberSafeOptimizations': 'true' - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_opt_fso_off', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'EnableFiberSafeOptimizations': 'false' - } - }, - 'sources': ['hello.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/compiler-flags/pdbname-override.gyp b/tools/gyp/test/win/compiler-flags/pdbname-override.gyp deleted file mode 100644 index dad20e01fde23632123a62fdd5c41d0c593201f0..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/pdbname-override.gyp +++ /dev/null @@ -1,26 +0,0 @@ -# Copyright (c) 2013 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': 'test_pdbname', - 'type': 'executable', - 'sources': [ - 'hello.cc', - 'pdbname.cc', - ], - 'msvs_settings': { - 'VCCLCompilerTool': { - 'DebugInformationFormat': '3', - 'ProgramDataBaseFileName': '<(PRODUCT_DIR)/compiler_generated.pdb', - }, - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - 'ProgramDatabaseFile': '<(PRODUCT_DIR)/linker_generated.pdb', - }, - }, - }, - ] -} diff --git a/tools/gyp/test/win/compiler-flags/pdbname.cc b/tools/gyp/test/win/compiler-flags/pdbname.cc deleted file mode 100644 index 0fe05d5afb095be07eaab0c715f189a2d1b55e44..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/pdbname.cc +++ /dev/null @@ -1,7 +0,0 @@ -// 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. - -int some_function() { - return 0; -} diff --git a/tools/gyp/test/win/compiler-flags/pdbname.gyp b/tools/gyp/test/win/compiler-flags/pdbname.gyp deleted file mode 100644 index 8fcf754727c228ca363841d07ae84100a1c9ae6f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/pdbname.gyp +++ /dev/null @@ -1,24 +0,0 @@ -# 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': 'test_pdbname', - 'type': 'executable', - 'sources': [ - 'hello.cc', - 'pdbname.cc', - ], - 'msvs_settings': { - 'VCCLCompilerTool': { - 'DebugInformationFormat': '3', - }, - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - }, - }, - }, - ] -} diff --git a/tools/gyp/test/win/compiler-flags/precomp.cc b/tools/gyp/test/win/compiler-flags/precomp.cc deleted file mode 100644 index d16bac890fe92c289caa89ae36ec9a432412e927..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/precomp.cc +++ /dev/null @@ -1,6 +0,0 @@ -// Copyright 2013 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. - -#include -#include diff --git a/tools/gyp/test/win/compiler-flags/rtti-on.cc b/tools/gyp/test/win/compiler-flags/rtti-on.cc deleted file mode 100644 index 2d3ad03ae4d6a00b9f1978fc46b99fb56081e53b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/rtti-on.cc +++ /dev/null @@ -1,11 +0,0 @@ -// 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. - -#ifndef _CPPRTTI -#error -#endif - -int main() { - return 0; -} diff --git a/tools/gyp/test/win/compiler-flags/rtti.gyp b/tools/gyp/test/win/compiler-flags/rtti.gyp deleted file mode 100644 index 704cd58f5a5542936aa5904be5b532cdc015c38d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/rtti.gyp +++ /dev/null @@ -1,37 +0,0 @@ -# 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': 'test_rtti_off', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'RuntimeTypeInfo': 'false', - 'WarnAsError': 'true' - } - }, - 'sources': ['rtti-on.cc'], - }, - { - 'target_name': 'test_rtti_on', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'RuntimeTypeInfo': 'true', - 'WarnAsError': 'true' - } - }, - 'sources': ['rtti-on.cc'], - }, - { - 'target_name': 'test_rtti_unset', - 'type': 'executable', - 'msvs_settings': { - }, - 'sources': ['rtti-on.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/compiler-flags/runtime-checks.cc b/tools/gyp/test/win/compiler-flags/runtime-checks.cc deleted file mode 100644 index fdb811da8767fb8fb05e74de5a3e3f5d2cf32660..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/runtime-checks.cc +++ /dev/null @@ -1,11 +0,0 @@ -// 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. - -#ifndef __MSVC_RUNTIME_CHECKS -#error -#endif - -int main() { - return 0; -} diff --git a/tools/gyp/test/win/compiler-flags/runtime-checks.gyp b/tools/gyp/test/win/compiler-flags/runtime-checks.gyp deleted file mode 100644 index 8ea30920577b6c207e0360aee896990fe4763788..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/runtime-checks.gyp +++ /dev/null @@ -1,29 +0,0 @@ -# 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': 'test_brc_none', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'Optimization': '0', - } - }, - 'sources': ['runtime-checks.cc'], - }, - { - 'target_name': 'test_brc_1', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'Optimization': '0', - 'BasicRuntimeChecks': '3' - } - }, - 'sources': ['runtime-checks.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/compiler-flags/runtime-library-md.cc b/tools/gyp/test/win/compiler-flags/runtime-library-md.cc deleted file mode 100644 index 87c83021d4e79575f284036b65c73be9b223b53e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/runtime-library-md.cc +++ /dev/null @@ -1,19 +0,0 @@ -// 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. - -#ifndef _MT -#error -#endif - -#ifdef _DEBUG -#error -#endif - -#ifndef _DLL -#error -#endif - -int main() { - return 0; -} diff --git a/tools/gyp/test/win/compiler-flags/runtime-library-mdd.cc b/tools/gyp/test/win/compiler-flags/runtime-library-mdd.cc deleted file mode 100644 index 9f175e493e03ec3bb3c3618f8ba2a4532036c0fb..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/runtime-library-mdd.cc +++ /dev/null @@ -1,19 +0,0 @@ -// 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. - -#ifndef _MT -#error -#endif - -#ifndef _DEBUG -#error -#endif - -#ifndef _DLL -#error -#endif - -int main() { - return 0; -} diff --git a/tools/gyp/test/win/compiler-flags/runtime-library-mt.cc b/tools/gyp/test/win/compiler-flags/runtime-library-mt.cc deleted file mode 100644 index 27e62b63dbe3d992a6583935611384765f0856a2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/runtime-library-mt.cc +++ /dev/null @@ -1,19 +0,0 @@ -// 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. - -#ifndef _MT -#error -#endif - -#ifdef _DEBUG -#error -#endif - -#ifdef _DLL -#error -#endif - -int main() { - return 0; -} diff --git a/tools/gyp/test/win/compiler-flags/runtime-library-mtd.cc b/tools/gyp/test/win/compiler-flags/runtime-library-mtd.cc deleted file mode 100644 index a9921db9e2f418c84e9783712c0163cd40e4d63c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/runtime-library-mtd.cc +++ /dev/null @@ -1,19 +0,0 @@ -// 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. - -#ifndef _MT -#error -#endif - -#ifndef _DEBUG -#error -#endif - -#ifdef _DLL -#error -#endif - -int main() { - return 0; -} diff --git a/tools/gyp/test/win/compiler-flags/runtime-library.gyp b/tools/gyp/test/win/compiler-flags/runtime-library.gyp deleted file mode 100644 index 04afc391c77c43f3f7ffc9ae01846f42402c06d4..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/runtime-library.gyp +++ /dev/null @@ -1,48 +0,0 @@ -# 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': 'test_rl_md', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'RuntimeLibrary': '2' - } - }, - 'sources': ['runtime-library-md.cc'], - }, - { - 'target_name': 'test_rl_mdd', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'RuntimeLibrary': '3' - } - }, - 'sources': ['runtime-library-mdd.cc'], - }, - { - 'target_name': 'test_rl_mt', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'RuntimeLibrary': '0' - } - }, - 'sources': ['runtime-library-mt.cc'], - }, - { - 'target_name': 'test_rl_mtd', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'RuntimeLibrary': '1' - } - }, - 'sources': ['runtime-library-mtd.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/compiler-flags/subdir/header.h b/tools/gyp/test/win/compiler-flags/subdir/header.h deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tools/gyp/test/win/compiler-flags/treat-wchar-t-as-built-in-type.gyp b/tools/gyp/test/win/compiler-flags/treat-wchar-t-as-built-in-type.gyp deleted file mode 100644 index 456fe047d04fb1a8be865d81556a099129f1b34f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/treat-wchar-t-as-built-in-type.gyp +++ /dev/null @@ -1,33 +0,0 @@ -# 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': 'test_treat_wchar_t_as_built_in_type_negative', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'TreatWChar_tAsBuiltInType': 'false', - }, - }, - 'sources': [ - 'treat-wchar-t-as-built-in-type1.cc', - ], - }, - { - 'target_name': 'test_treat_wchar_t_as_built_in_type_positive', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'TreatWChar_tAsBuiltInType': 'true', - }, - }, - 'sources': [ - 'treat-wchar-t-as-built-in-type2.cc', - ], - }, - - ], -} diff --git a/tools/gyp/test/win/compiler-flags/treat-wchar-t-as-built-in-type1.cc b/tools/gyp/test/win/compiler-flags/treat-wchar-t-as-built-in-type1.cc deleted file mode 100644 index fc1ed0b7ea8f8484777e4701b72a1ba49cfb898a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/treat-wchar-t-as-built-in-type1.cc +++ /dev/null @@ -1,11 +0,0 @@ -// 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. - -#ifdef _NATIVE_WCHAR_T_DEFINED -#error -#endif - -int main() { - return 0; -} diff --git a/tools/gyp/test/win/compiler-flags/treat-wchar-t-as-built-in-type2.cc b/tools/gyp/test/win/compiler-flags/treat-wchar-t-as-built-in-type2.cc deleted file mode 100644 index 28ab94f742b469af33f3f119e2548802cf979cc3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/treat-wchar-t-as-built-in-type2.cc +++ /dev/null @@ -1,11 +0,0 @@ -// 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. - -#ifndef _NATIVE_WCHAR_T_DEFINED -#error -#endif - -int main() { - return 0; -} diff --git a/tools/gyp/test/win/compiler-flags/uninit.cc b/tools/gyp/test/win/compiler-flags/uninit.cc deleted file mode 100644 index a9d5f5d4833131a2c33cc1fe4cd98b043d461a62..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/uninit.cc +++ /dev/null @@ -1,13 +0,0 @@ -// 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. - -// Should trigger C6001: using uninitialized memory for |i|. -int f(bool b) { - int i; - if (b) - i = 0; - return i; -} - -int main() {} diff --git a/tools/gyp/test/win/compiler-flags/warning-as-error.cc b/tools/gyp/test/win/compiler-flags/warning-as-error.cc deleted file mode 100644 index fd2130aca59e6bb4c57743be67f8f6b95e48ff96..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/warning-as-error.cc +++ /dev/null @@ -1,9 +0,0 @@ -// 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. - -int main() { - // Cause a warning, even at /W1 - int export; - return 0; -} diff --git a/tools/gyp/test/win/compiler-flags/warning-as-error.gyp b/tools/gyp/test/win/compiler-flags/warning-as-error.gyp deleted file mode 100644 index d71f26114104f4d73c3020e7a4bc043a920b457c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/warning-as-error.gyp +++ /dev/null @@ -1,37 +0,0 @@ -# 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': 'test_warn_as_error_false', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WarnAsError': 'false' - } - }, - 'sources': ['warning-as-error.cc'] - }, - { - 'target_name': 'test_warn_as_error_true', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WarnAsError': 'true' - } - }, - 'sources': ['warning-as-error.cc'] - }, - { - 'target_name': 'test_warn_as_error_unset', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - } - }, - 'sources': ['warning-as-error.cc'] - }, - ] -} diff --git a/tools/gyp/test/win/compiler-flags/warning-level.gyp b/tools/gyp/test/win/compiler-flags/warning-level.gyp deleted file mode 100644 index 2297aa7cacf97020edcfcfe9e0e7dd2a11a59d7e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/warning-level.gyp +++ /dev/null @@ -1,115 +0,0 @@ -# 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': [ - # Level 1 - { - 'target_name': 'test_wl1_fail', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WarningLevel': '1', - 'WarnAsError': 'true', - } - }, - 'sources': ['warning-level1.cc'], - }, - { - 'target_name': 'test_wl1_pass', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WarningLevel': '1', - 'WarnAsError': 'true', - } - }, - 'sources': ['warning-level2.cc'], - }, - - # Level 2 - { - 'target_name': 'test_wl2_fail', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WarningLevel': '2', - 'WarnAsError': 'true', - } - }, - 'sources': ['warning-level2.cc'], - }, - { - 'target_name': 'test_wl2_pass', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WarningLevel': '2', - 'WarnAsError': 'true', - } - }, - 'sources': ['warning-level3.cc'], - }, - - # Level 3 - { - 'target_name': 'test_wl3_fail', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WarningLevel': '3', - 'WarnAsError': 'true', - } - }, - 'sources': ['warning-level3.cc'], - }, - { - 'target_name': 'test_wl3_pass', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WarningLevel': '3', - 'WarnAsError': 'true', - } - }, - 'sources': ['warning-level4.cc'], - }, - - - # Level 4 - { - 'target_name': 'test_wl4_fail', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WarningLevel': '4', - 'WarnAsError': 'true', - } - }, - 'sources': ['warning-level4.cc'], - }, - - # Default level - { - 'target_name': 'test_def_fail', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WarnAsError': 'true', - } - }, - 'sources': ['warning-level1.cc'], - }, - { - 'target_name': 'test_def_pass', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - } - }, - 'sources': ['warning-level2.cc'], - }, - - ] -} diff --git a/tools/gyp/test/win/compiler-flags/warning-level1.cc b/tools/gyp/test/win/compiler-flags/warning-level1.cc deleted file mode 100644 index 119578d694004a1006197da5e6926d9d960dd20e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/warning-level1.cc +++ /dev/null @@ -1,8 +0,0 @@ -// 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. - -int main() { - int export; // Cause a level 1 warning (C4237). - return 0; -} diff --git a/tools/gyp/test/win/compiler-flags/warning-level2.cc b/tools/gyp/test/win/compiler-flags/warning-level2.cc deleted file mode 100644 index 9a2670318069fb6a22a9211c9c77ef28ba28307d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/warning-level2.cc +++ /dev/null @@ -1,14 +0,0 @@ -// 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. - -int f(int x) { - return 0; -} - -int main() { - double x = 10.1; - // Cause a level 2 warning (C4243). - return f(x); - return 0; -} diff --git a/tools/gyp/test/win/compiler-flags/warning-level3.cc b/tools/gyp/test/win/compiler-flags/warning-level3.cc deleted file mode 100644 index e0a9f3cdd98261ecdb256844587066b2e335ae0a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/warning-level3.cc +++ /dev/null @@ -1,11 +0,0 @@ -// 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. - -// Cause a level 3 warning (C4359). -struct __declspec(align(8)) C8 { __int64 i; }; -struct __declspec(align(4)) C4 { C8 m8; }; - -int main() { - return 0; -} diff --git a/tools/gyp/test/win/compiler-flags/warning-level4.cc b/tools/gyp/test/win/compiler-flags/warning-level4.cc deleted file mode 100644 index 48a4fb70181bddf40400a8a906ab9cb3738ffabd..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/compiler-flags/warning-level4.cc +++ /dev/null @@ -1,10 +0,0 @@ -// 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. - -int main() { - const int i = -1; - // Cause a level 4 warning (C4245). - unsigned int j = i; - return 0; -} diff --git a/tools/gyp/test/win/enable-winrt/dllmain.cc b/tools/gyp/test/win/enable-winrt/dllmain.cc deleted file mode 100644 index dedd83c3f66d60dc035be56b700636ff659b0644..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/enable-winrt/dllmain.cc +++ /dev/null @@ -1,30 +0,0 @@ -// Copyright (c) 2013 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. - -#include -#include -#include -#include - -using namespace Microsoft::WRL; -using namespace Microsoft::WRL::Wrappers; -using namespace ABI::Windows::Foundation; -using namespace ABI::Windows::Graphics::Display; - -bool TryToUseSomeWinRT() { - ComPtr dp; - HStringReference s(RuntimeClass_Windows_Graphics_Display_DisplayProperties); - HRESULT hr = GetActivationFactory(s.Get(), dp.GetAddressOf()); - if (SUCCEEDED(hr)) { - float dpi = 96.0f; - if (SUCCEEDED(dp->get_LogicalDpi(&dpi))) { - return true; - } - } - return false; -} - -BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) { - return TRUE; -} diff --git a/tools/gyp/test/win/enable-winrt/enable-winrt.gyp b/tools/gyp/test/win/enable-winrt/enable-winrt.gyp deleted file mode 100644 index 69f70189db94de5d35eede52d8075fcb5c72514c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/enable-winrt/enable-winrt.gyp +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (c) 2013 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': 'enable_winrt_dll', - 'type': 'shared_library', - 'msvs_enable_winrt': 1, - 'sources': [ - 'dllmain.cc', - ], - }, - { - 'target_name': 'enable_winrt_missing_dll', - 'type': 'shared_library', - 'sources': [ - 'dllmain.cc', - ], - }, - { - 'target_name': 'enable_winrt_winphone_dll', - 'type': 'shared_library', - 'msvs_enable_winrt': 1, - 'msvs_enable_winphone': 1, - 'sources': [ - 'dllmain.cc', - ], - 'msvs_settings': { - 'VCLinkerTool': { - 'AdditionalDependencies': [ - '%(AdditionalDependencies)', - ], - }, - }, - }, - ] -} diff --git a/tools/gyp/test/win/generator-output-different-drive/gyptest-generator-output-different-drive.py b/tools/gyp/test/win/generator-output-different-drive/gyptest-generator-output-different-drive.py deleted file mode 100644 index 8c8c365d5ee81a4de98ca0785068647fa877b37c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/generator-output-different-drive/gyptest-generator-output-different-drive.py +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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 the generator output can be written to a different drive on Windows. -""" - -import os -import TestGyp -import string -import subprocess -import sys - - -if sys.platform == 'win32': - import win32api - - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - def GetFirstFreeDriveLetter(): - """ Returns the first unused Windows drive letter in [A, Z] """ - all_letters = [c for c in string.uppercase] - in_use = win32api.GetLogicalDriveStrings() - free = list(set(all_letters) - set(in_use)) - return free[0] - - output_dir = os.path.join('different-drive', 'output') - if not os.path.isdir(os.path.abspath(output_dir)): - os.makedirs(os.path.abspath(output_dir)) - output_drive = GetFirstFreeDriveLetter() - subprocess.call(['subst', '%c:' % output_drive, os.path.abspath(output_dir)]) - try: - test.run_gyp('prog.gyp', '--generator-output=%s' % ( - os.path.join(output_drive, 'output'))) - test.build('prog.gyp', test.ALL, chdir=os.path.join(output_drive, 'output')) - test.built_file_must_exist('program', chdir=os.path.join(output_drive, - 'output'), - type=test.EXECUTABLE) - test.pass_test() - finally: - subprocess.call(['subst', '%c:' % output_drive, '/D']) diff --git a/tools/gyp/test/win/generator-output-different-drive/prog.c b/tools/gyp/test/win/generator-output-different-drive/prog.c deleted file mode 100644 index 7937f5d07a0c250c06d8d76ac598e9b3c0eaa48b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/generator-output-different-drive/prog.c +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright 2013 The Chromium Authors. All rights reserved. -// Use of this source code is governed by a BSD-style license that can be -// found in the LICENSE file. - -#include - -int main(void) { - printf("Hello from prog.c\n"); - return 0; -} diff --git a/tools/gyp/test/win/generator-output-different-drive/prog.gyp b/tools/gyp/test/win/generator-output-different-drive/prog.gyp deleted file mode 100644 index 92f53e5da56f441abd6471673ae0ce597aa8f5dc..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/generator-output-different-drive/prog.gyp +++ /dev/null @@ -1,15 +0,0 @@ -# Copyright 2013 The Chromium Authors. 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': 'program', - 'type': 'executable', - 'sources': [ - 'prog.c', - ], - }, - ], -} diff --git a/tools/gyp/test/win/gyptest-asm-files.py b/tools/gyp/test/win/gyptest-asm-files.py deleted file mode 100644 index 007b52eb267688b6827356620a8f2a885bf29e20..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-asm-files.py +++ /dev/null @@ -1,26 +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. - -""" -Make sure .s files aren't passed to cl. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'asm-files' - test.run_gyp('asm-files.gyp', chdir=CHDIR) - # The compiler will error out if it's passed the .s files, so just make sure - # the build succeeds. The compiler doesn't directly support building - # assembler files on Windows, they have to be built explicitly with a - # third-party tool. - test.build('asm-files.gyp', test.ALL, chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-cl-additional-include-dirs.py b/tools/gyp/test/win/gyptest-cl-additional-include-dirs.py deleted file mode 100644 index 1fabfa97526e09115e4b0cf78fa9118090b9e915..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-cl-additional-include-dirs.py +++ /dev/null @@ -1,22 +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. - -""" -Make sure additional include dirs are extracted properly. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'compiler-flags' - test.run_gyp('additional-include-dirs.gyp', chdir=CHDIR) - test.build('additional-include-dirs.gyp', test.ALL, chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-cl-additional-options.py b/tools/gyp/test/win/gyptest-cl-additional-options.py deleted file mode 100644 index e9aea10dc98fa325e24528fbc817f920e3883761..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-cl-additional-options.py +++ /dev/null @@ -1,28 +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. - -""" -Make sure additional manual compiler flags are extracted properly. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'compiler-flags' - test.run_gyp('additional-options.gyp', chdir=CHDIR) - - # Warning level not overidden, must fail. - test.build('additional-options.gyp', 'test_additional_none', chdir=CHDIR, - status=1) - - # Warning level is overridden, must succeed. - test.build('additional-options.gyp', 'test_additional_one', chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-cl-analysis.py b/tools/gyp/test/win/gyptest-cl-analysis.py deleted file mode 100644 index 7b3b9897f5a7e0bb8e29f75a38acb1ae1b2f71f3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-cl-analysis.py +++ /dev/null @@ -1,30 +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. - -""" -Make sure PREfast (code analysis) setting is extracted properly. -""" - -import TestGyp - -import os -import sys - -if (sys.platform == 'win32' and - int(os.environ.get('GYP_MSVS_VERSION', 0)) >= 2012): - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'compiler-flags' - test.run_gyp('analysis.gyp', chdir=CHDIR) - - # Analysis enabled, should fail. - test.build('analysis.gyp', 'test_analysis_on', chdir=CHDIR, status=1) - - # Analysis not enabled, or unspecified, should pass. - test.build('analysis.gyp', 'test_analysis_off', chdir=CHDIR) - test.build('analysis.gyp', 'test_analysis_unspec', chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-cl-buffer-security-check.py b/tools/gyp/test/win/gyptest-cl-buffer-security-check.py deleted file mode 100644 index e22869c3d35e3d67b1b05559e4d51c41c118bf91..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-cl-buffer-security-check.py +++ /dev/null @@ -1,53 +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. - -""" -Make sure buffer security check setting is extracted properly. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'compiler-flags' - test.run_gyp('buffer-security-check.gyp', chdir=CHDIR) - test.build('buffer-security-check.gyp', chdir=CHDIR) - - def GetDisassemblyOfMain(exe): - # The standard library uses buffer security checks independent of our - # buffer security settings, so we extract just our code (i.e. main()) to - # check against. - full_path = test.built_file_path(exe, chdir=CHDIR) - output = test.run_dumpbin('/disasm', full_path) - result = [] - in_main = False - for line in output.splitlines(): - if line == '_main:': - in_main = True - elif in_main: - # Disassembly of next function starts. - if line.startswith('_'): - break - result.append(line) - return '\n'.join(result) - - # Buffer security checks are on by default, make sure security_cookie - # appears in the disassembly of our code. - if 'security_cookie' not in GetDisassemblyOfMain('test_bsc_unset.exe'): - test.fail_test() - - # Explicitly on. - if 'security_cookie' not in GetDisassemblyOfMain('test_bsc_on.exe'): - test.fail_test() - - # Explicitly off, shouldn't be a reference to the security cookie. - if 'security_cookie' in GetDisassemblyOfMain('test_bsc_off.exe'): - test.fail_test() - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-cl-calling-convention.py b/tools/gyp/test/win/gyptest-cl-calling-convention.py deleted file mode 100644 index b5fdc477440939a5c720f48c687ee041aa5121a6..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-cl-calling-convention.py +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Make sure calling convention setting is extracted properly. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'compiler-flags' - test.run_gyp('calling-convention.gyp', chdir=CHDIR) - test.build('calling-convention.gyp', test.ALL, chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-cl-character-set.py b/tools/gyp/test/win/gyptest-cl-character-set.py deleted file mode 100644 index 7fabb6722a87f176ee87d393891e51a39e070ad2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-cl-character-set.py +++ /dev/null @@ -1,22 +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. - -""" -Make sure character set setting is extracted properly. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'compiler-flags' - test.run_gyp('character-set.gyp', chdir=CHDIR) - test.build('character-set.gyp', test.ALL, chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-cl-debug-format.py b/tools/gyp/test/win/gyptest-cl-debug-format.py deleted file mode 100644 index 6c68a619bed82bf5fc62d0d998bc47b38fcd51eb..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-cl-debug-format.py +++ /dev/null @@ -1,43 +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. - -""" -Make sure debug format settings are extracted properly. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['ninja']) - - CHDIR = 'compiler-flags' - test.run_gyp('debug-format.gyp', chdir=CHDIR) - - # While there's ways to via .pdb contents, the .pdb doesn't include - # which style the debug information was created from, so we resort to just - # verifying the flags are correct on the command line. - - ninja_file = test.built_file_path('obj/test-debug-format-off.ninja', - chdir=CHDIR) - test.must_not_contain(ninja_file, '/Z7') - test.must_not_contain(ninja_file, '/Zi') - test.must_not_contain(ninja_file, '/ZI') - - ninja_file = test.built_file_path('obj/test-debug-format-oldstyle.ninja', - chdir=CHDIR) - test.must_contain(ninja_file, '/Z7') - - ninja_file = test.built_file_path('obj/test-debug-format-pdb.ninja', - chdir=CHDIR) - test.must_contain(ninja_file, '/Zi') - - ninja_file = test.built_file_path('obj/test-debug-format-editcontinue.ninja', - chdir=CHDIR) - test.must_contain(ninja_file, '/ZI') - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-cl-default-char-is-unsigned.py b/tools/gyp/test/win/gyptest-cl-default-char-is-unsigned.py deleted file mode 100644 index d20f6742f5e17e064bb0beb46b0d09b84e5624fe..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-cl-default-char-is-unsigned.py +++ /dev/null @@ -1,22 +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. - -""" -Make sure DefaultCharIsUnsigned option is functional. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'compiler-flags' - test.run_gyp('default-char-is-unsigned.gyp', chdir=CHDIR) - test.build('default-char-is-unsigned.gyp', test.ALL, chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-cl-disable-specific-warnings.py b/tools/gyp/test/win/gyptest-cl-disable-specific-warnings.py deleted file mode 100644 index cb253aff62151881cda5aebf390a613fb6c51b57..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-cl-disable-specific-warnings.py +++ /dev/null @@ -1,32 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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. - -""" -Make sure disable specific warnings is extracted properly. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'compiler-flags' - test.run_gyp('disable-specific-warnings.gyp', chdir=CHDIR) - - # The source file contains a warning, so if WarnAsError is true and - # DisableSpecificWarnings for the warning in question is set, then the build - # should succeed, otherwise it must fail. - - test.build('disable-specific-warnings.gyp', - 'test_disable_specific_warnings_set', - chdir=CHDIR) - test.build('disable-specific-warnings.gyp', - 'test_disable_specific_warnings_unset', - chdir=CHDIR, status=1) - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-cl-enable-enhanced-instruction-set.py b/tools/gyp/test/win/gyptest-cl-enable-enhanced-instruction-set.py deleted file mode 100644 index 8940b22dc80c9edc64811bc60432e7acc4c668d8..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-cl-enable-enhanced-instruction-set.py +++ /dev/null @@ -1,44 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Test VCCLCompilerTool EnableEnhancedInstructionSet setting. -""" - -import TestGyp - -import os -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp() - - CHDIR = 'compiler-flags' - test.run_gyp('enable-enhanced-instruction-set.gyp', chdir=CHDIR) - - test.build('enable-enhanced-instruction-set.gyp', test.ALL, chdir=CHDIR) - - test.run_built_executable('sse_extensions', chdir=CHDIR, - stdout='/arch:SSE\n') - test.run_built_executable('sse2_extensions', chdir=CHDIR, - stdout='/arch:SSE2\n') - - # /arch:AVX introduced in VS2010, but MSBuild support lagged until 2012. - if os.path.exists(test.built_file_path('avx_extensions')): - test.run_built_executable('avx_extensions', chdir=CHDIR, - stdout='/arch:AVX\n') - - # /arch:IA32 introduced in VS2012. - if os.path.exists(test.built_file_path('no_extensions')): - test.run_built_executable('no_extensions', chdir=CHDIR, - stdout='/arch:IA32\n') - - # /arch:AVX2 introduced in VS2013r2. - if os.path.exists(test.built_file_path('avx2_extensions')): - test.run_built_executable('avx2_extensions', chdir=CHDIR, - stdout='/arch:AVX2\n') - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-cl-exception-handling.py b/tools/gyp/test/win/gyptest-cl-exception-handling.py deleted file mode 100644 index 5738a5407144b45ec70abeeb43aacf99706f682d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-cl-exception-handling.py +++ /dev/null @@ -1,33 +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. - -""" -Make sure exception handling settings are extracted properly. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'compiler-flags' - test.run_gyp('exception-handling.gyp', chdir=CHDIR) - - # Must fail. - test.build('exception-handling.gyp', 'test_eh_off', chdir=CHDIR, - status=1) - - # Must succeed. - test.build('exception-handling.gyp', 'test_eh_s', chdir=CHDIR) - test.build('exception-handling.gyp', 'test_eh_a', chdir=CHDIR) - - # Error code must be 1 if EHa, and 2 if EHsc. - test.run_built_executable('test_eh_a', chdir=CHDIR, status=1) - test.run_built_executable('test_eh_s', chdir=CHDIR, status=2) - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-cl-floating-point-model.py b/tools/gyp/test/win/gyptest-cl-floating-point-model.py deleted file mode 100644 index 86ff4785a07a7db0888d541993622115ed832ade..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-cl-floating-point-model.py +++ /dev/null @@ -1,22 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Make sure floating point model settings are extracted properly. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp() - - CHDIR = 'compiler-flags' - test.run_gyp('floating-point-model.gyp', chdir=CHDIR) - test.build('floating-point-model.gyp', test.ALL, chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-cl-force-include-files.py b/tools/gyp/test/win/gyptest-cl-force-include-files.py deleted file mode 100644 index b73b8bd50320ef3d7526f32ad0c4c0a86c4c1395..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-cl-force-include-files.py +++ /dev/null @@ -1,22 +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. - -""" -Make sure ForcedIncludeFiles option is functional. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'compiler-flags' - test.run_gyp('force-include-files.gyp', chdir=CHDIR) - test.build('force-include-files.gyp', test.ALL, chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-cl-function-level-linking.py b/tools/gyp/test/win/gyptest-cl-function-level-linking.py deleted file mode 100644 index 17c29e235fa7d1714e94f7bf01ff89b8b22a37ef..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-cl-function-level-linking.py +++ /dev/null @@ -1,52 +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. - -""" -Make sure function-level linking setting is extracted properly. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'compiler-flags' - test.run_gyp('function-level-linking.gyp', chdir=CHDIR) - test.build('function-level-linking.gyp', test.ALL, chdir=CHDIR) - - def CheckForSectionString(binary, search_for, should_exist): - output = test.run_dumpbin('/headers', binary) - if should_exist and search_for not in output: - print 'Did not find "%s" in %s' % (search_for, binary) - test.fail_test() - elif not should_exist and search_for in output: - print 'Found "%s" in %s (and shouldn\'t have)' % (search_for, binary) - test.fail_test() - - def Object(proj, obj): - sep = '.' if test.format == 'ninja' else '\\' - return 'obj\\%s%s%s' % (proj, sep, obj) - - look_for = '''COMDAT; sym= "int __cdecl comdat_function''' - - # When function level linking is on, the functions should be listed as - # separate comdat entries. - - CheckForSectionString( - test.built_file_path(Object('test_fll_on', 'function-level-linking.obj'), - chdir=CHDIR), - look_for, - should_exist=True) - - CheckForSectionString( - test.built_file_path(Object('test_fll_off', 'function-level-linking.obj'), - chdir=CHDIR), - look_for, - should_exist=False) - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-cl-optimizations.py b/tools/gyp/test/win/gyptest-cl-optimizations.py deleted file mode 100644 index 31341f7dd7e52e1062256d38d4f84892dd21dabc..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-cl-optimizations.py +++ /dev/null @@ -1,105 +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. - -""" -Make sure optimization settings are extracted properly. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['ninja']) - - CHDIR = 'compiler-flags' - test.run_gyp('optimizations.gyp', chdir=CHDIR) - - # It's hard to map flags to output contents in a non-fragile way (especially - # handling both 2008/2010), so just verify the correct ninja command line - # contents. - - ninja_file = test.built_file_path('obj/test_opt_off.ninja', chdir=CHDIR) - test.must_contain(ninja_file, 'cflags = /Od') - - ninja_file = test.built_file_path('obj/test_opt_lev_size.ninja', chdir=CHDIR) - test.must_contain(ninja_file, 'cflags = /O1') - - ninja_file = test.built_file_path('obj/test_opt_lev_speed.ninja', chdir=CHDIR) - test.must_contain(ninja_file, 'cflags = /O2') - - ninja_file = test.built_file_path('obj/test_opt_lev_max.ninja', chdir=CHDIR) - test.must_contain(ninja_file, 'cflags = /Ox') - - ninja_file = test.built_file_path('obj/test_opt_unset.ninja', chdir=CHDIR) - test.must_not_contain(ninja_file, '/Od') - test.must_not_contain(ninja_file, '/O1') - test.must_not_contain(ninja_file, '/Ox') - # Set by default if none specified. - test.must_contain(ninja_file, '/O2') - - ninja_file = test.built_file_path('obj/test_opt_fpo.ninja', chdir=CHDIR) - test.must_contain(ninja_file, '/Oy') - test.must_not_contain(ninja_file, '/Oy-') - - ninja_file = test.built_file_path('obj/test_opt_fpo_off.ninja', chdir=CHDIR) - test.must_contain(ninja_file, '/Oy-') - - ninja_file = test.built_file_path('obj/test_opt_intrinsic.ninja', - chdir=CHDIR) - test.must_contain(ninja_file, '/Oi') - test.must_not_contain(ninja_file, '/Oi-') - - ninja_file = test.built_file_path('obj/test_opt_intrinsic_off.ninja', - chdir=CHDIR) - test.must_contain(ninja_file, '/Oi-') - - ninja_file = test.built_file_path('obj/test_opt_inline_off.ninja', - chdir=CHDIR) - test.must_contain(ninja_file, '/Ob0') - - ninja_file = test.built_file_path('obj/test_opt_inline_manual.ninja', - chdir=CHDIR) - test.must_contain(ninja_file, '/Ob1') - - ninja_file = test.built_file_path('obj/test_opt_inline_auto.ninja', - chdir=CHDIR) - test.must_contain(ninja_file, '/Ob2') - - ninja_file = test.built_file_path('obj/test_opt_neither.ninja', - chdir=CHDIR) - test.must_not_contain(ninja_file, '/Os') - test.must_not_contain(ninja_file, '/Ot') - - ninja_file = test.built_file_path('obj/test_opt_size.ninja', - chdir=CHDIR) - test.must_contain(ninja_file, '/Os') - - ninja_file = test.built_file_path('obj/test_opt_speed.ninja', - chdir=CHDIR) - test.must_contain(ninja_file, '/Ot') - - ninja_file = test.built_file_path('obj/test_opt_wpo.ninja', - chdir=CHDIR) - test.must_contain(ninja_file, '/GL') - - ninja_file = test.built_file_path('obj/test_opt_sp.ninja', - chdir=CHDIR) - test.must_contain(ninja_file, '/GF') - - ninja_file = test.built_file_path('obj/test_opt_sp_off.ninja', - chdir=CHDIR) - test.must_not_contain(ninja_file, '/GF') - - ninja_file = test.built_file_path('obj/test_opt_fso.ninja', - chdir=CHDIR) - test.must_contain(ninja_file, '/GT') - - ninja_file = test.built_file_path('obj/test_opt_fso_off.ninja', - chdir=CHDIR) - test.must_not_contain(ninja_file, '/GT') - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-cl-pdbname-override.py b/tools/gyp/test/win/gyptest-cl-pdbname-override.py deleted file mode 100644 index da9b49af160dd2ba44ca951d3ac1ff87463c5b6c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-cl-pdbname-override.py +++ /dev/null @@ -1,27 +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. - -""" -Make sure pdb is named as expected (shared between .cc files). -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp() - - CHDIR = 'compiler-flags' - test.run_gyp('pdbname-override.gyp', chdir=CHDIR) - test.build('pdbname-override.gyp', test.ALL, chdir=CHDIR) - - # Confirm that the pdb generated by the compiler was renamed (and we also - # have the linker generated one). - test.built_file_must_exist('compiler_generated.pdb', chdir=CHDIR) - test.built_file_must_exist('linker_generated.pdb', chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-cl-pdbname.py b/tools/gyp/test/win/gyptest-cl-pdbname.py deleted file mode 100644 index f09ac233cd3fec583da095a65a2eea5eefad114e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-cl-pdbname.py +++ /dev/null @@ -1,30 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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. - -""" -Make sure pdb is named as expected (shared between .cc files). -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['ninja']) - - CHDIR = 'compiler-flags' - test.run_gyp('pdbname.gyp', chdir=CHDIR) - test.build('pdbname.gyp', test.ALL, chdir=CHDIR) - - # Confirm that the default behaviour is to name the .pdb per-target (rather - # than per .cc file). - test.built_file_must_exist('obj/test_pdbname.cc.pdb', chdir=CHDIR) - - # Confirm that there should be a .pdb alongside the executable. - test.built_file_must_exist('test_pdbname.exe', chdir=CHDIR) - test.built_file_must_exist('test_pdbname.exe.pdb', chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-cl-rtti.py b/tools/gyp/test/win/gyptest-cl-rtti.py deleted file mode 100644 index d49a09437959b01cac7174015ad275a597d6046c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-cl-rtti.py +++ /dev/null @@ -1,30 +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. - -""" -Make sure RTTI setting is extracted properly. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'compiler-flags' - test.run_gyp('rtti.gyp', chdir=CHDIR) - - # Must fail. - test.build('rtti.gyp', 'test_rtti_off', chdir=CHDIR, status=1) - - # Must succeed. - test.build('rtti.gyp', 'test_rtti_on', chdir=CHDIR) - - # Must succeed. - test.build('rtti.gyp', 'test_rtti_unset', chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-cl-runtime-checks.py b/tools/gyp/test/win/gyptest-cl-runtime-checks.py deleted file mode 100644 index 4fd529f8927978dc4e4cbeba9fe5f43d42c81f57..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-cl-runtime-checks.py +++ /dev/null @@ -1,30 +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. - -""" -Make sure RTC setting is extracted properly. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'compiler-flags' - test.run_gyp('runtime-checks.gyp', chdir=CHDIR) - - # Runtime checks disabled, should fail. - test.build('runtime-checks.gyp', 'test_brc_none', chdir=CHDIR, status=1) - - # Runtime checks enabled, should pass. - test.build('runtime-checks.gyp', 'test_brc_1', chdir=CHDIR) - - # TODO(scottmg): There are other less frequently used/partial options, but - # it's not clear how to verify them, so ignore for now. - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-cl-runtime-library.py b/tools/gyp/test/win/gyptest-cl-runtime-library.py deleted file mode 100644 index 53c149297bd3e1ca0e43fc47e7d25abe3f365111..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-cl-runtime-library.py +++ /dev/null @@ -1,22 +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. - -""" -Make sure runtime C library setting is extracted properly. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'compiler-flags' - test.run_gyp('runtime-library.gyp', chdir=CHDIR) - test.build('runtime-library.gyp', test.ALL, chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-cl-treat-wchar-t-as-built-in-type.py b/tools/gyp/test/win/gyptest-cl-treat-wchar-t-as-built-in-type.py deleted file mode 100644 index ca35fb55a0ebd69910964a8b1e7b4c3cd8074e1e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-cl-treat-wchar-t-as-built-in-type.py +++ /dev/null @@ -1,22 +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. - -""" -Make sure TreatWChar_tAsBuiltInType option is functional. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'compiler-flags' - test.run_gyp('treat-wchar-t-as-built-in-type.gyp', chdir=CHDIR) - test.build('treat-wchar-t-as-built-in-type.gyp', test.ALL, chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-cl-warning-as-error.py b/tools/gyp/test/win/gyptest-cl-warning-as-error.py deleted file mode 100644 index d4ef1b362b50438017fb95c97b33d3b428c68a1f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-cl-warning-as-error.py +++ /dev/null @@ -1,30 +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. - -""" -Make sure warning-as-error is extracted properly. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'compiler-flags' - test.run_gyp('warning-as-error.gyp', chdir=CHDIR) - - # The source file contains a warning, so if WarnAsError is false (or - # default, which is also false), then the build should succeed, otherwise it - # must fail. - - test.build('warning-as-error.gyp', 'test_warn_as_error_false', chdir=CHDIR) - test.build('warning-as-error.gyp', 'test_warn_as_error_unset', chdir=CHDIR) - test.build('warning-as-error.gyp', 'test_warn_as_error_true', chdir=CHDIR, - status=1) - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-cl-warning-level.py b/tools/gyp/test/win/gyptest-cl-warning-level.py deleted file mode 100644 index 62a5b39b6a28f9f55eee522c63c0bc416e2bfba6..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-cl-warning-level.py +++ /dev/null @@ -1,41 +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. - -""" -Make sure warning level is extracted properly. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'compiler-flags' - test.run_gyp('warning-level.gyp', chdir=CHDIR) - - # A separate target for each warning level: one pass (compiling a file - # containing a warning that's above the specified level); and one fail - # (compiling a file at the specified level). No pass for 4 of course, - # because it would have to have no warnings. The default warning level is - # equivalent to level 1. - - test.build('warning-level.gyp', 'test_wl1_fail', chdir=CHDIR, status=1) - test.build('warning-level.gyp', 'test_wl1_pass', chdir=CHDIR) - - test.build('warning-level.gyp', 'test_wl2_fail', chdir=CHDIR, status=1) - test.build('warning-level.gyp', 'test_wl2_pass', chdir=CHDIR) - - test.build('warning-level.gyp', 'test_wl3_fail', chdir=CHDIR, status=1) - test.build('warning-level.gyp', 'test_wl3_pass', chdir=CHDIR) - - test.build('warning-level.gyp', 'test_wl4_fail', chdir=CHDIR, status=1) - - test.build('warning-level.gyp', 'test_def_fail', chdir=CHDIR, status=1) - test.build('warning-level.gyp', 'test_def_pass', chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-command-quote.py b/tools/gyp/test/win/gyptest-command-quote.py deleted file mode 100644 index 652b05b9b8f52d719289a7c473384b4ba4bfad66..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-command-quote.py +++ /dev/null @@ -1,37 +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. - -""" - -Make sure the program in a command can be a called batch file, or an -application in the path. Specifically, this means not quoting something like -"call x.bat", lest the shell look for a program named "call x.bat", rather -than calling "x.bat". -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - CHDIR = 'command-quote' - test.run_gyp('command-quote.gyp', chdir=CHDIR) - - test.build('command-quote.gyp', 'test_batch', chdir=CHDIR) - test.build('command-quote.gyp', 'test_call_separate', chdir=CHDIR) - test.build('command-quote.gyp', 'test_with_double_quotes', chdir=CHDIR) - test.build('command-quote.gyp', 'test_with_single_quotes', chdir=CHDIR) - - # We confirm that this fails because other generators don't handle spaces in - # inputs so it's preferable to not have it work here. - test.build('command-quote.gyp', 'test_with_spaces', chdir=CHDIR, status=1) - - CHDIR = 'command-quote/subdir/and/another' - test.run_gyp('in-subdir.gyp', chdir=CHDIR) - test.build('in-subdir.gyp', 'test_batch_depth', chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-lib-ltcg.py b/tools/gyp/test/win/gyptest-lib-ltcg.py deleted file mode 100644 index d1d7bad8407f24b159ba9955cc28c647fd0ff20c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-lib-ltcg.py +++ /dev/null @@ -1,22 +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. - -""" -Make sure LTCG setting is extracted properly. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'lib-flags' - test.run_gyp('ltcg.gyp', chdir=CHDIR) - test.build('ltcg.gyp', test.ALL, chdir=CHDIR) - test.must_not_contain_any_line(test.stdout(), ['restarting link with /LTCG']) - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-link-additional-deps.py b/tools/gyp/test/win/gyptest-link-additional-deps.py deleted file mode 100644 index 62c57366f9931a15fe933756e98d2a00b99aa4a9..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-link-additional-deps.py +++ /dev/null @@ -1,22 +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. - -""" -Make sure additional library dependencies are handled. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'linker-flags' - test.run_gyp('additional-deps.gyp', chdir=CHDIR) - test.build('additional-deps.gyp', test.ALL, chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-link-additional-options.py b/tools/gyp/test/win/gyptest-link-additional-options.py deleted file mode 100644 index 7e57ae47644defe470a084c03847f6ceafadf4a1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-link-additional-options.py +++ /dev/null @@ -1,22 +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. - -""" -Make sure additional options are handled. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'linker-flags' - test.run_gyp('additional-options.gyp', chdir=CHDIR) - test.build('additional-options.gyp', test.ALL, chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-link-aslr.py b/tools/gyp/test/win/gyptest-link-aslr.py deleted file mode 100644 index e765017d3b9fc1382dd13a09447bd38b39784ae6..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-link-aslr.py +++ /dev/null @@ -1,35 +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. - -""" -Make sure aslr setting is extracted properly. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'linker-flags' - test.run_gyp('aslr.gyp', chdir=CHDIR) - test.build('aslr.gyp', test.ALL, chdir=CHDIR) - - def HasDynamicBase(exe): - full_path = test.built_file_path(exe, chdir=CHDIR) - output = test.run_dumpbin('/headers', full_path) - return ' Dynamic base' in output - - # Default is to be on. - if not HasDynamicBase('test_aslr_default.exe'): - test.fail_test() - if HasDynamicBase('test_aslr_no.exe'): - test.fail_test() - if not HasDynamicBase('test_aslr_yes.exe'): - test.fail_test() - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-link-base-address.py b/tools/gyp/test/win/gyptest-link-base-address.py deleted file mode 100644 index d58527ad7e9377222e5b6aeb1c59be5a481975bf..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-link-base-address.py +++ /dev/null @@ -1,62 +0,0 @@ -#!/usr/bin/env python - -# Copyright 2013 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. - -""" -Make sure the base address setting is extracted properly. -""" - -import TestGyp - -import re -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'linker-flags' - test.run_gyp('base-address.gyp', chdir=CHDIR) - test.build('base-address.gyp', test.ALL, chdir=CHDIR) - - def GetHeaders(exe): - full_path = test.built_file_path(exe, chdir=CHDIR) - return test.run_dumpbin('/headers', full_path) - - # Extract the image base address from the headers output. - image_base_reg_ex = re.compile(r'.*\s+([0-9]+) image base.*', re.DOTALL) - - exe_headers = GetHeaders('test_base_specified_exe.exe') - exe_match = image_base_reg_ex.match(exe_headers) - - if not exe_match or not exe_match.group(1): - test.fail_test() - if exe_match.group(1) != '420000': - test.fail_test() - - dll_headers = GetHeaders('test_base_specified_dll.dll') - dll_match = image_base_reg_ex.match(dll_headers) - - if not dll_match or not dll_match.group(1): - test.fail_test() - if dll_match.group(1) != '10420000': - test.fail_test() - - default_exe_headers = GetHeaders('test_base_default_exe.exe') - default_exe_match = image_base_reg_ex.match(default_exe_headers) - - if not default_exe_match or not default_exe_match.group(1): - test.fail_test() - if default_exe_match.group(1) != '400000': - test.fail_test() - - default_dll_headers = GetHeaders('test_base_default_dll.dll') - default_dll_match = image_base_reg_ex.match(default_dll_headers) - - if not default_dll_match or not default_dll_match.group(1): - test.fail_test() - if default_dll_match.group(1) != '10000000': - test.fail_test() - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-link-debug-info.py b/tools/gyp/test/win/gyptest-link-debug-info.py deleted file mode 100644 index 33e8ac48bf1acffa53c7e6231043c11367f3ed18..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-link-debug-info.py +++ /dev/null @@ -1,26 +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. - -""" -Make sure debug info setting is extracted properly. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'linker-flags' - test.run_gyp('debug-info.gyp', chdir=CHDIR) - test.build('debug-info.gyp', test.ALL, chdir=CHDIR) - - suffix = '.exe.pdb' if test.format == 'ninja' else '.pdb' - test.built_file_must_not_exist('test_debug_off%s' % suffix, chdir=CHDIR) - test.built_file_must_exist('test_debug_on%s' % suffix, chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-link-default-libs.py b/tools/gyp/test/win/gyptest-link-default-libs.py deleted file mode 100644 index 5edf467913e67911675e9e6b2ee7d41123e0c74e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-link-default-libs.py +++ /dev/null @@ -1,22 +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. - -""" -Make sure we include the default libs. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'linker-flags' - test.run_gyp('no-default-libs.gyp', chdir=CHDIR) - test.build('no-default-libs.gyp', test.ALL, chdir=CHDIR, status=1) - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-link-deffile.py b/tools/gyp/test/win/gyptest-link-deffile.py deleted file mode 100644 index 94df874f857e1f4dee88492f956704b770131e7c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-link-deffile.py +++ /dev/null @@ -1,43 +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. - -""" -Make sure a .def file is handled in the link. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'linker-flags' - - # Multiple .def files doesn't make any sense, should fail at generate time. - test.run_gyp('deffile-multiple.gyp', chdir=CHDIR, stderr=None, status=1) - - test.run_gyp('deffile.gyp', chdir=CHDIR) - test.build('deffile.gyp', test.ALL, chdir=CHDIR) - - def HasExport(binary, export): - full_path = test.built_file_path(binary, chdir=CHDIR) - output = test.run_dumpbin('/exports', full_path) - return export in output - - # Make sure we only have the export when the .def file is in use. - - if HasExport('test_deffile_dll_notexported.dll', 'AnExportedFunction'): - test.fail_test() - if not HasExport('test_deffile_dll_ok.dll', 'AnExportedFunction'): - test.fail_test() - - if HasExport('test_deffile_exe_notexported.exe', 'AnExportedFunction'): - test.fail_test() - if not HasExport('test_deffile_exe_ok.exe', 'AnExportedFunction'): - test.fail_test() - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-link-defrelink.py b/tools/gyp/test/win/gyptest-link-defrelink.py deleted file mode 100644 index 7f2642f1e49efb731c9ba650659d3dfed89cb880..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-link-defrelink.py +++ /dev/null @@ -1,51 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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. - -""" -Make sure a relink is performed when a .def file is touched. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'linker-flags' - target = 'test_deffile_dll_ok' - def_contents = test.read('linker-flags/deffile.def') - - # This first build makes sure everything is up to date. - test.run_gyp('deffile.gyp', chdir=CHDIR) - test.build('deffile.gyp', target, chdir=CHDIR) - test.up_to_date('deffile.gyp', target, chdir=CHDIR) - - def HasExport(binary, export): - full_path = test.built_file_path(binary, chdir=CHDIR) - output = test.run_dumpbin('/exports', full_path) - return export in output - - # Verify that only one function is exported. - if not HasExport('test_deffile_dll_ok.dll', 'AnExportedFunction'): - test.fail_test() - if HasExport('test_deffile_dll_ok.dll', 'AnotherExportedFunction'): - test.fail_test() - - # Add AnotherExportedFunction to the def file, then rebuild. If it doesn't - # relink the DLL, then the subsequent check for AnotherExportedFunction will - # fail. - new_def_contents = def_contents + "\n AnotherExportedFunction" - test.write('linker-flags/deffile.def', new_def_contents) - test.build('deffile.gyp', target, chdir=CHDIR) - test.up_to_date('deffile.gyp', target, chdir=CHDIR) - - if not HasExport('test_deffile_dll_ok.dll', 'AnExportedFunction'): - test.fail_test() - if not HasExport('test_deffile_dll_ok.dll', 'AnotherExportedFunction'): - test.fail_test() - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-link-delay-load-dlls.py b/tools/gyp/test/win/gyptest-link-delay-load-dlls.py deleted file mode 100644 index 3880247b4ae3a5b8da6abcc3904a42d9555c2756..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-link-delay-load-dlls.py +++ /dev/null @@ -1,35 +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. - -""" -Make sure delay load setting is extracted properly. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'linker-flags' - test.run_gyp('delay-load-dlls.gyp', chdir=CHDIR) - test.build('delay-load-dlls.gyp', test.ALL, chdir=CHDIR) - - prefix = 'contains the following delay load imports:' - shell32_look_for = prefix + '\r\n\r\n SHELL32.dll' - - output = test.run_dumpbin( - '/all', test.built_file_path('test_dld_none.exe', chdir=CHDIR)) - if prefix in output: - test.fail_test() - - output = test.run_dumpbin( - '/all', test.built_file_path('test_dld_shell32.exe', chdir=CHDIR)) - if shell32_look_for not in output: - test.fail_test() - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-link-embed-manifest.py b/tools/gyp/test/win/gyptest-link-embed-manifest.py deleted file mode 100644 index 5b9d2c25b448cb68b651a5ff12db2e9482924300..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-link-embed-manifest.py +++ /dev/null @@ -1,99 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 Yandex LLC. All rights reserved. -# Use of this source code is governed by a BSD-style license that can be -# found in the LICENSE file. - -""" -Make sure manifests are embedded in binaries properly. Handling of -AdditionalManifestFiles is tested too. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - import pywintypes - import win32api - import winerror - - RT_MANIFEST = 24 - - class LoadLibrary(object): - """Context manager for loading and releasing binaries in Windows. - Yields the handle of the binary loaded.""" - def __init__(self, path): - self._path = path - self._handle = None - - def __enter__(self): - self._handle = win32api.LoadLibrary(self._path) - return self._handle - - def __exit__(self, type, value, traceback): - win32api.FreeLibrary(self._handle) - - - def extract_manifest(path, resource_name): - """Reads manifest from |path| and returns it as a string. - Returns None is there is no such manifest.""" - with LoadLibrary(path) as handle: - try: - return win32api.LoadResource(handle, RT_MANIFEST, resource_name) - except pywintypes.error as error: - if error.args[0] == winerror.ERROR_RESOURCE_DATA_NOT_FOUND: - return None - else: - raise - - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - CHDIR = 'linker-flags' - test.run_gyp('embed-manifest.gyp', chdir=CHDIR) - test.build('embed-manifest.gyp', test.ALL, chdir=CHDIR) - - # The following binaries must contain a manifest embedded. - test.fail_test(not extract_manifest(test.built_file_path( - 'test_manifest_exe.exe', chdir=CHDIR), 1)) - test.fail_test(not extract_manifest(test.built_file_path( - 'test_manifest_exe_inc.exe', chdir=CHDIR), 1)) - test.fail_test(not extract_manifest(test.built_file_path( - 'test_manifest_dll.dll', chdir=CHDIR), 2)) - test.fail_test(not extract_manifest(test.built_file_path( - 'test_manifest_dll_inc.dll', chdir=CHDIR), 2)) - - # Must contain the Win7 support GUID, but not the Vista one (from - # extra2.manifest). - test.fail_test( - '35138b9a-5d96-4fbd-8e2d-a2440225f93a' not in - extract_manifest(test.built_file_path('test_manifest_extra1.exe', - chdir=CHDIR), 1)) - test.fail_test( - 'e2011457-1546-43c5-a5fe-008deee3d3f0' in - extract_manifest(test.built_file_path('test_manifest_extra1.exe', - chdir=CHDIR), 1)) - # Must contain both. - test.fail_test( - '35138b9a-5d96-4fbd-8e2d-a2440225f93a' not in - extract_manifest(test.built_file_path('test_manifest_extra2.exe', - chdir=CHDIR), 1)) - test.fail_test( - 'e2011457-1546-43c5-a5fe-008deee3d3f0' not in - extract_manifest(test.built_file_path('test_manifest_extra2.exe', - chdir=CHDIR), 1)) - - # Same as extra2, but using list syntax instead. - test.fail_test( - '35138b9a-5d96-4fbd-8e2d-a2440225f93a' not in - extract_manifest(test.built_file_path('test_manifest_extra_list.exe', - chdir=CHDIR), 1)) - test.fail_test( - 'e2011457-1546-43c5-a5fe-008deee3d3f0' not in - extract_manifest(test.built_file_path('test_manifest_extra_list.exe', - chdir=CHDIR), 1)) - - # Test that incremental linking doesn't force manifest embedding. - test.fail_test(extract_manifest(test.built_file_path( - 'test_manifest_exe_inc_no_embed.exe', chdir=CHDIR), 1)) - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-link-enable-uac.py b/tools/gyp/test/win/gyptest-link-enable-uac.py deleted file mode 100644 index 131e07ec1f362566068c839c6c71b8ed39c97179..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-link-enable-uac.py +++ /dev/null @@ -1,95 +0,0 @@ -#!/usr/bin/env python - -# Copyright 2013 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 that embedding UAC information into the manifest works. -""" - -import TestGyp - -import sys -from xml.dom.minidom import parseString - -if sys.platform == 'win32': - import pywintypes - import win32api - import winerror - - RT_MANIFEST = 24 - - class LoadLibrary(object): - """Context manager for loading and releasing binaries in Windows. - Yields the handle of the binary loaded.""" - def __init__(self, path): - self._path = path - self._handle = None - - def __enter__(self): - self._handle = win32api.LoadLibrary(self._path) - return self._handle - - def __exit__(self, type, value, traceback): - win32api.FreeLibrary(self._handle) - - - def extract_manifest(path, resource_name): - """Reads manifest from |path| and returns it as a string. - Returns None is there is no such manifest.""" - with LoadLibrary(path) as handle: - try: - return win32api.LoadResource(handle, RT_MANIFEST, resource_name) - except pywintypes.error as error: - if error.args[0] == winerror.ERROR_RESOURCE_DATA_NOT_FOUND: - return None - else: - raise - - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - CHDIR = 'linker-flags' - test.run_gyp('enable-uac.gyp', chdir=CHDIR) - test.build('enable-uac.gyp', test.ALL, chdir=CHDIR) - - # The following binaries must contain a manifest embedded. - test.fail_test(not extract_manifest(test.built_file_path( - 'enable_uac.exe', chdir=CHDIR), 1)) - test.fail_test(not extract_manifest(test.built_file_path( - 'enable_uac_no.exe', chdir=CHDIR), 1)) - test.fail_test(not extract_manifest(test.built_file_path( - 'enable_uac_admin.exe', chdir=CHDIR), 1)) - - # Verify that - # is present. - manifest = parseString(extract_manifest( - test.built_file_path('enable_uac.exe', chdir=CHDIR), 1)) - execution_level = manifest.getElementsByTagName('requestedExecutionLevel') - test.fail_test(len(execution_level) != 1) - execution_level = execution_level[0].attributes - test.fail_test(not ( - execution_level.has_key('level') and - execution_level.has_key('uiAccess') and - execution_level['level'].nodeValue == 'asInvoker' and - execution_level['uiAccess'].nodeValue == 'false')) - - # Verify that is not in the menifest. - manifest = parseString(extract_manifest( - test.built_file_path('enable_uac_no.exe', chdir=CHDIR), 1)) - execution_level = manifest.getElementsByTagName('requestedExecutionLevel') - test.fail_test(len(execution_level) != 0) - - # Verify that is present. - manifest = parseString(extract_manifest( - test.built_file_path('enable_uac_admin.exe', chdir=CHDIR), 1)) - execution_level = manifest.getElementsByTagName('requestedExecutionLevel') - test.fail_test(len(execution_level) != 1) - execution_level = execution_level[0].attributes - test.fail_test(not ( - execution_level.has_key('level') and - execution_level.has_key('uiAccess') and - execution_level['level'].nodeValue == 'requireAdministrator' and - execution_level['uiAccess'].nodeValue == 'true')) - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-link-enable-winrt.py b/tools/gyp/test/win/gyptest-link-enable-winrt.py deleted file mode 100644 index 283863ced7a09ee751a76ef58d235ec283672d2a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-link-enable-winrt.py +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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. - -""" -Make sure msvs_enable_winrt works correctly. -""" - -import TestGyp - -import os -import sys -import struct - -CHDIR = 'enable-winrt' - -print 'This test is not currently working on the bots: https://code.google.com/p/gyp/issues/detail?id=466' -sys.exit(0) - -if (sys.platform == 'win32' and - int(os.environ.get('GYP_MSVS_VERSION', 0)) >= 2013): - test = TestGyp.TestGyp(formats=['msvs']) - - test.run_gyp('enable-winrt.gyp', chdir=CHDIR) - - test.build('enable-winrt.gyp', 'enable_winrt_dll', chdir=CHDIR) - - test.build('enable-winrt.gyp', 'enable_winrt_missing_dll', chdir=CHDIR, - status=1) - - test.build('enable-winrt.gyp', 'enable_winrt_winphone_dll', chdir=CHDIR) - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-link-entrypointsymbol.py b/tools/gyp/test/win/gyptest-link-entrypointsymbol.py deleted file mode 100644 index e88174a0858054f1aac292edfdb67e08a2489f72..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-link-entrypointsymbol.py +++ /dev/null @@ -1,24 +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. - -""" -Make sure entrypointsymbol setting is extracted properly. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'linker-flags' - test.run_gyp('entrypointsymbol.gyp', chdir=CHDIR) - - test.build('entrypointsymbol.gyp', 'test_ok', chdir=CHDIR) - test.build('entrypointsymbol.gyp', 'test_fail', chdir=CHDIR, status=1) - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-link-fixed-base.py b/tools/gyp/test/win/gyptest-link-fixed-base.py deleted file mode 100644 index 725a87028a56694acdfc6f4cd862c0148b649d93..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-link-fixed-base.py +++ /dev/null @@ -1,40 +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. - -""" -Make sure fixed base setting is extracted properly. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'linker-flags' - test.run_gyp('fixed-base.gyp', chdir=CHDIR) - test.build('fixed-base.gyp', test.ALL, chdir=CHDIR) - - def GetHeaders(exe): - full_path = test.built_file_path(exe, chdir=CHDIR) - return test.run_dumpbin('/headers', full_path) - - # For exe, default is fixed, for dll, it's not fixed. - if 'Relocations stripped' not in GetHeaders('test_fixed_default_exe.exe'): - test.fail_test() - if 'Relocations stripped' in GetHeaders('test_fixed_default_dll.dll'): - test.fail_test() - - # Explicitly not fixed. - if 'Relocations stripped' in GetHeaders('test_fixed_no.exe'): - test.fail_test() - - # Explicitly fixed. - if 'Relocations stripped' not in GetHeaders('test_fixed_yes.exe'): - test.fail_test() - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-link-force-symbol-reference.py b/tools/gyp/test/win/gyptest-link-force-symbol-reference.py deleted file mode 100644 index 235e94f71bd3d59cc1beb82f924811eca380dc9e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-link-force-symbol-reference.py +++ /dev/null @@ -1,26 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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. - -""" -Make sure ForceSymbolReference is translated properly. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'linker-flags' - test.run_gyp('force-symbol-reference.gyp', chdir=CHDIR) - test.build('force-symbol-reference.gyp', test.ALL, chdir=CHDIR) - - output = test.run_dumpbin( - '/disasm', test.built_file_path('test_force_reference.exe', chdir=CHDIR)) - if '?x@@YAHXZ:' not in output or '?y@@YAHXZ:' not in output: - test.fail_test() - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-link-generate-manifest.py b/tools/gyp/test/win/gyptest-link-generate-manifest.py deleted file mode 100644 index 77c9228ee5d771ca25775c205ff6d6dcf4fae400..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-link-generate-manifest.py +++ /dev/null @@ -1,127 +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. - -""" -Make sure we generate a manifest file when linking binaries, including -handling AdditionalManifestFiles. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - import pywintypes - import win32api - import winerror - - RT_MANIFEST = 24 - - class LoadLibrary(object): - """Context manager for loading and releasing binaries in Windows. - Yields the handle of the binary loaded.""" - def __init__(self, path): - self._path = path - self._handle = None - - def __enter__(self): - self._handle = win32api.LoadLibrary(self._path) - return self._handle - - def __exit__(self, type, value, traceback): - win32api.FreeLibrary(self._handle) - - def extract_manifest(path, resource_name): - """Reads manifest from |path| and returns it as a string. - Returns None is there is no such manifest.""" - with LoadLibrary(path) as handle: - try: - return win32api.LoadResource(handle, RT_MANIFEST, resource_name) - except pywintypes.error as error: - if error.args[0] == winerror.ERROR_RESOURCE_DATA_NOT_FOUND: - return None - else: - raise - - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'linker-flags' - test.run_gyp('generate-manifest.gyp', chdir=CHDIR) - test.build('generate-manifest.gyp', test.ALL, chdir=CHDIR) - - # Make sure that generation of .generated.manifest does not cause a relink. - test.run_gyp('generate-manifest.gyp', chdir=CHDIR) - test.up_to_date('generate-manifest.gyp', test.ALL, chdir=CHDIR) - - def test_manifest(filename, generate_manifest, embedded_manifest, - extra_manifest): - exe_file = test.built_file_path(filename, chdir=CHDIR) - if not generate_manifest: - test.must_not_exist(exe_file + '.manifest') - manifest = extract_manifest(exe_file, 1) - test.fail_test(manifest) - return - if embedded_manifest: - manifest = extract_manifest(exe_file, 1) - test.fail_test(not manifest) - else: - test.must_exist(exe_file + '.manifest') - manifest = test.read(exe_file + '.manifest') - test.fail_test(not manifest) - test.fail_test(extract_manifest(exe_file, 1)) - if generate_manifest: - test.must_contain_any_line(manifest, 'requestedExecutionLevel') - if extra_manifest: - test.must_contain_any_line(manifest, - '35138b9a-5d96-4fbd-8e2d-a2440225f93a') - test.must_contain_any_line(manifest, - 'e2011457-1546-43c5-a5fe-008deee3d3f0') - - test_manifest('test_generate_manifest_true.exe', - generate_manifest=True, - embedded_manifest=False, - extra_manifest=False) - test_manifest('test_generate_manifest_false.exe', - generate_manifest=False, - embedded_manifest=False, - extra_manifest=False) - test_manifest('test_generate_manifest_default.exe', - generate_manifest=True, - embedded_manifest=False, - extra_manifest=False) - test_manifest('test_generate_manifest_true_as_embedded.exe', - generate_manifest=True, - embedded_manifest=True, - extra_manifest=False) - test_manifest('test_generate_manifest_false_as_embedded.exe', - generate_manifest=False, - embedded_manifest=True, - extra_manifest=False) - test_manifest('test_generate_manifest_default_as_embedded.exe', - generate_manifest=True, - embedded_manifest=True, - extra_manifest=False) - test_manifest('test_generate_manifest_true_with_extra_manifest.exe', - generate_manifest=True, - embedded_manifest=False, - extra_manifest=True) - test_manifest('test_generate_manifest_false_with_extra_manifest.exe', - generate_manifest=False, - embedded_manifest=False, - extra_manifest=True) - test_manifest('test_generate_manifest_true_with_extra_manifest_list.exe', - generate_manifest=True, - embedded_manifest=False, - extra_manifest=True) - test_manifest('test_generate_manifest_false_with_extra_manifest_list.exe', - generate_manifest=False, - embedded_manifest=False, - extra_manifest=True) - test_manifest('test_generate_manifest_default_embed_default.exe', - generate_manifest=True, - embedded_manifest=True, - extra_manifest=False) - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-link-incremental.py b/tools/gyp/test/win/gyptest-link-incremental.py deleted file mode 100644 index e7184e162c8c1048ad9b8316d222d6852454f7b1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-link-incremental.py +++ /dev/null @@ -1,37 +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. - -""" -Make sure incremental linking setting is extracted properly. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'linker-flags' - test.run_gyp('incremental.gyp', chdir=CHDIR) - test.build('incremental.gyp', test.ALL, chdir=CHDIR) - - def HasILTTables(exe): - full_path = test.built_file_path(exe, chdir=CHDIR) - output = test.run_dumpbin('/disasm', full_path) - return '@ILT+' in output - - # Default or unset is to be on. - if not HasILTTables('test_incremental_unset.exe'): - test.fail_test() - if not HasILTTables('test_incremental_default.exe'): - test.fail_test() - if HasILTTables('test_incremental_no.exe'): - test.fail_test() - if not HasILTTables('test_incremental_yes.exe'): - test.fail_test() - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-link-large-address-aware.py b/tools/gyp/test/win/gyptest-link-large-address-aware.py deleted file mode 100644 index ea433f20994cfc98ce050c5caf9fc3c90bdf41d7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-link-large-address-aware.py +++ /dev/null @@ -1,35 +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. - -""" -Make sure largeaddressaware setting is extracted properly. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja']) - - CHDIR = 'linker-flags' - test.run_gyp('large-address-aware.gyp', chdir=CHDIR) - test.build('large-address-aware.gyp', test.ALL, chdir=CHDIR) - - def GetHeaders(exe): - return test.run_dumpbin('/headers', test.built_file_path(exe, chdir=CHDIR)) - - MARKER = 'Application can handle large (>2GB) addresses' - - # Explicitly off. - if MARKER in GetHeaders('test_large_address_aware_no.exe'): - test.fail_test() - - # Explicitly on. - if MARKER not in GetHeaders('test_large_address_aware_yes.exe'): - test.fail_test() - - test.pass_test() diff --git a/tools/gyp/test/win/gyptest-link-large-pdb.py b/tools/gyp/test/win/gyptest-link-large-pdb.py deleted file mode 100644 index f91001c0082d72c70648b18525ffef13476adcad..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/gyptest-link-large-pdb.py +++ /dev/null @@ -1,70 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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. - -""" -Make sure msvs_large_pdb works correctly. -""" - -import TestGyp - -import struct -import sys - - -CHDIR = 'large-pdb' - - -def CheckImageAndPdb(test, image_basename, expected_page_size, - pdb_basename=None): - if not pdb_basename: - pdb_basename = image_basename + '.pdb' - test.built_file_must_exist(image_basename, chdir=CHDIR) - test.built_file_must_exist(pdb_basename, chdir=CHDIR) - - # We expect the PDB to have the given page size. For full details of the - # header look here: https://code.google.com/p/pdbparser/wiki/MSF_Format - # We read the little-endian 4-byte unsigned integer at position 32 of the - # file. - pdb_path = test.built_file_path(pdb_basename, chdir=CHDIR) - pdb_file = open(pdb_path, 'rb') - pdb_file.seek(32, 0) - page_size = struct.unpack('(indexer)); - return 0; -} diff --git a/tools/gyp/test/win/idl-rules/idl_compiler.py b/tools/gyp/test/win/idl-rules/idl_compiler.py deleted file mode 100644 index a12b274d6754c4e7d8b6d669abacfa59987e5604..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/idl-rules/idl_compiler.py +++ /dev/null @@ -1,17 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -# mock, just outputs empty .h/.cpp files - -import os -import sys - -if len(sys.argv) == 2: - basename, ext = os.path.splitext(sys.argv[1]) - with open('%s.h' % basename, 'w') as f: - f.write('// %s.h\n' % basename) - with open('%s.cpp' % basename, 'w') as f: - f.write('// %s.cpp\n' % basename) diff --git a/tools/gyp/test/win/importlib/dll_no_exports.cc b/tools/gyp/test/win/importlib/dll_no_exports.cc deleted file mode 100644 index 96dd7970b7145087624aa7b1326ef9a3a0906824..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/importlib/dll_no_exports.cc +++ /dev/null @@ -1,9 +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. - -#include - -BOOL APIENTRY DllMain(HMODULE module, DWORD reason, LPVOID reserved) { - return TRUE; -} diff --git a/tools/gyp/test/win/importlib/has-exports.cc b/tools/gyp/test/win/importlib/has-exports.cc deleted file mode 100644 index 3f62d6c60de6a45997db4dbd1d47ab39a6197649..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/importlib/has-exports.cc +++ /dev/null @@ -1,10 +0,0 @@ -// 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. - -__declspec(dllexport) void some_function() { -} - -int main() { - return 0; -} diff --git a/tools/gyp/test/win/importlib/hello.cc b/tools/gyp/test/win/importlib/hello.cc deleted file mode 100644 index 66ff68c11314bd4cdcbc492eefacaa7a1214781d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/importlib/hello.cc +++ /dev/null @@ -1,9 +0,0 @@ -// 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. - -__declspec(dllimport) void some_function(); - -int main() { - some_function(); -} diff --git a/tools/gyp/test/win/importlib/importlib.gyp b/tools/gyp/test/win/importlib/importlib.gyp deleted file mode 100644 index ab15b1893d46c65dbab791ef96e4bfa79c0a51a7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/importlib/importlib.gyp +++ /dev/null @@ -1,30 +0,0 @@ -# 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': 'test_importlib', - 'type': 'shared_library', - 'msvs_settings': { - 'VCLinkerTool': { - 'LinkIncremental': '2', - } - }, - 'sources': ['has-exports.cc'], - }, - - { - 'target_name': 'test_linkagainst', - 'type': 'executable', - 'dependencies': ['test_importlib'], - 'msvs_settings': { - 'VCLinkerTool': { - 'LinkIncremental': '2', - } - }, - 'sources': ['hello.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/importlib/noimplib.gyp b/tools/gyp/test/win/importlib/noimplib.gyp deleted file mode 100644 index 0245058a996b486723feea00e159668e474a19a7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/importlib/noimplib.gyp +++ /dev/null @@ -1,16 +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': 'no_import_library', - 'type': 'loadable_module', - 'msvs_settings': { - 'NoImportLibrary': 'true', - }, - 'sources': ['dll_no_exports.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/large-pdb/dllmain.cc b/tools/gyp/test/win/large-pdb/dllmain.cc deleted file mode 100644 index 14875623e833b6fd6667e800e5c722214999c9dc..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/large-pdb/dllmain.cc +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright (c) 2013 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. - -#include - -BOOL WINAPI DllMain(HINSTANCE hinstance, DWORD reason, LPVOID reserved) { - return TRUE; -} diff --git a/tools/gyp/test/win/large-pdb/large-pdb.gyp b/tools/gyp/test/win/large-pdb/large-pdb.gyp deleted file mode 100644 index 2a241a562331842c360e50eb1490f70eeef66476..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/large-pdb/large-pdb.gyp +++ /dev/null @@ -1,98 +0,0 @@ -# Copyright (c) 2013 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': 'large_pdb_exe', - 'type': 'executable', - 'msvs_large_pdb': 1, - 'sources': [ - 'main.cc', - ], - 'msvs_settings': { - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - 'ProgramDatabaseFile': '<(PRODUCT_DIR)/large_pdb_exe.exe.pdb', - }, - }, - }, - { - 'target_name': 'small_pdb_exe', - 'type': 'executable', - 'msvs_large_pdb': 0, - 'sources': [ - 'main.cc', - ], - 'msvs_settings': { - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - 'ProgramDatabaseFile': '<(PRODUCT_DIR)/small_pdb_exe.exe.pdb', - }, - }, - }, - { - 'target_name': 'large_pdb_dll', - 'type': 'shared_library', - 'msvs_large_pdb': 1, - 'sources': [ - 'dllmain.cc', - ], - 'msvs_settings': { - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - 'ProgramDatabaseFile': '<(PRODUCT_DIR)/large_pdb_dll.dll.pdb', - }, - }, - }, - { - 'target_name': 'small_pdb_dll', - 'type': 'shared_library', - 'msvs_large_pdb': 0, - 'sources': [ - 'dllmain.cc', - ], - 'msvs_settings': { - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - 'ProgramDatabaseFile': '<(PRODUCT_DIR)/small_pdb_dll.dll.pdb', - }, - }, - }, - { - 'target_name': 'large_pdb_implicit_exe', - 'type': 'executable', - 'msvs_large_pdb': 1, - 'sources': [ - 'main.cc', - ], - # No PDB file is specified. However, the msvs_large_pdb mechanism should - # default to the appropriate <(PRODUCT_DIR)/<(TARGET_NAME).exe.pdb. - }, - { - 'target_name': 'large_pdb_variable_exe', - 'type': 'executable', - 'msvs_large_pdb': 1, - 'sources': [ - 'main.cc', - ], - # No PDB file is specified. However, the msvs_large_pdb_path variable - # explicitly sets one. - 'variables': { - 'msvs_large_pdb_path': '<(PRODUCT_DIR)/foo.pdb', - }, - }, - { - 'target_name': 'large_pdb_product_exe', - 'product_name': 'bar', - 'type': 'executable', - 'msvs_large_pdb': 1, - 'sources': [ - 'main.cc', - ], - # No PDB file is specified. However, we've specified a product name so - # it should use <(PRODUCT_DIR)/bar.exe.pdb. - }, - ] -} diff --git a/tools/gyp/test/win/large-pdb/main.cc b/tools/gyp/test/win/large-pdb/main.cc deleted file mode 100644 index c3da8e9219305676a5482ffd271f9ad344208207..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/large-pdb/main.cc +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2013 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. - -int main(void) { - return 0; -} diff --git a/tools/gyp/test/win/lib-flags/answer.cc b/tools/gyp/test/win/lib-flags/answer.cc deleted file mode 100644 index a6ffa168620f581dd13e338512b8aa38f61aaf32..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/lib-flags/answer.cc +++ /dev/null @@ -1,9 +0,0 @@ -// 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. - -#include "answer.h" - -int answer() { - return 42; -} diff --git a/tools/gyp/test/win/lib-flags/answer.h b/tools/gyp/test/win/lib-flags/answer.h deleted file mode 100644 index 82312d54b8e7b0afbeac97a2b0252b733b384285..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/lib-flags/answer.h +++ /dev/null @@ -1,5 +0,0 @@ -// 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. - -int answer(); \ No newline at end of file diff --git a/tools/gyp/test/win/lib-flags/ltcg.gyp b/tools/gyp/test/win/lib-flags/ltcg.gyp deleted file mode 100644 index c183107730ad2c96dd7988f0265f0f9091842ecb..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/lib-flags/ltcg.gyp +++ /dev/null @@ -1,21 +0,0 @@ -# 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': 'lib_answer', - 'type': 'static_library', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WholeProgramOptimization': 'true', # /GL - }, - 'VCLibrarianTool': { - 'LinkTimeCodeGeneration': 'true', # /LTCG - }, - }, - 'sources': ['answer.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/a/x.cc b/tools/gyp/test/win/linker-flags/a/x.cc deleted file mode 100644 index f5f763b0956348e03bb20ea79ffa2462b6ea6aa1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/a/x.cc +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2013 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. - -int x() { - return 1; -} diff --git a/tools/gyp/test/win/linker-flags/a/z.cc b/tools/gyp/test/win/linker-flags/a/z.cc deleted file mode 100644 index 8a43501270ae8aa85be0fa9a20c9e36a0b93eb93..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/a/z.cc +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2013 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. - -int z() { - return 3; -} diff --git a/tools/gyp/test/win/linker-flags/additional-deps.cc b/tools/gyp/test/win/linker-flags/additional-deps.cc deleted file mode 100644 index 7dfb589d26d198b5f33a0c42be39b9f2519ed846..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/additional-deps.cc +++ /dev/null @@ -1,10 +0,0 @@ -// 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. - -#include - -int main() { - WSAStartup(0, 0); - return 0; -} diff --git a/tools/gyp/test/win/linker-flags/additional-deps.gyp b/tools/gyp/test/win/linker-flags/additional-deps.gyp deleted file mode 100644 index 55afe64fb09466de37891aaa9562e4cf44160ffa..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/additional-deps.gyp +++ /dev/null @@ -1,30 +0,0 @@ -# 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': 'test_deps_none', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_deps_few', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'AdditionalDependencies': [ - 'wininet.lib', - 'ws2_32.lib', - ] - } - }, - 'sources': ['additional-deps.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/additional-options.gyp b/tools/gyp/test/win/linker-flags/additional-options.gyp deleted file mode 100644 index be47a6b04e215611a7d24efc5554a6577f21d8bd..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/additional-options.gyp +++ /dev/null @@ -1,29 +0,0 @@ -# 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': 'test_additional_none', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_additional_few', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'AdditionalOptions': [ - '/dynamicbase:no', - ] - } - }, - 'sources': ['hello.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/aslr.gyp b/tools/gyp/test/win/linker-flags/aslr.gyp deleted file mode 100644 index b3aefd50b7f0c481f09b1921a5ea5398d33d8266..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/aslr.gyp +++ /dev/null @@ -1,35 +0,0 @@ -# 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': 'test_aslr_default', - 'type': 'executable', - 'msvs_settings': { - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_aslr_no', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'RandomizedBaseAddress': '1', - }, - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_aslr_yes', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'RandomizedBaseAddress': '2', - } - }, - 'sources': ['hello.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/b/y.cc b/tools/gyp/test/win/linker-flags/b/y.cc deleted file mode 100644 index bd884119fcd44ab7f0c2b78f52ae5c62517f7a66..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/b/y.cc +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2013 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. - -int y() { - return 2; -} diff --git a/tools/gyp/test/win/linker-flags/base-address.gyp b/tools/gyp/test/win/linker-flags/base-address.gyp deleted file mode 100644 index 873ebfea3f124e267f15b8f8cb1a1a4119bc58f7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/base-address.gyp +++ /dev/null @@ -1,38 +0,0 @@ -# Copyright 2013 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': 'test_base_specified_exe', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'BaseAddress': '0x00420000', - }, - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_base_specified_dll', - 'type': 'shared_library', - 'msvs_settings': { - 'VCLinkerTool': { - 'BaseAddress': '0x10420000', - }, - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_base_default_exe', - 'type': 'executable', - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_base_default_dll', - 'type': 'shared_library', - 'sources': ['hello.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/debug-info.gyp b/tools/gyp/test/win/linker-flags/debug-info.gyp deleted file mode 100644 index d47d0ecced958a0db18dfd935f78b667fab1dd8f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/debug-info.gyp +++ /dev/null @@ -1,28 +0,0 @@ -# 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': 'test_debug_off', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'GenerateDebugInformation': 'false' - }, - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_debug_on', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true' - }, - }, - 'sources': ['hello.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/deffile-multiple.gyp b/tools/gyp/test/win/linker-flags/deffile-multiple.gyp deleted file mode 100644 index c74a9af20aecc39824e8f65268def3139db66254..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/deffile-multiple.gyp +++ /dev/null @@ -1,17 +0,0 @@ -# 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': 'test_deffile_multiple_fail', - 'type': 'shared_library', - 'sources': [ - 'deffile.cc', - 'deffile.def', - 'deffile2.def', - ], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/deffile.cc b/tools/gyp/test/win/linker-flags/deffile.cc deleted file mode 100644 index fa203b34c84e1ec2537e8d84e79d3f2ecd4802fd..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/deffile.cc +++ /dev/null @@ -1,13 +0,0 @@ -// 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. - -void AnExportedFunction() { -} - -void AnotherExportedFunction() { -} - -int main() { - return 0; -} diff --git a/tools/gyp/test/win/linker-flags/deffile.def b/tools/gyp/test/win/linker-flags/deffile.def deleted file mode 100644 index ba9d399bd6f9ae512179768e06cbd5ee5fa20d17..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/deffile.def +++ /dev/null @@ -1,8 +0,0 @@ -; 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. - -LIBRARY test_deffile_ok - -EXPORTS - AnExportedFunction diff --git a/tools/gyp/test/win/linker-flags/deffile.gyp b/tools/gyp/test/win/linker-flags/deffile.gyp deleted file mode 100644 index 7b241d5e3ae45abeba7151ab9861a5b3869772b7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/deffile.gyp +++ /dev/null @@ -1,38 +0,0 @@ -# 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': 'test_deffile_dll_ok', - 'type': 'shared_library', - 'sources': [ - 'deffile.cc', - 'deffile.def', - ], - }, - { - 'target_name': 'test_deffile_dll_notexported', - 'type': 'shared_library', - 'sources': [ - 'deffile.cc', - ], - }, - { - 'target_name': 'test_deffile_exe_ok', - 'type': 'executable', - 'sources': [ - 'deffile.cc', - 'deffile.def', - ], - }, - { - 'target_name': 'test_deffile_exe_notexported', - 'type': 'executable', - 'sources': [ - 'deffile.cc', - ], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/delay-load-dlls.gyp b/tools/gyp/test/win/linker-flags/delay-load-dlls.gyp deleted file mode 100644 index 671cbaa802f5366c32c09d76043702b8335e3c38..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/delay-load-dlls.gyp +++ /dev/null @@ -1,35 +0,0 @@ -# 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': 'test_dld_none', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - } - }, - 'sources': ['delay-load.cc'], - 'libraries': [ - 'delayimp.lib', - 'shell32.lib', - ], - }, - { - 'target_name': 'test_dld_shell32', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'DelayLoadDLLs': ['shell32.dll'] - } - }, - 'sources': ['delay-load.cc'], - 'libraries': [ - 'delayimp.lib', - 'shell32.lib', - ], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/delay-load.cc b/tools/gyp/test/win/linker-flags/delay-load.cc deleted file mode 100644 index 2be34aa876c79a9b4061194e865b085b9430715e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/delay-load.cc +++ /dev/null @@ -1,10 +0,0 @@ -// 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. - -#include - -int main() { - SHCreateDirectory(0, 0); - return 0; -} diff --git a/tools/gyp/test/win/linker-flags/embed-manifest.gyp b/tools/gyp/test/win/linker-flags/embed-manifest.gyp deleted file mode 100644 index fefb2f56d85e2a17560c6082b3faed2dba96d580..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/embed-manifest.gyp +++ /dev/null @@ -1,109 +0,0 @@ -# Copyright (c) 2013 Yandex LLC. 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': 'test_manifest_exe', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'LinkIncremental': '1', - }, - 'VCManifestTool': { - 'EmbedManifest': 'true', - } - }, - }, - { - 'target_name': 'test_manifest_dll', - 'type': 'loadable_module', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'LinkIncremental': '1', - }, - 'VCManifestTool': { - 'EmbedManifest': 'true', - } - }, - }, - { - 'target_name': 'test_manifest_extra1', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCManifestTool': { - 'EmbedManifest': 'true', - 'AdditionalManifestFiles': 'extra.manifest', - } - }, - }, - { - 'target_name': 'test_manifest_extra2', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCManifestTool': { - 'EmbedManifest': 'true', - 'AdditionalManifestFiles': 'extra.manifest;extra2.manifest', - } - }, - }, - { - 'target_name': 'test_manifest_extra_list', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCManifestTool': { - 'EmbedManifest': 'true', - 'AdditionalManifestFiles': [ - 'extra.manifest', - 'extra2.manifest' - ], - } - }, - }, - { - 'target_name': 'test_manifest_dll_inc', - 'type': 'loadable_module', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'LinkIncremental': '2', - }, - 'VCManifestTool': { - 'EmbedManifest': 'true', - } - }, - }, - { - 'target_name': 'test_manifest_exe_inc', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'LinkIncremental': '2', - }, - 'VCManifestTool': { - 'EmbedManifest': 'true', - } - }, - }, - { - 'target_name': 'test_manifest_exe_inc_no_embed', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'LinkIncremental': '2', - }, - 'VCManifestTool': { - 'EmbedManifest': 'false', - } - }, - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/enable-uac.gyp b/tools/gyp/test/win/linker-flags/enable-uac.gyp deleted file mode 100644 index 4e58c86ec8855038726205b21743852b1d20aaf3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/enable-uac.gyp +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright 2013 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': 'enable_uac', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCManifestTool': { - 'EmbedManifest': 'true', - } - }, - }, - { - 'target_name': 'enable_uac_no', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'EnableUAC': 'false', - }, - 'VCManifestTool': { - 'EmbedManifest': 'true', - } - }, - }, - { - 'target_name': 'enable_uac_admin', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'UACExecutionLevel': 2, - 'UACUIAccess': 'true', - }, - 'VCManifestTool': { - 'EmbedManifest': 'true', - } - }, - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/entrypointsymbol.cc b/tools/gyp/test/win/linker-flags/entrypointsymbol.cc deleted file mode 100644 index b567bc87b30bca79945a3efc30c05c511db67866..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/entrypointsymbol.cc +++ /dev/null @@ -1,13 +0,0 @@ -// 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. - -// The entry point specified by link.exe /ENTRY option. -extern "C" void MainEntryPoint() { -} - -// Still needed because the linker checks for existence of one of main, wmain, -// WinMain, or wMain to offer informative diagnositics. -int main() { - return 0; -} diff --git a/tools/gyp/test/win/linker-flags/entrypointsymbol.gyp b/tools/gyp/test/win/linker-flags/entrypointsymbol.gyp deleted file mode 100644 index 7f2c14252d013e8d2562e6917107ca8d6aa82686..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/entrypointsymbol.gyp +++ /dev/null @@ -1,28 +0,0 @@ -# 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': 'test_ok', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'EntryPointSymbol': 'MainEntryPoint', - } - }, - 'sources': ['entrypointsymbol.cc'], - }, - { - 'target_name': 'test_fail', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'EntryPointSymbol': 'MainEntryPoint', - } - }, - 'sources': ['hello.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/extra.manifest b/tools/gyp/test/win/linker-flags/extra.manifest deleted file mode 100644 index 5cc2fc3512acec691b2911ec1a817dcd5c49f634..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/extra.manifest +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/tools/gyp/test/win/linker-flags/extra2.manifest b/tools/gyp/test/win/linker-flags/extra2.manifest deleted file mode 100644 index 1fea404eec4b364a70ccb21d1ca996b48e69cfac..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/extra2.manifest +++ /dev/null @@ -1,11 +0,0 @@ - - - - - - - - - - - diff --git a/tools/gyp/test/win/linker-flags/fixed-base.gyp b/tools/gyp/test/win/linker-flags/fixed-base.gyp deleted file mode 100644 index cc2982eb2799cbec96d929b237252e3f52b09670..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/fixed-base.gyp +++ /dev/null @@ -1,52 +0,0 @@ -# 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': [ - # Disable DYNAMICBASE for these tests because it implies/doesn't imply - # FIXED in certain cases so it complicates the test for FIXED. - { - 'target_name': 'test_fixed_default_exe', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'RandomizedBaseAddress': '1', - }, - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_fixed_default_dll', - 'type': 'shared_library', - 'msvs_settings': { - 'VCLinkerTool': { - 'RandomizedBaseAddress': '1', - }, - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_fixed_no', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'FixedBaseAddress': '1', - 'RandomizedBaseAddress': '1', - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_fixed_yes', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'FixedBaseAddress': '2', - 'RandomizedBaseAddress': '1', - }, - }, - 'sources': ['hello.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/force-symbol-reference.gyp b/tools/gyp/test/win/linker-flags/force-symbol-reference.gyp deleted file mode 100644 index 1f354fafc7b78c4ed0f9aae561f90cdb0153bfe4..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/force-symbol-reference.gyp +++ /dev/null @@ -1,39 +0,0 @@ -# Copyright (c) 2013 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': 'test_force_reference_lib', - 'type': 'static_library', - 'sources': ['x.cc', 'y.cc'], - }, - { - 'target_name': 'test_force_reference', - 'type': 'executable', - # Turn on debug info to get symbols in disasm for the test code, and - # turn on opt:ref to drop unused symbols to make sure we wouldn't - # otherwise have the symbols. - 'msvs_settings': { - 'VCCLCompilerTool': { - 'DebugInformationFormat': '3', - }, - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - 'AdditionalOptions': [ - '/OPT:REF', - ], - 'ForceSymbolReferences': [ - '?x@@YAHXZ', - '?y@@YAHXZ', - ], - }, - }, - 'sources': ['hello.cc'], - 'dependencies': [ - 'test_force_reference_lib', - ], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/generate-manifest.gyp b/tools/gyp/test/win/linker-flags/generate-manifest.gyp deleted file mode 100644 index 34a68d1a489db79de2fd90c43eb902df06f945b1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/generate-manifest.gyp +++ /dev/null @@ -1,166 +0,0 @@ -# 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': 'test_generate_manifest_true', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'EnableUAC': 'true', - 'GenerateManifest': 'true', - }, - 'VCManifestTool': { - 'EmbedManifest': 'false', - }, - }, - }, - { - 'target_name': 'test_generate_manifest_false', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'EnableUAC': 'true', - 'GenerateManifest': 'false', - }, - 'VCManifestTool': { - 'EmbedManifest': 'false', - }, - }, - }, - { - 'target_name': 'test_generate_manifest_default', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'EnableUAC': 'true', - }, - 'VCManifestTool': { - 'EmbedManifest': 'false', - }, - }, - }, - { - 'target_name': 'test_generate_manifest_true_as_embedded', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'EnableUAC': 'true', - 'GenerateManifest': 'true', - }, - 'VCManifestTool': { - 'EmbedManifest': 'true', - }, - }, - }, - { - 'target_name': 'test_generate_manifest_false_as_embedded', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'EnableUAC': 'true', - 'GenerateManifest': 'false', - }, - 'VCManifestTool': { - 'EmbedManifest': 'true', - }, - }, - }, - { - 'target_name': 'test_generate_manifest_default_as_embedded', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'EnableUAC': 'true', - }, - 'VCManifestTool': { - 'EmbedManifest': 'true', - }, - }, - }, - { - 'target_name': 'test_generate_manifest_true_with_extra_manifest', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'EnableUAC': 'true', - 'GenerateManifest': 'true', - }, - 'VCManifestTool': { - 'EmbedManifest': 'false', - 'AdditionalManifestFiles': 'extra.manifest;extra2.manifest', - }, - }, - }, - { - 'target_name': 'test_generate_manifest_false_with_extra_manifest', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'EnableUAC': 'true', - 'GenerateManifest': 'false', - }, - 'VCManifestTool': { - 'EmbedManifest': 'false', - 'AdditionalManifestFiles': 'extra.manifest;extra2.manifest', - }, - }, - }, - { - 'target_name': 'test_generate_manifest_true_with_extra_manifest_list', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'EnableUAC': 'true', - 'GenerateManifest': 'true', - }, - 'VCManifestTool': { - 'EmbedManifest': 'false', - 'AdditionalManifestFiles': [ - 'extra.manifest', - 'extra2.manifest', - ], - }, - }, - }, - { - 'target_name': 'test_generate_manifest_false_with_extra_manifest_list', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'EnableUAC': 'true', - 'GenerateManifest': 'false', - }, - 'VCManifestTool': { - 'EmbedManifest': 'false', - 'AdditionalManifestFiles': [ - 'extra.manifest', - 'extra2.manifest', - ], - }, - }, - }, - { - 'target_name': 'test_generate_manifest_default_embed_default', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'EnableUAC': 'true', - }, - }, - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/hello.cc b/tools/gyp/test/win/linker-flags/hello.cc deleted file mode 100644 index 1711567ef566703fcd9c33e0a236b1b30454df6a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/hello.cc +++ /dev/null @@ -1,7 +0,0 @@ -// 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. - -int main() { - return 0; -} diff --git a/tools/gyp/test/win/linker-flags/incremental.gyp b/tools/gyp/test/win/linker-flags/incremental.gyp deleted file mode 100644 index 59f3103253ce8376ee32b227c59329cab7c5564c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/incremental.gyp +++ /dev/null @@ -1,65 +0,0 @@ -# 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': [ - # Turn on debug information so the incremental linking tables have a - # visible symbolic name in the disassembly. - { - 'target_name': 'test_incremental_unset', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'DebugInformationFormat': '3', - }, - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - }, - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_incremental_default', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'DebugInformationFormat': '3', - }, - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - 'LinkIncremental': '0', - }, - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_incremental_no', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'DebugInformationFormat': '3', - }, - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - 'LinkIncremental': '1', - }, - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_incremental_yes', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'DebugInformationFormat': '3', - }, - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - 'LinkIncremental': '2', - } - }, - 'sources': ['hello.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/inline_test.cc b/tools/gyp/test/win/linker-flags/inline_test.cc deleted file mode 100644 index a9f177e4768a2995fc8939aacf89e6ce5a160732..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/inline_test.cc +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2013 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. - -#include "inline_test.h" - -#include -#pragma intrinsic(_ReturnAddress) - -bool IsFunctionInlined(void* caller_return_address) { - return _ReturnAddress() == caller_return_address; -} diff --git a/tools/gyp/test/win/linker-flags/inline_test.h b/tools/gyp/test/win/linker-flags/inline_test.h deleted file mode 100644 index 117913c4f50403e8772623d3203585b2749a9f91..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/inline_test.h +++ /dev/null @@ -1,5 +0,0 @@ -// Copyright (c) 2013 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. - -bool IsFunctionInlined(void* current_return_address); diff --git a/tools/gyp/test/win/linker-flags/inline_test_main.cc b/tools/gyp/test/win/linker-flags/inline_test_main.cc deleted file mode 100644 index 23cafe8f94a3bcc8f713a844aa728bfc7df171ed..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/inline_test_main.cc +++ /dev/null @@ -1,15 +0,0 @@ -// Copyright (c) 2013 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. - -#include "inline_test.h" - -#include -#include - -#pragma intrinsic(_ReturnAddress) - -int main() { - if (IsFunctionInlined(_ReturnAddress())) - puts("==== inlined ====\n"); -} diff --git a/tools/gyp/test/win/linker-flags/large-address-aware.gyp b/tools/gyp/test/win/linker-flags/large-address-aware.gyp deleted file mode 100644 index fa56d3789ce318b0cac0ea5e87f8f52739dafbb2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/large-address-aware.gyp +++ /dev/null @@ -1,28 +0,0 @@ -# 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': 'test_large_address_aware_no', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'LargeAddressAware': '1', - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_large_address_aware_yes', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'LargeAddressAware': '2', - }, - }, - 'sources': ['hello.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/library-adjust.cc b/tools/gyp/test/win/linker-flags/library-adjust.cc deleted file mode 100644 index 7dfb589d26d198b5f33a0c42be39b9f2519ed846..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/library-adjust.cc +++ /dev/null @@ -1,10 +0,0 @@ -// 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. - -#include - -int main() { - WSAStartup(0, 0); - return 0; -} diff --git a/tools/gyp/test/win/linker-flags/library-adjust.gyp b/tools/gyp/test/win/linker-flags/library-adjust.gyp deleted file mode 100644 index 10e9996f5c6a8cf8eae1dc0e410719af770f95f2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/library-adjust.gyp +++ /dev/null @@ -1,16 +0,0 @@ -# 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': 'test_adjust', - 'type': 'executable', - 'libraries': [ - '-lws2_32.lib' - ], - 'sources': ['library-adjust.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/library-directories-define.cc b/tools/gyp/test/win/linker-flags/library-directories-define.cc deleted file mode 100644 index 211ef062c1390aa9cb0ebc917bed9f091aea7957..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/library-directories-define.cc +++ /dev/null @@ -1,7 +0,0 @@ -// 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. - -int library_function() { - return 0; -} diff --git a/tools/gyp/test/win/linker-flags/library-directories-reference.cc b/tools/gyp/test/win/linker-flags/library-directories-reference.cc deleted file mode 100644 index 335097839a18b8dc2d835354906cdf2c0c48d74e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/library-directories-reference.cc +++ /dev/null @@ -1,10 +0,0 @@ -// 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. - -extern int library_function(); - -int main() { - library_function(); - return 0; -} diff --git a/tools/gyp/test/win/linker-flags/library-directories.gyp b/tools/gyp/test/win/linker-flags/library-directories.gyp deleted file mode 100644 index 25395d6c879de42d652f055996c95c02232b0a7b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/library-directories.gyp +++ /dev/null @@ -1,42 +0,0 @@ -# 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': 'test_libdirs_none', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'AdditionalDependencies': [ - 'test_lib.lib', - ], - }, - }, - 'sources': ['library-directories-reference.cc'], - }, - { - 'target_name': 'test_libdirs_with', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - # NOTE: Don't use this for general dependencies between gyp - # libraries (use 'dependencies' instead). This is done here only for - # testing. - # - # This setting should only be used to depend on third party prebuilt - # libraries that are stored as binaries at a known location. - 'AdditionalLibraryDirectories': [ - '<(DEPTH)/out/Default/obj/subdir', # ninja style - '<(DEPTH)/subdir/Default/lib', # msvs style - ], - 'AdditionalDependencies': [ - 'test_lib.lib', - ], - }, - }, - 'sources': ['library-directories-reference.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/link-ordering.gyp b/tools/gyp/test/win/linker-flags/link-ordering.gyp deleted file mode 100644 index 66f44309d1388b20736e8382902f31385d91ff67..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/link-ordering.gyp +++ /dev/null @@ -1,95 +0,0 @@ -# Copyright (c) 2013 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': 'test_ordering_exe', - 'type': 'executable', - # These are so the names of the functions appear in the disassembly. - 'msvs_settings': { - 'VCCLCompilerTool': { - 'DebugInformationFormat': '3', - 'Optimization': '2', - }, - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - 'LinkIncremental': '1', - 'GenerateManifest': 'false', - # Minimize the disassembly to just our code. - 'AdditionalOptions': [ - '/NODEFAULTLIB', - ], - }, - }, - 'sources': [ - # Explicitly sorted the same way as the disassembly in the test .py. - 'main-crt.c', - 'z.cc', - 'x.cc', - 'y.cc', - 'hello.cc', - ], - }, - - { - 'target_name': 'test_ordering_subdirs', - 'type': 'executable', - # These are so the names of the functions appear in the disassembly. - 'msvs_settings': { - 'VCCLCompilerTool': { - 'DebugInformationFormat': '3', - 'Optimization': '2', - }, - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - 'LinkIncremental': '1', - 'GenerateManifest': 'false', - # Minimize the disassembly to just our code. - 'AdditionalOptions': [ - '/NODEFAULTLIB', - ], - }, - }, - 'sources': [ - # Explicitly sorted the same way as the disassembly in the test .py. - 'main-crt.c', - 'hello.cc', - 'b/y.cc', - 'a/z.cc', - ], - }, - - - { - 'target_name': 'test_ordering_subdirs_mixed', - 'type': 'executable', - # These are so the names of the functions appear in the disassembly. - 'msvs_settings': { - 'VCCLCompilerTool': { - 'DebugInformationFormat': '3', - 'Optimization': '2', - }, - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - 'LinkIncremental': '1', - 'GenerateManifest': 'false', - # Minimize the disassembly to just our code. - 'AdditionalOptions': [ - '/NODEFAULTLIB', - ], - }, - }, - 'sources': [ - # Explicitly sorted the same way as the disassembly in the test .py. - 'main-crt.c', - 'a/x.cc', - 'hello.cc', - 'a/z.cc', - 'y.cc', - ], - }, - - ] -} diff --git a/tools/gyp/test/win/linker-flags/link-warning.cc b/tools/gyp/test/win/linker-flags/link-warning.cc deleted file mode 100644 index 4b34277ba35ace40110f12e275bba10243957eac..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/link-warning.cc +++ /dev/null @@ -1,10 +0,0 @@ -// Copyright (c) 2013 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. - -// This will cause LNK4254. -#pragma comment(linker, "/merge:.data=.text") - -int main() { - return 0; -} diff --git a/tools/gyp/test/win/linker-flags/ltcg.gyp b/tools/gyp/test/win/linker-flags/ltcg.gyp deleted file mode 100644 index ddb0d9b4e2b5900bbe729af1a681c3083cad9613..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/ltcg.gyp +++ /dev/null @@ -1,42 +0,0 @@ -# Copyright (c) 2013 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': 'test_ltcg_off', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WholeProgramOptimization': 'false', - }, - 'VCLinkerTool': { - 'LinkTimeCodeGeneration': '0', - }, - }, - 'sources': [ - 'inline_test.h', - 'inline_test.cc', - 'inline_test_main.cc', - ], - }, - { - 'target_name': 'test_ltcg_on', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WholeProgramOptimization': 'true', # /GL - }, - 'VCLinkerTool': { - 'LinkTimeCodeGeneration': '1', # /LTCG - }, - }, - 'sources': [ - 'inline_test.h', - 'inline_test.cc', - 'inline_test_main.cc', - ], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/main-crt.c b/tools/gyp/test/win/linker-flags/main-crt.c deleted file mode 100644 index bdc80c54fd9532a5ca722e923380f1acf9d942d7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/main-crt.c +++ /dev/null @@ -1,8 +0,0 @@ -// Copyright (c) 2013 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. - -// Stub so we can link with /NODEFAULTLIB when checking disasm. -int mainCRTStartup() { - return 5; -} diff --git a/tools/gyp/test/win/linker-flags/manifest-in-comment.cc b/tools/gyp/test/win/linker-flags/manifest-in-comment.cc deleted file mode 100644 index ae54ae546290006d558fea9c342535819d697e15..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/manifest-in-comment.cc +++ /dev/null @@ -1,13 +0,0 @@ -// Copyright 2013 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. - -#pragma comment(linker, \ - "\"/manifestdependency:type='Win32' " \ - "name='Test.Research.SampleAssembly' version='6.0.0.0' " \ - "processorArchitecture='X86' " \ - "publicKeyToken='0000000000000000' language='*'\"") - -int main() { - return 0; -} diff --git a/tools/gyp/test/win/linker-flags/mapfile.cc b/tools/gyp/test/win/linker-flags/mapfile.cc deleted file mode 100644 index cebccb264a06314e445fa52d147ca649f24a3ab7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/mapfile.cc +++ /dev/null @@ -1,12 +0,0 @@ -// Copyright (c) 2013 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. - -__declspec(dllexport) -void AnExportedFunction() { - // We need an exported function to verify that /MAPINFO:EXPORTS works. -} - -int main() { - return 0; -} diff --git a/tools/gyp/test/win/linker-flags/mapfile.gyp b/tools/gyp/test/win/linker-flags/mapfile.gyp deleted file mode 100644 index 14206fe28d7d2872389d2b1b5bb188cdf37fda1e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/mapfile.gyp +++ /dev/null @@ -1,45 +0,0 @@ -# Copyright (c) 2013 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': 'test_mapfile_unset', - 'type': 'executable', - 'sources': ['mapfile.cc'], - }, - { - 'target_name': 'test_mapfile_generate', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'GenerateMapFile': 'true', - }, - }, - 'sources': ['mapfile.cc'], - }, - { - 'target_name': 'test_mapfile_generate_exports', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'GenerateMapFile': 'true', - 'MapExports': 'true', - }, - }, - 'sources': ['mapfile.cc'], - }, - { - 'target_name': 'test_mapfile_generate_filename', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'GenerateMapFile': 'true', - 'MapFileName': '<(PRODUCT_DIR)/custom_file_name.map', - }, - }, - 'sources': ['mapfile.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/no-default-libs.cc b/tools/gyp/test/win/linker-flags/no-default-libs.cc deleted file mode 100644 index e306846987d378e73ee7e30b7a2fb26691811185..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/no-default-libs.cc +++ /dev/null @@ -1,18 +0,0 @@ -// 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. - -// Reference something in kernel32.dll. This will fail to link, verifying that -// GYP provides no default import library configuration. -// Note that we don't include Windows.h, as that will result in generating -// linker directives in the object file through #pragma comment(lib, ...). -typedef short BOOL; - -extern "C" __declspec(dllimport) -BOOL CopyFileW(const wchar_t*, const wchar_t*, BOOL); - - -int main() { - CopyFileW(0, 0, 0); // kernel32 - return 0; -} diff --git a/tools/gyp/test/win/linker-flags/no-default-libs.gyp b/tools/gyp/test/win/linker-flags/no-default-libs.gyp deleted file mode 100644 index 77838ce8c4c617ace0da1a9c2ca16946c071d132..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/no-default-libs.gyp +++ /dev/null @@ -1,13 +0,0 @@ -# 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': 'test_default', - 'type': 'executable', - 'sources': ['no-default-libs.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/nodefaultlib.cc b/tools/gyp/test/win/linker-flags/nodefaultlib.cc deleted file mode 100644 index 24b6eca438fe8a755983105ee67779e189978942..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/nodefaultlib.cc +++ /dev/null @@ -1,13 +0,0 @@ -// 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. - -// Include entry point function that's excluded by removing C runtime libraries. -extern "C" void mainCRTStartup() { -} - -// Still needed because the linker checks for existence of one of main, wmain, -// WinMain, or wMain to offer informative diagnositics. -int main() { - return 0; -} diff --git a/tools/gyp/test/win/linker-flags/nodefaultlib.gyp b/tools/gyp/test/win/linker-flags/nodefaultlib.gyp deleted file mode 100644 index 4fb452a18bcafb8cb6e52a9968e590354337b3cf..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/nodefaultlib.gyp +++ /dev/null @@ -1,30 +0,0 @@ -# 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': 'test_ok', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'IgnoreDefaultLibraryNames': - ['libcmtd.lib', 'libcmt.lib', 'msvcrt.lib', 'msvcrtd.lib'], - } - }, - 'sources': ['nodefaultlib.cc'], - }, - { - 'target_name': 'test_fail', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'IgnoreDefaultLibraryNames': - ['libcmtd.lib', 'libcmt.lib', 'msvcrt.lib', 'msvcrtd.lib'], - } - }, - 'sources': ['hello.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/nxcompat.gyp b/tools/gyp/test/win/linker-flags/nxcompat.gyp deleted file mode 100644 index fa4118cbd73ebc39f17014007db55d70a8e9ccc2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/nxcompat.gyp +++ /dev/null @@ -1,35 +0,0 @@ -# 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': 'test_nxcompat_default', - 'type': 'executable', - 'msvs_settings': { - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_nxcompat_no', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'DataExecutionPrevention': '1', - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_nxcompat_yes', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'DataExecutionPrevention': '2', - }, - }, - 'sources': ['hello.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/opt-icf.cc b/tools/gyp/test/win/linker-flags/opt-icf.cc deleted file mode 100644 index 1f12156b7fc37ced85c1f59cf48f8ab92c242e6a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/opt-icf.cc +++ /dev/null @@ -1,29 +0,0 @@ -// 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. - -void similar_function0(char* x) { - while (*x) { - ++x; - } -} - -void similar_function1(char* p) { - while (*p) { - ++p; - } -} - -void similar_function2(char* q) { - while (*q) { - ++q; - } -} - -int main() { - char* x = "hello"; - similar_function0(x); - similar_function1(x); - similar_function2(x); - return 0; -} diff --git a/tools/gyp/test/win/linker-flags/opt-icf.gyp b/tools/gyp/test/win/linker-flags/opt-icf.gyp deleted file mode 100644 index effe8021c34273ee5dc21facbebf26bcfbcfc0b4..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/opt-icf.gyp +++ /dev/null @@ -1,63 +0,0 @@ -# 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': [ - # Have to turn on function level linking here to get the function packaged - # as a COMDAT so that it's eligible for merging. Also turn on debug - # information so that the symbol names for the code appear in the dump. - # Finally, specify non-incremental linking so that there's not a bunch of - # extra "similar_function"s in the output (the ILT jump table). - { - 'target_name': 'test_opticf_default', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'EnableFunctionLevelLinking': 'true', - 'DebugInformationFormat': '3', - 'Optimization': '0', - }, - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - 'LinkIncremental': '1', - }, - }, - 'sources': ['opt-icf.cc'], - }, - { - 'target_name': 'test_opticf_no', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'EnableFunctionLevelLinking': 'true', - 'DebugInformationFormat': '3', - 'Optimization': '0', - }, - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - 'EnableCOMDATFolding': '1', - 'LinkIncremental': '1', - }, - }, - 'sources': ['opt-icf.cc'], - }, - { - 'target_name': 'test_opticf_yes', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'EnableFunctionLevelLinking': 'true', - 'DebugInformationFormat': '3', - 'Optimization': '0', - }, - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - 'EnableCOMDATFolding': '2', - 'LinkIncremental': '1', - }, - }, - 'sources': ['opt-icf.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/opt-ref.cc b/tools/gyp/test/win/linker-flags/opt-ref.cc deleted file mode 100644 index afaa328a5d571a67510bcad39f1ea445b1d6c9e4..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/opt-ref.cc +++ /dev/null @@ -1,11 +0,0 @@ -// 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. - -int unused_function() { - return 0; -} - -int main() { - return 0; -} diff --git a/tools/gyp/test/win/linker-flags/opt-ref.gyp b/tools/gyp/test/win/linker-flags/opt-ref.gyp deleted file mode 100644 index 69d0281a08d2e2773de460b10c0279a1aa31c81f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/opt-ref.gyp +++ /dev/null @@ -1,56 +0,0 @@ -# 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': [ - # Have to turn on function level linking here to get the function packaged - # as a COMDAT so that it's eligible for optimizing away. Also turn on - # debug information so that the symbol names for the code appear in the - # dump (so we can verify if they are included in the final exe). - { - 'target_name': 'test_optref_default', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'EnableFunctionLevelLinking': 'true', - 'DebugInformationFormat': '3', - }, - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - }, - }, - 'sources': ['opt-ref.cc'], - }, - { - 'target_name': 'test_optref_no', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'EnableFunctionLevelLinking': 'true', - 'DebugInformationFormat': '3', - }, - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - 'OptimizeReferences': '1', - }, - }, - 'sources': ['opt-ref.cc'], - }, - { - 'target_name': 'test_optref_yes', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'EnableFunctionLevelLinking': 'true', - 'DebugInformationFormat': '3', - }, - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - 'OptimizeReferences': '2', - }, - }, - 'sources': ['opt-ref.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/outputfile.gyp b/tools/gyp/test/win/linker-flags/outputfile.gyp deleted file mode 100644 index 1022ec2e20aabaa44dcdef83c8d22406d7c645e7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/outputfile.gyp +++ /dev/null @@ -1,58 +0,0 @@ -# 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': 'test_output_exe', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'OutputFile': '$(OutDir)\\blorp.exe' - }, - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_output_exe2', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'OutputFile': '$(OutDir)\\subdir\\blorp.exe' - }, - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_output_dll', - 'type': 'shared_library', - 'msvs_settings': { - 'VCLinkerTool': { - 'OutputFile': '$(OutDir)\\blorp.dll' - }, - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_output_lib', - 'type': 'static_library', - 'msvs_settings': { - 'VCLibrarianTool': { - 'OutputFile': '$(OutDir)\\blorp.lib' - }, - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_output_lib2', - 'type': 'static_library', - 'msvs_settings': { - 'VCLibrarianTool': { - 'OutputFile': '$(OutDir)\\subdir\\blorp.lib' - }, - }, - 'sources': ['hello.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/pdb-output.gyp b/tools/gyp/test/win/linker-flags/pdb-output.gyp deleted file mode 100644 index 1a03c67cc01c61f963e11904aa9b02e7699b0129..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/pdb-output.gyp +++ /dev/null @@ -1,49 +0,0 @@ -# Copyright (c) 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': 'test_pdb_output_exe', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCCLCompilerTool': { - 'DebugInformationFormat': '3' - }, - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - 'ProgramDatabaseFile': 'output_exe.pdb', - }, - }, - }, - { - 'target_name': 'test_pdb_output_dll', - 'type': 'shared_library', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCCLCompilerTool': { - 'DebugInformationFormat': '3' - }, - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - 'ProgramDatabaseFile': 'output_dll.pdb', - }, - }, - }, - { - 'target_name': 'test_pdb_output_disabled', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCCLCompilerTool': { - 'DebugInformationFormat': '0' - }, - 'VCLinkerTool': { - 'GenerateDebugInformation': 'false', - }, - }, - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/pgo.gyp b/tools/gyp/test/win/linker-flags/pgo.gyp deleted file mode 100644 index 9c5d47688393061d44fd4a754d152cd557798c23..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/pgo.gyp +++ /dev/null @@ -1,143 +0,0 @@ -# Copyright (c) 2013 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. - -{ - 'variables': { - 'pgd_basename': 'test_pgo', - }, - 'targets': [ - # In the PGO (Profile-Guided Optimization) build flow, we need to build the - # target binary multiple times. To implement this flow with gyp, here we - # define multiple 'executable' targets, each of which represents one build - # particular build/profile stage. On tricky part to do this is that these - # 'executable' targets should share the code itself so that profile data - # can be reused among these 'executable' files. In other words, the only - # differences among below 'executable' targets are: - # 1) PGO (Profile-Guided Optimization) database, and - # 2) linker options. - # The following static library contains all the logic including entry point. - # Basically we don't need to rebuild this target once we enter profiling - # phase of PGO. - { - 'target_name': 'test_pgo_main', - 'type': 'static_library', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WholeProgramOptimization': 'true', # /GL - }, - 'VCLibrarianTool': { - 'LinkTimeCodeGeneration': 'true', - }, - }, - 'link_settings': { - 'msvs_settings': { - 'VCLinkerTool': { - 'ProfileGuidedDatabase': '$(OutDir)\\<(pgd_basename).pgd', - 'TargetMachine': '1', # x86 - 32 - 'SubSystem': '1', # /SUBSYSTEM:CONSOLE - # Tell ninja generator not to pass /ManifestFile: option - # to the linker, because it causes LNK1268 error in PGO biuld. - 'GenerateManifest': 'false', - # We need to specify 'libcmt.lib' here so that the linker can pick - # up a valid entry point. - 'AdditionalDependencies': [ - 'libcmt.lib', - ], - }, - }, - }, - 'sources': [ - 'inline_test.h', - 'inline_test.cc', - 'inline_test_main.cc', - ], - }, - { - 'target_name': 'test_pgo_instrument', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'LinkTimeCodeGeneration': '2', - }, - }, - 'dependencies': [ - 'test_pgo_main', - ], - }, - { - 'target_name': 'gen_profile_guided_database', - 'type': 'none', - 'msvs_cygwin_shell': 0, - 'actions': [ - { - 'action_name': 'action_main', - 'inputs': [], - 'outputs': [ - '$(OutDir)\\<(pgd_basename).pgd', - ], - 'action': [ - 'python', 'update_pgd.py', - '--vcbindir', '$(VCInstallDir)bin', - '--exe', '$(OutDir)\\test_pgo_instrument.exe', - '--pgd', '$(OutDir)\\<(pgd_basename).pgd', - ], - }, - ], - 'dependencies': [ - 'test_pgo_instrument', - ], - }, - { - 'target_name': 'test_pgo_optimize', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'LinkTimeCodeGeneration': '3', - }, - }, - 'sources': [ - '$(OutDir)\\<(pgd_basename).pgd', - ], - 'dependencies': [ - 'test_pgo_main', - 'gen_profile_guided_database', - ], - }, - { - 'target_name': 'test_pgo_update', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'LinkTimeCodeGeneration': '4', - }, - }, - 'sources': [ - '$(OutDir)\\<(pgd_basename).pgd', - ], - 'dependencies': [ - 'test_pgo_main', - ], - }, - # A helper target to dump link.exe's command line options. We can use the - # output to determine if PGO (Profile-Guided Optimization) is available on - # the test environment. - { - 'target_name': 'gen_linker_option', - 'type': 'none', - 'msvs_cygwin_shell': 0, - 'actions': [ - { - 'action_name': 'action_main', - 'inputs': [], - 'outputs': [ - '$(OutDir)\\linker_options.txt', - ], - 'action': [ - 'cmd.exe', '/c link.exe > $(OutDir)\\linker_options.txt & exit 0', - ], - }, - ], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/profile.gyp b/tools/gyp/test/win/linker-flags/profile.gyp deleted file mode 100644 index d60a700fbbf2933cac8c294bcf708258d70093d4..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/profile.gyp +++ /dev/null @@ -1,50 +0,0 @@ -# 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': [ - # Verify that 'Profile' option correctly makes it to LINK steup in Ninja - { - 'target_name': 'test_profile_true', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCCLCompilerTool': { - 'DebugInformationFormat': '3' - }, - 'VCLinkerTool': { - 'Profile': 'true', - 'GenerateDebugInformation': 'true', - }, - }, - }, - { - 'target_name': 'test_profile_false', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCCLCompilerTool': { - 'DebugInformationFormat': '3' - }, - 'VCLinkerTool': { - 'Profile': 'false', - 'GenerateDebugInformation': 'true', - }, - }, - }, - { - 'target_name': 'test_profile_default', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCCLCompilerTool': { - 'DebugInformationFormat': '3' - }, - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - }, - }, - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/program-database.gyp b/tools/gyp/test/win/linker-flags/program-database.gyp deleted file mode 100644 index 6e60ac0dc998486af4121a2a939d87fa2fa261c5..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/program-database.gyp +++ /dev/null @@ -1,40 +0,0 @@ -# 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': [ - # Verify that 'ProgramDatabaseFile' option correctly makes it to LINK - # step in Ninja. - { - # Verify that VC macros and windows paths work correctly. - 'target_name': 'test_pdb_outdir', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCCLCompilerTool': { - 'DebugInformationFormat': '3' - }, - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - 'ProgramDatabaseFile': '$(OutDir)\\name_outdir.pdb', - }, - }, - }, - { - # Verify that GYP macros and POSIX paths work correctly. - 'target_name': 'test_pdb_proddir', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCCLCompilerTool': { - 'DebugInformationFormat': '3' - }, - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - 'ProgramDatabaseFile': '<(PRODUCT_DIR)/name_proddir.pdb', - }, - }, - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/safeseh.gyp b/tools/gyp/test/win/linker-flags/safeseh.gyp deleted file mode 100644 index d4a62074b8f94c1fa33c7ffc95a2db78603f9d2f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/safeseh.gyp +++ /dev/null @@ -1,79 +0,0 @@ -# Copyright (c) 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. - -{ - 'target_defaults': { - 'configurations': { - 'Default': { - 'msvs_configuration_platform': 'Win32', - }, - 'Default_x64': { - 'inherit_from': ['Default'], - 'msvs_configuration_platform': 'x64', - }, - }, - }, - 'targets': [ - { - 'target_name': 'test_safeseh_default', - 'type': 'executable', - 'msvs_settings': { - # By default, msvs passes /SAFESEH for Link, but not for MASM. In - # order for test_safeseh_default to link successfully, we need to - # explicitly specify /SAFESEH for MASM. - 'MASM': { - 'UseSafeExceptionHandlers': 'true', - }, - }, - 'sources': [ - 'safeseh_hello.cc', - 'safeseh_zero.asm', - ], - }, - { - 'target_name': 'test_safeseh_no', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'ImageHasSafeExceptionHandlers': 'false', - }, - }, - 'sources': [ - 'safeseh_hello.cc', - 'safeseh_zero.asm', - ], - }, - { - 'target_name': 'test_safeseh_yes', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'ImageHasSafeExceptionHandlers': 'true', - }, - 'MASM': { - 'UseSafeExceptionHandlers': 'true', - }, - }, - 'sources': [ - 'safeseh_hello.cc', - 'safeseh_zero.asm', - ], - }, - { - # x64 targets cannot have ImageHasSafeExceptionHandlers or - # UseSafeExceptionHandlers set. - 'target_name': 'test_safeseh_x64', - 'type': 'executable', - 'configurations': { - 'Default': { - 'msvs_target_platform': 'x64', - }, - }, - 'sources': [ - 'safeseh_hello.cc', - 'safeseh_zero64.asm', - ], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/safeseh_hello.cc b/tools/gyp/test/win/linker-flags/safeseh_hello.cc deleted file mode 100644 index 6141300d2c0a517a8f79075619d089be0ddbf2ea..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/safeseh_hello.cc +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) 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. - -extern "C" { -int zero(void); -} - -int main() { - return zero(); -} diff --git a/tools/gyp/test/win/linker-flags/safeseh_zero.asm b/tools/gyp/test/win/linker-flags/safeseh_zero.asm deleted file mode 100644 index 62da0df4f3359d2465dca2370c13fc98ecf07b63..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/safeseh_zero.asm +++ /dev/null @@ -1,10 +0,0 @@ -.MODEL FLAT, C -.CODE - -PUBLIC zero -zero PROC - xor eax, eax - ret 0 -zero ENDP - -END diff --git a/tools/gyp/test/win/linker-flags/safeseh_zero64.asm b/tools/gyp/test/win/linker-flags/safeseh_zero64.asm deleted file mode 100644 index a4740c0dfb5abd25129b92df78bc5521eae5fbd5..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/safeseh_zero64.asm +++ /dev/null @@ -1,9 +0,0 @@ -.CODE - -PUBLIC zero -zero PROC - xor eax, eax - ret 0 -zero ENDP - -END diff --git a/tools/gyp/test/win/linker-flags/subdir/library.gyp b/tools/gyp/test/win/linker-flags/subdir/library.gyp deleted file mode 100644 index 9b4bd1d63178e4f8c826dc7fa752d71a6a2576d2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/subdir/library.gyp +++ /dev/null @@ -1,13 +0,0 @@ -# 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': 'test_lib', - 'type': 'static_library', - 'sources': ['../library-directories-define.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/subsystem-windows.cc b/tools/gyp/test/win/linker-flags/subsystem-windows.cc deleted file mode 100644 index ac99da808ebd7fdd49907e6131f5a00a5f13ce52..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/subsystem-windows.cc +++ /dev/null @@ -1,9 +0,0 @@ -// 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. - -#include - -int CALLBACK WinMain(HINSTANCE, HINSTANCE, LPSTR, int) { - return 0; -} diff --git a/tools/gyp/test/win/linker-flags/subsystem.gyp b/tools/gyp/test/win/linker-flags/subsystem.gyp deleted file mode 100644 index 63f072a20676287d176465252e8e68a882484140..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/subsystem.gyp +++ /dev/null @@ -1,70 +0,0 @@ -# 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': 'test_console_ok', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'SubSystem': '1' - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_console_fail', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'SubSystem': '1' - } - }, - 'sources': ['subsystem-windows.cc'], - }, - { - 'target_name': 'test_windows_ok', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'SubSystem': '2' - } - }, - 'sources': ['subsystem-windows.cc'], - }, - { - 'target_name': 'test_windows_fail', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'SubSystem': '2' - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_console_xp', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'SubSystem': '1', - 'MinimumRequiredVersion': '5.01', # XP. - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_windows_xp', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'SubSystem': '2', - 'MinimumRequiredVersion': '5.01', # XP. - } - }, - 'sources': ['subsystem-windows.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/target-machine.gyp b/tools/gyp/test/win/linker-flags/target-machine.gyp deleted file mode 100644 index 30271926c9f2262066344a5f4ec5bc91f4b6c282..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/target-machine.gyp +++ /dev/null @@ -1,48 +0,0 @@ -# Copyright (c) 2013 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': 'test_target_link_x86', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'TargetMachine': '1', - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_target_link_x64', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'TargetMachine': '17', - }, - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_target_lib_x86', - 'type': 'static_library', - 'msvs_settings': { - 'VCLibrarianTool': { - 'TargetMachine': '1', - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_target_lib_x64', - 'type': 'static_library', - 'msvs_settings': { - 'VCLibrarianTool': { - 'TargetMachine': '17', - }, - }, - 'sources': ['hello.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/tsaware.gyp b/tools/gyp/test/win/linker-flags/tsaware.gyp deleted file mode 100644 index 7ffc7426bbfef813a333f63d69e7cc9f90123361..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/tsaware.gyp +++ /dev/null @@ -1,28 +0,0 @@ -# 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': 'test_tsaware_no', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'TerminalServerAware': '1', - } - }, - 'sources': ['hello.cc'], - }, - { - 'target_name': 'test_tsaware_yes', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'TerminalServerAware': '2', - }, - }, - 'sources': ['hello.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/unsupported-manifest.gyp b/tools/gyp/test/win/linker-flags/unsupported-manifest.gyp deleted file mode 100644 index 5549e7cb9bd6f887a62efbefc8d700ce0292e679..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/unsupported-manifest.gyp +++ /dev/null @@ -1,13 +0,0 @@ -# Copyright (c) 2013 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': 'test_unsupported', - 'type': 'executable', - 'sources': ['manifest-in-comment.cc'], - }, - ], -} diff --git a/tools/gyp/test/win/linker-flags/update_pgd.py b/tools/gyp/test/win/linker-flags/update_pgd.py deleted file mode 100644 index 176e9e5472f0cd131474f8fa56d90375d03aa53c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/update_pgd.py +++ /dev/null @@ -1,35 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 2013 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. - -from optparse import OptionParser -import glob -import os -import subprocess - -parser = OptionParser() -parser.add_option('--exe', dest='exe') -parser.add_option('--vcbindir', dest='vcbindir') -parser.add_option('--pgd', dest='pgd') -(options, args) = parser.parse_args() - -# Instrumented binaries fail to run unless the Visual C++'s bin dir is included -# in the PATH environment variable. -os.environ['PATH'] = os.environ['PATH'] + os.pathsep + options.vcbindir - -# Run Instrumented binary. The profile will be recorded into *.pgc file. -subprocess.call([options.exe]) - -# Merge *.pgc files into a *.pgd (Profile-Guided Database) file. -subprocess.call(['pgomgr', '/merge', options.pgd]) - -# *.pgc files are no longer necessary. Clear all of them. -pgd_file = os.path.abspath(options.pgd) -pgd_dir = os.path.dirname(pgd_file) -(pgd_basename, _) = os.path.splitext(os.path.basename(pgd_file)) -pgc_filepattern = os.path.join(pgd_dir, '%s!*.pgc' % pgd_basename) -pgc_files= glob.glob(pgc_filepattern) -for pgc_file in pgc_files: - os.unlink(pgc_file) diff --git a/tools/gyp/test/win/linker-flags/warn-as-error.gyp b/tools/gyp/test/win/linker-flags/warn-as-error.gyp deleted file mode 100644 index 600eb0c353fa0944d2ed0ac0f1b239bb5c6ff605..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/warn-as-error.gyp +++ /dev/null @@ -1,33 +0,0 @@ -# Copyright (c) 2013 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': 'test_on', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'TreatLinkerWarningAsErrors': 'true', - } - }, - 'sources': ['link-warning.cc'], - }, - { - 'target_name': 'test_off', - 'type': 'executable', - 'msvs_settings': { - 'VCLinkerTool': { - 'TreatLinkerWarningAsErrors': 'false', - } - }, - 'sources': ['link-warning.cc'], - }, - { - 'target_name': 'test_default', - 'type': 'executable', - 'sources': ['link-warning.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/linker-flags/x.cc b/tools/gyp/test/win/linker-flags/x.cc deleted file mode 100644 index f5f763b0956348e03bb20ea79ffa2462b6ea6aa1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/x.cc +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2013 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. - -int x() { - return 1; -} diff --git a/tools/gyp/test/win/linker-flags/y.cc b/tools/gyp/test/win/linker-flags/y.cc deleted file mode 100644 index bd884119fcd44ab7f0c2b78f52ae5c62517f7a66..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/y.cc +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2013 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. - -int y() { - return 2; -} diff --git a/tools/gyp/test/win/linker-flags/z.cc b/tools/gyp/test/win/linker-flags/z.cc deleted file mode 100644 index 8a43501270ae8aa85be0fa9a20c9e36a0b93eb93..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/linker-flags/z.cc +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2013 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. - -int z() { - return 3; -} diff --git a/tools/gyp/test/win/long-command-line/function.cc b/tools/gyp/test/win/long-command-line/function.cc deleted file mode 100644 index af44b2cabd6bb8a213e60091e98aaa47985f8705..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/long-command-line/function.cc +++ /dev/null @@ -1,7 +0,0 @@ -// 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. - -int func() { - return 0; -} diff --git a/tools/gyp/test/win/long-command-line/hello.cc b/tools/gyp/test/win/long-command-line/hello.cc deleted file mode 100644 index 1711567ef566703fcd9c33e0a236b1b30454df6a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/long-command-line/hello.cc +++ /dev/null @@ -1,7 +0,0 @@ -// 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. - -int main() { - return 0; -} diff --git a/tools/gyp/test/win/long-command-line/long-command-line.gyp b/tools/gyp/test/win/long-command-line/long-command-line.gyp deleted file mode 100644 index 964c94fa946844a729d2144c5525d075b4e7fd6d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/long-command-line/long-command-line.gyp +++ /dev/null @@ -1,54 +0,0 @@ -# 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': 'longexe', - 'type': 'executable', - 'msvs_settings': { - # Use this as a simple way to get a long command. - 'VCCLCompilerTool': { - 'AdditionalOptions': '/nologo ' * 8000, - }, - 'VCLinkerTool': { - 'AdditionalOptions': '/nologo ' * 8000, - }, - }, - 'sources': [ - 'hello.cc', - ], - }, - { - 'target_name': 'longlib', - 'type': 'static_library', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'AdditionalOptions': '/nologo ' * 8000, - }, - 'VCLibrarianTool': { - 'AdditionalOptions': '/nologo ' * 8000, - }, - }, - 'sources': [ - 'function.cc', - ], - }, - { - 'target_name': 'longdll', - 'type': 'shared_library', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'AdditionalOptions': '/nologo ' * 8000, - }, - 'VCLinkerTool': { - 'AdditionalOptions': '/nologo ' * 8000, - }, - }, - 'sources': [ - 'hello.cc', - ], - }, - ] -} diff --git a/tools/gyp/test/win/ml-safeseh/a.asm b/tools/gyp/test/win/ml-safeseh/a.asm deleted file mode 100644 index 62da0df4f3359d2465dca2370c13fc98ecf07b63..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/ml-safeseh/a.asm +++ /dev/null @@ -1,10 +0,0 @@ -.MODEL FLAT, C -.CODE - -PUBLIC zero -zero PROC - xor eax, eax - ret 0 -zero ENDP - -END diff --git a/tools/gyp/test/win/ml-safeseh/hello.cc b/tools/gyp/test/win/ml-safeseh/hello.cc deleted file mode 100644 index 6141300d2c0a517a8f79075619d089be0ddbf2ea..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/ml-safeseh/hello.cc +++ /dev/null @@ -1,11 +0,0 @@ -// Copyright (c) 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. - -extern "C" { -int zero(void); -} - -int main() { - return zero(); -} diff --git a/tools/gyp/test/win/ml-safeseh/ml-safeseh.gyp b/tools/gyp/test/win/ml-safeseh/ml-safeseh.gyp deleted file mode 100644 index bf8618f865623d408b4300ce7dec70cfef6d4348..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/ml-safeseh/ml-safeseh.gyp +++ /dev/null @@ -1,24 +0,0 @@ -# Copyright (c) 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': 'ml_safeseh', - 'type': 'executable', - 'sources': [ - 'hello.cc', - 'a.asm', - ], - 'msvs_settings': { - 'VCLinkerTool': { - 'ImageHasSafeExceptionHandlers': 'true', - }, - 'MASM': { - 'UseSafeExceptionHandlers': 'true', - }, - }, - }, - ] -} diff --git a/tools/gyp/test/win/precompiled/gyptest-all.py b/tools/gyp/test/win/precompiled/gyptest-all.py deleted file mode 100644 index 9fb5e62edf464de38588922eca38470187f52bb5..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/precompiled/gyptest-all.py +++ /dev/null @@ -1,21 +0,0 @@ -#!/usr/bin/env python - -# 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. - -""" -Verifies that precompiled headers can be specified. -""" - -import TestGyp - -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['msvs', 'ninja'], workdir='workarea_all') - test.run_gyp('hello.gyp') - test.build('hello.gyp', 'hello') - test.run_built_executable('hello', stdout="Hello, world!\nHello, two!\n") - test.up_to_date('hello.gyp', test.ALL) - test.pass_test() diff --git a/tools/gyp/test/win/precompiled/hello.c b/tools/gyp/test/win/precompiled/hello.c deleted file mode 100644 index ffb47bf822198467ec691b4763cfc455f0d6c562..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/precompiled/hello.c +++ /dev/null @@ -1,14 +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. */ - -// Note the abscence of a stdio.h include. This will be inserted because of the -// precompiled header. - -extern int hello2(); - -int main(void) { - printf("Hello, world!\n"); - hello2(); - return 0; -} diff --git a/tools/gyp/test/win/precompiled/hello.gyp b/tools/gyp/test/win/precompiled/hello.gyp deleted file mode 100644 index 5f82c535939eacf0f07b2f13029f54eb333fd962..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/precompiled/hello.gyp +++ /dev/null @@ -1,28 +0,0 @@ -# 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': 'hello', - 'type': 'executable', - 'sources': [ - 'hello.c', - 'hello2.c', - 'precomp.c', - ], - 'msvs_precompiled_header': 'stdio.h', - 'msvs_precompiled_source': 'precomp.c', - - # Required so that the printf actually causes a build failure - # if the pch isn't included. - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WarningLevel': '3', - 'WarnAsError': 'true', - }, - }, - }, - ], -} diff --git a/tools/gyp/test/win/precompiled/hello2.c b/tools/gyp/test/win/precompiled/hello2.c deleted file mode 100644 index d6d53111fb80d5163769ba7a612ee25806ba90ba..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/precompiled/hello2.c +++ /dev/null @@ -1,13 +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. */ - -// Unlike hello.c, this file specifies the headers. - -#include -#include - -int hello2() { - printf("Hello, two!\n"); - return 0; -} diff --git a/tools/gyp/test/win/precompiled/precomp.c b/tools/gyp/test/win/precompiled/precomp.c deleted file mode 100644 index 517c61a36ba476e5a091880ffcd885f5004aecde..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/precompiled/precomp.c +++ /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. */ - -// The precompiled header does not have to be the first one in the file. - -#include -#include diff --git a/tools/gyp/test/win/rc-build/Resource.h b/tools/gyp/test/win/rc-build/Resource.h deleted file mode 100644 index 2f50df91a7516227f447099557d41eec5f46e798..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/rc-build/Resource.h +++ /dev/null @@ -1,26 +0,0 @@ -//{{NO_DEPENDENCIES}} -// Microsoft Visual C++ generated include file. -// Used by hello.rc -// - -#define IDS_APP_TITLE 103 - -#define IDR_MAINFRAME 128 -#define IDI_HELLO 107 -#define IDI_SMALL 108 -#define IDC_HELLO 109 -#ifndef IDC_STATIC -#define IDC_STATIC -1 -#endif -// Next default values for new objects -// -#ifdef APSTUDIO_INVOKED -#ifndef APSTUDIO_READONLY_SYMBOLS - -#define _APS_NO_MFC 130 -#define _APS_NEXT_RESOURCE_VALUE 129 -#define _APS_NEXT_COMMAND_VALUE 32771 -#define _APS_NEXT_CONTROL_VALUE 1000 -#define _APS_NEXT_SYMED_VALUE 110 -#endif -#endif diff --git a/tools/gyp/test/win/rc-build/hello.cpp b/tools/gyp/test/win/rc-build/hello.cpp deleted file mode 100644 index 866078ee896d4e4840615a062a280754a3bd416b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/rc-build/hello.cpp +++ /dev/null @@ -1,30 +0,0 @@ -// 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. - -#define WIN32_LEAN_AND_MEAN -#include -#include - -#include "resource.h" - -#define MAX_LOADSTRING 100 - -TCHAR szTitle[MAX_LOADSTRING]; -TCHAR szWindowClass[MAX_LOADSTRING]; - -int APIENTRY _tWinMain( - HINSTANCE hInstance, - HINSTANCE hPrevInstance, - LPTSTR lpCmdLine, - int nCmdShow) { - // Make sure we can load some resources. - int count = 0; - LoadString(hInstance, IDS_APP_TITLE, szTitle, MAX_LOADSTRING); - if (szTitle[0] != 0) ++count; - LoadString(hInstance, IDC_HELLO, szWindowClass, MAX_LOADSTRING); - if (szWindowClass[0] != 0) ++count; - if (LoadIcon(hInstance, MAKEINTRESOURCE(IDI_SMALL)) != NULL) ++count; - if (LoadIcon(hInstance, MAKEINTRESOURCE(IDI_HELLO)) != NULL) ++count; - return count; -} diff --git a/tools/gyp/test/win/rc-build/hello.gyp b/tools/gyp/test/win/rc-build/hello.gyp deleted file mode 100644 index 3a66357dd4a73aadb68d3fa6ed58b2fe6077f3b7..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/rc-build/hello.gyp +++ /dev/null @@ -1,92 +0,0 @@ -# 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': 'with_resources', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'DebugInformationFormat': '3', - }, - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - }, - 'VCResourceCompilerTool': { - 'Culture' : '1033', - }, - }, - 'sources': [ - 'hello.cpp', - 'hello.rc', - ], - 'libraries': [ - 'kernel32.lib', - 'user32.lib', - ], - }, - { - 'target_name': 'with_resources_subdir', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'DebugInformationFormat': '3', - }, - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - }, - 'VCResourceCompilerTool': { - 'Culture' : '1033', - }, - }, - 'sources': [ - 'hello.cpp', - 'subdir/hello2.rc', - ], - 'libraries': [ - 'kernel32.lib', - 'user32.lib', - ], - }, - { - 'target_name': 'with_include_subdir', - 'type': 'executable', - 'msvs_settings': { - 'VCCLCompilerTool': { - 'DebugInformationFormat': '3', - }, - 'VCLinkerTool': { - 'GenerateDebugInformation': 'true', - }, - 'VCResourceCompilerTool': { - 'Culture' : '1033', - }, - }, - 'resource_include_dirs': [ - '$(ProjectDir)\\subdir', - ], - 'sources': [ - 'hello.cpp', - 'hello3.rc', - ], - 'libraries': [ - 'kernel32.lib', - 'user32.lib', - ], - }, - { - 'target_name': 'resource_only_dll', - 'type': 'shared_library', - 'msvs_settings': { - 'VCLinkerTool': { - 'ResourceOnlyDLL': 'true', - }, - }, - 'sources': [ - 'hello.rc', - ], - }, - ], -} diff --git a/tools/gyp/test/win/rc-build/hello.h b/tools/gyp/test/win/rc-build/hello.h deleted file mode 100644 index d00d47e78850873d403acbd67a88b7c9b44b7cb1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/rc-build/hello.h +++ /dev/null @@ -1,3 +0,0 @@ -#pragma once - -#include "resource.h" diff --git a/tools/gyp/test/win/rc-build/hello.ico b/tools/gyp/test/win/rc-build/hello.ico deleted file mode 100644 index d551aa3aaf80adf9b7760e2eb8de95a5c3e53df6..0000000000000000000000000000000000000000 Binary files a/tools/gyp/test/win/rc-build/hello.ico and /dev/null differ diff --git a/tools/gyp/test/win/rc-build/hello.rc b/tools/gyp/test/win/rc-build/hello.rc deleted file mode 100644 index 42826485f70c69034df7e3c4c077d8b3015dca43..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/rc-build/hello.rc +++ /dev/null @@ -1,86 +0,0 @@ -//Microsoft Visual C++ generated resource script. -// -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#ifndef APSTUDIO_INVOKED -#include "targetver.h" -#endif -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -LANGUAGE 9, 1 -#pragma code_page(932) - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. - -IDI_HELLO ICON "hello.ico" -IDI_SMALL ICON "small.ico" - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#ifndef APSTUDIO_INVOKED\r\n" - "#include ""targetver.h""\r\n" - "#endif\r\n" - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE -BEGIN - IDC_HELLO "HELLO" - IDS_APP_TITLE "hello" -END - -#endif -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED diff --git a/tools/gyp/test/win/rc-build/hello3.rc b/tools/gyp/test/win/rc-build/hello3.rc deleted file mode 100644 index 0bfa05a764a4730df7a9ca9495df304042bc7d21..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/rc-build/hello3.rc +++ /dev/null @@ -1,87 +0,0 @@ -//Microsoft Visual C++ generated resource script. -// -#include "include.h" -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#ifndef APSTUDIO_INVOKED -#include "targetver.h" -#endif -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -LANGUAGE 9, 1 -#pragma code_page(932) - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. - -IDI_HELLO ICON "hello.ico" -IDI_SMALL ICON "small.ico" - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#ifndef APSTUDIO_INVOKED\r\n" - "#include ""targetver.h""\r\n" - "#endif\r\n" - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE -BEGIN - IDC_HELLO "HELLO" - IDS_APP_TITLE "hello" -END - -#endif -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED diff --git a/tools/gyp/test/win/rc-build/small.ico b/tools/gyp/test/win/rc-build/small.ico deleted file mode 100644 index d551aa3aaf80adf9b7760e2eb8de95a5c3e53df6..0000000000000000000000000000000000000000 Binary files a/tools/gyp/test/win/rc-build/small.ico and /dev/null differ diff --git a/tools/gyp/test/win/rc-build/subdir/hello2.rc b/tools/gyp/test/win/rc-build/subdir/hello2.rc deleted file mode 100644 index 3725ccc367da4a9df00d87a9abf0da2fb5087d2c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/rc-build/subdir/hello2.rc +++ /dev/null @@ -1,87 +0,0 @@ -//Microsoft Visual C++ generated resource script. -// -#include "subdir/include.h" -#include "resource.h" - -#define APSTUDIO_READONLY_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 2 resource. -// -#ifndef APSTUDIO_INVOKED -#include "targetver.h" -#endif -#define APSTUDIO_HIDDEN_SYMBOLS -#include "windows.h" -#undef APSTUDIO_HIDDEN_SYMBOLS -///////////////////////////////////////////////////////////////////////////// -#undef APSTUDIO_READONLY_SYMBOLS - -#if !defined(AFX_RESOURCE_DLL) || defined(AFX_TARG_ENU) -LANGUAGE 9, 1 -#pragma code_page(932) - -///////////////////////////////////////////////////////////////////////////// -// -// Icon -// - -// Icon with lowest ID value placed first to ensure application icon -// remains consistent on all systems. - -IDI_HELLO ICON "hello.ico" -IDI_SMALL ICON "small.ico" - -#ifdef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// TEXTINCLUDE -// -1 TEXTINCLUDE -BEGIN - "resource.h\0" -END - -2 TEXTINCLUDE -BEGIN - "#ifndef APSTUDIO_INVOKED\r\n" - "#include ""targetver.h""\r\n" - "#endif\r\n" - "#define APSTUDIO_HIDDEN_SYMBOLS\r\n" - "#include ""windows.h""\r\n" - "#undef APSTUDIO_HIDDEN_SYMBOLS\r\n" - "\0" -END - -3 TEXTINCLUDE -BEGIN - "\r\n" - "\0" -END - -#endif // APSTUDIO_INVOKED - -///////////////////////////////////////////////////////////////////////////// -// -// String Table -// - -STRINGTABLE -BEGIN - IDC_HELLO "HELLO" - IDS_APP_TITLE "hello" -END - -#endif -///////////////////////////////////////////////////////////////////////////// - - - -#ifndef APSTUDIO_INVOKED -///////////////////////////////////////////////////////////////////////////// -// -// Generated from the TEXTINCLUDE 3 resource. -// - -///////////////////////////////////////////////////////////////////////////// -#endif // not APSTUDIO_INVOKED diff --git a/tools/gyp/test/win/rc-build/subdir/include.h b/tools/gyp/test/win/rc-build/subdir/include.h deleted file mode 100644 index d5151f584fee4dcff77aa71d567a3e79475281c1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/rc-build/subdir/include.h +++ /dev/null @@ -1 +0,0 @@ -// Just exists to make sure it can be included. diff --git a/tools/gyp/test/win/rc-build/targetver.h b/tools/gyp/test/win/rc-build/targetver.h deleted file mode 100644 index 28ff06c94cd4d35e5f9b53f12500f2460485079b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/rc-build/targetver.h +++ /dev/null @@ -1,24 +0,0 @@ -#pragma once - -// The following macros define the minimum required platform. The minimum required platform -// is the earliest version of Windows, Internet Explorer etc. that has the necessary features to run -// your application. The macros work by enabling all features available on platform versions up to and -// including the version specified. - -// Modify the following defines if you have to target a platform prior to the ones specified below. -// Refer to MSDN for the latest info on corresponding values for different platforms. -#ifndef WINVER // Specifies that the minimum required platform is Windows Vista. -#define WINVER 0x0600 // Change this to the appropriate value to target other versions of Windows. -#endif - -#ifndef _WIN32_WINNT // Specifies that the minimum required platform is Windows Vista. -#define _WIN32_WINNT 0x0600 // Change this to the appropriate value to target other versions of Windows. -#endif - -#ifndef _WIN32_WINDOWS // Specifies that the minimum required platform is Windows 98. -#define _WIN32_WINDOWS 0x0410 // Change this to the appropriate value to target Windows Me or later. -#endif - -#ifndef _WIN32_IE // Specifies that the minimum required platform is Internet Explorer 7.0. -#define _WIN32_IE 0x0700 // Change this to the appropriate value to target other versions of IE. -#endif diff --git a/tools/gyp/test/win/shard/hello.cc b/tools/gyp/test/win/shard/hello.cc deleted file mode 100644 index a9dce624539fc21d4b3c8af14f97a00ce1ada575..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/shard/hello.cc +++ /dev/null @@ -1,7 +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. - -int main() { - return 0; -} diff --git a/tools/gyp/test/win/shard/hello1.cc b/tools/gyp/test/win/shard/hello1.cc deleted file mode 100644 index 0eccf2861d5d7ed60f24d11f1a1e48c68d074c5f..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/shard/hello1.cc +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2013 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. - -int f1() { - return 0; -} diff --git a/tools/gyp/test/win/shard/hello2.cc b/tools/gyp/test/win/shard/hello2.cc deleted file mode 100644 index 23fcb546cb04a424be1c75f5c20d5950f0501095..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/shard/hello2.cc +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2013 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. - -int f2() { - return 0; -} diff --git a/tools/gyp/test/win/shard/hello3.cc b/tools/gyp/test/win/shard/hello3.cc deleted file mode 100644 index a72e2efb5a312404a0a026216ae2371f368b7a2d..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/shard/hello3.cc +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2013 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. - -int f3() { - return 0; -} diff --git a/tools/gyp/test/win/shard/hello4.cc b/tools/gyp/test/win/shard/hello4.cc deleted file mode 100644 index a94df194999a38e80cde7e2a7205a9f6a39601cd..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/shard/hello4.cc +++ /dev/null @@ -1,7 +0,0 @@ -// Copyright (c) 2013 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. - -int f4() { - return 0; -} diff --git a/tools/gyp/test/win/shard/shard.gyp b/tools/gyp/test/win/shard/shard.gyp deleted file mode 100644 index eac45fcff770e9f4c6d146059e8b30e2eac43d0e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/shard/shard.gyp +++ /dev/null @@ -1,31 +0,0 @@ -# Copyright (c) 2013 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': 'shard', - 'type': 'static_library', - 'msvs_shard': 4, - 'sources': [ - 'hello1.cc', - 'hello2.cc', - 'hello3.cc', - 'hello4.cc', - ], - 'product_dir': '<(PRODUCT_DIR)', - }, - { - 'target_name': 'refs_to_shard', - 'type': 'executable', - 'dependencies': [ - # Make sure references are correctly updated. - 'shard', - ], - 'sources': [ - 'hello.cc', - ], - }, - ] -} diff --git a/tools/gyp/test/win/shard/shard_ref.gyp b/tools/gyp/test/win/shard/shard_ref.gyp deleted file mode 100644 index 3ec8d76f99176017cd70295bda31cb53b7dc9c70..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/shard/shard_ref.gyp +++ /dev/null @@ -1,41 +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': 'refs_to_shard_external_lib', - 'type': 'static_library', - 'dependencies': [ - # Make sure references in other files are updated correctly. - 'shard.gyp:shard', - ], - 'sources': [ - 'hello.cc', - ], - }, - { - 'target_name': 'refs_to_shard_external_exe', - 'type': 'executable', - 'dependencies': [ - # Make sure references in other files are updated correctly. - 'shard.gyp:shard', - ], - 'sources': [ - 'hello.cc', - ], - }, - { - 'target_name': 'refs_to_shard_external_dll', - 'type': 'shared_library', - 'dependencies': [ - # Make sure references in other files are updated correctly. - 'shard.gyp:shard', - ], - 'sources': [ - 'hello.cc', - ], - }, - ] -} diff --git a/tools/gyp/test/win/system-include/bar/header.h b/tools/gyp/test/win/system-include/bar/header.h deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tools/gyp/test/win/system-include/common/commonheader.h b/tools/gyp/test/win/system-include/common/commonheader.h deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tools/gyp/test/win/system-include/foo/header.h b/tools/gyp/test/win/system-include/foo/header.h deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tools/gyp/test/win/system-include/main.cc b/tools/gyp/test/win/system-include/main.cc deleted file mode 100644 index b04ea8a53055472401251572c98903e52e24495c..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/system-include/main.cc +++ /dev/null @@ -1,4 +0,0 @@ -#include -#include - -int main() {} diff --git a/tools/gyp/test/win/system-include/test.gyp b/tools/gyp/test/win/system-include/test.gyp deleted file mode 100644 index 07f2636543b76c38d2da053a68264d87d5b78ddf..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/system-include/test.gyp +++ /dev/null @@ -1,26 +0,0 @@ -{ - 'target_defaults': { - 'msvs_settings': { - 'VCCLCompilerTool': { - 'WarningLevel': '4', - 'WarnAsError': 'true', - }, - }, - 'msvs_system_include_dirs': [ - '$(ProjectName)', # Different for each target - 'common', # Same for all targets - ], - }, - 'targets': [ - { - 'target_name': 'foo', - 'type': 'executable', - 'sources': [ 'main.cc', ], - }, - { - 'target_name': 'bar', - 'type': 'executable', - 'sources': [ 'main.cc', ], - }, - ], -} diff --git a/tools/gyp/test/win/uldi/a.cc b/tools/gyp/test/win/uldi/a.cc deleted file mode 100644 index 0fe05d5afb095be07eaab0c715f189a2d1b55e44..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/uldi/a.cc +++ /dev/null @@ -1,7 +0,0 @@ -// 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. - -int some_function() { - return 0; -} diff --git a/tools/gyp/test/win/uldi/b.cc b/tools/gyp/test/win/uldi/b.cc deleted file mode 100644 index 0fe05d5afb095be07eaab0c715f189a2d1b55e44..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/uldi/b.cc +++ /dev/null @@ -1,7 +0,0 @@ -// 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. - -int some_function() { - return 0; -} diff --git a/tools/gyp/test/win/uldi/main.cc b/tools/gyp/test/win/uldi/main.cc deleted file mode 100644 index 81b46d863ab59df8668d179ee21721e4c1fbd913..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/uldi/main.cc +++ /dev/null @@ -1,10 +0,0 @@ -// 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. - -extern int some_function(); - -int main() { - some_function(); - return 0; -} diff --git a/tools/gyp/test/win/uldi/uldi.gyp b/tools/gyp/test/win/uldi/uldi.gyp deleted file mode 100644 index c32f5e0956e41c48d2d41be8e1f7e78aeb853e98..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/uldi/uldi.gyp +++ /dev/null @@ -1,45 +0,0 @@ -# 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': 'lib1', - 'type': 'static_library', - 'sources': ['a.cc'], - }, - { - 'target_name': 'final_uldi', - 'type': 'executable', - 'dependencies': [ - 'lib1', - 'lib2', - ], - 'msvs_settings': { - 'VCLinkerTool': { - 'UseLibraryDependencyInputs': 'true' - }, - }, - 'sources': ['main.cc'], - }, - { - 'target_name': 'final_no_uldi', - 'type': 'executable', - 'dependencies': [ - 'lib1', - 'lib2', - ], - 'sources': ['main.cc'], - }, - { - 'target_name': 'lib2', - 'type': 'static_library', - # b.cc has the same named function as a.cc, but don't use the same name - # so that the .obj will have a different name. If the obj file has the - # same name, the linker will discard the obj file, invalidating the - # test. - 'sources': ['b.cc'], - }, - ] -} diff --git a/tools/gyp/test/win/vs-macros/as.py b/tools/gyp/test/win/vs-macros/as.py deleted file mode 100644 index e0bc3ae6f3c74ff171c7ce9af82bd756fab8a765..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/vs-macros/as.py +++ /dev/null @@ -1,18 +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. - -from optparse import OptionParser - -parser = OptionParser() -parser.add_option('-a', dest='platform') -parser.add_option('-o', dest='output') -parser.add_option('-p', dest='path') -(options, args) = parser.parse_args() - -f = open(options.output, 'w') -print >>f, 'options', options -print >>f, 'args', args -f.close() diff --git a/tools/gyp/test/win/vs-macros/containing-gyp.gyp b/tools/gyp/test/win/vs-macros/containing-gyp.gyp deleted file mode 100644 index c07b639ff1c05277cdb116363eb999d78906b76b..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/vs-macros/containing-gyp.gyp +++ /dev/null @@ -1,39 +0,0 @@ -# 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': 'test_expansions', - 'msvs_cygwin_shell': 0, - 'type': 'none', - 'rules': [ - { - 'rule_name': 'assembler (gnu-compatible)', - 'msvs_cygwin_shell': 0, - 'msvs_quote_cmd': 0, - 'extension': 'S', - 'inputs': [ - 'as.py', - ], - 'outputs': [ - '$(IntDir)/$(InputName).obj', - ], - 'action': - ['python', - 'as.py', - '-a', '$(PlatformName)', - '-o', '$(IntDir)/$(InputName).obj', - '-p', '<(DEPTH)', - '$(InputPath)'], - 'message': 'Building assembly language file $(InputPath)', - 'process_outputs_as_sources': 1, - }, - ], - 'sources': [ - 'input.S', - ], - }, - ] -} diff --git a/tools/gyp/test/win/vs-macros/do_stuff.py b/tools/gyp/test/win/vs-macros/do_stuff.py deleted file mode 100644 index 4669d3139b8cecefbc03721d92d7899993910724..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/vs-macros/do_stuff.py +++ /dev/null @@ -1,8 +0,0 @@ -# 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. - -import sys - -input = open(sys.argv[1], "r").read() -open(sys.argv[2], "w").write(input + "Modified.") diff --git a/tools/gyp/test/win/vs-macros/hello.cc b/tools/gyp/test/win/vs-macros/hello.cc deleted file mode 100644 index 1711567ef566703fcd9c33e0a236b1b30454df6a..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/vs-macros/hello.cc +++ /dev/null @@ -1,7 +0,0 @@ -// 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. - -int main() { - return 0; -} diff --git a/tools/gyp/test/win/vs-macros/input-output-macros.gyp b/tools/gyp/test/win/vs-macros/input-output-macros.gyp deleted file mode 100644 index b4520f8cb8d3371145dbf3570c4d663fb0fba3c2..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/vs-macros/input-output-macros.gyp +++ /dev/null @@ -1,32 +0,0 @@ -# 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': 'test_expansions', - 'msvs_cygwin_shell': 0, - 'type': 'none', - 'rules': [ - { - 'rule_name': 'generate_file', - 'extension': 'blah', - 'inputs': [ - 'do_stuff.py', - ], - 'outputs': [ - '$(OutDir)\\<(RULE_INPUT_NAME).something', - ], - 'action': ['python', - 'do_stuff.py', - '<(RULE_INPUT_PATH)', - '$(OutDir)\\<(RULE_INPUT_NAME).something',], - }, - ], - 'sources': [ - 'stuff.blah', - ], - }, - ] -} diff --git a/tools/gyp/test/win/vs-macros/input.S b/tools/gyp/test/win/vs-macros/input.S deleted file mode 100644 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000 diff --git a/tools/gyp/test/win/vs-macros/projectname.gyp b/tools/gyp/test/win/vs-macros/projectname.gyp deleted file mode 100644 index 625a17764357387d426c47ce745c4badeb652e43..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/vs-macros/projectname.gyp +++ /dev/null @@ -1,29 +0,0 @@ -# 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': 'test_expansions', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'OutputFile': '$(OutDir)\\$(ProjectName)_plus_something.exe', - }, - }, - }, - { - 'target_name': 'test_with_product_name', - 'product_name': 'prod_name', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'OutputFile': '$(OutDir)\\$(ProjectName)_plus_something.exe', - }, - }, - }, - ] -} diff --git a/tools/gyp/test/win/vs-macros/stuff.blah b/tools/gyp/test/win/vs-macros/stuff.blah deleted file mode 100644 index d438b4a787c5dd0a16add455b7a896e3f2f9664e..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/vs-macros/stuff.blah +++ /dev/null @@ -1 +0,0 @@ -Random data file. diff --git a/tools/gyp/test/win/vs-macros/targetext.gyp b/tools/gyp/test/win/vs-macros/targetext.gyp deleted file mode 100644 index 11f580e4a602a3357b6138414b11377a9e724be1..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/vs-macros/targetext.gyp +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright (c) 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': 'test_targetext_executable', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'OutputFile': '$(TargetDir)\\executable$(TargetExt)', - }, - }, - }, - { - 'target_name': 'test_targetext_loadable_module', - 'type': 'loadable_module', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'OutputFile': '$(TargetDir)\\loadable_module$(TargetExt)', - }, - }, - }, - { - 'target_name': 'test_targetext_shared_library', - 'type': 'shared_library', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'OutputFile': '$(TargetDir)\\shared_library$(TargetExt)', - }, - }, - }, - { - 'target_name': 'test_targetext_static_library', - 'type': 'static_library', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLibrarianTool': { - 'OutputFile': '$(TargetDir)\\static_library$(TargetExt)', - }, - }, - }, - { - 'target_name': 'test_targetext_product_extension', - 'type': 'executable', - 'sources': ['hello.cc'], - 'product_extension': 'library', - 'msvs_settings': { - 'VCLinkerTool': { - 'OutputFile': '$(TargetDir)\\product_extension$(TargetExt)', - }, - }, - }, - ] -} diff --git a/tools/gyp/test/win/vs-macros/targetfilename.gyp b/tools/gyp/test/win/vs-macros/targetfilename.gyp deleted file mode 100644 index 82873202789ffee156002ed24eb50505613b65e3..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/vs-macros/targetfilename.gyp +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright (c) 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': 'test_targetfilename_executable', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'OutputFile': '$(TargetDir)\\$(TargetFileName)', - }, - }, - }, - { - 'target_name': 'test_targetfilename_loadable_module', - 'type': 'loadable_module', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'OutputFile': '$(TargetDir)\\$(TargetFileName)', - }, - }, - }, - { - 'target_name': 'test_targetfilename_shared_library', - 'type': 'loadable_module', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'OutputFile': '$(TargetDir)\\$(TargetFileName)', - }, - }, - }, - { - 'target_name': 'test_targetfilename_static_library', - 'type': 'static_library', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLibrarianTool': { - 'OutputFile': '$(TargetDir)\\$(TargetFileName)', - }, - }, - }, - { - 'target_name': 'test_targetfilename_product_extension', - 'type': 'executable', - 'sources': ['hello.cc'], - 'product_extension': 'foo', - 'msvs_settings': { - 'VCLinkerTool': { - 'OutputFile': '$(TargetDir)\\$(TargetFileName)', - }, - }, - }, - ] -} diff --git a/tools/gyp/test/win/vs-macros/targetname.gyp b/tools/gyp/test/win/vs-macros/targetname.gyp deleted file mode 100644 index a53d3c0aa3bc630694c834c591ad6b2b4db62477..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/vs-macros/targetname.gyp +++ /dev/null @@ -1,52 +0,0 @@ -# Copyright (c) 2013 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': 'test_targetname', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'OutputFile': '$(TargetDir)\\$(TargetName)_plus_something1.exe', - }, - }, - }, - { - 'target_name': 'test_targetname_with_prefix', - 'product_prefix': 'prod_prefix', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'OutputFile': '$(TargetDir)\\$(TargetName)_plus_something2.exe', - }, - }, - }, - { - 'target_name': 'test_targetname_with_prodname', - 'product_name': 'prod_name', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'OutputFile': '$(TargetDir)\\$(TargetName)_plus_something3.exe', - }, - }, - }, - { - 'target_name': 'test_targetname_with_prodname_with_prefix', - 'product_name': 'prod_name', - 'product_prefix': 'prod_prefix', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'OutputFile': '$(TargetDir)\\$(TargetName)_plus_something4.exe', - }, - }, - }, - ] -} diff --git a/tools/gyp/test/win/vs-macros/targetpath.gyp b/tools/gyp/test/win/vs-macros/targetpath.gyp deleted file mode 100644 index a8699ffb25341970cfd37e644f5c5859d79f9e70..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/vs-macros/targetpath.gyp +++ /dev/null @@ -1,59 +0,0 @@ -# Copyright (c) 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': 'test_targetpath_executable', - 'type': 'executable', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'OutputFile': '$(TargetPath)', - }, - }, - }, - { - 'target_name': 'test_targetpath_loadable_module', - 'type': 'loadable_module', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'OutputFile': '$(TargetPath)', - }, - }, - }, - { - 'target_name': 'test_targetpath_shared_library', - 'type': 'loadable_module', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLinkerTool': { - 'OutputFile': '$(TargetPath)', - }, - }, - }, - { - 'target_name': 'test_targetpath_static_library', - 'type': 'static_library', - 'sources': ['hello.cc'], - 'msvs_settings': { - 'VCLibrarianTool': { - 'OutputFile': '$(TargetPath)', - }, - }, - }, - { - 'target_name': 'test_targetpath_product_extension', - 'type': 'executable', - 'sources': ['hello.cc'], - 'product_extension': 'foo', - 'msvs_settings': { - 'VCLinkerTool': { - 'OutputFile': '$(TargetPath)', - }, - }, - }, - ] -} diff --git a/tools/gyp/test/win/vs-macros/test_exists.py b/tools/gyp/test/win/vs-macros/test_exists.py deleted file mode 100644 index f5c90ad6f271ee64762e706fbe6347038fda1c25..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/vs-macros/test_exists.py +++ /dev/null @@ -1,10 +0,0 @@ -# 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. - -import os -import sys - -if not os.path.exists(sys.argv[1]): - raise -open(sys.argv[2], 'w').close() diff --git a/tools/gyp/test/win/vs-macros/vcinstalldir.gyp b/tools/gyp/test/win/vs-macros/vcinstalldir.gyp deleted file mode 100644 index 3763a4eb182ea230bdbd7a1064d3a8406d36bf52..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/vs-macros/vcinstalldir.gyp +++ /dev/null @@ -1,41 +0,0 @@ -# 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': 'test_slash_trailing', - 'type': 'none', - 'msvs_cygwin_shell': '0', - 'actions': [ - { - 'action_name': 'root', - 'inputs': [], - 'outputs': ['out1'], - 'action': ['python', 'test_exists.py', '$(VCInstallDir)', 'out1'] - }, - ], - }, - { - 'target_name': 'test_slash_dir', - 'type': 'none', - 'msvs_cygwin_shell': '0', - 'actions': [ - { - 'action_name': 'bin', - 'inputs': [], - 'outputs': ['out2'], - 'action': ['python', 'test_exists.py', '$(VCInstallDir)bin', 'out2'], - }, - { - 'action_name': 'compiler', - 'inputs': [], - 'outputs': ['out3'], - 'action': [ - 'python', 'test_exists.py', '$(VCInstallDir)bin\\cl.exe', 'out3'], - }, - ], - }, - ] -} diff --git a/tools/gyp/test/win/win-tool/copies_readonly_files.gyp b/tools/gyp/test/win/win-tool/copies_readonly_files.gyp deleted file mode 100644 index 3cd7e69f1a2af70dfc6ad37fd5dd559ea16836c8..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/win-tool/copies_readonly_files.gyp +++ /dev/null @@ -1,29 +0,0 @@ -{ - 'targets': [ - { - 'target_name': 'foo', - 'type': 'none', - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/dest', - 'files': [ - 'read-only-file', - ], - }, - ], - }, # target: foo - - { - 'target_name': 'bar', - 'type': 'none', - 'copies': [ - { - 'destination': '<(PRODUCT_DIR)/dest', - 'files': [ - 'subdir/', - ], - }, - ], - }, # target: bar - ], -} diff --git a/tools/gyp/test/win/win-tool/gyptest-win-tool-handles-readonly-files.py b/tools/gyp/test/win/win-tool/gyptest-win-tool-handles-readonly-files.py deleted file mode 100644 index 951b95277564093524fb2c6b9f920aeba5d1bab5..0000000000000000000000000000000000000000 --- a/tools/gyp/test/win/win-tool/gyptest-win-tool-handles-readonly-files.py +++ /dev/null @@ -1,55 +0,0 @@ -#!/usr/bin/env python - -# Copyright (c) 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. - -""" -Make sure overwriting read-only files works as expected (via win-tool). -""" - -import TestGyp - -import filecmp -import os -import stat -import sys - -if sys.platform == 'win32': - test = TestGyp.TestGyp(formats=['ninja']) - - # First, create the source files. - os.makedirs('subdir') - read_only_files = ['read-only-file', 'subdir/A', 'subdir/B', 'subdir/C'] - for f in read_only_files: - test.write(f, 'source_contents') - test.chmod(f, stat.S_IREAD) - if os.access(f, os.W_OK): - test.fail_test() - - # Second, create the read-only destination files. Note that we are creating - # them where the ninja and win-tool will try to copy them to, in order to test - # that copies overwrite the files. - os.makedirs(test.built_file_path('dest/subdir')) - for f in read_only_files: - f = os.path.join('dest', f) - test.write(test.built_file_path(f), 'SHOULD BE OVERWRITTEN') - test.chmod(test.built_file_path(f), stat.S_IREAD) - # Ensure not writable. - if os.access(test.built_file_path(f), os.W_OK): - test.fail_test() - - test.run_gyp('copies_readonly_files.gyp') - test.build('copies_readonly_files.gyp') - - # Check the destination files were overwritten by ninja. - for f in read_only_files: - f = os.path.join('dest', f) - test.must_contain(test.built_file_path(f), 'source_contents') - - # This will fail if the files are not the same mode or contents. - for f in read_only_files: - if not filecmp.cmp(f, test.built_file_path(os.path.join('dest', f))): - test.fail_test() - - test.pass_test()