[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[8215] move tests under t
|
From: |
gavinsmith0123 |
|
Subject: |
[8215] move tests under t |
|
Date: |
Sun, 23 Sep 2018 09:49:01 -0400 (EDT) |
Revision: 8215
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8215
Author: gavin
Date: 2018-09-23 09:49:00 -0400 (Sun, 23 Sep 2018)
Log Message:
-----------
move tests under t
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/maintain/regenerate_cmd_tests.sh
trunk/tp/t/92formatting.t
trunk/tp/tests/README
trunk/tp/tests/formatting/list-of-tests
Added Paths:
-----------
trunk/tp/t/input_files/empty.texi
trunk/tp/t/input_files/one_line.texi
trunk/tp/t/input_files/unknown_nodes_renamed.texi
trunk/tp/t/results/formatting/empty.pl
trunk/tp/t/results/formatting/one_line.pl
trunk/tp/t/results/formatting/unknown_nodes_renamed.pl
Removed Paths:
-------------
trunk/tp/tests/formatting/empty.texi
trunk/tp/tests/formatting/one_line.texi
trunk/tp/tests/formatting/res_parser/one_line/
trunk/tp/tests/formatting/res_parser/one_line_no_content/
trunk/tp/tests/formatting/res_parser/unknown_nodes_renamed/
trunk/tp/tests/formatting/unknown_nodes_renamed.texi
trunk/tp/tests/test_scripts/formatting_empty.sh
trunk/tp/tests/test_scripts/formatting_one_line.sh
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2018-09-23 13:21:02 UTC (rev 8214)
+++ trunk/ChangeLog 2018-09-23 13:49:00 UTC (rev 8215)
@@ -1,5 +1,16 @@
2018-09-23 Gavin Smith <address@hidden>
+ * tp/tests/formatting/list-of-tests
+ (unknown_nodes_renamed, one_line, empty): Remove.
+ * tp/t/92formatting.t
+ (unknown_nodes_renamed, one_line, empty): New tests.
+
+ * tp/maintain/regenerate_cmd_tests.sh: Wipe tests directory.
+ * tp/tests/README: Do not mention wiping tests directory.
+ Explain which other files to delete.
+
+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.
Modified: trunk/tp/maintain/regenerate_cmd_tests.sh
===================================================================
--- trunk/tp/maintain/regenerate_cmd_tests.sh 2018-09-23 13:21:02 UTC (rev
8214)
+++ trunk/tp/maintain/regenerate_cmd_tests.sh 2018-09-23 13:49:00 UTC (rev
8215)
@@ -24,6 +24,7 @@
test_scripts_dir='test_scripts'
test -d $test_scripts_dir || mkdir $test_scripts_dir
+rm -f $test_scripts_dir/*
dir=`echo $0 | sed 's,/[^/]*$,,'`
outfile=$1
Modified: trunk/tp/t/92formatting.t
===================================================================
--- trunk/tp/t/92formatting.t 2018-09-23 13:21:02 UTC (rev 8214)
+++ trunk/tp/t/92formatting.t 2018-09-23 13:49:00 UTC (rev 8215)
@@ -9,10 +9,22 @@
# These tests are supposed to test the same things as tests
# under tp/tests did, but to be faster.
my @test_cases = (
+['unknown_nodes_renamed',
+ undef, {'test_file' => 'unknown_nodes_renamed.texi',
+ },
+],
['one_line_no_content',
undef, {'test_file' => 'one_line_no_content.texi',
},
],
+['one_line',
+ undef, {'test_file' => 'one_line.texi',
+ },
+],
+['empty',
+ undef, {'test_file' => 'empty.texi',
+ },
+],
);
Copied: trunk/tp/t/input_files/empty.texi (from rev 8074,
trunk/tp/tests/formatting/empty.texi)
===================================================================
Copied: trunk/tp/t/input_files/one_line.texi (from rev 8074,
trunk/tp/tests/formatting/one_line.texi)
===================================================================
--- trunk/tp/t/input_files/one_line.texi (rev 0)
+++ trunk/tp/t/input_files/one_line.texi 2018-09-23 13:49:00 UTC (rev
8215)
@@ -0,0 +1 @@
+AB
Copied: trunk/tp/t/input_files/unknown_nodes_renamed.texi (from rev 8074,
trunk/tp/tests/formatting/unknown_nodes_renamed.texi)
===================================================================
--- trunk/tp/t/input_files/unknown_nodes_renamed.texi
(rev 0)
+++ trunk/tp/t/input_files/unknown_nodes_renamed.texi 2018-09-23 13:49:00 UTC
(rev 8215)
@@ -0,0 +1 @@
address@hidden Top
Added: trunk/tp/t/results/formatting/empty.pl
===================================================================
--- trunk/tp/t/results/formatting/empty.pl (rev 0)
+++ trunk/tp/t/results/formatting/empty.pl 2018-09-23 13:49:00 UTC (rev
8215)
@@ -0,0 +1,85 @@
+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{'empty'} = {
+ 'contents' => [],
+ 'type' => 'text_root'
+};
+
+$result_texis{'empty'} = '';
+
+
+$result_texts{'empty'} = '';
+
+$result_errors{'empty'} = [];
+
+
+
+$result_converted{'html'}->{'empty'} = '<!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'}->{'empty'} = [
+ {
+ 'error_line' => 'empty.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;
Added: trunk/tp/t/results/formatting/one_line.pl
===================================================================
--- trunk/tp/t/results/formatting/one_line.pl (rev 0)
+++ trunk/tp/t/results/formatting/one_line.pl 2018-09-23 13:49:00 UTC (rev
8215)
@@ -0,0 +1,102 @@
+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'} = {
+ 'contents' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'AB
+'
+ }
+ ],
+ 'parent' => {},
+ 'type' => 'paragraph'
+ }
+ ],
+ 'type' => 'text_root'
+};
+$result_trees{'one_line'}{'contents'}[0]{'contents'}[0]{'parent'} =
$result_trees{'one_line'}{'contents'}[0];
+$result_trees{'one_line'}{'contents'}[0]{'parent'} = $result_trees{'one_line'};
+
+$result_texis{'one_line'} = 'AB
+';
+
+
+$result_texts{'one_line'} = 'AB
+';
+
+$result_errors{'one_line'} = [];
+
+
+
+$result_converted{'html'}->{'one_line'} = '<!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">
+<p>AB
+</p><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'} = [
+ {
+ 'error_line' => 'one_line.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;
Added: trunk/tp/t/results/formatting/unknown_nodes_renamed.pl
===================================================================
--- trunk/tp/t/results/formatting/unknown_nodes_renamed.pl
(rev 0)
+++ trunk/tp/t/results/formatting/unknown_nodes_renamed.pl 2018-09-23
13:49:00 UTC (rev 8215)
@@ -0,0 +1,168 @@
+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{'unknown_nodes_renamed'} = {
+ 'contents' => [
+ {
+ 'contents' => [],
+ 'parent' => {},
+ 'type' => 'text_root'
+ },
+ {
+ 'args' => [
+ {
+ 'contents' => [
+ {
+ 'parent' => {},
+ 'text' => 'Top'
+ }
+ ],
+ 'extra' => {
+ 'spaces_after_argument' => '
+'
+ },
+ 'parent' => {},
+ 'type' => 'misc_line_arg'
+ }
+ ],
+ 'cmdname' => 'node',
+ 'contents' => [],
+ 'extra' => {
+ 'node_content' => [
+ {}
+ ],
+ 'nodes_manuals' => [
+ {
+ 'node_content' => [],
+ 'normalized' => 'Top'
+ }
+ ],
+ 'normalized' => 'Top',
+ 'spaces_before_argument' => ' '
+ },
+ 'line_nr' => {
+ 'file_name' => 'unknown_nodes_renamed.texi',
+ 'line_nr' => 1,
+ 'macro' => ''
+ },
+ 'parent' => {}
+ }
+ ],
+ 'type' => 'document_root'
+};
+$result_trees{'unknown_nodes_renamed'}{'contents'}[0]{'parent'} =
$result_trees{'unknown_nodes_renamed'};
+$result_trees{'unknown_nodes_renamed'}{'contents'}[1]{'args'}[0]{'contents'}[0]{'parent'}
= $result_trees{'unknown_nodes_renamed'}{'contents'}[1]{'args'}[0];
+$result_trees{'unknown_nodes_renamed'}{'contents'}[1]{'args'}[0]{'parent'} =
$result_trees{'unknown_nodes_renamed'}{'contents'}[1];
+$result_trees{'unknown_nodes_renamed'}{'contents'}[1]{'extra'}{'node_content'}[0]
=
$result_trees{'unknown_nodes_renamed'}{'contents'}[1]{'args'}[0]{'contents'}[0];
+$result_trees{'unknown_nodes_renamed'}{'contents'}[1]{'extra'}{'nodes_manuals'}[0]{'node_content'}
=
$result_trees{'unknown_nodes_renamed'}{'contents'}[1]{'extra'}{'node_content'};
+$result_trees{'unknown_nodes_renamed'}{'contents'}[1]{'parent'} =
$result_trees{'unknown_nodes_renamed'};
+
+$result_texis{'unknown_nodes_renamed'} = '@node Top
+';
+
+
+$result_texts{'unknown_nodes_renamed'} = '';
+
+$result_sectioning{'unknown_nodes_renamed'} = {};
+
+$result_nodes{'unknown_nodes_renamed'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top',
+ 'spaces_before_argument' => ' '
+ },
+ 'node_up' => {
+ 'extra' => {
+ 'manual_content' => [
+ {
+ 'text' => 'dir'
+ }
+ ],
+ 'top_node_up' => {}
+ },
+ 'type' => 'top_node_up'
+ }
+};
+$result_nodes{'unknown_nodes_renamed'}{'node_up'}{'extra'}{'top_node_up'} =
$result_nodes{'unknown_nodes_renamed'};
+
+$result_menus{'unknown_nodes_renamed'} = {
+ 'cmdname' => 'node',
+ 'extra' => {
+ 'normalized' => 'Top',
+ 'spaces_before_argument' => ' '
+ }
+};
+
+$result_errors{'unknown_nodes_renamed'} = [];
+
+
+
+$result_converted{'html'}->{'unknown_nodes_renamed'} = '<!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">
+<a name="Top"></a>
+<hr>
+<p><font size="-1">
+ This document was generated on <em>a sunny day</em>.
+</font></p>
+
+
+</body>
+</html>
+';
+
+$result_converted_errors{'html'}->{'unknown_nodes_renamed'} = [
+ {
+ 'error_line' => 'unknown_nodes_renamed.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/README
===================================================================
--- trunk/tp/tests/README 2018-09-23 13:21:02 UTC (rev 8214)
+++ trunk/tp/tests/README 2018-09-23 13:49:00 UTC (rev 8215)
@@ -186,10 +186,16 @@
Deleting a test
===============
-rm test_scripts/*
+Run "make" to recreate the test scripts (which runs
+../maintain/regenerate_cmd_tests.sh).
-Then "make" to recreate the test scripts
-
svn status test_scripts/
Then "svn rm" the missing files.
+
+Delete directories containing reference test results, e.g.
+
+ls -d formatting/*/unknown_nodes_renamed
+rm -r formatting/out_parser/unknown_nodes_renamed
+svn rm formatting/res_parser/unknown_nodes_renamed
+
Deleted: trunk/tp/tests/formatting/empty.texi
===================================================================
Modified: trunk/tp/tests/formatting/list-of-tests
===================================================================
--- trunk/tp/tests/formatting/list-of-tests 2018-09-23 13:21:02 UTC (rev
8214)
+++ trunk/tp/tests/formatting/list-of-tests 2018-09-23 13:49:00 UTC (rev
8215)
@@ -23,10 +23,6 @@
ignore_and_comments_output ignore_and_comments.texi --init
ignore_and_comments_output.init
test_redefine_need test_need.texi --init redefine_need.init
-# test the first line
-one_line one_line.texi
-empty empty.texi
-
# diverse
direntry_dircategory_info_split direntry_dircategory.texi --info --split-size 1
split_nocopying split_nocopying.texi --info
Deleted: trunk/tp/tests/formatting/one_line.texi
===================================================================
--- trunk/tp/tests/formatting/one_line.texi 2018-09-23 13:21:02 UTC (rev
8214)
+++ trunk/tp/tests/formatting/one_line.texi 2018-09-23 13:49:00 UTC (rev
8215)
@@ -1 +0,0 @@
-AB
Deleted: trunk/tp/tests/formatting/unknown_nodes_renamed.texi
===================================================================
--- trunk/tp/tests/formatting/unknown_nodes_renamed.texi 2018-09-23
13:21:02 UTC (rev 8214)
+++ trunk/tp/tests/formatting/unknown_nodes_renamed.texi 2018-09-23
13:49:00 UTC (rev 8215)
@@ -1 +0,0 @@
address@hidden Top
Deleted: trunk/tp/tests/test_scripts/formatting_empty.sh
===================================================================
--- trunk/tp/tests/test_scripts/formatting_empty.sh 2018-09-23 13:21:02 UTC
(rev 8214)
+++ trunk/tp/tests/test_scripts/formatting_empty.sh 2018-09-23 13:49:00 UTC
(rev 8215)
@@ -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='empty'
-[ -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
-
Deleted: trunk/tp/tests/test_scripts/formatting_one_line.sh
===================================================================
--- trunk/tp/tests/test_scripts/formatting_one_line.sh 2018-09-23 13:21:02 UTC
(rev 8214)
+++ trunk/tp/tests/test_scripts/formatting_one_line.sh 2018-09-23 13:49:00 UTC
(rev 8215)
@@ -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'
-[ -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
-
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [8215] move tests under t,
gavinsmith0123 <=