summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2011-04-22 20:05:51 +0300
committerArtem Bityutskiy <Artem.Bityutskiy@nokia.com>2011-04-24 19:12:30 +0300
commit495880672a8aef1d217b841d204f9d6723e7171f (patch)
tree6033f772658037da6ee422d840be75abf5450f32 /tests
parent0d209f581d2a9906b94a88325e9ea4b4249215db (diff)
fs-tests: integck: print a bit less if in power cut mode
Do not print extra messages when unable to re-mount - they are already printed by the recover function. Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
Diffstat (limited to 'tests')
-rw-r--r--tests/fs-tests/integrity/integck.c25
1 files changed, 12 insertions, 13 deletions
diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c
index 55fe8be..63f6956 100644
--- a/tests/fs-tests/integrity/integck.c
+++ b/tests/fs-tests/integrity/integck.c
@@ -3014,6 +3014,18 @@ int main(int argc, char *argv[])
free_test_data();
+ do {
+ ret = recover_tested_fs();
+ if (ret) {
+ CHECK(errno == EROFS);
+ rpt += 1;
+ }
+ /*
+ * Mount may also fail due to an emulated power cut
+ * while mounting - keep re-starting.
+ */
+ } while (ret);
+
/*
* The file-system became read-only and we are in power cut
* testing mode. Re-mount the file-system and re-start the
@@ -3022,19 +3034,6 @@ int main(int argc, char *argv[])
if (args.verbose)
normsg("re-mount the FS and re-start - count %ld", rpt);
- do {
- ret = recover_tested_fs();
- if (ret) {
- CHECK(errno == EROFS);
- /*
- * Mount may also fail due to an emulated power
- * cut while mounting - keep re-starting.
- */
- if (args.verbose)
- normsg("could not mount, try again - count %ld",
- ++rpt);
- }
- } while (ret);
}
free_test_data();