ignore another generated file

[simgrid.git] / tools / tesh / run_context.h

diff --git a/tools/tesh/run_context.h b/tools/tesh/run_context.h
index 203472f..1915e7f 100644 (file)
--- a/tools/tesh/run_context.h
+++ b/tools/tesh/run_context.h
@@ -1,6 +1,6 @@
 /* run_context -- stuff in which TESH runs a command                        */
 
-/* Copyright (c) 2007, 2008, 2009, 2010. The SimGrid Team.
+/* Copyright (c) 2007-2010, 2012-2014. The SimGrid Team.
  * All rights reserved.                                                     */
 
 /* This program is free software; you can redistribute it and/or modify it
@@ -10,6 +10,7 @@
 #define TESH_RUN_CONTEXT_H
 
 #include "tesh.h"
+#include "xbt/synchro_core.h"
 
 typedef enum { e_output_check, e_output_display,
   e_output_ignore
@@ -23,18 +24,18 @@ typedef struct {
   int env_size;
   char *filepos;
   int pid;
-  int is_background:1;
-  int is_empty:1;
-  int is_stoppable:1;
+  unsigned is_background:1;
+  unsigned is_empty:1;
+  unsigned is_stoppable:1;
 
-  int brokenpipe:1;
-  int timeout:1;
+  unsigned brokenpipe:1;
+  unsigned timeout:1;
 
-  int reader_done:1;            /* reader set this to true when he's done because
+  unsigned reader_done:1;       /* reader set this to true when he's done because
                                    the child is dead. The main thread use it to detect
                                    that the child is not dead before the end of timeout */
 
-  int interrupted:1;            /* Whether we got stopped by an armageddon */
+  unsigned interrupted:1;       /* Whether we got stopped by an armageddon */
   xbt_os_mutex_t interruption;  /* To allow main thread to kill a runner
                                    one only at certain points */
 
@@ -46,6 +47,7 @@ typedef struct {
   int end_time;                 /* begin_time + timeout, as epoch */
   char *expected_signal;        /* name of signal to raise (or NULL if none) */
   int expected_return;          /* the exepeted return code of following command */
+  unsigned output_sort:1;       /* whether the output must be sorted before comparison */
 
   /* buffers */
   xbt_strbuff_t input;
@@ -89,4 +91,4 @@ void *rctx_wait(void *rctx);
 /* Parse a line comming from the suite file, and add this into the rctx */
 void rctx_pushline(const char *filepos, char kind, char *line);
 
-#endif /* TESH_RUN_CONTEXT_H */
+#endif                          /* TESH_RUN_CONTEXT_H */