From eb5732695c420d65cfb7f8b778f31d63e05a2c2b Mon Sep 17 00:00:00 2001 From: Ross Patterson Date: Mon, 11 Aug 2025 05:12:22 -0400 Subject: [PATCH 1/6] Timeout discards saved console. --- src/HercControl.cpp | 1 + 1 file changed, 1 insertion(+) diff --git a/src/HercControl.cpp b/src/HercControl.cpp index af307ad..bc194c0 100644 --- a/src/HercControl.cpp +++ b/src/HercControl.cpp @@ -249,6 +249,7 @@ void callHerculesConsole(string command, string waitFor, vector& console cerr << rang::fg::cyan << "Timeout Reset" << rang::style::reset << endl; } } + console.insert(console.begin(), saveConsole.begin(), saveConsole.end()); throw runtime_error("Timeout"); } } From 7f851d42f5a6373077fadbb591ad56dad489e4a2 Mon Sep 17 00:00:00 2001 From: Ross Patterson Date: Mon, 11 Aug 2025 05:16:32 -0400 Subject: [PATCH 2/6] Use my Docker image for testing. --- .github/workflows/ccpp.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index 2d6bfbc..afe1fcf 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -11,7 +11,7 @@ jobs: services: vm370: - image: adriansutherland/vm370:latest + image: rosspatterson/vm370:latest ports: - 8038:8038 From 979787b29f72af1f4180c442c34ff9f928bb3185 Mon Sep 17 00:00:00 2001 From: Ross Patterson Date: Mon, 11 Aug 2025 05:20:20 -0400 Subject: [PATCH 3/6] Upgrade GitHub actions. --- .github/workflows/ccpp.yml | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index afe1fcf..d3a34cf 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -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" @@ -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" @@ -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" @@ -170,7 +170,7 @@ jobs: - uses: actions/checkout@v1 - name: Get ubuntu binary - uses: actions/download-artifact@v1 + uses: actions/download-artifact@v4 with: name: HercControl-Ubuntu @@ -179,7 +179,7 @@ jobs: 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 @@ -188,7 +188,7 @@ jobs: 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 From 333e81761ba3bc555a47e7e2f76b557facbcbe7e Mon Sep 17 00:00:00 2001 From: Ross Patterson Date: Mon, 11 Aug 2025 05:26:09 -0400 Subject: [PATCH 4/6] Update tests for VM/CE 1.1.2. --- test/basictest.cmd | 4 ++-- test/basictest.sh | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/test/basictest.cmd b/test/basictest.cmd index 908b81c..c82818b 100644 --- a/test/basictest.cmd +++ b/test/basictest.cmd @@ -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 diff --git a/test/basictest.sh b/test/basictest.sh index 1587798..6f4ff0c 100644 --- a/test/basictest.sh +++ b/test/basictest.sh @@ -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" From b56e0b1eb4ba678b81ef51caf44433f5a1b72ee0 Mon Sep 17 00:00:00 2001 From: Ross Patterson Date: Mon, 11 Aug 2025 05:35:12 -0400 Subject: [PATCH 5/6] Update changelog, version. --- CMakeLists.txt | 2 +- changelog.txt | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index aa8505f..ac43335 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -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() diff --git a/changelog.txt b/changelog.txt index b80d6ac..c77c805 100644 --- a/changelog.txt +++ b/changelog.txt @@ -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) From cef67d0adfed9128590b1c5f1f4a65e650ec6ce6 Mon Sep 17 00:00:00 2001 From: Ross Patterson Date: Mon, 11 Aug 2025 05:50:44 -0400 Subject: [PATCH 6/6] Adapt to GitHub action changes. --- .github/workflows/ccpp.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/.github/workflows/ccpp.yml b/.github/workflows/ccpp.yml index d3a34cf..9f9dd0c 100644 --- a/.github/workflows/ccpp.yml +++ b/.github/workflows/ccpp.yml @@ -173,6 +173,7 @@ jobs: uses: actions/download-artifact@v4 with: name: HercControl-Ubuntu + path: HercControl-Ubuntu - name: ZIP ubuntu binary run: @@ -182,6 +183,7 @@ jobs: uses: actions/download-artifact@v4 with: name: HercControl-Windows + path: HercControl-Windows - name: ZIP windows binary run: @@ -191,6 +193,7 @@ jobs: uses: actions/download-artifact@v4 with: name: HercControl-MacOS + path: HercControl-MacOS - name: ZIP macos binary run: