Changeset 37284

Timestamp:

Aug 21, 2014, 7:28:09 PM (12 years ago)

Author:

eugene

Message:

sc_prepare_run works for chip

Location:

tags/ipp-pv3-20140717/ippScripts

Files:

• Build.PL (modified) (1 diff)
• scripts/sc_prepare_run.pl (modified) (9 diffs)

tags/ipp-pv3-20140717/ippScripts/Build.PL

@@ -141 +141 @@
         scripts/sc_prepare_stack.pl
         scripts/sc_prepare_warp.pl
+        scripts/sc_prepare_run.pl
         scripts/sc_remote_exec.pl
         scripts/sc_retry_return.pl

tags/ipp-pv3-20140717/ippScripts/scripts/sc_prepare_run.pl

@@ -78 +78 @@
 
     my ( $success, $error_code, $full_buf, $stdout_buf, $stderr_buf ) =
-        run(command => $command, verbose => $verbose);
+        run(command => $command, verbose => $verbose);
     unless ($success) {
-        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
-        
-        &my_die("Unable to run chiptool to determine stage parameters.", $remote_id, $error_code);
+        $error_code = (($error_code >> 8) or $PS_EXIT_PROG_ERROR);
+
+        &my_die("Unable to run chiptool to determine stage parameters.", $remote_id, $error_code);
     }
     my $MDlist = $mdcParser->parse(join "", @$stdout_buf) or
-        &my_die("Unable to determine component information.", $remote_id,$PS_EXIT_PROG_ERROR);
+        &my_die("Unable to determine component information.", $remote_id,$PS_EXIT_PROG_ERROR);
     $compData = parse_md_list($MDlist);
 }
@@ -104 +104 @@
 my $disk_return  = $ipprc->file_resolve($uri_return,1);
 
-my (undef, $remote_config) = uri_convert($uri_config); # Needs to be done after we've created it. 
+my %have_transfer = ();
+my %have_check    = ();
+my %have_config   = ();
+my %have_generate = ();
+my %have_return   = ();
+
+my (undef, $remote_config) = uri_convert($uri_config); # Needs to be done after we've created it.
 
 open(TRANSFER, ">$disk_transfer")  || &my_die("Couldn't open file? $disk_transfer",$chip_id,$PS_EXIT_SYS_ERROR);
@@ -125 +131 @@
     open(INPUT, "$disk_transfer");
     while ($line = <INPUT>) {
-        print TRANSFER $line;
+        unless ($have_transfer{$line}) {
+            $have_transfer{$line} = 1;
+            print TRANSFER $line;
+        }
     }
     close (INPUT);
@@ -133 +142 @@
     open(INPUT, "$disk_check");
     while ($line = <INPUT>) {
-        print CHECK $line;
+        unless ($have_check{$line}) {
+            $have_check{$line} = 1;
+            print CHECK $line;
+        }
     }
     close (INPUT);
@@ -141 +153 @@
     open(INPUT, "$disk_config");
     while ($line = <INPUT>) {
-        print CONFIG $line;
+        unless ($have_config{$line}) {
+            $have_config{$line} = 1;
+            print CONFIG $line;
+        }
     }
     close (INPUT);
@@ -149 +164 @@
     open(INPUT, "$disk_generate");
     while ($line = <INPUT>) {
-        print GENERATE $line;
+        unless ($have_generate{$line}) {
+            $have_generate{$line} = 1;
+            print GENERATE $line;
+        }
     }
     close (INPUT);
@@ -157 +175 @@
     open(INPUT, "$disk_return");
     while ($line = <INPUT>) {
-        print RETURN $line;
+        unless ($have_return{$line}) {
+            $have_return{$line} = 1;
+            print RETURN $line;
+        }
     }
     close (INPUT);
@@ -223 +244 @@
     my $ipp_disk= $ipprc->file_resolve( $neb_uri );
     my $remote_disk = $ipp_disk;
-    
+
     unless(defined($ipp_disk)) {
-        my_die();
+        my_die();
     }
 
@@ -244 +265 @@
 
     carp($msg);
-    
+
     if (defined $id and not $no_update) {
-        my $command = "remotetool -updaterun -remote_id $id";
-        $command .= " -fault $exit_code " if defined $exit_code;
-        $command .= " -set_state $exit_state " if defined $exit_state;
-        $command .= " -dbname $dbname " if defined $dbname;
-
-        system($command);
+        my $command = "remotetool -updaterun -remote_id $id";
+        $command .= " -fault $exit_code " if defined $exit_code;
+        $command .= " -set_state $exit_state " if defined $exit_state;
+        $command .= " -dbname $dbname " if defined $dbname;
+
+        system($command);
     }