Merge pull request dosemu2#2644 from andrewbird/ci-220

CI: packaging workflow renaming and other tidyups and fixes

Author: stsp

.github/workflows/ci-flatpak.yml …ub/workflows/create-packages-flatpak.yml.github/workflows/ci-flatpak.yml renamed to .github/workflows/create-packages-flatpak.yml .github/workflows/ci-flatpak.yml renamed to .github/workflows/create-packages-flatpak.yml

@@ -4,11 +4,11 @@ on:
 #    branches:
 #      - devel
 
-name: Flatpack build
+name: Create Packages (Flatpak)
 
 jobs:
   build:
-    name: "Flatpak"
+    name: "build"
     runs-on: ubuntu-24.04
     if: (github.repository_owner == 'dosemu2')
     container:

.github/workflows/packages.yml …hub/workflows/create-packages-termux.yml.github/workflows/packages.yml renamed to .github/workflows/create-packages-termux.yml .github/workflows/packages.yml renamed to .github/workflows/create-packages-termux.yml

@@ -1,4 +1,4 @@
-name: Packages
+name: Create Packages (Termux)
 
 on:
   push:
@@ -16,6 +16,7 @@ permissions: {} # none
 
 jobs:
   build:
+    if: github.event_name != 'pull_request' || github.event.pull_request.draft == false
     permissions:
       contents: read # actions/upload-artifact doesn't need contents: write
     runs-on: ubuntu-24.04

ci_test.sh

@@ -22,10 +22,11 @@ python3 test/test_dosemu.py --get-test-binaries
 # Make cpu tests here so that we see any failures
 make -C test/cpu clean all
 
-echo
-echo "====================================================="
-echo "=        Tests run on various flavours of DOS       ="
-echo "====================================================="
+cat >&2 << EOF
+=====================================================
+=        Tests run on various flavours of DOS       =
+=====================================================
+EOF
 # all DOS flavours, all tests
 # python3 test/test_dosemu.py
 # single DOS example
@@ -72,15 +73,15 @@ if [ "${BLDTYPE}" != "packaged" ] ; then  # Only makes sense if we are building
   }
 
   branch_has_emulator_changes() {
-    git diff --name-only ${BASE_SHA:-}..HEAD -- src/base/emu-i386/simx8
+    [ "$(git diff --name-only ${BASE_SHA:-}..HEAD -- src/base/emu-i386/simx86 | wc -l)" != "0" ]
   }
 
   last5_has_emulator_changes() {
-    git diff --name-only HEAD~5 -- src/base/emu-i386/simx86
+    [ "$(git diff --name-only HEAD~5 -- src/base/emu-i386/simx86 | wc -l)" != "0" ]
   }
 
   merge_has_emulator_changes() {
-    git diff --name-only HEAD ^HEAD^1 -- src/base/emu-i386/simx8
+    [ "$(git diff --name-only HEAD ^HEAD^1 -- src/base/emu-i386/simx86 | wc -l)" != "0" ]
   }
 
   if is_primary ; then

test/common_framework.py

@@ -183,18 +183,18 @@ def setUpClassPost(cls):
                     major, minor = release().split('.')[0:2]
                     if not (major == '6' and minor in ['11', '12', '13']):
                         if environ.get("NO_KVM", '0') == '1':
-                            print("\nUsable KVM found but NO_KVM=1 - Disabling\n")
+                            print(" \nUsable KVM found but NO_KVM=1 - Disabling", file=stderr, flush=True)
                         else:
-                            print("\nUsable KVM found\n")
+                            print(" \nUsable KVM found", file=stderr, flush=True)
                             cls.have_kvm = True
                     else:
-                        print("\nUsable KVM found but blacklisted kernel (6.11 - 6.13) - Disabling\n")
+                        print(" \nUsable KVM found but blacklisted kernel (6.11 - 6.13) - Disabling", file=stderr, flush=True)
 
             except FileNotFoundError:
                 pass
             except PermissionError:
                 op = check_output(["getfacl", "/dev/kvm"])
-                print("\nPermissions wrong on /dev/kvm\n%s\n" % op.decode('ASCII'))
+                print(" \nPermissions wrong on /dev/kvm\n%s" % op.decode('ASCII'), file=stderr, flush=True)
 
     @classmethod
     def tearDownClass(cls):
@@ -587,11 +587,6 @@ def test_0_basic_boot(self):
 
 class MyTestResult(unittest.TextTestResult):
 
-    def startTestRun(self):
-        super(MyTestResult, self).startTestRun()
-        self.stream.writeln(" ")
-        self.stream.flush()
-
     def getDescription(self, test):
         if 'SubTest' in strclass(test.__class__):
             return str(test)
@@ -724,6 +719,12 @@ def addSubTest(self, test, subtest, err):
 class MyTestRunner(unittest.TextTestRunner):
     resultclass = MyTestResult
 
+    def run(self, test):
+        self.stream.flush()
+        result = super().run(test)
+        self.stream.flush()
+        return result
+
 
 def main(argv=None):
     if version_info < (3, 2):