github.com/simh.simh
1
0
Fork 0
mirror of https://github.com/simh/simh.git synced 2026-01-25 19:56:25 +00:00
Code Releases Activity

All VAX: fix makefile invocation of VAX diagbistuc tests

Browse Source
This commit is contained in:
Mark Pizzolato
2018-09-28 15:46:50 -07:00
parent 568a80dfb8
commit a56e55b8ac
9 changed files with 23 additions and 41 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
makefile
View File

@@ -1898,8 +1898,8 @@ ifeq ($(WIN32),)
else
copy $(@D)\microvax3900${EXE} $(@D)\vax${EXE}
endif
ifneq (,$(call find_test,$(VAXD),microvax3900))
$@ $(call find_test,$(VAXD),microvax3900) $(TEST_ARG)
ifneq (,$(call find_test,$(VAXD),vax-diag))
$@ $(call find_test,$(VAXD),vax-diag) $(TEST_ARG)
endif
microvax1 : ${BIN}BuildROMs${EXE} ${BIN}microvax1${EXE}
@@ -1907,8 +1907,8 @@ microvax1 : ${BIN}BuildROMs${EXE} ${BIN}microvax1${EXE}
${BIN}microvax1${EXE} : ${VAX610} ${SIM} ${BUILD_ROMS}
${MKDIRBIN}
${CC} ${VAX610} ${SIM} ${VAX610_OPT} -o $@ ${LDFLAGS}
ifneq (,$(call find_test,$(VAXD),microvax1))
$@ $(call find_test,$(VAXD),microvax1) $(TEST_ARG)
ifneq (,$(call find_test,$(VAXD),vax-diag))
$@ $(call find_test,$(VAXD),vax-diag) $(TEST_ARG)
endif
rtvax1000 : ${BIN}BuildROMs${EXE} ${BIN}rtvax1000${EXE}
@@ -1916,8 +1916,8 @@ rtvax1000 : ${BIN}BuildROMs${EXE} ${BIN}rtvax1000${EXE}
${BIN}rtvax1000${EXE} : ${VAX630} ${SIM} ${BUILD_ROMS}
${MKDIRBIN}
${CC} ${VAX630} ${SIM} ${VAX620_OPT} -o $@ ${LDFLAGS}
ifneq (,$(call find_test,$(VAXD),rtvax1000))
$@ $(call find_test,$(VAXD),rtvax1000) $(TEST_ARG)
ifneq (,$(call find_test,$(VAXD),vax-diag))
$@ $(call find_test,$(VAXD),vax-diag) $(TEST_ARG)
endif
microvax2 : ${BIN}BuildROMs${EXE} ${BIN}microvax2${EXE}
@@ -1925,8 +1925,8 @@ microvax2 : ${BIN}BuildROMs${EXE} ${BIN}microvax2${EXE}
${BIN}microvax2${EXE} : ${VAX630} ${SIM} ${BUILD_ROMS}
${MKDIRBIN}
${CC} ${VAX630} ${SIM} ${VAX630_OPT} -o $@ ${LDFLAGS}
ifneq (,$(call find_test,$(VAXD),microvax2))
$@ $(call find_test,$(VAXD),microvax2) $(TEST_ARG)
ifneq (,$(call find_test,$(VAXD),vax-diag))
$@ $(call find_test,$(VAXD),vax-diag) $(TEST_ARG)
endif
vax730 : ${BIN}BuildROMs${EXE} ${BIN}vax730${EXE}
@@ -1934,8 +1934,8 @@ vax730 : ${BIN}BuildROMs${EXE} ${BIN}vax730${EXE}
${BIN}vax730${EXE} : ${VAX730} ${SIM} ${BUILD_ROMS}
${MKDIRBIN}
${CC} ${VAX730} ${SIM} ${VAX730_OPT} -o $@ ${LDFLAGS}
ifneq (,$(call find_test,$(VAXD),vax730))
$@ $(call find_test,$(VAXD),vax730) $(TEST_ARG)
ifneq (,$(call find_test,$(VAXD),vax-diag))
$@ $(call find_test,$(VAXD),vax-diag) $(TEST_ARG)
endif
vax750 : ${BIN}BuildROMs${EXE} ${BIN}vax750${EXE}
@@ -1943,8 +1943,8 @@ vax750 : ${BIN}BuildROMs${EXE} ${BIN}vax750${EXE}
${BIN}vax750${EXE} : ${VAX750} ${SIM} ${BUILD_ROMS}
${MKDIRBIN}
${CC} ${VAX750} ${SIM} ${VAX750_OPT} -o $@ ${LDFLAGS}
ifneq (,$(call find_test,$(VAXD),vax750))
$@ $(call find_test,$(VAXD),vax750) $(TEST_ARG)
ifneq (,$(call find_test,$(VAXD),vax-diag))
$@ $(call find_test,$(VAXD),vax-diag) $(TEST_ARG)
endif
vax780 : ${BIN}BuildROMs${EXE} ${BIN}vax780${EXE}
@@ -1952,8 +1952,8 @@ vax780 : ${BIN}BuildROMs${EXE} ${BIN}vax780${EXE}
${BIN}vax780${EXE} : ${VAX780} ${SIM} ${BUILD_ROMS}
${MKDIRBIN}
${CC} ${VAX780} ${SIM} ${VAX780_OPT} $(CC_OUTSPEC) ${LDFLAGS}
ifneq (,$(call find_test,$(VAXD),vax780))
$@ $(call find_test,$(VAXD),vax780) $(TEST_ARG)
ifneq (,$(call find_test,$(VAXD),vax-diag))
$@ $(call find_test,$(VAXD),vax-diag) $(TEST_ARG)
endif
vax8600 : ${BIN}BuildROMs${EXE} ${BIN}vax8600${EXE}
@@ -1961,8 +1961,8 @@ vax8600 : ${BIN}BuildROMs${EXE} ${BIN}vax8600${EXE}
${BIN}vax8600${EXE} : ${VAX8600} ${SIM} ${BUILD_ROMS}
${MKDIRBIN}
${CC} ${VAX8600} ${SIM} ${VAX8600_OPT} $(CC_OUTSPEC) ${LDFLAGS}
ifneq (,$(call find_test,$(VAXD),vax8600))
$@ $(call find_test,$(VAXD),vax8600) $(TEST_ARG)
ifneq (,$(call find_test,$(VAXD),vax-diag))
$@ $(call find_test,$(VAXD),vax-diag) $(TEST_ARG)
endif
nova : ${BIN}nova${EXE}