aboutsummaryrefslogtreecommitdiff
path: root/tests/util/xmalloc-t.in
diff options
context:
space:
mode:
Diffstat (limited to 'tests/util/xmalloc-t.in')
-rw-r--r--tests/util/xmalloc-t.in44
1 files changed, 22 insertions, 22 deletions
diff --git a/tests/util/xmalloc-t.in b/tests/util/xmalloc-t.in
index 504bbaa..f721822 100644
--- a/tests/util/xmalloc-t.in
+++ b/tests/util/xmalloc-t.in
@@ -3,18 +3,18 @@
#
# Test suite for xmalloc and friends.
#
-# Copyright (c) 2004, 2005, 2006
+# Copyright 2004, 2005, 2006
# by Internet Systems Consortium, Inc. ("ISC")
-# Copyright (c) 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001,
-# 2002, 2003 by The Internet Software Consortium and Rich Salz
-#
+# Copyright 1991, 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002,
+# 2003 by The Internet Software Consortium and Rich Salz
+#
# This code is derived from software contributed to the Internet Software
# Consortium by Rich Salz.
-#
+#
# Permission to use, copy, modify, and distribute this software for any
# purpose with or without fee is hereby granted, provided that the above
# copyright notice and this permission notice appear in all copies.
-#
+#
# THE SOFTWARE IS PROVIDED "AS IS" AND ISC DISCLAIMS ALL WARRANTIES WITH
# REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY
# AND FITNESS. IN NO EVENT SHALL ISC BE LIABLE FOR ANY SPECIAL, DIRECT,
@@ -39,7 +39,7 @@ runsuccess () {
printcount "ok"
else
if test $status = 2 ; then
- printcount "ok" "# skip no data limit support"
+ printcount "ok" "# skip - no data limit support"
else
printcount "not ok"
echo " $output"
@@ -59,7 +59,7 @@ runfailure () {
printcount "ok"
else
if test $status = 2 ; then
- printcount "ok" "# skip no data limit support"
+ printcount "ok" "# skip - no data limit support"
else
printcount "not ok"
echo " saw: $output"
@@ -94,28 +94,28 @@ runsuccess "v" "128000" "0"
# Now limit our memory to 120KB and then try the large ones again, all of
# which should fail.
runfailure "m" "128000" "120000" \
- "failed to malloc 128000 bytes at xmalloc.c line 54"
+ "failed to malloc 128000 bytes at xmalloc.c line 61"
runfailure "r" "128000" "120000" \
- "failed to realloc 128000 bytes at xmalloc.c line 80"
+ "failed to realloc 128000 bytes at xmalloc.c line 90"
runfailure "s" "64000" "120000" \
- "failed to strdup 64000 bytes at xmalloc.c line 109"
+ "failed to strdup 64000 bytes at xmalloc.c line 121"
runfailure "n" "64000" "120000" \
- "failed to strndup 64000 bytes at xmalloc.c line 133"
+ "failed to strndup 64000 bytes at xmalloc.c line 148"
runfailure "c" "128000" "120000" \
- "failed to calloc 128000 bytes at xmalloc.c line 155"
+ "failed to calloc 128000 bytes at xmalloc.c line 172"
runfailure "a" "64000" "120000" \
- "failed to asprintf 64000 bytes at xmalloc.c line 177"
+ "failed to asprintf 64000 bytes at xmalloc.c line 241"
runfailure "v" "64000" "120000" \
- "failed to vasprintf 64000 bytes at xmalloc.c line 196"
+ "failed to vasprintf 64000 bytes at xmalloc.c line 217"
# Check our custom error handler.
-runfailure "M" "128000" "120000" "malloc 128000 xmalloc.c 54"
-runfailure "R" "128000" "120000" "realloc 128000 xmalloc.c 80"
-runfailure "S" "64000" "120000" "strdup 64000 xmalloc.c 109"
-runfailure "N" "64000" "120000" "strndup 64000 xmalloc.c 133"
-runfailure "C" "128000" "120000" "calloc 128000 xmalloc.c 155"
-runfailure "A" "64000" "120000" "asprintf 64000 xmalloc.c 177"
-runfailure "V" "64000" "120000" "vasprintf 64000 xmalloc.c 196"
+runfailure "M" "128000" "120000" "malloc 128000 xmalloc.c 61"
+runfailure "R" "128000" "120000" "realloc 128000 xmalloc.c 90"
+runfailure "S" "64000" "120000" "strdup 64000 xmalloc.c 121"
+runfailure "N" "64000" "120000" "strndup 64000 xmalloc.c 148"
+runfailure "C" "128000" "120000" "calloc 128000 xmalloc.c 172"
+runfailure "A" "64000" "120000" "asprintf 64000 xmalloc.c 241"
+runfailure "V" "64000" "120000" "vasprintf 64000 xmalloc.c 217"
# Check the smaller ones again just for grins.
runsuccess "m" "21" "96000"