Overview
Comment: | Resized test patt box on dashboard, updated help for removal of -itempatt, temporary remove of -rollup, added rollup test, added -test-file and -test-path tests |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
c3f6a89ed179c8b57d3932805743b9f7 |
User & Date: | matt on 2012-10-14 23:27:46 |
Other Links: | manifest | tags |
Context
2012-10-15
| ||
08:54 | Merged in some leftover changes.... check-in: 737532df21 user: mrwellan tags: trunk | |
2012-10-14
| ||
23:27 | Resized test patt box on dashboard, updated help for removal of -itempatt, temporary remove of -rollup, added rollup test, added -test-file and -test-path tests check-in: c3f6a89ed1 user: matt tags: trunk | |
2012-10-13
| ||
16:17 | More changes to test retrieval query, logic on states/statuses not correct check-in: d73fe88a2b user: matt tags: trunk | |
Changes
Modified dashboard.scm from [ad71833a27] to [36c219b534].
︙ | ︙ | |||
427 428 429 430 431 432 433 | ;; controls (along bottom) (set! controls (iup:hbox (iup:vbox (iup:frame #:title "filter test and items" (iup:hbox | | | | | | > | 427 428 429 430 431 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 | ;; controls (along bottom) (set! controls (iup:hbox (iup:vbox (iup:frame #:title "filter test and items" (iup:hbox (iup:textbox #:size "120x15" #:fontsize "10" #:value "%" #:action (lambda (obj unk val) (mark-for-update) (update-search "test-name" val))) ;;(iup:textbox #:size "60x15" #:fontsize "10" #:value "%" ;; #:action (lambda (obj unk val) ;; (mark-for-update) ;; (update-search "item-name" val)) )) (iup:vbox (iup:hbox (iup:button "Sort" #:action (lambda (obj) (set! *tests-sort-reverse* (not *tests-sort-reverse*)) (iup:attribute-set! obj "TITLE" (if *tests-sort-reverse* "+Sort" "-Sort")) (mark-for-update))) (iup:button "HideEmpty" #:action (lambda (obj) |
︙ | ︙ |
Modified db.scm from [26dcf46988] to [2fb3c871e0].
︙ | ︙ | |||
939 940 941 942 943 944 945 | (conc "r." key " like '" val "'")) keynames (string-split target "/")) " AND ")) (testqry (tests:match->sqlqry testpatt)) (qrystr (conc "SELECT t.rundir FROM tests AS t INNER JOIN runs AS r ON t.run_id=r.id WHERE " keystr " AND r.runname LIKE '" runname "' AND " testqry | | | | 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 | (conc "r." key " like '" val "'")) keynames (string-split target "/")) " AND ")) (testqry (tests:match->sqlqry testpatt)) (qrystr (conc "SELECT t.rundir FROM tests AS t INNER JOIN runs AS r ON t.run_id=r.id WHERE " keystr " AND r.runname LIKE '" runname "' AND " testqry " AND t.state LIKE '" statepatt "' AND t.status LIKE '" statuspatt "' ORDER BY t.event_time ASC;"))) (debug:print 3 "qrystr: " qrystr) (sqlite3:for-each-row (lambda (p) (set! res (cons p res))) db qrystr) (if fnamepatt |
︙ | ︙ |
Modified megatest.scm from [d7e905f635] to [bc96cda5c5].
︙ | ︙ | |||
38 39 40 41 42 43 44 | Usage: megatest [options] -h : this help Launching and managing runs -runall : run all tests that are not state COMPLETED and status PASS, CHECK or KILLED -runtests tst1,tst2 ... : run tests | | | | | < | | 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 64 | Usage: megatest [options] -h : this help Launching and managing runs -runall : run all tests that are not state COMPLETED and status PASS, CHECK or KILLED -runtests tst1,tst2 ... : run tests -remove-runs : remove the data for a run, requires :runname and -testpatt Optionally use :state and :status -set-state-status X,Y : set state to X and status to Y, requires controls per -remove-runs -rerun FAIL,WARN... : force re-run for tests with specificed status(s) -rollup : (currently disabled) fill run (set by :runname) with latest test(s) from prior runs with same keys -lock : lock run specified by target and runname -unlock : unlock run specified by target and runname Selectors (e.g. use for -runtests, -remove-runs, -set-state-status, -list-runs etc.) -target key1/key2/... : run for key1, key2, etc. -reqtarg key1/key2/... : run for key1, key2, etc. but key1/key2 must be in runconfig -testpatt patt1/patt2,patt3/... : % is wildcard :runname : required, name for this particular test run :state : Applies to runs, tests or steps depending on context :status : Applies to runs, tests or steps depending on context Test helpers (for use inside tests) -step stepname -test-status : set the state and status of a test (use :state and :status) |
︙ | ︙ | |||
413 414 415 416 417 418 419 | args:arg-hash)))) ;;====================================================================== ;; Rollup into a run ;;====================================================================== (if (args:get-arg "-rollup") | > > > | | | | | | | | | 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 428 429 430 431 432 433 434 435 436 | args:arg-hash)))) ;;====================================================================== ;; Rollup into a run ;;====================================================================== (if (args:get-arg "-rollup") (begin (debug:print 0 "ERROR: Rollup is currently not working. If you need it please submit a ticket at http://www.kiatoa.com/fossils/megatest") (exit 4))) ;; (general-run-call ;; "-rollup" ;; "rollup tests" ;; (lambda (target runname keys keynames keyvallst) ;; (runs:rollup-run keys ;; (keys->alist keys "na") ;; (args:get-arg ":runname") ;; user)))) ;;====================================================================== ;; Lock or unlock a run ;;====================================================================== (if (or (args:get-arg "-lock")(args:get-arg "-unlock")) (general-run-call |
︙ | ︙ |
Modified tests/Makefile from [c8e8dd267c] to [28ce7976aa].
︙ | ︙ | |||
42 43 44 45 46 47 48 | # NOTE: Only one instance can be a server test5 : fullprep cd fullrun;$(MEGATEST) $(SERVER) & cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_aa -debug $(DEBUG) $(LOGGING) > aa.log 2> aa.log & cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_ab -debug $(DEBUG) $(LOGGING) > ab.log 2> ab.log & cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_ac -debug $(DEBUG) $(LOGGING) > ac.log 2> ac.log & cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_ad -debug $(DEBUG) $(LOGGING) > ad.log 2> ad.log & | | | | | > > | 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 63 | # NOTE: Only one instance can be a server test5 : fullprep cd fullrun;$(MEGATEST) $(SERVER) & cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_aa -debug $(DEBUG) $(LOGGING) > aa.log 2> aa.log & cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_ab -debug $(DEBUG) $(LOGGING) > ab.log 2> ab.log & cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_ac -debug $(DEBUG) $(LOGGING) > ac.log 2> ac.log & cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_ad -debug $(DEBUG) $(LOGGING) > ad.log 2> ad.log & cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_ae -debug $(DEBUG) $(LOGGING) > ae.log 2> ae.log & cd fullrun;sleep 10;$(MEGATEST) -runall $(TARGET) :runname $(RUNNAME)_af -debug $(DEBUG) $(LOGGING) > af.log 2> af.log & test6: fullprep cd fullrun;$(MEGATEST) -runtests runfirst -testpatt %/1 -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_itempatt -v cd fullrun;$(MEGATEST) -runtests runfirst -testpatt %blahha% -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_itempatt -debug 10 cd fullrun;$(MEGATEST) -rollup :runname newrun -target ubuntu/nfs/none -debug 10 cleanprep : ../*.scm Makefile */*.config # if [ -e fullrun/megatest.db ]; then sqlite3 fullrun/megatest.db "delete from metadat where var='SERVER';";fi mkdir -p /tmp/mt_runs /tmp/mt_links cd ..;make install rm -f fullrun/logging.db touch cleanprep |
︙ | ︙ |
Added tests/fullrun/tests/test_mt_vars/test-path-file.sh version [bda1e004e9].
> > > > > > > > > > > > > > > > > > > > > > > > > > > > | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 28 | #!/bin/bash # get a previous test export EZFAILPATH=`$MT_MEGATEST -test-files envfile.txt -target $MT_TARGET :runname $MT_RUNNAME -testpatt runfirst/a%` echo Found $EZFAILPATH if [[ -e $EZFAILPATH ]];then echo All good! else echo NOT good! exit 1 fi export EZFAILPATH=`$MT_MEGATEST -test-paths -target $MT_TARGET :runname $MT_RUNNAME -testpatt runfirst/a%` echo Found $EZFAILPATH if [[ -e $EZFAILPATH ]];then echo All good! else echo NOT good! exit 1 fi exit 0 |
Modified tests/fullrun/tests/test_mt_vars/testconfig from [0bc69a6c64] to [ebbf948a4d].
︙ | ︙ | |||
11 12 13 14 15 16 17 18 19 20 21 22 23 24 | # ALT_VAR should NOT be set altvarnotset altvarnotset.sh # EMPTY_VAR should be an empty string empty_var empty_var.sh [requirements] waiton runfirst priority 0 [items] NUMNUM [system cat $MT_RUN_AREA_HOME/tmp/$USER/$sysname/$fsname/$datapath/$MT_RUNNAME/$PREDICTABLE] | > > > | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 26 27 | # ALT_VAR should NOT be set altvarnotset altvarnotset.sh # EMPTY_VAR should be an empty string empty_var empty_var.sh # test-path and test-file test-path test-path-file.sh [requirements] waiton runfirst priority 0 [items] NUMNUM [system cat $MT_RUN_AREA_HOME/tmp/$USER/$sysname/$fsname/$datapath/$MT_RUNNAME/$PREDICTABLE] |
︙ | ︙ |