Overview
| Comment: | Merged f8e4 from branch v1.55 into v1.60 |
|---|---|
| Downloads: | Tarball | ZIP archive | SQL archive |
| Timelines: | family | ancestors | descendants | both | v1.60 |
| Files: | files | file ages | folders |
| SHA1: |
bc0f8a61c784ad5efc970b6d1eb382e1 |
| User & Date: | matt on 2014-03-30 01:10:28 |
| Other Links: | branch diff | manifest | tags |
Context
|
2014-05-22
| ||
| 13:46 | Sucessful merge from 2b3c(v1.55) into v1.60 check-in: 23bb603800 user: mrwellan tags: v1.60 | |
|
2014-04-02
| ||
| 07:15 | Merge, needs more clean up Closed-Leaf check-in: 0b420c6656 user: matt tags: v1.60-v1.55-partial-merge | |
|
2014-03-30
| ||
| 01:10 | Merged f8e4 from branch v1.55 into v1.60 check-in: bc0f8a61c7 user: matt tags: v1.60 | |
|
2014-03-29
| ||
| 19:11 | Increased retries in client:start to 100, minor edits? check-in: 18d165c8c7 user: matt tags: v1.60 | |
|
2014-03-25
| ||
| 10:05 | Speculative fix for the toplevel problem check-in: f8e4667eee user: matt tags: v1.55 | |
Changes
Modified Makefile from [ed1f2297ca] to [e9add66050].
| ︙ | ︙ | |||
25 26 27 28 29 30 31 | CKPATH=$(shell dirname $(shell dirname $(CSIPATH))) # ARCHSTR=$(shell uname -m)_$(shell uname -r) # BASH_MACHTYPE=$(shell bash -c "echo \$$MACHTYPE") # ARCHSTR=$(BASH_MACHTYPE)_$(shell lsb_release -sr) ARCHSTR=$(shell lsb_release -sr) # ARCHSTR=$(shell bash -c "echo \$$MACHTYPE") | | | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 | CKPATH=$(shell dirname $(shell dirname $(CSIPATH))) # ARCHSTR=$(shell uname -m)_$(shell uname -r) # BASH_MACHTYPE=$(shell bash -c "echo \$$MACHTYPE") # ARCHSTR=$(BASH_MACHTYPE)_$(shell lsb_release -sr) ARCHSTR=$(shell lsb_release -sr) # ARCHSTR=$(shell bash -c "echo \$$MACHTYPE") all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard txtdb refdb : txtdb/txtdb.scm csc -I txtdb txtdb/txtdb.scm -o refdb mtest: $(OFILES) megatest.o csc $(CSCOPTS) $(OFILES) megatest.o -o mtest |
| ︙ | ︙ |
Modified runs.scm from [88c42814b9] to [e243ff4cf9].
| ︙ | ︙ | |||
395 396 397 398 399 400 401 |
"\n items: " items
"\n can-run-more: " can-run-more)
(cond
;; all prereqs met, fire off the test
;; or, if it is a 'toplevel test and all prereqs not met are COMPLETED then launch
| > | | | 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 |
"\n items: " items
"\n can-run-more: " can-run-more)
(cond
;; all prereqs met, fire off the test
;; or, if it is a 'toplevel test and all prereqs not met are COMPLETED then launch
((and (not (member 'toplevel testmode))
(member (hash-table-ref/default test-registry (runs:make-full-test-name hed item-path) 'n/a)
'(DONOTRUN removed CANNOTRUN))) ;; *common:cant-run-states-sym*) ;; '(COMPLETED KILLED WAIVED UNKNOWN INCOMPLETE)) ;; try to catch repeat processing of COMPLETED tests here
(debug:print-info 1 "Test " hed " set to \"" (hash-table-ref test-registry (runs:make-full-test-name hed item-path)) "\". Removing it from the queue")
(if (or (not (null? tal))
(not (null? reg)))
(list (runs:queue-next-hed tal reg reglen regfull)
(runs:queue-next-tal tal reg reglen regfull)
(runs:queue-next-reg tal reg reglen regfull)
reruns)
|
| ︙ | ︙ |