Browse Source

Fix broken tests

Also, make tests run in a *BSD environment
pull/10/head
Virgil Dupras 5 years ago
parent
commit
253674ea05
8 changed files with 21 additions and 15 deletions
  1. +12
    -12
      kernel/stdio.asm
  2. +0
    -1
      tools/tests/unit/runtests.sh
  3. +2
    -0
      tools/tests/unit/test_expr.asm
  4. +2
    -0
      tools/tests/unit/test_parse_z.asm
  5. +1
    -0
      tools/tests/unit/test_symbol.asm
  6. +1
    -1
      tools/tests/zasm/errtests.sh
  7. +1
    -1
      tools/tests/zasm/geninstrs.py
  8. +2
    -0
      tools/tests/zasm/test7.asm

+ 12
- 12
kernel/stdio.asm 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


+ 0
- 1
tools/tests/unit/runtests.sh View File

@@ -1,7 +1,6 @@
#!/bin/sh

set -e
set -o pipefail

BASE=../../..
TOOLS=../..


+ 2
- 0
tools/tests/unit/test_expr.asm 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"


+ 2
- 0
tools/tests/unit/test_parse_z.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


+ 1
- 0
tools/tests/unit/test_symbol.asm 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


+ 1
- 1
tools/tests/zasm/errtests.sh View File

@@ -1,4 +1,4 @@
#!/bin/sh
#!/usr/bin/env bash

# no "set -e" because we test errors



+ 1
- 1
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
# tables



+ 2
- 0
tools/tests/zasm/test7.asm 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"


Loading…
Cancel
Save