diff --git a/.github/workflows/lint.yml b/.github/workflows/lint.yml index 718b8b1b..7a3acbf2 100644 --- a/.github/workflows/lint.yml +++ b/.github/workflows/lint.yml @@ -19,8 +19,8 @@ jobs: - name: Install dependencies run: | - ./setup.sh --user - ./setup-dev.sh --user + ./setup.sh + ./setup-dev.sh - name: Run linters run: | diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml index 1ad20948..e2d7a48b 100644 --- a/.github/workflows/tests.yml +++ b/.github/workflows/tests.yml @@ -19,18 +19,17 @@ jobs: - name: Install dependencies run: | - ./setup.sh --user - ./setup-dev.sh --user - pip install --user coveralls + ./setup.sh + ./setup-dev.sh - name: Python version info run: | echo 'GDB py:' gdb --batch --quiet --nx --nh --ex 'py import sys; print(sys.version)' echo 'Installed py:' - python -V + ./.venv/bin/python -V echo 'Installed packages:' - python -m pip freeze + ./.venv/bin/python -m pip freeze # We set `kernel.yama.ptrace_scope=0` for `attachp` command tests - name: Run tests @@ -42,8 +41,8 @@ jobs: - name: Process coverage data if: matrix.os == 'ubuntu-22.04' run: | - coverage combine - coverage xml + ./.venv/bin/coverage combine + ./.venv/bin/coverage xml - name: "Upload coverage to Codecov" if: matrix.os == 'ubuntu-22.04' @@ -63,8 +62,8 @@ jobs: - name: Install dependencies run: | - ./setup.sh --user - ./setup-dev.sh --user + ./setup.sh + ./setup-dev.sh mkdir .cov - name: Set up cache for QEMU images @@ -92,8 +91,8 @@ jobs: - name: Process coverage data run: | - coverage combine - coverage xml + ./.venv/bin/coverage combine + ./.venv/bin/coverage xml - name: Upload coverage to Codecov uses: codecov/codecov-action@v3 diff --git a/dev-requirements.txt b/dev-requirements.txt index 8d14f810..05f366a4 100644 --- a/dev-requirements.txt +++ b/dev-requirements.txt @@ -1,12 +1,16 @@ black==22.8.0; python_version < '3.7' black==23.3.0; python_version >= '3.7' -coverage==6.2; python_version < '3.7' -coverage==7.2.6; python_version >= '3.7' +coverage[toml]==6.2; python_version < '3.7' +coverage[toml]==7.2.6; python_version >= '3.7' +tomli==1.2.3 ; python_version < '3.7' +tomli==2.0.1 ; python_version >= '3.7' isort==5.10.1; python_version <= '3.7' isort==5.12.0; python_version > '3.7' mypy==1.3.0; python_version >= '3.7' pytest==7.0.1; python_version < '3.7' pytest==7.3.1; python_version >= '3.7' +pytest-cov==4.0.0 ; python_version < '3.7' +pytest-cov==4.1.0 ; python_version >= '3.7' rich==12.6.0; python_version < '3.7' rich==13.3.5; python_version >= '3.7' ruff==0.0.270; python_version >= '3.7' diff --git a/setup.sh b/setup.sh index 9259f4cd..664bff30 100755 --- a/setup.sh +++ b/setup.sh @@ -69,21 +69,16 @@ install_pacman() { } usage() { - echo "Usage: $0 [--update] [--user]" + echo "Usage: $0 [--update]" echo " --update: Install/update dependencies without checking ~/.gdbinit" - echo " --user: Install pip dependencies to the user's home directory" } UPDATE_MODE= -USER_MODE= for arg in "$@"; do case $arg in --update) UPDATE_MODE=1 ;; - --user) - USER_MODE=1 - ;; -h | --help) set +x usage diff --git a/tests/gdb-tests/tests.sh b/tests/gdb-tests/tests.sh index e4c9c6c0..dc30c51e 100755 --- a/tests/gdb-tests/tests.sh +++ b/tests/gdb-tests/tests.sh @@ -101,7 +101,7 @@ run_gdb() { # NOTE: We run tests under GDB sessions and because of some cleanup/tests dependencies problems # we decided to run each test in a separate GDB session -gdb_args=(--command $GDB_INIT_PATH --command pytests_collect.py) +gdb_args=(--init-command $GDB_INIT_PATH --command pytests_collect.py) TESTS_COLLECT_OUTPUT=$(run_gdb "${gdb_args[@]}") if [ $? -eq 1 ]; then @@ -117,7 +117,7 @@ TESTS_LIST=($(echo -E "$TESTS_COLLECT_OUTPUT" | grep -o "tests/.*::.*" | grep "$ run_test() { test_case="$1" - gdb_args=(--command $GDB_INIT_PATH --command pytests_launcher.py) + gdb_args=(--init-command $GDB_INIT_PATH --command pytests_launcher.py) if [ ${RUN_CODECOV} -ne 0 ]; then gdb_args=(-ex 'py import coverage;coverage.process_startup()' "${gdb_args[@]}") fi