texinfo-commits
[Top][All Lists]
Advanced

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]

texinfo/tp/tests run_parser_all.sh formatting/r...


From: Patrice Dumas
Subject: texinfo/tp/tests run_parser_all.sh formatting/r...
Date: Mon, 30 Jan 2012 21:21:37 +0000

CVSROOT:        /sources/texinfo
Module name:    texinfo
Changes by:     Patrice Dumas <pertusus>        12/01/30 21:21:37

Modified files:
        tp/tests       : run_parser_all.sh 
Removed files:
        tp/tests/formatting/res_parser/simplest_httex: simplest.2 
        tp/tests/formatting/res_parser/tex_complex_httex: tex_complex.2 
        tp/tests/formatting/res_parser/tex_httex: tex.2 

Log message:
        Don't compare/copy what is issued on stderr with tex4ht, as tex4ht may 
be
        customized and give something different.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/run_parser_all.sh?cvsroot=texinfo&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/formatting/res_parser/simplest_httex/simplest.2?cvsroot=texinfo&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/formatting/res_parser/tex_complex_httex/tex_complex.2?cvsroot=texinfo&r1=1.1&r2=0
http://cvs.savannah.gnu.org/viewcvs/texinfo/tp/tests/formatting/res_parser/tex_httex/tex.2?cvsroot=texinfo&r1=1.1&r2=0

Patches:
Index: run_parser_all.sh
===================================================================
RCS file: /sources/texinfo/texinfo/tp/tests/run_parser_all.sh,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- run_parser_all.sh   30 Jan 2012 01:04:21 -0000      1.2
+++ run_parser_all.sh   30 Jan 2012 21:21:36 -0000      1.3
@@ -141,7 +141,7 @@
              mkdir "${resdir}$dir/"
           fi
           cp -r "${outdir}$dir/"* "${resdir}$dir/"
-          rm -f "${resdir}$dir/"*.png "${resdir}$dir/"*_l2h.css
+          rm -f "${resdir}$dir/"*.png "${resdir}$dir/"*_l2h.css 
"${resdir}$dir/"*_2 "${resdir}$dir/"*_1
         else
           echo "No dir ${outdir}$dir" 1>&2
         fi
@@ -303,7 +303,14 @@
         rm -f "${outdir}$dir/"*".aux"  "${outdir}$dir/"*"_images.out"
       fi
       if [ "$use_latex2html" = 'yes' -o "$use_tex4ht" = 'yes' ]; then
-        rm -f "${outdir}$dir/$basename.1"
+        # to keep the files but avoid them being copyied or diffed
+        mv "${outdir}$dir/$basename.1" "${outdir}$dir/${basename}_1"
+      fi
+      if [ "$use_tex4ht" = 'yes' ]; then
+        # tex4ht may be customized to use dvipng or dvips, both being
+        # verbose, so there can not be reproducible tests on stderr either
+        # with tex4ht.
+        mv "${outdir}$dir/$basename.2" "${outdir}$dir/${basename}_2"
       fi
       res_dir_used=
       if [ -d "$results_dir/$dir" ]; then
@@ -312,7 +319,7 @@
       #  res_dir_used="$results_dir_ref/$dir"
       fi
       if [ "z$res_dir_used" != 'z' ]; then
-        diff -a -u --exclude=CVS --exclude='*.png' --exclude='*_l2h.css' -r 
"$res_dir_used" "${outdir}$dir" 2>>$logfile > "$diffs_dir/$diff_base.diff"
+        diff -a -u --exclude=CVS --exclude='*.png' --exclude='*_l2h.css' 
--exclude='*_1' --exclude='*_2' -r "$res_dir_used" "${outdir}$dir" 2>>$logfile 
> "$diffs_dir/$diff_base.diff"
         dif_ret=$?
         if [ $dif_ret != 0 ]; then
           echo "D: ${mydir}$diffs_dir/$diff_base.diff"

Index: formatting/res_parser/simplest_httex/simplest.2
===================================================================
RCS file: formatting/res_parser/simplest_httex/simplest.2
diff -N formatting/res_parser/simplest_httex/simplest.2
--- formatting/res_parser/simplest_httex/simplest.2     14 Jan 2012 19:00:54 
-0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-warning: Must specify a title with a title command or @top

Index: formatting/res_parser/tex_complex_httex/tex_complex.2
===================================================================
RCS file: formatting/res_parser/tex_complex_httex/tex_complex.2
diff -N formatting/res_parser/tex_complex_httex/tex_complex.2
--- formatting/res_parser/tex_complex_httex/tex_complex.2       14 Jan 2012 
19:01:06 -0000      1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1 +0,0 @@
-dvipng warning: DVI magnification of 1000 over-ridden by user (1400) dvipng 
warning: DVI magnification of 1000 over-ridden by user (1400) dvipng warning: 
DVI magnification of 1000 over-ridden by user (1400) 
\ No newline at end of file

Index: formatting/res_parser/tex_httex/tex.2
===================================================================
RCS file: formatting/res_parser/tex_httex/tex.2
diff -N formatting/res_parser/tex_httex/tex.2
--- formatting/res_parser/tex_httex/tex.2       14 Jan 2012 19:01:17 -0000      
1.1
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,4 +0,0 @@
-tex.texi:7: warning: @tex should only appear at a line beginning
-tex.texi:14: Superfluous argument to @end tex:  bidule
-tex.texi:42: warning: @\ should only appear in math context
-dvipng warning: DVI magnification of 1000 over-ridden by user (1400) 
\ No newline at end of file



reply via email to

[Prev in Thread] Current Thread [Next in Thread]