D17487: [analyzer][scan-build-py] flag filter modification for compilation database creation

llvm-svn: 266726

1 files changed, 13 insertions, 13 deletions

diff --git a/clang/tools/scan-build-py/tests/functional/cases/test_create_cdb.py b/clang/tools/scan-build-py/tests/functional/cases/test_create_cdb.py
index 6d449ba39c0..c26fce0bbf8 100644
--- a/clang/tools/scan-build-py/tests/functional/cases/test_create_cdb.py
+++ b/clang/tools/scan-build-py/tests/functional/cases/test_create_cdb.py
@@ -4,7 +4,7 @@
 # This file is distributed under the University of Illinois Open Source
 # License. See LICENSE.TXT for details.
 
-from ...unit import fixtures
+import libear
 from . import make_args, silent_check_call, silent_call, create_empty_file
 import unittest
 
@@ -28,13 +28,13 @@ class CompilationDatabaseTest(unittest.TestCase):
             return len(content)
 
     def test_successful_build(self):
-        with fixtures.TempDir() as tmpdir:
+        with libear.TemporaryDirectory() as tmpdir:
             result = self.run_intercept(tmpdir, ['build_regular'])
             self.assertTrue(os.path.isfile(result))
             self.assertEqual(5, self.count_entries(result))
 
     def test_successful_build_with_wrapper(self):
-        with fixtures.TempDir() as tmpdir:
+        with libear.TemporaryDirectory() as tmpdir:
             result = os.path.join(tmpdir, 'cdb.json')
             make = make_args(tmpdir) + ['build_regular']
             silent_check_call(['intercept-build', '--cdb', result,
@@ -44,14 +44,14 @@ class CompilationDatabaseTest(unittest.TestCase):
 
     @unittest.skipIf(os.getenv('TRAVIS'), 'ubuntu make return -11')
     def test_successful_build_parallel(self):
-        with fixtures.TempDir() as tmpdir:
+        with libear.TemporaryDirectory() as tmpdir:
             result = self.run_intercept(tmpdir, ['-j', '4', 'build_regular'])
             self.assertTrue(os.path.isfile(result))
             self.assertEqual(5, self.count_entries(result))
 
     @unittest.skipIf(os.getenv('TRAVIS'), 'ubuntu env remove clang from path')
     def test_successful_build_on_empty_env(self):
-        with fixtures.TempDir() as tmpdir:
+        with libear.TemporaryDirectory() as tmpdir:
             result = os.path.join(tmpdir, 'cdb.json')
             make = make_args(tmpdir) + ['CC=clang', 'build_regular']
             silent_check_call(['intercept-build', '--cdb', result,
@@ -60,13 +60,13 @@ class CompilationDatabaseTest(unittest.TestCase):
             self.assertEqual(5, self.count_entries(result))
 
     def test_successful_build_all_in_one(self):
-        with fixtures.TempDir() as tmpdir:
+        with libear.TemporaryDirectory() as tmpdir:
             result = self.run_intercept(tmpdir, ['build_all_in_one'])
             self.assertTrue(os.path.isfile(result))
             self.assertEqual(5, self.count_entries(result))
 
     def test_not_successful_build(self):
-        with fixtures.TempDir() as tmpdir:
+        with libear.TemporaryDirectory() as tmpdir:
             result = os.path.join(tmpdir, 'cdb.json')
             make = make_args(tmpdir) + ['build_broken']
             silent_call(
@@ -84,12 +84,12 @@ class ExitCodeTest(unittest.TestCase):
             ['intercept-build', '--cdb', result] + make)
 
     def test_successful_build(self):
-        with fixtures.TempDir() as tmpdir:
+        with libear.TemporaryDirectory() as tmpdir:
             exitcode = self.run_intercept(tmpdir, 'build_clean')
             self.assertFalse(exitcode)
 
     def test_not_successful_build(self):
-        with fixtures.TempDir() as tmpdir:
+        with libear.TemporaryDirectory() as tmpdir:
             exitcode = self.run_intercept(tmpdir, 'build_broken')
             self.assertTrue(exitcode)
 
@@ -110,7 +110,7 @@ class ResumeFeatureTest(unittest.TestCase):
             return len(content)
 
     def test_overwrite_existing_cdb(self):
-        with fixtures.TempDir() as tmpdir:
+        with libear.TemporaryDirectory() as tmpdir:
             result = self.run_intercept(tmpdir, 'build_clean', [])
             self.assertTrue(os.path.isfile(result))
             result = self.run_intercept(tmpdir, 'build_regular', [])
@@ -118,7 +118,7 @@ class ResumeFeatureTest(unittest.TestCase):
             self.assertEqual(2, self.count_entries(result))
 
     def test_append_to_existing_cdb(self):
-        with fixtures.TempDir() as tmpdir:
+        with libear.TemporaryDirectory() as tmpdir:
             result = self.run_intercept(tmpdir, 'build_clean', [])
             self.assertTrue(os.path.isfile(result))
             result = self.run_intercept(tmpdir, 'build_regular', ['--append'])
@@ -138,7 +138,7 @@ class ResultFormatingTest(unittest.TestCase):
             return content
 
     def assert_creates_number_of_entries(self, command, count):
-        with fixtures.TempDir() as tmpdir:
+        with libear.TemporaryDirectory() as tmpdir:
             filename = os.path.join(tmpdir, 'test.c')
             create_empty_file(filename)
             command.append(filename)
@@ -153,7 +153,7 @@ class ResultFormatingTest(unittest.TestCase):
         self.assert_creates_number_of_entries(['cc', '-c', '-MM'], 0)
 
     def assert_command_creates_entry(self, command, expected):
-        with fixtures.TempDir() as tmpdir:
+        with libear.TemporaryDirectory() as tmpdir:
             filename = os.path.join(tmpdir, command[-1])
             create_empty_file(filename)
             cmd = ['sh', '-c', ' '.join(command)]