Merge origin/main: resolve Makefile TEST_BINS conflict
Keep test_ppagecache and test_pfs_helpers entries from testability-refactor alongside test_pfsupload already merged into main. Co-Authored-By: Claude Sonnet 4.6 <noreply@anthropic.com>
This commit is contained in:
commit
4249feabfd
1
Makefile
1
Makefile
|
|
@ -250,6 +250,7 @@ tests/test_pfs_helpers: $(UNIT_DIR)/test_pfs_helpers.c $(LIBDIR)/pfs_helpers.c $
|
|||
-Wl,--wrap=ptimer_time
|
||||
# ^ GNU ld only; --wrap stubs out encrypted-size, folder-task lookup, and timer
|
||||
|
||||
|
||||
tests/test_read_response: $(UNIT_DIR)/test_read_response.cpp rpcclient.cpp tests/stubs/test_stubs_cpp.c
|
||||
$(CXX) $(TEST_CXXFLAGS) $(CXXFLAGS) -o $@ $^
|
||||
|
||||
|
|
|
|||
Loading…
Reference in New Issue