From 30ca09e13b3c7e6ff5f719ea6882d97acee609eb Mon Sep 17 00:00:00 2001 From: Pierre-Marc Fournier Date: Thu, 25 Mar 2010 11:59:09 -0400 Subject: [PATCH] testsuite: update for libmallocwrap rename to libustinstr-malloc --- configure.ac | 2 +- tests/Makefile.am | 2 +- tests/runtests | 8 ++++---- .../Makefile.am | 0 .../prog.c | 0 5 files changed, 6 insertions(+), 6 deletions(-) rename tests/{test-libmallocwrap => test-libustinstr-malloc}/Makefile.am (100%) rename tests/{test-libmallocwrap => test-libustinstr-malloc}/prog.c (100%) diff --git a/configure.ac b/configure.ac index dc32afb..a354f83 100644 --- a/configure.ac +++ b/configure.ac @@ -116,7 +116,7 @@ AC_CONFIG_FILES([ tests/simple_include/Makefile tests/snprintf/Makefile tests/test-nevents/Makefile - tests/test-libmallocwrap/Makefile + tests/test-libustinstr-malloc/Makefile libustinstr-malloc/Makefile libustfork/Makefile ustd/Makefile diff --git a/tests/Makefile.am b/tests/Makefile.am index 7688e7e..8e5c678 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -1,3 +1,3 @@ -SUBDIRS = hello hello2 basic basic_long fork simple_include snprintf test-nevents test-libmallocwrap +SUBDIRS = hello hello2 basic basic_long fork simple_include snprintf test-nevents test-libustinstr-malloc dist_noinst_SCRIPTS = test_loop runtests trace_matches diff --git a/tests/runtests b/tests/runtests index 3cb9da6..116bb1f 100755 --- a/tests/runtests +++ b/tests/runtests @@ -50,10 +50,10 @@ NOFAIL $MATCHES -N "fork - potential_exec" "^ust.potential_exec:" $trace_loc NOFAIL $MATCHES -N "fork - after_exec" "^ust.after_exec:" $trace_loc NOFAIL check_trace_logs "$trace_loc" -starttest "libmallocwrap" -NOFAIL usttrace -lm $TESTDIR/test-libmallocwrap/.libs/prog +starttest "libustinstr-malloc" +NOFAIL usttrace -lm $TESTDIR/test-libustinstr-malloc/.libs/prog trace_loc=$(usttrace -W) -NOFAIL $MATCHES -N "mallocwrap - malloc" -n 1000 "^ust.malloc:.*{ size = 1[0-9][0-9][0-9]," $trace_loc +NOFAIL $MATCHES -N "libustinstr-malloc - malloc" -n 1000 "^ust.malloc:.*{ size = 1[0-9][0-9][0-9]," $trace_loc NOFAIL check_trace_logs "$trace_loc" ### Manual mode test @@ -68,7 +68,7 @@ mkfifo -m 0600 "$pidfilepath" ustd --pidfile "$pidfilepath" -o "$TRACE_DIR" >/dev/null 2>&1 & USTD_PID="$(<$pidfilepath)" -LD_PRELOAD=/usr/local/lib/libust.so.0.0.0:/usr/local/lib/libmallocwrap.so find / >/dev/null 2>&1 & +LD_PRELOAD=/usr/local/lib/libust.so.0.0.0:/usr/local/lib/libustinstr-malloc.so find / >/dev/null 2>&1 & PID=$! sleep 0.1 NOFAIL ustctl --list-markers "$PID" >/dev/null diff --git a/tests/test-libmallocwrap/Makefile.am b/tests/test-libustinstr-malloc/Makefile.am similarity index 100% rename from tests/test-libmallocwrap/Makefile.am rename to tests/test-libustinstr-malloc/Makefile.am diff --git a/tests/test-libmallocwrap/prog.c b/tests/test-libustinstr-malloc/prog.c similarity index 100% rename from tests/test-libmallocwrap/prog.c rename to tests/test-libustinstr-malloc/prog.c -- 2.34.1