Add logging and log checking to build rules

This commit is contained in:
Philip Zembrod 2020-11-01 22:25:51 +01:00
parent b8c74160cc
commit 2b4cc92a7e
9 changed files with 105 additions and 12 deletions

View File

@ -44,7 +44,7 @@ lite64: test-lite-c64.result
debug-64: emulator/tcbase.T64 emulator/build-vf.sh \
disks/vforth4_2.d64 disks/tc38q.d64 $(vf_fth_files_petscii)
emulator/build-vf.sh vf-c64-main.fth
emulator/build-vf.sh vf-c64-main nosave
run-devenv: emulator/devenv.T64
emulator/run-in-vice.sh devenv
@ -65,26 +65,28 @@ cbmfiles/tcbase: emulator/c64-vf-390.T64 emulator/build-tcbase.sh \
$(vf_binaries): emulator/tcbase.T64 emulator/build-vf.sh \
disks/tc38q.d64 $(vf_fth_files_petscii)
$(vf_binaries): cbmfiles/logtofile.fth
cbmfiles/vf-full-c64:
emulator/build-vf.sh vf-full-c64.fth vf-full-c64
emulator/build-vf.sh vf-full-c64
cbmfiles/vf-full-c16+:
emulator/build-vf.sh vf-full-c16+.fth vf-full-c16+
emulator/build-vf.sh vf-full-c16+
cbmfiles/vf-full-c16-:
emulator/build-vf.sh vf-full-c16-.fth vf-full-c16-
emulator/build-vf.sh vf-full-c16-
cbmfiles/vf-lite-c64:
emulator/build-vf.sh vf-lite-c64.fth vf-lite-c64
emulator/build-vf.sh vf-lite-c64
cbmfiles/vf-lite-c16+:
emulator/build-vf.sh vf-lite-c16+.fth vf-lite-c16+
emulator/build-vf.sh vf-lite-c16+
cbmfiles/vf-lite-c16-:
emulator/build-vf.sh vf-lite-c16-.fth vf-lite-c16-
emulator/build-vf.sh vf-lite-c16-
cbmfiles/vf-lite-x16:
emulator/build-vf.sh vf-lite-x16.fth vf-lite-x16
emulator/build-vf.sh vf-lite-x16
# Core test targets

View File

@ -10,13 +10,20 @@ set -e
emulatordir="$(dirname "${BASH_SOURCE[0]}")"
basedir="$(realpath --relative-to="$PWD" "${emulatordir}/..")"
source="$1"
target="$2"
target="${1}"
source="${target}.fth"
logfile="${target}.log"
nosave="${2}"
test -n "$target" && rm -f "${basedir}/cbmfiles/${target}"
test -z "${nosave}" && rm -f "${basedir}/cbmfiles/${target}"
rm -f "${basedir}/cbmfiles/${logfile}"
keybuf="include ${source}\nsave-target ${target}\ndos s0:notdone\n"
test -z "$target" && keybuf="include ${source}\n"
test -n "${nosave}" && keybuf="include ${source}\n"
DISK10=tc38q "${emulatordir}/run-in-vice.sh" \
"tcbase" "${keybuf}"
petscii2ascii "${basedir}/cbmfiles/${logfile}" | \
grep -F 'target compile complete' || \
(echo "check logfile ${basedir}/cbmfiles/${logfile}" && exit 1)

View File

@ -1,6 +1,15 @@
\ with build log:
' noop alias \log
\ without build log:
\ ' \ alias \log
\log include logtofile.fth
include vf-tc-prep.fth
\log logopen" vf-lite-c64.log"
include vf-trg-c16+.fth
\ The actual volksForth sources
@ -15,4 +24,7 @@ include vf-finalize.fth
include vf-memsetup.fth
include vf-pr-target.fth
.( target compile complete) cr
\log logclose
quit

View File

@ -1,6 +1,15 @@
\ with build log:
' noop alias \log
\ without build log:
\ ' \ alias \log
\log include logtofile.fth
include vf-tc-prep.fth
\log logopen" vf-lite-c64.log"
include vf-trg-c16-.fth
\ The actual volksForth sources
@ -15,4 +24,7 @@ include vf-finalize.fth
include vf-memsetup.fth
include vf-pr-target.fth
.( target compile complete) cr
\log logclose
quit

View File

@ -1,6 +1,15 @@
\ with build log:
' noop alias \log
\ without build log:
\ ' \ alias \log
\log include logtofile.fth
include vf-tc-prep.fth
\log logopen" vf-lite-c64.log"
include vf-trg-c64.fth
\ The actual volksForth sources
@ -15,4 +24,7 @@ include vf-finalize.fth
include vf-memsetup.fth
include vf-pr-target.fth
.( target compile complete) cr
\log logclose
quit

View File

@ -1,6 +1,15 @@
\ with build log:
' noop alias \log
\ without build log:
\ ' \ alias \log
\log include logtofile.fth
include vf-tc-prep.fth
\log logopen" vf-lite-c64.log"
include vf-trg-c16+.fth
\ The actual volksForth sources
@ -14,4 +23,7 @@ include vf-finalize.fth
include vf-memsetup.fth
include vf-pr-target.fth
.( target compile complete) cr
\log logclose
quit

View File

@ -1,6 +1,15 @@
\ with build log:
' noop alias \log
\ without build log:
\ ' \ alias \log
\log include logtofile.fth
include vf-tc-prep.fth
\log logopen" vf-lite-c64.log"
include vf-trg-c16-.fth
\ The actual volksForth sources
@ -14,4 +23,7 @@ include vf-finalize.fth
include vf-memsetup.fth
include vf-pr-target.fth
.( target compile complete) cr
\log logclose
quit

View File

@ -1,6 +1,15 @@
\ with build log:
' noop alias \log
\ without build log:
\ ' \ alias \log
\log include logtofile.fth
include vf-tc-prep.fth
\log logopen" vf-lite-c64.log"
include vf-trg-c64.fth
\ The actual volksForth sources
@ -14,4 +23,7 @@ include vf-finalize.fth
include vf-memsetup.fth
include vf-pr-target.fth
.( target compile complete) cr
\log logclose
quit

View File

@ -1,6 +1,15 @@
\ with build log:
' noop alias \log
\ without build log:
\ ' \ alias \log
\log include logtofile.fth
include vf-tc-prep.fth
\log logopen" vf-lite-x16.log"
include vf-trg-x16.fth
\ The actual volksForth sources
@ -14,4 +23,7 @@ include vf-finalize.fth
include vf-memsetup.fth
include vf-pr-target.fth
.( target compile complete) cr
\log logclose
quit