From patchwork Sat Feb 29 00:01:38 2020 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: =?utf-8?q?Fr=C3=A9d=C3=A9ric_Mangano-Tarumi?= X-Patchwork-Id: 1528 Return-Path: Delivered-To: patchwork@archlinux.org Received: from apollo.archlinux.org (localhost [127.0.0.1]) by apollo.archlinux.org (Postfix) with ESMTP id 8B32C175618A5 for ; Sat, 29 Feb 2020 00:06:22 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.4.4 (2020-01-24) on apollo.archlinux.org X-Spam-Level: X-Spam-Status: No, score=-2.2 required=5.0 tests=DKIM_INVALID=1, DKIM_SIGNED=0.1,MAILING_LIST_MULTI=-1,RCVD_IN_DNSWL_MED=-2.3, SPF_HELO_NONE=0.001 autolearn=ham autolearn_force=no version=3.4.4 X-Spam-BL-Results: [127.0.9.2] Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by apollo.archlinux.org (Postfix) with ESMTPS for ; Sat, 29 Feb 2020 00:06:22 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 31675198739D59; Sat, 29 Feb 2020 00:04:21 +0000 (UTC) Received: from luna.archlinux.org (luna.archlinux.org [5.9.250.164]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits)) (No client certificate requested) (Authenticated sender: luna) by orion.archlinux.org (Postfix) with ESMTPSA id B71B2198739D4D; Sat, 29 Feb 2020 00:03:18 +0000 (UTC) Authentication-Results: orion.archlinux.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mg0.fr header.i=@mg0.fr header.b=S3FBmH73 Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id A86EF29D0E; Sat, 29 Feb 2020 00:03:18 +0000 (UTC) Authentication-Results: luna.archlinux.org; dkim=fail reason="signature verification failed" (1024-bit key) header.d=mg0.fr header.i=@mg0.fr header.b=S3FBmH73 Received: from luna.archlinux.org (luna.archlinux.org [127.0.0.1]) by luna.archlinux.org (Postfix) with ESMTP id D3A6529D0B for ; Sat, 29 Feb 2020 00:03:15 +0000 (UTC) Received: from orion.archlinux.org (orion.archlinux.org [88.198.91.70]) by luna.archlinux.org (Postfix) with ESMTPS for ; Sat, 29 Feb 2020 00:03:15 +0000 (UTC) Received: from orion.archlinux.org (localhost [127.0.0.1]) by orion.archlinux.org (Postfix) with ESMTP id 1C150198739D3A for ; Sat, 29 Feb 2020 00:02:34 +0000 (UTC) Received: from tsubame.mg0.fr (tsubame.mg0.fr [IPv6:2001:41d0:401:3100::402b]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange ECDHE (P-384) server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by orion.archlinux.org (Postfix) with ESMTPS for ; Sat, 29 Feb 2020 00:02:34 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=mg0.fr; s=tsubame; h=Content-Type:MIME-Version:Message-ID:Subject:To:From:Date:Sender :Reply-To:Cc:Content-Transfer-Encoding:Content-ID:Content-Description: Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID: In-Reply-To:References:List-Id:List-Help:List-Unsubscribe:List-Subscribe: List-Post:List-Owner:List-Archive; bh=vheHQjzlT+Mvwgpiz//e2UjxV0U/F4edRXN72KUBFe0=; b=S3FBmH73LnaWoNALEfn6FGp8Lu iBpgOzNYCtNqlfFXSf+luQPu+tFJS6TuBHtZqt8HTmGWzyrFy+C68SCFIv5MZDxqHdwCqQh30e9lz fCB8iigrrgyiwYwBoIEkunOpRv2ha3Kk3O/JXFyHcEUeQTHj9qIKhMdPkF7LSkS+cYpQ=; Received: from fmang by tsubame.mg0.fr with local (Exim 4.93) (envelope-from ) id 1j7pZa-006hMA-Pq for aur-dev@archlinux.org; Sat, 29 Feb 2020 01:01:38 +0100 Date: Sat, 29 Feb 2020 01:01:38 +0100 From: =?utf-8?b?RnLDqWTDqXJpYw==?= Mangano-Tarumi To: aur-dev@archlinux.org Subject: [PATCH 2/4] Support running tests from any directory Message-ID: <20200229000138.GA1596609@tsubame.mg0.fr> MIME-Version: 1.0 Content-Disposition: inline X-BeenThere: aur-dev@archlinux.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: "Arch User Repository \(AUR\) Development" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: aur-dev-bounces@archlinux.org Sender: "aur-dev" --- test/setup.sh | 5 ++--- test/t1100-git-auth.t | 2 +- test/t1200-git-serve.t | 2 +- test/t1300-git-update.t | 2 +- test/t2100-mkpkglists.t | 2 +- test/t2200-tuvotereminder.t | 2 +- test/t2300-pkgmaint.t | 2 +- test/t2400-aurblup.t | 2 +- test/t2500-notify.t | 2 +- test/t2600-rendercomment.t | 2 +- test/t2700-usermaint.t | 2 +- 11 files changed, 12 insertions(+), 13 deletions(-) diff --git a/test/setup.sh b/test/setup.sh index cad5cd66..4a6eb3b1 100644 --- a/test/setup.sh +++ b/test/setup.sh @@ -1,7 +1,6 @@ -TEST_DIRECTORY="$(pwd)" -TOPLEVEL="$(cd .. && pwd)" +TOPLEVEL="$(cd "$(dirname "$0")/.." && pwd)" -. ./sharness.sh +. "$TOPLEVEL/test/sharness.sh" # Configure python search path. PYTHONPATH="$TOPLEVEL" diff --git a/test/t1100-git-auth.t b/test/t1100-git-auth.t index 71d526f2..cbf16aed 100755 --- a/test/t1100-git-auth.t +++ b/test/t1100-git-auth.t @@ -2,7 +2,7 @@ test_description='git-auth tests' -. ./setup.sh +. "$(dirname "$0")/setup.sh" test_expect_success 'Test basic authentication.' ' "$GIT_AUTH" "$AUTH_KEYTYPE_USER" "$AUTH_KEYTEXT_USER" >out && diff --git a/test/t1200-git-serve.t b/test/t1200-git-serve.t index e817b2cf..1893cdcd 100755 --- a/test/t1200-git-serve.t +++ b/test/t1200-git-serve.t @@ -2,7 +2,7 @@ test_description='git-serve tests' -. ./setup.sh +. "$(dirname "$0")/setup.sh" test_expect_success 'Test interactive shell.' ' "$GIT_SERVE" 2>&1 | grep -q "Interactive shell is disabled." diff --git a/test/t1300-git-update.t b/test/t1300-git-update.t index 06d14984..82c0fb99 100755 --- a/test/t1300-git-update.t +++ b/test/t1300-git-update.t @@ -2,7 +2,7 @@ test_description='git-update tests' -. ./setup.sh +. "$(dirname "$0")/setup.sh" dump_package_info() { for t in Packages Licenses PackageLicenses Groups PackageGroups \ diff --git a/test/t2100-mkpkglists.t b/test/t2100-mkpkglists.t index fc11d073..5bf13de8 100755 --- a/test/t2100-mkpkglists.t +++ b/test/t2100-mkpkglists.t @@ -2,7 +2,7 @@ test_description='mkpkglists tests' -. ./setup.sh +. "$(dirname "$0")/setup.sh" test_expect_success 'Test package list generation with no packages.' ' echo "DELETE FROM Packages;" | sqlite3 aur.db && diff --git a/test/t2200-tuvotereminder.t b/test/t2200-tuvotereminder.t index c82ce874..5a8f3a25 100755 --- a/test/t2200-tuvotereminder.t +++ b/test/t2200-tuvotereminder.t @@ -2,7 +2,7 @@ test_description='tuvotereminder tests' -. ./setup.sh +. "$(dirname "$0")/setup.sh" test_expect_success 'Test Trusted User vote reminders.' ' now=$(date -d now +%s) && diff --git a/test/t2300-pkgmaint.t b/test/t2300-pkgmaint.t index 478df526..c390f5db 100755 --- a/test/t2300-pkgmaint.t +++ b/test/t2300-pkgmaint.t @@ -2,7 +2,7 @@ test_description='pkgmaint tests' -. ./setup.sh +. "$(dirname "$0")/setup.sh" test_expect_success 'Test package base cleanup script.' ' now=$(date -d now +%s) && diff --git a/test/t2400-aurblup.t b/test/t2400-aurblup.t index 708281c6..cc287a0f 100755 --- a/test/t2400-aurblup.t +++ b/test/t2400-aurblup.t @@ -2,7 +2,7 @@ test_description='aurblup tests' -. ./setup.sh +. "$(dirname "$0")/setup.sh" test_expect_success 'Test official provider update script.' ' mkdir -p remote/test/foobar-1.0-1 && diff --git a/test/t2500-notify.t b/test/t2500-notify.t index 380e65b8..5ef64c18 100755 --- a/test/t2500-notify.t +++ b/test/t2500-notify.t @@ -2,7 +2,7 @@ test_description='notify tests' -. ./setup.sh +. "$(dirname "$0")/setup.sh" test_expect_success 'Test out-of-date notifications.' ' cat <<-EOD | sqlite3 aur.db && diff --git a/test/t2600-rendercomment.t b/test/t2600-rendercomment.t index be408b80..e01904c6 100755 --- a/test/t2600-rendercomment.t +++ b/test/t2600-rendercomment.t @@ -2,7 +2,7 @@ test_description='rendercomment tests' -. ./setup.sh +. "$(dirname "$0")/setup.sh" test_expect_success 'Test comment rendering.' ' cat <<-EOD | sqlite3 aur.db && diff --git a/test/t2700-usermaint.t b/test/t2700-usermaint.t index 4f625142..f0bb449b 100755 --- a/test/t2700-usermaint.t +++ b/test/t2700-usermaint.t @@ -2,7 +2,7 @@ test_description='usermaint tests' -. ./setup.sh +. "$(dirname "$0")/setup.sh" test_expect_success 'Test removal of login IP addresses.' ' now=$(date -d now +%s) &&