diff options
| author | Peter Rosin <peda@lysator.liu.se> | 2013-01-09 12:58:55 +0100 |
|---|---|---|
| committer | Peter Rosin <peda@lysator.liu.se> | 2013-01-09 12:58:55 +0100 |
| commit | 820e373cf2521e553db409e87c4ccc5e6cc4b074 (patch) | |
| tree | 425312026634f948e0c60f125b30196995d7e630 /tests | |
| parent | 66acec8407935f13aad5ab7f86a0ec8e9ec0f8ce (diff) | |
| download | libtool-820e373cf2521e553db409e87c4ccc5e6cc4b074.tar.gz | |
tests: fix nits in path handling
tests/bindir.at: func_save_and_prepend_path is already checking
$bindirneeded internally, so remove checks from call sites. Add
proper quoting while at it.
(func_save_and_prepend_path): Use $PATH_SEPARATOR instead of a literal
colon (in both instances).
Signed-off-by: Peter Rosin <peda@lysator.liu.se>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/bindir.at | 14 |
1 files changed, 5 insertions, 9 deletions
diff --git a/tests/bindir.at b/tests/bindir.at index 9786d082..cc9c24a2 100644 --- a/tests/bindir.at +++ b/tests/bindir.at @@ -82,7 +82,7 @@ func_save_and_prepend_path () { save_PATH=$PATH if $bindirneeded; then - PATH=$1:$PATH + PATH=$1$PATH_SEPARATOR$PATH fi export PATH } @@ -143,7 +143,7 @@ LT_AT_NOINST_EXEC_CHECK([./main]) # Ensure libraries can be found on PATH, if we are on one # of the affected platforms, before testing the shared version. -func_save_and_prepend_path $curdir/$objdir +func_save_and_prepend_path "$curdir/$objdir" $bindirneeded && { LT_AT_NOINST_EXEC_CHECK([$objdir/main]) } @@ -194,7 +194,7 @@ func_save_and_prepend_path () { save_PATH=$PATH if $bindirneeded; then - PATH=$1:$PATH + PATH=$1$PATH_SEPARATOR$PATH fi export PATH } @@ -282,9 +282,7 @@ do fi # And that it can be executed. - extrapath= - $bindirneeded && extrapath=$libdir/../bin - func_save_and_prepend_path $extrapath + func_save_and_prepend_path "$libdir/../bin" LT_AT_EXEC_CHECK([$curdir/sbin/main$EXEEXT], [0], [ignore], [ignore], []) func_restore_path @@ -346,9 +344,7 @@ do fi # And that it can be executed. - extrapath= - $bindirneeded && extrapath=$bindir - func_save_and_prepend_path $extrapath + func_save_and_prepend_path "$bindir" LT_AT_EXEC_CHECK([$curdir/sbin/main$EXEEXT], [0], [ignore], [ignore], []) func_restore_path |