[PATCH] test: expand regex in test/basic

[PATCH] test: expand regex in test/basic

[david]

From: David Bremner <bremner@debian.org>

Over time, maintaining this very long regex has become irritating,
especially when resolving conflicts.

This patch replaces the call to sed with multiple extra arguments to
find.  Since each test binary is now on it's own line, this should
make resolving conflicts easier.

The use of basename is clunky, but at least is portable (unlike the
printf option to find)
---
 test/basic |   13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

diff --git a/test/basic b/test/basic
index c47197c..7420c7d 100755
--- a/test/basic
+++ b/test/basic
@@ -53,8 +53,17 @@ test_expect_code 2 'failure to clean up causes the test to fail' '
 test_begin_subtest 'Ensure that all available tests will be run by notmuch-test'
 eval $(sed -n -e '/^TESTS="$/,/^"$/p' $TEST_DIRECTORY/notmuch-test)
 tests_in_suite=$(for i in $TESTS; do echo $i; done | sort)
-available=$(find "$TEST_DIRECTORY" -maxdepth 1 -type f -perm +111 | \
-    sed -r -e "s,.*/,," -e "/^(aggregate-results.sh|notmuch-test|smtp-dummy|test-verbose|symbol-test|arg-test|parse-time)$/d" | \
+
+
+available=$(find "$TEST_DIRECTORY" -maxdepth 1 -type f -perm +111  \
+    ! -name aggregate-results.sh	\
+    ! -name arg-test			\
+    ! -name notmuch-test		\
+    ! -name parse-time			\
+    ! -name smtp-dummy			\
+    ! -name symbol-test			\
+    ! -name test-verbose		\
+    -exec basename {} \; | \
     sort)
 test_expect_equal "$tests_in_suite" "$available"
 
-- 
1.7.10.4

Re: [PATCH] test: expand regex in test/basic

[David Bremner]

david@tethera.net writes:

> -available=$(find "$TEST_DIRECTORY" -maxdepth 1 -type f -perm +111 | \
> -    sed -r -e "s,.*/,," -e "/^(aggregate-results.sh|notmuch-test|smtp-dummy|test-verbose|symbol-test|arg-test|parse-time)$/d" | \
> +
> +
> +available=$(find "$TEST_DIRECTORY" -maxdepth 1 -type f -perm +111  \

Umm. I thought I killed those blank lines. Pretend they're not there ;).

d

Re: [PATCH] test: expand regex in test/basic

[Tomi Ollila]

On Sat, Nov 10 2012, David Bremner <david@tethera.net> wrote:

> david@tethera.net writes:
>
>> -available=$(find "$TEST_DIRECTORY" -maxdepth 1 -type f -perm +111 | \
>> -    sed -r -e "s,.*/,," -e "/^(aggregate-results.sh|notmuch-test|smtp-dummy|test-verbose|symbol-test|arg-test|parse-time)$/d" | \
>> +
>> +
>> +available=$(find "$TEST_DIRECTORY" -maxdepth 1 -type f -perm +111  \
>
> Umm. I thought I killed those blank lines. Pretend they're not there ;).

Great idea -- I suggest you restore the use of | sed 's,.*,,' | instead
of that basename, though.

> d

Tomi

[PATCH v2] test: expand regex in test/basic

[david]

From: David Bremner <bremner@debian.org>

Over time, maintaining this very long regex has become irritating,
especially when resolving conflicts.

This patch replaces the call to sed with multiple extra arguments to
find.  Since each test binary is now on it's own line, this should
make resolving conflicts easier.
---
 test/basic |   12 +++++++++---
 1 file changed, 9 insertions(+), 3 deletions(-)

diff --git a/test/basic b/test/basic
index c47197c..1b842d2 100755
--- a/test/basic
+++ b/test/basic
@@ -53,9 +53,15 @@ test_expect_code 2 'failure to clean up causes the test to fail' '
 test_begin_subtest 'Ensure that all available tests will be run by notmuch-test'
 eval $(sed -n -e '/^TESTS="$/,/^"$/p' $TEST_DIRECTORY/notmuch-test)
 tests_in_suite=$(for i in $TESTS; do echo $i; done | sort)
-available=$(find "$TEST_DIRECTORY" -maxdepth 1 -type f -perm +111 | \
-    sed -r -e "s,.*/,," -e "/^(aggregate-results.sh|notmuch-test|smtp-dummy|test-verbose|symbol-test|arg-test|parse-time)$/d" | \
-    sort)
+available=$(find "$TEST_DIRECTORY" -maxdepth 1 -type f -perm +111  \
+    ! -name aggregate-results.sh	\
+    ! -name arg-test			\
+    ! -name notmuch-test		\
+    ! -name parse-time			\
+    ! -name smtp-dummy			\
+    ! -name symbol-test			\
+    ! -name test-verbose		\
+    | sed 's,.*/,,' | sort)
 test_expect_equal "$tests_in_suite" "$available"
 
 EXPECTED=$TEST_DIRECTORY/test.expected-output
-- 
1.7.10.4

Re: [PATCH v2] test: expand regex in test/basic

[Tomi Ollila]

On Thu, Nov 15 2012, david@tethera.net wrote:

> From: David Bremner <bremner@debian.org>
>
> Over time, maintaining this very long regex has become irritating,
> especially when resolving conflicts.
>
> This patch replaces the call to sed with multiple extra arguments to
> find.  Since each test binary is now on it's own line, this should
> make resolving conflicts easier.

LGTM. Works. +1

Tomi


> ---
>  test/basic |   12 +++++++++---
>  1 file changed, 9 insertions(+), 3 deletions(-)
>
> diff --git a/test/basic b/test/basic
> index c47197c..1b842d2 100755
> --- a/test/basic
> +++ b/test/basic
> @@ -53,9 +53,15 @@ test_expect_code 2 'failure to clean up causes the test to fail' '
>  test_begin_subtest 'Ensure that all available tests will be run by notmuch-test'
>  eval $(sed -n -e '/^TESTS="$/,/^"$/p' $TEST_DIRECTORY/notmuch-test)
>  tests_in_suite=$(for i in $TESTS; do echo $i; done | sort)
> -available=$(find "$TEST_DIRECTORY" -maxdepth 1 -type f -perm +111 | \
> -    sed -r -e "s,.*/,," -e "/^(aggregate-results.sh|notmuch-test|smtp-dummy|test-verbose|symbol-test|arg-test|parse-time)$/d" | \
> -    sort)
> +available=$(find "$TEST_DIRECTORY" -maxdepth 1 -type f -perm +111  \
> +    ! -name aggregate-results.sh	\
> +    ! -name arg-test			\
> +    ! -name notmuch-test		\
> +    ! -name parse-time			\
> +    ! -name smtp-dummy			\
> +    ! -name symbol-test			\
> +    ! -name test-verbose		\
> +    | sed 's,.*/,,' | sort)
>  test_expect_equal "$tests_in_suite" "$available"
>  
>  EXPECTED=$TEST_DIRECTORY/test.expected-output
> -- 
> 1.7.10.4
>
> _______________________________________________
> notmuch mailing list
> notmuch@notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch

Re: [PATCH v2] test: expand regex in test/basic

[Austin Clements]

Quoth david@tethera.net on Nov 14 at  9:30 pm:
> From: David Bremner <bremner@debian.org>
> 
> Over time, maintaining this very long regex has become irritating,
> especially when resolving conflicts.
> 
> This patch replaces the call to sed with multiple extra arguments to
> find.  Since each test binary is now on it's own line, this should
> make resolving conflicts easier.

LGTM.

Re: [PATCH v2] test: expand regex in test/basic

[David Bremner]

david@tethera.net writes:

> From: David Bremner <bremner@debian.org>
>
> Over time, maintaining this very long regex has become irritating,
> especially when resolving conflicts.

Pushed.

d