Changes in / [58f26cb:bf45993] in mainline
- Files:
-
- 71 added
- 8 edited
Legend:
- Unmodified
- Added
- Removed
-
HelenOS.config
r58f26cb rbf45993 600 600 ! CONFIG_WRITE_CORE_FILES (n/y) 601 601 602 % Include userspace unit tests (PCUT) 603 ! CONFIG_PCUT_TESTS (n/y) 604 605 % Include PCUT self-tests 606 ! CONFIG_PCUT_SELF_TESTS (n/y) 607 602 608 % Include development files (headers, libraries) 603 609 ! CONFIG_DEVEL_FILES (n/y) -
boot/Makefile
r58f26cb rbf45993 68 68 cp "$$file" "$(DIST_PATH)/app/" ; \ 69 69 done 70 ifeq ($(CONFIG_PCUT_TESTS),y) 71 echo "echo Running all tests..." >"$(DIST_PATH)/test/run_all" 72 echo "<html><head><title>HelenOS test results</title></head><body>" >"$(DIST_PATH)/test/test.html" 73 echo "<h1>HelenOS test results</h1><ul>" >>"$(DIST_PATH)/test/test.html" 74 for file in $(RD_TESTS) ; do \ 75 file2=`basename $$file`; \ 76 cp "$$file" "$(DIST_PATH)/test/" ; \ 77 echo "echo ' ->' $$file2" >>"$(DIST_PATH)/test/run_all"; \ 78 echo "/test/$$file2 | to /test/$$file2.out" >>"$(DIST_PATH)/test/run_all"; \ 79 echo "cat /test/$$file2.out" >>"$(DIST_PATH)/test/run_all"; \ 80 echo "cp -f /test/$$file2.out /data/web/result-$$file2.txt" >>"$(DIST_PATH)/test/run_all"; \ 81 echo "<li><a href=\"result-$$file2.txt\">$$file2</a></li>" >>"$(DIST_PATH)/test/test.html"; \ 82 done 83 echo "cp -f /test/test.html /data/web/test.html" >>"$(DIST_PATH)/test/run_all" 84 echo "</ul></body></html>" >>"$(DIST_PATH)/test/test.html" 85 endif 86 87 ifeq ($(CONFIG_PCUT_SELF_TESTS),y) 88 echo "echo Running all PCUT self-tests..." >"$(DIST_PATH)/test/run_pcut" 89 echo "<html><head><title>Results of PCUT self-tests on HelenOS</title></head><body>" >"$(DIST_PATH)/test/pcut.html" 90 echo "<h1>Results of PCUT self-tests on HelenOS</h1><ul>" >>"$(DIST_PATH)/test/pcut.html" 91 for file in $(USPACE_PATH)/lib/pcut/test-libpcut-*; do \ 92 file2=`basename $$file`; \ 93 name=`echo "$$file2" | sed 's/test-libpcut-//'`; \ 94 cp "$$file" "$(DIST_PATH)/test/" ; \ 95 echo "echo ' ->' $$name" >>"$(DIST_PATH)/test/run_pcut"; \ 96 echo "/test/$$file2 | to /test/$$file2.out" >>"$(DIST_PATH)/test/run_pcut"; \ 97 echo "cat /test/$$file2.out" >>"$(DIST_PATH)/test/run_pcut"; \ 98 echo "cp -f /test/$$file2.out /data/web/result-$$file2.txt" >>"$(DIST_PATH)/test/run_pcut"; \ 99 echo "<li><a href=\"result-$$file2.txt\">$$name</a></li>" >>"$(DIST_PATH)/test/pcut.html"; \ 100 done 101 echo "cp -f /test/pcut.html /data/web/pcut.html" >>"$(DIST_PATH)/test/run_pcut" 102 echo "</ul></body></html>" >>"$(DIST_PATH)/test/pcut.html" 103 endif 104 70 105 for drv in $(RD_DRVS) ; do \ 71 106 drv_dir="`dirname "$$drv"`" ; \ … … 100 135 rm -rf $(USPACE_PATH)/dist/inc/* 101 136 rm -f $(USPACE_PATH)/dist/app/* 137 rm -f $(USPACE_PATH)/dist/test/* 102 138 rm -f $(USPACE_PATH)/dist/cfg/net/* -
boot/Makefile.common
r58f26cb rbf45993 221 221 $(USPACE_PATH)/app/fontviewer/fontviewer 222 222 223 RD_TESTS = \ 224 $(USPACE_PATH)/lib/c/test-libc \ 225 $(USPACE_PATH)/lib/posix/test-libposix \ 226 $(USPACE_PATH)/app/bdsh/test-bdsh 227 228 223 229 COMPONENTS = \ 224 230 $(KERNEL_PATH)/kernel.bin \ -
uspace/Makefile
r58f26cb rbf45993 231 231 lib/usbvirt \ 232 232 lib/pcm \ 233 lib/pcut \ 233 234 lib/bithenge \ 234 235 lib/posix \ … … 240 241 LIBN_BUILD = $(addsuffix .build,$(LIBN)) 241 242 BUILDS := $(addsuffix .build,$(DIRS)) 243 BUILDS_TESTS := $(addsuffix .build-test,$(DIRS) $(LIBS) lib/c) 242 244 243 245 CLEANS := $(addsuffix .clean,$(DIRS)) $(addsuffix .clean,$(LIBN)) $(addsuffix .clean,$(LIBS)) $(addsuffix .clean,$(LIBC)) … … 245 247 .PHONY: all $(LIBC_BUILD) $(LIBS_BUILD) $(LIBN_BUILD) $(BUILDS) $(CLEANS) clean 246 248 247 all: $(BUILDS) 249 all: $(BUILDS) $(BUILDS_TESTS) 250 251 $(BUILDS_TESTS): $(BUILDS) 252 $(MAKE) -C $(basename $@) all-test PRECHECK=$(PRECHECK) 248 253 249 254 clean: $(CLEANS) -
uspace/Makefile.common
r58f26cb rbf45993 78 78 JOB = $(BINARY).job 79 79 OUTPUT = $(BINARY) 80 TEST_BINARY = test-$(BINARY) 80 81 EXTRA_OUTPUT += $(BINARY).disasm 81 82 EXTRA_CLEAN += $(BINARY).map … … 85 86 JOB = $(LIBRARY).job 86 87 OUTPUT = $(LIBRARY).a 88 TEST_BINARY = test-$(LIBRARY) 87 89 endif 88 90 … … 200 202 endif 201 203 204 # PCUT-based unit tests 205 ifneq ($(TEST_SOURCES),) 206 TEST_OUTPUT = $(TEST_BINARY) 207 TEST_CFLAGS = -I$(LIB_PREFIX)/pcut/include -D__helenos__ 208 TEST_OUTPUT_LIBS = $(LIB_PREFIX)/pcut/libpcut.a 209 EXTRA_CLEAN += $(TEST_OUTPUT) $(TEST_OUTPUT).map 210 ifneq ($(LIBRARY),) 211 TEST_OUTPUT_LIBS += $(OUTPUT) 212 endif 213 TEST_OUTPUT_LIBS += $(TEST_LIBS) 214 endif 215 202 216 .PHONY: all clean 203 217 204 218 all: $(VERSION_DEF) $(COMMON_MAKEFILE) $(CONFIG_MAKEFILE) $(CONFIG_HEADER) $(LIBS) $(OUTPUT) $(LOUTPUT) $(EXTRA_OUTPUT) 205 219 -[ -f $(DEPEND) ] && cp -a $(DEPEND) $(DEPEND_PREV) 220 221 all-test: $(TEST_OUTPUT) 206 222 207 223 clean: … … 294 310 OBJECTS := $(addsuffix .o,$(basename $(SOURCES))) 295 311 LOBJECTS := $(addsuffix .lo,$(basename $(SOURCES))) 312 TEST_OBJECTS := $(addsuffix .test.o,$(basename $(TEST_SOURCES))) 296 313 297 314 ifneq ($(BINARY),) … … 338 355 endif 339 356 357 ifneq ($(TEST_OUTPUT),) 358 $(TEST_OUTPUT): $(LINKER_SCRIPT) $(TEST_OBJECTS) $(TEST_OUTPUT_LIBS) 359 $(LD) -n $(LFLAGS) -T $(LINKER_SCRIPT) -M -Map $(TEST_OUTPUT).map -o $@ $(TEST_OBJECTS) $(TEST_OUTPUT_LIBS) $(LIBS) $(BASE_LIBS) 360 ifeq ($(CONFIG_STRIP_BINARIES),y) 361 $(STRIP) $(TEST_OUTPUT) 362 endif 363 endif 364 340 365 %.o: %.S $(DEPEND) 341 366 $(GCC) $(DEFS) $(GCC_CFLAGS) -D__ASM__ -c $< -o $@ … … 356 381 endif 357 382 383 %.test.o: %.c $(DEPEND) 384 $(CC) $(DEFS) $(CFLAGS) $(TEST_CFLAGS) -c $< -o $@ 385 ifeq ($(PRECHECK),y) 386 $(JOBFILE) $(JOB) $< $@ cc core $(DEFS) $(CFLAGS) 387 endif 388 358 389 %.lo: %.S $(DEPEND) 359 390 $(CC) $(DEFS) $(LIB_CFLAGS) -D__ASM__ -c $< -o $@ … … 375 406 376 407 $(DEPEND): $(PRE_DEPEND) 377 makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) > $@ 2> /dev/null408 makedepend -f - -- $(DEPEND_DEFS) $(CFLAGS) -- $(SOURCES) $(TEST_SOURCES) > $@ 2> /dev/null 378 409 -[ -f $(DEPEND_PREV) ] && diff -q $(DEPEND_PREV) $@ && mv -f $(DEPEND_PREV) $@ 379 410 -
uspace/app/bdsh/Makefile
r58f26cb rbf45993 65 65 tok.c 66 66 67 TEST_SOURCES = \ 68 tok.c \ 69 test/toktest.c 70 67 71 include $(USPACE_PREFIX)/Makefile.common -
uspace/lib/c/Makefile
r58f26cb rbf45993 165 165 $(ARCH_SOURCES) 166 166 167 TEST_SOURCES = \ 168 test/main.c \ 169 test/sprintf.c 170 167 171 include $(USPACE_PREFIX)/Makefile.common 168 172 -
uspace/lib/posix/Makefile
r58f26cb rbf45993 79 79 source/unistd.c 80 80 81 TEST_SOURCES = \ 82 test/main.c \ 83 test/scanf.c 84 81 85 include $(USPACE_PREFIX)/Makefile.common 82 86
Note:
See TracChangeset
for help on using the changeset viewer.