From f7fecbfc47c114a633f1fa754a0d9e1ad6cfc868 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 22 Dec 2010 17:53:09 +0100 Subject: [PATCH] ptsname: Avoid test failure on OSF/1 5.1. * modules/ptsname-tests (Depends-on): Add 'same-inode'. * tests/test-ptsname.c: Include , same-inode.h. (same_slave): New function. (main): Use it to compare ptsname's result with the expected file name. --- ChangeLog | 8 ++++++++ modules/ptsname-tests | 1 + tests/test-ptsname.c | 27 +++++++++++++++++++++++++-- 3 files changed, 34 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index e0e4e3afd3..db2c7ad409 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,11 @@ +2010-12-22 Bruno Haible + + ptsname: Avoid test failure on OSF/1 5.1. + * modules/ptsname-tests (Depends-on): Add 'same-inode'. + * tests/test-ptsname.c: Include , same-inode.h. + (same_slave): New function. + (main): Use it to compare ptsname's result with the expected file name. + 2010-12-22 Bruno Haible Port extended stdio modules to HP NonStop Kernel. diff --git a/modules/ptsname-tests b/modules/ptsname-tests index 30136aa64b..344b8a7038 100644 --- a/modules/ptsname-tests +++ b/modules/ptsname-tests @@ -4,6 +4,7 @@ tests/signature.h tests/macros.h Depends-on: +same-inode configure.ac: diff --git a/tests/test-ptsname.c b/tests/test-ptsname.c index ce392833cc..8c95100a29 100644 --- a/tests/test-ptsname.c +++ b/tests/test-ptsname.c @@ -25,9 +25,32 @@ SIGNATURE_CHECK (ptsname, char *, (int)); #include #include #include +#include + +#include "same-inode.h" #include "macros.h" +/* Compare two slave names. + On some systems, there are hard links in the /dev/ directory. + For example, on OSF/1 5.1, + /dev/ttyp0 == /dev/pts/0 + /dev/ttyp9 == /dev/pts/9 + /dev/ttypa == /dev/pts/10 + /dev/ttype == /dev/pts/14 + */ +static int +same_slave (const char *slave_name1, const char *slave_name2) +{ + struct stat statbuf1; + struct stat statbuf2; + + return (strcmp (slave_name1, slave_name2) == 0 + || (stat (slave_name1, &statbuf1) >= 0 + && stat (slave_name2, &statbuf2) >= 0 + && SAME_INODE (statbuf1, statbuf2))); +} + int main (void) { @@ -75,7 +98,7 @@ main (void) result = ptsname (fd); ASSERT (result != NULL); sprintf (slave_name, "/dev/tty%c%c", char1, char2); - ASSERT (strcmp (result, slave_name) == 0); + ASSERT (same_slave (result, slave_name)); close (fd); } @@ -105,7 +128,7 @@ main (void) result = ptsname (fd); ASSERT (result != NULL); sprintf (slave_name, "/dev/tty%c%c", char1, char2); - ASSERT (strcmp (result, slave_name) == 0); + ASSERT (same_slave (result, slave_name)); close (fd); } -- 2.30.2