aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorXavi Garcia Mena <xavi.garcia.mena@canonical.com>2015-11-03 17:21:43 +0100
committerXavi Garcia Mena <xavi.garcia.mena@canonical.com>2015-11-03 17:21:43 +0100
commitb7eba034a7465141a5788574e4ac536c39fd08d6 (patch)
treec0bc085f77913b10f54e6e81cc783458121565e1
parent796e71b8527730ecc6c5129d15fba48fbe5dfbb8 (diff)
downloadayatana-indicator-sound-b7eba034a7465141a5788574e4ac536c39fd08d6.tar.gz
ayatana-indicator-sound-b7eba034a7465141a5788574e4ac536c39fd08d6.tar.bz2
ayatana-indicator-sound-b7eba034a7465141a5788574e4ac536c39fd08d6.zip
Disable integration tests to avoid universe dependencies
-rw-r--r--debian/control11
-rw-r--r--src/CMakeLists.txt3
-rw-r--r--tests/CMakeLists.txt7
3 files changed, 6 insertions, 15 deletions
diff --git a/debian/control b/debian/control
index f170fcf..3585713 100644
--- a/debian/control
+++ b/debian/control
@@ -5,13 +5,11 @@ Maintainer: Ubuntu Desktop Team <ubuntu-desktop@lists.ubuntu.com>
XSBC-Original-Maintainer: Conor Curran <conor.curran@canonical.com>
Build-Depends: debhelper (>= 9.0),
cmake,
- cmake-extras (>= 0.4),
dbus,
dbus-test-runner (>> 14.04.0+14.04.20150120.1),
dh-translations,
gir1.2-accountsservice-1.0,
gnome-common,
- google-mock (>= 1.6.0+svn437),
gsettings-ubuntu-schemas,
autotools-dev,
valac (>= 0.20),
@@ -20,22 +18,13 @@ Build-Depends: debhelper (>= 9.0),
libgirepository1.0-dev,
libglib2.0-dev (>= 2.22.3),
libgtest-dev,
- libqtdbusmock1-dev (>= 0.3),
- libqtdbustest1-dev,
- libunity-api-dev,
liburl-dispatcher1-dev,
libpulse-dev (>= 1:4.0-0ubuntu21),
libpulse-mainloop-glib0 (>= 0.9.18),
libnotify-dev,
libgee-dev,
libxml2-dev,
- pulseaudio,
python3-dbusmock,
- qt5-default,
- qtbase5-dev,
- qtbase5-dev-tools,
- qtdeclarative5-dev,
- qtdeclarative5-dev-tools,
Standards-Version: 3.9.4
Homepage: https://launchpad.net/indicator-sound
# If you aren't a member of ~indicator-applet-developers but need to upload
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 73a270c..6c621ae 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -207,4 +207,5 @@ install(
RUNTIME DESTINATION ${CMAKE_INSTALL_LIBEXECDIR}/indicator-sound/
)
-add_subdirectory(gmenuharness)
+# Disable integration tests
+# add_subdirectory(gmenuharness)
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index adc08de..f77bcb1 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -281,6 +281,7 @@ add_test(indcator-test
indicator-test
)
-add_subdirectory(integration)
-add_subdirectory(dbus-types)
-add_subdirectory(service-mocks) \ No newline at end of file
+# Disable integration tests
+# add_subdirectory(integration)
+# add_subdirectory(dbus-types)
+# add_subdirectory(service-mocks)