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

Merge remote-tracking branch 'upstream/master' into testsuite

Browse Source
This commit is contained in:
mrdudz
2015-07-11 12:44:06 +02:00
parent 1380c68cf3 50b0536222
commit 5ceffa1f70
5 changed files with 18 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
test/Makefile
View File

@@ -11,10 +11,9 @@ endif
ifdef CMD_EXE ifdef CMD_EXE
EXE := .exe EXE := .exe
DEL = del /f $(subst /,\,$1) DEL = -del /f $(subst /,\,$1)
MKDIR = mkdir $(subst /,\,$1) MKDIR = mkdir $(subst /,\,$1)
DIRLIST = $(strip $(foreach dir,$1,$(wildcard $(dir)))) RMDIR = -rmdir /s /q $(subst /,\,$1)
RMDIR = $(if $(DIRLIST),rmdir /s /q $(subst /,\,$(DIRLIST)))
else else
EXE := EXE :=
DEL = $(RM) $1 DEL = $(RM) $1

6
test/err/Makefile
View File

@@ -7,7 +7,7 @@ endif
ifdef CMD_EXE ifdef CMD_EXE
NOT := - # Hack NOT := - # Hack
DEL = del /f $(subst /,\,$1) DEL = -del /f $(subst /,\,$1)
else else
NOT := ! NOT := !
DEL = $(RM) $1 DEL = $(RM) $1
@@ -44,5 +44,5 @@ $(WORKDIR)/%.or.prg: %.c
$(NOT) $(CL65) -Or $(CC65FLAGS) $< -o $@ $(NOT) $(CL65) -Or $(CC65FLAGS) $< -o $@
clean: clean:
-@$(call DEL,$(TESTS)) @$(call DEL,$(TESTS))
-@$(call DEL,$(SOURCES:.c=.o)) @$(call DEL,$(SOURCES:.c=.o))

8
test/misc/Makefile
View File

@@ -8,7 +8,7 @@ endif
ifdef CMD_EXE ifdef CMD_EXE
S := $(subst /,\,/) S := $(subst /,\,/)
NOT := - # Hack NOT := - # Hack
DEL = del /f $(subst /,\,$1) DEL = -del /f $(subst /,\,$1)
else else
S := / S := /
NOT := ! NOT := !
@@ -58,6 +58,6 @@ $(WORKDIR)/cc65141011%prg: cc65141011.c
-$(SIM65) $(SIM65FLAGS) $@ -$(SIM65) $(SIM65FLAGS) $@
clean: clean:
-@$(call DEL,$(TESTS)) @$(call DEL,$(TESTS))
-@$(call DEL,$(SOURCES:.c=.o)) @$(call DEL,$(SOURCES:.c=.o))
-@$(call DEL,$(SOURCES:%.c=$(WORKDIR)/%.out)) @$(call DEL,$(SOURCES:%.c=$(WORKDIR)/%.out))

12
test/ref/Makefile
View File

@@ -8,7 +8,7 @@ endif
ifdef CMD_EXE ifdef CMD_EXE
S := $(subst /,\,/) S := $(subst /,\,/)
DEL = del /f $(subst /,\,$1) DEL = -del /f $(subst /,\,$1)
else else
S := / S := /
DEL = $(RM) $1 DEL = $(RM) $1
@@ -89,8 +89,8 @@ $(WORKDIR)/%.or.prg: %.c $(WORKDIR)/%.ref
$(DIFF) $(WORKDIR)/$*.out $(WORKDIR)/$*.ref $(DIFF) $(WORKDIR)/$*.out $(WORKDIR)/$*.ref
clean: clean:
-@$(call DEL,$(TESTS)) @$(call DEL,$(TESTS))
-@$(call DEL,$(SOURCES:.c=.o)) @$(call DEL,$(SOURCES:.c=.o))
-@$(call DEL,$(SOURCES:%.c=$(WORKDIR)/%.out)) @$(call DEL,$(SOURCES:%.c=$(WORKDIR)/%.out))
-@$(call DEL,$(SOURCES:%.c=$(WORKDIR)/%.ref)) @$(call DEL,$(SOURCES:%.c=$(WORKDIR)/%.ref))
-@$(call DEL,$(SOURCES:%.c=$(WORKDIR)/%.host)) @$(call DEL,$(SOURCES:%.c=$(WORKDIR)/%.host))

6
test/val/Makefile
View File

@@ -6,7 +6,7 @@ ifneq ($(shell echo),)
endif endif
ifdef CMD_EXE ifdef CMD_EXE
DEL = del /f $(subst /,\,$1) DEL = -del /f $(subst /,\,$1)
else else
DEL = $(RM) $1 DEL = $(RM) $1
endif endif
@@ -66,5 +66,5 @@ $(WORKDIR)/%.or.prg: %.c
$(SIM65) $(SIM65FLAGS) $@ $(SIM65) $(SIM65FLAGS) $@
clean: clean:
-@$(call DEL,$(TESTS)) @$(call DEL,$(TESTS))
-@$(call DEL,$(SOURCES:.c=.o)) @$(call DEL,$(SOURCES:.c=.o))