diff options
author | Vratko Polak <vrpolak@cisco.com> | 2019-04-04 13:45:11 +0200 |
---|---|---|
committer | Vratko Polak <vrpolak@cisco.com> | 2019-04-08 16:34:10 +0200 |
commit | 5e6145a4260ffce1c302e94b9b241851f90838e1 (patch) | |
tree | 2480a5419cf127ac64262d271b8094f4834b2a66 /resources/libraries/bash/entry/check | |
parent | 5221220aa5a893e93d78ba31f84b0ad4d6245ec3 (diff) |
Upgrade autogen to NICs and search types
+ All perf suites updated, as autogen change is backward incompatible.
+ Only x710 -ndrpdr suites remain in git repository.
+ Removed retry feature of run_tests.
+ Renamed topology_type and traffic_type to traffic_profile.
+ Renamed framesize to frame_size; nic_model to nic_name.
+ Reordered Variables table to start with nic_name and overhead.
+ Fixed wrong overhead value in some cbc-sha1 suites.
+ Fixed some suite tags.
++ Introduced tags to distinguish suites, such as IPSECINT.
+ Bound crypto hardware to NIC name.
+ Implemented NIC limit hiding.
+ Also search and teardown related arguments are now hidden.
+ Main measurement keywords updated to new arg handling.
+ Max rate related keywords moved to performance_limits.robot
+ Teardowns unified.
+ Generated tests are archived.
++ Generated directory is .gitignore-d.
+ Regenerator raises an exception on seeing non-compatible suite.
++ Relatively helpful message should be seen in exception.
+ Suite and template Documentation has generated parts.
+- With short NIC names only.
+ Autogen checker also upgraded.
+ Tag expressions replaced with long files to ensure analogous tests.
Change-Id: I60e9a999187e7da1f60d0eb4fb02afa14682aa46
Signed-off-by: Vratko Polak <vrpolak@cisco.com>
Diffstat (limited to 'resources/libraries/bash/entry/check')
-rw-r--r-- | resources/libraries/bash/entry/check/autogen.sh | 34 |
1 files changed, 19 insertions, 15 deletions
diff --git a/resources/libraries/bash/entry/check/autogen.sh b/resources/libraries/bash/entry/check/autogen.sh index 35ecc281ee..0164b65962 100644 --- a/resources/libraries/bash/entry/check/autogen.sh +++ b/resources/libraries/bash/entry/check/autogen.sh @@ -18,13 +18,16 @@ set -exuo pipefail # This file does not have executable flag nor shebang, # to dissuade non-tox callers. -# This script run every executable *.py script anywhere within tests/ dir, +# This script starts with copying ${CSIT_DIR}/tests to ${GENERATED_DIR}/. +# Then the script runs every executable *.py script anywhere in the copied dir, # the working directory temporarily changed to where the *.py file is. # Proper virtualenv is assumed to be active. -# If "git diff" sees any change, this script fails. -# The diff output stored to autogen.log (overwriting). -# The *.py files are assumed to be robot suite generators, -# any change means the contribution does not match the generated code. +# Then another directory in ${GENERATED_DIR} is created, where +# the just generated content is copied and then overwitten by the non-generated. +# If "diff -dur" sees any changes by the overwrite, this script fails. +# The diff output is stored to autogen.log (overwriting). +# The executed *.py files are assumed to be robot suite generators, +# any change means the contribution is not consistent with the regenerated code. # "set -eu" handles failures from the following two lines. BASH_CHECKS_DIR="$(dirname $(readlink -e "${BASH_SOURCE[0]}"))" @@ -33,20 +36,21 @@ source "${BASH_FUNCTION_DIR}/common.sh" || { echo "Source failed." >&2 exit 1 } - +common_dirs work_dir="$(pwd)" || die trap "cd '${work_dir}'" EXIT || die -file_list="$(find ./tests -type f -executable -name '*.py')" || die -for gen in ${file_list}; do - directory="$(dirname "${gen}")" || die - filename="$(basename "${gen}")" || die - pushd "${directory}" || die - ./"${filename}" || die - popd || die -done +generate_tests + +rm -rf "${GENERATED_DIR}/tests_tmp" +cp -r "${GENERATED_DIR}/tests" "${GENERATED_DIR}/tests_tmp" +# Default cp behavior is to put inside a targed dir, not to override. +cp -rf "${CSIT_DIR}/tests"/* "${GENERATED_DIR}/tests_tmp"/ +# TODO: Do we want to archive ${GENERATED_DIR}? +# I think archiving the diff is enough. -lines="$(git diff | tee "autogen.log" | wc -l)" || die +diff_cmd=("diff" "-dur" "${GENERATED_DIR}/tests_tmp" "${GENERATED_DIR}/tests") +lines="$("${diff_cmd[@]}" | tee "autogen.log" | wc -l)" || die if [ "${lines}" != "0" ]; then # TODO: Decide which text goes to stdout and which to stderr. warn "Autogen conflict diff nonzero lines: ${lines}" |