Re: texinfo-6.0.91 pretest

[Gavin Smith]

On 2 January 2016 at 11:26, Eli Zaretskii <address@hidden> wrote:
>
> One way is to run the output through Sed, before comparing, to replace
> "^htmlxref" with "./htmlxref".
>

That's a good suggestion, and in fact looking at the code this is done
already for other tests. Below is what I came up with.

If this works I'll add a couple of comments and commit it.

Index: tp/tests/run_parser_all.sh
===================================================================
--- tp/tests/run_parser_all.sh  (revision 6901)
+++ tp/tests/run_parser_all.sh  (working copy)
@@ -349,14 +349,14 @@
         chmod -R u+w "$staging_dir_res/$dir"
         rm -rf $staging_dir_res$dir/CVS $staging_dir_res$dir/.svn

+        # store raw output
+        raw_outdir="$testdir/${raw_out_dir}${dir_suffix}/"
+        test -d "${raw_outdir}" || mkdir "${raw_outdir}"
+        rm -rf "${raw_outdir}$dir"
         # with latex2html or tex4ht output is stored in raw_outdir, and files
         # are removed or modified from the output directory used for
comparisons
         if test "$use_latex2html" = 'yes' || test "$use_tex4ht" = 'yes' ; then

-          # store raw output
-          raw_outdir="$testdir/${raw_out_dir}${dir_suffix}/"
-          test -d "${raw_outdir}" || mkdir "${raw_outdir}"
-          rm -rf "${raw_outdir}$dir"
           cp -pr ${outdir}$dir/ "${raw_outdir}"

           # remove files that are not reproducible
@@ -365,6 +365,9 @@
                 ${outdir}$dir/*_tex4ht_*.idv ${outdir}$dir/*_tex4ht_*.dvi \
                 ${outdir}$dir/*_l2h.html.* \
                 ${outdir}$dir/*_tex4ht_tex.html*
+        else
+          mkdir -p "${raw_outdir}$dir"
+          cp -pr ${outdir}$dir/${basename}.2 "${raw_outdir}$dir"
         fi
         if test "$use_tex4ht" = 'yes' ; then
           # tex4ht may be customized to use dvipng or dvips, both being
@@ -374,6 +377,7 @@
         elif test "$use_latex2html" = 'yes' ; then
           sed -e 's/^texexpand.*/texexpand /' \
               -e '/is no longer supported at.*line/d' \
+              -e 's/^htmlxref/.\/htmlxref' \
               $raw_outdir$dir/$basename.2 > $outdir$dir/$basename.2
           # "*"_images.pl" files are not guaranteed to be present
           for file in "${raw_outdir}$dir/"*"_labels.pl"; do
@@ -400,6 +404,9 @@
           # even with the normalizations above.
           rm -f ${outdir}$dir/*.aux ${outdir}$dir/*_images.out \
                 ${outdir}$dir/*_l2h.css ${outdir}$dir/*_l2h_images.pl
+        else
+          sed -e 's/^htmlxref/.\/htmlxref/' \
+              $raw_outdir$dir/$basename.2 > $outdir$dir/$basename.2
         fi

         diff $DIFF_A_OPTION $DIFF_U_OPTION -r
"${staging_dir_res}$dir" "${outdir}$dir" 2>>$logfile >
"$testdir/$diffs_dir/$diff_base.diff"