D17487: [analyzer][scan-build-py] flag filter modification for compilation database creation
llvm-svn: 266726
diff --git a/clang/tools/scan-build-py/tests/unit/test_intercept.py b/clang/tools/scan-build-py/tests/unit/test_intercept.py
index b6f01f3..5b6ed2ce 100644
--- a/clang/tools/scan-build-py/tests/unit/test_intercept.py
+++ b/clang/tools/scan-build-py/tests/unit/test_intercept.py
@@ -4,62 +4,37 @@
# This file is distributed under the University of Illinois Open Source
# License. See LICENSE.TXT for details.
+import libear
import libscanbuild.intercept as sut
-from . import fixtures
+import unittest
import os.path
-class InterceptUtilTest(fixtures.TestCase):
-
- def test_is_compiler_call_filter(self):
- def test(command):
- return sut.is_compiler_call({'command': [command]})
-
- self.assertTrue(test('clang'))
- self.assertTrue(test('clang-3.6'))
- self.assertTrue(test('clang++'))
- self.assertTrue(test('clang++-3.5.1'))
- self.assertTrue(test('cc'))
- self.assertTrue(test('c++'))
- self.assertTrue(test('gcc'))
- self.assertTrue(test('g++'))
- self.assertTrue(test('/usr/local/bin/gcc'))
- self.assertTrue(test('/usr/local/bin/g++'))
- self.assertTrue(test('/usr/local/bin/clang'))
- self.assertTrue(test('armv7_neno-linux-gnueabi-g++'))
-
- self.assertFalse(test(''))
- self.assertFalse(test('ld'))
- self.assertFalse(test('as'))
- self.assertFalse(test('/usr/local/bin/compiler'))
+class InterceptUtilTest(unittest.TestCase):
def test_format_entry_filters_action(self):
def test(command):
- return list(sut.format_entry(
- {'command': command, 'directory': '/opt/src/project'}))
+ trace = {'command': command, 'directory': '/opt/src/project'}
+ return list(sut.format_entry(trace))
self.assertTrue(test(['cc', '-c', 'file.c', '-o', 'file.o']))
self.assertFalse(test(['cc', '-E', 'file.c']))
self.assertFalse(test(['cc', '-MM', 'file.c']))
self.assertFalse(test(['cc', 'this.o', 'that.o', '-o', 'a.out']))
- self.assertFalse(test(['cc', '-print-prog-name']))
def test_format_entry_normalize_filename(self):
- directory = os.path.join(os.sep, 'home', 'me', 'project')
+ parent = os.path.join(os.sep, 'home', 'me')
+ current = os.path.join(parent, 'project')
- def test(command):
- result = list(sut.format_entry(
- {'command': command, 'directory': directory}))
- return result[0]['file']
+ def test(filename):
+ trace = {'directory': current, 'command': ['cc', '-c', filename]}
+ return list(sut.format_entry(trace))[0]['file']
- self.assertEqual(test(['cc', '-c', 'file.c']),
- os.path.join(directory, 'file.c'))
- self.assertEqual(test(['cc', '-c', './file.c']),
- os.path.join(directory, 'file.c'))
- self.assertEqual(test(['cc', '-c', '../file.c']),
- os.path.join(os.path.dirname(directory), 'file.c'))
- self.assertEqual(test(['cc', '-c', '/opt/file.c']),
- '/opt/file.c')
+ self.assertEqual(os.path.join(current, 'file.c'), test('file.c'))
+ self.assertEqual(os.path.join(current, 'file.c'), test('./file.c'))
+ self.assertEqual(os.path.join(parent, 'file.c'), test('../file.c'))
+ self.assertEqual(os.path.join(current, 'file.c'),
+ test(os.path.join(current, 'file.c')))
def test_sip(self):
def create_status_report(filename, message):
@@ -92,7 +67,7 @@
OSX = 'darwin'
LINUX = 'linux'
- with fixtures.TempDir() as tmpdir:
+ with libear.TemporaryDirectory() as tmpdir:
try:
saved = os.environ['PATH']
os.environ['PATH'] = tmpdir + ':' + saved