From c117d9048ae591401a79037222da7bf7bda85705 Mon Sep 17 00:00:00 2001
From: Pierre Schmitz <pierre@archlinux.de>
Date: Sun, 8 Aug 2010 03:44:17 +0200
Subject: Reduce verbosity

Only inform of errors and processes that might take longer.
---
 test/lib/common.inc |  4 +---
 test/runTest        | 14 +++++++-------
 2 files changed, 8 insertions(+), 10 deletions(-)

(limited to 'test')

diff --git a/test/lib/common.inc b/test/lib/common.inc
index dd3022e..2d2b612 100644
--- a/test/lib/common.inc
+++ b/test/lib/common.inc
@@ -60,10 +60,8 @@ eot
 }
 
 tearDown() {
-	echo -n 'Cleaning up...'
 	rm -rf "${TMP}"
 	rm -f "${curdir}/../config.local"
-	echo 'done'
 	echo
 }
 
@@ -73,7 +71,7 @@ releasePackage() {
 	local arch=$3
 
 	pushd "${TMP}/svn-packages-copy"/${pkgbase}/trunk/ >/dev/null
-	archrelease ${repo}-${arch} >/dev/null
+	archrelease ${repo}-${arch} >/dev/null 2&>1
 	popd >/dev/null
 	cp "${pkgdir}/${pkgbase}"/*.pkg.tar.* "${STAGING}"/${repo}/
 }
diff --git a/test/runTest b/test/runTest
index d453493..b24b7ea 100755
--- a/test/runTest
+++ b/test/runTest
@@ -235,7 +235,7 @@ testCleanupSimplePackages() {
 		../db-remove pkg-simple-a extra ${arch}
 	done
 
-	../cron-jobs/ftpdir-cleanup
+	../cron-jobs/ftpdir-cleanup >/dev/null
 
 	for arch in ${arches[@]}; do
 		local pkg1="pkg-simple-a-1-1-${arch}.pkg.tar.xz"
@@ -258,7 +258,7 @@ testCleanupAnyPackages() {
 
 	../db-update extra
 	../db-remove pkg-any-a extra any
-	../cron-jobs/ftpdir-cleanup
+	../cron-jobs/ftpdir-cleanup >/dev/null
 
 	local pkg1='pkg-any-a-1-1-any.pkg.tar.xz'
 	[ -f "${FTP_BASE}/packages/arch/${arch}/${pkg1}" ] && fail "packages/arch/${arch}/${pkg1} found"
@@ -289,7 +289,7 @@ testCleanupSplitPackages() {
 		done
 	done
 
-	../cron-jobs/ftpdir-cleanup
+	../cron-jobs/ftpdir-cleanup >/dev/null
 
 	for arch in ${arches[@]}; do
 		for pkg in "${pkgdir}/${pkgs[0]}"/*-${arch}.pkg.tar.*; do
@@ -333,7 +333,7 @@ testMovePackagesWithoutPool() {
 		done
 	done
 
-	../cron-jobs/ftpdir-cleanup
+	../cron-jobs/ftpdir-cleanup >/dev/null
 
 	for pkgbase in ${pkgs[@]}; do
 		for arch in ${arches[@]}; do
@@ -341,7 +341,7 @@ testMovePackagesWithoutPool() {
 		done
 	done
 
-	../cron-jobs/ftpdir-cleanup
+	../cron-jobs/ftpdir-cleanup >/dev/null
 
 	for pkgbase in ${pkgs[@]}; do
 		for arch in ${arches[@]}; do
@@ -374,13 +374,13 @@ testMoveAnyPackagesWithoutPool() {
 		done
 	done
 
-	../cron-jobs/ftpdir-cleanup
+	../cron-jobs/ftpdir-cleanup >/dev/null
 
 	for pkgbase in ${pkgs[@]}; do
 		../db-move ${pkgbase} testing extra any
 	done
 
-	../cron-jobs/ftpdir-cleanup
+	../cron-jobs/ftpdir-cleanup >/dev/null
 
 	for pkgbase in ${pkgs[@]}; do
 		for pkg in "${pkgdir}/${pkgbase}"/*-any.pkg.tar.*; do
-- 
cgit v1.2.3