diff --git a/apple2Tester.go b/apple2Tester.go index ecb0c8a..1d9e83c 100644 --- a/apple2Tester.go +++ b/apple2Tester.go @@ -51,11 +51,13 @@ func (at *apple2Tester) getText80() string { return screen.RenderTextModeString(at.a, true, false, false, at.a.isApple2e) } -func buildTerminateConditionCycles(cycles uint64) terminateConditionFunc { - return func(a *Apple2) bool { - return a.cpu.GetCycles() > cycles +/* + func buildTerminateConditionCycles(cycles uint64) terminateConditionFunc { + return func(a *Apple2) bool { + return a.cpu.GetCycles() > cycles + } } -} +*/ const textCheckInterval = uint64(100_000) diff --git a/cardBrainBoard.go b/cardBrainBoard.go index d47a93e..6f6f874 100644 --- a/cardBrainBoard.go +++ b/cardBrainBoard.go @@ -73,7 +73,7 @@ func newCardBrainBoardBuilder() *cardBuilder { } else if bank == "down" { c.isBankB = true } else { - return nil, fmt.Errorf("Invalid bank '%s', must be up or down", bank) + return nil, fmt.Errorf("invalid bank '%s', must be up or down", bank) } dips, err := paramsGetDIPs(params, "dips", 8) diff --git a/cardBrainBoard_test.go b/cardBrainBoard_test.go index 3eb6ff0..a288f6e 100644 --- a/cardBrainBoard_test.go +++ b/cardBrainBoard_test.go @@ -29,6 +29,8 @@ func TestBrainBoardCardWozaniam(t *testing.T) { } at.run() + at.terminateCondition = buildTerminateConditionText(at, "_@_@_@_@_@_@_@_@_@_@_@_@_@_@_@_@_@_@_@_@", false, 100_000) + text := at.getText() if !strings.Contains(text, "_@_@_@_@_@_@_@_@_@_@_@_@_@_@_@_@_@_@_@_@") { t.Errorf("Expected screen filled with _@_@', got '%s'", text) @@ -38,9 +40,7 @@ func TestBrainBoardCardWozaniam(t *testing.T) { func TestBrainBoardCardIntegerBasic(t *testing.T) { at := buildBrainBoardTester(t, "brainboard,switch=down") - at.terminateCondition = func(a *Apple2) bool { - return a.cpu.GetCycles() > 10_000_000 - } + at.terminateCondition = buildTerminateConditionText(at, "APPLE ][\n>", false, 1_000_000) at.run() text := at.getText()