From patchwork Fri Mar 14 10:07:48 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Daniel Vetter X-Patchwork-Id: 3832021 Return-Path: X-Original-To: patchwork-intel-gfx@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.19.201]) by patchwork2.web.kernel.org (Postfix) with ESMTP id B6E1EBF540 for ; Fri, 14 Mar 2014 10:08:05 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id B9E9820306 for ; Fri, 14 Mar 2014 10:08:04 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id E7098202F8 for ; Fri, 14 Mar 2014 10:08:02 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 48DCBFB3D4; Fri, 14 Mar 2014 03:08:00 -0700 (PDT) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mail-ee0-f49.google.com (mail-ee0-f49.google.com [74.125.83.49]) by gabe.freedesktop.org (Postfix) with ESMTP id CAED3FB3D3 for ; Fri, 14 Mar 2014 03:07:58 -0700 (PDT) Received: by mail-ee0-f49.google.com with SMTP id c41so1167648eek.36 for ; Fri, 14 Mar 2014 03:07:57 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=ffwll.ch; s=google; h=from:to:cc:subject:date:message-id; bh=p6GUx7nkT+2MRHZnwaq0XY6p/cvYUs5XJe9VN3i7pHo=; b=lBVPfiGrSX292uMM8dKNS7JWQnty2G5ZIxaRFKx9PbI/a+0PvJ37PjIgWs7KV18Lui vsLWJrtMFr26wwLabSgm4OYO8L/65SvS0zVh0FiyVRi9yWvJbZZ/e/a9w2DRlI5NU8zA fOVnaoMnq31huRGqtONgHBG5N1DA0iZDR5C/s= X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id; bh=p6GUx7nkT+2MRHZnwaq0XY6p/cvYUs5XJe9VN3i7pHo=; b=FJQvLHvCEj4+89ZhFUhOYwnwEVE/0PbQu7XbRrgP9/IYHyiU+IUyvh7Wv7bORyGVoy uxFgJHBfzKP39zIBPTwvQtHxP891cRWvtEhTDzoIR0hNaITci99xvxIAzEv0pvQ6G45R nAdgRY/56XS6IpSQ04nRvJJqhgc4e5/W9gvc4Xxnnj3eCR6fdPTFBaNQRcuJL54jX4NR RPp/H3HhixWSUkqVDpr5Ng9FFwwFEjd00x7XXKd6F/qPPayLlt1eFyruu2HcKe+DnBVq W4A+kP4lm3ywWIIhr4RaY4D0rGH4PJMSuEvrHaaQ4m5hYLahbsA2hezirQ1Oe39vUliO pgVg== X-Gm-Message-State: ALoCoQmo4RS48CUHq/FmseO/z3/2l2w3MhyANfS/iFetrENDea0lAYQqZhUTqmgQzT4iGWLmcShS X-Received: by 10.14.109.71 with SMTP id r47mr7585224eeg.6.1394791677642; Fri, 14 Mar 2014 03:07:57 -0700 (PDT) Received: from aaron.ffwll.local (84-73-67-144.dclient.hispeed.ch. [84.73.67.144]) by mx.google.com with ESMTPSA id m8sm16072844eeg.11.2014.03.14.03.07.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Fri, 14 Mar 2014 03:07:56 -0700 (PDT) From: Daniel Vetter To: Intel Graphics Development Date: Fri, 14 Mar 2014 11:07:48 +0100 Message-Id: <1394791669-16910-1-git-send-email-daniel.vetter@ffwll.ch> X-Mailer: git-send-email 1.8.4.rc3 Cc: Daniel Vetter Subject: [Intel-gfx] [PATCH 1/2] tests/pm_rps: use igt_assert_cmpint X-BeenThere: intel-gfx@lists.freedesktop.org X-Mailman-Version: 2.1.13 Precedence: list List-Id: Intel graphics driver community testing & development List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: intel-gfx-bounces@lists.freedesktop.org Errors-To: intel-gfx-bounces@lists.freedesktop.org X-Spam-Status: No, score=-4.1 required=5.0 tests=BAYES_00,DKIM_SIGNED, RCVD_IN_DNSWL_MED, T_DKIM_INVALID, T_RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP Much better debug output almost for free. Signed-off-by: Daniel Vetter --- tests/pm_rps.c | 30 +++++++++++++++--------------- 1 file changed, 15 insertions(+), 15 deletions(-) diff --git a/tests/pm_rps.c b/tests/pm_rps.c index b5dd494443ff..f5af9c2e92e8 100644 --- a/tests/pm_rps.c +++ b/tests/pm_rps.c @@ -110,25 +110,25 @@ static int do_writeval(FILE *filp, int val, int lerrno) static void checkit(const int *freqs) { - igt_assert(freqs[MIN] <= freqs[MAX]); - igt_assert(freqs[CUR] <= freqs[MAX]); - igt_assert(freqs[MIN] <= freqs[CUR]); - igt_assert(freqs[RPn] <= freqs[MIN]); - igt_assert(freqs[MAX] <= freqs[RP0]); - igt_assert(freqs[RP1] <= freqs[RP0]); - igt_assert(freqs[RPn] <= freqs[RP1]); + igt_assert_cmpint(freqs[MIN], <=, freqs[MAX]); + igt_assert_cmpint(freqs[CUR], <=, freqs[MAX]); + igt_assert_cmpint(freqs[MIN], <=, freqs[CUR]); + igt_assert_cmpint(freqs[RPn], <=, freqs[MIN]); + igt_assert_cmpint(freqs[MAX], <=, freqs[RP0]); + igt_assert_cmpint(freqs[RP1], <=, freqs[RP0]); + igt_assert_cmpint(freqs[RPn], <=, freqs[RP1]); igt_assert(freqs[RP0] != 0); igt_assert(freqs[RP1] != 0); } static void matchit(const int *freqs1, const int *freqs2) { - igt_assert(freqs1[CUR] == freqs2[CUR]); - igt_assert(freqs1[MIN] == freqs2[MIN]); - igt_assert(freqs1[MAX] == freqs2[MAX]); - igt_assert(freqs1[RP0] == freqs2[RP0]); - igt_assert(freqs1[RP1] == freqs2[RP1]); - igt_assert(freqs1[RPn] == freqs2[RPn]); + igt_assert_cmpint(freqs1[CUR], ==, freqs2[CUR]); + igt_assert_cmpint(freqs1[MIN], ==, freqs2[MIN]); + igt_assert_cmpint(freqs1[MAX], ==, freqs2[MAX]); + igt_assert_cmpint(freqs1[RP0], ==, freqs2[RP0]); + igt_assert_cmpint(freqs1[RP1], ==, freqs2[RP1]); + igt_assert_cmpint(freqs1[RPn], ==, freqs2[RPn]); } static void dump(const int *freqs) @@ -434,7 +434,7 @@ static void idle_check(void) wait += IDLE_WAIT_TIMESTEP_MSEC; } while (wait < IDLE_WAIT_TIMEOUT_MSEC); - igt_assert(freqs[CUR] == freqs[MIN]); + igt_assert_cmpint(freqs[CUR], ==, freqs[MIN]); igt_debug("Required %d msec to reach cur=min\n", wait); } @@ -457,7 +457,7 @@ static void loaded_check(void) wait += LOADED_WAIT_TIMESTEP_MSEC; } while (wait < LOADED_WAIT_TIMEOUT_MSEC); - igt_assert(freqs[CUR] == freqs[MAX]); + igt_assert_cmpint(freqs[CUR], ==, freqs[MAX]); igt_debug("Required %d msec to reach cur=max\n", wait); }