Updated run script and test script to make tests work with the latest

setup.
sameeragarwal · Oct 14, 2012 · e001da2 · e001da2
1 parent 582e58b
commit e001da2
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 7 deletions.
diff --git a/bin/test b/bin/test
@@ -41,10 +41,10 @@ if [ -n "$TEST_FILE" ] ; then
 fi
 
 
-CLASSPATH+=:${HIVE_DEV_HOME}/build/ql/test/classes
-CLASSPATH+=:${HIVE_DEV_HOME}/build/ivy/lib/test/hadoop-test-0.20.2.jar
-CLASSPATH+=:${HIVE_DEV_HOME}/data/conf
-export CLASSPATH
+SPARK_CLASSPATH+=":${HIVE_DEV_HOME}/build/ql/test/classes"
+SPARK_CLASSPATH+=":${HIVE_DEV_HOME}/build/ivy/lib/test/hadoop-test-0.20.2.jar"
+SPARK_CLASSPATH+=":${HIVE_DEV_HOME}/data/conf"
+export SPARK_CLASSPATH
 
 BUILD_PATH=$HIVE_DEV_HOME/build/ql
 
@@ -74,6 +74,7 @@ if [ "$TEST_WITH_ANT" == "1" ] ; then
   export RUNNER="ant -noclasspath -nouserlib -f $FWDIR/bin/build_test.xml test"
   exec $FWDIR/run "$@"
 else
+  export SHARK_LAUNCH_WITH_JAVA=1
   exec $FWDIR/run junit.textui.TestRunner shark.TestSharkCliDriver "$@"
 fi
 

diff --git a/lib/mesos-0.9.0.jar b/lib/mesos-0.9.0.jar
diff --git a/lib/scala-jline.jar b/lib/scala-jline.jar
diff --git a/run b/run
@@ -73,7 +73,7 @@ fi
 #CLASSPATH=${CLASSPATH}:${AUX_CLASSPATH}
 
 export SPARK_CLASSPATH
-export CLASSPATH=$SPARK_CLASSPATH # Needed for spark-shell
+export CLASSPATH+=$SPARK_CLASSPATH # Needed for spark-shell
 
 export SPARK_JAVA_OPTS+=" $TEST_JAVA_OPTS"
 
@@ -83,7 +83,7 @@ if [ "x$SHARK_MASTER_MEM" == "x" ] ; then
 fi
 
 # Set JAVA_OPTS to be able to load native libraries and to set heap size
-JAVA_OPTS="$SPARK_JAVA_OPTS"
+JAVA_OPTS+="$SPARK_JAVA_OPTS"
 JAVA_OPTS+=" -Djava.library.path=$SPARK_LIBRARY_PATH"
 JAVA_OPTS+=" -Xms$SHARK_MASTER_MEM -Xmx$SHARK_MASTER_MEM"
 
@@ -109,7 +109,7 @@ if [ "x$RUNNER" == "x" ] ; then
     # The JVM doesn't read JAVA_OPTS by default so we need to pass it in
     EXTRA_ARGS="$JAVA_OPTS"
   else
-    RUNNER="$SCALA -cp $CLASSPATH"
+    RUNNER="$SCALA -cp \"$CLASSPATH\""
     EXTRA_ARGS=""
   fi
 fi