From 92fa43fe9a5bd567491dfd02a7ecbbdf209c23a7 Mon Sep 17 00:00:00 2001 From: Mark Hammond Date: Sun, 15 Nov 2015 15:21:00 +0100 Subject: [PATCH] Bug 1224689 - Add a 'sync' mozinfo variable and only run test_remotetabmatches.js if it is defined. r=ted --- python/mozbuild/mozbuild/mozinfo.py | 1 + toolkit/components/places/tests/unifiedcomplete/xpcshell.ini | 1 + 2 files changed, 2 insertions(+) diff --git a/python/mozbuild/mozbuild/mozinfo.py b/python/mozbuild/mozbuild/mozinfo.py index 7854b7726c9..09a87c39fa3 100755 --- a/python/mozbuild/mozbuild/mozinfo.py +++ b/python/mozbuild/mozbuild/mozinfo.py @@ -85,6 +85,7 @@ def build_dict(config, env=os.environ): d['crashreporter'] = bool(substs.get('MOZ_CRASHREPORTER')) d['datareporting'] = bool(substs.get('MOZ_DATA_REPORTING')) d['healthreport'] = substs.get('MOZ_SERVICES_HEALTHREPORT') == '1' + d['sync'] = substs.get('MOZ_SERVICES_SYNC') == '1' d['asan'] = substs.get('MOZ_ASAN') == '1' d['tsan'] = substs.get('MOZ_TSAN') == '1' d['telemetry'] = substs.get('MOZ_TELEMETRY_REPORTING') == '1' diff --git a/toolkit/components/places/tests/unifiedcomplete/xpcshell.ini b/toolkit/components/places/tests/unifiedcomplete/xpcshell.ini index ce3221e31f0..69b7e959d3b 100644 --- a/toolkit/components/places/tests/unifiedcomplete/xpcshell.ini +++ b/toolkit/components/places/tests/unifiedcomplete/xpcshell.ini @@ -31,6 +31,7 @@ support-files = [test_multi_word_search.js] [test_queryurl.js] [test_remotetabmatches.js] +skip-if = !sync [test_searchEngine_alias.js] [test_searchEngine_current.js] [test_searchEngine_host.js]