summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBruno Haible <bruno@clisp.org>2012-01-03 03:56:16 +0100
committerBruno Haible <bruno@clisp.org>2012-01-03 03:56:16 +0100
commit573631b2b57b8323022e70879064a815d16799b8 (patch)
tree546c33e8ae658ee06c2a920fe1a6e1569a5b6d39
parentd7af94ea8b164efa0cc8e8618875a8e9c127ec3c (diff)
downloadgnulib-573631b2b57b8323022e70879064a815d16799b8.tar.gz
Enhance tests for module 'isatty'.
* modules/isatty-tests (Depends-on): Add pipe-posix. * tests/test-isatty.c: Include <fcntl.h>. (DEV_NULL): New macro. (main): Test the resut of isatty() also on regular files, pipes, and /dev/null.
-rw-r--r--ChangeLog7
-rw-r--r--modules/isatty-tests1
-rw-r--r--tests/test-isatty.c50
3 files changed, 58 insertions, 0 deletions
diff --git a/ChangeLog b/ChangeLog
index 8fdc3d5141..d097810d85 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
2012-01-02 Bruno Haible <bruno@clisp.org>
+ Enhance tests for module 'isatty'.
+ * modules/isatty-tests (Depends-on): Add pipe-posix.
+ * tests/test-isatty.c: Include <fcntl.h>.
+ (DEV_NULL): New macro.
+ (main): Test the resut of isatty() also on regular files, pipes, and
+ /dev/null.
+
New module 'isatty'.
* lib/unistd.in.h (isatty): New declaration.
* lib/isatty.c: New file, based on an idea of
diff --git a/modules/isatty-tests b/modules/isatty-tests
index ce699e3f7c..dff2d1723a 100644
--- a/modules/isatty-tests
+++ b/modules/isatty-tests
@@ -5,6 +5,7 @@ tests/macros.h
Depends-on:
unistd
+pipe-posix
configure.ac:
diff --git a/tests/test-isatty.c b/tests/test-isatty.c
index 9b164353a2..a63080c1f2 100644
--- a/tests/test-isatty.c
+++ b/tests/test-isatty.c
@@ -22,12 +22,24 @@
SIGNATURE_CHECK (isatty, int, (int));
#include <errno.h>
+#include <fcntl.h>
#include "macros.h"
+/* The name of the "always silent" device. */
+#if (defined _WIN32 || defined __WIN32__) && ! defined __CYGWIN__
+/* Native Woe32 API. */
+# define DEV_NULL "NUL"
+#else
+/* Unix API. */
+# define DEV_NULL "/dev/null"
+#endif
+
int
main (void)
{
+ const char *file = "test-isatty.txt";
+
/* Test behaviour for invalid file descriptors. */
{
errno = 0;
@@ -44,5 +56,43 @@ main (void)
);
}
+ /* Test behaviour for regular files. */
+ {
+ int fd;
+
+ fd = open (file, O_WRONLY|O_CREAT|O_TRUNC, 0644);
+ ASSERT (0 <= fd);
+ ASSERT (write (fd, "hello", 5) == 5);
+ ASSERT (close (fd) == 0);
+
+ fd = open (file, O_RDONLY);
+ ASSERT (0 <= fd);
+ ASSERT (! isatty (fd));
+ ASSERT (close (fd) == 0);
+ }
+
+ /* Test behaviour for pipes. */
+ {
+ int fd[2];
+
+ ASSERT (pipe (fd) == 0);
+ ASSERT (! isatty (fd[0]));
+ ASSERT (! isatty (fd[1]));
+ ASSERT (close (fd[0]) == 0);
+ ASSERT (close (fd[1]) == 0);
+ }
+
+ /* Test behaviour for /dev/null. */
+ {
+ int fd;
+
+ fd = open (DEV_NULL, O_RDONLY);
+ ASSERT (0 <= fd);
+ ASSERT (! isatty (fd));
+ ASSERT (close (fd) == 0);
+ }
+
+ ASSERT (unlink (file) == 0);
+
return 0;
}