diff mbox

[i-g-t,1/2] lib/igt_aux: Half the timeout for suspend to RAM and a third for suspend to disk.

Message ID 1461174597-7722-1-git-send-email-marius.c.vlad@intel.com (mailing list archive)
State New, archived
Headers show

Commit Message

Marius Vlad April 20, 2016, 5:49 p.m. UTC
Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
---
 lib/igt_aux.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

Comments

Sarvela, Tomi P April 21, 2016, 7:54 a.m. UTC | #1
Fi CI has ran with this patch approx 2 weeks at January.

All platforms acted the same with or without patch.

Tomi


On Wednesday 20 April 2016 20:49:56 Marius Vlad wrote:
> Signed-off-by: Marius Vlad <marius.c.vlad@intel.com>
> ---
>  lib/igt_aux.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
> 
> diff --git a/lib/igt_aux.c b/lib/igt_aux.c
> index c32569f..fe18365 100644
> --- a/lib/igt_aux.c
> +++ b/lib/igt_aux.c
> @@ -671,9 +671,9 @@ void igt_system_suspend_autoresume(void)
>  	igt_skip_on_simulation();
> 
>  	/* skip if system doesn't support suspend-to-mem */
> -	igt_require(system("rtcwake -n -s 30 -m mem" SQUELCH) == 0);
> +	igt_require(system("rtcwake -n -s 15 -m mem" SQUELCH) == 0);
> 
> -	igt_assert_f(system("rtcwake -s 30 -m mem") == 0,
> +	igt_assert_f(system("rtcwake -s 15 -m mem") == 0,
>  		     "This failure means that something is wrong with the "
>  		     "rtcwake tool or how your distro is set up. This is not "
>  		     "a i915.ko or i-g-t bug.\n");
> @@ -698,12 +698,12 @@ void igt_system_hibernate_autoresume(void)
>  	igt_skip_on_simulation();
> 
>  	/* skip if system doesn't support suspend-to-disk */
> -	igt_require(system("rtcwake -n -s 90 -m disk" SQUELCH) == 0);
> +	igt_require(system("rtcwake -n -s 30 -m disk" SQUELCH) == 0);
> 
>  	/* The timeout might need to be adjusted if hibernation takes too long
>  	 * or if we have to wait excessively long before resume
>  	 */
> -	igt_assert_f(system("rtcwake -s 90 -m disk") == 0,
> +	igt_assert_f(system("rtcwake -s 30 -m disk") == 0,
>  		     "This failure means that something is wrong with the "
>  		     "rtcwake tool or how your distro is set up. This is not "
>  		     "a i915.ko or i-g-t bug.\n");
diff mbox

Patch

diff --git a/lib/igt_aux.c b/lib/igt_aux.c
index c32569f..fe18365 100644
--- a/lib/igt_aux.c
+++ b/lib/igt_aux.c
@@ -671,9 +671,9 @@  void igt_system_suspend_autoresume(void)
 	igt_skip_on_simulation();
 
 	/* skip if system doesn't support suspend-to-mem */
-	igt_require(system("rtcwake -n -s 30 -m mem" SQUELCH) == 0);
+	igt_require(system("rtcwake -n -s 15 -m mem" SQUELCH) == 0);
 
-	igt_assert_f(system("rtcwake -s 30 -m mem") == 0,
+	igt_assert_f(system("rtcwake -s 15 -m mem") == 0,
 		     "This failure means that something is wrong with the "
 		     "rtcwake tool or how your distro is set up. This is not "
 		     "a i915.ko or i-g-t bug.\n");
@@ -698,12 +698,12 @@  void igt_system_hibernate_autoresume(void)
 	igt_skip_on_simulation();
 
 	/* skip if system doesn't support suspend-to-disk */
-	igt_require(system("rtcwake -n -s 90 -m disk" SQUELCH) == 0);
+	igt_require(system("rtcwake -n -s 30 -m disk" SQUELCH) == 0);
 
 	/* The timeout might need to be adjusted if hibernation takes too long
 	 * or if we have to wait excessively long before resume
 	 */
-	igt_assert_f(system("rtcwake -s 90 -m disk") == 0,
+	igt_assert_f(system("rtcwake -s 30 -m disk") == 0,
 		     "This failure means that something is wrong with the "
 		     "rtcwake tool or how your distro is set up. This is not "
 		     "a i915.ko or i-g-t bug.\n");