scripts/run_tests.sh: remove windows_tests

To further trim down run_tests.sh, move the functionality of
windows_tests() directly into .travis.yml.
This commit is contained in:
Eric Biggers 2020-10-18 14:21:26 -07:00
parent 416fea5fad
commit 63efed8dee
2 changed files with 3 additions and 21 deletions

View File

@ -39,7 +39,9 @@ matrix:
- sudo apt-get install -y libz-dev valgrind
gcc-mingw-w64-x86-64 libz-mingw-w64-dev
script:
- scripts/run_tests.sh gzip windows
- scripts/run_tests.sh gzip
- make CC=i686-w64-mingw32-gcc CFLAGS=-Werror all test_programs
- make CC=x86_64-w64-mingw32-gcc CFLAGS=-Werror all test_programs
- name: Basic tests (old Linux distro, gcc)
os: linux

View File

@ -209,25 +209,6 @@ freestanding_tests() {
###############################################################################
windows_tests() {
local arch
test_group_included windows || return 0
# Windows: currently compiled but not run
for arch in i686 x86_64; do
local compiler=${arch}-w64-mingw32-gcc
if ! type -P $compiler > /dev/null; then
log_skip "$compiler not found"
continue
fi
run_cmd make CC=$compiler CFLAGS=-Werror -j$NPROC \
all test_programs
done
}
###############################################################################
gzip_tests() {
test_group_included gzip || return 0
@ -264,7 +245,6 @@ log " TESTDATA=$TESTDATA"
native_tests
freestanding_tests
windows_tests
gzip_tests
if (( TESTS_SKIPPED )); then