From f88c1b8b2a1dd41b94fab799474e233d62c12ab5 Mon Sep 17 00:00:00 2001
From: Mark Pizzolato <mark@infocomm.com>
Date: Tue, 7 May 2019 12:03:49 -0700
Subject: [PATCH] VAX: Add build time diag execution for many new simulators

---
 VAX/tests/vax-diag_test.ini | 16 ++++++++--------
 1 file changed, 8 insertions(+), 8 deletions(-)

diff --git a/VAX/tests/vax-diag_test.ini b/VAX/tests/vax-diag_test.ini
index 8d2456bc..99d2957b 100644
--- a/VAX/tests/vax-diag_test.ini
+++ b/VAX/tests/vax-diag_test.ini
@@ -23,18 +23,11 @@ if ("%1" == "-v") set console notelnet
 else set -qu console telnet=65432,telnet=buffered; set env -a DIAG_QUIET_MODE=1
 goto DIAG_%SIM_BIN_NAME%
 
-:DIAG_INFOSERVER100
-:DIAG_INFOSERVER1000
-:DIAG_INFOSERVER150VTX
 :DIAG_MICROVAX2
 :DIAG_MICROVAX2000
-:DIAG_MICROVAX3100
-:DIAG_MICROVAX3100E
-:DIAG_MICROVAX3100M76
 :DIAG_MICROVAX3100M80
 :DIAG_RTVAX1000
-:DIAG_VAXSTATION3100M30
-:DIAG_VAXSTATION3100M38
+:DIAG_VAXSTATION3100M76
 :DIAG_VAXSTATION4000M60
 :DIAG_VAXSTATION4000VLC
 echof "No diagnostics are available for the %SIM_NAME% Simulator\n"
@@ -48,8 +41,15 @@ go -q 200
 if (PC != 0x1150DA51) echof "\r\n*** FAILED - %SIM_NAME% Hardware Core Instruction test EHKAA\n"; exit 1
 else                  echof "\r\n*** PASSED - %SIM_NAME% Hardware Core Instruction test EHKAA\n"; exit 0
 
+:DIAG_INFOSERVER100
+:DIAG_INFOSERVER1000
+:DIAG_INFOSERVER150VXT
+:DIAG_MICROVAX3100
+:DIAG_MICROVAX3100E
 :DIAG_VAX
 :DIAG_MICROVAX3900
+:DIAG_VAXSTATION3100M30
+:DIAG_VAXSTATION3100M38
 echo Running Hardware Core Test (EHKAA)
 if not exist ehkaa.exe echof "\r\nMISSING - Diagnostic '%~p0ehkaa.exe' is missing\n"; exit 1
 load ehkaa.exe