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 958c0f4..a820c74 100644 (file)
--- a/tools/tesh2/src/command.c
+++ b/tools/tesh2/src/command.c
@@ -1035,11 +1035,11 @@ command_summarize(command_t command)
                        \r
                        case csr_outputs_dont_match :\r
                        {\r
-                               char *diff;\r
+                               /*char *diff;*/\r
                                printf("          reason                      : ouputs don't match\n");\r
-                               diff = xbt_str_diff(command->context->output->data,command->output->data);              \r
+                               /*diff = xbt_str_diff(command->context->output->data,command->output->data);            \r
                                printf("          output diff :\n%s\n",diff);\r
-                               free(diff);\r
+                               free(diff);*/\r
                        }     \r
 \r
                        break;\r

diff --git a/tools/tesh2/src/fstream.c b/tools/tesh2/src/fstream.c
index f244865..0a8ef5e 100644 (file)
--- 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
                        \r
                        if((p = strstr(line2 + 2, exp)))\r
                        {\r
-                               if((p + strlen(variable->name) + 1)[0] != '\0')\r
+                               if((p + strlen(variable->name) + 1)[0] != '\0' && !(isalpha((p + strlen(variable->name) + 1)[0])))\r
                                        delimiters[0] = (p + strlen(variable->name) + 1)[0];\r
 \r
                                if(variable->val)\r

diff --git a/tools/tesh2/src/main.c b/tools/tesh2/src/main.c
index 58d7d7d..44293c8 100644 (file)
--- 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 075c765..79ccc08 100644 (file)
--- a/tools/tesh2/src/runner.c
+++ b/tools/tesh2/src/runner.c
@@ -674,11 +674,11 @@ runner_summarize(void)
                {\r
                        FileTimeToSystemTime(&user_time, &si);\r
                        \r
-                       printf("         Total tesh user time used:       %uhour(s) %uminute(s) %usecond(s) %millisecond(s)\n", si.wHour, si.wMinute, si.wSecond, si.wMilliseconds );\r
+                       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 );\r
                        \r
                        FileTimeToSystemTime(&kernel_time, &si);\r
                        \r
-                       printf("         Total tesh kernel time used:     %uhour(s) %uminute(s) %usecond(s) %millisecond(s)\n", si.wHour, si.wMinute, si.wSecond, si.wMilliseconds );\r
+                       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 );\r
                }\r
 \r
 \r

diff --git a/tools/tesh2/src/unit.c b/tools/tesh2/src/unit.c
index a3c5f18..49282e4 100644 (file)
--- 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++;  \r
                }\r
                \r
-               asprintf(&p," Unit: %s ............................................................................", include->description ? include->description : include->fstream->name);\r
+               asprintf(&p," Unit: %s ............................................................................", include->description && strlen(include->description) < 60 ? include->description : include->fstream->name);\r
                        \r
                p[70] = '\0';\r
                printf("%s", p);\r
@@ -732,7 +732,7 @@ unit_summuarize(unit_t unit)
                                        number_of_successeded_tests++;\r
                        }\r
                        \r
-                       asprintf(&p," Unit: %s ............................................................................", include->description ? include->description : include->fstream->name);\r
+                       asprintf(&p," Unit: %s ............................................................................", include->description && strlen(include->description) < 60 ? include->description : include->fstream->name);\r
                        \r
                        p[70] = '\0';\r
                        printf("%s", p);\r

diff --git a/tools/tesh2/tesh/tesh.vcproj b/tools/tesh2/tesh/tesh.vcproj
index 2c6d457..7ed69e6 100644 (file)
--- a/tools/tesh2/tesh/tesh.vcproj
+++ b/tools/tesh2/tesh/tesh.vcproj
@@ -51,6 +51,7 @@
                                DebugInformationFormat="4"\r
                                CompileAs="1"\r
                                DisableSpecificWarnings="4996;4127;4204;4706;4245"\r
+                               UseFullPaths="false"\r
                        />\r
                        <Tool\r
                                Name="VCManagedResourceCompilerTool"\r