aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorReynold Xin <rxin@cs.berkeley.edu>2013-05-16 14:31:38 -0700
committerReynold Xin <rxin@cs.berkeley.edu>2013-05-16 14:31:38 -0700
commit43644a293f5faec088530cf3a84d3680f2a103af (patch)
treefef954d654d58ea9b6c4ca0d493ea22790b2c71b
parent61cf17623835007114ee69394999faaba8a46206 (diff)
downloadspark-43644a293f5faec088530cf3a84d3680f2a103af.tar.gz
spark-43644a293f5faec088530cf3a84d3680f2a103af.tar.bz2
spark-43644a293f5faec088530cf3a84d3680f2a103af.zip
Only check for repl classes if the user is running the repl. Otherwise,
check for core classes in run. This fixed the problem that core tests depend on whether repl module is compiled or not.
-rwxr-xr-xrun10
1 files changed, 8 insertions, 2 deletions
diff --git a/run b/run
index c744bbd3dc..c0065c53f1 100755
--- a/run
+++ b/run
@@ -102,12 +102,18 @@ STREAMING_DIR="$FWDIR/streaming"
PYSPARK_DIR="$FWDIR/python"
# Exit if the user hasn't compiled Spark
-if [ ! -e "$REPL_DIR/target" ]; then
- echo "Failed to find Spark classes in $REPL_DIR/target" >&2
+if [ ! -e "$CORE_DIR/target" ]; then
+ echo "Failed to find Spark classes in $CORE_DIR/target" >&2
echo "You need to compile Spark before running this program" >&2
exit 1
fi
+if [[ "$@" = *repl* && ! -e "$REPL_DIR/target" ]]; then
+ echo "Failed to find Spark classes in $REPL_DIR/target" >&2
+ echo "You need to compile Spark repl module before running this program" >&2
+ exit 1
+fi
+
# Build up classpath
CLASSPATH="$SPARK_CLASSPATH"
CLASSPATH="$CLASSPATH:$FWDIR/conf"