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