X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/blobdiff_plain/f2e52e70789159e58204f2cc770dc5f7a4c6498b..7eef625065d0b3af4a64b5665009491426db974f:/tools/tesh2/include/types.h

diff --git a/tools/tesh2/include/types.h b/tools/tesh2/include/types.h
index 1d40427e1e..322d81c229 100644
--- a/tools/tesh2/include/types.h
+++ b/tools/tesh2/include/types.h
@@ -39,7 +39,7 @@ extern "C" {
  * file descriptor and pid types for portability.
  */
 
-#ifdef WIN32
+#ifdef _XBT_WIN32
 	
 	#ifndef __FD_T_DEFINED
 		typedef HANDLE fd_t;
@@ -116,6 +116,7 @@ typedef struct s_unit
 	xbt_dynar_t suites;					/* the suites contained by the unit										*/
 	int exit_code;						/* the exit code of the unit											*/
 	int err_kind;
+	char* err_line;
 	xbt_dynar_t includes;
 	char* filepos;
 }s_unit_t,* unit_t;
@@ -167,7 +168,7 @@ typedef enum e_command_status_raison
 	csr_outputs_dont_match				= 12,
 	csr_signals_dont_match				= 13,
 	csr_unexpected_signal_caught		= 14,
-	csr_expected_signal_not_receipt		= 15,
+	csr_expected_signal_not_received		= 15,
 	csr_pipe_function_failed			= 16,		/* the function pipe() or CreatePipe() fails						*/
 	csr_dup2_function_failure			= 17,
 	csr_execlp_function_failure			= 18,
@@ -314,6 +315,12 @@ typedef struct s_context
 	xbt_strbuff_t output;				/* the expected output of the command of the test						*/
 	output_handling_t output_handling;
 	int async;							/* if 1, the command is asynchronous									*/
+	
+	#ifdef _XBT_WIN32
+	char* t_command_line;				/* translate the command line on Windows								*/
+	unsigned is_not_found:1;
+	#endif
+
 }s_context_t,* context_t;
 
 /* 
@@ -338,7 +345,7 @@ typedef struct s_command
 	fd_t stdout_fd;						/* the stdout fd of the command											*/
 	fd_t stdin_fd;						/* the stdin fd of the command											*/
 	int exit_code;						/* the exit code of the command											*/
-	#ifdef WIN32
+	#ifdef _XBT_WIN32
 	unsigned long stat_val;
 	#else
 	int stat_val;
@@ -346,7 +353,7 @@ typedef struct s_command
 	char* signal;						/* the signal raised by the command if any								*/
 	xbt_os_mutex_t mutex;
 	
-	#ifndef WIN32
+	#ifndef _XBT_WIN32
 	int killed;							/* if 1, the command was killed											*/
 	int execlp_errno;
 	#endif