Merge branch 'main' of github.com:oscomp/starry-next into yyy-dev

Author: y3none

apps/oscomp/judge_basic.py

@@ -116,7 +116,7 @@ def test(self, data):
         self.assert_ge(len(data), 1)
         self.assert_in_str(r"  close \d+ success.", data)
 
-class dup2_test(TestBase):
+class test_dup2(TestBase):
     def __init__(self):
         super().__init__("dup2", 2)
 
@@ -296,22 +296,22 @@ def test(self, data):
 
 class test_pipe(TestBase):
     def __init__(self):
-        super().__init__("pipe", 4)
+        super().__init__("pipe", 2)
 
     def test(self, data):
         self.assert_ge(len(data), 3)
-        cpid0 = False
-        cpid1 = False
-        for line in data[:3]:
-            if line == "cpid: 0":
-                cpid0 = True
-                continue
-            r = re.findall(r"cpid: (\d+)", line)
-            if r and int(r[0]) > 0:
-                cpid1 = True
-                continue
-        self.assert_equal(cpid0, True)
-        self.assert_equal(cpid1, True)
+        # cpid0 = False
+        # cpid1 = False
+        # for line in data[:3]:
+        #     if line == "cpid: 0":
+        #         cpid0 = True
+        #         continue
+        #     r = re.findall(r"cpid: (\d+)", line)
+        #     if r and int(r[0]) > 0:
+        #         cpid1 = True
+        #         continue
+        # self.assert_equal(cpid0, True)
+        # self.assert_equal(cpid1, True)
         self.assert_equal(data[2], "  Write to pipe successfully.")
 
 class test_read(TestBase):
@@ -462,6 +462,21 @@ def get_runner(name):
     "test_gettimeofday",
     "test_sleep",
     "test_times"
+    "test_pipe",
+    # "test_close",
+    # "test_dup",
+    # "test_dup2",
+    # "test_fstat",
+    # "test_getcwd",
+    # "test_mkdir",
+    # "test_open",
+    # "test_read",
+    # "test_unlink",
+    # "test_write",
+    # "test_openat",
+    # "test_getdents",
+    # "test_mount",
+    # "test_umount",
 ]
 
 if __name__ == '__main__':
@@ -509,6 +524,7 @@ def get_runner(name):
     for x in runner.values():
         result = x.get_result()
         if result['all'] != result['pass'] and result['name'] in target_testcases:
+            print(result['name'] + " failed!")
             exit(255)
-    print("Busybox testcases passed.")
+    print("Basic testcases passed.")
     print(json.dumps(test_results))

apps/oscomp/testcase_list

@@ -1,13 +1 @@
-/musl/basic/brk
-/musl/basic/chdir
-/musl/basic/clone
-/musl/basic/getpid
-/musl/basic/getppid
-/musl/basic/exit
-/musl/basic/wait
-/musl/basic/execve
-/musl/basic/waitpid
-/musl/basic/yield
-/musl/basic/gettimeofday
-/musl/basic/sleep
-/musl/basic/times
+/musl/runtest.exe -w entry-static.exe argv

scripts/oscomp_test.sh

@@ -46,6 +46,21 @@ basic_testlist=(
     "/$LIBC/basic/gettimeofday"
     "/$LIBC/basic/sleep"
     "/$LIBC/basic/times"
+    "/$LIBC/basic/pipe"
+    # "/$LIBC/basic/close"
+    # "/$LIBC/basic/dup"
+    # "/$LIBC/basic/dup2"
+    # "/$LIBC/basic/fstat"
+    # "/$LIBC/basic/getcwd"
+    # "/$LIBC/basic/mkdir_"
+    # "/$LIBC/basic/open"
+    # "/$LIBC/basic/read"
+    # "/$LIBC/basic/unlink"
+    # "/$LIBC/basic/write"
+    # "/$LIBC/basic/openat"
+    # "/$LIBC/basic/getdents"
+    # "/$LIBC/basic/mount"
+    # "/$LIBC/basic/umount"
 )
 busybox_testlist=("/$LIBC/busybox sh /$LIBC/busybox_testcode.sh")
 iozone_testlist=("/$LIBC/busybox sh /$LIBC/iozone_testcode.sh")