merge changes from Andreas - test scripts updates, setfacl bug fix.

4 files changed, 25 insertions, 2 deletions

diff --git a/VERSION b/VERSION
index a5c287c..d6fb318 100644
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=0
-PKG_REVISION=3
+PKG_REVISION=4
 PKG_BUILD=0
diff --git a/debian/changelog b/debian/changelog
index a7eb500..2009092 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+attr (2.0.4-1) unstable; urgency=low
+
+  * New upstream bugfix release
+
+ -- Nathan Scott <nathans@debian.org>  Tue,  5 Mar 2002 13:58:58 +1100
+
 attr (2.0.3-1) unstable; urgency=low
 
   * Major new upstream release
diff --git a/doc/CHANGES b/doc/CHANGES
index 86771af..5b58aaf 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,7 @@
-attr-2.0.3 (1 March 2002)
+attr-2.0.4 (05 March 2002)
+	- A minor change to the test/run script
+
+attr-2.0.3 (01 March 2002)
 	- add in ARM architecture system call numbers
 	- updates to the test output from Andreas
 
diff --git a/test/run b/test/run
index b545a53..e9bf5d0 100644
--- a/test/run
+++ b/test/run
@@ -16,6 +16,8 @@ if (isatty(fileno(STDOUT))) {
 my ($prog, $in, $out) = ([], [], []);
 my $line = 0;
 my $prog_line;
+my ($tests, $failed);
+
 for (;;) {
   my $script = <>; $line++;
   $script =~ s/\@OWNER\@/$owner/g;
@@ -39,6 +41,8 @@ for (;;) {
 		 #print "$out->[$n] != $result->[$n]";
 	 }
        }
+       $tests++;
+       $failed++ unless $good;
        print $good ? $OK : $FAILED, "\n";
        if (!$good) {
          for (my $n=0; $n < $nmax; $n++) {
@@ -62,6 +66,16 @@ for (;;) {
   }
   last unless defined($script);
 }
+my $status = sprintf("%d commands (%d passed, %d failed)",
+	$tests, $tests-$failed, $failed);
+if (isatty(fileno(STDOUT))) {
+	if ($failed) {
+		$status = "\033[31m\033[1m" . $status . "\033[m";
+	} else {
+		$status = "\033[32m" . $status . "\033[m";
+	}
+}
+print $status, "\n";
 
 sub exec_test($$) {
   my ($prog, $in) = @_;