[Pkg-haskell-commits] [package-plan] 104/457: Really make sure that test dependencies are checked

[Joachim Breitner]

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

nomeata pushed a commit to branch master
in repository package-plan.

commit 5eb5c6d0004a1add09ddc46e9bedc20814c0c685
Author: Joachim Breitner <mail at joachim-breitner.de>
Date:   Tue Jun 4 21:12:22 2013 +0000

    Really make sure that test dependencies are checked
    
    simply by listing all packages in the cabal-install command line. Packages whose test suite we cannot run are to be marked "notest" in packages.txt.
---
 packages.txt     | 16 ++++++++--------
 test-packages.pl | 17 +++++++++++++----
 2 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/packages.txt b/packages.txt
index d7a674e..1b11968 100644
--- a/packages.txt
+++ b/packages.txt
@@ -37,7 +37,7 @@ blaze-builder 0.3.1.0
 blaze-builder-conduit 1.0.0
 blaze-builder-enumerator 0.2.0.5
 blaze-html 0.5.1.3
-blaze-markup 0.5.1.5
+blaze-markup 0.5.1.4
 blaze-svg 0.3.3.0
 blaze-textual 0.2.0.8
 bloomfilter 1.2.6.10
@@ -265,8 +265,8 @@ HSH 2.1.0
 hslogger 1.2.1
 hsmagick 0.5
 hsp 0.8.0
-hspec 1.4.4
-hspec-expectations 0.3.0.3
+hspec 1.4.4 notest
+hspec-expectations 0.3.0.3 notest
 hsql 1.8.2
 hsql-mysql 1.8.2
 hsql-odbc 1.8.2
@@ -360,7 +360,7 @@ monoid-transformer 0.0.2
 mtl 2.1.2
 mtlparse 0.1.2
 murmur-hash 0.1.0.6
-mwc-random 0.11.0.0
+mwc-random 0.11.0.0 notest
 nats 0.1
 ncurses 0.2.1
 netwire 4.0.7
@@ -460,7 +460,7 @@ semigroupoid-extras 3.0.1
 semigroupoids 3.0.2
 semigroups 0.9
 sendfile 0.7.9
-setenv 0.1.0
+setenv 0.1.0 notest
 sfml-audio 0.7.0.1816
 SHA 1.5.0.1
 shakespeare 1.0.2
@@ -509,7 +509,7 @@ temporary 1.1.2.4
 Tensor 1.0.0.1
 terminal-progress-bar 0.0.1.1
 terminfo 0.3.2.5
-test-framework 0.6
+test-framework 0.6 notest
 test-framework-hunit 0.2.7
 test-framework-quickcheck2 0.2.12.3
 test-framework-th 0.2.2
@@ -541,7 +541,7 @@ utf8-string 0.3.7
 utility-ht 0.0.5.1
 uuagc 0.9.42.2
 uuagc-cabal 1.0.4.0
-uuid 1.2.3
+uuid 1.2.3 notest
 uulib 0.9.15
 vault 0.2.0.1
 vector 0.10.0.1
@@ -550,7 +550,7 @@ vector-space 0.8.6
 vector-space-points 0.1.2.0
 void 0.5.11
 vte 0.12.1
-vty 4.7.0.20
+vty 4.7.0.20 notest
 wai 1.4.0
 wai-app-file-cgi 0.8.3
 wai-app-static 1.3.1.2
diff --git a/test-packages.pl b/test-packages.pl
index 8b46fbd..e579287 100644
--- a/test-packages.pl
+++ b/test-packages.pl
@@ -9,6 +9,7 @@ my %packages;
 my %versions;
 my %available;
 my %comments;
+my %notest;
 
 print "Reading packages.txt...\n";
 open PACKAGES, "<", "packages.txt" or die $!;
@@ -19,9 +20,12 @@ while (<PACKAGES>) {
 	unless (m/^(.*?) (.*?)(?: (.*))?$/) {
 		print "Ignoring unparseable line $.: $_\n";
 	}
-	$packages{$1}++;
-	$versions{$1} = $2;
-	$comments{$1} = $3 if $3;
+	my ($pkg,$version,$comment) = ($1,$2,$3);
+	$packages{$pkg}++;
+	$versions{$pkg} = $version;
+	next unless $comment;
+	$notest{$pkg}++ if $comment =~ s/notest\s*//;
+	$comments{$pkg} = $comment if $comment;
 }
 close PACKAGES;
 
@@ -83,7 +87,12 @@ my @params = ("cabal", "install", "--dry-run", "--force-reinstall", "--enable-te
 
 for my $pkg (sort keys %versions) {
 	next if (exists $comments{$pkg});
-	push @params, "--constraint", sprintf "%s (== %s)\n", $pkg, $versions{$pkg};
+	push @params, "--constraint", sprintf "%s (== %s)", $pkg, $versions{$pkg};
+}
+for my $pkg (sort keys %versions) {
+	next if (exists $comments{$pkg});
+	next if (exists $notest{$pkg});
+	push @params, sprintf "%s-%s", $pkg, $versions{$pkg};
 }
 
 print "Running cabal-install...\n";

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-haskell/package-plan.git