diff --git a/clang/utils/analyzer/SATestBuild.py b/clang/utils/analyzer/SATestBuild.py
--- a/clang/utils/analyzer/SATestBuild.py
+++ b/clang/utils/analyzer/SATestBuild.py
@@ -633,7 +633,7 @@
 
                 self.tasks_queue.task_done()
 
-            except CalledProcessError:
+            except BaseException:
                 self.failure_flag.set()
                 raise