Skip to content

Commit e9d29c9

Browse files
pfalconpfalcon
committed
lib/tinytest: Move from tools/tinytest.
Tinytest library was misplaced under tools/. By convention, any target libraries belong to lib/, while tools/ contains host-side tools.
1 parent 24c641c commit e9d29c9

5 files changed

Lines changed: 4 additions & 2 deletions

File tree

tools/tinytest/README renamed to lib/tinytest/README

File renamed without changes.

tools/tinytest/tinytest.c renamed to lib/tinytest/tinytest.c

File renamed without changes.

tools/tinytest/tinytest.h renamed to lib/tinytest/tinytest.h

File renamed without changes.

tools/tinytest/tinytest_macros.h renamed to lib/tinytest/tinytest_macros.h

File renamed without changes.

‎ports/qemu-arm/Makefile‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,10 +9,12 @@ include $(TOP)/py/py.mk
99

1010
CROSS_COMPILE = arm-none-eabi-
1111

12+
TINYTEST = $(TOP)/lib/tinytest
13+
1214
INC += -I.
1315
INC += -I$(TOP)
1416
INC += -I$(BUILD)
15-
INC += -I$(TOP)/tools/tinytest/
17+
INC += -I$(TINYTEST)
1618

1719
CFLAGS_CORTEX_M3 = -mthumb -mcpu=cortex-m3 -mfloat-abi=soft
1820
CFLAGS = $(INC) -Wall -Wpointer-arith -Werror -std=gnu99 $(CFLAGS_CORTEX_M3) $(COPT) \
@@ -101,7 +103,7 @@ $(BUILD)/genhdr/tests.h:
101103
$(Q)echo "Generating $@";(cd $(TOP)/tests; ../tools/tinytest-codegen.py) > $@
102104

103105
$(BUILD)/tinytest.o:
104-
$(Q)$(CC) $(CFLAGS) -DNO_FORKING -o $@ -c $(TOP)/tools/tinytest/tinytest.c
106+
$(Q)$(CC) $(CFLAGS) -DNO_FORKING -o $@ -c $(TINYTEST)/tinytest.c
105107

106108
## `$(LD)` doesn't seem to like `--specs` for some reason, but we can just use `$(CC)` here.
107109
$(BUILD)/firmware.elf: $(OBJ_COMMON) $(OBJ_RUN)

0 commit comments

Comments
 (0)