Skip to content
This repository has been archived by the owner on Jan 11, 2024. It is now read-only.

Add unit tests: mochitest-bc,reftest-5,reftest-6,marionette-webapi #28

Merged
merged 2 commits into from
Nov 19, 2012
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 35 additions & 11 deletions trychooser
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -38,12 +38,15 @@ p_all = N ("All platforms", "Build on all platforms", ' -p all')
p_any = NoPrompt (" -p ") p_any = NoPrompt (" -p ")
p_linux = N ("Linux", "Build on i386 (32-bit) linux", 'linux,') p_linux = N ("Linux", "Build on i386 (32-bit) linux", 'linux,')
p_linux64 = N ("linux64", "Build on x86-64 (64-bit) linux", 'linux64,') 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_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 (32-bit)", 'win32,') p_win32 = N ("win32", "Build on Windows (32-bit)", 'win32,')
p_win64 = N ("win64", "Build on Windows (64-bit)", 'win64,') p_win64 = N ("win64", "Build on Windows (64-bit)", 'win64,')
p_android = N ("android", "Build on Android", 'android,') p_android = N ("android", "Build on Android", 'android,')
p_android_armv6 = N ("android-armv6", "Build on Android Armv6", 'android-armv6,') p_android_armv6 = N ("android-armv6", "Build on Android Armv6", 'android-armv6,')
p_android_noion = N ("android-noion", "Build on Android without IonMonkey", 'android-noion,')
p_ics_armv7a_gecko = N ("ics_armv7a_gecko", "Build on the B2G emulator", 'ics_armv7a_gecko,')
p_panda = N ("panda", "Build on panda (B2G automation board)", 'panda,')
p_unagi = N ("unagi", "Build on unagi (B2G device image)", 'unagi,')
p_none = NoPrompt (" -p none") p_none = NoPrompt (" -p none")


u_all = N ("All Unit tests", "Run all unit tests on all chosen platforms", ' -u all') u_all = N ("All Unit tests", "Run all unit tests on all chosen platforms", ' -u all')
Expand All @@ -65,6 +68,7 @@ u_mochitest2 = N ("mochitest-2", "Run mochitest-2", 'mochitest-2,')
u_mochitest3 = N ("mochitest-3", "Run mochitest-3", 'mochitest-3,') u_mochitest3 = N ("mochitest-3", "Run mochitest-3", 'mochitest-3,')
u_mochitest4 = N ("mochitest-4", "Run mochitest-4", 'mochitest-4,') u_mochitest4 = N ("mochitest-4", "Run mochitest-4", 'mochitest-4,')
u_mochitest5 = N ("mochitest-5", "Run mochitest-5", 'mochitest-5,') u_mochitest5 = N ("mochitest-5", "Run mochitest-5", 'mochitest-5,')
u_mochitestbc = N ("mochitest-bc", "Run mochitest-browser-chrome", 'mochitest-bc,')
u_mochitesto = N ("mochitest-o", "Run mochitest-o", 'mochitest-o,') u_mochitesto = N ("mochitest-o", "Run mochitest-o", 'mochitest-o,')
## Android only suite names ## Android only suite names
u_mochitest6 = N ("mochitest-6", "Run mochitest-6 (android-only)", 'mochitest-6,') u_mochitest6 = N ("mochitest-6", "Run mochitest-6 (android-only)", 'mochitest-6,')
Expand All @@ -81,6 +85,10 @@ 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_jsreftest2 = N ("jsreftest-2", "Run jsreftests-2 (android-only)", 'jsreftest-2,')
u_jsreftest3 = N ("jsreftest-3", "Run jsreftests-3 (android-only)", 'jsreftest-3,') u_jsreftest3 = N ("jsreftest-3", "Run jsreftests-3 (android-only)", 'jsreftest-3,')
u_robocop = N ("robocop", "Run robocop tests (android-only)", 'robocop,') u_robocop = N ("robocop", "Run robocop tests (android-only)", 'robocop,')
## B2G only suite names
u_reftest5 = N ("reftest-5", "Run reftest-5 (B2G-only)", 'reftest-5,')
u_reftest6 = N ("reftest-6", "Run reftest-6 (B2G-only)", 'reftest-6,')
u_marionette_webapi = N ("marionette-webapi", "Run marionette-webapi (B2G-only)", 'marionette-webapi,')


u_none = NoPrompt (" -u none") u_none = NoPrompt (" -u none")


Expand Down Expand Up @@ -142,8 +150,16 @@ p_win64.y = p_android
p_win64.n = p_android p_win64.n = p_android
p_android.y = p_android_armv6 p_android.y = p_android_armv6
p_android.n = p_android_armv6 p_android.n = p_android_armv6
p_android_armv6.y = D(u_all) p_android_armv6.y = p_android_noion
p_android_armv6.n = D(u_all) p_android_armv6.n = p_android_noion
p_android_noion.y = p_ics_armv7a_gecko
p_android_noion.n = p_ics_armv7a_gecko
p_ics_armv7a_gecko.y = p_panda
p_ics_armv7a_gecko.n = p_panda
p_panda.y = p_unagi
p_panda.n = p_unagi
p_unagi.y = D(u_all)
p_unagi.n = D(u_all)


u_all.y = t_all u_all.y = t_all
u_all.n = u_any u_all.n = u_any
Expand All @@ -158,8 +174,12 @@ u_reftest2.y = u_reftest3
u_reftest2.n = u_reftest3 u_reftest2.n = u_reftest3
u_reftest3.y = u_reftest4 u_reftest3.y = u_reftest4
u_reftest3.n = u_reftest4 u_reftest3.n = u_reftest4
u_reftest4.y = u_reftest_ipc u_reftest4.y = u_reftest5
u_reftest4.n = u_reftest_ipc u_reftest4.n = u_reftest5
u_reftest5.y = u_reftest6
u_reftest5.n = u_reftest6
u_reftest6.y = u_reftest_ipc
u_reftest6.n = u_reftest_ipc
u_reftest_ipc.y = u_reftest_naccel u_reftest_ipc.y = u_reftest_naccel
u_reftest_ipc.n = u_reftest_naccel u_reftest_ipc.n = u_reftest_naccel
u_reftest_naccel.y = u_crashtest u_reftest_naccel.y = u_crashtest
Expand All @@ -186,8 +206,10 @@ u_jsreftest3.y = u_jetpack
u_jsreftest3.n = u_jetpack u_jsreftest3.n = u_jetpack
u_jetpack.y = u_marionette u_jetpack.y = u_marionette
u_jetpack.n = u_marionette u_jetpack.n = u_marionette
u_marionette.y = u_mozmill u_marionette.y = u_marionette_webapi
u_marionette.n = u_mozmill u_marionette.n = u_marionette_webapi
u_marionette_webapi.y = u_mozmill
u_marionette_webapi.n = u_mozmill
u_mozmill.y = u_robocop u_mozmill.y = u_robocop
u_mozmill.n = u_robocop u_mozmill.n = u_robocop
u_robocop.y = u_mochitests u_robocop.y = u_mochitests
Expand All @@ -210,8 +232,10 @@ u_mochitest6.y = u_mochitest7
u_mochitest6.n = u_mochitest7 u_mochitest6.n = u_mochitest7
u_mochitest7.y = u_mochitest8 u_mochitest7.y = u_mochitest8
u_mochitest7.n = u_mochitest8 u_mochitest7.n = u_mochitest8
u_mochitest8.y = u_mochitesto u_mochitest8.y = u_mochitestbc
u_mochitest8.n = u_mochitesto u_mochitest8.n = u_mochitestbc
u_mochitestbc.y = u_mochitesto
u_mochitestbc.n = u_mochitesto
u_mochitesto.y = D(t_all) u_mochitesto.y = D(t_all)
u_mochitesto.n = D(t_all) u_mochitesto.n = D(t_all)


Expand Down Expand Up @@ -298,8 +322,8 @@ def run_algorithm(state):
# Hard to test these above, so use string search for weird flag combination # Hard to test these above, so use string search for weird flag combination
################ ################


platforms = 'linux,linux64,macosx,macosx64,win32,android,android-xul'.split(',') platforms = 'linux,linux64,macosx64,win32,win64,android,android-armv6,android-noion,ics_armv7a_gecko,panda,unagi'.split(',')
unittests = 'reftest,crashtest,xpcshell,jsreftest,opengl,mochitest-1,mochitest-2,mochitest-3,mochitest-4,mochitest-5,mochitest-o,mochitests'.split(',') unittests = 'reftest,reftest-ipc,reftest-no-accel,crashtest,crashtest-ipc,xpcshell,jsreftest,jetpack,marionette,mozmill,mochitests,reftest-1,reftest-2,reftest-3,reftest-4,jsreftest-1,jsreftest-2,jsreftest-3,crashtest-2,crashtest-3,mochitest-6,mochitest-7,mochitest-8,robocop,reftest-1,reftest-2,reftest-3,reftest-4,reftest-5,reftest-6,marionette-webapi'.split(',')
taloss = 'nochrome,dromaeo,a11y,svg,chrome,tp,dirty,scroll,cold,v8'.split(',') taloss = 'nochrome,dromaeo,a11y,svg,chrome,tp,dirty,scroll,cold,v8'.split(',')




Expand Down
22 changes: 11 additions & 11 deletions trychooser_test
Original file line number Original file line Diff line number Diff line change
Expand Up @@ -15,26 +15,26 @@ tests = [
('NYYYYY', '-b do -p all -u all -t all'), ('NYYYYY', '-b do -p all -u all -t all'),
('NNYYYY', '-b o -p all -u all -t all'), ('NNYYYY', '-b o -p all -u all -t all'),
('NNNYYYY', '-b d -p all -u all -t all'), ('NNNYYYY', '-b d -p all -u all -t all'),
('NYNYYYYYYYYY', '-b do -p linux,linux64,macosx64,win32,win64,android,android-armv6 -u all -t all'), ('NYNYYYYYYYYYYYYY', '-b do -p linux,linux64,macosx64,win32,win64,android,android-armv6,android-noion,ics_armv7a_gecko,panda,unagi -u all -t all'),
('NYNNNYYNNNYY', '-b do -p macosx64,win32 -u all -t all'), ('NYNNNYYNNNNNNNYY', '-b do -p macosx64,win32 -u all -t all'),
('NYNNNNNNYNYYY', '-b do -p android -u all -t all'), ('NYNNNNNNYNNNNNYYY', '-b do -p android -u all -t all'),
('NYYNNY', '-b do -p all -u none -t all'), ('NYYNNY', '-b do -p all -u none -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'), ('NYYNYYYYYYYYYYYYYYYYYYYYYYYYYNYYYYYYYYYYYY', '-b do -p all -u reftest,reftest-1,reftest-2,reftest-3,reftest-4,reftest-5,reftest-6,reftest-ipc,reftest-no-accel,crashtest,crashtest-1,crashtest-2,crashtest-3,crashtest-ipc,xpcshell,jsreftest,jsreftest-1,jsreftest-2,jsreftest-3,jetpack,marionette,marionette-webapi,mozmill,robocop,mochitest-1,mochitest-2,mochitest-3,mochitest-4,mochitest-5,mochitest-6,mochitest-7,mochitest-8,mochitest-bc,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'), ('NYYNYYYYYYYYYYYYYYYYYYYYYYYYYNYYYYYNNNNNNY', '-b do -p all -u reftest,reftest-1,reftest-2,reftest-3,reftest-4,reftest-5,reftest-6,reftest-ipc,reftest-no-accel,crashtest,crashtest-1,crashtest-2,crashtest-3,crashtest-ipc,xpcshell,jsreftest,jsreftest-1,jsreftest-2,jsreftest-3,jetpack,marionette,marionette-webapi,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'), ('NYYNYYYYYYYYYYYYYYYYYYYYYYYYYNYYYNNYNNNYYY', '-b do -p all -u reftest,reftest-1,reftest-2,reftest-3,reftest-4,reftest-5,reftest-6,reftest-ipc,reftest-no-accel,crashtest,crashtest-1,crashtest-2,crashtest-3,crashtest-ipc,xpcshell,jsreftest,jsreftest-1,jsreftest-2,jsreftest-3,jetpack,marionette,marionette-webapi,mozmill,robocop,mochitest-1,mochitest-2,mochitest-5,mochitest-bc,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'), ('NYYNYNNNNNNNNNNNNNNYYNNNNYYNNNYYYYYYNNNYYY', '-b do -p all -u xpcshell,jsreftest,marionette,marionette-webapi,mochitest-1,mochitest-2,mochitest-3,mochitest-4,mochitest-5,mochitest-bc,mochitest-o -t all'),
('NYYNYYNNNNNNYNNNNYYNNNNYNNYYY', '-b do -p all -u reftest,crashtest,xpcshell,jsreftest,marionette,mochitests -t all'), ('NYYNYYNNNNNNNNYNNNNYYNNNNYYNNYYY', '-b do -p all -u reftest,crashtest,xpcshell,jsreftest,marionette,marionette-webapi,mochitests -t all'),
('NYYYNNNN', '-b do -p all -u all -t none'), ('NYYYNNNN', '-b do -p all -u all -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'), ('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'), ('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'), ('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'), ('NYYNYNNNNNNNNNNNNNNNNNNNNNNNNYNN', '-b do -p all -u mochitests -t none'),
] ]


invalid_tests = [ invalid_tests = [
('NYNNNNNNNNYY', ": try: -b do -p -u all -t all"), # No platforms ('NYNNNNNNNNNNNNYY', ": try: -b do -p -u all -t all"), # No platforms
('NNNNYYY', ""), # No builds ('NNNNYYY', ""), # No builds
('NYYNYNNNNNNNNNNNNNNNNNNNNNNNNNN', ": try: -b do -p all -u -t none"), # Wanted unittests, none picked ('NYYNYNNNNNNNNNNNNNNNNNNNNNNNNNNNNNN', ": 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 ('NYYYNYNNNNNNNNYNNNNNNNNNN', ": try: -b do -p all -u all -t"), # Wanted talos, none picked
] ]


Expand Down