Make run_remote_tests.sh support --results_dir_root.

Patch author: Andy Chan <andyc@codeaurora.org>
Original issue: http://codereview.chromium.org/2128016/show
Reviewed by sosa@chromium.org.

BUG=none
TEST=none

Review URL: http://codereview.chromium.org/2728006
This commit is contained in:
Daniel Erat 2010-06-09 15:55:03 -07:00
parent 362944a873
commit 0db85ef360

View File

@ -149,15 +149,37 @@ function main() {
exit 1 exit 1
fi 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 -e
# Set global TMP for remote_access.sh's sake # Set global TMP for remote_access.sh's sake
if [[ ${INSIDE_CHROOT} -eq 0 ]] # and if --results_dir_root is specified,
then # set TMP and create dir appropriately
TMP=$(mktemp -d ${FLAGS_chroot}/tmp/run_remote_tests.XXXX) 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}}) TMP_INSIDE_CHROOT=$(echo ${TMP#${FLAGS_chroot}})
else 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} TMP_INSIDE_CHROOT=${TMP}
fi fi
@ -217,12 +239,6 @@ function main() {
echo_color "yellow" " * " "${CONTROL_FILE}" echo_color "yellow" " * " "${CONTROL_FILE}"
done 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 for control_file in ${control_files_to_run}; do
# Assume a line starts with TEST_TYPE = # Assume a line starts with TEST_TYPE =
control_file=$(remove_quotes "${control_file}") control_file=$(remove_quotes "${control_file}")