Merge pull request boriel-basic#583 from boriel/test/fix_testing

test: fix testing glob path!
boriel · Nov 7, 2021 · fe50d5b · fe50d5b
2 parents 1a59f1a + 20d8aa9
commit fe50d5b
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 7 deletions.
diff --git a/tests/functional/test_basic.py b/tests/functional/test_basic.py
@@ -10,7 +10,9 @@
 TEST_PATH = os.path.dirname(os.path.realpath(__file__))
 
 
-@pytest.mark.parametrize("fname", [os.path.join(TEST_PATH, f) for f in glob.glob("**/*.bas", recursive=True)])
+@pytest.mark.parametrize(
+    "fname", [os.path.join(TEST_PATH, f) for f in glob.glob(os.path.join(TEST_PATH, "**", "*.bas"), recursive=True)]
+)
 @pytest.mark.timeout(15)
 def test_basic(fname):
     test.main(["-d", fname])

diff --git a/tests/functional/zx48k/spfill.asm b/tests/functional/zx48k/spfill.asm
@@ -61,7 +61,7 @@
 	ei
 	ret
 _SPFill:
-#line 12 "/zxbasic/src/arch/zx48k/library/SP/Fill.bas"
+#line 11 "/zxbasic/src/arch/zx48k/library/SP/Fill.bas"
 		push namespace core
 		PROC
 		LOCAL SPPFill
@@ -1404,7 +1404,7 @@ USR_STR:
 	    jr z, USR_ERROR ; a$ = "" => Invalid Arg
 	    inc hl
 	    ld a, (hl) ; Only the 1st char is needed
-	    and 11011111b ; Convert it to UPPER CASE
+	    and %11011111 ; Convert it to UPPER CASE
 	    sub 144   ; CODE(UDG "A")
 	    jr nc, CONT
 	    add a, 144   ; It was a letter

diff --git a/tests/functional/zx48k/usr0.asm b/tests/functional/zx48k/usr0.asm
@@ -1016,7 +1016,7 @@ __PRINT_TABLE:    ; Jump table for 0 .. 22 codes
 	    DW __PRINT_TAB    ; 23 TAB
 	    ENDP
 	    pop namespace
-#line 25 "usr0.bas"
+#line 25 "zx48k/usr0.bas"
 #line 1 "/zxbasic/src/arch/zx48k/library-asm/printu16.asm"
 #line 1 "/zxbasic/src/arch/zx48k/library-asm/printi16.asm"
 #line 1 "/zxbasic/src/arch/zx48k/library-asm/printnum.asm"
@@ -1164,7 +1164,7 @@ __PRINTU_LOOP:
 	    ENDP
 	    pop namespace
 #line 2 "/zxbasic/src/arch/zx48k/library-asm/printu16.asm"
-#line 26 "usr0.bas"
+#line 26 "zx48k/usr0.bas"
 #line 1 "/zxbasic/src/arch/zx48k/library-asm/usr_str.asm"
 	; This function just returns the address of the UDG of the given str.
 	; If the str is EMPTY or not a letter, 0 is returned and ERR_NR set
@@ -1454,7 +1454,7 @@ USR_STR:
 	    jr z, USR_ERROR ; a$ = "" => Invalid Arg
 	    inc hl
 	    ld a, (hl) ; Only the 1st char is needed
-	    and 11011111b ; Convert it to UPPER CASE
+	    and %11011111 ; Convert it to UPPER CASE
 	    sub 144   ; CODE(UDG "A")
 	    jr nc, CONT
 	    add a, 144   ; It was a letter
@@ -1488,5 +1488,5 @@ USR_ERROR:
 	    ret
 	    ENDP
 	    pop namespace
-#line 27 "usr0.bas"
+#line 27 "zx48k/usr0.bas"
 	END