diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/mtd-tests/flash_speed.c | 6 | ||||
| -rw-r--r-- | tests/ubifs_tools-tests/Makemodule.am | 5 |
2 files changed, 7 insertions, 4 deletions
diff --git a/tests/mtd-tests/flash_speed.c b/tests/mtd-tests/flash_speed.c index 11f396c..3319452 100644 --- a/tests/mtd-tests/flash_speed.c +++ b/tests/mtd-tests/flash_speed.c @@ -190,7 +190,7 @@ static int read_eraseblock(int ebnum) { int err = mtd_read(&mtd, fd, ebnum, 0, iobuf, mtd.eb_size); if (err) - fprintf(stderr, "Error writing block %d!\n", ebnum); + fprintf(stderr, "Error reading block %d!\n", ebnum); return err; } @@ -490,7 +490,7 @@ int main(int argc, char **argv) } /* Multi-block erase all eraseblocks */ - if (!skip) { + if (flags & DESTRUCTIVE && !skip) { for (k = 1; k < 7; ++k) { blocks = 1 << k; printf("Testing %dx multi-block erase speed\n", blocks); @@ -518,7 +518,7 @@ int main(int argc, char **argv) /* Write a page and immediately after try to read another page. Report * the latency difference when performed on different banks (NOR only). */ - if (speb >= 0 && mtd.subpage_size == 1) { + if (flags & DESTRUCTIVE && speb >= 0 && mtd.subpage_size == 1) { long rww_duration_w, rww_latency_end; long rww_duration_rnw, rww_duration_r_end; bool rww_r_end_first; diff --git a/tests/ubifs_tools-tests/Makemodule.am b/tests/ubifs_tools-tests/Makemodule.am index 1715757..5fe4f83 100644 --- a/tests/ubifs_tools-tests/Makemodule.am +++ b/tests/ubifs_tools-tests/Makemodule.am @@ -10,7 +10,7 @@ test_SCRIPTS += \ tests/ubifs_tools-tests/fsck_tests/fsck_bad_image.sh \ tests/ubifs_tools-tests/mkfs_tests/build_fs_from_dir.sh -test_DATA += \ +TEST_IMAGE_FILES = \ tests/ubifs_tools-tests/images/good.gz \ tests/ubifs_tools-tests/images/sb_fanout.gz \ tests/ubifs_tools-tests/images/sb_fmt_version.gz \ @@ -64,3 +64,6 @@ test_DATA += \ tests/ubifs_tools-tests/images/dir_lost_not_recover.gz \ tests/ubifs_tools-tests/images/root_dir.gz \ tests/ubifs_tools-tests/images/empty_tnc.gz + +test_DATA += $(TEST_IMAGE_FILES) +EXTRA_DIST += $(TEST_IMAGE_FILES) |