added some windows/cmd.exe stuff

This commit is contained in:
mrdudz
2014-11-23 12:18:19 +01:00
parent 198bd893f9
commit 8a66605d5e
7 changed files with 46 additions and 17 deletions

View File

@@ -6,10 +6,10 @@ MAKE := make --no-print-dir
.PHONY: all clean .PHONY: all clean
all: all:
@$(MAKE) -C val all @$(MAKE) -C val clean all
@$(MAKE) -C ref all @$(MAKE) -C ref clean all
@$(MAKE) -C err all @$(MAKE) -C err clean all
@$(MAKE) -C misc all @$(MAKE) -C misc clean all
clean: clean:
@$(MAKE) -C val clean @$(MAKE) -C val clean

View File

@@ -1,14 +1,21 @@
# makefile for the tests that MUST NOT compile # makefile for the tests that MUST NOT compile
ifneq ($(shell echo),)
CMD_EXE = 1
endif
CC65FLAGS = -t sim6502 CC65FLAGS = -t sim6502
CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65) CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
SIM65 := $(if $(wildcard ../../bin/sim65*),../../bin/sim65,sim65)
ifdef CMD_EXE
RM := del /f
else
RM := rm -f RM := rm -f
endif
.PHONY: all .PHONY: all clean
TESTS := $(patsubst %.c,%.prg,$(wildcard *.c)) TESTS := $(patsubst %.c,%.prg,$(wildcard *.c))
TESTS += $(patsubst %.c,%.o.prg,$(wildcard *.c)) TESTS += $(patsubst %.c,%.o.prg,$(wildcard *.c))

View File

@@ -1,14 +1,25 @@
# makefile for the remaining tests that need special care in one way or another
ifneq ($(shell echo),)
CMD_EXE = 1
endif
CC65FLAGS = -t sim6502 CC65FLAGS = -t sim6502
SIM65FLAGS = -x 200000000 SIM65FLAGS = -x 200000000
CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65) CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
SIM65 := $(if $(wildcard ../../bin/sim65*),../../bin/sim65,sim65) SIM65 := $(if $(wildcard ../../bin/sim65*),../../bin/sim65,sim65)
ifdef CMD_EXE
RM := del /f
DIFF := fc
else
RM := rm -f RM := rm -f
DIFF := diff -q DIFF := diff -q
endif
.PHONY: all .PHONY: all clean
TESTS := $(patsubst %.c,%.prg,$(wildcard *.c)) TESTS := $(patsubst %.c,%.prg,$(wildcard *.c))
TESTS += $(patsubst %.c,%.o.prg,$(wildcard *.c)) TESTS += $(patsubst %.c,%.o.prg,$(wildcard *.c))

View File

@@ -12,5 +12,5 @@ compiler.
/misc - a few tests that need special care of some sort /misc - a few tests that need special care of some sort
to run the tests use "make clean all" in this (top) directory, the makefile to run the tests use "make" in this (top) directory, the makefile should exit
should exit with no error. with no error.

View File

@@ -2,18 +2,27 @@
# makefile for the regression tests that generate output which has to be # makefile for the regression tests that generate output which has to be
# compared with reference output # compared with reference output
ifneq ($(shell echo),)
CMD_EXE = 1
endif
CC65FLAGS = -t sim6502 CC65FLAGS = -t sim6502
SIM65FLAGS = -x 200000000 SIM65FLAGS = -x 200000000
CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65) CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
SIM65 := $(if $(wildcard ../../bin/sim65*),../../bin/sim65,sim65) SIM65 := $(if $(wildcard ../../bin/sim65*),../../bin/sim65,sim65)
ifdef CMD_EXE
RM := del /f
DIFF := fc
else
RM := rm -f RM := rm -f
DIFF := diff -q DIFF := diff -q
endif
CFLAGS := -O2 -Wall -W -Wextra -fwrapv -fno-strict-overflow CFLAGS := -O2 -Wall -W -Wextra -fwrapv -fno-strict-overflow
.PHONY: all .PHONY: all clean
REFS := $(patsubst %.c,%.ref,$(wildcard *.c)) REFS := $(patsubst %.c,%.ref,$(wildcard *.c))

View File

@@ -1,10 +1,4 @@
- the tests in ./misc need special care
- check all tests in ./ref and make them return their results as exit code - check all tests in ./ref and make them return their results as exit code
- in ./val use some other tool than "diff" for comparing the results
- fixup makefiles to use "del" instead of "rm -f" on windows
- reduce usage of "common.h" to a minimum - reduce usage of "common.h" to a minimum

View File

@@ -1,15 +1,23 @@
# makefile for the regression tests that return an error code on failure # makefile for the regression tests that return an error code on failure
ifneq ($(shell echo),)
CMD_EXE = 1
endif
CC65FLAGS = -t sim6502 CC65FLAGS = -t sim6502
SIM65FLAGS = -x 200000000 SIM65FLAGS = -x 200000000
CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65) CL65 := $(if $(wildcard ../../bin/cl65*),../../bin/cl65,cl65)
SIM65 := $(if $(wildcard ../../bin/sim65*),../../bin/sim65,sim65) SIM65 := $(if $(wildcard ../../bin/sim65*),../../bin/sim65,sim65)
ifdef CMD_EXE
RM := del /f
else
RM := rm -f RM := rm -f
endif
.PHONY: all .PHONY: all clean
TESTS := $(patsubst %.c,%.prg,$(wildcard *.c)) TESTS := $(patsubst %.c,%.prg,$(wildcard *.c))
TESTS += $(patsubst %.c,%.o.prg,$(wildcard *.c)) TESTS += $(patsubst %.c,%.o.prg,$(wildcard *.c))