diff mbox

[babeltrace,stable-1.5] Fix: ctf writer test on Cygwin

Message ID 1491505244-340-1-git-send-email-mjeanson@efficios.com
State Accepted, archived
Delegated to: Jérémie Galarneau
Headers show

Commit Message

Michael Jeanson April 6, 2017, 7 p.m. UTC
In the ctf writer test we execl() some libtool wrappers that get confused
when arg[0] is not the full path to the binary.

Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
---
 tests/lib/test_ctf_writer.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

Comments

Michael Jeanson April 10, 2017, 10:18 p.m. UTC | #1
On 2017-04-06 15:00, Michael Jeanson wrote:
> In the ctf writer test we execl() some libtool wrappers that get confused
> when arg[0] is not the full path to the binary.
> 
> Signed-off-by: Michael Jeanson <mjeanson at efficios.com>
> ---
>  tests/lib/test_ctf_writer.c | 4 ++--
>  1 file changed, 2 insertions(+), 2 deletions(-)
> 
> diff --git a/tests/lib/test_ctf_writer.c b/tests/lib/test_ctf_writer.c
> index 961df79..53613c9 100644
> --- a/tests/lib/test_ctf_writer.c
> +++ b/tests/lib/test_ctf_writer.c
> @@ -94,7 +94,7 @@ void validate_metadata(char *parser_path, char *metadata_path)
>  			goto result;
>  		}
>  
> -		execl(parser_path, "ctf-parser-test", (char *) NULL);
> +		execl(parser_path, parser_path, (char *) NULL);
>  		perror("# Could not launch the ctf metadata parser process");
>  		exit(-1);
>  	}
> @@ -201,7 +201,7 @@ void validate_trace(char *parser_path, char *trace_path)
>  			goto result;
>  		}
>  
> -		execl(parser_path, "babeltrace", trace_path, (char *) NULL);
> +		execl(parser_path, parser_path, trace_path, (char *) NULL);
>  		perror("# Could not launch the babeltrace process");
>  		exit(-1);
>  	}
> 

You can hold on merging this patch for now, I think it's only useful for
a very specific environment which might not be worth supporting.

Michael
Michael Jeanson April 11, 2017, 8:37 p.m. UTC | #2
On 2017-04-10 18:18, Michael Jeanson wrote:
> 
> You can hold on merging this patch for now, I think it's only useful for
> a very specific environment which might not be worth supporting.
> 

Scratch that, it's needed after all, sorry for the noise.

Michael
Jérémie Galarneau May 26, 2017, 1:37 p.m. UTC | #3
Merged in stable-1.5. Thanks!

Jérémie

On 11 April 2017 at 16:37, Michael Jeanson <mjeanson at efficios.com> wrote:
> On 2017-04-10 18:18, Michael Jeanson wrote:
>>
>> You can hold on merging this patch for now, I think it's only useful for
>> a very specific environment which might not be worth supporting.
>>
>
> Scratch that, it's needed after all, sorry for the noise.
>
> Michael
>
diff mbox

Patch

diff --git a/tests/lib/test_ctf_writer.c b/tests/lib/test_ctf_writer.c
index 961df79..53613c9 100644
--- a/tests/lib/test_ctf_writer.c
+++ b/tests/lib/test_ctf_writer.c
@@ -94,7 +94,7 @@  void validate_metadata(char *parser_path, char *metadata_path)
 			goto result;
 		}
 
-		execl(parser_path, "ctf-parser-test", (char *) NULL);
+		execl(parser_path, parser_path, (char *) NULL);
 		perror("# Could not launch the ctf metadata parser process");
 		exit(-1);
 	}
@@ -201,7 +201,7 @@  void validate_trace(char *parser_path, char *trace_path)
 			goto result;
 		}
 
-		execl(parser_path, "babeltrace", trace_path, (char *) NULL);
+		execl(parser_path, parser_path, trace_path, (char *) NULL);
 		perror("# Could not launch the babeltrace process");
 		exit(-1);
 	}