changeset 53164:a3e7e08ee427

8215961: jdk/jfr/event/os/TestCPUInformation.java fails on AArch64 Reviewed-by: aph, goetz, lucy
author mbaesken
date Thu, 03 Jan 2019 16:14:40 +0100
parents 2345e253e677
children 697b5f5dec56
files src/hotspot/cpu/aarch64/vm_version_ext_aarch64.cpp src/hotspot/cpu/s390/vm_version_ext_s390.cpp test/jdk/jdk/jfr/event/os/TestCPUInformation.java
diffstat 3 files changed, 3 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/src/hotspot/cpu/aarch64/vm_version_ext_aarch64.cpp	Thu Jan 03 15:54:01 2019 -0500
+++ b/src/hotspot/cpu/aarch64/vm_version_ext_aarch64.cpp	Thu Jan 03 16:14:40 2019 +0100
@@ -50,7 +50,7 @@
   _no_of_threads = _no_of_cores;
   _no_of_sockets = _no_of_cores;
   snprintf(_cpu_name, CPU_TYPE_DESC_BUF_SIZE - 1, "AArch64");
-  snprintf(_cpu_desc, CPU_DETAILED_DESC_BUF_SIZE, "%s", _features_string);
+  snprintf(_cpu_desc, CPU_DETAILED_DESC_BUF_SIZE, "AArch64 %s", _features_string);
   _initialized = true;
 }
 
--- a/src/hotspot/cpu/s390/vm_version_ext_s390.cpp	Thu Jan 03 15:54:01 2019 -0500
+++ b/src/hotspot/cpu/s390/vm_version_ext_s390.cpp	Thu Jan 03 16:14:40 2019 +0100
@@ -46,7 +46,7 @@
   _no_of_threads = _no_of_cores;
   _no_of_sockets = _no_of_cores;
   snprintf(_cpu_name, CPU_TYPE_DESC_BUF_SIZE, "s390 %s", VM_Version::get_model_string());
-  snprintf(_cpu_desc, CPU_DETAILED_DESC_BUF_SIZE, "zArch %s", features_string());
+  snprintf(_cpu_desc, CPU_DETAILED_DESC_BUF_SIZE, "s390 %s", features_string());
   _initialized = true;
 }
 
--- a/test/jdk/jdk/jfr/event/os/TestCPUInformation.java	Thu Jan 03 15:54:01 2019 -0500
+++ b/test/jdk/jdk/jfr/event/os/TestCPUInformation.java	Thu Jan 03 16:14:40 2019 +0100
@@ -55,7 +55,7 @@
             Events.assertField(event, "cores").atLeast(1);
             Events.assertField(event, "sockets").atLeast(1);
             Events.assertField(event, "cpu").containsAny("Intel", "AMD", "Unknown x86", "sparc", "ARM", "PPC", "PowerPC", "AArch64", "s390");
-            Events.assertField(event, "description").containsAny("Intel", "AMD", "Unknown x86", "SPARC", "ARM", "PPC", "PowerPC", "AArch64", "zArch");
+            Events.assertField(event, "description").containsAny("Intel", "AMD", "Unknown x86", "SPARC", "ARM", "PPC", "PowerPC", "AArch64", "s390");
         }
     }
 }