public inbox for cygwin-cvs@sourceware.org help / color / mirror / Atom feed
From: Jon Turney <jturney@sourceware.org> To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: testsuite: Drop setting TDIRECTORY Date: Fri, 21 Jul 2023 12:26:22 +0000 (GMT) [thread overview] Message-ID: <20230721122622.B59B43858409@sourceware.org> (raw) https://sourceware.org/git/gitweb.cgi?p=newlib-cygwin.git;h=9fca983916a88ebb565654d639b79f2e5fdfd5a8 commit 9fca983916a88ebb565654d639b79f2e5fdfd5a8 Author: Jon Turney <jon.turney@dronecode.org.uk> Date: Thu Jul 6 11:54:04 2023 +0100 Cygwin: testsuite: Drop setting TDIRECTORY Drop setting TDIRECTORY, just use /tmp in the 'test installation' now that we have it. This effectively reverts f3ed5f2fe029d74372aca68b18936e164ff47cf7 Signed-off-by: Jon Turney <jon.turney@dronecode.org.uk> Diff: --- winsup/testsuite/Makefile.am | 8 -------- winsup/testsuite/cygrun.c | 5 +---- winsup/testsuite/winsup.api/winsup.exp | 4 +--- 3 files changed, 2 insertions(+), 15 deletions(-) diff --git a/winsup/testsuite/Makefile.am b/winsup/testsuite/Makefile.am index 60111a0aa..9159a1be8 100644 --- a/winsup/testsuite/Makefile.am +++ b/winsup/testsuite/Makefile.am @@ -334,17 +334,9 @@ DEJATOOL = winsup RUNTESTFLAGS_1 = -v RUNTESTFLAGS = $(RUNTESTFLAGS_$(V)) -# a temporary directory, to be used for files created by tests -tmpdir = $(abspath $(builddir)/tmp/) -# the same temporary directory, as an absolute, /cygdrive path (so it can be -# understood by the test DLL, which will have a different mount table) -testdll_tmpdir = $(shell cygpath -ma $(tmpdir) | sed -e 's#^\([A-Z]\):#/cygdrive/\L\1#') - site-extra.exp: ../config.status Makefile @rm -f ./tmp0 @echo "set runtime_root \"`pwd`/testinst/bin\"" >> ./tmp0 - @echo "set tmpdir $(tmpdir)" >> ./tmp0 - @echo "set testdll_tmpdir $(testdll_tmpdir)" >> ./tmp0 @echo "set cygrun \"`pwd`/mingw/cygrun\"" >> ./tmp0 @mv ./tmp0 site-extra.exp diff --git a/winsup/testsuite/cygrun.c b/winsup/testsuite/cygrun.c index 925b5513f..d8de7d158 100644 --- a/winsup/testsuite/cygrun.c +++ b/winsup/testsuite/cygrun.c @@ -26,13 +26,10 @@ main (int argc, char **argv) if (argc < 2) { - fprintf (stderr, "Usage: cygrun [program] [tmpdir]\n"); + fprintf (stderr, "Usage: cygrun [program]\n"); exit (0); } - if (argc >= 3) - SetEnvironmentVariable ("TDIRECTORY", argv[2]); - SetEnvironmentVariable ("CYGWIN_TESTING", "1"); memset (&sa, 0, sizeof (sa)); diff --git a/winsup/testsuite/winsup.api/winsup.exp b/winsup/testsuite/winsup.api/winsup.exp index 111509511..76455a97c 100644 --- a/winsup/testsuite/winsup.api/winsup.exp +++ b/winsup/testsuite/winsup.api/winsup.exp @@ -62,10 +62,8 @@ foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.c $srcdir/$subdir/*/*.{cc } else { set redirect_output /dev/null } - file mkdir $tmpdir/$tmpfile set env(PATH) "$runtime_root:$env(PATH)" - ws_spawn "cygdrop $cygrun $exec $testdll_tmpdir/$tmpfile > $redirect_output" - file delete -force $tmpdir/$tmpfile + ws_spawn "cygdrop $cygrun $exec > $redirect_output" set env(PATH) "$orig_path" if { $rv } { fail "$testcase"
reply other threads:[~2023-07-21 12:26 UTC|newest] Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20230721122622.B59B43858409@sourceware.org \ --to=jturney@sourceware.org \ --cc=cygwin-cvs@sourceware.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for read-only IMAP folder(s) and NNTP newsgroup(s).