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. 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