Bug 814748 - Provide the ability to enable/disable xpcshell tests for per-window private browsing builds; r=ted

This commit is contained in:
Ehsan Akhgari 2012-11-24 11:48:10 -05:00
parent 136a70ea49
commit 78562d643e
2 changed files with 4 additions and 0 deletions

View File

@ -65,6 +65,9 @@ def build_dict(env=os.environ):
# crashreporter # crashreporter
d["crashreporter"] = 'MOZ_CRASHREPORTER' in env and env['MOZ_CRASHREPORTER'] == '1' d["crashreporter"] = 'MOZ_CRASHREPORTER' in env and env['MOZ_CRASHREPORTER'] == '1'
# per-window private browsing
d["perwindowprivatebrowsing"] = 'MOZ_PER_WINDOW_PRIVATE_BROWSING' in env and env['MOZ_PER_WINDOW_PRIVATE_BROWSING'] == '1'
return d return d
#TODO: replace this with the json module when Python >= 2.6 is a requirement. #TODO: replace this with the json module when Python >= 2.6 is a requirement.

View File

@ -8885,6 +8885,7 @@ MOZ_DEBUG=${MOZ_DEBUG} \
MOZ_WIDGET_TOOLKIT=${MOZ_WIDGET_TOOLKIT} \ MOZ_WIDGET_TOOLKIT=${MOZ_WIDGET_TOOLKIT} \
UNIVERSAL_BINARY=${UNIVERSAL_BINARY} \ UNIVERSAL_BINARY=${UNIVERSAL_BINARY} \
MOZ_CRASHREPORTER=${MOZ_CRASHREPORTER} \ MOZ_CRASHREPORTER=${MOZ_CRASHREPORTER} \
MOZ_PER_WINDOW_PRIVATE_BROWSING=${MOZ_PER_WINDOW_PRIVATE_BROWSING} \
$PYTHON ${_topsrcdir}/config/writemozinfo.py ./mozinfo.json.tmp $PYTHON ${_topsrcdir}/config/writemozinfo.py ./mozinfo.json.tmp
if cmp -s ./mozinfo.json.tmp ./mozinfo.json; then if cmp -s ./mozinfo.json.tmp ./mozinfo.json; then
rm ./mozinfo.json.tmp rm ./mozinfo.json.tmp