Cleanup test/fs tests. NFC (#24831)

Mostly converting to C and using EM_JS_DEPS macro.

Also, added lzfs test test_other.py so it can be tested outside the
browser tests.

Author: sbc100

test/fs/test_fopen_write.cpp renamed to test/fs/test_fopen_write.c

@@ -9,8 +9,7 @@
 #include <string.h>
 #include <emscripten/emscripten.h>
 
-void create_file()
-{
+void create_file() {
   FILE *file = fopen("hello_file.txt", "wb");
   assert(file);
   const char *data = "Hello world";
@@ -24,8 +23,7 @@ void create_file()
   fclose(file);
 }
 
-void read_file()
-{
+void read_file() {
   FILE *file = fopen("hello_file.txt", "rb");
   char buffer[128] = {};
   size_t read = fread(buffer, 1, sizeof(buffer), file);
@@ -34,8 +32,7 @@ void read_file()
   assert(!strcmp(buffer, "Hello data!"));
 }
 
-int main()
-{
+int main() {
   create_file();
   read_file();
   return 0;

test/fs/test_getcwd_with_non_ascii_name.c

@@ -0,0 +1,75 @@
+// Copyright 2017 The Emscripten Authors.  All rights reserved.
+// Emscripten is available under two separate licenses, the MIT license and the
+// University of Illinois/NCSA Open Source License.  Both these licenses can be
+// found in the LICENSE file.
+
+#include <assert.h>
+#include <errno.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/stat.h>
+#include <unistd.h>
+
+char* makeLongStr(const char* str, int strCount) {
+  char* result = malloc((strCount * strlen(str)) + 1);
+  result[0] = '\0';
+
+  for (int i = 0; i < strCount; ++i) {
+    strcat(result, str);
+  }
+
+  return result;
+}
+
+void doPositiveTest(const char* dirName) {
+  printf("positive test case: %s\n", dirName);
+
+  char fullDirName[4096];
+  sprintf(fullDirName, "/%s", dirName);
+  int ret = mkdir(fullDirName, 0777);
+  assert(ret == 0);
+  ret = chdir(fullDirName);
+  assert(ret == 0);
+
+  char buf[4096];
+  char* cwd = getcwd(buf, sizeof(buf));
+  assert(cwd != NULL);
+  printf("getcwd -> %s\n", cwd);
+}
+
+void doNegativeTest(const char* dirName) {
+  printf("negative test case: %s\n", dirName);
+
+  int ret = mkdir(dirName, 0777);
+  assert(ret == 0);
+  ret = chdir(dirName);
+  assert(ret == 0);
+
+  unsigned char buf[4096];
+  unsigned char filler = 0xFE;
+  memset(buf, filler, sizeof(buf));
+
+  size_t allowedBufferSize = strlen(dirName) / 2;
+  char* cwd = getcwd((char*)buf, allowedBufferSize);
+  assert(cwd == 0);
+  assert(errno == ERANGE);
+
+  for (size_t i = allowedBufferSize; i < sizeof(buf); i++) {
+    assert(buf[i] == filler);
+  }
+}
+
+int main() {
+  // Short non-ascii name
+  doPositiveTest(u8"абвгд");
+
+  // Long non-ascii name
+  char longStr[4096] = "abcde";
+  strcat(longStr, makeLongStr(u8"абвгд", 25));
+  assert(strlen(longStr) == 255);
+  doPositiveTest(longStr);
+
+  // The negative test passes a half-sized buffer to getcwd and makes sure that it fails.
+  doNegativeTest(makeLongStr(u8"abcde", 10));
+}

test/fs/test_getcwd_with_non_ascii_name.cpp

@@ -1,5 +1,5 @@
 positive test case: абвгд
-ret2 = /абвгд
+getcwd -> /абвгд
 positive test case: abcdeабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгд
-ret2 = /abcdeабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгд
+getcwd -> /abcdeабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгдабвгд
 negative test case: abcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcdeabcde

test/fs/test_getcwd_with_non_ascii_name.out

@@ -8,25 +8,24 @@
 #include <stdio.h>
 #include <unistd.h>
 #include <assert.h>
+#include <stdbool.h>
 #include <stdlib.h>
 #include <sys/stat.h>
 #include <sys/syscall.h>
 
-#define BUF_SIZE (sizeof(dirent)*2)
+#define BUF_SIZE (sizeof(struct dirent)*2)
 
-int main(int argc, char *argv[])
-{
+int main(int argc, char *argv[]) {
   int fd = open(".", O_RDONLY | O_DIRECTORY);
   assert(fd > 0);
 
-  printf("sizeof(dirent): %zu, sizeof(buffer): %zu\n", sizeof(dirent), BUF_SIZE);
+  printf("sizeof(dirent): %zu, sizeof(buffer): %zu\n", sizeof(struct dirent), BUF_SIZE);
 
   bool first = true;
 
-  for(;;)
-  {
+  while (1) {
     char buf[BUF_SIZE];
-    int nread = getdents(fd, (dirent*)buf, BUF_SIZE);
+    int nread = getdents(fd, (struct dirent*)buf, BUF_SIZE);
     assert(nread != -1);
     if (nread == 0)
       break;
@@ -39,9 +38,8 @@ int main(int argc, char *argv[])
     printf("--------------- nread=%d ---------------\n", nread);
     printf("i-node#  file type  d_reclen  d_off   d_name\n");
     int bpos = 0;
-    while(bpos < nread)
-    {
-      dirent *d = (dirent *)(buf + bpos);
+    while (bpos < nread) {
+      struct dirent *d = (struct dirent *)(buf + bpos);
       printf("%8ld  ", (long)d->d_ino);
       char d_type = *(buf + bpos + d->d_reclen - 1);
       printf("%-10s ", (d_type == DT_REG) ?  "regular" :

test/fs/test_getdents64.cpp renamed to test/fs/test_getdents64.c

@@ -0,0 +1,62 @@
+// Copyright 2017 The Emscripten Authors.  All rights reserved.
+// Emscripten is available under two separate licenses, the MIT license and the
+// University of Illinois/NCSA Open Source License.  Both these licenses can be
+// found in the LICENSE file.
+
+#include <assert.h>
+#include <dirent.h>
+#include <string.h>
+#include <stdio.h>
+#include <sys/stat.h>
+#include <fcntl.h>
+#include <unistd.h>
+
+void touch(const char* fileName) {
+  int fd = open(fileName, O_CREAT | O_WRONLY,  S_IRUSR | S_IWUSR | S_IRGRP);
+  assert(fd);
+  close(fd);
+}
+
+void doTest(const char* uniqueDirName, const char* fileName) {
+  printf("test in %s: %s\n", uniqueDirName, fileName);
+
+  int ret = mkdir(uniqueDirName, 0777);
+  assert(ret == 0);
+
+  char buf[1024];
+  sprintf(buf, "%s/%s", uniqueDirName, fileName);
+  touch(buf);
+
+  int fd = open(uniqueDirName, O_RDONLY | O_DIRECTORY);
+  assert(fd > 0);
+
+  while (1) {
+    struct dirent d;
+    int nread = getdents(fd, &d, sizeof(d));
+    assert(nread != -1);
+    if (nread == 0) {
+      break;
+    }
+
+    if (strcmp(d.d_name, ".") == 0 || strcmp(d.d_name, "..") == 0) {
+      continue;
+    }
+
+    printf("d.d_name = %s\n", d.d_name);
+
+    // If it needed to be, the name was truncated.
+    assert(strlen(d.d_name) <= 255);
+  }
+}
+
+int main() {
+  // Non-ascii file name.
+  doTest("test_dir", u8"абвгд");
+
+#ifndef WASMFS // The JS FS truncates filenames automatically, which is incorrect. Wasmfs and Linux do not.
+  // File name exceeds the limit of 255 chars and is truncated.
+  char longName[300];
+  memset(longName, 1, sizeof(longName));
+  doTest("test_dir2", longName);
+#endif
+}

test/fs/test_getdents64_special_cases.c

@@ -14,9 +14,11 @@
 
 #define TOTAL_SIZE (10*1024*128)
 
+EM_JS_DEPS(deps, "$ccall");
+
 double before_it_all;
 
-extern "C" void EMSCRIPTEN_KEEPALIVE finish() {
+void EMSCRIPTEN_KEEPALIVE finish() {
   // load some file data, SYNCHRONOUSLY :)
   char buffer[100];
   int num;
@@ -130,7 +132,7 @@ extern "C" void EMSCRIPTEN_KEEPALIVE finish() {
 #if LOAD_MANUALLY
   result = 1;
 #else
-  result = 2;
+  result = 0;
 #endif
   emscripten_force_exit(result);
 }

test/fs/test_getdents64_special_cases.cpp

@@ -9,7 +9,7 @@
 
 #include <emscripten.h>
 
-extern "C" {
+EM_JS_DEPS(deps, "$ccall");
 
 void EMSCRIPTEN_KEEPALIVE finish() {
   // load some file data, SYNCHRONOUSLY :)
@@ -39,8 +39,6 @@ void EMSCRIPTEN_KEEPALIVE finish() {
   REPORT_RESULT(1);
 }
 
-}
-
 int main() {
   // Load the metadata and data of our file package. When they arrive, load the contents of the package into our filesystem.
   // The data arrives as a Blob, which could in other cases arrive from any other way a Blob can arrive: