From: Augustin Degomme <degomme@idpann.imag.fr>
Date: Thu, 10 Oct 2013 15:17:35 +0000 (+0200)
Subject: chomp may not be enough in some cases + tell win that we want 2 digits only for exponents
X-Git-Tag: v3_9_90~17
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/818c1ddfc943e736729794a838d4753a335211b0?ds=sidebyside

chomp may not be enough in some cases + tell win that we want 2 digits only for exponents
---

diff --git a/buildtools/Cmake/Scripts/tesh.pl b/buildtools/Cmake/Scripts/tesh.pl
index 0cc491c8ce..07e609ee2f 100755
--- a/buildtools/Cmake/Scripts/tesh.pl
+++ b/buildtools/Cmake/Scripts/tesh.pl
@@ -38,6 +38,7 @@ if($^O eq "linux"){
 }
 else{
     $OS = "WIN";
+    $ENV{"PRINTF_EXPONENT_DIGITS"} = "2"; 
 }
 
 
@@ -243,7 +244,7 @@ sub exec_cmd {
 
   ###
   # exec the command line
-  ###
+  ###  $line =~ s/\r//g;
   $pid = open3(\*CHILD_IN, \*OUT, \*OUT, $cmd{'cmd'} );
 
   # push all provided input to executing child
@@ -392,6 +393,7 @@ LINE: while (not $finished and not $error) {
 
   $line_num++;
   chomp $line;
+  $line =~ s/\r//g;
   print "[TESH/debug] $line_num: $line\n" if $opts{'debug'};
   my $next;
   # deal with line continuations