From 731acc5582edbbe7e1f1d4ced848b3ddeea29d6a Mon Sep 17 00:00:00 2001
From: Josef Eisl <josef.eisl@jku.at>
Date: Tue, 21 Jun 2016 10:40:11 +0200
Subject: [PATCH] ci: use JVM_CONFIG for x4150

---
 ci_includes/x4150.hocon | 16 +++++++++-------
 1 file changed, 9 insertions(+), 7 deletions(-)

diff --git a/ci_includes/x4150.hocon b/ci_includes/x4150.hocon
index b871d894ed5d..aa229f99251e 100644
--- a/ci_includes/x4150.hocon
+++ b/ci_includes/x4150.hocon
@@ -1,16 +1,18 @@
+x4150.default : {
+  environment : {
+    JVM_CONFIG :  "graal-core"
+  }
+}
 # SPECjbb2005-related targets
 
-bench-specjbb2005-x4150: ${commonLinux} ${bench-specjbb2005} {
+bench-specjbb2005-x4150: ${commonLinux} ${bench-specjbb2005} ${x4150.default} {
   capabilities: [linux, x4150, bench, post-merge]
   name: "bench-specjbb2005-linux-x4150"
-  args.mx : ["--machine-name", "x4150"]
-  args.jvm : ["--jvm-config=graal-core", "-Xmx64g", "-Xms64g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks"]
-  args.bench : []
   run: [
     ${bench-jvmci.mx-specjbb2005} [
-      ] ${bench-specjbb2005-x4150.args.mx} ["--"
-      ] ${bench-specjbb2005-x4150.args.jvm} ["--"
-      ] ${bench-specjbb2005-x4150.args.bench}
+      "--machine-name", "x4150", "--",
+      "-Xmx64g", "-Xms64g", "-XX:+UseJVMCICompiler", "-XX:+PrintConcurrentLocks", "--jvm-config=${JVM_CONFIG}"
+    ]
   ]
 }