Chromium Code Reviews| 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 file copies with --generator-output using an explicit build | 8 Verifies file copies with --generator-output using an explicit build | 
| 9 target of 'all'. | 9 target of 'all'. | 
| 10 """ | 10 """ | 
| 11 | 11 | 
| 12 import TestGyp | 12 import TestGyp | 
| 13 | 13 | 
| 14 # Android doesn't support --generator-output. | 14 # Android doesn't support --generator-output. | 
| 15 test = TestGyp.TestGyp(formats=['!android']) | 15 test = TestGyp.TestGyp(formats=['!android']) | 
| 16 | 16 | 
| 17 # Bug: xcode-ninja doesn't respect --generator-output | |
| 
 
sdefresne
2014/09/02 15:13:05
Same here.
 
 | |
| 18 if test.format == 'xcode-ninja': | |
| 19 test.skip_test() | |
| 20 | |
| 17 test.writable(test.workpath('copies'), False) | 21 test.writable(test.workpath('copies'), False) | 
| 18 | 22 | 
| 19 test.run_gyp('copies.gyp', | 23 test.run_gyp('copies.gyp', | 
| 20 '--generator-output=' + test.workpath('gypfiles'), | 24 '--generator-output=' + test.workpath('gypfiles'), | 
| 21 '-G', 'xcode_ninja_target_pattern=^(?!copies_null)', | 25 '-G', 'xcode_ninja_target_pattern=^(?!copies_null)', | 
| 22 chdir='copies') | 26 chdir='copies') | 
| 23 | 27 | 
| 24 test.writable(test.workpath('copies'), True) | 28 test.writable(test.workpath('copies'), True) | 
| 25 | 29 | 
| 26 test.relocate('copies', 'relocate/copies') | 30 test.relocate('copies', 'relocate/copies') | 
| (...skipping 24 matching lines...) Expand all Loading... | |
| 51 | 55 | 
| 52 if test.format == 'xcode': | 56 if test.format == 'xcode': | 
| 53 chdir = 'relocate/copies/subdir/build' | 57 chdir = 'relocate/copies/subdir/build' | 
| 54 elif test.format in ['make', 'ninja', 'xcode-ninja', 'cmake']: | 58 elif test.format in ['make', 'ninja', 'xcode-ninja', 'cmake']: | 
| 55 chdir = 'relocate/gypfiles/out' | 59 chdir = 'relocate/gypfiles/out' | 
| 56 else: | 60 else: | 
| 57 chdir = 'relocate/gypfiles' | 61 chdir = 'relocate/gypfiles' | 
| 58 test.must_match([chdir, 'Default', 'copies-out', 'file4'], "file4 contents\n") | 62 test.must_match([chdir, 'Default', 'copies-out', 'file4'], "file4 contents\n") | 
| 59 | 63 | 
| 60 test.pass_test() | 64 test.pass_test() | 
| OLD | NEW |