diff options
| author | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2017-12-08 19:26:15 +0200 |
|---|---|---|
| committer | Paul Sokolovsky <pfalcon@users.sourceforge.net> | 2017-12-08 19:26:15 +0200 |
| commit | e9d29c9ba997ae0f00f16f3a21dffce7c763a3d4 (patch) | |
| tree | 101656c5e1f57a784077edf0d1708aeeb9321002 | |
| parent | 24c641c4e3637a8c73b7546c5500a49f7dd94b2a (diff) | |
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.
| -rw-r--r-- | lib/tinytest/README (renamed from tools/tinytest/README) | 0 | ||||
| -rw-r--r-- | lib/tinytest/tinytest.c (renamed from tools/tinytest/tinytest.c) | 0 | ||||
| -rw-r--r-- | lib/tinytest/tinytest.h (renamed from tools/tinytest/tinytest.h) | 0 | ||||
| -rw-r--r-- | lib/tinytest/tinytest_macros.h (renamed from tools/tinytest/tinytest_macros.h) | 0 | ||||
| -rw-r--r-- | ports/qemu-arm/Makefile | 6 |
5 files changed, 4 insertions, 2 deletions
diff --git a/tools/tinytest/README b/lib/tinytest/README index 902c4a2e0..902c4a2e0 100644 --- a/tools/tinytest/README +++ b/lib/tinytest/README diff --git a/tools/tinytest/tinytest.c b/lib/tinytest/tinytest.c index 1ef957d31..1ef957d31 100644 --- a/tools/tinytest/tinytest.c +++ b/lib/tinytest/tinytest.c diff --git a/tools/tinytest/tinytest.h b/lib/tinytest/tinytest.h index dff440e31..dff440e31 100644 --- a/tools/tinytest/tinytest.h +++ b/lib/tinytest/tinytest.h diff --git a/tools/tinytest/tinytest_macros.h b/lib/tinytest/tinytest_macros.h index 9ff69b1d5..9ff69b1d5 100644 --- a/tools/tinytest/tinytest_macros.h +++ b/lib/tinytest/tinytest_macros.h diff --git a/ports/qemu-arm/Makefile b/ports/qemu-arm/Makefile index 39e13853f..c0d257a3e 100644 --- a/ports/qemu-arm/Makefile +++ b/ports/qemu-arm/Makefile @@ -9,10 +9,12 @@ include $(TOP)/py/py.mk CROSS_COMPILE = arm-none-eabi- +TINYTEST = $(TOP)/lib/tinytest + INC += -I. INC += -I$(TOP) INC += -I$(BUILD) -INC += -I$(TOP)/tools/tinytest/ +INC += -I$(TINYTEST) CFLAGS_CORTEX_M3 = -mthumb -mcpu=cortex-m3 -mfloat-abi=soft CFLAGS = $(INC) -Wall -Wpointer-arith -Werror -std=gnu99 $(CFLAGS_CORTEX_M3) $(COPT) \ @@ -101,7 +103,7 @@ $(BUILD)/genhdr/tests.h: $(Q)echo "Generating $@";(cd $(TOP)/tests; ../tools/tinytest-codegen.py) > $@ $(BUILD)/tinytest.o: - $(Q)$(CC) $(CFLAGS) -DNO_FORKING -o $@ -c $(TOP)/tools/tinytest/tinytest.c + $(Q)$(CC) $(CFLAGS) -DNO_FORKING -o $@ -c $(TINYTEST)/tinytest.c ## `$(LD)` doesn't seem to like `--specs` for some reason, but we can just use `$(CC)` here. $(BUILD)/firmware.elf: $(OBJ_COMMON) $(OBJ_RUN) |