lttv: Look for executable in run script

[lttv.git] / runlttv

diff --git a/runlttv b/runlttv
index 82296c3e50df15b7a6284fc14b1ee6cd4eb213fe..31728d65b0d3c786cd93b5b8d08ad5b0c2a6fbc1 100755 (executable)
--- a/runlttv
+++ b/runlttv
@@ -19,10 +19,22 @@
 
 RCFILE=".runlttvrc"
 
-ARGS="-L lttv/modules/gui/controlflow/.libs -m guicontrolflow -L lttv/modules/gui/lttvwindow/lttvwindow/.libs -m lttvwindow -L lttv/modules/gui/detailedevents/.libs -m guievents -L lttv/modules/gui/tracecontrol/.libs -m guitracecontrol -L lttv/modules/gui/statistics/.libs -m guistatistics -L lttv/modules/gui/resourceview/.libs -m resourceview -L lttv/modules/gui/filter/.libs -m guifilter -L lttv/modules/gui/interrupts/.libs -m interrupts -L lttv/modules/gui/histogram/.libs -m guihistogram"
-LTTV_EXEC="lttv/lttv/.libs/lttv.real"
-
-if [ ! -e "$LTTV_EXEC" ]; then
+ARGS=\
+"-L lttv/modules/gui/lttvwindow/lttvwindow/.libs -m lttvwindow "\
+"-L lttv/modules/gui/controlflow/.libs -m guicontrolflow "\
+"-L lttv/modules/gui/detailedevents/.libs -m guievents "\
+"-L lttv/modules/gui/tracecontrol/.libs -m guitracecontrol "\
+"-L lttv/modules/gui/statistics/.libs -m guistatistics "\
+"-L lttv/modules/gui/resourceview/.libs -m resourceview "\
+"-L lttv/modules/gui/filter/.libs -m guifilter "\
+"-L lttv/modules/gui/interrupts/.libs -m interrupts "\
+"-L lttv/modules/gui/histogram/.libs -m guihistogram"
+
+if [ -e "lttv/lttv/.libs/lttv.real" ]; then
+       LTTV_EXEC="lttv/lttv/.libs/lttv.real"
+elif [ -e "lttv/lttv/lttv.real" ]; then
+       LTTV_EXEC="lttv/lttv/lttv.real"
+else
        echo "error: LTTV should be compiled before running this script." >/dev/stderr
        exit 1
 fi
@@ -42,7 +54,7 @@ echo $dbg
 if [ -n "$dbg" ]; then
        LD_LIBRARY_PATH=ltt/.libs gdb --args $LTTV_EXEC $ARGS $TRACEFILE
 elif [ -n "$valgrind" ]; then
-       LD_LIBRARY_PATH=ltt/.libs valgrind --show-reachable=yes --leak-check=full $LTTV_EXEC $ARGS $TRACEFILE
+       LD_LIBRARY_PATH=ltt/.libs valgrind --track-origins=yes --show-reachable=yes --leak-check=full --error-limit=no $LTTV_EXEC $ARGS $TRACEFILE
 elif [ -n "$strace" ]; then
        LD_LIBRARY_PATH=ltt/.libs strace $LTTV_EXEC $ARGS $TRACEFILE
 else