gem5-dev@gem5.org

The gem5 Developer List

View all threads

[XS] Change in gem5/gem5[release-staging-v23-0]: stdlib,tests: Fix download_check.py

BB
Bobby Bruce (Gerrit)
Fri, Jul 7, 2023 9:22 PM

Bobby Bruce has submitted this change. (
https://gem5-review.googlesource.com/c/public/gem5/+/72159?usp=email )

Change subject: stdlib,tests: Fix download_check.py
......................................................................

stdlib,tests: Fix download_check.py

This was causing the Weekly tests to fail. The removing of the download
directory should only happen at the end. Prior to this patch it was
deleted and then referenced, which caused problems.

Change-Id: I134782e89a13f5c3cd5c1912ad53a701d0413d16
Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/72159
Reviewed-by: Bobby Bruce bbruce@ucdavis.edu
Maintainer: Bobby Bruce bbruce@ucdavis.edu
Tested-by: kokoro noreply+kokoro@google.com

M tests/gem5/configs/download_check.py
1 file changed, 2 insertions(+), 3 deletions(-)

Approvals:
Bobby Bruce: Looks good to me, approved; Looks good to me, approved
kokoro: Regressions pass

diff --git a/tests/gem5/configs/download_check.py
b/tests/gem5/configs/download_check.py
index 2180f4f..e3b06a5 100644
--- a/tests/gem5/configs/download_check.py
+++ b/tests/gem5/configs/download_check.py
@@ -94,7 +94,6 @@
continue

  for resource_version in ids[id]:
  •     resource_json = get_resource_json_obj(
            resource_id=id,
            resource_version=resource_version,
    

@@ -129,8 +128,8 @@
+ f" gem5-resources
({resource_json['md5sum']}).{os.linesep}"
)

  •    # Remove the downloaded resource.
    
  • shutil.rmtree(download_path, ignore_errors=True)
    +# Remove the downloaded resource.
    +shutil.rmtree(args.download_directory, ignore_errors=True)

If errors exist, raise an exception highlighting them.

if errors:

--
To view, visit
https://gem5-review.googlesource.com/c/public/gem5/+/72159?usp=email
To unsubscribe, or for help writing mail filters, visit
https://gem5-review.googlesource.com/settings?usp=email

Gerrit-MessageType: merged
Gerrit-Project: public/gem5
Gerrit-Branch: release-staging-v23-0
Gerrit-Change-Id: I134782e89a13f5c3cd5c1912ad53a701d0413d16
Gerrit-Change-Number: 72159
Gerrit-PatchSet: 2
Gerrit-Owner: Bobby Bruce bbruce@ucdavis.edu
Gerrit-Reviewer: Bobby Bruce bbruce@ucdavis.edu
Gerrit-Reviewer: kokoro noreply+kokoro@google.com
Gerrit-CC: kokoro noreply+kokoro@google.com

Bobby Bruce has submitted this change. ( https://gem5-review.googlesource.com/c/public/gem5/+/72159?usp=email ) Change subject: stdlib,tests: Fix download_check.py ...................................................................... stdlib,tests: Fix download_check.py This was causing the Weekly tests to fail. The removing of the download directory should only happen at the end. Prior to this patch it was deleted and then referenced, which caused problems. Change-Id: I134782e89a13f5c3cd5c1912ad53a701d0413d16 Reviewed-on: https://gem5-review.googlesource.com/c/public/gem5/+/72159 Reviewed-by: Bobby Bruce <bbruce@ucdavis.edu> Maintainer: Bobby Bruce <bbruce@ucdavis.edu> Tested-by: kokoro <noreply+kokoro@google.com> --- M tests/gem5/configs/download_check.py 1 file changed, 2 insertions(+), 3 deletions(-) Approvals: Bobby Bruce: Looks good to me, approved; Looks good to me, approved kokoro: Regressions pass diff --git a/tests/gem5/configs/download_check.py b/tests/gem5/configs/download_check.py index 2180f4f..e3b06a5 100644 --- a/tests/gem5/configs/download_check.py +++ b/tests/gem5/configs/download_check.py @@ -94,7 +94,6 @@ continue for resource_version in ids[id]: - resource_json = get_resource_json_obj( resource_id=id, resource_version=resource_version, @@ -129,8 +128,8 @@ + f" gem5-resources ({resource_json['md5sum']}).{os.linesep}" ) - # Remove the downloaded resource. - shutil.rmtree(download_path, ignore_errors=True) +# Remove the downloaded resource. +shutil.rmtree(args.download_directory, ignore_errors=True) # If errors exist, raise an exception highlighting them. if errors: -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/72159?usp=email To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings?usp=email Gerrit-MessageType: merged Gerrit-Project: public/gem5 Gerrit-Branch: release-staging-v23-0 Gerrit-Change-Id: I134782e89a13f5c3cd5c1912ad53a701d0413d16 Gerrit-Change-Number: 72159 Gerrit-PatchSet: 2 Gerrit-Owner: Bobby Bruce <bbruce@ucdavis.edu> Gerrit-Reviewer: Bobby Bruce <bbruce@ucdavis.edu> Gerrit-Reviewer: kokoro <noreply+kokoro@google.com> Gerrit-CC: kokoro <noreply+kokoro@google.com>