| Index: test/mac/gyptest-objc-gc.py
|
| diff --git a/test/mac/gyptest-objc-gc.py b/test/mac/gyptest-objc-gc.py
|
| index 70ec7578493749043678d92968a6535a0283258b..0cec458983908d2d35d44ee86ea1c76c9057275c 100644
|
| --- a/test/mac/gyptest-objc-gc.py
|
| +++ b/test/mac/gyptest-objc-gc.py
|
| @@ -9,6 +9,7 @@ Verifies that GC objc settings are handled correctly.
|
| """
|
|
|
| import TestGyp
|
| +import TestMac
|
|
|
| import sys
|
|
|
| @@ -17,29 +18,34 @@ if sys.platform == 'darwin':
|
| test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode'],
|
| match = lambda a, b: True)
|
|
|
| - CHDIR = 'objc-gc'
|
| - test.run_gyp('test.gyp', chdir=CHDIR)
|
| + # Xcode 5.1 removed support for garbage-collection:
|
| + # error: garbage collection is no longer supported
|
| + if TestMac.Xcode.Version() < '0510':
|
|
|
| - build_error_code = {
|
| - 'xcode': [1, 65], # 1 for xcode 3, 65 for xcode 4 (see `man sysexits`)
|
| - 'make': 2,
|
| - 'ninja': 1,
|
| - }[test.format]
|
| + CHDIR = 'objc-gc'
|
| + test.run_gyp('test.gyp', chdir=CHDIR)
|
|
|
| - test.build('test.gyp', 'gc_exe_fails', chdir=CHDIR, status=build_error_code)
|
| - test.build(
|
| - 'test.gyp', 'gc_off_exe_req_lib', chdir=CHDIR, status=build_error_code)
|
| + build_error_code = {
|
| + 'xcode': [1, 65], # 1 for xcode 3, 65 for xcode 4 (see `man sysexits`)
|
| + 'make': 2,
|
| + 'ninja': 1,
|
| + }[test.format]
|
|
|
| - test.build('test.gyp', 'gc_req_exe', chdir=CHDIR)
|
| - test.run_built_executable('gc_req_exe', chdir=CHDIR, stdout="gc on: 1\n")
|
| + test.build('test.gyp', 'gc_exe_fails', chdir=CHDIR, status=build_error_code)
|
| + test.build(
|
| + 'test.gyp', 'gc_off_exe_req_lib', chdir=CHDIR, status=build_error_code)
|
|
|
| - test.build('test.gyp', 'gc_exe_req_lib', chdir=CHDIR)
|
| - test.run_built_executable('gc_exe_req_lib', chdir=CHDIR, stdout="gc on: 1\n")
|
| + test.build('test.gyp', 'gc_req_exe', chdir=CHDIR)
|
| + test.run_built_executable('gc_req_exe', chdir=CHDIR, stdout="gc on: 1\n")
|
|
|
| - test.build('test.gyp', 'gc_exe', chdir=CHDIR)
|
| - test.run_built_executable('gc_exe', chdir=CHDIR, stdout="gc on: 1\n")
|
| + test.build('test.gyp', 'gc_exe_req_lib', chdir=CHDIR)
|
| + test.run_built_executable(
|
| + 'gc_exe_req_lib', chdir=CHDIR, stdout="gc on: 1\n")
|
|
|
| - test.build('test.gyp', 'gc_off_exe', chdir=CHDIR)
|
| - test.run_built_executable('gc_off_exe', chdir=CHDIR, stdout="gc on: 0\n")
|
| + test.build('test.gyp', 'gc_exe', chdir=CHDIR)
|
| + test.run_built_executable('gc_exe', chdir=CHDIR, stdout="gc on: 1\n")
|
| +
|
| + test.build('test.gyp', 'gc_off_exe', chdir=CHDIR)
|
| + test.run_built_executable('gc_off_exe', chdir=CHDIR, stdout="gc on: 0\n")
|
|
|
| test.pass_test()
|
|
|