All of lore.kernel.org
 help / color / mirror / Atom feed
From: Cyril Hrubis <chrubis@suse.cz>
To: ltp@lists.linux.it
Subject: [LTP] [PATCH] newlib_tests/test_exec.c: Fix compiler error before glibc v2.11
Date: Fri, 24 Aug 2018 16:56:56 +0200	[thread overview]
Message-ID: <20180824145656.GA5131@rei> (raw)
In-Reply-To: <1535015214-4033-1-git-send-email-yangx.jy@cn.fujitsu.com>

Hi!
> Before glibc v2.11, execvpe() was not introduced and resulted in
> compiler error, so we replace execvpe() with execve() and update
> test-writing-guidelines.txt.
> 
> Signed-off-by: xiao yang <yangx.jy@cn.fujitsu.com>
> ---
>  doc/test-writing-guidelines.txt | 11 ++++++++---
>  lib/newlib_tests/test_exec.c    | 11 ++++++++---
>  2 files changed, 16 insertions(+), 6 deletions(-)
> 
> diff --git a/doc/test-writing-guidelines.txt b/doc/test-writing-guidelines.txt
> index a169724..f62e16e 100644
> --- a/doc/test-writing-guidelines.txt
> +++ b/doc/test-writing-guidelines.txt
> @@ -696,15 +696,20 @@ a non zero exit code.
>  [source,c]
>  -------------------------------------------------------------------------------
>  /* test.c */
> -#define _GNU_SOURCE
> -#include <stdlib.h>
> +#include <unistd.h>
>  #include "tst_test.h"
>  
> +extern char **environ;

Looking at this the only change here should be:

> -#include <stdlib.h>
> +#include <unistd.h>

As man 7 environ says:

(This variable must be declared in the user program, but is declared in
the header file <unistd.h> if the _GNU_SOURCE feature test macro is
defined.)

Or is environ not defined with _GNU_SOURCE for older libc?

>  static void do_test(void)
>  {
>  	char *const argv[] = {"test_exec_child", NULL};
> +	char path[4096];
> +
> +	if (tst_get_path("test_exec_child", path, sizeof(path)))
> +		tst_brk(TCONF, "Couldn't find test_exec_child in $PATH");
>  
> -	execvpe(argv[0], argv, environ);
> +	execve(path, argv, environ);
>  	tst_res(TBROK | TERRNO, "EXEC!");
>  }
> diff --git a/lib/newlib_tests/test_exec.c b/lib/newlib_tests/test_exec.c
> index 8aef621..e70080e 100644
> --- a/lib/newlib_tests/test_exec.c
> +++ b/lib/newlib_tests/test_exec.c
> @@ -24,15 +24,20 @@
>   * $ PATH=$PATH:$PWD ./test_exec
>   */
>  
> -#define _GNU_SOURCE
> -#include <stdlib.h>
> +#include <unistd.h>
>  #include "tst_test.h"
>  
> +extern char **environ;

Here as well.

>  static void do_test(void)
>  {
>  	char *const argv[] = {"test_exec_child", NULL};
> +	char path[4096];
> +
> +	if (tst_get_path("test_exec_child", path, sizeof(path)))
> +		tst_brk(TCONF, "Couldn't find test_exec_child in $PATH");
>  
> -	execvpe(argv[0], argv, environ);
> +	execve(path, argv, environ);
>  
>  	tst_res(TBROK | TERRNO, "EXEC!");
>  }

Otherwise it looks good.

-- 
Cyril Hrubis
chrubis@suse.cz

  parent reply	other threads:[~2018-08-24 14:56 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-08-23  9:06 [LTP] [PATCH] newlib_tests/test_exec.c: Fix compiler error before glibc v2.11 Xiao Yang
2018-08-23  9:18 ` Xiao Yang
2018-08-24 14:56 ` Cyril Hrubis [this message]
2018-08-26 23:51   ` Xiao Yang
2018-08-27  0:05   ` [LTP] [PATCH v2] " Xiao Yang
2018-08-28 11:38     ` Jan Stancek
2018-08-28 23:54       ` Xiao Yang
2018-08-31 12:10     ` Petr Vorel
2018-09-04  6:37     ` Xiao Yang
2018-09-10 22:41     ` Petr Vorel

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180824145656.GA5131@rei \
    --to=chrubis@suse.cz \
    --cc=ltp@lists.linux.it \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.