Fix gyptest-app for Xcode 5.0.2

test/mac/gyptest-app.py

 #!/usr/bin/env python
 
 # 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.
 
 """
 Verifies that app bundles are built correctly.
 """
 
@@ skipping 14 matching lines @@
     test.fail_test()
 
 def ls(path):
   '''Returns a list of all files in a directory, relative to the directory.'''
   result = []
   for dirpath, _, files in os.walk(path):
     for f in files:
       result.append(os.path.join(dirpath, f)[len(path) + 1:])
   return result
 
+def XcodeVersion():
+  stdout = subprocess.check_output(['xcodebuild', '-version'])
+  version = stdout.splitlines()[0].split()[-1].replace('.', '')
+  return (version + '0' * (3 - len(version))).zfill(4)
+
 
 if sys.platform == 'darwin':
   test = TestGyp.TestGyp(formats=['ninja', 'make', 'xcode'])
 
   test.run_gyp('test.gyp', chdir='app-bundle')
 
   test.build('test.gyp', test.ALL, chdir='app-bundle')
 
   # Binary
   test.built_file_must_exist('Test App Gyp.app/Contents/MacOS/Test App Gyp',
                              chdir='app-bundle')
 
   # Info.plist
   info_plist = test.built_file_path('Test App Gyp.app/Contents/Info.plist',
                                     chdir='app-bundle')
   test.must_exist(info_plist)
   test.must_contain(info_plist, 'com.google.Test-App-Gyp')  # Variable expansion
   test.must_not_contain(info_plist, '${MACOSX_DEPLOYMENT_TARGET}');
 
   if test.format != 'make':
     # TODO: Synthesized plist entries aren't hooked up in the make generator.
     plist = plistlib.readPlist(info_plist)
     ExpectEq(GetStdout(['sw_vers', '-buildVersion']),
              plist['BuildMachineOSBuild'])
-    ExpectEq('', plist['DTSDKName'])
+
+    # Prior to Xcode 5.0.0, SDKROOT (and thus DTSDKName) was only defined if
+    # set in the Xcode project file. Starting with that version, it is always
+    # defined.
+    expected = ''
+    if XcodeVersion() >= '0500':
+      version = GetStdout(['xcodebuild', '-version', '-sdk', '', 'SDKVersion'])
+      expected = 'macosx' + version
+    ExpectEq(expected, plist['DTSDKName'])
     sdkbuild = GetStdout(
         ['xcodebuild', '-version', '-sdk', '', 'ProductBuildVersion'])
     if not sdkbuild:
       # Above command doesn't work in Xcode 4.2.
       sdkbuild = plist['BuildMachineOSBuild']
     ExpectEq(sdkbuild, plist['DTSDKBuild'])
     xcode, build = GetStdout(['xcodebuild', '-version']).splitlines()
     xcode = xcode.split()[-1].replace('.', '')
     xcode = (xcode + '0' * (3 - len(xcode))).zfill(4)
     build = build.split()[-1]
@@ skipping 27 matching lines @@
      set(['Contents/MacOS/Test App Gyp',
           'Contents/Info.plist',
           'Contents/Resources/English.lproj/MainMenu.nib',
           'Contents/PkgInfo',
           ] +
          [os.path.join('Contents/Resources/English.lproj', f)
              for f in strings_files]):
     test.fail_test()
 
   test.pass_test()