changeset 50898:75547f03c6b0

8203802: Jvmti test fails to build with VS2017 Reviewed-by: sspitsyn, erikj
author dtitov
date Wed, 30 May 2018 08:59:56 -0700
parents 7c40e39e38a1
children ae67f5db7469
files make/test/JtregNativeHotspot.gmk test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/timers/JvmtiTest/JvmtiTest.c test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.h
diffstat 3 files changed, 10 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/make/test/JtregNativeHotspot.gmk	Wed May 30 10:23:45 2018 -0700
+++ b/make/test/JtregNativeHotspot.gmk	Wed May 30 08:59:56 2018 -0700
@@ -851,8 +851,6 @@
     BUILD_HOTSPOT_JTREG_EXECUTABLES_CFLAGS_exeFPRegs := -MT
     BUILD_HOTSPOT_JTREG_EXCLUDE += exesigtest.c
 
-    # Disable warning until JDK-8203802 is fixed
-    BUILD_HOTSPOT_JTREG_LIBRARIES_CFLAGS_libtimers += -wd4477
 else
     BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libbootclssearch_agent += -lpthread
     BUILD_HOTSPOT_JTREG_LIBRARIES_LIBS_libsystemclssearch_agent += -lpthread
--- a/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/timers/JvmtiTest/JvmtiTest.c	Wed May 30 10:23:45 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/jvmti/unit/timers/JvmtiTest/JvmtiTest.c	Wed May 30 08:59:56 2018 -0700
@@ -364,10 +364,10 @@
           }
 #endif
           if (passed) {
-            debug_printf("Pass: currThreadTime(%ld) >= %2.0f%% of threadTime(%ld)\n",
+            debug_printf("Pass: currThreadTime(" JLONG_FORMAT ") >= %2.0f%% of threadTime(" JLONG_FORMAT ")\n",
                          ctt, 100.0 - VARIANCE_PERCENT, tt);
           } else {
-            printf("FAIL: currThreadTime(%ld) < %2.0f%% of threadTime(%ld)\n",
+            printf("FAIL: currThreadTime(" JLONG_FORMAT ") < %2.0f%% of threadTime(" JLONG_FORMAT ")\n",
                    ctt, 100.0 - VARIANCE_PERCENT, tt);
             iGlobalStatus = 2;
           }
--- a/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.h	Wed May 30 10:23:45 2018 -0700
+++ b/test/hotspot/jtreg/vmTestbase/nsk/share/native/nsk_tools.h	Wed May 30 08:59:56 2018 -0700
@@ -27,9 +27,17 @@
 /*************************************************************/
 
 #include <stdarg.h>
+#include <inttypes.h>
 
 /*************************************************************/
 
+#if defined(_LP64) && defined(__APPLE__)
+#define JLONG_FORMAT "%ld"
+#else  // _LP64 && __APPLE__
+#define JLONG_FORMAT "%" PRId64
+#endif // _LP64 && __APPLE__
+
+
 /**
  * Use examples:
  *