Overview
Comment: | Added -modepatt as synomym to --modepatt |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | v1.64 |
Files: | files | file ages | folders |
SHA1: |
d4a7194a9b0acc733c621f2acfdb16f8 |
User & Date: | mrwellan on 2018-04-24 14:49:27 |
Other Links: | branch diff | manifest | tags |
Context
2018-04-24
| ||
14:50 | Bumped version to v1.6439 Leaf check-in: 309a1b9c27 user: mrwellan tags: v1.64, v1.6439 | |
14:49 | Added -modepatt as synomym to --modepatt check-in: d4a7194a9b user: mrwellan tags: v1.64 | |
2018-04-18
| ||
23:50 | Added some old stuff for running testqa check-in: 978de66607 user: matt tags: v1.64 | |
Changes
Modified Makefile from [696b77aef0] to [8839377865].
︙ | ︙ | |||
30 31 32 33 34 35 36 | DEPLOYHELPERS=$(addprefix deploytarg/,$(ADTLSCR)) MTESTHASH=$(shell fossil info|grep checkout:| awk '{print $$2}') ifeq ($(MTESTHASH),) $(error MTESTHASH is broken!) endif | < < < | 30 31 32 33 34 35 36 37 38 39 40 41 42 43 | DEPLOYHELPERS=$(addprefix deploytarg/,$(ADTLSCR)) MTESTHASH=$(shell fossil info|grep checkout:| awk '{print $$2}') ifeq ($(MTESTHASH),) $(error MTESTHASH is broken!) endif CSIPATH=$(shell which csi) CKPATH=$(shell dirname $(shell dirname $(CSIPATH))) # ARCHSTR=$(shell uname -m)_$(shell uname -r) # BASH_MACHTYPE=$(shell bash -c "echo \$$MACHTYPE") # ARCHSTR=$(BASH_MACHTYPE)_$(shell lsb_release -sr) ARCHSTR=$(shell lsb_release -sr) # ARCHSTR=$(shell bash -c "echo \$$MACHTYPE") |
︙ | ︙ | |||
58 59 60 61 62 63 64 65 66 67 68 69 70 71 | ndboard : newdashboard.scm $(OFILES) $(GOFILES) csc $(CSCOPTS) $(OFILES) $(GOFILES) newdashboard.scm -o ndboard mtut: $(OFILES) mtut.scm csc $(CSCOPTS) $(OFILES) mtut.scm -o mtut TCMTOBJS = \ api.o \ archive.o \ cgisetup/models/pgdb.o \ client.o \ common.o \ configf.o \ | > > > | 55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 | ndboard : newdashboard.scm $(OFILES) $(GOFILES) csc $(CSCOPTS) $(OFILES) $(GOFILES) newdashboard.scm -o ndboard mtut: $(OFILES) mtut.scm csc $(CSCOPTS) $(OFILES) mtut.scm -o mtut showmtesthash: @echo $(MTESTHASH) TCMTOBJS = \ api.o \ archive.o \ cgisetup/models/pgdb.o \ client.o \ common.o \ configf.o \ |
︙ | ︙ |
cgisetup/cgi-bin/models became a regular file with contents [39c07627cc].
cgisetup/cgi-bin/pages became a regular file with contents [e2b5ed002d].
Modified common.scm from [d7b3aac795] to [9f0e275c98].
︙ | ︙ | |||
958 959 960 961 962 963 964 | (define (common:args-get-status) (or (args:get-arg "-status")(args:get-arg ":status"))) (define (common:args-get-testpatt rconf) (let* (;; (tagexpr (args:get-arg "-tagexpr")) ;; (tags-testpatt (if tagexpr (string-join (runs:get-tests-matching-tags tagexpr) ",") #f)) | | | 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 | (define (common:args-get-status) (or (args:get-arg "-status")(args:get-arg ":status"))) (define (common:args-get-testpatt rconf) (let* (;; (tagexpr (args:get-arg "-tagexpr")) ;; (tags-testpatt (if tagexpr (string-join (runs:get-tests-matching-tags tagexpr) ",") #f)) (testpatt-key (or (args:get-arg "-modepatt") (args:get-arg "--modepatt") "TESTPATT")) (args-testpatt (or (args:get-arg "-testpatt") (args:get-arg "-runtests") "%")) (rtestpatt (if rconf (runconfigs-get rconf testpatt-key) #f))) (cond ((args:get-arg "--modepatt") ;; modepatt is a forced setting, when set it MUST refer to an existing PATT in the runconfig (if rconf (runconfigs-get rconf testpatt-key) #f)) ;; We do NOT fall back to "%" |
︙ | ︙ |
Modified megatest.scm from [4ccc1620b9] to [ab85416143].
︙ | ︙ | |||
121 122 123 124 125 126 127 | 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 runconfigs -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 | | | 121 122 123 124 125 126 127 128 129 130 131 132 133 134 135 | 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 runconfigs -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 -modepatt key : load testpatt from <key> in runconfigs instead of default TESTPATT if -testpatt and -tagexpr are not specified -tagexpr tag1,tag2%,.. : select tests with tags matching expression Test helpers (for use inside tests) -step stepname -test-status : set the state and status of a test (use :state and :status) -setlog logfname : set the path/filename to the final log relative to the test |
︙ | ︙ | |||
264 265 266 267 268 269 270 271 272 273 274 275 276 277 | "-state" ":status" "-status" "-list-runs" "-testdata-csv" "-testpatt" "--modepatt" "-tagexpr" "-itempatt" "-setlog" "-set-toplog" "-runstep" "-logpro" "-m" | > | 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 | "-state" ":status" "-status" "-list-runs" "-testdata-csv" "-testpatt" "--modepatt" "-modepatt" "-tagexpr" "-itempatt" "-setlog" "-set-toplog" "-runstep" "-logpro" "-m" |
︙ | ︙ |