Bug 821343 - TestAUSHelper doesn't exist for b2g xpcshell_updater tests, r=ahal

This commit is contained in:
Robert Strong 2012-12-16 15:53:57 -05:00
parent c4babd77a1
commit d08742bda0
2 changed files with 5 additions and 15 deletions

View File

@ -29,8 +29,7 @@ ifdef MOZ_MAINTENANCE_SERVICE
DEFINES += -DMOZ_MAINTENANCE_SERVICE=$(MOZ_MAINTENANCE_SERVICE)
endif
# Android doesn't build the updater binary, so it skips the things that test it.
ifneq ($(OS_TARGET),Android)
ifneq (android,$(MOZ_WIDGET_TOOLKIT))
DIRS = \
chrome \
$(NULL)
@ -68,7 +67,7 @@ endif # Not Android
include $(topsrcdir)/config/rules.mk
ifneq ($(OS_TARGET),Android)
ifneq (android,$(MOZ_WIDGET_TOOLKIT))
# TestAUSReadStrings runs during check in the following directory with a Unicode
# char in order to test bug 473417 on Windows.
ifeq ($(OS_ARCH),WINNT)
@ -89,9 +88,9 @@ endif # Not Android
libs:: unit/head_update.js.in
$(PYTHON) $(MOZILLA_DIR)/config/Preprocessor.py -Fsubstitution $(DEFINES) $(ACDEFINES) $^ > $(TESTROOT)/unit/head_update.js
ifneq ($(OS_TARGET),Android)
ifneq (android,$(MOZ_WIDGET_TOOLKIT))
ifndef MOZ_PROFILE_GENERATE
libs::
$(INSTALL) TestAUSHelper$(BIN_SUFFIX) $(DEPTH)/_tests/xpcshell/$(relativesrcdir)/unit
endif
endif # Not Android
endif

View File

@ -1,21 +1,12 @@
[test_0110_general.js]
skip-if = toolkit == "gonk"
reason = bug 820380
[test_0111_general.js]
skip-if = toolkit == "gonk"
reason = bug 820380
[test_0112_general.js]
skip-if = toolkit == "gonk"
reason = bug 820380
[test_0113_general.js]
skip-if = os == "mac" || toolkit == "gonk"
reason = bug 820380
[test_0114_general.js]
skip-if = os == "mac" || toolkit == "gonk"
reason = bug 820380
skip-if = os == "mac"
[test_0115_general.js]
skip-if = toolkit == "gonk"
reason = bug 820380
[test_0200_app_launch_apply_update.js]
skip-if = toolkit == "gonk"
reason = bug 820380