tests: move schedutils tool test scripts to dedicated subdirs

Signed-off-by: Christian Goeschel Ndjomouo <cgoesc2@wgu.edu>

diff --git a/tests/expected/schedutils/chrt b/tests/expected/chrt/chrt
similarity index 100%
rename from tests/expected/schedutils/chrt
rename to tests/expected/chrt/chrt

diff --git a/tests/expected/schedutils/chrt-batch b/tests/expected/chrt/chrt-batch
similarity index 100%
rename from tests/expected/schedutils/chrt-batch
rename to tests/expected/chrt/chrt-batch

diff --git a/tests/expected/schedutils/chrt-batch-custom-slice b/tests/expected/chrt/chrt-batch-custom-slice
similarity index 100%
rename from tests/expected/schedutils/chrt-batch-custom-slice
rename to tests/expected/chrt/chrt-batch-custom-slice

diff --git a/tests/expected/schedutils/chrt-deadline b/tests/expected/chrt/chrt-deadline
similarity index 100%
rename from tests/expected/schedutils/chrt-deadline
rename to tests/expected/chrt/chrt-deadline

diff --git a/tests/expected/schedutils/chrt-ext b/tests/expected/chrt/chrt-ext
similarity index 100%
rename from tests/expected/schedutils/chrt-ext
rename to tests/expected/chrt/chrt-ext

diff --git a/tests/expected/schedutils/chrt-fifo b/tests/expected/chrt/chrt-fifo
similarity index 100%
rename from tests/expected/schedutils/chrt-fifo
rename to tests/expected/chrt/chrt-fifo

diff --git a/tests/expected/schedutils/chrt-idle b/tests/expected/chrt/chrt-idle
similarity index 100%
rename from tests/expected/schedutils/chrt-idle
rename to tests/expected/chrt/chrt-idle

diff --git a/tests/expected/schedutils/chrt-non-root-batch-vs-nice b/tests/expected/chrt/chrt-non-root-batch-vs-nice
similarity index 100%
rename from tests/expected/schedutils/chrt-non-root-batch-vs-nice
rename to tests/expected/chrt/chrt-non-root-batch-vs-nice

diff --git a/tests/expected/schedutils/chrt-other b/tests/expected/chrt/chrt-other
similarity index 100%
rename from tests/expected/schedutils/chrt-other
rename to tests/expected/chrt/chrt-other

diff --git a/tests/expected/schedutils/chrt-other-custom-slice b/tests/expected/chrt/chrt-other-custom-slice
similarity index 100%
rename from tests/expected/schedutils/chrt-other-custom-slice
rename to tests/expected/chrt/chrt-other-custom-slice

diff --git a/tests/expected/schedutils/chrt-rr b/tests/expected/chrt/chrt-rr
similarity index 100%
rename from tests/expected/schedutils/chrt-rr
rename to tests/expected/chrt/chrt-rr

diff --git a/tests/expected/schedutils/coresched-copy-from-child-to-parent b/tests/expected/coresched/coresched-copy-from-child-to-parent
similarity index 100%
rename from tests/expected/schedutils/coresched-copy-from-child-to-parent
rename to tests/expected/coresched/coresched-copy-from-child-to-parent

diff --git a/tests/expected/schedutils/coresched-copy-from-parent-to-nested-child b/tests/expected/coresched/coresched-copy-from-parent-to-nested-child
similarity index 100%
rename from tests/expected/schedutils/coresched-copy-from-parent-to-nested-child
rename to tests/expected/coresched/coresched-copy-from-parent-to-nested-child

diff --git a/tests/expected/schedutils/coresched-get-cookie-own-pid b/tests/expected/coresched/coresched-get-cookie-own-pid
similarity index 100%
rename from tests/expected/schedutils/coresched-get-cookie-own-pid
rename to tests/expected/coresched/coresched-get-cookie-own-pid

diff --git a/tests/expected/schedutils/coresched-get-cookie-parent-pid b/tests/expected/coresched/coresched-get-cookie-parent-pid
similarity index 100%
rename from tests/expected/schedutils/coresched-get-cookie-parent-pid
rename to tests/expected/coresched/coresched-get-cookie-parent-pid

diff --git a/tests/expected/schedutils/coresched-new-child-with-new-cookie b/tests/expected/coresched/coresched-new-child-with-new-cookie
similarity index 100%
rename from tests/expected/schedutils/coresched-new-child-with-new-cookie
rename to tests/expected/coresched/coresched-new-child-with-new-cookie

diff --git a/tests/expected/schedutils/coresched-set-cookie-parent-pid.err b/tests/expected/coresched/coresched-set-cookie-parent-pid.err
similarity index 100%
rename from tests/expected/schedutils/coresched-set-cookie-parent-pid.err
rename to tests/expected/coresched/coresched-set-cookie-parent-pid.err

diff --git a/tests/expected/schedutils/set-cookie-parent-pid b/tests/expected/schedutils/set-cookie-parent-pid
deleted file mode 100644 (file)
index e7318ff..0000000
--- a/tests/expected/schedutils/set-cookie-parent-pid
+++ /dev/null
@@ -1 +0,0 @@
-coresched: set cookie of PID PARENT_PID to PARENT_COOKIE

diff --git a/tests/ts/schedutils/chrt b/tests/ts/chrt/chrt
similarity index 100%
rename from tests/ts/schedutils/chrt
rename to tests/ts/chrt/chrt

diff --git a/tests/ts/schedutils/chrt-non-root b/tests/ts/chrt/chrt-non-root
similarity index 100%
rename from tests/ts/schedutils/chrt-non-root
rename to tests/ts/chrt/chrt-non-root

diff --git a/tests/ts/schedutils/coresched b/tests/ts/coresched/coresched
similarity index 96%
rename from tests/ts/schedutils/coresched
rename to tests/ts/coresched/coresched
index 36e1a9ca12dae66975388378356672cabc11a95c..1cdc3c2e78a32db32aefb13e8a98e6d41f7fb4b6 100755 (executable)
--- a/tests/ts/schedutils/coresched
+++ b/tests/ts/coresched/coresched
@@ -31,7 +31,7 @@ fi
 # The behavior of coresched does not depend on the exact values of these cookies, so using
 # placeholder values does not change the behavior tests.
 ts_init_subtest "set-cookie-parent-pid"
-CORESCHED_OUTPUT=$( ($TS_CMD_CORESCHED -v new -d $$ \
+CORESCHED_OUTPUT=$( ($TS_CMD_CORESCHED --verbose new --dest $$ \
   | tee -a "$TS_OUTPUT") 3>&1 1>&2 2>&3 \
   | sed "s/$$/PARENT_PID/g")
 CORESCHED_PARENT_COOKIE=$(echo "$CORESCHED_OUTPUT" | sed 's/^.*\(0x.*$\)/\1/g')
@@ -44,7 +44,7 @@ echo "$CORESCHED_OUTPUT" >> "$TS_ERRLOG"
 ts_finalize_subtest
 
 ts_init_subtest "get-cookie-parent-pid"
-$TS_CMD_CORESCHED get -s $$ 2>> "$TS_ERRLOG" \
+$TS_CMD_CORESCHED get --source $$ 2>> "$TS_ERRLOG" \
   | sed -e "s/$$/PARENT_PID/g" \
         -e "s/$CORESCHED_PARENT_COOKIE/PARENT_COOKIE/g" >> "$TS_OUTPUT"
 ts_finalize_subtest