Comment: | Merged development into trunk for release v1.5402 |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk | v1.5402 |
Files: | files | file ages | folders |
SHA1: |
1067e3e7726e5ea70887e5505b702724 |
User & Date: | mrwellan on 2013-03-28 15:37:54 |
Other Links: | manifest | tags |
2013-03-28
| ||
18:49 | Adding the minor waiton improvement check-in: 43971be52c user: mrwellan tags: trunk, v1.5402 | |
15:37 | Merged development into trunk for release v1.5402 check-in: 1067e3e772 user: mrwellan tags: trunk, v1.5402 | |
15:32 | Updated ignores to account for mkdeploy task area check-in: 44ed980989 user: mrwellan tags: development | |
2013-03-21
| ||
14:45 | Bumped version to v1.54 check-in: 601ea0a908 user: mrwellan tags: trunk, v1.54 | |
Modified .fossil-settings/ignore-glob from [f29b162901] to [92ee512e61].
1 2 3 4 5 6 7 8 9 10 11 | 1 2 3 4 5 6 7 8 9 10 11 12 13 | + + | utils/build/* *~ *.o bin/* tests/megatest.db tests/monitor.db megatest dboard tests/fullrun/tmp/* tests/simpleruns tests/simplelinks mkdeploy/runs mkdeploy/links |
Modified Makefile from [be97b6abe5] to [060ce7f733].
12 13 14 15 16 17 18 | 12 13 14 15 16 17 18 19 20 21 22 23 24 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 | - + + + + + + + + + + + + - - + + + - - + + + | GUISRCF = dashboard-tests.scm dashboard-guimonitor.scm OFILES = $(SRCFILES:%.scm=%.o) GOFILES = $(GUISRCF:%.scm=%.o) ADTLSCR=mt_laststep mt_runstep mt_ezstep HELPERS=$(addprefix $(PREFIX)/bin/,$(ADTLSCR)) |
55 56 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 | 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 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 122 123 124 125 126 127 128 129 130 | + + + - + - + - + + + + - + + + + + + + | $(PREFIX)/bin/mtest : mtest @echo Installing to PREFIX=$(PREFIX) $(INSTALL) mtest $(PREFIX)/bin/mtest utils/mk_wrapper $(PREFIX) mtest > $(PREFIX)/bin/megatest chmod a+x $(PREFIX)/bin/megatest $(PREFIX)/bin/newdashboard : newdashboard $(INSTALL) newdashboard $(PREFIX)/bin/newdashboard $(HELPERS) : utils/mt_* $(INSTALL) $< $@ chmod a+x $@ $(DEPLOYHELPERS) : utils/mt_* $(INSTALL) $< $@ chmod a+X $@ $(PREFIX)/bin/nbfake : utils/nbfake $(INSTALL) $< $@ chmod a+x $@ $(PREFIX)/bin/nbfind : utils/nbfind $(INSTALL) $< $@ chmod a+x $@ |
Modified dashboard.scm from [d676ee3f3f] to [7c18e62e8f].
57 58 59 60 61 62 63 64 65 66 67 68 69 70 | 57 58 59 60 61 62 63 64 65 66 67 68 69 70 71 | + | (list "-rows" "-run" "-test" "-debug" "-host" ) (list "-h" "-use-server" "-guimonitor" "-main" "-v" "-q" ) args:arg-hash 0)) |
81 82 83 84 85 86 87 | 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 | + + - + | (define *db* #f) ;; (open-db)) (if (args:get-arg "-host") (begin (set! *runremote* (string-split (args:get-arg "-host" ":"))) (client:launch)) (if (not (args:get-arg "-use-server")) (set! *transport-type* 'fs) ;; force fs access |
Modified db.scm from [a79dc29e57] to [0623ab4501].
258 259 260 261 262 263 264 265 266 267 268 269 270 271 | 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 274 275 276 277 278 279 280 281 | + + + + + + + + + + | (if (not dbexists) (begin (sqlite3:execute db "PRAGMA synchronous = FULL;") (debug:print-info 11 "Initialized test database " dbpath) (db:testdb-initialize db))) ;; (sqlite3:execute db "PRAGMA synchronous = 0;") (debug:print-info 11 "open-test-db END (sucessful)" testpath) ;; now let's test that everything is correct (handle-exceptions exn (begin (debug:print 0 "ERROR: problem accessing test db " testpath ", you probably should clean and re-run this test" ((condition-property-accessor 'exn 'message) exn)) #f) ;; Is there a cheaper single line operation that will check for existance of a table ;; and raise an exception ? (sqlite3:execute db "SELECT id FROM test_data LIMIT 1;")) db) (begin (debug:print-info 11 "open-test-db END (unsucessful)" testpath) #f))) ;; find and open the testdat.db file for an existing test (define (db:open-test-db-by-test-id db test-id) |
Added docs/dashboard-and-other-windows.png version [a35c6fd575].
cannot compute difference between binary files
Added docs/dashboard-small.png version [211ec54d32].
cannot compute difference between binary files
Modified docs/dashboard-test.png from [14d4ee0830] to [456084404a].
cannot compute difference between binary files
Modified docs/manual/megatest_manual.html from [6c30402d62] to [2055d691a1].
743 744 745 746 747 748 749 | 743 744 745 746 747 748 749 750 751 752 753 754 755 756 757 758 759 760 761 762 763 764 765 766 | - + - - - + - - - - - - - + + + + + | <span id="revnumber">version 1.0,</span> <span id="revdate">April 2012</span> </div> <div id="content"> <div class="sect1"> <h2 id="_dedication">Dedication</h2> <div class="sectionbody"> |
1002 1003 1004 1005 1006 1007 1008 | 998 999 1000 1001 1002 1003 1004 1005 1006 1007 1008 1009 | - + | </div> </div> </div> <div id="footnotes"><hr /></div> <div id="footer"> <div id="footer-text"> Version 1.0<br /> |
Modified docs/manual/megatest_manual.txt from [de94f0104e] to [2feb2da4e0].
1 2 3 4 5 6 7 8 9 10 11 | 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 29 30 | - + - - - - + + - - - - + + - - + + | The Megatest Users Manual ========================= Matt Welland <matt@kiatoa.com> v1.0, April 2012 :doctype: book [dedication] Dedication ========== |
Added docs/megatest-training.odp version [d231c12bb1].
cannot compute difference between binary files
Added docs/megatest-training.pdf version [201749c3bb].
cannot compute difference between binary files
Added docs/new-dashboard.png version [a952fb4cfb].
cannot compute difference between binary files
Added example/megatest.config version [f551a39ee6].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 21 22 23 24 | + + + + + + + + + + + + + + + + + + + + + + + + | [fields] PLATFORM TEXT OS TEXT [setup] # Adjust max_concurrent_jobs to limit parallel jobs max_concurrent_jobs 50 # This is your link path, best to set it and then not change it linktree #{getenv PWD}/linktree # Job tools control how your jobs are launched [jobtools] useshell yes launcher nbfind # You can override environment variables for all your tests here [env-override] EXAMPLE_VAR example value # As you run more tests you may need to add additional disks # the names are arbitrary but must be unique [disks] disk0 #{getenv PWD}/runs |
Added example/runconfigs.config version [346ed47154].
1 2 3 4 5 6 | + + + + + + | [default] ALLTESTS see this variable # Your variables here are grouped by targets [SYSTEM/RELEASE] [SYSTEM_val/RELEASE_val] ANOTHERVAR only defined if target is SYSTEM_val/RELEASE_val |
Added example/tests/checkspace/checkspace.logpro version [ee0eb59e56].
1 2 3 | + + + | (expect:error in "LogFileBody" = 0 "Any error" #/err/i) (expect:required in "LogFileBody" = 1 "Sucess signature" #/adequate space/) |
Added example/tests/checkspace/checkspace.sh version [82b23e5995].
1 2 3 4 5 6 7 8 | + + + + + + + + | #!/bin/bash -e freespace=`df -k $DIRECTORY | grep $DIRECTORY | awk '{print $4}'` if [[ $freespace -lt $REQUIRED ]];then echo "ERROR: insufficient space on $DIRECTORY" exit 1 else echo "There is adequate space on $DIRECTORY" fi |
Added example/tests/checkspace/testconfig version [10e3422ed2].
1 2 3 4 5 6 7 8 9 | + + + + + + + + + | # Add steps here. Format is "stepname script" [ezsteps] checkspace checkspace.sh # Iteration for your tests are controlled by the items section [itemstable] DIRECTORY /tmp /opt REQUIRED 1000000 100000 |
Modified launch.scm from [f18b47fd5d] to [4243d5cf59].
471 472 473 474 475 476 477 | 471 472 473 474 475 476 477 478 479 480 481 482 483 484 485 486 487 488 489 490 491 492 493 494 495 496 497 498 499 500 501 502 503 504 505 506 507 508 509 510 511 512 513 514 515 516 517 518 519 520 521 522 523 524 525 526 527 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 544 545 546 547 548 549 550 551 552 553 | + + + + + - + - + + + + + + + + + + + + + - + + + + + + - + - + + + + + - - + + + + + + + + + + - + | ;; Now create the link from the test path to the link tree, however ;; if the test is iterated it is necessary to create the parent path ;; to the iteration. use pathname-directory to trim the path by one ;; level (if (not not-iterated) ;; i.e. iterated (let ((iterated-parent (pathname-directory (conc lnkpath "/" item-path)))) (debug:print-info 2 "Creating iterated parent " iterated-parent) (handle-exceptions exn (begin (debug:print 0 "ERROR: Failed to create directory " iterated-parent ((condition-property-accessor 'exn 'message) exn) ", exiting") (exit 1)) |
Modified megatest-version.scm from [b8f493a8cd] to [af9292025d].
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)) |
Added mkdeploy/megatest.config version [abe5540207].
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 29 30 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | [fields] PLATFORM TEXT OS TEXT OSVER TEXT [setup] # Adjust max_concurrent_jobs to limit parallel jobs max_concurrent_jobs 20 # This is your link path, best to set it and then not change it linktree #{getenv MT_RUN_AREA_HOME}/linktree # Job tools control how your jobs are launched [jobtools] useshell yes launcher nbfind # As you run more tests you may need to add additional disks # the names are arbitrary but must be unique # [disks] disk0 #{getenv MT_RUN_AREA_HOME}/runs # put env-override last so definitions in site.config by default # are added as env-override variables # [env-override] # if the file site.config exists it will be used [include site.config] |
Added mkdeploy/runconfigs.config version [739b3a2709].
1 2 3 4 5 6 7 8 9 | + + + + + + + + + | [default] TARGDIR_tmp /tmp TARGDIR_opt /opt TARGDIR_runs #{getenv MT_RUN_AREA_HOME}/runs BUILDDIR #{getenv MT_RUN_AREA_HOME}/.. # Your variables here are grouped by targets [SYSTEM/RELEASE] [SYSTEM_val/RELEASE_val] ANOTHERVAR only defined if target is SYSTEM_val/RELEASE_val |
Added mkdeploy/tests/checkspace/checkspace.logpro version [ee0eb59e56].
1 2 3 | + + + | (expect:error in "LogFileBody" = 0 "Any error" #/err/i) (expect:required in "LogFileBody" = 1 "Sucess signature" #/adequate space/) |
Added mkdeploy/tests/checkspace/checkspace.sh version [dc233ea2bc].
1 2 3 4 5 6 7 8 | + + + + + + + + | #!/bin/bash -e freespace=`df -k /$DIRECTORY | grep $DIRECTORY | awk '{print $4}'` if [[ $freespace -lt $REQUIRED ]];then echo "ERROR: insufficient space on /$DIRECTORY" exit 1 else echo "There is adequate space on /$DIRECTORY" fi |
Added mkdeploy/tests/checkspace/testconfig version [64ad5ec3fd].
1 2 3 4 5 6 7 8 9 10 11 | + + + + + + + + + + + | # Add steps here. Format is "stepname script" [ezsteps] checkspace checkspace.sh # Iteration for your tests are controlled by the items section # However it is impractical to code the actual directory here # so use names here and dereference to variables in runconfigs [itemstable] DIRECTORY tmp opt runs REQUIRED 100000 100000 1000000 |
Added mkdeploy/tests/eggs/install.logpro version [6d91c96c24].
1 2 3 4 5 | + + + + + | (expect:ignore in "LogFileBody" >= 0 "ignore setup-error-handling" #/setup-error-handling/) (expect:ignore in "LogFileBody" >= 0 "ignore check-errors" (list #/check-errors/ #/type-errors/ #/srfi-4-errors/)) (expect:error in "LogFileBody" = 0 "Any error" #/error/i) (expect:required in "LogFileBody" = 1 "Sucess signature" #/DONE/) |
Added mkdeploy/tests/eggs/install.sh version [f4ea44ce25].
1 2 3 4 | + + + + | #!/bin/bash -e targpath=`megatest -test-paths -target $MT_TARGET :runname $MT_RUNNAME -testpatt executables/megatest` chicken-install -prefix $targpath/megatest -deploy $EGGNAME echo DONE |
Added mkdeploy/tests/eggs/testconfig version [9e809f74ce].
1 2 3 4 5 6 7 8 9 10 11 12 | + + + + + + + + + + + + | # Add steps here. Format is "stepname script" [ezsteps] install install.sh [requirements] waiton executables # Iteration for your tests are controlled by the items section # However it is impractical to code the actual directory here # so use names here and dereference to variables in runconfigs [items] EGGNAME apropos base64 canvas-draw csv-xml directory-utils dot-locking extras fmt format hostinfo http-client intarweb json md5 message-digest posix posix-extras readline regex regex-case s11n spiffy spiffy-request-vars sqlite3 srfi-1 srfi-18 srfi-69 tcp test uri-common zmq check-errors synch matchable sql-null tcp-server rpc blob-utils string-utils variable-item defstruct uri-generic sendfile openssl lookup-table list-utils stack |
Added mkdeploy/tests/executables/addlibs.logpro version [6af16367a1].
1 2 3 | + + + | (expect:error in "LogFileBody" = 0 "Any error" #/err/i) (expect:required in "LogFileBody" = 1 "Sucess signature" #/libchicken.so.6/) |
Added mkdeploy/tests/executables/addlibs.sh version [8e40255426].
1 2 3 4 5 6 7 8 9 10 | + + + + + + + + + + | #!/bin/bash -e CSIPATH=$(echo $(type csi)|awk '{print $3}') CKPATH=$(dirname $(dirname $CSIPATH)) rsync -av $EXECUTABLE/ ../deploytarg/ for i in iup im cd av call sqlite; do cp $(CKPATH)/lib/lib$i* ../deploytarg/ done cp $(CKPATH)/include/*.h ../deploytarg/ |
Added mkdeploy/tests/executables/install.logpro version [6af16367a1].
1 2 3 | + + + | (expect:error in "LogFileBody" = 0 "Any error" #/err/i) (expect:required in "LogFileBody" = 1 "Sucess signature" #/libchicken.so.6/) |
Added mkdeploy/tests/executables/install.sh version [de5fcdb1f7].
1 2 3 4 5 6 7 | + + + + + + + | #!/bin/bash -e unset LD_LIBRARY_PATH rm -rf $EXECUTABLE mkdir $EXECUTABLE csc -deploy $EXECUTABLE ls $EXECUTABLE |
Added mkdeploy/tests/executables/linksrc.logpro version [174fad494f].
1 2 3 | + + + | (expect:error in "LogFileBody" = 0 "Any error" #/err/i) (expect:required in "LogFileBody" = 1 "Sucess signature" #/Makefile/) |
Added mkdeploy/tests/executables/linksrc.sh version [aeb7742b04].
1 2 3 4 5 6 | + + + + + + | #!/bin/bash -e rm -f *.scm *.o Makefile ln -s $BUILDDIR/*.scm . ln -s $BUILDDIR/Makefile . ls Makefile *.scm |
Added mkdeploy/tests/executables/make_mt.logpro version [bd9b47de4a].
1 2 3 | + + + | (expect:error in "LogFileBody" = 0 "Any error" #/err/i) (expect:required in "LogFileBody" = 1 "Sucess signature" #/mtest/) |
Added mkdeploy/tests/executables/testconfig version [d82229732d].
1 2 3 4 5 6 7 8 9 10 11 12 13 | + + + + + + + + + + + + + | # Add steps here. Format is "stepname script" [ezsteps] linksrc linksrc.sh make_mt make install install.sh addlibs addlibs.sh # Iteration for your tests are controlled by the items section # However it is impractical to code the actual directory here # so use names here and dereference to variables in runconfigs [itemstable] EXECUTABLE megatest dashboard |
Added mkdeploy/tests/helpers/install.logpro version [ee0eb59e56].
1 2 3 | + + + | (expect:error in "LogFileBody" = 0 "Any error" #/err/i) (expect:required in "LogFileBody" = 1 "Sucess signature" #/adequate space/) |
Added mkdeploy/tests/helpers/install.sh version [dc233ea2bc].
1 2 3 4 5 6 7 8 | + + + + + + + + | #!/bin/bash -e freespace=`df -k /$DIRECTORY | grep $DIRECTORY | awk '{print $4}'` if [[ $freespace -lt $REQUIRED ]];then echo "ERROR: insufficient space on /$DIRECTORY" exit 1 else echo "There is adequate space on /$DIRECTORY" fi |
Added mkdeploy/tests/helpers/testconfig version [f444692bff].
1 2 3 4 5 6 7 8 9 10 11 | + + + + + + + + + + + | # Add steps here. Format is "stepname script" [ezsteps] install install.sh # Iteration for your tests are controlled by the items section # However it is impractical to code the actual directory here # so use names here and dereference to variables in runconfigs [itemstable] DIRECTORY tmp opt runs REQUIRED 100000 100000 1000000 |
Modified runs.scm from [8801ee7227] to [1603d85928].
815 816 817 818 819 820 821 | 815 816 817 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 834 835 836 837 838 839 | + + + - + + + + - + | (debug:print 0 "WARNING: test dir " real-dir " appears to not exist or is not readable"))) (if real-dir (debug:print 0 "WARNING: directory " real-dir " does not exist") (debug:print 0 "WARNING: no real directory corrosponding to link " run-dir ", nothing done"))) (if (symbolic-link? run-dir) (begin (debug:print-info 1 "Removing symlink " run-dir) (handle-exceptions exn (debug:print 0 "ERROR: Failed to remove symlink " run-dir ((condition-property-accessor 'exn 'message) exn) ", attempting to continue") |
Modified tests/fullrun/megatest.config from [5c1993a08a] to [5787cd5928].
1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17 18 19 20 | 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 29 30 31 | + + + + + + + + + + + | [fields] sysname TEXT fsname TEXT datapath TEXT # refareas can be searched to find previous runs # the path points to where megatest.db exists [refareas] area1 /tmp/oldarea/megatest [include #{getenv MT_RUN_AREA_HOME}/config/mt_include_1.config] [setup] # It is possible (but not recommended) to override the rsync command used # to populate the test directories. For test development the following # example can be useful # testcopycmd cp --remove-destination -rsv TEST_SRC_PATH/. TEST_TARG_PATH/. # or for hard links # testcopycmd cp --remove-destination -rlv TEST_SRC_PATH/ TEST_TARG_PATH/ # FULL or 2, NORMAL or 1, OFF or 0 synchronous OFF # Throttle roughly scales the db access milliseconds to seconds delay throttle 0.2 # Max retries allows megatest to re-check that a tests status has changed # as tests can have transient FAIL status occasionally maxretries 20 |