From: cherierm <cherierm@48e7efb5-ca39-0410-a469-dd3cf9ba447f>
Date: Fri, 27 Jun 2008 14:05:39 +0000 (+0000)
Subject: Some change concerning the display of the summary
X-Git-Tag: v3.3~257
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/563955262ad3325677f1021c2bafd7c369585bf4

Some change concerning the display of the summary

git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5849 48e7efb5-ca39-0410-a469-dd3cf9ba447f
---

diff --git a/tools/tesh2/src/command.c b/tools/tesh2/src/command.c
index 958c0f4a7a..a820c74aca 100644
--- a/tools/tesh2/src/command.c
+++ b/tools/tesh2/src/command.c
@@ -1035,11 +1035,11 @@ command_summarize(command_t command)
 			
 			case csr_outputs_dont_match :
 			{
-				char *diff;
+				/*char *diff;*/
 				printf("          reason                      : ouputs don't match\n");
-				diff = xbt_str_diff(command->context->output->data,command->output->data);	  	
+				/*diff = xbt_str_diff(command->context->output->data,command->output->data);	  	
 				printf("          output diff :\n%s\n",diff);
-				free(diff);
+				free(diff);*/
 			}     
 
 			break;
diff --git a/tools/tesh2/src/fstream.c b/tools/tesh2/src/fstream.c
index f244865eb4..0a8ef5e60a 100644
--- a/tools/tesh2/src/fstream.c
+++ b/tools/tesh2/src/fstream.c
@@ -708,7 +708,7 @@ fstream_lex_line(fstream_t fstream, context_t context, xbt_os_mutex_t mutex, con
 			
 			if((p = strstr(line2 + 2, exp)))
 			{
-				if((p + strlen(variable->name) + 1)[0] != '\0')
+				if((p + strlen(variable->name) + 1)[0] != '\0' && !(isalpha((p + strlen(variable->name) + 1)[0])))
 					delimiters[0] = (p + strlen(variable->name) + 1)[0];
 
 				if(variable->val)
diff --git a/tools/tesh2/src/main.c b/tools/tesh2/src/main.c
index 58d7d7d47a..44293c85b5 100644
--- a/tools/tesh2/src/main.c
+++ b/tools/tesh2/src/main.c
@@ -613,7 +613,7 @@ finalize(void)
 
 	if(sig_int)
 		INFO0("Tesh interrupted (receive a SIGINT)");
-	else if(!summary_flag && !dry_run_flag && !silent_flag && !just_print_flag && !print_version_flag && !print_usage_flag && is_tesh_root)
+	else if(!summary_flag && !detail_summary_flag && !dry_run_flag && !silent_flag && !just_print_flag && !print_version_flag && !print_usage_flag && is_tesh_root)
 	{
 		if(!exit_code)
 			INFO2("Tesh terminated with exit code %d : %s",exit_code, "success");
diff --git a/tools/tesh2/src/runner.c b/tools/tesh2/src/runner.c
index 075c765970..79ccc0875f 100644
--- a/tools/tesh2/src/runner.c
+++ b/tools/tesh2/src/runner.c
@@ -674,11 +674,11 @@ runner_summarize(void)
 		{
 			FileTimeToSystemTime(&user_time, &si);
 			
-			printf("         Total tesh user time used:       %uhour(s) %uminute(s) %usecond(s) %millisecond(s)\n", si.wHour, si.wMinute, si.wSecond, si.wMilliseconds );
+			printf(" User time used:   %2u Hour(s) %2u Minute(s) %2u Second(s) %3u Millisecond(s)\n", si.wHour, si.wMinute, si.wSecond, si.wMilliseconds );
 			
 			FileTimeToSystemTime(&kernel_time, &si);
 			
-			printf("         Total tesh kernel time used:     %uhour(s) %uminute(s) %usecond(s) %millisecond(s)\n", si.wHour, si.wMinute, si.wSecond, si.wMilliseconds );
+			printf(" Kernel time used: %2u Hour(s) %2u Minute(s) %2u Second(s) %3u Millisecond(s)\n", si.wHour, si.wMinute, si.wSecond, si.wMilliseconds );
 		}
 
 
diff --git a/tools/tesh2/src/unit.c b/tools/tesh2/src/unit.c
index a3c5f18c9e..49282e44cc 100644
--- a/tools/tesh2/src/unit.c
+++ b/tools/tesh2/src/unit.c
@@ -634,7 +634,7 @@ unit_summuarize(unit_t unit)
 				number_of_successeded_tests++;	
 		}
 		
-		asprintf(&p," Unit: %s ............................................................................", include->description ? include->description : include->fstream->name);
+		asprintf(&p," Unit: %s ............................................................................", include->description && strlen(include->description) < 60 ? include->description : include->fstream->name);
 			
 		p[70] = '\0';
 		printf("%s", p);
@@ -732,7 +732,7 @@ unit_summuarize(unit_t unit)
 					number_of_successeded_tests++;
 			}
 			
-			asprintf(&p," Unit: %s ............................................................................", include->description ? include->description : include->fstream->name);
+			asprintf(&p," Unit: %s ............................................................................", include->description && strlen(include->description) < 60 ? include->description : include->fstream->name);
 			
 			p[70] = '\0';
 			printf("%s", p);
diff --git a/tools/tesh2/tesh/tesh.vcproj b/tools/tesh2/tesh/tesh.vcproj
index 2c6d45745d..7ed69e627f 100644
--- a/tools/tesh2/tesh/tesh.vcproj
+++ b/tools/tesh2/tesh/tesh.vcproj
@@ -51,6 +51,7 @@
 				DebugInformationFormat="4"
 				CompileAs="1"
 				DisableSpecificWarnings="4996;4127;4204;4706;4245"
+				UseFullPaths="false"
 			/>
 			<Tool
 				Name="VCManagedResourceCompilerTool"