aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--tests/qxmppcallmanager/tst_qxmppcallmanager.cpp4
-rwxr-xr-xtests/travis/build-and-test5
2 files changed, 9 insertions, 0 deletions
diff --git a/tests/qxmppcallmanager/tst_qxmppcallmanager.cpp b/tests/qxmppcallmanager/tst_qxmppcallmanager.cpp
index a674c109..1091cb5b 100644
--- a/tests/qxmppcallmanager/tst_qxmppcallmanager.cpp
+++ b/tests/qxmppcallmanager/tst_qxmppcallmanager.cpp
@@ -19,6 +19,10 @@ private:
void tst_QXmppCallManager::testCall()
{
+ if (!qEnvironmentVariableIsEmpty("QXMPP_TESTS_SKIP_CALL_MANAGER")) {
+ QSKIP("Skipping because 'QXMPP_TESTS_SKIP_CALL_MANAGER' was set.");
+ }
+
QXmppCall *receiverCall = nullptr;
const QString testDomain("localhost");
diff --git a/tests/travis/build-and-test b/tests/travis/build-and-test
index c39f1806..d7d4affd 100755
--- a/tests/travis/build-and-test
+++ b/tests/travis/build-and-test
@@ -33,6 +33,11 @@ if [ "$CONFIG" = "full-debug" ]; then
export CXXFLAGS="-fprofile-arcs -ftest-coverage"
fi
+# Skip currently broken call manager test on macOS
+if [ $HOST_SYSTEM = "Darwin" ]; then
+ export QXMPP_TESTS_SKIP_CALL_MANAGER=1
+fi
+
# compile
mkdir build
cd build