On 2015/06/15 4:56, ISHIKAWA, Chiaki wrote: > Hi, > > I used to use tryserver, but due to the difficulty to clear local > patches before submitting to tryserver, I have not done so for a couple > of years (or longer). > > Lately, to create a binary that incorporate my patches for I/O error > handling on tryserver so that people can download and test it on their > PCs,I dusted off my old script to prepare and submit jobs to tryserver. > The submission itself seems to work, but compilation does not work as > expected. > > I thought I would incorporate the > patches to M-C portion, but that does not seem to be > picked up very well. Tryserver fails to apply the patches M-C portion. > > For example, this is the failure message. > From: > https://treeherder.mozilla.org/#/jobs?repo=try-comm-central&revision=45abe0e0acef > > abort: patch failed to apply > subprocess.CalledProcessError: Command '['hg', 'import', '-R', > 'mozilla', '-m', 'local patch from > /builds/slave/tb-try-c-cen-lx-00000000000000/build/mozilla-M-C-negative-error-code-processing.patch', > '--no-commit', '--force', > '/builds/slave/tb-try-c-cen-lx-00000000000000/build/mozilla-M-C-negative-error-code-processing.patch']' > returned non-zero exit status 255 > make: *** [run_client_py] Error 1 > > The patch mozilla-M-C-negative-error-code-processing.patch starts with > the following lines: > # HG changeset patch > # User ISHIKAWA, Chiaki <[email protected]> > # Parent e05c94353fb6f0b511ceb8a1e13cee4ab0e6a6d3 > Some error-related functions expect positive error code, but passed > negative values > > diff --git a/nsprpub/pr/src/misc/prerror.c b/nsprpub/pr/src/misc/prerror.c > --- a/nsprpub/pr/src/misc/prerror.c > +++ b/nsprpub/pr/src/misc/prerror.c > @@ -25,18 +25,26 @@ PR_IMPLEMENT(void) PR_SetError(PRErrorCo > PRThread *thread = PR_GetCurrentThread(); > thread->errorCode = code; > thread->osErrorCode = osErr; > ... > > > My setup was done about two years ago or so. > > I wonder if there have been subsequent changes to C-C TB tryserver usage > to make M-C patches to be incorporated properly. > > > I noticed a few things. > > 1. People's successful submissions do not seem to have a separate > trychooser.patch. I explicitly insert trychooser paramter as a > standalone patch. > > 2. I have this client-py.patch: client-py patch. > But I don't see it in other people's submissions, but their jobs do not > seem to need changes to M-C portion of the tree. > > But I need to change a few parts of M-C portion of the tree. > So I need client-py.patch. > However, I needed to update this patch. > The old content is no longer valid and so I needed to change it. > (The old content was picked up from the following URLs: > > Pushing mozilla-central patches > https://wiki.mozilla.org/ReleaseEngineering/ThunderbirdTryServer > > https://wiki.mozilla.org/ReleaseEngineering/ThunderbirdTryServer/ApplyPatchesMozconfigPatch > > I now have the following client-py.patch, but patching still fails as I > explained. > > # HG changeset patch > # Parent af55c346f84be6aa53cc986e3b03c3a92e4f2333 > # User ISHIKAWA, Chiaki <[email protected]> > # Parent c352d4695e280ede8c37d0e1f3ede6fc51d3e10e > client-py patch > > diff --git a/build/client.py-args b/build/client.py-args > --- a/build/client.py-args > +++ b/build/client.py-args > @@ -1,1 +1,1 @@ > ---hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py > --hgtool1=../scripts/buildfarm/utils/hgtool.py --skip-chatzilla > --skip-comm --skip-inspector --tinderbox-print > +--hg-options='--time' --hgtool=../tools/buildfarm/utils/hgtool.py > --hgtool1=../scripts/buildfarm/utils/hgtool.py --apply-patches > --skip-chatzilla --skip-comm --skip-inspector --tinderbox-print > > I wonder if there is an updated description of how to use C-C TB > tryserver correctly. > > TIA > > PS: I forgot. Somehow win32 build cannot proceed because it prints > something about missing .m4 file. > > From: > https://treeherder.mozilla.org/#/jobs?repo=try-comm-central&revision=88719ec9e045 > > mozmake.exe[1]: *** No rule to make target > 'c:/builds/moz2_slave/tb-try-c-cen-w32-0000000000000/build/mozilla/aclocal.m4', > needed by > 'c:/builds/moz2_slave/tb-try-c-cen-w32-0000000000000/build/configure'. Stop. > mozmake.exe: *** > [c:/builds/moz2_slave/tb-try-c-cen-w32-0000000000000/build/objdir-tb/Makefile] > Error 2 > > > But since my main aim is to create linux version, win32 issue can wait. > > PPS: When I push to tryserver, I get, on the local PC, > a warning that says that post push exited with return code 1. > > I have the following snippet in my ~/.hgrc: > > [hooks] > post-push = hg phase --force --draft "mq()" > > I wonder if this has anything to do with the failure on the tryserver. >
I forgot to mention. Without the M-C patches, the compilation started until it encountered an error due to missing macro which needs to be put inside a file under M-C portion of the tree. See job https://treeherder.mozilla.org/#/jobs?repo=try-comm-central&revision=88719ec9e045 TIA _______________________________________________ dev-builds mailing list [email protected] https://lists.mozilla.org/listinfo/dev-builds
