Comment: | Merged in use-cache option and couple minor typo fixes from cache-control branch |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.64 |
Files: | files | file ages | folders |
SHA1: |
b8c9afec8d18256afcf320968ac16c11 |
User & Date: | matt on 2017-03-21 23:29:16 |
Other Links: | branch diff | manifest | tags |
2017-03-22
| ||
11:51 | allowed cmdline pgdb to override config pgdb check-in: 056d11c7d2 user: srehman tags: v1.64 | |
2017-03-21
| ||
23:29 | Merged in use-cache option and couple minor typo fixes from cache-control branch check-in: b8c9afec8d user: matt tags: v1.64 | |
23:22 | add dummy var to allow build of newdashboard check-in: 623f8e2c89 user: matt tags: v1.64 | |
23:12 | fix minor typos Closed-Leaf check-in: 3910c136f6 user: matt tags: cache-control | |
Modified Makefile from [a4b2bae12e] to [a8eded8e26].
1 2 3 4 | 1 2 3 4 5 6 7 8 9 10 11 12 | - + | # make install CSCOPTS='-accumulate-profile -profile-name $(PWD)/profile-ww$(shell date +%V.%u)' # rm <files>.o ; make install CSCOPTS='-profile' ; ... ; chicken-profile | less PREFIX=$(PWD) |
︙ |
Modified common.scm from [eab4c1e605] to [6b83e95585].
︙ | |||
558 559 560 561 562 563 564 | 558 559 560 561 562 563 564 565 566 567 568 569 570 571 572 573 574 575 576 577 578 579 580 581 582 583 584 585 586 587 588 | - + + - - - - - - + + + + + + + | (define (assoc/default key lst . default) (let ((res (assoc key lst))) (if res (cadr res)(if (null? default) #f (car default))))) (define (common:get-testsuite-name) (or (configf:lookup *configdat* "setup" "area-name") ;; megatest is a flexible tool, testsuite is too limiting a description. (configf:lookup *configdat* "setup" "testsuite" ) |
︙ | |||
1055 1056 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 | 1057 1058 1059 1060 1061 1062 1063 1064 1065 1066 1067 1068 1069 1070 1071 1072 1073 1074 1075 1076 1077 | + + + + + + + | ;; (define (common:on-homehost?) (let ((hh (common:get-homehost))) (if hh (cdr hh) #f))) ;; do we honor the caches of the config files? ;; (define (common:use-cache?) (not (or (args:get-arg "-no-cache") (and *configdat* (equal? (configf:lookup *configdat* "setup" "use-cache") "no"))))) ;;====================================================================== ;; M I S C L I S T S ;;====================================================================== ;; items in lista are matched value and position in listb ;; return the remaining items in listb or #f ;; |
︙ |
Modified dashboard.scm from [2ddcbd2dba] to [3869e6c0c0].
︙ | |||
97 98 99 100 101 102 103 | 97 98 99 100 101 102 103 104 105 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 | - - - - + + + + | (exit))) (if (args:get-arg "-h") (begin (print help) (exit))) |
︙ |
Modified launch.scm from [b27c32acbe] to [ca0c9cc6e2].
︙ | |||
779 780 781 782 783 784 785 | 779 780 781 782 783 784 785 786 787 788 789 790 791 792 793 794 | + - + | (mutex-unlock! *launch-setup-mutex*) *toppath*) (let ((res (launch:setup-body force: force areapath: areapath))) (mutex-unlock! *launch-setup-mutex*) res))) (define (launch:setup-body #!key (force #f) (areapath #f)) (let* ((use-cache (common:use-cache?)) |
︙ | |||
802 803 804 805 806 807 808 | 803 804 805 806 807 808 809 810 811 812 813 814 815 816 817 | - + | ;; (print "runname: " runname " target: " target " mtcachef: " mtcachef " rccachef: " rccachef) (set! *toppath* toppath) ;; This is needed when we are running as a test using CMDINFO as a datasource (cond ;; data was read and cached and available in *configstatus*, toppath has already been set ((eq? *configstatus* 'fulldata) *toppath*) ;; if mtcachef exists just read it, however we need to assume toppath is available in $MT_RUN_AREA_HOME |
︙ | |||
915 916 917 918 919 920 921 922 923 924 925 926 927 928 | 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 | + | (directory-exists? *toppath*)) (begin (setenv "MT_RUN_AREA_HOME" *toppath*) (setenv "MT_TESTSUITENAME" (common:get-testsuite-name))) (begin (debug:print-error 0 *default-log-port* "failed to find the top path to your Megatest area.") ;;(exit 1) (set! *toppath* #f) ;; force it to be false so we return #f #f )) ;; if have -append-config then read and append here (let ((cfname (args:get-arg "-append-config"))) (if (and cfname (file-read-access? cfname)) (read-config cfname *configdat* #t))) ;; values are added to the hash, no need to do anything special. |
︙ |
Modified megatest.scm from [95d4de0210] to [3b2b336b0b].
︙ | |||
84 85 86 87 88 89 90 | 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 | - + + - + | -rerun-all : set all tests to NOT_STARTED,n/a and run with -preclean -lock : lock run specified by target and runname -unlock : unlock run specified by target and runname -set-run-status status : sets status for run to status, requires -target and -runname -get-run-status : gets status for run specified by target and runname -run-wait : wait on run specified by target and runname -preclean : remove the existing test directory before running the test |
︙ | |||
207 208 209 210 211 212 213 214 215 216 217 218 219 220 | 208 209 210 211 212 213 214 215 216 217 218 219 220 221 222 | + | # Get test path, use '.' to get a single path or a specific path/file pattern megatest -test-files 'logs/*.log' -target ubuntu/n%/no% -runname w49% -testpatt test_mt% Called as " (string-intersperse (argv) " ") " Version " megatest-version ", built from " megatest-fossil-hash )) ;; -gui : start a gui interface ;; -config fname : override the runconfigs file with fname ;; process args (define remargs (args:get-args (argv) (list "-runtests" ;; run a specific test "-config" ;; override the config file name "-append-config" |
︙ | |||
307 308 309 310 311 312 313 314 315 316 317 318 319 320 | 309 310 311 312 313 314 315 316 317 318 319 320 321 322 323 | + | "-summarize-items" "-gui" "-daemonize" "-preclean" "-rerun-clean" "-rerun-all" "-clean-cache" "-no-cache" "-cache-db" "-use-db-cache" ;; misc "-repl" "-lock" "-unlock" "-list-servers" |
︙ | |||
865 866 867 868 869 870 871 | 868 869 870 871 872 873 874 875 876 877 878 879 880 881 882 883 | - + + | (let* ((rundir (if (and (getenv "MT_LINKTREE")(getenv "MT_TARGET")(getenv "MT_RUNNAME")) (conc (getenv "MT_LINKTREE") "/" (getenv "MT_TARGET") "/" (getenv "MT_RUNNAME")) #f)) (cfgf (if rundir (conc rundir "/.runconfig." megatest-version "-" megatest-fossil-hash) #f))) (if (and cfgf (file-exists? cfgf) |
︙ |
Modified runconfig.scm from [7cd09cf0fb] to [6eed309bc6].
︙ | |||
54 55 56 57 58 59 60 | 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | - + | change-env) (safe-setenv envvar val)) (hash-table-set! finaldat envvar val))) (map car section-dat))))) sections) (if already-seen (begin |
︙ |
Modified tests.scm from [31439bf084] to [bccd138868].
︙ | |||
1142 1143 1144 1145 1146 1147 1148 | 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 | + - + - + + | ;; if .testconfig exists in test directory read and return it ;; else if have cached copy in *testconfigs* return it IFF there is a section "have fulldata" ;; else read the testconfig file ;; if have path to test directory save the config as .testconfig and return it ;; (define (tests:get-testconfig test-name item-path test-registry system-allowed #!key (force-create #f)) (let* ((use-cache (common:use-cache?)) |
︙ |
Modified tests/fdktestqa/testqa/megatest.config from [200e742890] to [d32541500d].
1 2 3 4 5 6 7 8 9 10 11 12 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 | + + + | [setup] testcopycmd cp --remove-destination -rlv TEST_SRC_PATH/. TEST_TARG_PATH/. >> TEST_TARG_PATH/mt_launch.log 2>> TEST_TARG_PATH/mt_launch.log # launchwait no launch-delay 0 [server] runtime 180 # All these are overridden in ../fdk.config # [jobtools] # launcher nbfake # launcher bsub -q priority -o $MT_TEST_RUN_DIR/openlava.log [include ../fdk.config] |
︙ |
Modified tests/fdktestqa/testqa/runsuite.sh from [5c9574fe6e] to [b83309f619].
1 2 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 | - - + + - + - + - - + | #!/bin/bash |
Modified tests/fullrun/megatest.config from [ad7007c3e5] to [55e292f1b8].
︙ | |||
236 237 238 239 240 241 242 243 244 245 246 247 248 249 | 236 237 238 239 240 241 242 243 244 245 246 247 248 249 250 | + | [archive-disks] # Archives will be organised under these paths like this: # <testsuite>/<creationdate> # Within the archive the data is structured like this: # <target>/<runname>/<test>/ disk0 /tmp/#{getenv USER}/adisk1 disk1 /mfs/tmp/archive # Uncomment these to emulate a job queue with a long time (look in bin/sleeprunner for the time) [jobtools] launcher #{scheme (case (string->symbol (conc (getenv "datapath"))) \ ((none) "nbfake") \ ((openlava) "bsub -o $MT_LINKTREE/$MT_TARGET/$MT_RUNNAME.$MT_TESTNAME-$MT_ITEM_PATH.log") \ ((sleeprunner) "sleeprunner") \ |
︙ |
Modified tests/fullrun/runconfigs.config from [9658c57de1] to [cf88798291].
1 2 3 | 1 2 3 4 5 6 7 8 9 10 11 12 | - + + | [default] SOMEVAR This should show up in SOMEVAR3 VARNOVAL |
︙ |
Modified tests/fullrun/tests/test_mt_vars/testconfig from [0083ae639f] to [cd1b423cdc].
︙ | |||
50 51 52 53 54 55 56 | 50 51 52 53 54 55 56 57 58 | - + | (expect:required in "LogFileBody" = 1 "VARNOVAL" #/VARNOVAL/) [test_meta] author matt owner bob description This test runs a single ezstep which is expected to pass, no logpro file. |
Modified utils/installall.sh from [291419ff6a] to [5277c0ad22].
︙ | |||
25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 | 25 26 27 28 29 30 31 32 33 34 35 36 37 38 39 40 41 42 43 44 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 | + + + + + | echo sudo apt-get install libssl-dev uuid-dev echo sudo apt-get install libmotif3 -OR- set KTYPE=26g4 echo echo Set OPTION to std, currently OPTION=$OPTION echo echo Additionally, if you want mysql-client, you will need to make sure echo mysql_config is in your path echo for postgres to install dbi libpq-dev echo echo You are using PREFIX=$PREFIX echo You are using proxy="$proxy" echo echo "Set additional_libpath to help find gtk or other libraries, don't forget a leading :" SYSTEM_TYPE=$(lsb_release -irs |tr ' ' '_' |tr '\n' '-')$(uname -i)-$OPTION CHICKEN_VERSION=4.11.0 CHICKEN_BASEVER=4.11.0 # Set up variables # case $SYSTEM_TYPE in Ubuntu-16.04-x86_64-std) KTYPE=32 CDVER=5.10 IUPVER=3.17 IMVER=3.11 CHICKEN_VERSION=4.12.0 CHICKEN_BASEVER=4.12.0 ;; Ubuntu-16.04-i686-std) KTYPE=32 CDVER=5.10 IUPVER=3.17 IMVER=3.11 ;; |
︙ | |||
108 109 110 111 112 113 114 | 113 114 115 116 117 118 119 120 121 122 123 124 125 126 | - - | echo Using KTYPE=$KTYPE fi # Put all the downloaded tar files in tgz mkdir -p tgz # http://code.call-cc.org/releases/4.8.0/chicken-4.8.0.5.tar.gz |
︙ |