From patchwork Mon Nov 4 16:30:46 2013 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: oscar.mateo@intel.com X-Patchwork-Id: 3136501 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 E7D9BBEEB2 for ; Mon, 4 Nov 2013 16:35:40 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id C940C204E3 for ; Mon, 4 Nov 2013 16:35:39 +0000 (UTC) Received: from gabe.freedesktop.org (gabe.freedesktop.org [131.252.210.177]) by mail.kernel.org (Postfix) with ESMTP id 8F78B204E2 for ; Mon, 4 Nov 2013 16:35:38 +0000 (UTC) Received: from gabe.freedesktop.org (localhost [127.0.0.1]) by gabe.freedesktop.org (Postfix) with ESMTP id 84A09FA9AA; Mon, 4 Nov 2013 08:35:37 -0800 (PST) X-Original-To: intel-gfx@lists.freedesktop.org Delivered-To: intel-gfx@lists.freedesktop.org Received: from mga11.intel.com (mga11.intel.com [192.55.52.93]) by gabe.freedesktop.org (Postfix) with ESMTP id C842DFA9A9 for ; Mon, 4 Nov 2013 08:35:34 -0800 (PST) Received: from fmsmga002.fm.intel.com ([10.253.24.26]) by fmsmga102.fm.intel.com with ESMTP; 04 Nov 2013 08:35:34 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.93,633,1378882800"; d="scan'208";a="427711748" Received: from unknown (HELO omateolo-haswell.isw.intel.com) ([10.102.226.164]) by fmsmga002.fm.intel.com with ESMTP; 04 Nov 2013 08:35:33 -0800 From: oscar.mateo@intel.com To: intel-gfx@lists.freedesktop.org Date: Mon, 4 Nov 2013 16:30:46 +0000 Message-Id: <1383582649-2841-1-git-send-email-oscar.mateo@intel.com> X-Mailer: git-send-email 1.7.9.5 Subject: [Intel-gfx] [PATCH 1/4] tests: Fix "-thrashing" and "-thrash-inactive" distinction 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.2 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, 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 From: Oscar Mateo A typo in the relocation tests made both sub-tests perform the same action: drop *all* caches. Signed-off-by: Oscar Mateo --- tests/gem_persistent_relocs.c | 2 +- tests/gem_reloc_vs_gpu.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/tests/gem_persistent_relocs.c b/tests/gem_persistent_relocs.c index 29b19ed..34d8492 100644 --- a/tests/gem_persistent_relocs.c +++ b/tests/gem_persistent_relocs.c @@ -289,7 +289,7 @@ static void do_forked_test(int fd, unsigned flags) if (flags & (THRASH | THRASH_INACTIVE)) { char fname[FILENAME_MAX]; int drop_caches_fd; - const char *data = THRASH_INACTIVE ? "0xf" : "0x7"; + const char *data = (flags & THRASH_INACTIVE) ? "0x7" : "0xf"; snprintf(fname, FILENAME_MAX, "%s/%i/%s", "/sys/kernel/debug/dri", drm_get_card(), diff --git a/tests/gem_reloc_vs_gpu.c b/tests/gem_reloc_vs_gpu.c index ae7b446..bbfdc3a 100644 --- a/tests/gem_reloc_vs_gpu.c +++ b/tests/gem_reloc_vs_gpu.c @@ -284,7 +284,7 @@ static void do_forked_test(int fd, unsigned flags) if (flags & (THRASH | THRASH_INACTIVE)) { char fname[FILENAME_MAX]; int drop_caches_fd; - const char *data = THRASH_INACTIVE ? "0xf" : "0x7"; + const char *data = (flags & THRASH_INACTIVE) ? "0x7" : "0xf"; snprintf(fname, FILENAME_MAX, "%s/%i/%s", "/sys/kernel/debug/dri", drm_get_card(),