6 files changed, 4 insertions, 153 deletions
diff --git a/tests/portable/asprintf-t.c b/tests/portable/asprintf-t.c
index c61c14a..e556d95 100644
--- a/tests/portable/asprintf-t.c
+++ b/tests/portable/asprintf-t.c
@@ -16,6 +16,7 @@
  */
 
 #include <config.h>
+#include <portable/macros.h>
 #include <portable/system.h>
 
 #include <tests/tap/basic.h>
diff --git a/tests/portable/snprintf-t.c b/tests/portable/snprintf-t.c
index 270d2e1..cc8cf00 100644
--- a/tests/portable/snprintf-t.c
+++ b/tests/portable/snprintf-t.c
@@ -26,7 +26,9 @@
  * Disable the requirement that format strings be literals.  We need variable
  * formats for easy testing.
  */
-#pragma GCC diagnostic ignored "-Wformat-nonliteral"
+#if __GNUC__ > 4 || (__GNUC__ == 4 && __GNUC_MINOR__ > 2) || defined(__clang__)
+# pragma GCC diagnostic ignored "-Wformat-nonliteral"
+#endif
 
 /*
  * Intentionally don't add the printf attribute here since we pass a
diff --git a/tests/portable/strlcat-t.c b/tests/portable/strlcat-t.c
deleted file mode 100644
index 58aba58..0000000
--- a/tests/portable/strlcat-t.c
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * strlcat test suite.
- *
- * The canonical version of this file is maintained in the rra-c-util package,
- * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
- *
- * Written by Russ Allbery <eagle@eyrie.org>
- *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
- */
-
-#include <config.h>
-#include <portable/system.h>
-
-#include <tests/tap/basic.h>
-
-size_t test_strlcat(char *, const char *, size_t);
-
-
-int
-main(void)
-{
-    char buffer[10] = "";
-
-    plan(27);
-
-    is_int(3, test_strlcat(buffer, "foo", sizeof(buffer)),
-           "strlcat into empty buffer");
-    is_string("foo", buffer, "...with right output");
-    is_int(7, test_strlcat(buffer, " bar", sizeof(buffer)),
-           "...and append more");
-    is_string("foo bar", buffer, "...and output is still correct");
-    is_int(9, test_strlcat(buffer, "!!", sizeof(buffer)),
-           "...and append to buffer limit");
-    is_string("foo bar!!", buffer, "...output is still correct");
-    is_int(10, test_strlcat(buffer, "!", sizeof(buffer)),
-           "...append one more character");
-    is_string("foo bar!!", buffer, "...and output didn't change");
-    ok(buffer[9] == '\0', "...buffer still nul-terminated");
-    buffer[0] = '\0';
-    is_int(11, test_strlcat(buffer, "hello world", sizeof(buffer)),
-           "append single long string");
-    is_string("hello wor", buffer, "...string truncates properly");
-    ok(buffer[9] == '\0', "...buffer still nul-terminated");
-    buffer[0] = '\0';
-    is_int(7, test_strlcat(buffer, "sausage", 5), "lie about buffer length");
-    is_string("saus", buffer, "...contents are correct");
-    is_int(14, test_strlcat(buffer, "bacon eggs", sizeof(buffer)),
-           "...add more up to real size");
-    is_string("sausbacon", buffer, "...and result is correct");
-
-    /* Make sure that with a size of 0, the destination isn't changed. */
-    is_int(11, test_strlcat(buffer, "!!", 0), "no change with size of 0");
-    is_string("sausbacon", buffer, "...and content is the same");
-
-    /* Now play with empty strings. */
-    is_int(9, test_strlcat(buffer, "", 0),
-           "correct count when appending empty string");
-    is_string("sausbacon", buffer, "...and contents are unchanged");
-    buffer[0] = '\0';
-    is_int(0, test_strlcat(buffer, "", sizeof(buffer)),
-           "correct count when appending empty string to empty buffer");
-    is_string("", buffer, "...and buffer content is correct");
-    is_int(3, test_strlcat(buffer, "foo", 2), "append to length 2 buffer");
-    is_string("f", buffer, "...and got only a single character");
-    ok(buffer[1] == '\0', "...and buffer is still nul-terminated");
-    is_int(1, test_strlcat(buffer, "", sizeof(buffer)),
-           "append an empty string");
-    ok(buffer[1] == '\0', "...and buffer is still nul-terminated");
-
-    return 0;
-}
diff --git a/tests/portable/strlcat.c b/tests/portable/strlcat.c
deleted file mode 100644
index 8983bd8..0000000
--- a/tests/portable/strlcat.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define TESTING 1
-#include <portable/strlcat.c>
diff --git a/tests/portable/strlcpy-t.c b/tests/portable/strlcpy-t.c
deleted file mode 100644
index 6652a7c..0000000
--- a/tests/portable/strlcpy-t.c
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * strlcpy test suite.
- *
- * The canonical version of this file is maintained in the rra-c-util package,
- * which can be found at <http://www.eyrie.org/~eagle/software/rra-c-util/>.
- *
- * Written by Russ Allbery <eagle@eyrie.org>
- *
- * The authors hereby relinquish any claim to any copyright that they may have
- * in this work, whether granted under contract or by operation of law or
- * international treaty, and hereby commit to the public, at large, that they
- * shall not, at any time in the future, seek to enforce any copyright in this
- * work against any person or entity, or prevent any person or entity from
- * copying, publishing, distributing or creating derivative works of this
- * work.
- */
-
-#include <config.h>
-#include <portable/system.h>
-
-#include <tests/tap/basic.h>
-
-size_t test_strlcpy(char *, const char *, size_t);
-
-
-int
-main(void)
-{
-    char buffer[10];
-
-    plan(23);
-
-    is_int(3, test_strlcpy(buffer, "foo", sizeof(buffer)), "simple strlcpy");
-    is_string("foo", buffer, "...result is correct");
-    is_int(9, test_strlcpy(buffer, "hello wor", sizeof(buffer)),
-           "strlcpy exact length of buffer");
-    is_string("hello wor", buffer, "...result is correct");
-    is_int(10, test_strlcpy(buffer, "world hell", sizeof(buffer)),
-           "strlcpy one more than buffer length");
-    is_string("world hel", buffer, "...result is correct");
-    ok(buffer[9] == '\0', "...buffer is nul-terminated");
-    is_int(11, test_strlcpy(buffer, "hello world", sizeof(buffer)),
-           "strlcpy more than buffer length");
-    is_string("hello wor", buffer, "...result is correct");
-    ok(buffer[9] == '\0', "...buffer is nul-terminated");
-
-    /* Make sure that with a size of 0, the destination isn't changed. */
-    is_int(3, test_strlcpy(buffer, "foo", 0), "buffer unchanged if size 0");
-    is_string("hello wor", buffer, "...contents still the same");
-
-    /* Now play with empty strings. */
-    is_int(0, test_strlcpy(buffer, "", 0), "copy empty string with size 0");
-    is_string("hello wor", buffer, "...buffer unchanged");
-    is_int(0, test_strlcpy(buffer, "", sizeof(buffer)),
-           "copy empty string into full buffer");
-    is_string("", buffer, "...buffer now empty string");
-    is_int(3, test_strlcpy(buffer, "foo", 2),
-           "copy string into buffer of size 2");
-    is_string("f", buffer, "...got one character");
-    ok(buffer[1] == '\0', "...buffer is nul-terminated");
-    is_int(0, test_strlcpy(buffer, "", 1),
-           "copy empty string into buffer of size 1");
-    ok(buffer[0] == '\0', "...buffer is empty string");
-
-    /* Finally, check using strlcpy as strlen. */
-    is_int(3, test_strlcpy(NULL, "foo", 0), "use strlcpy as strlen");
-    is_int(11, test_strlcpy(NULL, "hello world", 0), "...again");
-
-    return 0;
-}
diff --git a/tests/portable/strlcpy.c b/tests/portable/strlcpy.c
deleted file mode 100644
index d444595..0000000
--- a/tests/portable/strlcpy.c
+++ /dev/null
@@ -1,2 +0,0 @@
-#define TESTING 1
-#include <portable/strlcpy.c>