summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorP. J. McDermott <pj@pehjota.net>2014-05-15 18:03:44 (EDT)
committer P. J. McDermott <pj@pehjota.net>2014-05-15 18:03:44 (EDT)
commit63cf1af3e69ae1f328ee61caec553a629481ceb4 (patch)
tree712b2072783ddcb9209ff035fed38fa8cd120bf0
parentf1ae939a22d07a873a5e1e139763baefa2f0581d (diff)
tests/common.sh: Remove _ob_local and _ob_return.
-rw-r--r--TODO1
-rw-r--r--tests/common.sh19
2 files changed, 8 insertions, 12 deletions
diff --git a/TODO b/TODO
index 9e5502b..574a6dc 100644
--- a/TODO
+++ b/TODO
@@ -28,7 +28,6 @@ Tasks:
- Review eval commands.
* See if ob-installdocs can/should handle non-directory non-regular files.
* Write manual pages for functions and utilities.
- * tests/common.sh still uses `_ob_local`.
Copyright
diff --git a/tests/common.sh b/tests/common.sh
index b5c7f71..2075558 100644
--- a/tests/common.sh
+++ b/tests/common.sh
@@ -25,25 +25,22 @@ BUILDDIR="${PWD}/.."
ob_use()
{
- _ob_local _obu_module
+ local module=
if [ "${#}" -eq 1 ]; then
- _obu_module="${1}"
+ module="${1}"
else
- _ob_return 125
- return ${?}
+ return 125
fi
- _obu_module="${BUILDDIR}/lib/${_obu_module}.sm"
- if [ -r "${_obu_module}" ]; then
- . "${_obu_module}"
+ module="${BUILDDIR}/lib/${module}.sm"
+ if [ -r "${module}" ]; then
+ . "${module}"
else
- _ob_return 1
- return ${?}
+ return 1
fi
- _ob_return 0
- return ${?}
+ return 0
}
test_assert()