Cleanup: tests: use find's `-name` option instead of grep

[lttng-tools.git] / tests / regression / tools / regen-metadata / test_kernel

diff --git a/tests/regression/tools/regen-metadata/test_kernel b/tests/regression/tools/regen-metadata/test_kernel
index 0f879e6360b3c500720b6f302d264c3974f5b0ca..3056e39049ae853883a093fab22fce9c9178e461 100755 (executable)
--- a/tests/regression/tools/regen-metadata/test_kernel
+++ b/tests/regression/tools/regen-metadata/test_kernel
@@ -32,7 +32,7 @@ function test_kernel_streaming ()
        validate_trace $EVENT_NAME $TRACE_PATH/$HOSTNAME/$SESSION_NAME*
 
        # Find the metadata file
-       metadata_path=$(find "$TRACE_PATH/$HOSTNAME/$SESSION_NAME"* | grep metadata)
+       metadata_path=$(find "$TRACE_PATH/$HOSTNAME/$SESSION_NAME"* -name "metadata")
 
        # Empty the metadata file
        echo -n > "$metadata_path"
@@ -61,7 +61,7 @@ function test_kernel_local ()
        validate_trace $EVENT_NAME "$TRACE_PATH"
 
        # Find the metadata file
-       metadata_path=$(find "$TRACE_PATH"* | grep metadata)
+       metadata_path=$(find "$TRACE_PATH"* -name "metadata")
 
        # Empty the metadata file
        echo -n > "$metadata_path"
@@ -102,7 +102,7 @@ skip $isroot "Root access is needed. Skipping all kernel streaming tests." $NUM_
                ${fct_test}
        done
 
-       rmmod lttng-test
+       modprobe --remove lttng-test
        stop_lttng_sessiond
        stop_lttng_relayd
 }