1
0
mirror of https://github.com/hsoft/collapseos.git synced 2024-11-23 16:18:05 +11:00

Fix broken tests

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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

View File

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