From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id E01AC386F47A; Sun, 8 Nov 2020 15:21:53 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org E01AC386F47A Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: Jon TURNEY To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: Ensure temporary directory used by tests exists X-Act-Checkin: newlib-cygwin X-Git-Author: Jon Turney X-Git-Refname: refs/heads/master X-Git-Oldrev: 9cdb799806e7531a1286d5928e501ae84e74be5f X-Git-Newrev: f3ed5f2fe029d74372aca68b18936e164ff47cf7 Message-Id: <20201108152153.E01AC386F47A@sourceware.org> Date: Sun, 8 Nov 2020 15:21:53 +0000 (GMT) X-BeenThere: cygwin-cvs@cygwin.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Cygwin core component git logs List-Unsubscribe: , List-Archive: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 08 Nov 2020 15:21:54 -0000 https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=f3ed5f2fe029d74372aca68b18936e164ff47cf7 commit f3ed5f2fe029d74372aca68b18936e164ff47cf7 Author: Jon Turney Date: Thu Oct 29 14:43:32 2020 +0000 Cygwin: Ensure temporary directory used by tests exists By default, libltp tests will create temporary files in a subdirectory of /tmp, which will (nowadays) be located relative to the test DLL (by assuming that it is in /bin). This will evaluate to the directory $target_builddir/winsup/tmp, which doesn't exist. The location used for these temporary files can be explicitly controlled by setting the TDIRECTORY env var. Arrange to set that env var to the /cygdrive path of a tmp subdirectory of the build directory. Unfortunately, libltp doesn't clean the temporary directory if TDIRECTORY is set, and some tests assume they are started in a clean directory, so we need to do that in tcl. Diff: --- winsup/testsuite/Makefile.in | 10 ++++++++-- winsup/testsuite/cygrun.c | 5 ++++- winsup/testsuite/winsup.api/winsup.exp | 4 +++- 3 files changed, 15 insertions(+), 4 deletions(-) diff --git a/winsup/testsuite/Makefile.in b/winsup/testsuite/Makefile.in index b77961878..3b5a251b2 100644 --- a/winsup/testsuite/Makefile.in +++ b/winsup/testsuite/Makefile.in @@ -97,7 +97,8 @@ force: install: clean: - -rm -f *.o *.dll *.a *.exp junk *.bak *.base *.exe testsuite/* *.d *.dat + -rm -f *.o *.dll *.a *.exp junk *.bak *.base *.exe *.d *.dat + -rm -rf testsuite maintainer-clean realclean: clean @echo "This command is intended for maintainers to use;" @@ -123,6 +124,11 @@ $(RUNTIME) : $(cygwin_build)/Makefile # Set to $(target_alias)/ for cross. target_subdir = @target_subdir@ +# temporary directory to be used for files created by tests (as an absolute, +# /cygdrive path, so it can be understood by the test DLL, which will have +# different mount table) +tmpdir = $(shell cygpath -ma $(objdir)/testsuite/tmp/ | sed -e 's#^\([A-Z]\):#/cygdrive/\L\1#') + site.exp: ./config.status Makefile @echo "Making a new config file..." -@rm -f ./tmp? @@ -142,7 +148,7 @@ site.exp: ./config.status Makefile # CFLAGS is set even though it's empty to show we reserve the right to set it. @echo "set CFLAGS \"$(ALL_CFLAGS)\"" >> ./tmp0 @echo "set MINGW_CXX \"$(MINGW_CXX)\"" >> ./tmp0 - echo "set tmpdir $(objdir)/testsuite" >> ./tmp0 + @echo "set tmpdir $(tmpdir)" >> ./tmp0 @echo "set ltp_includes \"$(realpath $(libltp_srcdir))/include\"" >> ./tmp0 @echo "## All variables above are generated by configure. Do Not Edit ##" >> ./tmp0 @cat ./tmp0 > site.exp diff --git a/winsup/testsuite/cygrun.c b/winsup/testsuite/cygrun.c index d1f53aad3..65d859d59 100644 --- a/winsup/testsuite/cygrun.c +++ b/winsup/testsuite/cygrun.c @@ -25,10 +25,13 @@ main (int argc, char **argv) if (argc < 2) { - fprintf (stderr, "Usage: cygrun [program]\n"); + fprintf (stderr, "Usage: cygrun [program] [tmpdir]\n"); exit (0); } + if (argc >= 3) + SetEnvironmentVariable ("TDIRECTORY", argv[2]); + SetEnvironmentVariable ("CYGWIN_TESTING", "1"); if ((p = getenv ("CYGWIN")) == NULL || (strstr (p, "ntsec") == NULL)) { diff --git a/winsup/testsuite/winsup.api/winsup.exp b/winsup/testsuite/winsup.api/winsup.exp index 1550b9445..cd5964d47 100644 --- a/winsup/testsuite/winsup.api/winsup.exp +++ b/winsup/testsuite/winsup.api/winsup.exp @@ -68,7 +68,9 @@ foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.c $srcdir/$subdir/*/*.{cc } else { set redirect_output /dev/null } - ws_spawn "$rootme/cygrun ./$base.exe > $redirect_output" + file mkdir $tmpdir/$base + ws_spawn "$rootme/cygrun ./$base.exe $tmpdir/$base > $redirect_output" + file delete -force $tmpdir/$base if { $rv } { fail "$testcase (execute)" if { $xfail_expected } {