From: Jason Wessel Date: Wed, 27 Apr 2011 20:22:16 +0000 (+0200) Subject: support busybox for manual trace tests X-Git-Tag: v1.9.1~378 X-Git-Url: https://git.lttng.org./?a=commitdiff_plain;h=a5723f5808f5c93ef4ae20ed11523c97db0e6269;p=lttng-ust.git support busybox for manual trace tests The busybox version of find does not support using -L, and it does not appear to be needed in order to pass the test. In the interest of being able to run internal UST tests on a busybox based rootfs, appropriately detect if -L is available as an argument to find and use it when it is available. Signed-off-by: Jason Wessel Signed-off-by: Nils Carlson --- diff --git a/tests/manual_mode_tracing.sh b/tests/manual_mode_tracing.sh index 19044ba0..f9bc7930 100755 --- a/tests/manual_mode_tracing.sh +++ b/tests/manual_mode_tracing.sh @@ -43,7 +43,14 @@ UST_CONSUMERD_PID="$(<$pidfilepath)" LIB_UST="$TESTDIR/../libust/.libs/libust.so.0.0.0" LIB_UST_MALLOC="$TESTDIR/../libustinstr-malloc/.libs/libustinstr-malloc.so" -LD_PRELOAD="$LIB_UST:$LIB_UST_MALLOC" find -L / >/dev/null 2>&1 & +# Check to see if find supports -L +find . -maxdepth 0 -L > /dev/null 2>&1 +if [ $? = 0 ] ; then + USE_L="-L" +else + USE_L="" +fi +LD_PRELOAD="$LIB_UST:$LIB_UST_MALLOC" find $USE_L / >/dev/null 2>&1 & PID=$! TRACE=auto USTCTL="$TESTDIR/../ustctl/ustctl"