]> git.ipfire.org Git - thirdparty/systemd.git/commitdiff
oom: update extended test to remove swap gating 18361/head
authorAnita Zhang <the.anitazha@gmail.com>
Sun, 24 Jan 2021 09:34:23 +0000 (01:34 -0800)
committerAnita Zhang <the.anitazha@gmail.com>
Sun, 24 Jan 2021 10:03:59 +0000 (02:03 -0800)
test/units/testsuite-56.sh

index 6e7941a57fc199bab33d3a84c3efc596d9fd10df..4dc9d8c7a86c408b67c6d14a820b7678ba14edc1 100755 (executable)
@@ -6,7 +6,6 @@ systemd-analyze log-level debug
 systemd-analyze log-target console
 
 # Loose checks to ensure the environment has the necessary features for systemd-oomd
-[[ "$( awk '/SwapTotal/ { print $2 }' /proc/meminfo )" != "0" ]] || echo "no swap" >> /skipped
 [[ -e /proc/pressure ]] || echo "no PSI" >> /skipped
 cgroup_type=$(stat -fc %T /sys/fs/cgroup/)
 if [[ "$cgroup_type" != *"cgroup2"* ]] && [[ "$cgroup_type" != *"0x63677270"* ]]; then
@@ -16,8 +15,8 @@ fi
 
 echo "DefaultMemoryPressureDurationSec=5s" >> /etc/systemd/oomd.conf
 
-systemctl start testsuite-56-testbloat.service
 systemctl start testsuite-56-testchill.service
+systemctl start testsuite-56-testbloat.service
 
 # Verify systemd-oomd is monitoring the expected units
 oomctl | grep "/testsuite-56-workload.slice"