aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRobert Tari <robert@tari.in>2021-10-25 17:26:42 +0200
committerRobert Tari <robert@tari.in>2021-10-25 17:26:42 +0200
commit03d55a301614654bf150f51c0e0c472fef6a904b (patch)
tree852419cff072412f807e4be0fb099a2802987b86
parentdb6cef87656a54dafa3fea9c588f54281512e665 (diff)
parent313410a372dc87943bd1b5045ab29bd4a00daf9d (diff)
downloadayatana-indicator-display-main.tar.gz
ayatana-indicator-display-main.tar.bz2
ayatana-indicator-display-main.zip
Merge branch 'sunweaver-pr/travis-cleanup'HEADmain
Attributes GH PR #34: https://github.com/AyatanaIndicators/ayatana-indicator-display/pull/34
-rw-r--r--.build.yml28
-rw-r--r--tests/CMakeLists.txt2
2 files changed, 8 insertions, 22 deletions
diff --git a/.build.yml b/.build.yml
index d1a101b..47d88bf 100644
--- a/.build.yml
+++ b/.build.yml
@@ -12,7 +12,6 @@ requires:
- which
- cmake
- cmake-extras
- - mate-common
- dbus
- intltool
- glib2
@@ -24,7 +23,6 @@ requires:
debian:
# Useful URL: https://salsa.debian.org/debian-ayatana-team/ayatana-indicator-display
- - autopoint
- clang
- clang-tools
- g++
@@ -32,7 +30,6 @@ requires:
- git
- cmake
- cmake-extras
- - mate-common
- dbus
- intltool
# - libayatana-common-dev
@@ -54,14 +51,12 @@ requires:
- systemd
ubuntu:
- - autopoint
- clang
- clang-tools
- g++
- git
- cmake
- cmake-extras
- - mate-common
- dbus
- intltool
# - libayatana-common-dev
@@ -84,14 +79,12 @@ requires:
- gsettings-ubuntu-schemas
ubuntu:focal:
- - autopoint
- clang
- clang-tools
- g++
- git
- cmake
- cmake-extras
- - mate-common
- dbus
- intltool
# - libayatana-common-dev
@@ -140,6 +133,8 @@ before_scripts:
- cmake . -DCMAKE_INSTALL_PREFIX=/usr
- make
- make install
+ - cd -
+ - rm -Rf libayatana-common-build/
build_scripts:
- if [ ${DISTRO_NAME} == "debian" ];then
@@ -147,10 +142,7 @@ build_scripts:
- cppcheck --enable=warning,style,performance,portability,information,missingInclude .
- fi
-
- - if [ -e ./autogen.sh ]; then
- - NOCONFIGURE=1 ./autogen.sh
- - scan-build $CHECKERS ./configure --prefix=/usr --enable-gtk-doc --enable-compile-warnings=maximum
- - elif [ -e ./CMakeLists.txt ]; then
+ - 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_TESTS=ON
- else
@@ -173,15 +165,9 @@ build_scripts:
- fi
- scan-build $CHECKERS --keep-cc -o html-report make
- fi
-
-after_scripts:
- - if [ ${BUILD_TYPE} == "scripts" ];then
- - XVFB_RUN="$(which xvfb-run || true)"
- - if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ];then
- - if [ -e ./autogen.sh ]; then
- - ${XVFB_RUN} make check
- - elif [ -e ./CMakeLists.txt ]; then
- - ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test
- - fi
+ - XVFB_RUN="$(which xvfb-run || true)"
+ - if [ ${DISTRO_NAME} == "debian" ] || [ ${DISTRO_NAME} == "ubuntu" ];then
+ - if [ -e ./CMakeLists.txt ]; then
+ - ${XVFB_RUN} env CTEST_OUTPUT_ON_FAILURE=1 make test
- fi
- fi
diff --git a/tests/CMakeLists.txt b/tests/CMakeLists.txt
index 76ebd56..4c1b9b8 100644
--- a/tests/CMakeLists.txt
+++ b/tests/CMakeLists.txt
@@ -29,7 +29,7 @@ endif()
add_compile_options(${CXX_WARNING_ARGS})
-add_test(cppcheck cppcheck --enable=all -USCHEMA_DIR --error-exitcode=2 --inline-suppr --library=qt -I${CMAKE_SOURCE_DIR} -i${CMAKE_SOURCE_DIR}/tests/utils/qmain.cpp -i${CMAKE_SOURCE_DIR}/tests/gmock ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests --suppress=missingIncludeSystem --suppress=uninitDerivedMemberVar --suppress=unmatchedSuppression)
+add_test(cppcheck cppcheck --enable=all -USCHEMA_DIR --error-exitcode=2 --inline-suppr --library=qt -I${CMAKE_SOURCE_DIR} -i${CMAKE_SOURCE_DIR}/tests/utils/qmain.cpp -i${CMAKE_SOURCE_DIR}/tests/gmock ${CMAKE_SOURCE_DIR}/src ${CMAKE_SOURCE_DIR}/tests --suppress=missingIncludeSystem --suppress=uninitDerivedMemberVar --suppress=unmatchedSuppression --suppress=constParameter)
add_subdirectory(integration)
add_subdirectory(unit)