izaya/collapseos
1
0
Fork 0
mirror of https://github.com/hsoft/collapseos.git synced 2024-11-27 14:48:06 +11:00
Code Issues Releases Wiki Activity

Fix broken tests

Browse Source 
Also, make tests run in a *BSD environment
This commit is contained in:
Virgil Dupras 2019-07-19 14:24:35 -04:00
parent eefadc3917
commit 253674ea05
8 changed files with 21 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
kernel/stdio.asm
View File

@ -134,18 +134,18 @@ stdioReadC:
; save char for later ; save char for later
ex af, af' ex af, af'
ld a, (STDIO_BUFIDX) ld a, (STDIO_BUFIDX)
push hl ;<| push hl ; --> lvl 1
ld hl, STDIO_BUF ; | ld hl, STDIO_BUF
; make HL point to dest spot | ; make HL point to dest spot
call addHL ; | call addHL
; Write our char down | ; Write our char down
ex af, af' ; | ex af, af'
ld (hl), a ; | ld (hl), a
; follow up with a null char | ; follow up with a null char
inc hl ; | inc hl
xor a ; | xor a
ld (hl), a ; | ld (hl), a
pop hl ;<| pop hl ; <-- lvl 1
; inc idx, which still is in AF' ; inc idx, which still is in AF'
ex af, af' ex af, af'
inc a inc a

1
tools/tests/unit/runtests.sh
View File

@ -1,7 +1,6 @@
#!/bin/sh #!/bin/sh
set -e set -e
set -o pipefail
BASE=../../.. BASE=../../..
TOOLS=../.. TOOLS=../..

2
tools/tests/unit/test_expr.asm
View File

@ -3,8 +3,10 @@ jp test
#include "core.asm" #include "core.asm"
#include "parse.asm" #include "parse.asm"
#include "lib/util.asm"
#include "zasm/util.asm" #include "zasm/util.asm"
#include "zasm/const.asm" #include "zasm/const.asm"
#include "lib/parse.asm"
#include "zasm/parse.asm" #include "zasm/parse.asm"
.equ SYM_RAMSTART RAMSTART .equ SYM_RAMSTART RAMSTART
#include "zasm/symbol.asm" #include "zasm/symbol.asm"

2
tools/tests/unit/test_parse_z.asm
View File

@ -2,7 +2,9 @@ jp test
#include "core.asm" #include "core.asm"
#include "parse.asm" #include "parse.asm"
#include "lib/util.asm"
#include "zasm/util.asm" #include "zasm/util.asm"
#include "lib/parse.asm"
#include "zasm/parse.asm" #include "zasm/parse.asm"
; mocks. aren't used in tests ; mocks. aren't used in tests

1
tools/tests/unit/test_symbol.asm
View File

@ -2,6 +2,7 @@
jp test jp test
#include "core.asm" #include "core.asm"
#include "lib/util.asm"
#include "zasm/util.asm" #include "zasm/util.asm"
#include "zasm/const.asm" #include "zasm/const.asm"
.equ SYM_RAMSTART RAMSTART .equ SYM_RAMSTART RAMSTART

2
tools/tests/zasm/errtests.sh
View File

@ -1,4 +1,4 @@
#!/bin/sh #!/usr/bin/env bash
# no "set -e" because we test errors # no "set -e" because we test errors

2
tools/tests/zasm/geninstrs.py
View File

@ -1,4 +1,4 @@
#!/usr/bin/python #!/usr/bin/env python3
# Generate almost all possible combination for instructions from instruction # Generate almost all possible combination for instructions from instruction
# tables # tables

2
tools/tests/zasm/test7.asm
View File

@ -30,11 +30,13 @@
#include "err.h" #include "err.h"
#include "zasm/const.asm" #include "zasm/const.asm"
#include "lib/util.asm"
#include "zasm/util.asm" #include "zasm/util.asm"
.equ IO_RAMSTART USER_RAMSTART .equ IO_RAMSTART USER_RAMSTART
#include "zasm/io.asm" #include "zasm/io.asm"
.equ SYM_RAMSTART IO_RAMEND .equ SYM_RAMSTART IO_RAMEND
#include "zasm/symbol.asm" #include "zasm/symbol.asm"
#include "lib/parse.asm"
#include "zasm/parse.asm" #include "zasm/parse.asm"
.equ TOK_RAMSTART SYM_RAMEND .equ TOK_RAMSTART SYM_RAMEND
#include "zasm/tok.asm" #include "zasm/tok.asm"