mirror of
https://github.com/RTimothyEdwards/magic.git
synced 2026-09-07 01:44:29 +02:00
Darryl L. MilesandClaude Opus 4.8
fad955ce54
The gdb and valgrind launchers previously passed every argument straight to magic, leaving no way to give the tool its own options. Add a "--" split (shared magic_split_args helper): arguments before "--" go to gdb/valgrind, arguments after go to magic; with no "--", all arguments go to magic (the common case). Examples: ./run_magic_gdb.sh -tui -ex run -- -dnull foo.mag ./run_magic_valgrind.sh --tool=callgrind -- foo.mag Also make the tool binary and its default options overridable from the environment: GDB/GDB_OPTS and VALGRIND/VALGRIND_OPTS (valgrind defaults to --leak-check=full --error-exitcode=0), and warn if the tool is not on PATH. Smoke-tested against a live X display: gdb runs magic to a clean exit and valgrind produces a Memcheck report; option routing verified (a bogus flag after "--" is rejected by magic, not gdb), both headless (-dnull) and GUI. Co-Authored-By: Claude Opus 4.8 <[email protected]>
52 lines
2.4 KiB
Bash
52 lines
2.4 KiB
Bash
#!/usr/bin/env bash
|
|
#
|
|
# run_magic_valgrind.sh -- run magic under valgrind, straight from the build tree.
|
|
# Generated by configure from scripts/run_magic_valgrind.sh.in.
|
|
#
|
|
# PURPOSE
|
|
# Memory-check the just-built magic without `make install`. Stages
|
|
# ${builddir}/CAD_DIR (symlinks) on first run, exports CAD_ROOT, then runs
|
|
# valgrind on the self-contained "magicexec".
|
|
#
|
|
# USAGE
|
|
# ./run_magic_valgrind.sh [valgrind-opts...] [-- [magic-args...]]
|
|
#
|
|
# A "--" separates valgrind's own options from magic's:
|
|
# ./run_magic_valgrind.sh # default memcheck options
|
|
# ./run_magic_valgrind.sh foo.mag # no "--" => all args go to magic
|
|
# ./run_magic_valgrind.sh -v -- foo.mag # valgrind -v, magic gets foo.mag
|
|
# ./run_magic_valgrind.sh --tool=callgrind -- # a different valgrind tool
|
|
# With no "--", every argument is passed to magic (the common case).
|
|
#
|
|
# This checks the GUI binary; Tk/X allocations make the output noisy, so for
|
|
# real leak hunting run the batch device: ./run_magic_valgrind.sh -- -dnull
|
|
#
|
|
# ENVIRONMENT OVERRIDES (all optional; each wins over the baked default)
|
|
# VALGRIND valgrind binary to use (default: valgrind on PATH)
|
|
# VALGRIND_OPTS default valgrind options (default: --leak-check=full
|
|
# --error-exitcode=0). Set empty to clear them; command-line
|
|
# options before "--" are added after these.
|
|
# CAD_ROOT reuse an alternate runtime tree instead of staging $builddir/CAD_DIR
|
|
# MAGIC_WISH wish for the Tk console (default: the configure-matched wish)
|
|
# WISH TCLSH wish/tclsh matching this build's Tcl/Tk (--with-tk / --with-tcl)
|
|
# MAGIC_BUILDDIR MAGIC_SRCDIR build/source tops (default: baked-in absolutes)
|
|
# Inherited values are sanity-checked; problems print as stderr warnings.
|
|
# See magic_run_common.sh for the authoritative list and defaults.
|
|
set -eu
|
|
here="$(cd "$(dirname "$0")" && pwd)"
|
|
. "$here/magic_run_common.sh"
|
|
|
|
VALGRIND="${VALGRIND:-valgrind}"
|
|
command -v "$VALGRIND" >/dev/null 2>&1 || magic_warn "valgrind '$VALGRIND' not found on PATH"
|
|
VALGRIND_OPTS="${VALGRIND_OPTS---leak-check=full --error-exitcode=0}"
|
|
|
|
magic_require_built
|
|
magic_stage
|
|
magic_split_args "$@"
|
|
|
|
# valgrind <opts> magicexec -- <magic-args>
|
|
exec "$VALGRIND" $VALGRIND_OPTS \
|
|
${MAGIC_TOOL_OPTS[@]+"${MAGIC_TOOL_OPTS[@]}"} \
|
|
"$MAGIC_TCL/magicexec" -- \
|
|
${MAGIC_ARGS[@]+"${MAGIC_ARGS[@]}"}
|