# HG changeset patch
# User brendand
# Date 1254915020 -3600
# Node ID 4762134f02d073d9e8e44b7fe36fbca944436519
# Parent  1fa00c60da461d7afd445e9082d4618a80adba5c
graphics test plan now only runs fbserv tests

diff -r 1fa00c60da46 -r 4762134f02d0 common/tools/ats/bctest/graphics/graphicssvs.pl
--- a/common/tools/ats/bctest/graphics/graphicssvs.pl	Fri Oct 09 14:18:52 2009 +0100
+++ b/common/tools/ats/bctest/graphics/graphicssvs.pl	Wed Oct 07 12:30:20 2009 +0100
@@ -7,127 +7,40 @@
 unlink "graphicssvs.zip";
 rmtree "temp";
 mkpath "temp/graphicssvs/graphics/general";
+mkpath "temp/graphicssvs/graphics/winscw/general";
 mkpath "temp/graphicssvs/winscw_udeb";
-mkpath "temp/graphicssvs/graphics/bitgdi/general";
-mkpath "temp/graphicssvs/graphics/fntstore/general";
 mkpath "temp/graphicssvs/graphics/t_fbservapi/general";
-mkpath "temp/graphicssvs/graphics/wserv/general";
 
 my $epoc=$ENV{'EPOCROOT'} . "epoc32/";
-copy("graphicssvs.xml",                                                          "temp/test.xml");
+copy("graphicssvs.xml",                                                          			"temp/test.xml");
 
-copy $epoc . "release/winscw/udeb/twsgraphicshare.exe",                                                     "temp/graphicssvs/winscw_udeb/twsgraphicshare.exe" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/twsgraphicunshare.exe",                                                   "temp/graphicssvs/winscw_udeb/twsgraphicunshare.exe" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/t_animplugin.dll",                                                        "temp/graphicssvs/winscw_udeb/t_animplugin.dll" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/t_fbservapi.exe",                                                         "temp/graphicssvs/winscw_udeb/t_fbservapi.exe" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/t_graphicsbitgdiapi.exe",                                                 "temp/graphicssvs/winscw_udeb/t_graphicsbitgdiapi.exe" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/t_graphicsfntstoreapi.exe",                                               "temp/graphicssvs/winscw_udeb/t_graphicsfntstoreapi.exe" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/t_graphicswservapi.exe",                                                  "temp/graphicssvs/winscw_udeb/t_graphicswservapi.exe" or die "failed : $!";
+copy $epoc . "release/winscw/udeb/t_fbservapi.exe",                                            "temp/graphicssvs/winscw_udeb/t_fbservapi.exe" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/t_graphics.ini",                                               "temp/graphicssvs/graphics/general/t_graphics.ini" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/winscw/t_graphics.ini",                                        "temp/graphicssvs/graphics/winscw/general/t_graphics.ini" or die "failed : $!";
 
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitgc-publicapi-2.ini",                     "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi-2.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitgc-publicapi-3.ini",                     "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi-3.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitgc-publicapi.ini",                       "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitgc-publicapi.script",                    "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitgcfont-publicapi.ini",                   "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitgcfont-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitgcfont-publicapi.script",                "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitgcfont-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitmapdevice-publicapi.ini",                "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitmapdevice-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsbitmapdevice-publicapi.script",             "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsbitmapdevice-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsdevice-publicapi.ini",                      "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsdevice-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsdevice-publicapi.script",                   "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsdevice-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsscreendevice-publicapi.ini",                "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsscreendevice-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-fbsscreendevice-publicapi.script",             "temp/graphicssvs/graphics/general/graphics-bitgdi-fbsscreendevice-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-polygonfiller-publicapi.ini",                  "temp/graphicssvs/graphics/general/graphics-bitgdi-polygonfiller-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-bitgdi-polygonfiller-publicapi.script",               "temp/graphicssvs/graphics/general/graphics-bitgdi-polygonfiller-publicapi.script" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-publicapi.tcs",                                 "temp/graphicssvs/graphics/general/graphics-fbserv-publicapi.tcs" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-publicapi.script",                  		   "temp/graphicssvs/graphics/general/graphics-fbserv-publicapi.script" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-bitmaputil-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-fbserv-bitmaputil-publicapi.script" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-fbsbitmap-publicapi.script",                   "temp/graphicssvs/graphics/general/graphics-fbserv-fbsbitmap-publicapi.script" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-fbscolor256bitmaputil-publicapi.script",       "temp/graphicssvs/graphics/general/graphics-fbserv-fbscolor256bitmaputil-publicapi.script" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-fbsfont-publicapi.script",                     "temp/graphicssvs/graphics/general/graphics-fbserv-fbsfont-publicapi.script" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-fbssession-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-fbserv-fbssession-publicapi.script" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-fbstypefacestore-publicapi.script",            "temp/graphicssvs/graphics/general/graphics-fbserv-fbstypefacestore-publicapi.script" or die "failed : $!";
 
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-bitmaputil-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-fbserv-bitmaputil-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-bitmaputil-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-fbserv-bitmaputil-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbsbitmap-publicapi.ini",                      "temp/graphicssvs/graphics/general/graphics-fbserv-fbsbitmap-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbsbitmap-publicapi.script",                   "temp/graphicssvs/graphics/general/graphics-fbserv-fbsbitmap-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbscolor256bitmaputil-publicapi.ini",          "temp/graphicssvs/graphics/general/graphics-fbserv-fbscolor256bitmaputil-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbscolor256bitmaputil-publicapi.script",       "temp/graphicssvs/graphics/general/graphics-fbserv-fbscolor256bitmaputil-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbsfont-publicapi.ini",                        "temp/graphicssvs/graphics/general/graphics-fbserv-fbsfont-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbsfont-publicapi.script",                     "temp/graphicssvs/graphics/general/graphics-fbserv-fbsfont-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbssession-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-fbserv-fbssession-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbssession-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-fbserv-fbssession-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbstypefacestore-publicapi.ini",               "temp/graphicssvs/graphics/general/graphics-fbserv-fbstypefacestore-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fbserv-fbstypefacestore-publicapi.script",            "temp/graphicssvs/graphics/general/graphics-fbserv-fbstypefacestore-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fntstore-bitmapfont-publicapi.ini",                   "temp/graphicssvs/graphics/general/graphics-fntstore-bitmapfont-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fntstore-bitmapfont-publicapi.script",                "temp/graphicssvs/graphics/general/graphics-fntstore-bitmapfont-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fntstore-fntstore-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-fntstore-fntstore-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fntstore-fntstore-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-fntstore-fntstore-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fntstore-openfontrasterizercontext-publicapi.ini",    "temp/graphicssvs/graphics/general/graphics-fntstore-openfontrasterizercontext-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-fntstore-openfontrasterizercontext-publicapi.script", "temp/graphicssvs/graphics/general/graphics-fntstore-openfontrasterizercontext-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-anim-publicapi.ini",                            "temp/graphicssvs/graphics/general/graphics-wserv-anim-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-anim-publicapi.script",                         "temp/graphicssvs/graphics/general/graphics-wserv-anim-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animdll-publicapi.ini",                         "temp/graphicssvs/graphics/general/graphics-wserv-animdll-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animdll-publicapi.script",                      "temp/graphicssvs/graphics/general/graphics-wserv-animdll-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animgeneralfunctions-publicapi.ini",            "temp/graphicssvs/graphics/general/graphics-wserv-animgeneralfunctions-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animgeneralfunctions-publicapi.script",         "temp/graphicssvs/graphics/general/graphics-wserv-animgeneralfunctions-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animgfwe-publicapi.ini",                        "temp/graphicssvs/graphics/general/graphics-wserv-animgfwe-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animgfwe-publicapi.script",                     "temp/graphicssvs/graphics/general/graphics-wserv-animgfwe-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animspritefunctions-publicapi.ini",             "temp/graphicssvs/graphics/general/graphics-wserv-animspritefunctions-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animspritefunctions-publicapi.script",          "temp/graphicssvs/graphics/general/graphics-wserv-animspritefunctions-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animwindowfunctions-publicapi.ini",             "temp/graphicssvs/graphics/general/graphics-wserv-animwindowfunctions-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-animwindowfunctions-publicapi.script",          "temp/graphicssvs/graphics/general/graphics-wserv-animwindowfunctions-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-backedupwindow-publicapi.ini",                  "temp/graphicssvs/graphics/general/graphics-wserv-backedupwindow-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-backedupwindow-publicapi.script",               "temp/graphicssvs/graphics/general/graphics-wserv-backedupwindow-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-blankwindow-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-wserv-blankwindow-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-blankwindow-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-wserv-blankwindow-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-directscreenaccess-publicapi.ini",              "temp/graphicssvs/graphics/general/graphics-wserv-directscreenaccess-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-directscreenaccess-publicapi.script",           "temp/graphicssvs/graphics/general/graphics-wserv-directscreenaccess-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-dsasession-publicapi.ini",                      "temp/graphicssvs/graphics/general/graphics-wserv-dsasession-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-dsasession-publicapi.script",                   "temp/graphicssvs/graphics/general/graphics-wserv-dsasession-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-events-publicapi.ini",                          "temp/graphicssvs/graphics/general/graphics-wserv-events-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-events-publicapi.script",                       "temp/graphicssvs/graphics/general/graphics-wserv-events-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-frame-publicapi.ini",                           "temp/graphicssvs/graphics/general/graphics-wserv-frame-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-frame-publicapi.script",                        "temp/graphicssvs/graphics/general/graphics-wserv-frame-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-session-publicapi.ini",                         "temp/graphicssvs/graphics/general/graphics-wserv-session-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-session-publicapi.script",                      "temp/graphicssvs/graphics/general/graphics-wserv-session-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-soundplugin-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-wserv-soundplugin-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-soundplugin-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-wserv-soundplugin-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-window-publicapi.ini",                          "temp/graphicssvs/graphics/general/graphics-wserv-window-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-window-publicapi.script",                       "temp/graphicssvs/graphics/general/graphics-wserv-window-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-windowgc-publicapi.ini",                        "temp/graphicssvs/graphics/general/graphics-wserv-windowgc-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-windowgc-publicapi.script",                     "temp/graphicssvs/graphics/general/graphics-wserv-windowgc-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-windowgroup-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-wserv-windowgroup-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-windowgroup-publicapi.script",                  "temp/graphicssvs/graphics/general/graphics-wserv-windowgroup-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsbitmap-publicapi.ini",                        "temp/graphicssvs/graphics/general/graphics-wserv-wsbitmap-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsbitmap-publicapi.script",                     "temp/graphicssvs/graphics/general/graphics-wserv-wsbitmap-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsgraphicbitmap-publicapi.ini",                 "temp/graphicssvs/graphics/general/graphics-wserv-wsgraphicbitmap-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsgraphicbitmap-publicapi.script",              "temp/graphicssvs/graphics/general/graphics-wserv-wsgraphicbitmap-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsgraphicbitmapanimation-publicapi.ini",        "temp/graphicssvs/graphics/general/graphics-wserv-wsgraphicbitmapanimation-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsgraphicbitmapanimation-publicapi.script",     "temp/graphicssvs/graphics/general/graphics-wserv-wsgraphicbitmapanimation-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsgraphicmsgbuf-publicapi.ini",                 "temp/graphicssvs/graphics/general/graphics-wserv-wsgraphicmsgbuf-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsgraphicmsgbuf-publicapi.script",              "temp/graphicssvs/graphics/general/graphics-wserv-wsgraphicmsgbuf-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wspointercursor-publicapi.ini",                 "temp/graphicssvs/graphics/general/graphics-wserv-wspointercursor-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wspointercursor-publicapi.script",              "temp/graphicssvs/graphics/general/graphics-wserv-wspointercursor-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsscreendevice-publicapi.ini",                  "temp/graphicssvs/graphics/general/graphics-wserv-wsscreendevice-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wsscreendevice-publicapi.script",               "temp/graphicssvs/graphics/general/graphics-wserv-wsscreendevice-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wssprite-publicapi.ini",                        "temp/graphicssvs/graphics/general/graphics-wserv-wssprite-publicapi.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/graphics-wserv-wssprite-publicapi.script",                     "temp/graphicssvs/graphics/general/graphics-wserv-wssprite-publicapi.script" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/t_graphics.ini",                                               "temp/graphicssvs/graphics/general/t_graphics.ini" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/t_graphics.tcs",                                               "temp/graphicssvs/graphics/general/t_graphics.tcs" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/t_graphics_panic.tcs",                                         "temp/graphicssvs/graphics/general/t_graphics_panic.tcs" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-bitmaputil-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-fbserv-bitmaputil-publicapi.ini" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-fbsbitmap-publicapi.ini",                      "temp/graphicssvs/graphics/general/graphics-fbserv-fbsbitmap-publicapi.ini" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-fbscolor256bitmaputil-publicapi.ini",          "temp/graphicssvs/graphics/general/graphics-fbserv-fbscolor256bitmaputil-publicapi.ini" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-fbsfont-publicapi.ini",                        "temp/graphicssvs/graphics/general/graphics-fbserv-fbsfont-publicapi.ini" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-fbssession-publicapi.ini",                     "temp/graphicssvs/graphics/general/graphics-fbserv-fbssession-publicapi.ini" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/graphics-fbserv-fbstypefacestore-publicapi.ini",            	"temp/graphicssvs/graphics/general/graphics-fbserv-fbstypefacestore-publicapi.ini" or die "failed : $!";
 
-copy $epoc . "release/winscw/udeb/z/graphics/bitgdi/test_rwssprite_bitmap.mbm",                             "temp/graphicssvs/graphics/bitgdi/general/test_rwssprite_bitmap.mbm" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/bitgdi/testfontws.gdr",                                        "temp/graphicssvs/graphics/bitgdi/general/testfontws.gdr" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/fntstore/bad_entrysel",                                        "temp/graphicssvs/graphics/fntstore/general/bad_entrysel" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/fntstore/dummy",                                               "temp/graphicssvs/graphics/fntstore/general/dummy" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/fntstore/dummy",                                               "temp/graphicssvs/graphics/fntstore/general/dummy_2" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/fntstore/testfontws.gdr",                                      "temp/graphicssvs/graphics/fntstore/general/testfontws.gdr" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/empty_file.txt",                                   "temp/graphicssvs/graphics/t_fbservapi/general/empty_file.txt" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/scaniline_10bytes.txt",                            "temp/graphicssvs/graphics/t_fbservapi/general/scaniline_10bytes.txt" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/testfontfb.gdr",                                   "temp/graphicssvs/graphics/t_fbservapi/general/testfontfb.gdr" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/test_bitmap.mbm",                                  "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap.mbm" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/test_bitmap_24bit_400x300.mbm",                    "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap_24bit_400x300.mbm" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/test_bitmap_32x8.mbm",                             "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap_32x8.mbm" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/test_bitmap_offset8.mbm",                          "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap_offset8.mbm" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/t_fbservapi/test_bitmap_rom.rbm",                              "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap_rom.rbm" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/wserv/testfontws.gdr",                                         "temp/graphicssvs/graphics/wserv/general/testfontws.gdr" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/wserv/test_alpha.mbm",                                         "temp/graphicssvs/graphics/wserv/general/test_alpha.mbm" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/wserv/test_board.mbm",                                         "temp/graphicssvs/graphics/wserv/general/test_board.mbm" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/wserv/test_mask.mbm",                                          "temp/graphicssvs/graphics/wserv/general/test_mask.mbm" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/wserv/test_rwssprite_bitmap.mbm",                              "temp/graphicssvs/graphics/wserv/general/test_rwssprite_bitmap.mbm" or die "failed : $!";
-copy $epoc . "release/winscw/udeb/z/graphics/wserv/wsgraphicbitmapanimation.mbm",                           "temp/graphicssvs/graphics/wserv/general/wsgraphicbitmapanimation.mbm" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/t_fbservapi/empty_file.txt",                                   "temp/graphicssvs/graphics/t_fbservapi/general/empty_file.txt" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/t_fbservapi/scaniline_10bytes.txt",                            "temp/graphicssvs/graphics/t_fbservapi/general/scaniline_10bytes.txt" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/t_fbservapi/testfontfb.gdr",                                   "temp/graphicssvs/graphics/t_fbservapi/general/testfontfb.gdr" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/t_fbservapi/test_bitmap.mbm",                                  "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap.mbm" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/t_fbservapi/test_bitmap_24bit_400x300.mbm",                    "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap_24bit_400x300.mbm" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/t_fbservapi/test_bitmap_32x8.mbm",                             "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap_32x8.mbm" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/t_fbservapi/test_bitmap_offset8.mbm",                          "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap_offset8.mbm" or die "failed : $!";
+copy $epoc . "winscw/c/graphics/t_fbservapi/test_bitmap_rom.rbm",                              "temp/graphicssvs/graphics/t_fbservapi/general/test_bitmap_rom.rbm" or die "failed : $!";
 
 system("7z a -tzip graphicssvs.zip ./temp/*");
diff -r 1fa00c60da46 -r 4762134f02d0 common/tools/ats/bctest/graphics/graphicssvs.xml
--- a/common/tools/ats/bctest/graphics/graphicssvs.xml	Fri Oct 09 14:18:52 2009 +0100
+++ b/common/tools/ats/bctest/graphics/graphicssvs.xml	Wed Oct 07 12:30:20 2009 +0100
@@ -15,32 +15,14 @@
             <device rank="master" alias="emulator_udeb"/>
         </target>
         <session id="" name="Graphics SVS Session" harness="GENERIC" enabled="true" passrate="100">
-            <set id="" name="Window Server" harness="GENERIC" enabled="true" passrate="100">
-                <case id="" name="Install Common Files for Window Server" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="t_graphicswservapi.exe (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+            <set id="" name="Font and Bitmap Server" harness="GENERIC" enabled="true" passrate="100">
+                <case id="" name="Font and Bitmap Server Tests" harness="GENERIC" enabled="true" passrate="100">
+                    <step id="" name="t_fbservapi.exe (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
                         <command>install</command>
                         <params>
                             <param type="binary"/>
-                            <param src="t_graphicswservapi.exe"/>
-                            <param dst="c:\sys\bin\t_graphicswservapi.exe"/>
-                            <param component-path="graphicssvs" />
-                        </params>
-                    </step>
-                    <step id="" name="t_animplugin.dll (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="binary"/>
-                            <param src="t_animplugin.dll"/>
-                            <param dst="c:\sys\bin\t_animplugin.dll"/>
-                            <param component-path="graphicssvs" />
-                        </params>
-                    </step>
-                    <step id="" name="twsgraphicunshare.exe (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="binary"/>
-                            <param src="twsgraphicunshare.exe"/>
-                            <param dst="c:\sys\bin\twsgraphicunshare.exe"/>
+                            <param src="t_fbservapi.exe"/>
+                            <param dst="c:\sys\bin\t_fbservapi.exe"/>
                             <param component-path="graphicssvs" />
                         </params>
                     </step>
@@ -53,1077 +35,12 @@
 							<param component-path="graphicssvs\graphics" />
 						</params>
 					</step>
-                    <step id="" name="test_rwssprite_bitmap.mbm (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="test_rwssprite_bitmap.mbm"/>
-							<param dst="c:\graphics\wserv\test_rwssprite_bitmap.mbm"/>
-							<param component-path="graphicssvs\graphics\wserv" />
-						</params>
-					</step>
-                    <step id="" name="test_board.mbm (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="test_board.mbm"/>
-							<param dst="c:\graphics\wserv\test_board.mbm"/>
-							<param component-path="graphicssvs\graphics\wserv" />
-						</params>
-					</step>
-                    <step id="" name="test_alpha.mbm (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="test_alpha.mbm"/>
-							<param dst="c:\graphics\wserv\test_alpha.mbm"/>
-							<param component-path="graphicssvs\graphics\wserv" />
-						</params>
-					</step>
-                    <step id="" name="test_mask.mbm (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="test_mask.mbm"/>
-							<param dst="c:\graphics\wserv\test_mask.mbm"/>
-							<param component-path="graphicssvs\graphics\wserv" />
-						</params>
-					</step>
-                    <step id="" name="wsgraphicbitmapanimation.mbm (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="wsgraphicbitmapanimation.mbm"/>
-							<param dst="c:\graphics\wserv\wsgraphicbitmapanimation.mbm"/>
-							<param component-path="graphicssvs\graphics\wserv" />
-						</params>
-					</step>
-                    <step id="" name="testfontws.gdr (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testfontws.gdr"/>
-							<param dst="c:\graphics\wserv\testfontws.gdr"/>
-							<param component-path="graphicssvs\graphics\wserv" />
-						</params>
-					</step>
-                </case>
-                <case id="" name="Animation" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-anim-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="graphics-wserv-anim-publicapi.script"/>
-							<param dst="c:\graphics\graphics-wserv-anim-publicapi.script"/>
-							<param component-path="graphicssvs\graphics" />
-						</params>
-					</step>
-					<step id="" name="graphics-wserv-anim-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="graphics-wserv-anim-publicapi.ini"/>
-							<param dst="c:\graphics\graphics-wserv-anim-publicapi.ini"/>
-							<param component-path="graphicssvs\graphics" />
-						</params>
-					</step>
-                    <step id="" name="graphics-wserv-anim-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>execute</command>
-						<params>
-							<param file="testexecute.exe" /> 
-							<param parameters="c:\graphics\graphics-wserv-anim-publicapi.script" /> 
-							<param result-file="c:\logs\testexecute\graphics-wserv-anim-publicapi.htm" /> 
-							<param timeout="1200" /> 
-							<param parser="TEFTestResultParser" /> 
-							<param leave-old-result="true" /> 
-						</params>
-                    </step>
-                </case>
-                <case id="" name="Animation Plugin DLL" harness="GENERIC" enabled="true" passrate="100">
-					<step id="" name="graphics-wserv-animdll-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="graphics-wserv-animdll-publicapi.script"/>
-							<param dst="c:\graphics\graphics-wserv-animdll-publicapi.script"/>
-							<param component-path="graphicssvs\graphics" />
-						</params>
-					</step>
-					<step id="" name="graphics-wserv-animdll-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="graphics-wserv-animdll-publicapi.ini"/>
-							<param dst="c:\graphics\graphics-wserv-animdll-publicapi.ini"/>
-							<param component-path="graphicssvs\graphics" />
-						</params>
-					</step>
-                    <step id="" name="graphics-wserv-animdll-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>execute</command>
-						<params>
-							<param file="testexecute.exe" /> 
-							<param parameters="c:\graphics\graphics-wserv-animdll-publicapi.script" /> 
-							<param result-file="c:\logs\testexecute\graphics-wserv-animdll-publicapi.htm" /> 
-							<param timeout="1200" /> 
-							<param parser="TEFTestResultParser" /> 
-							<param leave-old-result="true" /> 
-						</params>
-                    </step>
-                </case>
-                <case id="" name="Animation General Functions" harness="GENERIC" enabled="true" passrate="100">
-					<step id="" name="graphics-wserv-animgeneralfunctions-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="graphics-wserv-animgeneralfunctions-publicapi.script"/>
-							<param dst="c:\graphics\graphics-wserv-animgeneralfunctions-publicapi.script"/>
-							<param component-path="graphicssvs\graphics" />
-						</params>
-					</step>
-					<step id="" name="graphics-wserv-animgeneralfunctions-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="graphics-wserv-animgeneralfunctions-publicapi.ini"/>
-							<param dst="c:\graphics\graphics-wserv-animgeneralfunctions-publicapi.ini"/>
-							<param component-path="graphicssvs\graphics" />
-						</params>
-					</step>
-                    <step id="" name="graphics-wserv-animgeneralfunctions-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>execute</command>
-						<params>
-							<param file="testexecute.exe" /> 
-							<param parameters="c:\graphics\graphics-wserv-animgeneralfunctions-publicapi.script" /> 
-							<param result-file="c:\logs\testexecute\graphics-wserv-animgeneralfunctions-publicapi.htm" /> 
-							<param timeout="1200" /> 
-							<param parser="TEFTestResultParser" /> 
-							<param leave-old-result="true" /> 
-						</params>
-                    </step>
-                </case>
-                <case id="" name="Animation General Functions(Window Extension)" harness="GENERIC" enabled="true" passrate="100">
-					<step id="" name="graphics-wserv-animgfwe-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="graphics-wserv-animgfwe-publicapi.script"/>
-							<param dst="c:\graphics\graphics-wserv-animgfwe-publicapi.script"/>
-							<param component-path="graphicssvs\graphics" />
-						</params>
-					</step>
-					<step id="" name="graphics-wserv-animgfwe-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+                    <step id="" name="graphics-fbserv-publicapi.tcs (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
 						<command>install</command>
 						<params>
 							<param type="data"/>
-							<param src="graphics-wserv-animgfwe-publicapi.ini"/>
-							<param dst="c:\graphics\graphics-wserv-animgfwe-publicapi.ini"/>
-							<param component-path="graphicssvs\graphics" />
-						</params>
-					</step>
-                    <step id="" name="graphics-wserv-animgfwe-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>execute</command>
-						<params>
-							<param file="testexecute.exe" /> 
-							<param parameters="c:\graphics\graphics-wserv-animgfwe-publicapi.script" /> 
-							<param result-file="c:\logs\testexecute\graphics-wserv-animgfwe-publicapi.htm" /> 
-							<param timeout="1200" /> 
-							<param parser="TEFTestResultParser" /> 
-							<param leave-old-result="true" /> 
-						</params>
-                    </step>
-                </case>
-                <case id="" name="Animation Sprite Functions" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-animspritefunctions-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-animspritefunctions-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-animspritefunctions-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-animspritefunctions-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-animspritefunctions-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-animspritefunctions-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-animspritefunctions-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-animspritefunctions-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-animspritefunctions-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Animation Window Functions" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-animwindowfunctions-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-animwindowfunctions-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-animwindowfunctions-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-animwindowfunctions-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-animwindowfunctions-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-animwindowfunctions-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-animwindowfunctions-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-animwindowfunctions-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-animwindowfunctions-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Backed Up Window" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-backedupwindow-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-backedupwindow-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-backedupwindow-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-backedupwindow-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-backedupwindow-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-backedupwindow-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-backedupwindow-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-backedupwindow-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-backedupwindow-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Blank Window" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-blankwindow-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-blankwindow-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-blankwindow-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-blankwindow-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-blankwindow-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-blankwindow-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-blankwindow-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-blankwindow-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-blankwindow-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Direct Screen Access" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-directscreenaccess-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-directscreenaccess-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-directscreenaccess-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-directscreenaccess-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-directscreenaccess-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-directscreenaccess-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-directscreenaccess-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-directscreenaccess-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-directscreenaccess-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Direct Screen Access Session" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-dsasession-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-dsasession-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-dsasession-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-dsasession-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-dsasession-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-dsasession-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-dsasession-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-dsasession-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-dsasession-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Window Server Events" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-events-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-events-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-events-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-events-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-events-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-events-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-events-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-events-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-events-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Window Server Frames" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-frame-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-frame-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-frame-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-frame-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-frame-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-frame-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-frame-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-frame-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-frame-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Window Server Session" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-session-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-session-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-session-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-session-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-session-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-session-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-session-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-session-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-session-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Window Server Sound Plugin" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-soundplugin-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-soundplugin-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-soundplugin-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-soundplugin-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-soundplugin-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-soundplugin-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-soundplugin-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-soundplugin-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-soundplugin-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Window Graphics Context" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-windowgc-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-windowgc-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-windowgc-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-windowgc-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-windowgc-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-windowgc-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-windowgc-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-windowgc-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-windowgc-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Window Groups" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-windowgroup-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-windowgroup-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-windowgroup-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-windowgroup-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-windowgroup-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-windowgroup-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-windowgroup-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-windowgroup-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-windowgroup-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Windows" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-window-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-window-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-window-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-window-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-window-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-window-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-window-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-window-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-window-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Window Server Bitmap" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-wsbitmap-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-wsbitmap-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-wsbitmap-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-wsbitmap-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-wsbitmap-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-wsbitmap-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-wsbitmap-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-wsbitmap-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-wsbitmap-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Window Server Graphic Bitmap Animation" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-wsgraphicbitmapanimation-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-wsgraphicbitmapanimation-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-wsgraphicbitmapanimation-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-wsgraphicbitmapanimation-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-wsgraphicbitmapanimation-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-wsgraphicbitmapanimation-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-wsgraphicbitmapanimation-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-wsgraphicbitmapanimation-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-wsgraphicbitmapanimation-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Window Server Graphic Bitmap" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-wsgraphicbitmap-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-wsgraphicbitmap-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-wsgraphicbitmap-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-wsgraphicbitmap-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-wsgraphicbitmap-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-wsgraphicbitmap-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-wsgraphicbitmap-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-wsgraphicbitmap-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-wsgraphicbitmap-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Window Server Graphic Message Buffer" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-wsgraphicmsgbuf-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-wsgraphicmsgbuf-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-wsgraphicmsgbuf-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-wsgraphicmsgbuf-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-wsgraphicmsgbuf-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-wsgraphicmsgbuf-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-wsgraphicmsgbuf-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-wsgraphicmsgbuf-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-wsgraphicmsgbuf-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Window Server Pointer Cursor" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-wspointercursor-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-wspointercursor-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-wspointercursor-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-wspointercursor-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-wspointercursor-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-wspointercursor-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-wspointercursor-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-wspointercursor-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-wspointercursor-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Window Server Screen Device" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-wsscreendevice-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-wsscreendevice-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-wsscreendevice-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-wsscreendevice-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-wsscreendevice-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-wsscreendevice-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-wsscreendevice-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-wsscreendevice-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-wsscreendevice-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Window Server Sprite" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-wserv-wssprite-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-wssprite-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-wserv-wssprite-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-wssprite-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-wserv-wssprite-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-wserv-wssprite-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-wserv-wssprite-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-wserv-wssprite-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-wserv-wssprite-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-            </set>
-            <set id="" name="Bit GDI (Graphics Device Interface)" harness="GENERIC" enabled="true" passrate="100">
-                <case id="" name="Install Common Files for Bit GDI" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="t_graphicsbitgdiapi.exe (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="binary"/>
-                            <param src="t_graphicsbitgdiapi.exe"/>
-                            <param dst="c:\sys\bin\t_graphicsbitgdiapi.exe"/>
-                            <param component-path="graphicssvs" />
-                        </params>
-                    </step>
-                    <step id="" name="t_graphics.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="t_graphics.ini"/>
-							<param dst="c:\graphics\t_graphics.ini"/>
-							<param component-path="graphicssvs\graphics" />
-						</params>
-					</step>
-                    <step id="" name="test_rwssprite_bitmap.mbm (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="test_rwssprite_bitmap.mbm"/>
-							<param dst="c:\graphics\bitgdi\test_rwssprite_bitmap.mbm"/>
-							<param component-path="graphicssvs\graphics\bitgdi" />
-						</params>
-					</step>
-                    <step id="" name="testfontws.gdr (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testfontws.gdr"/>
-							<param dst="c:\graphics\bitgdi"/>
-							<param component-path="graphicssvs\graphics\bitgdi" />
-						</params>
-					</step>
-                    <step id="" name="test_bitmap_rom.rbm (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="test_bitmap_rom.rbm"/>
-							<param dst="z:\graphics\t_fbservapi\test_bitmap_rom.rbm"/>
-							<param component-path="graphicssvs\graphics\t_fbservapi" />
-						</params>
-					</step>                  
-                </case>
-                <case id="" name="Bit Graphics Context" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-bitgdi-fbsbitgc-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-bitgdi-fbsbitgc-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-bitgdi-fbsbitgc-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-bitgdi-fbsbitgc-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-bitgdi-fbsbitgc-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-bitgdi-fbsbitgc-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-bitgdi-fbsbitgc-publicapi-2.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-bitgdi-fbsbitgc-publicapi-2.ini"/>
-                            <param dst="c:\graphics\graphics-bitgdi-fbsbitgc-publicapi-2.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-bitgdi-fbsbitgc-publicapi-3.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-bitgdi-fbsbitgc-publicapi-3.ini"/>
-                            <param dst="c:\graphics\graphics-bitgdi-fbsbitgc-publicapi-3.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-bitgdi-fbsbitgc-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-bitgdi-fbsbitgc-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-bitgdi-fbsbitgc-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Bit Graphics Context Font" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-bitgdi-fbsbitgcfont-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-bitgdi-fbsbitgcfont-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-bitgdi-fbsbitgcfont-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-bitgdi-fbsbitgcfont-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-bitgdi-fbsbitgcfont-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-bitgdi-fbsbitgcfont-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-bitgdi-fbsbitgcfont-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-bitgdi-fbsbitgcfont-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-bitgdi-fbsbitgcfont-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Bitmap Device" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-bitgdi-fbsbitmapdevice-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-bitgdi-fbsbitmapdevice-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-bitgdi-fbsbitmapdevice-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-bitgdi-fbsbitmapdevice-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-bitgdi-fbsbitmapdevice-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-bitgdi-fbsbitmapdevice-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-bitgdi-fbsbitmapdevice-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-bitgdi-fbsbitmapdevice-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-bitgdi-fbsbitmapdevice-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="FBS Device" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-bitgdi-fbsdevice-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-bitgdi-fbsdevice-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-bitgdi-fbsdevice-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-bitgdi-fbsdevice-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-bitgdi-fbsdevice-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-bitgdi-fbsdevice-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-bitgdi-fbsdevice-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-bitgdi-fbsdevice-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-bitgdi-fbsdevice-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="FBS Screen Device" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-bitgdi-fbsscreendevice-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-bitgdi-fbsscreendevice-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-bitgdi-fbsscreendevice-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-bitgdi-fbsscreendevice-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-bitgdi-fbsscreendevice-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-bitgdi-fbsscreendevice-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-bitgdi-fbsscreendevice-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-bitgdi-fbsscreendevice-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-bitgdi-fbsscreendevice-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Polygon Filler" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-bitgdi-polygonfiller-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-bitgdi-polygonfiller-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-bitgdi-polygonfiller-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-bitgdi-polygonfiller-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-bitgdi-polygonfiller-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-bitgdi-polygonfiller-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-bitgdi-polygonfiller-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-bitgdi-polygonfiller-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-bitgdi-polygonfiller-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-            </set>
-            <set id="" name="Font and Bitmap Server" harness="GENERIC" enabled="true" passrate="100">
-                <case id="" name="Install Common Files for Font and Bitmap Server" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="t_fbservapi.exe (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="binary"/>
-                            <param src="t_fbservapi.exe"/>
-                            <param dst="c:\sys\bin\t_fbservapi.exe"/>
-                            <param component-path="graphicssvs" />
-                        </params>
-                    </step>
-                    
-                    <step id="" name="t_graphics.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="t_graphics.ini"/>
-							<param dst="c:\graphics\t_graphics.ini"/>
+							<param src="graphics-fbserv-publicapi.tcs"/>
+							<param dst="c:\graphics\graphics-fbserv-publicapi.tcs"/>
 							<param component-path="graphicssvs\graphics" />
 						</params>
 					</step>
@@ -1199,8 +116,15 @@
 							<param component-path="graphicssvs\graphics\t_fbservapi" />
 						</params>
 					</step>
-                </case>
-                <case id="" name="Bitmap Utilities" harness="GENERIC" enabled="true" passrate="100">
+                    <step id="" name="graphics-fbserv-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+                        <command>install</command>
+                        <params>
+                            <param type="data"/>
+                            <param src="graphics-fbserv-publicapi.script"/>
+                            <param dst="c:\graphics\graphics-fbserv-publicapi.script"/>
+                            <param component-path="graphicssvs\graphics" />
+                        </params>
+                    </step>
                     <step id="" name="graphics-fbserv-bitmaputil-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
                         <command>install</command>
                         <params>
@@ -1219,19 +143,6 @@
                             <param component-path="graphicssvs\graphics" />
                         </params>
                     </step>
-                    <step id="" name="graphics-fbserv-bitmaputil-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-fbserv-bitmaputil-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-fbserv-bitmaputil-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="FBS Bitmap" harness="GENERIC" enabled="true" passrate="100">
                     <step id="" name="graphics-fbserv-fbsbitmap-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
                         <command>install</command>
                         <params>
@@ -1250,19 +161,6 @@
                             <param component-path="graphicssvs\graphics" />
                         </params>
                     </step>
-                    <step id="" name="graphics-fbserv-fbsbitmap-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-fbserv-fbsbitmap-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-fbserv-fbsbitmap-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="256-Color Bitmap Utilities" harness="GENERIC" enabled="true" passrate="100">
                     <step id="" name="graphics-fbserv-fbscolor256bitmaputil-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
                         <command>install</command>
                         <params>
@@ -1281,19 +179,6 @@
                             <param component-path="graphicssvs\graphics" />
                         </params>
                     </step>
-                    <step id="" name="graphics-fbserv-fbscolor256bitmaputil-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-fbserv-fbscolor256bitmaputil-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-fbserv-fbscolor256bitmaputil-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="FBS Fonts" harness="GENERIC" enabled="true" passrate="100">
                     <step id="" name="graphics-fbserv-fbsfont-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
                         <command>install</command>
                         <params>
@@ -1312,19 +197,6 @@
                             <param component-path="graphicssvs\graphics" />
                         </params>
                     </step>
-                    <step id="" name="graphics-fbserv-fbsfont-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-fbserv-fbsfont-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-fbserv-fbsfont-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="FBS Session" harness="GENERIC" enabled="true" passrate="100">
                     <step id="" name="graphics-fbserv-fbssession-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
                         <command>install</command>
                         <params>
@@ -1343,19 +215,6 @@
                             <param component-path="graphicssvs\graphics" />
                         </params>
                     </step>
-                    <step id="" name="graphics-fbserv-fbssession-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-fbserv-fbssession-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-fbserv-fbssession-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="FBS Typeface Store" harness="GENERIC" enabled="true" passrate="100">
                     <step id="" name="graphics-fbserv-fbstypefacestore-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
                         <command>install</command>
                         <params>
@@ -1374,164 +233,13 @@
                             <param component-path="graphicssvs\graphics" />
                         </params>
                     </step>
-                    <step id="" name="graphics-fbserv-fbstypefacestore-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
+                    <step id="" name="graphics-fbserv-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
                         <command>execute</command>
                         <params>
                             <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-fbserv-fbstypefacestore-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-fbserv-fbstypefacestore-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-            </set>
-            <set id="" name="Font Store" harness="GENERIC" enabled="true" passrate="100">
-                <case id="" name="Install Common Files for Font Store" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="t_graphicsfntstoreapi.exe (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="binary"/>
-                            <param src="t_graphicsfntstoreapi.exe"/>
-                            <param dst="c:\sys\bin\t_graphicsfntstoreapi.exe"/>
-                            <param component-path="graphicssvs" />
-                        </params>
-                    </step>
-                    <step id="" name="t_graphics.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="t_graphics.ini"/>
-							<param dst="c:\graphics\t_graphics.ini"/>
-							<param component-path="graphicssvs\graphics" />
-						</params>
-					</step>
-                    <step id="" name="testfontws.gdr (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="testfontws.gdr"/>
-							<param dst="c:\graphics\fntstore\testfontws.gdr"/>
-							<param component-path="graphicssvs\graphics\fntstore" />
-						</params>
-					</step>
-                    <step id="" name="bad_entrysel (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="bad_entrysel"/>
-							<param dst="c:\graphics\fntstore\bad_entrysel"/>
-							<param component-path="graphicssvs\graphics\fntstore" />
-						</params>
-					</step>
-                    <step id="" name="dummy (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="dummy"/>
-							<param dst="c:\graphics\fntstore\dummy"/>
-							<param component-path="graphicssvs\graphics\fntstore" />
-						</params>
-					</step>
-                    <step id="" name="dummy_2 (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-						<command>install</command>
-						<params>
-							<param type="data"/>
-							<param src="dummy_2"/>
-							<param dst="c:\graphics\fntstore\dummy_2"/>
-							<param component-path="graphicssvs\graphics\fntstore" />
-						</params>
-					</step>
-                </case>
-                <case id="" name="Bitmap Font" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-fntstore-bitmapfont-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-fntstore-bitmapfont-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-fntstore-bitmapfont-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-fntstore-bitmapfont-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-fntstore-bitmapfont-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-fntstore-bitmapfont-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-fntstore-bitmapfont-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-fntstore-bitmapfont-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-fntstore-bitmapfont-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Font Store" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-fntstore-fntstore-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-fntstore-fntstore-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-fntstore-fntstore-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-fntstore-fntstore-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-fntstore-fntstore-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-fntstore-fntstore-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-fntstore-fntstore-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-fntstore-fntstore-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-fntstore-fntstore-publicapi.htm" /> 
-                            <param timeout="1200" /> 
-                            <param parser="TEFTestResultParser" /> 
-                            <param leave-old-result="true" /> 
-                        </params>
-                    </step>
-                </case>
-                <case id="" name="Open Font Rasterizer Context" harness="GENERIC" enabled="true" passrate="100">
-                    <step id="" name="graphics-fntstore-openfontrasterizercontext-publicapi.script (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-fntstore-openfontrasterizercontext-publicapi.script"/>
-                            <param dst="c:\graphics\graphics-fntstore-openfontrasterizercontext-publicapi.script"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-fntstore-openfontrasterizercontext-publicapi.ini (install)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>install</command>
-                        <params>
-                            <param type="data"/>
-                            <param src="graphics-fntstore-openfontrasterizercontext-publicapi.ini"/>
-                            <param dst="c:\graphics\graphics-fntstore-openfontrasterizercontext-publicapi.ini"/>
-                            <param component-path="graphicssvs\graphics" />
-                        </params>
-                    </step>
-                    <step id="" name="graphics-fntstore-openfontrasterizercontext-publicapi.script (execute)" harness="GENERIC" enabled="true" passrate="100" significant="false">
-                        <command>execute</command>
-                        <params>
-                            <param file="testexecute.exe" /> 
-                            <param parameters="c:\graphics\graphics-fntstore-openfontrasterizercontext-publicapi.script" /> 
-                            <param result-file="c:\logs\testexecute\graphics-fntstore-openfontrasterizercontext-publicapi.htm" /> 
-                            <param timeout="1200" /> 
+                            <param parameters="c:\graphics\graphics-fbserv-publicapi.script -tcx \graphics\graphics-fbserv-publicapi.tcs" /> 
+                            <param result-file="c:\logs\testexecute\graphics-fbserv-publicapi.htm" /> 
+                            <param timeout="3600" /> 
                             <param parser="TEFTestResultParser" /> 
                             <param leave-old-result="true" /> 
                         </params>
@@ -1541,27 +249,10 @@
         </session>
 	</plan>
 	<files>
-		<file>graphicssvs/winscw_udeb/twsgraphicshare.exe</file>
-        <file>graphicssvs/winscw_udeb/twsgraphicunshare.exe</file>
-        <file>graphicssvs/winscw_udeb/t_animplugin.dll</file>
         <file>graphicssvs/winscw_udeb/t_fbservapi.exe</file>
-        <file>graphicssvs/winscw_udeb/t_graphicsbitgdiapi.exe</file>
-        <file>graphicssvs/winscw_udeb/t_graphicsfntstoreapi.exe</file>
-		<file>graphicssvs/winscw_udeb/t_graphicswservapi.exe</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi-2.ini</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitgc-publicapi-3.ini</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitgcfont-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitgcfont-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitmapdevice-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsbitmapdevice-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsdevice-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsdevice-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsscreendevice-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-fbsscreendevice-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-polygonfiller-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-bitgdi-polygonfiller-publicapi.ini</file>
+		<file>graphicssvs/graphics/general/t_graphics.ini</file>
+		<file>graphicssvs/graphics/general/graphics-fbserv-publicapi.tcs</file>
+		<file>graphicssvs/graphics/general/graphics-fbserv-publicapi.script</file>
         <file>graphicssvs/graphics/general/graphics-fbserv-bitmaputil-publicapi.script</file>
         <file>graphicssvs/graphics/general/graphics-fbserv-bitmaputil-publicapi.ini</file>
         <file>graphicssvs/graphics/general/graphics-fbserv-fbsbitmap-publicapi.script</file>
@@ -1574,69 +265,6 @@
         <file>graphicssvs/graphics/general/graphics-fbserv-fbssession-publicapi.ini</file>
         <file>graphicssvs/graphics/general/graphics-fbserv-fbstypefacestore-publicapi.script</file>
         <file>graphicssvs/graphics/general/graphics-fbserv-fbstypefacestore-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-fntstore-bitmapfont-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-fntstore-bitmapfont-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-fntstore-fntstore-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-fntstore-fntstore-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-fntstore-openfontrasterizercontext-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-fntstore-openfontrasterizercontext-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-anim-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-anim-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-animdll-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-animdll-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-animgeneralfunctions-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-animgeneralfunctions-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-animgfwe-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-animgfwe-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-animspritefunctions-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-animspritefunctions-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-animwindowfunctions-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-animwindowfunctions-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-backedupwindow-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-backedupwindow-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-blankwindow-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-blankwindow-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-directscreenaccess-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-directscreenaccess-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-dsasession-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-dsasession-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-events-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-events-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-frame-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-frame-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-session-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-session-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-soundplugin-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-soundplugin-publicapi.ini</file>        
-        <file>graphicssvs/graphics/general/graphics-wserv-windowgc-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-windowgc-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-windowgroup-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-windowgroup-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-window-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-window-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-wsbitmap-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-wsbitmap-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-wsgraphicbitmapanimation-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-wsgraphicbitmapanimation-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-wsgraphicbitmap-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-wsgraphicbitmap-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-wsgraphicmsgbuf-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-wsgraphicmsgbuf-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-wspointercursor-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-wspointercursor-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-wsscreendevice-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-wsscreendevice-publicapi.ini</file>        
-        <file>graphicssvs/graphics/general/graphics-wserv-wssprite-publicapi.script</file>
-        <file>graphicssvs/graphics/general/graphics-wserv-wssprite-publicapi.ini</file>
-        <file>graphicssvs/graphics/general/t_graphics.ini</file>
-        <file>graphicssvs/graphics/general/t_graphics.tcs</file>
-        <file>graphicssvs/graphics/general/t_graphics_panic.tcs</file>
-        <file>graphicssvs/graphics/bitgdi/general/test_rwssprite_bitmap.mbm</file>
-        <file>graphicssvs/graphics/bitgdi/general/testfontws.gdr</file>
-        <file>graphicssvs/graphics/fntstore/general/bad_entrysel</file>
-        <file>graphicssvs/graphics/fntstore/general/dummy</file>
-        <file>graphicssvs/graphics/fntstore/general/dummy_2</file>
-        <file>graphicssvs/graphics/fntstore/general/testfontws.gdr</file>
         <file>graphicssvs/graphics/t_fbservapi/general/test_bitmap_rom.rbm</file>
         <file>graphicssvs/graphics/t_fbservapi/general/empty_file.txt</file>
         <file>graphicssvs/graphics/t_fbservapi/general/scaniline_10bytes.txt</file>
@@ -1645,11 +273,5 @@
         <file>graphicssvs/graphics/t_fbservapi/general/test_bitmap_24bit_400x300.mbm</file>
         <file>graphicssvs/graphics/t_fbservapi/general/test_bitmap_32x8.mbm</file>
         <file>graphicssvs/graphics/t_fbservapi/general/test_bitmap_offset8.mbm</file>
-        <file>graphicssvs/graphics/wserv/general/test_rwssprite_bitmap.mbm</file>
-        <file>graphicssvs/graphics/wserv/general/test_alpha.mbm</file>
-        <file>graphicssvs/graphics/wserv/general/test_board.mbm</file>
-        <file>graphicssvs/graphics/wserv/general/test_mask.mbm</file>
-        <file>graphicssvs/graphics/wserv/general/wsgraphicbitmapanimation.mbm</file>
-        <file>graphicssvs/graphics/wserv/general/testfontws.gdr</file>
     </files>
 </test>