[fix]: remove dummy exception in tests

castlele · Dec 27, 2024 · e550a1b · e550a1b
1 parent aa98ee3
commit e550a1b
Show file tree

Hide file tree

Showing 6 changed files with 15 additions and 5 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,4 +1,4 @@
 check_report.txt
 .cache/
 **/*.o
-**/*.so
+cluautils/*
diff --git a/Makefile b/Makefile
@@ -1,3 +1,5 @@
+OSNAME=$(shell uname)
+
 CC=clang
 CFLAGS=-arch arm64
 ARCHIVE_CFLAGS=-shared -fPIC $(CFLAGS)
@@ -20,13 +22,22 @@ THREAD_BINARY=thread.so
 MEMORY_CFILES=$(MEMORY_SRC)/memory.c
 MEMORY_BINARY=memory.so
 
-
-THREAD_LIBS=-L./$(THREAD_BIN)/ -lcthread
+THREAD_LIBS=
 TEST_SRC=tests/cthread_internal_tests.c
 TEST_BINARY=tests
 
+# TODO: Update paths somehow
 LIBS=-llua -ldl -lm -I/Users/castlelecs/.luaver/lua/5.1/include/ -L/Users/castlelecs/.luaver/lua/5.1/lib/
 
+ifeq ($(OSNAME), Darwin)
+	THREAD_LIBS=-L./$(THREAD_BIN)/ -lcthread
+endif
+
+ifeq ($(OSNAME), Linux)
+	THREAD_LIBS=-L./$(THREAD_BIN)/ -lcthread -pthread
+endif
+
+
 build: build_thread build_memory
 test: test_thread
 

diff --git a/src/memory/bin/memory.so b/src/memory/bin/memory.so
diff --git a/src/threads/bin/libcthread.so b/src/threads/bin/libcthread.so
diff --git a/src/threads/bin/thread.so b/src/threads/bin/thread.so
diff --git a/tests/oop_tests.lua b/tests/oop_tests.lua
@@ -37,7 +37,6 @@ t.describe("OOP tests", function()
       local obj = CObject()
       local sut = obj:extend()
 
-      -- expectDefaultMethods(sut)
-      t.expect(false)
+      expectDefaultMethods(sut)
    end)
 end)