Commit Message
This test verifies the sanity of ftime and exposes bugs such as BZ #16430.
It takes between one and two seconds to finish.
ChangeLog:
2014-09-04 Arjun Shankar <arjun.is@lostca.se>
* time/tst-ftime.c: New test.
* time/Makefile (tests): Add tst-ftime.
---
time/Makefile | 2 +-
time/tst-ftime.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
2 files changed, 52 insertions(+), 1 deletion(-)
create mode 100644 time/tst-ftime.c
Comments
On Fri, Sep 05, 2014 at 12:05:51AM +0200, Arjun Shankar wrote:
> This test verifies the sanity of ftime and exposes bugs such as BZ #16430.
> It takes between one and two seconds to finish.
Thanks!
>
> ChangeLog:
>
> 2014-09-04 Arjun Shankar <arjun.is@lostca.se>
>
> * time/tst-ftime.c: New test.
> * time/Makefile (tests): Add tst-ftime.
> ---
> time/Makefile | 2 +-
> time/tst-ftime.c | 51 +++++++++++++++++++++++++++++++++++++++++++++++++++
> 2 files changed, 52 insertions(+), 1 deletion(-)
> create mode 100644 time/tst-ftime.c
> diff --git a/time/Makefile b/time/Makefile
> index a07c041..55c1de8 100644
> --- a/time/Makefile
> +++ b/time/Makefile
> @@ -37,7 +37,7 @@ aux := era alt_digit lc-time-cleanup
> tests := test_time clocktest tst-posixtz tst-strptime tst_wcsftime \
> tst-getdate tst-mktime tst-mktime2 tst-ftime_l tst-strftime \
> tst-mktime3 tst-strptime2 bug-asctime bug-asctime_r bug-mktime1 \
> - tst-strptime3 bug-getdate1 tst-strptime-whitespace
> + tst-strptime3 bug-getdate1 tst-strptime-whitespace tst-ftime
>
> include ../Rules
>
> diff --git a/time/tst-ftime.c b/time/tst-ftime.c
> new file mode 100644
> index 0000000..9345915f
> --- /dev/null
> +++ b/time/tst-ftime.c
> @@ -0,0 +1,51 @@
> +/* Copyright (C) 2014 Free Software Foundation, Inc.
Add a line describing the test.
> + This file is part of the GNU C Library.
> +
> + The GNU C Library is free software; you can redistribute it and/or
> + modify it under the terms of the GNU Lesser General Public
> + License as published by the Free Software Foundation; either
> + version 2.1 of the License, or (at your option) any later version.
> +
> + The GNU C Library is distributed in the hope that it will be useful,
> + but WITHOUT ANY WARRANTY; without even the implied warranty of
> + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
> + Lesser General Public License for more details.
> +
> + You should have received a copy of the GNU Lesser General Public
> + License along with the GNU C Library; if not, see
> + <http://www.gnu.org/licenses/>. */
> +
> +#include <sys/timeb.h>
> +#include <err.h>
> +
> +/* The test takes between 1 and 2 seconds. */
> +#define TIMEOUT 3
Put this #define near the end along with the TEST_FUNCTION definition.
> +
> +static int
> +do_test (void)
> +{
> + struct timeb prev, curr = {.time = 0, .millitm = 0};
> + int sec = 0;
> +
> + while (sec != 3)
> + {
> + prev = curr;
> +
> + if (ftime (&curr))
> + errx (1, "ftime returned an error");
Use:
printf ("ftime returned an error");
return 1;
All test output ought to go into $(test).out. Likewise for all cases
below.
> +
> + if (curr.time < prev.time)
> + errx (1, "ftime's time flowed backwards");
> +
> + if (curr.time == prev.time
> + && curr.millitm < prev.millitm)
> + errx (1, "ftime's millitm flowed backwards");
> +
> + if (curr.time > prev.time)
> + sec ++;
> + }
> + return 0;
> +}
> +
> +#define TEST_FUNCTION do_test ()
> +#include "../test-skeleton.c"
@@ -37,7 +37,7 @@ aux := era alt_digit lc-time-cleanup
tests := test_time clocktest tst-posixtz tst-strptime tst_wcsftime \
tst-getdate tst-mktime tst-mktime2 tst-ftime_l tst-strftime \
tst-mktime3 tst-strptime2 bug-asctime bug-asctime_r bug-mktime1 \
- tst-strptime3 bug-getdate1 tst-strptime-whitespace
+ tst-strptime3 bug-getdate1 tst-strptime-whitespace tst-ftime
include ../Rules
new file mode 100644
@@ -0,0 +1,51 @@
+/* Copyright (C) 2014 Free Software Foundation, Inc.
+ This file is part of the GNU C Library.
+
+ The GNU C Library is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2.1 of the License, or (at your option) any later version.
+
+ The GNU C Library is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ Lesser General Public License for more details.
+
+ You should have received a copy of the GNU Lesser General Public
+ License along with the GNU C Library; if not, see
+ <http://www.gnu.org/licenses/>. */
+
+#include <sys/timeb.h>
+#include <err.h>
+
+/* The test takes between 1 and 2 seconds. */
+#define TIMEOUT 3
+
+static int
+do_test (void)
+{
+ struct timeb prev, curr = {.time = 0, .millitm = 0};
+ int sec = 0;
+
+ while (sec != 3)
+ {
+ prev = curr;
+
+ if (ftime (&curr))
+ errx (1, "ftime returned an error");
+
+ if (curr.time < prev.time)
+ errx (1, "ftime's time flowed backwards");
+
+ if (curr.time == prev.time
+ && curr.millitm < prev.millitm)
+ errx (1, "ftime's millitm flowed backwards");
+
+ if (curr.time > prev.time)
+ sec ++;
+ }
+ return 0;
+}
+
+#define TEST_FUNCTION do_test ()
+#include "../test-skeleton.c"