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

Side by Side Diff: test/ninja/normalize-paths-win/gyptest-normalize-paths.py

Issue 194883010: Fix missing variable MSVS expansion of copies arguments with Ninja. (Closed) Base URL: http://gyp.googlecode.com/svn/trunk
Patch Set: fix scott comments Created 6 years, 9 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/ninja.py ('k') | test/ninja/normalize-paths-win/normalize-paths.gyp » ('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 Make sure paths are normalized with VS macros properly expanded on Windows. 8 Make sure paths are normalized with VS macros properly expanded on Windows.
9 """ 9 """
10 10
(...skipping 13 matching lines...) Expand all
24 if '$!product_dir' in subninja: 24 if '$!product_dir' in subninja:
25 test.fail_test() 25 test.fail_test()
26 if 'out\\Default' in subninja: 26 if 'out\\Default' in subninja:
27 test.fail_test() 27 test.fail_test()
28 28
29 second = open(test.built_file_path('obj/second.ninja')).read() 29 second = open(test.built_file_path('obj/second.ninja')).read()
30 if ('..\\..\\things\\AnotherName.exe' in second or 30 if ('..\\..\\things\\AnotherName.exe' in second or
31 'AnotherName.exe' not in second): 31 'AnotherName.exe' not in second):
32 test.fail_test() 32 test.fail_test()
33 33
34 copytarget = open(test.built_file_path('obj/copy_target.ninja')).read()
35 print copytarget
scottmg 2014/03/12 20:20:10 remove print
36 if '$(VSInstallDir)' in copytarget:
37 test.fail_test()
38
34 action = open(test.built_file_path('obj/action.ninja')).read() 39 action = open(test.built_file_path('obj/action.ninja')).read()
35 if '..\\..\\out\\Default' in action: 40 if '..\\..\\out\\Default' in action:
36 test.fail_test() 41 test.fail_test()
37 if '..\\..\\SomethingElse' in action or 'SomethingElse' not in action: 42 if '..\\..\\SomethingElse' in action or 'SomethingElse' not in action:
38 test.fail_test() 43 test.fail_test()
39 if '..\\..\\SomeOtherInput' in action or 'SomeOtherInput' not in action: 44 if '..\\..\\SomeOtherInput' in action or 'SomeOtherInput' not in action:
40 test.fail_test() 45 test.fail_test()
41 46
42 test.pass_test() 47 test.pass_test()
OLDNEW
« no previous file with comments | « pylib/gyp/generator/ninja.py ('k') | test/ninja/normalize-paths-win/normalize-paths.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698