diff options
| author | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-20 10:54:51 +0100 |
|---|---|---|
| committer | wolfbeast <mcwerewolf@wolfbeast.com> | 2019-02-20 10:54:51 +0100 |
| commit | fc0a0f13ad6f0e4e60246d2cfd324a2fb1f0b35f (patch) | |
| tree | 12babcd8964575da9fbbcfd516ce1513823451ee /toolkit/mozapps/update/tests | |
| parent | 833be88a6dfe1d52ab6a22ec498d515293c9d034 (diff) | |
| download | UXP-fc0a0f13ad6f0e4e60246d2cfd324a2fb1f0b35f.tar UXP-fc0a0f13ad6f0e4e60246d2cfd324a2fb1f0b35f.tar.gz UXP-fc0a0f13ad6f0e4e60246d2cfd324a2fb1f0b35f.tar.lz UXP-fc0a0f13ad6f0e4e60246d2cfd324a2fb1f0b35f.tar.xz UXP-fc0a0f13ad6f0e4e60246d2cfd324a2fb1f0b35f.zip | |
Remove conditional MOZ_MAINTENANCE_SERVICE code
Tag #145
Diffstat (limited to 'toolkit/mozapps/update/tests')
| -rw-r--r-- | toolkit/mozapps/update/tests/TestAUSHelper.cpp | 10 | ||||
| -rw-r--r-- | toolkit/mozapps/update/tests/moz.build | 6 |
2 files changed, 1 insertions, 15 deletions
diff --git a/toolkit/mozapps/update/tests/TestAUSHelper.cpp b/toolkit/mozapps/update/tests/TestAUSHelper.cpp index f71103b7a..a20c4a79a 100644 --- a/toolkit/mozapps/update/tests/TestAUSHelper.cpp +++ b/toolkit/mozapps/update/tests/TestAUSHelper.cpp @@ -217,16 +217,8 @@ int NS_main(int argc, NS_tchar **argv) } if (!NS_tstrcmp(argv[1], NS_T("check-signature"))) { -#if defined(XP_WIN) && defined(MOZ_MAINTENANCE_SERVICE) - if (ERROR_SUCCESS == VerifyCertificateTrustForFile(argv[2])) { - return 0; - } else { - return 1; - } -#else - // Not implemented on non-Windows platforms + // Not implemented return 1; -#endif } if (!NS_tstrcmp(argv[1], NS_T("setup-symlink"))) { diff --git a/toolkit/mozapps/update/tests/moz.build b/toolkit/mozapps/update/tests/moz.build index 842ec7f90..94949b17f 100644 --- a/toolkit/mozapps/update/tests/moz.build +++ b/toolkit/mozapps/update/tests/moz.build @@ -15,9 +15,6 @@ XPCSHELL_TESTS_MANIFESTS += [ 'unit_base_updater/xpcshell.ini' ] -if CONFIG['MOZ_MAINTENANCE_SERVICE']: - XPCSHELL_TESTS_MANIFESTS += ['unit_service_updater/xpcshell.ini'] - SimplePrograms([ 'TestAUSHelper', 'TestAUSReadStrings', @@ -47,9 +44,6 @@ for var in ('MOZ_APP_NAME', 'MOZ_APP_BASENAME', 'MOZ_APP_DISPLAYNAME', DEFINES['NS_NO_XPCOM'] = True -if CONFIG['MOZ_MAINTENANCE_SERVICE']: - DEFINES['MOZ_MAINTENANCE_SERVICE'] = CONFIG['MOZ_MAINTENANCE_SERVICE'] - # For debugging purposes only #DEFINES['DISABLE_UPDATER_AUTHENTICODE_CHECK'] = True |