From 787e538a489403918e583aa9778b72fb064c6893 Mon Sep 17 00:00:00 2001
From: Akash Kothari <akashk4@tyler.cs.illinois.edu>
Date: Tue, 28 Jan 2020 20:58:04 -0600
Subject: [PATCH] Fixing errors in installer and testing scripts
---
hpvm/scripts/automate_tests.sh | 4 +++-
hpvm/scripts/llvm_installer.sh | 5 +++--
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/hpvm/scripts/automate_tests.sh b/hpvm/scripts/automate_tests.sh
index 565d207547..aece74eaa0 100644
--- a/hpvm/scripts/automate_tests.sh
+++ b/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
diff --git a/hpvm/scripts/llvm_installer.sh b/hpvm/scripts/llvm_installer.sh
index f878ae077c..4de8d15dfd 100755
--- a/hpvm/scripts/llvm_installer.sh
+++ b/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
--
GitLab