From c10982e4419491e303a52451cc38597ec36cbe54 Mon Sep 17 00:00:00 2001 From: "Bobby R. Bruce" Date: Fri, 17 Sep 2021 17:05:14 -0700 Subject: [PATCH] tests: Update x86 boot tests to use x86-ubuntu-img The x86-boot-exit resource is being deprecated for the more versatile x86-ubuntu-img resource. The latter attempts to run `m5 readfile`, allowing a user to specify a script to be run. If no script is specified `m5 exit` is run. Therefore it can be used in the x86-boot-exit tests. Change-Id: I7fecb314bd0e1d4be4f1181e57046e4621199b64 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/50647 Tested-by: kokoro Reviewed-by: Austin Harris Maintainer: Bobby R. Bruce --- tests/gem5/configs/x86_boot_exit_run.py | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/tests/gem5/configs/x86_boot_exit_run.py b/tests/gem5/configs/x86_boot_exit_run.py index 6c5488d9a7..fcd29e9ed4 100644 --- a/tests/gem5/configs/x86_boot_exit_run.py +++ b/tests/gem5/configs/x86_boot_exit_run.py @@ -206,11 +206,10 @@ motherboard.set_workload( resource_directory=args.resource_directory, ), disk_image=Resource( - "x86-boot-exit", + "x86-ubuntu-img", override=args.override_download, resource_directory=args.resource_directory, ), - command="m5 exit \n", kernel_args=additional_kernal_args, )