# HG changeset patch # User Maciej Seroka # Date 1272463271 -3600 # Node ID 4ae26accd7dac980b087e074fb4e2a191893db68 # Parent 8428cb6e199e1d1b9465ab07328979d976695f4d Fixed ats_specialise_drop to insert ROM image parameters diff -r 8428cb6e199e -r 4ae26accd7da common/tools/ats/ats_specialise_test_drop.pl --- a/common/tools/ats/ats_specialise_test_drop.pl Wed Apr 28 14:43:07 2010 +0100 +++ b/common/tools/ats/ats_specialise_test_drop.pl Wed Apr 28 15:01:11 2010 +0100 @@ -49,13 +49,13 @@ sub silent_command($); my %optmap = ( 'test-drop-name' => \$test_drop_name, - 'host-name' => \$host_name, - 'build-id' => \$build_id, - 'src' => \$srcfile, - 'dest' => \$destfile, + 'host-name' => \$host_name, + 'build-id' => \$build_id, + 'src' => \$srcfile, + 'dest' => \$destfile, 'help' => \$help, 'publish' => \$publish, - 'bld-drive' => \$bld_drive, + 'bld-drive' => \$bld_drive, 'test-target' => \$test_target, 'image-path' => \$image_path); @@ -67,7 +67,7 @@ 'dest=s', 'help!', 'publish=s', - 'bld-drive=s', + 'bld-drive=s', 'test-target=s', 'image-path=s') or usage_error(); @@ -132,7 +132,7 @@ # Parse the input XML into hashref. my $test_drop = XMLin("./$xml_in", keeproot => 1, - forcearray => [ 'name', 'id','owner','priority','buildid','postAction','type','target','device', 'property', 'command', 'param','plan'],# + forcearray => [ 'name', 'id', 'owner', 'priority', 'buildid', 'postAction', 'type', 'target', 'device', 'property', 'command', 'param', 'plan'],# keyattr => [] ); # Insert the specified test drop name, if any. @@ -140,17 +140,17 @@ # Insert the specified build id, if any. $test_drop->{'test'}->{'buildid'}->[0] = $build_id, if $build_id; # Insert the path to the ROM image -if $image_path { +if ($image_path) { + $test_drop->{'test'}->{'plan'}->[0]->{'flash'}->[0]; my $flash_params = $test_drop->{'test'}->{'plan'}->[0]->{'flash'}; - $flash_params->[1] = { 'target-alias' => $test_target, 'images' => $image_path }; - } - + $flash_params->[0] = { 'target-alias' => $test_target, 'images' => $image_path }; +} # Insert the FileStoreAction parameter my $postaction_params = $test_drop->{'test'}->{'postAction'}->[0]->{'params'}->{'param'}, if $publish; $postaction_params->[1] = { 'name' => "to-folder", 'value' => $publish }, if $publish; -if ($host_name and (lc($test_target) ne "winscw") { # Also insert specified host name if target is WINSCW +if ($host_name) { # Also insert specified host name my $devices = $test_drop->{'test'}->{'target'}->[0]->{'device'}; foreach my $device (@{$devices}) {