fdo-mirrors/dbus
1
0
Fork 0
mirror of https://gitlab.freedesktop.org/dbus/dbus.git synced 2026-05-08 10:18:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

ci-build: retab with 4-space indentation

Browse source 
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
This commit is contained in:
Simon McVittie 2016-11-28 12:54:21 +00:00
parent 300d9a3c96
commit f6eb7c8afb
1 changed files with 160 additions and 158 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

318
tools/ci-build.sh
View file

@ -26,19 +26,19 @@ set -e
set -x set -x
if [ -z "$dbus_ci_variant" ]; then if [ -z "$dbus_ci_variant" ]; then
dbus_ci_variant=production dbus_ci_variant=production
fi fi
if [ -z "$dbus_ci_host" ]; then if [ -z "$dbus_ci_host" ]; then
dbus_ci_host=native dbus_ci_host=native
fi fi
if [ -z "$dbus_ci_buildsys" ]; then if [ -z "$dbus_ci_buildsys" ]; then
dbus_ci_buildsys=autotools dbus_ci_buildsys=autotools
fi fi
if [ -z "$dbus_ci_parallel" ]; then if [ -z "$dbus_ci_parallel" ]; then
dbus_ci_parallel=1 dbus_ci_parallel=1
fi fi
dbus_test=yes 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" make="make -j${dbus_ci_parallel} V=1 VERBOSE=1"
case "$dbus_ci_host" in case "$dbus_ci_host" in
(mingw) (mingw)
mirror=http://sourceforge.net/projects/msys2/files/REPOS/MINGW/i686/ mirror=http://sourceforge.net/projects/msys2/files/REPOS/MINGW/i686/
mingw="$(pwd)/mingw32" mingw="$(pwd)/mingw32"
install -d "${mingw}" install -d "${mingw}"
export PKG_CONFIG_LIBDIR="${mingw}/lib/pkgconfig" export PKG_CONFIG_LIBDIR="${mingw}/lib/pkgconfig"
export PKG_CONFIG_PATH= export PKG_CONFIG_PATH=
export PKG_CONFIG="pkg-config --define-variable=prefix=${mingw}" export PKG_CONFIG="pkg-config --define-variable=prefix=${mingw}"
unset CC unset CC
unset CXX unset CXX
for pkg in \ for pkg in \
expat-2.1.0-6 \ expat-2.1.0-6 \
gcc-libs-5.2.0-4 \ gcc-libs-5.2.0-4 \
gettext-0.19.6-1 \ gettext-0.19.6-1 \
glib2-2.46.1-1 \ glib2-2.46.1-1 \
libffi-3.2.1-3 \ libffi-3.2.1-3 \
zlib-1.2.8-9 \ zlib-1.2.8-9 \
; do ; do
wget ${mirror}/mingw-w64-i686-${pkg}-any.pkg.tar.xz wget ${mirror}/mingw-w64-i686-${pkg}-any.pkg.tar.xz
tar -xvf mingw-w64-i686-${pkg}-any.pkg.tar.xz tar -xvf mingw-w64-i686-${pkg}-any.pkg.tar.xz
done done
export TMPDIR=/tmp export TMPDIR=/tmp
;; ;;
esac esac
case "$dbus_ci_buildsys" in case "$dbus_ci_buildsys" in
(autotools) (autotools)
case "$dbus_ci_variant" in case "$dbus_ci_variant" in
(debug) (debug)
# Full developer/debug build. # Full developer/debug build.
set _ "$@" set _ "$@"
set "$@" --enable-developer --enable-tests set "$@" --enable-developer --enable-tests
shift shift
# The test coverage for OOM-safety is too # The test coverage for OOM-safety is too
# verbose to be useful on travis-ci. # verbose to be useful on travis-ci.
export DBUS_TEST_MALLOC_FAILURES=0 export DBUS_TEST_MALLOC_FAILURES=0
;; ;;
(reduced) (reduced)
# A smaller configuration than normal, with # A smaller configuration than normal, with
# various features disabled; this emulates # various features disabled; this emulates
# an older system or one that does not have # an older system or one that does not have
# all the optional libraries. # all the optional libraries.
set _ "$@" set _ "$@"
# No LSMs (the production build has both) # No LSMs (the production build has both)
set "$@" --disable-selinux --disable-apparmor set "$@" --disable-selinux --disable-apparmor
# No inotify (we will use dnotify) # No inotify (we will use dnotify)
set "$@" --disable-inotify set "$@" --disable-inotify
# No epoll or kqueue (we will use poll) # No epoll or kqueue (we will use poll)
set "$@" --disable-epoll --disable-kqueue set "$@" --disable-epoll --disable-kqueue
# No special init system support # No special init system support
set "$@" --disable-launchd --disable-systemd set "$@" --disable-launchd --disable-systemd
# No libaudit or valgrind # No libaudit or valgrind
set "$@" --disable-libaudit --without-valgrind set "$@" --disable-libaudit --without-valgrind
shift shift
;; ;;
(legacy) (legacy)
# An unrealistically cut-down configuration, # An unrealistically cut-down configuration,
# to check that it compiles and works. # to check that it compiles and works.
set _ "$@" set _ "$@"
# Disable native atomic operations on Unix # Disable native atomic operations on Unix
# (armv4, as used as the baseline for Debian # (armv4, as used as the baseline for Debian
# armel, is one architecture that really # armel, is one architecture that really
# doesn't have them) # doesn't have them)
set "$@" dbus_cv_sync_sub_and_fetch=no set "$@" dbus_cv_sync_sub_and_fetch=no
# No epoll, kqueue or poll (we will fall back # No epoll, kqueue or poll (we will fall back
# to select, even on Unix where we would # to select, even on Unix where we would
# usually at least have poll) # usually at least have poll)
set "$@" --disable-epoll --disable-kqueue set "$@" --disable-epoll --disable-kqueue
set "$@" CPPFLAGS=-DBROKEN_POLL=1 set "$@" CPPFLAGS=-DBROKEN_POLL=1
# Enable SELinux and AppArmor but not # Enable SELinux and AppArmor but not
# libaudit - that configuration has sometimes # libaudit - that configuration has sometimes
# failed # failed
set "$@" --enable-selinux --enable-apparmor set "$@" --enable-selinux --enable-apparmor
set "$@" --disable-libaudit --without-valgrind set "$@" --disable-libaudit --without-valgrind
# No directory monitoring at all # No directory monitoring at all
set "$@" --disable-inotify --disable-dnotify set "$@" --disable-inotify --disable-dnotify
# No special init system support # No special init system support
set "$@" --disable-launchd --disable-systemd set "$@" --disable-launchd --disable-systemd
# No X11 autolaunching # No X11 autolaunching
set "$@" --disable-x11-autolaunch set "$@" --disable-x11-autolaunch
shift shift
;; ;;
(*) (*)
;; ;;
esac esac
case "$dbus_ci_host" in case "$dbus_ci_host" in
(mingw) (mingw)
set _ "$@" set _ "$@"
set "$@" --build="$(build-aux/config.guess)" set "$@" --build="$(build-aux/config.guess)"
set "$@" --host=i686-w64-mingw32 set "$@" --host=i686-w64-mingw32
set "$@" LDFLAGS=-L"${mingw}/lib" set "$@" LDFLAGS=-L"${mingw}/lib"
set "$@" CPPFLAGS=-I"${mingw}/include" set "$@" CPPFLAGS=-I"${mingw}/include"
set "$@" CFLAGS=-static-libgcc set "$@" CFLAGS=-static-libgcc
set "$@" CXXFLAGS=-static-libgcc set "$@" CXXFLAGS=-static-libgcc
# don't run tests yet, Wine needs Xvfb and # don't run tests yet, Wine needs Xvfb and
# more msys2 libraries # more msys2 libraries
dbus_test= dbus_test=
# don't "make install" system-wide # don't "make install" system-wide
dbus_ci_sudo= dbus_ci_sudo=
shift shift
;; ;;
esac esac
../configure \ ../configure \
--enable-installed-tests \ --enable-installed-tests \
--enable-maintainer-mode \ --enable-maintainer-mode \
--enable-modular-tests \ --enable-modular-tests \
--with-glib \ --with-glib \
"$@" "$@"
${make} ${make}
[ -z "$dbus_test" ] || ${make} check || [ -z "$dbus_test_fatal" ] [ -z "$dbus_test" ] || ${make} check || [ -z "$dbus_test_fatal" ]
cat test/test-suite.log || : cat test/test-suite.log || :
[ -z "$dbus_test" ] || ${make} distcheck || \ [ -z "$dbus_test" ] || ${make} distcheck || \
[ -z "$dbus_test_fatal" ] [ -z "$dbus_test_fatal" ]
${make} install DESTDIR=$(pwd)/DESTDIR ${make} install DESTDIR=$(pwd)/DESTDIR
( cd DESTDIR && find . ) ( cd DESTDIR && find . )
if [ -n "$dbus_ci_sudo" ] && [ -n "$dbus_test" ]; then if [ -n "$dbus_ci_sudo" ] && [ -n "$dbus_test" ]; then
sudo ${make} install sudo ${make} install
LD_LIBRARY_PATH=/usr/local/lib ${make} installcheck || \ LD_LIBRARY_PATH=/usr/local/lib ${make} installcheck || \
[ -z "$dbus_test_fatal" ] [ -z "$dbus_test_fatal" ]
cat test/test-suite.log || : cat test/test-suite.log || :
# re-run them with gnome-desktop-testing # re-run them with gnome-desktop-testing
env LD_LIBRARY_PATH=/usr/local/lib \ env LD_LIBRARY_PATH=/usr/local/lib \
gnome-desktop-testing-runner -d /usr/local/share dbus/ || \ gnome-desktop-testing-runner -d /usr/local/share dbus/ || \
[ -z "$dbus_test_fatal" ] [ -z "$dbus_test_fatal" ]
# these tests benefit from being re-run as root # these tests benefit from being re-run as root
sudo env LD_LIBRARY_PATH=/usr/local/lib \ sudo env LD_LIBRARY_PATH=/usr/local/lib \
gnome-desktop-testing-runner -d /usr/local/share \ gnome-desktop-testing-runner -d /usr/local/share \
dbus/test-uid-permissions_with_config.test || \ dbus/test-uid-permissions_with_config.test || \
[ -z "$dbus_test_fatal" ] [ -z "$dbus_test_fatal" ]
fi fi
;; ;;
(cmake) (cmake)
case "$dbus_ci_host" in case "$dbus_ci_host" in
(mingw) (mingw)
set _ "$@" set _ "$@"
set "$@" -D CMAKE_TOOLCHAIN_FILE="${srcdir}/cmake/i686-w64-mingw32.cmake" set "$@" -D CMAKE_TOOLCHAIN_FILE="${srcdir}/cmake/i686-w64-mingw32.cmake"
set "$@" -D CMAKE_PREFIX_PATH="${mingw}" set "$@" -D CMAKE_PREFIX_PATH="${mingw}"
set "$@" -D CMAKE_INCLUDE_PATH="${mingw}/include" set "$@" -D CMAKE_INCLUDE_PATH="${mingw}/include"
set "$@" -D CMAKE_LIBRARY_PATH="${mingw}/lib" set "$@" -D CMAKE_LIBRARY_PATH="${mingw}/lib"
set "$@" -D EXPAT_LIBRARY="${mingw}/lib/libexpat.dll.a" set "$@" -D EXPAT_LIBRARY="${mingw}/lib/libexpat.dll.a"
set "$@" -D GLIB2_LIBRARIES="${mingw}/lib/libglib-2.0.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 GOBJECT_LIBRARIES="${mingw}/lib/libgobject-2.0.dll.a"
set "$@" -D GIO_LIBRARIES="${mingw}/lib/libgio-2.0.dll.a" set "$@" -D GIO_LIBRARIES="${mingw}/lib/libgio-2.0.dll.a"
shift shift
# don't run tests yet, Wine needs Xvfb and more # don't run tests yet, Wine needs Xvfb and more
# msys2 libraries # msys2 libraries
dbus_test= dbus_test=
;; ;;
esac esac
cmake "$@" ../cmake cmake "$@" ../cmake
${make} ${make}
# The test coverage for OOM-safety is too verbose to be useful on # The test coverage for OOM-safety is too verbose to be useful on
# travis-ci. # travis-ci.
export DBUS_TEST_MALLOC_FAILURES=0 export DBUS_TEST_MALLOC_FAILURES=0
[ -z "$dbus_test" ] || ctest -VV || [ -z "$dbus_test_fatal" ] [ -z "$dbus_test" ] || ctest -VV || [ -z "$dbus_test_fatal" ]
${make} install DESTDIR=$(pwd)/DESTDIR ${make} install DESTDIR=$(pwd)/DESTDIR
( cd DESTDIR && find . ) ( cd DESTDIR && find . )
;; ;;
esac esac
# vim:set sw=4 sts=4 et: