Fixing errors in installer and testing scripts

hpvm/scripts/automate_tests.sh

@@ -2,10 +2,12 @@
 
 CURRENT_DIR=`pwd`
 BUILD_DIR=$CURRENT_DIR/build
+HPVM_RT=hpvm-rt/hpvm-rt.bc
 
-if [ -x $BUILD_DIR/tools/hpvm/projects/$HPVM_RT ]; then
+if [ -f $BUILD_DIR/tools/hpvm/projects/$HPVM_RT ]; then
     true
 else
+    echo $BUILD_DIR/tools/hpvm/projects/$HPVM_RT
     echo HPVM not installed! Exiting without running tests!.
     exit 0
 fi

hpvm/scripts/llvm_installer.sh

@@ -19,7 +19,7 @@ LLVM_SRC="llvm-$VERSION.src"
 LIBCXX_SRC="libcxx-$VERSION.src"
 LIBCXXABI_SRC="libcxxabi-$VERSION.src"
 
-HPVM_RT=hpvm-rt.bc
+HPVM_RT=hpvm-rt/hpvm-rt.bc
 
 AUTOMATE="y"
 
@@ -182,9 +182,10 @@ make -j$NUM_THREADS
 #make install
 
 
-if [ -x $BUILD_DIR/tools/hpvm/projects/$HPVM_RT ]; then
+if [ -f $BUILD_DIR/tools/hpvm/projects/$HPVM_RT ]; then
     true
 else
+    echo $BUILD_DIR/tools/hpvm/projects/$HPVM_RT
     echo HPVM not installed properly.
     exit 0
 fi