gem5-dev@gem5.org

The gem5 Developer List

View all threads

[S] Change in gem5/gem5[develop]: tests: Fix bugs related to gem5 Vision

KP
Kunal Pai (Gerrit)
Wed, Jun 7, 2023 10:31 PM

Kunal Pai has uploaded this change for review. (
https://gem5-review.googlesource.com/c/public/gem5/+/71360?usp=email )

Change subject: tests: Fix bugs related to gem5 Vision
......................................................................

tests: Fix bugs related to gem5 Vision

This patch fixes refs under tests/pyunit/stdlib/resources.

Removes instances of {url_base} in refs.

Also, renames two refs: mongo_mock and mongo_dup_mock
to mongo-mock and mongo-dup-mock to follow naming
convention of other refs.

Change-Id: If115114bc7a89764e7c546b77a93d36d6a3b5f8a
Co-authored-by: Parth Shah helloparthshah@gmail.com
Co-authored-by: Harshil2107 harshilp2107@gmail.com
Co-authored-by: aarsli arsli@ucdavis.edu

M tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py
R tests/pyunit/stdlib/resources/refs/mongo-dup-mock.json
R tests/pyunit/stdlib/resources/refs/mongo-mock.json
M tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json
M tests/pyunit/stdlib/resources/refs/workload-checks.json
5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py
b/tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py
index 96aadf6..344f67b 100644
--- a/tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py
+++ b/tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py
@@ -82,12 +82,12 @@

mock_json = {}

-with open(Path(file).parent / "refs/mongo_mock.json", "r") as f:
+with open(Path(file).parent / "refs/mongo-mock.json", "r") as f:
mock_json = json.load(f)

duplicate_mock_json = {}

-with open(Path(file).parent / "refs/mongo_dup_mock.json", "r") as f:
+with open(Path(file).parent / "refs/mongo-dup-mock.json", "r") as f:
duplicate_mock_json = json.load(f)

diff --git a/tests/pyunit/stdlib/resources/refs/mongo_dup_mock.json
b/tests/pyunit/stdlib/resources/refs/mongo-dup-mock.json
similarity index 100%
rename from tests/pyunit/stdlib/resources/refs/mongo_dup_mock.json
rename to tests/pyunit/stdlib/resources/refs/mongo-dup-mock.json
diff --git a/tests/pyunit/stdlib/resources/refs/mongo_mock.json
b/tests/pyunit/stdlib/resources/refs/mongo-mock.json
similarity index 100%
rename from tests/pyunit/stdlib/resources/refs/mongo_mock.json
rename to tests/pyunit/stdlib/resources/refs/mongo-mock.json
diff --git
a/tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json
b/tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json
index 8349b92..f336915 100644

a/tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json
+++
b/tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json
@@ -6,7 +6,7 @@
"architecture": "X86",
"is_zipped": false,
"md5sum": "dbf120338b37153e3334603970cebd8c",

  •    "url": "{url_base}/test-progs/hello/bin/x86/linux/hello64-static",
    
  •    "url": "https://dist.gem5.org/dist/develop/test-progs/hello/bin/x86/linux/hello64-static",
        "source": "src/simple",
        "resource_version": "1.0.0",
        "gem5_versions": [
    

diff --git a/tests/pyunit/stdlib/resources/refs/workload-checks.json
b/tests/pyunit/stdlib/resources/refs/workload-checks.json
index d19396b..c9554a9 100644
--- a/tests/pyunit/stdlib/resources/refs/workload-checks.json
+++ b/tests/pyunit/stdlib/resources/refs/workload-checks.json
@@ -6,7 +6,7 @@
"architecture": "X86",
"is_zipped": false,
"md5sum": "4838c99b77d33c8307b939c16624e4ac",

  •    "url": "{url_base}/kernels/x86/static/vmlinux-5.2.3",
    
  •    "url": "https://dist.gem5.org/dist/develop/kernels/x86/static/vmlinux-5.2.3",
        "source": "src/linux-kernel",
        "resource_version": "1.0.0",
        "gem5_versions": [
    

@@ -20,7 +20,7 @@
"architecture": "X86",
"is_zipped": true,
"md5sum": "90e363abf0ddf22eefa2c7c5c9391c49",

  •    "url": "{url_base}/images/x86/ubuntu-18-04/x86-ubuntu.img.gz",
    
  •    "url": "https://dist.gem5.org/dist/develop/images/x86/ubuntu-18-04/x86-ubuntu.img.gz",
        "source": "src/x86-ubuntu",
        "root_partition": "1",
        "resource_version": "1.0.0",
    

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

Gerrit-MessageType: newchange
Gerrit-Project: public/gem5
Gerrit-Branch: develop
Gerrit-Change-Id: If115114bc7a89764e7c546b77a93d36d6a3b5f8a
Gerrit-Change-Number: 71360
Gerrit-PatchSet: 1
Gerrit-Owner: Kunal Pai kunpai@ucdavis.edu

Kunal Pai has uploaded this change for review. ( https://gem5-review.googlesource.com/c/public/gem5/+/71360?usp=email ) Change subject: tests: Fix bugs related to gem5 Vision ...................................................................... tests: Fix bugs related to gem5 Vision This patch fixes refs under tests/pyunit/stdlib/resources. Removes instances of {url_base} in refs. Also, renames two refs: mongo_mock and mongo_dup_mock to mongo-mock and mongo-dup-mock to follow naming convention of other refs. Change-Id: If115114bc7a89764e7c546b77a93d36d6a3b5f8a Co-authored-by: Parth Shah <helloparthshah@gmail.com> Co-authored-by: Harshil2107 <harshilp2107@gmail.com> Co-authored-by: aarsli <arsli@ucdavis.edu> --- M tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py R tests/pyunit/stdlib/resources/refs/mongo-dup-mock.json R tests/pyunit/stdlib/resources/refs/mongo-mock.json M tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json M tests/pyunit/stdlib/resources/refs/workload-checks.json 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py b/tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py index 96aadf6..344f67b 100644 --- a/tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py +++ b/tests/pyunit/stdlib/resources/pyunit_client_wrapper_checks.py @@ -82,12 +82,12 @@ mock_json = {} -with open(Path(__file__).parent / "refs/mongo_mock.json", "r") as f: +with open(Path(__file__).parent / "refs/mongo-mock.json", "r") as f: mock_json = json.load(f) duplicate_mock_json = {} -with open(Path(__file__).parent / "refs/mongo_dup_mock.json", "r") as f: +with open(Path(__file__).parent / "refs/mongo-dup-mock.json", "r") as f: duplicate_mock_json = json.load(f) diff --git a/tests/pyunit/stdlib/resources/refs/mongo_dup_mock.json b/tests/pyunit/stdlib/resources/refs/mongo-dup-mock.json similarity index 100% rename from tests/pyunit/stdlib/resources/refs/mongo_dup_mock.json rename to tests/pyunit/stdlib/resources/refs/mongo-dup-mock.json diff --git a/tests/pyunit/stdlib/resources/refs/mongo_mock.json b/tests/pyunit/stdlib/resources/refs/mongo-mock.json similarity index 100% rename from tests/pyunit/stdlib/resources/refs/mongo_mock.json rename to tests/pyunit/stdlib/resources/refs/mongo-mock.json diff --git a/tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json b/tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json index 8349b92..f336915 100644 --- a/tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json +++ b/tests/pyunit/stdlib/resources/refs/workload-checks-custom-workload.json @@ -6,7 +6,7 @@ "architecture": "X86", "is_zipped": false, "md5sum": "dbf120338b37153e3334603970cebd8c", - "url": "{url_base}/test-progs/hello/bin/x86/linux/hello64-static", + "url": "https://dist.gem5.org/dist/develop/test-progs/hello/bin/x86/linux/hello64-static", "source": "src/simple", "resource_version": "1.0.0", "gem5_versions": [ diff --git a/tests/pyunit/stdlib/resources/refs/workload-checks.json b/tests/pyunit/stdlib/resources/refs/workload-checks.json index d19396b..c9554a9 100644 --- a/tests/pyunit/stdlib/resources/refs/workload-checks.json +++ b/tests/pyunit/stdlib/resources/refs/workload-checks.json @@ -6,7 +6,7 @@ "architecture": "X86", "is_zipped": false, "md5sum": "4838c99b77d33c8307b939c16624e4ac", - "url": "{url_base}/kernels/x86/static/vmlinux-5.2.3", + "url": "https://dist.gem5.org/dist/develop/kernels/x86/static/vmlinux-5.2.3", "source": "src/linux-kernel", "resource_version": "1.0.0", "gem5_versions": [ @@ -20,7 +20,7 @@ "architecture": "X86", "is_zipped": true, "md5sum": "90e363abf0ddf22eefa2c7c5c9391c49", - "url": "{url_base}/images/x86/ubuntu-18-04/x86-ubuntu.img.gz", + "url": "https://dist.gem5.org/dist/develop/images/x86/ubuntu-18-04/x86-ubuntu.img.gz", "source": "src/x86-ubuntu", "root_partition": "1", "resource_version": "1.0.0", -- To view, visit https://gem5-review.googlesource.com/c/public/gem5/+/71360?usp=email To unsubscribe, or for help writing mail filters, visit https://gem5-review.googlesource.com/settings?usp=email Gerrit-MessageType: newchange Gerrit-Project: public/gem5 Gerrit-Branch: develop Gerrit-Change-Id: If115114bc7a89764e7c546b77a93d36d6a3b5f8a Gerrit-Change-Number: 71360 Gerrit-PatchSet: 1 Gerrit-Owner: Kunal Pai <kunpai@ucdavis.edu>