Received: from martinlund.org ([173.255.130.145] helo=slmp-550-86.slc.westdc.net) by bombadil.infradead.org with esmtps (Exim 4.90_1 #2 (Red Hat Linux)) id 1fxYAH-0006ae-Us for linux-mtd@lists.infradead.org; Wed, 05 Sep 2018 13:48:15 +0000 Received: from [79.171.149.172] (port=34584 helo=quark.gomspace.lan) by slmp-550-86.slc.westdc.net with esmtpsa (TLSv1.2:ECDHE-RSA-AES128-GCM-SHA256:128) (Exim 4.91) (envelope-from ) id 1fxYA4-004Lj4-Qo for linux-mtd@lists.infradead.org; Wed, 05 Sep 2018 07:48:01 -0600 From: Martin Lund To: linux-mtd@lists.infradead.org Subject: [PATCH v2 mtd-utils] ubi-tests: io_paral: Fix error handling of update_volume() Date: Wed, 5 Sep 2018 15:47:38 +0200 Message-Id: <20180905134738.3461-1-malu@gomspace.com> List-Id: Linux MTD discussion mailing list List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , The io_paral test returns success even in case it throws e.g. the following error message: [io_paral] update_volume():125: written and read data are different This patch fixes so that the io_paral application returns a non-zero error code when an error is detected. --- tests/ubi-tests/io_paral.c | 28 ++++++++++++++++++---------- 1 file changed, 18 insertions(+), 10 deletions(-) diff --git a/tests/ubi-tests/io_paral.c b/tests/ubi-tests/io_paral.c index b2b462e..da24b1b 100644 --- a/tests/ubi-tests/io_paral.c +++ b/tests/ubi-tests/io_paral.c @@ -24,6 +24,7 @@ #include #include #include +#include #include #include #include @@ -149,22 +150,22 @@ static void *update_thread(void *ptr) if (ret) { failed("ubi_rmvol"); errorm("cannot remove volume %d", vol_id); - return NULL; + return (void *) -1; } ret = ubi_mkvol(libubi, node, &reqests[vol_id]); if (ret) { failed("ubi_mkvol"); errorm("cannot create volume %d", vol_id); - return NULL; + return (void *) -1; } } ret = update_volume(vol_id, bytes); - if (ret) - return NULL; + if (ret != 0) + return (void *) -1; } - return NULL; + return (void *) 0; } static void *write_thread(void *ptr) @@ -179,7 +180,7 @@ static void *write_thread(void *ptr) if (fd == -1) { failed("open"); errorm("cannot open \"%s\"\n", vol_node); - return NULL; + return (void *) -1; } ret = ubi_set_property(fd, UBI_VOL_PROP_DIRECT_WRITE, 1); @@ -228,12 +229,13 @@ static void *write_thread(void *ptr) } close(fd); - return NULL; + return (void *) 0; } int main(int argc, char * const argv[]) { - int i, ret; + int i, ret, error=false; + intptr_t thread_ret; pthread_t threads[THREADS_NUM]; if (initial_check(argc, argv)) @@ -301,8 +303,14 @@ int main(int argc, char * const argv[]) } } - for (i = 0; i < THREADS_NUM; i++) - pthread_join(threads[i], NULL); + for (i = 0; i < THREADS_NUM; i++) { + pthread_join(threads[i], (void **) &thread_ret); + if (thread_ret != 0) + error = true; + } + + if (error) + goto remove; for (i = 0; i <= THREADS_NUM; i++) { if (ubi_rmvol(libubi, node, i)) { -- 2.18.0