Skip to content

Commit

Permalink
[BUILD] Fixing lingering errors in CI build
Browse files Browse the repository at this point in the history
- Some tests are spewing -Wno-format errors that should be suppressed
- To address, added $(LIBS) to .o -> .c rule in tests/Makefile
- Cython is complaining about not being able to import log levels
- To address, renamed runtime.pxd -> studentapi.pxd
  • Loading branch information
benliao1 committed Jul 21, 2023
1 parent ce0e068 commit 11db2bb
Show file tree
Hide file tree
Showing 4 changed files with 3 additions and 3 deletions.
2 changes: 1 addition & 1 deletion executor/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ $(BIN)/$(TARGET): $(OBJS) | $(BIN)
$(CC) $(OBJS) -o $@ $(LIBS) $(PY_LIB)

# rule to compile studentapi.c
studentapi.c: studentapi.pyx runtime.pxd setup.py
studentapi.c: studentapi.pyx studentapi.pxd setup.py
$(PY_VER) setup.py build_ext -i

# rule to compile testapi
Expand Down
File renamed without changes.
2 changes: 1 addition & 1 deletion executor/studentapi.pyx
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
# cython: nonecheck=True

# from libc.stdint cimport *
from runtime cimport *
from studentapi cimport *
from cpython.mem cimport PyMem_Malloc, PyMem_Free
from libc.string cimport strcmp

Expand Down
2 changes: 1 addition & 1 deletion tests/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -162,7 +162,7 @@ $(TEST_EXE): $$(patsubst $(BIN)/%,$(OBJ)/$(THIS_DIR)/%.o,$$@) $(TEST_OBJS) $(PBC
# [gcc][-MMD -MP ...][-I../runtime_util -I../net_handler/pbc_gen .....] -c [client/net_handler_client.c]
# -o [../build/obj/tests/client/net_handler_client.o]
$(OBJ)/$(THIS_DIR)/%.o: %.c | $(BUILD_DIR)
$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@
$(CC) $(CFLAGS) $(INCLUDE) -c $< -o $@ $(LIBS)

################################ general rule for making a build or bin directory

Expand Down

0 comments on commit 11db2bb

Please sign in to comment.