From 23214b53eb7e6b63ba1e6cb618ccdaf2536de84e Mon Sep 17 00:00:00 2001 From: Ludovic Pouzenc Date: Sun, 12 Dec 2010 14:34:29 +0000 Subject: Ajout du support valgrind dans le script compil.sh git-svn-id: file:///var/svn/2010-netlemmings/trunk@203 077b3477-7977-48bd-8428-443f22f7bfda --- scripts/compil.sh | 23 ++++++++++++++++++++--- 1 file changed, 20 insertions(+), 3 deletions(-) diff --git a/scripts/compil.sh b/scripts/compil.sh index 1828044..865da98 100755 --- a/scripts/compil.sh +++ b/scripts/compil.sh @@ -8,22 +8,39 @@ echo -e "\tII. Cmake then make" if [ $# -gt 0 ] then case $1 in - test) echo -e "\tIII. Test" ctest -V;; + test) + echo -e "\tIII. Test" + ( cd "$BASEPATH/bin" && ctest -V ) + ;; launch) echo -e "\tIV. Serveur execution" cd "$BASEPATH/bin" #gnome-terminal -t SERVEUR -e "bash -c './server_on_piou.sh ; sleep 15'"& gnome-terminal -t SERVEUR --hide-menubar --geometry 48x15+10+0 -e "bash -c 'src/netlem_ds ; echo \"WAITING 15s\" ; sleep 15'"& echo "WAITING FEW SECONDS" - sleep 5; + sleep 2; echo -e "\tV. Client 1 execution" gnome-terminal -t CLIENT1 --hide-menubar --geometry 48x15+10+310 -e "bash -c 'src/netlem localhost; echo \"WAITING 15s\" ; sleep 15'"& sleep 1; echo -e "\tVI. Client 2 execution" gnome-terminal -t CLIENT2 --hide-menubar --geometry 48x15+10+600 -e "bash -c 'src/netlem localhost; echo \"WAITING 15s\" ; sleep 15'"& ;; + valgrind) + echo -e "\tIV. Serveur execution" + cd "$BASEPATH/bin" + #gnome-terminal -t SERVEUR -e "bash -c './server_on_piou.sh ; sleep 15'"& + gnome-terminal -t SERVEUR --hide-menubar --geometry 48x15+10+0 -e "bash -c 'src/netlem_ds ; echo \"WAITING 15s\" ; sleep 15'"& + echo "WAITING FEW SECONDS" + sleep 5; + echo -e "\tV. Client 1 execution" + gnome-terminal -t CLIENT1 --hide-menubar --geometry 48x15+10+310 -e "bash -c 'src/netlem localhost; echo \"WAITING 15s\" ; sleep 15'"& + sleep 1; + echo -e "\tVI. Client 2 execution (with valgrind)" + gnome-terminal -t CLIENT2 --hide-menubar --geometry 48x15+10+600 -e "bash -c 'valgrind src/netlem localhost; echo \"Press ENTER TO CLOSE\" ; read line'"& + ;; esac else - echo "Compilation done, please enter an argument to -test- or -launch- the game" + echo "Compilation done" + echo "You can add one of the following arg : test, launch, valgrind" fi -- cgit v1.2.3