summaryrefslogtreecommitdiff
path: root/src/test
diff options
context:
space:
mode:
authorLennart Poettering <lennart@poettering.net>2014-11-06 21:19:20 +0100
committerLennart Poettering <lennart@poettering.net>2014-11-07 01:19:56 +0100
commitcda134ab1eac84f874aacf8e885a07112a7fd5ce (patch)
tree1c1739debf6148d09afd9f18cd61e1c2471fab94 /src/test
parent0c2576ef74a9f9b96519cdcb7f9c01742d8255e2 (diff)
copy: teach copy_bytes() sendfile() support, and then replace sendfile_full() by it
Diffstat (limited to 'src/test')
-rw-r--r--src/test/test-copy.c26
-rw-r--r--src/test/test-fileio.c25
2 files changed, 26 insertions, 25 deletions
diff --git a/src/test/test-copy.c b/src/test/test-copy.c
index 6aa86a03be..d2cad08cb6 100644
--- a/src/test/test-copy.c
+++ b/src/test/test-copy.c
@@ -48,11 +48,36 @@ static void test_copy_file(void) {
assert_se(read_full_file(fn_copy, &buf, &sz) == 0);
assert_se(streq(buf, "foo bar bar bar foo\n"));
+ assert_se(sz == 20);
unlink(fn);
unlink(fn_copy);
}
+static void test_copy_file_fd(void) {
+ char in_fn[] = "/tmp/test-copy-file-fd-XXXXXX";
+ char out_fn[] = "/tmp/test-copy-file-fd-XXXXXX";
+ _cleanup_close_ int in_fd = -1, out_fd = -1;
+ char text[] = "boohoo\nfoo\n\tbar\n";
+ char buf[64] = {0};
+
+ in_fd = mkostemp_safe(in_fn, O_RDWR);
+ assert_se(in_fd >= 0);
+ out_fd = mkostemp_safe(out_fn, O_RDWR);
+ assert_se(out_fd >= 0);
+
+ assert_se(write_string_file(in_fn, text) == 0);
+ assert_se(copy_file_fd("/a/file/which/does/not/exist/i/guess", out_fd) < 0);
+ assert_se(copy_file_fd(in_fn, out_fd) >= 0);
+ assert_se(lseek(out_fd, SEEK_SET, 0) == 0);
+
+ assert_se(read(out_fd, buf, sizeof(buf)) == sizeof(text) - 1);
+ assert_se(streq(buf, text));
+
+ unlink(in_fn);
+ unlink(out_fn);
+}
+
static void test_copy_tree(void) {
char original_dir[] = "/tmp/test-copy_tree/";
char copy_dir[] = "/tmp/test-copy_tree-copy/";
@@ -109,6 +134,7 @@ static void test_copy_tree(void) {
int main(int argc, char *argv[]) {
test_copy_file();
+ test_copy_file_fd();
test_copy_tree();
return 0;
diff --git a/src/test/test-fileio.c b/src/test/test-fileio.c
index c26a6facb4..cdf1973ea5 100644
--- a/src/test/test-fileio.c
+++ b/src/test/test-fileio.c
@@ -348,30 +348,6 @@ static void test_write_string_file_no_create(void) {
unlink(fn);
}
-static void test_sendfile_full(void) {
- char in_fn[] = "/tmp/test-sendfile_full-XXXXXX";
- char out_fn[] = "/tmp/test-sendfile_full-XXXXXX";
- _cleanup_close_ int in_fd, out_fd;
- char text[] = "boohoo\nfoo\n\tbar\n";
- char buf[64] = {0};
-
- in_fd = mkostemp_safe(in_fn, O_RDWR);
- assert_se(in_fd >= 0);
- out_fd = mkostemp_safe(out_fn, O_RDWR);
- assert_se(out_fd >= 0);
-
- assert_se(write_string_file(in_fn, text) == 0);
- assert_se(sendfile_full(out_fd, "/a/file/which/does/not/exist/i/guess") < 0);
- assert_se(sendfile_full(out_fd, in_fn) == sizeof(text) - 1);
- assert_se(lseek(out_fd, SEEK_SET, 0) == 0);
-
- assert_se(read(out_fd, buf, sizeof(buf)) == sizeof(text) - 1);
- assert_se(streq(buf, text));
-
- unlink(in_fn);
- unlink(out_fn);
-}
-
static void test_load_env_file_pairs(void) {
char fn[] = "/tmp/test-load_env_file_pairs-XXXXXX";
int fd;
@@ -428,7 +404,6 @@ int main(int argc, char *argv[]) {
test_write_string_stream();
test_write_string_file();
test_write_string_file_no_create();
- test_sendfile_full();
test_load_env_file_pairs();
return 0;