Skip to content

Commit 826be78

Browse files
committed
[ci] Update pytest verbosity, drop OSX-clang16 cppyy jobs
1 parent a4e908e commit 826be78

File tree

1 file changed

+8
-8
lines changed

1 file changed

+8
-8
lines changed

.github/workflows/ci.yml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -553,12 +553,12 @@ jobs:
553553
clang-runtime: '17'
554554
cling: Off
555555
cppyy: On
556-
- name: osx14-arm-clang-clang-repl-16-cppyy
556+
- name: osx14-arm-clang-clang-repl-16
557557
os: macos-14
558558
compiler: clang
559559
clang-runtime: '16'
560560
cling: Off
561-
cppyy: On
561+
cppyy: Off
562562
- name: osx14-arm-clang-clang13-cling-cppyy
563563
os: macos-14
564564
compiler: clang
@@ -584,12 +584,12 @@ jobs:
584584
clang-runtime: '17'
585585
cling: Off
586586
cppyy: On
587-
- name: osx13-x86-clang-clang-repl-16-cppyy
587+
- name: osx13-x86-clang-clang-repl-16
588588
os: macos-13
589589
compiler: clang
590590
clang-runtime: '16'
591591
cling: Off
592-
cppyy: On
592+
cppyy: Off
593593
- name: osx13-x86-clang-clang13-cling-cppyy
594594
os: macos-13
595595
compiler: clang
@@ -1018,21 +1018,21 @@ jobs:
10181018
echo ::endgroup::
10191019
echo ::group::Run complete test suite
10201020
set -o pipefail
1021-
python -m pytest -sv | tee complete_testrun.log 2>&1
1021+
python -m pytest -sv -ra | tee complete_testrun.log 2>&1
10221022
set +o pipefail
10231023
echo ::group::Crashing Test Logs
10241024
# See if we don't have a crash that went away
10251025
# Comment out all xfails but the ones that have a run=False condition.
10261026
find . -name "*.py" -exec sed -i '/run=False/!s/^ *@mark.xfail\(.*\)/#&/' {} \;
1027-
python -m pytest -n 1 -m "xfail" --runxfail -sv --max-worker-restart 512 | tee test_crashed.log 2>&1 || true
1027+
python -m pytest -n 1 -m "xfail" --runxfail -sv -ra --max-worker-restart 512 | tee test_crashed.log 2>&1 || true
10281028
git checkout .
10291029
echo ::endgroup::
10301030
echo ::group::XFAIL Test Logs
10311031
# Rewrite all xfails that have a run clause to skipif. This way we will
10321032
# avoid conditionally crashing xfails
10331033
find . -name "*.py" -exec sed -i -E 's/(^ *)@mark.xfail\(run=(.*)/\[email protected](condition=not \2/g' {} \;
10341034
# See if we don't have an xfail that went away
1035-
python -m pytest --runxfail -sv | tee test_xfailed.log 2>&1 || true
1035+
python -m pytest --runxfail -sv -ra | tee test_xfailed.log 2>&1 || true
10361036
git checkout .
10371037
echo ::endgroup::
10381038
echo ::group::Passing Test Logs
@@ -1047,7 +1047,7 @@ jobs:
10471047
echo "Running valgrind on passing tests"
10481048
CLANG_VERSION="${{ matrix.clang-runtime }}"
10491049
SUPPRESSION_FILE="../etc/clang${CLANG_VERSION}-valgrind.supp"
1050-
valgrind --show-error-list=yes --error-exitcode=1 --track-origins=yes --suppressions="${SUPPRESSION_FILE}" --suppressions=../etc/valgrind-cppyy-cling.supp python -m pytest -m "not xfail" -v
1050+
valgrind --show-error-list=yes --error-exitcode=1 --track-origins=yes --suppressions="${SUPPRESSION_FILE}" --suppressions=../etc/valgrind-cppyy-cling.supp python -m pytest -m "not xfail" -sv -ra
10511051
fi
10521052
export RETCODE=+$?
10531053
echo ::endgroup::

0 commit comments

Comments
 (0)