summaryrefslogtreecommitdiffstats
path: root/layout/xul
diff options
context:
space:
mode:
authorMoonchild <moonchild@palemoon.org>2020-12-26 10:16:55 +0000
committerMoonchild <moonchild@palemoon.org>2020-12-26 10:16:55 +0000
commitae2a160348562dfa5361f1e68226365b240c9597 (patch)
tree8c3ee83f8a4b618942d4e215a6937af20d7a66b4 /layout/xul
parent9f004841a248c7c17f536be77d7af67de7b3f39b (diff)
downloadUXP-ae2a160348562dfa5361f1e68226365b240c9597.tar
UXP-ae2a160348562dfa5361f1e68226365b240c9597.tar.gz
UXP-ae2a160348562dfa5361f1e68226365b240c9597.tar.lz
UXP-ae2a160348562dfa5361f1e68226365b240c9597.tar.xz
UXP-ae2a160348562dfa5361f1e68226365b240c9597.zip
Issue #1053 - Part 2a: Remove android from /layout (partial)
This removes android code from base, build, forms, generic, inspector, style, printing, tools and xul.
Diffstat (limited to 'layout/xul')
-rw-r--r--layout/xul/crashtests/crashtests.list4
-rw-r--r--layout/xul/reftest/reftest.list4
-rw-r--r--layout/xul/test/chrome.ini1
-rw-r--r--layout/xul/test/mochitest.ini3
4 files changed, 4 insertions, 8 deletions
diff --git a/layout/xul/crashtests/crashtests.list b/layout/xul/crashtests/crashtests.list
index 4ee6654c6..ad7c84770 100644
--- a/layout/xul/crashtests/crashtests.list
+++ b/layout/xul/crashtests/crashtests.list
@@ -32,7 +32,7 @@ load 360642-1.xul
load 365151.xul
load 366112-1.xul
asserts(0-50) load 366203-1.xul # bug 1217984
-asserts(24) asserts-if(Android&&!asyncPan,9) load 367185-1.xhtml # bug 1220345
+asserts(24) load 367185-1.xhtml # bug 1220345
load 369942-1.xhtml
load 374102-1.xul
load 376137-1.html
@@ -77,7 +77,7 @@ load 434458-1.xul
load 452185.html
load 460900-1.xul
load 464149-1.xul
-asserts-if(winWidget,1) asserts-if(Android,0-1) load 464407-1.xhtml # Bug 450974 on win, Bug 1267054 on Android
+asserts-if(winWidget,1) load 464407-1.xhtml # Bug 450974
load 467080.xul
load 467481-1.xul
load 470063-1.html
diff --git a/layout/xul/reftest/reftest.list b/layout/xul/reftest/reftest.list
index 39f353577..4f927b5d0 100644
--- a/layout/xul/reftest/reftest.list
+++ b/layout/xul/reftest/reftest.list
@@ -1,6 +1,6 @@
-fails-if(Android) == textbox-multiline-noresize.xul textbox-multiline-ref.xul # reference is blank on Android (due to no native theme support?)
+== textbox-multiline-noresize.xul textbox-multiline-ref.xul
!= textbox-multiline-resize.xul textbox-multiline-ref.xul
== popup-explicit-size.xul popup-explicit-size-ref.xul
-random-if(Android) == image-size.xul image-size-ref.xul
+== image-size.xul image-size-ref.xul
== image-scaling-min-height-1.xul image-scaling-min-height-1-ref.xul
== textbox-text-transform.xul textbox-text-transform-ref.xul
diff --git a/layout/xul/test/chrome.ini b/layout/xul/test/chrome.ini
index 2a647b6b7..44224dca8 100644
--- a/layout/xul/test/chrome.ini
+++ b/layout/xul/test/chrome.ini
@@ -1,5 +1,4 @@
[DEFAULT]
-skip-if = os == 'android'
support-files =
window_resizer.xul
window_resizer_element.xul
diff --git a/layout/xul/test/mochitest.ini b/layout/xul/test/mochitest.ini
index 540abc730..e48262ab0 100644
--- a/layout/xul/test/mochitest.ini
+++ b/layout/xul/test/mochitest.ini
@@ -3,10 +3,7 @@
[test_bug386386.html]
[test_bug394800.xhtml]
[test_bug511075.html]
-skip-if = toolkit == 'android' #bug 798806
[test_bug563416.html]
[test_bug1197913.xul]
-skip-if = toolkit == 'android'
[test_resizer_incontent.xul]
[test_splitter.xul]
-skip-if = toolkit == 'android' # no XUL theme