Test only - Bug 1354850 - Use updater to run general app update service tests and remove gonk test code. r=mhowell

This commit is contained in:
Robert Strong 2017-04-10 13:00:06 -07:00
Родитель fd68582d06
Коммит af651cefc1
50 изменённых файлов: 199 добавлений и 1856 удалений

Просмотреть файл

@ -1,320 +0,0 @@
UPDATE TYPE complete
PREPARE REMOVEFILE searchplugins/searchpluginstext0
PREPARE REMOVEFILE searchplugins/searchpluginspng0.png
PREPARE REMOVEFILE removed-files
PREPARE REMOVEFILE precomplete
PREPARE REMOVEFILE exe0.exe
PREPARE REMOVEFILE 2/20/20text0
PREPARE REMOVEFILE 2/20/20png0.png
PREPARE REMOVEFILE 0/0exe0.exe
PREPARE REMOVEFILE 0/00/00text0
PREPARE REMOVEDIR searchplugins/
PREPARE REMOVEDIR defaults/pref/
PREPARE REMOVEDIR defaults/
PREPARE REMOVEDIR 2/20/
PREPARE REMOVEDIR 2/
PREPARE REMOVEDIR 0/00/
PREPARE REMOVEDIR 0/
PREPARE ADD searchplugins/searchpluginstext0
PREPARE ADD searchplugins/searchpluginspng1.png
PREPARE ADD searchplugins/searchpluginspng0.png
PREPARE ADD removed-files
PREPARE ADD precomplete
PREPARE ADD exe0.exe
PREPARE ADD distribution/extensions/extensions1/extensions1text0
PREPARE ADD distribution/extensions/extensions1/extensions1png1.png
PREPARE ADD distribution/extensions/extensions1/extensions1png0.png
PREPARE ADD distribution/extensions/extensions0/extensions0text0
PREPARE ADD distribution/extensions/extensions0/extensions0png1.png
PREPARE ADD distribution/extensions/extensions0/extensions0png0.png
PREPARE ADD 1/10/10text0
PREPARE ADD 0/0exe0.exe
PREPARE ADD 0/00/00text1
PREPARE ADD 0/00/00text0
PREPARE ADD 0/00/00png0.png
PREPARE REMOVEDIR 9/99/
PREPARE REMOVEDIR 9/99/
PREPARE REMOVEDIR 9/98/
PREPARE REMOVEFILE 9/97/971/97xtext1
PREPARE REMOVEFILE 9/97/971/97xtext0
PREPARE REMOVEDIR 9/97/971/
PREPARE REMOVEFILE 9/97/970/97xtext1
PREPARE REMOVEFILE 9/97/970/97xtext0
PREPARE REMOVEDIR 9/97/970/
PREPARE REMOVEDIR 9/97/
PREPARE REMOVEFILE 9/96/96text1
PREPARE REMOVEFILE 9/96/96text0
PREPARE REMOVEDIR 9/96/
PREPARE REMOVEDIR 9/95/
PREPARE REMOVEDIR 9/95/
PREPARE REMOVEDIR 9/94/
PREPARE REMOVEDIR 9/94/
PREPARE REMOVEDIR 9/93/
PREPARE REMOVEDIR 9/92/
PREPARE REMOVEDIR 9/91/
PREPARE REMOVEDIR 9/90/
PREPARE REMOVEDIR 9/90/
PREPARE REMOVEDIR 8/89/
PREPARE REMOVEDIR 8/89/
PREPARE REMOVEDIR 8/88/
PREPARE REMOVEFILE 8/87/871/87xtext1
PREPARE REMOVEFILE 8/87/871/87xtext0
PREPARE REMOVEDIR 8/87/871/
PREPARE REMOVEFILE 8/87/870/87xtext1
PREPARE REMOVEFILE 8/87/870/87xtext0
PREPARE REMOVEDIR 8/87/870/
PREPARE REMOVEDIR 8/87/
PREPARE REMOVEFILE 8/86/86text1
PREPARE REMOVEFILE 8/86/86text0
PREPARE REMOVEDIR 8/86/
PREPARE REMOVEDIR 8/85/
PREPARE REMOVEDIR 8/85/
PREPARE REMOVEDIR 8/84/
PREPARE REMOVEDIR 8/84/
PREPARE REMOVEDIR 8/83/
PREPARE REMOVEDIR 8/82/
PREPARE REMOVEDIR 8/81/
PREPARE REMOVEDIR 8/80/
PREPARE REMOVEDIR 8/80/
PREPARE REMOVEFILE 7/71/7xtext1
PREPARE REMOVEFILE 7/71/7xtext0
PREPARE REMOVEFILE 7/71/7xtest.exe
PREPARE REMOVEDIR 7/71/
PREPARE REMOVEFILE 7/70/7xtext1
PREPARE REMOVEFILE 7/70/7xtext0
PREPARE REMOVEFILE 7/70/7xtest.exe
PREPARE REMOVEDIR 7/70/
PREPARE REMOVEFILE 7/7text1
PREPARE REMOVEFILE 7/7text0
PREPARE REMOVEDIR 7/
PREPARE REMOVEDIR 6/
PREPARE REMOVEFILE 5/5text1
PREPARE REMOVEFILE 5/5text0
PREPARE REMOVEFILE 5/5text1
PREPARE REMOVEFILE 5/5text0
PREPARE REMOVEFILE 5/5test.exe
PREPARE REMOVEDIR 5/
PREPARE REMOVEFILE 4/4text1
PREPARE REMOVEFILE 4/4text0
PREPARE REMOVEDIR 4/
PREPARE REMOVEFILE 3/3text1
PREPARE REMOVEFILE 3/3text0
EXECUTE REMOVEFILE searchplugins/searchpluginstext0
EXECUTE REMOVEFILE searchplugins/searchpluginspng0.png
EXECUTE REMOVEFILE removed-files
EXECUTE REMOVEFILE precomplete
EXECUTE REMOVEFILE exe0.exe
EXECUTE REMOVEFILE 2/20/20text0
EXECUTE REMOVEFILE 2/20/20png0.png
EXECUTE REMOVEFILE 0/0exe0.exe
EXECUTE REMOVEFILE 0/00/00text0
EXECUTE REMOVEDIR searchplugins/
EXECUTE REMOVEDIR defaults/pref/
EXECUTE REMOVEDIR defaults/
EXECUTE REMOVEDIR 2/20/
EXECUTE REMOVEDIR 2/
EXECUTE REMOVEDIR 0/00/
EXECUTE REMOVEDIR 0/
EXECUTE ADD searchplugins/searchpluginstext0
EXECUTE ADD searchplugins/searchpluginspng1.png
EXECUTE ADD searchplugins/searchpluginspng0.png
EXECUTE ADD removed-files
EXECUTE ADD precomplete
EXECUTE ADD exe0.exe
EXECUTE ADD distribution/extensions/extensions1/extensions1text0
EXECUTE ADD distribution/extensions/extensions1/extensions1png1.png
EXECUTE ADD distribution/extensions/extensions1/extensions1png0.png
EXECUTE ADD distribution/extensions/extensions0/extensions0text0
EXECUTE ADD distribution/extensions/extensions0/extensions0png1.png
EXECUTE ADD distribution/extensions/extensions0/extensions0png0.png
EXECUTE ADD 1/10/10text0
EXECUTE ADD 0/0exe0.exe
EXECUTE ADD 0/00/00text1
EXECUTE ADD 0/00/00text0
EXECUTE ADD 0/00/00png0.png
EXECUTE REMOVEDIR 9/99/
EXECUTE REMOVEDIR 9/99/
EXECUTE REMOVEDIR 9/98/
EXECUTE REMOVEFILE 9/97/971/97xtext1
EXECUTE REMOVEFILE 9/97/971/97xtext0
EXECUTE REMOVEDIR 9/97/971/
EXECUTE REMOVEFILE 9/97/970/97xtext1
EXECUTE REMOVEFILE 9/97/970/97xtext0
EXECUTE REMOVEDIR 9/97/970/
EXECUTE REMOVEDIR 9/97/
EXECUTE REMOVEFILE 9/96/96text1
EXECUTE REMOVEFILE 9/96/96text0
EXECUTE REMOVEDIR 9/96/
EXECUTE REMOVEDIR 9/95/
EXECUTE REMOVEDIR 9/95/
EXECUTE REMOVEDIR 9/94/
EXECUTE REMOVEDIR 9/94/
EXECUTE REMOVEDIR 9/93/
EXECUTE REMOVEDIR 9/92/
EXECUTE REMOVEDIR 9/91/
EXECUTE REMOVEDIR 9/90/
EXECUTE REMOVEDIR 9/90/
EXECUTE REMOVEDIR 8/89/
EXECUTE REMOVEDIR 8/89/
EXECUTE REMOVEDIR 8/88/
EXECUTE REMOVEFILE 8/87/871/87xtext1
EXECUTE REMOVEFILE 8/87/871/87xtext0
EXECUTE REMOVEDIR 8/87/871/
EXECUTE REMOVEFILE 8/87/870/87xtext1
EXECUTE REMOVEFILE 8/87/870/87xtext0
EXECUTE REMOVEDIR 8/87/870/
EXECUTE REMOVEDIR 8/87/
EXECUTE REMOVEFILE 8/86/86text1
EXECUTE REMOVEFILE 8/86/86text0
EXECUTE REMOVEDIR 8/86/
EXECUTE REMOVEDIR 8/85/
EXECUTE REMOVEDIR 8/85/
EXECUTE REMOVEDIR 8/84/
EXECUTE REMOVEDIR 8/84/
EXECUTE REMOVEDIR 8/83/
EXECUTE REMOVEDIR 8/82/
EXECUTE REMOVEDIR 8/81/
EXECUTE REMOVEDIR 8/80/
EXECUTE REMOVEDIR 8/80/
EXECUTE REMOVEFILE 7/71/7xtext1
EXECUTE REMOVEFILE 7/71/7xtext0
EXECUTE REMOVEFILE 7/71/7xtest.exe
EXECUTE REMOVEDIR 7/71/
EXECUTE REMOVEFILE 7/70/7xtext1
EXECUTE REMOVEFILE 7/70/7xtext0
EXECUTE REMOVEFILE 7/70/7xtest.exe
EXECUTE REMOVEDIR 7/70/
EXECUTE REMOVEFILE 7/7text1
EXECUTE REMOVEFILE 7/7text0
EXECUTE REMOVEDIR 7/
EXECUTE REMOVEDIR 6/
EXECUTE REMOVEFILE 5/5text1
EXECUTE REMOVEFILE 5/5text0
EXECUTE REMOVEFILE 5/5text1
file cannot be removed because it does not exist; skipping
EXECUTE REMOVEFILE 5/5text0
file cannot be removed because it does not exist; skipping
EXECUTE REMOVEFILE 5/5test.exe
EXECUTE REMOVEDIR 5/
EXECUTE REMOVEFILE 4/4text1
EXECUTE REMOVEFILE 4/4text0
EXECUTE REMOVEDIR 4/
EXECUTE REMOVEFILE 3/3text1
EXECUTE REMOVEFILE 3/3text0
FINISH REMOVEFILE searchplugins/searchpluginstext0
FINISH REMOVEFILE searchplugins/searchpluginspng0.png
FINISH REMOVEFILE removed-files
FINISH REMOVEFILE precomplete
FINISH REMOVEFILE exe0.exe
FINISH REMOVEFILE 2/20/20text0
FINISH REMOVEFILE 2/20/20png0.png
FINISH REMOVEFILE 0/0exe0.exe
FINISH REMOVEFILE 0/00/00text0
FINISH REMOVEDIR searchplugins/
removing directory: searchplugins/, rv: 0
FINISH REMOVEDIR defaults/pref/
removing directory: defaults/pref/, rv: 0
FINISH REMOVEDIR defaults/
removing directory: defaults/, rv: 0
FINISH REMOVEDIR 2/20/
FINISH REMOVEDIR 2/
FINISH REMOVEDIR 0/00/
removing directory: 0/00/, rv: 0
FINISH REMOVEDIR 0/
removing directory: 0/, rv: 0
FINISH ADD searchplugins/searchpluginstext0
FINISH ADD searchplugins/searchpluginspng1.png
FINISH ADD searchplugins/searchpluginspng0.png
FINISH ADD removed-files
FINISH ADD precomplete
FINISH ADD exe0.exe
FINISH ADD distribution/extensions/extensions1/extensions1text0
FINISH ADD distribution/extensions/extensions1/extensions1png1.png
FINISH ADD distribution/extensions/extensions1/extensions1png0.png
FINISH ADD distribution/extensions/extensions0/extensions0text0
FINISH ADD distribution/extensions/extensions0/extensions0png1.png
FINISH ADD distribution/extensions/extensions0/extensions0png0.png
FINISH ADD 1/10/10text0
FINISH ADD 0/0exe0.exe
FINISH ADD 0/00/00text1
FINISH ADD 0/00/00text0
FINISH ADD 0/00/00png0.png
FINISH REMOVEDIR 9/99/
FINISH REMOVEDIR 9/99/
directory no longer exists; skipping
FINISH REMOVEDIR 9/98/
FINISH REMOVEFILE 9/97/971/97xtext1
FINISH REMOVEFILE 9/97/971/97xtext0
FINISH REMOVEDIR 9/97/971/
FINISH REMOVEFILE 9/97/970/97xtext1
FINISH REMOVEFILE 9/97/970/97xtext0
FINISH REMOVEDIR 9/97/970/
FINISH REMOVEDIR 9/97/
FINISH REMOVEFILE 9/96/96text1
FINISH REMOVEFILE 9/96/96text0
FINISH REMOVEDIR 9/96/
FINISH REMOVEDIR 9/95/
FINISH REMOVEDIR 9/95/
directory no longer exists; skipping
FINISH REMOVEDIR 9/94/
FINISH REMOVEDIR 9/94/
directory no longer exists; skipping
FINISH REMOVEDIR 9/93/
FINISH REMOVEDIR 9/92/
removing directory: 9/92/, rv: 0
FINISH REMOVEDIR 9/91/
removing directory: 9/91/, rv: 0
FINISH REMOVEDIR 9/90/
FINISH REMOVEDIR 9/90/
directory no longer exists; skipping
FINISH REMOVEDIR 8/89/
FINISH REMOVEDIR 8/89/
directory no longer exists; skipping
FINISH REMOVEDIR 8/88/
FINISH REMOVEFILE 8/87/871/87xtext1
FINISH REMOVEFILE 8/87/871/87xtext0
FINISH REMOVEDIR 8/87/871/
FINISH REMOVEFILE 8/87/870/87xtext1
FINISH REMOVEFILE 8/87/870/87xtext0
FINISH REMOVEDIR 8/87/870/
FINISH REMOVEDIR 8/87/
FINISH REMOVEFILE 8/86/86text1
FINISH REMOVEFILE 8/86/86text0
FINISH REMOVEDIR 8/86/
FINISH REMOVEDIR 8/85/
FINISH REMOVEDIR 8/85/
directory no longer exists; skipping
FINISH REMOVEDIR 8/84/
FINISH REMOVEDIR 8/84/
directory no longer exists; skipping
FINISH REMOVEDIR 8/83/
FINISH REMOVEDIR 8/82/
removing directory: 8/82/, rv: 0
FINISH REMOVEDIR 8/81/
removing directory: 8/81/, rv: 0
FINISH REMOVEDIR 8/80/
FINISH REMOVEDIR 8/80/
directory no longer exists; skipping
FINISH REMOVEFILE 7/71/7xtext1
FINISH REMOVEFILE 7/71/7xtext0
FINISH REMOVEFILE 7/71/7xtest.exe
FINISH REMOVEDIR 7/71/
FINISH REMOVEFILE 7/70/7xtext1
FINISH REMOVEFILE 7/70/7xtext0
FINISH REMOVEFILE 7/70/7xtest.exe
FINISH REMOVEDIR 7/70/
FINISH REMOVEFILE 7/7text1
FINISH REMOVEFILE 7/7text0
FINISH REMOVEDIR 7/
FINISH REMOVEDIR 6/
FINISH REMOVEFILE 5/5text1
FINISH REMOVEFILE 5/5text0
FINISH REMOVEFILE 5/5test.exe
FINISH REMOVEDIR 5/
FINISH REMOVEFILE 4/4text1
FINISH REMOVEFILE 4/4text0
FINISH REMOVEDIR 4/
FINISH REMOVEFILE 3/3text1
FINISH REMOVEFILE 3/3text0
succeeded
calling QuitProgressUI

Просмотреть файл

@ -1,320 +0,0 @@
UPDATE TYPE complete
PREPARE REMOVEFILE searchplugins/searchpluginstext0
PREPARE REMOVEFILE searchplugins/searchpluginspng0.png
PREPARE REMOVEFILE removed-files
PREPARE REMOVEFILE precomplete
PREPARE REMOVEFILE exe0.exe
PREPARE REMOVEFILE 2/20/20text0
PREPARE REMOVEFILE 2/20/20png0.png
PREPARE REMOVEFILE 0/0exe0.exe
PREPARE REMOVEFILE 0/00/00text0
PREPARE REMOVEDIR searchplugins/
PREPARE REMOVEDIR defaults/pref/
PREPARE REMOVEDIR defaults/
PREPARE REMOVEDIR 2/20/
PREPARE REMOVEDIR 2/
PREPARE REMOVEDIR 0/00/
PREPARE REMOVEDIR 0/
PREPARE ADD searchplugins/searchpluginstext0
PREPARE ADD searchplugins/searchpluginspng1.png
PREPARE ADD searchplugins/searchpluginspng0.png
PREPARE ADD removed-files
PREPARE ADD precomplete
PREPARE ADD exe0.exe
PREPARE ADD distribution/extensions/extensions1/extensions1text0
PREPARE ADD distribution/extensions/extensions1/extensions1png1.png
PREPARE ADD distribution/extensions/extensions1/extensions1png0.png
PREPARE ADD distribution/extensions/extensions0/extensions0text0
PREPARE ADD distribution/extensions/extensions0/extensions0png1.png
PREPARE ADD distribution/extensions/extensions0/extensions0png0.png
PREPARE ADD 1/10/10text0
PREPARE ADD 0/0exe0.exe
PREPARE ADD 0/00/00text1
PREPARE ADD 0/00/00text0
PREPARE ADD 0/00/00png0.png
PREPARE REMOVEDIR 9/99/
PREPARE REMOVEDIR 9/99/
PREPARE REMOVEDIR 9/98/
PREPARE REMOVEFILE 9/97/970/97xtext0
PREPARE REMOVEFILE 9/97/970/97xtext1
PREPARE REMOVEDIR 9/97/970/
PREPARE REMOVEFILE 9/97/971/97xtext0
PREPARE REMOVEFILE 9/97/971/97xtext1
PREPARE REMOVEDIR 9/97/971/
PREPARE REMOVEDIR 9/97/
PREPARE REMOVEFILE 9/96/96text0
PREPARE REMOVEFILE 9/96/96text1
PREPARE REMOVEDIR 9/96/
PREPARE REMOVEDIR 9/95/
PREPARE REMOVEDIR 9/95/
PREPARE REMOVEDIR 9/94/
PREPARE REMOVEDIR 9/94/
PREPARE REMOVEDIR 9/93/
PREPARE REMOVEDIR 9/92/
PREPARE REMOVEDIR 9/91/
PREPARE REMOVEDIR 9/90/
PREPARE REMOVEDIR 9/90/
PREPARE REMOVEDIR 8/89/
PREPARE REMOVEDIR 8/89/
PREPARE REMOVEDIR 8/88/
PREPARE REMOVEFILE 8/87/870/87xtext0
PREPARE REMOVEFILE 8/87/870/87xtext1
PREPARE REMOVEDIR 8/87/870/
PREPARE REMOVEFILE 8/87/871/87xtext0
PREPARE REMOVEFILE 8/87/871/87xtext1
PREPARE REMOVEDIR 8/87/871/
PREPARE REMOVEDIR 8/87/
PREPARE REMOVEFILE 8/86/86text0
PREPARE REMOVEFILE 8/86/86text1
PREPARE REMOVEDIR 8/86/
PREPARE REMOVEDIR 8/85/
PREPARE REMOVEDIR 8/85/
PREPARE REMOVEDIR 8/84/
PREPARE REMOVEDIR 8/84/
PREPARE REMOVEDIR 8/83/
PREPARE REMOVEDIR 8/82/
PREPARE REMOVEDIR 8/81/
PREPARE REMOVEDIR 8/80/
PREPARE REMOVEDIR 8/80/
PREPARE REMOVEFILE 7/7text0
PREPARE REMOVEFILE 7/7text1
PREPARE REMOVEFILE 7/70/7xtest.exe
PREPARE REMOVEFILE 7/70/7xtext0
PREPARE REMOVEFILE 7/70/7xtext1
PREPARE REMOVEDIR 7/70/
PREPARE REMOVEFILE 7/71/7xtest.exe
PREPARE REMOVEFILE 7/71/7xtext0
PREPARE REMOVEFILE 7/71/7xtext1
PREPARE REMOVEDIR 7/71/
PREPARE REMOVEDIR 7/
PREPARE REMOVEDIR 6/
PREPARE REMOVEFILE 5/5text1
PREPARE REMOVEFILE 5/5text0
PREPARE REMOVEFILE 5/5test.exe
PREPARE REMOVEFILE 5/5text0
PREPARE REMOVEFILE 5/5text1
PREPARE REMOVEDIR 5/
PREPARE REMOVEFILE 4/4text1
PREPARE REMOVEFILE 4/4text0
PREPARE REMOVEDIR 4/
PREPARE REMOVEFILE 3/3text1
PREPARE REMOVEFILE 3/3text0
EXECUTE REMOVEFILE searchplugins/searchpluginstext0
EXECUTE REMOVEFILE searchplugins/searchpluginspng0.png
EXECUTE REMOVEFILE removed-files
EXECUTE REMOVEFILE precomplete
EXECUTE REMOVEFILE exe0.exe
EXECUTE REMOVEFILE 2/20/20text0
EXECUTE REMOVEFILE 2/20/20png0.png
EXECUTE REMOVEFILE 0/0exe0.exe
EXECUTE REMOVEFILE 0/00/00text0
EXECUTE REMOVEDIR searchplugins/
EXECUTE REMOVEDIR defaults/pref/
EXECUTE REMOVEDIR defaults/
EXECUTE REMOVEDIR 2/20/
EXECUTE REMOVEDIR 2/
EXECUTE REMOVEDIR 0/00/
EXECUTE REMOVEDIR 0/
EXECUTE ADD searchplugins/searchpluginstext0
EXECUTE ADD searchplugins/searchpluginspng1.png
EXECUTE ADD searchplugins/searchpluginspng0.png
EXECUTE ADD removed-files
EXECUTE ADD precomplete
EXECUTE ADD exe0.exe
EXECUTE ADD distribution/extensions/extensions1/extensions1text0
EXECUTE ADD distribution/extensions/extensions1/extensions1png1.png
EXECUTE ADD distribution/extensions/extensions1/extensions1png0.png
EXECUTE ADD distribution/extensions/extensions0/extensions0text0
EXECUTE ADD distribution/extensions/extensions0/extensions0png1.png
EXECUTE ADD distribution/extensions/extensions0/extensions0png0.png
EXECUTE ADD 1/10/10text0
EXECUTE ADD 0/0exe0.exe
EXECUTE ADD 0/00/00text1
EXECUTE ADD 0/00/00text0
EXECUTE ADD 0/00/00png0.png
EXECUTE REMOVEDIR 9/99/
EXECUTE REMOVEDIR 9/99/
EXECUTE REMOVEDIR 9/98/
EXECUTE REMOVEFILE 9/97/970/97xtext0
EXECUTE REMOVEFILE 9/97/970/97xtext1
EXECUTE REMOVEDIR 9/97/970/
EXECUTE REMOVEFILE 9/97/971/97xtext0
EXECUTE REMOVEFILE 9/97/971/97xtext1
EXECUTE REMOVEDIR 9/97/971/
EXECUTE REMOVEDIR 9/97/
EXECUTE REMOVEFILE 9/96/96text0
EXECUTE REMOVEFILE 9/96/96text1
EXECUTE REMOVEDIR 9/96/
EXECUTE REMOVEDIR 9/95/
EXECUTE REMOVEDIR 9/95/
EXECUTE REMOVEDIR 9/94/
EXECUTE REMOVEDIR 9/94/
EXECUTE REMOVEDIR 9/93/
EXECUTE REMOVEDIR 9/92/
EXECUTE REMOVEDIR 9/91/
EXECUTE REMOVEDIR 9/90/
EXECUTE REMOVEDIR 9/90/
EXECUTE REMOVEDIR 8/89/
EXECUTE REMOVEDIR 8/89/
EXECUTE REMOVEDIR 8/88/
EXECUTE REMOVEFILE 8/87/870/87xtext0
EXECUTE REMOVEFILE 8/87/870/87xtext1
EXECUTE REMOVEDIR 8/87/870/
EXECUTE REMOVEFILE 8/87/871/87xtext0
EXECUTE REMOVEFILE 8/87/871/87xtext1
EXECUTE REMOVEDIR 8/87/871/
EXECUTE REMOVEDIR 8/87/
EXECUTE REMOVEFILE 8/86/86text0
EXECUTE REMOVEFILE 8/86/86text1
EXECUTE REMOVEDIR 8/86/
EXECUTE REMOVEDIR 8/85/
EXECUTE REMOVEDIR 8/85/
EXECUTE REMOVEDIR 8/84/
EXECUTE REMOVEDIR 8/84/
EXECUTE REMOVEDIR 8/83/
EXECUTE REMOVEDIR 8/82/
EXECUTE REMOVEDIR 8/81/
EXECUTE REMOVEDIR 8/80/
EXECUTE REMOVEDIR 8/80/
EXECUTE REMOVEFILE 7/7text0
EXECUTE REMOVEFILE 7/7text1
EXECUTE REMOVEFILE 7/70/7xtest.exe
EXECUTE REMOVEFILE 7/70/7xtext0
EXECUTE REMOVEFILE 7/70/7xtext1
EXECUTE REMOVEDIR 7/70/
EXECUTE REMOVEFILE 7/71/7xtest.exe
EXECUTE REMOVEFILE 7/71/7xtext0
EXECUTE REMOVEFILE 7/71/7xtext1
EXECUTE REMOVEDIR 7/71/
EXECUTE REMOVEDIR 7/
EXECUTE REMOVEDIR 6/
EXECUTE REMOVEFILE 5/5text1
EXECUTE REMOVEFILE 5/5text0
EXECUTE REMOVEFILE 5/5test.exe
EXECUTE REMOVEFILE 5/5text0
file cannot be removed because it does not exist; skipping
EXECUTE REMOVEFILE 5/5text1
file cannot be removed because it does not exist; skipping
EXECUTE REMOVEDIR 5/
EXECUTE REMOVEFILE 4/4text1
EXECUTE REMOVEFILE 4/4text0
EXECUTE REMOVEDIR 4/
EXECUTE REMOVEFILE 3/3text1
EXECUTE REMOVEFILE 3/3text0
FINISH REMOVEFILE searchplugins/searchpluginstext0
FINISH REMOVEFILE searchplugins/searchpluginspng0.png
FINISH REMOVEFILE removed-files
FINISH REMOVEFILE precomplete
FINISH REMOVEFILE exe0.exe
FINISH REMOVEFILE 2/20/20text0
FINISH REMOVEFILE 2/20/20png0.png
FINISH REMOVEFILE 0/0exe0.exe
FINISH REMOVEFILE 0/00/00text0
FINISH REMOVEDIR searchplugins/
removing directory: searchplugins/, rv: 0
FINISH REMOVEDIR defaults/pref/
removing directory: defaults/pref/, rv: 0
FINISH REMOVEDIR defaults/
removing directory: defaults/, rv: 0
FINISH REMOVEDIR 2/20/
FINISH REMOVEDIR 2/
FINISH REMOVEDIR 0/00/
removing directory: 0/00/, rv: 0
FINISH REMOVEDIR 0/
removing directory: 0/, rv: 0
FINISH ADD searchplugins/searchpluginstext0
FINISH ADD searchplugins/searchpluginspng1.png
FINISH ADD searchplugins/searchpluginspng0.png
FINISH ADD removed-files
FINISH ADD precomplete
FINISH ADD exe0.exe
FINISH ADD distribution/extensions/extensions1/extensions1text0
FINISH ADD distribution/extensions/extensions1/extensions1png1.png
FINISH ADD distribution/extensions/extensions1/extensions1png0.png
FINISH ADD distribution/extensions/extensions0/extensions0text0
FINISH ADD distribution/extensions/extensions0/extensions0png1.png
FINISH ADD distribution/extensions/extensions0/extensions0png0.png
FINISH ADD 1/10/10text0
FINISH ADD 0/0exe0.exe
FINISH ADD 0/00/00text1
FINISH ADD 0/00/00text0
FINISH ADD 0/00/00png0.png
FINISH REMOVEDIR 9/99/
FINISH REMOVEDIR 9/99/
directory no longer exists; skipping
FINISH REMOVEDIR 9/98/
FINISH REMOVEFILE 9/97/970/97xtext0
FINISH REMOVEFILE 9/97/970/97xtext1
FINISH REMOVEDIR 9/97/970/
FINISH REMOVEFILE 9/97/971/97xtext0
FINISH REMOVEFILE 9/97/971/97xtext1
FINISH REMOVEDIR 9/97/971/
FINISH REMOVEDIR 9/97/
FINISH REMOVEFILE 9/96/96text0
FINISH REMOVEFILE 9/96/96text1
FINISH REMOVEDIR 9/96/
FINISH REMOVEDIR 9/95/
FINISH REMOVEDIR 9/95/
directory no longer exists; skipping
FINISH REMOVEDIR 9/94/
FINISH REMOVEDIR 9/94/
directory no longer exists; skipping
FINISH REMOVEDIR 9/93/
FINISH REMOVEDIR 9/92/
removing directory: 9/92/, rv: 0
FINISH REMOVEDIR 9/91/
removing directory: 9/91/, rv: 0
FINISH REMOVEDIR 9/90/
FINISH REMOVEDIR 9/90/
directory no longer exists; skipping
FINISH REMOVEDIR 8/89/
FINISH REMOVEDIR 8/89/
directory no longer exists; skipping
FINISH REMOVEDIR 8/88/
FINISH REMOVEFILE 8/87/870/87xtext0
FINISH REMOVEFILE 8/87/870/87xtext1
FINISH REMOVEDIR 8/87/870/
FINISH REMOVEFILE 8/87/871/87xtext0
FINISH REMOVEFILE 8/87/871/87xtext1
FINISH REMOVEDIR 8/87/871/
FINISH REMOVEDIR 8/87/
FINISH REMOVEFILE 8/86/86text0
FINISH REMOVEFILE 8/86/86text1
FINISH REMOVEDIR 8/86/
FINISH REMOVEDIR 8/85/
FINISH REMOVEDIR 8/85/
directory no longer exists; skipping
FINISH REMOVEDIR 8/84/
FINISH REMOVEDIR 8/84/
directory no longer exists; skipping
FINISH REMOVEDIR 8/83/
FINISH REMOVEDIR 8/82/
removing directory: 8/82/, rv: 0
FINISH REMOVEDIR 8/81/
removing directory: 8/81/, rv: 0
FINISH REMOVEDIR 8/80/
FINISH REMOVEDIR 8/80/
directory no longer exists; skipping
FINISH REMOVEFILE 7/7text0
FINISH REMOVEFILE 7/7text1
FINISH REMOVEFILE 7/70/7xtest.exe
FINISH REMOVEFILE 7/70/7xtext0
FINISH REMOVEFILE 7/70/7xtext1
FINISH REMOVEDIR 7/70/
FINISH REMOVEFILE 7/71/7xtest.exe
FINISH REMOVEFILE 7/71/7xtext0
FINISH REMOVEFILE 7/71/7xtext1
FINISH REMOVEDIR 7/71/
FINISH REMOVEDIR 7/
FINISH REMOVEDIR 6/
FINISH REMOVEFILE 5/5text1
FINISH REMOVEFILE 5/5text0
FINISH REMOVEFILE 5/5test.exe
FINISH REMOVEDIR 5/
FINISH REMOVEFILE 4/4text1
FINISH REMOVEFILE 4/4text0
FINISH REMOVEDIR 4/
FINISH REMOVEFILE 3/3text1
FINISH REMOVEFILE 3/3text0
succeeded
calling QuitProgressUI

Просмотреть файл

@ -1,192 +0,0 @@
UPDATE TYPE partial
PREPARE ADD searchplugins/searchpluginstext0
PREPARE PATCH searchplugins/searchpluginspng1.png
PREPARE PATCH searchplugins/searchpluginspng0.png
PREPARE ADD precomplete
PREPARE PATCH exe0.exe
PREPARE ADD distribution/extensions/extensions1/extensions1text0
PREPARE PATCH distribution/extensions/extensions1/extensions1png1.png
PREPARE PATCH distribution/extensions/extensions1/extensions1png0.png
PREPARE ADD distribution/extensions/extensions0/extensions0text0
PREPARE PATCH distribution/extensions/extensions0/extensions0png1.png
PREPARE PATCH distribution/extensions/extensions0/extensions0png0.png
PREPARE PATCH 0/0exe0.exe
PREPARE ADD 0/00/00text0
PREPARE PATCH 0/00/00png0.png
PREPARE ADD 2/20/20text0
PREPARE ADD 2/20/20png0.png
PREPARE ADD 0/00/00text2
PREPARE REMOVEFILE 1/10/10text0
PREPARE REMOVEFILE 0/00/00text1
PREPARE REMOVEDIR 9/99/
PREPARE REMOVEDIR 9/99/
PREPARE REMOVEDIR 9/98/
PREPARE REMOVEFILE 9/97/971/97xtext1
PREPARE REMOVEFILE 9/97/971/97xtext0
PREPARE REMOVEDIR 9/97/971/
PREPARE REMOVEFILE 9/97/970/97xtext1
PREPARE REMOVEFILE 9/97/970/97xtext0
PREPARE REMOVEDIR 9/97/970/
PREPARE REMOVEDIR 9/97/
PREPARE REMOVEFILE 9/96/96text1
PREPARE REMOVEFILE 9/96/96text0
PREPARE REMOVEDIR 9/96/
PREPARE REMOVEDIR 9/95/
PREPARE REMOVEDIR 9/95/
PREPARE REMOVEDIR 9/94/
PREPARE REMOVEDIR 9/94/
PREPARE REMOVEDIR 9/93/
PREPARE REMOVEDIR 9/92/
PREPARE REMOVEDIR 9/91/
PREPARE REMOVEDIR 9/90/
PREPARE REMOVEDIR 9/90/
PREPARE REMOVEDIR 8/89/
PREPARE REMOVEDIR 8/89/
PREPARE REMOVEDIR 8/88/
PREPARE REMOVEFILE 8/87/871/87xtext1
PREPARE REMOVEFILE 8/87/871/87xtext0
PREPARE REMOVEDIR 8/87/871/
PREPARE REMOVEFILE 8/87/870/87xtext1
PREPARE REMOVEFILE 8/87/870/87xtext0
PREPARE REMOVEDIR 8/87/870/
PREPARE REMOVEDIR 8/87/
PREPARE REMOVEFILE 8/86/86text1
PREPARE REMOVEFILE 8/86/86text0
PREPARE REMOVEDIR 8/86/
PREPARE REMOVEDIR 8/85/
PREPARE REMOVEDIR 8/85/
PREPARE REMOVEDIR 8/84/
PREPARE REMOVEDIR 8/84/
PREPARE REMOVEDIR 8/83/
PREPARE REMOVEDIR 8/82/
PREPARE REMOVEDIR 8/81/
PREPARE REMOVEDIR 8/80/
PREPARE REMOVEDIR 8/80/
PREPARE REMOVEFILE 7/71/7xtext1
PREPARE REMOVEFILE 7/71/7xtext0
PREPARE REMOVEFILE 7/71/7xtest.exe
PREPARE REMOVEDIR 7/71/
PREPARE REMOVEFILE 7/70/7xtext1
PREPARE REMOVEFILE 7/70/7xtext0
PREPARE REMOVEFILE 7/70/7xtest.exe
PREPARE REMOVEDIR 7/70/
PREPARE REMOVEFILE 7/7text1
PREPARE REMOVEFILE 7/7text0
PREPARE REMOVEDIR 7/
PREPARE REMOVEDIR 6/
PREPARE REMOVEFILE 5/5text1
PREPARE REMOVEFILE 5/5text0
PREPARE REMOVEFILE 5/5text1
PREPARE REMOVEFILE 5/5text0
PREPARE REMOVEFILE 5/5test.exe
PREPARE REMOVEDIR 5/
PREPARE REMOVEFILE 4/4text1
PREPARE REMOVEFILE 4/4text0
PREPARE REMOVEDIR 4/
PREPARE REMOVEFILE 3/3text1
PREPARE REMOVEFILE 3/3text0
PREPARE REMOVEDIR 1/10/
PREPARE REMOVEDIR 1/
EXECUTE ADD searchplugins/searchpluginstext0
EXECUTE PATCH searchplugins/searchpluginspng1.png
EXECUTE PATCH searchplugins/searchpluginspng0.png
EXECUTE ADD precomplete
EXECUTE PATCH exe0.exe
EXECUTE ADD distribution/extensions/extensions1/extensions1text0
EXECUTE PATCH distribution/extensions/extensions1/extensions1png1.png
EXECUTE PATCH distribution/extensions/extensions1/extensions1png0.png
EXECUTE ADD distribution/extensions/extensions0/extensions0text0
EXECUTE PATCH distribution/extensions/extensions0/extensions0png1.png
EXECUTE PATCH distribution/extensions/extensions0/extensions0png0.png
EXECUTE PATCH 0/0exe0.exe
LoadSourceFile: destination file size 776 does not match expected size 79872
LoadSourceFile failed
### execution failed
FINISH ADD searchplugins/searchpluginstext0
FINISH PATCH searchplugins/searchpluginspng1.png
FINISH PATCH searchplugins/searchpluginspng0.png
FINISH ADD precomplete
FINISH PATCH exe0.exe
FINISH ADD distribution/extensions/extensions1/extensions1text0
backup_restore: backup file doesn't exist: distribution/extensions/extensions1/extensions1text0.moz-backup
FINISH PATCH distribution/extensions/extensions1/extensions1png1.png
FINISH PATCH distribution/extensions/extensions1/extensions1png0.png
FINISH ADD distribution/extensions/extensions0/extensions0text0
FINISH PATCH distribution/extensions/extensions0/extensions0png1.png
FINISH PATCH distribution/extensions/extensions0/extensions0png0.png
FINISH PATCH 0/0exe0.exe
backup_restore: backup file doesn't exist: 0/0exe0.exe.moz-backup
FINISH ADD 0/00/00text0
backup_restore: backup file doesn't exist: 0/00/00text0.moz-backup
FINISH PATCH 0/00/00png0.png
backup_restore: backup file doesn't exist: 0/00/00png0.png.moz-backup
FINISH ADD 2/20/20text0
backup_restore: backup file doesn't exist: 2/20/20text0.moz-backup
FINISH ADD 2/20/20png0.png
backup_restore: backup file doesn't exist: 2/20/20png0.png.moz-backup
FINISH ADD 0/00/00text2
backup_restore: backup file doesn't exist: 0/00/00text2.moz-backup
FINISH REMOVEFILE 1/10/10text0
backup_restore: backup file doesn't exist: 1/10/10text0.moz-backup
FINISH REMOVEFILE 0/00/00text1
backup_restore: backup file doesn't exist: 0/00/00text1.moz-backup
FINISH REMOVEFILE 9/97/971/97xtext1
backup_restore: backup file doesn't exist: 9/97/971/97xtext1.moz-backup
FINISH REMOVEFILE 9/97/971/97xtext0
backup_restore: backup file doesn't exist: 9/97/971/97xtext0.moz-backup
FINISH REMOVEFILE 9/97/970/97xtext1
backup_restore: backup file doesn't exist: 9/97/970/97xtext1.moz-backup
FINISH REMOVEFILE 9/97/970/97xtext0
backup_restore: backup file doesn't exist: 9/97/970/97xtext0.moz-backup
FINISH REMOVEFILE 9/96/96text1
backup_restore: backup file doesn't exist: 9/96/96text1.moz-backup
FINISH REMOVEFILE 9/96/96text0
backup_restore: backup file doesn't exist: 9/96/96text0.moz-backup
FINISH REMOVEFILE 8/87/871/87xtext1
backup_restore: backup file doesn't exist: 8/87/871/87xtext1.moz-backup
FINISH REMOVEFILE 8/87/871/87xtext0
backup_restore: backup file doesn't exist: 8/87/871/87xtext0.moz-backup
FINISH REMOVEFILE 8/87/870/87xtext1
backup_restore: backup file doesn't exist: 8/87/870/87xtext1.moz-backup
FINISH REMOVEFILE 8/87/870/87xtext0
backup_restore: backup file doesn't exist: 8/87/870/87xtext0.moz-backup
FINISH REMOVEFILE 8/86/86text1
backup_restore: backup file doesn't exist: 8/86/86text1.moz-backup
FINISH REMOVEFILE 8/86/86text0
backup_restore: backup file doesn't exist: 8/86/86text0.moz-backup
FINISH REMOVEFILE 7/71/7xtext1
backup_restore: backup file doesn't exist: 7/71/7xtext1.moz-backup
FINISH REMOVEFILE 7/71/7xtext0
backup_restore: backup file doesn't exist: 7/71/7xtext0.moz-backup
FINISH REMOVEFILE 7/71/7xtest.exe
backup_restore: backup file doesn't exist: 7/71/7xtest.exe.moz-backup
FINISH REMOVEFILE 7/70/7xtext1
backup_restore: backup file doesn't exist: 7/70/7xtext1.moz-backup
FINISH REMOVEFILE 7/70/7xtext0
backup_restore: backup file doesn't exist: 7/70/7xtext0.moz-backup
FINISH REMOVEFILE 7/70/7xtest.exe
backup_restore: backup file doesn't exist: 7/70/7xtest.exe.moz-backup
FINISH REMOVEFILE 7/7text1
backup_restore: backup file doesn't exist: 7/7text1.moz-backup
FINISH REMOVEFILE 7/7text0
backup_restore: backup file doesn't exist: 7/7text0.moz-backup
FINISH REMOVEFILE 5/5text1
backup_restore: backup file doesn't exist: 5/5text1.moz-backup
FINISH REMOVEFILE 5/5text0
backup_restore: backup file doesn't exist: 5/5text0.moz-backup
FINISH REMOVEFILE 5/5text1
backup_restore: backup file doesn't exist: 5/5text1.moz-backup
FINISH REMOVEFILE 5/5text0
backup_restore: backup file doesn't exist: 5/5text0.moz-backup
FINISH REMOVEFILE 5/5test.exe
backup_restore: backup file doesn't exist: 5/5test.exe.moz-backup
FINISH REMOVEFILE 4/4text1
backup_restore: backup file doesn't exist: 4/4text1.moz-backup
FINISH REMOVEFILE 4/4text0
backup_restore: backup file doesn't exist: 4/4text0.moz-backup
FINISH REMOVEFILE 3/3text1
backup_restore: backup file doesn't exist: 3/3text1.moz-backup
FINISH REMOVEFILE 3/3text0
backup_restore: backup file doesn't exist: 3/3text0.moz-backup
failed: 2
calling QuitProgressUI

Просмотреть файл

@ -1,279 +0,0 @@
UPDATE TYPE partial
PREPARE ADD searchplugins/searchpluginstext0
PREPARE PATCH searchplugins/searchpluginspng1.png
PREPARE PATCH searchplugins/searchpluginspng0.png
PREPARE ADD precomplete
PREPARE PATCH exe0.exe
PREPARE ADD distribution/extensions/extensions1/extensions1text0
PREPARE PATCH distribution/extensions/extensions1/extensions1png1.png
PREPARE PATCH distribution/extensions/extensions1/extensions1png0.png
PREPARE ADD distribution/extensions/extensions0/extensions0text0
PREPARE PATCH distribution/extensions/extensions0/extensions0png1.png
PREPARE PATCH distribution/extensions/extensions0/extensions0png0.png
PREPARE PATCH 0/0exe0.exe
PREPARE ADD 0/00/00text0
PREPARE PATCH 0/00/00png0.png
PREPARE ADD 2/20/20text0
PREPARE ADD 2/20/20png0.png
PREPARE ADD 0/00/00text2
PREPARE REMOVEFILE 1/10/10text0
PREPARE REMOVEFILE 0/00/00text1
PREPARE REMOVEDIR 9/99/
PREPARE REMOVEDIR 9/99/
PREPARE REMOVEDIR 9/98/
PREPARE REMOVEFILE 9/97/971/97xtext1
PREPARE REMOVEFILE 9/97/971/97xtext0
PREPARE REMOVEDIR 9/97/971/
PREPARE REMOVEFILE 9/97/970/97xtext1
PREPARE REMOVEFILE 9/97/970/97xtext0
PREPARE REMOVEDIR 9/97/970/
PREPARE REMOVEDIR 9/97/
PREPARE REMOVEFILE 9/96/96text1
PREPARE REMOVEFILE 9/96/96text0
PREPARE REMOVEDIR 9/96/
PREPARE REMOVEDIR 9/95/
PREPARE REMOVEDIR 9/95/
PREPARE REMOVEDIR 9/94/
PREPARE REMOVEDIR 9/94/
PREPARE REMOVEDIR 9/93/
PREPARE REMOVEDIR 9/92/
PREPARE REMOVEDIR 9/91/
PREPARE REMOVEDIR 9/90/
PREPARE REMOVEDIR 9/90/
PREPARE REMOVEDIR 8/89/
PREPARE REMOVEDIR 8/89/
PREPARE REMOVEDIR 8/88/
PREPARE REMOVEFILE 8/87/871/87xtext1
PREPARE REMOVEFILE 8/87/871/87xtext0
PREPARE REMOVEDIR 8/87/871/
PREPARE REMOVEFILE 8/87/870/87xtext1
PREPARE REMOVEFILE 8/87/870/87xtext0
PREPARE REMOVEDIR 8/87/870/
PREPARE REMOVEDIR 8/87/
PREPARE REMOVEFILE 8/86/86text1
PREPARE REMOVEFILE 8/86/86text0
PREPARE REMOVEDIR 8/86/
PREPARE REMOVEDIR 8/85/
PREPARE REMOVEDIR 8/85/
PREPARE REMOVEDIR 8/84/
PREPARE REMOVEDIR 8/84/
PREPARE REMOVEDIR 8/83/
PREPARE REMOVEDIR 8/82/
PREPARE REMOVEDIR 8/81/
PREPARE REMOVEDIR 8/80/
PREPARE REMOVEDIR 8/80/
PREPARE REMOVEFILE 7/71/7xtext1
PREPARE REMOVEFILE 7/71/7xtext0
PREPARE REMOVEFILE 7/71/7xtest.exe
PREPARE REMOVEDIR 7/71/
PREPARE REMOVEFILE 7/70/7xtext1
PREPARE REMOVEFILE 7/70/7xtext0
PREPARE REMOVEFILE 7/70/7xtest.exe
PREPARE REMOVEDIR 7/70/
PREPARE REMOVEFILE 7/7text1
PREPARE REMOVEFILE 7/7text0
PREPARE REMOVEDIR 7/
PREPARE REMOVEDIR 6/
PREPARE REMOVEFILE 5/5text1
PREPARE REMOVEFILE 5/5text0
PREPARE REMOVEFILE 5/5text1
PREPARE REMOVEFILE 5/5text0
PREPARE REMOVEFILE 5/5test.exe
PREPARE REMOVEDIR 5/
PREPARE REMOVEFILE 4/4text1
PREPARE REMOVEFILE 4/4text0
PREPARE REMOVEDIR 4/
PREPARE REMOVEFILE 3/3text1
PREPARE REMOVEFILE 3/3text0
PREPARE REMOVEDIR 1/10/
PREPARE REMOVEDIR 1/
EXECUTE ADD searchplugins/searchpluginstext0
EXECUTE PATCH searchplugins/searchpluginspng1.png
EXECUTE PATCH searchplugins/searchpluginspng0.png
EXECUTE ADD precomplete
EXECUTE PATCH exe0.exe
EXECUTE ADD distribution/extensions/extensions1/extensions1text0
EXECUTE PATCH distribution/extensions/extensions1/extensions1png1.png
EXECUTE PATCH distribution/extensions/extensions1/extensions1png0.png
EXECUTE ADD distribution/extensions/extensions0/extensions0text0
EXECUTE PATCH distribution/extensions/extensions0/extensions0png1.png
EXECUTE PATCH distribution/extensions/extensions0/extensions0png0.png
EXECUTE PATCH 0/0exe0.exe
EXECUTE ADD 0/00/00text0
EXECUTE PATCH 0/00/00png0.png
EXECUTE ADD 2/20/20text0
EXECUTE ADD 2/20/20png0.png
EXECUTE ADD 0/00/00text2
EXECUTE REMOVEFILE 1/10/10text0
EXECUTE REMOVEFILE 0/00/00text1
EXECUTE REMOVEDIR 9/99/
EXECUTE REMOVEDIR 9/99/
EXECUTE REMOVEDIR 9/98/
EXECUTE REMOVEFILE 9/97/971/97xtext1
EXECUTE REMOVEFILE 9/97/971/97xtext0
EXECUTE REMOVEDIR 9/97/971/
EXECUTE REMOVEFILE 9/97/970/97xtext1
EXECUTE REMOVEFILE 9/97/970/97xtext0
EXECUTE REMOVEDIR 9/97/970/
EXECUTE REMOVEDIR 9/97/
EXECUTE REMOVEFILE 9/96/96text1
EXECUTE REMOVEFILE 9/96/96text0
EXECUTE REMOVEDIR 9/96/
EXECUTE REMOVEDIR 9/95/
EXECUTE REMOVEDIR 9/95/
EXECUTE REMOVEDIR 9/94/
EXECUTE REMOVEDIR 9/94/
EXECUTE REMOVEDIR 9/93/
EXECUTE REMOVEDIR 9/92/
EXECUTE REMOVEDIR 9/91/
EXECUTE REMOVEDIR 9/90/
EXECUTE REMOVEDIR 9/90/
EXECUTE REMOVEDIR 8/89/
EXECUTE REMOVEDIR 8/89/
EXECUTE REMOVEDIR 8/88/
EXECUTE REMOVEFILE 8/87/871/87xtext1
EXECUTE REMOVEFILE 8/87/871/87xtext0
EXECUTE REMOVEDIR 8/87/871/
EXECUTE REMOVEFILE 8/87/870/87xtext1
EXECUTE REMOVEFILE 8/87/870/87xtext0
EXECUTE REMOVEDIR 8/87/870/
EXECUTE REMOVEDIR 8/87/
EXECUTE REMOVEFILE 8/86/86text1
EXECUTE REMOVEFILE 8/86/86text0
EXECUTE REMOVEDIR 8/86/
EXECUTE REMOVEDIR 8/85/
EXECUTE REMOVEDIR 8/85/
EXECUTE REMOVEDIR 8/84/
EXECUTE REMOVEDIR 8/84/
EXECUTE REMOVEDIR 8/83/
EXECUTE REMOVEDIR 8/82/
EXECUTE REMOVEDIR 8/81/
EXECUTE REMOVEDIR 8/80/
EXECUTE REMOVEDIR 8/80/
EXECUTE REMOVEFILE 7/71/7xtext1
EXECUTE REMOVEFILE 7/71/7xtext0
EXECUTE REMOVEFILE 7/71/7xtest.exe
EXECUTE REMOVEDIR 7/71/
EXECUTE REMOVEFILE 7/70/7xtext1
EXECUTE REMOVEFILE 7/70/7xtext0
EXECUTE REMOVEFILE 7/70/7xtest.exe
EXECUTE REMOVEDIR 7/70/
EXECUTE REMOVEFILE 7/7text1
EXECUTE REMOVEFILE 7/7text0
EXECUTE REMOVEDIR 7/
EXECUTE REMOVEDIR 6/
EXECUTE REMOVEFILE 5/5text1
EXECUTE REMOVEFILE 5/5text0
EXECUTE REMOVEFILE 5/5text1
file cannot be removed because it does not exist; skipping
EXECUTE REMOVEFILE 5/5text0
file cannot be removed because it does not exist; skipping
EXECUTE REMOVEFILE 5/5test.exe
EXECUTE REMOVEDIR 5/
EXECUTE REMOVEFILE 4/4text1
EXECUTE REMOVEFILE 4/4text0
EXECUTE REMOVEDIR 4/
EXECUTE REMOVEFILE 3/3text1
EXECUTE REMOVEFILE 3/3text0
EXECUTE REMOVEDIR 1/10/
EXECUTE REMOVEDIR 1/
FINISH ADD searchplugins/searchpluginstext0
FINISH PATCH searchplugins/searchpluginspng1.png
FINISH PATCH searchplugins/searchpluginspng0.png
FINISH ADD precomplete
FINISH PATCH exe0.exe
FINISH ADD distribution/extensions/extensions1/extensions1text0
FINISH PATCH distribution/extensions/extensions1/extensions1png1.png
FINISH PATCH distribution/extensions/extensions1/extensions1png0.png
FINISH ADD distribution/extensions/extensions0/extensions0text0
FINISH PATCH distribution/extensions/extensions0/extensions0png1.png
FINISH PATCH distribution/extensions/extensions0/extensions0png0.png
FINISH PATCH 0/0exe0.exe
FINISH ADD 0/00/00text0
FINISH PATCH 0/00/00png0.png
FINISH ADD 2/20/20text0
FINISH ADD 2/20/20png0.png
FINISH ADD 0/00/00text2
FINISH REMOVEFILE 1/10/10text0
FINISH REMOVEFILE 0/00/00text1
FINISH REMOVEDIR 9/99/
FINISH REMOVEDIR 9/99/
directory no longer exists; skipping
FINISH REMOVEDIR 9/98/
FINISH REMOVEFILE 9/97/971/97xtext1
FINISH REMOVEFILE 9/97/971/97xtext0
FINISH REMOVEDIR 9/97/971/
FINISH REMOVEFILE 9/97/970/97xtext1
FINISH REMOVEFILE 9/97/970/97xtext0
FINISH REMOVEDIR 9/97/970/
FINISH REMOVEDIR 9/97/
FINISH REMOVEFILE 9/96/96text1
FINISH REMOVEFILE 9/96/96text0
FINISH REMOVEDIR 9/96/
FINISH REMOVEDIR 9/95/
FINISH REMOVEDIR 9/95/
directory no longer exists; skipping
FINISH REMOVEDIR 9/94/
FINISH REMOVEDIR 9/94/
directory no longer exists; skipping
FINISH REMOVEDIR 9/93/
FINISH REMOVEDIR 9/92/
removing directory: 9/92/, rv: 0
FINISH REMOVEDIR 9/91/
removing directory: 9/91/, rv: 0
FINISH REMOVEDIR 9/90/
FINISH REMOVEDIR 9/90/
directory no longer exists; skipping
FINISH REMOVEDIR 8/89/
FINISH REMOVEDIR 8/89/
directory no longer exists; skipping
FINISH REMOVEDIR 8/88/
FINISH REMOVEFILE 8/87/871/87xtext1
FINISH REMOVEFILE 8/87/871/87xtext0
FINISH REMOVEDIR 8/87/871/
FINISH REMOVEFILE 8/87/870/87xtext1
FINISH REMOVEFILE 8/87/870/87xtext0
FINISH REMOVEDIR 8/87/870/
FINISH REMOVEDIR 8/87/
FINISH REMOVEFILE 8/86/86text1
FINISH REMOVEFILE 8/86/86text0
FINISH REMOVEDIR 8/86/
FINISH REMOVEDIR 8/85/
FINISH REMOVEDIR 8/85/
directory no longer exists; skipping
FINISH REMOVEDIR 8/84/
FINISH REMOVEDIR 8/84/
directory no longer exists; skipping
FINISH REMOVEDIR 8/83/
FINISH REMOVEDIR 8/82/
removing directory: 8/82/, rv: 0
FINISH REMOVEDIR 8/81/
removing directory: 8/81/, rv: 0
FINISH REMOVEDIR 8/80/
FINISH REMOVEDIR 8/80/
directory no longer exists; skipping
FINISH REMOVEFILE 7/71/7xtext1
FINISH REMOVEFILE 7/71/7xtext0
FINISH REMOVEFILE 7/71/7xtest.exe
FINISH REMOVEDIR 7/71/
FINISH REMOVEFILE 7/70/7xtext1
FINISH REMOVEFILE 7/70/7xtext0
FINISH REMOVEFILE 7/70/7xtest.exe
FINISH REMOVEDIR 7/70/
FINISH REMOVEFILE 7/7text1
FINISH REMOVEFILE 7/7text0
FINISH REMOVEDIR 7/
FINISH REMOVEDIR 6/
FINISH REMOVEFILE 5/5text1
FINISH REMOVEFILE 5/5text0
FINISH REMOVEFILE 5/5test.exe
FINISH REMOVEDIR 5/
FINISH REMOVEFILE 4/4text1
FINISH REMOVEFILE 4/4text0
FINISH REMOVEDIR 4/
FINISH REMOVEFILE 3/3text1
FINISH REMOVEFILE 3/3text0
FINISH REMOVEDIR 1/10/
FINISH REMOVEDIR 1/
succeeded
calling QuitProgressUI

Просмотреть файл

@ -1,279 +0,0 @@
UPDATE TYPE partial
PREPARE ADD searchplugins/searchpluginstext0
PREPARE PATCH searchplugins/searchpluginspng1.png
PREPARE PATCH searchplugins/searchpluginspng0.png
PREPARE ADD precomplete
PREPARE PATCH exe0.exe
PREPARE ADD distribution/extensions/extensions1/extensions1text0
PREPARE PATCH distribution/extensions/extensions1/extensions1png1.png
PREPARE PATCH distribution/extensions/extensions1/extensions1png0.png
PREPARE ADD distribution/extensions/extensions0/extensions0text0
PREPARE PATCH distribution/extensions/extensions0/extensions0png1.png
PREPARE PATCH distribution/extensions/extensions0/extensions0png0.png
PREPARE PATCH 0/0exe0.exe
PREPARE ADD 0/00/00text0
PREPARE PATCH 0/00/00png0.png
PREPARE ADD 2/20/20text0
PREPARE ADD 2/20/20png0.png
PREPARE ADD 0/00/00text2
PREPARE REMOVEFILE 1/10/10text0
PREPARE REMOVEFILE 0/00/00text1
PREPARE REMOVEDIR 9/99/
PREPARE REMOVEDIR 9/99/
PREPARE REMOVEDIR 9/98/
PREPARE REMOVEFILE 9/97/970/97xtext0
PREPARE REMOVEFILE 9/97/970/97xtext1
PREPARE REMOVEDIR 9/97/970/
PREPARE REMOVEFILE 9/97/971/97xtext0
PREPARE REMOVEFILE 9/97/971/97xtext1
PREPARE REMOVEDIR 9/97/971/
PREPARE REMOVEDIR 9/97/
PREPARE REMOVEFILE 9/96/96text0
PREPARE REMOVEFILE 9/96/96text1
PREPARE REMOVEDIR 9/96/
PREPARE REMOVEDIR 9/95/
PREPARE REMOVEDIR 9/95/
PREPARE REMOVEDIR 9/94/
PREPARE REMOVEDIR 9/94/
PREPARE REMOVEDIR 9/93/
PREPARE REMOVEDIR 9/92/
PREPARE REMOVEDIR 9/91/
PREPARE REMOVEDIR 9/90/
PREPARE REMOVEDIR 9/90/
PREPARE REMOVEDIR 8/89/
PREPARE REMOVEDIR 8/89/
PREPARE REMOVEDIR 8/88/
PREPARE REMOVEFILE 8/87/870/87xtext0
PREPARE REMOVEFILE 8/87/870/87xtext1
PREPARE REMOVEDIR 8/87/870/
PREPARE REMOVEFILE 8/87/871/87xtext0
PREPARE REMOVEFILE 8/87/871/87xtext1
PREPARE REMOVEDIR 8/87/871/
PREPARE REMOVEDIR 8/87/
PREPARE REMOVEFILE 8/86/86text0
PREPARE REMOVEFILE 8/86/86text1
PREPARE REMOVEDIR 8/86/
PREPARE REMOVEDIR 8/85/
PREPARE REMOVEDIR 8/85/
PREPARE REMOVEDIR 8/84/
PREPARE REMOVEDIR 8/84/
PREPARE REMOVEDIR 8/83/
PREPARE REMOVEDIR 8/82/
PREPARE REMOVEDIR 8/81/
PREPARE REMOVEDIR 8/80/
PREPARE REMOVEDIR 8/80/
PREPARE REMOVEFILE 7/7text0
PREPARE REMOVEFILE 7/7text1
PREPARE REMOVEFILE 7/70/7xtest.exe
PREPARE REMOVEFILE 7/70/7xtext0
PREPARE REMOVEFILE 7/70/7xtext1
PREPARE REMOVEDIR 7/70/
PREPARE REMOVEFILE 7/71/7xtest.exe
PREPARE REMOVEFILE 7/71/7xtext0
PREPARE REMOVEFILE 7/71/7xtext1
PREPARE REMOVEDIR 7/71/
PREPARE REMOVEDIR 7/
PREPARE REMOVEDIR 6/
PREPARE REMOVEFILE 5/5text1
PREPARE REMOVEFILE 5/5text0
PREPARE REMOVEFILE 5/5test.exe
PREPARE REMOVEFILE 5/5text0
PREPARE REMOVEFILE 5/5text1
PREPARE REMOVEDIR 5/
PREPARE REMOVEFILE 4/4text1
PREPARE REMOVEFILE 4/4text0
PREPARE REMOVEDIR 4/
PREPARE REMOVEFILE 3/3text1
PREPARE REMOVEFILE 3/3text0
PREPARE REMOVEDIR 1/10/
PREPARE REMOVEDIR 1/
EXECUTE ADD searchplugins/searchpluginstext0
EXECUTE PATCH searchplugins/searchpluginspng1.png
EXECUTE PATCH searchplugins/searchpluginspng0.png
EXECUTE ADD precomplete
EXECUTE PATCH exe0.exe
EXECUTE ADD distribution/extensions/extensions1/extensions1text0
EXECUTE PATCH distribution/extensions/extensions1/extensions1png1.png
EXECUTE PATCH distribution/extensions/extensions1/extensions1png0.png
EXECUTE ADD distribution/extensions/extensions0/extensions0text0
EXECUTE PATCH distribution/extensions/extensions0/extensions0png1.png
EXECUTE PATCH distribution/extensions/extensions0/extensions0png0.png
EXECUTE PATCH 0/0exe0.exe
EXECUTE ADD 0/00/00text0
EXECUTE PATCH 0/00/00png0.png
EXECUTE ADD 2/20/20text0
EXECUTE ADD 2/20/20png0.png
EXECUTE ADD 0/00/00text2
EXECUTE REMOVEFILE 1/10/10text0
EXECUTE REMOVEFILE 0/00/00text1
EXECUTE REMOVEDIR 9/99/
EXECUTE REMOVEDIR 9/99/
EXECUTE REMOVEDIR 9/98/
EXECUTE REMOVEFILE 9/97/970/97xtext0
EXECUTE REMOVEFILE 9/97/970/97xtext1
EXECUTE REMOVEDIR 9/97/970/
EXECUTE REMOVEFILE 9/97/971/97xtext0
EXECUTE REMOVEFILE 9/97/971/97xtext1
EXECUTE REMOVEDIR 9/97/971/
EXECUTE REMOVEDIR 9/97/
EXECUTE REMOVEFILE 9/96/96text0
EXECUTE REMOVEFILE 9/96/96text1
EXECUTE REMOVEDIR 9/96/
EXECUTE REMOVEDIR 9/95/
EXECUTE REMOVEDIR 9/95/
EXECUTE REMOVEDIR 9/94/
EXECUTE REMOVEDIR 9/94/
EXECUTE REMOVEDIR 9/93/
EXECUTE REMOVEDIR 9/92/
EXECUTE REMOVEDIR 9/91/
EXECUTE REMOVEDIR 9/90/
EXECUTE REMOVEDIR 9/90/
EXECUTE REMOVEDIR 8/89/
EXECUTE REMOVEDIR 8/89/
EXECUTE REMOVEDIR 8/88/
EXECUTE REMOVEFILE 8/87/870/87xtext0
EXECUTE REMOVEFILE 8/87/870/87xtext1
EXECUTE REMOVEDIR 8/87/870/
EXECUTE REMOVEFILE 8/87/871/87xtext0
EXECUTE REMOVEFILE 8/87/871/87xtext1
EXECUTE REMOVEDIR 8/87/871/
EXECUTE REMOVEDIR 8/87/
EXECUTE REMOVEFILE 8/86/86text0
EXECUTE REMOVEFILE 8/86/86text1
EXECUTE REMOVEDIR 8/86/
EXECUTE REMOVEDIR 8/85/
EXECUTE REMOVEDIR 8/85/
EXECUTE REMOVEDIR 8/84/
EXECUTE REMOVEDIR 8/84/
EXECUTE REMOVEDIR 8/83/
EXECUTE REMOVEDIR 8/82/
EXECUTE REMOVEDIR 8/81/
EXECUTE REMOVEDIR 8/80/
EXECUTE REMOVEDIR 8/80/
EXECUTE REMOVEFILE 7/7text0
EXECUTE REMOVEFILE 7/7text1
EXECUTE REMOVEFILE 7/70/7xtest.exe
EXECUTE REMOVEFILE 7/70/7xtext0
EXECUTE REMOVEFILE 7/70/7xtext1
EXECUTE REMOVEDIR 7/70/
EXECUTE REMOVEFILE 7/71/7xtest.exe
EXECUTE REMOVEFILE 7/71/7xtext0
EXECUTE REMOVEFILE 7/71/7xtext1
EXECUTE REMOVEDIR 7/71/
EXECUTE REMOVEDIR 7/
EXECUTE REMOVEDIR 6/
EXECUTE REMOVEFILE 5/5text1
EXECUTE REMOVEFILE 5/5text0
EXECUTE REMOVEFILE 5/5test.exe
EXECUTE REMOVEFILE 5/5text0
file cannot be removed because it does not exist; skipping
EXECUTE REMOVEFILE 5/5text1
file cannot be removed because it does not exist; skipping
EXECUTE REMOVEDIR 5/
EXECUTE REMOVEFILE 4/4text1
EXECUTE REMOVEFILE 4/4text0
EXECUTE REMOVEDIR 4/
EXECUTE REMOVEFILE 3/3text1
EXECUTE REMOVEFILE 3/3text0
EXECUTE REMOVEDIR 1/10/
EXECUTE REMOVEDIR 1/
FINISH ADD searchplugins/searchpluginstext0
FINISH PATCH searchplugins/searchpluginspng1.png
FINISH PATCH searchplugins/searchpluginspng0.png
FINISH ADD precomplete
FINISH PATCH exe0.exe
FINISH ADD distribution/extensions/extensions1/extensions1text0
FINISH PATCH distribution/extensions/extensions1/extensions1png1.png
FINISH PATCH distribution/extensions/extensions1/extensions1png0.png
FINISH ADD distribution/extensions/extensions0/extensions0text0
FINISH PATCH distribution/extensions/extensions0/extensions0png1.png
FINISH PATCH distribution/extensions/extensions0/extensions0png0.png
FINISH PATCH 0/0exe0.exe
FINISH ADD 0/00/00text0
FINISH PATCH 0/00/00png0.png
FINISH ADD 2/20/20text0
FINISH ADD 2/20/20png0.png
FINISH ADD 0/00/00text2
FINISH REMOVEFILE 1/10/10text0
FINISH REMOVEFILE 0/00/00text1
FINISH REMOVEDIR 9/99/
FINISH REMOVEDIR 9/99/
directory no longer exists; skipping
FINISH REMOVEDIR 9/98/
FINISH REMOVEFILE 9/97/970/97xtext0
FINISH REMOVEFILE 9/97/970/97xtext1
FINISH REMOVEDIR 9/97/970/
FINISH REMOVEFILE 9/97/971/97xtext0
FINISH REMOVEFILE 9/97/971/97xtext1
FINISH REMOVEDIR 9/97/971/
FINISH REMOVEDIR 9/97/
FINISH REMOVEFILE 9/96/96text0
FINISH REMOVEFILE 9/96/96text1
FINISH REMOVEDIR 9/96/
FINISH REMOVEDIR 9/95/
FINISH REMOVEDIR 9/95/
directory no longer exists; skipping
FINISH REMOVEDIR 9/94/
FINISH REMOVEDIR 9/94/
directory no longer exists; skipping
FINISH REMOVEDIR 9/93/
FINISH REMOVEDIR 9/92/
removing directory: 9/92/, rv: 0
FINISH REMOVEDIR 9/91/
removing directory: 9/91/, rv: 0
FINISH REMOVEDIR 9/90/
FINISH REMOVEDIR 9/90/
directory no longer exists; skipping
FINISH REMOVEDIR 8/89/
FINISH REMOVEDIR 8/89/
directory no longer exists; skipping
FINISH REMOVEDIR 8/88/
FINISH REMOVEFILE 8/87/870/87xtext0
FINISH REMOVEFILE 8/87/870/87xtext1
FINISH REMOVEDIR 8/87/870/
FINISH REMOVEFILE 8/87/871/87xtext0
FINISH REMOVEFILE 8/87/871/87xtext1
FINISH REMOVEDIR 8/87/871/
FINISH REMOVEDIR 8/87/
FINISH REMOVEFILE 8/86/86text0
FINISH REMOVEFILE 8/86/86text1
FINISH REMOVEDIR 8/86/
FINISH REMOVEDIR 8/85/
FINISH REMOVEDIR 8/85/
directory no longer exists; skipping
FINISH REMOVEDIR 8/84/
FINISH REMOVEDIR 8/84/
directory no longer exists; skipping
FINISH REMOVEDIR 8/83/
FINISH REMOVEDIR 8/82/
removing directory: 8/82/, rv: 0
FINISH REMOVEDIR 8/81/
removing directory: 8/81/, rv: 0
FINISH REMOVEDIR 8/80/
FINISH REMOVEDIR 8/80/
directory no longer exists; skipping
FINISH REMOVEFILE 7/7text0
FINISH REMOVEFILE 7/7text1
FINISH REMOVEFILE 7/70/7xtest.exe
FINISH REMOVEFILE 7/70/7xtext0
FINISH REMOVEFILE 7/70/7xtext1
FINISH REMOVEDIR 7/70/
FINISH REMOVEFILE 7/71/7xtest.exe
FINISH REMOVEFILE 7/71/7xtext0
FINISH REMOVEFILE 7/71/7xtext1
FINISH REMOVEDIR 7/71/
FINISH REMOVEDIR 7/
FINISH REMOVEDIR 6/
FINISH REMOVEFILE 5/5text1
FINISH REMOVEFILE 5/5text0
FINISH REMOVEFILE 5/5test.exe
FINISH REMOVEDIR 5/
FINISH REMOVEFILE 4/4text1
FINISH REMOVEFILE 4/4text0
FINISH REMOVEDIR 4/
FINISH REMOVEFILE 3/3text1
FINISH REMOVEFILE 3/3text0
FINISH REMOVEDIR 1/10/
FINISH REMOVEDIR 1/
succeeded
calling QuitProgressUI

Просмотреть файл

@ -40,18 +40,6 @@ const IS_UNIX = true;
const IS_UNIX = false; const IS_UNIX = false;
#endif #endif
#ifdef ANDROID
const IS_ANDROID = true;
#else
const IS_ANDROID = false;
#endif
#ifdef MOZ_WIDGET_GONK
const IS_TOOLKIT_GONK = true;
#else
const IS_TOOLKIT_GONK = false;
#endif
#ifdef MOZ_VERIFY_MAR_SIGNATURE #ifdef MOZ_VERIFY_MAR_SIGNATURE
const MOZ_VERIFY_MAR_SIGNATURE = true; const MOZ_VERIFY_MAR_SIGNATURE = true;
#else #else

Просмотреть файл

@ -38,8 +38,8 @@ const URL_HTTP_UPDATE_SJS = "http://test_details/";
/* global INSTALL_LOCALE, MOZ_APP_NAME, BIN_SUFFIX, MOZ_APP_VENDOR */ /* global INSTALL_LOCALE, MOZ_APP_NAME, BIN_SUFFIX, MOZ_APP_VENDOR */
/* global MOZ_APP_BASENAME, APP_BIN_SUFFIX, APP_INFO_NAME, APP_INFO_VENDOR */ /* global MOZ_APP_BASENAME, APP_BIN_SUFFIX, APP_INFO_NAME, APP_INFO_VENDOR */
/* global IS_WIN, IS_MACOSX, IS_UNIX, IS_ANDROID, IS_TOOLKIT_GONK */ /* global IS_WIN, IS_MACOSX, IS_UNIX, MOZ_VERIFY_MAR_SIGNATURE */
/* global MOZ_VERIFY_MAR_SIGNATURE, MOZ_VERIFY_MAR_SIGNATURE, IS_AUTHENTICODE_CHECK_ENABLED */ /* global MOZ_VERIFY_MAR_SIGNATURE, IS_AUTHENTICODE_CHECK_ENABLED */
load("../data/xpcshellConstantsPP.js"); load("../data/xpcshellConstantsPP.js");
function getLogSuffix() { function getLogSuffix() {
@ -49,9 +49,6 @@ function getLogSuffix() {
if (IS_MACOSX) { if (IS_MACOSX) {
return "_mac"; return "_mac";
} }
if (IS_TOOLKIT_GONK) {
return "_gonk";
}
return "_linux"; return "_linux";
} }
@ -72,11 +69,6 @@ const COMPARE_LOG_SUFFIX = getLogSuffix();
const LOG_COMPLETE_SUCCESS = "complete_log_success" + COMPARE_LOG_SUFFIX; const LOG_COMPLETE_SUCCESS = "complete_log_success" + COMPARE_LOG_SUFFIX;
const LOG_PARTIAL_SUCCESS = "partial_log_success" + COMPARE_LOG_SUFFIX; const LOG_PARTIAL_SUCCESS = "partial_log_success" + COMPARE_LOG_SUFFIX;
const LOG_PARTIAL_FAILURE = "partial_log_failure" + COMPARE_LOG_SUFFIX; const LOG_PARTIAL_FAILURE = "partial_log_failure" + COMPARE_LOG_SUFFIX;
// Gonk sorts differently when applying and staging an update.
const LOG_COMPLETE_SUCCESS_STAGE = LOG_COMPLETE_SUCCESS +
(IS_TOOLKIT_GONK ? "_stage" : "");
const LOG_PARTIAL_SUCCESS_STAGE = LOG_PARTIAL_SUCCESS +
(IS_TOOLKIT_GONK ? "_stage" : "");
const LOG_REPLACE_SUCCESS = "replace_log_success"; const LOG_REPLACE_SUCCESS = "replace_log_success";
const USE_EXECV = IS_UNIX && !IS_MACOSX; const USE_EXECV = IS_UNIX && !IS_MACOSX;
@ -177,6 +169,7 @@ var gServiceLaunchedCallbackArgs = null;
var gCallbackBinFile = "callback_app" + BIN_SUFFIX; var gCallbackBinFile = "callback_app" + BIN_SUFFIX;
var gCallbackArgs = ["./", "callback.log", "Test Arg 2", "Test Arg 3"]; var gCallbackArgs = ["./", "callback.log", "Test Arg 2", "Test Arg 3"];
var gPostUpdateBinFile = "postup_app" + BIN_SUFFIX; var gPostUpdateBinFile = "postup_app" + BIN_SUFFIX;
var gSvcOriginalLogContents;
var gUseTestAppDir = true; var gUseTestAppDir = true;
// Some update staging failures can remove the update. This allows tests to // Some update staging failures can remove the update. This allows tests to
// specify that the status file and the active update should not be checked // specify that the status file and the active update should not be checked
@ -193,6 +186,7 @@ var gEnvXPCOMDebugBreak;
var gEnvXPCOMMemLeakLog; var gEnvXPCOMMemLeakLog;
var gEnvDyldLibraryPath; var gEnvDyldLibraryPath;
var gEnvLdLibraryPath; var gEnvLdLibraryPath;
var gASanOptions;
// Set to true to log additional information for debugging. To log additional // Set to true to log additional information for debugging. To log additional
// information for an individual test set DEBUG_AUS_TEST to true in the test's // information for an individual test set DEBUG_AUS_TEST to true in the test's
@ -929,9 +923,9 @@ function cleanupTestCommon() {
} }
} }
// The updates directory is located outside of the application directory on // The updates directory is located outside of the application directory and
// Windows, Mac OS X, and GONK and needs to be removed. // needs to be removed on Windows and Mac OS X.
if (IS_WIN || IS_MACOSX || IS_TOOLKIT_GONK) { if (IS_WIN || IS_MACOSX) {
let updatesDir = getMockUpdRootD(); let updatesDir = getMockUpdRootD();
// Try to remove the directory used to apply updates. Since the test has // Try to remove the directory used to apply updates. Since the test has
// already finished this is non-fatal for the test. // already finished this is non-fatal for the test.
@ -1013,7 +1007,7 @@ function setDefaultPrefs() {
// Enable Update logging // Enable Update logging
Services.prefs.setBoolPref(PREF_APP_UPDATE_LOG, true); Services.prefs.setBoolPref(PREF_APP_UPDATE_LOG, true);
} else { } else {
// Some apps (e.g. gonk) set this preference to true by default // Some apps set this preference to true by default
Services.prefs.setBoolPref(PREF_APP_UPDATE_LOG, false); Services.prefs.setBoolPref(PREF_APP_UPDATE_LOG, false);
} }
// In case telemetry is enabled for xpcshell tests. // In case telemetry is enabled for xpcshell tests.
@ -1412,12 +1406,6 @@ function getMockUpdRootD() {
return getMockUpdRootDMac(); return getMockUpdRootDMac();
} }
// The gonk updates directory is under /data/local but for the updater tests
// we use the following directory so the tests can run in parallel.
if (IS_TOOLKIT_GONK) {
return do_get_file(gTestID + "/", true);
}
return getApplyDirFile(DIR_MACOS, true); return getApplyDirFile(DIR_MACOS, true);
} }
@ -1661,9 +1649,17 @@ function logUpdateLog(aLogLeafName) {
} }
/** /**
* Launches the updater binary or the service to apply an update for updater * Gets the maintenance service log contents.
* tests. For non-service tests runUpdateUsingUpdater will be called and for */
* service tests runUpdateUsingService will be called. function readServiceLogFile() {
let file = getMaintSvcDir();
file.append("logs");
file.append("maintenanceservice.log");
return readFile(file);
}
/**
* Launches the updater binary to apply an update for updater tests.
* *
* @param aExpectedStatus * @param aExpectedStatus
* The expected value of update.status when the test finishes. For * The expected value of update.status when the test finishes. For
@ -1681,53 +1677,23 @@ function logUpdateLog(aLogLeafName) {
*/ */
function runUpdate(aExpectedStatus, aSwitchApp, aExpectedExitValue, function runUpdate(aExpectedStatus, aSwitchApp, aExpectedExitValue,
aCheckSvcLog) { aCheckSvcLog) {
let svcOriginalLog;
if (IS_SERVICE_TEST) { if (IS_SERVICE_TEST) {
let expectedStatus = aExpectedStatus; copyFileToTestAppDir(FILE_MAINTENANCE_SERVICE_BIN, false);
if (aExpectedStatus == STATE_PENDING) { copyFileToTestAppDir(FILE_MAINTENANCE_SERVICE_INSTALLER_BIN, false);
expectedStatus = STATE_PENDING_SVC; if (aCheckSvcLog) {
} else if (aExpectedStatus == STATE_APPLIED) { svcOriginalLog = readServiceLogFile();
expectedStatus = STATE_APPLIED_SVC;
} }
runUpdateUsingService(expectedStatus, aSwitchApp, aCheckSvcLog);
} else {
runUpdateUsingUpdater(aExpectedStatus, aSwitchApp, aExpectedExitValue);
} }
}
/**
* Launches the updater binary or the service to apply an update for updater
* tests. When completed runUpdateFinished will be called.
*
* @param aExpectedStatus
* The expected value of update.status when the test finishes.
* @param aSwitchApp
* If true the update should switch the application with an updated
* staged application and if false the update should be applied to the
* installed application.
* @param aExpectedExitValue
* The expected exit value from the updater binary.
*/
function runUpdateUsingUpdater(aExpectedStatus, aSwitchApp, aExpectedExitValue) {
// Copy the updater binary to the directory where it will apply updates. // Copy the updater binary to the directory where it will apply updates.
let updateBin = copyTestUpdaterForRunUsingUpdater(); let updateBin = copyTestUpdaterForRunUsingUpdater();
Assert.ok(updateBin.exists(), Assert.ok(updateBin.exists(),
MSG_SHOULD_EXIST + getMsgPath(updateBin.path)); MSG_SHOULD_EXIST + getMsgPath(updateBin.path));
let updatesDir = getUpdatesPatchDir(); let updatesDirPath = getUpdatesPatchDir().path;
let updatesDirPath = updatesDir.path; let applyToDirPath = getApplyDirFile(null, true).path;
let stageDirPath = getStageDirFile(null, true).path;
let applyToDir = getApplyDirFile(null, true);
let applyToDirPath = applyToDir.path;
let stageDir = getStageDirFile(null, true);
let stageDirPath = stageDir.path;
if (IS_WIN) {
// Convert to native path
updatesDirPath = updatesDirPath.replace(/\//g, "\\");
applyToDirPath = applyToDirPath.replace(/\//g, "\\");
stageDirPath = stageDirPath.replace(/\//g, "\\");
}
let callbackApp = getApplyDirFile(DIR_RESOURCES + gCallbackBinFile); let callbackApp = getApplyDirFile(DIR_RESOURCES + gCallbackBinFile);
callbackApp.permissions = PERMS_DIRECTORY; callbackApp.permissions = PERMS_DIRECTORY;
@ -1746,28 +1712,23 @@ function runUpdateUsingUpdater(aExpectedStatus, aSwitchApp, aExpectedExitValue)
args = args.concat(gCallbackArgs); args = args.concat(gCallbackArgs);
debugDump("running the updater: " + updateBin.path + " " + args.join(" ")); debugDump("running the updater: " + updateBin.path + " " + args.join(" "));
// See bug 1279108. if (aSwitchApp) {
// nsIProcess doesn't have an API to pass a separate environment to the // We want to set the env vars again
// subprocess, so we need to alter the environment of the current process gShouldResetEnv = undefined;
// before launching the updater binary.
let asan_options = null;
if (gEnv.exists("ASAN_OPTIONS")) {
asan_options = gEnv.get("ASAN_OPTIONS");
gEnv.set("ASAN_OPTIONS", asan_options + ":detect_leaks=0");
} else {
gEnv.set("ASAN_OPTIONS", "detect_leaks=0");
} }
setEnvironment();
let process = Cc["@mozilla.org/process/util;1"]. let process = Cc["@mozilla.org/process/util;1"].
createInstance(Ci.nsIProcess); createInstance(Ci.nsIProcess);
process.init(updateBin); process.init(updateBin);
process.run(true, args, args.length); process.run(true, args, args.length);
// Restore previous ASAN_OPTIONS if there were any. resetEnvironment();
gEnv.set("ASAN_OPTIONS", asan_options ? asan_options : "");
let status = readStatusFile(); let status = readStatusFile();
if (process.exitValue != aExpectedExitValue || status != aExpectedStatus) { if ((!IS_SERVICE_TEST && process.exitValue != aExpectedExitValue) ||
status != aExpectedStatus) {
if (process.exitValue != aExpectedExitValue) { if (process.exitValue != aExpectedExitValue) {
logTestInfo("updater exited with unexpected value! Got: " + logTestInfo("updater exited with unexpected value! Got: " +
process.exitValue + ", Expected: " + aExpectedExitValue); process.exitValue + ", Expected: " + aExpectedExitValue);
@ -1778,11 +1739,24 @@ function runUpdateUsingUpdater(aExpectedStatus, aSwitchApp, aExpectedExitValue)
} }
logUpdateLog(FILE_LAST_UPDATE_LOG); logUpdateLog(FILE_LAST_UPDATE_LOG);
} }
Assert.equal(process.exitValue, aExpectedExitValue,
"the process exit value" + MSG_SHOULD_EQUAL); if (!IS_SERVICE_TEST) {
Assert.equal(process.exitValue, aExpectedExitValue,
"the process exit value" + MSG_SHOULD_EQUAL);
}
Assert.equal(status, aExpectedStatus, Assert.equal(status, aExpectedStatus,
"the update status" + MSG_SHOULD_EQUAL); "the update status" + MSG_SHOULD_EQUAL);
if (IS_SERVICE_TEST && aCheckSvcLog) {
let contents = readServiceLogFile();
Assert.notEqual(contents, svcOriginalLog,
"the contents of the maintenanceservice.log should not " +
"be the same as the original contents");
Assert.notEqual(contents.indexOf(LOG_SVC_SUCCESSFUL_LAUNCH), -1,
"the contents of the maintenanceservice.log should " +
"contain the successful launch string");
}
do_execute_soon(runUpdateFinished); do_execute_soon(runUpdateFinished);
} }
@ -1905,12 +1879,15 @@ const gUpdateStagedObserver = {
/** /**
* Stages an update using nsIUpdateProcessor:processUpdate for updater tests. * Stages an update using nsIUpdateProcessor:processUpdate for updater tests.
*
* @param aCheckSvcLog
* Whether the service log should be checked for service tests.
*/ */
function stageUpdate() { function stageUpdate(aCheckSvcLog) {
debugDump("start - attempting to stage update"); debugDump("start - attempting to stage update");
if (IS_TOOLKIT_GONK) { if (IS_SERVICE_TEST && aCheckSvcLog) {
copyTestUpdaterToBinDir(); gSvcOriginalLogContents = readServiceLogFile();
} }
Services.obs.addObserver(gUpdateStagedObserver, "update-staged", false); Services.obs.addObserver(gUpdateStagedObserver, "update-staged", false);
@ -1991,6 +1968,16 @@ function checkUpdateStagedState(aUpdateState) {
MSG_SHOULD_NOT_EXIST + getMsgPath(stageDir.path)); MSG_SHOULD_NOT_EXIST + getMsgPath(stageDir.path));
} }
if (IS_SERVICE_TEST && gSvcOriginalLogContents !== undefined) {
let contents = readServiceLogFile();
Assert.notEqual(contents, gSvcOriginalLogContents,
"the contents of the maintenanceservice.log should not " +
"be the same as the original contents");
Assert.notEqual(contents.indexOf(LOG_SVC_SUCCESSFUL_LAUNCH), -1,
"the contents of the maintenanceservice.log should " +
"contain the successful launch string");
}
do_execute_soon(stageUpdateFinished); do_execute_soon(stageUpdateFinished);
} }
@ -2134,7 +2121,7 @@ function setupAppFiles() {
inGreDir: true}]; inGreDir: true}];
// On Linux the updater.png must also be copied // On Linux the updater.png must also be copied
if (IS_UNIX && !IS_MACOSX && !IS_TOOLKIT_GONK) { if (IS_UNIX && !IS_MACOSX) {
appFiles.push({relPath: "icons/updater.png", appFiles.push({relPath: "icons/updater.png",
inGreDir: true}); inGreDir: true});
} }
@ -2219,8 +2206,7 @@ function copyFileToTestAppDir(aFileRelPath, aInGreDir) {
let shouldSymlink = (pathParts[pathParts.length - 1] == "XUL" || let shouldSymlink = (pathParts[pathParts.length - 1] == "XUL" ||
fileRelPath.substr(fileRelPath.length - 3) == ".so" || fileRelPath.substr(fileRelPath.length - 3) == ".so" ||
fileRelPath.substr(fileRelPath.length - 6) == ".dylib"); fileRelPath.substr(fileRelPath.length - 6) == ".dylib");
// The tests don't support symlinks on gonk. if (!shouldSymlink) {
if (!shouldSymlink || IS_TOOLKIT_GONK) {
if (!destFile.exists()) { if (!destFile.exists()) {
try { try {
srcFile.copyToFollowingLinks(destFile.parent, destFile.leafName); srcFile.copyToFollowingLinks(destFile.parent, destFile.leafName);
@ -2380,157 +2366,6 @@ function waitForApplicationStop(aApplication) {
aApplication); aApplication);
} }
/**
* Helper function for updater tests for launching the updater using the
* maintenance service to apply a mar file. When complete runUpdateFinished
* will be called.
*
* @param aExpectedStatus
* The expected value of update.status when the test finishes.
* @param aSwitchApp
* If true the update should switch the application with an updated
* staged application and if false the update should be applied to the
* installed application.
* @param aCheckSvcLog
* Whether the service log should be checked.
*/
function runUpdateUsingService(aExpectedStatus, aSwitchApp, aCheckSvcLog) {
if (!IS_WIN) {
do_throw("Windows only function called by a different platform!");
}
let svcOriginalLog;
// Check the service logs for a successful update
function checkServiceLogs(aOriginalContents) {
let contents = readServiceLogFile();
Assert.notEqual(contents, aOriginalContents,
"the contents of the maintenanceservice.log should not " +
"be the same as the original contents");
Assert.notEqual(contents.indexOf(LOG_SVC_SUCCESSFUL_LAUNCH), -1,
"the contents of the maintenanceservice.log should " +
"contain the successful launch string");
}
function readServiceLogFile() {
let file = getMaintSvcDir();
file.append("logs");
file.append("maintenanceservice.log");
return readFile(file);
}
function checkServiceUpdateFinished() {
waitForApplicationStop(FILE_MAINTENANCE_SERVICE_BIN);
waitForApplicationStop(FILE_UPDATER_BIN);
// Wait for the expected status
let status;
try {
status = readStatusFile();
} catch (e) {
do_execute_soon(checkServiceUpdateFinished);
return;
}
// The status will probably always be equal to STATE_APPLYING but there is a
// race condition where it would be possible on slower machines where status
// could be equal to STATE_PENDING_SVC.
if (status == STATE_APPLYING) {
debugDump("still waiting to see the " + aExpectedStatus +
" status, got " + status + " for now...");
do_execute_soon(checkServiceUpdateFinished);
return;
}
// Make sure all of the logs are written out.
waitForServiceStop(false);
resetEnvironment();
if (status != aExpectedStatus) {
logTestInfo("update status is not the expected status! Got: " + status +
", Expected: " + aExpectedStatus);
logTestInfo("update.status contents: " + readStatusFile());
logUpdateLog(FILE_UPDATE_LOG);
}
Assert.equal(status, aExpectedStatus,
"the update status" + MSG_SHOULD_EQUAL);
if (aCheckSvcLog) {
checkServiceLogs(svcOriginalLog);
}
do_execute_soon(runUpdateFinished);
}
// Make sure the service from the previous test is already stopped.
waitForServiceStop(true);
// Prevent the cleanup function from begin run more than once
if (gRegisteredServiceCleanup === undefined) {
gRegisteredServiceCleanup = true;
do_register_cleanup(function RUUS_cleanup() {
resetEnvironment();
// This will delete the app arguments log file if it exists.
try {
getAppArgsLogPath();
} catch (e) {
logTestInfo("unable to remove file during cleanup. Exception: " + e);
}
});
}
if (aCheckSvcLog) {
svcOriginalLog = readServiceLogFile();
}
let appArgsLogPath = getAppArgsLogPath();
gServiceLaunchedCallbackLog = appArgsLogPath.replace(/^"|"$/g, "");
gServiceLaunchedCallbackArgs = [
"-no-remote",
"-test-process-updates",
"-dump-args",
appArgsLogPath
];
if (aSwitchApp) {
// We want to set the env vars again
gShouldResetEnv = undefined;
}
setEnvironment();
let updater = getTestDirFile(FILE_UPDATER_BIN);
if (!updater.exists()) {
do_throw("Unable to find the updater binary!");
}
let testBinDir = getGREBinDir();
updater.copyToFollowingLinks(testBinDir, updater.leafName);
// The service will execute maintenanceservice_installer.exe and
// will copy maintenanceservice.exe out of the same directory from
// the installation directory. So we need to make sure both of those
// bins always exist in the installation directory.
copyFileToTestAppDir(FILE_MAINTENANCE_SERVICE_BIN, false);
copyFileToTestAppDir(FILE_MAINTENANCE_SERVICE_INSTALLER_BIN, false);
let launchBin = getLaunchBin();
let args = getProcessArgs(["-dump-args", appArgsLogPath]);
let process = Cc["@mozilla.org/process/util;1"].
createInstance(Ci.nsIProcess);
process.init(launchBin);
debugDump("launching " + launchBin.path + " " + args.join(" "));
// Firefox does not wait for the service command to finish, but
// we still launch the process sync to avoid intermittent failures with
// the log file not being written out yet.
// We will rely on watching the update.status file and waiting for the service
// to stop to know the service command is done.
process.run(true, args, args.length);
do_execute_soon(checkServiceUpdateFinished);
}
/** /**
* Gets the platform specific shell binary that is launched using nsIProcess and * Gets the platform specific shell binary that is launched using nsIProcess and
@ -2663,7 +2498,8 @@ function waitForHelperSleep() {
do_throw("Exceeded MAX_TIMEOUT_RUNS while waiting for the helper to " + do_throw("Exceeded MAX_TIMEOUT_RUNS while waiting for the helper to " +
"finish its operation. Path: " + output.path); "finish its operation. Path: " + output.path);
} }
do_execute_soon(waitForHelperSleep); // Uses do_timeout instead of do_execute_soon to lessen log spew.
do_timeout(FILE_IN_USE_TIMEOUT_MS, waitForHelperSleep);
return; return;
} }
try { try {
@ -2674,7 +2510,8 @@ function waitForHelperSleep() {
"message file to no longer be in use. Path: " + output.path); "message file to no longer be in use. Path: " + output.path);
} }
debugDump("failed to remove file. Path: " + output.path); debugDump("failed to remove file. Path: " + output.path);
do_execute_soon(waitForHelperSleep); // Uses do_timeout instead of do_execute_soon to lessen log spew.
do_timeout(FILE_IN_USE_TIMEOUT_MS, waitForHelperSleep);
return; return;
} }
waitForHelperSleepFinished(); waitForHelperSleepFinished();
@ -2690,7 +2527,8 @@ function waitForHelperFinished() {
// this test can fail intermittently on Windows debug builds. // this test can fail intermittently on Windows debug builds.
let output = getApplyDirFile(DIR_RESOURCES + "output", true); let output = getApplyDirFile(DIR_RESOURCES + "output", true);
if (readFile(output) != "finished\n") { if (readFile(output) != "finished\n") {
do_execute_soon(waitForHelperFinished); // Uses do_timeout instead of do_execute_soon to lessen log spew.
do_timeout(FILE_IN_USE_TIMEOUT_MS, waitForHelperFinished);
return; return;
} }
// Give the lock file process time to unlock the file before deleting the // Give the lock file process time to unlock the file before deleting the
@ -2828,12 +2666,7 @@ function setupUpdaterTest(aMarFile, aPostUpdateAsync) {
createUpdaterINI(aPostUpdateAsync); createUpdaterINI(aPostUpdateAsync);
} }
if (IS_TOOLKIT_GONK) { setupAppFilesAsync();
// Gonk doesn't use the app files in any of the tests.
do_execute_soon(setupUpdaterTestFinished);
} else {
setupAppFilesAsync();
}
} }
/** /**
@ -3346,30 +3179,16 @@ function checkFilesAfterUpdateCommon(aGetFileFunc, aStageDirExists,
} }
} }
/**
* Calls the appropriate callback log check for service and non-service tests.
*/
function checkCallbackLog() {
if (IS_SERVICE_TEST) {
// Prevent this check from being repeatedly logged in the xpcshell log by
// checking it here instead of in checkCallbackServiceLog.
Assert.ok(!!gServiceLaunchedCallbackLog,
"gServiceLaunchedCallbackLog should be defined");
checkCallbackServiceLog();
} else {
checkCallbackAppLog();
}
}
/** /**
* Helper function for updater binary tests for verifying the contents of the * Helper function for updater binary tests for verifying the contents of the
* updater callback application log which should contain the arguments passed to * updater callback application log which should contain the arguments passed to
* the callback application. * the callback application.
*/ */
function checkCallbackAppLog() { function checkCallbackLog() {
let appLaunchLog = getApplyDirFile(DIR_RESOURCES + gCallbackArgs[1], true); let appLaunchLog = getApplyDirFile(DIR_RESOURCES + gCallbackArgs[1], true);
if (!appLaunchLog.exists()) { if (!appLaunchLog.exists()) {
do_execute_soon(checkCallbackAppLog); // Uses do_timeout instead of do_execute_soon to lessen log spew.
do_timeout(FILE_IN_USE_TIMEOUT_MS, checkCallbackLog);
return; return;
} }
@ -3405,7 +3224,8 @@ function checkCallbackAppLog() {
// This should never happen! // This should never happen!
do_throw("Unable to find incorrect callback log contents!"); do_throw("Unable to find incorrect callback log contents!");
} }
do_execute_soon(checkCallbackAppLog); // Uses do_timeout instead of do_execute_soon to lessen log spew.
do_timeout(FILE_IN_USE_TIMEOUT_MS, checkCallbackLog);
return; return;
} }
Assert.ok(true, "the callback log contents" + MSG_SHOULD_EQUAL); Assert.ok(true, "the callback log contents" + MSG_SHOULD_EQUAL);
@ -4108,6 +3928,14 @@ function setEnvironment() {
gShouldResetEnv = true; gShouldResetEnv = true;
// See bug 1279108.
if (gEnv.exists("ASAN_OPTIONS")) {
gASanOptions = gEnv.get("ASAN_OPTIONS");
gEnv.set("ASAN_OPTIONS", gASanOptions + ":detect_leaks=0");
} else {
gEnv.set("ASAN_OPTIONS", "detect_leaks=0");
}
if (IS_WIN && !gEnv.exists("XRE_NO_WINDOWS_CRASH_DIALOG")) { if (IS_WIN && !gEnv.exists("XRE_NO_WINDOWS_CRASH_DIALOG")) {
gAddedEnvXRENoWindowsCrashDialog = true; gAddedEnvXRENoWindowsCrashDialog = true;
debugDump("setting the XRE_NO_WINDOWS_CRASH_DIALOG environment " + debugDump("setting the XRE_NO_WINDOWS_CRASH_DIALOG environment " +
@ -4171,8 +3999,10 @@ function setEnvironment() {
gEnv.set("XPCOM_DEBUG_BREAK", "warn"); gEnv.set("XPCOM_DEBUG_BREAK", "warn");
debugDump("setting MOZ_NO_SERVICE_FALLBACK environment variable to 1"); if (IS_SERVICE_TEST) {
gEnv.set("MOZ_NO_SERVICE_FALLBACK", "1"); debugDump("setting MOZ_NO_SERVICE_FALLBACK environment variable to 1");
gEnv.set("MOZ_NO_SERVICE_FALLBACK", "1");
}
} }
/** /**
@ -4187,6 +4017,9 @@ function resetEnvironment() {
gShouldResetEnv = false; gShouldResetEnv = false;
// Restore previous ASAN_OPTIONS if there were any.
gEnv.set("ASAN_OPTIONS", gASanOptions ? gASanOptions : "");
if (gEnvXPCOMMemLeakLog) { if (gEnvXPCOMMemLeakLog) {
debugDump("setting the XPCOM_MEM_LEAK_LOG environment variable back to " + debugDump("setting the XPCOM_MEM_LEAK_LOG environment variable back to " +
gEnvXPCOMMemLeakLog); gEnvXPCOMMemLeakLog);
@ -4228,6 +4061,8 @@ function resetEnvironment() {
gEnv.set("XRE_NO_WINDOWS_CRASH_DIALOG", ""); gEnv.set("XRE_NO_WINDOWS_CRASH_DIALOG", "");
} }
debugDump("removing MOZ_NO_SERVICE_FALLBACK environment variable"); if (IS_SERVICE_TEST) {
gEnv.set("MOZ_NO_SERVICE_FALLBACK", ""); debugDump("removing MOZ_NO_SERVICE_FALLBACK environment variable");
gEnv.set("MOZ_NO_SERVICE_FALLBACK", "");
}
} }

Просмотреть файл

@ -70,8 +70,6 @@ FINAL_TARGET_FILES += [
'data/complete.exe', 'data/complete.exe',
'data/complete.mar', 'data/complete.mar',
'data/complete.png', 'data/complete.png',
'data/complete_log_success_gonk',
'data/complete_log_success_gonk_stage',
'data/complete_log_success_mac', 'data/complete_log_success_mac',
'data/complete_log_success_win', 'data/complete_log_success_win',
'data/complete_mac.mar', 'data/complete_mac.mar',
@ -84,11 +82,8 @@ FINAL_TARGET_FILES += [
'data/partial.exe', 'data/partial.exe',
'data/partial.mar', 'data/partial.mar',
'data/partial.png', 'data/partial.png',
'data/partial_log_failure_gonk',
'data/partial_log_failure_mac', 'data/partial_log_failure_mac',
'data/partial_log_failure_win', 'data/partial_log_failure_win',
'data/partial_log_success_gonk',
'data/partial_log_success_gonk_stage',
'data/partial_log_success_mac', 'data/partial_log_success_mac',
'data/partial_log_success_win', 'data/partial_log_success_win',
'data/partial_mac.mar', 'data/partial_mac.mar',

Просмотреть файл

@ -20,16 +20,8 @@ function run_test() {
standardInit(); standardInit();
if (IS_TOOLKIT_GONK) { Assert.ok(!gUpdateManager.activeUpdate,
// Gonk doesn't resume downloads at boot time, so the update "there should not be an active update");
// will remain active until the user chooses a new one, at
// which point, the old update will be removed.
Assert.ok(!!gUpdateManager.activeUpdate,
"there should be an active update");
} else {
Assert.ok(!gUpdateManager.activeUpdate,
"there should not be an active update");
}
Assert.equal(gUpdateManager.updateCount, 0, Assert.equal(gUpdateManager.updateCount, 0,
"the update manager update count" + MSG_SHOULD_EQUAL); "the update manager update count" + MSG_SHOULD_EQUAL);

Просмотреть файл

@ -21,16 +21,8 @@ function run_test() {
standardInit(); standardInit();
if (IS_TOOLKIT_GONK) { Assert.ok(!gUpdateManager.activeUpdate,
// Gonk doesn't resume downloads at boot time, so the update "there should not be an active update");
// will remain active until the user chooses a new one, at
// which point, the old update will be removed.
Assert.ok(!!gUpdateManager.activeUpdate,
"there should be an active update");
} else {
Assert.ok(!gUpdateManager.activeUpdate,
"there should not be an active update");
}
Assert.equal(gUpdateManager.updateCount, 0, Assert.equal(gUpdateManager.updateCount, 0,
"the update manager update count" + MSG_SHOULD_EQUAL); "the update manager update count" + MSG_SHOULD_EQUAL);

Просмотреть файл

@ -66,44 +66,6 @@ function check_test_helper_pt1_2() {
gNextRunFunc(); gNextRunFunc();
} }
// The following 3 functions are a workaround for GONK due to Bug 828858 and
// can be removed after it is fixed and the callers are changed to use the
// regular helper functions.
function run_test_helper_bug828858_pt1(aMsg, aExpectedStatusResult, aNextRunFunc) {
gUpdates = null;
gUpdateCount = null;
gStatusResult = null;
gCheckFunc = check_test_helper_bug828858_pt1_1;
gNextRunFunc = aNextRunFunc;
gExpectedStatusResult = aExpectedStatusResult;
debugDump(aMsg, Components.stack.caller);
gUpdateChecker.checkForUpdates(updateCheckListener, true);
}
function check_test_helper_bug828858_pt1_1() {
Assert.equal(gUpdateCount, 1,
"the update count" + MSG_SHOULD_EQUAL);
gCheckFunc = check_test_helper_bug828858_pt1_2;
let bestUpdate = gAUS.selectUpdate(gUpdates, gUpdateCount);
let state = gAUS.downloadUpdate(bestUpdate, false);
if (state == STATE_NONE || state == STATE_FAILED) {
do_throw("nsIApplicationUpdateService:downloadUpdate returned " + state);
}
gAUS.addDownloadListener(downloadListener);
}
function check_test_helper_bug828858_pt1_2() {
if (gStatusResult == Cr.NS_ERROR_CONTENT_CORRUPTED) {
Assert.ok(true,
"the status result should equal NS_ERROR_CONTENT_CORRUPTED");
} else {
Assert.equal(gStatusResult, gExpectedStatusResult,
"the download status result" + MSG_SHOULD_EQUAL);
}
gAUS.removeDownloadListener(downloadListener);
gNextRunFunc();
}
function setResponseBody(aHashFunction, aHashValue, aSize) { function setResponseBody(aHashFunction, aHashValue, aSize) {
let patches = getRemotePatchString(null, null, let patches = getRemotePatchString(null, null,
aHashFunction, aHashValue, aSize); aHashFunction, aHashValue, aSize);
@ -194,17 +156,6 @@ function run_test_pt11() {
function run_test_pt12() { function run_test_pt12() {
const arbitraryFileSize = 1024000; const arbitraryFileSize = 1024000;
setResponseBody("MD5", MD5_HASH_SIMPLE_MAR, arbitraryFileSize); setResponseBody("MD5", MD5_HASH_SIMPLE_MAR, arbitraryFileSize);
if (IS_TOOLKIT_GONK) { run_test_helper_pt1("mar download with a valid MD5 hash but invalid file size",
// There seems to be a race on the web server side when the patchFile is Cr.NS_ERROR_UNEXPECTED, finish_test);
// stored on the SDCard. Sometimes, the webserver will serve up an error
// 416 and the contents of the file, and sometimes it will serve up an error
// 200 and no contents. This can cause either NS_ERROR_UNEXPECTED or
// NS_ERROR_CONTENT_CORRUPTED.
// Bug 828858 was filed to follow up on this issue.
run_test_helper_bug828858_pt1("mar download with a valid MD5 hash but invalid file size",
Cr.NS_ERROR_UNEXPECTED, finish_test);
} else {
run_test_helper_pt1("mar download with a valid MD5 hash but invalid file size",
Cr.NS_ERROR_UNEXPECTED, finish_test);
}
} }

Просмотреть файл

@ -212,19 +212,8 @@ function run_test_pt2() {
Services.prefs.setIntPref(PREF_APP_UPDATE_SOCKET_MAXERRORS, 2); Services.prefs.setIntPref(PREF_APP_UPDATE_SOCKET_MAXERRORS, 2);
Services.prefs.setIntPref(PREF_APP_UPDATE_RETRYTIMEOUT, 0); Services.prefs.setIntPref(PREF_APP_UPDATE_RETRYTIMEOUT, 0);
setResponseBody("MD5", MD5_HASH_SIMPLE_MAR); setResponseBody("MD5", MD5_HASH_SIMPLE_MAR);
let expectedResult;
if (IS_TOOLKIT_GONK) {
// Gonk treats interrupted downloads differently. For gonk, if the state
// is pending, this means that the download has completed and only the
// staging needs to occur. So gonk will skip the download portion which
// results in an NS_OK return.
expectedResult = Cr.NS_OK;
} else {
expectedResult = Cr.NS_ERROR_NET_RESET;
}
run_test_helper_pt1("mar download with connection interruption without recovery", run_test_helper_pt1("mar download with connection interruption without recovery",
expectedResult, run_test_pt3); Cr.NS_ERROR_NET_RESET, run_test_pt3);
} }
// Test entering offline mode while downloading // Test entering offline mode while downloading

Просмотреть файл

@ -19,15 +19,8 @@ function run_test() {
standardInit(); standardInit();
if (IS_TOOLKIT_GONK) { Assert.equal(gUpdateManager.updateCount, 1,
// GONK doesn't resume downloads at boot time, so the updateCount will "the update manager updateCount attribute" + MSG_SHOULD_EQUAL);
// always be zero.
Assert.equal(gUpdateManager.updateCount, 0,
"the update manager updateCount attribute" + MSG_SHOULD_EQUAL);
} else {
Assert.equal(gUpdateManager.updateCount, 1,
"the update manager updateCount attribute" + MSG_SHOULD_EQUAL);
}
Assert.equal(gUpdateManager.activeUpdate.state, STATE_DOWNLOADING, Assert.equal(gUpdateManager.activeUpdate.state, STATE_DOWNLOADING,
"the update manager activeUpdate state attribute" + "the update manager activeUpdate state attribute" +
MSG_SHOULD_EQUAL); MSG_SHOULD_EQUAL);

Просмотреть файл

@ -25,7 +25,7 @@ function run_test() {
* Called after the call to setupUpdaterTest finishes. * Called after the call to setupUpdaterTest finishes.
*/ */
function setupUpdaterTestFinished() { function setupUpdaterTestFinished() {
stageUpdate(); stageUpdate(false);
} }
/** /**

Просмотреть файл

@ -23,7 +23,7 @@ function run_test() {
* Called after the call to setupUpdaterTest finishes. * Called after the call to setupUpdaterTest finishes.
*/ */
function setupUpdaterTestFinished() { function setupUpdaterTestFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**
@ -32,7 +32,7 @@ function setupUpdaterTestFinished() {
function stageUpdateFinished() { function stageUpdateFinished() {
checkPostUpdateRunningFile(false); checkPostUpdateRunningFile(false);
checkFilesAfterUpdateSuccess(getStageDirFile, true, false); checkFilesAfterUpdateSuccess(getStageDirFile, true, false);
checkUpdateLogContents(LOG_COMPLETE_SUCCESS_STAGE, true); checkUpdateLogContents(LOG_COMPLETE_SUCCESS, true);
lockDirectory(getAppBaseDir().path); lockDirectory(getAppBaseDir().path);
// Switch the application to the staged application that was updated. // Switch the application to the staged application that was updated.
runUpdateUsingApp(STATE_SUCCEEDED); runUpdateUsingApp(STATE_SUCCEEDED);

Просмотреть файл

@ -23,7 +23,7 @@ function run_test() {
* Called after the call to setupUpdaterTest finishes. * Called after the call to setupUpdaterTest finishes.
*/ */
function setupUpdaterTestFinished() { function setupUpdaterTestFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**
@ -32,7 +32,7 @@ function setupUpdaterTestFinished() {
function stageUpdateFinished() { function stageUpdateFinished() {
checkPostUpdateRunningFile(false); checkPostUpdateRunningFile(false);
checkFilesAfterUpdateSuccess(getStageDirFile, true); checkFilesAfterUpdateSuccess(getStageDirFile, true);
checkUpdateLogContents(LOG_COMPLETE_SUCCESS_STAGE, true); checkUpdateLogContents(LOG_COMPLETE_SUCCESS, true);
// Switch the application to the staged application that was updated. // Switch the application to the staged application that was updated.
runUpdateUsingApp(STATE_SUCCEEDED); runUpdateUsingApp(STATE_SUCCEEDED);
} }

Просмотреть файл

@ -28,7 +28,7 @@ function setupUpdaterTestFinished() {
* Called after the call to waitForHelperSleep finishes. * Called after the call to waitForHelperSleep finishes.
*/ */
function waitForHelperSleepFinished() { function waitForHelperSleepFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**
@ -37,9 +37,9 @@ function waitForHelperSleepFinished() {
function stageUpdateFinished() { function stageUpdateFinished() {
checkPostUpdateRunningFile(false); checkPostUpdateRunningFile(false);
checkFilesAfterUpdateSuccess(getStageDirFile, true); checkFilesAfterUpdateSuccess(getStageDirFile, true);
checkUpdateLogContents(LOG_COMPLETE_SUCCESS_STAGE, true); checkUpdateLogContents(LOG_COMPLETE_SUCCESS, true);
// Switch the application to the staged application that was updated. // Switch the application to the staged application that was updated.
runUpdate(STATE_PENDING, true, 1, false); runUpdate(STATE_AFTER_RUNUPDATE, true, 1, true);
} }
/** /**

Просмотреть файл

@ -31,7 +31,7 @@ function setupUpdaterTestFinished() {
* Called after the call to waitForHelperSleep finishes. * Called after the call to waitForHelperSleep finishes.
*/ */
function waitForHelperSleepFinished() { function waitForHelperSleepFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**
@ -40,7 +40,7 @@ function waitForHelperSleepFinished() {
function stageUpdateFinished() { function stageUpdateFinished() {
checkPostUpdateRunningFile(false); checkPostUpdateRunningFile(false);
checkFilesAfterUpdateSuccess(getStageDirFile, true); checkFilesAfterUpdateSuccess(getStageDirFile, true);
checkUpdateLogContents(LOG_COMPLETE_SUCCESS_STAGE, true); checkUpdateLogContents(LOG_COMPLETE_SUCCESS, true);
// Switch the application to the staged application that was updated. // Switch the application to the staged application that was updated.
runUpdate(STATE_SUCCEEDED, true, 0, true); runUpdate(STATE_SUCCEEDED, true, 0, true);
} }
@ -84,8 +84,7 @@ function checkPostUpdateAppLogFinished() {
* Setup symlinks for the test. * Setup symlinks for the test.
*/ */
function setupSymLinks() { function setupSymLinks() {
// The tests don't support symlinks on gonk. if (IS_UNIX) {
if (IS_UNIX && !IS_TOOLKIT_GONK) {
removeSymlink(); removeSymlink();
createSymlink(); createSymlink();
do_register_cleanup(removeSymlink); do_register_cleanup(removeSymlink);
@ -108,8 +107,7 @@ function setupSymLinks() {
* Checks the state of the symlinks for the test. * Checks the state of the symlinks for the test.
*/ */
function checkSymLinks() { function checkSymLinks() {
// The tests don't support symlinks on gonk. if (IS_UNIX) {
if (IS_UNIX && !IS_TOOLKIT_GONK) {
checkSymlink(); checkSymlink();
} }
} }

Просмотреть файл

@ -20,7 +20,7 @@ function run_test() {
* Called after the call to setupUpdaterTest finishes. * Called after the call to setupUpdaterTest finishes.
*/ */
function setupUpdaterTestFinished() { function setupUpdaterTestFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**
@ -29,9 +29,9 @@ function setupUpdaterTestFinished() {
function stageUpdateFinished() { function stageUpdateFinished() {
checkPostUpdateRunningFile(false); checkPostUpdateRunningFile(false);
checkFilesAfterUpdateSuccess(getStageDirFile, true); checkFilesAfterUpdateSuccess(getStageDirFile, true);
checkUpdateLogContents(LOG_COMPLETE_SUCCESS_STAGE, true); checkUpdateLogContents(LOG_COMPLETE_SUCCESS, true);
// Switch the application to the staged application that was updated. // Switch the application to the staged application that was updated.
runUpdate(STATE_SUCCEEDED, true, 0, false); runUpdate(STATE_SUCCEEDED, true, 0, true);
} }
/** /**

Просмотреть файл

@ -20,7 +20,7 @@ function run_test() {
* Called after the call to setupUpdaterTest finishes. * Called after the call to setupUpdaterTest finishes.
*/ */
function setupUpdaterTestFinished() { function setupUpdaterTestFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**
@ -29,9 +29,9 @@ function setupUpdaterTestFinished() {
function stageUpdateFinished() { function stageUpdateFinished() {
checkPostUpdateRunningFile(false); checkPostUpdateRunningFile(false);
checkFilesAfterUpdateSuccess(getStageDirFile, true); checkFilesAfterUpdateSuccess(getStageDirFile, true);
checkUpdateLogContents(LOG_PARTIAL_SUCCESS_STAGE, true); checkUpdateLogContents(LOG_PARTIAL_SUCCESS, true);
// Switch the application to the staged application that was updated. // Switch the application to the staged application that was updated.
runUpdate(STATE_SUCCEEDED, true, 0, false); runUpdate(STATE_SUCCEEDED, true, 0, true);
} }
/** /**

Просмотреть файл

@ -22,8 +22,8 @@ function run_test() {
function setupUpdaterTestFinished() { function setupUpdaterTestFinished() {
// If execv is used the updater process will turn into the callback process // If execv is used the updater process will turn into the callback process
// and the updater's return code will be that of the callback process. // and the updater's return code will be that of the callback process.
runUpdate(STATE_FAILED_LOADSOURCE_ERROR_WRONG_SIZE, false, runUpdate(STATE_FAILED_LOADSOURCE_ERROR_WRONG_SIZE, false, (USE_EXECV ? 0 : 1),
(USE_EXECV ? 0 : 1), true); true);
} }
/** /**

Просмотреть файл

@ -28,7 +28,7 @@ function setupUpdaterTestFinished() {
* Called after the call to waitForHelperSleep finishes. * Called after the call to waitForHelperSleep finishes.
*/ */
function waitForHelperSleepFinished() { function waitForHelperSleepFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**
@ -37,9 +37,9 @@ function waitForHelperSleepFinished() {
function stageUpdateFinished() { function stageUpdateFinished() {
checkPostUpdateRunningFile(false); checkPostUpdateRunningFile(false);
checkFilesAfterUpdateSuccess(getStageDirFile, true); checkFilesAfterUpdateSuccess(getStageDirFile, true);
checkUpdateLogContents(LOG_COMPLETE_SUCCESS_STAGE, true); checkUpdateLogContents(LOG_COMPLETE_SUCCESS, true);
// Switch the application to the staged application that was updated. // Switch the application to the staged application that was updated.
runUpdate(STATE_PENDING, true, 1, false); runUpdate(STATE_AFTER_RUNUPDATE, true, 1, true);
} }
/** /**

Просмотреть файл

@ -28,7 +28,7 @@ function setupUpdaterTestFinished() {
* Called after the call to waitForHelperSleep finishes. * Called after the call to waitForHelperSleep finishes.
*/ */
function waitForHelperSleepFinished() { function waitForHelperSleepFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**
@ -37,9 +37,9 @@ function waitForHelperSleepFinished() {
function stageUpdateFinished() { function stageUpdateFinished() {
checkPostUpdateRunningFile(false); checkPostUpdateRunningFile(false);
checkFilesAfterUpdateSuccess(getStageDirFile, true); checkFilesAfterUpdateSuccess(getStageDirFile, true);
checkUpdateLogContents(LOG_PARTIAL_SUCCESS_STAGE, true); checkUpdateLogContents(LOG_PARTIAL_SUCCESS, true);
// Switch the application to the staged application that was updated. // Switch the application to the staged application that was updated.
runUpdate(STATE_PENDING, true, 1, false); runUpdate(STATE_AFTER_RUNUPDATE, true, 1, true);
} }
/** /**

Просмотреть файл

@ -27,7 +27,7 @@ function setupUpdaterTestFinished() {
* Called after the call to waitForHelperSleep finishes. * Called after the call to waitForHelperSleep finishes.
*/ */
function waitForHelperSleepFinished() { function waitForHelperSleepFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**

Просмотреть файл

@ -27,7 +27,7 @@ function setupUpdaterTestFinished() {
* Called after the call to waitForHelperSleep finishes. * Called after the call to waitForHelperSleep finishes.
*/ */
function waitForHelperSleepFinished() { function waitForHelperSleepFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**

Просмотреть файл

@ -29,7 +29,7 @@ function setupUpdaterTestFinished() {
* Called after the call to waitForHelperSleep finishes. * Called after the call to waitForHelperSleep finishes.
*/ */
function waitForHelperSleepFinished() { function waitForHelperSleepFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**
@ -38,9 +38,9 @@ function waitForHelperSleepFinished() {
function stageUpdateFinished() { function stageUpdateFinished() {
checkPostUpdateRunningFile(false); checkPostUpdateRunningFile(false);
checkFilesAfterUpdateSuccess(getStageDirFile, true); checkFilesAfterUpdateSuccess(getStageDirFile, true);
checkUpdateLogContents(LOG_COMPLETE_SUCCESS_STAGE, true); checkUpdateLogContents(LOG_COMPLETE_SUCCESS, true);
// Switch the application to the staged application that was updated. // Switch the application to the staged application that was updated.
runUpdate(STATE_PENDING, true, 1, false); runUpdate(STATE_AFTER_RUNUPDATE, true, 1, true);
} }
/** /**

Просмотреть файл

@ -28,7 +28,7 @@ function setupUpdaterTestFinished() {
* Called after the call to waitForHelperSleep finishes. * Called after the call to waitForHelperSleep finishes.
*/ */
function waitForHelperSleepFinished() { function waitForHelperSleepFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**
@ -37,9 +37,9 @@ function waitForHelperSleepFinished() {
function stageUpdateFinished() { function stageUpdateFinished() {
checkPostUpdateRunningFile(false); checkPostUpdateRunningFile(false);
checkFilesAfterUpdateSuccess(getStageDirFile, true); checkFilesAfterUpdateSuccess(getStageDirFile, true);
checkUpdateLogContents(LOG_PARTIAL_SUCCESS_STAGE, true); checkUpdateLogContents(LOG_PARTIAL_SUCCESS, true);
// Switch the application to the staged application that was updated. // Switch the application to the staged application that was updated.
runUpdate(STATE_PENDING, true, 1, false); runUpdate(STATE_AFTER_RUNUPDATE, true, 1, true);
} }
/** /**

Просмотреть файл

@ -23,7 +23,7 @@ function run_test() {
* Called after the call to setupUpdaterTest finishes. * Called after the call to setupUpdaterTest finishes.
*/ */
function setupUpdaterTestFinished() { function setupUpdaterTestFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**

Просмотреть файл

@ -25,7 +25,7 @@ function run_test() {
* Called after the call to setupUpdaterTest finishes. * Called after the call to setupUpdaterTest finishes.
*/ */
function setupUpdaterTestFinished() { function setupUpdaterTestFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**
@ -34,7 +34,7 @@ function setupUpdaterTestFinished() {
function stageUpdateFinished() { function stageUpdateFinished() {
checkPostUpdateRunningFile(false); checkPostUpdateRunningFile(false);
checkFilesAfterUpdateSuccess(getStageDirFile, true); checkFilesAfterUpdateSuccess(getStageDirFile, true);
checkUpdateLogContents(LOG_COMPLETE_SUCCESS_STAGE, true); checkUpdateLogContents(LOG_COMPLETE_SUCCESS, true);
// Switch the application to the staged application that was updated. // Switch the application to the staged application that was updated.
runUpdate(STATE_SUCCEEDED, true, 0, true); runUpdate(STATE_SUCCEEDED, true, 0, true);
} }
@ -101,8 +101,7 @@ function checkDistributionDir() {
function setupSymLinks() { function setupSymLinks() {
// Don't test symlinks on Mac OS X in this test since it tends to timeout. // Don't test symlinks on Mac OS X in this test since it tends to timeout.
// It is tested on Mac OS X in marAppInUseStageSuccessComplete_unix.js // It is tested on Mac OS X in marAppInUseStageSuccessComplete_unix.js
// The tests don't support symlinks on gonk. if (IS_UNIX && !IS_MACOSX) {
if (IS_UNIX && !IS_MACOSX && !IS_TOOLKIT_GONK) {
removeSymlink(); removeSymlink();
createSymlink(); createSymlink();
do_register_cleanup(removeSymlink); do_register_cleanup(removeSymlink);
@ -125,8 +124,9 @@ function setupSymLinks() {
* Checks the state of the symlinks for the test. * Checks the state of the symlinks for the test.
*/ */
function checkSymLinks() { function checkSymLinks() {
// The tests don't support symlinks on gonk. // Don't test symlinks on Mac OS X in this test since it tends to timeout.
if (IS_UNIX && !IS_MACOSX && !IS_TOOLKIT_GONK) { // It is tested on Mac OS X in marAppInUseStageSuccessComplete_unix.js
if (IS_UNIX && !IS_MACOSX) {
checkSymlink(); checkSymlink();
} }
} }

Просмотреть файл

@ -25,7 +25,7 @@ function run_test() {
* Called after the call to setupUpdaterTest finishes. * Called after the call to setupUpdaterTest finishes.
*/ */
function setupUpdaterTestFinished() { function setupUpdaterTestFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**
@ -34,9 +34,9 @@ function setupUpdaterTestFinished() {
function stageUpdateFinished() { function stageUpdateFinished() {
checkPostUpdateRunningFile(false); checkPostUpdateRunningFile(false);
checkFilesAfterUpdateSuccess(getStageDirFile, true); checkFilesAfterUpdateSuccess(getStageDirFile, true);
checkUpdateLogContents(LOG_PARTIAL_SUCCESS_STAGE, true, false, true); checkUpdateLogContents(LOG_PARTIAL_SUCCESS, true, false, true);
// Switch the application to the staged application that was updated. // Switch the application to the staged application that was updated.
runUpdate(STATE_SUCCEEDED, true, 0, false); runUpdate(STATE_SUCCEEDED, true, 0, true);
} }
/** /**

Просмотреть файл

@ -25,8 +25,8 @@ function run_test() {
function setupUpdaterTestFinished() { function setupUpdaterTestFinished() {
// If execv is used the updater process will turn into the callback process // If execv is used the updater process will turn into the callback process
// and the updater's return code will be that of the callback process. // and the updater's return code will be that of the callback process.
runUpdateUsingUpdater(STATE_FAILED_VERSION_DOWNGRADE_ERROR, false, runUpdate(STATE_FAILED_VERSION_DOWNGRADE_ERROR, false, (USE_EXECV ? 0 : 1),
(USE_EXECV ? 0 : 1)); false);
} }
/** /**

Просмотреть файл

@ -24,8 +24,8 @@ function setupUpdaterTestFinished() {
overrideApplyToDir(getApplyDirPath() + "/../NoSuchDir"); overrideApplyToDir(getApplyDirPath() + "/../NoSuchDir");
// If execv is used the updater process will turn into the callback process // If execv is used the updater process will turn into the callback process
// and the updater's return code will be that of the callback process. // and the updater's return code will be that of the callback process.
runUpdateUsingUpdater(STATE_FAILED_INVALID_APPLYTO_DIR_ERROR, false, runUpdate(STATE_FAILED_INVALID_APPLYTO_DIR_ERROR, false, (USE_EXECV ? 0 : 1),
(USE_EXECV ? 0 : 1)); false);
} }
/** /**

Просмотреть файл

@ -25,8 +25,8 @@ function run_test() {
function setupUpdaterTestFinished() { function setupUpdaterTestFinished() {
// If execv is used the updater process will turn into the callback process // If execv is used the updater process will turn into the callback process
// and the updater's return code will be that of the callback process. // and the updater's return code will be that of the callback process.
runUpdateUsingUpdater(STATE_FAILED_MAR_CHANNEL_MISMATCH_ERROR, false, runUpdate(STATE_FAILED_MAR_CHANNEL_MISMATCH_ERROR, false, (USE_EXECV ? 0 : 1),
(USE_EXECV ? 0 : 1)); false);
} }
/** /**

Просмотреть файл

@ -19,7 +19,7 @@ function run_test() {
* Called after the call to setupUpdaterTest finishes. * Called after the call to setupUpdaterTest finishes.
*/ */
function setupUpdaterTestFinished() { function setupUpdaterTestFinished() {
runUpdateUsingService(STATE_SUCCEEDED, false, true); runUpdate(STATE_SUCCEEDED, false, 0, true);
} }
/** /**

Просмотреть файл

@ -25,7 +25,7 @@ function run_test() {
* Called after the call to setupUpdaterTest finishes. * Called after the call to setupUpdaterTest finishes.
*/ */
function setupUpdaterTestFinished() { function setupUpdaterTestFinished() {
stageUpdate(); stageUpdate(false);
} }
/** /**

Просмотреть файл

@ -23,7 +23,7 @@ function run_test() {
* Called after the call to setupUpdaterTest finishes. * Called after the call to setupUpdaterTest finishes.
*/ */
function setupUpdaterTestFinished() { function setupUpdaterTestFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**
@ -32,7 +32,7 @@ function setupUpdaterTestFinished() {
function stageUpdateFinished() { function stageUpdateFinished() {
checkPostUpdateRunningFile(false); checkPostUpdateRunningFile(false);
checkFilesAfterUpdateSuccess(getStageDirFile, true, false); checkFilesAfterUpdateSuccess(getStageDirFile, true, false);
checkUpdateLogContents(LOG_COMPLETE_SUCCESS_STAGE, true); checkUpdateLogContents(LOG_COMPLETE_SUCCESS, true);
lockDirectory(getAppBaseDir().path); lockDirectory(getAppBaseDir().path);
// Switch the application to the staged application that was updated. // Switch the application to the staged application that was updated.
runUpdateUsingApp(STATE_SUCCEEDED); runUpdateUsingApp(STATE_SUCCEEDED);

Просмотреть файл

@ -23,7 +23,7 @@ function run_test() {
* Called after the call to setupUpdaterTest finishes. * Called after the call to setupUpdaterTest finishes.
*/ */
function setupUpdaterTestFinished() { function setupUpdaterTestFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**
@ -32,7 +32,7 @@ function setupUpdaterTestFinished() {
function stageUpdateFinished() { function stageUpdateFinished() {
checkPostUpdateRunningFile(false); checkPostUpdateRunningFile(false);
checkFilesAfterUpdateSuccess(getStageDirFile, true); checkFilesAfterUpdateSuccess(getStageDirFile, true);
checkUpdateLogContents(LOG_COMPLETE_SUCCESS_STAGE, true); checkUpdateLogContents(LOG_COMPLETE_SUCCESS, true);
// Switch the application to the staged application that was updated. // Switch the application to the staged application that was updated.
runUpdateUsingApp(STATE_SUCCEEDED); runUpdateUsingApp(STATE_SUCCEEDED);
} }

Просмотреть файл

@ -28,7 +28,7 @@ function setupUpdaterTestFinished() {
* Called after the call to waitForHelperSleep finishes. * Called after the call to waitForHelperSleep finishes.
*/ */
function waitForHelperSleepFinished() { function waitForHelperSleepFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**
@ -37,9 +37,9 @@ function waitForHelperSleepFinished() {
function stageUpdateFinished() { function stageUpdateFinished() {
checkPostUpdateRunningFile(false); checkPostUpdateRunningFile(false);
checkFilesAfterUpdateSuccess(getStageDirFile, true); checkFilesAfterUpdateSuccess(getStageDirFile, true);
checkUpdateLogContents(LOG_COMPLETE_SUCCESS_STAGE, true); checkUpdateLogContents(LOG_COMPLETE_SUCCESS, true);
// Switch the application to the staged application that was updated. // Switch the application to the staged application that was updated.
runUpdate(STATE_PENDING, true, 1, false); runUpdate(STATE_AFTER_RUNUPDATE, true, 1, true);
} }
/** /**

Просмотреть файл

@ -20,7 +20,7 @@ function run_test() {
* Called after the call to setupUpdaterTest finishes. * Called after the call to setupUpdaterTest finishes.
*/ */
function setupUpdaterTestFinished() { function setupUpdaterTestFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**
@ -29,9 +29,9 @@ function setupUpdaterTestFinished() {
function stageUpdateFinished() { function stageUpdateFinished() {
checkPostUpdateRunningFile(false); checkPostUpdateRunningFile(false);
checkFilesAfterUpdateSuccess(getStageDirFile, true); checkFilesAfterUpdateSuccess(getStageDirFile, true);
checkUpdateLogContents(LOG_COMPLETE_SUCCESS_STAGE, true); checkUpdateLogContents(LOG_COMPLETE_SUCCESS, true);
// Switch the application to the staged application that was updated. // Switch the application to the staged application that was updated.
runUpdate(STATE_SUCCEEDED, true, 0, false); runUpdate(STATE_SUCCEEDED, true, 0, true);
} }
/** /**

Просмотреть файл

@ -20,7 +20,7 @@ function run_test() {
* Called after the call to setupUpdaterTest finishes. * Called after the call to setupUpdaterTest finishes.
*/ */
function setupUpdaterTestFinished() { function setupUpdaterTestFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**
@ -29,9 +29,9 @@ function setupUpdaterTestFinished() {
function stageUpdateFinished() { function stageUpdateFinished() {
checkPostUpdateRunningFile(false); checkPostUpdateRunningFile(false);
checkFilesAfterUpdateSuccess(getStageDirFile, true); checkFilesAfterUpdateSuccess(getStageDirFile, true);
checkUpdateLogContents(LOG_PARTIAL_SUCCESS_STAGE, true); checkUpdateLogContents(LOG_PARTIAL_SUCCESS, true);
// Switch the application to the staged application that was updated. // Switch the application to the staged application that was updated.
runUpdate(STATE_SUCCEEDED, true, 0, false); runUpdate(STATE_SUCCEEDED, true, 0, true);
} }
/** /**

Просмотреть файл

@ -22,8 +22,8 @@ function run_test() {
function setupUpdaterTestFinished() { function setupUpdaterTestFinished() {
// If execv is used the updater process will turn into the callback process // If execv is used the updater process will turn into the callback process
// and the updater's return code will be that of the callback process. // and the updater's return code will be that of the callback process.
runUpdate(STATE_FAILED_LOADSOURCE_ERROR_WRONG_SIZE, false, runUpdate(STATE_FAILED_LOADSOURCE_ERROR_WRONG_SIZE, false, (USE_EXECV ? 0 : 1),
(USE_EXECV ? 0 : 1), true); true);
} }
/** /**

Просмотреть файл

@ -28,7 +28,7 @@ function setupUpdaterTestFinished() {
* Called after the call to waitForHelperSleep finishes. * Called after the call to waitForHelperSleep finishes.
*/ */
function waitForHelperSleepFinished() { function waitForHelperSleepFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**
@ -37,9 +37,9 @@ function waitForHelperSleepFinished() {
function stageUpdateFinished() { function stageUpdateFinished() {
checkPostUpdateRunningFile(false); checkPostUpdateRunningFile(false);
checkFilesAfterUpdateSuccess(getStageDirFile, true); checkFilesAfterUpdateSuccess(getStageDirFile, true);
checkUpdateLogContents(LOG_COMPLETE_SUCCESS_STAGE, true); checkUpdateLogContents(LOG_COMPLETE_SUCCESS, true);
// Switch the application to the staged application that was updated. // Switch the application to the staged application that was updated.
runUpdate(STATE_PENDING, true, 1, false); runUpdate(STATE_AFTER_RUNUPDATE, true, 1, true);
} }
/** /**

Просмотреть файл

@ -28,7 +28,7 @@ function setupUpdaterTestFinished() {
* Called after the call to waitForHelperSleep finishes. * Called after the call to waitForHelperSleep finishes.
*/ */
function waitForHelperSleepFinished() { function waitForHelperSleepFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**
@ -37,9 +37,9 @@ function waitForHelperSleepFinished() {
function stageUpdateFinished() { function stageUpdateFinished() {
checkPostUpdateRunningFile(false); checkPostUpdateRunningFile(false);
checkFilesAfterUpdateSuccess(getStageDirFile, true); checkFilesAfterUpdateSuccess(getStageDirFile, true);
checkUpdateLogContents(LOG_PARTIAL_SUCCESS_STAGE, true); checkUpdateLogContents(LOG_PARTIAL_SUCCESS, true);
// Switch the application to the staged application that was updated. // Switch the application to the staged application that was updated.
runUpdate(STATE_PENDING, true, 1, false); runUpdate(STATE_AFTER_RUNUPDATE, true, 1, true);
} }
/** /**

Просмотреть файл

@ -27,7 +27,7 @@ function setupUpdaterTestFinished() {
* Called after the call to waitForHelperSleep finishes. * Called after the call to waitForHelperSleep finishes.
*/ */
function waitForHelperSleepFinished() { function waitForHelperSleepFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**

Просмотреть файл

@ -27,7 +27,7 @@ function setupUpdaterTestFinished() {
* Called after the call to waitForHelperSleep finishes. * Called after the call to waitForHelperSleep finishes.
*/ */
function waitForHelperSleepFinished() { function waitForHelperSleepFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**

Просмотреть файл

@ -29,7 +29,7 @@ function setupUpdaterTestFinished() {
* Called after the call to waitForHelperSleep finishes. * Called after the call to waitForHelperSleep finishes.
*/ */
function waitForHelperSleepFinished() { function waitForHelperSleepFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**
@ -38,9 +38,9 @@ function waitForHelperSleepFinished() {
function stageUpdateFinished() { function stageUpdateFinished() {
checkPostUpdateRunningFile(false); checkPostUpdateRunningFile(false);
checkFilesAfterUpdateSuccess(getStageDirFile, true); checkFilesAfterUpdateSuccess(getStageDirFile, true);
checkUpdateLogContents(LOG_COMPLETE_SUCCESS_STAGE, true); checkUpdateLogContents(LOG_COMPLETE_SUCCESS, true);
// Switch the application to the staged application that was updated. // Switch the application to the staged application that was updated.
runUpdate(STATE_PENDING, true, 1, false); runUpdate(STATE_AFTER_RUNUPDATE, true, 1, true);
} }
/** /**

Просмотреть файл

@ -28,7 +28,7 @@ function setupUpdaterTestFinished() {
* Called after the call to waitForHelperSleep finishes. * Called after the call to waitForHelperSleep finishes.
*/ */
function waitForHelperSleepFinished() { function waitForHelperSleepFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**
@ -37,9 +37,9 @@ function waitForHelperSleepFinished() {
function stageUpdateFinished() { function stageUpdateFinished() {
checkPostUpdateRunningFile(false); checkPostUpdateRunningFile(false);
checkFilesAfterUpdateSuccess(getStageDirFile, true); checkFilesAfterUpdateSuccess(getStageDirFile, true);
checkUpdateLogContents(LOG_PARTIAL_SUCCESS_STAGE, true); checkUpdateLogContents(LOG_PARTIAL_SUCCESS, true);
// Switch the application to the staged application that was updated. // Switch the application to the staged application that was updated.
runUpdate(STATE_PENDING, true, 1, false); runUpdate(STATE_AFTER_RUNUPDATE, true, 1, true);
} }
/** /**

Просмотреть файл

@ -23,7 +23,7 @@ function run_test() {
* Called after the call to setupUpdaterTest finishes. * Called after the call to setupUpdaterTest finishes.
*/ */
function setupUpdaterTestFinished() { function setupUpdaterTestFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**

Просмотреть файл

@ -25,7 +25,7 @@ function run_test() {
* Called after the call to setupUpdaterTest finishes. * Called after the call to setupUpdaterTest finishes.
*/ */
function setupUpdaterTestFinished() { function setupUpdaterTestFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**
@ -34,7 +34,7 @@ function setupUpdaterTestFinished() {
function stageUpdateFinished() { function stageUpdateFinished() {
checkPostUpdateRunningFile(false); checkPostUpdateRunningFile(false);
checkFilesAfterUpdateSuccess(getStageDirFile, true); checkFilesAfterUpdateSuccess(getStageDirFile, true);
checkUpdateLogContents(LOG_COMPLETE_SUCCESS_STAGE, true); checkUpdateLogContents(LOG_COMPLETE_SUCCESS, true);
// Switch the application to the staged application that was updated. // Switch the application to the staged application that was updated.
runUpdate(STATE_SUCCEEDED, true, 0, true); runUpdate(STATE_SUCCEEDED, true, 0, true);
} }
@ -101,8 +101,7 @@ function checkDistributionDir() {
function setupSymLinks() { function setupSymLinks() {
// Don't test symlinks on Mac OS X in this test since it tends to timeout. // Don't test symlinks on Mac OS X in this test since it tends to timeout.
// It is tested on Mac OS X in marAppInUseStageSuccessComplete_unix.js // It is tested on Mac OS X in marAppInUseStageSuccessComplete_unix.js
// The tests don't support symlinks on gonk. if (IS_UNIX && !IS_MACOSX) {
if (IS_UNIX && !IS_MACOSX && !IS_TOOLKIT_GONK) {
removeSymlink(); removeSymlink();
createSymlink(); createSymlink();
do_register_cleanup(removeSymlink); do_register_cleanup(removeSymlink);
@ -125,8 +124,9 @@ function setupSymLinks() {
* Checks the state of the symlinks for the test. * Checks the state of the symlinks for the test.
*/ */
function checkSymLinks() { function checkSymLinks() {
// The tests don't support symlinks on gonk. // Don't test symlinks on Mac OS X in this test since it tends to timeout.
if (IS_UNIX && !IS_MACOSX && !IS_TOOLKIT_GONK) { // It is tested on Mac OS X in marAppInUseStageSuccessComplete_unix.js
if (IS_UNIX && !IS_MACOSX) {
checkSymlink(); checkSymlink();
} }
} }

Просмотреть файл

@ -25,7 +25,7 @@ function run_test() {
* Called after the call to setupUpdaterTest finishes. * Called after the call to setupUpdaterTest finishes.
*/ */
function setupUpdaterTestFinished() { function setupUpdaterTestFinished() {
stageUpdate(); stageUpdate(true);
} }
/** /**
@ -34,9 +34,9 @@ function setupUpdaterTestFinished() {
function stageUpdateFinished() { function stageUpdateFinished() {
checkPostUpdateRunningFile(false); checkPostUpdateRunningFile(false);
checkFilesAfterUpdateSuccess(getStageDirFile, true); checkFilesAfterUpdateSuccess(getStageDirFile, true);
checkUpdateLogContents(LOG_PARTIAL_SUCCESS_STAGE, true, false, true); checkUpdateLogContents(LOG_PARTIAL_SUCCESS, true, false, true);
// Switch the application to the staged application that was updated. // Switch the application to the staged application that was updated.
runUpdate(STATE_SUCCEEDED, true, 0, false); runUpdate(STATE_SUCCEEDED, true, 0, true);
} }
/** /**