mirror of
https://github.com/urbit/shrub.git
synced 2024-12-14 11:08:45 +03:00
Execute /mark/ in scaffolds
This commit is contained in:
parent
4791657f49
commit
42e3c9312f
@ -97,6 +97,7 @@
|
||||
test-plan-fsbc
|
||||
test-core-fscb
|
||||
test-core-fspm
|
||||
test-core-fszy-renderer
|
||||
test-bunt
|
||||
test-volt
|
||||
test-vale
|
||||
@ -4991,6 +4992,79 @@
|
||||
(expect-ford-empty ford ~nul)
|
||||
==
|
||||
::
|
||||
++ test-core-fszy-renderer
|
||||
:- `tank`leaf+"test-core-fszy-renderer"
|
||||
::
|
||||
=/ ford *ford-gate
|
||||
::
|
||||
=/ hoon-src-type=type [%atom %$ ~]
|
||||
=/ scry-results=(map [term beam] cage)
|
||||
%- my :~
|
||||
:- [%cx [[~nul %home %da ~1234.5.6] /hoon/program/gen]]
|
||||
:- %hoon
|
||||
:- hoon-src-type
|
||||
'''
|
||||
/= data /: /===/data
|
||||
/foo/
|
||||
data
|
||||
'''
|
||||
::
|
||||
:- [%cx [[~nul %home %da ~1234.5.6] /hoon/foo/ren]]
|
||||
:- %hoon
|
||||
:- hoon-src-type
|
||||
'''
|
||||
/= data /!noun/
|
||||
data
|
||||
'''
|
||||
::
|
||||
:- [%cx [[~nul %home %da ~1234.5.6] /hoon/data]]
|
||||
:- %hoon
|
||||
:- hoon-src-type
|
||||
'''
|
||||
[1 2 3 ~]
|
||||
'''
|
||||
==
|
||||
::
|
||||
=^ results1 ford
|
||||
%- test-ford-call-with-comparator :*
|
||||
ford
|
||||
now=~1234.5.6
|
||||
scry=(scry-with-results scry-results)
|
||||
::
|
||||
::
|
||||
^= call-args
|
||||
:* duct=~[/path] type=~ %make ~nul
|
||||
%pin ~1234.5.6
|
||||
%core [[~nul %home] /hoon/program/gen]
|
||||
==
|
||||
::
|
||||
^= comparator
|
||||
|= moves=(list move:ford-gate)
|
||||
::
|
||||
?> =(1 (lent moves))
|
||||
?> ?=(^ moves)
|
||||
?> ?=([* %give %made @da %complete %success %pin *] i.moves)
|
||||
=/ result result.p.card.i.moves
|
||||
=/ pin-result build-result.result
|
||||
?> ?=([%success %core *] build-result.pin-result)
|
||||
::
|
||||
=/ =vase vase.build-result.pin-result
|
||||
::
|
||||
%+ weld
|
||||
%- expect-eq !>
|
||||
:- [1 2 3 ~]
|
||||
q.vase
|
||||
::
|
||||
%- expect-eq !>
|
||||
:- &
|
||||
(~(nest ut p.vase) | -:!>([1 2 3 ~]))
|
||||
==
|
||||
::
|
||||
;: weld
|
||||
results1
|
||||
(expect-ford-empty ford ~nul)
|
||||
==
|
||||
::
|
||||
++ test-bunt
|
||||
:- `tank`leaf+"test-bunt"
|
||||
::
|
||||
|
@ -3482,7 +3482,7 @@
|
||||
|= [subject=cage =crane]
|
||||
^- compose-cranes
|
||||
::
|
||||
|^ ?+ -.crane !!
|
||||
|^ ?- -.crane
|
||||
%fssg (run-fssg +.crane)
|
||||
%fsbc (run-fsbc +.crane)
|
||||
%fsbr (run-fsbr +.crane)
|
||||
@ -3495,6 +3495,7 @@
|
||||
%fscl (run-fscl +.crane)
|
||||
%fskt (run-fskt +.crane)
|
||||
%fszp (run-fszp +.crane)
|
||||
%fszy (run-fszy +.crane)
|
||||
==
|
||||
:: +run-fssg: runs the `/~` rune
|
||||
::
|
||||
@ -3939,6 +3940,23 @@
|
||||
?> ?=([~ %success %vale *] vale-result)
|
||||
::
|
||||
[[%subject cage.u.vale-result] ..run-crane]
|
||||
:: +run-fszy: runs the `/mark/` "rune"
|
||||
::
|
||||
++ run-fszy
|
||||
|= =mark
|
||||
^- compose-cranes
|
||||
::
|
||||
=/ bake-build=^build
|
||||
:- date.build
|
||||
[%bake mark query-string path-to-render]
|
||||
=^ bake-result accessed-builds (depend-on bake-build)
|
||||
?~ bake-result
|
||||
[[%block [bake-build]~] ..run-crane]
|
||||
?: ?=([~ %error *] bake-result)
|
||||
[[%error [leaf+"/mark/ failed: " message.u.bake-result]] ..run-crane]
|
||||
?> ?=([~ %success %bake *] bake-result)
|
||||
::
|
||||
[[%subject cage.u.bake-result] ..run-crane]
|
||||
--
|
||||
:: +gather-path-builds: produce %path builds to resolve import paths
|
||||
::
|
||||
|
Loading…
Reference in New Issue
Block a user