Chromium Code Reviews
chromiumcodereview-hr@appspot.gserviceaccount.com (chromiumcodereview-hr) | Please choose your nickname with Settings | Help | Chromium Project | Gerrit Changes | Sign out
(154)

Side by Side Diff: test/msvs/shared_output/gyptest-shared_output.py

Issue 10832322: Fixes msvs generator for projects with non-default IntermediateDirectories. (Closed) Base URL: http://gyp.googlecode.com/svn/trunk/
Patch Set: Fixes msvs generator for projects with non-default IntermediateDirectories. Created 8 years, 4 months ago
Use n/p to move between diff chunks; N/P to move between comments. Draft comments are only viewable by you.
Jump to:
View unified diff | Download patch | Annotate | Revision Log
« no previous file with comments | « pylib/gyp/generator/msvs.py ('k') | no next file » | no next file with comments »
Toggle Intra-line Diffs ('i') | Expand Comments ('e') | Collapse Comments ('c') | Show Comments Hide Comments ('s')
OLDNEW
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
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()
OLDNEW
« no previous file with comments | « pylib/gyp/generator/msvs.py ('k') | no next file » | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698