X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f1be35ba7d6cb89619fe933cbd5bfdd10c611948..d41f59b57dbce6d6baed56b99dd89f2d160702ad:/buildtools/Cmake/tesh.pl

diff --git a/buildtools/Cmake/tesh.pl b/buildtools/Cmake/tesh.pl
old mode 100644
new mode 100755
index bd20f0cccc..a1ec8afc8f
--- a/buildtools/Cmake/tesh.pl
+++ b/buildtools/Cmake/tesh.pl
@@ -1,15 +1,26 @@
-#!perl -w
+#! /usr/bin/perl -w
+
 use strict;
 
-if($#ARGV!=1){die "Usage: perl tesh.pl <directory> <teshfile.tesh>\n";}
-my($directory)=$ARGV[0];
-my($file)=$ARGV[1];
+if($#ARGV!=2){die "Usage: tesh.pl --cd <directory> <teshfile.tesh>\n";}
 my($line1);
 my($line2);
 my($execline);
 my($ok)=0;
-chdir("$directory");
-print "Change directory to \"$directory\"\n";
+my($nb_arg)=0;
+
+do{
+	if($ARGV[$nb_arg] =~ /^--cd$/)
+	{
+		$nb_arg++;
+		my($directory)=$ARGV[$nb_arg];
+		chdir("$directory");
+		print "Change directory to \"$directory\"\n";	
+	}
+	$nb_arg++;
+}while(($nb_arg-1)!=$#ARGV);
+
+my($file)=$ARGV[$nb_arg-1];
 open SH_LIGNE, $file or die "Unable to open $file. $!\n";
 
 while(defined($line1=<SH_LIGNE>))
@@ -19,11 +30,13 @@ while(defined($line1=<SH_LIGNE>))
 			$line1 =~ s/\$\{srcdir\:\=\.\}/./g;
 			$line1 =~ s/\$SG_TEST_EXENV//g;
 			$line1 =~ s/\$SG_EXENV_TEST//g;
-			$line1 =~ s/\$EXEEXT/.exe/g;
+			$line1 =~ s/\$EXEEXT//g;
 			$line1 =~ s/\${EXEEXT:=}//g;
 			$line1 =~ s/^\$\ *//g;
 			$line1 =~ s/^.\/lua/lua/g;
 			$line1 =~ s/^.\/ruby/ruby/g;
+			
+			$line1 =~ s/\(%i:%P@%h\)/\\\(%i:%P@%h\\\)/g;
 			chomp $line1;
 			$execline = $line1;
 			print "$execline\n";
@@ -39,11 +52,33 @@ while(defined($line1=<SH_LIGNE>))
 			$line1 =~ s/\r//g;
 			chomp $line1;
 			
-			if($line1 =~ /^.*\[.*\].*\[.*\/INFO\].*$/){if(!defined($line2=<FILE_ERR>)){die;}}elsif($line1 =~ /^.*\[.*\].*\[.*\/WARNING\].*$/){if(!defined($line2=<FILE_ERR>)){die;}}
-			elsif($line1 =~ /^.*\[.*\].*\[.*\/CRITICAL\].*$/){if(!defined($line2=<FILE_ERR>)){die;}}
-			elsif($line1 =~ /^.*\[.*\].*\[.*\/DEBUG\].*$/){if(!defined($line2=<FILE_ERR>)){die;}}
-			else{if(!defined($line2=<FILE>)){die;}}
-			
+			if($line1 =~ /^.*\[.*\].*\[.*\/INFO\].*$/)
+				{if(!defined($line2=<FILE_ERR>))
+					{	print "- $line1\n";
+						die;}}
+			elsif($line1 =~ /^.*\[.*\].*\[.*\/WARNING\].*$/)
+				{if(!defined($line2=<FILE_ERR>))
+					{	print "- $line1\n";
+						die;}}
+			elsif($line1 =~ /^.*\[.*\].*\[.*\/CRITICAL\].*$/)
+				{if(!defined($line2=<FILE_ERR>))
+					{	print "- $line1\n";
+						die;}}
+			elsif($line1 =~ /^.*\[.*\].*\[.*\/DEBUG\].*$/)
+				{if(!defined($line2=<FILE_ERR>))
+					{	print "- $line1\n";
+						die;}}
+			elsif($line1 =~ /^.*\[.*\].*\[0\:\@\].*$/)
+				{if(!defined($line2=<FILE_ERR>))
+					{	print "- $line1\n";
+						die;}}
+			elsif($line1 =~ /^.*\[.*\].*\(0\:\@\).*$/)
+				{if(!defined($line2=<FILE_ERR>))
+					{	print "- $line1\n";
+						die;}}
+			else{if(!defined($line2=<FILE>))
+					{	print "- $line1\n";
+						die;}}		
 			$line2 =~ s/\r//g;							
 			chomp $line2;