fix sutton-full for graphic tests

1 files changed, 38 insertions, 20 deletions

diff --git a/whitelists/sutton-full.whitelist b/whitelists/sutton-full.whitelist
index 6f3ceb5..75b8aaf 100644
--- a/whitelists/sutton-full.whitelist
+++ b/whitelists/sutton-full.whitelist
@@ -113,31 +113,49 @@
 2013.com.canonical.certification::ethernet/info_automated
 
 2013.com.canonical.certification::__graphics__
-2013.com.canonical.certification::graphics/generator_glxgears
+2013.com.canonical.certification::graphics/generator_.*
+2013.com.canonical.certification::graphics/1_glxgears_.*
 2013.com.canonical.certification::graphics/xorg-version
 2013.com.canonical.certification::graphics/driver_version
-2013.com.canonical.certification::graphics/generator_modes
-2013.com.canonical.certification::graphics/generator_color_depth
-2013.com.canonical.certification::graphics/generator_fresh_rate
-2013.com.canonical.certification::graphics/generator_graphic_memory
-2013.com.canonical.certification::graphics/generator_compiz_check
-2013.com.canonical.certification::graphics/generator_rotation
-2013.com.canonical.certification::graphics/generator_resolution
-2013.com.canonical.certification::graphics/generator_resolution-change
-2013.com.canonical.certification::graphics/generator_screen_resolution
-2013.com.canonical.certification::graphics/generator_screenshot
-2013.com.canonical.certification::graphics/generator_screenshot.jpg
-2013.com.canonical.certification::graphics/generator_screenshot_fullscreen.video
-2013.com.canonical.certification::graphics/generator_screenshot_fullscreen.video.jpg
-2013.com.canonical.certification::graphics/generator_switch_card
-2013.com.canonical.certification::graphics/generator_unity_support
-2013.com.canonical.certification::graphics/display
-2013.com.canonical.certification::graphics/generator_maximum_resolution
-2013.com.canonical.certification::graphics/generator_minimum_resolution
+2013.com.canonical.certification::graphics/1_modes_.*
+2013.com.canonical.certification::graphics/1_color_depth_.*
+2013.com.canonical.certification::graphics/1_fresh_rate_.*
+2013.com.canonical.certification::graphics/1_graphic_memory_.*
+2013.com.canonical.certification::graphics/1_compiz_check_.*
+2013.com.canonical.certification::graphics/1_rotation_.*
+2013.com.canonical.certification::graphics/1_resolution_.*
+2013.com.canonical.certification::graphics/1_resolution-change_.*
+2013.com.canonical.certification::graphics/1_screen_resolution_.*
+2013.com.canonical.certification::graphics/1_unity_support_.*
+2013.com.canonical.certification::graphics/1_maximum_resolution_.*
+2013.com.canonical.certification::graphics/1_cycle_resolution_.*
+2013.com.canonical.certification::graphics/1_minimum_resolution_.*
+2013.com.canonical.certification::graphics/1_screenshot_.*
+2013.com.canonical.certification::graphics/1_screenshot.jpg_.*
+2013.com.canonical.certification::graphics/1_screenshot_fullscreen.video_.*
+2013.com.canonical.certification::graphics/1_screenshot_fullscreen.video.jpg_.*
+2013.com.canonical.certification::graphics/2__switch_card_.*
+2013.com.canonical.certification::graphics/2_modes_.*
+2013.com.canonical.certification::graphics/2_color_depth_.*
+2013.com.canonical.certification::graphics/2_fresh_rate_.*
+2013.com.canonical.certification::graphics/2_graphic_memory_.*
+2013.com.canonical.certification::graphics/2_compiz_check_.*
+2013.com.canonical.certification::graphics/2_rotation_.*
+2013.com.canonical.certification::graphics/2_resolution_.*
+2013.com.canonical.certification::graphics/2_resolution-change_.*
+2013.com.canonical.certification::graphics/2_screen_resolution_.*
+2013.com.canonical.certification::graphics/2_unity_support_.*
+2013.com.canonical.certification::graphics/2_maximum_resolution_.*
+2013.com.canonical.certification::graphics/2_cycle_resolution_.*
+2013.com.canonical.certification::graphics/2_minimum_resolution_.*
+2013.com.canonical.certification::graphics/2_screenshot_.*
+2013.com.canonical.certification::graphics/2_screenshot.jpg_.*
+2013.com.canonical.certification::graphics/2_screenshot_fullscreen.video_.*
+2013.com.canonical.certification::graphics/2_screenshot_fullscreen.video.jpg_.*
 2013.com.canonical.certification::graphics/xorg-failsafe
+2013.com.canonical.certification::graphics/display
 2013.com.canonical.certification::graphics/xorg-process
 2013.com.canonical.certification::graphics/VESA_drivers_not_in_use
-2013.com.canonical.certification::graphics/generator_cycle_resolution
 
 #2013.com.canonical.certification::__hibernate__
 #See below, power-management/hibernate_advanced