From b40aafc696836c881fb7a8f6f74c260d72659c2d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C3=89ric=20Lemoine?= <eric.lemoine@gmail.com>
Date: Fri, 29 Mar 2013 16:05:56 +0100
Subject: [PATCH] Tests requireall.js generated in build dir

---
 .gitignore         | 2 +-
 build.py           | 7 ++++---
 buildcfg/test.json | 2 +-
 3 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/.gitignore b/.gitignore
index caa5d63250..6865fd705e 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,9 +16,9 @@
 /build/proj4js
 /build/proj4js-*.zip
 /build/src
+/build/test/requireall.js
 /build/examples/*.combined.js
 /examples/*.html.png
 /build/examples/*.json
 /examples/example-list.js
 /examples/example-list.xml
-/test/requireall.js
diff --git a/build.py b/build.py
index e493cebdf6..91bc071f21 100755
--- a/build.py
+++ b/build.py
@@ -213,7 +213,7 @@ def build_src_internal_src_requireall_js(t):
     _build_require_list(t.dependencies, t.name)
 
 
-@target('test/requireall.js', SPEC)
+@target('build/test/requireall.js', SPEC)
 def build_test_requireall_js(t):
     _build_require_list(t.dependencies, t.name)
 
@@ -280,7 +280,8 @@ def examples_star_combined_js(name, match):
     return Target(name, action=action, dependencies=dependencies)
 
 
-@target('serve', PLOVR_JAR, INTERNAL_SRC, 'test/requireall.js', 'examples')
+@target('serve', PLOVR_JAR, INTERNAL_SRC, 'build/test/requireall.js',
+        'examples')
 def serve(t):
     t.run('%(JAVA)s', '-jar', PLOVR_JAR, 'serve', 'buildcfg/ol.json',
           'buildcfg/ol-all.json', EXAMPLES_JSON, 'buildcfg/test.json')
@@ -533,7 +534,7 @@ def proj4js_zip(t):
                os.path.basename(t.name), md5=PROJ4JS_ZIP_MD5)
 
 
-@target('test', INTERNAL_SRC, PROJ4JS, 'test/requireall.js', phony=True)
+@target('test', INTERNAL_SRC, PROJ4JS, 'build/test/requireall.js', phony=True)
 def test(t):
     t.run('%(PHANTOMJS)s', 'test/mocha-phantomjs.coffee', 'test/ol.html')
 
diff --git a/buildcfg/test.json b/buildcfg/test.json
index 24d0b01af5..22f1c70c0b 100644
--- a/buildcfg/test.json
+++ b/buildcfg/test.json
@@ -5,7 +5,7 @@
   "inherits": "base.json",
 
   "inputs": [
-    "../test/requireall.js"
+    "../build/test/requireall.js"
   ],
 
   "paths": [