summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2016-11-28 12:54:21 +0000
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2016-11-29 12:36:23 +0000
commitf6eb7c8afb7e08d2fc8c6426aff89b305f997f4e (patch)
tree97bd5d5e95adfec8cc6f475ae0e726b386b6e83a /tools
parent300d9a3c9671c1e9047bd5c83a26e07b42e0e864 (diff)
downloaddbus-f6eb7c8afb7e08d2fc8c6426aff89b305f997f4e.tar.gz
dbus-f6eb7c8afb7e08d2fc8c6426aff89b305f997f4e.tar.bz2
dbus-f6eb7c8afb7e08d2fc8c6426aff89b305f997f4e.zip
ci-build: retab with 4-space indentation
This realigns it with the script loosely based on this one that I sent to OSTree. Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk> Reviewed-by: Philip Withnall <philip.withnall@collabora.co.uk> Bug: https://bugs.freedesktop.org/show_bug.cgi?id=98889
Diffstat (limited to 'tools')
-rwxr-xr-xtools/ci-build.sh344
1 files changed, 173 insertions, 171 deletions
diff --git a/tools/ci-build.sh b/tools/ci-build.sh
index a50ec160..9ee097e1 100755
--- a/tools/ci-build.sh
+++ b/tools/ci-build.sh
@@ -26,19 +26,19 @@ set -e
set -x
if [ -z "$dbus_ci_variant" ]; then
- dbus_ci_variant=production
+ dbus_ci_variant=production
fi
if [ -z "$dbus_ci_host" ]; then
- dbus_ci_host=native
+ dbus_ci_host=native
fi
if [ -z "$dbus_ci_buildsys" ]; then
- dbus_ci_buildsys=autotools
+ dbus_ci_buildsys=autotools
fi
if [ -z "$dbus_ci_parallel" ]; then
- dbus_ci_parallel=1
+ dbus_ci_parallel=1
fi
dbus_test=yes
@@ -53,174 +53,176 @@ cd ci-build-${dbus_ci_variant}-${dbus_ci_host}
make="make -j${dbus_ci_parallel} V=1 VERBOSE=1"
case "$dbus_ci_host" in
- (mingw)
- mirror=http://sourceforge.net/projects/msys2/files/REPOS/MINGW/i686/
- mingw="$(pwd)/mingw32"
- install -d "${mingw}"
- export PKG_CONFIG_LIBDIR="${mingw}/lib/pkgconfig"
- export PKG_CONFIG_PATH=
- export PKG_CONFIG="pkg-config --define-variable=prefix=${mingw}"
- unset CC
- unset CXX
- for pkg in \
- expat-2.1.0-6 \
- gcc-libs-5.2.0-4 \
- gettext-0.19.6-1 \
- glib2-2.46.1-1 \
- libffi-3.2.1-3 \
- zlib-1.2.8-9 \
- ; do
- wget ${mirror}/mingw-w64-i686-${pkg}-any.pkg.tar.xz
- tar -xvf mingw-w64-i686-${pkg}-any.pkg.tar.xz
- done
- export TMPDIR=/tmp
- ;;
+ (mingw)
+ mirror=http://sourceforge.net/projects/msys2/files/REPOS/MINGW/i686/
+ mingw="$(pwd)/mingw32"
+ install -d "${mingw}"
+ export PKG_CONFIG_LIBDIR="${mingw}/lib/pkgconfig"
+ export PKG_CONFIG_PATH=
+ export PKG_CONFIG="pkg-config --define-variable=prefix=${mingw}"
+ unset CC
+ unset CXX
+ for pkg in \
+ expat-2.1.0-6 \
+ gcc-libs-5.2.0-4 \
+ gettext-0.19.6-1 \
+ glib2-2.46.1-1 \
+ libffi-3.2.1-3 \
+ zlib-1.2.8-9 \
+ ; do
+ wget ${mirror}/mingw-w64-i686-${pkg}-any.pkg.tar.xz
+ tar -xvf mingw-w64-i686-${pkg}-any.pkg.tar.xz
+ done
+ export TMPDIR=/tmp
+ ;;
esac
case "$dbus_ci_buildsys" in
- (autotools)
- case "$dbus_ci_variant" in
- (debug)
- # Full developer/debug build.
- set _ "$@"
- set "$@" --enable-developer --enable-tests
- shift
- # The test coverage for OOM-safety is too
- # verbose to be useful on travis-ci.
- export DBUS_TEST_MALLOC_FAILURES=0
- ;;
-
- (reduced)
- # A smaller configuration than normal, with
- # various features disabled; this emulates
- # an older system or one that does not have
- # all the optional libraries.
- set _ "$@"
- # No LSMs (the production build has both)
- set "$@" --disable-selinux --disable-apparmor
- # No inotify (we will use dnotify)
- set "$@" --disable-inotify
- # No epoll or kqueue (we will use poll)
- set "$@" --disable-epoll --disable-kqueue
- # No special init system support
- set "$@" --disable-launchd --disable-systemd
- # No libaudit or valgrind
- set "$@" --disable-libaudit --without-valgrind
- shift
- ;;
-
- (legacy)
- # An unrealistically cut-down configuration,
- # to check that it compiles and works.
- set _ "$@"
- # Disable native atomic operations on Unix
- # (armv4, as used as the baseline for Debian
- # armel, is one architecture that really
- # doesn't have them)
- set "$@" dbus_cv_sync_sub_and_fetch=no
- # No epoll, kqueue or poll (we will fall back
- # to select, even on Unix where we would
- # usually at least have poll)
- set "$@" --disable-epoll --disable-kqueue
- set "$@" CPPFLAGS=-DBROKEN_POLL=1
- # Enable SELinux and AppArmor but not
- # libaudit - that configuration has sometimes
- # failed
- set "$@" --enable-selinux --enable-apparmor
- set "$@" --disable-libaudit --without-valgrind
- # No directory monitoring at all
- set "$@" --disable-inotify --disable-dnotify
- # No special init system support
- set "$@" --disable-launchd --disable-systemd
- # No X11 autolaunching
- set "$@" --disable-x11-autolaunch
- shift
- ;;
-
- (*)
- ;;
- esac
-
- case "$dbus_ci_host" in
- (mingw)
- set _ "$@"
- set "$@" --build="$(build-aux/config.guess)"
- set "$@" --host=i686-w64-mingw32
- set "$@" LDFLAGS=-L"${mingw}/lib"
- set "$@" CPPFLAGS=-I"${mingw}/include"
- set "$@" CFLAGS=-static-libgcc
- set "$@" CXXFLAGS=-static-libgcc
- # don't run tests yet, Wine needs Xvfb and
- # more msys2 libraries
- dbus_test=
- # don't "make install" system-wide
- dbus_ci_sudo=
- shift
- ;;
- esac
-
- ../configure \
- --enable-installed-tests \
- --enable-maintainer-mode \
- --enable-modular-tests \
- --with-glib \
- "$@"
-
- ${make}
- [ -z "$dbus_test" ] || ${make} check || [ -z "$dbus_test_fatal" ]
- cat test/test-suite.log || :
- [ -z "$dbus_test" ] || ${make} distcheck || \
- [ -z "$dbus_test_fatal" ]
-
- ${make} install DESTDIR=$(pwd)/DESTDIR
- ( cd DESTDIR && find . )
-
- if [ -n "$dbus_ci_sudo" ] && [ -n "$dbus_test" ]; then
- sudo ${make} install
- LD_LIBRARY_PATH=/usr/local/lib ${make} installcheck || \
- [ -z "$dbus_test_fatal" ]
- cat test/test-suite.log || :
-
- # re-run them with gnome-desktop-testing
- env LD_LIBRARY_PATH=/usr/local/lib \
- gnome-desktop-testing-runner -d /usr/local/share dbus/ || \
- [ -z "$dbus_test_fatal" ]
-
- # these tests benefit from being re-run as root
- sudo env LD_LIBRARY_PATH=/usr/local/lib \
- gnome-desktop-testing-runner -d /usr/local/share \
- dbus/test-uid-permissions_with_config.test || \
- [ -z "$dbus_test_fatal" ]
- fi
- ;;
-
- (cmake)
- case "$dbus_ci_host" in
- (mingw)
- set _ "$@"
- set "$@" -D CMAKE_TOOLCHAIN_FILE="${srcdir}/cmake/i686-w64-mingw32.cmake"
- set "$@" -D CMAKE_PREFIX_PATH="${mingw}"
- set "$@" -D CMAKE_INCLUDE_PATH="${mingw}/include"
- set "$@" -D CMAKE_LIBRARY_PATH="${mingw}/lib"
- set "$@" -D EXPAT_LIBRARY="${mingw}/lib/libexpat.dll.a"
- set "$@" -D GLIB2_LIBRARIES="${mingw}/lib/libglib-2.0.dll.a"
- set "$@" -D GOBJECT_LIBRARIES="${mingw}/lib/libgobject-2.0.dll.a"
- set "$@" -D GIO_LIBRARIES="${mingw}/lib/libgio-2.0.dll.a"
- shift
- # don't run tests yet, Wine needs Xvfb and more
- # msys2 libraries
- dbus_test=
- ;;
- esac
-
- cmake "$@" ../cmake
-
- ${make}
- # The test coverage for OOM-safety is too verbose to be useful on
- # travis-ci.
- export DBUS_TEST_MALLOC_FAILURES=0
- [ -z "$dbus_test" ] || ctest -VV || [ -z "$dbus_test_fatal" ]
- ${make} install DESTDIR=$(pwd)/DESTDIR
- ( cd DESTDIR && find . )
- ;;
+ (autotools)
+ case "$dbus_ci_variant" in
+ (debug)
+ # Full developer/debug build.
+ set _ "$@"
+ set "$@" --enable-developer --enable-tests
+ shift
+ # The test coverage for OOM-safety is too
+ # verbose to be useful on travis-ci.
+ export DBUS_TEST_MALLOC_FAILURES=0
+ ;;
+
+ (reduced)
+ # A smaller configuration than normal, with
+ # various features disabled; this emulates
+ # an older system or one that does not have
+ # all the optional libraries.
+ set _ "$@"
+ # No LSMs (the production build has both)
+ set "$@" --disable-selinux --disable-apparmor
+ # No inotify (we will use dnotify)
+ set "$@" --disable-inotify
+ # No epoll or kqueue (we will use poll)
+ set "$@" --disable-epoll --disable-kqueue
+ # No special init system support
+ set "$@" --disable-launchd --disable-systemd
+ # No libaudit or valgrind
+ set "$@" --disable-libaudit --without-valgrind
+ shift
+ ;;
+
+ (legacy)
+ # An unrealistically cut-down configuration,
+ # to check that it compiles and works.
+ set _ "$@"
+ # Disable native atomic operations on Unix
+ # (armv4, as used as the baseline for Debian
+ # armel, is one architecture that really
+ # doesn't have them)
+ set "$@" dbus_cv_sync_sub_and_fetch=no
+ # No epoll, kqueue or poll (we will fall back
+ # to select, even on Unix where we would
+ # usually at least have poll)
+ set "$@" --disable-epoll --disable-kqueue
+ set "$@" CPPFLAGS=-DBROKEN_POLL=1
+ # Enable SELinux and AppArmor but not
+ # libaudit - that configuration has sometimes
+ # failed
+ set "$@" --enable-selinux --enable-apparmor
+ set "$@" --disable-libaudit --without-valgrind
+ # No directory monitoring at all
+ set "$@" --disable-inotify --disable-dnotify
+ # No special init system support
+ set "$@" --disable-launchd --disable-systemd
+ # No X11 autolaunching
+ set "$@" --disable-x11-autolaunch
+ shift
+ ;;
+
+ (*)
+ ;;
+ esac
+
+ case "$dbus_ci_host" in
+ (mingw)
+ set _ "$@"
+ set "$@" --build="$(build-aux/config.guess)"
+ set "$@" --host=i686-w64-mingw32
+ set "$@" LDFLAGS=-L"${mingw}/lib"
+ set "$@" CPPFLAGS=-I"${mingw}/include"
+ set "$@" CFLAGS=-static-libgcc
+ set "$@" CXXFLAGS=-static-libgcc
+ # don't run tests yet, Wine needs Xvfb and
+ # more msys2 libraries
+ dbus_test=
+ # don't "make install" system-wide
+ dbus_ci_sudo=
+ shift
+ ;;
+ esac
+
+ ../configure \
+ --enable-installed-tests \
+ --enable-maintainer-mode \
+ --enable-modular-tests \
+ --with-glib \
+ "$@"
+
+ ${make}
+ [ -z "$dbus_test" ] || ${make} check || [ -z "$dbus_test_fatal" ]
+ cat test/test-suite.log || :
+ [ -z "$dbus_test" ] || ${make} distcheck || \
+ [ -z "$dbus_test_fatal" ]
+
+ ${make} install DESTDIR=$(pwd)/DESTDIR
+ ( cd DESTDIR && find . )
+
+ if [ -n "$dbus_ci_sudo" ] && [ -n "$dbus_test" ]; then
+ sudo ${make} install
+ LD_LIBRARY_PATH=/usr/local/lib ${make} installcheck || \
+ [ -z "$dbus_test_fatal" ]
+ cat test/test-suite.log || :
+
+ # re-run them with gnome-desktop-testing
+ env LD_LIBRARY_PATH=/usr/local/lib \
+ gnome-desktop-testing-runner -d /usr/local/share dbus/ || \
+ [ -z "$dbus_test_fatal" ]
+
+ # these tests benefit from being re-run as root
+ sudo env LD_LIBRARY_PATH=/usr/local/lib \
+ gnome-desktop-testing-runner -d /usr/local/share \
+ dbus/test-uid-permissions_with_config.test || \
+ [ -z "$dbus_test_fatal" ]
+ fi
+ ;;
+
+ (cmake)
+ case "$dbus_ci_host" in
+ (mingw)
+ set _ "$@"
+ set "$@" -D CMAKE_TOOLCHAIN_FILE="${srcdir}/cmake/i686-w64-mingw32.cmake"
+ set "$@" -D CMAKE_PREFIX_PATH="${mingw}"
+ set "$@" -D CMAKE_INCLUDE_PATH="${mingw}/include"
+ set "$@" -D CMAKE_LIBRARY_PATH="${mingw}/lib"
+ set "$@" -D EXPAT_LIBRARY="${mingw}/lib/libexpat.dll.a"
+ set "$@" -D GLIB2_LIBRARIES="${mingw}/lib/libglib-2.0.dll.a"
+ set "$@" -D GOBJECT_LIBRARIES="${mingw}/lib/libgobject-2.0.dll.a"
+ set "$@" -D GIO_LIBRARIES="${mingw}/lib/libgio-2.0.dll.a"
+ shift
+ # don't run tests yet, Wine needs Xvfb and more
+ # msys2 libraries
+ dbus_test=
+ ;;
+ esac
+
+ cmake "$@" ../cmake
+
+ ${make}
+ # The test coverage for OOM-safety is too verbose to be useful on
+ # travis-ci.
+ export DBUS_TEST_MALLOC_FAILURES=0
+ [ -z "$dbus_test" ] || ctest -VV || [ -z "$dbus_test_fatal" ]
+ ${make} install DESTDIR=$(pwd)/DESTDIR
+ ( cd DESTDIR && find . )
+ ;;
esac
+
+# vim:set sw=4 sts=4 et: