From 16006ce8387889e3be3159b4f69dccd2c164732f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Per=20=C3=98yvind=20Karlsen?= <peroyvind@mandriva.org>
Date: Thu, 7 Oct 2010 10:15:59 +0000
Subject: fix diff check

---
 t/resolve.t | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/t/resolve.t b/t/resolve.t
index 7891267..a00c4b3 100644
--- a/t/resolve.t
+++ b/t/resolve.t
@@ -25,7 +25,7 @@ sub solve_check {
     my $cand_pkgs = $urpm->find_candidate_packages($pkg);
     my @pkgs;
     my $out;
-    my $in;
+    my $in = "";
     my $file = "res/$pkg.resolve";
     if ($suggest) {
 	@pkgs = $urpm->resolve_requested($db, undef, $cand_pkgs);
@@ -43,10 +43,14 @@ sub solve_check {
     	print FILE  $out;
 	close FILE;
     } else {
-	open(my $diff, "|echo -n '$out' | diff -pu $file -") or die $!;
-	is(<$diff>, undef, "$file comparision");
+	open(my $diff, "echo -n '$out' | diff -pu $file - |") or die $!;
+	while(<$diff>) {
+	    $in .= <$diff>;
+
+	}
 	close($diff);
     }
+    is($in, "", "$file comparision");
 
     is(int @pkgs, $pkgtotal, "$pkg total number of packages");
 }
-- 
cgit v1.2.1