INN commit: branches/2.6 (6 files)

INN Commit rra at isc.org
Thu Nov 12 20:23:43 UTC 2020


    Date: Thursday, November 12, 2020 @ 12:23:42
  Author: iulius
Revision: 10398

docs/pod.t:  Fix path to Perl interpreter in test suite

Thanks to Bo Lindbergh for the bug report.

Added:
  branches/2.6/tests/docs/pod.t.in
    (from rev 10389, trunk/tests/docs/pod.t.in)
Modified:
  branches/2.6/MANIFEST
  branches/2.6/support/mkmanifest
  branches/2.6/tests/Makefile
  branches/2.6/tests/docs/	(properties)
Deleted:
  branches/2.6/tests/docs/pod.t

---------------------+
 MANIFEST            |    2 -
 support/mkmanifest  |    1 
 tests/Makefile      |    5 ++
 tests/docs          |    1 
 tests/docs/pod.t    |   86 --------------------------------------------------
 tests/docs/pod.t.in |   86 ++++++++++++++++++++++++++++++++++++++++++++++++++
 6 files changed, 93 insertions(+), 88 deletions(-)

Modified: MANIFEST
===================================================================
--- MANIFEST	2020-11-12 20:22:51 UTC (rev 10397)
+++ MANIFEST	2020-11-12 20:23:42 UTC (rev 10398)
@@ -870,7 +870,7 @@
 tests/data/upgrade/overview.fmt       Obsolete overview.fmt config file
 tests/data/upgrade/sasl.conf          Obsolete sasl.conf config file
 tests/docs                            Test suite for documentation (Directory)
-tests/docs/pod.t                       Tests for POD formatting
+tests/docs/pod.t.in                   Tests for POD formatting
 tests/innd                            Test suite for innd (Directory)
 tests/innd/artparse-t.c               Tests for ARTparse in innd
 tests/innd/chan-t.c                   Tests for CHAN functions in innd

Modified: support/mkmanifest
===================================================================
--- support/mkmanifest	2020-11-12 20:22:51 UTC (rev 10397)
+++ support/mkmanifest	2020-11-12 20:23:42 UTC (rev 10398)
@@ -267,6 +267,7 @@
 tests/runtests
 tests/authprogs/ident.t
 tests/clients/server-list
+tests/docs/pod.t
 tests/innd/artparse.t
 tests/innd/chan.t
 tests/lib/asprintf.t

Modified: tests/Makefile
===================================================================
--- tests/Makefile	2020-11-12 20:22:51 UTC (rev 10397)
+++ tests/Makefile	2020-11-12 20:23:42 UTC (rev 10398)
@@ -32,7 +32,7 @@
 
 ##  Extra stuff that needs to be built before tests can be run.
 
-EXTRA	= runtests clients/server-list lib/xmalloc
+EXTRA	= runtests clients/server-list docs/pod.t lib/xmalloc
 
 all check test tests: $(TESTS) $(EXTRA)
 	./runtests -l TESTS
@@ -75,6 +75,9 @@
 clients/server-list: clients/server-list.in $(FIXSCRIPT)
 	$(FIXSCRIPT) -i clients/server-list.in
 
+docs/pod.t: docs/pod.t.in $(FIXSCRIPT)
+	$(FIXSCRIPT) -i docs/pod.t.in
+
 authprogs/ident.t: authprogs/ident-t.o tap/basic.o $(LIBINN)
 	$(LINK) authprogs/ident-t.o tap/basic.o $(LIBINN) $(LIBS)
 

Index: branches/2.6/tests/docs
===================================================================
--- tests/docs	2020-11-12 20:22:51 UTC (rev 10397)
+++ tests/docs	2020-11-12 20:23:42 UTC (rev 10398)

Property changes on: branches/2.6/tests/docs
___________________________________________________________________
Added: svn:ignore
## -0,0 +1 ##
+pod.t
Deleted: tests/docs/pod.t
===================================================================
--- tests/docs/pod.t	2020-11-12 20:22:51 UTC (rev 10397)
+++ tests/docs/pod.t	2020-11-12 20:23:42 UTC (rev 10398)
@@ -1,86 +0,0 @@
-#!/usr/bin/perl
-#
-# $Id$
-#
-# Check all POD documents in the tree for POD formatting errors.
-#
-# Copyright 2016 Russ Allbery <eagle at eyrie.org>
-# Copyright 2012-2014
-#     The Board of Trustees of the Leland Stanford Junior University
-#
-# This file is part of C TAP Harness.  The current version plus supporting
-# documentation is at <https://www.eyrie.org/~eagle/software/c-tap-harness/>.
-#
-# Permission is hereby granted, free of charge, to any person obtaining a
-# copy of this software and associated documentation files (the "Software"),
-# to deal in the Software without restriction, including without limitation
-# the rights to use, copy, modify, merge, publish, distribute, sublicense,
-# and/or sell copies of the Software, and to permit persons to whom the
-# Software is furnished to do so, subject to the following conditions:
-#
-# The above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-# DEALINGS IN THE SOFTWARE.
-#
-# SPDX-License-Identifier: MIT
-
-use 5.006;
-use strict;
-use warnings;
-
-use File::Spec;
-
-# Red Hat's base perl package doesn't include Test::More (one has to install
-# the perl-core package in addition).  Try to detect this and skip any Perl
-# tests if Test::More is not present.
-eval {
-    require Test::More;
-    Test::More->import();
-};
-if ($@) {
-    print "1..0 # SKIP Test::More required for test\n"
-      or croak('Cannot write to stdout');
-    exit 0;
-}
-
-# Abort if C_TAP_SOURCE isn't set.
-if (!$ENV{C_TAP_SOURCE}) {
-    BAIL_OUT('C_TAP_SOURCE environment variable not set');
-}
-
-# Load the Test::Pod module.
-if (!eval { require Test::Pod }) {
-    plan(skip_all => 'Test::Pod required for testing POD');
-}
-Test::Pod->import;
-
-# C_TAP_SOURCE will be the test directory.  Change to the parent.
-my ($vol, $dirs) = File::Spec->splitpath($ENV{C_TAP_SOURCE}, 1);
-my @dirs = File::Spec->splitdir($dirs);
-pop(@dirs);
-if ($dirs[-1] eq File::Spec->updir) {
-    pop(@dirs);
-    pop(@dirs);
-}
-my $root = File::Spec->catpath($vol, File::Spec->catdir(@dirs), q{});
-chdir($root) or BAIL_OUT("cannot chdir to $root: $!");
-
-# Add some additional exclusions, useful mostly for other programs that copy
-# this test.
-## no critic (TestingAndDebugging::ProhibitNoWarnings)
-## no critic (Variables::ProhibitPackageVars)
-{
-    no warnings 'once';
-    $Test::Pod::ignore_dirs{'.libs'} = 'libraries';
-}
-## use critic
-
-# Check syntax of every POD file we can find.
-all_pod_files_ok(q{.});

Copied: branches/2.6/tests/docs/pod.t.in (from rev 10389, trunk/tests/docs/pod.t.in)
===================================================================
--- tests/docs/pod.t.in	                        (rev 0)
+++ tests/docs/pod.t.in	2020-11-12 20:23:42 UTC (rev 10398)
@@ -0,0 +1,86 @@
+#!/usr/bin/perl
+#
+# $Id$
+#
+# Check all POD documents in the tree for POD formatting errors.
+#
+# Copyright 2016 Russ Allbery <eagle at eyrie.org>
+# Copyright 2012-2014
+#     The Board of Trustees of the Leland Stanford Junior University
+#
+# This file is part of C TAP Harness.  The current version plus supporting
+# documentation is at <https://www.eyrie.org/~eagle/software/c-tap-harness/>.
+#
+# Permission is hereby granted, free of charge, to any person obtaining a
+# copy of this software and associated documentation files (the "Software"),
+# to deal in the Software without restriction, including without limitation
+# the rights to use, copy, modify, merge, publish, distribute, sublicense,
+# and/or sell copies of the Software, and to permit persons to whom the
+# Software is furnished to do so, subject to the following conditions:
+#
+# The above copyright notice and this permission notice shall be included in
+# all copies or substantial portions of the Software.
+#
+# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+# THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+# FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+# DEALINGS IN THE SOFTWARE.
+#
+# SPDX-License-Identifier: MIT
+
+use 5.006;
+use strict;
+use warnings;
+
+use File::Spec;
+
+# Red Hat's base perl package doesn't include Test::More (one has to install
+# the perl-core package in addition).  Try to detect this and skip any Perl
+# tests if Test::More is not present.
+eval {
+    require Test::More;
+    Test::More->import();
+};
+if ($@) {
+    print "1..0 # SKIP Test::More required for test\n"
+      or croak('Cannot write to stdout');
+    exit 0;
+}
+
+# Abort if C_TAP_SOURCE isn't set.
+if (!$ENV{C_TAP_SOURCE}) {
+    BAIL_OUT('C_TAP_SOURCE environment variable not set');
+}
+
+# Load the Test::Pod module.
+if (!eval { require Test::Pod }) {
+    plan(skip_all => 'Test::Pod required for testing POD');
+}
+Test::Pod->import;
+
+# C_TAP_SOURCE will be the test directory.  Change to the parent.
+my ($vol, $dirs) = File::Spec->splitpath($ENV{C_TAP_SOURCE}, 1);
+my @dirs = File::Spec->splitdir($dirs);
+pop(@dirs);
+if ($dirs[-1] eq File::Spec->updir) {
+    pop(@dirs);
+    pop(@dirs);
+}
+my $root = File::Spec->catpath($vol, File::Spec->catdir(@dirs), q{});
+chdir($root) or BAIL_OUT("cannot chdir to $root: $!");
+
+# Add some additional exclusions, useful mostly for other programs that copy
+# this test.
+## no critic (TestingAndDebugging::ProhibitNoWarnings)
+## no critic (Variables::ProhibitPackageVars)
+{
+    no warnings 'once';
+    $Test::Pod::ignore_dirs{'.libs'} = 'libraries';
+}
+## use critic
+
+# Check syntax of every POD file we can find.
+all_pod_files_ok(q{.});



More information about the inn-committers mailing list