瀏覽代碼

Added required start files

msmith-techempower 11 年之前
父節點
當前提交
27d9358d37
共有 3 個文件被更改,包括 9 次插入2 次删除
  1. 1 1
      frameworks/Java/gemini/benchmark_config
  2. 8 0
      frameworks/Java/gemini/start.sh
  3. 0 1
      toolset/benchmark/framework_test.py

+ 1 - 1
frameworks/Java/gemini/benchmark_config

@@ -2,7 +2,7 @@
   "framework": "gemini",
   "tests": [{
     "default": {
-      "setup_file": "setup",
+      "setup_file": "start",
       "json_url": "/",
       "db_url": "/db",
       "query_url": "/query?queries=",

+ 8 - 0
frameworks/Java/gemini/start.sh

@@ -0,0 +1,8 @@
+#!/bin/bash
+
+#setup_util.replace_text("gemini/Docroot/WEB-INF/GeminiHello.conf", "db.ConnectString = .*:3306", "db.ConnectString = " + args.database_host + ":3306")
+#setup_util.replace_text("gemini/Docroot/WEB-INF/resin.xml", "root-directory=\".*\/FrameworkBenchmarks/gemini", "root-directory=\"%s" % args.troot)
+  
+mkdir -p Docroot/WEB-INFclasses
+ant compile
+$RESIN_HOME/bin/resinctl -conf $TROOT/Docroot/WEB-INF/resin.xml start

+ 0 - 1
toolset/benchmark/framework_test.py

@@ -197,7 +197,6 @@ class FrameworkTest:
     # This requires superuser privs, so `sudo` is necessary.
     #   -u [username] The username
     #   -E Preserves the current environment variables
-    print 'sudo -u %s -E ./%s.sh' % (self.benchmarker.runner_user, self.setup_file)
     subprocess.Popen('sudo -u %s -E ./%s.sh' % (self.benchmarker.runner_user, self.setup_file), cwd=self.directory, shell=True, stderr=err, stdout=out)
 
     # Stop the progress printer