diff --git a/fsendfile.c b/fsendfile.c index 61921c8..75bddbb 100644 --- a/fsendfile.c +++ b/fsendfile.c @@ -77,42 +77,8 @@ ssize_t fsendfile(FILE *src, FILE *dst, size_t len) return (num == -1) ? -1 : (ssize_t)tot; } -#ifdef UNITTEST -#include -#include - -int main(void) -{ - int i = 0; - char *files[] = { - "/etc/passwd", "/tmp/tok", - "/etc/passwd", "/tmp/passwd", - "/etc/passwd", "/tmp/passwd", - NULL - }; - FILE *src, *dst; - - while (files[i]) { - src = fopen(files[i], "r"); - dst = fopen(files[i + 1], "w"); - printf("fsendfile(%s, %s, 512)\t", files[i], files[i + 1]); - if (-1 == fsendfile(src, dst, 512)) - err(1, "Failed fsendfile(%s, %s)", files[i], files[i + 1]); - - if (!access(files[i + 1], F_OK)) - printf("OK => %s\n", files[i + 1]); - - remove(files[i + 1]); - i += 2; - } - - return 0; -} -#endif /* UNITTEST */ - /** * Local Variables: - * compile-command: "make V=1 -f fsendfile.mk" * indent-tabs-mode: t * c-file-style: "linux" * End: diff --git a/fsendfile.mk b/fsendfile.mk deleted file mode 100644 index cc8ae25..0000000 --- a/fsendfile.mk +++ /dev/null @@ -1,4 +0,0 @@ -OBJS = -TARGET = fsendfile.test clean - -include rules.mk diff --git a/tests/.gitignore b/tests/.gitignore index f8c7922..82770e3 100644 --- a/tests/.gitignore +++ b/tests/.gitignore @@ -1,5 +1,6 @@ *.log *.trs +fsendfile lfile makepath pidfile diff --git a/tests/Makefile.am b/tests/Makefile.am index be35a07..3a4b2ac 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -2,6 +2,7 @@ EXTRA_DIST = check.h CLEANFILES = *~ *.trs *.log TESTS = +TESTS += fsendfile TESTS += lfile TESTS += makepath TESTS += pidfile diff --git a/tests/fsendfile.c b/tests/fsendfile.c new file mode 100644 index 0000000..f0f22f3 --- /dev/null +++ b/tests/fsendfile.c @@ -0,0 +1,31 @@ +#include +#include +#include "check.h" + +int main(void) +{ + int i = 0; + char *files[] = { + "/etc/passwd", "/tmp/tok", + "/etc/passwd", "/tmp/passwd", + "/etc/passwd", "/tmp/passwd", + NULL + }; + FILE *src, *dst; + + while (files[i]) { + src = fopen(files[i], "r"); + dst = fopen(files[i + 1], "w"); + printf("fsendfile(%s, %s, 512)\t", files[i], files[i + 1]); + if (-1 == fsendfile(src, dst, 512)) + err(1, "Failed fsendfile(%s, %s)", files[i], files[i + 1]); + + if (!access(files[i + 1], F_OK)) + printf("OK => %s\n", files[i + 1]); + + remove(files[i + 1]); + i += 2; + } + + return 0; +}