Fix Avahi/Linux build error (Issue #5566)

[thirdparty/cups.git] / test / ipp-everywhere.test

diff --git a/test/ipp-everywhere.test b/test/ipp-everywhere.test
index d1e5b2ce37406a17d2e2cbb4eafdf78da242bb2f..d7b0c445cedf0206e75e84cf731d9929513dd33f 100644 (file)
--- a/test/ipp-everywhere.test
+++ b/test/ipp-everywhere.test
@@ -1,16 +1,11 @@
 #
-# "$Id$"
+# IPP Everywhere test suite.
 #
-#   IPP Everywhere test suite.
+# Copyright © 2007-2018 by Apple Inc.
+# Copyright © 2001-2006 by Easy Software Products. All rights reserved.
 #
-#   Copyright 2007-2013 by Apple Inc.
-#   Copyright 2001-2006 by Easy Software Products. All rights reserved.
-#
-#   These coded instructions, statements, and computer programs are the
-#   property of Apple Inc. and are protected by Federal copyright
-#   law.  Distribution and use rights are outlined in the file "LICENSE.txt"
-#   which should have been included with this file.  If this file is
-#   file is missing or damaged, see the license at "http://www.cups.org/".
+# Licensed under Apache License v2.0.  See the file "LICENSE" for more
+# information.
 #
 # Usage:
 #
@@ -161,7 +156,7 @@ INCLUDE "ipp-2.0.test"
        EXPECT pwg-raster-document-resolution-supported WITH-VALUE 150dpi DEFINE-MATCH HAVE_150DPI
        EXPECT pwg-raster-document-resolution-supported WITH-VALUE 180dpi DEFINE-MATCH HAVE_180DPI
        EXPECT pwg-raster-document-resolution-supported WITH-VALUE 300dpi DEFINE-MATCH HAVE_300DPI
-       EXPECT pwg-raster-document-resolution-supported WITH-VALUE 3600dpi DEFINE-MATCH HAVE_360DPI
+       EXPECT pwg-raster-document-resolution-supported WITH-VALUE 360dpi DEFINE-MATCH HAVE_360DPI
        EXPECT pwg-raster-document-resolution-supported WITH-VALUE 600dpi DEFINE-MATCH HAVE_600DPI
        EXPECT pwg-raster-document-resolution-supported WITH-VALUE 720dpi DEFINE-MATCH HAVE_720DPI
 
@@ -181,7 +176,7 @@ INCLUDE "ipp-2.0.test"
 # Test printing all sample documents
 {
        NAME "Print color.jpg-4x6 @ 150dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/color.jpg-4x6-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/color.jpg-4x6-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -193,7 +188,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-150dpi-20111130/black-1/color.jpg-4x6-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/color.jpg-4x6-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -201,7 +196,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 150dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/color.jpg-4x6-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/color.jpg-4x6-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -216,7 +211,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20111130/black-1/color.jpg-4x6-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/color.jpg-4x6-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -224,7 +219,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 150dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/color.jpg-4x6-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/color.jpg-4x6-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -239,7 +234,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20111130/black-1/color.jpg-4x6-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/color.jpg-4x6-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -247,7 +242,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 150dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -259,7 +254,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-150dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -267,7 +262,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 150dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -282,7 +277,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -290,7 +285,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 150dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -305,7 +300,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/color.jpg-4x6-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -313,7 +308,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 150dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -325,7 +320,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-150dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -333,7 +328,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 150dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -348,7 +343,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -356,7 +351,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 150dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -371,7 +366,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/color.jpg-4x6-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -379,7 +374,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 150dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -391,7 +386,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-150dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -399,7 +394,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 150dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -414,7 +409,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -422,7 +417,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 150dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -437,7 +432,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/color.jpg-4x6-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -445,7 +440,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 150dpi, srgb-16"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
 
@@ -457,7 +452,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-150dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -465,7 +460,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 150dpi, srgb-16, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -480,7 +475,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -488,7 +483,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 150dpi, srgb-16, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -503,7 +498,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-16/color.jpg-4x6-srgb-16-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -511,7 +506,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/color.jpg-4x6-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/color.jpg-4x6-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -523,7 +518,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-180dpi-20111130/black-1/color.jpg-4x6-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/color.jpg-4x6-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -531,7 +526,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/color.jpg-4x6-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/color.jpg-4x6-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -546,7 +541,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20111130/black-1/color.jpg-4x6-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/color.jpg-4x6-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -554,7 +549,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/color.jpg-4x6-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/color.jpg-4x6-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -569,7 +564,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20111130/black-1/color.jpg-4x6-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/color.jpg-4x6-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -577,7 +572,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -589,7 +584,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-180dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -597,7 +592,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -612,7 +607,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -620,7 +615,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -635,7 +630,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/color.jpg-4x6-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -643,7 +638,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -655,7 +650,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-180dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -663,7 +658,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -678,7 +673,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -686,7 +681,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -701,7 +696,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/color.jpg-4x6-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -709,7 +704,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -721,7 +716,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-180dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -729,7 +724,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -744,7 +739,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -752,7 +747,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -767,7 +762,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/color.jpg-4x6-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -775,7 +770,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, srgb-16"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
 
@@ -787,7 +782,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-180dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -795,7 +790,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, srgb-16, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -810,7 +805,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -818,7 +813,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 180dpi, srgb-16, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -833,7 +828,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-16/color.jpg-4x6-srgb-16-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -841,7 +836,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/color.jpg-4x6-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/color.jpg-4x6-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -853,7 +848,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-300dpi-20111130/black-1/color.jpg-4x6-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/color.jpg-4x6-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -861,7 +856,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/color.jpg-4x6-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/color.jpg-4x6-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -876,7 +871,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20111130/black-1/color.jpg-4x6-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/color.jpg-4x6-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -884,7 +879,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/color.jpg-4x6-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/color.jpg-4x6-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -899,7 +894,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20111130/black-1/color.jpg-4x6-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/color.jpg-4x6-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -907,7 +902,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -919,7 +914,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-300dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -927,7 +922,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -942,7 +937,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -950,7 +945,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -965,7 +960,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/color.jpg-4x6-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -973,7 +968,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -985,7 +980,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-300dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -993,7 +988,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1008,7 +1003,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1016,7 +1011,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1031,7 +1026,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/color.jpg-4x6-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1039,7 +1034,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -1051,7 +1046,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-300dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1059,7 +1054,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1074,7 +1069,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1082,7 +1077,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1097,7 +1092,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/color.jpg-4x6-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1105,7 +1100,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, srgb-16"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
 
@@ -1117,7 +1112,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-300dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1125,7 +1120,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, srgb-16, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1140,7 +1135,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1148,7 +1143,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 300dpi, srgb-16, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1163,7 +1158,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-16/color.jpg-4x6-srgb-16-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1171,7 +1166,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/color.jpg-4x6-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/color.jpg-4x6-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -1183,7 +1178,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-360dpi-20111130/black-1/color.jpg-4x6-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/color.jpg-4x6-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1191,7 +1186,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/color.jpg-4x6-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/color.jpg-4x6-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1206,7 +1201,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20111130/black-1/color.jpg-4x6-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/color.jpg-4x6-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1214,7 +1209,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/color.jpg-4x6-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/color.jpg-4x6-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1229,7 +1224,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20111130/black-1/color.jpg-4x6-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/color.jpg-4x6-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1237,7 +1232,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -1249,7 +1244,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-360dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1257,7 +1252,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1272,7 +1267,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1280,7 +1275,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1295,7 +1290,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/color.jpg-4x6-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1303,7 +1298,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -1315,7 +1310,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-360dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1323,7 +1318,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1338,7 +1333,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1346,7 +1341,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1361,7 +1356,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/color.jpg-4x6-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1369,7 +1364,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -1381,7 +1376,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-360dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1389,7 +1384,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1404,7 +1399,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1412,7 +1407,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1427,7 +1422,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/color.jpg-4x6-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1435,7 +1430,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, srgb-16"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
 
@@ -1447,7 +1442,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-360dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1455,7 +1450,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, srgb-16, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1470,7 +1465,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1478,7 +1473,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 360dpi, srgb-16, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1493,7 +1488,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-16/color.jpg-4x6-srgb-16-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1501,7 +1496,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/color.jpg-4x6-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/color.jpg-4x6-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -1513,7 +1508,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-600dpi-20111130/black-1/color.jpg-4x6-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/color.jpg-4x6-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1521,7 +1516,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/color.jpg-4x6-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/color.jpg-4x6-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1536,7 +1531,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20111130/black-1/color.jpg-4x6-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/color.jpg-4x6-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1544,7 +1539,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/color.jpg-4x6-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/color.jpg-4x6-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1559,7 +1554,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20111130/black-1/color.jpg-4x6-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/color.jpg-4x6-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1567,7 +1562,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -1579,7 +1574,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-600dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1587,7 +1582,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1602,7 +1597,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1610,7 +1605,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1625,7 +1620,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/color.jpg-4x6-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1633,7 +1628,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -1645,7 +1640,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-600dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1653,7 +1648,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1668,7 +1663,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1676,7 +1671,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1691,7 +1686,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/color.jpg-4x6-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1699,7 +1694,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -1711,7 +1706,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-600dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1719,7 +1714,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1734,7 +1729,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1742,7 +1737,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1757,7 +1752,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/color.jpg-4x6-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1765,7 +1760,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, srgb-16"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
 
@@ -1777,7 +1772,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-600dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1785,7 +1780,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, srgb-16, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1800,7 +1795,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1808,7 +1803,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 600dpi, srgb-16, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1823,7 +1818,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-16/color.jpg-4x6-srgb-16-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1831,7 +1826,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/color.jpg-4x6-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/color.jpg-4x6-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -1843,7 +1838,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-720dpi-20111130/black-1/color.jpg-4x6-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/color.jpg-4x6-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1851,7 +1846,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/color.jpg-4x6-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/color.jpg-4x6-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1866,7 +1861,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20111130/black-1/color.jpg-4x6-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/color.jpg-4x6-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1874,7 +1869,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/color.jpg-4x6-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/color.jpg-4x6-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1889,7 +1884,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20111130/black-1/color.jpg-4x6-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/color.jpg-4x6-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1897,7 +1892,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -1909,7 +1904,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-720dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1917,7 +1912,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1932,7 +1927,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1940,7 +1935,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -1955,7 +1950,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20111130/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/color.jpg-4x6-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1963,7 +1958,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -1975,7 +1970,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-720dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -1983,7 +1978,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -1998,7 +1993,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2006,7 +2001,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2021,7 +2016,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20111130/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/color.jpg-4x6-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2029,7 +2024,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -2041,7 +2036,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-720dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2049,7 +2044,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2064,7 +2059,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2072,7 +2067,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2087,7 +2082,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20111130/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/color.jpg-4x6-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2095,7 +2090,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, srgb-16"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
 
@@ -2107,7 +2102,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "color.jpg-4x6"
-       FILE pwg-raster-samples-720dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2115,7 +2110,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, srgb-16, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2130,7 +2125,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2138,7 +2133,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print color.jpg-4x6 @ 720dpi, srgb-16, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_16
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2153,7 +2148,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "color.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20111130/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-16/color.jpg-4x6-srgb-16-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2161,7 +2156,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 150dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/document-a4-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/document-a4-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -2173,7 +2168,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-150dpi-20111130/black-1/document-a4-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/document-a4-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2181,7 +2176,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 150dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/document-a4-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/document-a4-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2196,7 +2191,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20111130/black-1/document-a4-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/document-a4-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2204,7 +2199,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 150dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/document-a4-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/document-a4-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2219,7 +2214,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20111130/black-1/document-a4-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/document-a4-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2227,7 +2222,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 150dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/document-a4-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/document-a4-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -2239,7 +2234,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-150dpi-20111130/cmyk-8/document-a4-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/document-a4-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2247,7 +2242,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 150dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/document-a4-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/document-a4-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2262,7 +2257,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20111130/cmyk-8/document-a4-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/document-a4-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2270,7 +2265,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 150dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/document-a4-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/document-a4-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2285,7 +2280,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20111130/cmyk-8/document-a4-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/document-a4-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2293,7 +2288,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 150dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/document-a4-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/document-a4-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -2305,7 +2300,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-150dpi-20111130/sgray-8/document-a4-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/document-a4-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2313,7 +2308,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 150dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/document-a4-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/document-a4-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2328,7 +2323,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20111130/sgray-8/document-a4-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/document-a4-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2336,7 +2331,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 150dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/document-a4-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/document-a4-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2351,7 +2346,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20111130/sgray-8/document-a4-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/document-a4-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2359,7 +2354,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 150dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/document-a4-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/document-a4-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -2371,7 +2366,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-150dpi-20111130/srgb-8/document-a4-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/document-a4-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2379,7 +2374,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 150dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/document-a4-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/document-a4-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2394,7 +2389,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20111130/srgb-8/document-a4-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/document-a4-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2402,7 +2397,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 150dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/document-a4-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/document-a4-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2417,7 +2412,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20111130/srgb-8/document-a4-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/document-a4-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2425,7 +2420,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 180dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/document-a4-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/document-a4-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -2437,7 +2432,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-180dpi-20111130/black-1/document-a4-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/document-a4-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2445,7 +2440,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 180dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/document-a4-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/document-a4-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2460,7 +2455,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20111130/black-1/document-a4-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/document-a4-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2468,7 +2463,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 180dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/document-a4-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/document-a4-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2483,7 +2478,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20111130/black-1/document-a4-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/document-a4-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2491,7 +2486,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 180dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/document-a4-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/document-a4-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -2503,7 +2498,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-180dpi-20111130/cmyk-8/document-a4-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/document-a4-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2511,7 +2506,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 180dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/document-a4-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/document-a4-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2526,7 +2521,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20111130/cmyk-8/document-a4-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/document-a4-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2534,7 +2529,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 180dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/document-a4-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/document-a4-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2549,7 +2544,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20111130/cmyk-8/document-a4-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/document-a4-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2557,7 +2552,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 180dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/document-a4-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/document-a4-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -2569,7 +2564,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-180dpi-20111130/sgray-8/document-a4-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/document-a4-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2577,7 +2572,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 180dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/document-a4-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/document-a4-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2592,7 +2587,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20111130/sgray-8/document-a4-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/document-a4-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2600,7 +2595,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 180dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/document-a4-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/document-a4-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2615,7 +2610,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20111130/sgray-8/document-a4-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/document-a4-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2623,7 +2618,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 180dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/document-a4-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/document-a4-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -2635,7 +2630,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-180dpi-20111130/srgb-8/document-a4-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/document-a4-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2643,7 +2638,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 180dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/document-a4-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/document-a4-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2658,7 +2653,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20111130/srgb-8/document-a4-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/document-a4-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2666,7 +2661,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 180dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/document-a4-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/document-a4-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2681,7 +2676,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20111130/srgb-8/document-a4-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/document-a4-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2689,7 +2684,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 300dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/document-a4-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/document-a4-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -2701,7 +2696,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-300dpi-20111130/black-1/document-a4-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/document-a4-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2709,7 +2704,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 300dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/document-a4-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/document-a4-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2724,7 +2719,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20111130/black-1/document-a4-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/document-a4-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2732,7 +2727,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 300dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/document-a4-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/document-a4-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2747,7 +2742,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20111130/black-1/document-a4-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/document-a4-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2755,7 +2750,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 300dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/document-a4-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/document-a4-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -2767,7 +2762,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-300dpi-20111130/cmyk-8/document-a4-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/document-a4-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2775,7 +2770,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 300dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/document-a4-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/document-a4-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2790,7 +2785,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20111130/cmyk-8/document-a4-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/document-a4-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2798,7 +2793,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 300dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/document-a4-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/document-a4-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2813,7 +2808,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20111130/cmyk-8/document-a4-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/document-a4-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2821,7 +2816,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 300dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/document-a4-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/document-a4-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -2833,7 +2828,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-300dpi-20111130/sgray-8/document-a4-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/document-a4-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2841,7 +2836,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 300dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/document-a4-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/document-a4-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2856,7 +2851,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20111130/sgray-8/document-a4-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/document-a4-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2864,7 +2859,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 300dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/document-a4-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/document-a4-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2879,7 +2874,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20111130/sgray-8/document-a4-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/document-a4-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2887,7 +2882,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 300dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/document-a4-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/document-a4-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -2899,7 +2894,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-300dpi-20111130/srgb-8/document-a4-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/document-a4-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2907,7 +2902,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 300dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/document-a4-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/document-a4-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2922,7 +2917,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20111130/srgb-8/document-a4-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/document-a4-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2930,7 +2925,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 300dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/document-a4-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/document-a4-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -2945,7 +2940,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20111130/srgb-8/document-a4-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/document-a4-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2953,7 +2948,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 360dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/document-a4-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/document-a4-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -2965,7 +2960,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-360dpi-20111130/black-1/document-a4-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/document-a4-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2973,7 +2968,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 360dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/document-a4-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/document-a4-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -2988,7 +2983,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20111130/black-1/document-a4-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/document-a4-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -2996,7 +2991,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 360dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/document-a4-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/document-a4-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3011,7 +3006,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20111130/black-1/document-a4-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/document-a4-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3019,7 +3014,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 360dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/document-a4-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/document-a4-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -3031,7 +3026,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-360dpi-20111130/cmyk-8/document-a4-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/document-a4-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3039,7 +3034,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 360dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/document-a4-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/document-a4-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3054,7 +3049,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20111130/cmyk-8/document-a4-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/document-a4-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3062,7 +3057,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 360dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/document-a4-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/document-a4-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3077,7 +3072,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20111130/cmyk-8/document-a4-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/document-a4-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3085,7 +3080,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 360dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/document-a4-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/document-a4-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -3097,7 +3092,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-360dpi-20111130/sgray-8/document-a4-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/document-a4-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3105,7 +3100,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 360dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/document-a4-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/document-a4-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3120,7 +3115,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20111130/sgray-8/document-a4-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/document-a4-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3128,7 +3123,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 360dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/document-a4-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/document-a4-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3143,7 +3138,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20111130/sgray-8/document-a4-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/document-a4-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3151,7 +3146,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 360dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/document-a4-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/document-a4-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -3163,7 +3158,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-360dpi-20111130/srgb-8/document-a4-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/document-a4-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3171,7 +3166,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 360dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/document-a4-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/document-a4-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3186,7 +3181,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20111130/srgb-8/document-a4-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/document-a4-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3194,7 +3189,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 360dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/document-a4-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/document-a4-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3209,7 +3204,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20111130/srgb-8/document-a4-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/document-a4-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3217,7 +3212,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 600dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/document-a4-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/document-a4-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -3229,7 +3224,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-600dpi-20111130/black-1/document-a4-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/document-a4-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3237,7 +3232,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 600dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/document-a4-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/document-a4-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3252,7 +3247,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20111130/black-1/document-a4-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/document-a4-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3260,7 +3255,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 600dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/document-a4-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/document-a4-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3275,7 +3270,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20111130/black-1/document-a4-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/document-a4-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3283,7 +3278,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 600dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/document-a4-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/document-a4-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -3295,7 +3290,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-600dpi-20111130/cmyk-8/document-a4-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/document-a4-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3303,7 +3298,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 600dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/document-a4-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/document-a4-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3318,7 +3313,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20111130/cmyk-8/document-a4-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/document-a4-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3326,7 +3321,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 600dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/document-a4-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/document-a4-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3341,7 +3336,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20111130/cmyk-8/document-a4-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/document-a4-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3349,7 +3344,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 600dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/document-a4-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/document-a4-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -3361,7 +3356,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-600dpi-20111130/sgray-8/document-a4-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/document-a4-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3369,7 +3364,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 600dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/document-a4-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/document-a4-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3384,7 +3379,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20111130/sgray-8/document-a4-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/document-a4-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3392,7 +3387,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 600dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/document-a4-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/document-a4-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3407,7 +3402,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20111130/sgray-8/document-a4-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/document-a4-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3415,7 +3410,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 600dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/document-a4-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/document-a4-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -3427,7 +3422,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-600dpi-20111130/srgb-8/document-a4-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/document-a4-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3435,7 +3430,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 600dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/document-a4-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/document-a4-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3450,7 +3445,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20111130/srgb-8/document-a4-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/document-a4-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3458,7 +3453,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 600dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/document-a4-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/document-a4-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3473,7 +3468,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20111130/srgb-8/document-a4-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/document-a4-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3481,7 +3476,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 720dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/document-a4-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/document-a4-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -3493,7 +3488,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-720dpi-20111130/black-1/document-a4-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/document-a4-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3501,7 +3496,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 720dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/document-a4-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/document-a4-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3516,7 +3511,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20111130/black-1/document-a4-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/document-a4-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3524,7 +3519,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 720dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/document-a4-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/document-a4-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3539,7 +3534,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20111130/black-1/document-a4-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/document-a4-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3547,7 +3542,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 720dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/document-a4-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/document-a4-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -3559,7 +3554,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-720dpi-20111130/cmyk-8/document-a4-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/document-a4-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3567,7 +3562,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 720dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/document-a4-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/document-a4-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3582,7 +3577,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20111130/cmyk-8/document-a4-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/document-a4-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3590,7 +3585,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 720dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/document-a4-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/document-a4-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3605,7 +3600,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20111130/cmyk-8/document-a4-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/document-a4-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3613,7 +3608,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 720dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/document-a4-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/document-a4-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -3625,7 +3620,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-720dpi-20111130/sgray-8/document-a4-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/document-a4-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3633,7 +3628,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 720dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/document-a4-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/document-a4-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3648,7 +3643,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20111130/sgray-8/document-a4-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/document-a4-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3656,7 +3651,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 720dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/document-a4-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/document-a4-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3671,7 +3666,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20111130/sgray-8/document-a4-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/document-a4-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3679,7 +3674,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 720dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/document-a4-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/document-a4-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -3691,7 +3686,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-a4"
-       FILE pwg-raster-samples-720dpi-20111130/srgb-8/document-a4-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/document-a4-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3699,7 +3694,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 720dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/document-a4-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/document-a4-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3714,7 +3709,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20111130/srgb-8/document-a4-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/document-a4-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3722,7 +3717,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-a4 @ 720dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/document-a4-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/document-a4-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3737,7 +3732,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20111130/srgb-8/document-a4-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/document-a4-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3745,7 +3740,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 150dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/document-letter-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/document-letter-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -3757,7 +3752,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-150dpi-20111130/black-1/document-letter-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/document-letter-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3765,7 +3760,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 150dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/document-letter-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/document-letter-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3780,7 +3775,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20111130/black-1/document-letter-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/document-letter-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3788,7 +3783,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 150dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/document-letter-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/document-letter-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3803,7 +3798,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20111130/black-1/document-letter-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/document-letter-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3811,7 +3806,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 150dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/document-letter-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/document-letter-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -3823,7 +3818,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-150dpi-20111130/cmyk-8/document-letter-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/document-letter-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3831,7 +3826,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 150dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/document-letter-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/document-letter-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3846,7 +3841,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20111130/cmyk-8/document-letter-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/document-letter-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3854,7 +3849,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 150dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/document-letter-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/document-letter-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3869,7 +3864,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20111130/cmyk-8/document-letter-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/document-letter-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3877,7 +3872,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 150dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/document-letter-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/document-letter-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -3889,7 +3884,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-150dpi-20111130/sgray-8/document-letter-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/document-letter-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3897,7 +3892,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 150dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/document-letter-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/document-letter-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3912,7 +3907,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20111130/sgray-8/document-letter-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/document-letter-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3920,7 +3915,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 150dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/document-letter-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/document-letter-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -3935,7 +3930,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20111130/sgray-8/document-letter-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/document-letter-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3943,7 +3938,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 150dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/document-letter-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/document-letter-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -3955,7 +3950,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-150dpi-20111130/srgb-8/document-letter-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/document-letter-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3963,7 +3958,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 150dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/document-letter-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/document-letter-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -3978,7 +3973,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20111130/srgb-8/document-letter-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/document-letter-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -3986,7 +3981,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 150dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/document-letter-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/document-letter-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4001,7 +3996,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20111130/srgb-8/document-letter-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/document-letter-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4009,7 +4004,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 180dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/document-letter-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/document-letter-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -4021,7 +4016,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-180dpi-20111130/black-1/document-letter-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/document-letter-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4029,7 +4024,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 180dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/document-letter-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/document-letter-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4044,7 +4039,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20111130/black-1/document-letter-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/document-letter-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4052,7 +4047,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 180dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/document-letter-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/document-letter-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4067,7 +4062,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20111130/black-1/document-letter-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/document-letter-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4075,7 +4070,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 180dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/document-letter-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/document-letter-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -4087,7 +4082,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-180dpi-20111130/cmyk-8/document-letter-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/document-letter-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4095,7 +4090,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 180dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/document-letter-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/document-letter-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4110,7 +4105,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20111130/cmyk-8/document-letter-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/document-letter-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4118,7 +4113,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 180dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/document-letter-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/document-letter-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4133,7 +4128,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20111130/cmyk-8/document-letter-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/document-letter-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4141,7 +4136,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 180dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/document-letter-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/document-letter-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -4153,7 +4148,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-180dpi-20111130/sgray-8/document-letter-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/document-letter-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4161,7 +4156,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 180dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/document-letter-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/document-letter-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4176,7 +4171,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20111130/sgray-8/document-letter-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/document-letter-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4184,7 +4179,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 180dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/document-letter-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/document-letter-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4199,7 +4194,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20111130/sgray-8/document-letter-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/document-letter-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4207,7 +4202,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 180dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/document-letter-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/document-letter-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -4219,7 +4214,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-180dpi-20111130/srgb-8/document-letter-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/document-letter-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4227,7 +4222,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 180dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/document-letter-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/document-letter-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4242,7 +4237,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20111130/srgb-8/document-letter-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/document-letter-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4250,7 +4245,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 180dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/document-letter-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/document-letter-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4265,7 +4260,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20111130/srgb-8/document-letter-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/document-letter-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4273,7 +4268,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 300dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/document-letter-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/document-letter-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -4285,7 +4280,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-300dpi-20111130/black-1/document-letter-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/document-letter-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4293,7 +4288,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 300dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/document-letter-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/document-letter-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4308,7 +4303,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20111130/black-1/document-letter-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/document-letter-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4316,7 +4311,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 300dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/document-letter-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/document-letter-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4331,7 +4326,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20111130/black-1/document-letter-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/document-letter-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4339,7 +4334,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 300dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/document-letter-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/document-letter-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -4351,7 +4346,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-300dpi-20111130/cmyk-8/document-letter-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/document-letter-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4359,7 +4354,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 300dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/document-letter-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/document-letter-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4374,7 +4369,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20111130/cmyk-8/document-letter-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/document-letter-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4382,7 +4377,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 300dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/document-letter-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/document-letter-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4397,7 +4392,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20111130/cmyk-8/document-letter-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/document-letter-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4405,7 +4400,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 300dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/document-letter-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/document-letter-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -4417,7 +4412,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-300dpi-20111130/sgray-8/document-letter-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/document-letter-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4425,7 +4420,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 300dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/document-letter-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/document-letter-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4440,7 +4435,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20111130/sgray-8/document-letter-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/document-letter-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4448,7 +4443,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 300dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/document-letter-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/document-letter-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4463,7 +4458,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20111130/sgray-8/document-letter-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/document-letter-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4471,7 +4466,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 300dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/document-letter-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/document-letter-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -4483,7 +4478,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-300dpi-20111130/srgb-8/document-letter-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/document-letter-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4491,7 +4486,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 300dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/document-letter-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/document-letter-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4506,7 +4501,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20111130/srgb-8/document-letter-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/document-letter-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4514,7 +4509,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 300dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/document-letter-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/document-letter-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4529,7 +4524,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20111130/srgb-8/document-letter-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/document-letter-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4537,7 +4532,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 360dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/document-letter-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/document-letter-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -4549,7 +4544,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-360dpi-20111130/black-1/document-letter-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/document-letter-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4557,7 +4552,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 360dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/document-letter-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/document-letter-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4572,7 +4567,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20111130/black-1/document-letter-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/document-letter-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4580,7 +4575,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 360dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/document-letter-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/document-letter-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4595,7 +4590,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20111130/black-1/document-letter-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/document-letter-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4603,7 +4598,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 360dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/document-letter-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/document-letter-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -4615,7 +4610,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-360dpi-20111130/cmyk-8/document-letter-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/document-letter-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4623,7 +4618,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 360dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/document-letter-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/document-letter-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4638,7 +4633,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20111130/cmyk-8/document-letter-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/document-letter-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4646,7 +4641,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 360dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/document-letter-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/document-letter-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4661,7 +4656,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20111130/cmyk-8/document-letter-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/document-letter-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4669,7 +4664,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 360dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/document-letter-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/document-letter-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -4681,7 +4676,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-360dpi-20111130/sgray-8/document-letter-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/document-letter-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4689,7 +4684,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 360dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/document-letter-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/document-letter-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4704,7 +4699,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20111130/sgray-8/document-letter-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/document-letter-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4712,7 +4707,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 360dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/document-letter-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/document-letter-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4727,7 +4722,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20111130/sgray-8/document-letter-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/document-letter-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4735,7 +4730,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 360dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/document-letter-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/document-letter-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -4747,7 +4742,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-360dpi-20111130/srgb-8/document-letter-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/document-letter-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4755,7 +4750,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 360dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/document-letter-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/document-letter-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4770,7 +4765,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20111130/srgb-8/document-letter-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/document-letter-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4778,7 +4773,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 360dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/document-letter-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/document-letter-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4793,7 +4788,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20111130/srgb-8/document-letter-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/document-letter-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4801,7 +4796,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 600dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/document-letter-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/document-letter-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -4813,7 +4808,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-600dpi-20111130/black-1/document-letter-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/document-letter-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4821,7 +4816,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 600dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/document-letter-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/document-letter-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4836,7 +4831,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20111130/black-1/document-letter-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/document-letter-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4844,7 +4839,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 600dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/document-letter-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/document-letter-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4859,7 +4854,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20111130/black-1/document-letter-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/document-letter-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4867,7 +4862,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 600dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/document-letter-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/document-letter-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -4879,7 +4874,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-600dpi-20111130/cmyk-8/document-letter-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/document-letter-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4887,7 +4882,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 600dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/document-letter-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/document-letter-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4902,7 +4897,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20111130/cmyk-8/document-letter-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/document-letter-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4910,7 +4905,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 600dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/document-letter-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/document-letter-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4925,7 +4920,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20111130/cmyk-8/document-letter-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/document-letter-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4933,7 +4928,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 600dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/document-letter-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/document-letter-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -4945,7 +4940,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-600dpi-20111130/sgray-8/document-letter-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/document-letter-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4953,7 +4948,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 600dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/document-letter-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/document-letter-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -4968,7 +4963,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20111130/sgray-8/document-letter-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/document-letter-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4976,7 +4971,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 600dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/document-letter-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/document-letter-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -4991,7 +4986,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20111130/sgray-8/document-letter-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/document-letter-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -4999,7 +4994,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 600dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/document-letter-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/document-letter-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -5011,7 +5006,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-600dpi-20111130/srgb-8/document-letter-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/document-letter-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5019,7 +5014,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 600dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/document-letter-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/document-letter-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5034,7 +5029,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20111130/srgb-8/document-letter-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/document-letter-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5042,7 +5037,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 600dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/document-letter-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/document-letter-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5057,7 +5052,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20111130/srgb-8/document-letter-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/document-letter-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5065,7 +5060,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 720dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/document-letter-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/document-letter-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -5077,7 +5072,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-720dpi-20111130/black-1/document-letter-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/document-letter-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5085,7 +5080,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 720dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/document-letter-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/document-letter-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5100,7 +5095,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20111130/black-1/document-letter-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/document-letter-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5108,7 +5103,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 720dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/document-letter-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/document-letter-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5123,7 +5118,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20111130/black-1/document-letter-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/document-letter-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5131,7 +5126,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 720dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/document-letter-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/document-letter-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -5143,7 +5138,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-720dpi-20111130/cmyk-8/document-letter-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/document-letter-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5151,7 +5146,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 720dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/document-letter-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/document-letter-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5166,7 +5161,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20111130/cmyk-8/document-letter-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/document-letter-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5174,7 +5169,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 720dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/document-letter-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/document-letter-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5189,7 +5184,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20111130/cmyk-8/document-letter-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/document-letter-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5197,7 +5192,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 720dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/document-letter-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/document-letter-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -5209,7 +5204,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-720dpi-20111130/sgray-8/document-letter-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/document-letter-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5217,7 +5212,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 720dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/document-letter-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/document-letter-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5232,7 +5227,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20111130/sgray-8/document-letter-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/document-letter-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5240,7 +5235,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 720dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/document-letter-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/document-letter-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5255,7 +5250,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20111130/sgray-8/document-letter-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/document-letter-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5263,7 +5258,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 720dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/document-letter-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/document-letter-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -5275,7 +5270,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "document-letter"
-       FILE pwg-raster-samples-720dpi-20111130/srgb-8/document-letter-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/document-letter-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5283,7 +5278,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 720dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/document-letter-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/document-letter-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5298,7 +5293,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "document-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20111130/srgb-8/document-letter-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/document-letter-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5306,7 +5301,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print document-letter @ 720dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/document-letter-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/document-letter-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5321,7 +5316,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "document-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20111130/srgb-8/document-letter-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/document-letter-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5329,7 +5324,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 150dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/gray.jpg-4x6-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/gray.jpg-4x6-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -5341,7 +5336,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-150dpi-20111130/black-1/gray.jpg-4x6-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/gray.jpg-4x6-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5349,7 +5344,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 150dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/gray.jpg-4x6-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/gray.jpg-4x6-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5364,7 +5359,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20111130/black-1/gray.jpg-4x6-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/gray.jpg-4x6-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5372,7 +5367,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 150dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/gray.jpg-4x6-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/gray.jpg-4x6-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5387,7 +5382,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20111130/black-1/gray.jpg-4x6-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/gray.jpg-4x6-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5395,7 +5390,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 150dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -5407,7 +5402,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-150dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5415,7 +5410,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 150dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5430,7 +5425,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5438,7 +5433,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 150dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5453,7 +5448,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/gray.jpg-4x6-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5461,7 +5456,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 150dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -5473,7 +5468,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-150dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5481,7 +5476,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 150dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5496,7 +5491,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5504,7 +5499,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 150dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5519,7 +5514,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/gray.jpg-4x6-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5527,7 +5522,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 180dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/gray.jpg-4x6-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/gray.jpg-4x6-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -5539,7 +5534,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-180dpi-20111130/black-1/gray.jpg-4x6-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/gray.jpg-4x6-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5547,7 +5542,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 180dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/gray.jpg-4x6-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/gray.jpg-4x6-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5562,7 +5557,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20111130/black-1/gray.jpg-4x6-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/gray.jpg-4x6-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5570,7 +5565,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 180dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/gray.jpg-4x6-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/gray.jpg-4x6-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5585,7 +5580,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20111130/black-1/gray.jpg-4x6-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/gray.jpg-4x6-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5593,7 +5588,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 180dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -5605,7 +5600,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-180dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5613,7 +5608,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 180dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5628,7 +5623,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5636,7 +5631,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 180dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5651,7 +5646,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/gray.jpg-4x6-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5659,7 +5654,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 180dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -5671,7 +5666,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-180dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5679,7 +5674,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 180dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5694,7 +5689,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5702,7 +5697,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 180dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5717,7 +5712,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/gray.jpg-4x6-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5725,7 +5720,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 300dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/gray.jpg-4x6-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/gray.jpg-4x6-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -5737,7 +5732,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-300dpi-20111130/black-1/gray.jpg-4x6-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/gray.jpg-4x6-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5745,7 +5740,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 300dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/gray.jpg-4x6-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/gray.jpg-4x6-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5760,7 +5755,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20111130/black-1/gray.jpg-4x6-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/gray.jpg-4x6-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5768,7 +5763,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 300dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/gray.jpg-4x6-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/gray.jpg-4x6-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5783,7 +5778,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20111130/black-1/gray.jpg-4x6-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/gray.jpg-4x6-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5791,7 +5786,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 300dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -5803,7 +5798,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-300dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5811,7 +5806,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 300dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5826,7 +5821,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5834,7 +5829,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 300dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5849,7 +5844,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/gray.jpg-4x6-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5857,7 +5852,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 300dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -5869,7 +5864,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-300dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5877,7 +5872,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 300dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5892,7 +5887,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5900,7 +5895,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 300dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5915,7 +5910,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/gray.jpg-4x6-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5923,7 +5918,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 360dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/gray.jpg-4x6-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/gray.jpg-4x6-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -5935,7 +5930,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-360dpi-20111130/black-1/gray.jpg-4x6-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/gray.jpg-4x6-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5943,7 +5938,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 360dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/gray.jpg-4x6-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/gray.jpg-4x6-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -5958,7 +5953,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20111130/black-1/gray.jpg-4x6-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/gray.jpg-4x6-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5966,7 +5961,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 360dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/gray.jpg-4x6-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/gray.jpg-4x6-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -5981,7 +5976,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20111130/black-1/gray.jpg-4x6-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/gray.jpg-4x6-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -5989,7 +5984,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 360dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -6001,7 +5996,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-360dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6009,7 +6004,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 360dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6024,7 +6019,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6032,7 +6027,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 360dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6047,7 +6042,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/gray.jpg-4x6-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6055,7 +6050,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 360dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -6067,7 +6062,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-360dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6075,7 +6070,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 360dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6090,7 +6085,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6098,7 +6093,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 360dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6113,7 +6108,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/gray.jpg-4x6-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6121,7 +6116,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 600dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/gray.jpg-4x6-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/gray.jpg-4x6-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -6133,7 +6128,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-600dpi-20111130/black-1/gray.jpg-4x6-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/gray.jpg-4x6-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6141,7 +6136,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 600dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/gray.jpg-4x6-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/gray.jpg-4x6-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6156,7 +6151,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20111130/black-1/gray.jpg-4x6-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/gray.jpg-4x6-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6164,7 +6159,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 600dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/gray.jpg-4x6-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/gray.jpg-4x6-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6179,7 +6174,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20111130/black-1/gray.jpg-4x6-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/gray.jpg-4x6-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6187,7 +6182,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 600dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -6199,7 +6194,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-600dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6207,7 +6202,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 600dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6222,7 +6217,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6230,7 +6225,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 600dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6245,7 +6240,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/gray.jpg-4x6-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6253,7 +6248,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 600dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -6265,7 +6260,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-600dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6273,7 +6268,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 600dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6288,7 +6283,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6296,7 +6291,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 600dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6311,7 +6306,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/gray.jpg-4x6-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6319,7 +6314,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 720dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/gray.jpg-4x6-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/gray.jpg-4x6-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -6331,7 +6326,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-720dpi-20111130/black-1/gray.jpg-4x6-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/gray.jpg-4x6-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6339,7 +6334,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 720dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/gray.jpg-4x6-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/gray.jpg-4x6-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6354,7 +6349,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20111130/black-1/gray.jpg-4x6-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/gray.jpg-4x6-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6362,7 +6357,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 720dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/gray.jpg-4x6-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/gray.jpg-4x6-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6377,7 +6372,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20111130/black-1/gray.jpg-4x6-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/gray.jpg-4x6-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6385,7 +6380,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 720dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -6397,7 +6392,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-720dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6405,7 +6400,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 720dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6420,7 +6415,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6428,7 +6423,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 720dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6443,7 +6438,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20111130/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/gray.jpg-4x6-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6451,7 +6446,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 720dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -6463,7 +6458,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "gray.jpg-4x6"
-       FILE pwg-raster-samples-720dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6471,7 +6466,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 720dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6486,7 +6481,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6494,7 +6489,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print gray.jpg-4x6 @ 720dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6509,7 +6504,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "gray.jpg-4x6"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20111130/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/gray.jpg-4x6-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6517,7 +6512,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 150dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/onepage-a4-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/onepage-a4-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -6529,7 +6524,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-150dpi-20111130/black-1/onepage-a4-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/onepage-a4-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6537,7 +6532,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 150dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/onepage-a4-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/onepage-a4-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6552,7 +6547,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20111130/black-1/onepage-a4-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/onepage-a4-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6560,7 +6555,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 150dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/onepage-a4-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/onepage-a4-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6575,7 +6570,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20111130/black-1/onepage-a4-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/onepage-a4-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6583,7 +6578,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 150dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -6595,7 +6590,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-150dpi-20111130/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6603,7 +6598,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 150dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6618,7 +6613,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20111130/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6626,7 +6621,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 150dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6641,7 +6636,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20111130/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/onepage-a4-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6649,7 +6644,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 150dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/onepage-a4-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/onepage-a4-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -6661,7 +6656,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-150dpi-20111130/sgray-8/onepage-a4-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/onepage-a4-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6669,7 +6664,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 150dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/onepage-a4-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/onepage-a4-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6684,7 +6679,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20111130/sgray-8/onepage-a4-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/onepage-a4-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6692,7 +6687,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 150dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/onepage-a4-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/onepage-a4-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6707,7 +6702,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20111130/sgray-8/onepage-a4-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/onepage-a4-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6715,7 +6710,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 150dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/onepage-a4-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/onepage-a4-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -6727,7 +6722,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-150dpi-20111130/srgb-8/onepage-a4-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/onepage-a4-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6735,7 +6730,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 150dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/onepage-a4-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/onepage-a4-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6750,7 +6745,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20111130/srgb-8/onepage-a4-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/onepage-a4-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6758,7 +6753,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 150dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/onepage-a4-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/onepage-a4-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6773,7 +6768,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20111130/srgb-8/onepage-a4-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/onepage-a4-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6781,7 +6776,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 180dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/onepage-a4-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/onepage-a4-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -6793,7 +6788,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-180dpi-20111130/black-1/onepage-a4-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/onepage-a4-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6801,7 +6796,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 180dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/onepage-a4-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/onepage-a4-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6816,7 +6811,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20111130/black-1/onepage-a4-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/onepage-a4-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6824,7 +6819,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 180dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/onepage-a4-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/onepage-a4-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6839,7 +6834,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20111130/black-1/onepage-a4-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/onepage-a4-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6847,7 +6842,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 180dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -6859,7 +6854,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-180dpi-20111130/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6867,7 +6862,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 180dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6882,7 +6877,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20111130/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6890,7 +6885,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 180dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6905,7 +6900,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20111130/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/onepage-a4-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6913,7 +6908,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 180dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/onepage-a4-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/onepage-a4-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -6925,7 +6920,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-180dpi-20111130/sgray-8/onepage-a4-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/onepage-a4-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6933,7 +6928,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 180dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/onepage-a4-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/onepage-a4-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -6948,7 +6943,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20111130/sgray-8/onepage-a4-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/onepage-a4-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6956,7 +6951,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 180dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/onepage-a4-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/onepage-a4-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -6971,7 +6966,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20111130/sgray-8/onepage-a4-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/onepage-a4-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6979,7 +6974,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 180dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/onepage-a4-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/onepage-a4-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -6991,7 +6986,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-180dpi-20111130/srgb-8/onepage-a4-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/onepage-a4-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -6999,7 +6994,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 180dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/onepage-a4-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/onepage-a4-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7014,7 +7009,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20111130/srgb-8/onepage-a4-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/onepage-a4-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7022,7 +7017,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 180dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/onepage-a4-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/onepage-a4-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7037,7 +7032,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20111130/srgb-8/onepage-a4-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/onepage-a4-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7045,7 +7040,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 300dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/onepage-a4-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/onepage-a4-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -7057,7 +7052,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-300dpi-20111130/black-1/onepage-a4-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/onepage-a4-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7065,7 +7060,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 300dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/onepage-a4-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/onepage-a4-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7080,7 +7075,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20111130/black-1/onepage-a4-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/onepage-a4-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7088,7 +7083,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 300dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/onepage-a4-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/onepage-a4-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7103,7 +7098,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20111130/black-1/onepage-a4-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/onepage-a4-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7111,7 +7106,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 300dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -7123,7 +7118,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-300dpi-20111130/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7131,7 +7126,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 300dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7146,7 +7141,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20111130/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7154,7 +7149,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 300dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7169,7 +7164,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20111130/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/onepage-a4-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7177,7 +7172,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 300dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/onepage-a4-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/onepage-a4-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -7189,7 +7184,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-300dpi-20111130/sgray-8/onepage-a4-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/onepage-a4-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7197,7 +7192,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 300dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/onepage-a4-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/onepage-a4-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7212,7 +7207,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20111130/sgray-8/onepage-a4-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/onepage-a4-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7220,7 +7215,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 300dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/onepage-a4-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/onepage-a4-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7235,7 +7230,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20111130/sgray-8/onepage-a4-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/onepage-a4-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7243,7 +7238,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 300dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/onepage-a4-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/onepage-a4-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -7255,7 +7250,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-300dpi-20111130/srgb-8/onepage-a4-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/onepage-a4-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7263,7 +7258,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 300dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/onepage-a4-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/onepage-a4-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7278,7 +7273,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20111130/srgb-8/onepage-a4-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/onepage-a4-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7286,7 +7281,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 300dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/onepage-a4-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/onepage-a4-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7301,7 +7296,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20111130/srgb-8/onepage-a4-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/onepage-a4-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7309,7 +7304,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 360dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/onepage-a4-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/onepage-a4-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -7321,7 +7316,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-360dpi-20111130/black-1/onepage-a4-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/onepage-a4-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7329,7 +7324,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 360dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/onepage-a4-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/onepage-a4-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7344,7 +7339,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20111130/black-1/onepage-a4-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/onepage-a4-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7352,7 +7347,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 360dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/onepage-a4-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/onepage-a4-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7367,7 +7362,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20111130/black-1/onepage-a4-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/onepage-a4-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7375,7 +7370,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 360dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -7387,7 +7382,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-360dpi-20111130/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7395,7 +7390,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 360dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7410,7 +7405,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20111130/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7418,7 +7413,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 360dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7433,7 +7428,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20111130/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/onepage-a4-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7441,7 +7436,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 360dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/onepage-a4-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/onepage-a4-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -7453,7 +7448,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-360dpi-20111130/sgray-8/onepage-a4-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/onepage-a4-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7461,7 +7456,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 360dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/onepage-a4-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/onepage-a4-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7476,7 +7471,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20111130/sgray-8/onepage-a4-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/onepage-a4-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7484,7 +7479,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 360dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/onepage-a4-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/onepage-a4-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7499,7 +7494,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20111130/sgray-8/onepage-a4-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/onepage-a4-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7507,7 +7502,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 360dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/onepage-a4-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/onepage-a4-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -7519,7 +7514,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-360dpi-20111130/srgb-8/onepage-a4-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/onepage-a4-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7527,7 +7522,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 360dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/onepage-a4-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/onepage-a4-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7542,7 +7537,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20111130/srgb-8/onepage-a4-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/onepage-a4-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7550,7 +7545,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 360dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/onepage-a4-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/onepage-a4-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7565,7 +7560,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20111130/srgb-8/onepage-a4-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/onepage-a4-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7573,7 +7568,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 600dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/onepage-a4-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/onepage-a4-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -7585,7 +7580,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-600dpi-20111130/black-1/onepage-a4-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/onepage-a4-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7593,7 +7588,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 600dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/onepage-a4-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/onepage-a4-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7608,7 +7603,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20111130/black-1/onepage-a4-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/onepage-a4-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7616,7 +7611,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 600dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/onepage-a4-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/onepage-a4-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7631,7 +7626,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20111130/black-1/onepage-a4-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/onepage-a4-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7639,7 +7634,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 600dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -7651,7 +7646,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-600dpi-20111130/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7659,7 +7654,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 600dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7674,7 +7669,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20111130/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7682,7 +7677,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 600dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7697,7 +7692,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20111130/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/onepage-a4-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7705,7 +7700,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 600dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/onepage-a4-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/onepage-a4-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -7717,7 +7712,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-600dpi-20111130/sgray-8/onepage-a4-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/onepage-a4-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7725,7 +7720,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 600dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/onepage-a4-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/onepage-a4-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7740,7 +7735,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20111130/sgray-8/onepage-a4-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/onepage-a4-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7748,7 +7743,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 600dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/onepage-a4-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/onepage-a4-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7763,7 +7758,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20111130/sgray-8/onepage-a4-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/onepage-a4-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7771,7 +7766,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 600dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/onepage-a4-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/onepage-a4-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -7783,7 +7778,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-600dpi-20111130/srgb-8/onepage-a4-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/onepage-a4-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7791,7 +7786,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 600dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/onepage-a4-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/onepage-a4-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7806,7 +7801,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20111130/srgb-8/onepage-a4-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/onepage-a4-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7814,7 +7809,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 600dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/onepage-a4-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/onepage-a4-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7829,7 +7824,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20111130/srgb-8/onepage-a4-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/onepage-a4-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7837,7 +7832,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 720dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/onepage-a4-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/onepage-a4-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -7849,7 +7844,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-720dpi-20111130/black-1/onepage-a4-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/onepage-a4-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7857,7 +7852,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 720dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/onepage-a4-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/onepage-a4-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7872,7 +7867,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20111130/black-1/onepage-a4-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/onepage-a4-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7880,7 +7875,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 720dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/onepage-a4-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/onepage-a4-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7895,7 +7890,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20111130/black-1/onepage-a4-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/onepage-a4-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7903,7 +7898,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 720dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -7915,7 +7910,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-720dpi-20111130/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7923,7 +7918,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 720dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -7938,7 +7933,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20111130/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7946,7 +7941,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 720dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -7961,7 +7956,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20111130/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/onepage-a4-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7969,7 +7964,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 720dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/onepage-a4-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/onepage-a4-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -7981,7 +7976,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-720dpi-20111130/sgray-8/onepage-a4-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/onepage-a4-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -7989,7 +7984,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 720dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/onepage-a4-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/onepage-a4-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8004,7 +7999,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20111130/sgray-8/onepage-a4-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/onepage-a4-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8012,7 +8007,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 720dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/onepage-a4-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/onepage-a4-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8027,7 +8022,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20111130/sgray-8/onepage-a4-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/onepage-a4-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8035,7 +8030,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 720dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/onepage-a4-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/onepage-a4-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -8047,7 +8042,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-a4"
-       FILE pwg-raster-samples-720dpi-20111130/srgb-8/onepage-a4-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/onepage-a4-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8055,7 +8050,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 720dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/onepage-a4-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/onepage-a4-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8070,7 +8065,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-a4"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20111130/srgb-8/onepage-a4-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/onepage-a4-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8078,7 +8073,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-a4 @ 720dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/onepage-a4-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/onepage-a4-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8093,7 +8088,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-a4"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20111130/srgb-8/onepage-a4-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/onepage-a4-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8101,7 +8096,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 150dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/onepage-letter-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/onepage-letter-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -8113,7 +8108,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-150dpi-20111130/black-1/onepage-letter-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/onepage-letter-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8121,7 +8116,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 150dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/onepage-letter-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/onepage-letter-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8136,7 +8131,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20111130/black-1/onepage-letter-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/onepage-letter-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8144,7 +8139,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 150dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/black-1/onepage-letter-black-1-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/black-1/onepage-letter-black-1-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8159,7 +8154,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20111130/black-1/onepage-letter-black-1-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/black-1/onepage-letter-black-1-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8167,7 +8162,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 150dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -8179,7 +8174,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-150dpi-20111130/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8187,7 +8182,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 150dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8202,7 +8197,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20111130/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8210,7 +8205,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 150dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8225,7 +8220,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20111130/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/cmyk-8/onepage-letter-cmyk-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8233,7 +8228,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 150dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/onepage-letter-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/onepage-letter-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -8245,7 +8240,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-150dpi-20111130/sgray-8/onepage-letter-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/onepage-letter-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8253,7 +8248,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 150dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/onepage-letter-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/onepage-letter-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8268,7 +8263,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20111130/sgray-8/onepage-letter-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/onepage-letter-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8276,7 +8271,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 150dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/sgray-8/onepage-letter-sgray-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/sgray-8/onepage-letter-sgray-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8291,7 +8286,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20111130/sgray-8/onepage-letter-sgray-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/sgray-8/onepage-letter-sgray-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8299,7 +8294,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 150dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/onepage-letter-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/onepage-letter-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -8311,7 +8306,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-150dpi-20111130/srgb-8/onepage-letter-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/onepage-letter-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8319,7 +8314,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 150dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/onepage-letter-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/onepage-letter-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8334,7 +8329,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-150dpi-20111130/srgb-8/onepage-letter-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/onepage-letter-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8342,7 +8337,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 150dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-150dpi-20111130/srgb-8/onepage-letter-srgb-8-150dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-150dpi/srgb-8/onepage-letter-srgb-8-150dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_150DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8357,7 +8352,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-150dpi-20111130/srgb-8/onepage-letter-srgb-8-150dpi.pwg
+       FILE pwg-raster-samples-150dpi/srgb-8/onepage-letter-srgb-8-150dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8365,7 +8360,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 180dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/onepage-letter-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/onepage-letter-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -8377,7 +8372,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-180dpi-20111130/black-1/onepage-letter-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/onepage-letter-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8385,7 +8380,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 180dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/onepage-letter-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/onepage-letter-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8400,7 +8395,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20111130/black-1/onepage-letter-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/onepage-letter-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8408,7 +8403,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 180dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/black-1/onepage-letter-black-1-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/black-1/onepage-letter-black-1-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8423,7 +8418,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20111130/black-1/onepage-letter-black-1-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/black-1/onepage-letter-black-1-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8431,7 +8426,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 180dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -8443,7 +8438,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-180dpi-20111130/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8451,7 +8446,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 180dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8466,7 +8461,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20111130/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8474,7 +8469,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 180dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8489,7 +8484,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20111130/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/cmyk-8/onepage-letter-cmyk-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8497,7 +8492,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 180dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/onepage-letter-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/onepage-letter-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -8509,7 +8504,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-180dpi-20111130/sgray-8/onepage-letter-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/onepage-letter-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8517,7 +8512,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 180dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/onepage-letter-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/onepage-letter-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8532,7 +8527,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20111130/sgray-8/onepage-letter-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/onepage-letter-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8540,7 +8535,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 180dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/sgray-8/onepage-letter-sgray-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/sgray-8/onepage-letter-sgray-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8555,7 +8550,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20111130/sgray-8/onepage-letter-sgray-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/sgray-8/onepage-letter-sgray-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8563,7 +8558,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 180dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/onepage-letter-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/onepage-letter-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -8575,7 +8570,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-180dpi-20111130/srgb-8/onepage-letter-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/onepage-letter-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8583,7 +8578,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 180dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/onepage-letter-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/onepage-letter-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8598,7 +8593,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-180dpi-20111130/srgb-8/onepage-letter-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/onepage-letter-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8606,7 +8601,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 180dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-180dpi-20111130/srgb-8/onepage-letter-srgb-8-180dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-180dpi/srgb-8/onepage-letter-srgb-8-180dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_180DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8621,7 +8616,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-180dpi-20111130/srgb-8/onepage-letter-srgb-8-180dpi.pwg
+       FILE pwg-raster-samples-180dpi/srgb-8/onepage-letter-srgb-8-180dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8629,7 +8624,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 300dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/onepage-letter-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/onepage-letter-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -8641,7 +8636,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-300dpi-20111130/black-1/onepage-letter-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/onepage-letter-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8649,7 +8644,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 300dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/onepage-letter-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/onepage-letter-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8664,7 +8659,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20111130/black-1/onepage-letter-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/onepage-letter-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8672,7 +8667,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 300dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/black-1/onepage-letter-black-1-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/black-1/onepage-letter-black-1-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8687,7 +8682,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20111130/black-1/onepage-letter-black-1-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/black-1/onepage-letter-black-1-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8695,7 +8690,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 300dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -8707,7 +8702,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-300dpi-20111130/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8715,7 +8710,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 300dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8730,7 +8725,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20111130/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8738,7 +8733,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 300dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8753,7 +8748,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20111130/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/cmyk-8/onepage-letter-cmyk-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8761,7 +8756,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 300dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/onepage-letter-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/onepage-letter-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -8773,7 +8768,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-300dpi-20111130/sgray-8/onepage-letter-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/onepage-letter-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8781,7 +8776,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 300dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/onepage-letter-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/onepage-letter-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8796,7 +8791,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20111130/sgray-8/onepage-letter-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/onepage-letter-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8804,7 +8799,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 300dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/sgray-8/onepage-letter-sgray-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/sgray-8/onepage-letter-sgray-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8819,7 +8814,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20111130/sgray-8/onepage-letter-sgray-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/sgray-8/onepage-letter-sgray-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8827,7 +8822,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 300dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/onepage-letter-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/onepage-letter-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -8839,7 +8834,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-300dpi-20111130/srgb-8/onepage-letter-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/onepage-letter-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8847,7 +8842,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 300dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/onepage-letter-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/onepage-letter-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8862,7 +8857,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-300dpi-20111130/srgb-8/onepage-letter-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/onepage-letter-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8870,7 +8865,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 300dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-300dpi-20111130/srgb-8/onepage-letter-srgb-8-300dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-300dpi/srgb-8/onepage-letter-srgb-8-300dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_300DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8885,7 +8880,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-300dpi-20111130/srgb-8/onepage-letter-srgb-8-300dpi.pwg
+       FILE pwg-raster-samples-300dpi/srgb-8/onepage-letter-srgb-8-300dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8893,7 +8888,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 360dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/onepage-letter-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/onepage-letter-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -8905,7 +8900,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-360dpi-20111130/black-1/onepage-letter-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/onepage-letter-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8913,7 +8908,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 360dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/onepage-letter-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/onepage-letter-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8928,7 +8923,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20111130/black-1/onepage-letter-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/onepage-letter-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8936,7 +8931,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 360dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/black-1/onepage-letter-black-1-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/black-1/onepage-letter-black-1-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -8951,7 +8946,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20111130/black-1/onepage-letter-black-1-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/black-1/onepage-letter-black-1-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8959,7 +8954,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 360dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -8971,7 +8966,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-360dpi-20111130/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -8979,7 +8974,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 360dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -8994,7 +8989,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20111130/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9002,7 +8997,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 360dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -9017,7 +9012,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20111130/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/cmyk-8/onepage-letter-cmyk-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9025,7 +9020,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 360dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/onepage-letter-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/onepage-letter-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -9037,7 +9032,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-360dpi-20111130/sgray-8/onepage-letter-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/onepage-letter-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9045,7 +9040,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 360dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/onepage-letter-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/onepage-letter-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -9060,7 +9055,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20111130/sgray-8/onepage-letter-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/onepage-letter-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9068,7 +9063,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 360dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/sgray-8/onepage-letter-sgray-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/sgray-8/onepage-letter-sgray-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -9083,7 +9078,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20111130/sgray-8/onepage-letter-sgray-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/sgray-8/onepage-letter-sgray-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9091,7 +9086,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 360dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/onepage-letter-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/onepage-letter-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -9103,7 +9098,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-360dpi-20111130/srgb-8/onepage-letter-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/onepage-letter-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9111,7 +9106,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 360dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/onepage-letter-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/onepage-letter-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -9126,7 +9121,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-360dpi-20111130/srgb-8/onepage-letter-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/onepage-letter-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9134,7 +9129,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 360dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-360dpi-20111130/srgb-8/onepage-letter-srgb-8-360dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-360dpi/srgb-8/onepage-letter-srgb-8-360dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_360DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -9149,7 +9144,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-360dpi-20111130/srgb-8/onepage-letter-srgb-8-360dpi.pwg
+       FILE pwg-raster-samples-360dpi/srgb-8/onepage-letter-srgb-8-360dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9157,7 +9152,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 600dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/onepage-letter-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/onepage-letter-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -9169,7 +9164,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-600dpi-20111130/black-1/onepage-letter-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/onepage-letter-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9177,7 +9172,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 600dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/onepage-letter-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/onepage-letter-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -9192,7 +9187,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20111130/black-1/onepage-letter-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/onepage-letter-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9200,7 +9195,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 600dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/black-1/onepage-letter-black-1-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/black-1/onepage-letter-black-1-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -9215,7 +9210,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20111130/black-1/onepage-letter-black-1-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/black-1/onepage-letter-black-1-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9223,7 +9218,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 600dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -9235,7 +9230,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-600dpi-20111130/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9243,7 +9238,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 600dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -9258,7 +9253,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20111130/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9266,7 +9261,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 600dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -9281,7 +9276,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20111130/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/cmyk-8/onepage-letter-cmyk-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9289,7 +9284,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 600dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/onepage-letter-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/onepage-letter-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -9301,7 +9296,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-600dpi-20111130/sgray-8/onepage-letter-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/onepage-letter-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9309,7 +9304,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 600dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/onepage-letter-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/onepage-letter-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -9324,7 +9319,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20111130/sgray-8/onepage-letter-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/onepage-letter-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9332,7 +9327,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 600dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/sgray-8/onepage-letter-sgray-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/sgray-8/onepage-letter-sgray-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -9347,7 +9342,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20111130/sgray-8/onepage-letter-sgray-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/sgray-8/onepage-letter-sgray-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9355,7 +9350,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 600dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/onepage-letter-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/onepage-letter-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -9367,7 +9362,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-600dpi-20111130/srgb-8/onepage-letter-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/onepage-letter-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9375,7 +9370,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 600dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/onepage-letter-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/onepage-letter-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -9390,7 +9385,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-600dpi-20111130/srgb-8/onepage-letter-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/onepage-letter-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9398,7 +9393,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 600dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-600dpi-20111130/srgb-8/onepage-letter-srgb-8-600dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-600dpi/srgb-8/onepage-letter-srgb-8-600dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_600DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -9413,7 +9408,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-600dpi-20111130/srgb-8/onepage-letter-srgb-8-600dpi.pwg
+       FILE pwg-raster-samples-600dpi/srgb-8/onepage-letter-srgb-8-600dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9421,7 +9416,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 720dpi, black-1"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/onepage-letter-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/onepage-letter-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
 
@@ -9433,7 +9428,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-720dpi-20111130/black-1/onepage-letter-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/onepage-letter-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9441,7 +9436,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 720dpi, black-1, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/onepage-letter-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/onepage-letter-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -9456,7 +9451,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20111130/black-1/onepage-letter-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/onepage-letter-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9464,7 +9459,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 720dpi, black-1, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/black-1/onepage-letter-black-1-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/black-1/onepage-letter-black-1-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_BLACK_1
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -9479,7 +9474,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20111130/black-1/onepage-letter-black-1-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/black-1/onepage-letter-black-1-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9487,7 +9482,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 720dpi, cmyk-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
 
@@ -9499,7 +9494,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-720dpi-20111130/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9507,7 +9502,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 720dpi, cmyk-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -9522,7 +9517,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20111130/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9530,7 +9525,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 720dpi, cmyk-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_CMYK_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -9545,7 +9540,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20111130/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/cmyk-8/onepage-letter-cmyk-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9553,7 +9548,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 720dpi, sgray-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/onepage-letter-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/onepage-letter-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
 
@@ -9565,7 +9560,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-720dpi-20111130/sgray-8/onepage-letter-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/onepage-letter-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9573,7 +9568,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 720dpi, sgray-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/onepage-letter-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/onepage-letter-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -9588,7 +9583,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20111130/sgray-8/onepage-letter-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/onepage-letter-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9596,7 +9591,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 720dpi, sgray-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/sgray-8/onepage-letter-sgray-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/sgray-8/onepage-letter-sgray-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SGRAY_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -9611,7 +9606,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20111130/sgray-8/onepage-letter-sgray-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/sgray-8/onepage-letter-sgray-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9619,7 +9614,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 720dpi, srgb-8"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/onepage-letter-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/onepage-letter-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
 
@@ -9631,7 +9626,7 @@ INCLUDE "ipp-2.0.test"
        ATTR name requesting-user-name $user
        ATTR mimeMediaType document-format image/pwg-raster
        ATTR name job-name "onepage-letter"
-       FILE pwg-raster-samples-720dpi-20111130/srgb-8/onepage-letter-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/onepage-letter-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9639,7 +9634,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 720dpi, srgb-8, deflate"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/onepage-letter-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/onepage-letter-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_DEFLATE
@@ -9654,7 +9649,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression deflate
        ATTR name job-name "onepage-letter"
        COMPRESSION deflate
-       FILE pwg-raster-samples-720dpi-20111130/srgb-8/onepage-letter-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/onepage-letter-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH
@@ -9662,7 +9657,7 @@ INCLUDE "ipp-2.0.test"
 
 {
        NAME "Print onepage-letter @ 720dpi, srgb-8, gzip"
-       SKIP-IF-MISSING pwg-raster-samples-720dpi-20111130/srgb-8/onepage-letter-srgb-8-720dpi.pwg
+       SKIP-IF-MISSING pwg-raster-samples-720dpi/srgb-8/onepage-letter-srgb-8-720dpi.pwg
        SKIP-IF-NOT-DEFINED HAVE_720DPI
        SKIP-IF-NOT-DEFINED HAVE_SRGB_8
        SKIP-IF-NOT-DEFINED HAVE_GZIP
@@ -9677,7 +9672,7 @@ INCLUDE "ipp-2.0.test"
        ATTR keyword compression gzip
        ATTR name job-name "onepage-letter"
        COMPRESSION gzip
-       FILE pwg-raster-samples-720dpi-20111130/srgb-8/onepage-letter-srgb-8-720dpi.pwg
+       FILE pwg-raster-samples-720dpi/srgb-8/onepage-letter-srgb-8-720dpi.pwg
 
        STATUS successful-ok
        STATUS server-error-busy REPEAT-MATCH