[-- Attachment #1.1: Type: text/plain, Size: 714 bytes --] Hey folks-- I just did a bit of testing and cleanup for out-of-tree builds (see the minor patches that should have landed on the list in the last hour or two). For me, "make check" in an out-of-tree build works fine now, with the exception of T391-python-cffi.sh and T395-ruby.sh. I'm afraid i don't know enough about either python or ruby to see the obvious fix for these builds, but i do note that they're the only builds which depend on copying their source into the out-of-tree location (assuming no one proposes an improvement for id:20200522010359.715688-1-dkg@fifthhorseman.net). Just thought i'd flag this as an outstanding problem that hopefully someone clever feels like digging into. --dkg [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 227 bytes --] [-- Attachment #2: Type: text/plain, Size: 0 bytes --]
Hi, On Thu 21 May 2020 at 21:29 -0400, Daniel Kahn Gillmor wrote: > Hey folks-- > > I just did a bit of testing and cleanup for out-of-tree builds (see the > minor patches that should have landed on the list in the last hour or > two). It probably is indeed the unfortunate case that copying the python source is currently the easiest. I had a quick look and it seemed like one'd have to dig into the cffi setuptools support to make this work and I'm not sure how successful that would be, but I admit I didn't feel like trying. > For me, "make check" in an out-of-tree build works fine now, with the > exception of T391-python-cffi.sh and T395-ruby.sh. I checked out the python one, and maybe that's not too hard. The following patch made this work for both in tree and out of tree (on top of your other patch): modified test/T391-python-cffi.sh @@ -8,7 +8,7 @@ fi test_begin_subtest "python cffi tests" -pytest_dir=$NOTMUCH_SRCDIR/bindings/python-cffi/build/stage +pytest_dir=$NOTMUCH_BUILDDIR/bindings/python-cffi/build/stage printf "[pytest]\nminversion = 3.0\naddopts = -ra\n" > $pytest_dir/pytest.ini test_expect_success "(cd $pytest_dir && ${NOTMUCH_PYTHON} -m pytest --log-file=$TMP_DIRECTORY/test.output)" test_done Hope that's helpful. Cheers, Floris
--- test/test-lib.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/test/test-lib.sh b/test/test-lib.sh index 792b1cb9..78a90862 100644 --- a/test/test-lib.sh +++ b/test/test-lib.sh @@ -1081,7 +1081,7 @@ test_python() { } test_ruby() { - MAIL_DIR=$MAIL_DIR $NOTMUCH_RUBY -I $NOTMUCH_SRCDIR/bindings/ruby> OUTPUT + MAIL_DIR=$MAIL_DIR $NOTMUCH_RUBY -I "$NOTMUCH_BUILDDIR/bindings/ruby"> OUTPUT } test_C () { -- 2.26.2
On Tue 2020-05-26 13:06:02 -0400, Daniel Kahn Gillmor wrote:
> ---
> test/test-lib.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/test/test-lib.sh b/test/test-lib.sh
> index 792b1cb9..78a90862 100644
> --- a/test/test-lib.sh
> +++ b/test/test-lib.sh
> @@ -1081,7 +1081,7 @@ test_python() {
> }
>
> test_ruby() {
> - MAIL_DIR=$MAIL_DIR $NOTMUCH_RUBY -I $NOTMUCH_SRCDIR/bindings/ruby> OUTPUT
> + MAIL_DIR=$MAIL_DIR $NOTMUCH_RUBY -I "$NOTMUCH_BUILDDIR/bindings/ruby"> OUTPUT
> }
>
> test_C () {
I should note that i'm not a ruby developer, but this seems to be the
correct patch to solve the problem, similar to what Floris proposed to
fix the python-cffi test suite.
--dkg
[-- Attachment #1.1: Type: text/plain, Size: 627 bytes --] On Sat 2020-05-23 21:52:18 +0200, Floris Bruynooghe wrote: > modified test/T391-python-cffi.sh > @@ -8,7 +8,7 @@ fi > > > test_begin_subtest "python cffi tests" > -pytest_dir=$NOTMUCH_SRCDIR/bindings/python-cffi/build/stage > +pytest_dir=$NOTMUCH_BUILDDIR/bindings/python-cffi/build/stage > printf "[pytest]\nminversion = 3.0\naddopts = -ra\n" > $pytest_dir/pytest.ini > test_expect_success "(cd $pytest_dir && ${NOTMUCH_PYTHON} -m pytest --log-file=$TMP_DIRECTORY/test.output)" > test_done I've tested this and i can confirm that it works for both out-of-tree and in-tree builds. LGTM. --dkg [-- Attachment #1.2: signature.asc --] [-- Type: application/pgp-signature, Size: 227 bytes --] [-- Attachment #2: Type: text/plain, Size: 0 bytes --]
Floris Bruynooghe <flub@devork.be> writes:
>
> I checked out the python one, and maybe that's not too hard. The
> following patch made this work for both in tree and out of tree (on top
> of your other patch):
>
> modified test/T391-python-cffi.sh
> @@ -8,7 +8,7 @@ fi
>
>
> test_begin_subtest "python cffi tests"
> -pytest_dir=$NOTMUCH_SRCDIR/bindings/python-cffi/build/stage
> +pytest_dir=$NOTMUCH_BUILDDIR/bindings/python-cffi/build/stage
> printf "[pytest]\nminversion = 3.0\naddopts = -ra\n" > $pytest_dir/pytest.ini
> test_expect_success "(cd $pytest_dir && ${NOTMUCH_PYTHON} -m pytest --log-file=$TMP_DIRECTORY/test.output)"
> test_done
>
I smooshed this into id:20200522010359.715688-1-dkg@fifthhorseman.net
and pushed to master.
Daniel Kahn Gillmor <dkg@fifthhorseman.net> writes:
> ---
> test/test-lib.sh | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/test/test-lib.sh b/test/test-lib.sh
> index 792b1cb9..78a90862 100644
> --- a/test/test-lib.sh
> +++ b/test/test-lib.sh
> @@ -1081,7 +1081,7 @@ test_python() {
> }
>
> test_ruby() {
> - MAIL_DIR=$MAIL_DIR $NOTMUCH_RUBY -I $NOTMUCH_SRCDIR/bindings/ruby> OUTPUT
> + MAIL_DIR=$MAIL_DIR $NOTMUCH_RUBY -I "$NOTMUCH_BUILDDIR/bindings/ruby"> OUTPUT
> }
>
> test_C () {
> --
pushed to master
Daniel Kahn Gillmor <dkg@fifthhorseman.net> writes:
> Hey folks--
>
> I just did a bit of testing and cleanup for out-of-tree builds (see the
> minor patches that should have landed on the list in the last hour or
> two).
>
> For me, "make check" in an out-of-tree build works fine now, with the
> exception of T391-python-cffi.sh and T395-ruby.sh.
>
> I'm afraid i don't know enough about either python or ruby to see the
> obvious fix for these builds, but i do note that they're the only builds
> which depend on copying their source into the out-of-tree location
> (assuming no one proposes an improvement for
> id:20200522010359.715688-1-dkg@fifthhorseman.net).
>
> Just thought i'd flag this as an outstanding problem that hopefully
> someone clever feels like digging into.
It's a bit of a continual battle to keep the out-of-tree stuff working,
but currently (cea1604a087645d07998c6986a8678b2af239322) this is fixed.
d