Skip to content


Subversion checkout URL

You can clone with
Download ZIP
Browse files

Fix addition of Win64 platform

We weren't actually prompting about Win64, but if we had, we
would have done a second "win32?" prompt.
  • Loading branch information...
commit 7e5ff44b6415c203286e4acf5c08faa5efb368c8 1 parent 63313c7
@philor philor authored
Showing with 10 additions and 8 deletions.
  1. +6 −4 trychooser
  2. +4 −4 trychooser_test
10 trychooser
@@ -40,8 +40,8 @@ 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_none = NoPrompt (" -p none")
@@ -135,8 +135,10 @@ 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_win32.y = p_win64
+p_win32.n = p_win64
+p_win64.y = p_android
+p_win64.n = p_android
p_android.y = D(u_all)
p_android.n = D(u_all)
8 trychooser_test
@@ -15,9 +15,9 @@ 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'),
+ ('NYNYYYYYYYY', '-b do -p linux,linux64,macosx64,win32,win64,android -u all -t all'),
+ ('NYNNNYYNNYY', '-b do -p macosx64,win32 -u all -t all'),
+ ('NYNNNNNNYYYY', '-b do -p android -u all -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'),
('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'),
@@ -32,7 +32,7 @@ tests = [
invalid_tests = [
- ('NYNNNNNNYY', ": try: -b do -p -u all -t all"), # No platforms
+ ('NYNNNNNNNYY', ": try: -b do -p -u all -t all"), # No platforms
('NNNNYYY', ""), # No builds
('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
Please sign in to comment.
Something went wrong with that request. Please try again.