Merge ~canonical-kernel-team/+git/autotest-client-tests:phlin/stress-smoke-cleanup into ~canonical-kernel-team/+git/autotest-client-tests:master

[Po-Hsu Lin]

The set_max_oom_level() along with the sleep and sync commands have been
moved to ubuntu_stress_smoke_test_init.sh already. We don't need them
anymore in ubuntu_stress_single_smoke_test.sh.

Also remove extra spaces from shebang.

[Andrei Gherzan (agherzan)]

Looks good!

review: Approve

[Paolo Pisati (p-pisati)]

LGTM.

review: Approve

[Po-Hsu Lin (cypressyew)]

Applied and pushed, thanks!

diff --git a/ubuntu_stress_smoke_test/ubuntu_stress_single_smoke_test.sh b/ubuntu_stress_smoke_test/ubuntu_stress_single_smoke_test.sh
index e3be957..5ba3f9d 100755
--- a/ubuntu_stress_smoke_test/ubuntu_stress_single_smoke_test.sh
+++ b/ubuntu_stress_smoke_test/ubuntu_stress_single_smoke_test.sh
@@ -1,4 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
 
 [ $# -lt 1 ] && echo "$0 requires STRESSOR name to be run" && exit 1
 STRESSOR=${1}
@@ -150,27 +150,6 @@ secs_now()
 	date "+%s"
 }
 
-#
-#  Try an ensure that this script and parent won't be oom'd
-#
-set_max_oom_level()
-{
-	if [ -e /proc/self/oom_score_adj ]; then
-		echo -900 > /proc/self/oom_score_adj
-		echo -900 > /proc/$PPID/oom_score_adj
-	elif [ -e /proc/self/oom_adj ]; then
-		echo -14 > /proc/self/oom_adj
-		echo -14 > /proc/$PPID/oom_adj
-	fi
-	#
-	# Ensure oom killer kills the stressor hogs rather
-	# than the wrong random process (e.g. autotest!)
-	#
-	if [ -e /proc/sys/vm/oom_kill_allocating_task ]; then
-		echo 0 > /proc/sys/vm/oom_kill_allocating_task
-	fi
-}
-
 check_machine
 
 passed=""
@@ -207,9 +186,6 @@ echo "Number of CPUs Online: $(getconf _NPROCESSORS_ONLN)"
 echo
 echo "Maximum bogo ops: ${MAX_BOGO_OPS}"
 echo " "
-set_max_oom_level
-sleep 15
-sync
 
 #
 #  Handle cases where cgroup settings are enabled or not
diff --git a/ubuntu_stress_smoke_test/ubuntu_stress_smoke_test_cleanup.sh b/ubuntu_stress_smoke_test/ubuntu_stress_smoke_test_cleanup.sh
index 6c43281..754844f 100755
--- a/ubuntu_stress_smoke_test/ubuntu_stress_smoke_test_cleanup.sh
+++ b/ubuntu_stress_smoke_test/ubuntu_stress_smoke_test_cleanup.sh
@@ -1,4 +1,4 @@
-#!/bin/bash 
+#!/bin/bash
 
 #
 #  Garbage collect swap file
diff --git a/ubuntu_stress_smoke_test/ubuntu_stress_smoke_test_init.sh b/ubuntu_stress_smoke_test/ubuntu_stress_smoke_test_init.sh
index 0471fb7..d037df6 100755
--- a/ubuntu_stress_smoke_test/ubuntu_stress_smoke_test_init.sh
+++ b/ubuntu_stress_smoke_test/ubuntu_stress_smoke_test_init.sh
@@ -1,6 +1,4 @@
-#!/bin/bash 
-
-SYS_ZSWAP_ENABLED=/sys/module/zswap/parameters/enabled
+#!/bin/bash
 
 #
 #  Try an ensure that this script and parent won't be oom'd