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 Test checking that IntermediateDirectory can be defined in terms of | 8 Test checking that IntermediateDirectory can be defined in terms of |
9 OutputDirectory. We previously had emitted the definition of | 9 OutputDirectory. We previously had emitted the definition of |
10 IntermediateDirectory before the definition of OutputDirectory. | 10 IntermediateDirectory before the definition of OutputDirectory. |
(...skipping 12 matching lines...) Expand all Loading... |
23 test.set_configuration('Baz') | 23 test.set_configuration('Baz') |
24 | 24 |
25 test.build('there/there.gyp', test.ALL) | 25 test.build('there/there.gyp', test.ALL) |
26 test.must_exist(os.path.join(test.workdir, 'foo', 'there.exe')) | 26 test.must_exist(os.path.join(test.workdir, 'foo', 'there.exe')) |
27 test.must_exist(os.path.join(test.workdir, 'foo', 'bar', 'there.obj')) | 27 test.must_exist(os.path.join(test.workdir, 'foo', 'bar', 'there.obj')) |
28 | 28 |
29 test.build('hello.gyp', test.ALL) | 29 test.build('hello.gyp', test.ALL) |
30 test.must_exist(os.path.join(test.workdir, 'foo', 'hello.exe')) | 30 test.must_exist(os.path.join(test.workdir, 'foo', 'hello.exe')) |
31 test.must_exist(os.path.join(test.workdir, 'foo', 'bar', 'hello.obj')) | 31 test.must_exist(os.path.join(test.workdir, 'foo', 'bar', 'hello.obj')) |
32 | 32 |
| 33 if test.format == 'msvs': |
| 34 if test.uses_msbuild: |
| 35 test.must_contain('pull_in_there.vcxproj', |
| 36 '<IntDir>$(OutDir)bar\\</IntDir>') |
| 37 else: |
| 38 test.must_contain('pull_in_there.vcproj', |
| 39 'IntermediateDirectory="$(OutDir)bar\\"') |
| 40 |
33 test.pass_test() | 41 test.pass_test() |
OLD | NEW |