Merge pull request #26 from philor/master

Update to the current state of the trychooser web page

trychooser

@@ -40,23 +40,24 @@ p_linux = N ("Linux", "Build on i386 (32-bit) linux", 'linux,')
 p_linux64 = N ("linux64", "Build on x86-64 (64-bit) linux", 'linux64,')
 p_linuxqt = N ("linuxqt", "Build on Qt linux", 'linuxqt,')
 p_macosx64 = N ("macosx64", "Build on Mac OSX 10.6 (x86-64, 64-bit, part of a universal binary)", 'macosx64,')
-p_win32 = N ("win32", "Build on Windows", 'win32,')
-p_win64 = N ("win32", "Build on Windows", 'win64,')
+p_win32 = N ("win32", "Build on Windows (32-bit)", 'win32,')
+p_win64 = N ("win64", "Build on Windows (64-bit)", 'win64,')
 p_android = N ("android", "Build on Android", 'android,')
+p_android_armv6 = N ("android-armv6", "Build on Android Armv6", 'android-armv6,')
 p_none = NoPrompt (" -p none")
 
 u_all = N ("All Unit tests", "Run all unit tests on all chosen platforms", ' -u all')
 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,41 +73,43 @@ 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")
 
 t_all = N ("All talos tests", "Run all talos tests on all chosen platforms", ' -t all')
 t_any = N ("Any talos tests", "Would you like to be asked about running each set of talos tests", ' -t ')
-t_nochrome = N ("nochrome", "Run nochrome suite", 'nochrome,')
-t_dromaeo = N ("dromaeo", "Run dromaeo suite", 'dromaeo,')
-t_a11y = N ("a11y", "Run a11y suite", 'a11y,')
-t_svg = N ("svg", "Run svg suite", 'svg,')
-t_chrome = N ("chrome", "Run chrome suite", 'chrome,')
-t_tp = N ("tp", "Run tp suite", 'tp,')
-t_tp4 = N ("tp4", "Run tp4 suite", 'tp4,')
-t_dirty = N ("dirty", "Run dirty suite", 'dirty,')
-t_scroll = N ("scroll", "Run scroll suite", 'scroll,')
-t_cold = N ("cold", "Run cold suite", 'cold,')
-t_v8 = N ("v8", "Run v8 suite", 'v8,')
+t_tpn = N ("tpn", "Run tpn suite", 'tpn,')
+t_nochromer = N ("nochromer", "Run nochromer suite", 'nochromer,')
+t_other = N ("other", "Run other suite", 'other,')
+t_dirtypaint = N ("dirtypaint", "Run dirtypaint suite", 'dirtypaint,')
+t_svgr = N ("svgr", "Run svgr suite", 'svgr,')
+t_dromaeojs = N ("dromaeojs", "Run dromaeojs suite", 'dromaeojs,')
+t_xperf = N ("xperf", "Run xperf suite", 'xperf,')
 t_none = NoPrompt (" -t none")
 
-remote_talos = ','.join(['remote-ts', 'remote-tdhtml', 'remote-tsvg', 'remote-tsspider',
-                         'remote-tpan', 'remote-tp4m', 'remote-tp4m_nochrome',])
+remote_talos = ','.join(['remote-ts', 'remote-tdhtml', 'remote-tsvg', 'remote-tpan',
+                         'remote-trobopan', 'remote-trobocheck', 'remote-troboprovider',
+                         'remote-trobocheck2', 'remote-trobocheck3', 'remote-tp4m_nochrome',])
 t_all_android = N ("All android talos tests", "Run all android talos tests", remote_talos)
 t_any_android = N ("Any android talos tests", "Run any android talos tests", '')
-t_svg_r = N ("remote-tsvg", "Run svg suite", 'remote-tsvg,')
+t_ts_r = N ("remote-ts", "Run Android ts suite", 'remote-ts,')
+t_tdhtml_r = N ("remote-tdhtml", "Run Android tdhtml suite", 'remote-tdhtml,')
+t_tsvg_r = N ("remote-tsvg", "Run Android tsvg suite", 'remote-tsvg,')
+t_tpan_r = N ("remote-tpan", "Run Android tpan suite", 'remote-tpan,')
+t_trobopan_r = N ("remote-trobopan", "Run Android trobopan suite", 'remote-trobopan,')
+t_trobocheck_r = N ("remote-trobocheck", "Run Android trobocheck suite", 'remote-trobocheck,')
+t_trobocheck2_r = N ("remote-trobocheck2", "Run Android trobocheck2 suite", 'remote-trobocheck2,')
+t_trobocheck3_r = N ("remote-trobocheck3", "Run Android trobocheck3 suite", 'remote-trobocheck3,')
+t_troboprovider_r = N ("remote-troboprovider", "Run Android troboprovider suite", 'remote-troboprovider,')
 t_nochrome_r = N ("remote-tp4m_nochrome", "Run tp4m nochrome suite", 'remote-tp4m_nochrome,')
-t_tp4_r = N ("remote-tp4m", "Run tp4 suite", 'remote-tp4m,')
-t_ts_r = N ("remote-ts", "Run ts suite", 'remote-ts,')
-t_tdhtml_r = N ("remote-tdhtml", "Run tdhtml suite", 'remote-tdhtml,')
-t_tsspider_r = N ("remote-tsspdier", "Run tsspider suite", 'remote-tsspider,')
-t_tpan_r = N ("remote-tpan", "Run tpan suite", 'remote-tpan,')
 t_none_r = NoPrompt ("")
 
 ################
@@ -133,10 +136,14 @@ p_linux64.y = p_macosx64
 p_linux64.n = p_macosx64
 p_macosx64.y = p_win32
 p_macosx64.n = p_win32
-p_win32.y = p_android
-p_win32.n = p_android
-p_android.y = D(u_all)
-p_android.n = D(u_all)
+p_win32.y = p_win64
+p_win32.n = p_win64
+p_win64.y = p_android
+p_win64.n = p_android
+p_android.y = p_android_armv6
+p_android.n = p_android_armv6
+p_android_armv6.y = D(u_all)
+p_android_armv6.n = D(u_all)
 
 u_all.y = t_all
 u_all.n = u_any
@@ -149,8 +156,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 +184,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
@@ -206,51 +217,49 @@ u_mochitesto.n = D(t_all)
 
 t_all.y = finish
 t_all.n = t_any
-t_any.y = t_nochrome
+t_any.y = t_tpn
 t_any.n = t_none
 t_none.next = finish
-t_nochrome.y = t_dromaeo
-t_nochrome.n = t_dromaeo
-t_dromaeo.y = t_a11y
-t_dromaeo.n = t_a11y
-t_a11y.y = t_svg
-t_a11y.n = t_svg
-t_svg.y = t_chrome
-t_svg.n = t_chrome
-t_chrome.y = t_tp
-t_chrome.n = t_tp
-t_tp.y = t_tp4
-t_tp.n = t_tp4
-t_tp4.y = t_dirty
-t_tp4.n = t_dirty
-t_dirty.y = t_scroll
-t_dirty.n = t_scroll
-t_scroll.y = t_cold
-t_scroll.n = t_cold
-t_cold.y = t_v8
-t_cold.n = t_v8
-t_v8.y = t_all_android
-t_v8.n = t_all_android
+t_tpn.y = t_nochromer
+t_tpn.n = t_nochromer
+t_nochromer.y = t_other
+t_nochromer.n = t_other
+t_other.y = t_dirtypaint
+t_other.n = t_dirtypaint
+t_dirtypaint.y = t_svgr
+t_dirtypaint.n = t_svgr
+t_svgr.y = t_dromaeojs
+t_svgr.n = t_dromaeojs
+t_dromaeojs.y = t_xperf
+t_dromaeojs.n = t_xperf
+t_xperf.y = t_all_android
+t_xperf.n = t_all_android
 
 t_all_android.y = finish
 t_all_android.n = t_any_android
-t_any_android.y = t_svg_r
+t_any_android.y = t_ts_r
 t_any_android.n = t_none_r
 t_none_r.next = finish
-t_svg_r.y = t_nochrome_r
-t_svg_r.n = t_nochrome_r
-t_nochrome_r.y = t_tp4_r
-t_nochrome_r.n = t_tp4_r
-t_tp4_r.y = t_ts_r
-t_tp4_r.n = t_ts_r
 t_ts_r.y = t_tdhtml_r
 t_ts_r.n = t_tdhtml_r
-t_tdhtml_r.y = t_tsspider_r
-t_tdhtml_r.n = t_tsspider_r
-t_tsspider_r.y = t_tpan_r
-t_tsspider_r.n = t_tpan_r
-t_tpan_r.y = D(finish)
-t_tpan_r.n = D(finish)
+t_tdhtml_r.y = t_tsvg_r
+t_tdhtml_r.n = t_tsvg_r
+t_tsvg_r.y = t_tpan_r
+t_tsvg_r.n = t_tpan_r
+t_tpan_r.y = t_trobopan_r
+t_tpan_r.n = t_trobopan_r
+t_trobopan_r.y = t_trobocheck_r
+t_trobopan_r.n = t_trobocheck_r
+t_trobocheck_r.y = t_trobocheck2_r
+t_trobocheck_r.n = t_trobocheck2_r
+t_trobocheck2_r.y = t_trobocheck3_r
+t_trobocheck2_r.n = t_trobocheck3_r
+t_trobocheck3_r.y = t_troboprovider_r
+t_trobocheck3_r.n = t_troboprovider_r
+t_troboprovider_r.y = t_nochrome_r
+t_troboprovider_r.n = t_nochrome_r
+t_nochrome_r.y = D(finish)
+t_nochrome_r.n = D(finish)
 
 ################
 # The actual algorithm is simple

trychooser_test

@@ -15,27 +15,27 @@ 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'),
-    ('NYNYYYYYYY', '-b do -p linux,linux64,macosx64,win32,android -u all -t all'),
-    ('NYNNNYYNYY', '-b do -p macosx64,win32 -u all -t all'),
-    ('NYNNNNNYYYY', '-b do -p android -u all -t all'),
+    ('NYNYYYYYYYYY', '-b do -p linux,linux64,macosx64,win32,win64,android,android-armv6 -u all -t all'),
+    ('NYNNNYYNNNYY', '-b do -p macosx64,win32 -u all -t all'),
+    ('NYNNNNNNYNYYY', '-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'),
+    ('NYYYNYYYYYYYYYYYYY', '-b do -p all -u all -t tpn,nochromer,other,dirtypaint,svgr,dromaeojs,xperf,remote-ts,remote-tdhtml,remote-tsvg,remote-tpan,remote-trobopan,remote-trobocheck,remote-troboprovider,remote-trobocheck2,remote-trobocheck3,remote-tp4m_nochrome'),
+    ('NYYYNYNNYYYYYNYYYYYYYYYYY', '-b do -p all -u all -t other,dirtypaint,svgr,dromaeojs,xperf,remote-ts,remote-tdhtml,remote-tsvg,remote-tpan,remote-trobopan,remote-trobocheck,remote-trobocheck2,remote-trobocheck3,remote-troboprovider,remote-tp4m_nochrome'),
+    ('NYYYNYYYYYYNYNYNNNNNNNNYN', '-b do -p all -u all -t tpn,nochromer,other,dirtypaint,svgr,xperf,remote-troboprovider'),
+    ('NYYNYNNNNNNNNNNNNNNNNNNNNNYNN', '-b do -p all -u mochitests -t none'),
     ]
 
 invalid_tests = [
-    ('NYNNNNNNYY', ": try: -b do -p -u all -t all"), # No platforms
+    ('NYNNNNNNNNYY', ": 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
-    ('NYYYNYNNNNNNNNNNNNYNNNNNNNNN', ": try: -b do -p all -u all -t"), # Wanted talos, none picked
+    ('NYYNYNNNNNNNNNNNNNNNNNNNNNNNNNN', ": try: -b do -p all -u -t none"), # Wanted unittests, none picked
+    ('NYYYNYNNNNNNNNYNNNNNNNNNN', ": try: -b do -p all -u all -t"), # Wanted talos, none picked
     ]
 
 tests = [(a, 'try: ' + b) for (a,b) in tests]