From: Pierre Veyre Date: Fri, 27 Sep 2013 15:33:43 +0000 (+0200) Subject: Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid X-Git-Tag: v3_9_90~71 X-Git-Url: http://bilbo.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b08c515d1ded5726d50e3e9e11c03260e3e1546d?hp=e26762bef97dffeaca2bbc7623153a793766de45 Merge branch 'master' of git+ssh://scm.gforge.inria.fr//gitroot/simgrid/simgrid --- diff --git a/CMakeLists.txt b/CMakeLists.txt index a1b4f44744..b68c5034ec 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -74,8 +74,7 @@ else() endif() endif() -string(REGEX MATCH "gcc" GCC "${CMAKE_C_COMPILER}") -if(GCC) +if(${CMAKE_C_COMPILER_ID} STREQUAL "GNU") exec_program("${CMAKE_C_COMPILER} --version" OUTPUT_VARIABLE "COMPILER_C_VERSION") exec_program("${CMAKE_CXX_COMPILER} --version" OUTPUT_VARIABLE "COMPILER_CXX_VERSION") string(REGEX MATCH "[0-9].[0-9].[0-9]" COMPILER_C_VERSION "${COMPILER_C_VERSION}") @@ -191,10 +190,6 @@ endif() include_directories(${INCLUDES}) -### Determine the assembly flavor that we need today -include(CMakeDetermineSystem) -set(PROCESSOR_${CMAKE_SYSTEM_PROCESSOR} 1) - ### Setup Options include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Option.cmake) diff --git a/buildtools/Cmake/CompleteInFiles.cmake b/buildtools/Cmake/CompleteInFiles.cmake index 472744646c..e8120d2867 100644 --- a/buildtools/Cmake/CompleteInFiles.cmake +++ b/buildtools/Cmake/CompleteInFiles.cmake @@ -7,16 +7,15 @@ set(CMAKE_MODULE_PATH # x86 # i.86 +### Determine the assembly flavor that we need today +include(CMakeDetermineSystem) IF(CMAKE_SYSTEM_PROCESSOR MATCHES ".86") IF(${ARCH_32_BITS}) + message(STATUS "System processor: i686 (${CMAKE_SYSTEM_PROCESSOR}, 32 bits)") set(PROCESSOR_i686 1) - set(SIMGRID_SYSTEM_PROCESSOR "${CMAKE_SYSTEM_PROCESSOR}") - message(STATUS "System processor: ${CMAKE_SYSTEM_PROCESSOR}") ELSE() - message(STATUS "System processor: amd64") - set(SIMGRID_SYSTEM_PROCESSOR "amd64") + message(STATUS "System processor: x86_64 (${CMAKE_SYSTEM_PROCESSOR}, 64 bits)") set(PROCESSOR_x86_64 1) - set(PROCESSOR_i686 0) ENDIF() set(HAVE_RAWCTX 1) @@ -57,6 +56,12 @@ ELSE() #PROCESSOR NOT FOUND ENDIF() +if(ARCH_32_BITS) + set(MPI_ADDRESS_SIZE 4) +else() + set(MPI_ADDRESS_SIZE 8) +endif() + message(STATUS "Cmake version ${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}") include(CheckFunctionExists) @@ -780,6 +785,7 @@ set(includedir "${CMAKE_INSTALL_PREFIX}/include") set(libdir ${exec_prefix}/lib) set(CMAKE_SMPI_COMMAND "export LD_LIBRARY_PATH=${CMAKE_INSTALL_PREFIX}/lib:${GTNETS_LIB_PATH}:${HAVE_NS3_LIB}:$LD_LIBRARY_PATH") +configure_file(${CMAKE_HOME_DIRECTORY}/include/smpi/mpif.h.in ${CMAKE_BINARY_DIR}/include/smpi/mpif.h @ONLY) configure_file(${CMAKE_HOME_DIRECTORY}/include/smpi/smpif.h.in ${CMAKE_BINARY_DIR}/include/smpi/smpif.h @ONLY) configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpicc.in ${CMAKE_BINARY_DIR}/bin/smpicc @ONLY) configure_file(${CMAKE_HOME_DIRECTORY}/src/smpi/smpif2c.in ${CMAKE_BINARY_DIR}/bin/smpif2c @ONLY) @@ -817,6 +823,7 @@ if(NOT WIN32) endif() set(generated_headers_to_install + ${CMAKE_CURRENT_BINARY_DIR}/include/smpi/mpif.h ${CMAKE_CURRENT_BINARY_DIR}/include/smpi/smpif.h ${CMAKE_CURRENT_BINARY_DIR}/include/simgrid_config.h ) diff --git a/buildtools/Cmake/DefinePackages.cmake b/buildtools/Cmake/DefinePackages.cmake index 940acdb8d7..301ccb087c 100644 --- a/buildtools/Cmake/DefinePackages.cmake +++ b/buildtools/Cmake/DefinePackages.cmake @@ -534,7 +534,6 @@ set(headers_to_install include/simgrid/platf_generator.h include/simgrid/simix.h include/smpi/mpi.h - include/smpi/mpif.h include/smpi/smpi.h include/smpi/smpi_cocci.h include/smpi/smpi_main.h @@ -580,6 +579,7 @@ set(headers_to_install ) set(source_of_generated_headers include/simgrid_config.h.in + include/smpi/mpif.h.in include/smpi/smpif.h.in src/context_sysv_config.h.in) diff --git a/buildtools/Cmake/Flags.cmake b/buildtools/Cmake/Flags.cmake index c573f8151a..68cae01b69 100644 --- a/buildtools/Cmake/Flags.cmake +++ b/buildtools/Cmake/Flags.cmake @@ -4,6 +4,7 @@ set(optCFLAGS "") if(NOT __VISUALC__ AND NOT __BORLANDC__) set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}-g3") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}-g3") + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -g") else() set(CMAKE_C_FLAGS "${CMAKE_C_FLAGS}/Zi") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS}/Zi") @@ -18,7 +19,7 @@ if(enable_compile_warnings) string(REPLACE "-Wclobbered " "" warnCFLAGS "${warnCFLAGS}") endif() - set(CMAKE_Fortran_FLAGS "-Wall") # FIXME: Q&D hack + set(CMAKE_Fortran_FLAGS "${CMAKE_Fortran_FLAGS} -Wall") # FIXME: Q&D hack set(CMAKE_JAVA_COMPILE_FLAGS "-Xlint") endif() diff --git a/buildtools/Cmake/GenerateDocWin.cmake b/buildtools/Cmake/GenerateDocWin.cmake index a7bc518d4f..71b7f8dba0 100644 --- a/buildtools/Cmake/GenerateDocWin.cmake +++ b/buildtools/Cmake/GenerateDocWin.cmake @@ -16,8 +16,8 @@ endif() if(NSIS_PATH) ADD_CUSTOM_TARGET(nsis COMMENT "Generating the SimGrid installor for Windows..." - DEPENDS simgrid simgrid graphicator tesh simgrid-colorizer simgrid_update_xml + DEPENDS simgrid simgrid graphicator simgrid-colorizer simgrid_update_xml COMMAND ${NSIS_PATH}/makensis.exe simgrid.nsi WORKING_DIRECTORY ${CMAKE_BINARY_DIR}/ ) -endif() \ No newline at end of file +endif() diff --git a/buildtools/Cmake/MakeJava.cmake b/buildtools/Cmake/MakeJava.cmake index 86d7dd372d..e8f3de6a29 100644 --- a/buildtools/Cmake/MakeJava.cmake +++ b/buildtools/Cmake/MakeJava.cmake @@ -36,7 +36,7 @@ if(WIN32) message(STATUS "pexports: ${PEXPORTS_PATH}") if(PEXPORTS_PATH) add_custom_command(TARGET SG_java POST_BUILD - COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/SG_java.dll > ${CMAKE_BINARY_DIR}/SG_java.def) + COMMAND ${PEXPORTS_PATH}/pexports.exe ${CMAKE_BINARY_DIR}/lib/SG_java.dll > ${CMAKE_BINARY_DIR}/lib/SG_java.def) endif(PEXPORTS_PATH) endif() diff --git a/buildtools/Cmake/MakeLibWin.cmake b/buildtools/Cmake/MakeLibWin.cmake index 206ab5ca34..f596b1f901 100644 --- a/buildtools/Cmake/MakeLibWin.cmake +++ b/buildtools/Cmake/MakeLibWin.cmake @@ -1,6 +1,9 @@ ### Make Libs #>gcc c:\simgrid-trunk\examples\msg\icomms\peer.c -static -Lc:\simgrid-trunk\lib -lsimgrid -Ic:\simgrid-trunk\include -lwsock32 +if(enable_java) + include(${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/MakeJava.cmake) +endif() add_library(simgrid SHARED ${simgrid_sources}) diff --git a/buildtools/Cmake/PrintArgs.cmake b/buildtools/Cmake/PrintArgs.cmake index eb7d3c2a58..d15127a6f1 100644 --- a/buildtools/Cmake/PrintArgs.cmake +++ b/buildtools/Cmake/PrintArgs.cmake @@ -123,7 +123,6 @@ message(" Graphviz mode .......: ${HAVE_GRAPHVIZ}") message(" Mallocators .........: ${enable_mallocators}") message("") message(" Simgrid dependencies : ${SIMGRID_DEP}") -message(" Smpi dependencies ...: ${SMPI_DEP}") message("") message(" INSTALL_PREFIX ......: ${CMAKE_INSTALL_PREFIX}") diff --git a/buildtools/Cmake/Scripts/tesh.pl b/buildtools/Cmake/Scripts/tesh.pl index a5b53c437a..cbdc724554 100755 --- a/buildtools/Cmake/Scripts/tesh.pl +++ b/buildtools/Cmake/Scripts/tesh.pl @@ -13,9 +13,10 @@ tesh -- testing shell B [I] I =cut -my($bindir); -my($srcdir); +my($bindir)="."; +my($srcdir)="."; my $path = $0; +my $OS; $path =~ s|[^/]*$||; push @INC,$path; @@ -24,14 +25,22 @@ use strict; use Term::ANSIColor; use IPC::Open3; -my($OS)=`echo %OS%`; -if($OS eq "%OS%"){ +if($^O eq "linux"){ $OS = "UNIX"; } else{ $OS = "WIN"; } + +sub trim($) +{ + my $string = shift; + $string =~ s/^\s+//; + $string =~ s/\s+$//; + return $string; +} + print "OS: ".$OS."\n"; # make sure we received a tesh file @@ -59,8 +68,14 @@ sub cd_cmd { } sub setenv_cmd { - if ($_[1] =~ /^(.*)=(.*)$/) { - my($var,$ctn)=($1,$2); + my($var,$ctn); + if ($_[0] =~ /^(.*)=(.*)$/) { + ($var,$ctn)=($1,$2); + }elsif ($_[1] =~ /^(.*)=(.*)$/) { + ($var,$ctn)=($1,$2); + } else { + die "[Tesh/CRITICAL] Malformed argument to setenv: expected 'name=value' but got '$_[1]'\n"; + } if($var =~ /bindir/){ print "[Tesh/INFO] setenv $var=$ctn\n"; @@ -76,9 +91,6 @@ sub setenv_cmd { print "[Tesh/INFO] setenv $var=$ctn\n"; } } - } else { - die "[Tesh/CRITICAL] Malformed argument to setenv: expected 'name=value' but got '$_[1]'\n"; - } } # Main option parsing sub @@ -220,12 +232,25 @@ sub exec_cmd { my @got; while(defined(my $got=)) { $got =~ s/\r//g; - #$got =~ s/^( )*//g; + $got =~ s/^( )*//g; chomp $got; - push @got, "$got"; + $got=trim($got); + if( $got ne ""){ + push @got, "$got"; + } } close OUT; - + + if ($sort){ + sub mysort{ + $a cmp $b + } + use sort qw(defaults _quicksort); # force quicksort + @got = sort mysort @got; + #also resort the other one, as perl sort is not the same as the C one used to generate teshes + @{$cmd{'out'}}=sort mysort @{$cmd{'out'}}; + } + # Cleanup the executing child, and kill the timeouter brother on need $cmd{'return'} = 0 unless defined($cmd{'return'}); my $wantret = "returned code ".(defined($cmd{'return'})? $cmd{'return'} : 0); @@ -304,7 +329,10 @@ LINE: while (defined(my $line=)) { if ($cmd =~ /^#/) { #comment } elsif ($cmd eq '> '){ #expected result line print "[TESH/debug] push expected result\n" if $opts{'debug'}; - push @{$cmd{'out'}}, $arg; + $arg=trim($arg); + if($arg ne ""){ + push @{$cmd{'out'}}, $arg; + } } elsif ($cmd eq '< ') { # provided input print "[TESH/debug] push provided input\n" if $opts{'debug'}; @@ -346,6 +374,7 @@ LINE: while (defined(my $line=)) { $cmd{'cmd'} = $arg; } elsif($line =~ /^! output sort/){ #output sort + $sort=1; $cmd{'sort'} = 1; } elsif($line =~ /^! output ignore/){ #output ignore diff --git a/buildtools/Cmake/src/simgrid.nsi.in b/buildtools/Cmake/src/simgrid.nsi.in index 2105d4d1c9..c53efe4e43 100644 --- a/buildtools/Cmake/src/simgrid.nsi.in +++ b/buildtools/Cmake/src/simgrid.nsi.in @@ -201,9 +201,9 @@ Section "SMPI Library" SMPISection setOutPath $INSTDIR\include\smpi file @CMAKE_HOME_DIRECTORY@\include\smpi\smpi.h file @CMAKE_HOME_DIRECTORY@\include\smpi\mpi.h - file @CMAKE_HOME_DIRECTORY@\include\smpi\mpif.h file @CMAKE_HOME_DIRECTORY@\include\smpi\smpi_cocci.h file @CMAKE_HOME_DIRECTORY@\include\smpi\smpi_main.h + file include\smpi\mpif.h file include\smpi\smpif.h CreateDirectory $INSTDIR\examples\smpi diff --git a/doc/doxygen/platform.doc b/doc/doxygen/platform.doc index 93e2e25711..1101198e49 100644 --- a/doc/doxygen/platform.doc +++ b/doc/doxygen/platform.doc @@ -162,15 +162,16 @@ contain more than 1 core. Here are the attributes of a host : referring to it. \li power (mandatory):the peak number FLOPS the CPU can manage. Expressed in flop/s. -\li core: The number of core of this host. If set, the power - gives the power of one core. The specified computing power will be +\li core: The number of core of this host (by default, 1). If + you specify the amount of cores, the 'power' parameter is the power + of each core. + For example, if you specify that your host has 6 cores, it will be available to up to 6 sequential tasks without sharing. If more tasks are placed on this host, the resource will be shared - accordingly. For example, if you schedule 12 tasks on the host, - each will get half of the computing power. Please note that - although sound, this model were never scientifically assessed. + accordingly. For example, if you schedule 12 tasks on that host, + each will get half of the specified computing power. Please note + that although sound, this model were never scientifically assessed. Please keep this fact in mind when using it. - \li availability: specify if the percentage of power available. \li availability_file: Allow you to use a file as input. This file will contain availability traces for this computer. The diff --git a/include/smpi/mpif.h b/include/smpi/mpif.h.in similarity index 98% rename from include/smpi/mpif.h rename to include/smpi/mpif.h.in index 88922f3ae9..c6a96a2857 100644 --- a/include/smpi/mpif.h +++ b/include/smpi/mpif.h.in @@ -182,8 +182,8 @@ parameter(MPI_BXOR=11) INTEGER MPI_ADDRESS_KIND, MPI_OFFSET_KIND - PARAMETER (MPI_ADDRESS_KIND=8) - PARAMETER (MPI_OFFSET_KIND=8) + PARAMETER (MPI_ADDRESS_KIND=@MPI_ADDRESS_SIZE@) + PARAMETER (MPI_OFFSET_KIND=@MPI_ADDRESS_SIZE@) INTEGER MPI_MODE_NOPRECEDE PARAMETER (MPI_MODE_NOPRECEDE=8192) diff --git a/src/simgrid/sg_config.c b/src/simgrid/sg_config.c index c56c6496f5..77d8befa7e 100644 --- a/src/simgrid/sg_config.c +++ b/src/simgrid/sg_config.c @@ -608,7 +608,7 @@ void sg_config_init(int *argc, char **argv) /* stack size of contexts in Ko */ xbt_cfg_register(&_sg_cfg_set, "contexts/stack_size", - "Stack size of contexts in Kib (ucontext or raw only)", + "Stack size of contexts in Kib", xbt_cfgelm_int, 1, 1, _sg_cfg_cb_context_stack_size, NULL); xbt_cfg_setdefault_int(_sg_cfg_set, "contexts/stack_size", 128); diff --git a/src/simix/smx_context_raw.c b/src/simix/smx_context_raw.c index bd78c9cff9..2fdb6d9d2c 100644 --- a/src/simix/smx_context_raw.c +++ b/src/simix/smx_context_raw.c @@ -44,7 +44,7 @@ extern raw_stack_t raw_makecontext(char* malloced_stack, int stack_size, rawctx_entry_point_t entry_point, void* arg); extern void raw_swapcontext(raw_stack_t* old, raw_stack_t new); -#ifdef PROCESSOR_x86_64 +#if PROCESSOR_x86_64 __asm__ ( #if defined(APPLE) ".text\n" diff --git a/teshsuite/smpi/mpich3-test/datatype/hindexed-zeros.c b/teshsuite/smpi/mpich3-test/datatype/hindexed-zeros.c index 4d4c39a233..db9d165315 100644 --- a/teshsuite/smpi/mpich3-test/datatype/hindexed-zeros.c +++ b/teshsuite/smpi/mpich3-test/datatype/hindexed-zeros.c @@ -11,7 +11,6 @@ static int verbose = 0; -int main(int argc, char *argv[]); int parse_args(int argc, char **argv); int hindexed_zerotype_test(void); int hindexed_sparsetype_test(void); diff --git a/teshsuite/smpi/mpich3-test/datatype/localpack.c b/teshsuite/smpi/mpich3-test/datatype/localpack.c index 5348d55f14..11e165a082 100644 --- a/teshsuite/smpi/mpich3-test/datatype/localpack.c +++ b/teshsuite/smpi/mpich3-test/datatype/localpack.c @@ -20,7 +20,6 @@ static int verbose = 0; #define BUF_SIZE 16384 -int main(int argc, char *argv[]); int parse_args(int argc, char **argv); int main(int argc, char *argv[]) diff --git a/teshsuite/smpi/mpich3-test/datatype/lots-of-types.c b/teshsuite/smpi/mpich3-test/datatype/lots-of-types.c index 9722167b7e..418ff0bce8 100644 --- a/teshsuite/smpi/mpich3-test/datatype/lots-of-types.c +++ b/teshsuite/smpi/mpich3-test/datatype/lots-of-types.c @@ -18,7 +18,6 @@ */ static int verbose = 1; -int main(int argc, char *argv[]); int parse_args(int argc, char **argv); int lots_of_types_test(void); diff --git a/teshsuite/smpi/mpich3-test/datatype/slice-pack-external.c b/teshsuite/smpi/mpich3-test/datatype/slice-pack-external.c index 8f4c004f93..25038fc192 100644 --- a/teshsuite/smpi/mpich3-test/datatype/slice-pack-external.c +++ b/teshsuite/smpi/mpich3-test/datatype/slice-pack-external.c @@ -12,7 +12,6 @@ static int verbose = 0; int a[100][100][100], e[9][9][9]; -int main(int argc, char *argv[]); /* helper functions */ static int parse_args(int argc, char **argv); diff --git a/teshsuite/smpi/mpich3-test/datatype/slice-pack.c b/teshsuite/smpi/mpich3-test/datatype/slice-pack.c index 8fcd3b596d..ef8c3c97a8 100644 --- a/teshsuite/smpi/mpich3-test/datatype/slice-pack.c +++ b/teshsuite/smpi/mpich3-test/datatype/slice-pack.c @@ -16,7 +16,6 @@ static int verbose = 0; int a[100][100][100], e[9][9][9]; -int main(int argc, char *argv[]); /* helper functions */ static int parse_args(int argc, char **argv); diff --git a/teshsuite/smpi/mpich3-test/datatype/struct-empty-el.c b/teshsuite/smpi/mpich3-test/datatype/struct-empty-el.c index 3704293a61..d0c57bd55d 100644 --- a/teshsuite/smpi/mpich3-test/datatype/struct-empty-el.c +++ b/teshsuite/smpi/mpich3-test/datatype/struct-empty-el.c @@ -11,7 +11,6 @@ static int verbose = 0; -int main(int argc, char *argv[]); int parse_args(int argc, char **argv); int single_struct_test(void); diff --git a/teshsuite/smpi/mpich3-test/datatype/struct-pack.c b/teshsuite/smpi/mpich3-test/datatype/struct-pack.c index d7b5719a44..cf16e6a279 100644 --- a/teshsuite/smpi/mpich3-test/datatype/struct-pack.c +++ b/teshsuite/smpi/mpich3-test/datatype/struct-pack.c @@ -11,7 +11,6 @@ static int verbose = 0; -int main(int argc, char *argv[]); int parse_args(int argc, char **argv); int single_struct_test(void); int array_of_structs_test(void); diff --git a/teshsuite/smpi/mpich3-test/datatype/transpose-pack.c b/teshsuite/smpi/mpich3-test/datatype/transpose-pack.c index 1cd22028d5..18e2c59273 100644 --- a/teshsuite/smpi/mpich3-test/datatype/transpose-pack.c +++ b/teshsuite/smpi/mpich3-test/datatype/transpose-pack.c @@ -15,7 +15,6 @@ static int verbose = 0; -int main(int argc, char *argv[]); int parse_args(int argc, char **argv); int main(int argc, char *argv[]) diff --git a/teshsuite/smpi/mpich3-test/datatype/triangular-pack.c b/teshsuite/smpi/mpich3-test/datatype/triangular-pack.c index 0720524d59..dde6eda4ce 100644 --- a/teshsuite/smpi/mpich3-test/datatype/triangular-pack.c +++ b/teshsuite/smpi/mpich3-test/datatype/triangular-pack.c @@ -10,8 +10,6 @@ #include "mpi.h" #include "mpitest.h" -int main(int argc, char *argv[]); - /* helper functions */ int parse_args(int argc, char **argv); diff --git a/teshsuite/smpi/mpich3-test/datatype/unusual-noncontigs.c b/teshsuite/smpi/mpich3-test/datatype/unusual-noncontigs.c index 5c608f8ee8..d6fd63cf1e 100644 --- a/teshsuite/smpi/mpich3-test/datatype/unusual-noncontigs.c +++ b/teshsuite/smpi/mpich3-test/datatype/unusual-noncontigs.c @@ -18,7 +18,6 @@ */ static int verbose = 1; -int main(int argc, char *argv[]); int parse_args(int argc, char **argv); int struct_negdisp_test(void); int vector_negstride_test(void); diff --git a/teshsuite/smpi/mpich3-test/include/mpitestconf.h b/teshsuite/smpi/mpich3-test/include/mpitestconf.h index eb39223af5..4eb4bb2c7a 100644 --- a/teshsuite/smpi/mpich3-test/include/mpitestconf.h +++ b/teshsuite/smpi/mpich3-test/include/mpitestconf.h @@ -57,8 +57,9 @@ //#define HAVE_FORTRAN_BINDING 0 /* Define to 1 if you have the `getrusage' function. */ +#ifndef WIN32 #define HAVE_GETRUSAGE 1 - +#endif /* Define if struct hostent contains h_addr_list */ #define HAVE_H_ADDR_LIST 1 @@ -141,8 +142,9 @@ #define HAVE_STRING_H 1 /* Define to 1 if you have the header file. */ +#ifndef WIN32 #define HAVE_SYS_RESOURCE_H 1 - +#endif /* Define to 1 if you have the header file. */ #define HAVE_SYS_STAT_H 1 diff --git a/teshsuite/smpi/mpich3-test/pt2pt/waitany-null.c b/teshsuite/smpi/mpich3-test/pt2pt/waitany-null.c index 9ba1eefa91..98df8ef8df 100644 --- a/teshsuite/smpi/mpich3-test/pt2pt/waitany-null.c +++ b/teshsuite/smpi/mpich3-test/pt2pt/waitany-null.c @@ -13,7 +13,6 @@ static int verbose = 0; -int main(int argc, char *argv[]); int parse_args(int argc, char **argv); int main(int argc, char *argv[]) diff --git a/tools/simgrid.supp b/tools/simgrid.supp index e904a368ec..6af801963a 100644 --- a/tools/simgrid.supp +++ b/tools/simgrid.supp @@ -53,35 +53,22 @@ # | } # `---- { - Memory leak in libcgraph (1/3) + Memory leak in libcgraph (1/2) Memcheck:Leak fun:malloc + ... obj:/usr/lib/libcgraph.so* fun:aaglex fun:aagparse fun:agconcat } { - Memory leak in libcgraph (2/3) + Memory leak in libcgraph (2/2) Memcheck:Leak fun:malloc - obj:/usr/lib/libcgraph.so* - fun:agalloc - obj:/usr/lib/libcgraph.so* + ... fun:agnode obj:/usr/lib/libcgraph.so* fun:aagparse fun:agconcat } -{ - Memory leak in libcgraph (3/3) - Memcheck:Leak - fun:malloc - fun:dtopen - fun:agdtopen - obj:/usr/lib/libcgraph.so* - fun:agstrdup - fun:aaglex - fun:aagparse - fun:agconcat -} diff --git a/tools/tesh/CMakeLists.txt b/tools/tesh/CMakeLists.txt index c099aa1d48..467c8e3d68 100644 --- a/tools/tesh/CMakeLists.txt +++ b/tools/tesh/CMakeLists.txt @@ -1,16 +1,20 @@ cmake_minimum_required(VERSION 2.6) if(WIN32) - #add_custom_target(tesh ALL - # DEPENDS ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/tesh.pl - # COMMENT "Install ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/tesh.pl" - # COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/tesh.pl ${CMAKE_BINARY_DIR}/bin/tesh - # ) +# add_custom_target(tesh ALL +# DEPENDS ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/tesh.pl +# COMMENT "Install ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/tesh.pl" +# COMMAND ${CMAKE_COMMAND} -E copy ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/tesh.pl ${CMAKE_BINARY_DIR}/bin/tesh +# ) file(COPY ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/tesh.pl DESTINATION ${CMAKE_BINARY_DIR}/bin/ FILE_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ GROUP_EXECUTE GROUP_READ) + file(COPY ${CMAKE_HOME_DIRECTORY}/buildtools/Cmake/Scripts/Diff.pm + DESTINATION ${CMAKE_BINARY_DIR} + FILE_PERMISSIONS OWNER_EXECUTE OWNER_WRITE OWNER_READ + GROUP_EXECUTE GROUP_READ) file(RENAME ${CMAKE_BINARY_DIR}/bin/tesh.pl ${CMAKE_BINARY_DIR}/bin/tesh) else() set(EXECUTABLE_OUTPUT_PATH "${CMAKE_BINARY_DIR}/bin")