more windows compliancy fun

diff --git a/buildtools/Cmake/Scripts/tesh.pl b/buildtools/Cmake/Scripts/tesh.pl
index ca4d0b7..0cc491c 100755 (executable)
--- a/buildtools/Cmake/Scripts/tesh.pl
+++ b/buildtools/Cmake/Scripts/tesh.pl
@@ -486,7 +486,7 @@ LINE: while (not $finished and not $error) {
     }
     $cmd{'output ignore'} = 1;
   }
     }
     $cmd{'output ignore'} = 1;
   }

-  elsif($line =~ /^!\s*expect signal (\w*)$/) {#expect signal SIGABRT
+  elsif($line =~ /^!\s*expect signal (\w*)/) {#expect signal SIGABRT

     if (defined($cmd{'cmd'})) {
       exec_cmd(\%cmd);
       %cmd = ();
     if (defined($cmd{'cmd'})) {
       exec_cmd(\%cmd);
       %cmd = ();

diff --git a/teshsuite/xbt/CMakeLists.txt b/teshsuite/xbt/CMakeLists.txt
index 0a4b766..a181c6d 100644 (file)
--- a/teshsuite/xbt/CMakeLists.txt
+++ b/teshsuite/xbt/CMakeLists.txt
@@ -1,24 +1,22 @@
 cmake_minimum_required(VERSION 2.6)
 
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")
 cmake_minimum_required(VERSION 2.6)
 
 set(EXECUTABLE_OUTPUT_PATH "${CMAKE_CURRENT_BINARY_DIR}")

-if(NOT WIN32)
-  add_executable(log_large_test log_large_test.c)
-  add_executable(parallel_log_crashtest parallel_log_crashtest.c)
-  if(HAVE_MMAP)
-    add_executable(mmalloc_test mmalloc_test.c)
-  endif()
-  add_executable(parmap_test parmap_test.c)
+
+add_executable(log_large_test log_large_test.c)
+add_executable(parallel_log_crashtest parallel_log_crashtest.c)
+if(HAVE_MMAP)
+  add_executable(mmalloc_test mmalloc_test.c)

 endif()
 endif()

+add_executable(parmap_test parmap_test.c)
+

 
 ### Add definitions for compile
 
 ### Add definitions for compile

-if(NOT WIN32)
-  target_link_libraries(log_large_test simgrid m pthread )
-  target_link_libraries(parallel_log_crashtest simgrid m pthread )
-  if(HAVE_MMAP)
-    target_link_libraries(mmalloc_test simgrid m pthread )
-  endif()
-  target_link_libraries(parmap_test simgrid m pthread )
+target_link_libraries(log_large_test simgrid)
+target_link_libraries(parallel_log_crashtest simgrid)
+if(HAVE_MMAP)
+  target_link_libraries(mmalloc_test simgrid)

 endif()
 endif()

+target_link_libraries(parmap_test simgrid)

 
 set(tesh_files
   ${tesh_files}
 
 set(tesh_files
   ${tesh_files}

diff --git a/tools/tesh/background.tesh b/tools/tesh/background.tesh
index 7c9de93..359d2a5 100644 (file)
--- a/tools/tesh/background.tesh
+++ b/tools/tesh/background.tesh
@@ -9,13 +9,20 @@ $ cd temp_testdir_background
 < #include <sys/types.h>
 < #include <sys/stat.h>
 < #include <fcntl.h>
 < #include <sys/types.h>
 < #include <sys/stat.h>
 < #include <fcntl.h>

+< #ifdef WIN32 
+<   #include "windows.h"
+< #endif

 <                   
 < int main() {
 <   char buff[2048];
 <   int got;
 <   int in;
 < 
 <                   
 < int main() {
 <   char buff[2048];
 <   int got;
 <   int in;
 < 

+< #ifndef WIN32 

 <   sleep(1);
 <   sleep(1);

+< #else
+<   Sleep(1000);
+< #endif

 <   in = open("tmp_fich",O_RDONLY|O_CREAT);
 <   if (in == -1) {
 <     perror("Cannot open tmp_fich: ");
 <   in = open("tmp_fich",O_RDONLY|O_CREAT);
 <   if (in == -1) {
 <     perror("Cannot open tmp_fich: ");