| OLD | NEW | 
|---|
| 1 #!/usr/bin/env python | 1 #!/usr/bin/env python | 
| 2 | 2 | 
| 3 # Copyright (c) 2012 Google Inc. All rights reserved. | 3 # Copyright (c) 2012 Google Inc. All rights reserved. | 
| 4 # Use of this source code is governed by a BSD-style license that can be | 4 # Use of this source code is governed by a BSD-style license that can be | 
| 5 # found in the LICENSE file. | 5 # found in the LICENSE file. | 
| 6 | 6 | 
| 7 """ | 7 """ | 
| 8 Verifies --generator-output= behavior when using actions. | 8 Verifies --generator-output= behavior when using actions. | 
| 9 """ | 9 """ | 
| 10 | 10 | 
| 11 import TestGyp | 11 import TestGyp | 
| 12 | 12 | 
| 13 # Android doesn't support --generator-output. | 13 # Android doesn't support --generator-output. | 
| 14 test = TestGyp.TestGyp(formats=['!android']) | 14 test = TestGyp.TestGyp(formats=['!android']) | 
| 15 | 15 | 
| 16 # All the generated files should go under 'gypfiles'. The source directory | 16 # All the generated files should go under 'gypfiles'. The source directory | 
| 17 # ('actions') should be untouched. | 17 # ('actions') should be untouched. | 
| 18 test.writable(test.workpath('actions'), False) | 18 test.writable(test.workpath('actions'), False) | 
| 19 test.run_gyp('actions.gyp', | 19 test.run_gyp('actions.gyp', | 
| 20              '--generator-output=' + test.workpath('gypfiles'), | 20              '--generator-output=' + test.workpath('gypfiles'), | 
|  | 21              '-G', 'xcode_ninja_target_pattern=^pull_in_all_actions$', | 
| 21              chdir='actions') | 22              chdir='actions') | 
| 22 | 23 | 
| 23 test.writable(test.workpath('actions'), True) | 24 test.writable(test.workpath('actions'), True) | 
| 24 | 25 | 
| 25 test.relocate('actions', 'relocate/actions') | 26 test.relocate('actions', 'relocate/actions') | 
| 26 test.relocate('gypfiles', 'relocate/gypfiles') | 27 test.relocate('gypfiles', 'relocate/gypfiles') | 
| 27 | 28 | 
| 28 test.writable(test.workpath('relocate/actions'), False) | 29 test.writable(test.workpath('relocate/actions'), False) | 
| 29 | 30 | 
| 30 # Some of the action outputs use "pure" relative paths (i.e. without prefixes | 31 # Some of the action outputs use "pure" relative paths (i.e. without prefixes | 
| (...skipping 18 matching lines...) Expand all  Loading... | 
| 49 if test.format == 'xcode': | 50 if test.format == 'xcode': | 
| 50   chdir = 'relocate/actions/subdir1' | 51   chdir = 'relocate/actions/subdir1' | 
| 51 else: | 52 else: | 
| 52   chdir = 'relocate/gypfiles' | 53   chdir = 'relocate/gypfiles' | 
| 53 test.run_built_executable('program', chdir=chdir, stdout=expect) | 54 test.run_built_executable('program', chdir=chdir, stdout=expect) | 
| 54 | 55 | 
| 55 test.must_match('relocate/actions/subdir2/actions-out/file.out', | 56 test.must_match('relocate/actions/subdir2/actions-out/file.out', | 
| 56                 "Hello from make-file.py\n") | 57                 "Hello from make-file.py\n") | 
| 57 | 58 | 
| 58 test.pass_test() | 59 test.pass_test() | 
| OLD | NEW | 
|---|