Skip to content

Commit 27832b2

Browse files
authored
Merge pull request #160 from jayrm/fbc-tests
fix or remove invalid tests in fbc test suite
2 parents 55a29fd + a6e5e23 commit 27832b2

File tree

13 files changed

+26
-36
lines changed

13 files changed

+26
-36
lines changed

inc/crt/stdarg.bi

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,6 @@
99
#ifndef __crt_stdarg_bi__
1010
#define __crt_stdarg_bi__
1111

12-
type va_list as any ptr
12+
type va_list as cva_list
1313

1414
#endif

tests/fbcunit/changelog.txt

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,9 @@
1+
Version 0.8
2+
3+
[changed]
4+
- run_tests() returns false (failed) if any one assert fails
5+
6+
17
Version 0.7
28

39
[added]

tests/fbcunit/inc/fbcunit.bi

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
#define __FBCUNIT_BI_INCLUDE__ 1
33

44
'' fbcunit - FreeBASIC Compiler Unit Testing Component
5-
'' Copyright (C) 2017-2018 Jeffery R. Marshall (coder[at]execulink[dot]com)
5+
'' Copyright (C) 2017-2019 Jeffery R. Marshall (coder[at]execulink[dot]com)
66
''
77
'' License: GNU Lesser General Public License
88
'' version 2.1 (or any later version) plus
@@ -13,7 +13,7 @@
1313
---------------------------------------------------------'/
1414

1515
#define FBCU_VER_MAJOR 0
16-
#define FBCU_VER_MINOR 7
16+
#define FBCU_VER_MINOR 8
1717

1818
#inclib "fbcunit"
1919

tests/fbcunit/license.txt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
fbcunit - FreeBASIC Compiler Unit Testing Component
2-
Copyright (C) 2017-2018 Jeffery R. Marshall (coder[at]execulink[dot]com)
2+
Copyright (C) 2017-2019 Jeffery R. Marshall (coder[at]execulink[dot]com)
33

44
This library is free software; you can redistribute it and/or
55
modify it under the terms of the GNU Lesser General Public

tests/fbcunit/readme.txt

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
fbcunit - FreeBASIC Compiler Unit Testing Component
2-
Copyright (C) 2017-2018 Jeffery R. Marshall (coder[at]execulink[dot]com)
2+
Copyright (C) 2017-2019 Jeffery R. Marshall (coder[at]execulink[dot]com)
33

4-
fbcunit version 0.7
4+
fbcunit version 0.8
55
-------------------
66
Unit testing component for fbc compiler. Provides macros
77
and common code for unit testing fbc compiled sources.

tests/fbcunit/src/fbcunit.bas

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
'' fbcunit - FreeBASIC Compiler Unit Testing Component
2-
'' Copyright (C) 2017-2018 Jeffery R. Marshall (coder[at]execulink[dot]com)
2+
'' Copyright (C) 2017-2019 Jeffery R. Marshall (coder[at]execulink[dot]com)
33
''
44
'' License: GNU Lesser General Public License
55
'' version 2.1 (or any later version) plus
@@ -607,6 +607,10 @@ namespace fbcu
607607

608608
fbcu_test_index = .test_index_next
609609

610+
if( .assert_pass_count <> .assert_count ) then
611+
failed = true
612+
end if
613+
610614
end with
611615

612616
wend

tests/functions/va_int_and_ptrs.bas

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
# include "fbcunit.bi"
22

3-
#if defined( __FB_64BIT__ )
4-
#if defined( __FB_WIN32__ )
5-
#define DOTEST
6-
#endif
7-
#elseif (__FB_BACKEND__ = "gas")
3+
#if (__FB_BACKEND__ = "gas")
84
#define DOTEST
95
#endif
106

tests/functions/va_strings.bas

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
# include "fbcunit.bi"
22

3-
#if defined( __FB_64BIT__ )
4-
#if defined( __FB_WIN32__ )
5-
#define DOTEST
6-
#endif
7-
#elseif (__FB_BACKEND__ = "gas")
3+
#if (__FB_BACKEND__ = "gas")
84
#define DOTEST
95
#endif
106

tests/functions/va_tmpstring.bas

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
# include "fbcunit.bi"
22

3-
#if defined( __FB_64BIT__ )
4-
#if defined( __FB_WIN32__ )
5-
#define DOTEST
6-
#endif
7-
#elseif (__FB_BACKEND__ = "gas")
3+
#if (__FB_BACKEND__ = "gas")
84
#define DOTEST
95
#endif
106

tests/functions/var_args.bas

Lines changed: 1 addition & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,6 @@
11
# include "fbcunit.bi"
22

3-
#if defined( __FB_64BIT__ )
4-
#if defined( __FB_WIN32__ )
5-
#define DOTEST
6-
#endif
7-
#elseif (__FB_BACKEND__ = "gas")
3+
#if (__FB_BACKEND__ = "gas")
84
#define DOTEST
95
#endif
106

0 commit comments

Comments
 (0)