tweak stringology and arbology test scripts

tests.aarbology.sh

@@ -71,21 +71,26 @@ function generateSubject {
 # $4 = pattern
 function runTest2 {
 	OUT=`timeout $TESTCASE_TIMEOUT bash -c "SUBJECT_FILE=\"$3\"; PATTERN_FILE=\"$4\"; $2"`
-	OUT=`test $1 -eq $OUT`
 	RET=$?
-
 	if [ $RET == 0 ]; then # ok
-		return 0
+		OUT=`test $1 -eq $OUT`
 	fi
-	log "$2" $RET "$3" "$4" "$OUT"
+	RET2=$?
+	if [ $RET != 0 ] || [ $RET2 != 0 ]; then # fail
+		log "$2" $RET "$3" "$4" "$OUT"
+	fi
 	if [ $RET == 124 ]; then # timeout
 		return 2
 	elif [ $RET -ge 124 ]; then #segv
 		return 3
-	else
+	fi
+
+	if [ $RET != 0 ]; then # fail
 		return 1
+	else
+		return 0
 	fi
 }
@@ -209,6 +214,48 @@ function runTestPattern {
 	outputResults
 }
+# $1 - aconversions2 sequence
+function runTestPatternEnds {
+	echo $1
+	echo -ne "\t"
+
+	clearResults
+
+	# predefined tests first
+	for SUBJECT_FILE in `ls $TESTS_DIR/aarbology.test*.subject.xml`; do
+		PATTERN_FILE=${SUBJECT_FILE%.subject.xml}.pattern.xml
+		if [ -f  ]; then
+			Occs=`./aarbology2 -e -a exactPatternMatch -s <(./acast2 -t PrefixRankedTree -i "$SUBJECT_FILE" ) -p <(./acast2 -t PrefixRankedPattern -i "$PATTERN_FILE" ) | ./astat2 -p size --set`
+
+			runTest2 "$Occs" "$2" "$SUBJECT_FILE" "$PATTERN_FILE"
+			registerResult $?
+		fi
+	done
+
+	echo -n " | "
+
+	# random tests
+	SUBJECT_FILE=s.xml
+	PATTERN_FILE=p.xml
+	for i in $(seq 1 $TESTCASE_ITERATIONS );
+	do
+		cat <(generateSubject) > $SUBJECT_FILE
+		cat <(generatePattern) > $PATTERN_FILE
+
+		Occs=`./aarbology2 -e -a exactPatternMatch -s <(./acast2 -t PrefixRankedTree -i "$SUBJECT_FILE" ) -p <(./acast2 -t PrefixRankedPattern -i "$PATTERN_FILE" ) | ./astat2 -p size --set`
+
+		runTest2 "$Occs" "$2" "$SUBJECT_FILE" "$PATTERN_FILE"
+		registerResult $?
+	done
+
+	rm $SUBJECT_FILE
+	rm $PATTERN_FILE
+
+	outputResults
+}
+
+runTestPatternEnds "Exact Tree Pattern Automaton (PrefixRanked)" "./aarbology2 -a exactTreePatternAutomaton -s <( ./acast2 -t PrefixRankedTree -i \"\$SUBJECT_FILE\" ) | ./adeterminize2 | ./arun2 -t result -i <(./acast2 -t PrefixRankedPattern -i \"\$PATTERN_FILE\" | ./acast2 -t LinearString ) | ./astat2 -p size --set"
+
 runTestSubtree "Exact Boyer Moore Horspool (Subtree PrefixRankedBar)" "./aarbology2 -a boyerMooreHorspool -s <( ./acast2 -t PrefixRankedBarTree -i \"\$SUBJECT_FILE\" ) -p <( ./acast2 -t PrefixRankedBarTree -i <(./alphabetManip2 -o add -i \"\$PATTERN_FILE\" -a <(./alphabetManip2 -o get -i \"\$SUBJECT_FILE\"))) | ./astat2 -p size --set"
 runTestSubtree "Exact Subtree Automaton (Tree)" "./arun2 -t occurrences -a <(./aarbology2 -a exactSubtreeMatchingAutomaton -p \"\$PATTERN_FILE\" | ./adeterminize2) -i \"\$SUBJECT_FILE\" | ./astat2 -p size --set"

tests.astringology.sh

@@ -65,21 +65,26 @@ function generateSubject {
 # $4 = pattern
 function runTest2 {
 	OUT=`timeout $TESTCASE_TIMEOUT bash -c "SUBJECT_FILE=\"$3\"; PATTERN_FILE=\"$4\"; $2"`
-	OUT=`test $1 -eq $OUT`
 	RET=$?
-
 	if [ $RET == 0 ]; then # ok
-		return 0
+		OUT=`test $1 -eq $OUT`
 	fi
-	log "$2" $RET "$3" "$4" "$OUT"
+	RET2=$?
+	if [ $RET != 0 ] || [ $RET2 != 0 ]; then # fail
+		log "$2" $RET "$3" "$4" "$OUT"
+	fi
 	if [ $RET == 124 ]; then # timeout
 		return 2
 	elif [ $RET -ge 124 ]; then #segv
 		return 3
-	else
+	fi
+
+	if [ $RET != 0 ]; then # fail
 		return 1
+	else
+		return 0
 	fi
 }