diff options
Diffstat (limited to 'malloc')
| -rw-r--r-- | malloc/Makefile | 5 | ||||
| -rwxr-xr-x | malloc/tst-mtrace.sh | 8 |
2 files changed, 8 insertions, 5 deletions
diff --git a/malloc/Makefile b/malloc/Makefile index 7831240e3c..7497908707 100644 --- a/malloc/Makefile +++ b/malloc/Makefile @@ -92,9 +92,8 @@ $(objpfx)libmcheck.a: $(objpfx)mcheck-init.o lib: $(objpfx)libmcheck.a ifeq (yes,$(build-shared)) -.PHONY: do-tst-mtrace -tests: do-tst-mtrace -do-tst-mtrace: tst-mtrace.sh $(objpfx)tst-mtrace +tests: $(objpfx)tst-mtrace.out +$(objpfx)tst-mtrace.out: tst-mtrace.sh $(objpfx)tst-mtrace $(SHELL) -e $< $(common-objpfx) endif diff --git a/malloc/tst-mtrace.sh b/malloc/tst-mtrace.sh index c0c8458e6d..8e12dd08ea 100755 --- a/malloc/tst-mtrace.sh +++ b/malloc/tst-mtrace.sh @@ -21,15 +21,19 @@ common_objpfx=$1; shift status=0 +trap "rm -f ${common_objpfx}malloc/tst-mtrace.leak; exit 1" 1 2 15 -MALLOC_TRACE=${common_objpfx}tst-mtrace.out \ +MALLOC_TRACE=${common_objpfx}malloc/tst-mtrace.leak \ LOCPATH=${common_objpfx}localedata GCONV_PATH=${common_objpfx}iconvdata \ ${common_objpfx}elf/ld.so --library-path $common_objpfx \ ${common_objpfx}malloc/tst-mtrace || status=1 if test $status -eq 0 && test -f ${common_objpfx}malloc/mtrace; then ${common_objpfx}malloc/mtrace ${common_objpfx}malloc/tst-mtrace \ - ${common_objpfx}tst-mtrace.out || status=1 + ${common_objpfx}malloc/tst-mtrace.leak \ + > ${common_objpfx}malloc/tst-mtrace.out|| status=1 fi +rm -f ${common_objpfx}malloc/tst-mtrace.leak + exit $status |