Merge pull request #1 from tehnick/travis

Update hook for Travis CI.

3 files changed, 29 insertions, 10 deletions

diff --git a/tests/install-build-depends b/tests/install-build-depends
deleted file mode 100755
index 70177295..00000000
--- a/tests/install-build-depends
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/sh
-
-if [ "$QT_SELECT" = "qt4" ]; then
-    sudo apt-get update
-    sudo apt-get install libqt4-dev
-else
-    sudo add-apt-repository -y ppa:ubuntu-sdk-team/ppa
-    sudo apt-get update
-    sudo apt-get install qtbase5-dev
-fi
diff --git a/tests/travis/build-and-test.sh b/tests/travis/build-and-test.sh
new file mode 100755
index 00000000..28932c0e
--- /dev/null
+++ b/tests/travis/build-and-test.sh
@@ -0,0 +1,14 @@
+#!/bin/sh
+
+BUILD_FLAGS="QMAKE_CXXFLAGS += '-O2 -fstack-protector --param=ssp-buffer-size=4 -Wformat -Werror=format-security -D_FORTIFY_SOURCE=2'" \
+            "QMAKE_LFLAGS += '-Wl,-z,relro -Wl,--as-needed'"
+
+if [ "$CONFIG" = "full" ]; then
+    qmake $BUILD_FLAGS QXMPP_USE_SPEEX=1 QXMPP_USE_THEORA=1
+else
+    qmake $BUILD_FLAGS QXMPP_USE_SPEEX="" QXMPP_USE_THEORA=""
+fi
+
+make VERBOSE=1
+
+tests/run.py
diff --git a/tests/travis/install-build-depends.sh b/tests/travis/install-build-depends.sh
new file mode 100755
index 00000000..66a1ddd3
--- /dev/null
+++ b/tests/travis/install-build-depends.sh
@@ -0,0 +1,15 @@
+#!/bin/sh
+
+sudo apt-get update -qq
+
+if [ "$QT_SELECT" = "qt4" ]; then
+    sudo apt-get install -qq libqt4-dev
+else
+    sudo add-apt-repository -y ppa:ubuntu-sdk-team/ppa
+    sudo apt-get update -qq
+    sudo apt-get install qtbase5-dev
+fi
+
+if [ "$CONFIG" = "full" ]; then
+    sudo apt-get install -qq  libspeex-dev libtheora-dev
+fi