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

[SCM] Debian package checker branch, master, updated. 2.4.3-54-gfd93158



The following commit has been merged in the master branch:
commit fd9315809b27770e6d3ee10ae8e1576c939048ee
Author: Niels Thykier <niels@thykier.net>
Date:   Sun Dec 26 22:46:34 2010 +0100

    More symlink testing.

diff --git a/t/COVERAGE b/t/COVERAGE
index 360551b..b665a42 100644
--- a/t/COVERAGE
+++ b/t/COVERAGE
@@ -1,4 +1,4 @@
-Last generated 2010-12-25
+Last generated 2010-12-26
 
 The following tags are not tested by the test suite:
 
@@ -315,9 +315,6 @@ files setuid-binary
 files subdir-in-usr-bin
 files svk-commit-file-in-package
 files svn-commit-file-in-package
-files symlink-contains-spurious-segments
-files symlink-ends-with-slash
-files symlink-is-self-recursive
 files use-of-compat-symlink
 files windows-thumbnail-database-in-package
 files wrong-file-owner-uid-or-gid
@@ -483,7 +480,6 @@ binary
   su-to-root-with-usr-sbin
   su-wrapper-not-su-to-root
   su-wrapper-without--c
-  symlink-contains-spurious-segments
   unquoted-string-in-menu-item
   unstripped-binary-or-object
   xs-vcs-header-in-debian-control
@@ -573,8 +569,6 @@ filenames
   subdir-in-usr-bin
   svk-commit-file-in-package
   svn-commit-file-in-package
-  symlink-ends-with-slash
-  symlink-is-self-recursive
   use-of-compat-symlink
   windows-thumbnail-database-in-package
   wrong-file-owner-uid-or-gid
diff --git a/t/tests/files-symlinks/debian/debian/install b/t/tests/files-symlinks/debian/debian/install
index 3b7d28b..b0fb63f 100644
--- a/t/tests/files-symlinks/debian/debian/install
+++ b/t/tests/files-symlinks/debian/debian/install
@@ -1,4 +1,7 @@
 data-file usr/share/lintian/data/
-pkg.conf etc/
+pkg.conf etc/lintian/
 symlinks/data-file.old usr/share/lintian/data/
+symlinks/etc-lintian* usr/share/
 symlinks/pkg*.conf usr/share/lintian/data/
+symlinks/self-resursive usr/share/lintian/data/
+symlinks/spurious usr/share/lintian/data/
diff --git a/t/tests/files-symlinks/debian/debian/rules b/t/tests/files-symlinks/debian/debian/rules
index 9785a63..96057b9 100644
--- a/t/tests/files-symlinks/debian/debian/rules
+++ b/t/tests/files-symlinks/debian/debian/rules
@@ -5,9 +5,12 @@
 
 override_dh_auto_build:
 	mkdir symlinks/
-	ln -s ../../../../etc/pkg.conf symlinks/pkg-old.conf
-	ln -s ../..//..//..//../etc/pkg.conf symlinks/pkg.conf
-	ln -s /usr/share/lintian/data-file symlinks/data-file.old
+	ln -s ../../../../etc/lintian/pkg.conf symlinks/pkg-old.conf
+	ln -s ../..//..//..//../etc/lintian/pkg.conf symlinks/pkg.conf
+	ln -s /usr/share/lintian/data/data-file symlinks/data-file.old
+	ln -s /etc/lintian/ symlinks/etc-lintian
+	ln -s / symlinks/self-resursive
+	ln -s ../../lintian-old/../lintian/data/data-file  symlinks/spurious
 
 override_dh_auto_clean:
 	rm -fr symlinks/
diff --git a/t/tests/files-symlinks/desc b/t/tests/files-symlinks/desc
index b7dcc46..3a07ba3 100644
--- a/t/tests/files-symlinks/desc
+++ b/t/tests/files-symlinks/desc
@@ -3,9 +3,11 @@ Sequence: 6000
 Version: 1.0
 Description: Test tags about symlinks
 Test-For:
+ symlink-contains-spurious-segments
+ symlink-ends-with-slash
  symlink-has-double-slash
  symlink-has-too-many-up-segments
+ symlink-is-self-recursive
  symlink-should-be-absolute
  symlink-should-be-relative
 
-
diff --git a/t/tests/files-symlinks/tags b/t/tests/files-symlinks/tags
index 59a8c60..4bfaed0 100644
--- a/t/tests/files-symlinks/tags
+++ b/t/tests/files-symlinks/tags
@@ -1,4 +1,7 @@
-E: files-symlinks: symlink-has-too-many-up-segments usr/share/lintian/data/pkg.conf ../..//..//..//../etc/pkg.conf
-E: files-symlinks: symlink-should-be-absolute usr/share/lintian/data/pkg-old.conf ../../../../etc/pkg.conf
-W: files-symlinks: symlink-has-double-slash usr/share/lintian/data/pkg.conf ../..//..//..//../etc/pkg.conf
-W: files-symlinks: symlink-should-be-relative usr/share/lintian/data/data-file.old /usr/share/lintian/data-file
+E: files-symlinks: symlink-contains-spurious-segments usr/share/lintian/data/spurious ../../lintian-old/../lintian/data/data-file
+E: files-symlinks: symlink-has-too-many-up-segments usr/share/lintian/data/pkg.conf ../..//..//..//../etc/lintian/pkg.conf
+E: files-symlinks: symlink-should-be-absolute usr/share/lintian/data/pkg-old.conf ../../../../etc/lintian/pkg.conf
+W: files-symlinks: symlink-ends-with-slash usr/share/etc-lintian /etc/lintian/
+W: files-symlinks: symlink-has-double-slash usr/share/lintian/data/pkg.conf ../..//..//..//../etc/lintian/pkg.conf
+W: files-symlinks: symlink-is-self-recursive usr/share/lintian/data/self-resursive /
+W: files-symlinks: symlink-should-be-relative usr/share/lintian/data/data-file.old /usr/share/lintian/data/data-file

-- 
Debian package checker


Reply to: