runner_tests: Rename dynamic-subtests json test to dynamic-subtests-keep-dynamic

In preparation for testing the rest of the options for prune_mode,
rename the current dynamic subtest result test to reflect the option
value.

Signed-off-by: Petri Latvala <petri.latvala@intel.com>
Cc: Arkadiusz Hiler <arek@hiler.eu>
Reviewed-by: Swati Sharma <swati2.sharma@intel.com>

21 files changed, 5 insertions, 3 deletions

diff --git a/runner/json_tests_data/dynamic-subtests/0/dmesg.txt b/runner/json_tests_data/dynamic-subtests-keep-dynamic/0/dmesg.txt
index c87b4271..c87b4271 100644
--- a/runner/json_tests_data/dynamic-subtests/0/dmesg.txt
+++ b/runner/json_tests_data/dynamic-subtests-keep-dynamic/0/dmesg.txt
diff --git a/runner/json_tests_data/dynamic-subtests/0/err.txt b/runner/json_tests_data/dynamic-subtests-keep-dynamic/0/err.txt
index 3c280788..3c280788 100644
--- a/runner/json_tests_data/dynamic-subtests/0/err.txt
+++ b/runner/json_tests_data/dynamic-subtests-keep-dynamic/0/err.txt
diff --git a/runner/json_tests_data/dynamic-subtests/0/journal.txt b/runner/json_tests_data/dynamic-subtests-keep-dynamic/0/journal.txt
index aa8cef0c..aa8cef0c 100644
--- a/runner/json_tests_data/dynamic-subtests/0/journal.txt
+++ b/runner/json_tests_data/dynamic-subtests-keep-dynamic/0/journal.txt
diff --git a/runner/json_tests_data/dynamic-subtests/0/out.txt b/runner/json_tests_data/dynamic-subtests-keep-dynamic/0/out.txt
index 286da3f3..286da3f3 100644
--- a/runner/json_tests_data/dynamic-subtests/0/out.txt
+++ b/runner/json_tests_data/dynamic-subtests-keep-dynamic/0/out.txt
diff --git a/runner/json_tests_data/dynamic-subtests/1/dmesg.txt b/runner/json_tests_data/dynamic-subtests-keep-dynamic/1/dmesg.txt
index d6e16a46..d6e16a46 100644
--- a/runner/json_tests_data/dynamic-subtests/1/dmesg.txt
+++ b/runner/json_tests_data/dynamic-subtests-keep-dynamic/1/dmesg.txt
diff --git a/runner/json_tests_data/dynamic-subtests/1/err.txt b/runner/json_tests_data/dynamic-subtests-keep-dynamic/1/err.txt
index 6247e714..6247e714 100644
--- a/runner/json_tests_data/dynamic-subtests/1/err.txt
+++ b/runner/json_tests_data/dynamic-subtests-keep-dynamic/1/err.txt
diff --git a/runner/json_tests_data/dynamic-subtests/1/journal.txt b/runner/json_tests_data/dynamic-subtests-keep-dynamic/1/journal.txt
index 3e4ce5c4..3e4ce5c4 100644
--- a/runner/json_tests_data/dynamic-subtests/1/journal.txt
+++ b/runner/json_tests_data/dynamic-subtests-keep-dynamic/1/journal.txt
diff --git a/runner/json_tests_data/dynamic-subtests/1/out.txt b/runner/json_tests_data/dynamic-subtests-keep-dynamic/1/out.txt
index 704734dc..704734dc 100644
--- a/runner/json_tests_data/dynamic-subtests/1/out.txt
+++ b/runner/json_tests_data/dynamic-subtests-keep-dynamic/1/out.txt
diff --git a/runner/json_tests_data/dynamic-subtests/2/dmesg.txt b/runner/json_tests_data/dynamic-subtests-keep-dynamic/2/dmesg.txt
index 046ef579..046ef579 100644
--- a/runner/json_tests_data/dynamic-subtests/2/dmesg.txt
+++ b/runner/json_tests_data/dynamic-subtests-keep-dynamic/2/dmesg.txt
diff --git a/runner/json_tests_data/dynamic-subtests/2/err.txt b/runner/json_tests_data/dynamic-subtests-keep-dynamic/2/err.txt
index 1eae6061..1eae6061 100644
--- a/runner/json_tests_data/dynamic-subtests/2/err.txt
+++ b/runner/json_tests_data/dynamic-subtests-keep-dynamic/2/err.txt
diff --git a/runner/json_tests_data/dynamic-subtests/2/journal.txt b/runner/json_tests_data/dynamic-subtests-keep-dynamic/2/journal.txt
index 9469e227..9469e227 100644
--- a/runner/json_tests_data/dynamic-subtests/2/journal.txt
+++ b/runner/json_tests_data/dynamic-subtests-keep-dynamic/2/journal.txt
diff --git a/runner/json_tests_data/dynamic-subtests/2/out.txt b/runner/json_tests_data/dynamic-subtests-keep-dynamic/2/out.txt
index 3063844b..3063844b 100644
--- a/runner/json_tests_data/dynamic-subtests/2/out.txt
+++ b/runner/json_tests_data/dynamic-subtests-keep-dynamic/2/out.txt
diff --git a/runner/json_tests_data/dynamic-subtests-keep-dynamic/README.txt b/runner/json_tests_data/dynamic-subtests-keep-dynamic/README.txt
new file mode 100644
index 00000000..78bbf47c
--- /dev/null
+++ b/runner/json_tests_data/dynamic-subtests-keep-dynamic/README.txt
@@ -0,0 +1,3 @@
+A test with dynamic subtests with prune-mode=keep-dynamic should
+generate separate subresults for the dynamic tests without the
+subtests.
diff --git a/runner/json_tests_data/dynamic-subtests/endtime.txt b/runner/json_tests_data/dynamic-subtests-keep-dynamic/endtime.txt
index 5c7608b5..5c7608b5 100644
--- a/runner/json_tests_data/dynamic-subtests/endtime.txt
+++ b/runner/json_tests_data/dynamic-subtests-keep-dynamic/endtime.txt
diff --git a/runner/json_tests_data/dynamic-subtests/joblist.txt b/runner/json_tests_data/dynamic-subtests-keep-dynamic/joblist.txt
index 4fdcc5f1..4fdcc5f1 100644
--- a/runner/json_tests_data/dynamic-subtests/joblist.txt
+++ b/runner/json_tests_data/dynamic-subtests-keep-dynamic/joblist.txt
diff --git a/runner/json_tests_data/dynamic-subtests/metadata.txt b/runner/json_tests_data/dynamic-subtests-keep-dynamic/metadata.txt
index 8c77de01..2442f37e 100644
--- a/runner/json_tests_data/dynamic-subtests/metadata.txt
+++ b/runner/json_tests_data/dynamic-subtests-keep-dynamic/metadata.txt
@@ -10,3 +10,4 @@ use_watchdog : 0
 piglit_style_dmesg : 0
 test_root : /path/does/not/exist
 results_path : /path/does/not/exist
+prune_mode : 0
diff --git a/runner/json_tests_data/dynamic-subtests/reference.json b/runner/json_tests_data/dynamic-subtests-keep-dynamic/reference.json
index c013d282..c013d282 100644
--- a/runner/json_tests_data/dynamic-subtests/reference.json
+++ b/runner/json_tests_data/dynamic-subtests-keep-dynamic/reference.json
diff --git a/runner/json_tests_data/dynamic-subtests/starttime.txt b/runner/json_tests_data/dynamic-subtests-keep-dynamic/starttime.txt
index b30b32ee..b30b32ee 100644
--- a/runner/json_tests_data/dynamic-subtests/starttime.txt
+++ b/runner/json_tests_data/dynamic-subtests-keep-dynamic/starttime.txt
diff --git a/runner/json_tests_data/dynamic-subtests/uname.txt b/runner/json_tests_data/dynamic-subtests-keep-dynamic/uname.txt
index a7aef6f7..a7aef6f7 100644
--- a/runner/json_tests_data/dynamic-subtests/uname.txt
+++ b/runner/json_tests_data/dynamic-subtests-keep-dynamic/uname.txt
diff --git a/runner/json_tests_data/dynamic-subtests/README.txt b/runner/json_tests_data/dynamic-subtests/README.txt
deleted file mode 100644
index 3a63ab17..00000000
--- a/runner/json_tests_data/dynamic-subtests/README.txt
+++ /dev/null
@@ -1,2 +0,0 @@
-A test with dynamic subtests should generate separate subresults for
-the dynamic tests.
diff --git a/runner/runner_json_tests.c b/runner/runner_json_tests.c
index 43d7f6b9..882225c8 100644
--- a/runner/runner_json_tests.c
+++ b/runner/runner_json_tests.c
@@ -162,7 +162,7 @@ static const char *dirnames[] = {
 	"dmesg-warn-level",
 	"dmesg-warn-level-piglit-style",
 	"dmesg-warn-level-one-piglit-style",
-	"dynamic-subtests",
+	"dynamic-subtests-keep-dynamic",
 	"dynamic-subtest-name-in-multiple-subtests",
 	"unprintable-characters",
 	"empty-result-files",