OpenE2K/qemu-e2k
13
4
Fork 0
Code Issues 4 Pull Requests Projects 2 Releases Activity

tests/tcg/multiarch: move most output to stdout

Browse Source 
The default test run outputs to stdout so it can be re-directed.
Errors are still reported to stderr.

Signed-off-by: Alex Bennée <alex.bennee@linaro.org>
Reviewed-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Tested-by: Philippe Mathieu-Daudé <f4bug@amsat.org>
Reviewed-by: Richard Henderson <richard.henderson@linaro.org>
Reviewed-by: Thomas Huth <thuth@redhat.com>
This commit is contained in:
Alex Bennée 2018-04-24 14:00:46 +01:00
parent 5aa632d5d9
commit 07c85b696a
1 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

40
tests/tcg/multiarch/test-mmap.c
View File

@ -36,7 +36,7 @@
do \ do \
{ \ { \
if (!(x)) { \ if (!(x)) { \
fprintf (stderr, "FAILED at %s:%d\n", __FILE__, __LINE__); \ fprintf(stderr, "FAILED at %s:%d\n", __FILE__, __LINE__); \
exit (EXIT_FAILURE); \ exit (EXIT_FAILURE); \
} \ } \
} while (0) } while (0)
@ -57,7 +57,7 @@ void check_aligned_anonymous_unfixed_mmaps(void)
uintptr_t p; uintptr_t p;
int i; int i;
fprintf (stderr, "%s", __func__); fprintf(stdout, "%s", __func__);
for (i = 0; i < 0x1fff; i++) for (i = 0; i < 0x1fff; i++)
{ {
size_t len; size_t len;
@ -106,7 +106,7 @@ void check_aligned_anonymous_unfixed_mmaps(void)
munmap (p4, len); munmap (p4, len);
munmap (p5, len); munmap (p5, len);
} }
fprintf (stderr, " passed\n"); fprintf(stdout, " passed\n");
} }
void check_large_anonymous_unfixed_mmap(void) void check_large_anonymous_unfixed_mmap(void)
@ -115,7 +115,7 @@ void check_large_anonymous_unfixed_mmap(void)
uintptr_t p; uintptr_t p;
size_t len; size_t len;
fprintf (stderr, "%s", __func__); fprintf(stdout, "%s", __func__);
len = 0x02000000; len = 0x02000000;
p1 = mmap(NULL, len, PROT_READ, p1 = mmap(NULL, len, PROT_READ,
@ -130,7 +130,7 @@ void check_large_anonymous_unfixed_mmap(void)
/* Make sure we can read from the entire area. */ /* Make sure we can read from the entire area. */
memcpy (dummybuf, p1, pagesize); memcpy (dummybuf, p1, pagesize);
munmap (p1, len); munmap (p1, len);
fprintf (stderr, " passed\n"); fprintf(stdout, " passed\n");
} }
void check_aligned_anonymous_unfixed_colliding_mmaps(void) void check_aligned_anonymous_unfixed_colliding_mmaps(void)
@ -141,7 +141,7 @@ void check_aligned_anonymous_unfixed_colliding_mmaps(void)
uintptr_t p; uintptr_t p;
int i; int i;
fprintf (stderr, "%s", __func__); fprintf(stdout, "%s", __func__);
for (i = 0; i < 0x2fff; i++) for (i = 0; i < 0x2fff; i++)
{ {
int nlen; int nlen;
@ -180,7 +180,7 @@ void check_aligned_anonymous_unfixed_colliding_mmaps(void)
munmap (p2, pagesize); munmap (p2, pagesize);
munmap (p3, nlen); munmap (p3, nlen);
} }
fprintf (stderr, " passed\n"); fprintf(stdout, " passed\n");
} }
void check_aligned_anonymous_fixed_mmaps(void) void check_aligned_anonymous_fixed_mmaps(void)
@ -194,7 +194,7 @@ void check_aligned_anonymous_fixed_mmaps(void)
addr = mmap(NULL, pagesize * 40, PROT_READ | PROT_WRITE, addr = mmap(NULL, pagesize * 40, PROT_READ | PROT_WRITE,
MAP_PRIVATE | MAP_ANONYMOUS, MAP_PRIVATE | MAP_ANONYMOUS,
-1, 0); -1, 0);
fprintf (stderr, "%s addr=%p", __func__, addr); fprintf(stdout, "%s addr=%p", __func__, addr);
fail_unless (addr != MAP_FAILED); fail_unless (addr != MAP_FAILED);
for (i = 0; i < 40; i++) for (i = 0; i < 40; i++)
@ -212,7 +212,7 @@ void check_aligned_anonymous_fixed_mmaps(void)
munmap (p1, pagesize); munmap (p1, pagesize);
addr += pagesize; addr += pagesize;
} }
fprintf (stderr, " passed\n"); fprintf(stdout, " passed\n");
} }
void check_aligned_anonymous_fixed_mmaps_collide_with_host(void) void check_aligned_anonymous_fixed_mmaps_collide_with_host(void)
@ -225,8 +225,8 @@ void check_aligned_anonymous_fixed_mmaps_collide_with_host(void)
/* Find a suitable address to start with. Right were the x86 hosts /* Find a suitable address to start with. Right were the x86 hosts
stack is. */ stack is. */
addr = ((void *)0x80000000); addr = ((void *)0x80000000);
fprintf (stderr, "%s addr=%p", __func__, addr); fprintf(stdout, "%s addr=%p", __func__, addr);
fprintf (stderr, "FIXME: QEMU fails to track pages used by the host."); fprintf(stdout, "FIXME: QEMU fails to track pages used by the host.");
for (i = 0; i < 20; i++) for (i = 0; i < 20; i++)
{ {
@ -243,7 +243,7 @@ void check_aligned_anonymous_fixed_mmaps_collide_with_host(void)
munmap (p1, pagesize); munmap (p1, pagesize);
addr += pagesize; addr += pagesize;
} }
fprintf (stderr, " passed\n"); fprintf(stdout, " passed\n");
} }
void check_file_unfixed_mmaps(void) void check_file_unfixed_mmaps(void)
@ -252,7 +252,7 @@ void check_file_unfixed_mmaps(void)
uintptr_t p; uintptr_t p;
int i; int i;
fprintf (stderr, "%s", __func__); fprintf(stdout, "%s", __func__);
for (i = 0; i < 0x10; i++) for (i = 0; i < 0x10; i++)
{ {
size_t len; size_t len;
@ -294,7 +294,7 @@ void check_file_unfixed_mmaps(void)
munmap (p2, len); munmap (p2, len);
munmap (p3, len); munmap (p3, len);
} }
fprintf (stderr, " passed\n"); fprintf(stdout, " passed\n");
} }
void check_file_unfixed_eof_mmaps(void) void check_file_unfixed_eof_mmaps(void)
@ -304,7 +304,7 @@ void check_file_unfixed_eof_mmaps(void)
uintptr_t p; uintptr_t p;
int i; int i;
fprintf (stderr, "%s", __func__); fprintf(stdout, "%s", __func__);
for (i = 0; i < 0x10; i++) for (i = 0; i < 0x10; i++)
{ {
p1 = mmap(NULL, pagesize, PROT_READ, p1 = mmap(NULL, pagesize, PROT_READ,
@ -327,7 +327,7 @@ void check_file_unfixed_eof_mmaps(void)
fail_unless (cp[pagesize - 4] == 0); fail_unless (cp[pagesize - 4] == 0);
munmap (p1, pagesize); munmap (p1, pagesize);
} }
fprintf (stderr, " passed\n"); fprintf(stdout, " passed\n");
} }
void check_file_fixed_eof_mmaps(void) void check_file_fixed_eof_mmaps(void)
@ -343,7 +343,7 @@ void check_file_fixed_eof_mmaps(void)
MAP_PRIVATE | MAP_ANONYMOUS, MAP_PRIVATE | MAP_ANONYMOUS,
-1, 0); -1, 0);
fprintf (stderr, "%s addr=%p", __func__, (void *)addr); fprintf(stdout, "%s addr=%p", __func__, (void *)addr);
fail_unless (addr != MAP_FAILED); fail_unless (addr != MAP_FAILED);
for (i = 0; i < 0x10; i++) for (i = 0; i < 0x10; i++)
@ -371,7 +371,7 @@ void check_file_fixed_eof_mmaps(void)
munmap (p1, pagesize); munmap (p1, pagesize);
addr += pagesize; addr += pagesize;
} }
fprintf (stderr, " passed\n"); fprintf(stdout, " passed\n");
} }
void check_file_fixed_mmaps(void) void check_file_fixed_mmaps(void)
@ -384,7 +384,7 @@ void check_file_fixed_mmaps(void)
addr = mmap(NULL, pagesize * 40 * 4, PROT_READ, addr = mmap(NULL, pagesize * 40 * 4, PROT_READ,
MAP_PRIVATE | MAP_ANONYMOUS, MAP_PRIVATE | MAP_ANONYMOUS,
-1, 0); -1, 0);
fprintf (stderr, "%s addr=%p", __func__, (void *)addr); fprintf(stdout, "%s addr=%p", __func__, (void *)addr);
fail_unless (addr != MAP_FAILED); fail_unless (addr != MAP_FAILED);
for (i = 0; i < 40; i++) for (i = 0; i < 40; i++)
@ -426,7 +426,7 @@ void check_file_fixed_mmaps(void)
munmap (p4, pagesize); munmap (p4, pagesize);
addr += pagesize * 4; addr += pagesize * 4;
} }
fprintf (stderr, " passed\n"); fprintf(stdout, " passed\n");
} }
void checked_write(int fd, const void *buf, size_t count) void checked_write(int fd, const void *buf, size_t count)