diff options
| author | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-03 12:31:43 -0500 |
|---|---|---|
| committer | Anthony Liguori <anthony@codemonkey.ws> | 2013-09-03 12:31:44 -0500 |
| commit | 5a93d5c2abc719bd44f6c9fbeed88d3cae712606 (patch) | |
| tree | b3e9244146ce4bd678bdcf5b452b702f4be0ec8f /tests | |
| parent | 9ea0f58fc723daeb9e1dba9a762269e8cbbd1b73 (diff) | |
| parent | fcdda211f9239f4218f96cdc336a482f7103d90b (diff) | |
| download | qemu-5a93d5c2abc719bd44f6c9fbeed88d3cae712606.tar.gz qemu-5a93d5c2abc719bd44f6c9fbeed88d3cae712606.tar.bz2 qemu-5a93d5c2abc719bd44f6c9fbeed88d3cae712606.zip | |
Merge remote-tracking branch 'mjt/trivial-patches' into staging
# By Stefan Weil (6) and others
# Via Michael Tokarev
* mjt/trivial-patches:
aio / timers: use g_usleep() not sleep()
adlib: sort offsets in portio registration
qmp: fix integer usage in examples
tci: Remove function tcg_out64 (fix broken build)
target-arm: Report unimplemented opcodes (LOG_UNIMP)
pflash_cfi02.c: fix debug macro
configure: Remove unneeded redirections of stderr (pkg-config --exists)
configure: Remove unneeded redirections of stderr (pkg-config --cflags, --libs)
configure: Don't write .pyc files by default (python -B)
curl: qemu_bh_new() can never return NULL
slirp/arp_table.c: Avoid shifting into sign bit of signed integers
configure: disable clang -Wstring-plus-int warning
rdma: silly ipv6 bugfix
misc: Fix some typos in names and comments
slirp: Port redirection option behave differently on Linux and Windows
Message-id: 1378119695-14568-1-git-send-email-mjt@msgid.tls.msk.ru
Signed-off-by: Anthony Liguori <anthony@codemonkey.ws>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/test-aio.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/test-aio.c b/tests/test-aio.c index 07a1f61f87..532a1de3f9 100644 --- a/tests/test-aio.c +++ b/tests/test-aio.c @@ -396,7 +396,7 @@ static void test_timer_schedule(void) g_assert(!aio_poll(ctx, false)); g_assert_cmpint(data.n, ==, 0); - sleep(1); + g_usleep(1 * G_USEC_PER_SEC); g_assert_cmpint(data.n, ==, 0); g_assert(aio_poll(ctx, false)); @@ -729,7 +729,7 @@ static void test_source_timer_schedule(void) g_assert_cmpint(data.n, ==, 0); - sleep(1); + g_usleep(1 * G_USEC_PER_SEC); g_assert_cmpint(data.n, ==, 0); g_assert(g_main_context_iteration(NULL, false)); @@ -739,7 +739,7 @@ static void test_source_timer_schedule(void) do { g_assert(g_main_context_iteration(NULL, true)); } while (qemu_clock_get_ns(data.clock_type) <= expiry); - sleep(1); + g_usleep(1 * G_USEC_PER_SEC); g_main_context_iteration(NULL, false); g_assert_cmpint(data.n, ==, 2); |