[PATCH] test: handle filenames that have directories in them

2012-10-18 Thread David Bremner
Ethan Glasser-Camp  writes:

> Since $TEST_DIRECTORY is an absolute path, any filenames generated
> with it will be complete paths. Only use the basename to generate
> suffixes for filenames.

pushed.

d


[PATCH] test: handle filenames that have directories in them

2012-10-18 Thread Tomi Ollila
On Fri, Oct 12 2012, Ethan Glasser-Camp  wrote:

> Since $TEST_DIRECTORY is an absolute path, any filenames generated
> with it will be complete paths. Only use the basename to generate
> suffixes for filenames.
>
> Signed-off-by: Ethan Glasser-Camp 
> ---
> Discovered this while reviewing the patch queue. test/emacs generates
> filenames using $TEST_DIRECTORY, which is generated using pwd(1). Test
> failures then cause failures in the test harness.


LGTM. 

Removing needs-review (for this trivial change) as this helps the
good review work Ethan is doing :D

Tomi

Ps: some shell "trivia ;)" basename=`basename "$file"` works for variable
assignment; when giving as argument to command that needs one more quotes:
e.g. wc "`basename "$file"`"
fun?!

>
>  test/test-lib.sh |8 +---
>  1 file changed, 5 insertions(+), 3 deletions(-)
>
> diff --git a/test/test-lib.sh b/test/test-lib.sh
> index 7448b45..8de5e32 100644
> --- a/test/test-lib.sh
> +++ b/test/test-lib.sh
> @@ -498,16 +498,18 @@ test_expect_equal_file ()
>   error "bug in the test script: not 2 or 3 parameters to 
> test_expect_equal"
>  
>   file1="$1"
> + basename1=`basename "$file1"`
>   file2="$2"
> + basename2=`basename "$file2"`
>   if ! test_skip "$test_subtest_name"
>   then
>   if diff -q "$file1" "$file2" >/dev/null ; then
>   test_ok_ "$test_subtest_name"
>   else
>   testname=$this_test.$test_count
> - cp "$file1" "$testname.$file1"
> - cp "$file2" "$testname.$file2"
> - test_failure_ "$test_subtest_name" "$(diff -u 
> "$testname.$file1" "$testname.$file2")"
> + cp "$file1" "$testname.$basename1"
> + cp "$file2" "$testname.$basename2"
> + test_failure_ "$test_subtest_name" "$(diff -u 
> "$testname.$basename1" "$testname.$basename2")"
>   fi
>  fi
>  }
> -- 
> 1.7.9.5
>
> ___
> notmuch mailing list
> notmuch at notmuchmail.org
> http://notmuchmail.org/mailman/listinfo/notmuch


Re: [PATCH] test: handle filenames that have directories in them

2012-10-18 Thread David Bremner
Ethan Glasser-Camp ethan.glasser.c...@gmail.com writes:

 Since $TEST_DIRECTORY is an absolute path, any filenames generated
 with it will be complete paths. Only use the basename to generate
 suffixes for filenames.

pushed.

d
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch


Re: [PATCH] test: handle filenames that have directories in them

2012-10-17 Thread Tomi Ollila
On Fri, Oct 12 2012, Ethan Glasser-Camp ethan.glasser.c...@gmail.com wrote:

 Since $TEST_DIRECTORY is an absolute path, any filenames generated
 with it will be complete paths. Only use the basename to generate
 suffixes for filenames.

 Signed-off-by: Ethan Glasser-Camp et...@betacantrips.com
 ---
 Discovered this while reviewing the patch queue. test/emacs generates
 filenames using $TEST_DIRECTORY, which is generated using pwd(1). Test
 failures then cause failures in the test harness.


LGTM. 

Removing needs-review (for this trivial change) as this helps the
good review work Ethan is doing :D

Tomi

Ps: some shell trivia ;) basename=`basename $file` works for variable
assignment; when giving as argument to command that needs one more quotes:
e.g. wc `basename $file`
fun?!


  test/test-lib.sh |8 +---
  1 file changed, 5 insertions(+), 3 deletions(-)

 diff --git a/test/test-lib.sh b/test/test-lib.sh
 index 7448b45..8de5e32 100644
 --- a/test/test-lib.sh
 +++ b/test/test-lib.sh
 @@ -498,16 +498,18 @@ test_expect_equal_file ()
   error bug in the test script: not 2 or 3 parameters to 
 test_expect_equal
  
   file1=$1
 + basename1=`basename $file1`
   file2=$2
 + basename2=`basename $file2`
   if ! test_skip $test_subtest_name
   then
   if diff -q $file1 $file2 /dev/null ; then
   test_ok_ $test_subtest_name
   else
   testname=$this_test.$test_count
 - cp $file1 $testname.$file1
 - cp $file2 $testname.$file2
 - test_failure_ $test_subtest_name $(diff -u 
 $testname.$file1 $testname.$file2)
 + cp $file1 $testname.$basename1
 + cp $file2 $testname.$basename2
 + test_failure_ $test_subtest_name $(diff -u 
 $testname.$basename1 $testname.$basename2)
   fi
  fi
  }
 -- 
 1.7.9.5

 ___
 notmuch mailing list
 notmuch@notmuchmail.org
 http://notmuchmail.org/mailman/listinfo/notmuch
___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch


[PATCH] test: handle filenames that have directories in them

2012-10-12 Thread Ethan Glasser-Camp
Since $TEST_DIRECTORY is an absolute path, any filenames generated
with it will be complete paths. Only use the basename to generate
suffixes for filenames.

Signed-off-by: Ethan Glasser-Camp 
---
Discovered this while reviewing the patch queue. test/emacs generates
filenames using $TEST_DIRECTORY, which is generated using pwd(1). Test
failures then cause failures in the test harness.

 test/test-lib.sh |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 7448b45..8de5e32 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -498,16 +498,18 @@ test_expect_equal_file ()
error "bug in the test script: not 2 or 3 parameters to 
test_expect_equal"

file1="$1"
+   basename1=`basename "$file1"`
file2="$2"
+   basename2=`basename "$file2"`
if ! test_skip "$test_subtest_name"
then
if diff -q "$file1" "$file2" >/dev/null ; then
test_ok_ "$test_subtest_name"
else
testname=$this_test.$test_count
-   cp "$file1" "$testname.$file1"
-   cp "$file2" "$testname.$file2"
-   test_failure_ "$test_subtest_name" "$(diff -u 
"$testname.$file1" "$testname.$file2")"
+   cp "$file1" "$testname.$basename1"
+   cp "$file2" "$testname.$basename2"
+   test_failure_ "$test_subtest_name" "$(diff -u 
"$testname.$basename1" "$testname.$basename2")"
fi
 fi
 }
-- 
1.7.9.5



[PATCH] test: handle filenames that have directories in them

2012-10-12 Thread Ethan Glasser-Camp
Since $TEST_DIRECTORY is an absolute path, any filenames generated
with it will be complete paths. Only use the basename to generate
suffixes for filenames.

Signed-off-by: Ethan Glasser-Camp et...@betacantrips.com
---
Discovered this while reviewing the patch queue. test/emacs generates
filenames using $TEST_DIRECTORY, which is generated using pwd(1). Test
failures then cause failures in the test harness.

 test/test-lib.sh |8 +---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/test-lib.sh b/test/test-lib.sh
index 7448b45..8de5e32 100644
--- a/test/test-lib.sh
+++ b/test/test-lib.sh
@@ -498,16 +498,18 @@ test_expect_equal_file ()
error bug in the test script: not 2 or 3 parameters to 
test_expect_equal
 
file1=$1
+   basename1=`basename $file1`
file2=$2
+   basename2=`basename $file2`
if ! test_skip $test_subtest_name
then
if diff -q $file1 $file2 /dev/null ; then
test_ok_ $test_subtest_name
else
testname=$this_test.$test_count
-   cp $file1 $testname.$file1
-   cp $file2 $testname.$file2
-   test_failure_ $test_subtest_name $(diff -u 
$testname.$file1 $testname.$file2)
+   cp $file1 $testname.$basename1
+   cp $file2 $testname.$basename2
+   test_failure_ $test_subtest_name $(diff -u 
$testname.$basename1 $testname.$basename2)
fi
 fi
 }
-- 
1.7.9.5

___
notmuch mailing list
notmuch@notmuchmail.org
http://notmuchmail.org/mailman/listinfo/notmuch