From 9c8a03bdf2a94cc0e5093f5a5ed2b9f4e7cfb676 Mon Sep 17 00:00:00 2001 From: Ole Tange Date: Tue, 20 Nov 2012 00:39:25 +0100 Subject: [PATCH] testsuite: niceload: The most fragile tests split off. --- testsuite/tests-to-run/niceload01.sh | 9 --------- testsuite/tests-to-run/niceload03.sh | 11 +++++++++++ testsuite/wanted-results/niceload01 | 5 ----- testsuite/wanted-results/niceload03 | 5 +++++ 4 files changed, 16 insertions(+), 14 deletions(-) create mode 100644 testsuite/tests-to-run/niceload03.sh create mode 100644 testsuite/wanted-results/niceload03 diff --git a/testsuite/tests-to-run/niceload01.sh b/testsuite/tests-to-run/niceload01.sh index 3771aadb..84ebee91 100644 --- a/testsuite/tests-to-run/niceload01.sh +++ b/testsuite/tests-to-run/niceload01.sh @@ -31,15 +31,6 @@ EOF # force load > 10 while uptime | grep -v age:.[1-9][0-9].[0-9][0-9] >/dev/null ; do (timeout 5 nice burnP6 2>/dev/null &) done -cat <<'EOF' | stdout parallel -j0 -L1 -echo '### --soft -f and test if child is actually suspended and thus takes longer' - niceload --soft -t 0.2 -f 0.5 'seq 1000000 | wc;echo This should finish last' - (sleep 1; seq 1000000 | wc;echo This should finish first) -EOF - -# force load > 10 -while uptime | grep -v age:.[1-9][0-9].[0-9][0-9] >/dev/null ; do (timeout 5 nice burnP6 2>/dev/null &) done - cat <<'EOF' | stdout parallel -j0 -k -L1 echo '### -H and --hard' niceload -H -l 9.9 uptime | grep ':.[1-9][0-9].[0-9][0-9],' || echo OK-l9.9 diff --git a/testsuite/tests-to-run/niceload03.sh b/testsuite/tests-to-run/niceload03.sh new file mode 100644 index 00000000..2c328f55 --- /dev/null +++ b/testsuite/tests-to-run/niceload03.sh @@ -0,0 +1,11 @@ +#!/bin/bash + +# force load > 10 +while uptime | grep -v age:.[1-9][0-9].[0-9][0-9] >/dev/null ; do (timeout 5 nice burnP6 2>/dev/null &) done + +cat <<'EOF' | stdout parallel -j0 -L1 +echo '### --soft -f and test if child is actually suspended and thus takes longer' + niceload --soft -t 0.2 -f 0.5 'seq 1000000 | wc;echo This should finish last' + (sleep 1; seq 1000000 | wc;echo This should finish first) +EOF + diff --git a/testsuite/wanted-results/niceload01 b/testsuite/wanted-results/niceload01 index 3b8cd5f6..ae04f23c 100644 --- a/testsuite/wanted-results/niceload01 +++ b/testsuite/wanted-results/niceload01 @@ -7,11 +7,6 @@ OK--runmem ### -N and --noswap. Must give 0 -N 0 --noswap 0 -### --soft -f and test if child is actually suspended and thus takes longer -1000000 1000000 6888896 -This should finish first -1000000 1000000 6888896 -This should finish last ### -H and --hard OK-l9.9 OK-l9 diff --git a/testsuite/wanted-results/niceload03 b/testsuite/wanted-results/niceload03 new file mode 100644 index 00000000..3e485af9 --- /dev/null +++ b/testsuite/wanted-results/niceload03 @@ -0,0 +1,5 @@ +### --soft -f and test if child is actually suspended and thus takes longer +1000000 1000000 6888896 +This should finish first +1000000 1000000 6888896 +This should finish last