Merge pull request #92 from turbolent/improve-tests

turbolent · Dec 24, 2023 · 2a0ecfc · 2a0ecfc
2 parents e960772 + 9cbc88d
commit 2a0ecfc
Show file tree

Hide file tree

Showing 13 changed files with 203 additions and 165 deletions.
diff --git a/.github/workflows/tests.yml b/.github/workflows/tests.yml
@@ -85,11 +85,25 @@ jobs:
         working-directory: ./w2c2
         run: make BUILD=${{ matrix.build }} FEATURES="unistd libgen getopt glob ${{ matrix.threads && 'threads' || '' }}"
 
+      - if: steps.changes.outputs.w2c2 == 'true'
+        name: Test w2c2
+        env:
+          LDFLAGS: -static
+        working-directory: ./w2c2
+        run: make test BUILD=${{ matrix.build }} FEATURES="unistd libgen getopt glob ${{ matrix.threads && 'threads' || '' }}"
+
       - if: steps.changes.outputs.w2c2 == 'true'
         name: Build futex
         working-directory: ./futex
         run: make BUILD=${{ matrix.build }}
 
+      - if: steps.changes.outputs.w2c2 == 'true'
+        name: Test futex
+        env:
+          LDFLAGS: -static ${{ matrix.system.linkAtomic && '-latomic' || '' }}
+        working-directory: ./futex
+        run: make test BUILD=${{ matrix.build }}
+
       - if: steps.changes.outputs.w2c2 == 'true'
         name: Run WebAssembly tests
         env:
@@ -104,9 +118,15 @@ jobs:
         working-directory: ./wasi
         run: make BUILD=${{ matrix.build }}
 
+      - if: steps.changes.outputs.wasi == 'true'
+        name: Test wasi
+        env:
+          LDFLAGS: -static ${{ matrix.system.linkAtomic && '-latomic' || '' }}
+        working-directory: ./wasi
+        run: make test BUILD=${{ matrix.build }}
   macos:
     runs-on: macos-latest
-    name: "macOS, ${{ matrix.system.target }} (build=${{ matrix.build }}, threads=${{ matrix.threads }})"
+    name: "macOS (build=${{ matrix.build }}, threads=${{ matrix.threads }})"
 
     strategy:
       fail-fast: false
@@ -133,15 +153,23 @@ jobs:
         working-directory: ./w2c2
         run: make BUILD=${{ matrix.build }} FEATURES="unistd libgen getopt glob ${{ matrix.threads && 'threads' || '' }}"
 
+      - if: steps.changes.outputs.w2c2 == 'true'
+        name: Test w2c2
+        working-directory: ./w2c2
+        run: make test BUILD=${{ matrix.build }} FEATURES="unistd libgen getopt glob ${{ matrix.threads && 'threads' || '' }}"
+
       - if: steps.changes.outputs.w2c2 == 'true'
         name: Build futex
         working-directory: ./futex
         run: make BUILD=${{ matrix.build }}
 
+      - if: steps.changes.outputs.w2c2 == 'true'
+        name: Test futex
+        working-directory: ./futex
+        run: make test BUILD=${{ matrix.build }}
+
       - if: steps.changes.outputs.w2c2 == 'true'
         name: Run WebAssembly tests
-        env:
-          ARCH: ${{ matrix.system.target }}
         working-directory: ./tests
         shell: bash
         run: make run-tests
@@ -151,6 +179,11 @@ jobs:
         working-directory: ./wasi
         run: make BUILD=${{ matrix.build }} FEATURES="unistd sysuio systime sysresource strndup fcntl timespec lstat pthreads"
 
+      - if: steps.changes.outputs.wasi == 'true'
+        name: Test wasi
+        working-directory: ./wasi
+        run: make test BUILD=${{ matrix.build }} FEATURES="unistd sysuio systime sysresource strndup fcntl timespec lstat pthreads"
+
   windows-msvc:
     runs-on: windows-2019
     name: "Windows (MSVC)"

diff --git a/futex/Makefile b/futex/Makefile
@@ -63,9 +63,13 @@ libw2c2futex.a: $(TARGET_OBJECTS)
 	$(AR) qc $@ $^
 	ranlib $@
 
-test: $(TEST_OBJECTS)
+futex_test: $(TEST_OBJECTS)
 	$(CC) $(CFLAGS) $^ -o $@ $(LDFLAGS)
 
+.PHONY: test
+test: futex_test
+	./futex_test
+
 clean:
 	-rm -f *.o *.a
-	-rm -f test
+	-rm -f futex_test
diff --git a/futex/futex_test.c b/futex/futex_test.c
@@ -85,22 +85,22 @@ testFutex(void) {
 
     if (!WASM_THREAD_CREATE(&thread1, testThreadFunc, &arg1)) {
         fprintf(stderr, "FAIL testFutex: failed to create thread1\n");
-        return;
+        exit(1);
     }
 
     if (!WASM_THREAD_CREATE(&thread2, testThreadFunc, &arg2)) {
         fprintf(stderr, "FAIL testFutex: failed to create thread2\n");
-        return;
+        exit(1);
     }
 
     if (!WASM_THREAD_CREATE(&thread3, testThreadFunc, &arg3)) {
         fprintf(stderr, "FAIL testFutex: failed to create thread3\n");
-        return;
+        exit(1);
     }
 
     if (!WASM_THREAD_CREATE(&thread4, testThreadFunc, &arg4)) {
         fprintf(stderr, "FAIL testFutex: failed to create thread4\n");
-        return;
+        exit(1);
     }
 
     /* Wait for all threads to have started */

diff --git a/futex/list_test.c b/futex/list_test.c
@@ -1,4 +1,5 @@
 #include <stdio.h>
+#include <stdlib.h>
 
 #include "list_test.h"
 #include "list.h"
@@ -34,23 +35,23 @@ testListOperations(void) {
 
     if (list != &element2.link) {
         fprintf(stderr, "FAIL testList: list != &element2.link\n");
-        return;
+        exit(1);
     }
     if (list->next != &element3.link) {
         fprintf(stderr, "FAIL testList: list->next != &element3.link\n");
-        return;
+        exit(1);
     }
     if (list->prev != NULL) {
         fprintf(stderr, "FAIL testList: list->prev != NULL\n");
-        return;
+        exit(1);
     }
     if (element3.link.next != NULL) {
         fprintf(stderr, "FAIL testList: element3.link.next != NULL\n");
-        return;
+        exit(1);
     }
     if (element3.link.prev != &element2.link) {
         fprintf(stderr, "FAIL testList: element3.link.prev != &element2.link\n");
-        return;
+        exit(1);
     }
 
     /*Prepend element1 to the list. */
@@ -59,31 +60,31 @@ testListOperations(void) {
 
     if (list != &element1.link) {
         fprintf(stderr, "FAIL testList: list != &element1.link\n");
-        return;
+        exit(1);
     }
     if (list->next != &element2.link) {
         fprintf(stderr, "FAIL testList: list->next != &element2.link\n");
-        return;
+        exit(1);
     }
     if (list->prev != NULL) {
         fprintf(stderr, "FAIL testList: list->prev != NULL\n");
-        return;
+        exit(1);
     }
     if (element2.link.next != &element3.link) {
         fprintf(stderr, "FAIL testList: element2.link.next != &element3.link\n");
-        return;
+        exit(1);
     }
     if (element2.link.prev != &element1.link) {
         fprintf(stderr, "FAIL testList: element2.link.prev != &element1.link\n");
-        return;
+        exit(1);
     }
     if (element3.link.next != NULL) {
         fprintf(stderr, "FAIL testList: element3.link.next != NULL\n");
-        return;
+        exit(1);
     }
     if (element3.link.prev != &element2.link) {
         fprintf(stderr, "FAIL testList: element3.link.prev != &element2.link\n");
-        return;
+        exit(1);
     }
 
     /* Remove element2 from the list. */
@@ -92,31 +93,31 @@ testListOperations(void) {
 
     if (list != &element1.link) {
         fprintf(stderr, "FAIL testList: list != &element1.link\n");
-        return;
+        exit(1);
     }
     if (list->next != &element3.link) {
         fprintf(stderr, "FAIL testList: list->next != &element3.link\n");
-        return;
+        exit(1);
     }
     if (list->prev != NULL) {
         fprintf(stderr, "FAIL testList: list->prev != NULL\n");
-        return;
+        exit(1);
     }
     if (element2.link.next != NULL) {
         fprintf(stderr, "FAIL testList: element2.link.next != NULL\n");
-        return;
+        exit(1);
     }
     if (element2.link.prev != NULL) {
         fprintf(stderr, "FAIL testList: element2.link.prev != NULL\n");
-        return;
+        exit(1);
     }
     if (element3.link.next != NULL) {
         fprintf(stderr, "FAIL testList: element3.link.next != NULL\n");
-        return;
+        exit(1);
     }
     if (element3.link.prev != &element1.link) {
         fprintf(stderr, "FAIL testList: element3.link.prev != &element1.link\n");
-        return;
+        exit(1);
     }
 
     /* Remove element1 from the list. */
@@ -125,23 +126,23 @@ testListOperations(void) {
 
     if (list != &element3.link) {
         fprintf(stderr, "FAIL testList: list != &element3.link\n");
-        return;
+        exit(1);
     }
     if (list->next != NULL) {
         fprintf(stderr, "FAIL testList: list->next != NULL\n");
-        return;
+        exit(1);
     }
     if (list->prev != NULL) {
         fprintf(stderr, "FAIL testList: list->prev != NULL\n");
-        return;
+        exit(1);
     }
     if (element1.link.next != NULL) {
         fprintf(stderr, "FAIL testList: element1.link.next != NULL\n");
-        return;
+        exit(1);
     }
     if (element1.link.prev != NULL) {
         fprintf(stderr, "FAIL testList: element1.link.prev != NULL\n");
-        return;
+        exit(1);
     }
 
     fprintf(stderr, "PASS testList\n");
@@ -158,24 +159,24 @@ testFreeLink(ListLink* link) {
         case 0:
             if (element->value != 1) {
                 fprintf(stderr, "FAIL testListFree: element->value != 1\n");
-                return;
+                exit(1);
             }
             break;
         case 1:
             if (element->value != 2) {
                 fprintf(stderr, "FAIL testListFree: element->value != 2\n");
-                return;
+                exit(1);
             }
             break;
         case 2:
             if (element->value != 3) {
                 fprintf(stderr, "FAIL testListFree: element->value != 3\n");
-                return;
+                exit(1);
             }
             break;
         default:
             fprintf(stderr, "FAIL testListFree: freeCount > 2\n");
-            return;
+            exit(1);
     }
 
     freeCount++;
@@ -217,7 +218,7 @@ testListFree(void) {
 
     if (freeCount != 3) {
         fprintf(stderr, "FAIL testListFree: freeCount != 3\n");
-        return;
+        exit(1);
     }
 
     fprintf(stderr, "PASS testListFree\n");