diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2016-02-16 15:47:35 +0000 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2016-02-16 15:47:35 +0000 |
| commit | 250f53ddaac3211990fb20ced3c46d2338e195e3 (patch) | |
| tree | a63512b4b83c92e9ccf688b2e57a0cec4d6a46de /tests/test-io-channel-file.c | |
| parent | d5db2ec1774642db7febda0fba1cb3d0b9ef7236 (diff) | |
| parent | e8f117f3b3eb41a766d38e0b765f89ec79c6a9ff (diff) | |
| download | qemu-250f53ddaac3211990fb20ced3c46d2338e195e3.tar.gz | |
Merge remote-tracking branch 'remotes/berrange/tags/pull-io-next-2016-02-16-1' into staging
Merge I/O fixes 2016/02/16 v1
# gpg: Signature made Tue 16 Feb 2016 15:42:29 GMT using RSA key ID 15104FDF
# gpg: Good signature from "Daniel P. Berrange <dan@berrange.com>"
# gpg: aka "Daniel P. Berrange <berrange@redhat.com>"
* remotes/berrange/tags/pull-io-next-2016-02-16-1:
io: convert QIOChannelBuffer to use uint8_t instead of char
io: introduce helper for creating channels from file descriptors
io: improve docs for QIOChannelSocket async functions
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Diffstat (limited to 'tests/test-io-channel-file.c')
| -rw-r--r-- | tests/test-io-channel-file.c | 22 |
1 files changed, 22 insertions, 0 deletions
diff --git a/tests/test-io-channel-file.c b/tests/test-io-channel-file.c index c5d3d3c251..1e7f3c7f12 100644 --- a/tests/test-io-channel-file.c +++ b/tests/test-io-channel-file.c @@ -20,6 +20,7 @@ #include "qemu/osdep.h" #include "io/channel-file.h" +#include "io/channel-util.h" #include "io-channel-helpers.h" @@ -50,6 +51,26 @@ static void test_io_channel_file(void) } +static void test_io_channel_fd(void) +{ + QIOChannel *ioc; + int fd = -1; + +#define TEST_FILE "tests/test-io-channel-file.txt" + fd = open(TEST_FILE, O_CREAT | O_TRUNC | O_WRONLY, 0600); + g_assert_cmpint(fd, >, -1); + + ioc = qio_channel_new_fd(fd, &error_abort); + + g_assert_cmpstr(object_get_typename(OBJECT(ioc)), + ==, + TYPE_QIO_CHANNEL_FILE); + + unlink(TEST_FILE); + object_unref(OBJECT(ioc)); +} + + #ifndef _WIN32 static void test_io_channel_pipe(bool async) { @@ -93,6 +114,7 @@ int main(int argc, char **argv) g_test_init(&argc, &argv, NULL); g_test_add_func("/io/channel/file", test_io_channel_file); + g_test_add_func("/io/channel/file/fd", test_io_channel_fd); #ifndef _WIN32 g_test_add_func("/io/channel/pipe/sync", test_io_channel_pipe_sync); g_test_add_func("/io/channel/pipe/async", test_io_channel_pipe_async); |