From: Martin Quinson <martin.quinson@loria.fr>
Date: Wed, 14 Jun 2017 21:46:30 +0000 (+0200)
Subject: Merge branch 'ActivityPtr' of github.com:simgrid/simgrid into ActivityPtr
X-Git-Tag: v3.16~95
X-Git-Url: http://info.iut-bm.univ-fcomte.fr/pub/gitweb/simgrid.git/commitdiff_plain/b9a988d21c6d27486d4acf043e43360688c1e749?hp=8d8733c018b721a25cbab2edb8e7ba16fc98135a

Merge branch 'ActivityPtr' of github.com:simgrid/simgrid into ActivityPtr
---

diff --git a/teshsuite/s4u/CMakeLists.txt b/teshsuite/s4u/CMakeLists.txt
index 56b32611c3..cb1906439a 100644
--- a/teshsuite/s4u/CMakeLists.txt
+++ b/teshsuite/s4u/CMakeLists.txt
@@ -20,11 +20,10 @@ endforeach()
 
 # The output is not relevant
 ADD_TEST(tesh-s4u-comm-pt2pt   ${CMAKE_BINARY_DIR}/teshsuite/s4u/comm-pt2pt/comm-pt2pt   ${CMAKE_HOME_DIRECTORY}/examples/platforms/cluster.xml)
-ADD_TEST(tesh-s4u-comm-waitany ${CMAKE_BINARY_DIR}/teshsuite/s4u/comm-pt2pt/comm-waitany ${CMAKE_HOME_DIRECTORY}/examples/platforms/cluster.xml)
+ADD_TEST(tesh-s4u-comm-waitany ${CMAKE_BINARY_DIR}/teshsuite/s4u/comm-waitany/comm-waitany ${CMAKE_HOME_DIRECTORY}/examples/platforms/cluster.xml)
 
 
 
 set(teshsuite_src ${teshsuite_src}  PARENT_SCOPE)
 set(tesh_files    ${tesh_files}     PARENT_SCOPE)
 set(xml_files     ${xml_files}      PARENT_SCOPE)
-