diff options
author | Wolfram Sang <w.sang@pengutronix.de> | 2009-07-06 13:52:11 +0000 |
---|---|---|
committer | Wolfram Sang <w.sang@pengutronix.de> | 2009-07-06 13:52:11 +0000 |
commit | 6648230c2178487d1b466ee667fb0d7fdd7615d0 (patch) | |
tree | f97024e6f3f11c23c589504aa735cdd7f8a8ee45 /tests | |
parent | 5f887bdf7aa6f9ee15d1b6cc59363cea71178c5d (diff) | |
download | ptxdist-6648230c2178487d1b466ee667fb0d7fdd7615d0.tar.gz ptxdist-6648230c2178487d1b466ee667fb0d7fdd7615d0.tar.xz |
* kermit-wrapper: support a custom libptxdisttest.kermit in the workspace
git-svn-id: https://svn.pengutronix.de/svn/ptxdist/trunks/ptxdist-trunk@10945 33e552b5-05e3-0310-8538-816dae2090ed
Diffstat (limited to 'tests')
-rwxr-xr-x | tests/kwrapper | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/tests/kwrapper b/tests/kwrapper index 056399f5a..94d4deb1d 100755 --- a/tests/kwrapper +++ b/tests/kwrapper @@ -20,8 +20,11 @@ if [ ! -e "${KSCRIPT}" ]; then [ -e "${KSCRIPT}" ] || _error "No kermit-script for ${TST} found! Please report to the developers." fi -LIB="${OURDIR}/libptxdisttest.kermit" -[ -e "${LIB}" ] || _error "Could not find ${LIB}! Please report to the developers." +LIB_PATH="${PTXDIST_WORKSPACE}/tests" +if [ ! -e "${LIB_PATH}/libptxdisttest.kermit" ]; then + LIB_PATH="${OURDIR}" + [ -e "${LIB_PATH}/libptxdisttest.kermit" ] || _error "Could not find kermit-library! Please report to the developers." +fi TMPFILE="$(mktemp "${PTXDIST_TEMPDIR}/kwrapper.XXXXXX")" @@ -32,7 +35,7 @@ TMPFILE="$(mktemp "${PTXDIST_TEMPDIR}/kwrapper.XXXXXX")" sed -e 's/^\(PTXCONF_BOARDSETUP_[A-Z0-9_]*\)=/define \1 /' "${PTXDIST_BOARDSETUP}" > "${TMPFILE}" # FIXME: add PTXDIST_TEST_vars from environment, too -"${PTXDIST_SYSROOT_HOST}/bin/ckermit" "${KSCRIPT}" -Y = "${OURDIR}" "${TMPFILE}" "${@}" +"${PTXDIST_SYSROOT_HOST}/bin/ckermit" "${KSCRIPT}" -Y = "${LIB_PATH}" "${TMPFILE}" "${@}" [ $? != 0 ] && echo "An error occured! Please check also .${PTXDIST_PLATFORMDIR#${PTXDIST_WORKSPACE}}/test.log for further details!" >&2 rm -f "${TMPFILE}" |