From 1099d298d424546b74db11bf6fb7a51b7954fab6 Mon Sep 17 00:00:00 2001 From: Richard Lau Date: Tue, 17 Mar 2020 11:19:15 -0400 Subject: [PATCH] zos,test: fix spawn_empty_env for shared library build z/OS uses LIBPATH instead of LD_LIBRARY_PATH for the search path for shared libraries. PR-URL: https://github.com/libuv/libuv/pull/2737 Reviewed-By: Ben Noordhuis --- test/test-spawn.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/test/test-spawn.c b/test/test-spawn.c index 2b7f5d56..314a3562 100644 --- a/test/test-spawn.c +++ b/test/test-spawn.c @@ -236,13 +236,14 @@ TEST_IMPL(spawn_empty_env) { char* env[1]; /* The autotools dynamic library build requires the presence of - * DYLD_LIBARY_PATH (macOS) or LD_LIBRARY_PATH (other Unices) + * DYLD_LIBARY_PATH (macOS) or LD_LIBRARY_PATH/LIBPATH (other Unices) * in the environment, but of course that doesn't work with * the empty environment that we're testing here. */ if (NULL != getenv("DYLD_LIBRARY_PATH") || - NULL != getenv("LD_LIBRARY_PATH")) { - RETURN_SKIP("doesn't work with DYLD_LIBRARY_PATH/LD_LIBRARY_PATH"); + NULL != getenv("LD_LIBRARY_PATH") || + NULL != getenv("LIBPATH")) { + RETURN_SKIP("doesn't work with DYLD_LIBRARY_PATH/LD_LIBRARY_PATH/LIBPATH"); } init_process_options("spawn_helper1", exit_cb);