diff options
author | Yaroslav Brustinov <ybrustin@cisco.com> | 2016-01-18 22:00:51 +0200 |
---|---|---|
committer | Yaroslav Brustinov <ybrustin@cisco.com> | 2016-01-18 22:00:51 +0200 |
commit | eee866f42bd0fc8472e6295b4f26bd0697e59f1f (patch) | |
tree | b16947052643d6a0c7dd20012f0a1d664d044444 /scripts/trex-console | |
parent | c88f411b3a69d6ea56c6b9758b10c30b87a6c94b (diff) |
regression:
corrections of benchmarks
move packet builder tests to functional folder
add CPU utilization boundries for more tests
print Skipping message
fix relative drop counting
API:
convert hostname to IP at init of client side (trex_client.py)
various:
move python path determination to external common file
add functional tests running bash script
add sudo check to t-rex-64
Diffstat (limited to 'scripts/trex-console')
-rwxr-xr-x | scripts/trex-console | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/scripts/trex-console b/scripts/trex-console index 9e01dd16..53dbb0c1 100755 --- a/scripts/trex-console +++ b/scripts/trex-console @@ -1,31 +1,5 @@ #!/bin/bash -# if no variable of $PYTHON is define - we try to find it -function find_python { - # two candidates - machine python and cisco linux python - MACHINE_PYTHON=python - CEL_PYTHON=/router/bin/python - - # try the machine python - PYTHON=$MACHINE_PYTHON - - PCHECK=`$PYTHON -c "import sys; ver = sys.version_info[0] * 10 + sys.version_info[1];sys.exit(ver < 27)"` - if [ $? -ne 0 ]; then - PYTHON=$CEL_PYTHON - PCHECK=`$PYTHON -c "import sys; ver = sys.version_info[0] * 10 + sys.version_info[1];sys.exit(ver < 27)"` - - if [ $? -ne 0 ]; then - echo "*** $PYTHON - python version is too old, 2.7 at least is required" - exit -1 - fi - - fi - -} - -if [ -z "$PYTHON" ]; then - find_python -fi - +source find_python.sh $PYTHON automation/trex_control_plane/console/trex_console.py $@ |