Merge pull request #877 from fredriss/dev/fix-ubuntu-18.04-bot

Author: swift-ci

packages/Python/lldbsuite/test/functionalities/data-formatter/data-formatter-stl/libstdcpp/unique_ptr/TestDataFormatterStdUniquePtr.py

@@ -16,6 +16,7 @@ class StdUniquePtrDataFormatterTestCase(TestBase):
     mydir = TestBase.compute_mydir(__file__)
 
     @skipIfDarwin  # doesn't compile on Darwin
+    @skipIfLinux
     @skipUnlessLibstdcxxAvailable
     def test_with_run_command(self):
         self.build()
@@ -67,6 +68,7 @@ def test_with_run_command(self):
     @skipIfWindows  # libstdcpp not ported to Windows
     @skipIfDarwin  # doesn't compile on Darwin
     @skipIfwatchOS  # libstdcpp not ported to watchos
+    @skipIfLinux
     def test_recursive_unique_ptr(self):
         # Tests that LLDB can handle when we have a loop in the unique_ptr
         # reference chain and that it correctly handles the different options

packages/Python/lldbsuite/test/functionalities/thread/backtrace_all/ParallelTask.cpp

@@ -2,6 +2,7 @@
 #include <thread>
 #include <vector>
 #include <queue>
+#include <functional>
 #include <future>
 #include <iostream>
 #include <cassert>