Check-in [772558f8b5]
Not logged in
Overview
SHA1 Hash:772558f8b5722d3eae4e2097b9d400da85750d8a
Date: 2011-05-06 10:20:01
User: mrwellan
Comment:Missing fixes redone. runs:test-get-info -> db:test-get-info
Timelines: family | ancestors | descendants | both | trunk
Downloads: Tarball | ZIP archive
Other Links: files | file ages | manifest
Tags And Properties
Changes

Modified megatest.scm from [004777f9a8c72232] to [2fe365679203b75f].

378 (th1 (make-thread monitorjob)) 378 (th1 (make-thread monitorjob)) 379 (th2 (make-thread runit))) 379 (th2 (make-thread runit))) 380 (thread-start! th1) 380 (thread-start! th1) 381 (thread-start! th2) 381 (thread-start! th2) 382 (thread-join! th2) 382 (thread-join! th2) 383 (mutex-lock! m) 383 (mutex-lock! m) 384 (set! db (open-db)) 384 (set! db (open-db)) 385 (let* ((testinfo (runs:get-test-info db run-id test-name (item-lis | 385 (let* ((testinfo (db:get-test-info db run-id test-name (item-list- 386 (if (not (equal? (db:test-get-state testinfo) "COMPLETED")) 386 (if (not (equal? (db:test-get-state testinfo) "COMPLETED")) 387 (begin 387 (begin 388 (print "Test NOT logged as COMPLETED, (state=" (db:test-ge 388 (print "Test NOT logged as COMPLETED, (state=" (db:test-ge 389 (test-set-status! db run-id test-name 389 (test-set-status! db run-id test-name 390 (if kill-job? "KILLED" "COMPLETED") 390 (if kill-job? "KILLED" "COMPLETED") 391 (if (vector-ref exit-info 1) ;; look at 391 (if (vector-ref exit-info 1) ;; look at 392 (if (eq? (vector-ref exit-info 2) 0) 392 (if (eq? (vector-ref exit-info 2) 0)

Modified runs.scm from [db89a09415a82022] to [55dbaeab50492d2b].

97 item))) 97 item))) 98 98 99 (define (teststep-set-status! db run-id test-name teststep-name state-in status- 99 (define (teststep-set-status! db run-id test-name teststep-name state-in status- 100 ;; (print "run-id: " run-id " test-name: " test-name) 100 ;; (print "run-id: " run-id " test-name: " test-name) 101 (let* ((state (check-valid-items "state" state-in)) 101 (let* ((state (check-valid-items "state" state-in)) 102 (status (check-valid-items "status" status-in)) 102 (status (check-valid-items "status" status-in)) 103 (item-path (item-list->path itemdat)) 103 (item-path (item-list->path itemdat)) 104 (testdat (runs:get-test-info db run-id test-name item-path))) | 104 (testdat (db:get-test-info db run-id test-name item-path))) 105 ;; (print "testdat: " testdat) 105 ;; (print "testdat: " testdat) 106 (if (and testdat ;; if the section exists then force specification BUG, I do 106 (if (and testdat ;; if the section exists then force specification BUG, I do 107 (or (not state)(not status))) 107 (or (not state)(not status))) 108 (print "WARNING: Invalid " (if status "status" "state") 108 (print "WARNING: Invalid " (if status "status" "state") 109 " value \"" (if status status-in state-in) "\", update your valid 109 " value \"" (if status status-in state-in) "\", update your valid 110 (if testdat 110 (if testdat 111 (let ((test-id (test:get-id testdat))) 111 (let ((test-id (test:get-id testdat))) ................................................................................................................................................................................ 112 (sqlite3:execute db 112 (sqlite3:execute db 113 "INSERT OR REPLACE into test_steps (test_id,stepname,sta 113 "INSERT OR REPLACE into test_steps (test_id,stepname,sta 114 test-id teststep-name state status (if comment comment " 114 test-id teststep-name state status (if comment comment " 115 (print "ERROR: Can't update " test-name " for run " run-id " -> no such 115 (print "ERROR: Can't update " test-name " for run " run-id " -> no such 116 116 117 (define (test-get-kill-request db run-id test-name itemdat) 117 (define (test-get-kill-request db run-id test-name itemdat) 118 (let* ((item-path (item-list->path itemdat)) 118 (let* ((item-path (item-list->path itemdat)) 119 (testdat (runs:get-test-info db run-id test-name item-path))) | 119 (testdat (db:get-test-info db run-id test-name item-path))) 120 (equal? (test:get-state testdat) "KILLREQ"))) 120 (equal? (test:get-state testdat) "KILLREQ"))) 121 121 122 (define (test-set-meta-info db run-id testname itemdat) 122 (define (test-set-meta-info db run-id testname itemdat) 123 (let ((item-path (item-list->path itemdat)) 123 (let ((item-path (item-list->path itemdat)) 124 (cpuload (get-cpu-load)) 124 (cpuload (get-cpu-load)) 125 (hostname (get-host-name)) 125 (hostname (get-host-name)) 126 (diskfree (get-df (current-directory))) 126 (diskfree (get-df (current-directory)))

Modified tests/Makefile from [192cc0f807202b33] to [fa62ae488144bae4].

1 # run some tests 1 # run some tests 2 2 > 3 MEGATEST=$(shell realpath ../megatest) > 4 3 runall : 5 runall : 4 cd ../;make 6 cd ../;make 5 ../megatest -runall :sysname ubuntu :fsname nfs :datapath none :runname | 7 $(MEGATEST) -runall :sysname ubuntu :fsname nfs :datapath none :runname 6 8 7 test : 9 test : 8 cd ../;make test 10 cd ../;make test 9 make runall 11 make runall 10 12 11 dashboard : 13 dashboard : 12 cd ../;make dashboard 14 cd ../;make dashboard 13 ../dashboard & 15 ../dashboard &

Modified tests/megatest.config from [a84bbe77f9b586c8] to [c2d2bae88c161754].

1 [fields] 1 [fields] 2 sysname TEXT 2 sysname TEXT 3 fsname TEXT 3 fsname TEXT 4 datapath TEXT 4 datapath TEXT 5 5 6 [setup] 6 [setup] 7 executable /home/matt/data/megatest/megatest | 7 # executable /home/matt/data/megatest/megatest 8 max_concurrent_jobs 3 | 8 max_concurrent_jobs 5 9 9 10 [jobtools] 10 [jobtools] 11 # ## launcher launches jobs, the job is managed on the target host 11 # ## launcher launches jobs, the job is managed on the target host 12 ## by megatest, comment out launcher to run local 12 ## by megatest, comment out launcher to run local 13 # workhosts localhost hermes 13 # workhosts localhost hermes 14 launcher nbfake 14 launcher nbfake 15 15

Modified tests/tests/sqlitespeed/runscript.rb from [df18637493bcc06d] to [0c7cdb0a882bb34f].

1 #! /usr/bin/ruby | 1 #! /usr/bin/env ruby 2 2 3 require "#{ENV['MT_RUN_AREA_HOME']}/supportfiles/ruby/librunscript.rb" 3 require "#{ENV['MT_RUN_AREA_HOME']}/supportfiles/ruby/librunscript.rb" 4 4 5 # run_record(stepname, cmd) - will record in db if exit code of script was zero 5 # run_record(stepname, cmd) - will record in db if exit code of script was zero 6 run_and_record('create db',"sqlite3 testing.db << EOF\ncreate table if not exist 6 run_and_record('create db',"sqlite3 testing.db << EOF\ncreate table if not exist 7 7 8 # file_size_checker(stepname, filename, minsize, maxsize) - negative means ignor 8 # file_size_checker(stepname, filename, minsize, maxsize) - negative means ignor