integration test: attach a test directory to test file system (#61)

* integration test: attach a test directory to test file system

* change lwip version

* build-fs.sh: replace llvm-objcopy with objcopy

build.zig

@@ -17,17 +17,6 @@ const BuildParams = struct {
     fn new(b: *Build) Self {
         var params = BuildParams{};
 
-        const test_option = b.option(bool, "test", "run tests");
-        if (test_option) |t| {
-            params.is_test = t;
-            if (t) {
-                createTestDir() catch unreachable;
-                params.dir_path = TEST_DIR_PATH;
-            }
-        } else {
-            params.is_test = false;
-        }
-
         const obj_path_option = b.option([]const u8, "app-obj", "object file of application");
         if (obj_path_option) |p| {
             params.obj_path = p;
@@ -50,6 +39,17 @@ const BuildParams = struct {
             params.dir_path = null;
         }
 
+        const test_option = b.option(bool, "test", "run tests");
+        if (test_option) |t| {
+            params.is_test = t;
+            if (t) {
+                createTestDir() catch unreachable;
+                params.dir_path = TEST_DIR_PATH;
+            }
+        } else {
+            params.is_test = false;
+        }
+
         return params;
     }
 

scripts/build-fs.sh

@@ -25,13 +25,6 @@ mkdir -p build
 tar -cf build/disk.tar --format=ustar -C $dir_path .
 echo "tar archive created"
 
-# check if llvm-objcopy is installed
-if ! command -v llvm-objcopy &> /dev/null
-then
-    echo "llvm-objcopy could not be found"
-    exit 1
-fi
-
 # convert the archive to binary
-llvm-objcopy -Ibinary -Oelf64-x86-64 build/disk.tar build/disk.o
+objcopy -Ibinary -Oelf64-x86-64 build/disk.tar build/disk.o
 echo "disk.o created"

src/fs.zig

@@ -94,6 +94,7 @@ fn oct2int(oct: []const u8, len: usize) u32 {
 pub fn init() void {
     // check if fs is enabled
     if (!options.has_fs) {
+        log.debug.print("file system is not attached\n");
         return;
     }
 

src/wasi.zig

@@ -665,7 +665,7 @@ fn testServerSocket(base: usize) bool {
         log.fatal.printf("sock_open failed: res={d}\n", .{@intFromEnum(res)});
         return false;
     }
-    if (!(fd1.* == 4)) {
+    if (!(fd1.* == 5)) {
         log.fatal.printf("sock_open failed: fd={d}\n", .{fd1.*});
         return false;
     }