From: Jon Turney <jon.turney@dronecode.org.uk>
To: cygwin-patches@cygwin.com
Cc: Jon Turney <jon.turney@dronecode.org.uk>
Subject: [PATCH 1/2] Cygwin: testsuite: Drop setting TDIRECTORY
Date: Wed, 19 Jul 2023 13:41:41 +0100 [thread overview]
Message-ID: <20230719124142.10310-2-jon.turney@dronecode.org.uk> (raw)
In-Reply-To: <20230719124142.10310-1-jon.turney@dronecode.org.uk>
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>
---
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"
--
2.39.0
next prev parent reply other threads:[~2023-07-19 12:41 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-07-19 12:41 [PATCH 0/2] Testsuite adjustment and relevant fix Jon Turney
2023-07-19 12:41 ` Jon Turney [this message]
2023-07-19 12:41 ` [PATCH 2/2] Cygwin: Fix Windows file handle leak in stat("file", -1) Jon Turney
2023-07-19 15:33 ` [PATCH 0/2] Testsuite adjustment and relevant fix Corinna Vinschen
2023-07-20 12:55 ` Jon Turney
2023-07-20 15:14 ` Corinna Vinschen
2023-07-20 15:17 ` Corinna Vinschen
2023-07-21 12:26 ` Jon Turney
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=20230719124142.10310-2-jon.turney@dronecode.org.uk \
--to=jon.turney@dronecode.org.uk \
--cc=cygwin-patches@cygwin.com \
/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 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).