Skip to content

Commit 3fb8e99

Browse files
committed
Proper launch cmd for valgrind
1 parent e12b189 commit 3fb8e99

1 file changed

Lines changed: 9 additions & 12 deletions

File tree

valgrind.sh

Lines changed: 9 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -58,13 +58,15 @@ then
5858
err "failed to get commit hash"
5959
exit 1
6060
fi
61-
git_patches="$(get_applied_git_patches)"
62-
63-
srv_commit=77931f936c
64-
SRV_BIN=./bin/solofng1_no_asan_"${srv_commit}"
6561

66-
cp ~/git/ddnet-insta/build-valgrind/DDNet-Server "$SRV_BIN" || exit 1
62+
# TODO: enable logging
63+
log_cmd='echo nologging'
6764

65+
read -rd '' run_cmd << EOF
66+
$CFG_ENV_RUNTIME valgrind \
67+
--tool=massif \
68+
./$CFG_BIN -f autoexec.cfg "$log_cmd;#sid:$SERVER_UUID:gdb.sh"
69+
EOF
6870

6971
# valgrind \
7072
# --tool=memcheck \
@@ -73,15 +75,10 @@ cp ~/git/ddnet-insta/build-valgrind/DDNet-Server "$SRV_BIN" || exit 1
7375
# --leak-check=full \
7476
# --show-leak-kinds=all \
7577

76-
78+
log "$run_cmd"
7779
git_patches="$(get_applied_git_patches)"
7880
launch_commit="$(get_commit)"
79-
80-
valgrind \
81-
--tool=massif \
82-
--suppressions=./lib/supp/memcheck.supp \
83-
"$SRV_BIN" &> logs/valgrind_"$(date '+%F_%H-%M')".txt
84-
81+
bash -c "set -euo pipefail;$run_cmd"
8582
log "build commit: $launch_commit"
8683
if [ "$git_patches" != "" ]
8784
then

0 commit comments

Comments
 (0)