Просмотр исходного кода

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.
Guillem Jover лет назад: 10
Родитель
Сommit
a0be1b0c02
7 измененных файлов с 11 добавлено и 11 удалено
  1. 1 0
      debian/changelog
  2. 2 3
      lib/dpkg/t/.gitignore
  3. 4 4
      lib/dpkg/t/Makefile.am
  4. 0 0
      lib/dpkg/t/c-tarextract.c
  5. 0 0
      lib/dpkg/t/c-treewalk.c
  6. 2 2
      lib/dpkg/t/t-tar.t
  7. 2 2
      lib/dpkg/t/t-tree.t

+ 1 - 0
debian/changelog

@@ -86,6 +86,7 @@ dpkg (1.18.11) UNRELEASED; urgency=medium
     - Make test main function a TEST_ENTRY macro. This avoids confusing
     - Make test main function a TEST_ENTRY macro. This avoids confusing
       coverage programs, as the file that actually contains the main function
       coverage programs, as the file that actually contains the main function
       is the test itself.
       is the test itself.
+    - Rename test suite commands to be prefixed with «c-» instead of «t-».
   * Build system:
   * Build system:
     - Add support for profiling perl modules.
     - Add support for profiling perl modules.
     - Clean up compiler and linker automatic flag usage in configure.
     - Clean up compiler and linker automatic flag usage in configure.

+ 2 - 3
lib/dpkg/t/.gitignore

@@ -1,3 +1,5 @@
+c-tarextract
+c-treewalk
 c-trigdeferred
 c-trigdeferred
 t-ar
 t-ar
 t-arch
 t-arch
@@ -15,11 +17,8 @@ t-pkg-queue
 t-progname
 t-progname
 t-string
 t-string
 t-subproc
 t-subproc
-t-tar/
-t-tarextract
 t-test
 t-test
 t-test-skip
 t-test-skip
-t-treewalk
 t-trigger
 t-trigger
 t-varbuf
 t-varbuf
 t-version
 t-version

+ 4 - 4
lib/dpkg/t/Makefile.am

@@ -40,16 +40,16 @@ test_programs = \
 	$(nil)
 	$(nil)
 
 
 test_scripts = \
 test_scripts = \
-	t-tar.t \
-	t-tree.t \
+	t-tarextract.t \
+	t-treewalk.t \
 	t-trigdeferred.t \
 	t-trigdeferred.t \
 	$(nil)
 	$(nil)
 
 
 check_PROGRAMS = \
 check_PROGRAMS = \
 	$(test_programs) \
 	$(test_programs) \
+	c-tarextract \
+	c-treewalk \
 	c-trigdeferred \
 	c-trigdeferred \
-	t-tarextract \
-	t-treewalk \
 	$(nil)
 	$(nil)
 
 
 test_tmpdir = t.tmp
 test_tmpdir = t.tmp

lib/dpkg/t/t-tarextract.c → lib/dpkg/t/c-tarextract.c


lib/dpkg/t/t-treewalk.c → lib/dpkg/t/c-treewalk.c


+ 2 - 2
lib/dpkg/t/t-tar.t

@@ -31,7 +31,7 @@ use version;
 
 
 my $srcdir = $ENV{srcdir} || '.';
 my $srcdir = $ENV{srcdir} || '.';
 my $builddir = $ENV{builddir} || '.';
 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.
 # We require GNU tar >= 1.27 for --owner=NAME:ID and --group=NAME:ID.
 my $tar_version = qx(tar --version 2>/dev/null);
 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^.*dddd.*$//mg if $type eq 'v7';
         $expected =~ s/\n^.*symlink-long.*$//mg if $type eq 'ustar';
         $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);
               nocheck => 1, to_string => \$stdout, to_error => \$stderr);
         ok($? == 0, "tar extractor $type should succeed");
         ok($? == 0, "tar extractor $type should succeed");
         is($stderr, undef, "tar extractor $type stderr is empty");
         is($stderr, undef, "tar extractor $type stderr is empty");

+ 2 - 2
lib/dpkg/t/t-tree.t

@@ -30,7 +30,7 @@ use Dpkg::IPC;
 
 
 my $srcdir = $ENV{srcdir} || '.';
 my $srcdir = $ENV{srcdir} || '.';
 my $builddir = $ENV{builddir} || '.';
 my $builddir = $ENV{builddir} || '.';
-my $tmpdir = 't.tmp/t-tree';
+my $tmpdir = 't.tmp/t-treewalk';
 
 
 # Set a known umask.
 # Set a known umask.
 umask 0022;
 umask 0022;
@@ -149,7 +149,7 @@ sub test_treewalker {
 
 
         $ENV{TREEWALK_SKIP} = $type eq 'skip' ? "$dirtree/cccc" : undef;
         $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);
               nocheck => 1, to_string => \$stdout, to_error => \$stderr);
         ok($? == 0, "tree walker $type should succeed");
         ok($? == 0, "tree walker $type should succeed");
         is($stderr, undef, "tree walker $type stderr is empty");
         is($stderr, undef, "tree walker $type stderr is empty");