[dpkg] 83/187: libdpkg: Rename test suite commands to be prefixed with c- instead of t-

[Reiner Herrmann]

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

deki-guest pushed a commit to branch master
in repository dpkg.

commit a0be1b0c02f7af096db44e25d6e6eb4227cb3e57
Author: Guillem Jover <guillem at debian.org>
Date:   Sat Aug 20 03:17:31 2016 +0200

    libdpkg: Rename test suite commands to be prefixed with c- instead of t-
    
    This should make it more clear that these are not intended to be used
    directly by the TAP test runner. In addition now we can use the proper
    name for the .t perl scripts.
---
 debian/changelog                              | 1 +
 lib/dpkg/t/.gitignore                         | 5 ++---
 lib/dpkg/t/Makefile.am                        | 8 ++++----
 lib/dpkg/t/{t-tarextract.c => c-tarextract.c} | 0
 lib/dpkg/t/{t-treewalk.c => c-treewalk.c}     | 0
 lib/dpkg/t/{t-tar.t => t-tarextract.t}        | 4 ++--
 lib/dpkg/t/{t-tree.t => t-treewalk.t}         | 4 ++--
 7 files changed, 11 insertions(+), 11 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b4167d1..273e2b0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -86,6 +86,7 @@ dpkg (1.18.11) UNRELEASED; urgency=medium
     - Make test main function a TEST_ENTRY macro. This avoids confusing
       coverage programs, as the file that actually contains the main function
       is the test itself.
+    - Rename test suite commands to be prefixed with «c-» instead of «t-».
   * Build system:
     - Add support for profiling perl modules.
     - Clean up compiler and linker automatic flag usage in configure.
diff --git a/lib/dpkg/t/.gitignore b/lib/dpkg/t/.gitignore
index 6aeec24..3a2b4d3 100644
--- a/lib/dpkg/t/.gitignore
+++ b/lib/dpkg/t/.gitignore
@@ -1,3 +1,5 @@
+c-tarextract
+c-treewalk
 c-trigdeferred
 t-ar
 t-arch
@@ -15,11 +17,8 @@ t-pkg-queue
 t-progname
 t-string
 t-subproc
-t-tar/
-t-tarextract
 t-test
 t-test-skip
-t-treewalk
 t-trigger
 t-varbuf
 t-version
diff --git a/lib/dpkg/t/Makefile.am b/lib/dpkg/t/Makefile.am
index 30c2bdb..2bcc8f4 100644
--- a/lib/dpkg/t/Makefile.am
+++ b/lib/dpkg/t/Makefile.am
@@ -40,16 +40,16 @@ test_programs = \
 	$(nil)
 
 test_scripts = \
-	t-tar.t \
-	t-tree.t \
+	t-tarextract.t \
+	t-treewalk.t \
 	t-trigdeferred.t \
 	$(nil)
 
 check_PROGRAMS = \
 	$(test_programs) \
+	c-tarextract \
+	c-treewalk \
 	c-trigdeferred \
-	t-tarextract \
-	t-treewalk \
 	$(nil)
 
 test_tmpdir = t.tmp
diff --git a/lib/dpkg/t/t-tarextract.c b/lib/dpkg/t/c-tarextract.c
similarity index 100%
rename from lib/dpkg/t/t-tarextract.c
rename to lib/dpkg/t/c-tarextract.c
diff --git a/lib/dpkg/t/t-treewalk.c b/lib/dpkg/t/c-treewalk.c
similarity index 100%
rename from lib/dpkg/t/t-treewalk.c
rename to lib/dpkg/t/c-treewalk.c
diff --git a/lib/dpkg/t/t-tar.t b/lib/dpkg/t/t-tarextract.t
similarity index 98%
rename from lib/dpkg/t/t-tar.t
rename to lib/dpkg/t/t-tarextract.t
index b8dd50f..02f25b7 100755
--- a/lib/dpkg/t/t-tar.t
+++ b/lib/dpkg/t/t-tarextract.t
@@ -31,7 +31,7 @@ use version;
 
 my $srcdir = $ENV{srcdir} || '.';
 my $builddir = $ENV{builddir} || '.';
-my $tmpdir = 't.tmp/t-tar';
+my $tmpdir = 't.tmp/t-tarextract';
 
 # We require GNU tar >= 1.27 for --owner=NAME:ID and --group=NAME:ID.
 my $tar_version = qx(tar --version 2>/dev/null);
@@ -152,7 +152,7 @@ TAR
         $expected =~ s/\n^.*dddd.*$//mg if $type eq 'v7';
         $expected =~ s/\n^.*symlink-long.*$//mg if $type eq 'ustar';
 
-        spawn(exec => [ './t-tarextract', "$dirtree.tar" ],
+        spawn(exec => [ './c-tarextract', "$dirtree.tar" ],
               nocheck => 1, to_string => \$stdout, to_error => \$stderr);
         ok($? == 0, "tar extractor $type should succeed");
         is($stderr, undef, "tar extractor $type stderr is empty");
diff --git a/lib/dpkg/t/t-tree.t b/lib/dpkg/t/t-treewalk.t
similarity index 98%
rename from lib/dpkg/t/t-tree.t
rename to lib/dpkg/t/t-treewalk.t
index c4189a4..2538681 100755
--- a/lib/dpkg/t/t-tree.t
+++ b/lib/dpkg/t/t-treewalk.t
@@ -30,7 +30,7 @@ use Dpkg::IPC;
 
 my $srcdir = $ENV{srcdir} || '.';
 my $builddir = $ENV{builddir} || '.';
-my $tmpdir = 't.tmp/t-tree';
+my $tmpdir = 't.tmp/t-treewalk';
 
 # Set a known umask.
 umask 0022;
@@ -149,7 +149,7 @@ sub test_treewalker {
 
         $ENV{TREEWALK_SKIP} = $type eq 'skip' ? "$dirtree/cccc" : undef;
 
-        spawn(exec => [ './t-treewalk', $dirtree ],
+        spawn(exec => [ './c-treewalk', $dirtree ],
               nocheck => 1, to_string => \$stdout, to_error => \$stderr);
         ok($? == 0, "tree walker $type should succeed");
         is($stderr, undef, "tree walker $type stderr is empty");

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