[Libguestfs] [PATCH 2/2] tests/mount-local: fix relative pathname of FUSE client executable

[Laszlo Ersek]

On 09/02/21 15:56, Richard W.M. Jones wrote:
> On Thu, Sep 02, 2021 at 03:51:24PM +0200, Laszlo Ersek wrote:
>> In commit 6d32773e8118 ("tests: Run the tests in parallel.", 2021-03-18),
>> the working directory relative to which "test-parallel-mount-local" would
>> be launched (by the test machinery) changed from "tests/mount-local" to
>> just "tests".
>>
>> While the relative pathname of the "guestunmount" executable was updated
>> inside "test-parallel-mount-local" accordingly, the relative pathname of
>> the FUSE client ("test-parallel-mount-local" itself, just invoked with
>> "--test") was not. This issue guarantees that the exec call fails in the
>> child, and so the test case always hangs.
>>
>> Because we had removed "mount-local" from the end of the working
>> directory, prepend it now to the relative pathname of the FUSE client
>> executable.
>>
>> Fixes: 6d32773e811882f78dbd8c2a39a2b7a9c3cfca7c
>> Signed-off-by: Laszlo Ersek <lersek at redhat.com>
>> ---
>>  tests/mount-local/test-parallel-mount-local.c | 2 +-
>>  1 file changed, 1 insertion(+), 1 deletion(-)
>>
>> diff --git a/tests/mount-local/test-parallel-mount-local.c b/tests/mount-local/test-parallel-mount-local.c
>> index 5f00e328a39c..c33ecf5b2680 100644
>> --- a/tests/mount-local/test-parallel-mount-local.c
>> +++ b/tests/mount-local/test-parallel-mount-local.c
>> @@ -220,7 +220,7 @@ start_thread (void *statevp)
>>  
>>      if (pid == 0) { /* child */
>>        setpgid (0, 0);           /* so we don't get ^C from parent */
>> -      execlp ("./test-parallel-mount-local",
>> +      execlp ("mount-local/test-parallel-mount-local",
>>                "test-parallel-mount-local", "--test", state->mp, NULL);
>>        perror ("execlp");
>>        _exit (EXIT_FAILURE);
> 
> ACK series.

Pushed as commit range 13a1ae6da6e8..0a2f7621a089.

I added "Acked-by: Richard W.M. Jones <rjones at redhat.com>" to both
commit messages, with Rich's permission.

Thanks!
Laszlo