Support run multiple control file under the same test directory.

run_remote_tests.sh

Index: run_remote_tests.sh
diff --git a/run_remote_tests.sh b/run_remote_tests.sh
index da3fbd5ea245e2e6350a864ce2d75c32f491b77c..25282088cc4d832c75b1b41b9cb40ac033ef3c25 100755
--- a/run_remote_tests.sh
+++ b/run_remote_tests.sh
@@ -227,7 +227,21 @@ function main() {
     fi
     echo ""
     echo_color "yellow" ">>> Running ${type} test " ${control_file}
+    local control_file_name=$(basename "${control_file}")
     local short_name=$(basename $(dirname "${control_file}"))
+
+    # testName/control --> testName
+    # testName/control.bvt --> testName.bvt
+    # testName/control.regression --> testName.regression
+    # testName/some_control --> testName.some_control
+    if [[ "${control_file_name}" != control ]]; then
+      if [[ "${control_file_name}" == control.* ]]; then
+        short_name=${short_name}.${control_file_name/control./}
+      else
+        short_name=${short_name}.${control_file_name}
+      fi
+    fi
+
     local results_dir_name="${short_name}"
     local results_dir="${TMP_INSIDE_CHROOT}/${results_dir_name}"
     rm -rf "${results_dir}"