texinfo-commits
[Top][All Lists]
Advanced

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

[8214] move test under t


From: gavinsmith0123
Subject: [8214] move test under t
Date: Sun, 23 Sep 2018 09:21:03 -0400 (EDT)

Revision: 8214
          http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8214
Author:   gavin
Date:     2018-09-23 09:21:02 -0400 (Sun, 23 Sep 2018)
Log Message:
-----------
move test under t

Modified Paths:
--------------
    trunk/ChangeLog
    trunk/tp/Makefile.am
    trunk/tp/tests/formatting/list-of-tests

Added Paths:
-----------
    trunk/tp/t/92formatting.t
    trunk/tp/t/input_files/one_line_no_content.texi
    trunk/tp/t/results/formatting/
    trunk/tp/t/results/formatting/one_line_no_content.pl

Removed Paths:
-------------
    trunk/tp/tests/formatting/one_line_no_content.texi
    trunk/tp/tests/test_scripts/formatting_one_line_no_content.sh

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog     2018-09-23 12:33:44 UTC (rev 8213)
+++ trunk/ChangeLog     2018-09-23 13:21:02 UTC (rev 8214)
@@ -1,5 +1,11 @@
 2018-09-23  Gavin Smith  <address@hidden>
 
+       * tp/t/92formatting.t: New file.
+       * tp/t/92formatting.t (one_line_no_content): New test.
+       * tp/tests/formatting/list-of-tests (one_line_no_content): Remove test.
+
+2018-09-23  Gavin Smith  <address@hidden>
+
        * tp/maintain/regenerate_cmd_tests.sh: Remove code dealing with 
        "texi" as a special test case name.  Do not use separate '$arg' 
        and '$name' variables in the test scripts.
@@ -6,12 +12,6 @@
 
 2018-09-23  Gavin Smith  <address@hidden>
 
-       * tp/tests/nested_formats/list-of-tests (texi_nested_formats): Remove.
-       * tp/92nested_formats.t: New file.
-       * tp/92nested_formats.t (texi_nested_formats): New test.
-
-2018-09-23  Gavin Smith  <address@hidden>
-
        * tp/Texinfo/Convert/PlainTexinfo.pm: Do not pass a 
        'FIX_TEXINFO' value into Texinfo.pm.
        * tp/Texinfo/Convert/Texinfo.pm (convert, _expand_cmd_args_to_texi):

Modified: trunk/tp/Makefile.am
===================================================================
--- trunk/tp/Makefile.am        2018-09-23 12:33:44 UTC (rev 8213)
+++ trunk/tp/Makefile.am        2018-09-23 13:21:02 UTC (rev 8214)
@@ -173,6 +173,7 @@
  t/input_files/japanese_shift_jis.texi \
  t/input_files/nodequote.texi \
  t/input_files/non_break_spaces.texi \
+ t/input_files/one_line_no_content.texi \
  t/input_files/sample_utf8.texi \
  t/input_files/things_before_setfilename_no_element.texi \
  t/input_files/things_before_setfilename.texi \

Copied: trunk/tp/t/92formatting.t (from rev 8179, trunk/tp/t/91morecoverage.t)
===================================================================
--- trunk/tp/t/92formatting.t                           (rev 0)
+++ trunk/tp/t/92formatting.t   2018-09-23 13:21:02 UTC (rev 8214)
@@ -0,0 +1,28 @@
+# $Id: 02coverage.t 8055 2018-08-13 11:41:21Z gavin $
+use strict;
+
+use lib '.';
+use Texinfo::ModulePath (undef, undef, 'updirs' => 2);
+
+require 't/test_utils.pl';
+
+# These tests are supposed to test the same things as tests
+# under tp/tests did, but to be faster.
+my @test_cases = (
+['one_line_no_content',
+  undef, {'test_file' => 'one_line_no_content.texi',
+  },
+],
+
+);
+
+foreach my $test (@test_cases) {
+  push @{$test->[2]->{'test_formats'}}, 'html';
+  $test->[3]->{'TEXI2HTML'} = 1;
+  $test->[3]->{'TEST'} = 1;
+}
+
+our ($arg_test_case, $arg_generate, $arg_debug);
+
+run_all ('formatting', address@hidden, $arg_test_case,
+   $arg_generate, $arg_debug);

Copied: trunk/tp/t/input_files/one_line_no_content.texi (from rev 8074, 
trunk/tp/tests/formatting/one_line_no_content.texi)
===================================================================
--- trunk/tp/t/input_files/one_line_no_content.texi                             
(rev 0)
+++ trunk/tp/t/input_files/one_line_no_content.texi     2018-09-23 13:21:02 UTC 
(rev 8214)
@@ -0,0 +1 @@
+\input texinfo.tex

Added: trunk/tp/t/results/formatting/one_line_no_content.pl
===================================================================
--- trunk/tp/t/results/formatting/one_line_no_content.pl                        
        (rev 0)
+++ trunk/tp/t/results/formatting/one_line_no_content.pl        2018-09-23 
13:21:02 UTC (rev 8214)
@@ -0,0 +1,101 @@
+use vars qw(%result_texis %result_texts %result_trees %result_errors 
+   %result_indices %result_sectioning %result_nodes %result_menus
+   %result_floats %result_converted %result_converted_errors 
+   %result_elements %result_directions_text);
+
+use utf8;
+
+$result_trees{'one_line_no_content'} = {
+  'contents' => [
+    {
+      'contents' => [
+        {
+          'parent' => {},
+          'text' => '\\input texinfo.tex
+',
+          'type' => 'preamble_text'
+        }
+      ],
+      'parent' => {},
+      'type' => 'preamble'
+    }
+  ],
+  'type' => 'text_root'
+};
+$result_trees{'one_line_no_content'}{'contents'}[0]{'contents'}[0]{'parent'} = 
$result_trees{'one_line_no_content'}{'contents'}[0];
+$result_trees{'one_line_no_content'}{'contents'}[0]{'parent'} = 
$result_trees{'one_line_no_content'};
+
+$result_texis{'one_line_no_content'} = '\\input texinfo.tex
+';
+
+
+$result_texts{'one_line_no_content'} = '';
+
+$result_errors{'one_line_no_content'} = [];
+
+
+
+$result_converted{'html'}->{'one_line_no_content'} = '<!DOCTYPE html PUBLIC 
"-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd";>
+<html>
+<!-- Created by texinfo, http://www.gnu.org/software/texinfo/ -->
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+<title>Untitled Document</title>
+
+<meta name="description" content="Untitled Document">
+<meta name="keywords" content="Untitled Document">
+<meta name="resource-type" content="document">
+<meta name="distribution" content="global">
+<style type="text/css">
+<!--
+a.summary-letter {text-decoration: none}
+blockquote.indentedblock {margin-right: 0em}
+blockquote.smallindentedblock {margin-right: 0em; font-size: smaller}
+blockquote.smallquotation {font-size: smaller}
+div.display {margin-left: 3.2em}
+div.example {margin-left: 3.2em}
+div.lisp {margin-left: 3.2em}
+div.smalldisplay {margin-left: 3.2em}
+div.smallexample {margin-left: 3.2em}
+div.smalllisp {margin-left: 3.2em}
+kbd {font-style: oblique}
+pre.display {font-family: inherit}
+pre.format {font-family: inherit}
+pre.menu-comment {font-family: serif}
+pre.menu-preformatted {font-family: serif}
+pre.smalldisplay {font-family: inherit; font-size: smaller}
+pre.smallexample {font-size: smaller}
+pre.smallformat {font-family: inherit; font-size: smaller}
+pre.smalllisp {font-size: smaller}
+span.nolinebreak {white-space: nowrap}
+span.roman {font-family: initial; font-weight: normal}
+span.sansserif {font-family: sans-serif; font-weight: normal}
+ul.no-bullet {list-style: none}
+-->
+</style>
+
+
+</head>
+
+<body lang="en">
+<hr>
+<p><font size="-1">
+  This document was generated on <em>a sunny day</em>.
+</font></p>
+
+
+</body>
+</html>
+';
+
+$result_converted_errors{'html'}->{'one_line_no_content'} = [
+  {
+    'error_line' => 'one_line_no_content.texi: warning: must specify a title 
with a title command or @top
+',
+    'text' => 'must specify a title with a title command or @top',
+    'type' => 'warning'
+  }
+];
+
+
+1;

Modified: trunk/tp/tests/formatting/list-of-tests
===================================================================
--- trunk/tp/tests/formatting/list-of-tests     2018-09-23 12:33:44 UTC (rev 
8213)
+++ trunk/tp/tests/formatting/list-of-tests     2018-09-23 13:21:02 UTC (rev 
8214)
@@ -24,7 +24,6 @@
 test_redefine_need test_need.texi --init redefine_need.init
 
 # test the first line
-one_line_no_content one_line_no_content.texi
 one_line one_line.texi
 empty empty.texi
 

Deleted: trunk/tp/tests/formatting/one_line_no_content.texi
===================================================================
--- trunk/tp/tests/formatting/one_line_no_content.texi  2018-09-23 12:33:44 UTC 
(rev 8213)
+++ trunk/tp/tests/formatting/one_line_no_content.texi  2018-09-23 13:21:02 UTC 
(rev 8214)
@@ -1 +0,0 @@
-\input texinfo.tex

Deleted: trunk/tp/tests/test_scripts/formatting_one_line_no_content.sh
===================================================================
--- trunk/tp/tests/test_scripts/formatting_one_line_no_content.sh       
2018-09-23 12:33:44 UTC (rev 8213)
+++ trunk/tp/tests/test_scripts/formatting_one_line_no_content.sh       
2018-09-23 13:21:02 UTC (rev 8214)
@@ -1,25 +0,0 @@
-#! /bin/sh
-# This file generated by maintain/regenerate_cmd_tests.sh
-
-if test z"$srcdir" = "z"; then
-  srcdir=.
-fi
-
-one_test_logs_dir=test_log
-diffs_dir=diffs
-
-
-dir=formatting
-name='one_line_no_content'
-[ -d "$dir" ] || mkdir $dir
-
-srcdir_test=$dir; export srcdir_test;
-"$srcdir"/run_parser_all.sh -dir $dir $name
-exit_status=$?
-cat $dir/$one_test_logs_dir/$name.log
-if test $exit_status = 0 && test -f $dir/$diffs_dir/$name.diff; then
-  echo 
-  cat $dir/$diffs_dir/$name.diff
-fi
-exit $exit_status
-




reply via email to

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