Browse Source

Need to expose DBHOST to framework scripts

msmith-techempower 10 years ago
parent
commit
e0cb59cdb3
2 changed files with 3 additions and 3 deletions
  1. 1 1
      frameworks/Java/gemini/start.sh
  2. 2 2
      toolset/benchmark/framework_test.py

+ 1 - 1
frameworks/Java/gemini/start.sh

@@ -1,6 +1,6 @@
 #!/bin/bash
 #!/bin/bash
 
 
-sed -i 's/db.ConnectString = .*:3306/db.ConnectString = '"$TFB_DATABASE_HOST"':3306/g' Docroot/WEB-INF/GeminiHello.conf
+sed -i 's/db.ConnectString = .*:3306/db.ConnectString = '"$DBHOST"':3306/g' Docroot/WEB-INF/GeminiHello.conf
 sed -i 's|root-directory=".*/FrameworkBenchmarks/gemini|root-directory="'"$TROOT"'|g' Docroot/WEB-INF/resin.xml
 sed -i 's|root-directory=".*/FrameworkBenchmarks/gemini|root-directory="'"$TROOT"'|g' Docroot/WEB-INF/resin.xml
 mkdir -p Docroot/WEB-INF/classes
 mkdir -p Docroot/WEB-INF/classes
 ant compile
 ant compile

+ 2 - 2
toolset/benchmark/framework_test.py

@@ -169,8 +169,8 @@ class FrameworkTest:
 
 
     # Setup variables for TROOT and IROOT
     # Setup variables for TROOT and IROOT
     setup_util.replace_environ(config=profile, 
     setup_util.replace_environ(config=profile, 
-              command='export TROOT=%s && export IROOT=%s' %
-              (self.directory, self.install_root))
+              command='export TROOT=%s && export IROOT=%s && export DBHOST=%s' %
+              (self.directory, self.install_root, self.database_host))
 
 
     # Because start can take so long, we print a dot to let the user know 
     # Because start can take so long, we print a dot to let the user know 
     # we are working
     # we are working