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

Side by Side Diff: test/win/gyptest-link-target-machine.py

Issue 596023003: Revert "I need this change to create Windows 8.1/Windows Phone 8.1 projects that compile modules th… (Closed) Base URL: http://gyp.googlecode.com/svn/trunk
Patch Set: Created 6 years, 2 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 | « test/win/gyptest-link-enable-winrt.py ('k') | test/win/linker-flags/target-machine.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) 2013 Google Inc. All rights reserved. 3 # Copyright (c) 2013 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 TargetMachine setting is extracted properly. 8 Make sure TargetMachine setting is extracted properly.
9 """ 9 """
10 10
11 import TestGyp 11 import TestGyp
12 12
13 import sys 13 import sys
14 14
15 if sys.platform == 'win32': 15 if sys.platform == 'win32':
16 test = TestGyp.TestGyp(formats=['msvs', 'ninja']) 16 test = TestGyp.TestGyp(formats=['msvs', 'ninja'])
17 17
18 CHDIR = 'linker-flags' 18 CHDIR = 'linker-flags'
19 test.run_gyp('target-machine.gyp', chdir=CHDIR) 19 test.run_gyp('target-machine.gyp', chdir=CHDIR)
20 # The .cc file is compiled as x86 (the default), so the link/libs that are 20 # The .cc file is compiled as x86 (the default), so the link/libs that are
21 # x64 or ARM need to fail. 21 # x64 need to fail.
22 test.build('target-machine.gyp', 'test_target_link_x86', chdir=CHDIR) 22 test.build('target-machine.gyp', 'test_target_link_x86', chdir=CHDIR)
23 test.build( 23 test.build(
24 'target-machine.gyp', 'test_target_link_x64', chdir=CHDIR, status=1) 24 'target-machine.gyp', 'test_target_link_x64', chdir=CHDIR, status=1)
25 test.build('target-machine.gyp', 'test_target_lib_x86', chdir=CHDIR) 25 test.build('target-machine.gyp', 'test_target_lib_x86', chdir=CHDIR)
26 test.build('target-machine.gyp', 'test_target_lib_x64', chdir=CHDIR, status=1) 26 test.build('target-machine.gyp', 'test_target_lib_x64', chdir=CHDIR, status=1)
27 test.build('target-machine.gyp', 'test_target_lib_arm', chdir=CHDIR, status=1)
28 27
29 test.pass_test() 28 test.pass_test()
OLDNEW
« no previous file with comments | « test/win/gyptest-link-enable-winrt.py ('k') | test/win/linker-flags/target-machine.gyp » ('j') | no next file with comments »

Powered by Google App Engine
This is Rietveld 408576698