From 727c5429ba94aad935ff7f483fcb350aee00c1dd Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 16 May 2016 13:48:37 +0100 Subject: [PATCH 1/2] travis: compile with mingw in both production and debug flavours This should detect anything that is only a build failure when embedded tests or verbose mode are enabled, such as the missing include fixed in commit 4858faf. I'm not enabling embedded tests and verbose mode orthogonally because we don't want CI builds to take too long. Signed-off-by: Simon McVittie Reviewed-by: Ralf Habacker (cherry picked from commit 8f6fe1451ead14b82475177f40bbc2c256cba876) --- .travis.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.travis.yml b/.travis.yml index 9f3d6fab..db296739 100644 --- a/.travis.yml +++ b/.travis.yml @@ -44,6 +44,7 @@ env: - dbus_ci_variant=legacy - dbus_ci_buildsys=cmake - dbus_ci_host=mingw + - dbus_ci_host=mingw dbus_ci_variant=debug - dbus_ci_host=mingw dbus_ci_buildsys=cmake # vim:set sw=2 sts=2 et: From bed268845241ac0315b5684adb82c6994d3acaa3 Mon Sep 17 00:00:00 2001 From: Simon McVittie Date: Mon, 25 Jul 2016 11:53:13 +0100 Subject: [PATCH 2/2] Update NEWS for merge of dbus-1.10-ci branch --- NEWS | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/NEWS b/NEWS index d898c3c2..1981a8d0 100644 --- a/NEWS +++ b/NEWS @@ -13,12 +13,29 @@ Fixes: • Fix memory leaks and thread safety in subprocess starting on Windows (fd.o #95191, Ralf Habacker) +• Do not require systemd to have a service file if using it for activation + (fd.o #93194; Simon McVittie; backport from 1.11.0) + • Stop test-dbus-daemon incorrectly failing on platforms that cannot discover the process ID of clients (fd.o #96653, Руслан Ижбулатов) • In tests that exercise correct handling of crashing D-Bus services, suppress Windows crash handler (fd.o #95155; Yiyang Fei, Ralf Habacker) +• Merge dbus-1.10-ci branch, containing backports from 1.11.0 in build/test + code to support continuous integration (fd.o #93194, Simon McVittie) + + · Avoid -Wunused-label when compiling with libselinux but no libaudit + · In development builds, allow OOM tests to be disabled as documented + · Accept and ignore the --tap argument in all "embedded tests", and run + all automated tests with that argument for better diagnostics + · Fix the systemd activation test under CMake by installing the required + files + · In Automake, fix shell syntax for installcheck-local with no DESTDIR + · In Automake, don't try to run manual tests in installcheck + · In CMake, don't run manual-tcp test as an automated test + · Add travis-ci.org build machinery + D-Bus 1.10.8 (2016-03-07) ==