[5356] Fixes.

[Patrice Dumas]

Revision: 5356
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=5356
Author:   pertusus
Date:     2013-09-07 16:43:13 +0000 (Sat, 07 Sep 2013)
Log Message:
-----------
Fixes.

Separate files that cannot be in Windows file systems from
test results.

Modified Paths:
--------------
    trunk/texi2html/test/manage_test_archives.sh
    trunk/texi2html/test/run_test.sh
    trunk/texi2html/test/tex_html_singular/tests-parser.txt

Added Paths:
-----------
    trunk/texi2html/test/tex_html_manuals/tests-parser.txt
    trunk/texi2html/test/tex_html_tests

Modified: trunk/texi2html/test/manage_test_archives.sh
===================================================================
--- trunk/texi2html/test/manage_test_archives.sh        2013-09-07 16:42:03 UTC 
(rev 5355)
+++ trunk/texi2html/test/manage_test_archives.sh        2013-09-07 16:43:13 UTC 
(rev 5356)
@@ -34,13 +34,15 @@
 
 tp_tests_name=tp_tests_results-$VERSION
 texi2html_tests_name=t2h_tests_results
+files_tests_name=t2h_tests_files
 #manuals=t2h_tests_big_manuals
 
 if [ $command = 'packt2h' ]; then
-  rm -f $texi2html_tests_name.tar.gz #$manuals.tar.gz
+  rm -f $texi2html_tests_name.tar.gz $files_tests_name.tar.gz #$manuals.tar.gz
   (
   cd ..
-  tar c --exclude-vcs -z -f test/$texi2html_tests_name.tar.gz test/*/res/ 
test/*/res_all/ test/*/res_info/ test/*/res_html/ test/*/res_docbook/ 
test/*/res_xml/ test/many_input_files/*_res/ test/info_coverage/f--ile*
+  tar c --exclude-vcs -z -f test/$texi2html_tests_name.tar.gz test/*/res/ 
test/*/res_all/ test/*/res_info/ test/*/res_html/ test/*/res_docbook/ 
test/*/res_xml/ test/many_input_files/*_res/
+  tar c --exclude-vcs -z -f test/$files_tests_name.tar.gz 
test/info_coverage/f--ile*
   #tar c --exclude-vcs -z -f test/$manuals.tar.gz test/manuals/*.texi 
test/tar_manual/*.texi test/singular_manual/*.tex* 
test/singular_manual/d2t_singular/
   )
 elif [ $command = 'pack' ]; then
@@ -51,7 +53,7 @@
   )
 elif [ $command = 'get' ]; then :
   wget -N -r -np -A '*.tar.gz*' http://$download_dir/ || exit 1
-  for file in $texi2html_tests_name $tp_tests_name; do
+  for file in $texi2html_tests_name $tp_tests_name $files_tests_name; do
     if [ -f  $download_dir/$file.tar.gz ]; then
       cp -a $download_dir/$file.tar.gz ..
     else
@@ -60,12 +62,12 @@
   done
 elif [ $command = 'clean' ]; then
   rm -rf download-mirror.savannah.gnu.org
-  rm -f $texi2html_tests_name.tar.gz $tp_tests_name.tar.gz
-  rm -f ../$texi2html_tests_name.tar.gz ../$tp_tests_name.tar.gz
+  rm -f $texi2html_tests_name.tar.gz $tp_tests_name.tar.gz 
$files_tests_name.tar.gz
+  rm -f ../$texi2html_tests_name.tar.gz ../$tp_tests_name.tar.gz 
../$files_tests_name.tar.gz
 elif [ $command = 'unpack' ]; then
   (
   cd ..
-  for file in $texi2html_tests_name $tp_tests_name; do
+  for file in $files_tests_name $texi2html_tests_name $tp_tests_name; do
     if [ -f $file.tar.gz ]; then
       tar x -z -f $file.tar.gz
     else
@@ -91,8 +93,9 @@
   gpg -b --use-agent ../upload/$tp_tests_name.tar.gz
 elif [ $command = 'signt2h' ]; then
   mkdir -p ../upload
-  cp -a $texi2html_tests_name.tar.gz ../upload
+  cp -a $texi2html_tests_name.tar.gz $files_tests_name.tar.gz ../upload
   gpg -b --use-agent ../upload/$texi2html_tests_name.tar.gz
+  gpg -b --use-agent ../upload/$files_tests_name.tar.gz
 elif [ $command = 'upload' ]; then
   rsync -a -essh ../upload/ address@hidden:/releases/texinfo/
 else

Modified: trunk/texi2html/test/run_test.sh
===================================================================
--- trunk/texi2html/test/run_test.sh    2013-09-07 16:42:03 UTC (rev 5355)
+++ trunk/texi2html/test/run_test.sh    2013-09-07 16:43:13 UTC (rev 5356)
@@ -43,6 +43,11 @@
   no_tex4ht=no
 fi
 
+no_html2wiki=yes
+if which html2wiki > /dev/null 2>&1; then
+  no_html2wiki=no
+fi
+
 one_test=no
 if [ z"$1" != 'z' ]; then
   one_test=yes
@@ -176,6 +181,14 @@
       fi
       use_tex4ht=yes
     fi
+    if [ $use_tex4ht = 'yes' -o $use_latex2html = 'yes' ]; then
+      if echo "$remaining" | grep -qs -- '-init mediawiki.pm'; then
+       if [ "$no_html2wiki" = 'yes' ]; then
+         echo "S: (no html2wiki) $current"
+         continue
+       fi
+      fi
+    fi
     one_test_done=yes
     [ -d "$out_dir/$dir" ] && rm -rf "$out_dir/$dir"
     mkdir "$out_dir/$dir"

Added: trunk/texi2html/test/tex_html_manuals/tests-parser.txt
===================================================================
--- trunk/texi2html/test/tex_html_manuals/tests-parser.txt                      
        (rev 0)
+++ trunk/texi2html/test/tex_html_manuals/tests-parser.txt      2013-09-07 
16:43:13 UTC (rev 5356)
@@ -0,0 +1,3 @@
+#mini_ker_l2h ../manuals/mini_ker.texi --set-customization-variable 'L2H 1' 
--iftex
+mini_ker_httex ../manuals/mini_ker.texi --init tex4ht.pm --iftex
+mini_ker ../manuals/mini_ker.texi --init book.pm --split section --node-files 
--set-customization-variable 'USE_NODES 1' --iftex --init mini_ker_t2h.init 
--init tex4ht.pm

Modified: trunk/texi2html/test/tex_html_singular/tests-parser.txt
===================================================================
--- trunk/texi2html/test/tex_html_singular/tests-parser.txt     2013-09-07 
16:42:03 UTC (rev 5355)
+++ trunk/texi2html/test/tex_html_singular/tests-parser.txt     2013-09-07 
16:43:13 UTC (rev 5356)
@@ -1,2 +1,2 @@
-singular singular.texi --init-file t2h_singular.init 
--set-customization-variable 'L2H 1' --set-customization-variable 'SHORTEXTN 1' 
--set-customization-variable 'PREFIX sing' --set-customization-variable 
'TOP_FILE index.htm' --no-verbose
+singular ../singular_manual/singular.texi --init-file t2h_singular.init 
--set-customization-variable 'L2H 1' --set-customization-variable 'SHORTEXTN 1' 
--set-customization-variable 'PREFIX sing' --set-customization-variable 
'TOP_FILE index.htm' --no-verbose
 singular_httex ../singular_manual/singular.texi --init-file t2h_singular.init 
--init tex4ht.pm --set-customization-variable 'SHORTEXTN 1' 
--set-customization-variable 'PREFIX sing' --set-customization-variable 
'TOP_FILE index.htm' --no-verbose

Added: trunk/texi2html/test/tex_html_tests
===================================================================
--- trunk/texi2html/test/tex_html_tests                         (rev 0)
+++ trunk/texi2html/test/tex_html_tests 2013-09-07 16:43:13 UTC (rev 5356)
@@ -0,0 +1,13 @@
+#! /bin/sh
+# Copyright (C) 2010 Free Software Foundation, Inc.
+#
+# Copying and distribution of this file, with or without modification,
+# are permitted in any medium without royalty provided the copyright
+# notice and this notice are preserved.
+
+if [ z"$srcdir" = 'z' ]; then
+  srcdir=.
+fi
+
+"$srcdir"/tests.sh all \
+  tex_html tex_html_manuals tex_html_singular


Property changes on: trunk/texi2html/test/tex_html_tests
___________________________________________________________________
Added: svn:executable
   + *