Browse Source

Finished updating the Clojure tests

msmith-techempower 10 years ago
parent
commit
081c66d48b
2 changed files with 13 additions and 23 deletions
  1. 0 23
      frameworks/Clojure/luminus/setup.py
  2. 13 0
      frameworks/Clojure/luminus/setup.sh

+ 0 - 23
frameworks/Clojure/luminus/setup.py

@@ -1,23 +0,0 @@
-
-import subprocess
-import sys
-import setup_util
-
-def start(args, logfile, errfile):
-  setup_util.replace_text("luminus/hello/src/hello/models/schema.clj", ":subname \"//.*:3306", ":subname \"//" + args.database_host + ":3306")
-
-  try:
-    subprocess.check_call("$IROOT/bin/lein clean", shell=True, cwd="compojure/hello", stderr=errfile, stdout=logfile)
-    subprocess.check_call("$IROOT/bin/lein ring uberwar", shell=True, cwd="luminus/hello", stderr=errfile, stdout=logfile)
-    subprocess.check_call("rm -rf $RESIN_HOME/webapps/*", shell=True)
-    subprocess.check_call("cp luminus/hello/target/hello-luminus-standalone.war $RESIN_HOME/webapps/luminus.war", shell=True)
-    subprocess.check_call("$RESIN_HOME/bin/resinctl start", shell=True)
-    return 0
-  except subprocess.CalledProcessError:
-    return 1
-def stop(logfile, errfile):
-  try:
-    subprocess.check_call("$RESIN_HOME/bin/resinctl shutdown", shell=True, stderr=errfile, stdout=logfile)
-    return 0
-  except subprocess.CalledProcessError:
-    return 1

+ 13 - 0
frameworks/Clojure/luminus/setup.sh

@@ -0,0 +1,13 @@
+#!/bin/bash
+
+# Path vars must be set here
+export PATH="$JAVA_HOME/bin:$PATH"
+
+sed -i 's|:subname "//.*:3306|:subname "//'"${DBHOST}"':3306|g' hello/src/hello/models/schema.clj
+
+cd hello
+$IROOT/lein/bin/lein clean
+$IROOT/lein/bin/lein ring uberwar
+rm -rf $RESIN_HOME/webapps/*
+cp target/hello-luminus-standalone.war $RESIN_HOME/webapps/luminus.war
+$RESIN_HOME/bin/resinctl start