mason.test: Allow for a .factor-mason-rc which is loaded by maason.test.
							parent
							
								
									c0fbf0455d
								
							
						
					
					
						commit
						721fd36d0f
					
				| 
						 | 
					@ -1,11 +1,11 @@
 | 
				
			||||||
! Copyright (C) 2008, 2010 Eduardo Cavazos, Slava Pestov.
 | 
					! Copyright (C) 2008, 2010 Eduardo Cavazos, Slava Pestov.
 | 
				
			||||||
! See http://factorcode.org/license.txt for BSD license.
 | 
					! See http://factorcode.org/license.txt for BSD license.
 | 
				
			||||||
USING: accessors assocs benchmark bootstrap.stage2
 | 
					USING: accessors assocs benchmark bootstrap.stage2 command-line
 | 
				
			||||||
compiler.errors generic help.html help.lint io io.directories
 | 
					compiler.errors generic help.html help.lint io io.directories
 | 
				
			||||||
io.encodings.utf8 io.files kernel locals mason.common
 | 
					io.encodings.utf8 io.files kernel locals mason.common namespaces
 | 
				
			||||||
namespaces sequences sets sorting source-files.errors system
 | 
					parser.notes sequences sets sorting source-files.errors system
 | 
				
			||||||
tools.errors tools.test tools.time vocabs.errors
 | 
					tools.errors tools.test tools.time vocabs.errors
 | 
				
			||||||
vocabs.hierarchy vocabs.refresh words parser.notes ;
 | 
					vocabs.hierarchy vocabs.refresh words ;
 | 
				
			||||||
IN: mason.test
 | 
					IN: mason.test
 | 
				
			||||||
 | 
					
 | 
				
			||||||
: do-load ( -- )
 | 
					: do-load ( -- )
 | 
				
			||||||
| 
						 | 
					@ -63,9 +63,15 @@ M: method word-vocabulary "method-generic" word-prop word-vocabulary ;
 | 
				
			||||||
: check-boot-image ( -- ? )
 | 
					: check-boot-image ( -- ? )
 | 
				
			||||||
    outdated-core-vocabs [ outdated-boot-image. t ] [ 2drop f ] if ;
 | 
					    outdated-core-vocabs [ outdated-boot-image. t ] [ 2drop f ] if ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					: run-mason-rc ( -- )
 | 
				
			||||||
 | 
					    t "user-init" [
 | 
				
			||||||
 | 
					        ".factor-mason-rc" rc-path try-user-init
 | 
				
			||||||
 | 
					    ] with-variable ;
 | 
				
			||||||
 | 
					
 | 
				
			||||||
: do-all ( -- )
 | 
					: do-all ( -- )
 | 
				
			||||||
    f parser-quiet? set-global
 | 
					    f parser-quiet? set-global
 | 
				
			||||||
    ".." [
 | 
					    ".." [
 | 
				
			||||||
 | 
					        run-mason-rc
 | 
				
			||||||
        bootstrap-time get boot-time-file to-file
 | 
					        bootstrap-time get boot-time-file to-file
 | 
				
			||||||
        check-boot-image [ 1 exit ] when
 | 
					        check-boot-image [ 1 exit ] when
 | 
				
			||||||
        [ do-load ] benchmark load-time-file to-file
 | 
					        [ do-load ] benchmark load-time-file to-file
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue