Skip to content

Timeout doesn't display saved console. #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
RossPatterson wants to merge 6 commits into
base: develop
Choose a base branch
from
+17 −13
Open

Timeout doesn't display saved console. #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
eb57326
Timeout discards saved console.
RossPatterson Aug 11, 2025
7f851d4
Use my Docker image for testing.
RossPatterson Aug 11, 2025
979787b
Upgrade GitHub actions.
RossPatterson Aug 11, 2025
333e817
Update tests for VM/CE 1.1.2.
RossPatterson Aug 11, 2025
b56e0b1
Update changelog, version.
RossPatterson Aug 11, 2025
cef67d0
Adapt to GitHub action changes.
RossPatterson Aug 11, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 10 additions & 7 deletions .github/workflows/ccpp.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ jobs:

services:
vm370:
image: adriansutherland/vm370:latest
image: rosspatterson/vm370:latest
ports:
- 8038:8038

Expand Down Expand Up @@ -63,7 +63,7 @@ jobs:

- name: Upload Executable
if: startsWith(github.ref, 'refs/tags/')
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: HercControl-Ubuntu
path: "${{ runner.temp }}/exe"
Expand Down Expand Up @@ -109,7 +109,7 @@ jobs:

- name: Upload Executable
if: startsWith(github.ref, 'refs/tags/')
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: HercControl-Windows
path: "${{ runner.temp }}/exe"
Expand Down Expand Up @@ -155,7 +155,7 @@ jobs:

- name: Upload Executable
if: startsWith(github.ref, 'refs/tags/')
uses: actions/upload-artifact@v1
uses: actions/upload-artifact@v4
with:
name: HercControl-MacOS
path: "${{ runner.temp }}/exe"
Expand All @@ -170,27 +170,30 @@ jobs:
- uses: actions/checkout@v1

- name: Get ubuntu binary
uses: actions/download-artifact@v1
uses: actions/download-artifact@v4
with:
name: HercControl-Ubuntu
path: HercControl-Ubuntu

- name: ZIP ubuntu binary
run:
zip -r HercControl-Ubuntu.zip HercControl-Ubuntu

- name: Get windows binary
uses: actions/download-artifact@v1
uses: actions/download-artifact@v4
with:
name: HercControl-Windows
path: HercControl-Windows

- name: ZIP windows binary
run:
zip -r HercControl-Windows.zip HercControl-Windows

- name: Get macos binary
uses: actions/download-artifact@v1
uses: actions/download-artifact@v4
with:
name: HercControl-MacOS
path: HercControl-MacOS

- name: ZIP macos binary
run:
Expand Down
2 changes: 1 addition & 1 deletion CMakeLists.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ set(CMAKE_CXX_STANDARD_REQUIRED ON)
cmake_policy(SET CMP0091 NEW)
set(CMAKE_MSVC_RUNTIME_LIBRARY "MultiThreaded")

project(HercControl VERSION 1.1.1)
project(HercControl VERSION 1.1.2)

#include(CTest)
#enable_testing()
Expand Down
2 changes: 1 addition & 1 deletion changelog.txt
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
HercControl Change Log
======================

Issue 00001 - Timeout doesn't display saved console.
Feature f0102 - Control returned. Output all console, last (found line) line or silent (nothing)
Feature f0101 - Set marker. Allows the read from point (marker) to be set so that the console can be read to get external events like mounting a tape
Feature f0100 - Timeout logging. Show Hercules console output on timeout (helps debugging)
Expand Down
1 change: 1 addition & 0 deletions src/HercControl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,7 @@ void callHerculesConsole(string command, string waitFor, vector<string>& console
cerr << rang::fg::cyan << "Timeout Reset" << rang::style::reset << endl;
}
}
console.insert(console.begin(), saveConsole.begin(), saveConsole.end());
throw runtime_error("Timeout");
}
}
Expand Down
4 changes: 2 additions & 2 deletions test/basictest.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
.\herccontrol "ipl 141" -w "USER DSC LOGOFF AS AUTOLOG1"
.\herccontrol "ipl 6a1" -w "USER DSC LOGOFF AS AUTOLOG1"
if %errorlevel% NEQ 0 goto:eof
.\herccontrol "/enable all" -w "COMMAND COMPLETE"
if %errorlevel% NEQ 0 goto:eof
.\herccontrol "/cp disc" -w "^VM/370 Online"
if %errorlevel% NEQ 0 goto:eof
.\herccontrol "/logon cmsuser cmsuser" -w "^CMS"
.\herccontrol "/logon cmsuser cmsuser" -w "^VM Community Edition"
if %errorlevel% NEQ 0 goto:eof
.\herccontrol "/" -w "^Ready"
if %errorlevel% NEQ 0 goto:eof
Expand Down
4 changes: 2 additions & 2 deletions test/basictest.sh
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,10 +1,10 @@
#!/bin/bash
set -e
./herccontrol "ipl 141" -w ""
./herccontrol "ipl 6a1" -w ""
./herccontrol "" -w "USER DSC LOGOFF AS AUTOLOG1"
./herccontrol "/enable all" -w "COMMAND COMPLETE"
./herccontrol "/cp disc" -w "^VM/370 Online"
./herccontrol "/logon cmsuser cmsuser" -w "^CMS"
./herccontrol "/logon cmsuser cmsuser" -w "^VM Community Edition"
./herccontrol "/" -w "^Ready"
./herccontrol "/listf * * a" -w "^Ready"
./herccontrol "/logoff" -w "^VM/370 Online"
Expand Down