diff options
| author | Xavi Garcia Mena <xavi.garcia.mena@canonical.com> | 2015-11-11 12:55:11 +0100 |
|---|---|---|
| committer | Xavi Garcia Mena <xavi.garcia.mena@canonical.com> | 2015-11-11 12:55:11 +0100 |
| commit | 73af3f742f2085a1a21616edc92347b105f48e92 (patch) | |
| tree | ecaddf5671562a295a8bdd8c7b4928489e825c5e /tests/CMakeLists.txt | |
| parent | 5481d74daaf7b97898af7d97aca1239bdd380ff2 (diff) | |
| parent | d0c9ae776af81736a119de5172cc12336dfba96c (diff) | |
| download | ayatana-indicator-sound-73af3f742f2085a1a21616edc92347b105f48e92.tar.gz ayatana-indicator-sound-73af3f742f2085a1a21616edc92347b105f48e92.tar.bz2 ayatana-indicator-sound-73af3f742f2085a1a21616edc92347b105f48e92.zip | |
Fixed conflict
Diffstat (limited to 'tests/CMakeLists.txt')
| -rw-r--r-- | tests/CMakeLists.txt | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt index f77bcb1..adc08de 100644 --- a/tests/CMakeLists.txt +++ b/tests/CMakeLists.txt @@ -281,7 +281,6 @@ add_test(indcator-test indicator-test ) -# Disable integration tests -# add_subdirectory(integration) -# add_subdirectory(dbus-types) -# add_subdirectory(service-mocks) +add_subdirectory(integration) +add_subdirectory(dbus-types) +add_subdirectory(service-mocks)
\ No newline at end of file |