diff --git a/autoTest.pl b/autoTest.pl index 2f4912b..9527148 100755 --- a/autoTest.pl +++ b/autoTest.pl @@ -355,13 +355,11 @@ $data{'vb'}{'interp0'} = "mono"; $data{'vb'}{'interp1'} = "mint"; $data{'vb'}{'osfilter'} = "FreeBSD"; -sub checkValid -{ +sub checkValid { print "Checking outputed results for validity...\n"; local(@res) = `wc primes.*.txt`; local($i); - for($i=0; $i < $#res; $i++) - { + for($i=0; $i < $#res; $i++) { $arr[$i][0] = `echo \"$res[$i]\" | awk '{print \$2}'`; chomp($arr[$i][0]); chomp($arr[$i][0]); @@ -372,8 +370,7 @@ sub checkValid # scan all others for differencees, for each match add 1 to [i][2] $pt = 0; - for($i=0; $i<=$#arr; $i++) - { + for($i=0; $i<=$#arr; $i++) { $arr[$i][2] = 0; for($p=0; $p <= $#arr; $p++) { @@ -385,8 +382,7 @@ sub checkValid print "Checked ". ($#arr+1)." ouput files of $execd executed languages for validity:\n"; - if($pt != $#arr ) - { + if($pt != $#arr ) { print "Differences detected in ".(($#arr+1)-($pt+1)) ." output files:\n"; for($i=0; $i<= $#arr; $i++) { @@ -401,13 +397,11 @@ sub checkValid } -sub parseTimes -{ +sub parseTimes { if($debug) { print "\n$cmd\n"; } - for($i=0; $i< $itr; $i++) - { + for($i=0; $i< $itr; $i++) { if($rcmd ne "") { `$rcmd`; } my $tstr = `$cmd`; print "."; @@ -415,8 +409,7 @@ sub parseTimes /[^\d]*(\d*\.\d*)[^\d]*(\d*\.\d*)[^\d]*(\d*\.\d*).*/; } my $tr = $tu = $ts =0.0; - for($i=0; $i< $itr; $i++) - { + for($i=0; $i< $itr; $i++) { $tr += $tm[$i][0]; $tu += $tm[$i][1]; $ts += $tm[$i][2]; @@ -434,8 +427,7 @@ sub parseTimes print results "$tr seconds\n"; } -sub getByLocate -{ +sub getByLocate { local($where) = `locate $_[0] | grep bin | grep -v cgi | grep -v port | grep -v src`; ($where) = $where =~ /(.*\/$_[0])\n.*$/; #print "WHERE: '$where'\n"; @@ -443,15 +435,16 @@ sub getByLocate } -sub getInterp -{ +sub getInterp { local($where) = `/usr/bin/whereis $_[0] | grep -v port`; if(! ($where =~ "\:")) { - if($where eq "") { return getByLocate($_[0]); } - else { return "/usr/bin/env $_[0]"; + if($where eq "") { + return getByLocate($_[0]); + } + else { + return "/usr/bin/env $_[0]"; } - } else - { + } else { local($t1, $t2) = split(":", $where); chomp($t2); if($t2 ne "") { @@ -480,8 +473,7 @@ $yesall = 0; $item = 0; $execd = 0; $compiler=""; -foreach $l (@langs) -{ +foreach $l (@langs) { $item++; $interpB = 0; $compiler = ""; @@ -494,7 +486,7 @@ foreach $l (@langs) $data{$l}{'warn'} = $data{$l}{'oswarnmsg'}; } - if($yesall == 0 || $data{$l}{'reprompt'}){ + if($yesall == 0 || $data{$l}{'reprompt'}) { print "($item/$llen) Run ".$data{$l}{"name"}." test\n"; if($data{$l}{'warn'} && !$data{$l}{"reprompt"}) { print "WARNING: $data{$l}{'warn'}\n";} @@ -512,12 +504,10 @@ foreach $l (@langs) $query = ; $query = substr($query,0,1); } - if($query eq "a" || $query eq "A") - { + if($query eq "a" || $query eq "A") { $yesall = 1; } - if(($yesall == 1 && !$data{$l}{'reprompt'}) || $query eq "y" || $query eq "Y" ) - { + if(($yesall == 1 && !$data{$l}{'reprompt'}) || $query eq "y" || $query eq "Y" ) { if($yesall == 1) { if($query eq "n" || $query eq "N") { $query = "y";} } @@ -534,16 +524,14 @@ foreach $l (@langs) print results "($item/$llen) ". $data{$l}{"name"}." results:\n"; - if( $data{$l}{'osfilter'} and $os =~ $data{$l}{'osfilter'}) - { + if( $data{$l}{'osfilter'} and $os =~ $data{$l}{'osfilter'}) { print "ERROR: This language is flagged as incompatible with this operating system\n\n"; print results "ERROR: This language is flagged as incompatible with this operating system\n\n"; next; } $cmd=""; - if( $data{$l}{"compiler0"}) - { + if( $data{$l}{"compiler0"}) { print "Compiling"; print results "Compile"; if($l ne "java" && $l ne "m3") {$rcmd = "rm -f $data{$l}{'prog'}";} @@ -597,8 +585,7 @@ foreach $l (@langs) if( $gcc_code) { $cmd .= " ".$data{$l}{"src"}." "; } - if( $data{$l}{"cflags$cp"} ) - { + if( $data{$l}{"cflags$cp"} ) { $cmd .= $data{$l}{"cflags$cp"}; } if ( ! $gcc_code) { @@ -614,8 +601,7 @@ foreach $l (@langs) } - if($interpB && $data{$l}{'warnB'}) - { + if($interpB && $data{$l}{'warnB'}) { print "WARNING: ".$data{$l}{'warnB'}."\n"; } @@ -627,8 +613,7 @@ foreach $l (@langs) $cmd = "bash "; if(!$debug) { $cmd .= "2>&1 "; } $cmd .= "-c \"". $TIME . " bash -c \\\""; - if( $data{$l}{"interp0"} or $interpB) - { + if( $data{$l}{"interp0"} or $interpB) { $ip=0; if(! $data{$l}{'interp'}) { $data{$l}{'interp'} = 1; @@ -643,24 +628,19 @@ foreach $l (@langs) } } else { - for(; $ip < $data{$l}{'interp'}; $ip++) - { - + for(; $ip < $data{$l}{'interp'}; $ip++) { $interp = getInterp($data{$l}{"interp$ip"}); last if($interp ne ""); } } - if($ip == $data{$l}{'interp'}) - { + if($ip == $data{$l}{'interp'}) { $ilist = ""; if($interpB) { $ilist = "\t".$data{$l}{'interpB'}."\n"; - } else - { - for($p=0;$p<$data{$l}{'interp'};$p++) - { + } else { + for($p=0;$p<$data{$l}{'interp'};$p++) { $ilist .= "\t\t\t($p) " .$data{$l}{"interp$p"}."\n"; } } @@ -677,38 +657,34 @@ foreach $l (@langs) $cmd .= $data{$l}{"pre$ip"}; $cmd .= $data{$l}{"iflagspre$ip"}; $cmd .= "$interp "; - if(!$data{$l}{'noarg'}) - { - if( $data{$l}{"iflags$ip"}) - { - $cmd .= $data{$l}{"iflags$ip"}. " "; - } elsif( $data{$l}{"prog"} ) - { - $cmd .= $data{$l}{"prog"}." $max "; - } else - { - if($data{$l}{"versionfinder"}) { - $version = `$data{$l}{"versionfinder"}`; - chomp($version); - $data{$l}{'src'} =~ s/#VERSION#/$version/; - } - if($version) { - if($data{$l}{"iflagspre$version"}) - { - $cmd = $data{$l}{"iflagspre$version"} . $cmd; - } - } - $cmd .= $data{$l}{"src"}. " "; - $cmd .= "$max "; + if(!$data{$l}{'noarg'}) { + if( $data{$l}{"iflags$ip"}) { + $cmd .= $data{$l}{"iflags$ip"}. " "; + } elsif( $data{$l}{"prog"} ) { + $cmd .= $data{$l}{"prog"}." $max "; + } else { + if($data{$l}{"versionfinder"}) { + $version = `$data{$l}{"versionfinder"}`; + chomp($version); + $data{$l}{'src'} =~ s/#VERSION#/$version/; + } + if($version) { + if($data{$l}{"iflagspre$version"}) { + $cmd = $data{$l}{"iflagspre$version"} . $cmd; + } + } + $cmd .= $data{$l}{"src"}. " "; + $cmd .= "$max "; + } } - } - } else - { + } else { if($data{$l}{'pre'}) { $cmd .= $data{$l}{'pre'};} $cmd .= "./" . $data{$l}{"prog"} . " $max"; $filter = $data{$l}{"filter$cp"}; } - if($filter) { $cmd .= " | $filter "; } + if($filter) { + $cmd .= " | $filter "; + } $cmd .= " > primes.$l.txt"; $cmd .= "\\\"\""; print " "; @@ -720,9 +696,7 @@ foreach $l (@langs) print results "\n"; sleep 1; $execd++; - } - elsif( $query eq "q" || $query eq "Q") - { + } elsif( $query eq "q" || $query eq "Q") { print "\n"; checkValid(); print "Quiting\n";