diff options
| author | msmit <msmit@remedy.nl> | 2011-09-23 12:43:36 +0000 |
|---|---|---|
| committer | msmit <msmit@remedy.nl> | 2011-09-23 12:43:36 +0000 |
| commit | d088aacc41a35fc8c9b5062660e51c03763c178b (patch) | |
| tree | 820981452af09aceebdc91b0babab5b763c1872c | |
| parent | ff26f944433c690fb0d9bb8586786523fcb047f7 (diff) | |
| download | ATCD-d088aacc41a35fc8c9b5062660e51c03763c178b.tar.gz | |
Fri Sep 23 12:45:47 UTC 2011 Marcel Smit <msmit@remedy.nl>
* bin/PerlACE/TestTarget.pm:
* bin/PerlACE/TestTarget_Android.pm:
Created a special method for the ADB timeout environment
variable.
| -rw-r--r-- | ACE/ChangeLog | 7 | ||||
| -rw-r--r-- | ACE/bin/PerlACE/TestTarget.pm | 13 | ||||
| -rw-r--r-- | ACE/bin/PerlACE/TestTarget_Android.pm | 5 |
3 files changed, 21 insertions, 4 deletions
diff --git a/ACE/ChangeLog b/ACE/ChangeLog index 5ef021bc589..9138232ee5c 100644 --- a/ACE/ChangeLog +++ b/ACE/ChangeLog @@ -1,3 +1,10 @@ +Fri Sep 23 12:45:47 UTC 2011 Marcel Smit <msmit@remedy.nl> + + * bin/PerlACE/TestTarget.pm: + * bin/PerlACE/TestTarget_Android.pm: + Created a special method for the ADB timeout environment + variable. + Fri Sep 23 09:25:04 UTC 2011 Marcel Smit <msmit@remedy.nl> * bin/PerlACE/TestTarget_Android.pm: diff --git a/ACE/bin/PerlACE/TestTarget.pm b/ACE/bin/PerlACE/TestTarget.pm index a326413ad2a..58e8b53f574 100644 --- a/ACE/bin/PerlACE/TestTarget.pm +++ b/ACE/bin/PerlACE/TestTarget.pm @@ -156,6 +156,12 @@ sub GetConfigSettings ($) } else { $self->{PROCESS_STOP_WAIT_INTERVAL} = 10; } + $env_name = $env_prefix.'ADB_WAIT_FOR_DEVICE_TIMEOUT'; + if (exists $ENV{$env_name}) { + $self->{ADB_WAIT_FOR_DEVICE_TIMEOUT} = $ENV{$env_name}; + } else { + $self->{ADB_WAIT_FOR_DEVICE_TIMEOUT} = 120; + } $env_name = $env_prefix.'HOSTNAME'; if (exists $ENV{$env_name}) { $self->{HOSTNAME} = $ENV{$env_name}; @@ -317,6 +323,13 @@ sub ProcessStopWaitInterval ($) return $self->{PROCESS_STOP_WAIT_INTERVAL}; } +sub AdbWaitForDeviceTimeout ($) +{ + my $self = shift; + return $self->{ADB_WAIT_FOR_DEVICE_TIMEOUT}; +} + + sub LocalFile ($) { my $self = shift; diff --git a/ACE/bin/PerlACE/TestTarget_Android.pm b/ACE/bin/PerlACE/TestTarget_Android.pm index 5889fca391e..46145fb39e6 100644 --- a/ACE/bin/PerlACE/TestTarget_Android.pm +++ b/ACE/bin/PerlACE/TestTarget_Android.pm @@ -199,10 +199,7 @@ sub start_target () } eval { - my $timeout = 30; - if (defined ($ENV{'ANDROID_SDK_ROOT'})) { - $timeout = $ENV{'DOC_TEST_DEFAULT_ADB_WAIT_FOR_DEVICE_TIMEOUT'}; - } + my $timeout = $self->AdbWaitForDeviceTimeout (); local $SIG{ALRM} = sub { die "alarm\n" }; # NB: \n required alarm $timeout; |