Patchwork fs-tests: integck: fail loudly on unexpected EROFS

login
register
mail settings
Submitter Artem Bityutskiy
Date April 26, 2011, 7:30 a.m.
Message ID <1303803022-31863-1-git-send-email-dedekind1@gmail.com>
Download mbox | patch
Permalink /patch/92868/
State Accepted
Commit 8d723c74983953a5b2fe64164893e3aee84c9d78
Headers show

Comments

Artem Bityutskiy - April 26, 2011, 7:30 a.m.
From: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>

If we are not in power cut testing mode (-p was not used) and we get an
unexpected EROFS, we silently exit. This patch fixes this behavior and make
the test loudly fail instead.

Signed-off-by: Artem Bityutskiy <Artem.Bityutskiy@nokia.com>
---
 tests/fs-tests/integrity/integck.c |   12 ++++++++----
 1 files changed, 8 insertions(+), 4 deletions(-)

Patch

diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c
index bbbc7cb..1dd424e 100644
--- a/tests/fs-tests/integrity/integck.c
+++ b/tests/fs-tests/integrity/integck.c
@@ -69,9 +69,11 @@ 
 		check_failed(stringify(cond), __func__, __FILE__, __LINE__); \
 } while(0)
 
-#define pcv(fmt, ...) do {                                         \
-	if (args.power_cut_mode && args.verbose)                   \
-		normsg(fmt " (line %d)", ##__VA_ARGS__, __LINE__); \
+#define pcv(fmt, ...) do {                                                   \
+	if (!args.power_cut_mode || (args.power_cut_mode && args.verbose))   \
+		normsg(fmt " (line %d)", ##__VA_ARGS__, __LINE__);           \
+	if (!args.power_cut_mode)                                            \
+		CHECK(0);                                                    \
 } while(0)
 
 /* The variables below are set by command line arguments */
@@ -3048,8 +3050,10 @@  int main(int argc, char *argv[])
 		/*
 		 * Iterate forever only in case of power-cut emulation testing.
 		 */
-		if (!args.power_cut_mode)
+		if (!args.power_cut_mode) {
+			CHECK(!ret);
 			break;
+		}
 
 		CHECK(ret);
 		CHECK(errno == EROFS);