From 8eb46c7c493eb8c2c67e163e0c8e374c0d21afac Mon Sep 17 00:00:00 2001 From: Aran Vink Date: Sat, 12 Apr 2025 23:41:50 +0200 Subject: [PATCH 1/2] Add test in dosemu --- .github/workflows/docker-adplay-build.yml | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/.github/workflows/docker-adplay-build.yml b/.github/workflows/docker-adplay-build.yml index 9ad0c59..ca03f83 100644 --- a/.github/workflows/docker-adplay-build.yml +++ b/.github/workflows/docker-adplay-build.yml @@ -92,6 +92,19 @@ jobs: pushd adplay make gcc_version=${{ matrix.gcc_compiler }} binarydist popd + - name: Test AdPlay for DOS + run: | + # Please note that this only tests basic batch player functionality + # It does not test specific formats, this is already handled through Adplug specific tests, which are also run for DOS! + pushd adplay + # Install dosemu2 for testing + sudo add-apt-repository -y ppa:dosemu2/ppa + sudo apt install -y dosemu2 unzip + # We need CWSDPMI as well if we want to run any DOS programs. + wget https://www.delorie.com/pub/djgpp/current/v2misc/csdpmi7b.zip + unzip -j -o "csdpmi7b.zip" "bin/CWSDPMI.EXE" + cp ../adplug/test/testmus/loudness.lds . + dosemu adplay.exe -dumb /q loudness.lds - name: Upload artifact uses: actions/upload-artifact@v3 with: From d56b38579b4519376eced5a07ba87d1639136ece Mon Sep 17 00:00:00 2001 From: Aran Vink Date: Sat, 12 Apr 2025 23:57:47 +0200 Subject: [PATCH 2/2] Improve batch test comments --- .github/workflows/docker-adplay-build.yml | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/.github/workflows/docker-adplay-build.yml b/.github/workflows/docker-adplay-build.yml index e61c6ae..a02141a 100644 --- a/.github/workflows/docker-adplay-build.yml +++ b/.github/workflows/docker-adplay-build.yml @@ -93,10 +93,11 @@ jobs: pushd adplay make gcc_version=${{ matrix.gcc_compiler }} binarydist popd - - name: Test AdPlay for DOS + - name: Test AdPlay for DOS (batch player) run: | - # Please note that this only tests basic batch player functionality - # It does not test specific formats, this is already handled through Adplug specific tests, which are also run for DOS! + # This tests basic batch player functionality + # It does NOT test specific formats, this is already handled through Adplug specific tests, which are also run for DOS. + # It also does NOT test any GUI interaction pushd adplay # Install dosemu2 for testing sudo add-apt-repository -y ppa:dosemu2/ppa @@ -105,6 +106,7 @@ jobs: wget https://www.delorie.com/pub/djgpp/current/v2misc/csdpmi7b.zip unzip -j -o "csdpmi7b.zip" "bin/CWSDPMI.EXE" cp ../adplug/test/testmus/loudness.lds . + # Command below will execute AdPlay for Dos in dosemu, dosemu will relay the exitcode back, which in turn will be interpreted by the GitHub run action dosemu adplay.exe -dumb /q loudness.lds - name: Tag this version 'latest'