# HG changeset patch
# User Gilles Duboscq <gilles.m.duboscq@oracle.com>
# Date 1437644646 -7200
# Node ID 856aeb17e892ba26acef7db2c63d81bef33e570f
# Parent  6dc8c13bf1c7858e1723ebff88cf16d3e36ea1cd
Add debug info files in hotspot's results

diff -r 6dc8c13bf1c7 -r 856aeb17e892 mx.jvmci/mx_jvmci.py
--- a/mx.jvmci/mx_jvmci.py	Thu Jul 23 10:46:27 2015 +0200
+++ b/mx.jvmci/mx_jvmci.py	Thu Jul 23 11:44:06 2015 +0200
@@ -139,10 +139,12 @@
 def _exe(l):
     return mx.exe_suffix(l)
 
-
 def _lib(l):
     return mx.add_lib_suffix(mx.add_lib_prefix(l))
 
+def _lib_dbg(l):
+    return mx.add_debug_lib_suffix(mx.add_lib_prefix(l))
+
 class HotSpotVMJDKDeployedDist(JDKDeployedDist):
     def dist(self):
         name = mx.instantiatedDistributionName(self._name, dict(vm=get_vm(), vmbuild=_vmbuild), context=self._name)
@@ -153,8 +155,11 @@
             'jvmti.h' : 'include',
             'sa-jdi.jar' : 'lib',
             _lib('jvm') : join(relativeVmLibDirInJdk(), get_vm()),
+            _lib_dbg('jvm') : join(relativeVmLibDirInJdk(), get_vm()),
             _lib('saproc') : relativeVmLibDirInJdk(),
+            _lib_dbg('saproc') : relativeVmLibDirInJdk(),
             _lib('jsig') : relativeVmLibDirInJdk(),
+            _lib_dbg('jsig') : relativeVmLibDirInJdk(),
         }
         dist = self.dist()
         with tarfile.open(dist.path, 'r') as tar:
diff -r 6dc8c13bf1c7 -r 856aeb17e892 mx.jvmci/suite.py
--- a/mx.jvmci/suite.py	Thu Jul 23 10:46:27 2015 +0200
+++ b/mx.jvmci/suite.py	Thu Jul 23 11:44:06 2015 +0200
@@ -276,8 +276,11 @@
           '<os>/<os>_<arch>_<buildname>/generated/jvmtifiles/jvmti.h',
           '<os>/<os>_<arch>_<buildname>/generated/sa-jdi.jar',
           '<os>/<os>_<arch>_<buildname>/<vmbuild>/<lib:jvm>',
+          '<os>/<os>_<arch>_<buildname>/<vmbuild>/<libdebug:jvm>',
           '<os>/<os>_<arch>_<buildname>/<vmbuild>/<lib:saproc>',
+          '<os>/<os>_<arch>_<buildname>/<vmbuild>/<libdebug:saproc>',
           '<os>/<os>_<arch>_<buildname>/<vmbuild>/<lib:jsig>',
+          '<os>/<os>_<arch>_<buildname>/<vmbuild>/<libdebug:jsig>',
       ]
     }
   },