adjusted several Python tests to accommodate for the build dir usage [skip ci]

Author: firewave

test/cli/helloworld_test.py

@@ -290,24 +290,25 @@ def test_checkers_report(tmpdir):
     filename = os.path.join(tmpdir, '1.txt')
     args = [
         f'--checkers-report={filename}',
+        '--no-cppcheck-build-dir',  # TODO: remove this
         'helloworld'
     ]
 
     cppcheck(args, cwd=__script_dir)
 
     with open(filename, 'rt') as f:
-        data = f.read()
-        assert 'No   CheckAutoVariables::assignFunctionArg' in data
-        assert 'Yes  CheckAutoVariables::autoVariables' in data
+        data = f.read().splitlines()
+        assert 'No   CheckAutoVariables::assignFunctionArg                     require:style,warning' in data, json.dumps(data, indent=4)
+        assert 'Yes  CheckAutoVariables::autoVariables' in data, json.dumps(data, indent=4)
 
     args += [
         '--enable=style'
     ]
     cppcheck(args, cwd=__script_dir)
     with open(filename, 'rt') as f:
-        data = f.read()
+        data = f.read().splitlines()
         # checker has been activated by --enable=style
-        assert 'Yes  CheckAutoVariables::assignFunctionArg' in data
+        assert 'Yes  CheckAutoVariables::assignFunctionArg' in data, json.dumps(data, indent=4)
 
 
 def test_missing_include_system():  # #11283

test/cli/other_test.py

@@ -820,13 +820,6 @@ def test_unused_function_include(tmpdir):
     __test_unused_function_include(tmpdir, [])
 
 
-# TODO: remove when we inject builddir
-def test_unused_function_include_builddir(tmpdir):
-    builddir = os.path.join(tmpdir, 'injected')
-    os.makedirs(builddir)
-    __test_unused_function_include(tmpdir, ['--cppcheck-build-dir={}'.format(builddir)])
-
-
 # TODO: test with all other types
 def test_showtime_top5_file(tmpdir):
     test_file = os.path.join(tmpdir, 'test.cpp')

test/cli/qml_test.py

@@ -35,7 +35,7 @@ def __test_unused_functions(extra_args):
 
 
 def test_unused_functions():
-    __test_unused_functions(['-j1'])
+    __test_unused_functions(['-j1', '--no-cppcheck-build-dir'])
 
 
 def test_unused_functions_j():
@@ -45,6 +45,7 @@ def test_unused_functions_j():
         '--library=qt',
         '--enable=unusedFunction',
         '-j2',
+        '--no-cppcheck-build-dir',
         __project_dir
     ]
     ret, stdout, stderr = cppcheck(args)

test/cli/whole-program_test.py

@@ -220,8 +220,11 @@ def test_addon_rerun(tmp_path, builddir):
         '--enable=style',
         '--template={id}',
         'whole-program']
+    # do not use the injection because the directory needs to survive runs
     if builddir:
         args.append('--cppcheck-build-dir=' + str(tmp_path))
+    else:
+        args.append('--no-cppcheck-build-dir')
     _, _, stderr = cppcheck(args, cwd=__script_dir)
     assert 'misra-c2012-5.8' in stderr
     _, _, stderr = cppcheck(args, cwd=__script_dir)
@@ -293,10 +296,9 @@ def test_checkclass():
     __test_checkclass(['-j1'])
 
 
-# whole program analysis requires a build dir with -j
-@pytest.mark.xfail(strict=True)
+@pytest.mark.xfail(strict=True) # TODO: check error
 def test_checkclass_j():
-    __test_checkclass(['-j2'])
+    __test_checkclass(['-j2', '--no-cppcheck-build-dir'])
 
 
 def test_checkclass_builddir(tmpdir):
@@ -305,6 +307,11 @@ def test_checkclass_builddir(tmpdir):
     __test_checkclass(['--cppcheck-build-dir={}'.format(build_dir)])
 
 
+def test_checkclass_builddir_j(tmpdir):
+    build_dir = os.path.join(tmpdir, 'b1')
+    os.mkdir(build_dir)
+    __test_checkclass(['-j2', '--cppcheck-build-dir={}'.format(build_dir)])
+
 def __test_checkclass_project(tmpdir, extra_args):
     odr_file_1 = os.path.join(__script_dir, 'whole-program', 'odr1.cpp')
 
@@ -336,14 +343,18 @@ def test_checkclass_project(tmpdir):
     __test_checkclass_project(tmpdir, ['-j1'])
 
 
-# whole program analysis requires a build dir with -j
-@pytest.mark.xfail(strict=True)
+@pytest.mark.xfail(strict=True) # TODO: check error
 def test_checkclass_project_j(tmpdir):
-    __test_checkclass_project(tmpdir, ['-j2'])
+    __test_checkclass_project(tmpdir, ['-j2', '--no-cppcheck-build-dir'])
 
 
 def test_checkclass_project_builddir(tmpdir):
     build_dir = os.path.join(tmpdir, 'b1')
     os.mkdir(build_dir)
     __test_checkclass_project(tmpdir, ['-j1', '--cppcheck-build-dir={}'.format(build_dir)])
 
+
+def test_checkclass_project_builddir_j(tmpdir):
+    build_dir = os.path.join(tmpdir, 'b1')
+    os.mkdir(build_dir)
+    __test_checkclass_project(tmpdir, ['-j2', '--cppcheck-build-dir={}'.format(build_dir)])