Index: test/same-gyp-name/gyptest-all.py |
=================================================================== |
--- test/same-gyp-name/gyptest-all.py (revision 1498) |
+++ test/same-gyp-name/gyptest-all.py (working copy) |
@@ -1,6 +1,6 @@ |
#!/usr/bin/env python |
-# Copyright (c) 2011 Google Inc. All rights reserved. |
+# Copyright (c) 2012 Google Inc. All rights reserved. |
# Use of this source code is governed by a BSD-style license that can be |
# found in the LICENSE file. |
@@ -10,9 +10,7 @@ |
import TestGyp |
-# This causes a problem on XCode (duplicate ID). |
-# See http://code.google.com/p/gyp/issues/detail?id=114 |
-test = TestGyp.TestGyp(formats=['!xcode']) |
+test = TestGyp.TestGyp() |
test.run_gyp('all.gyp', chdir='src') |
@@ -28,7 +26,13 @@ |
Hello from main2.cc |
""" |
-test.run_built_executable('program1', chdir='relocate/src', stdout=expect1) |
-test.run_built_executable('program2', chdir='relocate/src', stdout=expect2) |
+if test.format == 'xcode': |
+ chdir1 = 'relocate/src/subdir1' |
+ chdir2 = 'relocate/src/subdir2' |
+else: |
+ chdir1 = chdir2 = 'relocate/src' |
Nico
2012/09/20 12:52:02
Do you understand why this is necessary? Other tes
|
+test.run_built_executable('program1', chdir=chdir1, stdout=expect1) |
+test.run_built_executable('program2', chdir=chdir2, stdout=expect2) |
+ |
test.pass_test() |