[Ezbench-dev] [PATCH 09/15] journal: add the run's output file for the "test" and "tested" output

[Martin Peres]

This will allow us to queue resume commands
---
 core.sh                          | 8 +++++---
 python-modules/ezbench/report.py | 3 +++
 runner.sh                        | 6 +++---
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/core.sh b/core.sh
index 9a21edc..4c6636f 100755
--- a/core.sh
+++ b/core.sh
@@ -695,7 +695,8 @@ do
         benchSubtests="${testSubTests[$t]}"
 
         # Generate the logs file names
-        fps_logs=$logsFolder/${version}_${testType[$t]}_${testNames[$t]}
+        fps_logs_filename="${version}_${testType[$t]}_${testNames[$t]}"
+        fps_logs="$logsFolder/$fps_logs_filename"
         error_logs=${fps_logs}.errors
 
         # Find the first run id available
@@ -731,6 +732,7 @@ do
             # Exit if asked to
             [ -e "$abortFile" ] && continue
 
+            run_log_file_name="${fps_logs_filename}#$c"
             run_log_file="${fps_logs}#$c"
             IFS='|' read -a run_sub_tests <<< "$benchSubtests"
 
@@ -738,9 +740,9 @@ do
             callIfDefined benchmark_run_pre_hook
 
             # This function will return multiple fps readings
-            write_to_journal test "$version_full" "${testNames[$t]}"
+            write_to_journal test "$version_full" "${testNames[$t]}" "$run_log_file_name"
             "$runFuncName" > "$run_log_file" 2> /dev/null
-            write_to_journal tested "$version_full" "${testNames[$t]}"
+            write_to_journal tested "$version_full" "${testNames[$t]}" "$run_log_file_name"
 
             callIfDefined benchmark_run_post_hook
             callIfDefined "$postHookFuncName"
diff --git a/python-modules/ezbench/report.py b/python-modules/ezbench/report.py
index 934d4c3..4edd203 100644
--- a/python-modules/ezbench/report.py
+++ b/python-modules/ezbench/report.py
@@ -1341,6 +1341,9 @@ class Journal:
 
                         attrs["version"] = fields[2]
                         attrs["test"] = fields[3]
+
+                        if len(fields) > 4:
+                            attrs["result_file"] = fields[4]
                     else:
                         key=",".join(fields[2:])
 
diff --git a/runner.sh b/runner.sh
index 5294507..689a513 100755
--- a/runner.sh
+++ b/runner.sh
@@ -360,7 +360,8 @@ function execute_test {
     [ -e "$abortFile" ] && return 80
 
     # Generate the logs file names
-    local reportFile=$logsFolder/${version}_${testType}_${testName}
+    local reportFileName="${version}_${testType}_${testName}"
+    local reportFile="$logsFolder/$reportFileName"
 
     # Only generate the run_log_file_name if it is unspecified
     if [ -z "$run_log_file_name" ]; then
@@ -397,13 +398,12 @@ function execute_test {
     callIfDefined benchmark_run_pre_hook
 
     # This function will return multiple fps readings
-    write_to_journal test "$version" "${testName}"
+    write_to_journal test "$version" "${testName}" "$run_log_file_name"
     if [ "$verboseOutput" -eq 1 ]; then
         "$execFuncName" > >(tee "$run_log_file")
     else
         "$execFuncName" > "$run_log_file" 2> /dev/null
     fi
-
     local exit_code=$?
     write_to_journal tested "$version" "${testName}" "$run_log_file_name"
 
-- 
2.11.0