Bug 821343 - TestAUSHelper doesn't exist for b2g xpcshell_updater tests, r=ahal
authorRobert Strong <rstrong@mozilla.com>
Sun, 16 Dec 2012 15:53:57 -0500
changeset 121770 fbec2ea99d3ab6eab8de7d78117aa412fd1ca2c2
parent 121769 62a769a3ae0e269485bcc1fd80f3dc8ba7f56919
child 121771 fefbcfe3575a126795e3f478431950cf7ff17e2b
push idunknown
push userunknown
push dateunknown
reviewersahal
bugs821343
milestone20.0a1
Bug 821343 - TestAUSHelper doesn't exist for b2g xpcshell_updater tests, r=ahal
toolkit/mozapps/update/test/Makefile.in
toolkit/mozapps/update/test/unit/xpcshell_updater.ini
--- a/toolkit/mozapps/update/test/Makefile.in
+++ b/toolkit/mozapps/update/test/Makefile.in
@@ -24,18 +24,17 @@ DEFINES += \
   -DNS_NO_XPCOM \
   -DMOZ_DEBUG=$(MOZ_DEBUG) \
   $(NULL)
 
 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)
 
 CPPSRCS = \
   TestAUSReadStrings.cpp \
   TestAUSHelper.cpp \
   $(NULL)
@@ -63,17 +62,17 @@ LIBS += \
 ifeq ($(OS_ARCH),WINNT)
 USE_STATIC_LIBS = 1
 DEFINES += -DUNICODE -D_UNICODE
 endif
 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)
 bug473417dir = test_bug473417-
 else
 bug473417dir = test_bug473417
 endif
 
@@ -84,14 +83,14 @@ check::
 	done
 	$(INSTALL) $(FINAL_TARGET)/TestAUSReadStrings$(BIN_SUFFIX) $(DEPTH)/_tests/updater/$(bug473417dir)/
 	@$(RUN_TEST_PROGRAM) $(DEPTH)/_tests/updater/$(bug473417dir)/TestAUSReadStrings$(BIN_SUFFIX)
 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
--- a/toolkit/mozapps/update/test/unit/xpcshell_updater.ini
+++ b/toolkit/mozapps/update/test/unit/xpcshell_updater.ini
@@ -1,24 +1,15 @@
 [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
 [test_0201_app_launch_apply_update.js]
 skip-if = toolkit == "gonk"
 reason = bug 820380