[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[8268] htmlxref.cnf strip leading directories for tests
From: |
gavinsmith0123 |
Subject: |
[8268] htmlxref.cnf strip leading directories for tests |
Date: |
Mon, 8 Oct 2018 16:31:08 -0400 (EDT) |
Revision: 8268
http://svn.sv.gnu.org/viewvc/?view=rev&root=texinfo&revision=8268
Author: gavin
Date: 2018-10-08 16:31:07 -0400 (Mon, 08 Oct 2018)
Log Message:
-----------
htmlxref.cnf strip leading directories for tests
Modified Paths:
--------------
trunk/ChangeLog
trunk/tp/Texinfo/Convert/HTML.pm
trunk/tp/t/results/htmlxref/htmlxref.pl
trunk/tp/t/results/htmlxref/htmlxref_nodes.pl
Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog 2018-10-08 19:44:01 UTC (rev 8267)
+++ trunk/ChangeLog 2018-10-08 20:31:07 UTC (rev 8268)
@@ -1,3 +1,9 @@
+2018-10-08 Gavin Smith <address@hidden>
+
+ * tp/Texinfo/Convert/HTML.pm (_parse_htmlxref_files) [TEST]:
+ Strip leading directories from file name in order to have
+ reliable reference test results for out-of-source builds.
+
2018-10-06 Gavin Smith <address@hidden>
* tp/Texinfo/Parser.pm (_end_line) <@columnfractions>: Set the
Modified: trunk/tp/Texinfo/Convert/HTML.pm
===================================================================
--- trunk/tp/Texinfo/Convert/HTML.pm 2018-10-08 19:44:01 UTC (rev 8267)
+++ trunk/tp/Texinfo/Convert/HTML.pm 2018-10-08 20:31:07 UTC (rev 8268)
@@ -4680,6 +4680,10 @@
my $htmlxref;
foreach my $file (@$files) {
+ my ($fname) = $file;
+ if ($self->get_conf('TEST')) {
+ $fname =~ s/([^\/]+\/)*//; # strip directories for out-of-source builds
+ }
print STDERR "html refs config file: $file\n" if
($self->get_conf('DEBUG'));
unless (open (HTMLXREF, $file)) {
$self->document_warn(
@@ -4711,11 +4715,11 @@
my $split_or_mono = shift @htmlxref;
#print STDERR "$split_or_mono
$Texi2HTML::Config::htmlxref_entries{$split_or_mono} $line_nr\n";
if (!defined($split_or_mono)) {
- $self->file_line_warn(__("missing type"), $file, $line_nr);
+ $self->file_line_warn(__("missing type"), $fname, $line_nr);
next;
} elsif (!defined($htmlxref_entries{$split_or_mono})) {
$self->file_line_warn(sprintf(__("unrecognized type: %s"),
- $split_or_mono), $file, $line_nr);
+ $split_or_mono), $fname, $line_nr);
next;
}
my $href = shift @htmlxref;
Modified: trunk/tp/t/results/htmlxref/htmlxref.pl
===================================================================
--- trunk/tp/t/results/htmlxref/htmlxref.pl 2018-10-08 19:44:01 UTC (rev
8267)
+++ trunk/tp/t/results/htmlxref/htmlxref.pl 2018-10-08 20:31:07 UTC (rev
8268)
@@ -3631,13 +3631,13 @@
$result_converted_errors{'file_html'}->{'htmlxref'} = [
{
- 'error_line' => 't/input_files/htmlxref.cnf:15: warning: unrecognized
type: foo
+ 'error_line' => 'htmlxref.cnf:15: warning: unrecognized type: foo
',
'text' => 'unrecognized type: foo',
'type' => 'warning'
},
{
- 'error_line' => 't/input_files/htmlxref.cnf:16: warning: missing type
+ 'error_line' => 'htmlxref.cnf:16: warning: missing type
',
'text' => 'missing type',
'type' => 'warning'
Modified: trunk/tp/t/results/htmlxref/htmlxref_nodes.pl
===================================================================
--- trunk/tp/t/results/htmlxref/htmlxref_nodes.pl 2018-10-08 19:44:01 UTC
(rev 8267)
+++ trunk/tp/t/results/htmlxref/htmlxref_nodes.pl 2018-10-08 20:31:07 UTC
(rev 8268)
@@ -3631,13 +3631,13 @@
$result_converted_errors{'file_html'}->{'htmlxref_nodes'} = [
{
- 'error_line' => 't/input_files/htmlxref.cnf:15: warning: unrecognized
type: foo
+ 'error_line' => 'htmlxref.cnf:15: warning: unrecognized type: foo
',
'text' => 'unrecognized type: foo',
'type' => 'warning'
},
{
- 'error_line' => 't/input_files/htmlxref.cnf:16: warning: missing type
+ 'error_line' => 'htmlxref.cnf:16: warning: missing type
',
'text' => 'missing type',
'type' => 'warning'
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [8268] htmlxref.cnf strip leading directories for tests,
gavinsmith0123 <=