X-Git-Url: http://git.archive.openwrt.org/?p=project%2Fuci.git;a=blobdiff_plain;f=test%2Ftests.sh;h=ee72c316775d489f0c3795160d5f188bbfb51344;hp=ae064f1090038986e1c398a99b240b781cd88fa0;hb=37930de695fbf183cd9eef8b33e428921efa7cc8;hpb=179b6f5fced8a0c1028ee56451efa26e40392961

diff --git a/test/tests.sh b/test/tests.sh
index ae064f1..ee72c31 100644
--- a/test/tests.sh
+++ b/test/tests.sh
@@ -6,12 +6,13 @@ CHANGES_DIR="/tmp/.uci"
 TMP_DIR=${TESTS_DIR}"/tmp"
 FULL_SUITE=${TESTS_DIR}"/full_suite.sh"
 
-UCI_STATIC="../uci-static"
-[ -x $UCI_STATIC ] || {
-	echo "uci-static is not present."
+UCI_BIN="../uci"
+[ -x $UCI_BIN ] || {
+	echo "uci is not present." >&2
 	return 1
 }
-UCI="${UCI_STATIC} -c ${CONFIG_DIR} -p ${CHANGES_DIR}"
+UCI="${UCI_BIN} -c ${CONFIG_DIR} -p ${CHANGES_DIR}"
+UCI_Q="${UCI_BIN} -c ${CONFIG_DIR} -p ${CHANGES_DIR} -q"
 
 REF_DIR="./references"
 SCRIPTS_DIR="./tests.d"
@@ -40,10 +41,21 @@ assertSameFile() {
 		echo "----"
 	}
 }
+assertNotSegFault()
+{
+	[ $1 -eq 139 ] && fail "Returned with 139: segmentation fault (SIGSEGV)!!!"
+}
+assertNotIllegal()
+{
+	[ $1 -eq 132 ] && fail "Returned with 132: Illegal instruction (SIGILL)!!!"
+}
 assertFailWithNoReturn() {
 	local test="$1"
 	value=$( $test )
-	assertFalse "'$test' does not fail" $?
+	rv=$?
+	assertFalse "'$test' does not fail" $rv
+	assertNotSegFault $rv
+	assertNotIllegal $rv
 	assertNull "'$test' returns '$value'" "$value"
 }
 EOF
@@ -60,6 +72,7 @@ CONFIG_DIR="${CONFIG_DIR}" \
 CHANGES_DIR="${CHANGES_DIR}" \
 TMP_DIR="${TMP_DIR}" \
 UCI="${UCI}" \
+UCI_Q="${UCI_Q}" \
 /bin/sh ${FULL_SUITE}
 
 rm -rf ${TESTS_DIR}