From bf231ba795387064e7c4f1781240619429a4ef29 Mon Sep 17 00:00:00 2001 From: Filip Tehlar Date: Wed, 7 Sep 2016 15:47:47 +0200 Subject: Introduce an option for testing binary API This patch introduces an option for choosing a configuration method in tests. Supported methods are VAT and vpp's debug CLI. * Added new aprameter to run.sh to define method (--cfg-method [vat|cli]). Defaults to vat. * When running a test separately the method can be set as follows: $ sudo CFG_METHOD=cli ./tests/.sh Again, it defaults to 'vat' if not provided. * Increased readability in test driver scripts when checking test status * When debugging you can stop test execution by running the test with WAIT=1: $ sudo WAIT=1 tests/.sh Change-Id: If851139cff072ba2e3b3594a3345763d360f3b59 Signed-off-by: Filip Tehlar --- .../vpp_lite_topo/test_driver/rtr_two_iface.sh | 20 +++----------------- 1 file changed, 3 insertions(+), 17 deletions(-) (limited to 'tests/data_plane/vpp_lite_topo/test_driver/rtr_two_iface.sh') diff --git a/tests/data_plane/vpp_lite_topo/test_driver/rtr_two_iface.sh b/tests/data_plane/vpp_lite_topo/test_driver/rtr_two_iface.sh index 507a817..a7d4a03 100644 --- a/tests/data_plane/vpp_lite_topo/test_driver/rtr_two_iface.sh +++ b/tests/data_plane/vpp_lite_topo/test_driver/rtr_two_iface.sh @@ -20,9 +20,7 @@ fi function test_rtr_two_iface { rtr_two_iface_setup - if [ "$2" == "wait" ] ; then - read -p "press any key to continue .." -n1 - fi + maybe_pause test_result=1 rc=0 @@ -37,21 +35,9 @@ function test_rtr_two_iface { echo "Unrecognized IP format '$1'" fi - #ip netns exec vpp1-ns ping -w 15 -c 1 "${1}" - #rc=$? - - if [ "$2" == "wait" ] ; then - read -p "press any key to continue .." -n1 - fi + maybe_pause rtr_two_iface_clean - - if [ $rc -ne 0 ] ; then - echo "Test failed: No ICMP response received within specified timeout limit!" - else - echo "Test passed." - test_result=0 - fi - + print_status $rc "No ICMP response!" exit $test_result } -- cgit 1.2.3-korg