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

SCP: Enhance SCP library testing to report and stop on errors

Browse source
This commit is contained in:
Mark Pizzolato 2020-04-11 13:03:00 -07:00
parent 049ba32505
commit 35780cf5e2
1 changed files with 17 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
scp.c
View file

@ -15380,6 +15380,10 @@ for (i = 0; (dptr = sim_devices[i]) != NULL; i++) {
t_stat tstat = SCPE_OK; t_stat tstat = SCPE_OK;
t_bool was_disabled = ((dptr->flags & DEV_DIS) != 0); t_bool was_disabled = ((dptr->flags & DEV_DIS) != 0);
if (DEV_TYPE(dptr) == 0) {
sim_printf ("Skipping %s - non library device type\n", dptr->name);
continue; /* skip unspecified devices */
}
sim_switches = saved_switches; sim_switches = saved_switches;
if (was_disabled) if (was_disabled)
tstat = set_dev_enbdis (dptr, NULL, 1, NULL); tstat = set_dev_enbdis (dptr, NULL, 1, NULL);
@ -15405,11 +15409,21 @@ for (i = 0; (dptr = sim_devices[i]) != NULL; i++) {
default: default:
break; break;
} }
if (was_disabled)
set_dev_enbdis (dptr, NULL, 0, NULL);
} }
if (was_disabled) else
set_dev_enbdis (dptr, NULL, 0, NULL); tstat = SCPE_OK; /* can't enable, just skip device */
if (tstat != SCPE_OK) if (tstat != SCPE_OK) {
stat = tstat; stat = tstat;
sim_printf ("%s device tests returned: %d - %s\n", dptr->name, tstat, sim_error_text (tstat));
if (sim_ttisatty()) {
if (get_yn ("Continue with additional tests? [N]", SCPE_STOP) == SCPE_STOP)
break;
}
else
break;
}
} }
return stat; return stat;
} }