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

This prevents grep of finding matches in the leading directories listed
by find.

It caused problem when I used the "metadata" string in one of the
directory names:
  /tmp/tmp.test_regen_metadata_ust_trace_path.6FbwPF/

Signed-off-by: Francis Deslauriers <francis.deslauriers@efficios.com>
Signed-off-by: Jérémie Galarneau <jeremie.galarneau@efficios.com>
Change-Id: I7165a3b4e4a16c793fe51c40484978be3a99dbfc

diff --git a/tests/regression/tools/metadata/test_kernel b/tests/regression/tools/metadata/test_kernel
index 82faf43b9509ffe9230a63ed792e74f5da494977..630fe2d4a4eb4c7b770fbf9c7be2728d43531e0c 100755 (executable)
--- a/tests/regression/tools/metadata/test_kernel
+++ b/tests/regression/tools/metadata/test_kernel
@@ -45,7 +45,7 @@ function test_kernel ()
        # bt1 accepts only a directory while bt2 accepts either the metadata
        # file directly or a directory with an immediate metadata file.
        # Settle for the common denominator.
-       metadata_path=$(find "${expected_path}/${session_name}"* | grep metadata)
+       metadata_path=$(find "${expected_path}/${session_name}"* -name "metadata")
        metadata_path=$(dirname "$metadata_path")
 
        $BABELTRACE_BIN --output-format=ctf-metadata "${metadata_path}" > "$metadata"

diff --git a/tests/regression/tools/metadata/test_ust b/tests/regression/tools/metadata/test_ust
index cea0d5ced76149d13a4c5860d9937e0dd85a72c4..ba34b7f4c4834c79916551152611cfd9ced969b1 100755 (executable)
--- a/tests/regression/tools/metadata/test_ust
+++ b/tests/regression/tools/metadata/test_ust
@@ -56,7 +56,7 @@ function test_per_uid ()
        # bt1 accepts only a directory while bt2 accepts either the metadata
        # file directly or a directory with an immediate metadata file.
        # Settle for the common denominator.
-       metadata_path=$(find "${expected_path}/${session_name}"* | grep metadata)
+       metadata_path=$(find "${expected_path}/${session_name}"* -name "metadata")
        metadata_path=$(dirname "$metadata_path")
 
        $BABELTRACE_BIN --output-format=ctf-metadata "${metadata_path}" > "$metadata"
@@ -150,7 +150,7 @@ function test_per_pid ()
        # bt1 accepts only a directory while bt2 accepts either the metadata
        # file directly or a directory with an immediate metadata file.
        # Settle for the common denominator.
-       metadata_path=$(find "${expected_path}/${session_name}"* | grep metadata)
+       metadata_path=$(find "${expected_path}/${session_name}"* -name "metadata")
        metadata_path=$(dirname "$metadata_path")
 
        $BABELTRACE_BIN --output-format=ctf-metadata "${metadata_path}" 1> "$metadata"

diff --git a/tests/regression/tools/regen-metadata/test_kernel b/tests/regression/tools/regen-metadata/test_kernel
index 8c31d488e373557912fa85674a0199ac73f99ecd..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"

diff --git a/tests/regression/tools/regen-metadata/test_ust b/tests/regression/tools/regen-metadata/test_ust
index 2a761307409f1ed594e4f0f71d75b6bf0e24f4e0..d23b4f203f866e0525fb5232e5952ce3332819fa 100755 (executable)
--- a/tests/regression/tools/regen-metadata/test_ust
+++ b/tests/regression/tools/regen-metadata/test_ust
@@ -63,7 +63,7 @@ function test_ust_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"
@@ -107,7 +107,7 @@ function test_ust_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"

diff --git a/tests/utils/utils.sh b/tests/utils/utils.sh
index 9ff25a0a57762fb029b91958a5c4b7183123f5ef..530a1062389a7f667fdf82732fd297ebf7bfcbdc 100644 (file)
--- a/tests/utils/utils.sh
+++ b/tests/utils/utils.sh
@@ -1783,7 +1783,7 @@ function validate_metadata_event ()
        local nr_event_id=$2
        local trace_path=$3
 
-       local metadata_file=$(find $trace_path | grep metadata)
+       local metadata_file=$(find $trace_path -name "metadata")
        local metadata_path=$(dirname $metadata_file)
 
        which $BABELTRACE_BIN >/dev/null