aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMartin Coufal <mcoufal@redhat.com>2023-06-09 13:58:04 +0200
committerArjun Shankar <arjun@redhat.com>2023-06-09 16:25:36 +0200
commit5e8d1b0328a850c229146f40e18848728b104583 (patch)
tree57409c93b73df74555f19becb1261b88fbd3c490
parentabcf8db7fa46b73fd5b8193ce11f9312301b84c7 (diff)
downloadglibc-5e8d1b0328a850c229146f40e18848728b104583.tar
glibc-5e8d1b0328a850c229146f40e18848728b104583.tar.gz
glibc-5e8d1b0328a850c229146f40e18848728b104583.tar.bz2
glibc-5e8d1b0328a850c229146f40e18848728b104583.zip
Remove unused DATEMSK file for tst-getdate
tst-getdate used to rely on an in-tree datemsk file that was subsequently replaced by a file created during test execution. This commit removes the unused file and corresponding env-var and uses a more appropriate name for the temp file. Reviewed-by: Carlos O'Donell <carlos@redhat.com>
-rw-r--r--time/Makefile1
-rw-r--r--time/datemsk2
-rw-r--r--time/tst-getdate.c2
3 files changed, 1 insertions, 4 deletions
diff --git a/time/Makefile b/time/Makefile
index 92bc3db315..1d2e667cad 100644
--- a/time/Makefile
+++ b/time/Makefile
@@ -104,7 +104,6 @@ CFLAGS-mktime.c += $(config-cflags-wno-ignored-attributes)
# Don't warn about Y2k problem in strftime format string.
CFLAGS-test_time.c += -Wno-format
-tst-getdate-ENV= DATEMSK=datemsk TZDIR=${common-objpfx}timezone/testdata
test_time-ARGS= EST5EDT CST
tst-tzname-ENV = TZDIR=${common-objpfx}timezone/testdata
diff --git a/time/datemsk b/time/datemsk
deleted file mode 100644
index 3dc4d417fe..0000000000
--- a/time/datemsk
+++ /dev/null
@@ -1,2 +0,0 @@
-%H:%M:%S %F
-%d-%m-%Y %T
diff --git a/time/tst-getdate.c b/time/tst-getdate.c
index cf97e220f7..4c9ed28d58 100644
--- a/time/tst-getdate.c
+++ b/time/tst-getdate.c
@@ -98,7 +98,7 @@ static const char datemskstr[] =
static void
do_prepare (int argc, char **argv)
{
- int fd = create_temp_file ("tst-chk1.", &datemsk);
+ int fd = create_temp_file ("tst-getdate.", &datemsk);
xwrite (fd, datemskstr, sizeof (datemskstr) - 1);
setenv ("DATEMSK", datemsk, 1);