[5203] * configure.ac, tp/defs.in, tp/tests/*/*.sh, tp/tests/ run_parser_all.sh:

[Patrice Dumas]

Revision: 5203
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5203
Author:   pertusus
Date:     2013-02-24 14:17:38 +0000 (Sun, 24 Feb 2013)
Log Message:
-----------
        * configure.ac, tp/defs.in, tp/tests/*/*.sh, tp/tests/run_parser_all.sh:
        determine whether diff accepts -u and sets DIFF_U_OPTION to -u if so.
        Report that HP-UX diff do not accept -u from Richard Lloyd
        bug-texinfo, 19 Feb 2013 15:56:41.

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/configure.ac
    trunk/tp/defs.in
    trunk/tp/tests/many_input_files/indices.sh
    trunk/tp/tests/many_input_files/tex_l2h.sh
    trunk/tp/tests/many_input_files/tex_t4ht.sh
    trunk/tp/tests/run_parser_all.sh

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2013-02-24 01:22:45 UTC (rev 5202)
+++ trunk/ChangeLog     2013-02-24 14:17:38 UTC (rev 5203)
@@ -1,3 +1,10 @@
+2013-02-24  Patrice Dumas  <address@hidden>
+
+       * configure.ac, tp/defs.in, tp/tests/*/*.sh, tp/tests/run_parser_all.sh:
+       determine whether diff accepts -u and sets DIFF_U_OPTION to -u if so.
+       Report that HP-UX diff do not accept -u from Richard Lloyd
+       bug-texinfo, 19 Feb 2013 15:56:41.
+
 2013-02-23  Patrice Dumas  <address@hidden>
 
        * tp/t/input_files/sample_utf8.texi: avoid having two nodes differing

Modified: trunk/configure.ac
===================================================================
--- trunk/configure.ac  2013-02-24 01:22:45 UTC (rev 5202)
+++ trunk/configure.ac  2013-02-24 14:17:38 UTC (rev 5203)
@@ -97,6 +97,25 @@
 MKINSTALLDIRS="\$(top_srcdir)/build-aux/install-sh -d"
 AC_SUBST([MKINSTALLDIRS])
 
+dnl check whether diff accepts the -u option (not on HP-UX)
+AC_MSG_CHECKING(whether diff accepts -u)
+diff_accepts_u_option=no
+echo foo >conftest.dtx
+echo foo | diff -u - conftest.dtx >/dev/null 2>&1
+error_status_diff_u=$?
+if test $error_status_diff_u = 0; then
+  diff_accepts_u_option=yes
+fi
+AC_MSG_RESULT($diff_accepts_u_option)
+rm -f conftest.dtx
+
+DIFF_U_OPTION=
+if test "z$diff_accepts_u_option" = 'zyes' ; then
+  DIFF_U_OPTION=-u
+fi
+AC_SUBST([DIFF_U_OPTION])
+
+
 # Needed on sysV68 for sigblock, sigsetmask.  But check for it in libc first.
 AC_CHECK_FUNC(sigblock, , [AC_CHECK_LIB(bsd, sigblock)])
 

Modified: trunk/tp/defs.in
===================================================================
--- trunk/tp/defs.in    2013-02-24 01:22:45 UTC (rev 5202)
+++ trunk/tp/defs.in    2013-02-24 14:17:38 UTC (rev 5203)
@@ -1,2 +1,3 @@
 PATH_SEPARATOR="@PATH_SEPARATOR@"
 PERL="@PERL@"
+DIFF_U_OPTION="@DIFF_U_OPTION@"

Modified: trunk/tp/tests/many_input_files/indices.sh
===================================================================
--- trunk/tp/tests/many_input_files/indices.sh  2013-02-24 01:22:45 UTC (rev 
5202)
+++ trunk/tp/tests/many_input_files/indices.sh  2013-02-24 14:17:38 UTC (rev 
5203)
@@ -41,7 +41,7 @@
     cp -pr "$srcdir/${dir}_res" $staging_dir
     chmod -R u+w "$staging_dir/${dir}_res"
     rm -rf $staging_dir/${dir}_res/CVS $staging_dir/${dir}_res/.svn
-    diff -u -r $staging_dir/${dir}_res ${dir} 2>>$logfile > 
$diffs_dir/$dir.diff
+    diff $DIFF_U_OPTION -r $staging_dir/${dir}_res ${dir} 2>>$logfile > 
$diffs_dir/$dir.diff
     dif_ret=$?
     if [ $dif_ret != 0 ]; then
       echo "D: $diffs_dir/$dir.diff"

Modified: trunk/tp/tests/many_input_files/tex_l2h.sh
===================================================================
--- trunk/tp/tests/many_input_files/tex_l2h.sh  2013-02-24 01:22:45 UTC (rev 
5202)
+++ trunk/tp/tests/many_input_files/tex_l2h.sh  2013-02-24 14:17:38 UTC (rev 
5203)
@@ -76,7 +76,7 @@
     chmod -R u+w "$staging_dir/${dir}_res"
     rm -rf $staging_dir/${dir}_res/CVS $staging_dir/${dir}_res/.svn
     #diff -u --exclude=CVS --exclude='*.png' -r "$srcdir/${dir}_res" "${dir}" 
2>>$logfile > "$diffs_dir/$dir.diff"
-    diff -u -r "$staging_dir/${dir}_res" "$outdir" 2>>$logfile > 
"$diffs_dir/$dir.diff"
+    diff $DIFF_U_OPTION -r "$staging_dir/${dir}_res" "$outdir" 2>>$logfile > 
"$diffs_dir/$dir.diff"
     dif_ret=$?
     if [ $dif_ret != 0 ]; then
       echo "D: $diffs_dir/$dir.diff"

Modified: trunk/tp/tests/many_input_files/tex_t4ht.sh
===================================================================
--- trunk/tp/tests/many_input_files/tex_t4ht.sh 2013-02-24 01:22:45 UTC (rev 
5202)
+++ trunk/tp/tests/many_input_files/tex_t4ht.sh 2013-02-24 14:17:38 UTC (rev 
5203)
@@ -55,7 +55,7 @@
     chmod -R u+w "$staging_dir/${dir}_res"
     rm -rf $staging_dir/${dir}_res/CVS $staging_dir/${dir}_res/.svn
     #diff -u --exclude=CVS --exclude='*.png' -r "$srcdir/${dir}_res" "${dir}" 
2>>$logfile > "$diffs_dir/$dir.diff"
-    diff -u -r "$staging_dir/${dir}_res" "${outdir}" 2>>$logfile > 
"$diffs_dir/$dir.diff"
+    diff $DIFF_U_OPTION -r "$staging_dir/${dir}_res" "${outdir}" 2>>$logfile > 
"$diffs_dir/$dir.diff"
     dif_ret=$?
     if [ $dif_ret != 0 ]; then
       echo "D: $diffs_dir/$dir.diff"

Modified: trunk/tp/tests/run_parser_all.sh
===================================================================
--- trunk/tp/tests/run_parser_all.sh    2013-02-24 01:22:45 UTC (rev 5202)
+++ trunk/tp/tests/run_parser_all.sh    2013-02-24 14:17:38 UTC (rev 5203)
@@ -355,7 +355,7 @@
                 ${outdir}$dir/*_l2h.css
         fi
 
-        diff -a -u -r "${staging_dir_res}$dir" "${outdir}$dir" 2>>$logfile > 
"$diffs_dir/$diff_base.diff"
+        diff -a $DIFF_U_OPTION -r "${staging_dir_res}$dir" "${outdir}$dir" 
2>>$logfile > "$diffs_dir/$diff_base.diff"
         dif_ret=$?
         if [ $dif_ret != 0 ]; then
           echo "D: ${mydir}$diffs_dir/$diff_base.diff"