From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: by sourceware.org (Postfix, from userid 2201) id B59B43858409; Fri, 21 Jul 2023 12:26:22 +0000 (GMT) DKIM-Filter: OpenDKIM Filter v2.11.0 sourceware.org B59B43858409 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=sourceware.org; s=default; t=1689942382; bh=RuZDHQ83JAN3PekDEitgmInJtjH09ssHKsK7I+uz9uU=; h=From:To:Subject:Date:From; b=KN4N8SUBKYh2mDU57WObwmn3uIy2et0RTRV84Q4dyzOvSFtiv9KCh/VfbJibRVa1T go4goYzmjFJZWz1s01ApVU+pH6OllFTwJdkmgCEtv65P0vk7QPLwrQMo3gsPSt8ruF 4gRf7OH+TgzVnVkh5FOBfz3nXHXiNud/4BAeclA8= Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable From: Jon Turney To: cygwin-cvs@sourceware.org Subject: [newlib-cygwin] Cygwin: testsuite: Drop setting TDIRECTORY X-Act-Checkin: newlib-cygwin X-Git-Author: Jon Turney X-Git-Refname: refs/heads/master X-Git-Oldrev: a02144808c5bc4e9753bfeabf06313c6413e1cd3 X-Git-Newrev: 9fca983916a88ebb565654d639b79f2e5fdfd5a8 Message-Id: <20230721122622.B59B43858409@sourceware.org> Date: Fri, 21 Jul 2023 12:26:22 +0000 (GMT) List-Id: https://sourceware.org/git/gitweb.cgi?p=3Dnewlib-cygwin.git;h=3D9fca983916a= 88ebb565654d639b79f2e5fdfd5a8 commit 9fca983916a88ebb565654d639b79f2e5fdfd5a8 Author: Jon Turney Date: Thu Jul 6 11:54:04 2023 +0100 Cygwin: testsuite: Drop setting TDIRECTORY =20 Drop setting TDIRECTORY, just use /tmp in the 'test installation' now that we have it. =20 This effectively reverts f3ed5f2fe029d74372aca68b18936e164ff47cf7 =20 Signed-off-by: Jon Turney 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 =3D winsup RUNTESTFLAGS_1 =3D -v RUNTESTFLAGS =3D $(RUNTESTFLAGS_$(V)) =20 -# a temporary directory, to be used for files created by tests -tmpdir =3D $(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 =3D $(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 =20 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) =20 if (argc < 2) { - fprintf (stderr, "Usage: cygrun [program] [tmpdir]\n"); + fprintf (stderr, "Usage: cygrun [program]\n"); exit (0); } =20 - if (argc >=3D 3) - SetEnvironmentVariable ("TDIRECTORY", argv[2]); - SetEnvironmentVariable ("CYGWIN_TESTING", "1"); =20 memset (&sa, 0, sizeof (sa)); diff --git a/winsup/testsuite/winsup.api/winsup.exp b/winsup/testsuite/wins= up.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"