summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--ChangeLog9
-rw-r--r--stdio-common/bug25.c1
-rw-r--r--support/tst-support_format_dns_packet.c4
-rw-r--r--support/tst-support_record_failure-2.sh10
-rw-r--r--support/tst-support_record_failure.c1
5 files changed, 20 insertions, 5 deletions
diff --git a/ChangeLog b/ChangeLog
index 1367e8eaaa..7809c3dc2b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,12 @@
+2017-03-22 Zack Weinberg <zackw@panix.com>
+
+ * stdio-common/bug25.c: Include stdlib.h.
+ * support/tst-support_format_dns_packet.c: Include stdio.h,
+ stdlib.h, and string.h.
+ * support/tst-support_record_failure.c: Include string.h.
+ * support/tst-support_record_failure-2.sh: Adjust line number
+ expectations and correct a typo in an error message.
+
2017-03-21 H.J. Lu <hongjiu.lu@intel.com>
[BZ #21258]
diff --git a/stdio-common/bug25.c b/stdio-common/bug25.c
index 30c133974b..617f21ab71 100644
--- a/stdio-common/bug25.c
+++ b/stdio-common/bug25.c
@@ -1,5 +1,6 @@
#include <stdio.h>
#include <string.h>
+#include <stdlib.h>
#include <unistd.h>
static const char expected[] = "\
diff --git a/support/tst-support_format_dns_packet.c b/support/tst-support_format_dns_packet.c
index ecd7abfe2b..9c8589c09c 100644
--- a/support/tst-support_format_dns_packet.c
+++ b/support/tst-support_format_dns_packet.c
@@ -20,6 +20,10 @@
#include <support/format_nss.h>
#include <support/run_diff.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+
static void
check_packet (const void *buffer, size_t length,
const char *name, const char *expected)
diff --git a/support/tst-support_record_failure-2.sh b/support/tst-support_record_failure-2.sh
index 175137780a..2c9372cc29 100644
--- a/support/tst-support_record_failure-2.sh
+++ b/support/tst-support_record_failure-2.sh
@@ -37,7 +37,7 @@ run_test () {
set -e
echo " exit status: $status"
if test "$output" != "$expected_output" ; then
- echo "error: unexpected ouput: $output"
+ echo "error: unexpected output: $output"
exit 1
fi
if test "$status" -ne "$expected_status" ; then
@@ -52,9 +52,9 @@ different_status () {
run_test 1 "error: 1 test failures" $direct --status=1
run_test 2 "error: 1 test failures" $direct --status=2
run_test 1 "error: 1 test failures" $direct --status=77
- run_test 2 "error: tst-support_record_failure.c:108: not true: false
+ run_test 2 "error: tst-support_record_failure.c:109: not true: false
error: 1 test failures" $direct --test-verify
- run_test 2 "error: tst-support_record_failure.c:108: not true: false
+ run_test 2 "error: tst-support_record_failure.c:109: not true: false
info: execution passed failed TEST_VERIFY
error: 1 test failures" $direct --test-verify --verbose
}
@@ -62,8 +62,8 @@ error: 1 test failures" $direct --test-verify --verbose
different_status
different_status --direct
-run_test 1 "error: tst-support_record_failure.c:115: not true: false
+run_test 1 "error: tst-support_record_failure.c:116: not true: false
error: 1 test failures" --test-verify-exit
# --direct does not print the summary error message if exit is called.
-run_test 1 "error: tst-support_record_failure.c:115: not true: false" \
+run_test 1 "error: tst-support_record_failure.c:116: not true: false" \
--direct --test-verify-exit
diff --git a/support/tst-support_record_failure.c b/support/tst-support_record_failure.c
index 62d8e1f057..e739e739c3 100644
--- a/support/tst-support_record_failure.c
+++ b/support/tst-support_record_failure.c
@@ -25,6 +25,7 @@
#include <stdbool.h>
#include <stdlib.h>
#include <stdio.h>
+#include <string.h>
static int exit_status_with_failure = -1;
static bool test_verify;