Overview
Comment: | Merged from trunk |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | interleaved-queries |
Files: | files | file ages | folders |
SHA1: |
6e890892da2dad1f52243cd9a76a6d9b |
User & Date: | matt on 2012-11-20 20:54:15 |
Other Links: | branch diff | manifest | tags |
Context
2012-11-20
| ||
22:01 | Merged in interleaved-queries branch check-in: 0d2cb51875 user: matt tags: trunk | |
20:54 | Merged from trunk Closed-Leaf check-in: 6e890892da user: matt tags: interleaved-queries | |
20:25 | Added exception handling to deal with high cpu loads check-in: aaf246854c user: matt tags: interleaved-queries | |
2012-11-12
| ||
22:00 | Cut back test5 to 4 parallel runs check-in: eb80c72f89 user: mrwellan tags: trunk | |
Changes
Modified megatest-version.scm from [f4fe051edd] to [0980567fa8].
1 2 3 4 5 | 1 2 3 4 5 6 7 | - + | ;; Always use two digit decimal ;; 1.01, 1.02...1.10,1.11 ... 1.99,2.00.. (declare (unit megatest-version)) |
Modified megatest.scm from [b74cc84dd9] to [a0e0e04587].
︙ | |||
183 184 185 186 187 188 189 190 191 192 193 194 195 196 | 183 184 185 186 187 188 189 190 191 192 193 194 195 196 197 198 199 | + + + | "-gui" ;; misc "-archive" "-repl" "-lock" "-unlock" "-list-servers" ;; mist queries "-list-disks" "-list-targets" ;; queries "-test-paths" ;; get path(s) to a test, ordered by youngest first "-runall" ;; run all tests "-remove-runs" "-usequeue" "-rebuild-db" |
︙ | |||
257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 | 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 | + + + + + + + + + + + + + + - + | ;; Misc general calls ;;====================================================================== (if (args:get-arg "-env2file") (begin (save-environment-as-files (args:get-arg "-env2file")) (set! *didsomething* #t))) ;; (if (args:get-arg "-list-targets") ;; (print (string-intersperse ;; (sort (map car (hash-table->alist ;; (read-config "runconfigs.config" ;; (make-hash-table) #f))) string<?) "\n"))) ;; ;; ;; (if (args:get-arg "-list-disks") ;; (print (string-intersperse ;; (map cadr (hash-table-ref/default ;; (read-config "megatest.config" #f #t) ;; "disks" "'" ;; ("none" ""))) "\n"))) ;;====================================================================== ;; Start the server - can be done in conjunction with -runall or -runtests (one day...) ;; we start the server if not running else start the client thread ;;====================================================================== (if (args:get-arg "-server") (begin |
︙ |
Modified runs.scm from [172ff57d41] to [33b2be809c].
︙ | |||
863 864 865 866 867 868 869 | 863 864 865 866 867 868 869 870 871 872 873 874 875 876 877 878 | - + + | (begin (debug:print 0 "Failed to setup, exiting") (exit 1))) (if (args:get-arg "-server") (open-run-close server:start db (args:get-arg "-server")) (if (not (or (args:get-arg "-runall") ;; runall and runtests are allowed to be servers (args:get-arg "-runtests"))) |
︙ |
Modified server.scm from [18494713b4] to [7e5fc3aa2f].
︙ | |||
76 77 78 79 80 81 82 | 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 | - + | (define-inline (zmqsock:get-pub dat)(vector-ref dat 0)) (define-inline (zmqsock:get-pull dat)(vector-ref dat 1)) (define-inline (zmqsock:set-pub! dat s)(vector-set! dat s 0)) (define-inline (zmqsock:set-pull! dat s)(vector-set! dat s 0)) (define (server:run hostn) |
︙ | |||
216 217 218 219 220 221 222 | 216 217 218 219 220 221 222 223 224 225 226 227 228 229 230 | - + | ;; (print-call-chain) (if (> trynum 0) (server:find-free-port-and-open iface s (+ p 1) trynum: (- trynum 1)) (debug:print-info 0 "Tried ports up to " p " but all were in use. Please try a different port range by starting the server with parameter \" -port N\" where N is the starting port number to use")) (exit)) ;; To exit or not? That is the question. (let ((zmq-url (conc "tcp://" iface ":" p))) |
︙ | |||
331 332 333 334 335 336 337 | 331 332 333 334 335 336 337 338 339 340 341 342 343 344 345 346 347 348 349 350 351 352 353 354 355 356 357 358 359 360 361 362 363 364 365 366 367 368 369 370 371 372 373 374 375 376 377 378 379 | - + + + + + - + - + - + - + | ;; (debug:print 0 " perhaps jobs killed with -9? Removing server records") ;; (open-run-close tasks:server-deregister tasks:open-db host pullport: pullport) ;; (server:client-setup (- numtries 1)) ;; #f) (server:client-connect iface pullport pubport)) ;; ) (if (> numtries 0) (let ((exe (car (argv)))) |
︙ |
Modified tests/Makefile from [6078b877de] to [2c0e45fcbc].
︙ | |||
47 48 49 50 51 52 53 | 47 48 49 50 51 52 53 54 55 56 57 58 59 60 61 62 | - - + + | # NOTE: Only one instance can be a server test5 : fullprep cd fullrun;sleep 0;$(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 & |
︙ |