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

Revert "test/assembler: removed WORKDIR variable, as remote assembling does only work partly"

Browse Source 
This reverts commit 7a9a7c3188.
This commit is contained in:
Sven Oliver Moll
2016-09-13 11:21:25 +02:00
parent 0949b2e104
commit aaa26c7d57
1 changed files with 8 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
test/assembler/Makefile
View File

@@ -2,6 +2,8 @@
# makefile for the assembler regression tests # makefile for the assembler regression tests
BINDIR = ../../bin BINDIR = ../../bin
#WORKDIR := ../../testwrk
WORKDIR := .
BASE_TARGETS = 6502 6502x 65sc02 65c02 BASE_TARGETS = 6502 6502x 65sc02 65c02
BASE_TARGETS += 4510 huc6280 BASE_TARGETS += 4510 huc6280
@@ -17,9 +19,9 @@ all:
# generate opcode targets and expand target list # generate opcode targets and expand target list
define opcode define opcode
OPCODE_TARGETLIST += $(1)-opcodes.bin OPCODE_TARGETLIST += $(1)-opcodes.bin
$(1)-opcodes.bin: $(1)-opcodes.s $$(WORKDIR)/$(1)-opcodes.bin: $(1)-opcodes.s
@$$(BINDIR)/cl65 --cpu $(1) -t none -l $(1)-opcodes.lst -o $$@ $$< @$$(BINDIR)/cl65 --cpu $(1) -t none -l $$(WORKDIR)/$(1)-opcodes.lst --obj-path $$(WORKDIR) -o $$@ $$<
@diff -q $(1)-opcodes.ref $$@ || (cat $(1)-opcodes.lst ; exit 1) @diff -q $(1)-opcodes.ref $$@ || (cat $$(WORKDIR)/$(1)-opcodes.lst ; exit 1)
@echo ca65 --cpu $(1) opcodes ok @echo ca65 --cpu $(1) opcodes ok
endef endef
$(foreach target,$(OPCODE_TARGETS),$(eval $(call opcode,$(target)))) $(foreach target,$(OPCODE_TARGETS),$(eval $(call opcode,$(target))))
@@ -27,9 +29,9 @@ $(foreach target,$(OPCODE_TARGETS),$(eval $(call opcode,$(target))))
# generate cpudetect targets and expand target list # generate cpudetect targets and expand target list
define cpudetect define cpudetect
CPUDETECT_TARGETLIST += $(1)-cpudetect.bin CPUDETECT_TARGETLIST += $(1)-cpudetect.bin
$(1)-cpudetect.bin: cpudetect.s $$(WORKDIR)/$(1)-cpudetect.bin: cpudetect.s
@$$(BINDIR)/cl65 --cpu $(1) -t none -l $(1)-cpudetect.lst -o $$@ $$< @$$(BINDIR)/cl65 --cpu $(1) -t none -l $$(WORKDIR)/$(1)-cpudetect.lst --obj-path $$(WORKDIR) -o $$@ $$<
@diff -q $(1)-cpudetect.ref $$@ || (cat $(1)-cpudetect.lst ; exit 1) @diff -q $(1)-cpudetect.ref $$@ || (cat $$(WORKDIR)/$(1)-cpudetect.lst ; exit 1)
@echo ca65 --cpu $(1) cpudetect ok @echo ca65 --cpu $(1) cpudetect ok
endef endef
$(foreach target,$(CPUDETECT_TARGETS),$(eval $(call cpudetect,$(target)))) $(foreach target,$(CPUDETECT_TARGETS),$(eval $(call cpudetect,$(target))))