diff options
| -rw-r--r-- | .build.yml | 2 | ||||
| -rw-r--r-- | CMakeLists.txt | 31 | ||||
| -rw-r--r-- | INSTALL.md | 23 | ||||
| -rwxr-xr-x | debian/rules | 2 | ||||
| -rw-r--r-- | tests/manual | 24 |
5 files changed, 3 insertions, 79 deletions
@@ -112,7 +112,7 @@ build_scripts: # - - if [ -e ./CMakeLists.txt ]; then - if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ]; then - - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_WERROR=ON -DENABLE_TESTS=ON + - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_WERROR=ON - else - scan-build $CHECKERS cmake . -DCMAKE_INSTALL_PREFIX=/usr -DCMAKE_VERBOSE_MAKEFILE=ON -DENABLE_WERROR=ON - fi diff --git a/CMakeLists.txt b/CMakeLists.txt index 7a23841..f3a5ada 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -1,5 +1,5 @@ -project(ayatana-indicator-bluetooth C CXX) cmake_minimum_required(VERSION 3.13) +project (ayatana-indicator-bluetooth VERSION 22.9.1 LANGUAGES C CXX) if(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) SET(CMAKE_INSTALL_PREFIX "/usr" CACHE PATH "..." FORCE) @@ -7,21 +7,10 @@ endif(CMAKE_INSTALL_PREFIX_INITIALIZED_TO_DEFAULT) set(CMAKE_MODULE_PATH "${CMAKE_SOURCE_DIR}/cmake" "${CMAKE_MODULE_PATH}") -set(PACKAGE ${CMAKE_PROJECT_NAME}) -set(PROJECT_VERSION 22.9.1) - # Options -option(ENABLE_TESTS "Enable all tests and checks" OFF) -option(ENABLE_COVERAGE "Enable coverage reports (includes enabling all tests and checks)" OFF) option(ENABLE_WERROR "Treat all build warnings as errors" OFF) - -if(ENABLE_COVERAGE) - set(ENABLE_TESTS ON) - set(CMAKE_BUILD_TYPE "Coverage") -else() - set(CMAKE_BUILD_TYPE "Release") -endif() +set (CMAKE_BUILD_TYPE "Release") if(ENABLE_WERROR) add_definitions("-Werror") @@ -71,23 +60,7 @@ add_subdirectory(data) add_subdirectory(src) add_subdirectory(po) -# testing & coverage - -if (ENABLE_TESTS) - - include(CTest) - enable_testing() - - if (ENABLE_COVERAGE) - - find_package(CoverageReport) - - endif() - -endif() - # Display config info message(STATUS "Install prefix: ${CMAKE_INSTALL_PREFIX}") -message(STATUS "Unit tests: ${ENABLE_TESTS}") message(STATUS "Build with -Werror: ${ENABLE_WERROR}") @@ -24,26 +24,3 @@ sudo make install ``` **The install prefix defaults to `/usr`, change it with `-DCMAKE_INSTALL_PREFIX=/some/path`** - -## For testers - unit tests only - -``` -cd ayatana-indicator-bluetooth-X.Y.Z -mkdir build -cd build -cmake .. -DENABLE_TESTS=ON -make -make test -make cppcheck -``` - -## For testers - both unit tests and code coverage - -``` -cd ayatana-indicator-bluetooth-X.Y.Z -mkdir build-coverage -cd build-coverage -cmake .. -DENABLE_COVERAGE=ON -make -make coverage-html -``` diff --git a/debian/rules b/debian/rules index 4ebd031..d10a551 100755 --- a/debian/rules +++ b/debian/rules @@ -4,8 +4,6 @@ NULL = DEB_CMAKE_EXTRA_FLAGS = \ -DCMAKE_INSTALL_LOCALSTATEDIR="/var" \ - -DENABLE_TESTS=ON \ - -DENABLE_COVERAGE=OFF \ $(NULL) export DPKG_GENSYMBOLS_CHECK_LEVEL=4 diff --git a/tests/manual b/tests/manual deleted file mode 100644 index 6a98842..0000000 --- a/tests/manual +++ /dev/null @@ -1,24 +0,0 @@ - -Test-case indicator-bluetooth/unity7-items-check -<dl> - <dt>Log in to a Unity 7 user session</dt> - <dt>Go to the panel and click on the Bluetooth indicator</dt> - <dd>Ensure there are items in the menu</dd> -</dl> - -Test-case indicator-bluetooth/unity7-greeter-items-check -<dl> - <dt>Start a system and wait for the greeter or logout of the current user session</dt> - <dt>Go to the panel and click on the Bluetooth indicator</dt> - <dd>Ensure there are items in the menu</dd> -</dl> - -Test-case indicator-bluetooth/unity8-items-check -<dl> - <dt>Login to a user session running Unity 8</dt> - <dt>Pull down the top panel until it sticks open</dt> - <dt>Navigate through the tabs until "Bluetooth" is shown</dt> - <dd>Bluetooth is at the top of the menu</dd> - <dd>The menu is populated with items</dd> -</dl> - |