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

[lintian] 06/07: Make r/harness a dplint command



This is an automated email from the git hooks/post-receive script.

nthykier pushed a commit to branch master
in repository lintian.

commit 97cf104d8b04ba7511aa62c999e189d31512fc05
Author: Niels Thykier <niels@thykier.net>
Date:   Mon Apr 25 20:07:24 2016 +0000

    Make r/harness a dplint command
    
    Also obsoletes a few test scripts.
    
    Signed-off-by: Niels Thykier <niels@thykier.net>
---
 reporting/harness => commands/reporting-harness.pm | 25 +++++++++-------------
 debian/changelog                                   |  3 +++
 t/scripts/01-critic/reporting.t                    |  1 -
 t/scripts/02-minimum-version/reporting.t           |  1 -
 t/scripts/03-strict/reporting.t                    |  1 -
 5 files changed, 13 insertions(+), 18 deletions(-)

diff --git a/reporting/harness b/commands/reporting-harness.pm
similarity index 96%
rename from reporting/harness
rename to commands/reporting-harness.pm
index ebaed55..eb6a311 100755
--- a/reporting/harness
+++ b/commands/reporting-harness.pm
@@ -30,6 +30,14 @@ use FileHandle;
 use Getopt::Long;
 use POSIX qw(strftime);
 
+use Lintian::Command qw(reap spawn safe_qx);
+use Lintian::Lab;
+use Lintian::Lab::Manifest;
+use Lintian::Processable;
+use Lintian::Relation::Version qw(versions_comparator);
+use Lintian::Util qw(open_gz slurp_entire_file strip visit_dpkg_paragraph
+  load_state_cache  save_state_cache);
+
 sub usage {
     print <<END;
 Lintian reporting harness
@@ -103,21 +111,6 @@ our (
     $STATE_DIR, $LINTIAN_VERSION, $LOG_FD
 );
 
-# import perl libraries
-unshift @INC, "$LINTIAN_ROOT/lib";
-require Lintian::Command;
-import Lintian::Command qw(reap spawn safe_qx);
-require Lintian::Lab;
-require Lintian::Lab::Manifest;
-require Lintian::Processable;
-require Lintian::Relation::Version;
-import Lintian::Relation::Version qw(versions_comparator);
-require Lintian::Util;
-import Lintian::Util qw(open_gz slurp_entire_file strip visit_dpkg_paragraph
-  load_state_cache  save_state_cache);
-
-main();
-
 sub main {
     parse_options_and_config();
 
@@ -403,6 +396,8 @@ sub Die {
     exit 1;
 }
 
+1;
+
 # Local Variables:
 # indent-tabs-mode: nil
 # cperl-indent-level: 4
diff --git a/debian/changelog b/debian/changelog
index 98871ea..9ddd00e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -39,6 +39,9 @@ lintian (2.5.45) UNRELEASED; urgency=medium
   * reporting/config:
     + [NT] Remove "$COPY_DOCS" configuration option.  The
       html_reports now always copies the documentation.
+  * reporting/harness:
+    + [NT] Refactored into a "dplint" command and renamed to
+      "commands/reporting-harness.pm".
   * reporting/html_reports:
     + [NT] Refactored into a "dplint" command and renamed to
       "commands/reporting-html-reports.pm".
diff --git a/t/scripts/01-critic/reporting.t b/t/scripts/01-critic/reporting.t
deleted file mode 120000
index c316f2d..0000000
--- a/t/scripts/01-critic/reporting.t
+++ /dev/null
@@ -1 +0,0 @@
-runner.pl
\ No newline at end of file
diff --git a/t/scripts/02-minimum-version/reporting.t b/t/scripts/02-minimum-version/reporting.t
deleted file mode 120000
index c316f2d..0000000
--- a/t/scripts/02-minimum-version/reporting.t
+++ /dev/null
@@ -1 +0,0 @@
-runner.pl
\ No newline at end of file
diff --git a/t/scripts/03-strict/reporting.t b/t/scripts/03-strict/reporting.t
deleted file mode 120000
index c316f2d..0000000
--- a/t/scripts/03-strict/reporting.t
+++ /dev/null
@@ -1 +0,0 @@
-runner.pl
\ No newline at end of file

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/lintian/lintian.git


Reply to: