From 1626399c08c4774fbb72814676e403127f125eaa Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Lemoine?= <eric.lemoine@gmail.com>
Date: Fri, 4 Jul 2014 09:05:12 +0200
Subject: [PATCH] Use serve.js as the test server

---
 build.py        | 12 +++++-------
 test/index.html |  2 +-
 2 files changed, 6 insertions(+), 8 deletions(-)

diff --git a/build.py b/build.py
index a0a51d8777..b7683da9d1 100755
--- a/build.py
+++ b/build.py
@@ -349,7 +349,7 @@ def examples_star_combined_js(name, match):
     return Target(name, action=action, dependencies=dependencies)
 
 
-@target('serve', 'test-deps', 'examples')
+@target('serve', PROJ4JS, 'examples')
 def serve(t):
     t.run('node', 'tasks/serve.js')
 
@@ -706,12 +706,10 @@ def proj4js_zip(t):
     t.info('downloaded %r', t.name)
 
 
-virtual('test-deps', PROJ4JS, 'build/test/requireall.js')
-
-
-@target('test', 'test-deps', phony=True)
+@target('test', PROJ4JS, phony=True)
 def test(t):
-    t.run('%(PHANTOMJS)s', 'test/mocha-phantomjs.js', 'test/ol.html')
+    t.run('%(PHANTOMJS)s', 'test/mocha-phantomjs.js',
+          'http://localhost:3000/test/index.html')
 
 
 @target('fixme', phony=True)
@@ -772,7 +770,7 @@ There is one option:
   -c               - Cleans up the repository from previous builds.
 
 The most common targets are:
-  serve            - Serves files through plovr, usually on port 9810.
+  serve            - Serves files, on port 3000.
   lint             - Runs gjslint on all sourcefiles to enforce specific syntax.
   build            - Builds singlefile versions of OpenLayers JavaScript and
                      CSS. This is also the default build target which runs when
diff --git a/test/index.html b/test/index.html
index 57d7f9eb76..d7c982ba5d 100644
--- a/test/index.html
+++ b/test/index.html
@@ -23,7 +23,7 @@
   </script>
   <script type="text/javascript" src="../build/proj4js/lib/proj4js-combined.js"></script>
 
-  <!-- This script is provided by the debug server (start with `npm start`) -->
+  <!-- This script is provided by the debug server (start with `build.py serve`) -->
   <script type="text/javascript" src="loader.js"></script>
 
   <script type="text/javascript">