From bd0d32d80b6162bd2888f98fe0cb1c9beaf9f6f7 Mon Sep 17 00:00:00 2001
From: navarrop <navarrop@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Mon, 6 Dec 2010 09:37:58 +0000
Subject: [PATCH] Change way to make tesh for win32.

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@9001 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---
 buildtools/Cmake/AddTests.cmake       |  5 ++--
 buildtools/Cmake/DefinePackages.cmake |  1 +
 buildtools/Cmake/Distrib.cmake        | 15 +++---------
 buildtools/Cmake/MakeExeLib.cmake     | 11 ++++++++-
 buildtools/Cmake/tesh.pl              | 35 +++++++++++++++++++++------
 5 files changed, 45 insertions(+), 22 deletions(-)
 mode change 100644 => 100755 buildtools/Cmake/tesh.pl

diff --git a/buildtools/Cmake/AddTests.cmake b/buildtools/Cmake/AddTests.cmake
index 4f8d0e98a5..e86703772c 100644
--- a/buildtools/Cmake/AddTests.cmake
+++ b/buildtools/Cmake/AddTests.cmake
@@ -1,13 +1,14 @@
+
 if(enable_memcheck)
 include(FindValgrind)
 endif(enable_memcheck)
 
-if(enable_smpi)
+if(enable_smpi AND NOT WIN32)
 	exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpicc" OUTPUT_VARIABLE "OKITOKI")
 	exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpif2c" OUTPUT_VARIABLE "OKITOKI")
 	exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpiff" OUTPUT_VARIABLE "OKITOKI")
 	exec_program("chmod a=rwx ${CMAKE_BINARY_DIR}/bin/smpirun" OUTPUT_VARIABLE "OKITOKI")
-endif(enable_smpi)
+endif(enable_smpi AND NOT WIN32)
 
 ### For code coverage
 ### Set some variables
diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake
index 132869db1f..7936f935e1 100644
--- a/buildtools/Cmake/DefinePackages.cmake
+++ b/buildtools/Cmake/DefinePackages.cmake
@@ -800,6 +800,7 @@ set(bin_files
 tools/MSG_visualization/colorize.pl
 tools/sg_unit_extractor.pl
 tools/simgrid_update_xml.pl
+buildtools/Cmake/tesh.pl
 )
 
 # This is the complete lise of what will be added to the source archive
diff --git a/buildtools/Cmake/Distrib.cmake b/buildtools/Cmake/Distrib.cmake
index 41b88fd142..e213f97d00 100644
--- a/buildtools/Cmake/Distrib.cmake
+++ b/buildtools/Cmake/Distrib.cmake
@@ -20,17 +20,10 @@ install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/smpicc
                  ${CMAKE_BINARY_DIR}/bin/smpiff
                  ${CMAKE_BINARY_DIR}/bin/smpirun
 		DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/)
-if(WIN32)
-	install(PROGRAMS ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl
-	DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/
-	RENAME tesh)
-	add_custom_target(tesh
-	COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_BINARY_DIR}/bin/tesh
-	)
-else(WIN32)
-	install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/tesh
-	DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/)
-endif(WIN32)  
+
+install(PROGRAMS ${CMAKE_BINARY_DIR}/bin/tesh
+DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/)
+
 	
 install(PROGRAMS ${CMAKE_HOME_DIRECTORY}/tools/MSG_visualization/colorize.pl
         DESTINATION $ENV{DESTDIR}${CMAKE_INSTALL_PREFIX}/bin/
diff --git a/buildtools/Cmake/MakeExeLib.cmake b/buildtools/Cmake/MakeExeLib.cmake
index 2e6d0cea00..12e431e1c5 100644
--- a/buildtools/Cmake/MakeExeLib.cmake
+++ b/buildtools/Cmake/MakeExeLib.cmake
@@ -164,7 +164,16 @@ endif(enable_lib_static)
 ### Load all files declaring binaries (tools, examples and tests) #
 ###################################################################
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/gras)
-add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/tesh)
+
+if(WIN32)
+	add_custom_target(tesh ALL
+	DEPENDS ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl
+	COMMENT "Install ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl"
+	COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/tesh.pl ${CMAKE_BINARY_DIR}/bin/tesh
+	)
+else(WIN32)
+	add_subdirectory(${CMAKE_HOME_DIRECTORY}/tools/tesh)
+endif(WIN32)
 
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/xbt)
 add_subdirectory(${CMAKE_HOME_DIRECTORY}/testsuite/surf)
diff --git a/buildtools/Cmake/tesh.pl b/buildtools/Cmake/tesh.pl
old mode 100644
new mode 100755
index d4e4c99555..a1ec8afc8f
--- a/buildtools/Cmake/tesh.pl
+++ b/buildtools/Cmake/tesh.pl
@@ -1,16 +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>))
@@ -25,6 +35,8 @@ while(defined($line1=<SH_LIGNE>))
 			$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";
@@ -56,10 +68,17 @@ while(defined($line1=<SH_LIGNE>))
 				{if(!defined($line2=<FILE_ERR>))
 					{	print "- $line1\n";
 						die;}}
-			else{if(!defined($line2=<FILE>))
+			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;
 			
-- 
2.20.1