From 8a88bc0317c7e449b65b067352f0d783171fb359 Mon Sep 17 00:00:00 2001 From: "Jason A. Donenfeld" Date: Wed, 23 Apr 2014 01:17:04 +0200 Subject: tests: make bash usage explicit --- tests/aggregate-results.sh | 2 +- tests/fake-editor-change-password.sh | 2 +- tests/gnupg/random_seed | Bin 600 -> 600 bytes tests/setup.sh | 4 +--- tests/sharness.sh | 2 +- tests/t0001-sanity-checks.sh | 2 +- tests/t0005-init-failing.sh | 2 +- tests/t0010-generate-tests.sh | 2 +- tests/t0020-show-tests.sh | 2 +- tests/t0050-mv-tests.sh | 2 +- tests/t0060-rm-tests.sh | 2 +- tests/t0100-insert-tests.sh | 2 +- tests/t0200-edit-tests.sh | 2 +- 13 files changed, 12 insertions(+), 14 deletions(-) diff --git a/tests/aggregate-results.sh b/tests/aggregate-results.sh index 958cbea..8552e26 100755 --- a/tests/aggregate-results.sh +++ b/tests/aggregate-results.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Copyright (c) 2008-2012 Git project # diff --git a/tests/fake-editor-change-password.sh b/tests/fake-editor-change-password.sh index bfae8e1..af74572 100755 --- a/tests/fake-editor-change-password.sh +++ b/tests/fake-editor-change-password.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # Fake editor program for testing 'pass edit'. # Changes password to 'Hello World', leaving rest of file intact. # diff --git a/tests/gnupg/random_seed b/tests/gnupg/random_seed index 8e02108..d89be71 100644 Binary files a/tests/gnupg/random_seed and b/tests/gnupg/random_seed differ diff --git a/tests/setup.sh b/tests/setup.sh index 88f8aa5..3b9e089 100755 --- a/tests/setup.sh +++ b/tests/setup.sh @@ -16,9 +16,7 @@ PASSWORD_STORE_TEST_HOME="$(cd "$(dirname "$BASH_SOURCE")"; pwd)" PASS="${PASSWORD_STORE_TEST_HOME}/../src/password-store.sh" -if test -e ${PASS} ; then - echo "pass is ${PASS}" -else +if ! test -e ${PASS} ; then echo "Could not find password-store.sh" exit 1 fi diff --git a/tests/sharness.sh b/tests/sharness.sh index 7395be4..380f22c 100644 --- a/tests/sharness.sh +++ b/tests/sharness.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash # # Copyright (c) 2011-2012 Mathias Lafeldt # Copyright (c) 2005-2012 Git project diff --git a/tests/t0001-sanity-checks.sh b/tests/t0001-sanity-checks.sh index bf04394..f20664e 100755 --- a/tests/t0001-sanity-checks.sh +++ b/tests/t0001-sanity-checks.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash test_description='Sanity checks' . ./setup.sh diff --git a/tests/t0005-init-failing.sh b/tests/t0005-init-failing.sh index 01548a6..e5864ff 100755 --- a/tests/t0005-init-failing.sh +++ b/tests/t0005-init-failing.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash test_description='Show "pass init" returning non-zero bug(?) (XXX: remove this test?)' . ./setup.sh diff --git a/tests/t0010-generate-tests.sh b/tests/t0010-generate-tests.sh index 96bb820..28be31d 100755 --- a/tests/t0010-generate-tests.sh +++ b/tests/t0010-generate-tests.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash test_description='Test generate' . ./setup.sh diff --git a/tests/t0020-show-tests.sh b/tests/t0020-show-tests.sh index 8e0a69a..5f582aa 100755 --- a/tests/t0020-show-tests.sh +++ b/tests/t0020-show-tests.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash test_description='Test show' . ./setup.sh diff --git a/tests/t0050-mv-tests.sh b/tests/t0050-mv-tests.sh index 65d2c7e..399868a 100755 --- a/tests/t0050-mv-tests.sh +++ b/tests/t0050-mv-tests.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash test_description='Test mv' . ./setup.sh diff --git a/tests/t0060-rm-tests.sh b/tests/t0060-rm-tests.sh index 5159ac7..7c5ad6a 100755 --- a/tests/t0060-rm-tests.sh +++ b/tests/t0060-rm-tests.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash test_description='Test rm' . ./setup.sh diff --git a/tests/t0100-insert-tests.sh b/tests/t0100-insert-tests.sh index f1349c4..acb892d 100755 --- a/tests/t0100-insert-tests.sh +++ b/tests/t0100-insert-tests.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash test_description='Test insert' . ./setup.sh diff --git a/tests/t0200-edit-tests.sh b/tests/t0200-edit-tests.sh index 65c67f1..27b1794 100755 --- a/tests/t0200-edit-tests.sh +++ b/tests/t0200-edit-tests.sh @@ -1,4 +1,4 @@ -#!/bin/sh +#!/bin/bash test_description='Test edit' . ./setup.sh -- cgit v1.2.3