Megatest

Check-in [68d79bff21]
Login
☰Home Timeline Files Branches Tags Tickets Wiki Login
Overview
Comment:fixed problem with logs of subrun execution
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | v1.65
Files: files | file ages | folders
SHA1: 68d79bff21bb8edebbe644e4ce83279bf1c680b8
User & Date: bjbarcla on 2017-12-29 15:03:57
Other Links: branch diff | manifest | tags
Context
2017-12-29
15:05
fixed problem with logs of subrun execution check-in: a354b5c1cb user: bjbarcla tags: v1.65
15:03
fixed problem with logs of subrun execution check-in: 68d79bff21 user: bjbarcla tags: v1.65
2017-12-28
18:00
enabled propagation of rerun, set-state-status to subrun; subrun goes to kill-req always but sometimes not to killed... need to figure it out. check-in: 8de562aa65 user: bjbarcla tags: v1.65
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified subrun.scm from [69ba5c8444] to [4af2fd651e].

︙
83
84
85
86
87
88
89
90

91
92
93
94
95
96



97
98
99
100
101
102
103

83
84
85
86
87
88
89

90






91
92
93
94
95
96
97
98
99
100








-
+
-
-
-
-
-
-
+
+
+








    
    (create-symbolic-link ra symlink-target)

    (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
      (let* ((log-prefix (subrun:sanitize-path
              (conc "-set-state-status "new-state-status
                    (if state (conc " -state "state) "")
                    (if status (conc " -status "status) "")))
             (log-prefix (conc "set-state-status="new-state-status
                    (if state (conc ":state="state) "")
                    (if status (conc "+status="status) "")))
                          (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
︙
120
121
122
123
124
125
126






127
128
129
130
131
132
133

117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136








+
+
+
+
+
+








  (let* ((log-prefix "run")
         (switches (subrun:selector+log-switches test-run-dir log-prefix))
         (run-wait #t)
         (cmd      (conc "megatest -run "switches" "
                         (if run-wait "-run-wait " ""))))
    cmd))


(define (subrun:sanitize-path inpath)
  (let* ((insane-pattern (irregex "[^[a-zA-Z0-9_\\-]")))
    (regex#string-substitute insane-pattern "_" inpath #t)))

(subrun:sanitize-path "a/b/c-d/e*f")

(define (subrun:get-runarea test-run-dir)
  (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)
︙
165
166
167
168
169
170
171
172
173
174
175
176
177






178
179
180

181
182
183
184
185
186
187

168
169
170
171
172
173
174






175
176
177
178
179
180
181
182

183
184
185
186
187
188
189
190








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


-
+








                                                                               ;; otherwise specified

         ;; define compact-stem for logfile
         (target        (alist-ref "-target" switch-alist-pre equal? #f)) ;; want data-structures alist-ref, not alist-lib alist-ref
         (runname       (alist-ref "-runname" switch-alist-pre equal? #f))


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

This page was generated in about 0.103s by Fossil 2.24 [452f8e1ffc] 2024-03-26 15:36:00