Skip to content

Commit

Permalink
Revert "adjust xvfb call in testing"
Browse files Browse the repository at this point in the history
This reverts commit 075402c.

(cherry picked from commit 78c7b3d)
  • Loading branch information
wahln committed Mar 23, 2023
1 parent 99336e0 commit 5a8c7f9
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 5 deletions.
10 changes: 7 additions & 3 deletions .github/runtests.sh
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,6 @@ function exitIfError {
# currently octave 6 can finish with a segfault when the program is closed due to some bug, for now we try to ignore it
if [ "$1" -ne 0 ] && [ "$1" -ne 139 ]; then
exit $1;
else
exit 0;
fi
}

Expand Down Expand Up @@ -41,5 +39,11 @@ export CONTINUOUS_INTEGRATION=true
export CI=true

## Actually run the test suite
${Runner} ${Switches} "matRad_runTests" > ../runtests.log #2> ../runtests.err put stdout to log, but let it print error messages
cd unitTest
TESTDIR=`pwd`
# also CD in MATLAB/Octave to make sure that startup files
# cannot play any role in setting the path
${Runner} ${Switches} "cd('${TESTDIR}'); matRad_runTests" > ../runtests.log #2> ../runtests.err put stdout to log, but let it print error messages
exitIfError $?
cd ..

3 changes: 1 addition & 2 deletions .github/workflows/tests.yml
Original file line number Diff line number Diff line change
Expand Up @@ -29,11 +29,10 @@ jobs:
uses: GabrielBB/xvfb-action@v1 #For Headless tests
with:
run: .github/runtests.sh octave-cli
working-directory: ./unitTest
- name: Upload logs if test fails
uses: actions/upload-artifact@v3
if: failure()
with:
name: Test Log
path: ./unitTest/runtests.log
path: runtests.log

0 comments on commit 5a8c7f9

Please sign in to comment.