• branch=v1.44 inherited from [f071891318]
• sym-v1.44 inherited from [f071891318]
• sym-v1.4401 cancelled by [8a02fcd8a2] on 2012-06-15 14:16:45

Modified configf.scm from [09b43df907ea32f0] to [35e1d07762c4d4b4].

  217           (configfile (cadr configinfo)))                                             217           (configfile (cadr configinfo)))
  218      (if toppath (change-directory toppath))                                          218      (if toppath (change-directory toppath))
  219      (let ((configdat  (if configfile (read-config configfile #f #t environ-patt:     219      (let ((configdat  (if configfile (read-config configfile #f #t environ-patt:
  220        (if toppath (change-directory curr-dir))                                       220        (if toppath (change-directory curr-dir))
  221        (list configdat toppath configfile fname))))                                   221        (list configdat toppath configfile fname))))
  222                                                                                       222  
  223  (define (config-lookup cfgdat section var)                                           223  (define (config-lookup cfgdat section var)
                                                                                        >   224    (if (hash-table? cfgdat)
  224    (let ((sectdat (hash-table-ref/default cfgdat section '())))                   |   225        (let ((sectdat (hash-table-ref/default cfgdat section '())))
  225      (if (null? sectdat)                                                          |   226          (if (null? sectdat)
  226          #f                                                                       |   227              #f
  227          (let ((match (assoc var sectdat)))                                       |   228              (let ((match (assoc var sectdat)))
  228            (if match ;; (and match (list? match)(> (length match) 1))             |   229                (if match ;; (and match (list? match)(> (length match) 1))
  229                (cadr match)                                                       |   230                    (cadr match)
  230                #f))                                                               |   231                    #f))
  231          )))                                                                      |   232              ))
                                                                                        >   233        #f))
  232                                                                                       234  
  233  (define (configf:section-vars cfgdat section)                                        235  (define (configf:section-vars cfgdat section)
  234    (let ((sectdat (hash-table-ref/default cfgdat section '())))                       236    (let ((sectdat (hash-table-ref/default cfgdat section '())))
  235      (if (null? sectdat)                                                              237      (if (null? sectdat)
  236          '()                                                                          238          '()
  237          (map car sectdat))))                                                         239          (map car sectdat))))
  238                                                                                       240  

Modified runs.scm from [b0555ec7173669e7] to [0fe79ba1b8d13ba0].

  207            (rdb:set-tests-state-status db run-id test-names #f "FAIL" "NOT_STARTE     207            (rdb:set-tests-state-status db run-id test-names #f "FAIL" "NOT_STARTE
  208                                                                                       208  
  209      ;; now add non-directly referenced dependencies (i.e. waiton)                    209      ;; now add non-directly referenced dependencies (i.e. waiton)
  210      (if (not (null? test-names))                                                     210      (if (not (null? test-names))
  211          (let loop ((hed (car test-names))                                            211          (let loop ((hed (car test-names))
  212                     (tal (cdr test-names)))         ;; 'return-procs tells the co     212                     (tal (cdr test-names)))         ;; 'return-procs tells the co
  213            (let* ((config  (tests:get-testconfig hed 'return-procs))                  213            (let* ((config  (tests:get-testconfig hed 'return-procs))
  214                   (waitons (string-split (let ((w (config-lookup config "requirem |   214                   (waitons (if config (string-split (let ((w (config-lookup confi
  215                                            (if w w "")))))                        |   215                                                       (if w w "")))
                                                                                        >   216                                (begin
                                                                                        >   217                                  (debug:print 0 "ERROR: non-existant required tes
                                                                                        >   218                                  (exit 1)))))
  216              ;; check for hed in waitons => this would be circular, remove it and     219              ;; check for hed in waitons => this would be circular, remove it and
  217              ;; error                                                                 220              ;; error
  218              (if (member hed waitons)                                                 221              (if (member hed waitons)
  219                  (begin                                                               222                  (begin
  220                    (debug:print 0 "ERROR: test " hed " has listed itself as a wai     223                    (debug:print 0 "ERROR: test " hed " has listed itself as a wai
  221                    (set! waitons (filter (lambda (x)(not (equal? x hed))) waitons     224                    (set! waitons (filter (lambda (x)(not (equal? x hed))) waitons
  222                                                                                       225  

Modified tests/fullrun/tests/all_toplevel/testconfig from [90ed78d278c43937] to [a36e0b7a9799d5aa].

    1  [ezsteps]                                                                              1  [ezsteps]
    2  calcresults megatest -list-runs $MT_RUNNAME -target $MT_TARGET                         2  calcresults megatest -list-runs $MT_RUNNAME -target $MT_TARGET
    3                                                                                         3  
    4  [requirements]                                                                         4  [requirements]
    5  waiton all_toplevel exit_0 exit_1 ez_exit2_fail ez_fail ez_pass ezlog_fail ezlog |     5  waiton all_toplevel exit_0 exit_1 ez_exit2_fail ez_fail ez_pass ezlog_fail ezlog
    6                                                                                         6  
    7  # This is a "toplevel" test, it does not require waitons to be non-FAIL to run         7  # This is a "toplevel" test, it does not require waitons to be non-FAIL to run
    8  mode toplevel                                                                          8  mode toplevel