Permalink
Browse files

Add Android-Armv6 platform

  • Loading branch information...
1 parent 7e5ff44 commit 183cc42953d7e773c01f67356a3fdb21eb3431da @philor philor committed Sep 17, 2012
Showing with 9 additions and 6 deletions.
  1. +5 −2 trychooser
  2. +4 −4 trychooser_test
View
@@ -43,6 +43,7 @@ p_macosx64 = N ("macosx64", "Build on Mac OSX 10.6 (x86-64, 64-bit, part of a un
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')
@@ -139,8 +140,10 @@ 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)
+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
View
@@ -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'),
- ('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'),
+ ('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'),
('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 = [
- ('NYNNNNNNNYY', ": try: -b do -p -u all -t all"), # No platforms
+ ('NYNNNNNNNNYY', ": 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

0 comments on commit 183cc42

Please sign in to comment.