aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormwasilew <milosz.wasilewski@linaro.org>2021-01-08 13:16:30 +0000
committerGitHub <noreply@github.com>2021-01-08 13:16:30 +0000
commite4d4481f13e4f28447ad9eb7b9afcb96484e3088 (patch)
tree4af14f1298ddac879682426eda255e94304daea1
parent2e77a25a4d6137a9cba97e68be6376921abde81e (diff)
parente08fea4249d54cd0288d1a4f2deb78f1f7393188 (diff)
Merge pull request #264 from ivoire/ltp-set-install-path2021.01
ltp: allow to set LTP_INSTALL_PATH
-rwxr-xr-xautomated/linux/ltp/ltp.sh6
-rw-r--r--automated/linux/ltp/ltp.yaml3
2 files changed, 7 insertions, 2 deletions
diff --git a/automated/linux/ltp/ltp.sh b/automated/linux/ltp/ltp.sh
index 9ce72564..528a86eb 100755
--- a/automated/linux/ltp/ltp.sh
+++ b/automated/linux/ltp/ltp.sh
@@ -39,6 +39,7 @@ usage() {
[-d temp directory]
[-g branch]
[-e environment]
+ [-i install path]
[-s True|False]
[-v LTP_VERSION]
[-M Timeout_Multiplier]
@@ -50,7 +51,7 @@ usage() {
exit 0
}
-while getopts "M:T:S:b:d:g:e:s:v:R:u:p:t:" arg; do
+while getopts "M:T:S:b:d:g:e:i:s:v:R:u:p:t:" arg; do
case "$arg" in
T)
TST_CMDFILES="${OPTARG}"
@@ -96,6 +97,9 @@ while getopts "M:T:S:b:d:g:e:s:v:R:u:p:t:" arg; do
e)
export ENVIRONMENT="${OPTARG}"
;;
+ i)
+ export LTP_INSTALL_PATH="${OPTARG}"
+ ;;
# SKIP_INSTALL is true in case of Open Embedded builds
# SKIP_INSTALL is flase in case of Debian builds
s) SKIP_INSTALL="${OPTARG}";;
diff --git a/automated/linux/ltp/ltp.yaml b/automated/linux/ltp/ltp.yaml
index 5f5471bc..9070b43d 100644
--- a/automated/linux/ltp/ltp.yaml
+++ b/automated/linux/ltp/ltp.yaml
@@ -35,6 +35,7 @@ params:
BOARD: ""
BRANCH: ""
LTP_TMPDIR: "/ltp-tmp"
+ LTP_INSTALL_PATH: "/opt/ltp"
ENVIRONMENT: ""
SKIP_INSTALL: false
@@ -69,5 +70,5 @@ params:
run:
steps:
- cd ./automated/linux/ltp/
- - ./ltp.sh -T "${TST_CMDFILES}" -s "${SKIP_INSTALL}" -v "${LTP_VERSION}" -M "${TIMEOUT_MULTIPLIER}" -R "${ROOT_PASSWD}" -b "${BOARD}" -d "${LTP_TMPDIR}" -g "${BRANCH}" -e "${ENVIRONMENT}" -S "${SKIPFILE}" -p "${TEST_DIR}" -u "${TEST_GIT_URL}" -t "${BUILD_FROM_TAR}"
+ - ./ltp.sh -T "${TST_CMDFILES}" -s "${SKIP_INSTALL}" -v "${LTP_VERSION}" -M "${TIMEOUT_MULTIPLIER}" -R "${ROOT_PASSWD}" -b "${BOARD}" -d "${LTP_TMPDIR}" -g "${BRANCH}" -e "${ENVIRONMENT}" -i "${LTP_INSTALL_PATH}" -S "${SKIPFILE}" -p "${TEST_DIR}" -u "${TEST_GIT_URL}" -t "${BUILD_FROM_TAR}"
- ../../utils/send-to-lava.sh ./output/result.txt