return $string;
}
-print "OS: ".$OS."\n";
-
# 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}:.";
-
+my $tesh_file;
##
## Command line option handling
# option handling helper subs
sub cd_cmd {
my $directory=$_[1];
+ my $failure=1;
if (-e $directory && -d $directory) {
chdir("$directory");
print "[Tesh/INFO] change directory to $directory\n";
+ $failure=0;
} elsif (-e $directory) {
- die "[Tesh/CRITICAL] Cannot change directory to '$directory': it is not a directory\n";
+ print "Cannot change directory to '$directory': it is not a directory\n";
} else {
- die "[Tesh/CRITICAL] Cannot change directory to '$directory': no such directory\n";
+ print "Chdir to $directory failed: No such file or directory\n";
+ }
+ if($failure==1){
+ print "Test suite `$tesh_file': NOK (system error)\n";
+ exit 4;
}
}
}
# Main option parsing sub
-my $tesh_file;
+
sub get_options {
# remove the tesh file from the ARGV used
my @ARGV = @_;
my @verbose = ();
my @cfg;
my $log; # ignored
+ my $enable_coverage;
my %opt = (
"help" => 0,
'setenv=s' => \&setenv_cmd,
'cfg=s' => \@cfg,
'log=s' => \$log,
+ 'enable-coverage+' => \$enable_coverage,
);
+ if($enable_coverage){
+ print "Enable coverage\n";
+ }
+
+ unless($tesh_file=~/\.tesh/){
+ $tesh_file="(stdin)";
+ print "Test suite from stdin\n";
+ }
+
$opt{'verbose'} = scalar @verbose;
foreach (@cfg) {
$opt{'cfg'} .= " --cfg=$_";
###
# exec the command line
###
- $pid = open3(\*IN, \*OUT, \*OUT, $cmd{'cmd'} );
+ $pid = open3(\*CHILD_IN, \*OUT, \*OUT, $cmd{'cmd'} );
+
+ # push all provided input to executing child
+ map { print CHILD_IN "$_\n" } @{$cmd{'in'}};
+ close CHILD_IN;
# if timeout specified, fork and kill executing child at the end of timeout
if ($timeout){
}
}
- # push all provided input to executing child
- map { print IN "$_\n" } $cmd{'in'};
- close IN;
# pop all output from executing child
my @got;
}
# parse tesh file
-print "Test suite $tesh_file\n";
-open TESH_FILE, $tesh_file or die "[Tesh/CRITICAL] Unable to open $tesh_file $!\n";
-
+#my $teshfile=$tesh_file;
+#$teshfile=~ s{\.[^.]+$}{};
+#print "Test suite `$teshfile'\n";
+unless($tesh_file eq "(stdin)"){
+ open TESH_FILE, $tesh_file or die "[Tesh/CRITICAL] Unable to open $tesh_file $!\n";
+}
my %cmd; # everything about the next command to run
my $line_num=0;
-LINE: while (defined(my $line=<TESH_FILE>)) {
+LINE: while (defined(my $line=<TESH_FILE>) or defined(my $line=<>)) {
$line_num++;
chomp $line;
print "[TESH/debug] $line_num: $line\n" if $opts{'debug'};
}
}
+
+
# Deal with last command
if (defined($cmd{'cmd'})) {
exec_cmd(\%cmd);
%cmd = ();
}
+if($tesh_file eq "(stdin)"){
+ print "Test suite from stdin OK\n";
+}
+
#my (@a,@b);
#push @a,"bl1"; push @b,"bl1";
#push @a,"bl2"; push @b,"bl2";