#include <sys/types.h>
#include <sys/wait.h>
+#include <sys/stat.h>
+#include <unistd.h>
XBT_LOG_EXTERNAL_DEFAULT_CATEGORY(tesh);
* Module management
*/
-static void kill_it(void*r) {
- rctx_t rctx = *(rctx_t*)r;
+static void kill_it(void *r)
+{
+ rctx_t rctx = *(rctx_t *) r;
- VERB2("Join thread %p which were running background cmd <%s>",rctx->runner,rctx->filepos);
- xbt_os_thread_join(rctx->runner,NULL);
+ VERB2("Join thread %p which were running background cmd <%s>", rctx->runner,
+ rctx->filepos);
+ xbt_os_thread_join(rctx->runner, NULL);
rctx_free(rctx);
}
-void rctx_init(void) {
- bg_jobs = xbt_dynar_new_sync(sizeof(rctx_t),kill_it);
+void rctx_init(void)
+{
+ bg_jobs = xbt_dynar_new_sync(sizeof(rctx_t), kill_it);
armageddon_mutex = xbt_os_mutex_init();
armageddon_initiator = NULL;
}
-void rctx_exit(void) {
+void rctx_exit(void)
+{
if (bg_jobs) {
/* Do not use xbt_dynar_free or it will lock the dynar, preventing armageddon from working */
while (xbt_dynar_length(bg_jobs)) {
- rctx_t rctx;
- xbt_dynar_pop(bg_jobs,&rctx);
- kill_it(&rctx);
+ rctx_t rctx;
+ xbt_dynar_pop(bg_jobs, &rctx);
+ kill_it(&rctx);
}
xbt_dynar_free(&bg_jobs);
}
xbt_os_mutex_destroy(armageddon_mutex);
}
-void rctx_wait_bg(void) {
+void rctx_wait_bg(void)
+{
if (bg_jobs) {
/* Do not use xbt_dynar_free or it will lock the dynar, preventing armageddon from working */
while (xbt_dynar_length(bg_jobs)) {
- rctx_t rctx;
- xbt_dynar_pop(bg_jobs,&rctx);
- kill_it(&rctx);
+ rctx_t rctx;
+ xbt_dynar_pop(bg_jobs, &rctx);
+ kill_it(&rctx);
}
xbt_dynar_free(&bg_jobs);
}
- bg_jobs = xbt_dynar_new_sync(sizeof(rctx_t),kill_it);
+ bg_jobs = xbt_dynar_new_sync(sizeof(rctx_t), kill_it);
}
-void rctx_armageddon(rctx_t initiator, int exitcode) {
+void rctx_armageddon(rctx_t initiator, int exitcode)
+{
rctx_t rctx;
- DEBUG2("Armageddon request by <%s> (exit=%d)",initiator->filepos,exitcode);
+ DEBUG2("Armageddon request by <%s> (exit=%d)", initiator->filepos,
+ exitcode);
xbt_os_mutex_acquire(armageddon_mutex);
if (armageddon_initiator != NULL) {
VERB0("Armageddon already started. Let it go");
xbt_os_mutex_release(armageddon_mutex);
return;
}
- DEBUG1("Armageddon request by <%s> got the lock. Let's go amok",initiator->filepos);
+ DEBUG1("Armageddon request by <%s> got the lock. Let's go amok",
+ initiator->filepos);
armageddon_initiator = initiator;
xbt_os_mutex_release(armageddon_mutex);
/* Kill any background commands */
while (xbt_dynar_length(bg_jobs)) {
- xbt_dynar_pop(bg_jobs,&rctx);
+ xbt_dynar_pop(bg_jobs, &rctx);
if (rctx != initiator) {
- INFO2("Kill <%s> because <%s> failed",rctx->filepos,initiator->filepos);
+ INFO2("Kill <%s> because <%s> failed", rctx->filepos,
+ initiator->filepos);
xbt_os_mutex_acquire(rctx->interruption);
rctx->interrupted = 1;
xbt_os_mutex_release(rctx->interruption);
if (!rctx->reader_done) {
- kill(rctx->pid,SIGTERM);
- usleep(100);
- kill(rctx->pid,SIGKILL);
+ kill(rctx->pid, SIGTERM);
+ usleep(100);
+ kill(rctx->pid, SIGKILL);
}
}
}
* Memory management
*/
-# ifdef __APPLE__
-/* under darwin, the environment gets added to the process at startup time. So, it's not defined at library link time, forcing us to extra tricks */
-# include <crt_externs.h>
-# define environ (*_NSGetEnviron())
-# else
- /* the environment, as specified by the opengroup, used to initialize the process properties */
- extern char **environ;
-# endif
-
-void rctx_empty(rctx_t rc) {
+void rctx_empty(rctx_t rc)
+{
int i;
- char **env_it=environ;
+ char **env_it = environ;
if (rc->cmd)
free(rc->cmd);
if (rc->filepos)
free(rc->filepos);
if (rc->env)
- free(rc->env);
+ free(rc->env);
- for (i=0;*env_it;i++,env_it++);
+ for (i = 0; *env_it; i++, env_it++);
i++;
rc->env_size = i;
- rc->env = malloc(i*sizeof(char*));
- memcpy(rc->env,environ,i*sizeof(char*));
+ rc->env = malloc(i * sizeof(char *));
+ memcpy(rc->env, environ, i * sizeof(char *));
rc->filepos = NULL;
rc->is_empty = 1;
}
-rctx_t rctx_new() {
- rctx_t res = xbt_new0(s_rctx_t,1);
+rctx_t rctx_new()
+{
+ rctx_t res = xbt_new0(s_rctx_t, 1);
- res->input=xbt_strbuff_new();
- res->output_wanted=xbt_strbuff_new();
- res->output_got=xbt_strbuff_new();
+ res->input = xbt_strbuff_new();
+ res->output_wanted = xbt_strbuff_new();
+ res->output_got = xbt_strbuff_new();
res->interruption = xbt_os_mutex_init();
rctx_empty(res);
return res;
}
-void rctx_free(rctx_t rctx) {
+void rctx_free(rctx_t rctx)
+{
DEBUG1("RCTX: Free %p", rctx);
- rctx_dump(rctx,"free");
+ rctx_dump(rctx, "free");
if (!rctx)
return;
free(rctx);
}
-void rctx_dump(rctx_t rctx, const char *str) {
+void rctx_dump(rctx_t rctx, const char *str)
+{
DEBUG9("%s RCTX %p={in%p={%d,%10s}, want={%d,%10s}, out={%d,%10s}}",
- str, rctx,
- rctx->input, rctx->input->used, rctx->input->data,
- rctx->output_wanted->used,rctx->output_wanted->data,
- rctx->output_got->used, rctx->output_got->data);
+ str, rctx,
+ rctx->input, rctx->input->used, rctx->input->data,
+ rctx->output_wanted->used, rctx->output_wanted->data,
+ rctx->output_got->used, rctx->output_got->data);
DEBUG5("%s RCTX %p=[cmd%p=%10s, pid=%d]",
- str,rctx,rctx->cmd,rctx->cmd,rctx->pid);
+ str, rctx, rctx->cmd, rctx->cmd, rctx->pid);
}
* Getting instructions from the file
*/
-void rctx_pushline(const char* filepos, char kind, char *line) {
+void rctx_pushline(const char *filepos, char kind, char *line)
+{
switch (kind) {
case '$':
case '&':
if (rctx->cmd) {
if (!rctx->is_empty) {
- ERROR2("[%s] More than one command in this chunk of lines (previous: %s).\n"
- " Dunno which input/output belongs to which command.",
- filepos,rctx->cmd);
- ERROR1("Test suite `%s': NOK (syntax error)",testsuite_name);
- rctx_armageddon(rctx,1);
- return;
+ ERROR2
+ ("[%s] More than one command in this chunk of lines (previous: %s).\n"
+ " Cannot guess which input/output belongs to which command.",
+ filepos, rctx->cmd);
+ ERROR1("Test suite `%s': NOK (syntax error)", testsuite_name);
+ rctx_armageddon(rctx, 1);
+ return;
}
rctx_start();
- VERB1("[%s] More than one command in this chunk of lines",filepos);
+ VERB1("[%s] More than one command in this chunk of lines", filepos);
}
if (kind == '&')
rctx->is_background = 1;
rctx->cmd = xbt_strdup(line);
rctx->filepos = xbt_strdup(filepos);
- INFO3("[%s] %s%s",filepos,rctx->cmd,
- ((rctx->is_background)?" (background command)":""));
+ INFO3("[%s] %s%s", filepos, rctx->cmd,
+ ((rctx->is_background) ? " (background command)" : ""));
break;
case '<':
rctx->is_empty = 0;
- xbt_strbuff_append(rctx->input,line);
- xbt_strbuff_append(rctx->input,"\n");
+ xbt_strbuff_append(rctx->input, line);
+ xbt_strbuff_append(rctx->input, "\n");
break;
case '>':
rctx->is_empty = 0;
- xbt_strbuff_append(rctx->output_wanted,line);
- xbt_strbuff_append(rctx->output_wanted,"\n");
+ xbt_strbuff_append(rctx->output_wanted, line);
+ xbt_strbuff_append(rctx->output_wanted, "\n");
break;
case '!':
if (rctx->cmd)
rctx_start();
- if (!strncmp(line,"timeout no",strlen("timeout no"))) {
+ if (!strncmp(line, "timeout no", strlen("timeout no"))) {
VERB1("[%s] (disable timeout)", filepos);
timeout_value = -1;
- } else if (!strncmp(line,"timeout ",strlen("timeout "))) {
- timeout_value=atoi(line+strlen("timeout"));
- VERB2("[%s] (new timeout value: %d)",
- filepos,timeout_value);
+ } else if (!strncmp(line, "timeout ", strlen("timeout "))) {
+ timeout_value = atoi(line + strlen("timeout"));
+ VERB2("[%s] (new timeout value: %d)", filepos, timeout_value);
- } else if (!strncmp(line,"expect signal ",strlen("expect signal "))) {
+ } else if (!strncmp(line, "expect signal ", strlen("expect signal "))) {
rctx->expected_signal = strdup(line + strlen("expect signal "));
- xbt_str_trim(rctx->expected_signal," \n");
- VERB2("[%s] (next command must raise signal %s)",
- filepos, rctx->expected_signal);
+ xbt_str_trim(rctx->expected_signal, " \n");
+ VERB2("[%s] (next command must raise signal %s)",
+ filepos, rctx->expected_signal);
- } else if (!strncmp(line,"expect return ",strlen("expect return "))) {
- rctx->expected_return = atoi(line+strlen("expect return "));
+ } else if (!strncmp(line, "expect return ", strlen("expect return "))) {
+ rctx->expected_return = atoi(line + strlen("expect return "));
VERB2("[%s] (next command must return code %d)",
- filepos, rctx->expected_return);
+ filepos, rctx->expected_return);
- } else if (!strncmp(line,"output ignore",strlen("output ignore"))) {
+ } else if (!strncmp(line, "output ignore", strlen("output ignore"))) {
rctx->output = e_output_ignore;
VERB1("[%s] (ignore output of next command)", filepos);
- } else if (!strncmp(line,"output display",strlen("output display"))) {
+ } else if (!strncmp(line, "output display", strlen("output display"))) {
rctx->output = e_output_display;
VERB1("[%s] (ignore output of next command)", filepos);
- } else if (!strncmp(line,"setenv ",strlen("setenv "))) {
- rctx->env = realloc(rctx->env,++(rctx->env_size)*sizeof(char*));
- rctx->env[rctx->env_size-2] = xbt_strdup(line+strlen("setenv "));
- rctx->env[rctx->env_size-1] = NULL;
- VERB1("[%s] (ignore output of next command)", filepos);
+ } else if (!strncmp(line, "setenv ", strlen("setenv "))) {
+ int len = strlen("setenv ");
+ char *eq = strchr(line + len, '=');
+ char *key = bprintf("%.*s", (int) (eq - line - len), line + len);
+ xbt_dict_set(env, key, xbt_strdup(eq + 1), xbt_free_f);
+
+ rctx->env = realloc(rctx->env, ++(rctx->env_size) * sizeof(char *));
+ rctx->env[rctx->env_size - 2] = xbt_strdup(line + len);
+ rctx->env[rctx->env_size - 1] = NULL;
+ VERB2("[%s] setenv %s", filepos, line + len);
} else {
- ERROR2("%s: Malformed metacommand: %s",filepos,line);
- ERROR1("Test suite `%s': NOK (syntax error)",testsuite_name);
- rctx_armageddon(rctx,1);
+ ERROR2("%s: Malformed metacommand: %s", filepos, line);
+ ERROR1("Test suite `%s': NOK (syntax error)", testsuite_name);
+ rctx_armageddon(rctx, 1);
return;
}
break;
/* The IO of the childs are handled by the two following threads
(one pair per child) */
-static void* thread_writer(void *r) {
+static void *thread_writer(void *r)
+{
int posw;
- rctx_t rctx = (rctx_t)r;
- for (posw=0; posw<rctx->input->used && !rctx->brokenpipe; ) {
+ rctx_t rctx = (rctx_t) r;
+ for (posw = 0; posw < rctx->input->used && !rctx->brokenpipe;) {
int got;
- DEBUG1("Still %d chars to write",rctx->input->used-posw);
- got=write(rctx->child_to,rctx->input->data+posw,rctx->input->used-posw);
- if (got>0)
- posw+=got;
- if (got<0) {
+ DEBUG1("Still %d chars to write", rctx->input->used - posw);
+ got =
+ write(rctx->child_to, rctx->input->data + posw,
+ rctx->input->used - posw);
+ if (got > 0)
+ posw += got;
+ if (got < 0) {
if (errno == EPIPE) {
- rctx->brokenpipe = 1;
- } else if (errno!=EINTR && errno!=EAGAIN && errno!=EPIPE) {
- perror("Error while writing input to child");
- ERROR1("Test suite `%s': NOK (system error)",testsuite_name);
- rctx_armageddon(rctx,4);
- return NULL;
+ rctx->brokenpipe = 1;
+ } else if (errno != EINTR && errno != EAGAIN && errno != EPIPE) {
+ perror("Error while writing input to child");
+ ERROR1("Test suite `%s': NOK (system error)", testsuite_name);
+ rctx_armageddon(rctx, 4);
+ return NULL;
}
}
- DEBUG1("written %d chars so far",posw);
+ DEBUG1("written %d chars so far", posw);
if (got <= 0)
usleep(100);
}
- rctx->input->data[0]='\0';
- rctx->input->used=0;
+ rctx->input->data[0] = '\0';
+ rctx->input->used = 0;
close(rctx->child_to);
return NULL;
}
-static void *thread_reader(void *r) {
- rctx_t rctx = (rctx_t)r;
- char *buffout=malloc(4096);
+
+static void *thread_reader(void *r)
+{
+ rctx_t rctx = (rctx_t) r;
+ char *buffout = malloc(4096);
int posr, got_pid;
do {
- posr=read(rctx->child_from,buffout,4095);
- if (posr<0 && errno!=EINTR && errno!=EAGAIN) {
+ posr = read(rctx->child_from, buffout, 4095);
+ if (posr < 0 && errno != EINTR && errno != EAGAIN) {
perror("Error while reading output of child");
ERROR1("Test suite `%s': NOK (system error)", testsuite_name);
- rctx_armageddon(rctx,4);
+ rctx_armageddon(rctx, 4);
return NULL;
}
- if (posr>0) {
- buffout[posr]='\0';
- xbt_strbuff_append(rctx->output_got,buffout);
+ if (posr > 0) {
+ buffout[posr] = '\0';
+ xbt_strbuff_append(rctx->output_got, buffout);
} else {
usleep(100);
}
- } while (!rctx->timeout && posr!=0);
+ } while (!rctx->timeout && posr != 0);
free(buffout);
/* let this thread wait for the child so that the main thread can detect the timeout without blocking on the wait */
- got_pid = waitpid(rctx->pid,&rctx->status,0);
+ got_pid = waitpid(rctx->pid, &rctx->status, 0);
if (got_pid != rctx->pid) {
- perror(bprintf("Cannot wait for the child %s",rctx->cmd));
+ perror(bprintf("Cannot wait for the child %s", rctx->cmd));
ERROR1("Test suite `%s': NOK (system error)", testsuite_name);
- rctx_armageddon(rctx,4);
+ rctx_armageddon(rctx, 4);
return NULL;
}
return NULL;
}
+/* Special command: mkfile is a building creating a file with the input data as content */
+static void rctx_mkfile(void)
+{
+ char *filename = xbt_strdup(rctx->cmd + strlen("mkfile "));
+ FILE *OUT;
+ xbt_str_trim(filename, NULL);
+ OUT = fopen(filename, "w");
+ if (!OUT) {
+ free(filename);
+ THROW3(system_error, errno, "%s: Cannot create file %s: %s",
+ rctx->filepos, filename, strerror(errno));
+ }
+ fprintf(OUT, "%s", rctx->input->data);
+ fclose(OUT);
+}
+
+/* function to be called from the child to start the actual process */
+static void start_command(rctx_t rctx)
+{
+ xbt_dynar_t cmd = xbt_str_split_quoted(rctx->cmd);
+ char *binary_name = NULL;
+ unsigned int it;
+ char *str;
+ xbt_dynar_get_cpy(cmd, 0, &binary_name);
+ char **args = xbt_new(char *, xbt_dynar_length(cmd) + 1);
+ int errcode;
+
+ if (!strncmp(rctx->cmd, "mkfile ", strlen("mkfile "))) {
+ rctx_mkfile();
+ exit(0); /* end the working child */
+ }
+
+ xbt_dynar_foreach(cmd, it, str) {
+ args[it] = xbt_strdup(str);
+ }
+ args[it] = NULL;
+
+ /* To search for the right executable path when not trivial */
+ struct stat stat_buf;
+
+ /* build the command line */
+ if (stat(binary_name, &stat_buf)) {
+ /* Damn. binary not in current dir. We'll have to dig the PATH to find it */
+ int i;
+
+ for (i = 0; environ[i]; i++) {
+ if (!strncmp("PATH=", environ[i], 5)) {
+ xbt_dynar_t path = xbt_str_split(environ[i] + 5, ":");
+
+ xbt_dynar_foreach(path, it, str) {
+ if (binary_name)
+ free(binary_name);
+ binary_name = bprintf("%s/%s", str, args[0]);
+ if (!stat(binary_name, &stat_buf)) {
+ /* Found. */
+ DEBUG1("Looked in the PATH for the binary. Found %s",
+ binary_name);
+ xbt_dynar_free(&path);
+ break;
+ }
+ }
+ xbt_dynar_free(&path);
+ if (stat(binary_name, &stat_buf)) {
+ /* not found */
+ printf("TESH_ERROR Command %s not found\n", args[0]);
+ exit(127);
+ }
+ break;
+ }
+ }
+ } else {
+ binary_name = xbt_strdup(args[0]);
+ }
+
+ errcode = execve(binary_name, args, rctx->env);
+ printf("TESH_ERROR %s: Cannot start %s: %s\n", rctx->filepos, rctx->cmd,
+ strerror(errcode));
+ exit(127);
+}
+
/* Start a new child, plug the pipes as expected and fire up the
helping threads. Is also waits for the child to end if this is a
foreground job, or fire up a thread to wait otherwise. */
-
-void rctx_start(void) {
+void rctx_start(void)
+{
int child_in[2];
int child_out[2];
- VERB2("Start %s %s",rctx->cmd,(rctx->is_background?"(background job)":""));
+ DEBUG1("Cmd before rewriting %s", rctx->cmd);
+ rctx->cmd = xbt_str_varsubst(rctx->cmd, env);
+ VERB2("Start %s %s", rctx->cmd,
+ (rctx->is_background ? "(background job)" : ""));
if (pipe(child_in) || pipe(child_out)) {
perror("Cannot open the pipes");
ERROR1("Test suite `%s': NOK (system error)", testsuite_name);
- rctx_armageddon(rctx,4);
+ rctx_armageddon(rctx, 4);
}
- rctx->pid=fork();
- if (rctx->pid<0) {
+ rctx->pid = fork();
+ if (rctx->pid < 0) {
perror("Cannot fork the command");
ERROR1("Test suite `%s': NOK (system error)", testsuite_name);
- rctx_armageddon(rctx,4);
+ rctx_armageddon(rctx, 4);
return;
}
- if (rctx->pid) { /* father */
+ if (rctx->pid) { /* father */
close(child_in[0]);
rctx->child_to = child_in[1];
rctx->child_from = child_out[0];
if (timeout_value > 0)
- rctx->end_time = time(NULL) + timeout_value;
+ rctx->end_time = time(NULL) + timeout_value;
else
- rctx->end_time = -1;
+ rctx->end_time = -1;
rctx->reader_done = 0;
- rctx->reader = xbt_os_thread_create("reader",thread_reader,(void*)rctx);
- rctx->writer = xbt_os_thread_create("writer",thread_writer,(void*)rctx);
+ rctx->reader =
+ xbt_os_thread_create("reader", thread_reader, (void *) rctx);
+ rctx->writer =
+ xbt_os_thread_create("writer", thread_writer, (void *) rctx);
- } else { /* child */
+ } else { /* child */
close(child_in[1]);
- dup2(child_in[0],0);
+ dup2(child_in[0], 0);
close(child_in[0]);
close(child_out[0]);
- dup2(child_out[1],1);
- dup2(child_out[1],2);
+ dup2(child_out[1], 1);
+ dup2(child_out[1], 2);
close(child_out[1]);
- xbt_dynar_t cmd = xbt_str_split_quoted(rctx->cmd);
- char *file;
- unsigned int it;
- char *str;
- xbt_dynar_get_cpy(cmd,0,&file);
- char **args = xbt_new(char*,xbt_dynar_length(cmd)+1);
- xbt_dynar_foreach(cmd,it,str)
- args[it] = xbt_strdup(str);
- args[it] = NULL;
- execve(file, args, rctx->env);
+ start_command(rctx);
}
rctx->is_stoppable = 1;
xbt_os_thread_t runner;
rctx = rctx_new();
- DEBUG2("RCTX: new bg=%p, new fg=%p",old,rctx);
+ DEBUG2("RCTX: new bg=%p, new fg=%p", old, rctx);
- DEBUG2("Launch a thread to wait for %s %d",old->cmd,old->pid);
- runner = xbt_os_thread_create(old->cmd,rctx_wait,(void*)old);
+ DEBUG2("Launch a thread to wait for %s %d", old->cmd, old->pid);
+ runner = xbt_os_thread_create(old->cmd, rctx_wait, (void *) old);
old->runner = runner;
- VERB3("Launched thread %p to wait for %s %d",
- runner,old->cmd, old->pid);
- xbt_dynar_push(bg_jobs,&old);
+ VERB3("Launched thread %p to wait for %s %d", runner, old->cmd, old->pid);
+ xbt_dynar_push(bg_jobs, &old);
}
}
thread (for foreground jobs) or in a separate one for background jobs.
That explains the prototype, forced by xbt_os_thread_create. */
-void *rctx_wait(void* r) {
- rctx_t rctx = (rctx_t)r;
+void *rctx_wait(void *r)
+{
+ rctx_t rctx = (rctx_t) r;
int errcode = 0;
int now = time(NULL);
- rctx_dump(rctx,"wait");
+ rctx_dump(rctx, "wait");
if (!rctx->is_stoppable)
- THROW1(unknown_error,0,"Cmd '%s' not started yet. Cannot wait it",
- rctx->cmd);
+ THROW1(unknown_error, 0, "Cmd '%s' not started yet. Cannot wait it",
+ rctx->cmd);
/* Wait for the child to die or the timeout to happen (or an armageddon to happen) */
- while (!rctx->interrupted && !rctx->reader_done && (rctx->end_time <0 ||rctx->end_time >= now)) {
+ while (!rctx->interrupted && !rctx->reader_done
+ && (rctx->end_time < 0 || rctx->end_time >= now)) {
usleep(100);
now = time(NULL);
}
xbt_os_mutex_acquire(rctx->interruption);
if (!rctx->interrupted && rctx->end_time > 0 && rctx->end_time < now) {
- INFO1("<%s> timeouted. Kill the process.",rctx->filepos);
+ INFO1("<%s> timeouted. Kill the process.", rctx->filepos);
rctx->timeout = 1;
- kill(rctx->pid,SIGTERM);
+ kill(rctx->pid, SIGTERM);
usleep(100);
- kill(rctx->pid,SIGKILL);
+ kill(rctx->pid, SIGKILL);
rctx->reader_done = 1;
}
/* Make sure helper threads die.
Cannot block since they wait for the child we just killed
if not already dead. */
- xbt_os_thread_join(rctx->writer,NULL);
- xbt_os_thread_join(rctx->reader,NULL);
+ xbt_os_thread_join(rctx->writer, NULL);
+ xbt_os_thread_join(rctx->reader, NULL);
/* xbt_os_mutex_release(rctx->interruption);
- if (rctx->interrupted)
- return NULL;
- xbt_os_mutex_acquire(rctx->interruption);*/
+ if (rctx->interrupted)
+ return NULL;
+ xbt_os_mutex_acquire(rctx->interruption); */
xbt_strbuff_chomp(rctx->output_got);
xbt_strbuff_chomp(rctx->output_wanted);
if (rctx->timeout) {
if (rctx->output_got->data[0])
INFO2("<%s> Output on timeout:\n%s",
- rctx->filepos,rctx->output_got->data);
+ rctx->filepos, rctx->output_got->data);
else
- INFO1("<%s> No output before timeout",
- rctx->filepos);
+ INFO1("<%s> No output before timeout", rctx->filepos);
ERROR3("Test suite `%s': NOK (<%s> timeout after %d sec)",
- testsuite_name,rctx->filepos,timeout_value);
+ testsuite_name, rctx->filepos, timeout_value);
DEBUG2("<%s> Interrupted = %d", rctx->filepos, rctx->interrupted);
if (!rctx->interrupted) {
rctx_armageddon(rctx, 3);
}
}
- DEBUG2("RCTX=%p (pid=%d)",rctx,rctx->pid);
- DEBUG3("Status(%s|%d)=%d",rctx->cmd,rctx->pid,rctx->status);
+ DEBUG2("RCTX=%p (pid=%d)", rctx, rctx->pid);
+ DEBUG3("Status(%s|%d)=%d", rctx->cmd, rctx->pid, rctx->status);
if (!rctx->interrupted) {
if (WIFSIGNALED(rctx->status) && !rctx->expected_signal) {
ERROR3("Test suite `%s': NOK (<%s> got signal %s)",
- testsuite_name, rctx->filepos,
- signal_name(WTERMSIG(rctx->status),NULL));
- errcode = WTERMSIG(rctx->status)+4;
+ testsuite_name, rctx->filepos,
+ signal_name(WTERMSIG(rctx->status), NULL));
+ errcode = WTERMSIG(rctx->status) + 4;
}
if (WIFSIGNALED(rctx->status) && rctx->expected_signal &&
- strcmp(signal_name(WTERMSIG(rctx->status),rctx->expected_signal),
- rctx->expected_signal)) {
+ strcmp(signal_name(WTERMSIG(rctx->status), rctx->expected_signal),
+ rctx->expected_signal)) {
ERROR4("Test suite `%s': NOK (%s got signal %s instead of %s)",
- testsuite_name, rctx->filepos,
- signal_name(WTERMSIG(rctx->status),rctx->expected_signal),
- rctx->expected_signal);
- errcode = WTERMSIG(rctx->status)+4;
+ testsuite_name, rctx->filepos,
+ signal_name(WTERMSIG(rctx->status), rctx->expected_signal),
+ rctx->expected_signal);
+ errcode = WTERMSIG(rctx->status) + 4;
}
if (!WIFSIGNALED(rctx->status) && rctx->expected_signal) {
ERROR3("Test suite `%s': NOK (child %s expected signal %s)",
- testsuite_name, rctx->filepos,
- rctx->expected_signal);
+ testsuite_name, rctx->filepos, rctx->expected_signal);
errcode = 5;
}
- if (WIFEXITED(rctx->status) && WEXITSTATUS(rctx->status) != rctx->expected_return ) {
+ if (WIFEXITED(rctx->status)
+ && WEXITSTATUS(rctx->status) != rctx->expected_return) {
if (rctx->expected_return)
- ERROR4("Test suite `%s': NOK (<%s> returned code %d instead of %d)",
- testsuite_name, rctx->filepos,
- WEXITSTATUS(rctx->status), rctx->expected_return);
+ ERROR4("Test suite `%s': NOK (<%s> returned code %d instead of %d)",
+ testsuite_name, rctx->filepos,
+ WEXITSTATUS(rctx->status), rctx->expected_return);
else
- ERROR3("Test suite `%s': NOK (<%s> returned code %d)",
- testsuite_name, rctx->filepos, WEXITSTATUS(rctx->status));
- errcode = 40+WEXITSTATUS(rctx->status);
+ ERROR3("Test suite `%s': NOK (<%s> returned code %d)",
+ testsuite_name, rctx->filepos, WEXITSTATUS(rctx->status));
+ errcode = 40 + WEXITSTATUS(rctx->status);
}
rctx->expected_return = 0;
- if(rctx->expected_signal){
+ if (rctx->expected_signal) {
free(rctx->expected_signal);
rctx->expected_signal = NULL;
}
}
+ while (rctx->output_got->used
+ && !strncmp(rctx->output_got->data, "TESH_ERROR ",
+ strlen("TESH_ERROR "))) {
+ int marklen = strlen("TESH_ERROR ");
+ char *endline = strchr(rctx->output_got->data, '\n');
+
+ CRITICAL2("%.*s", (int) (endline - rctx->output_got->data - marklen),
+ rctx->output_got->data + marklen);
+ memmove(rctx->output_got->data, rctx->output_got->data + marklen,
+ rctx->output_got->used - marklen);
+ rctx->output_got->used -= endline - rctx->output_got->data + 1;
+ rctx->output_got->data[rctx->output_got->used] = '\0';
+ errcode = 1;
+ }
- if ( rctx->output == e_output_check
- && ( rctx->output_got->used != rctx->output_wanted->used
- || strcmp(rctx->output_got->data, rctx->output_wanted->data))) {
- if (XBT_LOG_ISENABLED(tesh,xbt_log_priority_info)) {
- char *diff= xbt_str_diff(rctx->output_wanted->data,rctx->output_got->data);
- ERROR2("Output of <%s> mismatch:\n%s",rctx->filepos,diff);
- free(diff);
+ if (rctx->output == e_output_check
+ && (rctx->output_got->used != rctx->output_wanted->used
+ || strcmp(rctx->output_got->data, rctx->output_wanted->data))) {
+ if (XBT_LOG_ISENABLED(tesh, xbt_log_priority_info)) {
+ char *diff =
+ xbt_str_diff(rctx->output_wanted->data, rctx->output_got->data);
+ ERROR2("Output of <%s> mismatch:\n%s", rctx->filepos, diff);
+ free(diff);
}
ERROR2("Test suite `%s': NOK (<%s> output mismatch)",
- testsuite_name,rctx->filepos);
+ testsuite_name, rctx->filepos);
- errcode=2;
+ errcode = 2;
} else if (rctx->output == e_output_ignore) {
- INFO1("(ignoring the output of <%s> as requested)",rctx->filepos);
+ INFO1("(ignoring the output of <%s> as requested)", rctx->filepos);
} else if (rctx->output == e_output_display) {
xbt_dynar_t a = xbt_str_split(rctx->output_got->data, "\n");
- char *out = xbt_str_join(a,"\n||");
+ char *out = xbt_str_join(a, "\n||");
xbt_dynar_free(&a);
- INFO1("Here is the (ignored) command output: \n||%s",out);
+ INFO1("Here is the (ignored) command output: \n||%s", out);
free(out);
- } else if (errcode || rctx->interrupted) {
+ } else if ((errcode && errcode != 1) || rctx->interrupted) {
/* checking output, and matching */
xbt_dynar_t a = xbt_str_split(rctx->output_got->data, "\n");
- char *out = xbt_str_join(a,"\n||");
+ char *out = xbt_str_join(a, "\n||");
xbt_dynar_free(&a);
- INFO2("Output of <%s> so far: \n||%s",rctx->filepos,out);
+ INFO2("Output of <%s> so far: \n||%s", rctx->filepos, out);
free(out);
}
xbt_os_mutex_release(rctx->interruption);
return NULL;
}
-
