mirror of
https://github.com/irungentoo/toxcore.git
synced 2024-03-22 13:30:51 +08:00
Add an OSX build that doesn't run tests.
This one is not allowed to fail and ensures that toxcore can at least be built for OSX.
This commit is contained in:
parent
fdb46f6cf2
commit
08cd61387e
11
.travis.yml
11
.travis.yml
|
@ -2,6 +2,13 @@ language: c
|
||||||
|
|
||||||
matrix:
|
matrix:
|
||||||
include:
|
include:
|
||||||
|
# OSX build comes first because Travis queues builds in order. The OSX
|
||||||
|
# builds are often pushed on a very long (100-200 jobs) backlog, so they get
|
||||||
|
# highest priority in our build sequence.
|
||||||
|
- env: JOB=toxcore ENV=osx RUN_TESTS=false
|
||||||
|
os: osx
|
||||||
|
- env: JOB=toxcore ENV=osx RUN_TESTS=true
|
||||||
|
os: osx
|
||||||
- env: JOB=hstox ENV=linux
|
- env: JOB=hstox ENV=linux
|
||||||
language: haskell
|
language: haskell
|
||||||
ghc: 7.8
|
ghc: 7.8
|
||||||
|
@ -9,8 +16,6 @@ matrix:
|
||||||
compiler: gcc
|
compiler: gcc
|
||||||
- env: JOB=toxcore ENV=linux
|
- env: JOB=toxcore ENV=linux
|
||||||
compiler: clang
|
compiler: clang
|
||||||
- env: JOB=toxcore ENV=osx
|
|
||||||
os: osx
|
|
||||||
- env: JOB=toxcore ENV=windows ARCH=i686
|
- env: JOB=toxcore ENV=windows ARCH=i686
|
||||||
services:
|
services:
|
||||||
- docker
|
- docker
|
||||||
|
@ -19,7 +24,7 @@ matrix:
|
||||||
- docker
|
- docker
|
||||||
fast_finish: true
|
fast_finish: true
|
||||||
allow_failures:
|
allow_failures:
|
||||||
- os: osx
|
- env: JOB=toxcore ENV=osx RUN_TESTS=true
|
||||||
|
|
||||||
addons:
|
addons:
|
||||||
apt:
|
apt:
|
||||||
|
|
|
@ -4,6 +4,7 @@ CMAKE=cmake
|
||||||
CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS -DFORMAT_TEST=ON"
|
CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS -DFORMAT_TEST=ON"
|
||||||
NPROC=`nproc`
|
NPROC=`nproc`
|
||||||
CURDIR=$PWD
|
CURDIR=$PWD
|
||||||
|
RUN_TESTS=true
|
||||||
|
|
||||||
RUN() {
|
RUN() {
|
||||||
"$@"
|
"$@"
|
||||||
|
|
|
@ -4,13 +4,12 @@ CMAKE=$ARCH-w64-mingw32.shared-cmake
|
||||||
CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS -DBOOTSTRAP_DAEMON=OFF -DCOMPILE_AS_CXX=ON"
|
CMAKE_EXTRA_FLAGS="$CMAKE_EXTRA_FLAGS -DBOOTSTRAP_DAEMON=OFF -DCOMPILE_AS_CXX=ON"
|
||||||
NPROC=`nproc`
|
NPROC=`nproc`
|
||||||
CURDIR=/work
|
CURDIR=/work
|
||||||
|
RUN_TESTS=false
|
||||||
|
|
||||||
RUN() {
|
RUN() {
|
||||||
./dockcross "$@"
|
./dockcross "$@"
|
||||||
}
|
}
|
||||||
|
|
||||||
ENABLE_WINDOWS_TESTS=false
|
|
||||||
|
|
||||||
TESTS() {
|
TESTS() {
|
||||||
# Download Microsoft DLLs.
|
# Download Microsoft DLLs.
|
||||||
curl http://www.dlldump.com/dllfiles/I/iphlpapi.dll -o _build/iphlpapi.dll
|
curl http://www.dlldump.com/dllfiles/I/iphlpapi.dll -o _build/iphlpapi.dll
|
||||||
|
@ -20,10 +19,8 @@ TESTS() {
|
||||||
./dockcross sh -c 'cp $WINEDLLPATH/*.dll _build'
|
./dockcross sh -c 'cp $WINEDLLPATH/*.dll _build'
|
||||||
|
|
||||||
# Run tests in docker.
|
# Run tests in docker.
|
||||||
if $ENABLE_WINDOWS_TESTS; then
|
./dockcross "$@" || {
|
||||||
./dockcross "$@" || {
|
cat _build/Testing/Temporary/LastTest.log
|
||||||
cat _build/Testing/Temporary/LastTest.log
|
false
|
||||||
false
|
}
|
||||||
}
|
|
||||||
fi
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -37,4 +37,6 @@ RUN $CMAKE \
|
||||||
export CTEST_OUTPUT_ON_FAILURE=1
|
export CTEST_OUTPUT_ON_FAILURE=1
|
||||||
|
|
||||||
RUN make -C$BUILD_DIR -j$NPROC -k install
|
RUN make -C$BUILD_DIR -j$NPROC -k install
|
||||||
TESTS make -C$BUILD_DIR -j$NPROC test
|
if $RUN_TESTS; then
|
||||||
|
TESTS make -C$BUILD_DIR -j$NPROC test
|
||||||
|
fi
|
||||||
|
|
Loading…
Reference in New Issue
Block a user