12254: another test fix

Author: olabetskyi

test/cli/test-other.py

@@ -6,7 +6,7 @@
 import pytest
 import time
 
-from testutils import cppcheck, assert_cppcheck
+from testutils import cppcheck, assert_cppcheck, copy_and_prepare_cppcheck
 
 
 def __test_missing_include(tmpdir, use_j):
@@ -865,6 +865,10 @@ def test_build_dir_j_memleak(tmpdir): #12111
 def test_premium_with_relative_path(tmpdir):
     product_name = 'Cppcheck Premium ' + str(time.time())
 
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write('int main() {}')
+
     test_cfg = tmpdir.join('cppcheck.cfg')
     with open(test_cfg, 'wt') as f:
         f.write("""
@@ -875,13 +879,48 @@ def test_premium_with_relative_path(tmpdir):
                 }
                 """.replace('NAME', product_name))
 
-    args = ['--premium=misra-c++-2008', 'test.c']
+    args = ['--premium=misra-c++-2008', test_file]
 
-    exitcode, _, stderr = cppcheck(args, None, True, tmpdir)
-    assert exitcode == 0
+
+    cppcheck_exe = copy_and_prepare_cppcheck(tmpdir)
+
+    exitcode, _, stderr = cppcheck(args, None, True, cppcheck_exe)
     assert stderr == ''
+    assert exitcode == 0
 
-    exitcode, stdout, stderr = cppcheck(['--version'], None, True, tmpdir)
+
+    exitcode, stdout, stderr = cppcheck(['--version'], None, True, cppcheck_exe)
     assert stdout == product_name + '\n'
     assert stderr == ''
     assert exitcode == 0
+
+    os.remove(test_cfg)
+
+    exitcode, stdout, stderr = cppcheck(['--premium=misra-c++-2008'], None, cppcheck_exe)
+    assert stderr == ''
+    assert stdout == 'cppcheck: error: unrecognized command line option: "--premium=misra-c++-2008".\n'
+    assert exitcode == 1
+
+    exitcode, stdout, stderr = cppcheck(['--version'], None, cppcheck_exe)
+    assert stderr == ''
+    assert stdout == 'Cppcheck 2.13 dev' + '\n'
+    assert exitcode == 0
+
+def test_premium_with_relative_path2(tmpdir):
+    product_name = 'Cppcheck Premium ' + str(time.time())
+
+    test_file = os.path.join(tmpdir, 'test.cpp')
+    with open(test_file, 'wt') as f:
+        f.write('int main() {}')
+
+    args = ['--premium=misra-c++-2008', test_file]
+
+    exitcode, stdout, stderr = cppcheck(args, None)
+    assert stderr == ''
+    assert stdout == 'cppcheck: error: unrecognized command line option: "--premium=misra-c++-2008".\n'
+    assert exitcode == 1
+
+    exitcode, stdout, stderr = cppcheck(['--version'], None)
+    assert stdout == 'Cppcheck 2.13 dev' + '\n'
+    assert stderr == ''
+    assert exitcode == 0

test/cli/testutils.py

@@ -49,16 +49,17 @@ def __create_temporary_copy(tmpdir, temp_file_name):
     return temp_path
 
 
-def __lookup_cppcheck_exe(script_path=None):
+def __lookup_cppcheck_exe(cppcheck_exe_path=None):
+
+    if cppcheck_exe_path is not None:
+        return cppcheck_exe_path
+    
     # path the script is located in
-    if script_path == None:
-        script_path = os.path.dirname(os.path.realpath(__file__))
+    script_path = os.path.dirname(os.path.realpath(__file__))
 
     exe_name = "cppcheck"
-
     if sys.platform == "win32":
         exe_name += ".exe"
-
     exe_path = None
 
     if 'TEST_CPPCHECK_EXE_LOOKUP_PATH' in os.environ:
@@ -78,31 +79,24 @@ def __lookup_cppcheck_exe(script_path=None):
     return exe_path
 
 
-def __copy_and_prepare_cppcheck(tmpdir):
-    file_name = "cppcheck"
-    if sys.platform == "win32":
-        file_name += ".exe"
-    exe = __create_temporary_copy(tmpdir, file_name)
+def copy_and_prepare_cppcheck(tmpdir):
+    exe = shutil.copy2(__lookup_cppcheck_exe(), tmpdir)
 
     #add minimum cfg
-    if not os.path.exists(tmpdir + '/cfg'):
-        test_cfg_folder = tmpdir.mkdir('cfg')
-        test_cfg = test_cfg_folder.join('std.cfg')
-        if not os.path.exists(test_cfg):
-            with open(test_cfg, 'wt') as f:
-                f.write("""
-                        <?xml version="1.0"?>
-                        <def format="2"/>
-                        """)
+    test_cfg_folder = tmpdir.mkdir('cfg')
+    test_cfg = test_cfg_folder.join('std.cfg')
+    with open(test_cfg, 'wt') as f:
+        f.write("""
+                <?xml version="1.0"?>
+                <def format="2"/>
+                """)
     return exe
 
 
 # Run Cppcheck with args
-def cppcheck(args, env=None, remove_active_checkers=True, tmpdir=None):
-    if tmpdir != None:
-        exe = __copy_and_prepare_cppcheck(tmpdir)
-    else:
-        exe = __lookup_cppcheck_exe()
+def cppcheck(args, env=None, remove_active_checkers=True, cppcheck_exe_path=None):
+    exe = __lookup_cppcheck_exe(cppcheck_exe_path)
+
     assert exe is not None, 'no cppcheck binary found'
 
     logging.info(exe + ' ' + ' '.join(args))