Fixes few tests and a typo

trychooser

@@ -172,8 +172,8 @@ u_crashtest3.y = u_crashtest_ipc
 u_crashtest3.n = u_crashtest_ipc
 u_crashtest_ipc.y = u_browser_chrome
 u_crashtest_ipc.n = u_browser_chrome
-u_browser_chrome.y = u.xpcshell
-u_browser_chrome.n = u.xpcshell
+u_browser_chrome.y = u_xpcshell
+u_browser_chrome.n = u_xpcshell
 u_xpcshell.y = u_jsreftest
 u_xpcshell.n = u_jsreftest
 u_jsreftest.y = u_jsreftest1
@@ -302,7 +302,7 @@ def run_algorithm(state):
   # Hard to test these above, so use string search for weird flag combination
   ################
 
-  platforms  = 'linux,linux64,macosx,macosx64,win32,android-r7,maemo5-gtk,maemo5-qt'.split(',')
+  platforms  = 'linux,linux64,macosx,macosx64,win32,android,android-xul'.split(',')
   unittests = 'reftest,crashtest,xpcshell,jsreftest,opengl,mochitest-1,mochitest-2,mochitest-3,mochitest-4,mochitest-5,mochitest-o,mochitests'.split(',')
   taloss = 'nochrome,dromaeo,a11y,svg,chrome,tp,dirty,scroll,cold,v8'.split(',')
 

trychooser_test

@@ -15,13 +15,11 @@ tests = [
     ('NYYYYY', '-b do -p all -u all -t all'),
     ('NNYYYY', '-b o -p all -u all -t all'),
     ('NNNYYYY', '-b d -p all -u all -t all'),
-    ('NYNYYYYYYYYYY', '-b do -p linux,linux64,macosx,macosx64,win32,android-r7,maemo5-gtk,maemo5-qt -u all -t all'),
-    ('NYNNNYYYNNNYY', '-b do -p macosx,macosx64,win32 -u all -t all'),
-    ('NYNNNNNNNYYYY', '-b do -p maemo5-gtk,maemo5-qt -u all -t all'),
-    ('NYNNNNNNYNYYY', '-b do -p android-r7,maemo5-qt -u all -t all'),
-    ('NYNNNNNNYYNYY', '-b do -p android-r7,maemo5-gtk -u all -t all'),
-    ('NYNNNNNNNNYYY', '-b do -p maemo5-qt -u all -t all'),
-    ('NYNNNNNNYNNYY', '-b do -p android-r7 -u all -t all'),
+    ('NYNYYYYYYYYY', '-b do -p linux,linux64,macosx,macosx64,win32,android,android-xul -u all -t all'),
+    ('NYNNNYYYNNYY', '-b do -p macosx,macosx64,win32 -u all -t all'),
+    ('NYNNNNNNYYYY', '-b do -p android,android-xul -u all -t all'),
+    ('NYNNNNNNNYYY', '-b do -p android-xul -u all -t all'),
+    ('NYNNNNNNYNYY', '-b do -p android -u all -t all'),
     ('NYYNNY', '-b do -p all -u none -t all'),
     ('NYYNYYYYYYYYYYYNYYYYYYYY', '-b do -p all -u reftest,reftest-ipc,reftest-no-accel,crashtest,crashtest-ipc,xpcshell,jsreftest,jetpack,mozmill-all,opengl,mochitest-1,mochitest-2,mochitest-3,mochitest-4,mochitest-5,mochitest-o -t all'),
     ('NYYNYYYYYYYYYYYNYYYYYNNY', '-b do -p all -u reftest,reftest-ipc,reftest-no-accel,crashtest,crashtest-ipc,xpcshell,jsreftest,jetpack,mozmill-all,opengl,mochitest-1,mochitest-2,mochitest-3,mochitest-4 -t all'),