changeset 22284:09acb1bc3a56

make hotspot native project's results parameterized on <vmbuild>
author Doug Simon <doug.simon@oracle.com>
date Wed, 22 Jul 2015 22:45:55 +0200
parents 65eb572cbcb7
children 7d453d4d855a
files mx.jvmci/mx_jvmci.py mx.jvmci/suite.py
diffstat 2 files changed, 5 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/mx.jvmci/mx_jvmci.py	Wed Jul 22 20:39:26 2015 +0200
+++ b/mx.jvmci/mx_jvmci.py	Wed Jul 22 22:45:55 2015 +0200
@@ -756,6 +756,8 @@
         return ''
     if var == 'buildname':
         return _hotspotGetVariant()
+    if var == 'vmbuild':
+        return _vmbuild
     return mx._replaceResultsVar(m)
 
 class HotSpotProject(mx.NativeProject):
--- a/mx.jvmci/suite.py	Wed Jul 22 20:39:26 2015 +0200
+++ b/mx.jvmci/suite.py	Wed Jul 22 22:45:55 2015 +0200
@@ -281,9 +281,9 @@
       "results" : [
           '<os>/<os>_<arch>_<buildname>/generated/jvmtifiles/jvmti.h',
           '<os>/<os>_<arch>_<buildname>/generated/sa-jdi.jar',
-          '<os>/<os>_<arch>_<buildname>/product/<lib:jvm>',
-          '<os>/<os>_<arch>_<buildname>/product/<lib:saproc>',
-          '<os>/<os>_<arch>_<buildname>/product/<lib:jsig>',
+          '<os>/<os>_<arch>_<buildname>/<vmbuild>/<lib:jvm>',
+          '<os>/<os>_<arch>_<buildname>/<vmbuild>/<lib:saproc>',
+          '<os>/<os>_<arch>_<buildname>/<vmbuild>/<lib:jsig>',
       ]
     }
   },