From 18e1a5608f240332c8b2b91584d15e02aba08459 Mon Sep 17 00:00:00 2001
From: Graham MacDonald <grahamamacdonald@gmail.com>
Date: Mon, 13 Jan 2020 22:22:40 +0000
Subject: [PATCH] Re-enable netdb tests, fix compiler warning, improve brk
coverage
---
tests/Makefile | 9 ++++-----
tests/expected/netdb/getaddrinfo.stderr | 0
tests/expected/netdb/getaddrinfo.stdout | 1 +
tests/expected/netdb/netdb.stderr | 0
tests/expected/netdb/netdb.stdout | 1 +
tests/unistd/brk.c | 14 +++++++++++++-
6 files changed, 19 insertions(+), 6 deletions(-)
create mode 100644 tests/expected/netdb/getaddrinfo.stderr
create mode 100644 tests/expected/netdb/getaddrinfo.stdout
create mode 100644 tests/expected/netdb/netdb.stderr
create mode 100644 tests/expected/netdb/netdb.stdout
diff --git a/tests/Makefile b/tests/Makefile
index ebb38d485..530aa9372 100644
--- a/tests/Makefile
+++ b/tests/Makefile
@@ -16,10 +16,13 @@ EXPECT_NAMES=\
libgen \
locale \
math \
+ netdb/getaddrinfo \
+ netdb/netdb \
ptrace \
regex \
select \
setjmp \
+ signal \
stdio/all \
stdio/buffer \
stdio/fgets \
@@ -98,11 +101,7 @@ EXPECT_NAMES=\
wchar/wcsstr \
wchar/wcstod \
wchar/wcstok \
- wchar/wcstol \
- signal
- # TODO: Fix these
- # netdb/getaddrinfo \
- # netdb/netdb \
+ wchar/wcstol
# Binaries that may generate varied output
NAMES=\
diff --git a/tests/expected/netdb/getaddrinfo.stderr b/tests/expected/netdb/getaddrinfo.stderr
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/expected/netdb/getaddrinfo.stdout b/tests/expected/netdb/getaddrinfo.stdout
new file mode 100644
index 000000000..6bc12bb59
--- /dev/null
+++ b/tests/expected/netdb/getaddrinfo.stdout
@@ -0,0 +1 @@
+IPv4 address: 23.21.162.66 (www.redox-os.org)
diff --git a/tests/expected/netdb/netdb.stderr b/tests/expected/netdb/netdb.stderr
new file mode 100644
index 000000000..e69de29bb
diff --git a/tests/expected/netdb/netdb.stdout b/tests/expected/netdb/netdb.stdout
new file mode 100644
index 000000000..26a2f0f90
--- /dev/null
+++ b/tests/expected/netdb/netdb.stdout
@@ -0,0 +1 @@
+No visible errors occurred!
diff --git a/tests/unistd/brk.c b/tests/unistd/brk.c
index 8f59d8926..0dc7566cc 100644
--- a/tests/unistd/brk.c
+++ b/tests/unistd/brk.c
@@ -5,10 +5,22 @@
#include "test_helpers.h"
int main(void) {
+ // sbrk report current brk
void * current = sbrk(0);
ERROR_IF(sbrk, current, == (void *)-1);
- int status = brk(current + 4096);
+ // sbrk increment and report previous brk
+ void * prev = current;
+ current = sbrk(4096);
+ ERROR_IF(sbrk, current, != prev);
+
+ // sbrk report current break
+ prev = current;
+ current = sbrk(0);
+ ERROR_IF(sbrk, current, != (void*)((uintptr_t)prev + 4096));
+
+ // brk set break to new value
+ int status = brk((void*)((uintptr_t)current + 4096));
ERROR_IF(brk, status, == -1);
UNEXP_IF(brk, status, != 0);
}
--
GitLab