folkert/simh-testsetgenerator
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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
Show stats Download patch file Download diff file Expand all files Collapse all files

4
VAX/tests/EHKAA.ini
View file

@ -1,4 +0,0 @@
load ehkaa.exe
go 200
if (PC != 0x80018AD1) echof "\r\n%SIM_NAME% Hardware Core Instruction test EHKAA - FAILED\n"; exit 1
else echof "\r\n%SIM_NAME% Hardware Core Instruction test EHKAA - PASSED\n"; exit 0

7
VAX/tests/EVKAA.ini
View file

@ -1,7 +0,0 @@
set -qu console telnet=65432,telnet=buffered
load evkaa.exe
expect "Hit any key to continue" send "\r"; go -q
expect [2] "done!" echof "\r\n%SIM_NAME% Hardware Core Instruction test EVKAA - PASSED\n"; exit 0
go -q 200
echof "\r\n%SIM_NAME% Hardware Core Instruction test EVKAA - FAILED\n"
exit 1

2
VAX/tests/microvax3900_test.ini
View file

@ -1,2 +0,0 @@
cd VAX/tests
do VAX-DIAG.ini %1

11
VAX/tests/vax-diag.ini → VAX/tests/vax-diag_test.ini
View file

@ -6,7 +6,9 @@
:: if the script is invoked with -v as a parameter, verbose :: if the script is invoked with -v as a parameter, verbose
:: diagnostic output will be produced. :: diagnostic output will be produced.
:: ::
#echof "%%0=%0\n" :: The related diagnostic files must be located in the same directory
:: as this procedure.
::
#set clock async #set clock async
#set debug -ntp todr.dbg #set debug -ntp todr.dbg
#set todr debug #set todr debug
@ -15,6 +17,7 @@
#set int-clock nodebug=queue;gettime;check #set int-clock nodebug=queue;gettime;check
#set cpu hist=20000 #set cpu hist=20000
#break A3B4 SHOW HIST=40 #break A3B4 SHOW HIST=40
cd %~p0
set env DIAG_QUIET_MODE=0 set env DIAG_QUIET_MODE=0
if ("%1" == "-v") set console notelnet if ("%1" == "-v") set console notelnet
else set -qu console telnet=65432,telnet=buffered; set env -a DIAG_QUIET_MODE=1 else set -qu console telnet=65432,telnet=buffered; set env -a DIAG_QUIET_MODE=1
@ -26,7 +29,7 @@ exit 0
:DIAG_VAX :DIAG_VAX
:DIAG_MICROVAX3900 :DIAG_MICROVAX3900
echo Running Harware Core Test (EHKAA) echo Running Harware Core Test (EHKAA)
if not exist ehkaa.exe echof "\r\nMISSING - Diagnostic ehkaa.exe is missing\n"; exit 1 if not exist ehkaa.exe echof "\r\nMISSING - Diagnostic '%~p0ehkaa.exe' is missing\n"; exit 1
load ehkaa.exe load ehkaa.exe
go -q 200 go -q 200
if (PC != 0x80018AD1) echof "\r\n*** FAILED - %SIM_NAME% Hardware Core Instruction test EHKAA\n"; exit 1 if (PC != 0x80018AD1) echof "\r\n*** FAILED - %SIM_NAME% Hardware Core Instruction test EHKAA\n"; exit 1
@ -37,7 +40,7 @@ else echof "\r\n*** PASSED - %SIM_NAME% Hardware Core Instructi
:DIAG_VAX780 :DIAG_VAX780
:DIAG_VAX8600 :DIAG_VAX8600
echo Running Harware Core Test (EVKAA) echo Running Harware Core Test (EVKAA)
if not exist evkaa.exe echof "\r\nMISSING - Diagnostic evkaa.exe is missing\n"; exit 1 if not exist evkaa.exe echof "\r\nMISSING - Diagnostic '%~p0evkaa.exe' is missing\n"; exit 1
load evkaa.exe load evkaa.exe
expect "Hit any key to continue" send "\r"; go -q expect "Hit any key to continue" send "\r"; go -q
expect [2] "done!" echof "\r\n*** PASSED - %SIM_NAME% Hardware Core Instruction test EVKAA\n"; goto extended_tests expect [2] "done!" echof "\r\n*** PASSED - %SIM_NAME% Hardware Core Instruction test EVKAA\n"; goto extended_tests
@ -48,7 +51,7 @@ exit 1
:extended_tests :extended_tests
reset -p reset -p
if (DIAG_QUIET_MODE) echof "\nStarting VAX Diagnostic Supervisor\n" if (DIAG_QUIET_MODE) echof "\nStarting VAX Diagnostic Supervisor\n"
if not exist VAX_MINIMUM_DIAGS.dsk echof "\r\nMISSING - Diagnostic disk image VAX_MINIMUM_DIAGS.dsk is missing\n"; exit 1 if not exist VAX_MINIMUM_DIAGS.dsk echof "\r\nMISSING - Diagnostic disk image '%~p0VAX_MINIMUM_DIAGS.dsk' is missing\n"; exit 1
attach -rq rq0 VAX_MINIMUM_DIAGS.dsk attach -rq rq0 VAX_MINIMUM_DIAGS.dsk
goto %SIM_BIN_NAME% goto %SIM_BIN_NAME%

2
VAX/tests/vax730_test.ini
View file

@ -1,2 +0,0 @@
cd VAX/tests
do VAX-DIAG.ini %1

2
VAX/tests/vax750_test.ini
View file

@ -1,2 +0,0 @@
cd VAX/tests
do VAX-DIAG.ini %1

2
VAX/tests/vax780_test.ini
View file

@ -1,2 +0,0 @@
cd VAX/tests
do VAX-DIAG.ini %1

2
VAX/tests/vax8600_test.ini
View file

@ -1,2 +0,0 @@
cd VAX/tests
do VAX-DIAG.ini %1

32
makefile
View file

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