X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/cd6b9acf47ee5ec7cb1ccd1a9daf1fe090a3dd52..143a28bbbc8b35fc3fc1098e57f827fe95b8fb31:/tools/tesh/tesh.c

diff --git a/tools/tesh/tesh.c b/tools/tesh/tesh.c
index 1b3e1fb046..b8241a4935 100644
--- a/tools/tesh/tesh.c
+++ b/tools/tesh/tesh.c
@@ -13,26 +13,28 @@
 
 #include "tesh.h"
 #include "xbt.h"
+#include "simgrid_config.h" //For getline
 
 XBT_LOG_NEW_DEFAULT_CATEGORY(tesh, "TEst SHell utility");
 
 /*** Options ***/
 int timeout_value = 5;          /* child timeout value */
+int sort_len = 19;              /* length of the prefix to sort */
 
-char *testsuite_name;
+const char *testsuite_name;
 static void handle_line(const char *filepos, char *line)
 {
   /* Search end */
   xbt_str_rtrim(line + 2, "\n");
 
   /*
-     DEBUG7("rctx={%s,in={%d,>>%10s<<},exp={%d,>>%10s<<},got={%d,>>%10s<<}}",
+     XBT_DEBUG("rctx={%s,in={%d,>>%10s<<},exp={%d,>>%10s<<},got={%d,>>%10s<<}}",
      rctx->cmd,
      rctx->input->used,        rctx->input->data,
      rctx->output_wanted->used,rctx->output_wanted->data,
      rctx->output_got->used,   rctx->output_got->data);
    */
-  DEBUG2("[%s] %s", filepos, line);
+  XBT_DEBUG("[%s] %s", filepos, line);
 
   switch (line[0]) {
   case '#':
@@ -52,10 +54,10 @@ static void handle_line(const char *filepos, char *line)
       /* search beginning */
       while (*(dir++) == ' ');
       dir--;
-      VERB1("Saw cd '%s'", dir);
+      XBT_VERB("Saw cd '%s'", dir);
       if (chdir(dir)) {
-        ERROR2("Chdir to %s failed: %s", dir, strerror(errno));
-        ERROR1("Test suite `%s': NOK (system error)", testsuite_name);
+        XBT_ERROR("Chdir to %s failed: %s", dir, strerror(errno));
+        XBT_ERROR("Test suite `%s': NOK (system error)", testsuite_name);
         rctx_armageddon(rctx, 4);
       }
       break;
@@ -68,15 +70,15 @@ static void handle_line(const char *filepos, char *line)
     break;
 
   case 'p':
-    INFO2("[%s] %s", filepos, line + 2);
+    XBT_INFO("[%s] %s", filepos, line + 2);
     break;
   case 'P':
-    CRITICAL2("[%s] %s", filepos, line + 2);
+    XBT_CRITICAL("[%s] %s", filepos, line + 2);
     break;
 
   default:
-    ERROR2("[%s] Syntax error: %s", filepos, line);
-    ERROR1("Test suite `%s': NOK (syntax error)", testsuite_name);
+    XBT_ERROR("[%s] Syntax error: %s", filepos, line);
+    XBT_ERROR("Test suite `%s': NOK (syntax error)", testsuite_name);
     rctx_armageddon(rctx, 1);
     break;
   }
@@ -85,12 +87,12 @@ static void handle_line(const char *filepos, char *line)
 static void handle_suite(const char *filename, FILE * IN)
 {
   size_t len;
-  int blankline = 1;
-  int linelen = 0;
+  int blankline;
+  int linelen;
   char *line = NULL;
   int line_num = 0;
   char file_pos[256];
-  int to_be_continued = 0;
+  int to_be_continued;
   int buffbegin = 0;
   xbt_strbuff_t buff = NULL;
 
@@ -101,6 +103,8 @@ static void handle_suite(const char *filename, FILE * IN)
     line_num++;
 
     /* Count the line length while checking wheather it's blank */
+    blankline = 1;
+    linelen = 0;
 
     while (line[linelen] != '\0') {
       if (line[linelen] != ' ' && line[linelen] != '\t'
@@ -111,9 +115,9 @@ static void handle_suite(const char *filename, FILE * IN)
 
     if (blankline) {
       if (!rctx->cmd && !rctx->is_empty) {
-        ERROR1("[%d] Error: no command found in this chunk of lines.",
+        XBT_ERROR("[%d] Error: no command found in this chunk of lines.",
                buffbegin);
-        ERROR1("Test suite `%s': NOK (syntax error)", testsuite_name);
+        XBT_ERROR("Test suite `%s': NOK (syntax error)", testsuite_name);
         rctx_armageddon(rctx, 1);
       }
       if (rctx->cmd)
@@ -123,6 +127,7 @@ static void handle_suite(const char *filename, FILE * IN)
     }
 
     /* Deal with \ at the end of the line, and call handle_line on result */
+    to_be_continued = 0;
     if (linelen > 1 && line[linelen - 2] == '\\') {
       if (linelen > 2 && line[linelen - 3] == '\\') {
         /* Damn. Escaped \ */
@@ -187,33 +192,60 @@ int main(int argc, char *argv[])
   FILE *IN = NULL;
   int i;
   char *suitename = NULL;
+  struct sigaction newact;
+  xbt_init(&argc, argv);
+  rctx_init();
+  parse_environ();
 
   /* Ignore pipe issues.
      They will show up when we try to send data to dead buddies,
      but we will stop doing so when we're done with provided input */
-  struct sigaction newact;
   memset(&newact, 0, sizeof(newact));
   newact.sa_handler = SIG_IGN;
   sigaction(SIGPIPE, &newact, NULL);
 
-  xbt_init(&argc, argv);
-  rctx_init();
-  parse_environ();
-
   /* Get args */
   for (i = 1; i < argc; i++) {
     if (!strcmp(argv[i], "--cd")) {
       if (i == argc - 1) {
-        ERROR0("--cd argument requires an argument");
+        XBT_ERROR("--cd argument requires an argument");
         exit(1);
       }
       if (chdir(argv[i + 1])) {
-        ERROR2("Cannot change directory to %s: %s", argv[i + 1],
+        XBT_ERROR("Cannot change directory to %s: %s", argv[i + 1],
                strerror(errno));
         exit(1);
       }
-      INFO1("Change directory to %s", argv[i + 1]);
-      memmove(argv + i, argv + i + 2, (argc - i - 1)*sizeof(char*));
+      XBT_INFO("Change directory to %s", argv[i + 1]);
+      memmove(argv + i, argv + i + 2, (argc - i - 1) * sizeof(char *));
+      argc -= 2;
+      i -= 2;
+    } else if (!strcmp(argv[i], "--setenv" )) {
+      if (i == argc - 1) {
+        XBT_ERROR("--setenv argument requires an argument");
+        exit(1);
+      }
+      char *eq = strchr(argv[i+1], '=');
+      xbt_assert1(eq,"The argument of --setenv must contain a '=' (got %s instead)",argv[i+1]);
+      char *key = bprintf("%.*s", (int) (eq - argv[i+1]), argv[i+1]);
+      xbt_dict_set(env, key, xbt_strdup(eq + 1), xbt_free_f);
+      XBT_INFO("setting environment variable '%s' to '%s'", key, eq+1);
+      free(key);
+      memmove(argv + i, argv + i + 2, (argc - i - 1) * sizeof(char *));
+      argc -= 2;
+      i -= 2;
+    } else if (!strcmp(argv[i], "--cfg" )) {
+      if (i == argc - 1) {
+            XBT_ERROR("--cfg argument requires an argument");
+            exit(1);
+      }
+      if(!option){ //if option is NULL
+    	option = bprintf("--cfg=%s",argv[i+1]);
+      }else{
+    	option = bprintf("%s --cfg=%s",option,argv[i+1]);
+      }
+      XBT_INFO("Add option \'--cfg=%s\' to command line",argv[i+1]);
+      memmove(argv + i, argv + i + 2, (argc - i - 1) * sizeof(char *));
       argc -= 2;
       i -= 2;
     }
@@ -221,36 +253,40 @@ int main(int argc, char *argv[])
 
   /* Find the description file */
   if (argc == 1) {
-    INFO0("Test suite from stdin");
-    testsuite_name = xbt_strdup("(stdin)");
-    handle_suite("stdin", stdin);
-    INFO0("Test suite from stdin OK");
+    XBT_INFO("Test suite from stdin");
+    testsuite_name = "(stdin)";
+    handle_suite(testsuite_name, stdin);
+    rctx_wait_bg();
+    XBT_INFO("Test suite from stdin OK");
 
   } else {
     for (i = 1; i < argc; i++) {
       suitename = xbt_strdup(argv[i]);
-      if (!strcmp("./", suitename))
+      if (!strncmp("./", suitename, 2))
         memmove(suitename, suitename + 2, strlen(suitename + 2));
 
-      if (!strcmp(".tesh", suitename + strlen(suitename) - 5))
+      if (strlen(suitename) > 5 &&
+          !strcmp(".tesh", suitename + strlen(suitename) - 5))
         suitename[strlen(suitename) - 5] = '\0';
 
-      INFO1("Test suite `%s'", suitename);
+      XBT_INFO("Test suite `%s'", suitename);
       testsuite_name = suitename;
       IN = fopen(argv[i], "r");
       if (!IN) {
         perror(bprintf("Impossible to open the suite file `%s'", argv[i]));
-        ERROR1("Test suite `%s': NOK (system error)", testsuite_name);
+        XBT_ERROR("Test suite `%s': NOK (system error)", testsuite_name);
         rctx_armageddon(rctx, 1);
       }
       handle_suite(suitename, IN);
       rctx_wait_bg();
       fclose(IN);
-      INFO1("Test suite `%s' OK", suitename);
+      XBT_INFO("Test suite `%s' OK", suitename);
       free(suitename);
     }
   }
 
   rctx_exit();
+  xbt_dict_free(&env);
+  xbt_free_f(option);
   return 0;
 }