Skip to content

Commit c37f3b1

Browse files
authored
[ci] Cppyy tests - fix pytest failing (#233)
* Cppyy tests - try normal pytest first * Fix boost/eigen installation for OSX
1 parent 439883b commit c37f3b1

File tree

1 file changed

+6
-20
lines changed

1 file changed

+6
-20
lines changed

.github/workflows/ci.yml

Lines changed: 6 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -810,6 +810,9 @@ jobs:
810810
sudo apt install git g++ debhelper devscripts gnupg python3 valgrind
811811
sudo apt autoremove
812812
sudo apt clean
813+
# Install libraries used by the cppyy test suite
814+
sudo apt install libeigen3-dev
815+
sudo apt install libboost-all-dev
813816
814817
- name: Install deps on MacOS
815818
if: runner.os == 'macOS'
@@ -821,6 +824,8 @@ jobs:
821824
brew link --overwrite "$pkg"
822825
done
823826
brew upgrade
827+
brew install eigen
828+
brew install boost
824829
pip install distro pytest
825830
826831
- name: Restore Cache LLVM/Clang runtime build directory
@@ -1077,9 +1082,6 @@ jobs:
10771082
continue-on-error: true
10781083
if: ${{ (runner.os != 'windows') && (matrix.cppyy == 'On') && (matrix.xeus-clang-repl != 'On') }}
10791084
run: |
1080-
# Install libraries used by the cppyy test suite
1081-
sudo apt install libeigen3-dev
1082-
sudo apt install libboost-all-dev
10831085
# Run the tests
10841086
source .venv/bin/activate
10851087
cd cppyy/test
@@ -1091,23 +1093,7 @@ jobs:
10911093
python -m pip install numba
10921094
echo ::endgroup::
10931095
echo ::group::Run complete test suite
1094-
python -m pytest --tb=short -ra -sv> pytest_dump.log 2>&1 || :
1095-
last_line=$(tail -n 1 pytest_dump.log)
1096-
passed=$(echo "$last_line" | grep -oP "\d+ passed")
1097-
failed=$(echo "$last_line" | grep -oP "\d+ failed")
1098-
skipped=$(echo "$last_line" | grep -oP "\d+ skipped")
1099-
xpassed=$(echo "$last_line" | grep -oP "\d+ xpassed")
1100-
xfailed=$(echo "$last_line" | grep -oP "\d+ xfailed")
1101-
errors=$(echo "$last_line" | grep -oP "\d+ errors")
1102-
echo -e "\e[32mPASS: $passed\e[0m"
1103-
echo -e "\e[31mFAIL: $failed\e[0m"
1104-
echo -e "\e[33mSKIP: $skipped\e[0m"
1105-
echo -e "\e[33mXPASS: $xpassed\e[0m"
1106-
echo -e "\e[33mXFAIL: $xfailed\e[0m"
1107-
echo -e "\e[33mERRORS: $errors\e[0m"
1108-
echo ::endgroup::
1109-
echo "Cppyy Test Logs:"
1110-
tail -n1 pytest_dump.log
1096+
python -m pytest
11111097
echo ::group::Crashing Test Logs
11121098
# See if we don't have a crash that went away
11131099
# Comment out all xfails but the ones that have a run=False condition.

0 commit comments

Comments
 (0)