X-Git-Url: http://git.efficios.com/?p=lttng-tools.git;a=blobdiff_plain;f=tests%2Funit%2Ftest_directory_handle.c;fp=tests%2Funit%2Ftest_directory_handle.c;h=c14066909ee1212b2412d276f8ec8147a6a6a5e5;hp=da77c43d51af4acacee3203cf44243bed0bea809;hb=cbf53d23cecaca9c6ec71582663c4a8254a9f285;hpb=5c1f54d1d586f61a92704753411bd82c5c928218

diff --git a/tests/unit/test_directory_handle.c b/tests/unit/test_directory_handle.c
index da77c43d5..c14066909 100644
--- a/tests/unit/test_directory_handle.c
+++ b/tests/unit/test_directory_handle.c
@@ -162,40 +162,41 @@ end:
 static int test_rmdir_fail_non_empty(const char *test_dir)
 {
 	int ret, tests_ran = 0;
-	struct lttng_directory_handle test_dir_handle;
+	struct lttng_directory_handle *test_dir_handle;
 	char *created_dir = NULL;
 	const char test_root_name[] = "fail_non_empty";
 	char *test_dir_path = NULL;
 
 	diag("rmdir (fail if non-empty)");
 
-	ret = lttng_directory_handle_init(&test_dir_handle, test_dir);
-	ok(ret == 0, "Initialized directory handle from the test directory");
+	test_dir_handle = lttng_directory_handle_create(test_dir);
+	ok(test_dir_handle, "Initialized directory handle from the test directory");
 	tests_ran++;
-	if (ret) {
+	if (!test_dir_handle) {
+		ret = -1;
 		goto end;
 	}
 
-	ret = create_non_empty_hierarchy_with_root(&test_dir_handle, test_root_name);
+	ret = create_non_empty_hierarchy_with_root(test_dir_handle, test_root_name);
 	if (ret) {
 		diag("Failed to setup folder/file hierarchy to run test");
 		goto end;
 	}
 
 	ret = lttng_directory_handle_remove_subdirectory_recursive(
-			&test_dir_handle, test_root_name,
+			test_dir_handle, test_root_name,
 			LTTNG_DIRECTORY_HANDLE_FAIL_NON_EMPTY_FLAG);
 	ok(ret == -1, "Error returned when attempting to recursively remove non-empty hierarchy with LTTNG_DIRECTORY_HANDLE_FAIL_NON_EMPTY_FLAG");
 	tests_ran++;
 
-	ret = remove_file_from_hierarchy(&test_dir_handle, test_root_name);
+	ret = remove_file_from_hierarchy(test_dir_handle, test_root_name);
 	if (ret) {
 		diag("Failed to remove file from test folder hierarchy");
 		goto end;
 	}
 
 	ret = lttng_directory_handle_remove_subdirectory_recursive(
-			&test_dir_handle, test_root_name,
+			test_dir_handle, test_root_name,
 			LTTNG_DIRECTORY_HANDLE_FAIL_NON_EMPTY_FLAG);
 	ok(ret == 0, "No error returned when recursively removing empty hierarchy with LTTNG_DIRECTORY_HANDLE_FAIL_NON_EMPTY_FLAG");
 	tests_ran++;
@@ -211,7 +212,7 @@ static int test_rmdir_fail_non_empty(const char *test_dir)
 	tests_ran++;
 	ret = 0;
 end:
-	lttng_directory_handle_fini(&test_dir_handle);
+	lttng_directory_handle_put(test_dir_handle);
 	free(created_dir);
 	free(test_dir_path);
 	return ret == 0 ? tests_ran : ret;
@@ -220,28 +221,29 @@ end:
 static int test_rmdir_skip_non_empty(const char *test_dir)
 {
 	int ret, tests_ran = 0;
-	struct lttng_directory_handle test_dir_handle;
+	struct lttng_directory_handle *test_dir_handle;
 	char *created_dir = NULL;
 	const char test_root_name[] = "skip_non_empty";
 	char *test_dir_path = NULL;
 
 	diag("rmdir (skip if non-empty)");
 
-	ret = lttng_directory_handle_init(&test_dir_handle, test_dir);
-	ok(ret == 0, "Initialized directory handle from the test directory");
+	test_dir_handle = lttng_directory_handle_create(test_dir);
+	ok(test_dir_handle, "Initialized directory handle from the test directory");
 	tests_ran++;
-	if (ret) {
+	if (!test_dir_handle) {
+		ret = -1;
 		goto end;
 	}
 
-	ret = create_non_empty_hierarchy_with_root(&test_dir_handle, test_root_name);
+	ret = create_non_empty_hierarchy_with_root(test_dir_handle, test_root_name);
 	if (ret) {
 		diag("Failed to setup folder/file hierarchy to run test");
 		goto end;
 	}
 
 	ret = lttng_directory_handle_remove_subdirectory_recursive(
-			&test_dir_handle, test_root_name,
+			test_dir_handle, test_root_name,
 			LTTNG_DIRECTORY_HANDLE_SKIP_NON_EMPTY_FLAG);
 	ok(ret == 0, "No error returned when attempting to recursively remove non-empty hierarchy with LTTNG_DIRECTORY_HANDLE_SKIP_NON_EMPTY_FLAG");
 	tests_ran++;
@@ -254,14 +256,14 @@ static int test_rmdir_skip_non_empty(const char *test_dir)
 	ok(dir_exists(test_dir_path), "Test directory still exists after skip");
 	tests_ran++;
 
-	ret = remove_file_from_hierarchy(&test_dir_handle, test_root_name);
+	ret = remove_file_from_hierarchy(test_dir_handle, test_root_name);
 	if (ret) {
 		diag("Failed to remove file from test folder hierarchy");
 		goto end;
 	}
 
 	ret = lttng_directory_handle_remove_subdirectory_recursive(
-			&test_dir_handle, test_root_name,
+			test_dir_handle, test_root_name,
 			LTTNG_DIRECTORY_HANDLE_SKIP_NON_EMPTY_FLAG);
 	ok(ret == 0, "No error returned when recursively removing empty hierarchy with LTTNG_DIRECTORY_HANDLE_SKIP_NON_EMPTY_FLAG");
 	tests_ran++;
@@ -272,7 +274,7 @@ static int test_rmdir_skip_non_empty(const char *test_dir)
 	tests_ran++;
 	ret = 0;
 end:
-	lttng_directory_handle_fini(&test_dir_handle);
+	lttng_directory_handle_put(test_dir_handle);
 	free(created_dir);
 	free(test_dir_path);
 	return ret == 0 ? tests_ran : ret;