[PATCH 10/27] fs-tests: integck: make integck function return error

Artem Bityutskiy dedekind1 at gmail.com
Wed Apr 13 11:18:50 EDT 2011


From: Artem Bityutskiy <Artem.Bityutskiy at nokia.com>

Turn the 'void integck(void)' function into 'static int integck(void)'.
We need to teach the test to gracefully handle some error cases like
'EROFS' instead of failing and exiting straight away. And the ground
work for this is making all functions return errors. This is the first
tiny step in this direction.

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

diff --git a/tests/fs-tests/integrity/integck.c b/tests/fs-tests/integrity/integck.c
index ebe4995..3ee20b2 100644
--- a/tests/fs-tests/integrity/integck.c
+++ b/tests/fs-tests/integrity/integck.c
@@ -1951,7 +1951,7 @@ static void update_test_data(void)
 		do_an_operation();
 }
 
-void integck(void)
+static int integck(void)
 {
 	pid_t pid;
 	int64_t rpt;
@@ -1978,7 +1978,7 @@ void integck(void)
 	top_dir = dir_new(NULL, dir_name);
 
 	if (!top_dir)
-		return;
+		return -1;
 
 	srand(pid);
 
@@ -2012,6 +2012,8 @@ void integck(void)
 	close_open_files();
 	tests_clear_dir(dir_name);
 	CHECK(rmdir(dir_name) != -1);
+
+	return 0;
 }
 
 /*
@@ -2151,6 +2153,9 @@ int main(int argc, char *argv[])
 	}
 
 	/* Do the actual test */
-	integck();
-	return 0;
+	ret = integck();
+	if (ret)
+		return EXIT_FAILURE;
+
+	return EXIT_SUCCESS;
 }
-- 
1.7.2.3




More information about the linux-mtd mailing list