[xiph-commits] r13138 - trunk/xspf/testcase
sping at svn.xiph.org
sping at svn.xiph.org
Sun Jun 17 14:23:09 PDT 2007
Author: sping
Date: 2007-06-17 14:23:09 -0700 (Sun, 17 Jun 2007)
New Revision: 13138
Modified:
trunk/xspf/testcase/schema_test.sh
Log:
Back to linear model, tree was a bad idea
Modified: trunk/xspf/testcase/schema_test.sh
===================================================================
--- trunk/xspf/testcase/schema_test.sh 2007-06-17 18:34:28 UTC (rev 13137)
+++ trunk/xspf/testcase/schema_test.sh 2007-06-17 21:23:09 UTC (rev 13138)
@@ -47,7 +47,7 @@
# -----------------------------------------------------------------------------
# Versions
# -----------------------------------------------------------------------------
-echo "= Versions =" >> ${LOG_FILE}
+echo "===== Versions =====" >> ${LOG_FILE}
echo "RNV "`${RNV} -v 2>&1 | grep version | sed -r "s/rnv version (.+)/\1/"` >> ${LOG_FILE}
echo "xmllint #"`${XMLLINT} --version 2>&1 | grep version | sed -r "s/[^0-9]+//"` >> ${LOG_FILE}
echo "XMLStarlet "`${XML_STARLET} --version` >> ${LOG_FILE}
@@ -59,16 +59,7 @@
# -----------------------------------------------------------------------------
# Tests
# -----------------------------------------------------------------------------
-echo "= Tests =" >> ${LOG_FILE}
-echo "" >> ${LOG_FILE}
-echo "== XSPF-0 ==" >> ${LOG_FILE}
-echo "" >> ${LOG_FILE}
-echo "=== Relax NG Compact ===" >> ${LOG_FILE}
-echo "" >> ${LOG_FILE}
-echo "==== RNV ====" >> ${LOG_FILE}
-echo "" >> ${LOG_FILE}
-
-echo "===== Should have failed =====" >> ${LOG_FILE}
+echo "===== XSPF-0, Relax NG Compact, RNV, should have failed =====" >> ${LOG_FILE}
for i in ${FAIL_0_FILES}; do
if ${RNV} ${RNC_0_FILE} $i &>/dev/null ; then
echo $i >> ${LOG_FILE}
@@ -76,7 +67,7 @@
done
echo "" >> ${LOG_FILE}
-echo "===== Should have passed =====" >> ${LOG_FILE}
+echo "===== XSPF-0, Relax NG Compact, RNV, should have passed =====" >> ${LOG_FILE}
#for i in ${PASS_0_FILES}; do
# if ! ${RNV} ${RNC_0_FILE} $i &>/dev/null ; then
# echo $i >> ${LOG_FILE}
@@ -86,25 +77,17 @@
-echo "=== Relax NG XML ===" >> ${LOG_FILE}
-echo "" >> ${LOG_FILE}
-echo "==== XMLStarlet ====" >> ${LOG_FILE}
-echo "" >> ${LOG_FILE}
-
-echo "===== Should have failed =====" >> ${LOG_FILE}
+echo "===== XSPF-0, Relax NG XML, XMLStarlet, should have failed =====" >> ${LOG_FILE}
${XML_STARLET} validate --err --list-good --relaxng ${RNG_0_FILE} ${FAIL_0_FILES} 1>> ${LOG_FILE} 2>> /dev/null
echo "" >> ${LOG_FILE}
-echo "===== Should have passed =====" >> ${LOG_FILE}
+echo "===== XSPF-0, Relax NG XML, XMLStarlet, should have passed =====" >> ${LOG_FILE}
#${XML_STARLET} validate --err --list-bad --relaxng ${RNG_0_FILE} ${PASS_0_FILES} 1>> ${LOG_FILE} 2>> /dev/null
echo "" >> ${LOG_FILE}
-echo "==== xmllint ====" >> ${LOG_FILE}
-echo "" >> ${LOG_FILE}
-
-echo "===== Should have failed =====" >> ${LOG_FILE}
+echo "===== XSPF-0, Relax NG XML, xmllint, should have failed =====" >> ${LOG_FILE}
for i in ${FAIL_0_FILES}; do
if ${XMLLINT} --relaxng ${RNG_0_FILE} --noout $i &>/dev/null ; then
echo $i >> ${LOG_FILE}
@@ -112,7 +95,7 @@
done
echo "" >> ${LOG_FILE}
-echo "===== Should have passed =====" >> ${LOG_FILE}
+echo "===== XSPF-0, Relax NG XML, xmllint, should have passed =====" >> ${LOG_FILE}
#for i in ${PASS_0_FILES}; do
# if ! ${XMLLINT} --relaxng ${RNG_0_FILE} --noout $i &>/dev/null ; then
# echo $i >> ${LOG_FILE}
@@ -122,13 +105,7 @@
-echo "=== Without schema ===" >> ${LOG_FILE}
-echo "" >> ${LOG_FILE}
-
-echo "==== ${SPIFF_CHECK} ====" >> ${LOG_FILE}
-echo "" >> ${LOG_FILE}
-
-echo "===== Should have failed =====" >> ${LOG_FILE}
+echo "===== XSPF-0, without schema, spiff_check, should have failed =====" >> ${LOG_FILE}
for i in ${FAIL_0_FILES}; do
OUTPUT=`cat $i | ${SPIFF_CHECK} -`
if [ "${OUTPUT}" == "Valid XSPF-0." ]; then
@@ -137,7 +114,7 @@
done
echo "" >> ${LOG_FILE}
-echo "===== Should have passed =====" >> ${LOG_FILE}
+echo "===== XSPF-0, without schema, spiff_check, should have passed =====" >> ${LOG_FILE}
#for i in ${PASS_0_FILES}; do
# OUTPUT=`cat $i | ${SPIFF_CHECK} -`
# if [ "${OUTPUT}" != "Valid XSPF-0." ]; then
@@ -148,14 +125,7 @@
-echo "== XSPF-1 ==" >> ${LOG_FILE}
-echo "" >> ${LOG_FILE}
-echo "=== Relax NG Compact ===" >> ${LOG_FILE}
-echo "" >> ${LOG_FILE}
-echo "==== RNV ====" >> ${LOG_FILE}
-echo "" >> ${LOG_FILE}
-
-echo "===== Should have failed =====" >> ${LOG_FILE}
+echo "===== XSPF-1, Relax NG Compact, RNV, should have failed =====" >> ${LOG_FILE}
for i in ${FAIL_1_FILES}; do
if ${RNV} ${RNC_1_FILE} $i &>/dev/null ; then
echo $i >> ${LOG_FILE}
@@ -163,7 +133,7 @@
done
echo "" >> ${LOG_FILE}
-echo "===== Should have passed =====" >> ${LOG_FILE}
+echo "===== XSPF-1, Relax NG Compact, RNV, should have passed =====" >> ${LOG_FILE}
for i in ${PASS_1_FILES}; do
if ! ${RNV} ${RNC_1_FILE} $i &>/dev/null ; then
echo $i >> ${LOG_FILE}
@@ -173,25 +143,17 @@
-echo "=== Relax NG XML ===" >> ${LOG_FILE}
-echo "" >> ${LOG_FILE}
-echo "==== XMLStarlet ====" >> ${LOG_FILE}
-echo "" >> ${LOG_FILE}
-
-echo "===== Should have failed =====" >> ${LOG_FILE}
+echo "===== XSPF-1, Relax NG XML, XMLStarlet, should have failed =====" >> ${LOG_FILE}
${XML_STARLET} validate --err --list-good --relaxng ${RNG_1_FILE} ${FAIL_1_FILES} 1>> ${LOG_FILE} 2>> /dev/null
echo "" >> ${LOG_FILE}
-echo "===== Should have passed =====" >> ${LOG_FILE}
+echo "===== XSPF-1, Relax NG XML, XMLStarlet, should have passed =====" >> ${LOG_FILE}
${XML_STARLET} validate --err --list-bad --relaxng ${RNG_1_FILE} ${PASS_1_FILES} 1>> ${LOG_FILE} 2>> /dev/null
echo "" >> ${LOG_FILE}
-echo "==== xmllint ====" >> ${LOG_FILE}
-echo "" >> ${LOG_FILE}
-
-echo "===== Should have failed =====" >> ${LOG_FILE}
+echo "===== XSPF-1, Relax NG XML, xmllint, should have failed =====" >> ${LOG_FILE}
for i in ${FAIL_1_FILES}; do
if ${XMLLINT} --relaxng ${RNG_1_FILE} --noout $i &>/dev/null ; then
echo $i >> ${LOG_FILE}
@@ -199,7 +161,7 @@
done
echo "" >> ${LOG_FILE}
-echo "===== Should have passed =====" >> ${LOG_FILE}
+echo "===== XSPF-1, Relax NG XML, xmllint, should have passed =====" >> ${LOG_FILE}
for i in ${PASS_1_FILES}; do
if ! ${XMLLINT} --relaxng ${RNG_1_FILE} --noout $i &>/dev/null ; then
echo $i >> ${LOG_FILE}
@@ -209,24 +171,17 @@
-echo "=== W3C XML Schema ===" >> ${LOG_FILE}
-echo "" >> ${LOG_FILE}
-echo "==== XMLStarlet ====" >> ${LOG_FILE}
-echo "" >> ${LOG_FILE}
-
-echo "===== Should have failed =====" >> ${LOG_FILE}
+echo "===== XSPF-1, W3C XML Schema, XMLStarlet, should have failed =====" >> ${LOG_FILE}
${XML_STARLET} validate --err --list-good --xsd ${XSD_FILE} ${FAIL_1_FILES} 1>> ${LOG_FILE} 2>> /dev/null
echo "" >> ${LOG_FILE}
-echo "===== Should have passed =====" >> ${LOG_FILE}
+echo "===== XSPF-1, W3C XML Schema, XMLStarlet, should have passed =====" >> ${LOG_FILE}
${XML_STARLET} validate --err --list-bad --xsd ${XSD_FILE} ${PASS_1_FILES} 1>> ${LOG_FILE} 2>> /dev/null
echo "" >> ${LOG_FILE}
-echo "==== xmllint ====" >> ${LOG_FILE}
-echo "" >> ${LOG_FILE}
-echo "===== Should have failed =====" >> ${LOG_FILE}
+echo "===== XSPF-1, W3C XML Schema, xmllint, should have failed =====" >> ${LOG_FILE}
for i in ${FAIL_1_FILES}; do
if ${XMLLINT} --schema ${XSD_FILE} --noout $i &>/dev/null ; then
echo $i >> ${LOG_FILE}
@@ -234,7 +189,7 @@
done
echo "" >> ${LOG_FILE}
-echo "===== Should have passed =====" >> ${LOG_FILE}
+echo "===== XSPF-1, W3C XML Schema, xmllint, should have passed =====" >> ${LOG_FILE}
for i in ${PASS_1_FILES}; do
if ! ${XMLLINT} --schema ${XSD_FILE} --noout $i &>/dev/null ; then
echo $i >> ${LOG_FILE}
@@ -244,13 +199,7 @@
-echo "=== Without schema ===" >> ${LOG_FILE}
-echo "" >> ${LOG_FILE}
-
-echo "==== ${SPIFF_CHECK} ====" >> ${LOG_FILE}
-echo "" >> ${LOG_FILE}
-
-echo "===== Should have failed =====" >> ${LOG_FILE}
+echo "===== XSPF-1, without schema, spiff_check, should have failed =====" >> ${LOG_FILE}
for i in ${FAIL_1_FILES}; do
OUTPUT=`cat $i | ${SPIFF_CHECK} -`
if [ "${OUTPUT}" == "Valid XSPF-1." ]; then
@@ -259,7 +208,7 @@
done
echo "" >> ${LOG_FILE}
-echo "===== Should have passed =====" >> ${LOG_FILE}
+echo "===== XSPF-1, without schema, spiff_check, should have passed =====" >> ${LOG_FILE}
for i in ${PASS_1_FILES}; do
OUTPUT=`cat $i | ${SPIFF_CHECK} -`
if [ "${OUTPUT}" != "Valid XSPF-1." ]; then
More information about the commits
mailing list