[compiler-rt] e071ea4 - Unbreak check-builtins on macOS after Python3 switch.

[Nico Weber via llvm-commits]

Author: Nico Weber
Date: 2020-04-29T16:42:14-04:00
New Revision: e071ea48e923651ae21b9b684b0473248630322c

URL: https://github.com/llvm/llvm-project/commit/e071ea48e923651ae21b9b684b0473248630322c
DIFF: https://github.com/llvm/llvm-project/commit/e071ea48e923651ae21b9b684b0473248630322c.diff

LOG: Unbreak check-builtins on macOS after Python3 switch.

See https://crbug.com/1076480 for details.

Added: 
    

Modified: 
    compiler-rt/test/lit.common.cfg.py

Removed: 
    


################################################################################
diff  --git a/compiler-rt/test/lit.common.cfg.py b/compiler-rt/test/lit.common.cfg.py
index f0618dfc067c..6f325013a22c 100644
--- a/compiler-rt/test/lit.common.cfg.py
+++ b/compiler-rt/test/lit.common.cfg.py
@@ -307,7 +307,8 @@ def get_apple_platform_version_aligned_with(macos_version, apple_platform):
 
   osx_version = (10, 0, 0)
   try:
-    osx_version = subprocess.check_output(["sw_vers", "-productVersion"])
+    osx_version = subprocess.check_output(["sw_vers", "-productVersion"],
+                                          universal_newlines=True)
     osx_version = tuple(int(x) for x in osx_version.split('.'))
     if len(osx_version) == 2: osx_version = (osx_version[0], osx_version[1], 0)
     if osx_version >= (10, 11):
@@ -319,7 +320,7 @@ def get_apple_platform_version_aligned_with(macos_version, apple_platform):
       # this "feature", we can pass the test on newer OS X versions and other
       # platforms.
       config.available_features.add('osx-no-ld64-live_support')
-  except:
+  except subprocess.CalledProcessError:
     pass
 
   config.darwin_osx_version = osx_version