Sorry, this fell thru the cracks. What I meant is not ignoring test time conflicts, but ignoring conflicts when applying the patch. So, if out files conflict, it will just ignore conflicts, resulting in a bogus out file with some "<<<<<< ..." lines. Then these conflicting tests will fail as usual because of out file diff - a better result for patch submitter than having to resubmit for the entire test run.
On Mon, Oct 27, 2014 at 7:49 PM, Szehon Ho <sze...@cloudera.com> wrote: > The test-run script of precommit is here : > > https://github.com/apache/hive/blob/trunk/testutils/ptest2/src/main/resources/batch-exec.vm > > It references some properties that are set in properties file. Right now > those prop files live on build-machine, but we are planning eventually to > source-control them (see HIVE-7801). > > I might be missing something, but if you could get pre-commit to ignore > conflicts in qtest output (-Dtest.output.overwrite=true), how would that > help this scenario of having to regenerate output? It might be nice if > automation could return say a tarball of new .out files for you, but I > think that would not be so trivial to do, and not a 'precommit test'. > > > On Mon, Oct 27, 2014 at 6:41 PM, Sergey Shelukhin <ser...@hortonworks.com> > wrote: > > > Hi. > > Is there some place one can view and maybe change pre-commit scripts? > > I want to see if they can be made to optionally ignore conflicts in > *.q.out > > files and just run the build/tests anyway. > > Otherwise working on a patch that changes a lot of out files is an epic > > PITA because HiveQA keeps failing due to out file conflicts with parallel > > changes, unless you watch the queue and update the patch at the very last > > moment. > > > > -- > > CONFIDENTIALITY NOTICE > > NOTICE: This message is intended for the use of the individual or entity > to > > which it is addressed and may contain information that is confidential, > > privileged and exempt from disclosure under applicable law. If the reader > > of this message is not the intended recipient, you are hereby notified > that > > any printing, copying, dissemination, distribution, disclosure or > > forwarding of this communication is strictly prohibited. If you have > > received this communication in error, please contact the sender > immediately > > and delete it from your system. Thank You. > > > -- CONFIDENTIALITY NOTICE NOTICE: This message is intended for the use of the individual or entity to which it is addressed and may contain information that is confidential, privileged and exempt from disclosure under applicable law. If the reader of this message is not the intended recipient, you are hereby notified that any printing, copying, dissemination, distribution, disclosure or forwarding of this communication is strictly prohibited. If you have received this communication in error, please contact the sender immediately and delete it from your system. Thank You.
