On Fri, Mar 03, 2023 at 12:55:26PM +0000, Alex Bennée wrote: > > Daniel P. Berrangé <berra...@redhat.com> writes: > > > The 'check' script has some rather dubious logic whereby it assumes > > that if invoked as a symlink, then it is running from a separate > > source tree and build tree, otherwise it assumes the current working > > directory is a combined source and build tree. > > > > This doesn't work if you want to invoke the 'check' script using > > its full source tree path while still using a split source and build > > tree layout. This would be a typical situation with meson if you ask > > it to find the 'check' script path using files('check'). > > > > Rather than trying to make the logic more magical, add support for > > explicitly passing the dirs using --source-dir and --build-dir. If > > either is omitted the current logic is maintained. > > > > Signed-off-by: Daniel P. Berrangé <berra...@redhat.com> > > --- > > tests/qemu-iotests/check | 8 +++++++- > > tests/qemu-iotests/testenv.py | 17 +++++++++++++---- > > 2 files changed, 20 insertions(+), 5 deletions(-) > > > > diff --git a/tests/qemu-iotests/check b/tests/qemu-iotests/check > > index 9bdda1394e..806abc21d6 100755 > > --- a/tests/qemu-iotests/check > > +++ b/tests/qemu-iotests/check > > @@ -113,6 +113,10 @@ def make_argparser() -> argparse.ArgumentParser: > > 'middle of the process.') > > g_sel.add_argument('tests', metavar='TEST_FILES', nargs='*', > > help='tests to run, or "--" followed by a command') > > + g_sel.add_argument('--build-dir', default=None, > > + help='Path to iotests build directory') > > + g_sel.add_argument('--source-dir', default=None, > > + help='Path to iotests build directory') > > > > I'd be tempted to push all the automagic stuff into the options so you > have something like:
Hmm, yes, that's a nice idea, will give it a go as you suggest. With regards, Daniel -- |: https://berrange.com -o- https://www.flickr.com/photos/dberrange :| |: https://libvirt.org -o- https://fstop138.berrange.com :| |: https://entangle-photo.org -o- https://www.instagram.com/dberrange :|