install java from the simgrid-java, not make project

[simgrid.git] / buildtools / Cmake / tesh.pl

diff --git a/buildtools/Cmake/tesh.pl b/buildtools/Cmake/tesh.pl
index bd20f0c..d4e4c99 100644 (file)
--- a/buildtools/Cmake/tesh.pl
+++ b/buildtools/Cmake/tesh.pl
@@ -10,6 +10,7 @@ my($execline);
 my($ok)=0;\r
 chdir("$directory");\r
 print "Change directory to \"$directory\"\n";\r
+\r
 open SH_LIGNE, $file or die "Unable to open $file. $!\n";\r
 \r
 while(defined($line1=<SH_LIGNE>))\r
@@ -19,7 +20,7 @@ while(defined($line1=<SH_LIGNE>))
                        $line1 =~ s/\$\{srcdir\:\=\.\}/./g;\r
                        $line1 =~ s/\$SG_TEST_EXENV//g;\r
                        $line1 =~ s/\$SG_EXENV_TEST//g;\r
-                       $line1 =~ s/\$EXEEXT/.exe/g;\r
+                       $line1 =~ s/\$EXEEXT//g;\r
                        $line1 =~ s/\${EXEEXT:=}//g;\r
                        $line1 =~ s/^\$\ *//g;\r
                        $line1 =~ s/^.\/lua/lua/g;\r
@@ -39,10 +40,25 @@ while(defined($line1=<SH_LIGNE>))
                        $line1 =~ s/\r//g;\r
                        chomp $line1;\r
                        \r
-                       if($line1 =~ /^.*\[.*\].*\[.*\/INFO\].*$/){if(!defined($line2=<FILE_ERR>)){die;}}elsif($line1 =~ /^.*\[.*\].*\[.*\/WARNING\].*$/){if(!defined($line2=<FILE_ERR>)){die;}}\r
-                       elsif($line1 =~ /^.*\[.*\].*\[.*\/CRITICAL\].*$/){if(!defined($line2=<FILE_ERR>)){die;}}\r
-                       elsif($line1 =~ /^.*\[.*\].*\[.*\/DEBUG\].*$/){if(!defined($line2=<FILE_ERR>)){die;}}\r
-                       else{if(!defined($line2=<FILE>)){die;}}\r
+                       if($line1 =~ /^.*\[.*\].*\[.*\/INFO\].*$/)\r
+                               {if(!defined($line2=<FILE_ERR>))\r
+                                       {       print "- $line1\n";\r
+                                               die;}}\r
+                       elsif($line1 =~ /^.*\[.*\].*\[.*\/WARNING\].*$/)\r
+                               {if(!defined($line2=<FILE_ERR>))\r
+                                       {       print "- $line1\n";\r
+                                               die;}}\r
+                       elsif($line1 =~ /^.*\[.*\].*\[.*\/CRITICAL\].*$/)\r
+                               {if(!defined($line2=<FILE_ERR>))\r
+                                       {       print "- $line1\n";\r
+                                               die;}}\r
+                       elsif($line1 =~ /^.*\[.*\].*\[.*\/DEBUG\].*$/)\r
+                               {if(!defined($line2=<FILE_ERR>))\r
+                                       {       print "- $line1\n";\r
+                                               die;}}\r
+                       else{if(!defined($line2=<FILE>))\r
+                                       {       print "- $line1\n";\r
+                                               die;}}\r
                        \r
                        $line2 =~ s/\r//g;                                                      \r
                        chomp $line2;\r