[test] Remove test/wasmfs/get_backend.h. NFC (#23828)

These days we have a better mechanism that uses `setup_nodefs.js` as a
`--pre-js`.

See `setup_nodefs_test` in `test/common.py`

The advantage of this new mechanism is that it doesn't require the test
itself to know about wasmfs or any specific backend.

Author: sbc100

test/other/test_unlink.cpp

@@ -12,23 +12,9 @@
 #include <unistd.h>
 #include <assert.h>
 
-#ifdef WASMFS
-#include "../wasmfs/get_backend.h"
-#include <emscripten/wasmfs.h>
-#endif
-
 int main() {
   const char *filename = "test.dat";
-  const char *dirname = "test";
-
-#ifdef WASMFS
-  if (wasmfs_create_directory("root", 0777, get_backend()) != 0) {
-    return 1;
-  }
-  if (chdir("root") != 0) {
-    return 1;
-  }
-#endif
+  const char *dirname = "test.dir";
 
   // Create a file
   int fd = open(filename, O_RDWR | O_CREAT, 0777);
@@ -61,7 +47,6 @@ int main() {
   assert(access(dirname, F_OK) == -1);
 
   // The rest of this test does not yet pass with the node backend!
-#ifndef WASMFS_NODE_BACKEND
 
   // Check that we can still read the directory, but that it is empty.
   errno = 0;
@@ -92,8 +77,6 @@ int main() {
   close(parent);
 #endif
 
-#endif // WASMFS_NODE_BACKEND
-
   closedir(d);
 
   printf("ok\n");

test/test_other.py

@@ -118,11 +118,16 @@ def wasmfs_all_backends(f):
   @wraps(f)
   def metafunc(self, backend, *args, **kwargs):
     self.setup_wasmfs_test()
+    if backend == 'node':
+      self.setup_nodefs_test()
+    elif backend == 'raw':
+      self.setup_noderawfs_test()
     self.emcc_args.append(f'-D{backend}')
     f(self, *args, **kwargs)
 
-  parameterize(metafunc, {'': ('WASMFS_MEMORY_BACKEND',),
-                          'node': ('WASMFS_NODE_BACKEND',)})
+  parameterize(metafunc, {'': ('memory',),
+                          'node': ('node',),
+                          'raw': ('raw',)})
   return metafunc
 
 
@@ -133,12 +138,17 @@ def also_with_wasmfs_all_backends(f):
   def metafunc(self, backend, *args, **kwargs):
     if backend:
       self.setup_wasmfs_test()
+      if backend == 'node':
+        self.setup_nodefs_test()
+      elif backend == 'raw':
+        self.setup_noderawfs_test()
       self.emcc_args.append(f'-D{backend}')
     f(self, *args, **kwargs)
 
   parameterize(metafunc, {'': (None,),
-                          'wasmfs': ('WASMFS_MEMORY_BACKEND',),
-                          'wasmfs_node': ('WASMFS_NODE_BACKEND',)})
+                          'wasmfs': ('memory',),
+                          'wasmfs_node': ('node',),
+                          'wasmfs_raw': ('raw',)})
   return metafunc
 
 

test/wasmfs/get_backend.h

@@ -20,8 +20,6 @@
 #include <sys/syscall.h>
 #include <unistd.h>
 
-#include "get_backend.h"
-
 void print_one(int fd) {
   struct dirent d;
   int nread = getdents(fd, &d, sizeof(d));
@@ -54,21 +52,23 @@ void print(const char* dir) {
 }
 
 int main() {
-  int err = wasmfs_create_directory("/root", 0777, get_backend());
+  int err;
 
   // Set up test directories.
-  err = mkdir("/root/working", 0777);
+  err = mkdir("root", 0777);
+  assert(err != -1);
+  err = mkdir("root/working", 0777);
   assert(err != -1);
-  err = mkdir("/root/working/test", 0777);
+  err = mkdir("root/working/test", 0777);
   assert(err != -1);
 
   struct dirent d;
 
   // Try opening the directory that was just created.
-  printf("------------- Reading from /root/working Directory -------------\n");
-  print("/root/working");
+  printf("------------- Reading from root/working Directory -------------\n");
+  print("root/working");
 
-  int fd = open("/root/working", O_RDONLY | O_DIRECTORY);
+  int fd = open("root/working", O_RDONLY | O_DIRECTORY);
 
   // Try reading an invalid fd.
   errno = 0;
@@ -109,17 +109,17 @@ int main() {
 
   // Try to advance the offset of the directory.
   // Expect that '.' will be skipped.
-  fd = open("/root/working", O_RDONLY | O_DIRECTORY);
-  printf("/root/working file position is: %lli\n", lseek(fd, 1, SEEK_SET));
+  fd = open("root/working", O_RDONLY | O_DIRECTORY);
+  printf("root/working file position is: %lli\n", lseek(fd, 1, SEEK_SET));
   printf(
-    "------------- Reading one from /root/working Directory -------------\n");
+    "------------- Reading one from root/working Directory -------------\n");
   print_one(fd);
   close(fd);
 
   // Try to add a file to the /working directory.
-  fd = open("/root/working/foobar", O_CREAT, S_IRGRP);
+  fd = open("root/working/foobar", O_CREAT, S_IRGRP);
   assert(fd != -1);
   close(fd);
-  printf("------------- Reading from /root/working Directory -------------\n");
-  print("/root/working");
+  printf("------------- Reading from root/working Directory -------------\n");
+  print("root/working");
 }

test/wasmfs/wasmfs_getdents.c

@@ -1,4 +1,4 @@
-------------- Reading from /root/working Directory -------------
+------------- Reading from root/working Directory -------------
 d.d_name = .
 d.d_reclen = 280
 d.d_type = directory
@@ -58,13 +58,13 @@ stdin
 stdout
 urandom
 
-/root/working file position is: 1
-------------- Reading one from /root/working Directory -------------
+root/working file position is: 1
+------------- Reading one from root/working Directory -------------
 d.d_name = ..
 d.d_reclen = 280
 d.d_type = directory
 
-------------- Reading from /root/working Directory -------------
+------------- Reading from root/working Directory -------------
 d.d_name = .
 d.d_reclen = 280
 d.d_type = directory

test/wasmfs/wasmfs_getdents.out

@@ -6,21 +6,19 @@
  */
 
 #include <assert.h>
-#include <emscripten.h>
-#include <emscripten/wasmfs.h>
+#include <emscripten/em_asm.h>
 #include <errno.h>
 #include <fcntl.h>
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <sys/stat.h>
 #include <unistd.h>
 
-#include "get_backend.h"
-
 int main() {
-  int err = wasmfs_create_directory("/root", 0777, get_backend());
+  int err = mkdir("root", 0777);
   assert(err == 0);
-  int fd = open("/root/test", O_CREAT | O_WRONLY, S_IRUSR | S_IWUSR);
+  int fd = open("root/test", O_CREAT | O_WRONLY, S_IRUSR | S_IWUSR);
   const char* msg = "Success\n";
 
   errno = 0;
@@ -30,25 +28,29 @@ int main() {
   assert(err == 0);
 
   EM_ASM({
-    var output = FS.readFile("/root/test");
+    var output = FS.readFile("root/test");
     out(UTF8ArrayToString(output));
     out("Length: " + output.byteLength);
-    var err = FS.unlink("/root/test");
+    var err = FS.unlink("root/test");
     out("FS.unlink: " + err);
   });
 
   EM_ASM({
     try {
-      var output = FS.readFile("/root/no-exist", {encoding : 'utf8'});
+      var output = FS.readFile("root/no-exist", {encoding : 'utf8'});
     } catch (err) {
+      return;
     }
+    assert(false);
   });
 
   EM_ASM({
     try {
       // Already unlinked above, file should not exist anymore
-      var output = FS.readFile("/root/test", {encoding : 'utf8'});
+      var output = FS.readFile("root/test", {encoding : 'utf8'});
     } catch (err) {
+      return;
     }
+    assert(false);
   });
 }