Skip to content

Commit dc3ec3f

Browse files
authored
refs #12274 - test/cli/suppress-syntaxError_test.py: made it location-independent (danmar#6638)
1 parent 4a38b00 commit dc3ec3f

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed
Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,28 +1,31 @@
11

22
# python -m pytest test-suppress-syntaxError.py
33

4+
import os
45
from testutils import cppcheck
56

7+
__script_dir = os.path.dirname(os.path.abspath(__file__))
8+
69
def test_j():
7-
ret, stdout, stderr = cppcheck(['-q', '--error-exitcode=1', '-j2', '-q', 'proj-suppress-syntaxError'])
10+
ret, stdout, stderr = cppcheck(['-q', '--error-exitcode=1', '-j2', '-q', 'proj-suppress-syntaxError'], cwd=__script_dir)
811
assert ret == 1, stdout
912
assert len(stderr) > 0
1013

1114
def test_suppress_j():
12-
ret, stdout, stderr = cppcheck(['-q', '--error-exitcode=1', '--suppress=*:proj-suppress-syntaxError/*', '-j2', '-q', 'proj-suppress-syntaxError'])
15+
ret, stdout, stderr = cppcheck(['-q', '--error-exitcode=1', '--suppress=*:proj-suppress-syntaxError/*', '-j2', '-q', 'proj-suppress-syntaxError'], cwd=__script_dir)
1316
assert ret == 0, stdout
1417
assert len(stderr) == 0
1518

1619
# TODO: test with -j2
1720
def test_safety_suppress_syntax_error_implicitly(tmpdir):
18-
ret, stdout, stderr = cppcheck(['-q', '--safety', '--suppress=*', 'proj-suppress-syntaxError', '-j1'], remove_checkers_report=False)
21+
ret, stdout, stderr = cppcheck(['-q', '--safety', '--suppress=*', 'proj-suppress-syntaxError', '-j1'], remove_checkers_report=False, cwd=__script_dir)
1922
assert ret == 1, stdout
2023
assert '[syntaxError]' in stderr
2124
assert 'Active checkers: There was critical errors' in stderr
2225

2326
# TODO: test with -j2
2427
def test_safety_suppress_syntax_error_explicitly():
25-
ret, stdout, stderr = cppcheck(['-q', '--safety', '--suppress=syntaxError', 'proj-suppress-syntaxError', '-j1'], remove_checkers_report=False)
28+
ret, stdout, stderr = cppcheck(['-q', '--safety', '--suppress=syntaxError', 'proj-suppress-syntaxError', '-j1'], remove_checkers_report=False, cwd=__script_dir)
2629
assert ret == 1, stdout
2730
assert '[syntaxError]' not in stderr
2831
assert 'Active checkers: There was critical errors' in stderr

0 commit comments

Comments
 (0)