diff options
| author | P. J. McDermott <pjm@nac.net> | 2012-09-09 15:21:41 (EDT) |
|---|---|---|
| committer | P. J. McDermott <pjm@nac.net> | 2012-09-09 15:21:41 (EDT) |
| commit | f4b484b1ccfe92a610616ec927a6f63a6ebefc3c (patch) | |
| tree | 97c62a86e7db8c6ddca92bcef0c8b199e07d4fdc | |
| parent | ac2bf338797f6659f0137e1b718cb85e06f53cbd (diff) | |
Fix paths in tests.
| -rw-r--r-- | tests/Makefile.in | 4 | ||||
| -rw-r--r-- | tests/common.sh | 6 |
2 files changed, 6 insertions, 4 deletions
diff --git a/tests/Makefile.in b/tests/Makefile.in index 5c03a37..401cbd8 100644 --- a/tests/Makefile.in +++ b/tests/Makefile.in @@ -29,5 +29,5 @@ TESTS = test: $(TESTS) $(TESTS): - @printf ' SH tests/%s.sh\n' '$@' - @DESTDIR='$(DESTDIR)' $(SH) 'tests/$@.sh' + @printf ' SH %s.sh\n' '$@' + @$(SH) '$@.sh' diff --git a/tests/common.sh b/tests/common.sh index 55334e6..991566f 100644 --- a/tests/common.sh +++ b/tests/common.sh @@ -17,9 +17,11 @@ # You should have received a copy of the GNU General Public License # along with this program. If not, see <http://www.gnu.org/licenses/>. +BUILDDIR="${PWD}/.." + # The "common" module is used by all library modules. # We have to manually load the "common" module so we can use it in ob_use. -. "${DESTDIR}/lib/common.sm" +. "${BUILDDIR}/lib/common.sm" ob_use() { @@ -31,7 +33,7 @@ ob_use() return $(_ob_return 125) fi - _obu_module="${DESTDIR}/lib/${_obu_module}.sm" + _obu_module="${BUILDDIR}/lib/${_obu_module}.sm" if [ -r "${_obu_module}" ]; then . "${_obu_module}" else |