Explorar el Código

u-a: Fix test suite to use t.tmp from builddir instead of srcdir

This fixes “make distcheck”, as t.tmp is a read/write directory it has
to be used under builddir, which in most cases happens to be the same as
srcdir.
Guillem Jover hace 17 años
padre
commit
33a84d3856
Se han modificado 2 ficheros con 9 adiciones y 4 borrados
  1. 5 0
      ChangeLog
  2. 4 4
      scripts/t/900_update_alternatives.t

+ 5 - 0
ChangeLog

@@ -1,3 +1,8 @@
+2009-03-02  Guillem Jover  <guillem@debian.org>
+
+	* scripts/t/900_update_alternatives.t: Do not use $srcdir for t.tmp,
+	it's actually located in builddir.
+
 2009-03-02  Guillem Jover  <guillem@debian.org>
 2009-03-02  Guillem Jover  <guillem@debian.org>
 
 
 	* scripts/update-alternatives.pl (load): Print an actual error on open
 	* scripts/update-alternatives.pl (load): Print an actual error on open

+ 4 - 4
scripts/t/900_update_alternatives.t

@@ -8,9 +8,9 @@ use strict;
 use warnings;
 use warnings;
 
 
 my $srcdir = $ENV{srcdir} || '.';
 my $srcdir = $ENV{srcdir} || '.';
-my $admindir = File::Spec->rel2abs("$srcdir/t.tmp/ua/admindir"),
-my $altdir = File::Spec->rel2abs("$srcdir/t.tmp/ua/alternatives");
-my $bindir = File::Spec->rel2abs("$srcdir/t.tmp/ua/bin");
+my $admindir = File::Spec->rel2abs("t.tmp/ua/admindir"),
+my $altdir = File::Spec->rel2abs("t.tmp/ua/alternatives");
+my $bindir = File::Spec->rel2abs("t.tmp/ua/bin");
 # XXX: switch to version without .pl
 # XXX: switch to version without .pl
 my @ua = ("$srcdir/update-alternatives.pl", "--log", "/dev/null",
 my @ua = ("$srcdir/update-alternatives.pl", "--log", "/dev/null",
           "--quiet", "--admindir", "$admindir", "--altdir", "$altdir");
           "--quiet", "--admindir", "$admindir", "--altdir", "$altdir");
@@ -56,7 +56,7 @@ plan tests => (4 * ($nb_slaves + 1) + 2) * 24 # number of check_choices
 		+ 60;			      # rest
 		+ 60;			      # rest
 
 
 sub cleanup {
 sub cleanup {
-    system("rm -rf $srcdir/t.tmp/ua && mkdir -p $admindir && mkdir -p $altdir");
+    system("rm -rf t.tmp/ua && mkdir -p $admindir && mkdir -p $altdir");
     system("mkdir -p $bindir/more");
     system("mkdir -p $bindir/more");
 }
 }