libs/newlib-cygwin
libs/newlib-cygwin
4
0
Fork 0
mirror of git://sourceware.org/git/newlib-cygwin.git synced 2025-02-28 03:27:46 +08:00
Code Issues Projects Releases Wiki Activity

Cygwin: testsuite: Drop setting TDIRECTORY

Browse Source 
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>
This commit is contained in:
Jon Turney 2023-07-06 11:54:04 +01:00
parent a02144808c
commit 9fca983916
No known key found for this signature in database
GPG Key ID: C7C86F0370285C81
3 changed files with 2 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
winsup/testsuite/Makefile.am
View File

@ -334,17 +334,9 @@ DEJATOOL = winsup
RUNTESTFLAGS_1 = -v RUNTESTFLAGS_1 = -v
RUNTESTFLAGS = $(RUNTESTFLAGS_$(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 site-extra.exp: ../config.status Makefile
@rm -f ./tmp0 @rm -f ./tmp0
@echo "set runtime_root \"`pwd`/testinst/bin\"" >> ./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 @echo "set cygrun \"`pwd`/mingw/cygrun\"" >> ./tmp0
@mv ./tmp0 site-extra.exp @mv ./tmp0 site-extra.exp

5
winsup/testsuite/cygrun.c
View File

@ -26,13 +26,10 @@ main (int argc, char **argv)
if (argc < 2) if (argc < 2)
{ {
fprintf (stderr, "Usage: cygrun [program] [tmpdir]\n"); fprintf (stderr, "Usage: cygrun [program]\n");
exit (0); exit (0);
} }
if (argc >= 3)
SetEnvironmentVariable ("TDIRECTORY", argv[2]);
SetEnvironmentVariable ("CYGWIN_TESTING", "1"); SetEnvironmentVariable ("CYGWIN_TESTING", "1");
memset (&sa, 0, sizeof (sa)); memset (&sa, 0, sizeof (sa));

4
winsup/testsuite/winsup.api/winsup.exp
View File

@ -62,10 +62,8 @@ foreach src [lsort [glob -nocomplain $srcdir/$subdir/*.c $srcdir/$subdir/*/*.{cc
} else { } else {
set redirect_output /dev/null set redirect_output /dev/null
} }
file mkdir $tmpdir/$tmpfile
set env(PATH) "$runtime_root:$env(PATH)" set env(PATH) "$runtime_root:$env(PATH)"
ws_spawn "cygdrop $cygrun $exec $testdll_tmpdir/$tmpfile > $redirect_output" ws_spawn "cygdrop $cygrun $exec > $redirect_output"
file delete -force $tmpdir/$tmpfile
set env(PATH) "$orig_path" set env(PATH) "$orig_path"
if { $rv } { if { $rv } {
fail "$testcase" fail "$testcase"