diff options
| author | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-09-13 11:06:11 +0000 |
|---|---|---|
| committer | Johnny Willemsen <jwillemsen@remedy.nl> | 2011-09-13 11:06:11 +0000 |
| commit | f7165cf67a9ba00ce9ed97221948a75e54e7fd47 (patch) | |
| tree | 06702b06165d756cfd417dedf165555f3e2631d5 | |
| parent | 997dd43174b5f34e093ac2021218ef6092e3f9ed (diff) | |
| download | ATCD-f7165cf67a9ba00ce9ed97221948a75e54e7fd47.tar.gz | |
Added remove user image to get clean emulator
| -rw-r--r-- | ACE/bin/PerlACE/TestTarget_Android.pm | 12 |
1 files changed, 11 insertions, 1 deletions
diff --git a/ACE/bin/PerlACE/TestTarget_Android.pm b/ACE/bin/PerlACE/TestTarget_Android.pm index eb5ce515ee2..4046d209c54 100644 --- a/ACE/bin/PerlACE/TestTarget_Android.pm +++ b/ACE/bin/PerlACE/TestTarget_Android.pm @@ -142,11 +142,12 @@ sub start_target () print STDERR "Error: Android AVD name not defined.\n"; return 0; } + my $avd_name = $ENV{'ANDROID_AVD_NAME'}; my $android_process = $ENV{'ANDROID_SDK_ROOT'} . "/tools/android"; my $avd_process = $ENV{'ANDROID_SDK_ROOT'} . "/tools/emulator"; my $adb_process = $ENV{'ANDROID_SDK_ROOT'} . "/platform-tools/adb"; + my $user_data_image = $ENV{'ANDROID_SDK_HOME'} . ".android/avd/" . $avd_name . ".avd/userdata.img"; - my $avd_name = $ENV{'ANDROID_AVD_NAME'}; my $avd_options = "-noaudio -no-window -wipe-data"; if (defined ($ENV{'ANDROID_AVD_OPTIONS'})) { @@ -163,6 +164,15 @@ sub start_target () } elsif (defined $self->{PROCESS}) { #child here + my $user_image_cmd = "rm -f " . $user_data_image; + if (defined $ENV{'ACE_TEST_VERBOSE'}) { + print STDERR "Removing user data image: $user_image_cmd\n"; + } + + system ( $user_image_cmd ); + if ($? != 0) { + print STDERR "failed to execute: $!\n"; + } my $avd_cmd = "$avd_process" .' -avd ' . "$avd_name $avd_options"; if (defined $ENV{'ACE_TEST_VERBOSE'}) { |