From: Arnaud Giersch Date: Tue, 29 Aug 2017 20:04:12 +0000 (+0200) Subject: Remove bogus setenv. X-Git-Tag: v3_17~186 X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/05808d9852b605a7788964e7dd5152b26a25bc44 Remove bogus setenv. --- diff --git a/teshsuite/smpi/coll-allgather/coll-allgather.tesh b/teshsuite/smpi/coll-allgather/coll-allgather.tesh index cda0bba97f..7f6d031a31 100644 --- a/teshsuite/smpi/coll-allgather/coll-allgather.tesh +++ b/teshsuite/smpi/coll-allgather/coll-allgather.tesh @@ -1,5 +1,4 @@ # Smpi Alltoall collectives tests -! setenv LD_LIBRARY_PATH=../../lib ! output sort p Test allgather diff --git a/teshsuite/smpi/coll-allgatherv/coll-allgatherv.tesh b/teshsuite/smpi/coll-allgatherv/coll-allgatherv.tesh index b3a6e49531..835f62872d 100644 --- a/teshsuite/smpi/coll-allgatherv/coll-allgatherv.tesh +++ b/teshsuite/smpi/coll-allgatherv/coll-allgatherv.tesh @@ -1,5 +1,4 @@ # Smpi Allgatherv collectives tests -! setenv LD_LIBRARY_PATH=../../lib ! output sort p Test allgatherv diff --git a/teshsuite/smpi/coll-allreduce/coll-allreduce-automatic.tesh b/teshsuite/smpi/coll-allreduce/coll-allreduce-automatic.tesh index 57d1fa2bf5..b8b77622c1 100644 --- a/teshsuite/smpi/coll-allreduce/coll-allreduce-automatic.tesh +++ b/teshsuite/smpi/coll-allreduce/coll-allreduce-automatic.tesh @@ -1,5 +1,4 @@ # Smpi Allreduce collectives tests -! setenv LD_LIBRARY_PATH=../../lib p Test allreduce ! output sort diff --git a/teshsuite/smpi/coll-allreduce/coll-allreduce-large.tesh b/teshsuite/smpi/coll-allreduce/coll-allreduce-large.tesh index 841a8f4c00..1aa4a721a6 100644 --- a/teshsuite/smpi/coll-allreduce/coll-allreduce-large.tesh +++ b/teshsuite/smpi/coll-allreduce/coll-allreduce-large.tesh @@ -1,5 +1,4 @@ # Smpi Allreduce collectives tests -! setenv LD_LIBRARY_PATH=../../lib ! output sort ! timeout 20 diff --git a/teshsuite/smpi/coll-allreduce/coll-allreduce.tesh b/teshsuite/smpi/coll-allreduce/coll-allreduce.tesh index f3eefc0010..f1b9a3c67c 100644 --- a/teshsuite/smpi/coll-allreduce/coll-allreduce.tesh +++ b/teshsuite/smpi/coll-allreduce/coll-allreduce.tesh @@ -1,5 +1,4 @@ # Smpi Allreduce collectives tests -! setenv LD_LIBRARY_PATH=../../lib ! output sort p Test allreduce diff --git a/teshsuite/smpi/coll-alltoall/clusters.tesh b/teshsuite/smpi/coll-alltoall/clusters.tesh index 49527e232b..1367a2e437 100644 --- a/teshsuite/smpi/coll-alltoall/clusters.tesh +++ b/teshsuite/smpi/coll-alltoall/clusters.tesh @@ -1,5 +1,4 @@ # Smpi Alltoall on various cluster files, with several routings -! setenv LD_LIBRARY_PATH=../../lib ! output sort p Test classic - backbone diff --git a/teshsuite/smpi/coll-alltoall/coll-alltoall.tesh b/teshsuite/smpi/coll-alltoall/coll-alltoall.tesh index d9cf5d269c..1dda4e2314 100644 --- a/teshsuite/smpi/coll-alltoall/coll-alltoall.tesh +++ b/teshsuite/smpi/coll-alltoall/coll-alltoall.tesh @@ -1,5 +1,4 @@ # Smpi Alltoall collectives tests -! setenv LD_LIBRARY_PATH=../../lib ! output sort p Test all to all diff --git a/teshsuite/smpi/coll-alltoallv/coll-alltoallv.tesh b/teshsuite/smpi/coll-alltoallv/coll-alltoallv.tesh index dfcf17e975..02acc662d7 100644 --- a/teshsuite/smpi/coll-alltoallv/coll-alltoallv.tesh +++ b/teshsuite/smpi/coll-alltoallv/coll-alltoallv.tesh @@ -1,5 +1,4 @@ # Smpi Alltoall collectives tests -! setenv LD_LIBRARY_PATH=../../lib ! output sort p Test all to all diff --git a/teshsuite/smpi/coll-barrier/coll-barrier.tesh b/teshsuite/smpi/coll-barrier/coll-barrier.tesh index 6dd68217aa..6f92664c2a 100644 --- a/teshsuite/smpi/coll-barrier/coll-barrier.tesh +++ b/teshsuite/smpi/coll-barrier/coll-barrier.tesh @@ -1,5 +1,4 @@ # Smpi scatter collectives tests -! setenv LD_LIBRARY_PATH=../../lib ! output sort p Test barrier diff --git a/teshsuite/smpi/coll-bcast/coll-bcast.tesh b/teshsuite/smpi/coll-bcast/coll-bcast.tesh index 000ddca254..32d741e360 100644 --- a/teshsuite/smpi/coll-bcast/coll-bcast.tesh +++ b/teshsuite/smpi/coll-bcast/coll-bcast.tesh @@ -1,5 +1,4 @@ p Test Broadcast with more processes than hosts -! setenv LD_LIBRARY_PATH=../../lib ! output sort $ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile_coll -platform ../../../examples/platforms/small_platform.xml -np 16 --log=xbt_cfg.thres:critical ${bindir:=.}/coll-bcast --log=smpi_kernel.thres:warning --log=smpi_coll.thres:error diff --git a/teshsuite/smpi/coll-gather/coll-gather.tesh b/teshsuite/smpi/coll-gather/coll-gather.tesh index 6ac136a319..99efd2b02a 100644 --- a/teshsuite/smpi/coll-gather/coll-gather.tesh +++ b/teshsuite/smpi/coll-gather/coll-gather.tesh @@ -1,5 +1,4 @@ # Smpi Alltoall collectives tests -! setenv LD_LIBRARY_PATH=../../lib ! output sort ! timeout 30 diff --git a/teshsuite/smpi/coll-reduce-scatter/coll-reduce-scatter.tesh b/teshsuite/smpi/coll-reduce-scatter/coll-reduce-scatter.tesh index 557b7c9d28..5c04f3e35d 100644 --- a/teshsuite/smpi/coll-reduce-scatter/coll-reduce-scatter.tesh +++ b/teshsuite/smpi/coll-reduce-scatter/coll-reduce-scatter.tesh @@ -1,5 +1,4 @@ # Smpi reduce scatter collectives tests -! setenv LD_LIBRARY_PATH=../../lib ! output sort p Test reduce_scatter diff --git a/teshsuite/smpi/coll-reduce/coll-reduce.tesh b/teshsuite/smpi/coll-reduce/coll-reduce.tesh index b33cfb305a..bbab866811 100644 --- a/teshsuite/smpi/coll-reduce/coll-reduce.tesh +++ b/teshsuite/smpi/coll-reduce/coll-reduce.tesh @@ -1,5 +1,4 @@ # Smpi Allreduce collectives tests -! setenv LD_LIBRARY_PATH=../../lib ! output sort p Test allreduce diff --git a/teshsuite/smpi/coll-scatter/coll-scatter.tesh b/teshsuite/smpi/coll-scatter/coll-scatter.tesh index f1ba5c6cf0..a7bd5a65f8 100644 --- a/teshsuite/smpi/coll-scatter/coll-scatter.tesh +++ b/teshsuite/smpi/coll-scatter/coll-scatter.tesh @@ -1,5 +1,4 @@ # Smpi scatter collectives tests -! setenv LD_LIBRARY_PATH=../../lib ! output sort p Test scatter diff --git a/teshsuite/smpi/macro-partial-shared-communication/macro-partial-shared-communication.tesh b/teshsuite/smpi/macro-partial-shared-communication/macro-partial-shared-communication.tesh index 7c17af24a3..839b94055f 100644 --- a/teshsuite/smpi/macro-partial-shared-communication/macro-partial-shared-communication.tesh +++ b/teshsuite/smpi/macro-partial-shared-communication/macro-partial-shared-communication.tesh @@ -1,5 +1,4 @@ p Test compute -! setenv LD_LIBRARY_PATH=../../lib ! output sort ! timeout 5 $ ${bindir:=.}/../../../smpi_script/bin/smpirun -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 4 ${bindir:=.}/macro-partial-shared-communication --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning diff --git a/teshsuite/smpi/macro-partial-shared/macro-partial-shared.tesh b/teshsuite/smpi/macro-partial-shared/macro-partial-shared.tesh index 9ae19143cc..985dbbef87 100644 --- a/teshsuite/smpi/macro-partial-shared/macro-partial-shared.tesh +++ b/teshsuite/smpi/macro-partial-shared/macro-partial-shared.tesh @@ -1,5 +1,4 @@ p Test compute -! setenv LD_LIBRARY_PATH=../../lib ! output sort ! timeout 5 $ ${bindir:=.}/../../../smpi_script/bin/smpirun -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 4 ${bindir:=.}/macro-partial-shared --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning diff --git a/teshsuite/smpi/macro-shared/macro-shared.tesh b/teshsuite/smpi/macro-shared/macro-shared.tesh index 2a79f0996c..af9fd486d7 100644 --- a/teshsuite/smpi/macro-shared/macro-shared.tesh +++ b/teshsuite/smpi/macro-shared/macro-shared.tesh @@ -1,5 +1,4 @@ p Test compute -! setenv LD_LIBRARY_PATH=../../lib ! output sort ! timeout 5 $ ${bindir:=.}/../../../smpi_script/bin/smpirun -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 4 ${bindir:=.}/macro-shared --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning diff --git a/teshsuite/smpi/privatization/privatization.tesh b/teshsuite/smpi/privatization/privatization.tesh index b04775fc75..c749a9e563 100644 --- a/teshsuite/smpi/privatization/privatization.tesh +++ b/teshsuite/smpi/privatization/privatization.tesh @@ -1,5 +1,4 @@ p Test privatization -! setenv LD_LIBRARY_PATH=../../lib ! timeout 5 $ ${bindir:=.}/../../../smpi_script/bin/smpirun -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 32 ${bindir:=.}/privatization --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning --cfg=smpi/privatization:1 --log=simix_context.thres:error --log=xbt_memory_map.thres:critical > You requested to use 32 ranks, but there is only 5 processes in your hostfile... diff --git a/teshsuite/smpi/privatization/privatization_dlopen.tesh b/teshsuite/smpi/privatization/privatization_dlopen.tesh index ced2221bae..6dea653099 100644 --- a/teshsuite/smpi/privatization/privatization_dlopen.tesh +++ b/teshsuite/smpi/privatization/privatization_dlopen.tesh @@ -1,5 +1,4 @@ p Test privatization with dlopen -! setenv LD_LIBRARY_PATH=../../lib ! timeout 5 $ ${bindir:=.}/../../../smpi_script/bin/smpirun -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 32 ${bindir:=.}/privatization --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning --cfg=smpi/privatization:dlopen --log=simix_context.thres:error > You requested to use 32 ranks, but there is only 5 processes in your hostfile... diff --git a/teshsuite/smpi/pt2pt-dsend/pt2pt-dsend.tesh b/teshsuite/smpi/pt2pt-dsend/pt2pt-dsend.tesh index 23f4e201ad..ea6e70929f 100644 --- a/teshsuite/smpi/pt2pt-dsend/pt2pt-dsend.tesh +++ b/teshsuite/smpi/pt2pt-dsend/pt2pt-dsend.tesh @@ -1,5 +1,4 @@ p Test dsend -! setenv LD_LIBRARY_PATH=../../lib ! output sort $ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 2 ${bindir:=.}/pt2pt-dsend -q --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning > [Jupiter:1:(2) 0.000000] [dsend/INFO] rank 1: data exchanged @@ -11,7 +10,6 @@ p Test dsend with timings injection p message size is 4 bytes p process 1 will finish at 0.5+2*4 (send) + 1+0.1*4 (isend) = 9.9s p process 2 will finish at 0.5+2*4 (time before first send) + 2*(1+0.5*4) (recv+irecv) + 0.005890 (network time, same as before) = 14.505890s -! setenv LD_LIBRARY_PATH=../../lib ! output sort $ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 2 ${bindir:=.}/pt2pt-dsend -q --log=smpi_kernel.thres:warning --cfg=smpi/or:0:1:0.5 --cfg=smpi/os:0:0.5:2 --cfg=smpi/ois:0:1:0.1 --log=xbt_cfg.thres:warning > [Jupiter:1:(2) 9.900000] [dsend/INFO] rank 1: data exchanged diff --git a/teshsuite/smpi/pt2pt-pingpong/TI_output.tesh b/teshsuite/smpi/pt2pt-pingpong/TI_output.tesh index 41b3d1315c..adacbe79ff 100644 --- a/teshsuite/smpi/pt2pt-pingpong/TI_output.tesh +++ b/teshsuite/smpi/pt2pt-pingpong/TI_output.tesh @@ -3,7 +3,6 @@ $ rm -rf ./out_in_ti.txt_files p Test output of time independent tracing p generate a trace with pingpong, and replay itself, then check that output trace of the second run is the same as in the first (once sorted) -! setenv LD_LIBRARY_PATH=../../lib ! output sort $ ${bindir:=.}/../../../smpi_script/bin/smpirun -trace-ti --cfg=tracing/filename:out_in_ti.txt --cfg=smpi/simulate-computation:no -map -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 4 ${bindir:=.}/pt2pt-pingpong -q --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning > diff --git a/teshsuite/smpi/pt2pt-pingpong/broken_hostfiles.tesh b/teshsuite/smpi/pt2pt-pingpong/broken_hostfiles.tesh index fe266ef04b..3629028f3e 100644 --- a/teshsuite/smpi/pt2pt-pingpong/broken_hostfiles.tesh +++ b/teshsuite/smpi/pt2pt-pingpong/broken_hostfiles.tesh @@ -1,4 +1,3 @@ -! setenv LD_LIBRARY_PATH=../../lib ! expect return 1 $ ${bindir:=.}/../../../smpi_script/bin/smpirun -hostfile ../hostfile_empty -platform ../../../examples/platforms/small_platform.xml -np 4 ${bindir:=.}/pt2pt-pingpong -q --log=smpi_kernel.thres:warning > [smpirun] ** error: the hostfile '../hostfile_empty' is empty. Aborting. diff --git a/teshsuite/smpi/pt2pt-pingpong/pt2pt-pingpong.tesh b/teshsuite/smpi/pt2pt-pingpong/pt2pt-pingpong.tesh index 9bcbfa9970..6120d55019 100644 --- a/teshsuite/smpi/pt2pt-pingpong/pt2pt-pingpong.tesh +++ b/teshsuite/smpi/pt2pt-pingpong/pt2pt-pingpong.tesh @@ -1,5 +1,4 @@ p Test pingpong -! setenv LD_LIBRARY_PATH=../../lib ! output sort $ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 4 ${bindir:=.}/pt2pt-pingpong -q --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning > *** Ping-pong test (MPI_Send/MPI_Recv) *** diff --git a/teshsuite/smpi/timers/timers.tesh b/teshsuite/smpi/timers/timers.tesh index 9726e7b82c..92448d179b 100644 --- a/teshsuite/smpi/timers/timers.tesh +++ b/teshsuite/smpi/timers/timers.tesh @@ -1,5 +1,4 @@ p Test timers -! setenv LD_LIBRARY_PATH=../../lib $ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 1 ${bindir:=.}/timers -q --log=smpi_kernel.thres:warning --cfg=smpi/simulate-computation:no --cfg=smpi/host-speed:100000 --log=xbt_cfg.thres:warning > [rank 0] -> Tremblay diff --git a/teshsuite/smpi/type-hvector/type-hvector.tesh b/teshsuite/smpi/type-hvector/type-hvector.tesh index 91bbe67d68..839186d9c2 100644 --- a/teshsuite/smpi/type-hvector/type-hvector.tesh +++ b/teshsuite/smpi/type-hvector/type-hvector.tesh @@ -1,5 +1,4 @@ p Test hvector -! setenv LD_LIBRARY_PATH=../../lib ! output sort $ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 2 ${bindir:=.}/type-hvector -q --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning > [rank 0] -> Tremblay diff --git a/teshsuite/smpi/type-indexed/type-indexed.tesh b/teshsuite/smpi/type-indexed/type-indexed.tesh index 9bf1d2ff09..933004363e 100644 --- a/teshsuite/smpi/type-indexed/type-indexed.tesh +++ b/teshsuite/smpi/type-indexed/type-indexed.tesh @@ -1,5 +1,4 @@ p Test indexed -! setenv LD_LIBRARY_PATH=../../lib ! output sort $ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 2 ${bindir:=.}/type-indexed -q --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning > [rank 0] -> Tremblay diff --git a/teshsuite/smpi/type-struct/type-struct.tesh b/teshsuite/smpi/type-struct/type-struct.tesh index 6340f9223b..f564cbb3b7 100644 --- a/teshsuite/smpi/type-struct/type-struct.tesh +++ b/teshsuite/smpi/type-struct/type-struct.tesh @@ -1,5 +1,4 @@ p Test struct -! setenv LD_LIBRARY_PATH=../../lib ! output sort $ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile -platform ../../../examples/platforms/small_platform.xml -np 2 ${bindir:=.}/type-struct -q --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning > [rank 0] -> Tremblay diff --git a/teshsuite/smpi/type-vector/type-vector.tesh b/teshsuite/smpi/type-vector/type-vector.tesh index 5b23a477e5..d756d2abe9 100644 --- a/teshsuite/smpi/type-vector/type-vector.tesh +++ b/teshsuite/smpi/type-vector/type-vector.tesh @@ -1,5 +1,4 @@ p Test vector -! setenv LD_LIBRARY_PATH=../../lib ! output sort $ ${bindir:=.}/../../../smpi_script/bin/smpirun -map -hostfile ../hostfile -platform ${srcdir:=.}/../../../examples/platforms/small_platform.xml -np 2 ${bindir:=.}/type-vector -q --log=smpi_kernel.thres:warning --log=xbt_cfg.thres:warning > [rank 0] -> Tremblay