[compiler-rt] r354908 - Fixed a minor merge error with this patch.

Mitch Phillips via llvm-commits llvm-commits at lists.llvm.org
Tue Feb 26 10:41:55 PST 2019


Author: hctim
Date: Tue Feb 26 10:41:55 2019
New Revision: 354908

URL: http://llvm.org/viewvc/llvm-project?rev=354908&view=rev
Log:
Fixed a minor merge error with this patch.

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

Modified: compiler-rt/trunk/test/lit.common.cfg
URL: http://llvm.org/viewvc/llvm-project/compiler-rt/trunk/test/lit.common.cfg?rev=354908&r1=354907&r2=354908&view=diff
==============================================================================
--- compiler-rt/trunk/test/lit.common.cfg (original)
+++ compiler-rt/trunk/test/lit.common.cfg Tue Feb 26 10:41:55 2019
@@ -388,7 +388,7 @@ try:
       [os.path.join(config.llvm_tools_dir, 'llvm-config'), '--assertion-mode'],
       stdout = subprocess.PIPE,
       env=config.environment)
-except OSError:
+except OSError as e:
   print("Could not launch llvm-config in " + config.llvm_tools_dir)
   print("    Failed with error #{0}: {1}".format(e.errno, e.strerror))
   exit(42)




More information about the llvm-commits mailing list