[PATCH 1/2] mtd-utils: fs-tests: pass TEST_DIR to integck in run_all.sh

[PATCH 1/2] mtd-utils: fs-tests: pass TEST_DIR to integck in run_all.sh

[Dongsheng Yang]

Test integck requires a parameter but run_all.sh did no pass any to it.
Then:
integck: error!: test file-system was not specified (use -h for help)

Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
---
 tests/fs-tests/run_all.sh | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/tests/fs-tests/run_all.sh b/tests/fs-tests/run_all.sh
index 7c82921..cb481ab 100755
--- a/tests/fs-tests/run_all.sh
+++ b/tests/fs-tests/run_all.sh
@@ -16,7 +16,7 @@ rm -rf ${TEST_DIR}/*
 
 rm -rf ${TEST_DIR}/*
 
-./integrity/integck || exit 1
+./integrity/integck $TEST_DIR|| exit 1
 
 rm -rf ${TEST_DIR}/*
 
-- 
1.8.4.2

[PATCH 2/2] mtd-utils: ubi-tests: fix a some overflows

[Dongsheng Yang]

Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
---
 tests/ubi-tests/mkvol_bad.c   | 2 +-
 tests/ubi-tests/mkvol_basic.c | 2 +-
 tests/ubi-tests/rsvol.c       | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/tests/ubi-tests/mkvol_bad.c b/tests/ubi-tests/mkvol_bad.c
index 27f4795..486fbab 100644
--- a/tests/ubi-tests/mkvol_bad.c
+++ b/tests/ubi-tests/mkvol_bad.c
@@ -106,7 +106,7 @@ static int test_mkvol(void)
 		return -1;
 
 	req.alignment = dev_info.leb_size - dev_info.min_io_size;
-	req.bytes = (dev_info.leb_size - dev_info.leb_size % req.alignment) *
+	req.bytes = (long long)(dev_info.leb_size - dev_info.leb_size % req.alignment) *
 		    dev_info.avail_lebs + 1;
 	ret = ubi_mkvol(libubi, node, &req);
 	if (check_failed(ret, ENOSPC, "ubi_mkvol", "bytes = %lld", req.bytes))
diff --git a/tests/ubi-tests/mkvol_basic.c b/tests/ubi-tests/mkvol_basic.c
index cda7241..2ff6ac1 100644
--- a/tests/ubi-tests/mkvol_basic.c
+++ b/tests/ubi-tests/mkvol_basic.c
@@ -55,7 +55,7 @@ static int mkvol_alignment(void)
 
 		/* Bear in mind alignment reduces EB size */
 		ebsz = dev_info.leb_size - dev_info.leb_size % req.alignment;
-		req.bytes = dev_info.avail_lebs * ebsz;
+		req.bytes = (long long)dev_info.avail_lebs * ebsz;
 
 		req.vol_type = UBI_DYNAMIC_VOLUME;
 		req.name = name;
diff --git a/tests/ubi-tests/rsvol.c b/tests/ubi-tests/rsvol.c
index 60badb0..732bcaa 100644
--- a/tests/ubi-tests/rsvol.c
+++ b/tests/ubi-tests/rsvol.c
@@ -169,7 +169,7 @@ static int test_rsvol1(struct ubi_vol_info *vol_info)
 	}
 
 	if (ubi_rsvol(libubi, node, vol_info->vol_id,
-		      vol_info->leb_size * dev_info.avail_lebs)) {
+		      (long long)vol_info->leb_size * dev_info.avail_lebs)) {
 		failed("ubi_rsvol");
 		return -1;
 	}
-- 
1.8.4.2

Re: [PATCH 2/2] mtd-utils: ubi-tests: fix a some overflows

[Richard Weinberger]

Am 29.06.2015 um 10:49 schrieb Dongsheng Yang:
> Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
> ---
>  tests/ubi-tests/mkvol_bad.c   | 2 +-
>  tests/ubi-tests/mkvol_basic.c | 2 +-
>  tests/ubi-tests/rsvol.c       | 2 +-
>  3 files changed, 3 insertions(+), 3 deletions(-)

Reviewed-by: Richard Weinberger <richard@nod.at>

Thanks,
//richard

Re: [PATCH 1/2] mtd-utils: fs-tests: pass TEST_DIR to integck in run_all.sh

[Richard Weinberger]

Am 29.06.2015 um 10:49 schrieb Dongsheng Yang:
> Test integck requires a parameter but run_all.sh did no pass any to it.
> Then:
> integck: error!: test file-system was not specified (use -h for help)
> 
> Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
> ---
>  tests/fs-tests/run_all.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/fs-tests/run_all.sh b/tests/fs-tests/run_all.sh
> index 7c82921..cb481ab 100755
> --- a/tests/fs-tests/run_all.sh
> +++ b/tests/fs-tests/run_all.sh
> @@ -16,7 +16,7 @@ rm -rf ${TEST_DIR}/*
>  
>  rm -rf ${TEST_DIR}/*
>  
> -./integrity/integck || exit 1
> +./integrity/integck $TEST_DIR|| exit 1

Hmm, so, run_all.sh never worked as expected?
TBH I run integck always by hand, so at least I have never noticed.

Reviewed-by: Richard Weinberger <richard@nod.at>

Thanks,
//richard

Re: [PATCH 1/2] mtd-utils: fs-tests: pass TEST_DIR to integck in run_all.sh

[Brian Norris]

On Mon, Jun 29, 2015 at 04:49:18PM +0800, Dongsheng Yang wrote:
> Test integck requires a parameter but run_all.sh did no pass any to it.
> Then:
> integck: error!: test file-system was not specified (use -h for help)
> 
> Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>
> ---
>  tests/fs-tests/run_all.sh | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 
> diff --git a/tests/fs-tests/run_all.sh b/tests/fs-tests/run_all.sh
> index 7c82921..cb481ab 100755
> --- a/tests/fs-tests/run_all.sh
> +++ b/tests/fs-tests/run_all.sh
> @@ -16,7 +16,7 @@ rm -rf ${TEST_DIR}/*
>  
>  rm -rf ${TEST_DIR}/*
>  
> -./integrity/integck || exit 1
> +./integrity/integck $TEST_DIR|| exit 1

Applied, with a whitespace fixup. Thanks.

>  
>  rm -rf ${TEST_DIR}/*
>  
> -- 
> 1.8.4.2
> 

Re: [PATCH 2/2] mtd-utils: ubi-tests: fix a some overflows

[Brian Norris]

On Mon, Jun 29, 2015 at 04:49:19PM +0800, Dongsheng Yang wrote:
> Signed-off-by: Dongsheng Yang <yangds.fnst@cn.fujitsu.com>

Pushed to mtd-utils.git. Thanks!