From: Wolfram Schneider <wosch@indexdata.dk>
Date: Wed, 2 Jul 2014 09:14:37 +0000 (+0200)
Subject: enable to run the tests on a different port.
X-Git-Tag: 1.0.0~458^2~2
X-Git-Url: http://git.indexdata.com/?p=mkws-moved-to-github.git;a=commitdiff_plain;h=25fc05e09abe4bdd0e0327f4870ca8aab4e97641

enable to run the tests on a different port.

APACHE_PORT=5000 make check

thats helpfull if the port is already blocked by some other users.
---

diff --git a/test/Makefile b/test/Makefile
index 57b5c46..e808d55 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -3,8 +3,10 @@
 # For running on Mike's local install of node.js
 MIKE = PATH=$$PATH:/usr/local/lib/node-v0.10.24-linux-x64/bin
 
+APACHE_PORT:= $(shell echo $${APACHE_PORT-4040})
+
 #PHANTOMJS_URL=https://mkws-dev.indexdata.com/jasmine-popup.html	
-PHANTOMJS_URL=http://localhost:4040/jasmine-local-popup.html
+PHANTOMJS_URL=http://localhost:${APACHE_PORT}/jasmine-local-popup.html
 PHANTOMJS_TIMEOUT=16
 
 NPM_INSTALL_FLAGS=-q
diff --git a/test/bin/apache-template-update b/test/bin/apache-template-update
index 4f37a41..bf14cbd 100755
--- a/test/bin/apache-template-update
+++ b/test/bin/apache-template-update
@@ -12,7 +12,7 @@ export APACHE_RUN_GROUP=$(groups | awk '{ print $1 }')
 export APACHE_LOG_DIR=$APACHE_SERVER_ROOT/logs
 export APACHE_PID_FILE=$APACHE_LOG_DIR/mkws-jasmine.pid
 export APACHE_LOCK_FILE=$APACHE_LOG_DIR/accept.lock
-export APACHE_PORT=4040
+: ${APACHE_PORT=4040}; export APACHE_PORT
 
 export MKWS_ROOT=$(pwd)/..