From 1dd3439bb66eae7b61a3ce22b72ae8668fec1b58 Mon Sep 17 00:00:00 2001
From: David Robillard <d@drobilla.net>
Date: Thu, 6 Aug 2020 16:36:59 +0200
Subject: Add lilv_remove()

---
 test/lilv_test_utils.c | 11 ++---------
 test/test_state.c      |  3 +--
 2 files changed, 3 insertions(+), 11 deletions(-)

(limited to 'test')

diff --git a/test/lilv_test_utils.c b/test/lilv_test_utils.c
index def3eca..cfc5c4f 100644
--- a/test/lilv_test_utils.c
+++ b/test/lilv_test_utils.c
@@ -24,13 +24,6 @@
 #include "lilv/lilv.h"
 #include "serd/serd.h"
 
-#ifdef _WIN32
-#	include <direct.h>
-#	define mkdir(path, flags) _mkdir(path)
-#else
-#	include <unistd.h>
-#endif
-
 #include <errno.h>
 #include <stdbool.h>
 #include <stdint.h>
@@ -153,11 +146,11 @@ void
 delete_bundle(LilvTestEnv* env)
 {
 	if (env->test_content_path) {
-		unlink(env->test_content_path);
+		lilv_remove(env->test_content_path);
 	}
 
 	if (env->test_manifest_path) {
-		unlink(env->test_manifest_path);
+		lilv_remove(env->test_manifest_path);
 	}
 
 	if (env->test_bundle_path) {
diff --git a/test/test_state.c b/test/test_state.c
index acca4e9..5a2e5cb 100644
--- a/test/test_state.c
+++ b/test/test_state.c
@@ -32,7 +32,6 @@
 #	define mkdir(path, flags) _mkdir(path)
 #else
 #	include <sys/stat.h>
-#	include <unistd.h>
 #endif
 
 #include <assert.h>
@@ -561,7 +560,7 @@ main(void)
 	lilv_state_free(fstate7);
 	lilv_state_free(fstate72);
 
-	rmdir("state");
+	lilv_remove("state");
 
 	// Free URI map
 	for (size_t i = 0; i < n_uris; ++i) {
-- 
cgit v1.2.1