Sat, 03 Jan 2015 20:18:00 +0100
Conditionally enable double key logic according to:
private browsing mode or privacy.thirdparty.isolate preference and
implement in GetCookieStringCommon and FindCookie where it counts...
With some reservations of how to convince FindCookie users to test
condition and pass a nullptr when disabling double key logic.
1 # This Source Code Form is subject to the terms of the Mozilla Public
2 # License, v. 2.0. If a copy of the MPL was not distributed with this
3 # file, You can obtain one at http://mozilla.org/MPL/2.0/.
5 XPCSHELLTESTROOT = $(abspath $(DEPTH))/_tests/xpcshell/$(relativesrcdir)
6 CHROMETESTROOT = $(abspath $(DEPTH))/_tests/testing/mochitest/chrome/$(relativesrcdir)
8 DEFINES += \
9 -DAB_CD=$(AB_CD) \
10 $(NULL)
12 PP_TARGETS += aus-update-head
13 aus-update-head_FLAGS := -Fsubstitution $(DEFINES) $(ACDEFINES)
14 aus-update-head := $(srcdir)/unit_aus_update/head_update.js
15 aus-update-head_PATH := $(XPCSHELLTESTROOT)/unit_aus_update
17 INSTALL_TARGETS += xpcshell-data
18 xpcshell-data_TARGET := libs
19 xpcshell-data_DEST := $(XPCSHELLTESTROOT)/data
20 xpcshell-data_FILES := $(wildcard $(srcdir)/data/*)
22 # Android doesn't use the Mozilla updater or the toolkit update UI
23 ifneq (android,$(MOZ_WIDGET_TOOLKIT))
24 INSTALL_TARGETS += base-updater-head
25 base-updater-head_TARGET := libs
26 base-updater-head_DEST := $(XPCSHELLTESTROOT)/unit_base_updater
27 base-updater-head_FILES := $(XPCSHELLTESTROOT)/unit_aus_update/head_update.js
29 ifdef MOZ_MAINTENANCE_SERVICE
30 INSTALL_TARGETS += service-updater-head
31 service-updater-head_TARGET := libs
32 service-updater-head_DEST := $(XPCSHELLTESTROOT)/unit_service_updater
33 service-updater-head_FILES := $(XPCSHELLTESTROOT)/unit_aus_update/head_update.js
34 endif # MOZ_MAINTENANCE_SERVICE
36 ifndef MOZ_PROFILE_GENERATE
37 ifdef COMPILE_ENVIRONMENT
38 INSTALL_TARGETS += xpcshell-test-helper
39 xpcshell-test-helper_TARGET := libs
40 xpcshell-test-helper_DEST := $(XPCSHELLTESTROOT)/data
41 xpcshell-test-helper_FILES := $(DIST)/bin/TestAUSHelper$(BIN_SUFFIX)
42 endif
43 endif # Not MOZ_PROFILE_GENERATE
45 _CHROME_SHARED := \
46 update.sjs \
47 utils.js \
48 $(NULL)
49 PP_TARGETS += chrome-shared
50 chrome-shared := $(addprefix $(srcdir)/chrome/,$(_CHROME_SHARED))
51 chrome-shared_PATH := $(CHROMETESTROOT)/chrome
53 _CHROME_DATA := \
54 simple.mar \
55 $(NULL)
56 INSTALL_TARGETS += chrome-data
57 chrome-data_TARGET := libs
58 chrome-data_DEST := $(CHROMETESTROOT)/data
59 chrome-data_FILES := $(addprefix $(srcdir)/data/,$(_CHROME_DATA))
61 INI_TEST_FILES = \
62 TestAUSReadStrings1.ini \
63 TestAUSReadStrings2.ini \
64 TestAUSReadStrings3.ini \
65 $(NULL)
67 MOZ_WINCONSOLE = 1
69 ifeq ($(OS_ARCH),WINNT)
70 LIBS += $(call EXPAND_LIBNAME_PATH,updatecommon-standalone,../common-standalone)
71 OS_LIBS += $(call EXPAND_LIBNAME,wintrust shlwapi)
72 else
73 LIBS += $(call EXPAND_LIBNAME_PATH,updatecommon,../common)
74 endif
76 endif # Not Android
78 include $(topsrcdir)/config/rules.mk
80 ifneq (android,$(MOZ_WIDGET_TOOLKIT))
81 # TestAUSReadStrings runs during check in the following directory with a Unicode
82 # char in order to test bug 473417 on Windows.
83 ifeq ($(OS_ARCH),WINNT)
84 bug473417dir = test_bug473417-ó
85 else
86 bug473417dir = test_bug473417
87 endif
89 check::
90 $(RM) -rf $(DEPTH)/_tests/updater/ && $(NSINSTALL) -D $(DEPTH)/_tests/updater/$(bug473417dir)/
91 for i in $(INI_TEST_FILES); do \
92 $(INSTALL) $(srcdir)/$$i $(DEPTH)/_tests/updater/$(bug473417dir)/; \
93 done
94 $(INSTALL) $(FINAL_TARGET)/TestAUSReadStrings$(BIN_SUFFIX) $(DEPTH)/_tests/updater/$(bug473417dir)/
95 @$(RUN_TEST_PROGRAM) $(DEPTH)/_tests/updater/$(bug473417dir)/TestAUSReadStrings$(BIN_SUFFIX)
96 endif # Not Android