Skip to content

automated: linux: ltp: add option to pass kirk arguments #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
vigneshraman wants to merge 1 commit into from
+11 −3
Closed

automated: linux: ltp: add option to pass kirk arguments #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 7 additions & 2 deletions automated/linux/ltp/ltp.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ SHARD_INDEX=1

RUNNER=""
KIRK_WORKERS=1
EXTRA_KIRK_ARGS=""

LTP_TMPDIR=/ltp-tmp

Expand All @@ -55,11 +56,12 @@ usage() {
[-t build from tarfile ]
[-c sharding bucket to run ]
[-n number of shard buckets to create ]
[-k extra kirk arguments ]
" 1>&2
exit 0
}

while getopts "M:T:S:b:d:g:e:i:s:v:R:r:u:p:t:c:n:w:" arg; do
while getopts "M:T:S:b:d:g:e:i:s:v:R:r:u:p:t:c:n:w:k:" arg; do
case "$arg" in
T)
TST_CMDFILES="${OPTARG}"
Expand Down Expand Up @@ -139,6 +141,9 @@ while getopts "M:T:S:b:d:g:e:i:s:v:R:r:u:p:t:c:n:w:" arg; do
w)
KIRK_WORKERS="$OPTARG"
;;
k)
EXTRA_KIRK_ARGS="$OPTARG"
;;
*)
usage
error_msg "No flag ${OPTARG}"
Expand Down Expand Up @@ -197,7 +202,7 @@ run_ltp() {
if [ "${KIRK_WORKERS}" = "max" ]; then
KIRK_WORKERS=$(grep ^processor /proc/cpuinfo | wc -l)
fi
pipe0_status "${RUNNER} --framework ltp --run-suite shardfile \
pipe0_status "${RUNNER} ${EXTRA_KIRK_ARGS} --framework ltp --run-suite shardfile \
-d ${LTP_TMPDIR} --env LTP_COLORIZE_OUTPUT=0 \
${SKIPFILE_PATH:+--skip-file} ${SKIPFILE_PATH} \
${KIRK_WORKERS:+--workers} ${KIRK_WORKERS} \
Expand Down
5 changes: 4 additions & 1 deletion automated/linux/ltp/ltp.yaml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,9 @@ params:
# # Tests can now run concurrently by specifying '--workers X'.
KIRK_WORKERS: 1

# Extra arguments to pass directly to the kirk runner
EXTRA_KIRK_ARGS: ""

# If the following parameter is set, then the LTP suite is
# cloned and used unconditionally. In particular, the version
# of the suite is set to the commit pointed to by the
Expand Down Expand Up @@ -80,5 +83,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}" -r "${RUNNER}" -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}" -n "${SHARD_NUMBER}" -c "${SHARD_INDEX}" -w "${KIRK_WORKERS}"
- ./ltp.sh -T "${TST_CMDFILES}" -s "${SKIP_INSTALL}" -v "${LTP_VERSION}" -M "${TIMEOUT_MULTIPLIER}" -R "${ROOT_PASSWD}" -r "${RUNNER}" -k "${EXTRA_KIRK_ARGS}" -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}" -n "${SHARD_NUMBER}" -c "${SHARD_INDEX}" -w "${KIRK_WORKERS}"
- ../../utils/send-to-lava.sh ./output/result.txt