From patchwork Wed Apr 13 15:18:57 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Artem Bityutskiy X-Patchwork-Id: 91044 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from bombadil.infradead.org (bombadil.infradead.org [18.85.46.34]) (using TLSv1 with cipher DHE-RSA-AES256-SHA (256/256 bits)) (Client did not present a certificate) by ozlabs.org (Postfix) with ESMTPS id 10934B6F4E for ; Thu, 14 Apr 2011 01:19:51 +1000 (EST) Received: from canuck.infradead.org ([2001:4978:20e::1]) by bombadil.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux)) id 1QA1pD-0006lc-GX; Wed, 13 Apr 2011 15:17:47 +0000 Received: from localhost ([127.0.0.1] helo=canuck.infradead.org) by canuck.infradead.org with esmtp (Exim 4.72 #1 (Red Hat Linux)) id 1QA1pC-0003bN-0p; Wed, 13 Apr 2011 15:17:46 +0000 Received: from smtp.nokia.com ([147.243.1.48] helo=mgw-sa02.nokia.com) by canuck.infradead.org with esmtps (Exim 4.72 #1 (Red Hat Linux)) id 1QA1nS-0003SQ-8U for linux-mtd@lists.infradead.org; Wed, 13 Apr 2011 15:16:07 +0000 Received: from nokia.com (localhost [127.0.0.1]) by mgw-sa02.nokia.com (Switch-3.4.3/Switch-3.4.3) with ESMTP id p3DFFn4d018683 for ; Wed, 13 Apr 2011 18:15:56 +0300 Received: from eru.research.nokia.com ([[172.21.23.107]]) by mgw-sa02.nokia.com with ESMTP id p3DFFZw3018457 ; Wed, 13 Apr 2011 18:15:41 +0300 From: Artem Bityutskiy To: MTD list Subject: [PATCH 17/27] fs-tests: integck: clean up test directory creation Date: Wed, 13 Apr 2011 18:18:57 +0300 Message-Id: <1302707947-6143-18-git-send-email-dedekind1@gmail.com> X-Mailer: git-send-email 1.7.2.3 In-Reply-To: <1302707947-6143-1-git-send-email-dedekind1@gmail.com> References: <1302707947-6143-1-git-send-email-dedekind1@gmail.com> X-Nokia-AV: Clean X-CRM114-Version: 20090807-BlameThorstenAndJenny ( TRE 0.7.6 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20110413_111558_941586_CC4B79C4 X-CRM114-Status: GOOD ( 15.47 ) X-Spam-Score: 3.4 (+++) X-Spam-Report: SpamAssassin version 3.3.1 on canuck.infradead.org summary: Content analysis details: (3.4 points) pts rule name description ---- ---------------------- -------------------------------------------------- -0.0 RCVD_IN_DNSWL_NONE RBL: Sender listed at http://www.dnswl.org/, low trust [147.243.1.48 listed in list.dnswl.org] 0.0 FREEMAIL_FROM Sender email is freemail (dedekind1[at]gmail.com) 0.0 DKIM_ADSP_CUSTOM_MED No valid author signature, adsp_override is CUSTOM_MED 2.2 FREEMAIL_ENVFROM_END_DIGIT Envelope-from freemail username ends in digit (dedekind1[at]gmail.com) 1.2 NML_ADSP_CUSTOM_MED ADSP custom_med hit, and not from a mailing list Cc: Adrian Hunter X-BeenThere: linux-mtd@lists.infradead.org X-Mailman-Version: 2.1.12 Precedence: list List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: linux-mtd-bounces@lists.infradead.org Errors-To: linux-mtd-bounces+incoming=patchwork.ozlabs.org@lists.infradead.org From: Artem Bityutskiy Move the test directory name to the fsinfo structure and do few other cleanups while on it. Signed-off-by: Artem Bityutskiy --- tests/fs-tests/integrity/integck.c | 34 ++++++++++++++++++++++------------ 1 files changed, 22 insertions(+), 12 deletions(-) diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c index c21b488..ed02b56 100644 --- a/tests/fs-tests/integrity/integck.c +++ b/tests/fs-tests/integrity/integck.c @@ -44,6 +44,9 @@ #define MAX_RANDOM_SEED 10000000 +/* The pattern for the top directory where we run the test */ +#define TEST_DIR_PATTERN "integck_test_dir_%u" + /* The variables below are set by command line arguments */ static struct { long repeat_cnt; @@ -64,6 +67,7 @@ static struct { * can_mmap: file-system supports share writable 'mmap()' operation * fstype: file-system type (e.g., "ubifs") * mount_point: tested file-system mount point path + * test_dir: the directory on the tested file-system where we test */ static struct { int max_name_len; @@ -73,6 +77,7 @@ static struct { unsigned int can_mmap:1; const char *fstype; const char *mount_point; + const char *test_dir; } fsinfo = { .nospc_size_ok = 1, .can_mmap = 1, @@ -1970,27 +1975,21 @@ static void update_test_data(void) static int integck(void) { - unsigned int pid; int64_t rpt; - char dir_name[256]; /* Make our top directory */ - pid = getpid(); - normsg("pid is %u", pid); - CHECK(sprintf(dir_name, "integck_test_dir_%u", pid) > 0); - if (chdir(dir_name) != -1) { + if (chdir(fsinfo.test_dir) != -1) { /* Remove it if it is already there */ tests_clear_dir("."); CHECK(chdir("..") != -1); - CHECK(rmdir(dir_name) != -1); + CHECK(rmdir(fsinfo.test_dir) != -1); } - top_dir = dir_new(NULL, dir_name); + top_dir = dir_new(NULL, fsinfo.test_dir); if (!top_dir) return -1; - srand(pid); - + srand(getpid()); create_test_data(); if (!tests_fs_is_rootfs()) { @@ -2019,8 +2018,8 @@ static int integck(void) /* Tidy up by removing everything */ close_open_files(); - tests_clear_dir(dir_name); - CHECK(rmdir(dir_name) != -1); + tests_clear_dir(fsinfo.test_dir); + CHECK(rmdir(fsinfo.test_dir) != -1); return 0; } @@ -2036,6 +2035,7 @@ static void get_tested_fs_info(void) FILE *f; uint64_t z; char *p; + unsigned int pid; /* Remove trailing '/' symbols from the mount point */ p = dup_string(args.mount_point); @@ -2084,6 +2084,16 @@ static void get_tested_fs_info(void) for (z = get_free_space(); z >= 10; z /= 10) fsinfo.log10_initial_free += 1; + + /* Pick the test directory name */ + p = malloc(sizeof(TEST_DIR_PATTERN) + 20); + CHECK(p != NULL); + pid = getpid(); + CHECK(sprintf(p, "integck_test_dir_%u", pid) > 0); + fsinfo.test_dir = p; + + normsg("pid %u, testing \"%s\" at \"%s\"", + pid, fsinfo.fstype, fsinfo.mount_point); } static const char doc[] = PROGRAM_NAME " version " PROGRAM_VERSION