Gitlab CI: Call pytest directly
Running CTest currently gives no indication of which test failed. Run pytest directly instead to have usable output on failure.
This commit is contained in:
parent
8059a33b3b
commit
33efc751e9
|
@ -228,7 +228,7 @@ variables:
|
||||||
- printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
|
- printf "\e[0Ksection_end:%s:cmake_section\r\e[0K" "$( date +%s)"
|
||||||
- ninja
|
- ninja
|
||||||
- ninja test-programs
|
- ninja test-programs
|
||||||
- ctest --parallel 4 --output-on-failure
|
- pytest
|
||||||
after_script:
|
after_script:
|
||||||
# The cache should be large enough to be useful but it shouldn't take
|
# The cache should be large enough to be useful but it shouldn't take
|
||||||
# too long to restore+save each run.
|
# too long to restore+save each run.
|
||||||
|
@ -423,7 +423,7 @@ Win64 Package:
|
||||||
aws s3 cp "$package" "$env:S3_DESTINATION_WIN64/"
|
aws s3 cp "$package" "$env:S3_DESTINATION_WIN64/"
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
- ctest -C RelWithDebInfo --parallel 3 --force-new-ctest-process --output-on-failure
|
- C:\Windows\py.exe -m pytest
|
||||||
|
|
||||||
macOS Arm Package:
|
macOS Arm Package:
|
||||||
stage: build
|
stage: build
|
||||||
|
@ -455,7 +455,7 @@ macOS Arm Package:
|
||||||
fi
|
fi
|
||||||
- cd ..
|
- cd ..
|
||||||
- ninja test-programs
|
- ninja test-programs
|
||||||
- ctest --parallel 4 --output-on-failure
|
- pytest
|
||||||
needs: []
|
needs: []
|
||||||
|
|
||||||
macOS Intel Package:
|
macOS Intel Package:
|
||||||
|
@ -489,7 +489,7 @@ macOS Intel Package:
|
||||||
fi
|
fi
|
||||||
- cd ..
|
- cd ..
|
||||||
- ninja test-programs
|
- ninja test-programs
|
||||||
- ctest --parallel 4 --output-on-failure
|
- pytest
|
||||||
needs: []
|
needs: []
|
||||||
|
|
||||||
# Build the User's Guide and Developer's Guide
|
# Build the User's Guide and Developer's Guide
|
||||||
|
@ -569,7 +569,7 @@ GCC Release Build:
|
||||||
- chown -R user .
|
- chown -R user .
|
||||||
- if [ -f run/dumpcap ]; then setcap cap_net_raw,cap_net_admin+eip run/dumpcap; fi
|
- if [ -f run/dumpcap ]; then setcap cap_net_raw,cap_net_admin+eip run/dumpcap; fi
|
||||||
- if [ -f run/dumpcap ]; then su user -c "run/dumpcap -D" ; fi
|
- if [ -f run/dumpcap ]; then su user -c "run/dumpcap -D" ; fi
|
||||||
- su user -c "ctest --parallel $(getconf _NPROCESSORS_ONLN) --force-new-ctest-process --output-on-failure"
|
- su user -c pytest-3
|
||||||
artifacts:
|
artifacts:
|
||||||
paths:
|
paths:
|
||||||
- gcc_report.html
|
- gcc_report.html
|
||||||
|
@ -643,7 +643,7 @@ Windows Build:
|
||||||
- cmake -G "Visual Studio 17 2022" -A x64 -DENABLE_LTO=off ..
|
- cmake -G "Visual Studio 17 2022" -A x64 -DENABLE_LTO=off ..
|
||||||
- msbuild /verbosity:minimal /maxcpucount Wireshark.sln
|
- msbuild /verbosity:minimal /maxcpucount Wireshark.sln
|
||||||
- msbuild /verbosity:minimal /maxcpucount test-programs.vcxproj
|
- msbuild /verbosity:minimal /maxcpucount test-programs.vcxproj
|
||||||
- ctest -C RelWithDebInfo --parallel 3 --force-new-ctest-process --output-on-failure
|
- C:\Windows\py.exe -m pytest
|
||||||
|
|
||||||
Windows Qt5 Build:
|
Windows Qt5 Build:
|
||||||
extends: .build-windows
|
extends: .build-windows
|
||||||
|
|
Loading…
Reference in New Issue