Megatest

Check-in [b711d2b430]
Login
Overview
Comment:fixed two probable bugs
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | v1.65-cant-verify-at-home
Files: files | file ages | folders
SHA1: b711d2b4301cad9eb2d600792480c8365193e2a1
User & Date: bb on 2017-12-30 03:12:23
Other Links: branch diff | manifest | tags
Context
2017-12-31
00:38
idea Leaf check-in: e4b276aa24 user: bb tags: v1.65-cant-verify-at-home
2017-12-30
03:12
fixed two probable bugs check-in: b711d2b430 user: bb tags: v1.65-cant-verify-at-home
2017-12-29
16:16
run-wait should wait on launched tests which have uname=n/a too check-in: e4718cf7ed user: bjbarcla tags: v1.65
Changes

Modified Makefile from [c37f1ed514] to [e9112109b2].

40
41
42
43
44
45
46
47

48
49
50
51
52
53
54
40
41
42
43
44
45
46

47
48
49
50
51
52
53
54







-
+







MTESTHASH=$(shell fossil info|grep checkout:| awk '{print $$2}')

CSIPATH=$(shell which csi)
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 if [[ -e /usr/bin/sw_vers ]]; then /usr/bin/sw_vers -productVersion; else lsb_release -sr; fi)
# ARCHSTR=$(shell bash -c "echo \$$MACHTYPE")

PNGFILES = $(shell cd docs/manual;ls *png)

#all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut ndboard
all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut

Modified http-transport.scm from [1e8ff99827] to [805ca7974c].

40
41
42
43
44
45
46
47

48
49
50
51
52
53
54
40
41
42
43
44
45
46

47
48
49
50
51
52
53
54







-
+







      #f
      (conc "http://" (car hostport) ":" (cadr hostport))))

(define *server-loop-heart-beat* (current-seconds))

;;======================================================================
;; S E R V E R
;;======================================================================
;; ======================================================================

;; Call this to start the actual server
;;

(define *db:process-queue-mutex* (make-mutex))

(define (http-transport:run hostn)

Modified subrun.scm from [011e42f3f6] to [220b1e2631].

85
86
87
88
89
90
91
92
93
94
95
96
97







98
99
100
101
102
103
104
85
86
87
88
89
90
91






92
93
94
95
96
97
98
99
100
101
102
103
104
105







-
-
-
-
-
-
+
+
+
+
+
+
+








    (configf:write-alist testconfig "testconfig.subrun")))

(define (subrun:set-state-status test-run-dir state status new-state-status)
  (if (and (not (subrun:subrun-removed? test-run-dir)) (subrun:subrun-test-initialized? test-run-dir))
      (let* ((action-switches-str
              (conc "-set-state-status "new-state-status
                                (if state (conc " -state "state ""))
                                (if status (conc " -status "status) "")))
             (log-prefix (subrun:sanitize-path
                          (conc "set-state-status="new-state-status
                                (if state (conc ":state="state ""))
                                (if status (conc "+status="status) ""))))
                    (if state (conc " -state "state) "")
                    (if status (conc " -status "status) "")))
             (log-prefix
              (subrun:sanitize-path
               (conc "set-state-status="new-state-status
                     (if state (conc ":state="state) "")
                     (if status (conc "+status="status) ""))))
             (submt-result 
              (subrun:exec-sub-megatest test-run-dir action-switches-str log-prefix)))
        submt-result)))

(define (subrun:remove-subrun test-run-dir keep-records )
  (if (and (not (subrun:subrun-removed? test-run-dir)) (subrun:subrun-test-initialized? test-run-dir))
      (let* ((action-switches-str
178
179
180
181
182
183
184

185
186


187
188
189
190
191
192
193
179
180
181
182
183
184
185
186


187
188
189
190
191
192
193
194
195







+
-
-
+
+







                         (conc
                          target
                          "-"
                          runname
                          "-" (or testpatt mode-patt tag-expr "NO-TESTPATT"))))
         (logfile       (conc
                         test-run-dir "/"
                         (if log-prefix
                         (or (subrun:sanitize-path log-prefix) "")
                         (if log-prefix "-" "")
                             (conc (subrun:sanitize-path log-prefix) "-")
                             "")
                         compact-stem
                         ".log"))
         ;; swap out testpatt with modified test-patt and add -log
         (switch-alist  (cons
                         (cons "-log" logfile)
                         (map (lambda (item)
                                (if (equal? (car item) "-testpatt")