bslathi19/cc65
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

Shortenned the code that creates the TESTS make variable.

Browse Source 
And, fixed the variable-substitution that creates the CC65 optimization option.
This commit is contained in:
Greg King
2014-12-18 14:15:24 -05:00
parent e414e89b64
commit 244eeedcfc
4 changed files with 8 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
test/err/Makefile
View File

@@ -20,15 +20,7 @@ WORKDIR := ../../testwrk
.PHONY: all clean .PHONY: all clean
SOURCES := $(wildcard *.c) SOURCES := $(wildcard *.c)
TESTS := $(foreach option,. .o. .os. .osi. .osir. .oi. .oir. .or.,$(SOURCES:%.c=$(WORKDIR)/%$(option)prg))
TESTS := $(SOURCES:%.c=$(WORKDIR)/%.prg)
TESTS += $(SOURCES:%.c=$(WORKDIR)/%.o.prg)
TESTS += $(SOURCES:%.c=$(WORKDIR)/%.os.prg)
TESTS += $(SOURCES:%.c=$(WORKDIR)/%.osi.prg)
TESTS += $(SOURCES:%.c=$(WORKDIR)/%.osir.prg)
TESTS += $(SOURCES:%.c=$(WORKDIR)/%.oi.prg)
TESTS += $(SOURCES:%.c=$(WORKDIR)/%.oir.prg)
TESTS += $(SOURCES:%.c=$(WORKDIR)/%.or.prg)
all: $(TESTS) all: $(TESTS)

18
test/misc/Makefile
View File

@@ -24,38 +24,30 @@ DIFF := $(WORKDIR)/bdiff
.PHONY: all clean .PHONY: all clean
SOURCES := $(wildcard *.c) SOURCES := $(wildcard *.c)
TESTS := $(foreach option,. .o. .os. .osi. .osir. .oi. .oir. .or.,$(SOURCES:%.c=$(WORKDIR)/%$(option)prg))
TESTS := $(SOURCES:%.c=$(WORKDIR)/%.prg)
TESTS += $(SOURCES:%.c=$(WORKDIR)/%.o.prg)
TESTS += $(SOURCES:%.c=$(WORKDIR)/%.os.prg)
TESTS += $(SOURCES:%.c=$(WORKDIR)/%.osi.prg)
TESTS += $(SOURCES:%.c=$(WORKDIR)/%.osir.prg)
TESTS += $(SOURCES:%.c=$(WORKDIR)/%.oi.prg)
TESTS += $(SOURCES:%.c=$(WORKDIR)/%.oir.prg)
TESTS += $(SOURCES:%.c=$(WORKDIR)/%.or.prg)
all: $(TESTS) all: $(TESTS)
# should compile, but then hangs in an endless loop # should compile, but then hangs in an endless loop
$(WORKDIR)/endless%prg: endless.c $(WORKDIR)/endless%prg: endless.c
$(CL65) $(subst .,,($*:.o%=-O%)) $(CC65FLAGS) $< -o $@ $(CL65) $(subst .,,$(*:.o%=-O%)) $(CC65FLAGS) $< -o $@
! $(SIM65) $(SIM65FLAGS) $@ ! $(SIM65) $(SIM65FLAGS) $@
# these need reference data that can't be generated by a host-compiled program, # these need reference data that can't be generated by a host-compiled program,
# in a useful way # in a useful way
$(WORKDIR)/limits%prg: limits.c $(WORKDIR)/limits%prg: limits.c
$(CL65) $(subst .,,($*:.o%=-O%)) $(CC65FLAGS) $< -o $@ $(CL65) $(subst .,,$(*:.o%=-O%)) $(CC65FLAGS) $< -o $@
$(SIM65) $(SIM65FLAGS) $@ > $(WORKDIR)/limits.out $(SIM65) $(SIM65FLAGS) $@ > $(WORKDIR)/limits.out
$(DIFF) $(WORKDIR)/limits.out limits.ref $(DIFF) $(WORKDIR)/limits.out limits.ref
# the rest are tests that fail currently for one reason or another # the rest are tests that fail currently for one reason or another
$(WORKDIR)/fields%prg: fields.c $(WORKDIR)/fields%prg: fields.c
@echo "FIXME: " $@ "currently will fail." @echo "FIXME: " $@ "currently will fail."
$(CL65) $(subst .,,($*:.o%=-O%)) $(CC65FLAGS) $< -o $@ $(CL65) $(subst .,,$(*:.o%=-O%)) $(CC65FLAGS) $< -o $@
-$(SIM65) $(SIM65FLAGS) $@ -$(SIM65) $(SIM65FLAGS) $@
$(WORKDIR)/sitest%prg: sitest.c $(WORKDIR)/sitest%prg: sitest.c
@echo "FIXME: " $@ "currently will fail." @echo "FIXME: " $@ "currently will fail."
-$(CL65) $(subst .,,($*:.o%=-O%)) $(CC65FLAGS) $< -o $@ -$(CL65) $(subst .,,$(*:.o%=-O%)) $(CC65FLAGS) $< -o $@
# -$(SIM65) $(SIM65FLAGS) $@ # -$(SIM65) $(SIM65FLAGS) $@
clean: clean:

11
test/ref/Makefile
View File

@@ -27,17 +27,8 @@ CFLAGS := -O2 -Wall -W -Wextra -fwrapv -fno-strict-overflow
.PHONY: all clean .PHONY: all clean
SOURCES := $(wildcard *.c) SOURCES := $(wildcard *.c)
REFS := $(SOURCES:%.c=$(WORKDIR)/%.ref) REFS := $(SOURCES:%.c=$(WORKDIR)/%.ref)
TESTS := $(foreach option,. .o. .os. .osi. .osir. .oi. .oir. .or.,$(SOURCES:%.c=$(WORKDIR)/%$(option)prg))
TESTS := $(SOURCES:%.c=$(WORKDIR)/%.prg)
TESTS += $(SOURCES:%.c=$(WORKDIR)/%.o.prg)
TESTS += $(SOURCES:%.c=$(WORKDIR)/%.os.prg)
TESTS += $(SOURCES:%.c=$(WORKDIR)/%.osi.prg)
TESTS += $(SOURCES:%.c=$(WORKDIR)/%.osir.prg)
TESTS += $(SOURCES:%.c=$(WORKDIR)/%.oi.prg)
TESTS += $(SOURCES:%.c=$(WORKDIR)/%.oir.prg)
TESTS += $(SOURCES:%.c=$(WORKDIR)/%.or.prg)
all: $(REFS) $(TESTS) all: $(REFS) $(TESTS)

10
test/val/Makefile
View File

@@ -22,15 +22,7 @@ WORKDIR := ../../testwrk
.PHONY: all clean .PHONY: all clean
SOURCES := $(wildcard *.c) SOURCES := $(wildcard *.c)
TESTS := $(foreach option,. .o. .os. .osi. .osir. .oi. .oir. .or.,$(SOURCES:%.c=$(WORKDIR)/%$(option)prg))
TESTS := $(SOURCES:%.c=$(WORKDIR)/%.prg)
TESTS += $(SOURCES:%.c=$(WORKDIR)/%.o.prg)
TESTS += $(SOURCES:%.c=$(WORKDIR)/%.os.prg)
TESTS += $(SOURCES:%.c=$(WORKDIR)/%.osi.prg)
TESTS += $(SOURCES:%.c=$(WORKDIR)/%.osir.prg)
TESTS += $(SOURCES:%.c=$(WORKDIR)/%.oi.prg)
TESTS += $(SOURCES:%.c=$(WORKDIR)/%.oir.prg)
TESTS += $(SOURCES:%.c=$(WORKDIR)/%.or.prg)
all: $(TESTS) all: $(TESTS)