From ee784fff1af4da2151309f3a943257537f507cc8 Mon Sep 17 00:00:00 2001
From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Tue, 16 Jul 2019 15:01:04 +0000
Subject: [PATCH 1/2] tests: run TEST-01-BASIC under ASAN+UBSan again

Not that `journalctl --flush` is no longer flaky, it should be
safe to bring the test back.
---
 travis-ci/managers/xenial.sh | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/travis-ci/managers/xenial.sh b/travis-ci/managers/xenial.sh
index 076e8f9325..a11f2ce4d4 100755
--- a/travis-ci/managers/xenial.sh
+++ b/travis-ci/managers/xenial.sh
@@ -56,6 +56,4 @@ make -C test/TEST-01-BASIC clean setup run NSPAWN_TIMEOUT=600 TEST_NO_QEMU=yes N
 # Now that we're more or less sure that ASan isn't going to crash systemd and cause a kernel panic
 # let's also run the test with QEMU to cover udevd, sysctl and everything else that isn't run
 # in containers.
-
-# This should be turned on once `journalctl --flush` isn't flaky any more
-#make -C test/TEST-01-BASIC clean setup run QEMU_TIMEOUT=900 TEST_NO_NSPAWN=yes
+make -C test/TEST-01-BASIC clean setup run QEMU_TIMEOUT=900 TEST_NO_NSPAWN=yes

From 038bf640e920944fac57b75879059b1f8a262824 Mon Sep 17 00:00:00 2001
From: Evgeny Vereshchagin <evvers@ya.ru>
Date: Tue, 16 Jul 2019 15:01:26 +0000
Subject: [PATCH 2/2] tests: bump up QEMU_MEM

---
 test/test-functions | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/test/test-functions b/test/test-functions
index 5dbbff0f06..1aef07a44e 100644
--- a/test/test-functions
+++ b/test/test-functions
@@ -52,7 +52,7 @@ if [[ "$IS_BUILT_WITH_ASAN" = "yes" ]]; then
     STRIP_BINARIES=no
     SKIP_INITRD="${SKIP_INITRD:-yes}"
     PATH_TO_INIT=$ROOTLIBDIR/systemd-under-asan
-    QEMU_MEM="1536M"
+    QEMU_MEM="2048M"
     QEMU_SMP=4
 
     # We need to correctly distinguish between gcc's and clang's ASan DSOs.