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

Side by Side Diff: test/builddir/gyptest-all.py

Issue 10831183: Fixes an issue where OutputDirectory and IntermediateDirectory were being (Closed) Base URL: http://gyp.googlecode.com/svn/trunk/
Patch Set: 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') | test/builddir/gyptest-default.py » ('j') | 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 Verify the settings that cause a set of programs to be created in 8 Verify the settings that cause a set of programs to be created in
9 a specific build directory, and that no intermediate built files 9 a specific build directory, and that no intermediate built files
10 get created outside of that build directory hierarchy even when 10 get created outside of that build directory hierarchy even when
(...skipping 15 matching lines...) Expand all
26 # Android does not support setting the build directory. 26 # Android does not support setting the build directory.
27 test = TestGyp.TestGyp(formats=['!make', '!ninja', '!android']) 27 test = TestGyp.TestGyp(formats=['!make', '!ninja', '!android'])
28 28
29 test.run_gyp('prog1.gyp', '--depth=..', chdir='src') 29 test.run_gyp('prog1.gyp', '--depth=..', chdir='src')
30 if test.format == 'msvs': 30 if test.format == 'msvs':
31 if test.uses_msbuild: 31 if test.uses_msbuild:
32 test.must_contain('src/prog1.vcxproj', 32 test.must_contain('src/prog1.vcxproj',
33 '<OutDir>..\\builddir\\Default\\</OutDir>') 33 '<OutDir>..\\builddir\\Default\\</OutDir>')
34 else: 34 else:
35 test.must_contain('src/prog1.vcproj', 35 test.must_contain('src/prog1.vcproj',
36 'OutputDirectory="..\\builddir\\Default"') 36 'OutputDirectory="..\\builddir\\Default\\"')
37 37
38 test.relocate('src', 'relocate/src') 38 test.relocate('src', 'relocate/src')
39 39
40 test.subdir('relocate/builddir') 40 test.subdir('relocate/builddir')
41 41
42 # Make sure that all the built ../../etc. files only get put under builddir, 42 # Make sure that all the built ../../etc. files only get put under builddir,
43 # by making all of relocate read-only and then making only builddir writable. 43 # by making all of relocate read-only and then making only builddir writable.
44 test.writable('relocate', False) 44 test.writable('relocate', False)
45 test.writable('relocate/builddir', True) 45 test.writable('relocate/builddir', True)
46 46
(...skipping 29 matching lines...) Expand all
76 dir = 'relocate/builddir/Default/' 76 dir = 'relocate/builddir/Default/'
77 test.run(program=test.workpath(dir + prog), stdout=expect) 77 test.run(program=test.workpath(dir + prog), stdout=expect)
78 78
79 run_builddir('prog1', expect1) 79 run_builddir('prog1', expect1)
80 run_builddir('prog2', expect2) 80 run_builddir('prog2', expect2)
81 run_builddir('prog3', expect3) 81 run_builddir('prog3', expect3)
82 run_builddir('prog4', expect4) 82 run_builddir('prog4', expect4)
83 run_builddir('prog5', expect5) 83 run_builddir('prog5', expect5)
84 84
85 test.pass_test() 85 test.pass_test()
OLDNEW
« no previous file with comments | « pylib/gyp/generator/msvs.py ('k') | test/builddir/gyptest-default.py » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698