summary |
shortlog |
log |
commit | commitdiff |
tree
raw |
patch |
inline | side by side (from parent 1:
8bbd1ff)
git-svn-id: svn+ssh://scm.gforge.inria.fr/svn/simgrid/simgrid/trunk@5898
48e7efb5-ca39-0410-a469-
dd3cf9ba447f
#ifdef WIN32
char* t_command_line; /* translate the command line on Windows */
#ifdef WIN32
char* t_command_line; /* translate the command line on Windows */
+ unsigned is_not_found:1;
#endif
}s_context_t,* context_t;
#endif
}s_context_t,* context_t;
\r
#ifdef WIN32\r
context->t_command_line = NULL;\r
\r
#ifdef WIN32\r
context->t_command_line = NULL;\r
+ context->is_not_found = 0;\r
#endif\r
\r
return context;\r
#endif\r
\r
return context;\r
free(context->t_command_line);\r
context->t_command_line = NULL;\r
}\r
free(context->t_command_line);\r
context->t_command_line = NULL;\r
}\r
+\r
+ context->is_not_found = 0;\r
+\r
#endif\r
\r
if(context->pos)\r
#endif\r
\r
if(context->pos)\r
\r
#ifdef WIN32\r
dup->t_command_line = strdup(context->t_command_line);\r
\r
#ifdef WIN32\r
dup->t_command_line = strdup(context->t_command_line);\r
+ dup->is_not_found = context->is_not_found;\r
#endif\r
\r
dup->exit_code = context->exit_code;\r
#endif\r
\r
dup->exit_code = context->exit_code;\r
free(context->t_command_line);\r
context->t_command_line = NULL;\r
}\r
free(context->t_command_line);\r
context->t_command_line = NULL;\r
}\r
+ context->is_not_found = 0;\r
+\r
#endif\r
\r
if(context->pos)\r
#endif\r
\r
if(context->pos)\r
unit->is_running_suite = 0;\r
}\r
\r
unit->is_running_suite = 0;\r
}\r
\r
- if(context->command_line)\r
+ if(context->command_line && !context->is_not_found)\r
{\r
if(fstream_launch_command(fstream, context, mutex) < 0)\r
break;\r
{\r
if(fstream_launch_command(fstream, context, mutex) < 0)\r
break;\r
}\r
\r
/* Check that last command of the file ran well */\r
}\r
\r
/* Check that last command of the file ran well */\r
- if(context->command_line)\r
+ if(context->command_line && !context->is_not_found)\r
{\r
if(fstream_launch_command(fstream, context, mutex) < 0)\r
return -1;\r
{\r
if(fstream_launch_command(fstream, context, mutex) < 0)\r
return -1;\r
\r
if(!is_w32_cmd(command_line, fstream->unit->runner->path) && getpath(command_line, &path) < 0)\r
{\r
\r
if(!is_w32_cmd(command_line, fstream->unit->runner->path) && getpath(command_line, &path) < 0)\r
{\r
+ command_t command;\r
+\r
ERROR3("[%s] `%s' : NOK (%s)", filepos, command_line, error_to_string(ECMDNOTFOUND, 1));\r
unit_set_error(fstream->unit, ECMDNOTFOUND, 1, filepos);\r
ERROR3("[%s] `%s' : NOK (%s)", filepos, command_line, error_to_string(ECMDNOTFOUND, 1));\r
unit_set_error(fstream->unit, ECMDNOTFOUND, 1, filepos);\r
+\r
+ context->is_not_found = 1;\r
+ \r
+ command = command_new(fstream->unit, context, mutex);\r
+\r
+ command->status = cs_failed;\r
+ command->reason = csr_command_not_found;\r
+\r