@@ -295,36 +295,39 @@ userland: libc
295
295
.PHONY : userland
296
296
297
297
test : # # run unit tests
298
- test : CFLAGS += -fPIC -g3 -fsanitize=undefined
299
- test : CFLAGS_FOR_TESTS = -g3 -fsanitize=undefined -DENABLE_LOGS_FOR_TESTS -DTEST_ENV -I./test/ -I./src/ -I./src/arch/$(ARCH ) /
300
- test : VALGRIND_OPTS = --track-origins=yes --leak-check=yes
298
+ test : CFLAGS_WITHOUT_TARGET := $(filter-out --target=x86_64,$(CFLAGS ) )
299
+ test : CFLAGS = $(CFLAGS_WITHOUT_TARGET )
300
+ test : CFLAGS += -fPIC -g3 -fsanitize=undefined -fsanitize=address
301
+ test : CFLAGS_FOR_TESTS += -g3 -fsanitize=undefined -fsanitize=address
302
+ test : CFLAGS_FOR_TESTS += -DENABLE_LOGS_FOR_TESTS -DTEST_ENV
303
+ test : CFLAGS_FOR_TESTS += -I./test/ -I./src/ -I./src/arch/$(ARCH ) /
301
304
test : libc
302
305
# libc
303
306
mkdir -p $(ARCH_BUILD_DIR ) /libc/string
304
307
for file in $( LIBC_TEST_FILES) ; do \
305
308
echo ; \
306
309
$(CC ) -shared $(LIBC_OBJS_DIR ) /src/$$ file.o -o $(ARCH_BUILD_DIR ) /$$ file.so ; \
307
- $(CC ) -I./test/ test/$$ file.c -o $(ARCH_BUILD_DIR ) /$$ file ; \
310
+ $(CC ) -g3 -fsanitize=undefined -fsanitize=address - I./test/ test/$$ file.c -o $(ARCH_BUILD_DIR ) /$$ file ; \
308
311
LD_PRELOAD=./$(ARCH_BUILD_DIR ) /$$ file.so ./$(ARCH_BUILD_DIR ) /$$ file || exit 1 ; \
309
312
done
310
313
# fs/vfs
311
314
$(CC ) $(CFLAGS_FOR_TESTS ) -I./test/proxies/ -o $(ARCH_BUILD_DIR ) /vfs test/fs/vfs.c src/arch/$(ARCH ) /fs/vfs.c
312
- valgrind --track-origins=yes --leak-check=yes ./$(ARCH_BUILD_DIR ) /vfs
315
+ ./$(ARCH_BUILD_DIR ) /vfs
313
316
# fs/tar
314
317
$(CC ) $(CFLAGS_FOR_TESTS ) -o $(ARCH_BUILD_DIR ) /tar test/fs/tar.c src/arch/$(ARCH ) /fs/tar.c src/arch/$(ARCH ) /fs/vfs.c
315
- valgrind $( VALGRIND_OPTS ) ./$(ARCH_BUILD_DIR ) /tar
318
+ ./$(ARCH_BUILD_DIR ) /tar
316
319
# fs/proc
317
320
$(CC ) $(CFLAGS_FOR_TESTS ) -I./test/proxies/ -o $(ARCH_BUILD_DIR ) /proc test/fs/proc.c src/arch/$(ARCH ) /fs/proc.c src/arch/$(ARCH ) /fs/vfs.c
318
- valgrind $( VALGRIND_OPTS ) ./$(ARCH_BUILD_DIR ) /proc
321
+ ./$(ARCH_BUILD_DIR ) /proc
319
322
# fs/sock
320
323
$(CC ) $(CFLAGS_FOR_TESTS ) -o $(ARCH_BUILD_DIR ) /sock test/fs/sock.c src/arch/$(ARCH ) /fs/sock.c src/arch/$(ARCH ) /fs/vfs.c
321
- valgrind $( VALGRIND_OPTS ) ./$(ARCH_BUILD_DIR ) /sock
324
+ ./$(ARCH_BUILD_DIR ) /sock
322
325
# mmu/frame
323
326
$(CC ) $(CFLAGS_FOR_TESTS ) -Wformat=0 -I./test/proxies/ -o $(ARCH_BUILD_DIR ) /frame test/mmu/frame.c src/arch/$(ARCH ) /mmu/frame.c src/arch/$(ARCH ) /core/multiboot.c src/arch/$(ARCH ) /mmu/bitmap.c
324
- valgrind $( VALGRIND_OPTS ) ./$(ARCH_BUILD_DIR ) /frame
327
+ ./$(ARCH_BUILD_DIR ) /frame
325
328
# config/inish
326
329
$(CC ) $(CFLAGS_FOR_TESTS ) -I./test/proxies/ -o $(ARCH_BUILD_DIR ) /inish test/config/inish.c src/arch/$(ARCH ) /config/inish.c
327
- valgrind $( VALGRIND_OPTS ) ./$(ARCH_BUILD_DIR ) /inish
330
+ ./$(ARCH_BUILD_DIR ) /inish
328
331
# mmu/bitmap
329
332
$(CC ) $(CFLAGS_FOR_TESTS ) -o $(ARCH_BUILD_DIR ) /bitmap test/mmu/bitmap.c src/arch/$(ARCH ) /mmu/bitmap.c
330
333
./$(ARCH_BUILD_DIR ) /bitmap
0 commit comments