test/cli/test_other.py: added showtime tests with FileSettings [skip ci]

Author: firewave

test/cli/other_test.py

@@ -9,7 +9,7 @@
 import subprocess
 import shutil
 
-from testutils import cppcheck, assert_cppcheck, cppcheck_ex, __lookup_cppcheck_exe
+from testutils import cppcheck, assert_cppcheck, cppcheck_ex, __lookup_cppcheck_exe, create_compile_commands
 from xml.etree import ElementTree
 
 
@@ -956,9 +956,8 @@ def test_unused_function_include(tmpdir):
 
 # TODO: test with clang-tidy
 # TODO: test with --addon
-# TODO: test with FileSettings
 # TODO: test with multiple files
-def __test_showtime(tmp_path, showtime, exp_res, exp_last, extra_args=None):
+def __test_showtime(tmp_path, showtime, exp_res, exp_last, use_compdb, extra_args=None):
     test_file = tmp_path / 'test.cpp'
     with open(test_file, 'wt') as f:
         f.write(
@@ -972,10 +971,17 @@ def __test_showtime(tmp_path, showtime, exp_res, exp_last, extra_args=None):
     args = [
         f'--showtime={showtime}',
         '--quiet',
-        '--inline-suppr',
-        str(test_file)
+        '--inline-suppr'
     ]
 
+    if use_compdb:
+        compdb_file = tmp_path / 'compile_commands.json'
+        create_compile_commands(compdb_file, [test_file])
+
+        args.append(f'--project={compdb_file}')
+    else:
+        args.append(str(test_file))
+
     if extra_args:
         args += extra_args
 
@@ -994,50 +1000,87 @@ def __test_showtime(tmp_path, showtime, exp_res, exp_last, extra_args=None):
     assert stderr == ''
 
 
+def __test_showtime_top5_file(tmp_path, use_compdb):
+    __test_showtime(tmp_path, 'top5_file', 5, 'Check time: ', use_compdb)
+
+
 def test_showtime_top5_file(tmp_path):
-    __test_showtime(tmp_path, 'top5_file', 5, 'Check time: ')
+    __test_showtime_top5_file(tmp_path, False)
+
+
+def test_showtime_top5_file_compdb(tmp_path):
+    __test_showtime_top5_file(tmp_path, True)
 
 
 # TODO: remove extra args when --executor=process works works
+def __test_showtime_top5_summary(tmp_path, use_compdb):
+    __test_showtime(tmp_path, 'top5_summary', 5, 'Overall time: ', use_compdb, ['-j1'])
+
+
 def test_showtime_top5_summary(tmp_path):
-    __test_showtime(tmp_path, 'top5_summary', 5, 'Overall time: ', ['-j1'])
+    __test_showtime_top5_summary(tmp_path, False)
 
 
+def test_showtime_top5_summary_compdb(tmp_path):
+    __test_showtime_top5_summary(tmp_path, True)
+
+
+# TODO: compdb
 # TODO: remove when --executor=process works works
 def test_showtime_top5_summary_j_thread(tmp_path):
-    __test_showtime(tmp_path, 'top5_summary', 5, 'Overall time: ', ['-j2', '--executor=thread'])
+    __test_showtime(tmp_path, 'top5_summary', 5, 'Overall time: ', False, ['-j2', '--executor=thread'])
 
 
+# TODO: compdb
 # TODO: remove override when fixed
 @pytest.mark.skipif(sys.platform == 'win32', reason="requires ProcessExecutor")
 @pytest.mark.xfail(strict=True)  # TODO: need to transfer the timer results to parent process - see #4452
 def test_showtime_top5_summary_j_process(tmp_path):
-    __test_showtime(tmp_path, 'top5_summary', 5, 'Overall time: ', ['-j2', '--executor=process'])
+    __test_showtime(tmp_path, 'top5_summary', 5, 'Overall time: ', False, ['-j2', '--executor=process'])
+
+
+def __test_showtime_file(tmp_path, use_compdb):
+    __test_showtime(tmp_path, 'file', 79, 'Check time: ', use_compdb)
 
 
 def test_showtime_file(tmp_path):
-    __test_showtime(tmp_path, 'file', 79, 'Check time: ')
+    __test_showtime_file(tmp_path, False)
+
 
+def test_showtime_file_compdb(tmp_path):
+    __test_showtime_file(tmp_path, True)
 
+
+# TODO: compdb
 # TODO: remove extra args when --executor=process works works
 def test_showtime_summary(tmp_path):
-    __test_showtime(tmp_path, 'summary', 79, 'Overall time: ', ['-j1'])
+    __test_showtime(tmp_path, 'summary', 79, 'Overall time: ', False, ['-j1'])
 
 
+# TODO: compdb
 # TODO: remove when --executor=process works works
 def test_showtime_summary_j_thread(tmp_path):
-    __test_showtime(tmp_path, 'summary', 79, 'Overall time: ', ['-j2', '--executor=thread'])
+    __test_showtime(tmp_path, 'summary', 79, 'Overall time: ', False, ['-j2', '--executor=thread'])
 
 
+# TODO: compdb
 # TODO: remove override when fixed
 @pytest.mark.skipif(sys.platform == 'win32', reason="requires ProcessExecutor")
 @pytest.mark.xfail(strict=True)  # TODO: need to transfer the timer results to parent process - see #4452
 def test_showtime_summary_j_process(tmp_path):
-    __test_showtime(tmp_path, 'summary', 79, 'Overall time: ', ['-j2', '--executor=process'])
+    __test_showtime(tmp_path, 'summary', 79, 'Overall time: ', False, ['-j2', '--executor=process'])
+
+
+def __test_showtime_file_total(tmp_path, use_compdb):
+    __test_showtime(tmp_path, 'file-total', 0, 'Check time: ', use_compdb)
 
 
 def test_showtime_file_total(tmp_path):
-    __test_showtime(tmp_path, 'file-total', 0, 'Check time: ')
+    __test_showtime_file_total(tmp_path, False)
+
+
+def test_showtime_file_total_compdb(tmp_path):
+    __test_showtime_file_total(tmp_path, True)
 
 
 def test_showtime_unique(tmp_path):

test/cli/testutils.py

@@ -5,6 +5,7 @@
 import subprocess
 import time
 import tempfile
+import json
 
 # Create Cppcheck project file
 import sys
@@ -45,6 +46,22 @@ def create_gui_project_file(project_file, root_path=None, import_project=None, p
         f.write(cppcheck_xml)
 
 
+def create_compile_commands(compdb_file, files):
+    compdb = []
+    # TODO: bail out on empty list
+    for f in files:
+        compdb.append(
+            {
+                "file": str(f),
+                "directory": os.path.dirname(f),
+                "command": "gcc -c {}".format(os.path.basename(f))
+            }
+        )
+    compdb_j = json.dumps(compdb)
+    with open(compdb_file, 'wt') as f:
+        f.write(compdb_j)
+
+
 def __lookup_cppcheck_exe():
     # path the script is located in
     script_path = os.path.dirname(os.path.realpath(__file__))