changeset 42894:be8aea95908b

Merge
author dsamersoff
date Tue, 20 Dec 2016 12:16:41 +0000
parents 2104a8acb194 16dd6b309a48
children c868a2f327c6
files
diffstat 2 files changed, 1 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/hotspot/test/ProblemList.txt	Tue Dec 20 11:32:47 2016 +0000
+++ b/hotspot/test/ProblemList.txt	Tue Dec 20 12:16:41 2016 +0000
@@ -71,7 +71,6 @@
 
 # :hotspot_serviceability
 
-serviceability/dcmd/jvmti/LoadAgentDcmdTest.java 8150318 generic-all
 serviceability/jdwp/AllModulesCommandTest.java 8168478 generic-all
 serviceability/sa/sadebugd/SADebugDTest.java 8163805 generic-all
 
--- a/hotspot/test/serviceability/dcmd/jvmti/LoadAgentDcmdTest.java	Tue Dec 20 11:32:47 2016 +0000
+++ b/hotspot/test/serviceability/dcmd/jvmti/LoadAgentDcmdTest.java	Tue Dec 20 12:16:41 2016 +0000
@@ -136,11 +136,7 @@
         if (Platform.isWindows()) {
             return "bin";
         }
-        if (Platform.isOSX()) {
-            return "lib";
-        }
-
-        return "lib/" + Platform.getOsArch();
+        return "lib";
     }
 
     /**