Make run_remote_tests.sh support --results_dir_root.

run_remote_tests.sh

 #!/bin/bash
 
 # Copyright (c) 2009 The Chromium OS Authors. All rights reserved.
 # Use of this source code is governed by a BSD-style license that can be
 # found in the LICENSE file.
 
 # Script to run client or server tests on a live remote image.
 
 # Load common constants.  This should be the first executable line.
 # The path to common.sh should be relative to your script's location.
@@ skipping 131 matching lines @@
   cd $(dirname "$0")
 
   FLAGS "$@" || exit 1
 
   if [[ -z "${FLAGS_ARGV}" ]]; then
     echo "Please specify tests to run.  For example:"
     echo "  $0 --remote=MyMachine BootPerfServer"
     exit 1
   fi
 
+  # Check the validity of the user-specified result directory
+  # It must be within the /tmp directory
+  if [[ -n "${FLAGS_results_dir_root}" ]]; then
+    SUBSTRING=${FLAGS_results_dir_root:0:5}
+    if [[ ${SUBSTRING} != "/tmp/" ]]; then
+      echo "User-specified result directory must be within the /tmp directory"
+      echo "ex: --results_dir_root=/tmp/<result_directory>"
+      exit 1
+    fi
+  fi
+
   set -e
 
   # Set global TMP for remote_access.sh's sake
-  if [[ ${INSIDE_CHROOT} -eq 0 ]]
-  then
-    TMP=$(mktemp -d ${FLAGS_chroot}/tmp/run_remote_tests.XXXX)
+  # and if --results_dir_root is specified,
+  # set TMP and create dir appropriately
+  if [[ ${INSIDE_CHROOT} -eq 0 ]]; then
+    if [[ -n "${FLAGS_results_dir_root}" ]]; then
+      TMP=${FLAGS_chroot}${FLAGS_results_dir_root}
+      mkdir -m 777 ${TMP}
+    else
+      TMP=$(mktemp -d ${FLAGS_chroot}/tmp/run_remote_tests.XXXX)
+    fi
     TMP_INSIDE_CHROOT=$(echo ${TMP#${FLAGS_chroot}})
   else
-    TMP=$(mktemp -d /tmp/run_remote_tests.XXXX)
+    if [[ -n "${FLAGS_results_dir_root}" ]]; then
+      TMP=${FLAGS_results_dir_root}
+      mkdir -m 777 ${TMP}
+    else
+      TMP=$(mktemp -d /tmp/run_remote_tests.XXXX)
+    fi
     TMP_INSIDE_CHROOT=${TMP}
   fi
 
   trap cleanup EXIT
 
   remote_access_init
 
   local autotest_dir=""
   if [[ -z "${FLAGS_prepackaged_autotest}" ]]; then
     learn_board
@@ skipping 39 matching lines @@
   if [[ -z "${control_files_to_run}" ]]; then
     echo_color "red" ">>> Found no control files"
     exit 1
   fi
 
   echo_color "yellow" ">>> Running the following control files:"
   for CONTROL_FILE in ${control_files_to_run}; do
     echo_color "yellow" " * " "${CONTROL_FILE}"
   done
 
-  if [[ -z "${FLAGS_results_dir_root}" ]]; then
-    FLAGS_results_dir_root="${TMP_INSIDE_CHROOT}"
-  fi
-
-  mkdir -p "${FLAGS_results_dir_root}"
-
   for control_file in ${control_files_to_run}; do
     # Assume a line starts with TEST_TYPE =
     control_file=$(remove_quotes "${control_file}")
     local type=$(read_test_type "${autotest_dir}/${control_file}")
     local option
     if [[ "${type}" == "client" ]]; then
       option="-c"
     else
       option="-s"
     fi
@@ skipping 40 matching lines @@
       fi
     else
       echo_color "red" ">>> FAILED: ${control_file}"
       cat "${test_status}"
     fi
     local end_time=$(date '+%s')
   done
 }
 
 main $@