[Patch 2/5] t9601-cvsimport-vendor-branch: exclude test if cvs is not installed
- From
- randall.s.becker@rogers.com <randall.s.becker@rogers.com>
- Date
- Jun 13, 2019, 18:53 UTC
- Message-ID
- <20190613185313.16120-3-randall.s.becker@rogers.com>
- In-Reply-To
- <20190613185313.16120-1-randall.s.becker@rogers.com>
From: "Randall S. Becker" <rsbecker@nexbridge.com>
The t9601-cvsimport-vendor-branch test requires the cvs package to be installed on the system on which the test is being run. The test will fail if cvs is not installed. The patch checks that cvs is installed by running the object without arguments, which should complete successfully if available.
Signed-off-by: Randall S. Becker <rsbecker@nexbridge.com> --- t/t9601-cvsimport-vendor-branch.sh | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/t/t9601-cvsimport-vendor-branch.sh b/t/t9601-cvsimport-vendor-branch.sh index 827d39f5bf..a473f07d2d 100755 --- a/t/t9601-cvsimport-vendor-branch.sh +++ b/t/t9601-cvsimport-vendor-branch.sh @@ -32,8 +32,16 @@ # tag has been removed. test_description='git cvsimport handling of vendor branches' + . ./lib-cvs.sh +cvs >/dev/null 2>&1 +if test $? -ne 1 +then + skip_all='skipping git-cvsimport tests, cvs not found' + test_done +fi + setup_cvs_test_repository t9601 test_expect_success PERL 'import a module with a vendor branch' '
-- 2.22.0