Have the makefile start the server.

.travis.yml

@@ -1,3 +1,2 @@
 language: node_js
-before_script: "test/serve.sh 8080 &"
 script: "cd test; make"

test/Makefile

@@ -1,11 +1,15 @@
 
+test_port=8081
 test: basic none
 
-basic:
-	phantomjs basic.js 8080
+basic: server
+	phantomjs basic.js $(test_port)
 
-none: 
-	phantomjs none.js 8080
+none: server
+	phantomjs none.js $(test_port)
 
 lint:
-	jslint --terse ../hinclude.js
+	jslint --terse ../hinclude.js
+
+server:
+	./serve.sh $(test_port)

test/README.md

@@ -13,5 +13,4 @@ Note that jslint is most easily installed with [npm](http://npmjs.org/).
 Before the suite is run, start a server:
 
   > ./serve.sh&
-  
-Make sure to stop and restart the server when there are changes to hinclude.
+  

test/assets/hinclude.js

@@ -1,5 +1,5 @@
 /*
-hinclude.js -- HTML Includes (version 0.9.2)
+hinclude.js -- HTML Includes (version 0.9.5)
 
 Copyright (c) 2005-2011 Mark Nottingham <mnot@mnot.net>
 

test/serve.sh

@@ -1,6 +1,12 @@
 #!/bin/bash
 
+PORT=$1
 DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 
 cp -f $DIR/../hinclude.js $DIR/assets/
-cd $DIR/assets; python -m SimpleHTTPServer 8080 2>/dev/null
+
+cd $DIR/assets
+
+echo "Starting server on $PORT" >/dev/stderr
+python -m SimpleHTTPServer $PORT 2>/dev/null &
+echo "PID $!"