Update ipptool to include a Skipped boolean key for skipped tests.

Update FileId of tests.

Include Skipped boolean key for skipped Bonjour tests.

git-svn-id: svn+ssh://src.apple.com/svn/cups/cups.org/trunk@12120 a1ca3aef-8c08-0410-bb20-df032aa958be

diff --git a/everywhere/bonjour-access-tests.test b/everywhere/bonjour-access-tests.test
index b1fcea6949611d0c39f74749bd79466e1656461f..aaab36da683d6557defda6bed6fb60c78017a09e 100644 (file)
--- a/everywhere/bonjour-access-tests.test
+++ b/everywhere/bonjour-access-tests.test
@@ -18,7 +18,7 @@
 #   ./ipptool -tI printer-uri bonjour-access-tests.test
 #
 
-FILE-ID "org.pwg.ipp-everywhere.bonjour-20140825"
+FILE-ID "org.pwg.ipp-everywhere.20140826.bonjour"
 
 {
        # The name of the test...

diff --git a/everywhere/bonjour-tests.sh b/everywhere/bonjour-tests.sh
index ad938d1cd73e410375748064e34f90f49f8cf335..f8e3519a2669046e7d673746d1f48a3dae12f749 100755 (executable)
--- a/everywhere/bonjour-tests.sh
+++ b/everywhere/bonjour-tests.sh
@@ -139,7 +139,7 @@ cat >"$PLIST" <<EOF
 <!DOCTYPE plist PUBLIC "-//Apple Computer//DTD PLIST 1.0//EN" "http://www.apple.com/DTDs/PropertyList-1.0.dtd">
 <plist version="1.0">
 <dict>
-<key>FileId</key><string>org.pwg.ipp-everywhere.bonjour-20140825</string>
+<key>FileId</key><string>org.pwg.ipp-everywhere.20140826.bonjour</string>
 <key>Tests</key><array>
 EOF
 
@@ -159,6 +159,9 @@ end_test() {
        echo $1
        if test $1 = FAIL; then
                echo "<key>Successful</key><false />" >>"$PLIST"
+       elif test $1 = SKIP; then
+               echo "<key>Successful</key><true />" >>"$PLIST"
+               echo "<key>Skipped</key><true />" >>"$PLIST"
        else
                echo "<key>Successful</key><true />" >>"$PLIST"
        fi

diff --git a/everywhere/bonjour-value-tests.test b/everywhere/bonjour-value-tests.test
index 53470d09ceeef8098e838e3af7607c20834025ed..a7fce325799cd802f3793e1d87fb1430917f69be 100644 (file)
--- a/everywhere/bonjour-value-tests.test
+++ b/everywhere/bonjour-value-tests.test
@@ -18,7 +18,7 @@
 #   ./ipptool -tI printer-uri -d ADMINURL=url -d UUID=uuid bonjour-value-tests.test
 #
 
-FILE-ID "org.pwg.ipp-everywhere.bonjour-20140825"
+FILE-ID "org.pwg.ipp-everywhere.20140826.bonjour"
 
 {
        # The name of the test...

diff --git a/everywhere/document-format-tests.test b/everywhere/document-format-tests.test
index 6a3652d9d7555c67c59b46a265538ccd867e122a..bbb3e51693f5b37b5472454258425c56d5ff5d64 100644 (file)
--- a/everywhere/document-format-tests.test
+++ b/everywhere/document-format-tests.test
@@ -27,7 +27,7 @@
 # data is available in the "everywhere" subdirectory of the CUPS source code.
 #
 
-FILE-ID "org.pwg.ipp-everywhere.document-format-20140825"
+FILE-ID "org.pwg.ipp-everywhere.20140826.document"
 
 {
        NAME "D-1. PWG Raster Format Tests (mandatory)"

diff --git a/everywhere/ipp-tests.test b/everywhere/ipp-tests.test
index 8eec5de9a89dfaf7b079ec506b88f6fcdd55bde7..af258df564f5c5f5040585aff7c79e7fa37f4032 100644 (file)
--- a/everywhere/ipp-tests.test
+++ b/everywhere/ipp-tests.test
@@ -26,7 +26,7 @@
 # 'media-needed' keywords in the "printer-state-reasons" Printer attribute.
 #
 
-FILE-ID "org.pwg.ipp-everywhere.ipp-20140825"
+FILE-ID "org.pwg.ipp-everywhere.20140826.ipp"
 
 # All tests use IPP version 2.0, unless overridden in a test...
 VERSION 2.0

diff --git a/test/ipptool.c b/test/ipptool.c
index fbcc824b8a24375cb5fff45a79c154948e76b0b6..4c911d5eb74e1db3f2209d92cd2a7761be080050 100644 (file)
--- a/test/ipptool.c
+++ b/test/ipptool.c
@@ -2471,6 +2471,8 @@ do_tests(FILE         *outfile,           /* I - Output file */
       {
        fputs("<key>Successful</key>\n", outfile);
        fputs("<true />\n", outfile);
+       fputs("<key>Skipped</key>\n", outfile);
+       fputs("<true />\n", outfile);
        fputs("<key>StatusCode</key>\n", outfile);
        print_xml_string(outfile, "string", "skip");
        fputs("<key>ResponseAttributes</key>\n", outfile);