Modified pounder install and run scripts

index fe8db05..5bbfe2f 100755
@@ -24,7 +24,7 @@ source libpounder.sh
 export USE_CACHE=1
 
 # do we actually _have_ a cache server?
-if [ -z "$POUNDER_CACHE" ]; then
+if [ -z "$POUNDER_CACHE" -o "$POUNDER_CACHE" == "0" ]; then
 	export USE_CACHE=0
 fi
 

@@ -73,7 +73,12 @@ UNPACKED=0
 
 while [ "$UNPACKED" -lt 1 ]; do
 	# Unpack default test configuration?
-	echo -en "Which test scheduler setup do you want to unpack? [$DEFAULT_SCHEDPACK or \"NONE\"] "
+	SCHEDULERS=`ls $POUNDER_HOME/schedulers | awk -F"-tests.tar.gz" '{print $1}'`
+	echo "WHICH TEST SCHEDULER SETUP DO YOU WANT TO UNPACK?"
+	echo "[Choose from:"
+	echo "$SCHEDULERS"
+	echo "[Or simply press ENTER for the default scheduler]"
+	echo -n "Scheduler selection: "
 	read f
 	if [ -z "$f" ]; then
 		SCHEDPACK="$DEFAULT_SCHEDPACK"

@@ -81,22 +86,26 @@ while [ "$UNPACKED" -lt 1 ]; do
 		SCHEDPACK="$f"
 	fi
 
-	if [ "$f" != "NONE" ]; then
-		rm -rf tests/*
+	rm -rf tests/*
 
-		tar -xzvf "$SCHEDPACK-tests.tar.gz"
+	tar -xzvf "$POUNDER_HOME/schedulers/$SCHEDPACK-tests.tar.gz"
 
-		if [ "$?" -ne 0 ]; then
-			echo "Unable to untar $SCHEDPACK-tests.tar.gz; please try again."
-		else
-			echo "Untarred $SCHEDPACK-tests.tar.gz successfully."
-			UNPACKED=1
-		fi
+	if [ "$?" -ne 0 ]; then
+		echo "Unable to untar $SCHEDPACK-tests.tar.gz; please try again."
 	else
+		echo "Untarred $SCHEDPACK-tests.tar.gz successfully."
 		UNPACKED=1
 	fi
 done
 
+echo -en "Would you like to automate skipping of failed subtests? (subtests that failed to build will automatically be removed from test scheduler) [y/n]? "
+read f
+if [ "$f" == "y" -o "$f" == "Y" ]; then
+	AUTO_SKIP=1
+else
+	AUTO_SKIP=0
+fi
+
 # start builds...
 for i in $BUILDS
 do

@@ -104,10 +113,34 @@ do
 		continue
 	fi
 	if [ -x "build_scripts/$i" ]; then
-		echo "Building $i..."
-		"build_scripts/$i" $*
-		if [ "$?" -ne 0 ]; then
-			exit 1
+		FOUND=`find $POUNDER_HOME/tests -name *$i`
+		if [ -n "$FOUND" ]; then	
+			"build_scripts/$i" $*
+			BUILD_ERR=$?
+			if [ "$BUILD_ERR" -ne 0 ]; then
+				if [ $AUTO_SKIP -eq 0 ]; then
+					echo -en "$i build failed with Error $BUILD_ERR. If this is a subtest, would you like to skip it [y/n]? "
+					read f
+					if [ "$f" == "y" -o "$f" == "Y" ]; then
+                        			rm `find $POUNDER_HOME/tests -name *$i` > /dev/null 2>&1
+						if [ "$?" -ne 0 ]; then
+							echo "Failed to remove $i from test scheduler. $i is either not a subtest included in $SCHEDPACK-tests.tar.gz or is incorrectly defined in $POUNDER_HOME/tests (See SCHEDULER for naming rules if this is the case)."
+							echo -en "Skip anyway? [y/n] "
+							read f
+							if [ "$?" == "y" -o "$f" == "Y" ]; then
+								exit 0
+							elif [ "$f" == "n" -o "$f" == "N" -o -z "$f" ]; then
+								exit 1
+							fi
+						fi
+                			elif [ "$f" == "n" -o "$f" == "N" -o -z "$f" ]; then
+						echo "Exiting install ..."
+						exit 1
+					fi
+				else
+					rm `find ./tests -name *$i` > /dev/null 2>&1
+				fi
+			fi
 		fi
 	fi
 done

deleted file mode 100644
index 7f1bb20b7fafc15682ed07273211243e2a6b4442..0000000000000000000000000000000000000000
GIT binary patch

deleted file mode 100644
index 37b58a22b1c10a74ef32cd2d9fd48dc62106f920..0000000000000000000000000000000000000000
GIT binary patch

207 lines not on this page · raw message

new file mode 100644
index 0000000000000000000000000000000000000000..ac20bc9683618886e385a17e9fb2fe19b830e2fd
GIT binary patch

new file mode 100644
index 0000000000000000000000000000000000000000..5984a5ce372367e33902adcc831d830ba7910dac
GIT binary patch

new file mode 100644
index 0000000000000000000000000000000000000000..ddff53ee18b6c115b6cc0292f64a13abaccb048c
GIT binary patch

deleted file mode 100644
index fe3d576c115b61cefbda28552893c8af6f57e40e..0000000000000000000000000000000000000000
GIT binary patch

deleted file mode 100644
index 5a60a6fda24621fdbb9e71584eda87c3ac9b7515..0000000000000000000000000000000000000000
GIT binary patch