5 files changed, 74 insertions, 12 deletions

diff --git a/src/tests/utests/fs1/test.c b/src/tests/utests/fs1/test.c
index bab4d07..79db13b 100644
--- a/src/tests/utests/fs1/test.c
+++ b/src/tests/utests/fs1/test.c
@@ -17,20 +17,18 @@ int main(int argc, char **argv) {
 		dbg_printf("- '%s' %p %d\n", x.name, x.st.type, x.st.size);
 		if (x.st.type == FT_REGULAR) {
 			char buf[256];
-			strcpy(buf, "dev:/");
-			strcpy(buf+5, x.name);
+			strcpy(buf, "io:/");
+			strcpy(buf+4, x.name);
 			dbg_printf("trying to open %s...\n", buf);
 			fd_t ff = open(buf, FM_READ);
-			if (ff != 0) {
-				dbg_printf("ok, open as %d\n", ff);
-				char* cont = malloc(x.st.size + 1);
-				ASSERT(read(ff, 0, x.st.size, cont) == x.st.size);
-				cont[x.st.size] = 0;
-				dbg_printf("> '%s'\n", cont);
-				close(ff);
-			} else {
-				dbg_printf("Could not open '%s'\n", buf);
-			}
+			ASSERT(ff != 0);
+
+			dbg_printf("ok, open as %d\n", ff);
+			char* cont = malloc(x.st.size + 1);
+			ASSERT(read(ff, 0, x.st.size, cont) == x.st.size);
+			cont[x.st.size] = 0;
+			dbg_printf("> '%s'\n", cont);
+			close(ff);
 		}
 	}
 	close(f);
diff --git a/src/tests/utests/fs2/Makefile b/src/tests/utests/fs2/Makefile
new file mode 120000
index 0000000..4630a7c
--- /dev/null
+++ b/src/tests/utests/fs2/Makefile
@@ -0,0 +1 @@
+../rules.make
\ No newline at end of file
diff --git a/src/tests/utests/fs2/test.c b/src/tests/utests/fs2/test.c
new file mode 100644
index 0000000..f993c8e
--- /dev/null
+++ b/src/tests/utests/fs2/test.c
@@ -0,0 +1,30 @@
+#include <string.h>
+
+#include <malloc.h>
+
+#include <syscall.h>
+#include <debug.h>
+
+int main(int argc, char **argv) {
+	dbg_print("Hello, world! from user process.\n");
+
+	fd_t f = open("io:/mod", FM_READDIR);
+	dbg_printf("openned io:/mod as %d\n", f);
+	ASSERT(f != 0);
+
+	dirent_t x;
+	size_t ent_no = 0;
+	ASSERT (readdir(f, ent_no++, &x));
+
+	ASSERT(!strcmp(x.name, "init.bin"));
+	ASSERT(x.st.type == FT_REGULAR);
+
+	ASSERT(!readdir(f, ent_no++, &x));
+	close(f);
+
+	dbg_printf("(TEST-OK)\n");
+
+	return 0;
+}
+
+/* vim: set ts=4 sw=4 tw=0 noet :*/
diff --git a/src/tests/utests/subfs/Makefile b/src/tests/utests/subfs/Makefile
new file mode 120000
index 0000000..4630a7c
--- /dev/null
+++ b/src/tests/utests/subfs/Makefile
@@ -0,0 +1 @@
+../rules.make
\ No newline at end of file
diff --git a/src/tests/utests/subfs/test.c b/src/tests/utests/subfs/test.c
new file mode 100644
index 0000000..2612939
--- /dev/null
+++ b/src/tests/utests/subfs/test.c
@@ -0,0 +1,32 @@
+#include <string.h>
+
+#include <malloc.h>
+
+#include <syscall.h>
+#include <debug.h>
+
+int main(int argc, char **argv) {
+	dbg_print("Hello, world! from user process.\n");
+
+	ASSERT(fs_subfs("mod", "io", "/mod", FM_READ | FM_READDIR));
+
+	fd_t f = open("mod:/", FM_READDIR);
+	dbg_printf("openned mod:/ as %d\n", f);
+	ASSERT(f != 0);
+
+	dirent_t x;
+	size_t ent_no = 0;
+	ASSERT (readdir(f, ent_no++, &x));
+
+	ASSERT(!strcmp(x.name, "init.bin"));
+	ASSERT(x.st.type == FT_REGULAR);
+
+	ASSERT(!readdir(f, ent_no++, &x));
+	close(f);
+
+	dbg_printf("(TEST-OK)\n");
+
+	return 0;
+}
+
+/* vim: set ts=4 sw=4 tw=0 noet :*/