aboutsummaryrefslogtreecommitdiff
path: root/run
diff options
context:
space:
mode:
authorroot <root@ip-10-226-118-223.ec2.internal>2012-10-07 04:19:16 +0000
committerroot <root@ip-10-226-118-223.ec2.internal>2012-10-07 04:19:16 +0000
commitce915cadee1de8e265f090b7be2f6e70d1b4062e (patch)
treeeb09b75b72c2fb66e42e4dff62dadcc110f520cf /run
parent975009d68881eb3bebfe9168ea68b99574bebf70 (diff)
downloadspark-ce915cadee1de8e265f090b7be2f6e70d1b4062e.tar.gz
spark-ce915cadee1de8e265f090b7be2f6e70d1b4062e.tar.bz2
spark-ce915cadee1de8e265f090b7be2f6e70d1b4062e.zip
Made run script add test-classes onto the classpath only if SPARK_TESTING is set; fixes #216
Diffstat (limited to 'run')
-rwxr-xr-xrun6
1 files changed, 4 insertions, 2 deletions
diff --git a/run b/run
index 6cab4765ee..cb1499c6f9 100755
--- a/run
+++ b/run
@@ -21,7 +21,7 @@ fi
# If the user specifies a Mesos JAR, put it before our included one on the classpath
MESOS_CLASSPATH=""
-if [ -z "$MESOS_JAR" ] ; then
+if [ -n "$MESOS_JAR" ] ; then
MESOS_CLASSPATH="$MESOS_JAR"
fi
@@ -52,7 +52,9 @@ CLASSPATH="$SPARK_CLASSPATH"
CLASSPATH+=":$MESOS_CLASSPATH"
CLASSPATH+=":$FWDIR/conf"
CLASSPATH+=":$CORE_DIR/target/scala-$SCALA_VERSION/classes"
-CLASSPATH+=":$CORE_DIR/target/scala-$SCALA_VERSION/test-classes"
+if [ -n "$SPARK_TESTING" ] ; then
+ CLASSPATH+=":$CORE_DIR/target/scala-$SCALA_VERSION/test-classes"
+fi
CLASSPATH+=":$CORE_DIR/src/main/resources"
CLASSPATH+=":$REPL_DIR/target/scala-$SCALA_VERSION/classes"
CLASSPATH+=":$EXAMPLES_DIR/target/scala-$SCALA_VERSION/classes"