Made calls to new cleanup_boot_results_file function.
Change-Id: I419fd4f3cb7f6c967f322fd60885206414a059fa
Signed-off-by: Michael Walsh <micwalsh@us.ibm.com>
diff --git a/lib/obmc_boot_test.py b/lib/obmc_boot_test.py
index d6cc3f8..578e7eb 100755
--- a/lib/obmc_boot_test.py
+++ b/lib/obmc_boot_test.py
@@ -37,6 +37,7 @@
# DB_Logging
program_pid = os.getpid()
master_pid = os.environ.get('AUTOBOOT_MASTER_PID', program_pid)
+pgm_name = re.sub('\.py$', '', os.path.basename(__file__))
# Set up boot data structures.
boot_table = create_boot_table()
@@ -164,8 +165,10 @@
boot_list = filter(None, boot_list.split(":"))
boot_stack = filter(None, boot_stack.split(":"))
- boot_results_file_path = "/tmp/" + openbmc_nickname + ":pid_" +\
- str(master_pid) + ":boot_results"
+ cleanup_boot_results_file()
+ boot_results_file_path = create_boot_results_file_path(pgm_name,
+ openbmc_nickname,
+ master_pid)
if os.path.isfile(boot_results_file_path):
# We've been called before in this run so we'll load the saved