alx/ueforth
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Run tests on windows with wine.

Browse Source
This commit is contained in:
Brad Nelson
2022-01-29 15:14:45 -08:00
parent af99eef307
commit 7105a088c1
4 changed files with 24 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
ueforth/Makefile
View File

@ -87,11 +87,14 @@ LINK64 = "$(shell $(LSQ) ${MSVS}/*/*/VC/Tools/MSVC/*/bin/Hostx86/x64/link.exe |
RC32 = "$(shell $(LSQ) ${MSKITS}/*/bin/*/x86/rc.exe | head -n 1)" RC32 = "$(shell $(LSQ) ${MSKITS}/*/bin/*/x86/rc.exe | head -n 1)"
RC64 = "$(shell $(LSQ) ${MSKITS}/*/bin/*/x64/rc.exe | head -n 1)" RC64 = "$(shell $(LSQ) ${MSKITS}/*/bin/*/x64/rc.exe | head -n 1)"
UNIT_TESTS = unit_tests_posix
# Selectively enable windows if tools available # Selectively enable windows if tools available
DEPLOYABLE := 1 DEPLOYABLE := 1
ifneq ("", $(CL32)) ifneq ("", $(CL32))
ifneq ("", $(RC32)) ifneq ("", $(RC32))
TARGETS += $(WINDOWS)/uEf32.exe TARGETS += $(WINDOWS)/uEf32.exe
UNIT_TESTS += unit_tests_win32
else else
$(warning "Missing Visual Studio rc.exe skipping 32-bit Windows.") $(warning "Missing Visual Studio rc.exe skipping 32-bit Windows.")
DEPLOYABLE := 0 DEPLOYABLE := 0
@ -103,6 +106,7 @@ endif
ifneq ("", $(CL64)) ifneq ("", $(CL64))
ifneq ("", $(RC64)) ifneq ("", $(RC64))
TARGETS += $(WINDOWS)/uEf64.exe TARGETS += $(WINDOWS)/uEf64.exe
UNIT_TESTS += unit_tests_win64
else else
$(warning "Missing Visual Studio rc.exe skipping 64-bit Windows.") $(warning "Missing Visual Studio rc.exe skipping 64-bit Windows.")
DEPLOYABLE := 0 DEPLOYABLE := 0
@ -129,9 +133,17 @@ clean:
tests: unit_tests see_all_test tests: unit_tests see_all_test
unit_tests: $(POSIX)/ueforth common/all_tests.fs unit_tests: $(UNIT_TESTS)
unit_tests_posix: $(POSIX)/ueforth common/all_tests.fs
$^ $^
unit_tests_win32: $(WINDOWS)/uEf32.exe common/all_tests.fs
wine $^
unit_tests_win64: $(WINDOWS)/uEf64.exe common/all_tests.fs
wine $^
see_all_test: $(POSIX)/ueforth see_all_test: $(POSIX)/ueforth
echo \ echo \
also internals \ also internals \

2
ueforth/common/desktop.fs
View File

@ -1,4 +1,4 @@
\ Copyright 2021 Bradley D. Nelson \ Copyright 2022 Bradley D. Nelson
\ \
\ Licensed under the Apache License, Version 2.0 (the "License"); \ Licensed under the Apache License, Version 2.0 (the "License");
\ you may not use this file except in compliance with the License. \ you may not use this file except in compliance with the License.

4
ueforth/common/float_tests.fs
View File

@ -71,10 +71,10 @@ e: test-fconstant
e: test-fvariable e: test-fvariable
fvariable foo fvariable foo
100e foo sf! 10e foo sf!
foo sf@ fdup f* foo sf! foo sf@ fdup f* foo sf!
foo sf@ f. cr foo sf@ f. cr
out: 10000.000000 out: 100.000000
;e ;e
e: test-fcompare e: test-fcompare

9
ueforth/common/testing.fs
View File

@ -12,7 +12,14 @@
\ See the License for the specific language governing permissions and \ See the License for the specific language governing permissions and
\ limitations under the License. \ limitations under the License.
also ansi also posix also ansi
DEFINED? windows [IF]
also windows
: sysexit ( n -- ) ExitProcess ;
[ELSE]
also posix
[THEN]
( Support for eval tests ) ( Support for eval tests )
1000 constant expect-limit 1000 constant expect-limit