From a1c35107619ef15daae1a37e0b76240aa504699d Mon Sep 17 00:00:00 2001
From: Sean Kennedy <notjackkennedy@outlook.com>
Date: Mon, 2 Dec 2019 14:53:55 -0500
Subject: [PATCH] Fix fd dup tests to be more robust i.e. not depending on the
first fd to be 4.
---
tests/expected/fcntl/fcntl.stdout | 2 +-
tests/expected/unistd/dup.stdout | 2 +-
tests/fcntl/fcntl.c | 2 +-
tests/unistd/dup.c | 2 +-
4 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/tests/expected/fcntl/fcntl.stdout b/tests/expected/fcntl/fcntl.stdout
index 20ec3fc2..4fb8e076 100644
--- a/tests/expected/fcntl/fcntl.stdout
+++ b/tests/expected/fcntl/fcntl.stdout
@@ -1 +1 @@
-fd 4 duped into fd 5
+duped fd is 1 greater than the original fd
diff --git a/tests/expected/unistd/dup.stdout b/tests/expected/unistd/dup.stdout
index 20ec3fc2..4fb8e076 100644
--- a/tests/expected/unistd/dup.stdout
+++ b/tests/expected/unistd/dup.stdout
@@ -1 +1 @@
-fd 4 duped into fd 5
+duped fd is 1 greater than the original fd
diff --git a/tests/fcntl/fcntl.c b/tests/fcntl/fcntl.c
index df8442b8..66c6bd3b 100644
--- a/tests/fcntl/fcntl.c
+++ b/tests/fcntl/fcntl.c
@@ -19,7 +19,7 @@ int main(void) {
int newfd2 = fcntl(newfd, F_DUPFD, 0);
// TODO: The standard doesn't define errors for F_DUPFD
- printf("fd %d duped into fd %d\n", newfd, newfd2);
+ printf("duped fd is %d greater than the original fd\n", newfd2 - newfd);
int c1 = close(newfd);
ERROR_IF(close, c1, == -1);
diff --git a/tests/unistd/dup.c b/tests/unistd/dup.c
index ca879d6e..af1fb1f1 100644
--- a/tests/unistd/dup.c
+++ b/tests/unistd/dup.c
@@ -17,7 +17,7 @@ int main(void) {
ERROR_IF(dup, fd2, == -1);
UNEXP_IF(dup, fd2, < 0);
- printf("fd %d duped into fd %d\n", fd1, fd2);
+ printf("duped fd is %d greater than the original fd\n", fd2 - fd1);
int c1 = close(fd1);
ERROR_IF(close, c1, == -1);
--
GitLab