X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/c2ae0672c24f56b98d90669258562546f382e62b..0e4c1ba4f9c048eeded4100ca48716a4378a4870:/buildtools/Cmake/Scripts/tesh.pl diff --git a/buildtools/Cmake/Scripts/tesh.pl b/buildtools/Cmake/Scripts/tesh.pl index c4d9722165..f9f54d6608 100755 --- a/buildtools/Cmake/Scripts/tesh.pl +++ b/buildtools/Cmake/Scripts/tesh.pl @@ -24,6 +24,7 @@ my $tesh_file; my $tesh_name; my $error=0; my $exitcode=0; +my @bg_cmds; $path =~ s|[^/]*$||; push @INC,$path; @@ -32,26 +33,16 @@ use Getopt::Long qw(GetOptions); use strict; use Term::ANSIColor; use IPC::Open3; +use IO::File; if($^O eq "linux"){ $OS = "UNIX"; } else{ $OS = "WIN"; + $ENV{"PRINTF_EXPONENT_DIGITS"} = "2"; } - -sub trim($) -{ - my $string = shift; - $string =~ s/^\s+//; - $string =~ s/\s+$//; - return $string; -} - -# make sure we received a tesh file -scalar @ARGV > 0 || die "Usage:\n tesh [*options*] *tesh_file*\n"; - #Add current directory to path $ENV{PATH} = "$ENV{PATH}:."; @@ -186,16 +177,17 @@ my(@buffer_tesh)=(); sub exit_status { my $status = shift; if (POSIX::WIFEXITED($status)) { + $exitcode=POSIX::WEXITSTATUS($status)+40; return "returned code ".POSIX::WEXITSTATUS($status); } elsif (POSIX::WIFSIGNALED($status)) { - my $code; - if (POSIX::WTERMSIG($status) == SIGINT){$code="SIGINT"; } - elsif (POSIX::WTERMSIG($status) == SIGTERM) {$code="SIGTERM"; } - elsif (POSIX::WTERMSIG($status) == SIGKILL) {$code= "SIGKILL"; } - elsif (POSIX::WTERMSIG($status) == SIGABRT) {$code="SIGABRT"; } - elsif (POSIX::WTERMSIG($status) == SIGSEGV) {$code="SIGSEGV" ;} - $exitcode=POSIX::WTERMSIG($status)+4; - return "got signal $code"; + my $code; + if (POSIX::WTERMSIG($status) == SIGINT){$code="SIGINT"; } + elsif (POSIX::WTERMSIG($status) == SIGTERM) {$code="SIGTERM"; } + elsif (POSIX::WTERMSIG($status) == SIGKILL) {$code= "SIGKILL"; } + elsif (POSIX::WTERMSIG($status) == SIGABRT) {$code="SIGABRT"; } + elsif (POSIX::WTERMSIG($status) == SIGSEGV) {$code="SIGSEGV" ;} + $exitcode=POSIX::WTERMSIG($status)+4; + return "got signal $code"; } return "Unparsable status. Is the process stopped?"; } @@ -243,11 +235,15 @@ sub exec_cmd { ### # exec the command line - ### - $pid = open3(\*CHILD_IN, \*OUT, \*OUT, $cmd{'cmd'} ); + ### $line =~ s/\r//g; + + $cmd{'got'} = IO::File->new_tmpfile; + $cmd{'got'}->autoflush(1); + local *E = $cmd{'got'}; + $cmd{'pid'} = open3(\*CHILD_IN, ">&E", ">&E", $cmd{'cmd'} ); # push all provided input to executing child - map { print CHILD_IN "$_\n" } @{$cmd{'in'}}; + map { print CHILD_IN "$_\n"; } @{$cmd{'in'}}; close CHILD_IN; # if timeout specified, fork and kill executing child at the end of timeout @@ -258,27 +254,55 @@ sub exec_cmd { die "fork() failed: $!" unless defined $forked; if ( $forked == 0 ) { # child sleep $time_to_wait; - kill(9, $pid); + kill(SIGKILL, $cmd{'pid'}); exit $time_to_wait; } } + + # Cleanup the executing child, and kill the timeouter brother on need + $cmd{'return'} = 0 unless defined($cmd{'return'}); + if($cmd{'background'} != 1){ + waitpid ($cmd{'pid'}, 0); + $cmd{'gotret'} = exit_status($?); + parse_out(\%cmd); + }else{ + # & commands, which will be handled at the end + push @bg_cmds, \%cmd; + # no timeout for background commands + if($forked){ + kill(SIGKILL, $forked); + $timeout=0; + $forked=0; + } + } +} + + +sub parse_out { + my %cmd = %{$_[0]}; + my $gotret=$cmd{'gotret'}; + + my $wantret; + + if(defined($cmd{'expect'}) and ($cmd{'expect'} ne "")){ + $wantret = "got signal $cmd{'expect'}"; + }else{ + $wantret = "returned code ".(defined($cmd{'return'})? $cmd{'return'} : 0); + } + local *got = $cmd{'got'}; + seek(got,0,0); # pop all output from executing child my @got; - while(defined(my $got=)) { + while(defined(my $got=)) { $got =~ s/\r//g; - $got =~ s/^( )*//g; chomp $got; - $got=trim($got); - if( $got ne ""){ - if (!($enable_coverage and $got=~ /^profiling:/)){ - push @got, "$got"; - } - } + if (!($enable_coverage and $got=~ /^profiling:/)){ + push @got, $got; + } } - close OUT; - + if ($cmd{'sort'}){ sub mysort{ $a cmp $b @@ -290,19 +314,7 @@ sub exec_cmd { @{$cmd{'out'}}=sort mysort @{$cmd{'out'}}; } } - - # Cleanup the executing child, and kill the timeouter brother on need - $cmd{'return'} = 0 unless defined($cmd{'return'}); - my $wantret; - if(defined($cmd{'expect'}) and ($cmd{'expect'} ne "")){ - $wantret = "got signal $cmd{'expect'}"; - }else{ - $wantret = "returned code ".(defined($cmd{'return'})? $cmd{'return'} : 0); - $exitcode= 41; - } - my $gotret; - waitpid ($pid, 0); - $gotret = exit_status($?); + #Did we timeout ? If yes, handle it. If not, kill the forked process. if($timeout==-1 and $gotret eq "got signal SIGKILL"){ @@ -358,7 +370,6 @@ sub mkfile_cmd { my $file = $cmd{'arg'}; print "[Tesh/INFO] mkfile $file\n"; - die "[TESH/CRITICAL] no input provided to mkfile\n" unless defined($cmd{'in'}) && scalar @{$cmd{'in'}}; unlink($file); open(FILE,">$file") or die "[Tesh/CRITICAL] Unable to create file $file: $!\n"; print FILE join("\n", @{$cmd{'in'}}); @@ -392,9 +403,7 @@ LINE: while (not $finished and not $error) { $line_num++; chomp $line; - if($line!=~/\s/){ - next LINE; - } + $line =~ s/\r//g; print "[TESH/debug] $line_num: $line\n" if $opts{'debug'}; my $next; # deal with line continuations @@ -409,8 +418,8 @@ LINE: while (not $finished and not $error) { } # Push delayed commands on empty lines - unless ($line =~ m/^(.)\s*(.*)$/) { - if (defined($cmd{'cmd'})) { + unless ($line =~ m/^(.)(.*)$/) { + if (defined($cmd{'cmd'})) { exec_cmd(\%cmd); %cmd = (); } @@ -418,16 +427,14 @@ LINE: while (not $finished and not $error) { } my ($cmd,$arg) = ($1,$2); + $arg =~ s/^ //g; $arg =~ s/\r//g; $arg =~ s/\\\\/\\/g; # handle the commands if ($cmd =~ /^#/) { #comment } elsif ($cmd eq '>'){ #expected result line print "[TESH/debug] push expected result\n" if $opts{'debug'}; - $arg=trim($arg); - if($arg ne ""){ push @{$cmd{'out'}}, $arg; - } } elsif ($cmd eq '<') { # provided input print "[TESH/debug] push provided input\n" if $opts{'debug'}; @@ -489,11 +496,12 @@ LINE: while (not $finished and not $error) { } $cmd{'output ignore'} = 1; } - elsif($line =~ /^!\s*expect signal (\w*)$/) {#expect signal SIGABRT + elsif($line =~ /^!\s*expect signal (\w*)/) {#expect signal SIGABRT if (defined($cmd{'cmd'})) { exec_cmd(\%cmd); %cmd = (); } +print "hey\n"; $cmd{'expect'} = "$1"; } elsif($line =~ /^!\s*expect return/){ #expect return @@ -534,6 +542,11 @@ LINE: while (not $finished and not $error) { } else { die "[TESH/CRITICAL] parse error: $line\n"; } + if($forked){ + kill(SIGKILL, $forked); + $timeout=0; + } + } @@ -546,10 +559,20 @@ if (defined($cmd{'cmd'})) { if($forked){ - kill(9, $forked); + kill(SIGKILL, $forked); $timeout=0; } +foreach(@bg_cmds){ + my %test=%{$_}; + waitpid ($test{'pid'}, 0); + $test{'gotret'} = exit_status($?); + parse_out(\%test); +} + +@bg_cmds=(); + + if($error !=0){ exit $exitcode; }elsif($tesh_file eq "(stdin)"){