diff options
| author | Peter Jones <pjones@redhat.com> | 2008-06-04 13:32:46 -0400 |
|---|---|---|
| committer | Peter Jones <pjones@pjones2.localdomain> | 2008-06-04 13:32:46 -0400 |
| commit | cb560ad78285a8e6b8b4cfb9ab8f9eb4828ffea8 (patch) | |
| tree | 818f6ea3c3607df4c794a58742966617fe2ddc2c /src/libply/tests | |
| parent | 9ebe607e75b3170d27f12cd4802b5cbcc865d381 (diff) | |
| download | plymouth-cb560ad78285a8e6b8b4cfb9ab8f9eb4828ffea8.tar.gz plymouth-cb560ad78285a8e6b8b4cfb9ab8f9eb4828ffea8.tar.xz plymouth-cb560ad78285a8e6b8b4cfb9ab8f9eb4828ffea8.zip | |
Make ply-copy-dir-test.c work without the "detachable" functions.
Diffstat (limited to 'src/libply/tests')
| -rw-r--r-- | src/libply/tests/ply-copy-dir-test.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/libply/tests/ply-copy-dir-test.c b/src/libply/tests/ply-copy-dir-test.c index 75f0e1e..63bd900 100644 --- a/src/libply/tests/ply-copy-dir-test.c +++ b/src/libply/tests/ply-copy-dir-test.c @@ -44,7 +44,10 @@ test_dir_copy (void) if (!ply_copy_directory ("test-dir-copy-source", "test-dir-copy-dest")) return false; - if (!ply_create_detachable_directory ("/foo/test-dir-copy-scratch")) + if (!ply_create_directory ("/foo/test-dir-copy-scratch")) + return false; + + if (!ply_mount_tmpfs ("/foo/test-dir-copy-scratch")) return false; if (!ply_copy_directory ("test-dir-copy-dest", "/foo/test-dir-copy-scratch")) @@ -52,9 +55,16 @@ test_dir_copy (void) system ("ls /foo/test-dir-copy-scratch"); - dir_fd = ply_detach_directory ("/foo/test-dir-copy-scratch"); + dir_fd = open ("/foo/test-dir-copy-scratch", O_RDONLY); + if (dir_fd < 0) + { + umount("/foo/test-dir-copy-scratch"); + return false; + } + + umount("/foo/test-dir-copy-scratch"); - if (fchdir (dir_fd) != 0) + if (fchdir (dir_fd) != 0) { return false; system ("ls"); |