diff --git a/runner/json_tests_data/aborted-after-a-test/reference.json b/runner/json_tests_data/aborted-after-a-test/reference.json
index 0776f75822189cb479dfa262a42b539536290c9d..50ba9e6e1713c8d3a0511ccfdd824eecd616e153 100644
--- a/runner/json_tests_data/aborted-after-a-test/reference.json
+++ b/runner/json_tests_data/aborted-after-a-test/reference.json
@@ -3,6 +3,7 @@
"results_version":10,
"name":"normal-run",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
+ "cmdline":[],
"time_elapsed":{
"__type__":"TimeAttribute",
"start":1539953735.1110389,
diff --git a/runner/json_tests_data/aborted-on-boot/reference.json b/runner/json_tests_data/aborted-on-boot/reference.json
index 75f1946605bfe1b0671c3d4e7e5e006938791a72..238ec6fff8e44e97786476250c46995d640f51ed 100644
--- a/runner/json_tests_data/aborted-on-boot/reference.json
+++ b/runner/json_tests_data/aborted-on-boot/reference.json
@@ -3,6 +3,7 @@
"results_version":10,
"name":"normal-run",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
+ "cmdline":[],
"time_elapsed":{
"__type__":"TimeAttribute",
"start":1539953735.1110389,
diff --git a/runner/json_tests_data/dmesg-escapes/reference.json b/runner/json_tests_data/dmesg-escapes/reference.json
index 91c573106d98333dcb714be4c72ed16101ee9076..e74dc89e4e3c4b8b50c9edb23a198c175103fe92 100644
--- a/runner/json_tests_data/dmesg-escapes/reference.json
+++ b/runner/json_tests_data/dmesg-escapes/reference.json
@@ -3,6 +3,7 @@
"results_version":10,
"name":"normal-run",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
+ "cmdline":[],
"time_elapsed":{
"__type__":"TimeAttribute",
"start":1539953735.1110389,
diff --git a/runner/json_tests_data/dmesg-results/reference.json b/runner/json_tests_data/dmesg-results/reference.json
index e9e011853ae8c0d672a8036b1e4c86844d0e3049..81890f7d210b29c8abbae8729b316aea860387ce 100644
--- a/runner/json_tests_data/dmesg-results/reference.json
+++ b/runner/json_tests_data/dmesg-results/reference.json
@@ -3,6 +3,7 @@
"results_version":10,
"name":"normal-run",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
+ "cmdline":[],
"time_elapsed":{
"__type__":"TimeAttribute",
"start":1539953735.1110389,
diff --git a/runner/json_tests_data/dmesg-warn-level-one-piglit-style/reference.json b/runner/json_tests_data/dmesg-warn-level-one-piglit-style/reference.json
index 8d266cdfa90ad8d402d5f6eb6d08d3b59df09c1f..16c97d3a175c9da480fb8e2076d907cf2e14caa4 100644
--- a/runner/json_tests_data/dmesg-warn-level-one-piglit-style/reference.json
+++ b/runner/json_tests_data/dmesg-warn-level-one-piglit-style/reference.json
@@ -3,6 +3,7 @@
"results_version":10,
"name":"normal-run",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
+ "cmdline":[],
"time_elapsed":{
"__type__":"TimeAttribute",
"start":1539953735.1110389,
diff --git a/runner/json_tests_data/dmesg-warn-level-piglit-style/reference.json b/runner/json_tests_data/dmesg-warn-level-piglit-style/reference.json
index 4a1e8b313aa94a361a72c72e548a5c9de3a79934..e40000a27697270ca77e93dff4bef9f1560a5200 100644
--- a/runner/json_tests_data/dmesg-warn-level-piglit-style/reference.json
+++ b/runner/json_tests_data/dmesg-warn-level-piglit-style/reference.json
@@ -3,6 +3,7 @@
"results_version":10,
"name":"normal-run",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
+ "cmdline":[],
"time_elapsed":{
"__type__":"TimeAttribute",
"start":1539953735.1110389,
diff --git a/runner/json_tests_data/dmesg-warn-level/reference.json b/runner/json_tests_data/dmesg-warn-level/reference.json
index 400e9cfbc34b4c275f26db61f56dbd7e5d650931..fca3f1a54fa0e8f98c3020f2a764a4a47ec86658 100644
--- a/runner/json_tests_data/dmesg-warn-level/reference.json
+++ b/runner/json_tests_data/dmesg-warn-level/reference.json
@@ -3,6 +3,7 @@
"results_version":10,
"name":"normal-run",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
+ "cmdline":[],
"time_elapsed":{
"__type__":"TimeAttribute",
"start":1539953735.1110389,
diff --git a/runner/json_tests_data/dynamic-subtest-name-in-multiple-subtests/reference.json b/runner/json_tests_data/dynamic-subtest-name-in-multiple-subtests/reference.json
index 514de06a4f320b49bae0bd5eb986beb0126ce529..e3a6ffe3b7d8d42cdf2d87df9c58ca865b9fcaf0 100644
--- a/runner/json_tests_data/dynamic-subtest-name-in-multiple-subtests/reference.json
+++ b/runner/json_tests_data/dynamic-subtest-name-in-multiple-subtests/reference.json
@@ -3,6 +3,7 @@
"results_version":10,
"name":"dynamic-subtest-name-in-multiple-subtests",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
+ "cmdline":[],
"time_elapsed":{
"__type__":"TimeAttribute",
"start":1560163492.266377,
diff --git a/runner/json_tests_data/dynamic-subtests-keep-all/reference.json b/runner/json_tests_data/dynamic-subtests-keep-all/reference.json
index b2b71628840ed10bfad2e5a7a68064bade317b0b..20e626144ba28653751a38897ce768eeed5cde6c 100644
--- a/runner/json_tests_data/dynamic-subtests-keep-all/reference.json
+++ b/runner/json_tests_data/dynamic-subtests-keep-all/reference.json
@@ -3,6 +3,7 @@
"results_version":10,
"name":"dynamic-subtests",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
+ "cmdline":[],
"time_elapsed":{
"__type__":"TimeAttribute",
"start":1560163492.266377,
@@ -168,4 +169,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/runner/json_tests_data/dynamic-subtests-keep-dynamic/reference.json b/runner/json_tests_data/dynamic-subtests-keep-dynamic/reference.json
index c013d2821b5457c78eb045a8f87798cca70a5c2e..37bd91e84c85ea56be8a125ba123c2fa89e6c393 100644
--- a/runner/json_tests_data/dynamic-subtests-keep-dynamic/reference.json
+++ b/runner/json_tests_data/dynamic-subtests-keep-dynamic/reference.json
@@ -3,6 +3,7 @@
"results_version":10,
"name":"dynamic-subtests",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
+ "cmdline":[],
"time_elapsed":{
"__type__":"TimeAttribute",
"start":1560163492.266377,
diff --git a/runner/json_tests_data/dynamic-subtests-keep-requested/reference.json b/runner/json_tests_data/dynamic-subtests-keep-requested/reference.json
index c33c7ce7cd382747e800409890c0bd67dcc3bead..3a717f699331701a25cbdcae046d3f778abff12e 100644
--- a/runner/json_tests_data/dynamic-subtests-keep-requested/reference.json
+++ b/runner/json_tests_data/dynamic-subtests-keep-requested/reference.json
@@ -3,6 +3,7 @@
"results_version":10,
"name":"dynamic-subtests",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
+ "cmdline":[],
"time_elapsed":{
"__type__":"TimeAttribute",
"start":1560163492.266377,
@@ -120,4 +121,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/runner/json_tests_data/dynamic-subtests-keep-subtests/reference.json b/runner/json_tests_data/dynamic-subtests-keep-subtests/reference.json
index e53daa5a57313ea4cc5a29837a98375c7f2f277a..e4c320a0fa386ea27d8c94486704d2e1f8310ad1 100644
--- a/runner/json_tests_data/dynamic-subtests-keep-subtests/reference.json
+++ b/runner/json_tests_data/dynamic-subtests-keep-subtests/reference.json
@@ -3,6 +3,7 @@
"results_version":10,
"name":"dynamic-subtests",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
+ "cmdline":[],
"time_elapsed":{
"__type__":"TimeAttribute",
"start":1560163492.266377,
@@ -120,4 +121,4 @@
}
}
}
-}
\ No newline at end of file
+}
diff --git a/runner/json_tests_data/empty-result-files/reference.json b/runner/json_tests_data/empty-result-files/reference.json
index f81ffb81c13b43f40262df77a503de7c6556d832..332e2069342c4eca297b489f73f7e3a8d7369350 100644
--- a/runner/json_tests_data/empty-result-files/reference.json
+++ b/runner/json_tests_data/empty-result-files/reference.json
@@ -3,6 +3,7 @@
"results_version":10,
"name":"empty-result-files",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
+ "cmdline":[],
"time_elapsed":{
"__type__":"TimeAttribute",
"start":1539953735.1110389,
diff --git a/runner/json_tests_data/graceful-notrun/reference.json b/runner/json_tests_data/graceful-notrun/reference.json
index c95bdfecc0a0cd1997da20eab698e774649c227f..ddad3d9257e75a90b3acbbcd60f74ec55fc53ead 100644
--- a/runner/json_tests_data/graceful-notrun/reference.json
+++ b/runner/json_tests_data/graceful-notrun/reference.json
@@ -3,6 +3,7 @@
"results_version":10,
"name":"graceful-notrun",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
+ "cmdline":[],
"time_elapsed":{
"__type__":"TimeAttribute",
"start":1539953735.1110389,
diff --git a/runner/json_tests_data/incomplete-before-any-subtests/reference.json b/runner/json_tests_data/incomplete-before-any-subtests/reference.json
index 2a4bd45609b12a52d4d6ed6953962da7d468d9bd..5fc1978ebfdf25c7bc6dcaf054e39fac6e1cf99e 100644
--- a/runner/json_tests_data/incomplete-before-any-subtests/reference.json
+++ b/runner/json_tests_data/incomplete-before-any-subtests/reference.json
@@ -3,6 +3,7 @@
"results_version":10,
"name":"normal-run",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
+ "cmdline":[],
"time_elapsed":{
"__type__":"TimeAttribute",
"start":1539953735.1110389,
diff --git a/runner/json_tests_data/normal-run/reference.json b/runner/json_tests_data/normal-run/reference.json
index 0a00b1ca8a1e5133b055f353990f62144cf96039..814e4692057d558ff1e668584d1a3b05d2ce920f 100644
--- a/runner/json_tests_data/normal-run/reference.json
+++ b/runner/json_tests_data/normal-run/reference.json
@@ -3,6 +3,7 @@
"results_version":10,
"name":"normal-run",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
+ "cmdline":[],
"time_elapsed":{
"__type__":"TimeAttribute",
"start":1539953735.1110389,
diff --git a/runner/json_tests_data/notrun-results-multiple-mode/reference.json b/runner/json_tests_data/notrun-results-multiple-mode/reference.json
index 3f8b7fb09edd10df2adcde75360f58a812bc8aee..80ba5ec2c4dcf8596948d5aa140a79c76938bc99 100644
--- a/runner/json_tests_data/notrun-results-multiple-mode/reference.json
+++ b/runner/json_tests_data/notrun-results-multiple-mode/reference.json
@@ -3,6 +3,7 @@
"results_version":10,
"name":"normal-run",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
+ "cmdline":[],
"time_elapsed":{
"__type__":"TimeAttribute",
"start":1539953735.1110389,
diff --git a/runner/json_tests_data/notrun-results/reference.json b/runner/json_tests_data/notrun-results/reference.json
index 800de38c54af9988fe7cb594919a29317619d3ba..42fcd0017e6a3f8de376074d3144ee0176fcb5d4 100644
--- a/runner/json_tests_data/notrun-results/reference.json
+++ b/runner/json_tests_data/notrun-results/reference.json
@@ -3,6 +3,7 @@
"results_version":10,
"name":"normal-run",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
+ "cmdline":[],
"time_elapsed":{
"__type__":"TimeAttribute",
"start":1539953735.1110389,
diff --git a/runner/json_tests_data/piglit-style-dmesg/reference.json b/runner/json_tests_data/piglit-style-dmesg/reference.json
index bf5d86ee392d7f94066eac322af31765365d809b..6c751dc539d2e5bc7b7318412905f233c87d3acf 100644
--- a/runner/json_tests_data/piglit-style-dmesg/reference.json
+++ b/runner/json_tests_data/piglit-style-dmesg/reference.json
@@ -3,6 +3,7 @@
"results_version":10,
"name":"normal-run",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
+ "cmdline":[],
"time_elapsed":{
"__type__":"TimeAttribute",
"start":1539953735.1110389,
diff --git a/runner/json_tests_data/unprintable-characters/reference.json b/runner/json_tests_data/unprintable-characters/reference.json
index 88c62c34d1a8bf489c5cb095f7c88f2fafb9cbc1..e1b3302a52fec66532ebbe6a086f3f8001b2e252 100644
--- a/runner/json_tests_data/unprintable-characters/reference.json
+++ b/runner/json_tests_data/unprintable-characters/reference.json
@@ -3,6 +3,7 @@
"results_version":10,
"name":"normal-run",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
+ "cmdline":[],
"time_elapsed":{
"__type__":"TimeAttribute",
"start":1539953735.1110389,
diff --git a/runner/json_tests_data/warnings-with-dmesg-warns/reference.json b/runner/json_tests_data/warnings-with-dmesg-warns/reference.json
index bd0bb3a3dd43764be2e1e6ee73e257bf4430c0ba..67797e789ba438d14691b3e82b324bd7ccd3c64d 100644
--- a/runner/json_tests_data/warnings-with-dmesg-warns/reference.json
+++ b/runner/json_tests_data/warnings-with-dmesg-warns/reference.json
@@ -3,6 +3,7 @@
"results_version":10,
"name":"normal-run",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
+ "cmdline":[],
"time_elapsed":{
"__type__":"TimeAttribute",
"start":1539953735.1110389,
diff --git a/runner/json_tests_data/warnings/reference.json b/runner/json_tests_data/warnings/reference.json
index a2b79da9e081935819617a207fbb9068a59a29ef..2c483fdf59f2bad0f342981c0dabd79982aea5ba 100644
--- a/runner/json_tests_data/warnings/reference.json
+++ b/runner/json_tests_data/warnings/reference.json
@@ -3,6 +3,7 @@
"results_version":10,
"name":"normal-run",
"uname":"Linux hostname 4.18.0-1-amd64 #1 SMP Debian 4.18.6-1 (2018-09-06) x86_64",
+ "cmdline":[],
"time_elapsed":{
"__type__":"TimeAttribute",
"start":1539953735.1110389,
diff --git a/runner/resultgen.c b/runner/resultgen.c
index 87847bf5bdac328a27e3c61887e785d1d021d0fa..0d3a569cf3262efb195e7247db21e2462ed18040 100644
--- a/runner/resultgen.c
+++ b/runner/resultgen.c
@@ -2281,7 +2281,7 @@ struct json_object *generate_results_json(int dirfd)
{
struct settings settings;
struct job_list job_list;
- struct json_object *obj, *elapsed;
+ struct json_object *obj, *elapsed, *arr;
struct results results;
int testdirfd, fd;
size_t i;
@@ -2319,6 +2319,11 @@ struct json_object *generate_results_json(int dirfd)
close(fd);
}
+ arr = json_object_new_array();
+ for (i = 0; i < settings.cmdline.argc; i++)
+ json_object_array_add(arr, json_object_new_string(settings.cmdline.argv[i]));
+ json_object_object_add(obj, "cmdline", arr);
+
elapsed = json_object_new_object();
json_object_object_add(elapsed, "__type__", json_object_new_string("TimeAttribute"));
if ((fd = openat(dirfd, "starttime.txt", O_RDONLY)) >= 0) {