test: mac yak shaving

Author: refack

gyp/XCodeDetect.py

@@ -36,7 +36,10 @@ def GetSdkVersionInfoItem(sdk, item):
   # Since the CLT has no SDK paths anyway, returning None is the most sensible route and should still do the right thing.
   try:
     return run('xcrun', '--sdk', sdk, item)
-  except subprocess.CalledProcessError:
+  except subprocess.CalledProcessError as e:
+    stdout = e.output
+    status = e.returncode
+    cmd = ' '.join(e.cmd)
     return None
 
 

gyp/buildtime_helpers/mac_tool.py

@@ -137,7 +137,9 @@ def _CopyStringsFile(self, source, dest):
     # on invalid files. Do the same kind of validation.
     import CoreFoundation
     s = open(source, 'rb').read()
+    # noinspection PyUnresolvedReferences
     d = CoreFoundation.CFDataCreate(None, s, len(s))
+    # noinspection PyUnresolvedReferences
     _, error = CoreFoundation.CFPropertyListCreateFromXMLData(None, d, 0, None)
     if error:
       return
@@ -175,7 +177,9 @@ def ExecCopyInfoPlist(self, source, dest, convert_to_binary, *keys):
     # Insert synthesized key/value pairs (e.g. BuildMachineOSBuild).
     plist = plistlib.readPlistFromString(lines)
     if keys:
-      plist.update(json.loads(keys[0]))
+      j = json.loads(keys[0])
+      j = dict([i for i in j.items() if i[0] and i[1]])
+      plist.update(j)
     lines = plistlib.writePlistToString(plist)
 
     # Go through all the environment variables and replace them as variables in
@@ -284,7 +288,7 @@ def ExecFilterLibtool(self, *cmd_list):
   def ExecPackageIosFramework(self, framework):
     # Find the name of the binary based on the part before the ".framework".
     binary = os.path.basename(framework).split('.')[0]
-    module_path = os.path.join(framework, 'Modules');
+    module_path = os.path.join(framework, 'Modules')
     if not os.path.exists(module_path):
       os.mkdir(module_path)
     module_template = 'framework module %s {\n' \
@@ -345,7 +349,7 @@ def ExecCompileIosFrameworkHeaderMap(self, out, framework, *all_headers):
     WriteHmap(out, filelist)
 
   def ExecCopyIosFrameworkHeaders(self, framework, *copy_headers):
-    header_path = os.path.join(framework, 'Headers');
+    header_path = os.path.join(framework, 'Headers')
     if not os.path.exists(header_path):
       os.makedirs(header_path)
     for header in copy_headers:

gyp/xcode_emulation.py

@@ -529,7 +529,8 @@ def _AppendPlatformVersionMinFlags(self, lst):
     self._Appendf(lst, 'MACOSX_DEPLOYMENT_TARGET', '-mmacosx-version-min=%s')
     if 'IPHONEOS_DEPLOYMENT_TARGET' in self._Settings():
       # TODO: Implement this better?
-      sdk_path_basename = os.path.basename(self._SdkPath())
+      skd_path = self._SdkPath()
+      sdk_path_basename = os.path.basename(skd_path)
       if sdk_path_basename.lower().startswith('iphonesimulator'):
         self._Appendf(lst, 'IPHONEOS_DEPLOYMENT_TARGET', '-mios-simulator-version-min=%s')
       else:
@@ -1420,8 +1421,12 @@ def _GetXcodeEnv(xcode_settings, built_products_dir, srcroot, configuration, add
     'TEMP_DIR': '${TMPDIR}',
     'XCODE_VERSION_ACTUAL': XCodeDetect.Version(),
   }
-  if xcode_settings.GetPerConfigSetting('SDKROOT', configuration):
-    env['SDKROOT'] = xcode_settings._SdkPath(configuration)
+  wanted_sdk = xcode_settings.GetPerConfigSetting('SDKROOT', configuration)
+  if wanted_sdk:
+    sdk_root = xcode_settings._SdkPath(configuration)
+    if sdk_root is None:
+      raise GypError('Could not find `%s` SDK' % wanted_sdk)
+    env['SDKROOT'] = sdk_root
   else:
     env['SDKROOT'] = ''
 

gyptest.py

@@ -121,7 +121,7 @@ def print_configuration_info():
   if sys.platform == 'darwin':
     print('  Mac %s %s' % (platform.mac_ver()[0], platform.mac_ver()[2]))
     try:
-      from XCodeDetect import XCodeDetect
+      import XCodeDetect
       print('  Xcode %s' % XCodeDetect.Version())
     except:
       pass
@@ -136,7 +136,7 @@ def print_configuration_info():
   elif sys.platform in ('linux', 'linux2'):
     # noinspection PyBroadException
     try:
-      with open('/etc/lsb-release', mode='r', encoding='utf-8') as f:
+      with open('/etc/lsb-release', mode='r') as f:
         dist = f.read().strip()
       print('  Linux %s' % dist)
     except:

pylib/__init__.py

@@ -13,6 +13,9 @@
 if XCodeDetect.Version() < '0600':
   test.skip_test('Skip test on XCode < 0600')
 
+if not XCodeDetect.IPhoneSDKPath():
+  test.skip_test('Skip test when no IPhone SDK')
+
 test_gyp_path = 'test-assets-catalog.gyp'
 test_app_path = 'Test App Assets Catalog Gyp.app'
 test.run_gyp(test_gyp_path, chdir='app-bundle')

pylib/util.py

@@ -8,16 +8,13 @@
 Verifies that device and simulator bundles are built correctly.
 """
 
-import collections
-
 import TestGyp
 import XCodeDetect
 
 test = TestGyp.TestGyp(formats=['ninja', 'xcode'], platforms=['darwin'])
 
-if test.format == 'xcode':
-  # This test appears to hang flakily.
-  test.skip_test()  # bug=532
+if not XCodeDetect.IPhoneSDKPath():
+  test.skip_test('Skip test when no IPhone SDK')
 
 test_cases = [
   ('Default', 'TestArch32Bits', ['i386']),
@@ -40,7 +37,7 @@
 for configuration, target, archs in test_cases:
   is_device_build = configuration.endswith('-iphoneos')
 
-  kwds = collections.defaultdict(list)
+  kwds = {}
   if test.format == 'xcode':
     if is_device_build:
       configuration, sdk = configuration.split('-')

test/ios/gyptest-app-ios-assets-catalog.py

@@ -11,44 +11,41 @@
 """
 
 import TestGyp
-
-import os
-import stat
-import sys
-
-
-test = TestGyp.TestGyp(formats=['ninja', 'xcode'])
-
-if sys.platform == 'darwin':
-  test.run_gyp('copies-with-xcode-envvars.gyp',
-                chdir='copies-with-xcode-envvars')
-
-  test.build('copies-with-xcode-envvars.gyp', chdir='copies-with-xcode-envvars')
-
-  wrapper_name = 'copies-with-xcode-envvars.app/'
-  contents_path = wrapper_name
-  out_path = test.built_file_path('file0', chdir='copies-with-xcode-envvars')
-  test.must_contain(out_path, 'file0 contents\n')
-  out_path = test.built_file_path(wrapper_name + 'file1', chdir='copies-with-xcode-envvars')
-  test.must_contain(out_path, 'file1 contents\n')
-  out_path = test.built_file_path(contents_path + 'file2', chdir='copies-with-xcode-envvars')
-  test.must_contain(out_path, 'file2 contents\n')
-  out_path = test.built_file_path(contents_path + 'file3', chdir='copies-with-xcode-envvars')
-  test.must_contain(out_path, 'file3 contents\n')
-  out_path = test.built_file_path(contents_path + 'testimages/file4', chdir='copies-with-xcode-envvars')
-  test.must_contain(out_path, 'file4 contents\n')
-  out_path = test.built_file_path(contents_path + 'Java/file5', chdir='copies-with-xcode-envvars')
-  test.must_contain(out_path, 'file5 contents\n')
-  out_path = test.built_file_path(contents_path + 'Frameworks/file6', chdir='copies-with-xcode-envvars')
-  test.must_contain(out_path, 'file6 contents\n')
-  out_path = test.built_file_path(contents_path + 'Frameworks/file7', chdir='copies-with-xcode-envvars')
-  test.must_contain(out_path, 'file7 contents\n')
-  out_path = test.built_file_path(contents_path + 'SharedFrameworks/file8', chdir='copies-with-xcode-envvars')
-  test.must_contain(out_path, 'file8 contents\n')
-  out_path = test.built_file_path(contents_path + 'SharedSupport/file9', chdir='copies-with-xcode-envvars')
-  test.must_contain(out_path, 'file9 contents\n')
-  out_path = test.built_file_path(contents_path + 'PlugIns/file10', chdir='copies-with-xcode-envvars')
-  test.must_contain(out_path, 'file10 contents\n')
-  out_path = test.built_file_path(contents_path + 'XPCServices/file11', chdir='copies-with-xcode-envvars')
-  test.must_contain(out_path, 'file11 contents\n')
-  test.pass_test()
+import XCodeDetect
+
+test = TestGyp.TestGyp(formats=['ninja', 'xcode'], platforms=['darwin'])
+
+if not XCodeDetect.IPhoneSDKPath():
+  test.skip_test('Skip test when no IPhone SDK')
+
+test.run_gyp('copies-with-xcode-envvars.gyp', chdir='copies-with-xcode-envvars')
+
+test.build('copies-with-xcode-envvars.gyp', chdir='copies-with-xcode-envvars')
+
+wrapper_name = 'copies-with-xcode-envvars.app/'
+contents_path = wrapper_name
+out_path = test.built_file_path('file0', chdir='copies-with-xcode-envvars')
+test.must_contain(out_path, 'file0 contents\n')
+out_path = test.built_file_path(wrapper_name + 'file1', chdir='copies-with-xcode-envvars')
+test.must_contain(out_path, 'file1 contents\n')
+out_path = test.built_file_path(contents_path + 'file2', chdir='copies-with-xcode-envvars')
+test.must_contain(out_path, 'file2 contents\n')
+out_path = test.built_file_path(contents_path + 'file3', chdir='copies-with-xcode-envvars')
+test.must_contain(out_path, 'file3 contents\n')
+out_path = test.built_file_path(contents_path + 'testimages/file4', chdir='copies-with-xcode-envvars')
+test.must_contain(out_path, 'file4 contents\n')
+out_path = test.built_file_path(contents_path + 'Java/file5', chdir='copies-with-xcode-envvars')
+test.must_contain(out_path, 'file5 contents\n')
+out_path = test.built_file_path(contents_path + 'Frameworks/file6', chdir='copies-with-xcode-envvars')
+test.must_contain(out_path, 'file6 contents\n')
+out_path = test.built_file_path(contents_path + 'Frameworks/file7', chdir='copies-with-xcode-envvars')
+test.must_contain(out_path, 'file7 contents\n')
+out_path = test.built_file_path(contents_path + 'SharedFrameworks/file8', chdir='copies-with-xcode-envvars')
+test.must_contain(out_path, 'file8 contents\n')
+out_path = test.built_file_path(contents_path + 'SharedSupport/file9', chdir='copies-with-xcode-envvars')
+test.must_contain(out_path, 'file9 contents\n')
+out_path = test.built_file_path(contents_path + 'PlugIns/file10', chdir='copies-with-xcode-envvars')
+test.must_contain(out_path, 'file10 contents\n')
+out_path = test.built_file_path(contents_path + 'XPCServices/file11', chdir='copies-with-xcode-envvars')
+test.must_contain(out_path, 'file11 contents\n')
+test.pass_test()

test/ios/gyptest-archs.py

@@ -10,8 +10,8 @@
 if XCodeDetect.Version() < '0700':
   test.skip_test('Skip test on XCode < 0700')
 
-if test.format == 'xcode-ninja':
-  test.skip_test()
+if not XCodeDetect.IPhoneSDKPath():
+  test.skip_test('Skip test when no IPhone SDK')
 
 test.run_gyp('framework.gyp', chdir='framework')