diff options
| -rw-r--r-- | .gitignore | 47 | ||||
| -rw-r--r-- | .gitlab-ci.yml | 10 | ||||
| -rw-r--r-- | Makefile.am | 1 | ||||
| -rw-r--r-- | configure.ac.in | 2 | ||||
| -rwxr-xr-x | tests/tests-driver.sh | 12 |
5 files changed, 50 insertions, 22 deletions
@@ -8,6 +8,9 @@ Makefile Makefile.in +*.trs +*.log +ChangeLog configure config.log depcomp @@ -64,15 +67,41 @@ po/POTFILES po/Makefile.in.in po/stamp-it po/*.gmo -tests/t-has-properties.sh -tests/t-get-properties.sh -tests/t-set-properties -tests/t-remove-properties -tests/t-set-properties.sh -tests/t-remove-properties.sh -tests/t-has-properties -tests/t-get-properties -tests/test-xdg_config_home +po/*.pot +tests/get-properties/t-get-arrayv +tests/get-properties/t-get-boolean +tests/get-properties/t-get-double +tests/get-properties/t-get-int +tests/get-properties/t-get-string +tests/get-properties/t-get-stringlist +tests/get-properties/t-get-uint64 +tests/has-properties/t-has-arrayv +tests/has-properties/t-has-boolean +tests/has-properties/t-has-double +tests/has-properties/t-has-int +tests/has-properties/t-has-string +tests/has-properties/t-has-stringlist +tests/has-properties/t-has-uint64 +tests/object-bindings/t-object-bindings +tests/others/t-issue-16 +tests/property-changed-signal/t-string-changed-signal +tests/property-changed-signal/t-string-changed-signal-detailed +tests/reset-properties/t-reset-arrayv +tests/reset-properties/t-reset-boolean +tests/reset-properties/t-reset-double +tests/reset-properties/t-reset-int +tests/reset-properties/t-reset-string +tests/reset-properties/t-reset-stringlist +tests/reset-properties/t-reset-uint64 +tests/set-properties/t-set-arrayv +tests/set-properties/t-set-boolean +tests/set-properties/t-set-double +tests/set-properties/t-set-int +tests/set-properties/t-set-string +tests/set-properties/t-set-stringlist +tests/set-properties/t-set-uint64 +tests/tests-end/t-tests-end + xfconf/xfconf-dbus-bindings.h xfconf/libxfconf-0.pc xfconf/Xfconf-0.gir diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index 7fb4166..362c931 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -2,8 +2,10 @@ include: - project: 'xfce/xfce4-dev-tools' file: '/ci/build_project.yml' -# Skip distcheck for xfconf since it is not implemented. +# xfconf distcheck needs a working display/dbus to run tests +# Fake it with xvfb on headless container distcheck: - rules: - - when: never - + extends: .make + stage: distcheck + script: + - xvfb-run -a make distcheck diff --git a/Makefile.am b/Makefile.am index d394cbd..8064aed 100644 --- a/Makefile.am +++ b/Makefile.am @@ -30,7 +30,6 @@ EXTRA_DIST = \ AUTHORS \ COPYING \ ChangeLog \ - INSTALL \ NEWS \ README.md \ m4/introspection.m4 \ diff --git a/configure.ac.in b/configure.ac.in index a869a95..0c69141 100644 --- a/configure.ac.in +++ b/configure.ac.in @@ -20,7 +20,7 @@ m4_define([xfconf_version], [xfconf_version_major().xfconf_version_minor().xfcon m4_define([xfconf_default_debug], [ifelse(xfconf_version_tag(), [git], [yes], [minimum])]) dnl init autoconf -AC_INIT([xfconf], [xfconf_version], [https://bugzilla.xfce.org/]) +AC_INIT([xfconf], [xfconf_version], [https://gitlab.xfce.org/xfconf/xfconf]) AC_CONFIG_MACRO_DIRS([m4]) AC_PREREQ([2.50]) diff --git a/tests/tests-driver.sh b/tests/tests-driver.sh index b65bb64..ff1a2c1 100755 --- a/tests/tests-driver.sh +++ b/tests/tests-driver.sh @@ -88,19 +88,17 @@ trap 'sigint' INT # Last test, cleanup TEST_NAME=$(basename $TEST) -if [ "$TEST_NAME" == "t-tests-end" ]; then +if [ "$TEST_NAME" = "t-tests-end" ]; then cleanup exit 0 fi - # Prepare xfconfd prepare -# Execute the test -exec $TEST -ret = $? +$TEST +ret=$? # Test failed, cleanup -if [ $ret != 0 ]; then - cleanup +if [ $ret -ne 0 ]; then + cleanup fi exit $ret |