Fixed run_remote_test.sh to work properly with the new location of chrome tests

Fixed run_remote_test.sh to work properly with the new location of chrome tests


BUG=none
TEST=none

[zbehan, 2010-09-10 19:24:37]

+ericli

Is this needed? I thought that by moving things into the chrome_test dep
directly, these hacks will become obsoleted.

On Fri, Sep 10, 2010 at 12:04 PM, <zelidrag@chromium.org> wrote:

> Reviewers: zbehan, sosa,
>
> Description:
> Fixed run_remote_test.sh to work properly with the new location of chrome
> tests
>
>
> BUG=none
> TEST=none
>
> Please review this at http://codereview.chromium.org/3341028/show
>
> SVN Base: ssh://git@gitrw.chromium.org:9222/crosutils.git
>
> Affected files:
>  M run_remote_tests.sh
>
>
> Index: run_remote_tests.sh
> diff --git a/run_remote_tests.sh b/run_remote_tests.sh
> index
>
87738872c942819be2517de2c2797bbb22b6a29c..9dd8c71cfc827c1c23a457e44ac973b97a3f1497
> 100755
> --- a/run_remote_tests.sh
> +++ b/run_remote_tests.sh
> @@ -163,14 +163,19 @@ function main() {
>   fi
>
>   local control_files_to_run=""
> -
> +  local
> chrome_autotests="${CHROME_ROOT}/src/chrome/test/chromeos/autotest/files"
>   # Now search for tests which unambiguously include the given identifier
>   local search_path=$(echo {client,server}/{tests,site_tests})
> +  # Include chrome autotest in the search path
> +  if [ -n "${CHROME_ROOT}" ]; then
> +    search_path="${search_path} ${chrome_autotests}/client/site_tests"
> +  fi
>   pushd ${autotest_dir} > /dev/null
>   for test_request in $FLAGS_ARGV; do
>     test_request=$(remove_quotes "${test_request}")
>     ! finds=$(find ${search_path} -maxdepth 2 -type f \( -name control.\*
> -or \
>       -name control \) | egrep -v "~$" | egrep "${test_request}")
> +    pwd
>     if [[ -z "${finds}" ]]; then
>       echo_color "red" ">>> Cannot find match for \"${test_request}\""
>       exit 1
> @@ -210,6 +215,10 @@ function main() {
>     # Assume a line starts with TEST_TYPE =
>     control_file=$(remove_quotes "${control_file}")
>     local type=$(read_test_type "${autotest_dir}/${control_file}")
> +    # Check if the control file is an absolute path (i.e. chrome autotests
> case)
> +    if [[ ${control_file:0:1} == "/" ]]; then
> +      type=$(read_test_type "${control_file}")
> +    fi
>     local option
>     if [[ "${type}" == "client" ]]; then
>       option="-c"
> @@ -245,6 +254,12 @@ function main() {
>       autotest="./autotest${WORKON_SUFFIX}"
>     fi
>
> +    # Remove chrome autotest location prefix from control_file if needed
> +    if [[ ${control_file:0:${#chrome_autotests}} == "${chrome_autotests}"
> ]]; then
> +      control_file="${control_file:${#chrome_autotests}+1}"
> +      echo_color "yellow" ">>> Running chrome autotest " ${control_file}
> +    fi
> +
>     ${enter_chroot} ${autotest} --board "${FLAGS_board}" -m
> "${FLAGS_remote}" \
>       --ssh-port ${FLAGS_ssh_port} \
>       "${option}" "${control_file}" -r "${results_dir}" ${verbose} \
>
>
>

[zel, 2010-09-10 19:56:51]

Yes, it's needed. I can't run this script on my dev environment anymore
without this fix.


On Fri, Sep 10, 2010 at 12:24 PM, Zdenek Behan <zbehan@chromium.org> wrote:

> +ericli
>
> Is this needed? I thought that by moving things into the chrome_test dep
> directly, these hacks will become obsoleted.
>
>
> On Fri, Sep 10, 2010 at 12:04 PM, <zelidrag@chromium.org> wrote:
>
>> Reviewers: zbehan, sosa,
>>
>> Description:
>> Fixed run_remote_test.sh to work properly with the new location of chrome
>> tests
>>
>>
>> BUG=none
>> TEST=none
>>
>> Please review this at http://codereview.chromium.org/3341028/show
>>
>> SVN Base: ssh://git@gitrw.chromium.org:9222/crosutils.git
>>
>> Affected files:
>>  M run_remote_tests.sh
>>
>>
>> Index: run_remote_tests.sh
>> diff --git a/run_remote_tests.sh b/run_remote_tests.sh
>> index
>>
87738872c942819be2517de2c2797bbb22b6a29c..9dd8c71cfc827c1c23a457e44ac973b97a3f1497
>> 100755
>> --- a/run_remote_tests.sh
>> +++ b/run_remote_tests.sh
>> @@ -163,14 +163,19 @@ function main() {
>>   fi
>>
>>   local control_files_to_run=""
>> -
>> +  local
>> chrome_autotests="${CHROME_ROOT}/src/chrome/test/chromeos/autotest/files"
>>   # Now search for tests which unambiguously include the given identifier
>>   local search_path=$(echo {client,server}/{tests,site_tests})
>> +  # Include chrome autotest in the search path
>> +  if [ -n "${CHROME_ROOT}" ]; then
>> +    search_path="${search_path} ${chrome_autotests}/client/site_tests"
>> +  fi
>>   pushd ${autotest_dir} > /dev/null
>>   for test_request in $FLAGS_ARGV; do
>>     test_request=$(remove_quotes "${test_request}")
>>     ! finds=$(find ${search_path} -maxdepth 2 -type f \( -name control.\*
>> -or \
>>       -name control \) | egrep -v "~$" | egrep "${test_request}")
>> +    pwd
>>     if [[ -z "${finds}" ]]; then
>>       echo_color "red" ">>> Cannot find match for \"${test_request}\""
>>       exit 1
>> @@ -210,6 +215,10 @@ function main() {
>>     # Assume a line starts with TEST_TYPE =
>>     control_file=$(remove_quotes "${control_file}")
>>     local type=$(read_test_type "${autotest_dir}/${control_file}")
>> +    # Check if the control file is an absolute path (i.e. chrome
>> autotests case)
>> +    if [[ ${control_file:0:1} == "/" ]]; then
>> +      type=$(read_test_type "${control_file}")
>> +    fi
>>     local option
>>     if [[ "${type}" == "client" ]]; then
>>       option="-c"
>> @@ -245,6 +254,12 @@ function main() {
>>       autotest="./autotest${WORKON_SUFFIX}"
>>     fi
>>
>> +    # Remove chrome autotest location prefix from control_file if needed
>> +    if [[ ${control_file:0:${#chrome_autotests}} == "${chrome_autotests}"
>> ]]; then
>> +      control_file="${control_file:${#chrome_autotests}+1}"
>> +      echo_color "yellow" ">>> Running chrome autotest " ${control_file}
>> +    fi
>> +
>>     ${enter_chroot} ${autotest} --board "${FLAGS_board}" -m
>> "${FLAGS_remote}" \
>>       --ssh-port ${FLAGS_ssh_port} \
>>       "${option}" "${control_file}" -r "${results_dir}" ${verbose} \
>>
>>
>>
>

[ericli, 2010-09-10 20:00:56]

seems a good change, since run_remote_tests searches site_tests from
third_party/autotest/files instead of CHROOT/build/$BOARD/usr/local/autotest.

http://codereview.chromium.org/3341028/diff/1/2
File run_remote_tests.sh (right):

http://codereview.chromium.org/3341028/diff/1/2#newcode178
run_remote_tests.sh:178: pwd
remove this?

http://codereview.chromium.org/3341028/diff/1/2#newcode258
run_remote_tests.sh:258: if [[ ${control_file:0:${#chrome_autotests}} ==
"${chrome_autotests}" ]]; then
80 chars.

[zel, 2010-09-10 20:58:00]

http://codereview.chromium.org/3341028/diff/1/2
File run_remote_tests.sh (right):

http://codereview.chromium.org/3341028/diff/1/2#newcode178
run_remote_tests.sh:178: pwd
On 2010/09/10 20:00:56, ericli wrote:
> remove this?

Done.

http://codereview.chromium.org/3341028/diff/1/2#newcode258
run_remote_tests.sh:258: if [[ ${control_file:0:${#chrome_autotests}} ==
"${chrome_autotests}" ]]; then
On 2010/09/10 20:00:56, ericli wrote:
> 80 chars.

Done.

[ericli, 2010-09-10 21:04:19]

LGTM.