mason.child: Fix unit test for Windows.
parent
fb8d601c20
commit
a7958c65b2
|
@ -1,27 +1,39 @@
|
||||||
|
USING: io io.pathnames kernel mason.child mason.config
|
||||||
|
namespaces sequences system tools.test ;
|
||||||
IN: mason.child.tests
|
IN: mason.child.tests
|
||||||
USING: mason.child mason.config tools.test namespaces io kernel
|
|
||||||
sequences system ;
|
|
||||||
|
|
||||||
[ { "nmake" "/f" "nmakefile" "x86-32" } ] [
|
[ { "nmake" "/f" "nmakefile" "x86-32" } ] [
|
||||||
H{
|
H{
|
||||||
{ target-os windows }
|
{ target-os windows }
|
||||||
{ target-cpu x86.32 }
|
{ target-cpu x86.32 }
|
||||||
} [ make-cmd ] with-variables
|
} [ mason-child-make-cmd ] with-variables
|
||||||
] unit-test
|
] unit-test
|
||||||
|
|
||||||
[ { "make" "macosx-x86-32" } ] [
|
[ { "make" "macosx-x86-32" } ] [
|
||||||
H{
|
H{
|
||||||
{ target-os macosx }
|
{ target-os macosx }
|
||||||
{ target-cpu x86.32 }
|
{ target-cpu x86.32 }
|
||||||
} [ make-cmd ] with-variables
|
} [ mason-child-make-cmd ] with-variables
|
||||||
] unit-test
|
] unit-test
|
||||||
|
|
||||||
[ { "./factor.com" "-i=boot.windows-x86.32.image" "-no-user-init" } ] [
|
! Must be an absolute path on Windows because launch directory
|
||||||
H{
|
! is relative to parent directory (instead of current directory).
|
||||||
{ target-os windows }
|
|
||||||
{ target-cpu x86.32 }
|
os windows = [
|
||||||
} [ boot-cmd ] with-variables
|
{ t } [
|
||||||
] unit-test
|
H{
|
||||||
|
{ target-os windows }
|
||||||
|
{ target-cpu x86.32 }
|
||||||
|
} [ mason-child-boot-cmd ] with-variables first absolute-path?
|
||||||
|
] unit-test
|
||||||
|
] [
|
||||||
|
[ { "./factor.com" "-i=boot.windows-x86.32.image" "-no-user-init" } ] [
|
||||||
|
H{
|
||||||
|
{ target-os windows }
|
||||||
|
{ target-cpu x86.32 }
|
||||||
|
} [ mason-child-boot-cmd ] with-variables
|
||||||
|
] unit-test
|
||||||
|
] if
|
||||||
|
|
||||||
[ [ "Hi" print ] [ drop 3 ] [ 4 ] recover-else ] must-infer
|
[ [ "Hi" print ] [ drop 3 ] [ 4 ] recover-else ] must-infer
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue