From 591b1214ab938622b964052be154e88a78f41e37 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 20 Jan 2021 09:39:55 +0100 Subject: [PATCH] exec*e tests: Avoid test failures on Cygwin. * tests/test-execle-main.c (main): On Cygwin, add /bin to the new PATH. * tests/test-execve-main.c (main): Likewise. * tests/test-execvpe-main.c (main): Likewise. --- ChangeLog | 7 +++++++ tests/test-execle-main.c | 12 +++++++++++- tests/test-execve-main.c | 12 +++++++++++- tests/test-execvpe-main.c | 12 +++++++++++- 4 files changed, 40 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6a88e60564..92db4972ce 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,10 @@ +2021-01-20 Bruno Haible + + exec*e tests: Avoid test failures on Cygwin. + * tests/test-execle-main.c (main): On Cygwin, add /bin to the new PATH. + * tests/test-execve-main.c (main): Likewise. + * tests/test-execvpe-main.c (main): Likewise. + 2021-01-20 Bruno Haible canonicalize-lgpl: Work around a Cygwin bug. diff --git a/tests/test-execle-main.c b/tests/test-execle-main.c index 1b1f33bdfe..2c085f6307 100644 --- a/tests/test-execle-main.c +++ b/tests/test-execle-main.c @@ -30,7 +30,17 @@ int main () { const char *progname = "./test-exec-child"; - const char *env[3] = { "PATH=.", "Hommingberg=Gepardenforelle", NULL }; + const char *env[3] = + { + #ifdef __CYGWIN__ + /* The Cygwin DLLs needed by the program are in /bin. */ + "PATH=.:/bin", + #else + "PATH=.", + #endif + "Hommingberg=Gepardenforelle", + NULL + }; execle (progname, progname, "abc def", diff --git a/tests/test-execve-main.c b/tests/test-execve-main.c index 88d7a7e166..970372da18 100644 --- a/tests/test-execve-main.c +++ b/tests/test-execve-main.c @@ -30,7 +30,17 @@ int main () { const char *progname = "./test-exec-child"; - const char *env[3] = { "PATH=.", "Hommingberg=Gepardenforelle", NULL }; + const char *env[3] = + { + #ifdef __CYGWIN__ + /* The Cygwin DLLs needed by the program are in /bin. */ + "PATH=.:/bin", + #else + "PATH=.", + #endif + "Hommingberg=Gepardenforelle", + NULL + }; const char *argv[12] = { progname, diff --git a/tests/test-execvpe-main.c b/tests/test-execvpe-main.c index 9b4eca28a7..560ae8e690 100644 --- a/tests/test-execvpe-main.c +++ b/tests/test-execvpe-main.c @@ -30,7 +30,17 @@ int main () { const char *progname = "test-exec-child"; - const char *env[3] = { "PATH=.", "Hommingberg=Gepardenforelle", NULL }; + const char *env[3] = + { + #ifdef __CYGWIN__ + /* The Cygwin DLLs needed by the program are in /bin. */ + "PATH=.:/bin", + #else + "PATH=.", + #endif + "Hommingberg=Gepardenforelle", + NULL + }; const char *argv[12] = { progname, -- 2.39.5