steve
/
factor
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

builder improvements (download-image, simpler do-all)

db4
Eduardo Cavazos 2008-02-07 19:50:26 -06:00
parent 9ad68dcaaa
commit 1c3efa89d2
2 changed files with 6 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
extra/builder/builder.factor
View File

@ -2,7 +2,7 @@
USING: kernel io io.files io.launcher hashtables USING: kernel io io.files io.launcher hashtables
system continuations namespaces sequences splitting math.parser system continuations namespaces sequences splitting math.parser
prettyprint tools.time calendar bake vars http.client prettyprint tools.time calendar bake vars http.client
combinators bootstrap.image ; combinators bootstrap.image bootstrap.image.download ;
IN: builder IN: builder
@ -70,7 +70,6 @@ VAR: stamp
"pull" "pull"
"--no-summary" "--no-summary"
"git://factorcode.org/git/factor.git" "git://factorcode.org/git/factor.git"
! "http://dharmatech.onigirihouse.com/factor.git"
"master" "master"
} }
run-process process-status run-process process-status
@ -85,7 +84,7 @@ VAR: stamp
{ {
"git" "pull" "--no-summary" "git" "pull" "--no-summary"
"http://dharmatech.onigirihouse.com/factor.git" "master" "http://dharmatech.onigirihouse.com/factor.git" "master"
} run-process process-status } run-process drop
"/builds/" stamp> append make-directory "/builds/" stamp> append make-directory
"/builds/" stamp> append cd "/builds/" stamp> append cd
@ -112,14 +111,15 @@ VAR: stamp
"builder: vm compile" throw "builder: vm compile" throw
] if ] if
[ "http://factorcode.org/images/latest/" boot-image-name append download ] [ my-arch download-image ]
[ ]
[ "builder: image download" email-string ] [ "builder: image download" email-string ]
recover cleanup
`{ `{
{ +arguments+ { { +arguments+ {
,[ factor-binary ] ,[ factor-binary ]
,[ "-i=" boot-image-name append ] ,[ "-i=" my-boot-image-name append ]
"-no-user-init" "-no-user-init"
} } } }
{ +stdout+ "../boot-log" } { +stdout+ "../boot-log" }

24
extra/builder/test/test.factor
View File

@ -7,14 +7,6 @@ USING: kernel sequences assocs builder continuations vocabs vocabs.loader
IN: builder.test IN: builder.test
! : do-load ( -- )
! [
! [ load-everything ]
! [ require-all-error-vocabs "../load-everything-log" log-object ]
! recover
! ]
! "../load-everything-time" log-runtime ;
: do-load ( -- ) : do-load ( -- )
[ try-everything ] "../load-everything-time" log-runtime [ try-everything ] "../load-everything-time" log-runtime
dup empty? dup empty?
@ -22,22 +14,6 @@ IN: builder.test
[ "../load-everything-log" log-object ] [ "../load-everything-log" log-object ]
if ; if ;
! : do-tests ( -- )
! "" child-vocabs
! [ vocab-source-loaded? ] subset
! [ vocab-tests-path ] map
! [ dup [ ?resource-path exists? ] when ] subset
! [ dup run-test ] { } map>assoc
! [ second empty? not ] subset
! dup empty?
! [ drop ]
! [
! "../failing-tests" <file-writer>
! [ [ nl failures. ] assoc-each ]
! with-stream
! ]
! if ;
: do-tests ( -- ) : do-tests ( -- )
run-all-tests keys run-all-tests keys
dup empty? dup empty?