Magic-Mirror/gecko-dev
1
0
Fork 0
mirror of https://github.com/mozilla/gecko-dev.git synced 2025-02-28 05:10:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Bug 868329 - Switch legacy cases of test disabling on Android/B2G using makefile ifdefs over to android.json & b2g.json. r=edmorley

Browse Source
This commit is contained in:
Joel Maher 2013-05-07 12:46:45 -04:00
parent 9ca82995cc
commit 85d4edebe2
7 changed files with 17 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
dom/tests/mochitest/general/Makefile.in
View File

@ -51,19 +51,13 @@ MOCHITEST_FILES = \
test_interfaces.html \
test_idleapi_permissions.html \
test_stylesheetPI.html \
test_showModalDialog.html \
file_showModalDialog.html \
$(NULL)
# Disable this test until bug 795711 is fixed.
# test_network_events.html \
# Don't run modal dialog tests on mobile.
ifneq ($(OS_TARGET),Android)
MOCHITEST_FILES += \
test_showModalDialog.html \
file_showModalDialog.html \
$(NULL)
endif
MOCHITEST_CHROME_FILES = \
test_innerScreen.xul \
test_offsets.xul \

8
parser/htmlparser/tests/mochitest/Makefile.in
View File

@ -82,15 +82,9 @@ MOCHITEST_FILES = parser_datreader.js \
test_bug717180.html \
file_bug717180.html \
test_xml_mislabeled.html \
test_bug709083.html \
$(NULL)
# Test disabled on mobile. See bug 737020.
ifneq ($(OS_TARGET),Android)
ifndef MOZ_PLATFORM_MAEMO
MOCHITEST_FILES += test_bug709083.html
endif
endif
# Disabled test due to orange on Linux
# test_bug568470.html \
# file_bug568470.sjs \

6
testing/mochitest/android.json
View File

@ -191,6 +191,7 @@
"dom/tests/mochitest/general/test_497898.html": "",
"dom/tests/mochitest/general/test_focusrings.xul": "TIMED_OUT",
"dom/tests/mochitest/general/test_vibrator.html": "CRASH_SUTAGENT",
"dom/tests/mochitest/general/test_showModalDialog.html": "Don't run modal tests on Android",
"dom/tests/mochitest/geolocation/test_allowCurrent.html": "TIMED_OUT",
"dom/tests/mochitest/geolocation/test_allowWatch.html": "TIMED_OUT",
"dom/tests/mochitest/geolocation/test_cachedPosition.html": "TIMED_OUT",
@ -289,6 +290,7 @@
"layout/style/test/test_visited_pref.html": "TIMED_OUT",
"layout/style/test/test_visited_reftests.html": "TIMED_OUT",
"layout/xul/base/test/test_bug511075.html": "bug 798806",
"parser/htmlparser/tests/mochitest/test_bug709083.html": "bug 737020",
"parser/htmlparser/tests/mochitest/test_html5_tree_construction.html": "TIMED_OUT",
"parser/htmlparser/tests/mochitest/test_html5_tree_construction_part2.html": "TIMED_OUT",
"robocop": "TIMED_OUT",
@ -333,6 +335,8 @@
"widget/tests/test_bug760802.html": "",
"dom/tests/mochitest/ajax/offline": "SLOW_DIRECTORY",
"layout/base/tests": "SLOW_DIRECTORY",
"Harness_sanity/test_bug816847.html": "No test app installed"
"Harness_sanity/test_bug816847.html": "No test app installed",
"Harness_sanity/test_sanityEventUtils.html": "bug 688052",
"Harness_sanity/test_sanitySimpletest.html": "bug 688052"
}
}

8
testing/mochitest/b2g.json
View File

@ -261,6 +261,7 @@
"dom/tests/mochitest/general/test_windowedhistoryframes.html":"",
"dom/tests/mochitest/general/test_idleapi_permissions.html":"",
"dom/tests/mochitest/general/test_interfaces.html":"",
"dom/tests/mochitest/general/test_showModalDialog.html": "Don't run modal tests on Android",
"dom/tests/mochitest/geolocation/test_allowCurrent.html":"",
"dom/tests/mochitest/geolocation/test_allowWatch.html":"",
"dom/tests/mochitest/geolocation/test_cachedPosition.html":"",
@ -418,6 +419,11 @@
"layout/style/test/test_visited_pref.html" : "timed out",
"layout/style/test/test_visited_reftests.html":"",
"layout/tables/test/test_bug541668_table_event_delivery.html":"",
"layout/xul" : "xml doesn't work in b2g"
"layout/xul" : "xml doesn't work in b2g",
"parser/htmlparser/tests/mochitest/test_bug709083.html": "bug 737020",
"Harness_sanity/test_sanityEventUtils.html": "bug 688052",
"Harness_sanity/test_sanitySimpletest.html": "bug 688052"
}
}

8
testing/mochitest/tests/Makefile.in
View File

@ -24,14 +24,10 @@ _TEST_FILES = \
test_bug816847.html \
test_sanity_cleanup.html \
test_sanity_cleanup2.html \
test_sanityEventUtils.html \
test_sanitySimpletest.html \
$(NULL)
ifneq ($(OS_TARGET),Android)
# Disabled on Android for permaorange, see bug 688052
_TEST_FILES += \
test_sanityEventUtils.html \
test_sanitySimpletest.html
endif
# Copy the sanity tests into a subdirectory, so the top level is all dirs
# in the test screen.
libs:: $(_TEST_FILES)

5
toolkit/devtools/styleeditor/Makefile.in
View File

@ -8,11 +8,6 @@ srcdir = @srcdir@
VPATH = @srcdir@
include $(DEPTH)/config/autoconf.mk
#ifneq (Android,$(OS_TARGET))
# TEST_DIRS += test
#endif
include $(topsrcdir)/config/rules.mk
#libs::

1
toolkit/devtools/styleeditor/moz.build
View File

@ -3,4 +3,3 @@
# License, v. 2.0. If a copy of the MPL was not distributed with this
# file, You can obtain one at http://mozilla.org/MPL/2.0/.
#TEST_DIRS += ['tests']