svn commit: r1674326 - in /hive/trunk/testutils/metastore: execute-test-on-lxc.sh metastore-upgrade-test.sh

[sp...@apache.org]

Author: spena
Date: Fri Apr 17 14:33:50 2015
New Revision: 1674326

URL: http://svn.apache.org/r1674326
Log:
HIVE-10364: The HMS upgrade script test does not publish results when prepare.sh fails. (Sergio Pena, reviewed by Szehon Ho)

Modified:
    hive/trunk/testutils/metastore/execute-test-on-lxc.sh
    hive/trunk/testutils/metastore/metastore-upgrade-test.sh

Modified: hive/trunk/testutils/metastore/execute-test-on-lxc.sh
URL: http://svn.apache.org/viewvc/hive/trunk/testutils/metastore/execute-test-on-lxc.sh?rev=1674326&r1=1674325&r2=1674326&view=diff
==============================================================================
--- hive/trunk/testutils/metastore/execute-test-on-lxc.sh (original)
+++ hive/trunk/testutils/metastore/execute-test-on-lxc.sh Fri Apr 17 14:33:50 2015
@@ -23,7 +23,6 @@
 # in order to execute the metastore-upgrade-tests for different
 # server configurations.
 
-set -e
 cd $(dirname $0)
 
 OUT_LOG="/tmp/$(basename $0).log"
@@ -152,7 +151,10 @@ do
 	# Execute metastore upgrade tests
 	echo "Running metastore upgrade tests for $name..."
 	run_tests $name
-	log "$(lxc_print_metastore_log $name)"
+	rc=$?
 
+	log "$(lxc_print_metastore_log $name)"
 	lxc_stop $name
+
+	[ $rc != 0 ] && exit 1
 done

Modified: hive/trunk/testutils/metastore/metastore-upgrade-test.sh
URL: http://svn.apache.org/viewvc/hive/trunk/testutils/metastore/metastore-upgrade-test.sh?rev=1674326&r1=1674325&r2=1674326&view=diff
==============================================================================
--- hive/trunk/testutils/metastore/metastore-upgrade-test.sh (original)
+++ hive/trunk/testutils/metastore/metastore-upgrade-test.sh Fri Apr 17 14:33:50 2015
@@ -86,7 +86,10 @@ fi
 #
 
 log "Calling $SCRIPT_PREPARE ..."
-bash -e -x $SCRIPT_PREPARE || exit 1
+if ! bash -e -x $SCRIPT_PREPARE; then
+	log "Error: $SCRIPT_PREPARE failed. (see logs)"
+	exit 1
+fi
 log "Server prepared."
 
 #