# HG changeset patch
# User dsamersoff
# Date 1482236201 0
# Node ID be8aea95908b278518e10387ee69b9ba7e5910cf
# Parent  2104a8acb1947c0ffd294ec132e4b42ad4e4fb54# Parent  16dd6b309a48f479d2f4f812d2bc285ed74c4f63
Merge

diff -r 2104a8acb194 -r be8aea95908b hotspot/test/ProblemList.txt
--- 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
 
diff -r 2104a8acb194 -r be8aea95908b hotspot/test/serviceability/dcmd/jvmti/LoadAgentDcmdTest.java
--- 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";
     }
 
     /**