From: Brian Z. <bz...@zi...> - 2005-06-14 03:32:22
|
I committed this change about an hour ago. brian On Jun 13, 2005, at 10:04 PM, Updike, Clark wrote: > Oti- > > On 5/31 you committed build.xml 1.48. There was a section > that was as follows: > > <!-- Copy stuff under Lib/test so an overwrite is forced. > This should make jython tests overwrite cpython tests > of the same name. --> > <copy todir="${distDir}/Lib/test" overwrite="true"> > <fileset dir="${sourceDir}/Lib/test" includes="**"/> > </copy> > > Which you changed to: > > <!-- The jython .py modules: important to overwrite the above CPython > .py files --> > <echo>copy the jython *.py modules from ${sourceDir}/Lib</echo> > <copy todir="${distDir}/Lib" preservelastmodified="true" > overwrite="true"> > <fileset dir="${sourceDir}/Lib" includes="**/*.py" /> > </copy> > > One of the things the original did was copy the files in > /Lib/test/output into the dist directory. AFAICT, this > was needed to get regrtest.py to use the expected/generated > output from under the /Lib/test/output (more on this below). > Without this, there is no generated output for the jython tests. > > So either I'm running the tests incorrectly, or the copy > needs to be widened to include jython/Lib/test/output. > > To help decide which, here's how I was getting the jython tests > to pass by matching the generated output, prior to the build.xml > change that broke it. It's odd: > > 1. Get the unit test working passing (no failures, ingoring > mismatched output for now). > 2. run: jython regrtest.py -g <the test> to generate the output > 3. Copy the generated output from $dist/Lib/test/output back up > to jython/Lib/test/output (seems strange, but the -g option > dumps it to the dist dir). If you don't do this step, the > stale generated output from jython/Lib/test/output kept > getting used for the comparision. > > Doing it this way seemed weird, but it was the only way to: > > 1. Get the jython only test set to work, via: > jython regrtest.py > 2. Get the jython + cpython combined test set to work, via: > jython regrtest.py -a > 3. Keep them working after running a build. > > If nobody knows a better way to get the test output to > match, then the build should copy the generated output > to the dist dir (and we'll have to copy it from the > dist dir to jython/Lib/test/output after it is first > generated). Hopefully I'm doing it wrong and it make > more sense than this. > > Thanks, > Clark > |