X-Git-Url: https://gerrit.opnfv.org/gerrit/gitweb?a=blobdiff_plain;f=run_tests.sh;h=2257e75fa221b92f15b75e5204660d98f0953cdc;hb=911d39ce7a8b45ab8b6d7dd2ef1feb1a30ca4646;hp=9ae89b17a9de6b1643c18273342f9d3926ad9bad;hpb=f84c8dcc22f1499128893e62b0e15b4b592c47ba;p=bottlenecks.git

diff --git a/run_tests.sh b/run_tests.sh
index 9ae89b17..2257e75f 100755
--- a/run_tests.sh
+++ b/run_tests.sh
@@ -33,10 +33,10 @@ function check_testcase(){
     check_suite="$1"
     case $check_suite in
          "-rubbos")
-             $SUITE_PREFIX=$SUITE_PREFIX_CONFIG/rubbos/testcase_cfg
+             SUITE_PREFIX=$SUITE_PREFIX_CONFIG/rubbos/testcase_cfg
          ;;
          "-vstf")
-             $SUITE_PREFIX=$SUITE_PREFIX_CONFIG/vstf/testcase_cfg
+             SUITE_PREFIX=$SUITE_PREFIX_CONFIG/vstf/testcase_cfg
          ;;
     esac
 
@@ -47,10 +47,10 @@ function check_testcase(){
     all_testcases_insuite=`cat /tmp/all_testcases.yaml | awk -F '/' '{print $NF}' | awk -F '.' '{print $1}'`
     all_testcases=(${all_testcases_insuite})
 
-    if ["${TEST_CASE}" != ""]; then
+    if [ "${TEST_CASE}" != "" ]; then
        testcase_exec=(${TEST_CASE// /})
        for i in "${testcase_exec[@]}"; do
-           if [[ " ${all_test_cases[*]} " != *" $i "* ]]; then
+           if [[ " ${all_testcases[*]} " != *" $i "* ]]; then
                error "unknown test case: $i. available test cases are: ${all_test_cases[@]}"
            fi
        done
@@ -67,18 +67,19 @@ function run_test(){
     case $test_suite in
         "rubbos")
             info "Running rubbos test suite"
-            test_file="/home/opnfv/bottlenecks/testsuite/rubbos/testsuite_story/rubbos_story1"
+            test_file="/home/opnfv/bottlenecks/testsuites/rubbos/testsuite_story/rubbos_story1"
             if [[ -f $test_file ]]; then
                 testcases=($(cat $test_file))
             else
-                error("no rubbos test suite file ")
+                error "no rubbos test suite file"
             fi
             for i in "${testcases[@]}"; do
                 #check if the testcase is legal or not
                 check_testcase -rubbos $i
                 #adjust config parameters, different test suite has different methods, take rubbos as an example
                 #run test case, different test suite has different methods
-
+                file={$BASEDIR}/testsuites/rubbos/testcase_cfg/{$i}.yaml
+                python /home/opnfv/bottlenecks/testsuites/rubbos/run_rubbos.py -c $file
             done
         ;;
         "vstf")
@@ -87,13 +88,15 @@ function run_test(){
             if [[ -f $test_file ]]; then
                 testcases=($(cat $test_file))
             else
-                error("no vstf test suite file ")
+                error "no vstf test suite file "
             fi
             for i in "${testcases[@]}"; do
                 #check if the testcase is legal or not
                 check_testcase -vstf $i
                 #adjust config parameters
                 #run test case
+                file={$BASEDIR}/testsuites/vstf/testcase_cfg/{$i}.yaml
+                python /home/opnfv/bottlenecks/testsuites/vstf/run_vstf.py -c $file
             done
         ;;
     esac