summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Angus <tim@ngus.net>2013-03-22 16:41:47 +0000
committerTim Angus <tim@ngus.net>2013-03-22 19:04:09 +0000
commitceb5fe996511bbfd7f7ea2825d7d6ba4ddc413e4 (patch)
tree8729561b1b7226860595de8ccca99ffd44b79e2b
parent0ebeee161f218861892e1b17caf885c58fbdf03c (diff)
Make travis silent
-rw-r--r--.travis.yml17
-rwxr-xr-xbuild-test.sh30
2 files changed, 0 insertions, 47 deletions
diff --git a/.travis.yml b/.travis.yml
deleted file mode 100644
index dac609b5..00000000
--- a/.travis.yml
+++ /dev/null
@@ -1,17 +0,0 @@
-language: c
-compiler:
- - gcc
- - clang
- - i686-w64-mingw32-gcc
-
-script: ./build-test.sh
-
-before_install:
- - sudo apt-get update -qq
- - sudo apt-get remove -qq -y mingw32
- - sudo apt-get install -q -y libgl1-mesa-dev libsdl1.2-dev libvorbis-dev libfreetype6-dev mingw-w64
-
-notifications:
- irc: "irc.freenode.org#tremulous-dev"
- on_success: change
- on_failure: always
diff --git a/build-test.sh b/build-test.sh
deleted file mode 100755
index d5119431..00000000
--- a/build-test.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/sh
-
-failed=0;
-
-# check if testing mingw
-if [ "$CC" = "i686-w64-mingw32-gcc" ]; then
- export PLATFORM=mingw32
- export ARCH=x86
- export CC=
- haveExternalLibs=0
-else
- haveExternalLibs=1
-fi
-
-# Default Build
-(make clean release) || failed=1;
-
-# Test additional options
-if [ $haveExternalLibs -eq 1 ]; then
- (make clean release USE_CODEC_VORBIS=1 USE_FREETYPE=1) || failed=1;
-fi
-
-if [ $failed -eq 1 ]; then
- echo "Build failure.";
-else
- echo "All builds successful.";
-fi
-
-exit $failed;
-