Comment: | Merged v1.60 dev branch to trunk |
---|---|
Downloads: | Tarball | ZIP archive | SQL archive |
Timelines: | family | ancestors | descendants | both | trunk |
Files: | files | file ages | folders |
SHA1: |
e18bd606530422d918f74fcb84b77fb3 |
User & Date: | matt on 2015-07-12 22:36:55 |
Other Links: | manifest | tags |
2015-07-12
| ||
22:55 | Merging v1.60 into trunk to make manual updates visible on web page check-in: 48c3b1ff69 user: matt tags: trunk | |
22:36 | Merged v1.60 dev branch to trunk check-in: e18bd60653 user: matt tags: trunk | |
22:36 | Added more flexible/powerful job launching control. Allows granular to the test/itempath dispatching of jobs check-in: ad4b12b5f3 user: matt tags: v1.60 | |
2015-07-08
| ||
10:52 | Merged v1.60 into trunk check-in: 5e62539116 user: mrwellan tags: trunk | |
Modified NOTES from [8d1d854887] to [fdf26c3763].
|
Modified common.scm from [ec352267c4] to [62a7dd9755].
︙ | |||
389 390 391 392 393 394 395 | 389 390 391 392 393 394 395 396 397 398 399 400 401 402 403 404 405 406 407 408 409 410 411 412 413 414 415 416 417 418 419 420 421 422 423 424 425 426 427 | - + + + + + + + + + + + + + + + + + + + + + + + | ;; '(print (string-intersperse (map cadr (hash-table-ref/default (read-config "megatest.config" \#f \#t) "disks" '"'"'("none" ""))) "\n"))' (define (common:get-disks #!key (configf #f)) (hash-table-ref/default (or configf (read-config "megatest.config" #f #t)) "disks" '("none" ""))) ;;====================================================================== |
︙ | |||
926 927 928 929 930 931 932 | 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 999 1000 1001 1002 1003 1004 | + + + + + + + + + + + + + + + + + + + + + - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | ;; get registered dashboards ;; (define (mddb:get-dashboards) (let ((db (mddb:open-db))) (query fetch-column (sql db "SELECT ipaddr || ':' || portnum FROM dashboards;")))) ;;====================================================================== ;; T E S T L A U N C H I N G P E R I T E M W I T H H O S T T Y P E S ;;====================================================================== ;; ;; [host-types] ;; general ssh #{getbgesthost general} ;; nbgeneral nbjob run JOBCOMMAND -log $MT_LINKTREE/$MT_TARGET/$MT_RUNNAME.$MT_TESTNAME-$MT_ITEM_PATH.lgo ;; ;; [hosts] ;; general cubian xena ;; ;; [launchers] ;; envsetup general ;; xor/%/n 4C16G ;; % nbgeneral ;; ;; [jobtools] ;; launcher bsub ;; # if defined and not "no" flexi-launcher will bypass launcher unless there is no ;; # match. ;; flexi-launcher yes |
Modified configf.scm from [922dde9f07] to [721facc18d].
︙ | |||
116 117 118 119 120 121 122 | 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 | - + | (with-output-to-port (current-error-port) (lambda () (print "ERROR: " cmd " returned bad exit code " status))) "")))) ;; Lookup a value in runconfigs based on -reqtarg or -target (define (runconfigs-get config var) |
︙ |
Modified docs/manual/Makefile from [ed0d48b31e] to [218f4f2a4c].
︙ | |||
11 12 13 14 15 16 17 | 11 12 13 14 15 16 17 18 19 20 21 22 23 24 25 | - + | # design_spec.html : $(SRCFILES) $(CSVFILES) # asciidoc -b html5 -a icons -a iconsdir=$(DISPATH)/images/icons -a toc2 design_spec.txt # all : server.ps megatest_manual.html client.ps |
︙ |
Modified docs/manual/howto.txt from [ca4fcd3031] to [47a69b4c15].
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 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 60 61 62 63 64 65 66 67 68 69 70 71 72 73 74 75 76 77 78 79 80 81 82 83 84 85 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | How To Do Things ================ Remove Runs ----------- From the dashboard click on the button (PASS/FAIL...) for one of the tests. From the test control panel that comes up push the clean test button. The command field will be prefilled with a template command for removing that test. You can edit the command, for example change the argument to -testpatt to "%" to remove all tests. .Remove the test diskperf and all it's items ---------------- megatest -remove-runs -target ubuntu/nfs/none -runname ww28.1a -testpatt diskperf/% -v ---------------- .Remove all tests for all runs and all targets ---------------- megatest -remove-runs -target %/%/% -runname % -testpatt % -v ---------------- Archive Runs ------------ Megatest supports using the bup backup tool (https://bup.github.io/) to archive your tests for efficient storage and retrieval. Archived data can be rapidly retrieved if needed. The metadata for the run (PASS/FAIL status, run durations, time stamps etc.) are all preserved in the megatest database. For setup information see the Archiving topic in the reference section of this manual. To Archive ~~~~~~~~~~ Hint: use the test control panel to create a template command by pushing the "Archive Tests" button. .Archive a full run ---------------- megatest -target ubuntu/nfs/none -runname ww28.1a -archive save-remove -testpatt % ---------------- To Restore ~~~~~~~~~~ .Retrieve a single test ---------------- megatest -target ubuntu/nfs/none -runname ww28.1a -archive restore -testpatt diskperf/% ---------------- Hint: You can browse the archive using bup commands directly. ---------------- bup -d /path/to/bup/archive ftp ---------------- Submit jobs to Host Types based on Test Name -------------------------------------------- .In megatest.config ------------------------ [host-types] general ssh #{getbgesthost general} nbgeneral nbjob run JOBCOMMAND -log $MT_LINKTREE/$MT_TARGET/$MT_RUNNAME.$MT_TESTNAME-$MT_ITEM_PATH.lgo [hosts] general cubian xena [launchers] envsetup general xor/%/n 4C16G % nbgeneral [jobtools] launcher bsub # if defined and not "no" flexi-launcher will bypass launcher unless there is no # match. flexi-launcher yes ------------------------ Tricks ------ This section is a compendium of a various useful tricks for debugging, configuring and generally getting the most out of Megatest. Limiting your running jobs |
︙ | |||
32 33 34 35 36 37 38 39 40 41 42 43 44 45 | 106 107 108 109 110 111 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 | + + + + + + + + | Debugging Tricks ---------------- Examining The Environment ~~~~~~~~~~~~~~~~~~~~~~~~~ Test Control Panel - xterm ^^^^^^^^^^^^^^^^^^^^^^^^^^ From the dashboard click on a test PASS/FAIL button. This brings up a test control panel. Aproximately near the center left of the window there is a button "Start Xterm". Push this to get an xterm with the full context and environment loaded for that test. You can run scripts or ezsteps by copying from the testconfig (hint, load up the testconfig in a separate gvim or emacs window). This is the easiest way to debug your tests. During Config File Processing ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ It is often helpful to know the content of variables in various contexts as Megatest does the actions needed to run your tests. A handy technique is to force the startup of an xterm in the context being examined. |
︙ |
Modified docs/manual/megatest_manual.html from [7cd757095e] to [c1e091c8e4].
1 2 3 4 | 1 2 3 4 5 6 7 8 9 10 11 12 | - + | <!DOCTYPE html> <html lang="en"> <head> <meta http-equiv="Content-Type" content="text/html; charset=UTF-8"> |
︙ | |||
82 83 84 85 86 87 88 | 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 | - + + + + + + + | ul, ol, li > p { margin-top: 0; } ul > li { color: #aaa; } ul > li > * { color: black; } |
︙ | |||
214 215 216 217 218 219 220 | 220 221 222 223 224 225 226 227 228 229 230 231 232 233 234 | - + | div.exampleblock > div.content { border-left: 3px solid #dddddd; padding-left: 0.5em; } div.imageblock div.content { padding-left: 0; } |
︙ | |||
410 411 412 413 414 415 416 | 416 417 418 419 420 421 422 423 424 425 426 427 428 429 | - - - - - - | /* * xhtml11 specific * * */ |
︙ | |||
449 450 451 452 453 454 455 | 449 450 451 452 453 454 455 456 457 458 459 460 461 462 | - - - - - - | /* * html5 specific * * */ |
︙ | |||
534 535 536 537 538 539 540 541 542 543 544 545 546 547 | 528 529 530 531 532 533 534 535 536 537 538 539 540 541 542 543 | + + | body.manpage div.sectionbody { margin-left: 3em; } @media print { body.manpage div#toc { display: none; } } @media screen { body { max-width: 50em; /* approximately 80 characters wide */ margin-left: 16em; } #toc { |
︙ | |||
874 875 876 877 878 879 880 | 870 871 872 873 874 875 876 877 878 879 880 881 882 883 884 885 886 887 888 | + - - + + - - + + | Megatest. See the script installall.sch in the utils directory of the distribution for a mostly automated way to install everything needed for building Megatest on Linux.</p></div> <div class="paragraph"><p><span class="footnote"><br>[An example footnote.]<br></span></p></div> </div> </div> </div> <div class="sect1"> |
︙ | |||
910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 | 907 908 909 910 911 912 913 914 915 916 917 918 919 920 921 922 923 924 925 926 927 928 929 930 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 949 950 951 952 953 954 955 956 957 958 959 960 961 962 963 964 965 966 967 968 969 970 971 972 973 974 975 976 977 978 979 980 981 982 983 984 985 986 987 988 989 990 991 992 993 994 995 996 997 998 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | description An example test reviewed never</pre> </div></div> <div class="paragraph"><p>This test runs a single step called "stepname1" which runs a script "stepname.sh". Note that although it is common to put the actions needed for a test step into a script it is not necessary.</p></div> </div> </div> </div> <h1 id="_how_to_do_things">How To Do Things</h1> <div class="sect1"> <h2 id="_remove_runs">Remove Runs</h2> <div class="sectionbody"> <div class="paragraph"><p>From the dashboard click on the button (PASS/FAIL…) for one of the tests. From the test control panel that comes up push the clean test button. The command field will be prefilled with a template command for removing that test. You can edit the command, for example change the argument to -testpatt to "%" to remove all tests.</p></div> <div class="listingblock"> <div class="title">Remove the test diskperf and all it’s items</div> <div class="content monospaced"> <pre>megatest -remove-runs -target ubuntu/nfs/none -runname ww28.1a -testpatt diskperf/% -v</pre> </div></div> <div class="listingblock"> <div class="title">Remove all tests for all runs and all targets</div> <div class="content monospaced"> <pre>megatest -remove-runs -target %/%/% -runname % -testpatt % -v</pre> </div></div> </div> </div> <div class="sect1"> <h2 id="_archive_runs">Archive Runs</h2> <div class="sectionbody"> <div class="paragraph"><p>Megatest supports using the bup backup tool (<a href="https://bup.github.io/">https://bup.github.io/</a>) to archive your tests for efficient storage and retrieval. Archived data can be rapidly retrieved if needed. The metadata for the run (PASS/FAIL status, run durations, time stamps etc.) are all preserved in the megatest database.</p></div> <div class="paragraph"><p>For setup information see the Archiving topic in the reference section of this manual.</p></div> <div class="sect2"> <h3 id="_to_archive">To Archive</h3> <div class="paragraph"><p>Hint: use the test control panel to create a template command by pushing the "Archive Tests" button.</p></div> <div class="listingblock"> <div class="title">Archive a full run</div> <div class="content monospaced"> <pre>megatest -target ubuntu/nfs/none -runname ww28.1a -archive save-remove -testpatt %</pre> </div></div> </div> <div class="sect2"> <h3 id="_to_restore">To Restore</h3> <div class="listingblock"> <div class="title">Retrieve a single test</div> <div class="content monospaced"> <pre>megatest -target ubuntu/nfs/none -runname ww28.1a -archive restore -testpatt diskperf/%</pre> </div></div> <div class="paragraph"><p>Hint: You can browse the archive using bup commands directly.</p></div> <div class="listingblock"> <div class="content monospaced"> <pre>bup -d /path/to/bup/archive ftp</pre> </div></div> </div> </div> </div> <div class="sect1"> <h2 id="_submit_jobs_to_host_types_based_on_test_name">Submit jobs to Host Types based on Test Name</h2> <div class="sectionbody"> <div class="listingblock"> <div class="title">In megatest.config</div> <div class="content monospaced"> <pre>[host-types] general ssh #{getbgesthost general} nbgeneral nbjob run JOBCOMMAND -log $MT_LINKTREE/$MT_TARGET/$MT_RUNNAME.$MT_TESTNAME-$MT_ITEM_PATH.lgo [hosts] general cubian xena [launchers] envsetup general xor/%/n 4C16G % nbgeneral [jobtools] launcher bsub # if defined and not "no" flexi-launcher will bypass launcher unless there is no # match. flexi-launcher yes</pre> </div></div> </div> </div> <div class="sect1"> <h2 id="_tricks">Tricks</h2> <div class="sectionbody"> <div class="paragraph"><p>This section is a compendium of a various useful tricks for debugging, configuring and generally getting the most out of Megatest.</p></div> </div> </div> |
︙ | |||
943 944 945 946 947 948 949 950 951 952 953 954 955 956 | 1016 1017 1018 1019 1020 1021 1022 1023 1024 1025 1026 1027 1028 1029 1030 1031 1032 1033 1034 1035 1036 | + + + + + + + | </div> </div> <div class="sect1"> <h2 id="_debugging_tricks">Debugging Tricks</h2> <div class="sectionbody"> <div class="sect2"> <h3 id="_examining_the_environment">Examining The Environment</h3> <div class="sect3"> <h4 id="_test_control_panel_xterm">Test Control Panel - xterm</h4> <div class="paragraph"><p>From the dashboard click on a test PASS/FAIL button. This brings up a test control panel. Aproximately near the center left of the window there is a button "Start Xterm". Push this to get an xterm with the full context and environment loaded for that test. You can run scripts or ezsteps by copying from the testconfig (hint, load up the testconfig in a separate gvim or emacs window). This is the easiest way to debug your tests.</p></div> </div> <div class="sect3"> <h4 id="_during_config_file_processing">During Config File Processing</h4> <div class="paragraph"><p>It is often helpful to know the content of variables in various contexts as Megatest does the actions needed to run your tests. A handy technique is to force the startup of an xterm in the context being examined.</p></div> <div class="paragraph"><p>For example, if an item list is not being generated as expected you can inject the startup of an xterm as if it were an item:</p></div> <div class="listingblock"> |
︙ | |||
1013 1014 1015 1016 1017 1018 1019 | 1093 1094 1095 1096 1097 1098 1099 1100 1101 1102 1103 1104 1105 1106 1107 1108 1109 1110 1111 1112 1113 1114 1115 1116 1117 1118 1119 1120 1121 1122 1123 1124 1125 1126 1127 1128 1129 1130 1131 1132 1133 1134 1135 1136 1137 1138 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 | - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | sudo netstat -tulpn</pre> </div></div> </div> </div> </div> <h1 id="_reference">Reference</h1> <div class="sect1"> |
︙ | |||
1225 1226 1227 1228 1229 1230 1231 | 1344 1345 1346 1347 1348 1349 1350 1351 1352 1353 1354 1355 1356 1357 1358 1359 1360 1361 1362 1363 1364 1365 1366 1367 1368 1369 1370 1371 1372 1373 1374 1375 1376 1377 1378 1379 1380 1381 1382 1383 1384 1385 1386 1387 1388 1389 1390 1391 1392 1393 1394 1395 1396 1397 1398 | - + + + + + + + + + + + + + + + + + + + + + + | <div class="content monospaced"> <pre>[triggers] COMPLETED/ xterm -e bash -s --</pre> </div></div> <div class="admonitionblock"> <table><tr> <td class="icon"> |
︙ | |||
1343 1344 1345 1346 1347 1348 1349 | 1483 1484 1485 1486 1487 1488 1489 1490 1491 1492 1493 1494 1495 1496 1497 | - + | <div class="sectionbody"> <div class="paragraph"><p>One or more optional appendixes go here at section level zero.</p></div> <div class="sect2"> <h3 id="_appendix_sub_section">Appendix Sub-section</h3> <div class="admonitionblock"> <table><tr> <td class="icon"> |
︙ | |||
1415 1416 1417 1418 1419 1420 1421 | 1555 1556 1557 1558 1559 1560 1561 1562 1563 1564 1565 1566 1567 | - + + | </div> </div> </div> <div id="footnotes"><hr></div> <div id="footer"> <div id="footer-text"> Version 1.0<br> |
Modified docs/manual/reference.txt from [bbd73cd577] to [c49419698a].
1 2 3 4 | 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 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 | - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | Reference ========= |
︙ | |||
237 238 239 240 241 242 243 244 245 246 247 248 249 250 | 274 275 276 277 278 279 280 281 282 283 284 285 286 287 288 289 290 291 292 293 294 295 296 297 298 299 300 301 302 303 304 305 306 307 | + + + + + + + + + + + + + + + + + + + + | .For test "runfirst" override the toplevel generation with a script "mysummary.sh" ----------------- # Override the rollup for specific tests [testrollup] runfirst mysummary.sh ----------------- Archiving Setup --------------- In megatest.config add the following sections: .megatest.config -------------- [archive] # where to get bup executable # bup /path/to/bup [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>/ archive0 /mfs/myarchive-data/adisk1 -------------- Programming API --------------- These routines can be called from the megatest repl. .API Server Management Calls |
︙ |
Modified docs/manual/server.png from [ae7d7ee58e] to [524d8b2847].
cannot compute difference between binary files
Modified docs/manual/writing_tests.txt from [83549d4dfd] to [3f710469e5].
1 2 | 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 | + - + + + - + | Writing Tests ------------- |
︙ |
Modified launch.scm from [0b946dd28d] to [704d9ac900].
︙ | |||
556 557 558 559 560 561 562 | 556 557 558 559 560 561 562 563 564 565 566 567 568 569 570 571 | + - + | ))) *toppath*) (define (launch:cache-config) ;; if we have a linktree and -runtests and -target and the directory exists dump the config ;; to megatest-(current-seconds).cfg and symlink it to megatest.cfg (if (and *configdat* (or (args:get-arg "-run") |
︙ | |||
796 797 798 799 800 801 802 | 797 798 799 800 801 802 803 804 805 806 807 808 809 810 | - | )) (let* ((useshell (let ((ush (config-lookup *configdat* "jobtools" "useshell"))) (if ush (if (equal? ush "no") ;; must use "no" to NOT use shell #f ush) #t))) ;; default is yes |
︙ | |||
818 819 820 821 822 823 824 | 818 819 820 821 822 823 824 825 826 827 828 829 830 831 832 833 | - + + | (exe (pathname-strip-directory lm))) (conc (if dir (conc dir "/") "") (case (string->symbol exe) ((dboard) "../megatest") ((mtest) "../megatest") ((dashboard) "megatest") (else exe))))) |
︙ |
Modified megatest.scm from [2a5ebc4b47] to [6d1c1e566e].
︙ | |||
432 433 434 435 436 437 438 439 440 441 442 443 444 445 | 432 433 434 435 436 437 438 439 440 441 442 443 444 445 446 447 | + + | (set! open-run-close open-run-close-no-exception-handling)) (if (args:get-arg "-itempatt") (let ((newval (conc (args:get-arg "-testpatt") "/" (args:get-arg "-itempatt")))) (debug:print 0 "WARNING: -itempatt has been deprecated, please use -testpatt testpatt/itempatt method, new testpatt is "newval) (hash-table-set! args:arg-hash "-testpatt" newval) (hash-table-delete! args:arg-hash "-itempatt"))) (on-exit std-exit-procedure) ;;====================================================================== ;; Misc general calls ;;====================================================================== |
︙ | |||
851 852 853 854 855 856 857 | 853 854 855 856 857 858 859 860 861 862 863 864 865 866 867 868 869 870 | - - - - + + + + | (if (not (car *configinfo*)) (begin (debug:print 0 "ERROR: Attempted " action "on test(s) but run area config file not found") (exit 1)) ;; put test parameters into convenient variables (runs:operate-on action target |
︙ | |||
929 930 931 932 933 934 935 | 931 932 933 934 935 936 937 938 939 940 941 942 943 944 945 946 947 948 | + - - - + + + | ;; NOTE: list-runs and list-db-targets operate on local db!!! ;; (if (or (args:get-arg "-list-runs") (args:get-arg "-list-db-targets")) (if (launch:setup-for-run) (let* ((dbstruct (make-dbr:dbstruct path: *toppath* local: #t)) (runpatt (args:get-arg "-list-runs")) (testpatt (common:args-get-testpatt #f)) |
︙ | |||
1136 1137 1138 1139 1140 1141 1142 | 1139 1140 1141 1142 1143 1144 1145 1146 1147 1148 1149 1150 1151 1152 1153 1154 1155 1156 1157 1158 1159 1160 1161 1162 1163 1164 1165 1166 1167 1168 1169 1170 1171 1172 1173 1174 1175 1176 1177 1178 1179 1180 1181 1182 1183 1184 1185 1186 1187 1188 1189 1190 1191 1192 1193 1194 1195 1196 1197 1198 1199 1200 1201 1202 1203 1204 1205 | - + + + + - - + + - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + | ;; launch task ;; else ;; put task in deferred queue ;; if still ok to run tasks ;; process deferred tasks per above steps ;; run all tests are are Not COMPLETED and PASS or CHECK |
︙ | |||
1602 1603 1604 1605 1606 1607 1608 | 1608 1609 1610 1611 1612 1613 1614 1615 1616 1617 1618 1619 1620 1621 1622 1623 | + - + | (set! *didsomething* #t))) ;;====================================================================== ;; Wait on a run to complete ;;====================================================================== (if (and (args:get-arg "-run-wait") (not (or (args:get-arg "-run") |
︙ | |||
1673 1674 1675 1676 1677 1678 1679 | 1680 1681 1682 1683 1684 1685 1686 1687 1688 1689 1690 1691 1692 1693 1694 1695 | - + | (if (not *didsomething*) (debug:print 0 help)) (set! *time-to-exit* #t) (thread-join! *watchdog*) (if (not (eq? *globalexitstatus* 0)) |
Modified runconfig.scm from [d97360c67a] to [e05dafed02].
︙ | |||
52 53 54 55 56 57 58 | 52 53 54 55 56 57 58 59 60 61 62 63 64 65 66 67 68 | + - + + | (begin (debug:print 2 "Key settings found in runconfig.config:") (for-each (lambda (fullkey) (debug:print 2 (format #f "~20a ~a\n" fullkey (hash-table-ref/default whatfound fullkey 0)))) sections) (debug:print 2 "---") (set! *already-seen-runconfig-info* #t))) ;; finaldat ;; was returning this "finaldat" which would be good but conflicts with other uses |
︙ |
Modified runs.scm from [a18bf25a3a] to [76f6f46a09].
︙ | |||
45 46 47 48 49 50 51 | 45 46 47 48 49 50 51 52 53 54 55 56 57 58 59 60 | - + - - + - | (if (launch:setup-for-run) *configdat* (begin (debug:print 0 "ERROR: Called setup in a non-megatest area, exiting") (exit 1))))) (runrec (runs:runrec-make-record)) (target (common:args-get-target)) |
︙ | |||
82 83 84 85 86 87 88 89 90 91 92 93 94 95 | 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 | + + + + | (set! runconfig (read-config (conc *toppath* "/runconfigs.config") #f #t sections: (list "default" target))) (if (not (hash-table-ref/default runconfig (args:get-arg "-reqtarg") #f)) (begin (debug:print 0 "ERROR: [" (args:get-arg "-reqtarg") "] not found in " runconfigf) (if db (sqlite3:finalize! db)) (exit 1))) ;; Now have runconfigs data loaded, set environment vars ;; Only now can we calculate the testpatt (set! testpatt (common:args-get-testpatt runconfig)) (for-each (lambda (section) (for-each (lambda (varval) (set! envdat (append envdat (list varval))) (safe-setenv (car varval)(cadr varval))) (configf:get-section runconfig section))) (list "default" target)) (vector target runname testpatt keys keyvals envdat mconfig runconfig serverdat transport db toppath run-id))) |
︙ | |||
244 245 246 247 248 249 250 251 252 253 254 | 246 247 248 249 250 251 252 253 254 255 256 257 258 259 260 261 262 263 264 265 266 267 268 269 270 271 272 273 | + + + + + + + - - + + - - + | (exit 4))))) (thread-start! th2) (thread-start! th1) (thread-join! th2))))) (set-signal-handler! signal/int sighand) (set-signal-handler! signal/term sighand) (set-signal-handler! signal/stop sighand)) (runs:set-megatest-env-vars run-id inkeys: keys inrunname: runname) ;; these may be needed by the launching process (set! runconf (if (file-exists? runconfigf) (setup-env-defaults runconfigf run-id *already-seen-runconfig-info* keyvals target) (begin (debug:print 0 "WARNING: You do not have a run config file: " runconfigf) #f))) ;; register this run in monitor.db (rmt:tasks-add "run-tests" user target runname test-patts task-key) ;; params) (rmt:tasks-set-state-given-param-key task-key "running") |
︙ | |||
427 428 429 430 431 432 433 | 435 436 437 438 439 440 441 442 443 444 445 446 447 448 449 | - + | ;; (set! test-names (cons waiton test-names))))) ;; was an append, now a cons ))) waitons) (let ((remtests (delete-duplicates (append waitons tal)))) (if (not (null? remtests)) (begin |
︙ |
Modified tests/fullrun/megatest.config from [883d34808e] to [7fbae1ffea].
︙ | |||
255 256 257 258 259 260 261 262 | 255 256 257 258 259 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 | + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + | VAL1 Foo VAL2 ==>#{get test VAL1}Bar<== no spaces between Foo and Bar to pass ltest #{scheme (case (string->symbol (conc (getenv "datapath"))) \ ((none) "nbfake") \ ((openlava) "bsub") \ (else "sleeprunner"))} #================================================================ # Flexi-launcher #================================================================ # # [host-types] # general ssh #{getbgesthost general} # nbgeneral nbjob run JOBCOMMAND -log $MT_LINKTREE/$MT_TARGET/$MT_RUNNAME.$MT_TESTNAME-$MT_ITEM_PATH.lgo # # [hosts] # general cubian xena # # [launchers] # envsetup general # xor/%/n 4C16G # % nbgeneral # # [jobtools] # launcher bsub # # if defined and not "no" flexi-launcher will bypass launcher unless there is no # # match. # flexi-launcher yes [jobtools] flexi-launcher yes [host-types] general nbfake remote bsub [launchers] runfirst/sum% remote |
Modified tests/fullrun/runconfigs.config from [48da28b4cb] to [7bda90c9cb].
︙ | |||
21 22 23 24 25 26 27 28 29 30 31 32 33 34 | 21 22 23 24 25 26 27 28 29 30 31 32 33 34 35 36 37 | + + + | SOMEVAR2 This should show up in SOMEVAR4 if the target is ubuntu/nfs/none VARWITHDOLLARSIGNS The$USER/signs/should/be/replaced/with/variable [default] SOMEVAR3 #{rget SOMEVAR} SOMEVAR4 #{rget SOMEVAR2} SOMEVAR5 #{runconfigs-get SOMEVAR2} [ubuntu/nfs/all_toplevel] TESTPATT all_toplevel [this/a/test] BLAHFOO 123 [ubuntu/nfs/sleep1] SLEEPRUNNER 1 |
︙ |
Added tests/release/tests/testpatt_envvar/results.logpro version [71808ef31b].