Merge unittest changes

trychooser

@@ -49,14 +49,14 @@ u_all = N ("All Unit tests", "Run all unit tests on all chosen platforms", ' -u
 u_any = N ("Any unit tests", "Would you like to be asked about running each set of unit tests", ' -u ')
 u_reftest = N ("reftest", "Run reftests", 'reftest,')
 u_reftest_ipc = N ("reftest-ipc", "Run IPC reftests", 'reftest-ipc,')
-u_reftest_naccel = N ("reftest-no-accel", "Run non-accelerated reftests (win7 only)", 'reftest-no-accel,')
+u_reftest_naccel = N ("reftest-no-accel", "Run non-accelerated reftests (linux/win7 only)", 'reftest-no-accel,')
 u_crashtest = N ("crashtest", "Run crashtest tests", 'crashtest,')
 u_crashtest_ipc = N ("crashtest-ipc", "Run IPC crashtests", 'crashtest-ipc,')
 u_xpcshell = N ("xpcshell", "Run xpcshell tests", 'xpcshell,')
 u_jsreftest = N ("jsreftest", "Run jsreftests", 'jsreftest,')
 u_jetpack = N ("jetpack", "Run jetpack tests", 'jetpack,')
-u_mozmill = N ("mozmill-all", "Run mozmill testsl", 'mozmill-all,')
-u_opengl = N ("opengl", "Run opengl tests", 'opengl,')
+u_marionette = N ("marionette", "Run marionette tests", 'marionette,')
+u_mozmill = N ("mozmill", "Run mozmill tests (thunderbird-only)", 'mozmill,')
 u_mochitests = N ("Run all mochitests", "Run all of the mochitests", 'mochitests,')
 u_mochitests_any = N ("Run any mochitests", "Run any of the mochitests", '')
 u_mochitest1 = N ("mochitest-1", "Run mochitest-1", 'mochitest-1,')
@@ -72,12 +72,14 @@ u_mochitest8 = N ("mochitest-8", "Run mochitest-8 (android-only)", 'mochitest-8,
 u_reftest1 = N ("reftest-1", "Run reftest-1 (android-only)", 'reftest-1,')
 u_reftest2 = N ("reftest-2", "Run reftest-2 (android-only)", 'reftest-2,')
 u_reftest3 = N ("reftest-3", "Run reftest-3 (android-only)", 'reftest-3,')
+u_reftest4 = N ("reftest-4", "Run reftest-4 (android-only)", 'reftest-4,')
 u_crashtest1 = N ("crashtest-1", "Run crashtest-1 (android-only)", 'crashtest-1,')
 u_crashtest2 = N ("crashtest-2", "Run crashtest-2 (android-only)", 'crashtest-2,')
 u_crashtest3 = N ("crashtest-3", "Run crashtest-3 (android-only)", 'crashtest-3,')
 u_jsreftest1 = N ("jsreftest-1", "Run jsreftests-1 (android-only)", 'jsreftest-1,')
 u_jsreftest2 = N ("jsreftest-2", "Run jsreftests-2 (android-only)", 'jsreftest-2,')
 u_jsreftest3 = N ("jsreftest-3", "Run jsreftests-3 (android-only)", 'jsreftest-3,')
+u_robocop = N ("robocop", "Run robocop tests (android-only)", 'robocop,')
 
 u_none = NoPrompt (" -u none")
 
@@ -149,8 +151,10 @@ u_reftest1.y = u_reftest2
 u_reftest1.n = u_reftest2
 u_reftest2.y = u_reftest3
 u_reftest2.n = u_reftest3
-u_reftest3.y = u_reftest_ipc
-u_reftest3.n = u_reftest_ipc
+u_reftest3.y = u_reftest4
+u_reftest3.n = u_reftest4
+u_reftest4.y = u_reftest_ipc
+u_reftest4.n = u_reftest_ipc
 u_reftest_ipc.y = u_reftest_naccel
 u_reftest_ipc.n = u_reftest_naccel
 u_reftest_naccel.y = u_crashtest
@@ -175,12 +179,14 @@ u_jsreftest2.y = u_jsreftest3
 u_jsreftest2.n = u_jsreftest3
 u_jsreftest3.y = u_jetpack
 u_jsreftest3.n = u_jetpack
-u_jetpack.y = u_mozmill
-u_jetpack.n = u_mozmill
-u_mozmill.y = u_opengl
-u_mozmill.n = u_opengl
-u_opengl.y = u_mochitests
-u_opengl.n = u_mochitests
+u_jetpack.y = u_marionette
+u_jetpack.n = u_marionette
+u_marionette.y = u_mozmill
+u_marionette.n = u_mozmill
+u_mozmill.y = u_robocop
+u_mozmill.n = u_robocop
+u_robocop.y = u_mochitests
+u_robocop.n = u_mochitests
 u_mochitests.y = D(t_all)
 u_mochitests.n = u_mochitests_any
 u_mochitests_any.y = u_mochitest1

trychooser_test

@@ -19,22 +19,22 @@ tests = [
     ('NYNNNYYNYY', '-b do -p macosx64,win32 -u all -t all'),
     ('NYNNNNNYYYY', '-b do -p android -u all -t all'),
     ('NYYNNY', '-b do -p all -u none -t all'),
-    ('NYYNYYYYYYYYYYYYYYYYYYYYNYYYYYYYYYYY', '-b do -p all -u reftest,reftest-1,reftest-2,reftest-3,reftest-ipc,reftest-no-accel,crashtest,crashtest-1,crashtest-2,crashtest-3,crashtest-ipc,xpcshell,jsreftest,jsreftest-1,jsreftest-2,jsreftest-3,jetpack,mozmill-all,opengl,mochitest-1,mochitest-2,mochitest-3,mochitest-4,mochitest-5,mochitest-6,mochitest-7,mochitest-8,mochitest-o -t all'),
-    ('NYYNYYYYYYYYYYYYYYYYYYYYNYYYYYNNNNNY', '-b do -p all -u reftest,reftest-1,reftest-2,reftest-3,reftest-ipc,reftest-no-accel,crashtest,crashtest-1,crashtest-2,crashtest-3,crashtest-ipc,xpcshell,jsreftest,jsreftest-1,jsreftest-2,jsreftest-3,jetpack,mozmill-all,opengl,mochitest-1,mochitest-2,mochitest-3,mochitest-4 -t all'),
-    ('NYYNYYYYYYYYYYYYYYYYYYYYNYYYNNYNNNYY', '-b do -p all -u reftest,reftest-1,reftest-2,reftest-3,reftest-ipc,reftest-no-accel,crashtest,crashtest-1,crashtest-2,crashtest-3,crashtest-ipc,xpcshell,jsreftest,jsreftest-1,jsreftest-2,jsreftest-3,jetpack,mozmill-all,opengl,mochitest-1,mochitest-2,mochitest-5,mochitest-o -t all'),
-    ('NYYNYNNNNNNNNNNNYYNNNNNYNYYYYYYNNNYY', '-b do -p all -u xpcshell,jsreftest,opengl,mochitest-1,mochitest-2,mochitest-3,mochitest-4,mochitest-5,mochitest-o -t all'),
-    ('NYYNYYNNNNNYNNNNYYNNNNNYYY', '-b do -p all -u reftest,crashtest,xpcshell,jsreftest,opengl,mochitests -t all'),
+    ('NYYNYYYYYYYYYYYYYYYYYYYYYYNYYYYYYYYYYY', '-b do -p all -u reftest,reftest-1,reftest-2,reftest-3,reftest-4,reftest-ipc,reftest-no-accel,crashtest,crashtest-1,crashtest-2,crashtest-3,crashtest-ipc,xpcshell,jsreftest,jsreftest-1,jsreftest-2,jsreftest-3,jetpack,marionette,mozmill,robocop,mochitest-1,mochitest-2,mochitest-3,mochitest-4,mochitest-5,mochitest-6,mochitest-7,mochitest-8,mochitest-o -t all'),
+    ('NYYNYYYYYYYYYYYYYYYYYYYYYYNYYYYYNNNNNY', '-b do -p all -u reftest,reftest-1,reftest-2,reftest-3,reftest-4,reftest-ipc,reftest-no-accel,crashtest,crashtest-1,crashtest-2,crashtest-3,crashtest-ipc,xpcshell,jsreftest,jsreftest-1,jsreftest-2,jsreftest-3,jetpack,marionette,mozmill,robocop,mochitest-1,mochitest-2,mochitest-3,mochitest-4 -t all'),
+    ('NYYNYYYYYYYYYYYYYYYYYYYYYYNYYYNNYNNNYY', '-b do -p all -u reftest,reftest-1,reftest-2,reftest-3,reftest-4,reftest-ipc,reftest-no-accel,crashtest,crashtest-1,crashtest-2,crashtest-3,crashtest-ipc,xpcshell,jsreftest,jsreftest-1,jsreftest-2,jsreftest-3,jetpack,marionette,mozmill,robocop,mochitest-1,mochitest-2,mochitest-5,mochitest-o -t all'),
+    ('NYYNYNNNNNNNNNNNNYYNNNNYNNNYYYYYYNNNYY', '-b do -p all -u xpcshell,jsreftest,marionette,mochitest-1,mochitest-2,mochitest-3,mochitest-4,mochitest-5,mochitest-o -t all'),
+    ('NYYNYYNNNNNNYNNNNYYNNNNYNNYYY', '-b do -p all -u reftest,crashtest,xpcshell,jsreftest,marionette,mochitests -t all'),
     ('NYYYNNNN', '-b do -p all -u all -t none'),
     ('NYYYNYYYYYYYYYYYYY', '-b do -p all -u all -t nochrome,dromaeo,a11y,svg,chrome,tp,tp4,dirty,scroll,cold,v8,remote-ts,remote-tdhtml,remote-tsvg,remote-tsspider,remote-tpan,remote-tp4m,remote-tp4m_nochrome'),
     ('NYYYNYNNYYYYYYYYYNYYYYYYYYY', '-b do -p all -u all -t a11y,svg,chrome,tp,tp4,dirty,scroll,cold,v8,remote-tsvg,remote-tp4m_nochrome,remote-tp4m,remote-ts,remote-tdhtml,remote-tsspider,remote-tpan'),
     ('NYYYNYYYYYYYNYYNNNYNNNNYNN', '-b do -p all -u all -t nochrome,dromaeo,a11y,svg,chrome,tp,dirty,scroll,remote-tdhtml'),
-    ('NYYNYNNNNNNNNNNNNNNNNNNNYNN', '-b do -p all -u mochitests -t none'),
+    ('NYYNYNNNNNNNNNNNNNNNNNNNNNYNN', '-b do -p all -u mochitests -t none'),
     ]
 
 invalid_tests = [
     ('NYNNNNNNYY', ": try: -b do -p -u all -t all"), # No platforms
     ('NNNNYYY', ""), # No builds
-    ('NYYNYNNNNNNNNNNNNNNNNNNNNNNNN', ": try: -b do -p all -u -t none"), # Wanted unittests, none picked
+    ('NYYNYNNNNNNNNNNNNNNNNNNNNNNNNNN', ": try: -b do -p all -u -t none"), # Wanted unittests, none picked
     ('NYYYNYNNNNNNNNNNNNYNNNNNNNNN', ": try: -b do -p all -u all -t"), # Wanted talos, none picked
     ]