Megatest

Diff
Login

Differences From Artifact [011e42f3f6]:

To Artifact [5a34831075]:


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
134
135
136
137
138
139
140
141


142
143
144
145
146
147
148
135
136
137
138
139
140
141

142
143
144
145
146
147
148
149
150







-
+
+







  (if (subrun:subrun-test-initialized? test-run-dir)
      (let* ((info-alist (subrun:selector+log-alist
                          test-run-dir
                          "foo"))
             (run-area   (if (list? info-alist)
                             (alist-ref "-start-dir" info-alist equal? #f)
                             #f)))
        run-area)))
        run-area)
      #f))

(define (subrun:selector+log-alist test-run-dir log-prefix)
  (let* ((switch-def-alist (common:get-param-mapping flavor: 'config))
         (subrunfile   (conc test-run-dir "/testconfig.subrun" ))
         (subrundata   (with-input-from-file subrunfile read))
         (subrunconfig (configf:alist->config subrundata))
         (run-area     (configf:lookup subrunconfig "subrun" "run-area"))
178
179
180
181
182
183
184

185
186


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


188
189
190
191
192
193
194
195
196







+
-
-
+
+







                         (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")