[PATCH] test-lib.sh: work around ksh's trap shortcomings
- From
Brandon Casey <casey@nrlssc.navy.mil>
- Date
- Aug 18, 2008, 23:16 UTC
- Message-ID
- <gPlIc7E6mNDrXE6mwaHXFoin7rDpLmjvuzlhJfCp-YmuyVK3pEzqNA@cipher.nrlssc.navy.mil>
- In-Reply-To
- <giNXZFTxzY3B65dQob7CwvwwfSKlZpw_60oz81RxU5UN3PsTT_3dMQ@cipher.nrlssc.navy.mil>
In ksh, if trap is called within a function with 0 or EXIT as its signal, then the trap will be executed at the time the function returns. This causes a problem in the test functions since 'trap - exit' is called within the test_done function in order to remove the trap which calls die() on exit. This means trap has to be called from the scripts top-level. Do so using an alias.
Additionally, there is some strangeness with respect to aliases and sourced script files; the alias hack doesn't work. So call 'trap - 0' directly in lib-git-svn.sh before calling the test_done function. --- t/lib-git-svn.sh | 3 +++ t/test-lib.sh | 2 +- 2 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/t/lib-git-svn.sh b/t/lib-git-svn.sh index a841df2..e2e8cf3 100644 --- a/t/lib-git-svn.sh +++ b/t/lib-git-svn.sh @@ -3,6 +3,7 @@ if test -n "$NO_SVN_TESTS" then test_expect_success 'skipping git-svn tests, NO_SVN_TESTS defined' : + trap - exit test_done exit fi @@ -15,6 +16,7 @@ svn >/dev/null 2>&1 if test $? -ne 1 then test_expect_success 'skipping git-svn tests, svn not found' : + trap - exit test_done exit fi @@ -39,6 +41,7 @@ then err='Perl SVN libraries not found or unusable, skipping test' fi test_expect_success "$err" : + trap - exit test_done exit fi diff --git a/t/test-lib.sh b/t/test-lib.sh index 11c0275..6a3fc93 100644 --- a/t/test-lib.sh +++ b/t/test-lib.sh @@ -415,7 +415,6 @@ test_create_repo () { } test_done () { - trap - exit test_results_dir="$TEST_DIRECTORY/test-results" mkdir -p "$test_results_dir" test_results_path="$test_results_dir/${0%-*}-$$" @@ -457,6 +456,7 @@ test_done () { esac } +alias test_done='trap - exit && test_done' # Test the binaries we have just built. The tests are kept in # t/ subdirectory and are run in 'trash directory' subdirectory.
-- 1.6.0.13.ge1c8