fixed windows testing, docker required now

This commit is contained in:
Egan Ford 2023-05-09 12:32:10 -06:00
parent 163d8a9661
commit 51933f3223
6 changed files with 17 additions and 16 deletions

View File

@ -32,6 +32,7 @@ Download <https://github.com/datajerk/c2d/archive/master.zip> and extract.
### Build Notes
NOTE: cc65 2.13.3 required (no other version supported)
NOTE: Docker required for `make disttest`
Unix/Linux:

Binary file not shown.

Binary file not shown.

Binary file not shown.

4
dwine Executable file
View File

@ -0,0 +1,4 @@
#!/bin/bash
set -x
docker run --rm -it -v $PWD:/pwd wine32 bash -c "cd /pwd && wine $*"

28
test.sh
View File

@ -47,9 +47,8 @@ then
echo
echo "Testing Windows c2d..."
echo
PATH=$HOME/wine/bin:$PATH
echo "wine bin/c2d.exe ${BIN},${ADDR} ${BIN}.dsk"
wine bin/c2d.exe ${BIN},${ADDR} ${BIN}.dsk 2>&1 | sed 's/^/ /'
echo "./dwine bin/c2d.exe ${BIN},${ADDR} ${BIN}.dsk"
./dwine bin/c2d.exe ${BIN},${ADDR} ${BIN}.dsk 2>&1 | sed 's/^/ /'
CHECK=$(md5sum ${BIN}.dsk | awk '{print $1}')
if [ "$CHECK" = "$SUM" ]
then
@ -104,11 +103,10 @@ then
echo
echo "Testing Windows c2d textpage..."
echo
PATH=$HOME/wine/bin:$PATH
echo "wine bin/text2page.exe <${BIN}.text >${BIN}.textpage"
wine bin/text2page.exe <${BIN}.text >${BIN}.textpage
echo "wine bin/c2d.exe -t ${BIN}.textpage ${BIN},${ADDR} ${BIN}.dsk"
wine bin/c2d.exe -t ${BIN}.textpage ${BIN},${ADDR} ${BIN}.dsk 2>&1 | sed 's/^/ /'
echo "./dwine bin/text2page.exe <${BIN}.text >${BIN}.textpage"
./dwine bin/text2page.exe '<'${BIN}.text '>'${BIN}.textpage
echo "./dwine bin/c2d.exe -t ${BIN}.textpage ${BIN},${ADDR} ${BIN}.dsk"
./dwine bin/c2d.exe -t ${BIN}.textpage ${BIN},${ADDR} ${BIN}.dsk 2>&1 | sed 's/^/ /'
CHECK=$(md5sum ${BIN}.dsk | awk '{print $1}')
if [ "$CHECK" = "$SUM" ]
then
@ -145,9 +143,8 @@ rm -f ${BIN}.dsk
echo
echo "Testing Windows c2d..."
echo
PATH=$HOME/wine/bin:$PATH
echo "wine bin/c2d.exe ${BIN},${ADDR} ${BIN}.dsk"
wine bin/c2d.exe ${MON} ${BIN}.dsk 2>&1 | sed 's/^/ /'
echo "./dwine bin/c2d.exe ${BIN},${ADDR} ${BIN}.dsk"
./dwine bin/c2d.exe ${MON} ${BIN}.dsk 2>&1 | sed 's/^/ /'
CHECK=$(md5sum ${BIN}.dsk | awk '{print $1}')
if [ "$CHECK" = "$SUM" ]
then
@ -183,11 +180,10 @@ then
echo
echo "Testing Windows c2d textpage..."
echo
PATH=$HOME/wine/bin:$PATH
echo "wine bin/text2page.exe <${BIN}.text >${BIN}.textpage"
wine bin/text2page.exe <${BIN}.text >${BIN}.textpage
echo "wine bin/c2d.exe -t ${BIN}.textpage ${BIN},${ADDR} ${BIN}.dsk"
wine bin/c2d.exe -t ${BIN}.textpage ${MON} ${BIN}.dsk 2>&1 | sed 's/^/ /'
echo "./dwine bin/text2page.exe <${BIN}.text >${BIN}.textpage"
./dwine bin/text2page.exe '<'${BIN}.text '>'${BIN}.textpage
echo "./dwine bin/c2d.exe -t ${BIN}.textpage ${BIN},${ADDR} ${BIN}.dsk"
./dwine bin/c2d.exe -t ${BIN}.textpage ${MON} ${BIN}.dsk 2>&1 | sed 's/^/ /'
CHECK=$(md5sum ${BIN}.dsk | awk '{print $1}')
if [ "$CHECK" = "$SUM" ]
then