flywithu/ntel-gpu-tools
1
0
Fork 0
mirror of https://github.com/tiagovignatti/intel-gpu-tools.git synced 2025-06-12 02:16:17 +00:00
Code Issues Releases Wiki Activity

lib: Tidy testing for rtcwake

Browse Source 
When performing a dummy-run of rtcwake, hide the output as it doesn't
print anything useful (just when it will wake up).

Signed-off-by: Chris Wilson <chris@chris-wilson.co.uk>
This commit is contained in:
Chris Wilson 2016-03-03 10:15:35 +00:00
parent af22497ac9
commit cb4589af09
1 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/igt_aux.c
View File

@ -354,6 +354,8 @@ void igt_cleanup_aperture_trashers(void)
free(trash_bos); free(trash_bos);
} }
#define SQUELCH ">/dev/null 2>&1"
/** /**
* igt_system_suspend_autoresume: * igt_system_suspend_autoresume:
* *
@ -370,7 +372,7 @@ void igt_system_suspend_autoresume(void)
igt_skip_on_simulation(); igt_skip_on_simulation();
/* skip if system doesn't support suspend-to-mem */ /* skip if system doesn't support suspend-to-mem */
igt_skip_on(system("rtcwake -n -s 30 -m mem") != 0); igt_require(system("rtcwake -n -s 30 -m mem" SQUELCH) == 0);
igt_assert_f(system("rtcwake -s 30 -m mem") == 0, igt_assert_f(system("rtcwake -s 30 -m mem") == 0,
"This failure means that something is wrong with the " "This failure means that something is wrong with the "
@ -388,8 +390,6 @@ void igt_system_suspend_autoresume(void)
*/ */
void igt_system_hibernate_autoresume(void) void igt_system_hibernate_autoresume(void)
{ {
int ret;
/* FIXME: I'm guessing simulation behaves the same way as with /* FIXME: I'm guessing simulation behaves the same way as with
* suspend/resume, but it might be prudent to make sure * suspend/resume, but it might be prudent to make sure
*/ */
@ -399,13 +399,12 @@ void igt_system_hibernate_autoresume(void)
igt_skip_on_simulation(); igt_skip_on_simulation();
/* skip if system doesn't support suspend-to-disk */ /* skip if system doesn't support suspend-to-disk */
igt_skip_on(system("rtcwake -n -s 90 -m disk") != 0); igt_require(system("rtcwake -n -s 90 -m disk" SQUELCH) == 0);
/* The timeout might need to be adjusted if hibernation takes too long /* The timeout might need to be adjusted if hibernation takes too long
* or if we have to wait excessively long before resume * or if we have to wait excessively long before resume
*/ */
ret = system("rtcwake -s 90 -m disk"); igt_assert_f(system("rtcwake -s 90 -m disk") == 0,
igt_assert_f(ret == 0,
"This failure means that something is wrong with the " "This failure means that something is wrong with the "
"rtcwake tool or how your distro is set up. This is not " "rtcwake tool or how your distro is set up. This is not "
"a i915.ko or i-g-t bug.\n"); "a i915.ko or i-g-t bug.\n");