47 lines
1.7 KiB
Diff
47 lines
1.7 KiB
Diff
From c31a80c9edf8603cbdc5d2fe4465571a2ffcdff0 Mon Sep 17 00:00:00 2001
|
|
From: Harald Hoyer <harald@redhat.com>
|
|
Date: Thu, 16 Aug 2018 09:50:52 +0200
|
|
Subject: [PATCH] TEST-01: remove memdebug
|
|
|
|
---
|
|
.travis.yml | 6 ++----
|
|
test/TEST-01-BASIC/test.sh | 2 +-
|
|
2 files changed, 3 insertions(+), 5 deletions(-)
|
|
|
|
diff --git a/.travis.yml b/.travis.yml
|
|
index d6d3947c..1f50b6d9 100644
|
|
--- a/.travis.yml
|
|
+++ b/.travis.yml
|
|
@@ -4,15 +4,13 @@ services:
|
|
- docker
|
|
env:
|
|
matrix:
|
|
- - IMAGE=latest TESTS=01
|
|
- - IMAGE=latest TESTS="02 03 04 10 11 12 13 15 17 18"
|
|
+ - IMAGE=latest TESTS="01 02 03 04 10 11 12 13 15 17 18"
|
|
- IMAGE=latest TESTS=20
|
|
- IMAGE=latest TESTS="30 31"
|
|
- IMAGE=latest TESTS=50
|
|
- IMAGE=latest TESTS=70
|
|
- IMAGE=latest TESTS=99
|
|
- - IMAGE=rawhide TESTS=01
|
|
- - IMAGE=rawhide TESTS="02 03 04 10 11 12 13 15 17 18"
|
|
+ - IMAGE=rawhide TESTS="01 02 03 04 10 11 12 13 15 17 18"
|
|
- IMAGE=rawhide TESTS=20
|
|
- IMAGE=rawhide TESTS="30 31"
|
|
- IMAGE=rawhide TESTS=50
|
|
diff --git a/test/TEST-01-BASIC/test.sh b/test/TEST-01-BASIC/test.sh
|
|
index 137249f4..455afef6 100755
|
|
--- a/test/TEST-01-BASIC/test.sh
|
|
+++ b/test/TEST-01-BASIC/test.sh
|
|
@@ -15,7 +15,7 @@ test_run() {
|
|
-net none \
|
|
-watchdog i6300esb -watchdog-action poweroff \
|
|
-no-reboot \
|
|
- -append "panic=1 root=LABEL=dracut rw systemd.log_level=debug systemd.log_target=console rd.retry=3 rd.debug console=ttyS0,115200n81 rd.shell=0 $DEBUGFAIL rd.memdebug=4" \
|
|
+ -append "panic=1 root=LABEL=dracut rw systemd.log_level=debug systemd.log_target=console rd.retry=3 rd.debug console=ttyS0,115200n81 rd.shell=0 $DEBUGFAIL" \
|
|
-initrd $TESTDIR/initramfs.testing || return 1
|
|
grep -F -m 1 -q dracut-root-block-success $TESTDIR/result || return 1
|
|
}
|
|
|