From cd797bb30dce2398345cc32b74b305efc8ff2a2e Mon Sep 17 00:00:00 2001
From: Marco Vermeulen <vermeulen.mp@gmail.com>
Date: Sat, 17 Nov 2012 10:41:07 +0000
Subject: [PATCH] Use prepared scripts from build folder in tests.

---
 build.gradle                      | 2 +-
 build.sh                          | 2 +-
 src/test/resources/gvm/env.groovy | 4 +---
 3 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/build.gradle b/build.gradle
index 1bda0461..242bd06d 100644
--- a/build.gradle
+++ b/build.gradle
@@ -2,7 +2,7 @@ import org.apache.tools.ant.filters.*
 
 apply plugin: 'groovy'
 
-defaultTasks 'clean', 'prepareScripts', 'assembleArchive'
+defaultTasks 'clean', 'prepareScripts', 'assembleArchive', 'test'
 
 repositories {
     mavenCentral()
diff --git a/build.sh b/build.sh
index 5b4eeaa9..3252fdd9 100755
--- a/build.sh
+++ b/build.sh
@@ -2,4 +2,4 @@
 export JAVA_HOME=$(/usr/libexec/java_home -v1.7)
 export GVM_SERVICE="http://localhost:8080"
 export GVM_DIR="/tmp/gvm"
-./gradlew -i clean test
+./gradlew -i
diff --git a/src/test/resources/gvm/env.groovy b/src/test/resources/gvm/env.groovy
index 43a2e846..daca123f 100644
--- a/src/test/resources/gvm/env.groovy
+++ b/src/test/resources/gvm/env.groovy
@@ -1,7 +1,7 @@
 import static cucumber.runtime.groovy.Hooks.*
 import static gvm.VertxUtils.*
 
-baseDir = new File("srv/scripts")
+baseDir = new File("build/scripts")
 
 gvmDirEnv = System.getenv('GVM_DIR')
 if (! gvmDirEnv) {
@@ -17,8 +17,6 @@ gvmDir = new File("${gvmDirEnv}")
 varDir = new File("${gvmDirEnv}/var")
 broadcastFile = new File("${gvmDirEnv}/var/broadcast")
 
-scriptPath = 'srv/scripts'
-
 server = null
 
 Before(){