From 53810cd17b49a9de41a80977e9c0e03b58be176a Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Tue, 5 Feb 2008 18:28:05 -0600
Subject: [PATCH 1/4] builder: update target
---
extra/builder/builder.factor | 7 ++++++-
1 file changed, 6 insertions(+), 1 deletion(-)
diff --git a/extra/builder/builder.factor b/extra/builder/builder.factor
index 3216105d47..832b89a7dc 100755
--- a/extra/builder/builder.factor
+++ b/extra/builder/builder.factor
@@ -33,7 +33,12 @@ SYMBOL: builder-recipients
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-: target ( -- target ) `{ ,[ os ] %[ cpu "." split ] } "-" join ;
+! : target ( -- target ) `{ ,[ os ] %[ cpu "." split ] } "-" join ;
+
+: target ( -- target )
+ { { [ os "windows" = ] [ "windows-nt-x86-32" ] }
+ { [ t ] [ `{ ,[ os ] %[ cpu "." split ] } "-" join ] } }
+ cond ;
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
From e3e2cc7e0d647b628b245372a7c178ed492f42c4 Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Tue, 5 Feb 2008 23:09:33 -0600
Subject: [PATCH 2/4] Add builder.load-everything
---
extra/builder/builder.factor | 57 ++++++++++++-------
.../load-everything/load-everything.factor | 23 ++++++++
2 files changed, 58 insertions(+), 22 deletions(-)
create mode 100644 extra/builder/load-everything/load-everything.factor
diff --git a/extra/builder/builder.factor b/extra/builder/builder.factor
index 832b89a7dc..375023cb5e 100755
--- a/extra/builder/builder.factor
+++ b/extra/builder/builder.factor
@@ -33,19 +33,19 @@ SYMBOL: builder-recipients
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-! : target ( -- target ) `{ ,[ os ] %[ cpu "." split ] } "-" join ;
+: target ( -- target ) `{ ,[ os ] %[ cpu "." split ] } "-" join ;
-: target ( -- target )
- { { [ os "windows" = ] [ "windows-nt-x86-32" ] }
- { [ t ] [ `{ ,[ os ] %[ cpu "." split ] } "-" join ] } }
- cond ;
+! : target ( -- target )
+! { { [ os "windows" = ] [ "windows-nt-x86-32" ] }
+! { [ t ] [ `{ ,[ os ] %[ cpu "." split ] } "-" join ] } }
+! cond ;
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
: factor-binary ( -- name )
os
{ { "macosx" [ "./Factor.app/Contents/MacOS/factor" ] }
- { "windows" [ "./factor-nt.exe" ] }
+ { "winnt" [ "./factor-nt.exe" ] }
[ drop "./factor" ] }
case ;
@@ -61,7 +61,13 @@ VAR: stamp
"/builds/factor" cd
- { "git" "pull" "--no-summary" "git://factorcode.org/git/factor.git" }
+ {
+ "git"
+ "pull"
+ "--no-summary"
+ "git://factorcode.org/git/factor.git"
+ "master"
+ }
run-process process-status
0 =
[ ]
@@ -74,7 +80,7 @@ VAR: stamp
"/builds/" stamp> append make-directory
"/builds/" stamp> append cd
- { "git" "clone" "/builds/factor" } run-process drop
+ { "git" "clone" "../factor" } run-process drop
"factor" cd
@@ -121,20 +127,27 @@ VAR: stamp
"builder: bootstrap" throw
] if
- `{
- { +arguments+
- { ,[ factor-binary ] "-e=USE: tools.browser load-everything" } }
- { +stdout+ "../load-everything-log" }
- { +stderr+ +stdout+ }
- }
- >hashtable [ run-process process-status ] benchmark nip
- "../load-everything-time" <file-writer> [ . ] with-stream
- 0 =
- [ ]
- [
- "builder: load-everything" "../load-everything-log" email-file
- "builder: load-everything" throw
- ] if ;
+! `{
+! { +arguments+
+! { ,[ factor-binary ] "-e=USE: tools.browser load-everything" } }
+! { +stdout+ "../load-everything-log" }
+! { +stderr+ +stdout+ }
+! }
+! >hashtable [ run-process process-status ] benchmark nip
+! "../load-everything-time" <file-writer> [ . ] with-stream
+! 0 =
+! [ ]
+! [
+! "builder: load-everything" "../load-everything-log" email-file
+! "builder: load-everything" throw
+! ] if ;
+
+ `{ ,[ factor-binary ] "-run=builder.load-everything" } run-process drop
+ "../load-everything-log" exists?
+ [ "builder: load-everything" "../load-everything-log" email-file ]
+ when
+
+ ;
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/extra/builder/load-everything/load-everything.factor b/extra/builder/load-everything/load-everything.factor
new file mode 100644
index 0000000000..12007f214b
--- /dev/null
+++ b/extra/builder/load-everything/load-everything.factor
@@ -0,0 +1,23 @@
+
+USING: kernel continuations io io.files prettyprint vocabs.loader
+ tools.time tools.browser ;
+
+IN: builder.load-everything
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: runtime ( quot -- time ) benchmark nip ;
+
+: log-runtime ( quot file -- )
+ >r runtime r> <file-writer> [ . ] with-stream ;
+
+: log-object ( object file -- ) <file-writer> [ . ] with-stream ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
+: do-load-everything ( -- )
+ [ [ load-everything ] catch ] "../load-everything-time" log-runtime
+ [ require-all-error-vocabs "../load-everything-log" log-object ]
+ when ;
+
+MAIN: do-load-everything
\ No newline at end of file
From 7d2f6b32f5c6db32a6098491ce367dbb3bf90c0f Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Wed, 6 Feb 2008 04:26:13 -0600
Subject: [PATCH 3/4] Add builder.test
---
extra/builder/builder.factor | 46 +++++++++++++---------------------
extra/builder/test/test.factor | 33 ++++++++++++++++++++++++
2 files changed, 51 insertions(+), 28 deletions(-)
create mode 100644 extra/builder/test/test.factor
diff --git a/extra/builder/builder.factor b/extra/builder/builder.factor
index 375023cb5e..2acdbc3294 100755
--- a/extra/builder/builder.factor
+++ b/extra/builder/builder.factor
@@ -8,6 +8,15 @@ IN: builder
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+: runtime ( quot -- time ) benchmark nip ;
+
+: log-runtime ( quot file -- )
+ >r runtime r> <file-writer> [ . ] with-stream ;
+
+: log-object ( object file -- ) <file-writer> [ . ] with-stream ;
+
+! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+
: datestamp ( -- string )
now `{ ,[ dup timestamp-year ]
,[ dup timestamp-month ]
@@ -35,11 +44,6 @@ SYMBOL: builder-recipients
: target ( -- target ) `{ ,[ os ] %[ cpu "." split ] } "-" join ;
-! : target ( -- target )
-! { { [ os "windows" = ] [ "windows-nt-x86-32" ] }
-! { [ t ] [ `{ ,[ os ] %[ cpu "." split ] } "-" join ] } }
-! cond ;
-
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
: factor-binary ( -- name )
@@ -84,10 +88,8 @@ VAR: stamp
"factor" cd
- { "git" "show" } <process-stream>
- [ readln ] with-stream
- " " split second
- "../git-id" <file-writer> [ print ] with-stream
+ { "git" "show" } <process-stream> [ readln ] with-stream " " split second
+ "../git-id" log-object
{ "make" "clean" } run-process drop
@@ -117,9 +119,7 @@ VAR: stamp
{ +stdout+ "../boot-log" }
{ +stderr+ +stdout+ }
}
- >hashtable
- [ run-process process-status ]
- benchmark nip "../boot-time" <file-writer> [ . ] with-stream
+ >hashtable [ run-process ] "../boot-time" log-runtime process-status
0 =
[ ]
[
@@ -127,26 +127,16 @@ VAR: stamp
"builder: bootstrap" throw
] if
-! `{
-! { +arguments+
-! { ,[ factor-binary ] "-e=USE: tools.browser load-everything" } }
-! { +stdout+ "../load-everything-log" }
-! { +stderr+ +stdout+ }
-! }
-! >hashtable [ run-process process-status ] benchmark nip
-! "../load-everything-time" <file-writer> [ . ] with-stream
-! 0 =
-! [ ]
-! [
-! "builder: load-everything" "../load-everything-log" email-file
-! "builder: load-everything" throw
-! ] if ;
-
- `{ ,[ factor-binary ] "-run=builder.load-everything" } run-process drop
+ `{ ,[ factor-binary ] "-run=builder.test" } run-process drop
+
"../load-everything-log" exists?
[ "builder: load-everything" "../load-everything-log" email-file ]
when
+ "../failing-tests" exists?
+ [ "builder: failing tests" "../failing-tests" email-file ]
+ when
+
;
! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
diff --git a/extra/builder/test/test.factor b/extra/builder/test/test.factor
new file mode 100644
index 0000000000..ed75e99527
--- /dev/null
+++ b/extra/builder/test/test.factor
@@ -0,0 +1,33 @@
+
+USING: kernel sequences assocs builder continuations vocabs vocabs.loader
+ io
+ io.files
+ tools.browser
+ tools.test ;
+
+IN: builder.test
+
+: do-load ( -- )
+ [ [ load-everything ] catch ] "../load-everything-time" log-runtime
+ [ require-all-error-vocabs "../load-everything-log" log-object ]
+ when* ;
+
+: 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-all ( -- ) do-load do-tests ;
+
+MAIN: do-all
\ No newline at end of file
From a5c69dae631af981fdc598828c44ecdc12423bbe Mon Sep 17 00:00:00 2001
From: Eduardo Cavazos <dharmatech@finkelstein.stackeffects.info>
Date: Wed, 6 Feb 2008 06:10:55 -0600
Subject: [PATCH 4/4] update builder.test
---
.../load-everything/load-everything.factor | 23 -------------------
extra/builder/test/test.factor | 9 +++++---
2 files changed, 6 insertions(+), 26 deletions(-)
delete mode 100644 extra/builder/load-everything/load-everything.factor
diff --git a/extra/builder/load-everything/load-everything.factor b/extra/builder/load-everything/load-everything.factor
deleted file mode 100644
index 12007f214b..0000000000
--- a/extra/builder/load-everything/load-everything.factor
+++ /dev/null
@@ -1,23 +0,0 @@
-
-USING: kernel continuations io io.files prettyprint vocabs.loader
- tools.time tools.browser ;
-
-IN: builder.load-everything
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-: runtime ( quot -- time ) benchmark nip ;
-
-: log-runtime ( quot file -- )
- >r runtime r> <file-writer> [ . ] with-stream ;
-
-: log-object ( object file -- ) <file-writer> [ . ] with-stream ;
-
-! !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
-
-: do-load-everything ( -- )
- [ [ load-everything ] catch ] "../load-everything-time" log-runtime
- [ require-all-error-vocabs "../load-everything-log" log-object ]
- when ;
-
-MAIN: do-load-everything
\ No newline at end of file
diff --git a/extra/builder/test/test.factor b/extra/builder/test/test.factor
index ed75e99527..fb9c62e2aa 100644
--- a/extra/builder/test/test.factor
+++ b/extra/builder/test/test.factor
@@ -8,9 +8,12 @@ USING: kernel sequences assocs builder continuations vocabs vocabs.loader
IN: builder.test
: do-load ( -- )
- [ [ load-everything ] catch ] "../load-everything-time" log-runtime
- [ require-all-error-vocabs "../load-everything-log" log-object ]
- when* ;
+ [
+ [ load-everything ]
+ [ require-all-error-vocabs "../load-everything-log" log-object ]
+ recover
+ ]
+ "../load-everything-time" log-runtime ;
: do-tests ( -- )
"" child-vocabs