Changes In Branch v1.64-end-runs-fix Through [6f43371532] Excluding Merge-Ins
This is equivalent to a diff from 1eb7abcd28 to 6f43371532
|
2017-06-15
| ||
| 23:42 | Removed deletion of DELETED records from -cleanup-db. To delete old records use -rebuild-db check-in: 7cf89d165e user: matt tags: v1.64 | |
|
2017-06-14
| ||
| 00:14 | The NOTHING LEFT TO RUN section is not getting hit. Keeping it for now. Closed-Leaf check-in: a16fc0d2d0 user: matt tags: v1.64-end-runs-fix | |
|
2017-06-13
| ||
| 23:49 | Passes bigrun multi-level dependencies test. toprun and fullrun still appear to timeout. check-in: 6f43371532 user: matt tags: v1.64-end-runs-fix | |
| 04:32 | Slightly better but still fails the bigrun3 multi-level dependent test run check-in: fda4ad8acc user: matt tags: v1.64-end-runs-fix | |
|
2017-06-12
| ||
| 05:00 | Partial fix for neverending runs check-in: 8728fa008e user: matt tags: v1.64-end-runs-fix | |
|
2017-06-09
| ||
| 11:10 | Fixed gendot and merged in changes from v1.64 check-in: 6efedc27d5 user: mrwellan tags: v1.65 | |
| 10:03 | bumped version to v1.6419 check-in: 1eb7abcd28 user: mrwellan tags: v1.64, v1.6419 | |
| 00:20 | Added better message handling for teamcity integration check-in: 6e0ddfb724 user: matt tags: v1.64 | |
Modified runs.scm from [ddf4fcce25] to [c3d225d834].
| ︙ | |||
631 632 633 634 635 636 637 638 639 640 641 642 643 644 | 631 632 633 634 635 636 637 638 639 640 641 642 643 644 645 646 647 648 649 650 | + + + + + + |
;; 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 (db:test-make-full-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 *default-log-port* "Test " hed " set to \"" (hash-table-ref test-registry (db:test-make-full-name hed item-path)) "\". Removing it from the queue")
(mt:test-set-state-status-by-id run-id test-id
"NOT_STARTED" ;; state
(conc (hash-table-ref/default test-registry (db:test-make-full-name hed item-path) "CANNOTRUN"))
"Failed to run due to failed prerequisites")
(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)
(begin
|
| ︙ | |||
957 958 959 960 961 962 963 964 965 966 967 968 969 970 | 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 | + + + + + + + + |
;; (thread-sleep! *global-delta*)
(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)
#f))
;; this might speed things up!?
;; ((null? (filter (lambda (x)
;; (not (member (hash-table-ref/default test-registry x)
;; '(done removed))))
;; (hash-table-keys test-registry)))
;; (debug:print 0 *default-log-port* "NOTHING LEFT TO RUN!")
;; #f)
;; must be we have unmet prerequisites
;;
(else
(debug:print 4 *default-log-port* "FAILS: " fails)
;; If one or more of the prereqs-not-met are FAIL then we can issue
;; a message and drop hed from the items to be processed.
|
| ︙ | |||
1001 1002 1003 1004 1005 1006 1007 | 1015 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 | - + | reruns ;; WAS: (cons hed reruns) ;; but that makes no sense? )) (let ((nth-try (hash-table-ref/default test-registry hed 0))) (cond ((member "RUNNING" (map db:test-get-state prereqs-not-met)) (if (runs:lownoise (conc "possible RUNNING prerequistes " hed) 60) (debug:print 0 *default-log-port* "WARNING: test " hed " has possible RUNNING prerequisites, don't give up on it yet.")) |
| ︙ | |||
1024 1025 1026 1027 1028 1029 1030 | 1038 1039 1040 1041 1042 1043 1044 1045 1046 1047 1048 1049 1050 1051 1052 1053 1054 1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 1078 1079 1080 1081 1082 1083 1084 1085 1086 1087 1088 1089 1090 1091 1092 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 | + - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + - + + - + | ;; (list (car newtal)(cdr newtal) reg reruns) ;; (hash-table-set! test-registry hed 'removed) (list (runs:queue-next-hed newtal reg reglen regfull) (runs:queue-next-tal newtal reg reglen regfull) (runs:queue-next-reg newtal reg reglen regfull) reruns)) ((symbol? nth-try) (case nth-try |
| ︙ | |||
1316 1317 1318 1319 1320 1321 1322 | 1341 1342 1343 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 | - + + | "\n waitons: " waitons "\n num-retries: " num-retries "\n tal: " tal "\n reruns: " reruns "\n regfull: " regfull "\n reglen: " reglen "\n length reg: " (length reg) |
| ︙ | |||
1343 1344 1345 1346 1347 1348 1349 | 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 | + + + + + + + - + + - + | (not (member waiton reruns))) 1 #f)) waitons))))) ;; could do this more elegantly with a marker.... (debug:print 0 *default-log-port* "WARNING: Marking test " tfullname " as not runnable. It is waiting on tests that cannot be run. Giving up now.") (hash-table-set! test-registry tfullname 'removed)) ;; get rid of definitively removed items ((member (hash-table-ref/default test-registry tfullname 'x) '(removed CANNOTRUN)) (debug:print 0 *default-log-port* "INFO: Dropping test " tfullname " from the tests queue due to flag " (hash-table-ref/default test-registry tfullname 'x)) (if (not (null? tal)) (loop (car tal)(cdr tal) reg reruns))) |
| ︙ | |||
1462 1463 1464 1465 1466 1467 1468 1469 1470 1471 1472 1473 1474 1475 1476 1477 1478 1479 1480 | 1496 1497 1498 1499 1500 1501 1502 1503 1504 1505 1506 1507 1508 1509 1510 1511 1512 1513 1514 1515 1516 1517 1518 1519 1520 1521 1522 1523 1524 1525 1526 1527 1528 1529 1530 1531 1532 1533 1534 1535 1536 1537 1538 1539 1540 | + + + + + + + - - + + - + |
(thread-sleep! 5)
;; (wait-loop (rmt:get-count-tests-running-for-run-id run-id) num-running))))
(wait-loop (rmt:get-count-tests-running-for-run-id run-id) num-running))))
;; LET* ((test-record
;; we get here on "drop through". All done!
(debug:print-info 1 *default-log-port* "All tests launched")))
;; pre-reqs that are FAIL of some kind and thus prevent dependent test from
;; proceeding
;;
(define (runs:calc-fails prereqs-not-met)
(filter (lambda (test)
(and (vector? test) ;; not (string? test))
(member (db:test-get-state test) '("INCOMPLETE" "COMPLETED"))
(not (member (db:test-get-status test)
'("PASS" "WARN" "CHECK" "WAIVED" "SKIP")))))
prereqs-not-met))
;; pre-req tests that are marked such that *their* prereqs have failed
;;
(define (runs:calc-prereq-fail prereqs-not-met)
(filter (lambda (test)
(and (vector? test) ;; not (string? test))
(equal? (db:test-get-state test) "NOT_STARTED")
(member (db:test-get-status test)
'("PREQ_DISCARDED"))))
|
| ︙ |
Modified tests/fdktestqa/testqa/Makefile from [f65c4da07e] to [5f66f32595].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 | + - + - + - + | BINDIR = $(PWD)/../../../bin PATH := $(BINDIR):$(PATH) MEGATEST = $(BINDIR)/megatest DASHBOARD = $(BINDIR)/dashboard NEWDASHBOARD = $(BINDIR)/newdashboard RUNNAME = a NUMTESTS = 20 DEBUG = 0 all : $(MEGATEST) -remove-runs -target a/b -runname c -testpatt %/% $(MEGATEST) -run -testpatt % -target a/b -runname c bigbig : for tn in a b c d;do \ ($(MEGATEST) -run -testpatt % -target a/b -runname $tn & ) ; \ done waitonpatt : megatest -remove-runs -runname waitonpatt -target a/b -testpatt % NUMTESTS=15 megatest -run -target a/b -runname waitonpatt -testpatt bigrun3/%8 waitonall : megatest -remove-runs -runname waitonall -target a/b -testpatt % NUMTESTS=20 megatest -run -target a/b -runname waitonall -testpatt alltop bigrun : |