Skip to content

Commit 4604b6e

Browse files
authored
run test/cli Python tests from root dir now they are location-independent (danmar#6658)
1 parent 551fcfd commit 4604b6e

File tree

5 files changed

+29
-34
lines changed

5 files changed

+29
-34
lines changed

.github/workflows/CI-unixish.yml

Lines changed: 17 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -309,30 +309,37 @@ jobs:
309309
run: |
310310
tools/generate_and_run_more_tests.sh
311311
312-
# do not use pushd in this step since we go below the working directory
313312
- name: Run test/cli
314313
run: |
315-
cd test/cli
316-
python3 -m pytest -Werror --strict-markers -vv
317-
cd ../../..
314+
python3 -m pytest -Werror --strict-markers -vv test/cli
315+
316+
# TODO: use the step below instead
317+
# do not use pushd in this step since we go below the working directory
318+
- name: Run test/cli (symlink)
319+
run: |
320+
cd ..
318321
ln -s cppcheck 'cpp check'
319322
cd 'cpp check/test/cli'
320323
python3 -m pytest -Werror --strict-markers -vv
321324
322-
# do not use pushd in this step since we go below the working directory
325+
# FIXME: proj2_test.py fails because of the relative path cleanups in ImportProject::setRelativePaths()
326+
# It fails because the application path used as base path has its symlink resolved by getcwd().
327+
- name: Run test/cli (symlink)
328+
if: false
329+
run: |
330+
ln -s . 'cpp check'
331+
python3 -m pytest -Werror --strict-markers -vv 'cpp check/test/cli'
332+
323333
- name: Run test/cli (-j2)
324334
run: |
325-
cd test/cli
326-
python3 -m pytest -Werror --strict-markers -vv
335+
python3 -m pytest -Werror --strict-markers -vv test/cli
327336
env:
328337
TEST_CPPCHECK_INJECT_J: 2
329338

330-
# do not use pushd in this step since we go below the working directory
331339
- name: Run test/cli (--clang)
332340
if: false
333341
run: |
334-
cd test/cli
335-
python3 -m pytest -Werror --strict-markers -vv
342+
python3 -m pytest -Werror --strict-markers -vv test/cli
336343
env:
337344
TEST_CPPCHECK_INJECT_CLANG: clang
338345

.github/workflows/CI-windows.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -172,23 +172,20 @@ jobs:
172172
- name: Run test/cli
173173
if: matrix.config == 'release'
174174
run: |
175-
cd test/cli || exit /b !errorlevel!
176-
python -m pytest -Werror --strict-markers -vv || exit /b !errorlevel!
175+
python -m pytest -Werror --strict-markers -vv test/cli || exit /b !errorlevel!
177176
178177
- name: Run test/cli (-j2)
179178
if: matrix.config == 'release'
180179
run: |
181-
cd test/cli || exit /b !errorlevel!
182-
python -m pytest -Werror --strict-markers -vv || exit /b !errorlevel!
180+
python -m pytest -Werror --strict-markers -vv test/cli || exit /b !errorlevel!
183181
env:
184182
TEST_CPPCHECK_INJECT_J: 2
185183

186184
# TODO: install clang
187185
- name: Run test/cli (--clang)
188186
if: false # matrix.config == 'release'
189187
run: |
190-
cd test/cli || exit /b !errorlevel!
191-
python -m pytest -Werror --strict-markers -vv || exit /b !errorlevel!
188+
python -m pytest -Werror --strict-markers -vv test/cli || exit /b !errorlevel!
192189
env:
193190
TEST_CPPCHECK_INJECT_CLANG: clang
194191

.github/workflows/asan.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -100,23 +100,20 @@ jobs:
100100
- name: Run test/cli
101101
run: |
102102
pwd=$(pwd)
103-
cd test/cli
104-
TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv
103+
TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv test/cli
105104
106105
- name: Run test/cli (-j2)
107106
run: |
108107
pwd=$(pwd)
109-
cd test/cli
110-
TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv
108+
TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv test/cli
111109
env:
112110
TEST_CPPCHECK_INJECT_J: 2
113111

114112
- name: Run test/cli (--clang)
115113
if: false
116114
run: |
117115
pwd=$(pwd)
118-
cd test/cli
119-
TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv
116+
TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv test/cli
120117
env:
121118
TEST_CPPCHECK_INJECT_CLANG: clang
122119

.github/workflows/tsan.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,25 +99,22 @@ jobs:
9999
- name: Run test/cli
100100
run: |
101101
pwd=$(pwd)
102-
cd test/cli
103-
TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv
102+
TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv test/cli
104103
env:
105104
TEST_CPPCHECK_INJECT_EXECUTOR: thread
106105

107106
- name: Run test/cli (-j2)
108107
run: |
109108
pwd=$(pwd)
110-
cd test/cli
111-
TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv
109+
TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv test/cli
112110
env:
113111
TEST_CPPCHECK_INJECT_J: 2
114112

115113
- name: Run test/cli (--clang)
116114
if: false
117115
run: |
118116
pwd=$(pwd)
119-
cd test/cli
120-
TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv
117+
TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv test/cli
121118
env:
122119
TEST_CPPCHECK_INJECT_CLANG: clang
123120

.github/workflows/ubsan.yml

Lines changed: 3 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -99,23 +99,20 @@ jobs:
9999
- name: Run test/cli
100100
run: |
101101
pwd=$(pwd)
102-
cd test/cli
103-
TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv
102+
TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv test/cli
104103
105104
- name: Run test/cli (-j2)
106105
run: |
107106
pwd=$(pwd)
108-
cd test/cli
109-
TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv
107+
TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv test/cli
110108
env:
111109
TEST_CPPCHECK_INJECT_J: 2
112110

113111
- name: Run test/cli (--clang)
114112
if: false
115113
run: |
116114
pwd=$(pwd)
117-
cd test/cli
118-
TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv
115+
TEST_CPPCHECK_EXE_LOOKUP_PATH="$pwd/cmake.output" python3 -m pytest -Werror --strict-markers -vv test/cli
119116
env:
120117
TEST_CPPCHECK_INJECT_CLANG: clang
121118

0 commit comments

Comments
 (0)