ADDED .fossil-settings/crnl-glob Index: .fossil-settings/crnl-glob ================================================================== --- /dev/null +++ .fossil-settings/crnl-glob @@ -0,0 +1,1 @@ +docs/manual/megatest_manual.html Index: .mtutil.scm ================================================================== --- .mtutil.scm +++ .mtutil.scm @@ -1,5 +1,21 @@ +;; Copyright 2006-2017, Matthew Welland. +;; +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . (use json) (use ducttape-lib) (define (get-last-runname area-path target) @@ -23,45 +39,46 @@ (define (str-first-char->number str) (char->integer (string-ref str 0))) ;; example of how to set up and write target mappers ;; -(hash-table-set! *target-mappers* - 'prefix-contour - (lambda (target run-name area area-path reason contour mode-patt) - (conc contour "/" target))) -(hash-table-set! *target-mappers* - 'prefix-area-contour - (lambda (target run-name area area-path reason contour mode-patt) - (conc area "/" contour "/" target))) - -(hash-table-set! *runname-mappers* - 'corporate-ww - (lambda (target run-name area area-path reason contour mode-patt) - (print "corporate-ww called with: target=" target " run-name=" run-name " area=" area " area-path=" area-path " reason=" reason " contour=" contour " mode-patt=" mode-patt) - (let* ((last-name (get-last-runname area-path target)) - (last-letter (let* ((ch (if (string? last-name) - (let ((len (string-length last-name))) - (substring last-name (- len 1) len)) - "a")) - (chnum (str-first-char->number ch)) - (a (str-first-char->number "a")) - (z (str-first-char->number "z"))) - (if (and (>= chnum a)(<= chnum z)) - chnum - #f))) - (next-letter (if last-letter - (list->string - (list - (integer->char - (+ last-letter 1)))) ;; surely there is an easier way? - "a"))) - ;; (print "last-name: " last-name " last-letter: " last-letter " next-letter: " next-letter) - (conc (seconds->wwdate (current-seconds)) next-letter)))) - -(hash-table-set! *runname-mappers* - 'auto - (lambda (target run-name area area-path reason contour mode-patt) - "auto-eh")) - -;; (print "Got here!") +(add-target-mapper 'prefix-contour + (lambda (target run-name area area-path reason contour mode-patt) + (conc contour "/" target))) +(add-target-mapper 'prefix-area-contour + (lambda (target run-name area area-path reason contour mode-patt) + (conc area "/" contour "/" target))) + +(add-runname-mapper 'corporate-ww + (lambda (target run-name area area-path reason contour mode-patt) + (print "corporate-ww called with: target=" target " run-name=" run-name " area=" area " area-path=" area-path " reason=" reason " contour=" contour " mode-patt=" mode-patt) + (let* ((last-name (get-last-runname area-path target)) + (last-letter (let* ((ch (if (string? last-name) + (let ((len (string-length last-name))) + (substring last-name (- len 1) len)) + "a")) + (chnum (str-first-char->number ch)) + (a (str-first-char->number "a")) + (z (str-first-char->number "z"))) + (if (and (>= chnum a)(<= chnum z)) + chnum + #f))) + (next-letter (if last-letter + (list->string + (list + (integer->char + (+ last-letter 1)))) ;; surely there is an easier way? + "a"))) + ;; (print "last-name: " last-name " last-letter: " last-letter " next-letter: " next-letter) + (conc (seconds->wwdate (current-seconds)) next-letter)))) + +(add-runname-mapper 'auto + (lambda (target run-name area area-path reason contour mode-patt) + "auto-eh")) + +;; run only areas where first letter of area name is "a" +;; +(add-area-checker 'first-letter-a + (lambda (area target contour) + (string-match "^a.*$" area))) + Index: COPYING ================================================================== --- COPYING +++ COPYING @@ -1,724 +1,675 @@ - GNU GENERAL PUBLIC LICENSE - Version 2, June 1991 + GNU GENERAL PUBLIC LICENSE - Copyright (C) 1989, 1991 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + Version 3, 29 June 2007 + + Copyright (C) 2007 Free Software Foundation, Inc. Everyone is permitted to copy and distribute verbatim copies of this license document, but changing it is not allowed. - Preamble - - The licenses for most software are designed to take away your -freedom to share and change it. By contrast, the GNU General Public -License is intended to guarantee your freedom to share and change free -software--to make sure the software is free for all its users. This -General Public License applies to most of the Free Software -Foundation's software and to any other program whose authors commit to -using it. (Some other Free Software Foundation software is covered by -the GNU Library General Public License instead.) You can apply it to + Preamble + + The GNU General Public License is a free, copyleft license for +software and other kinds of works. + + The licenses for most software and other practical works are designed +to take away your freedom to share and change the works. By contrast, +the GNU General Public License is intended to guarantee your freedom to +share and change all versions of a program--to make sure it remains free +software for all its users. We, the Free Software Foundation, use the +GNU General Public License for most of our software; it applies also to +any other work released this way by its authors. You can apply it to your programs, too. When we speak of free software, we are referring to freedom, not price. Our General Public Licenses are designed to make sure that you have the freedom to distribute copies of free software (and charge for -this service if you wish), that you receive source code or can get it -if you want it, that you can change the software or use pieces of it -in new free programs; and that you know you can do these things. - - To protect your rights, we need to make restrictions that forbid -anyone to deny you these rights or to ask you to surrender the rights. -These restrictions translate to certain responsibilities for you if you -distribute copies of the software, or if you modify it. +them if you wish), that you receive source code or can get it if you +want it, that you can change the software or use pieces of it in new +free programs, and that you know you can do these things. + + To protect your rights, we need to prevent others from denying you +these rights or asking you to surrender the rights. Therefore, you have +certain responsibilities if you distribute copies of the software, or if +you modify it: responsibilities to respect the freedom of others. For example, if you distribute copies of such a program, whether -gratis or for a fee, you must give the recipients all the rights that -you have. You must make sure that they, too, receive or can get the -source code. And you must show them these terms so they know their -rights. - - We protect your rights with two steps: (1) copyright the software, and -(2) offer you this license which gives you legal permission to copy, -distribute and/or modify the software. - - Also, for each author's protection and ours, we want to make certain -that everyone understands that there is no warranty for this free -software. If the software is modified by someone else and passed on, we -want its recipients to know that what they have is not the original, so -that any problems introduced by others will not reflect on the original -authors' reputations. - - Finally, any free program is threatened constantly by software -patents. We wish to avoid the danger that redistributors of a free -program will individually obtain patent licenses, in effect making the -program proprietary. To prevent this, we have made it clear that any -patent must be licensed for everyone's free use or not licensed at all. +gratis or for a fee, you must pass on to the recipients the same +freedoms that you received. You must make sure that they, too, receive +or can get the source code. And you must show them these terms so they +know their rights. + + Developers that use the GNU GPL protect your rights with two steps: +(1) assert copyright on the software, and (2) offer you this License +giving you legal permission to copy, distribute and/or modify it. + + For the developers' and authors' protection, the GPL clearly explains +that there is no warranty for this free software. For both users' and +authors' sake, the GPL requires that modified versions be marked as +changed, so that their problems will not be attributed erroneously to +authors of previous versions. + + Some devices are designed to deny users access to install or run +modified versions of the software inside them, although the manufacturer +can do so. This is fundamentally incompatible with the aim of +protecting users' freedom to change the software. The systematic +pattern of such abuse occurs in the area of products for individuals to +use, which is precisely where it is most unacceptable. Therefore, we +have designed this version of the GPL to prohibit the practice for those +products. If such problems arise substantially in other domains, we +stand ready to extend this provision to those domains in future versions +of the GPL, as needed to protect the freedom of users. + + Finally, every program is threatened constantly by software patents. +States should not allow patents to restrict development and use of +software on general-purpose computers, but in those that do, we wish to +avoid the special danger that patents applied to a free program could +make it effectively proprietary. To prevent this, the GPL assures that +patents cannot be used to render the program non-free. The precise terms and conditions for copying, distribution and modification follow. - - GNU GENERAL PUBLIC LICENSE - TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION - - 0. This License applies to any program or other work which contains -a notice placed by the copyright holder saying it may be distributed -under the terms of this General Public License. The "Program", below, -refers to any such program or work, and a "work based on the Program" -means either the Program or any derivative work under copyright law: -that is to say, a work containing the Program or a portion of it, -either verbatim or with modifications and/or translated into another -language. (Hereinafter, translation is included without limitation in -the term "modification".) Each licensee is addressed as "you". - -Activities other than copying, distribution and modification are not -covered by this License; they are outside its scope. The act of -running the Program is not restricted, and the output from the Program -is covered only if its contents constitute a work based on the -Program (independent of having been made by running the Program). -Whether that is true depends on what the Program does. - - 1. You may copy and distribute verbatim copies of the Program's -source code as you receive it, in any medium, provided that you -conspicuously and appropriately publish on each copy an appropriate -copyright notice and disclaimer of warranty; keep intact all the -notices that refer to this License and to the absence of any warranty; -and give any other recipients of the Program a copy of this License -along with the Program. - -You may charge a fee for the physical act of transferring a copy, and -you may at your option offer warranty protection in exchange for a fee. - - 2. You may modify your copy or copies of the Program or any portion -of it, thus forming a work based on the Program, and copy and -distribute such modifications or work under the terms of Section 1 -above, provided that you also meet all of these conditions: - - a) You must cause the modified files to carry prominent notices - stating that you changed the files and the date of any change. - - b) You must cause any work that you distribute or publish, that in - whole or in part contains or is derived from the Program or any - part thereof, to be licensed as a whole at no charge to all third - parties under the terms of this License. - - c) If the modified program normally reads commands interactively - when run, you must cause it, when started running for such - interactive use in the most ordinary way, to print or display an - announcement including an appropriate copyright notice and a - notice that there is no warranty (or else, saying that you provide - a warranty) and that users may redistribute the program under - these conditions, and telling the user how to view a copy of this - License. (Exception: if the Program itself is interactive but - does not normally print such an announcement, your work based on - the Program is not required to print an announcement.) - -These requirements apply to the modified work as a whole. If -identifiable sections of that work are not derived from the Program, -and can be reasonably considered independent and separate works in -themselves, then this License, and its terms, do not apply to those -sections when you distribute them as separate works. But when you -distribute the same sections as part of a whole which is a work based -on the Program, the distribution of the whole must be on the terms of -this License, whose permissions for other licensees extend to the -entire whole, and thus to each and every part regardless of who wrote it. - -Thus, it is not the intent of this section to claim rights or contest -your rights to work written entirely by you; rather, the intent is to -exercise the right to control the distribution of derivative or -collective works based on the Program. - -In addition, mere aggregation of another work not based on the Program -with the Program (or with a work based on the Program) on a volume of -a storage or distribution medium does not bring the other work under -the scope of this License. - - 3. You may copy and distribute the Program (or a work based on it, -under Section 2) in object code or executable form under the terms of -Sections 1 and 2 above provided that you also do one of the following: - - a) Accompany it with the complete corresponding machine-readable - source code, which must be distributed under the terms of Sections - 1 and 2 above on a medium customarily used for software interchange; or, - - b) Accompany it with a written offer, valid for at least three - years, to give any third party, for a charge no more than your - cost of physically performing source distribution, a complete - machine-readable copy of the corresponding source code, to be - distributed under the terms of Sections 1 and 2 above on a medium - customarily used for software interchange; or, - - c) Accompany it with the information you received as to the offer - to distribute corresponding source code. (This alternative is - allowed only for noncommercial distribution and only if you - received the program in object code or executable form with such - an offer, in accord with Subsection b above.) - -The source code for a work means the preferred form of the work for -making modifications to it. For an executable work, complete source -code means all the source code for all modules it contains, plus any -associated interface definition files, plus the scripts used to -control compilation and installation of the executable. However, as a -special exception, the source code distributed need not include -anything that is normally distributed (in either source or binary -form) with the major components (compiler, kernel, and so on) of the -operating system on which the executable runs, unless that component -itself accompanies the executable. - -If distribution of executable or object code is made by offering -access to copy from a designated place, then offering equivalent -access to copy the source code from the same place counts as -distribution of the source code, even though third parties are not -compelled to copy the source along with the object code. - - 4. You may not copy, modify, sublicense, or distribute the Program -except as expressly provided under this License. Any attempt -otherwise to copy, modify, sublicense or distribute the Program is -void, and will automatically terminate your rights under this License. -However, parties who have received copies, or rights, from you under -this License will not have their licenses terminated so long as such -parties remain in full compliance. - - 5. You are not required to accept this License, since you have not -signed it. However, nothing else grants you permission to modify or -distribute the Program or its derivative works. These actions are -prohibited by law if you do not accept this License. Therefore, by -modifying or distributing the Program (or any work based on the -Program), you indicate your acceptance of this License to do so, and -all its terms and conditions for copying, distributing or modifying -the Program or works based on it. - - 6. Each time you redistribute the Program (or any work based on the -Program), the recipient automatically receives a license from the -original licensor to copy, distribute or modify the Program subject to -these terms and conditions. You may not impose any further -restrictions on the recipients' exercise of the rights granted herein. -You are not responsible for enforcing compliance by third parties to + + TERMS AND CONDITIONS + + 0. Definitions. + + "This License" refers to version 3 of the GNU General Public License. + + "Copyright" also means copyright-like laws that apply to other kinds of +works, such as semiconductor masks. + + "The Program" refers to any copyrightable work licensed under this +License. Each licensee is addressed as "you". "Licensees" and +"recipients" may be individuals or organizations. + + To "modify" a work means to copy from or adapt all or part of the work +in a fashion requiring copyright permission, other than the making of an +exact copy. The resulting work is called a "modified version" of the +earlier work or a work "based on" the earlier work. + + A "covered work" means either the unmodified Program or a work based +on the Program. + + To "propagate" a work means to do anything with it that, without +permission, would make you directly or secondarily liable for +infringement under applicable copyright law, except executing it on a +computer or modifying a private copy. Propagation includes copying, +distribution (with or without modification), making available to the +public, and in some countries other activities as well. + + To "convey" a work means any kind of propagation that enables other +parties to make or receive copies. Mere interaction with a user through +a computer network, with no transfer of a copy, is not conveying. + + An interactive user interface displays "Appropriate Legal Notices" +to the extent that it includes a convenient and prominently visible +feature that (1) displays an appropriate copyright notice, and (2) +tells the user that there is no warranty for the work (except to the +extent that warranties are provided), that licensees may convey the +work under this License, and how to view a copy of this License. If +the interface presents a list of user commands or options, such as a +menu, a prominent item in the list meets this criterion. + + 1. Source Code. + + The "source code" for a work means the preferred form of the work +for making modifications to it. "Object code" means any non-source +form of a work. + + A "Standard Interface" means an interface that either is an official +standard defined by a recognized standards body, or, in the case of +interfaces specified for a particular programming language, one that +is widely used among developers working in that language. + + The "System Libraries" of an executable work include anything, other +than the work as a whole, that (a) is included in the normal form of +packaging a Major Component, but which is not part of that Major +Component, and (b) serves only to enable use of the work with that +Major Component, or to implement a Standard Interface for which an +implementation is available to the public in source code form. A +"Major Component", in this context, means a major essential component +(kernel, window system, and so on) of the specific operating system +(if any) on which the executable work runs, or a compiler used to +produce the work, or an object code interpreter used to run it. + + The "Corresponding Source" for a work in object code form means all +the source code needed to generate, install, and (for an executable +work) run the object code and to modify the work, including scripts to +control those activities. However, it does not include the work's +System Libraries, or general-purpose tools or generally available free +programs which are used unmodified in performing those activities but +which are not part of the work. For example, Corresponding Source +includes interface definition files associated with source files for +the work, and the source code for shared libraries and dynamically +linked subprograms that the work is specifically designed to require, +such as by intimate data communication or control flow between those +subprograms and other parts of the work. + + The Corresponding Source need not include anything that users +can regenerate automatically from other parts of the Corresponding +Source. + + The Corresponding Source for a work in source code form is that +same work. + + 2. Basic Permissions. + + All rights granted under this License are granted for the term of +copyright on the Program, and are irrevocable provided the stated +conditions are met. This License explicitly affirms your unlimited +permission to run the unmodified Program. The output from running a +covered work is covered by this License only if the output, given its +content, constitutes a covered work. This License acknowledges your +rights of fair use or other equivalent, as provided by copyright law. + + You may make, run and propagate covered works that you do not +convey, without conditions so long as your license otherwise remains +in force. You may convey covered works to others for the sole purpose +of having them make modifications exclusively for you, or provide you +with facilities for running those works, provided that you comply with +the terms of this License in conveying all material for which you do +not control copyright. Those thus making or running the covered works +for you must do so exclusively on your behalf, under your direction +and control, on terms that prohibit them from making any copies of +your copyrighted material outside their relationship with you. + + Conveying under any other circumstances is permitted solely under +the conditions stated below. Sublicensing is not allowed; section 10 +makes it unnecessary. + + 3. Protecting Users' Legal Rights From Anti-Circumvention Law. + + No covered work shall be deemed part of an effective technological +measure under any applicable law fulfilling obligations under article +11 of the WIPO copyright treaty adopted on 20 December 1996, or +similar laws prohibiting or restricting circumvention of such +measures. + + When you convey a covered work, you waive any legal power to forbid +circumvention of technological measures to the extent such circumvention +is effected by exercising rights under this License with respect to +the covered work, and you disclaim any intention to limit operation or +modification of the work as a means of enforcing, against the work's +users, your or third parties' legal rights to forbid circumvention of +technological measures. + + 4. Conveying Verbatim Copies. + + You may convey verbatim copies of the Program's source code as you +receive it, in any medium, provided that you conspicuously and +appropriately publish on each copy an appropriate copyright notice; +keep intact all notices stating that this License and any +non-permissive terms added in accord with section 7 apply to the code; +keep intact all notices of the absence of any warranty; and give all +recipients a copy of this License along with the Program. + + You may charge any price or no price for each copy that you convey, +and you may offer support or warranty protection for a fee. + + 5. Conveying Modified Source Versions. + + You may convey a work based on the Program, or the modifications to +produce it from the Program, in the form of source code under the +terms of section 4, provided that you also meet all of these conditions: + + a) The work must carry prominent notices stating that you modified + it, and giving a relevant date. + + b) The work must carry prominent notices stating that it is + released under this License and any conditions added under section + 7. This requirement modifies the requirement in section 4 to + "keep intact all notices". + + c) You must license the entire work, as a whole, under this + License to anyone who comes into possession of a copy. This + License will therefore apply, along with any applicable section 7 + additional terms, to the whole of the work, and all its parts, + regardless of how they are packaged. This License gives no + permission to license the work in any other way, but it does not + invalidate such permission if you have separately received it. + + d) If the work has interactive user interfaces, each must display + Appropriate Legal Notices; however, if the Program has interactive + interfaces that do not display Appropriate Legal Notices, your + work need not make them do so. + + A compilation of a covered work with other separate and independent +works, which are not by their nature extensions of the covered work, +and which are not combined with it such as to form a larger program, +in or on a volume of a storage or distribution medium, is called an +"aggregate" if the compilation and its resulting copyright are not +used to limit the access or legal rights of the compilation's users +beyond what the individual works permit. Inclusion of a covered work +in an aggregate does not cause this License to apply to the other +parts of the aggregate. + + 6. Conveying Non-Source Forms. + + You may convey a covered work in object code form under the terms +of sections 4 and 5, provided that you also convey the +machine-readable Corresponding Source under the terms of this License, +in one of these ways: + + a) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by the + Corresponding Source fixed on a durable physical medium + customarily used for software interchange. + + b) Convey the object code in, or embodied in, a physical product + (including a physical distribution medium), accompanied by a + written offer, valid for at least three years and valid for as + long as you offer spare parts or customer support for that product + model, to give anyone who possesses the object code either (1) a + copy of the Corresponding Source for all the software in the + product that is covered by this License, on a durable physical + medium customarily used for software interchange, for a price no + more than your reasonable cost of physically performing this + conveying of source, or (2) access to copy the + Corresponding Source from a network server at no charge. + + c) Convey individual copies of the object code with a copy of the + written offer to provide the Corresponding Source. This + alternative is allowed only occasionally and noncommercially, and + only if you received the object code with such an offer, in accord + with subsection 6b. + + d) Convey the object code by offering access from a designated + place (gratis or for a charge), and offer equivalent access to the + Corresponding Source in the same way through the same place at no + further charge. You need not require recipients to copy the + Corresponding Source along with the object code. If the place to + copy the object code is a network server, the Corresponding Source + may be on a different server (operated by you or a third party) + that supports equivalent copying facilities, provided you maintain + clear directions next to the object code saying where to find the + Corresponding Source. Regardless of what server hosts the + Corresponding Source, you remain obligated to ensure that it is + available for as long as needed to satisfy these requirements. + + e) Convey the object code using peer-to-peer transmission, provided + you inform other peers where the object code and Corresponding + Source of the work are being offered to the general public at no + charge under subsection 6d. + + A separable portion of the object code, whose source code is excluded +from the Corresponding Source as a System Library, need not be +included in conveying the object code work. + + A "User Product" is either (1) a "consumer product", which means any +tangible personal property which is normally used for personal, family, +or household purposes, or (2) anything designed or sold for incorporation +into a dwelling. In determining whether a product is a consumer product, +doubtful cases shall be resolved in favor of coverage. For a particular +product received by a particular user, "normally used" refers to a +typical or common use of that class of product, regardless of the status +of the particular user or of the way in which the particular user +actually uses, or expects or is expected to use, the product. A product +is a consumer product regardless of whether the product has substantial +commercial, industrial or non-consumer uses, unless such uses represent +the only significant mode of use of the product. + + "Installation Information" for a User Product means any methods, +procedures, authorization keys, or other information required to install +and execute modified versions of a covered work in that User Product from +a modified version of its Corresponding Source. The information must +suffice to ensure that the continued functioning of the modified object +code is in no case prevented or interfered with solely because +modification has been made. + + If you convey an object code work under this section in, or with, or +specifically for use in, a User Product, and the conveying occurs as +part of a transaction in which the right of possession and use of the +User Product is transferred to the recipient in perpetuity or for a +fixed term (regardless of how the transaction is characterized), the +Corresponding Source conveyed under this section must be accompanied +by the Installation Information. But this requirement does not apply +if neither you nor any third party retains the ability to install +modified object code on the User Product (for example, the work has +been installed in ROM). + + The requirement to provide Installation Information does not include a +requirement to continue to provide support service, warranty, or updates +for a work that has been modified or installed by the recipient, or for +the User Product in which it has been modified or installed. Access to a +network may be denied when the modification itself materially and +adversely affects the operation of the network or violates the rules and +protocols for communication across the network. + + Corresponding Source conveyed, and Installation Information provided, +in accord with this section must be in a format that is publicly +documented (and with an implementation available to the public in +source code form), and must require no special password or key for +unpacking, reading or copying. + + 7. Additional Terms. + + "Additional permissions" are terms that supplement the terms of this +License by making exceptions from one or more of its conditions. +Additional permissions that are applicable to the entire Program shall +be treated as though they were included in this License, to the extent +that they are valid under applicable law. If additional permissions +apply only to part of the Program, that part may be used separately +under those permissions, but the entire Program remains governed by +this License without regard to the additional permissions. + + When you convey a copy of a covered work, you may at your option +remove any additional permissions from that copy, or from any part of +it. (Additional permissions may be written to require their own +removal in certain cases when you modify the work.) You may place +additional permissions on material, added by you to a covered work, +for which you have or can give appropriate copyright permission. + + Notwithstanding any other provision of this License, for material you +add to a covered work, you may (if authorized by the copyright holders of +that material) supplement the terms of this License with terms: + + a) Disclaiming warranty or limiting liability differently from the + terms of sections 15 and 16 of this License; or + + b) Requiring preservation of specified reasonable legal notices or + author attributions in that material or in the Appropriate Legal + Notices displayed by works containing it; or + + c) Prohibiting misrepresentation of the origin of that material, or + requiring that modified versions of such material be marked in + reasonable ways as different from the original version; or + + d) Limiting the use for publicity purposes of names of licensors or + authors of the material; or + + e) Declining to grant rights under trademark law for use of some + trade names, trademarks, or service marks; or + + f) Requiring indemnification of licensors and authors of that + material by anyone who conveys the material (or modified versions of + it) with contractual assumptions of liability to the recipient, for + any liability that these contractual assumptions directly impose on + those licensors and authors. + + All other non-permissive additional terms are considered "further +restrictions" within the meaning of section 10. If the Program as you +received it, or any part of it, contains a notice stating that it is +governed by this License along with a term that is a further +restriction, you may remove that term. If a license document contains +a further restriction but permits relicensing or conveying under this +License, you may add to a covered work material governed by the terms +of that license document, provided that the further restriction does +not survive such relicensing or conveying. + + If you add terms to a covered work in accord with this section, you +must place, in the relevant source files, a statement of the +additional terms that apply to those files, or a notice indicating +where to find the applicable terms. + + Additional terms, permissive or non-permissive, may be stated in the +form of a separately written license, or stated as exceptions; +the above requirements apply either way. + + 8. Termination. + + You may not propagate or modify a covered work except as expressly +provided under this License. Any attempt otherwise to propagate or +modify it is void, and will automatically terminate your rights under +this License (including any patent licenses granted under the third +paragraph of section 11). + + However, if you cease all violation of this License, then your +license from a particular copyright holder is reinstated (a) +provisionally, unless and until the copyright holder explicitly and +finally terminates your license, and (b) permanently, if the copyright +holder fails to notify you of the violation by some reasonable means +prior to 60 days after the cessation. + + Moreover, your license from a particular copyright holder is +reinstated permanently if the copyright holder notifies you of the +violation by some reasonable means, this is the first time you have +received notice of violation of this License (for any work) from that +copyright holder, and you cure the violation prior to 30 days after +your receipt of the notice. + + Termination of your rights under this section does not terminate the +licenses of parties who have received copies or rights from you under +this License. If your rights have been terminated and not permanently +reinstated, you do not qualify to receive new licenses for the same +material under section 10. + + 9. Acceptance Not Required for Having Copies. + + You are not required to accept this License in order to receive or +run a copy of the Program. Ancillary propagation of a covered work +occurring solely as a consequence of using peer-to-peer transmission +to receive a copy likewise does not require acceptance. However, +nothing other than this License grants you permission to propagate or +modify any covered work. These actions infringe copyright if you do +not accept this License. Therefore, by modifying or propagating a +covered work, you indicate your acceptance of this License to do so. + + 10. Automatic Licensing of Downstream Recipients. + + Each time you convey a covered work, the recipient automatically +receives a license from the original licensors, to run, modify and +propagate that work, subject to this License. You are not responsible +for enforcing compliance by third parties with this License. + + An "entity transaction" is a transaction transferring control of an +organization, or substantially all assets of one, or subdividing an +organization, or merging organizations. If propagation of a covered +work results from an entity transaction, each party to that +transaction who receives a copy of the work also receives whatever +licenses to the work the party's predecessor in interest had or could +give under the previous paragraph, plus a right to possession of the +Corresponding Source of the work from the predecessor in interest, if +the predecessor has it or can get it with reasonable efforts. + + You may not impose any further restrictions on the exercise of the +rights granted or affirmed under this License. For example, you may +not impose a license fee, royalty, or other charge for exercise of +rights granted under this License, and you may not initiate litigation +(including a cross-claim or counterclaim in a lawsuit) alleging that +any patent claim is infringed by making, using, selling, offering for +sale, or importing the Program or any portion of it. + + 11. Patents. + + A "contributor" is a copyright holder who authorizes use under this +License of the Program or a work on which the Program is based. The +work thus licensed is called the contributor's "contributor version". + + A contributor's "essential patent claims" are all patent claims +owned or controlled by the contributor, whether already acquired or +hereafter acquired, that would be infringed by some manner, permitted +by this License, of making, using, or selling its contributor version, +but do not include claims that would be infringed only as a +consequence of further modification of the contributor version. For +purposes of this definition, "control" includes the right to grant +patent sublicenses in a manner consistent with the requirements of this License. - 7. If, as a consequence of a court judgment or allegation of patent -infringement or for any other reason (not limited to patent issues), -conditions are imposed on you (whether by court order, agreement or + Each contributor grants you a non-exclusive, worldwide, royalty-free +patent license under the contributor's essential patent claims, to +make, use, sell, offer for sale, import and otherwise run, modify and +propagate the contents of its contributor version. + + In the following three paragraphs, a "patent license" is any express +agreement or commitment, however denominated, not to enforce a patent +(such as an express permission to practice a patent or covenant not to +sue for patent infringement). To "grant" such a patent license to a +party means to make such an agreement or commitment not to enforce a +patent against the party. + + If you convey a covered work, knowingly relying on a patent license, +and the Corresponding Source of the work is not available for anyone +to copy, free of charge and under the terms of this License, through a +publicly available network server or other readily accessible means, +then you must either (1) cause the Corresponding Source to be so +available, or (2) arrange to deprive yourself of the benefit of the +patent license for this particular work, or (3) arrange, in a manner +consistent with the requirements of this License, to extend the patent +license to downstream recipients. "Knowingly relying" means you have +actual knowledge that, but for the patent license, your conveying the +covered work in a country, or your recipient's use of the covered work +in a country, would infringe one or more identifiable patents in that +country that you have reason to believe are valid. + + If, pursuant to or in connection with a single transaction or +arrangement, you convey, or propagate by procuring conveyance of, a +covered work, and grant a patent license to some of the parties +receiving the covered work authorizing them to use, propagate, modify +or convey a specific copy of the covered work, then the patent license +you grant is automatically extended to all recipients of the covered +work and works based on it. + + A patent license is "discriminatory" if it does not include within +the scope of its coverage, prohibits the exercise of, or is +conditioned on the non-exercise of one or more of the rights that are +specifically granted under this License. You may not convey a covered +work if you are a party to an arrangement with a third party that is +in the business of distributing software, under which you make payment +to the third party based on the extent of your activity of conveying +the work, and under which the third party grants, to any of the +parties who would receive the covered work from you, a discriminatory +patent license (a) in connection with copies of the covered work +conveyed by you (or copies made from those copies), or (b) primarily +for and in connection with specific products or compilations that +contain the covered work, unless you entered into that arrangement, +or that patent license was granted, prior to 28 March 2007. + + Nothing in this License shall be construed as excluding or limiting +any implied license or other defenses to infringement that may +otherwise be available to you under applicable patent law. + + 12. No Surrender of Others' Freedom. + + If conditions are imposed on you (whether by court order, agreement or otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot -distribute so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you -may not distribute the Program at all. For example, if a patent -license would not permit royalty-free redistribution of the Program by -all those who receive copies directly or indirectly through you, then -the only way you could satisfy both it and this License would be to -refrain entirely from distribution of the Program. - -If any portion of this section is held invalid or unenforceable under -any particular circumstance, the balance of the section is intended to -apply and the section as a whole is intended to apply in other -circumstances. - -It is not the purpose of this section to induce you to infringe any -patents or other property right claims or to contest validity of any -such claims; this section has the sole purpose of protecting the -integrity of the free software distribution system, which is -implemented by public license practices. Many people have made -generous contributions to the wide range of software distributed -through that system in reliance on consistent application of that -system; it is up to the author/donor to decide if he or she is willing -to distribute software through any other system and a licensee cannot -impose that choice. - -This section is intended to make thoroughly clear what is believed to -be a consequence of the rest of this License. - - 8. If the distribution and/or use of the Program is restricted in -certain countries either by patents or by copyrighted interfaces, the -original copyright holder who places the Program under this License -may add an explicit geographical distribution limitation excluding -those countries, so that distribution is permitted only in or among -countries not thus excluded. In such case, this License incorporates -the limitation as if written in the body of this License. - - 9. The Free Software Foundation may publish revised and/or new versions -of the General Public License from time to time. Such new versions will +excuse you from the conditions of this License. If you cannot convey a +covered work so as to satisfy simultaneously your obligations under this +License and any other pertinent obligations, then as a consequence you may +not convey it at all. For example, if you agree to terms that obligate you +to collect a royalty for further conveying from those to whom you convey +the Program, the only way you could satisfy both those terms and this +License would be to refrain entirely from conveying the Program. + + 13. Use with the GNU Affero General Public License. + + Notwithstanding any other provision of this License, you have +permission to link or combine any covered work with a work licensed +under version 3 of the GNU Affero General Public License into a single +combined work, and to convey the resulting work. The terms of this +License will continue to apply to the part which is the covered work, +but the special requirements of the GNU Affero General Public License, +section 13, concerning interaction through a network will apply to the +combination as such. + + 14. Revised Versions of this License. + + The Free Software Foundation may publish revised and/or new versions of +the GNU General Public License from time to time. Such new versions will be similar in spirit to the present version, but may differ in detail to address new problems or concerns. -Each version is given a distinguishing version number. If the Program -specifies a version number of this License which applies to it and "any -later version", you have the option of following the terms and conditions -either of that version or of any later version published by the Free -Software Foundation. If the Program does not specify a version number of -this License, you may choose any version ever published by the Free Software -Foundation. - - 10. If you wish to incorporate parts of the Program into other free -programs whose distribution conditions are different, write to the author -to ask for permission. For software which is copyrighted by the Free -Software Foundation, write to the Free Software Foundation; we sometimes -make exceptions for this. Our decision will be guided by the two goals -of preserving the free status of all derivatives of our free software and -of promoting the sharing and reuse of software generally. - - NO WARRANTY - - 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY -FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN -OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES -PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED -OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF -MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS -TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE -PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING, -REPAIR OR CORRECTION. - - 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR -REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, -INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING -OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED -TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY -YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER -PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE -POSSIBILITY OF SUCH DAMAGES. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs + Each version is given a distinguishing version number. If the +Program specifies that a certain numbered version of the GNU General +Public License "or any later version" applies to it, you have the +option of following the terms and conditions either of that numbered +version or of any later version published by the Free Software +Foundation. If the Program does not specify a version number of the +GNU General Public License, you may choose any version ever published +by the Free Software Foundation. + + If the Program specifies that a proxy can decide which future +versions of the GNU General Public License can be used, that proxy's +public statement of acceptance of a version permanently authorizes you +to choose that version for the Program. + + Later license versions may give you additional or different +permissions. However, no additional obligations are imposed on any +author or copyright holder as a result of your choosing to follow a +later version. + + 15. Disclaimer of Warranty. + + THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY +APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT +HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY +OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, +THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR +PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM +IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF +ALL NECESSARY SERVICING, REPAIR OR CORRECTION. + + 16. Limitation of Liability. + + IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING +WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS +THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY +GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE +USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF +DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD +PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), +EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF +SUCH DAMAGES. + + 17. Interpretation of Sections 15 and 16. + + If the disclaimer of warranty and limitation of liability provided +above cannot be given local legal effect according to their terms, +reviewing courts shall apply local law that most closely approximates +an absolute waiver of all civil liability in connection with the +Program, unless a warranty or assumption of liability accompanies a +copy of the Program in return for a fee. + + END OF TERMS AND CONDITIONS + + How to Apply These Terms to Your New Programs If you develop a new program, and you want it to be of the greatest possible use to the public, the best way to achieve this is to make it free software which everyone can redistribute and change under these terms. To do so, attach the following notices to the program. It is safest to attach them to the start of each source file to most effectively -convey the exclusion of warranty; and each file should have at least +state the exclusion of warranty; and each file should have at least the "copyright" line and a pointer to where the full notice is found. Copyright (C) - This program is free software; you can redistribute it and/or modify + This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by - the Free Software Foundation; either version 2 of the License, or + the Free Software Foundation, either version 3 of the License, or (at your option) any later version. This program is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - + along with this program. If not, see . Also add information on how to contact you by electronic and paper mail. -If the program is interactive, make it output a short notice like this -when it starts in an interactive mode: + If the program does terminal interaction, make it output a short +notice like this when it starts in an interactive mode: - Gnomovision version 69, Copyright (C) year name of author - Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'. + Copyright (C) + This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. This is free software, and you are welcome to redistribute it under certain conditions; type `show c' for details. The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, the commands you use may -be called something other than `show w' and `show c'; they could even be -mouse-clicks or menu items--whatever suits your program. - -You should also get your employer (if you work as a programmer) or your -school, if any, to sign a "copyright disclaimer" for the program, if -necessary. Here is a sample; alter the names: - - Yoyodyne, Inc., hereby disclaims all copyright interest in the program - `Gnomovision' (which makes passes at compilers) written by James Hacker. - - , 1 April 1989 - Ty Coon, President of Vice - -This General Public License does not permit incorporating your program into -proprietary programs. If your program is a subroutine library, you may -consider it more useful to permit linking proprietary applications with the -library. If this is what you want to do, use the GNU Library General -Public License instead of this License. - - -GNU Free Documentation License -****************************** - - Version 1.1, March 2000 - Copyright (C) 2000 Free Software Foundation, Inc. - 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - 0. PREAMBLE - - The purpose of this License is to make a manual, textbook, or other - written document "free" in the sense of freedom: to assure everyone - the effective freedom to copy and redistribute it, with or without - modifying it, either commercially or noncommercially. Secondarily, - this License preserves for the author and publisher a way to get - credit for their work, while not being considered responsible for - modifications made by others. - - This License is a kind of "copyleft", which means that derivative - works of the document must themselves be free in the same sense. - It complements the GNU General Public License, which is a copyleft - license designed for free software. - - We have designed this License in order to use it for manuals for - free software, because free software needs free documentation: a - free program should come with manuals providing the same freedoms - that the software does. But this License is not limited to - software manuals; it can be used for any textual work, regardless - of subject matter or whether it is published as a printed book. - We recommend this License principally for works whose purpose is - instruction or reference. - - 1. APPLICABILITY AND DEFINITIONS - - This License applies to any manual or other work that contains a - notice placed by the copyright holder saying it can be distributed - under the terms of this License. The "Document", below, refers to - any such manual or work. Any member of the public is a licensee, - and is addressed as "you". - - A "Modified Version" of the Document means any work containing the - Document or a portion of it, either copied verbatim, or with - modifications and/or translated into another language. - - A "Secondary Section" is a named appendix or a front-matter - section of the Document that deals exclusively with the - relationship of the publishers or authors of the Document to the - Document's overall subject (or to related matters) and contains - nothing that could fall directly within that overall subject. - (For example, if the Document is in part a textbook of - mathematics, a Secondary Section may not explain any mathematics.) - The relationship could be a matter of historical connection with - the subject or with related matters, or of legal, commercial, - philosophical, ethical or political position regarding them. - - The "Invariant Sections" are certain Secondary Sections whose - titles are designated, as being those of Invariant Sections, in - the notice that says that the Document is released under this - License. - - The "Cover Texts" are certain short passages of text that are - listed, as Front-Cover Texts or Back-Cover Texts, in the notice - that says that the Document is released under this License. - - A "Transparent" copy of the Document means a machine-readable copy, - represented in a format whose specification is available to the - general public, whose contents can be viewed and edited directly - and straightforwardly with generic text editors or (for images - composed of pixels) generic paint programs or (for drawings) some - widely available drawing editor, and that is suitable for input to - text formatters or for automatic translation to a variety of - formats suitable for input to text formatters. A copy made in an - otherwise Transparent file format whose markup has been designed - to thwart or discourage subsequent modification by readers is not - Transparent. A copy that is not "Transparent" is called "Opaque". - - Examples of suitable formats for Transparent copies include plain - ASCII without markup, Texinfo input format, LaTeX input format, - SGML or XML using a publicly available DTD, and - standard-conforming simple HTML designed for human modification. - Opaque formats include PostScript, PDF, proprietary formats that - can be read and edited only by proprietary word processors, SGML - or XML for which the DTD and/or processing tools are not generally - available, and the machine-generated HTML produced by some word - processors for output purposes only. - - The "Title Page" means, for a printed book, the title page itself, - plus such following pages as are needed to hold, legibly, the - material this License requires to appear in the title page. For - works in formats which do not have any title page as such, "Title - Page" means the text near the most prominent appearance of the - work's title, preceding the beginning of the body of the text. - - 2. VERBATIM COPYING - - You may copy and distribute the Document in any medium, either - commercially or noncommercially, provided that this License, the - copyright notices, and the license notice saying this License - applies to the Document are reproduced in all copies, and that you - add no other conditions whatsoever to those of this License. You - may not use technical measures to obstruct or control the reading - or further copying of the copies you make or distribute. However, - you may accept compensation in exchange for copies. If you - distribute a large enough number of copies you must also follow - the conditions in section 3. - - You may also lend copies, under the same conditions stated above, - and you may publicly display copies. - - 3. COPYING IN QUANTITY - - If you publish printed copies of the Document numbering more than - 100, and the Document's license notice requires Cover Texts, you - must enclose the copies in covers that carry, clearly and legibly, - all these Cover Texts: Front-Cover Texts on the front cover, and - Back-Cover Texts on the back cover. Both covers must also clearly - and legibly identify you as the publisher of these copies. The - front cover must present the full title with all words of the - title equally prominent and visible. You may add other material - on the covers in addition. Copying with changes limited to the - covers, as long as they preserve the title of the Document and - satisfy these conditions, can be treated as verbatim copying in - other respects. - - If the required texts for either cover are too voluminous to fit - legibly, you should put the first ones listed (as many as fit - reasonably) on the actual cover, and continue the rest onto - adjacent pages. - - If you publish or distribute Opaque copies of the Document - numbering more than 100, you must either include a - machine-readable Transparent copy along with each Opaque copy, or - state in or with each Opaque copy a publicly-accessible - computer-network location containing a complete Transparent copy - of the Document, free of added material, which the general - network-using public has access to download anonymously at no - charge using public-standard network protocols. If you use the - latter option, you must take reasonably prudent steps, when you - begin distribution of Opaque copies in quantity, to ensure that - this Transparent copy will remain thus accessible at the stated - location until at least one year after the last time you - distribute an Opaque copy (directly or through your agents or - retailers) of that edition to the public. - - It is requested, but not required, that you contact the authors of - the Document well before redistributing any large number of - copies, to give them a chance to provide you with an updated - version of the Document. - - 4. MODIFICATIONS - - You may copy and distribute a Modified Version of the Document - under the conditions of sections 2 and 3 above, provided that you - release the Modified Version under precisely this License, with - the Modified Version filling the role of the Document, thus - licensing distribution and modification of the Modified Version to - whoever possesses a copy of it. In addition, you must do these - things in the Modified Version: - - A. Use in the Title Page (and on the covers, if any) a title - distinct from that of the Document, and from those of - previous versions (which should, if there were any, be listed - in the History section of the Document). You may use the - same title as a previous version if the original publisher of - that version gives permission. - - B. List on the Title Page, as authors, one or more persons or - entities responsible for authorship of the modifications in - the Modified Version, together with at least five of the - principal authors of the Document (all of its principal - authors, if it has less than five). - - C. State on the Title page the name of the publisher of the - Modified Version, as the publisher. - - D. Preserve all the copyright notices of the Document. - - E. Add an appropriate copyright notice for your modifications - adjacent to the other copyright notices. - - F. Include, immediately after the copyright notices, a license - notice giving the public permission to use the Modified - Version under the terms of this License, in the form shown in - the Addendum below. - - G. Preserve in that license notice the full lists of Invariant - Sections and required Cover Texts given in the Document's - license notice. - - H. Include an unaltered copy of this License. - - I. Preserve the section entitled "History", and its title, and - add to it an item stating at least the title, year, new - authors, and publisher of the Modified Version as given on - the Title Page. If there is no section entitled "History" in - the Document, create one stating the title, year, authors, - and publisher of the Document as given on its Title Page, - then add an item describing the Modified Version as stated in - the previous sentence. - - J. Preserve the network location, if any, given in the Document - for public access to a Transparent copy of the Document, and - likewise the network locations given in the Document for - previous versions it was based on. These may be placed in - the "History" section. You may omit a network location for a - work that was published at least four years before the - Document itself, or if the original publisher of the version - it refers to gives permission. - - K. In any section entitled "Acknowledgments" or "Dedications", - preserve the section's title, and preserve in the section all - the substance and tone of each of the contributor - acknowledgments and/or dedications given therein. - - L. Preserve all the Invariant Sections of the Document, - unaltered in their text and in their titles. Section numbers - or the equivalent are not considered part of the section - titles. - - M. Delete any section entitled "Endorsements". Such a section - may not be included in the Modified Version. - - N. Do not retitle any existing section as "Endorsements" or to - conflict in title with any Invariant Section. - - If the Modified Version includes new front-matter sections or - appendices that qualify as Secondary Sections and contain no - material copied from the Document, you may at your option - designate some or all of these sections as invariant. To do this, - add their titles to the list of Invariant Sections in the Modified - Version's license notice. These titles must be distinct from any - other section titles. - - You may add a section entitled "Endorsements", provided it contains - nothing but endorsements of your Modified Version by various - parties--for example, statements of peer review or that the text - has been approved by an organization as the authoritative - definition of a standard. - - You may add a passage of up to five words as a Front-Cover Text, - and a passage of up to 25 words as a Back-Cover Text, to the end - of the list of Cover Texts in the Modified Version. Only one - passage of Front-Cover Text and one of Back-Cover Text may be - added by (or through arrangements made by) any one entity. If the - Document already includes a cover text for the same cover, - previously added by you or by arrangement made by the same entity - you are acting on behalf of, you may not add another; but you may - replace the old one, on explicit permission from the previous - publisher that added the old one. - - The author(s) and publisher(s) of the Document do not by this - License give permission to use their names for publicity for or to - assert or imply endorsement of any Modified Version. - - 5. COMBINING DOCUMENTS - - You may combine the Document with other documents released under - this License, under the terms defined in section 4 above for - modified versions, provided that you include in the combination - all of the Invariant Sections of all of the original documents, - unmodified, and list them all as Invariant Sections of your - combined work in its license notice. - - The combined work need only contain one copy of this License, and - multiple identical Invariant Sections may be replaced with a single - copy. If there are multiple Invariant Sections with the same name - but different contents, make the title of each such section unique - by adding at the end of it, in parentheses, the name of the - original author or publisher of that section if known, or else a - unique number. Make the same adjustment to the section titles in - the list of Invariant Sections in the license notice of the - combined work. - - In the combination, you must combine any sections entitled - "History" in the various original documents, forming one section - entitled "History"; likewise combine any sections entitled - "Acknowledgments", and any sections entitled "Dedications". You - must delete all sections entitled "Endorsements." - - 6. COLLECTIONS OF DOCUMENTS - - You may make a collection consisting of the Document and other - documents released under this License, and replace the individual - copies of this License in the various documents with a single copy - that is included in the collection, provided that you follow the - rules of this License for verbatim copying of each of the - documents in all other respects. - - You may extract a single document from such a collection, and - distribute it individually under this License, provided you insert - a copy of this License into the extracted document, and follow - this License in all other respects regarding verbatim copying of - that document. - - 7. AGGREGATION WITH INDEPENDENT WORKS - - A compilation of the Document or its derivatives with other - separate and independent documents or works, in or on a volume of - a storage or distribution medium, does not as a whole count as a - Modified Version of the Document, provided no compilation - copyright is claimed for the compilation. Such a compilation is - called an "aggregate", and this License does not apply to the - other self-contained works thus compiled with the Document, on - account of their being thus compiled, if they are not themselves - derivative works of the Document. - - If the Cover Text requirement of section 3 is applicable to these - copies of the Document, then if the Document is less than one - quarter of the entire aggregate, the Document's Cover Texts may be - placed on covers that surround only the Document within the - aggregate. Otherwise they must appear on covers around the whole - aggregate. - - 8. TRANSLATION - - Translation is considered a kind of modification, so you may - distribute translations of the Document under the terms of section - 4. Replacing Invariant Sections with translations requires special - permission from their copyright holders, but you may include - translations of some or all Invariant Sections in addition to the - original versions of these Invariant Sections. You may include a - translation of this License provided that you also include the - original English version of this License. In case of a - disagreement between the translation and the original English - version of this License, the original English version will prevail. - - 9. TERMINATION - - You may not copy, modify, sublicense, or distribute the Document - except as expressly provided for under this License. Any other - attempt to copy, modify, sublicense or distribute the Document is - void, and will automatically terminate your rights under this - License. However, parties who have received copies, or rights, - from you under this License will not have their licenses - terminated so long as such parties remain in full compliance. - - 10. FUTURE REVISIONS OF THIS LICENSE - - The Free Software Foundation may publish new, revised versions of - the GNU Free Documentation License from time to time. Such new - versions will be similar in spirit to the present version, but may - differ in detail to address new problems or concerns. See - `http://www.gnu.org/copyleft/'. - - Each version of the License is given a distinguishing version - number. If the Document specifies that a particular numbered - version of this License "or any later version" applies to it, you - have the option of following the terms and conditions either of - that specified version or of any later version that has been - published (not as a draft) by the Free Software Foundation. If - the Document does not specify a version number of this License, - you may choose any version ever published (not as a draft) by the - Free Software Foundation. - -ADDENDUM: How to use this License for your documents ----------------------------------------------------- - - To use this License in a document you have written, include a copy of -the License in the document and put the following copyright and license -notices just after the title page: - - Copyright (C) YEAR YOUR NAME. - Permission is granted to copy, distribute and/or modify this document - under the terms of the GNU Free Documentation License, Version 1.1 - or any later version published by the Free Software Foundation; - with the Invariant Sections being LIST THEIR TITLES, with the - Front-Cover Texts being LIST, and with the Back-Cover Texts being LIST. - A copy of the license is included in the section entitled ``GNU - Free Documentation License''. - - If you have no Invariant Sections, write "with no Invariant Sections" -instead of saying which ones are invariant. If you have no Front-Cover -Texts, write "no Front-Cover Texts" instead of "Front-Cover Texts being -LIST"; likewise for Back-Cover Texts. - - If your document contains nontrivial examples of program code, we -recommend releasing these examples in parallel under your choice of -free software license, such as the GNU General Public License, to -permit their use in free software. - +parts of the General Public License. Of course, your program's commands +might be different; for a GUI interface, you would use an "about box". + + You should also get your employer (if you work as a programmer) or school, +if any, to sign a "copyright disclaimer" for the program, if necessary. +For more information on this, and how to apply and follow the GNU GPL, see +. + + The GNU General Public License does not permit incorporating your program +into proprietary programs. If your program is a subroutine library, you +may consider it more useful to permit linking proprietary applications with +the library. If this is what you want to do, use the GNU Lesser General +Public License instead of this License. But first, please read +. Index: Makefile ================================================================== --- Makefile +++ Makefile @@ -1,69 +1,142 @@ +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . + # make install CSCOPTS='-accumulate-profile -profile-name $(PWD)/profile-ww$(shell date +%V.%u)' # rm .o ; make install CSCOPTS='-profile' ; ... ; chicken-profile | less - +SHELL=/bin/bash PREFIX=$(PWD) CSCOPTS= INSTALL=install SRCFILES = common.scm items.scm launch.scm \ ods.scm runconfig.scm server.scm configf.scm \ db.scm keys.scm margs.scm megatest-version.scm \ process.scm runs.scm tasks.scm tests.scm genexample.scm \ - http-transport.scm filedb.scm \ - client.scm synchash.scm daemon.scm mt.scm \ + http-transport.scm filedb.scm tdb.scm \ + client.scm mt.scm \ ezsteps.scm lock-queue.scm sdb.scm \ - rmt.scm api.scm tdb.scm rpc-transport.scm \ - portlogger.scm archive.scm env.scm diff-report.scm cgisetup/models/pgdb.scm + rmt.scm api.scm subrun.scm \ + portlogger.scm archive.scm env.scm diff-report.scm cgisetup/models/pgdb.scm + +# module source files +MSRCFILES = ftail.scm # Eggs to install (straightforward ones) EGGS=matchable readline apropos base64 regex-literals format regex-case test coops trace csv \ dot-locking posix-utils posix-extras directory-utils hostinfo tcp-server rpc csv-xml fmt \ json md5 awful http-client spiffy uri-common intarweb spiffy-request-vars \ spiffy-directory-listing ssax sxml-serializer sxml-modifications iup canvas-draw sqlite3 -GUISRCF = dashboard-tests.scm dashboard-guimonitor.scm gutils.scm dcommon.scm tree.scm vg.scm +GUISRCF = dashboard-context-menu.scm dashboard-tests.scm dashboard-guimonitor.scm gutils.scm dcommon.scm tree.scm vg.scm OFILES = $(SRCFILES:%.scm=%.o) GOFILES = $(GUISRCF:%.scm=%.o) + +MOFILES = $(addprefix mofiles/,$(MSRCFILES:%.scm=%.o)) + +mofiles/%.o : %.scm + mkdir -p mofiles + csc $(CSCOPTS) -J -c $< -o mofiles/$*.o ADTLSCR=mt_laststep mt_runstep mt_ezstep HELPERS=$(addprefix $(PREFIX)/bin/,$(ADTLSCR)) 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 if [[ -e /usr/bin/sw_vers ]]; then /usr/bin/sw_vers -productVersion; else lsb_release -sr; fi) # ARCHSTR=$(shell bash -c "echo \$$MACHTYPE") PNGFILES = $(shell cd docs/manual;ls *png) -all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut ndboard +#all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut ndboard +all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard mtut -mtest: $(OFILES) readline-fix.scm megatest.o - csc $(CSCOPTS) $(OFILES) megatest.o -o mtest +mtest: $(OFILES) readline-fix.scm megatest.o $(MOFILES) mofiles/ftail.o + csc $(CSCOPTS) $(OFILES) $(MOFILES) megatest.o -o mtest -dboard : $(OFILES) $(GOFILES) dashboard.scm - csc $(CSCOPTS) $(OFILES) dashboard.scm $(GOFILES) -o dboard +showmtesthash: + @echo $(MTESTHASH) + +dboard : $(OFILES) $(GOFILES) dashboard.scm $(MOFILES) + csc $(CSCOPTS) $(OFILES) dashboard.scm $(GOFILES) $(MOFILES) -o dboard ndboard : newdashboard.scm $(OFILES) $(GOFILES) csc $(CSCOPTS) $(OFILES) $(GOFILES) newdashboard.scm -o ndboard -mtut: $(OFILES) mtut.scm +mtut: $(OFILES) megatest-fossil-hash.scm mtut.scm csc $(CSCOPTS) $(OFILES) mtut.scm -o mtut +TCMTOBJS = \ + api.o \ + archive.o \ + cgisetup/models/pgdb.o \ + client.o \ + common.o \ + configf.o \ + db.o \ + env.o \ + http-transport.o \ + items.o \ + keys.o \ + launch.o \ + lock-queue.o \ + margs.o \ + mt.o \ + megatest-version.o \ + ods.o \ + portlogger.o \ + process.o \ + rmt.o \ + rpc-transport.o \ + runconfig.o \ + runs.o \ + server.o \ + tasks.o \ + tdb.o \ + tests.o \ + subrun.o \ + + +tcmt : $(TCMTOBJS) tcmt.scm + csc $(CSCOPTS) $(TCMTOBJS) tcmt.scm -o tcmt + # install documentation to $(PREFIX)/docs # DOES NOT REBUILD DOCS # $(PREFIX)/share/docs/megatest_manual.html : docs/manual/megatest_manual.html mkdir -p $(PREFIX)/share/docs $(INSTALL) docs/manual/megatest_manual.html $(PREFIX)/share/docs/megatest_manual.html for png in $(PNGFILES);do $(INSTALL) docs/manual/$$png $(PREFIX)/share/docs/$$png;done +# add a fake dependency so this doens't copy everytime +$(PREFIX)/share/js/jquery-3.1.0.slim.min.js : # .fslckout + mkdir -p $(PREFIX)/share/js + fossil wiki export java-script-lib > $(PREFIX)/share/js/jquery-3.1.0.slim.min.js + $(PREFIX)/share/db/mt-pg.sql : mt-pg.sql mkdir -p $(PREFIX)/share/db $(INSTALL) mt-pg.sql $(PREFIX)/share/db/mt-pg.sql #multi-dboard : multi-dboard.scm $(OFILES) $(GOFILES) @@ -72,18 +145,18 @@ # # $(PREFIX)/bin/revtagfsl : utils/revtagfsl.scm # csc utils/revtagfsl.scm -o $(PREFIX)/bin/revtagfsl # Special dependencies for the includes -tests.o db.o launch.o runs.o dashboard-tests.o dashboard-guimonitor.o dashboard-main.o monitor.o dashboard.o \ +tests.o db.o launch.o runs.o dashboard-tests.o dashboard-context-menu.o dashboard-guimonitor.o dashboard-main.o monitor.o dashboard.o \ archive.o megatest.o : db_records.scm -tests.o runs.o dashboard.o dashboard-tests.o dashboard-main.o : run_records.scm +tests.o runs.o dashboard.o dashboard-tests.o dashboard-context-menu.o dashboard-main.o : run_records.scm db.o ezsteps.o keys.o launch.o megatest.o monitor.o runs-for-ref.o runs.o tests.o : key_records.scm tests.o tasks.o dashboard-tasks.o : task_records.scm runs.o : test_records.scm megatest.o : megatest-fossil-hash.scm -rmt.scm client.scm common.scm configf.scm dashboard-guimonitor.scm dashboard-tests.scm dashboard.scm db.scm dcommon.scm ezsteps.scm fs-transport.scm http-transport.scm index-tree.scm items.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm newdashboard.scm runconfig.scm runs.scm server.scm tdb.scm tests.scm tree.scm : common_records.scm rpc-transport.scm +rmt.scm client.scm common.scm configf.scm dashboard-guimonitor.scm dashboard-tests.scm dashboard.scm db.scm dcommon.scm ezsteps.scm fs-transport.scm http-transport.scm index-tree.scm items.scm keys.scm launch.scm megatest.scm monitor.scm mt.scm newdashboard.scm runconfig.scm runs.scm server.scm tdb.scm tests.scm tree.scm : common_records.scm common_records.scm : altdb.scm vg.o dashboard.o : vg_records.scm dcommon.o : run_records.scm # Temporary while transitioning to new routine # runs.o : run-tests-queue-classic.scm run-tests-queue-new.scm @@ -92,12 +165,12 @@ echo "(define megatest-fossil-hash \"$(MTESTHASH)\")" > megatest-fossil-hash.new if ! diff -q megatest-fossil-hash.new megatest-fossil-hash.scm ; then echo copying .new to .scm;cp -f megatest-fossil-hash.new megatest-fossil-hash.scm;fi $(OFILES) $(GOFILES) : common_records.scm -%.o : %.scm - csc $(CSCOPTS) -c $< +%.o : %.scm $(MOFILES) + csc $(CSCOPTS) -c $< $(MOFILES) $(PREFIX)/bin/.$(ARCHSTR)/mtest : mtest utils/mk_wrapper @echo Installing to PREFIX=$(PREFIX) $(INSTALL) mtest $(PREFIX)/bin/.$(ARCHSTR)/mtest utils/mk_wrapper $(PREFIX) mtest $(PREFIX)/bin/megatest @@ -111,13 +184,23 @@ chmod a+x $(PREFIX)/bin/newdashboard $(PREFIX)/bin/.$(ARCHSTR)/mtut : mtut $(INSTALL) mtut $(PREFIX)/bin/.$(ARCHSTR)/mtut +install-mtut : mtut + $(INSTALL) mtut $(PREFIX)/bin/mtut + $(PREFIX)/bin/mtutil : $(PREFIX)/bin/.$(ARCHSTR)/mtut utils/mk_wrapper utils/mk_wrapper $(PREFIX) mtut $(PREFIX)/bin/mtutil chmod a+x $(PREFIX)/bin/mtutil + +$(PREFIX)/bin/.$(ARCHSTR)/tcmt : tcmt + $(INSTALL) tcmt $(PREFIX)/bin/.$(ARCHSTR)/tcmt + +$(PREFIX)/bin/tcmt : $(PREFIX)/bin/.$(ARCHSTR)/tcmt utils/mk_wrapper + utils/mk_wrapper $(PREFIX) tcmt $(PREFIX)/bin/tcmt + chmod a+x $(PREFIX)/bin/tcmt # $(PREFIX)/bin/.$(ARCHSTR)/mdboard : multi-dboard # $(INSTALL) multi-dboard $(PREFIX)/bin/.$(ARCHSTR)/mdboard # $(PREFIX)/bin/mdboard : $(PREFIX)/bin/.$(ARCHSTR)/mdboard utils/mk_wrapper @@ -133,10 +216,14 @@ chmod a+x $@ $(PREFIX)/bin/mt_runstep : utils/mt_runstep $(INSTALL) $< $@ chmod a+x $@ + +$(PREFIX)/bin/serialize-env: serialize-env.scm + csc serialize-env.scm + $(INSTALL) serialize-env $@ $(PREFIX)/bin/mt_ezstep : utils/mt_ezstep $(INSTALL) $< $@ chmod a+x $@ @@ -191,13 +278,19 @@ chmod a+x $(PREFIX)/bin/dashboard $(INSTALL) dboard $(PREFIX)/bin/.$(ARCHSTR)/dboard install : $(PREFIX)/bin/.$(ARCHSTR) $(PREFIX)/bin/.$(ARCHSTR)/mtest $(PREFIX)/bin/megatest \ $(PREFIX)/bin/.$(ARCHSTR)/dboard $(PREFIX)/bin/dashboard $(HELPERS) $(PREFIX)/bin/nbfake \ + $(PREFIX)/bin/serialize-env \ $(PREFIX)/bin/nbfind $(PREFIX)/bin/loadrunner $(PREFIX)/bin/viewscreen $(PREFIX)/bin/mt_xterm \ + $(PREFIX)/share/docs/megatest_manual.html $(PREFIX)/bin/remrun \ $(PREFIX)/share/docs/megatest_manual.html $(PREFIX)/bin/remrun $(PREFIX)/bin/mtutil \ - $(PREFIX)/share/db/mt-pg.sql $(PREFIX)/bin/.$(ARCHSTR)/ndboard $(PREFIX)/bin/newdashboard + $(PREFIX)/bin/tcmt $(PREFIX)/share/db/mt-pg.sql \ + $(PREFIX)/share/js/jquery-3.1.0.slim.min.js +# $(PREFIX)/bin/.$(ARCHSTR)/ndboard + +# $(PREFIX)/bin/newdashboard $(PREFIX)/bin/.$(ARCHSTR) : mkdir -p $(PREFIX)/bin/.$(ARCHSTR) mkdir -p $(PREFIX)/bin/.$(ARCHSTR)/lib @@ -210,11 +303,11 @@ $(MTQA_FOSSIL) : fossil clone https://www.kiatoa.com/fossils/megatest_qa $(MTQA_FOSSIL) clean : - rm -f $(OFILES) $(GOFILES) megatest dboard dboard.o megatest.o dashboard.o megatest-fossil-hash.* altdb.scm + rm -f $(OFILES) $(GOFILES) $(MOFILES) $(TCMTOBJS) $(PREFIX)/megatest $(PREFIX)/dashboard mtest mtutil dboard dboard.o megatest.o dashboard.o megatest-fossil-hash.* altdb.scm mofiles/*.o vg.o #====================================================================== # Make the records files #====================================================================== @@ -268,19 +361,27 @@ xterm : sd (export BASEPATH=/tmp/$(USER)/basepath ; export PATH="$(PWD)/datashare-testing:$(PATH)" ; xterm &) datashare-testing/spublish : spublish.scm $(OFILES) - csc $(CSCOPTS) spublish.scm $(OFILES) -o datashare-testing/spublish - -datashare-testing/sretrieve : sretrieve.scm megatest-version.o margs.o configf.o process.o - csc $(CSCOPTS) sretrieve.scm megatest-version.o margs.o configf.o process.o -o datashare-testing/sretrieve - -sretrieve/sretrieve : datashare-testing/sretrieve - csc $(CSCOPTS) -deploy -deployed sretrieve.scm megatest-version.o margs.o configf.o process.o - chicken-install -keep-installed $(PROXY) -deploy -prefix sretrieve defstruct srfi-18 format sql-de-lite \ - srfi-1 posix regex regex-case srfi-69 + csc $(CSCOPTS) spublish.scm megatest-version.o margs.o process.o common.o -o datashare-testing/spublish + +datashare-testing/sretrieve : sretrieve.scm $(OFILES) + csc $(CSCOPTS) sretrieve.scm megatest-version.o margs.o process.o common.o -o datashare-testing/sretrieve + + +datashare-testing/sauthorize : sauthorize.scm $(OFILES) + csc $(CSCOPTS) sauthorize.scm megatest-version.o margs.o process.o common.o -o datashare-testing/sauthorize + +sauth-init: + mkdir -p datashare-testing + rm datashare-testing/sauthorize + rm datashare-testing/sretrieve + rm datashare-testing/spublish + +sauth : sauth-init datashare-testing/sauthorize datashare-testing/sretrieve datashare-testing/spublish + # base64 dot-locking \ # csv-xml z3 # "(define (toplevel-command . a) #f)" @@ -301,8 +402,25 @@ fi if csi -ne '(use postgresql)';then \ echo "(use postgresql)(hash-table-set! *available-db* 'postgresql #t)" >> altdb.scm;\ fi -portlogger-example : portlogger-example.scm api.o archive.o client.o common.o configf.o daemon.o dashboard-tests.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o megatest-version.o mt.o ods.o portlogger.o process.o rmt.o rpc-transport.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o - csc $(CSCOPTS) portlogger-example.scm api.o archive.o client.o common.o configf.o daemon.o dashboard-tests.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o megatest-version.o mt.o ods.o portlogger.o process.o rmt.o rpc-transport.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o +portlogger-example : portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o megatest-version.o mt.o ods.o portlogger.o process.o rmt.o rpc-transport.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o + csc $(CSCOPTS) portlogger-example.scm api.o archive.o client.o common.o configf.o dashboard-tests.o dashboard-context-menu.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o megatest-version.o mt.o ods.o portlogger.o process.o rmt.o rpc-transport.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o + +# create a pdf dot graphviz diagram from notations in rmt.scm +rmt.pdf : rmt.scm + grep ';;DOT' rmt.scm | sed -e 's/.*;;DOT //' > rmt.dot;dot -Tpdf rmt.dot -o rmt.pdf + +buildmanual: + cd docs/manual && make + +wikipage=plan +editwiki: + cd docs/manual && ../../utils/editwiki $(wikipage) + +viewmanual: + arora docs/manual/megatest_manual.html + +targets: + @grep : Makefile | perl -ne '/^([A-Za-z0-9_-]+):/ && print "$$1\n"' Index: Makefile.deploy ================================================================== --- Makefile.deploy +++ Makefile.deploy @@ -1,29 +1,60 @@ # make install CSCOPTS='-accumulate-profile -profile-name $(PWD)/profile-ww$(shell date +%V.%u)' + +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . +# + PREFIX=$(PWD) CSCOPTS= -deploy INSTALL=install +CHICKEN=$(shell which csc) +CHICKEN_BIN_DIR=$(shell dirname ${CHICKEN}/) +CHICKEN_DIR=${CHICKEN_BIN_DIR}/.. SRCFILES = common.scm items.scm launch.scm \ ods.scm runconfig.scm server.scm configf.scm \ db.scm keys.scm margs.scm megatest-version.scm \ process.scm runs.scm tasks.scm tests.scm genexample.scm \ - http-transport.scm filedb.scm \ - client.scm synchash.scm daemon.scm mt.scm \ + http-transport.scm filedb.scm tdb.scm \ + client.scm daemon.scm mt.scm \ ezsteps.scm lock-queue.scm sdb.scm \ - rmt.scm api.scm tdb.scm rpc-transport.scm \ - portlogger.scm archive.scm env.scm + rmt.scm api.scm subrun.scm \ + portlogger.scm archive.scm env.scm diff-report.scm cgisetup/models/pgdb.scm + +# module source files +MSRCFILES = ftail.scm # Eggs to install (straightforward ones) -EGGS=crypt matchable readline apropos base64 regex-literals format regex-case test coops trace csv \ +EGGS=matchable readline apropos base64 regex-literals format regex-case test coops trace csv \ dot-locking posix-utils posix-extras directory-utils hostinfo tcp-server rpc csv-xml fmt \ json md5 awful http-client spiffy uri-common intarweb spiffy-request-vars \ spiffy-directory-listing ssax sxml-serializer sxml-modifications iup canvas-draw sqlite3 GUISRCF = dashboard-tests.scm dashboard-guimonitor.scm gutils.scm dcommon.scm tree.scm vg.scm OFILES = $(SRCFILES:%.scm=%.o) GOFILES = $(GUISRCF:%.scm=%.o) + +MOFILES = $(addprefix mofiles/,$(MSRCFILES:%.scm=%.o)) + +mofiles/%.o : %.scm + mkdir -p mofiles + csc $(CSCOPTS) -J -c $< -o mofiles/$*.o ADTLSCR=mt_laststep mt_runstep mt_ezstep HELPERS=$(addprefix $(PREFIX)/bin/,$(ADTLSCR)) DEPLOYHELPERS=$(addprefix deploytarg/,$(ADTLSCR)) MTESTHASH=$(shell fossil info|grep checkout:| awk '{print $$2}') @@ -42,31 +73,46 @@ IMVER=3.11 IUPVER=3.17 KTYPE=26g4 CDVER=5.10 -all : $(PREFIX)/bin/.$(ARCHSTR) mtest dboard eggs sqlite matt iup +all : $(PREFIX)/bin/.$(ARCHSTR) postgres nanomsg mtest dboard mtut eggs sqlite matt iup wrappers -mtest: $(OFILES) readline-fix.scm megatest.o +mtest: $(OFILES) readline-fix.scm megatest.o $(MOFILES) mofiles/ftail.o mkdir -p $(PREFIX)/deploy - csc $(CSCOPTS) $(OFILES) megatest.o -o $(PREFIX)/deploy/mtest + csc $(CSCOPTS) $(OFILES) $(MOFILES) megatest.o -o $(PREFIX)/deploy/mtest + cp $(CKPATH)/lib/chicken/7/chicken.import.so $(PREFIX)/deploy/mtest + cp $(CKPATH)/lib/chicken/7/foreign.import.so $(PREFIX)/deploy/mtest + cp $(CKPATH)/lib/chicken/7/ports.import.so $(PREFIX)/deploy/mtest + cp $(CKPATH)/lib/chicken/7/data-structures.import.so $(PREFIX)/deploy/mtest + cp $(CKPATH)/lib/chicken/7/posix.import.so $(PREFIX)/deploy/mtest + cp $(CKPATH)/lib/chicken/7/irregex.import.so $(PREFIX)/deploy/mtest eggs: $(PREFIX)/deploy/mtest/fmt.so $(PREFIX)/deploy/mtest/fmt.so: - chicken-install -deploy -p $(PREFIX)/deploy/mtest base64 format regex-case simple-exceptions typed-records apropos directory-utils md5 spiffy http-client spiffy-request-vars spiffy-directory-listing posix-extras call-with-environment-variables csv typed-records pathname-expand json crypt dot-locking csv-xml z3 sql-de-lite hostinfo rpc directory-utils md5 spiffy http-client spiffy-request-vars spiffy-directory-listing posix-extras call-with-environment-variables rpc fmt + chicken-install -deploy -p $(PREFIX)/deploy/mtest base64 format regex-case simple-exceptions typed-records apropos directory-utils spiffy http-client spiffy-request-vars spiffy-directory-listing posix-extras call-with-environment-variables csv typed-records pathname-expand json crypt dot-locking csv-xml:0.10.2 z3 sql-de-lite hostinfo rpc directory-utils spiffy http-client spiffy-request-vars spiffy-directory-listing posix-extras call-with-environment-variables rpc fmt md5:3.1.0 check-errors:1.13.0 string-utils:1.2.4 message-digest:3.1.1 csv-xml:0.10.2 sha1 ansi-escape-sequences test slice rfc3339 uuid-lib filepath srfi-19:3.3.6 readline trace lolevel + cd utils/opensrc/mutils && chicken-install -deploy -p $(PREFIX)/deploy/mtest + cd ducttape && chicken-install -deploy -p $(PREFIX)/deploy/mtest + cp $(CHICKEN_DIR)/lib/chicken/7/chicken.import.so $(PREFIX)/deploy/mtest/ + cp $(CHICKEN_DIR)/lib/chicken/7/foreign* $(PREFIX)/deploy/mtest/ + cp $(CHICKEN_DIR)/lib/chicken/7/ports.import.so $(PREFIX)/deploy/mtest/ + cp $(CHICKEN_DIR)/lib/chicken/7/data-structures.import.so $(PREFIX)/deploy/mtest/ + cp $(CHICKEN_DIR)/lib/chicken/7/posix.import.so $(PREFIX)/deploy/mtest/ + cp $(CHICKEN_DIR)/lib/chicken/7/irregex.import.so $(PREFIX)/deploy/mtest/ + sqlite: $(PREFIX)/deploy/mtest/sqlite3.so $(PREFIX)/deploy/mtest/sqlite3.so: wget http://www.sqlite.org/2015/sqlite-autoconf-3090200.tar.gz tar xfz sqlite-autoconf-3090200.tar.gz cd sqlite-autoconf-3090200 - cd sqlite-autoconf-3090200 && ./configure --prefix=`realpath $(PREFIX)/deploy/mtest` + cd sqlite-autoconf-3090200 && ./configure --prefix=$(PREFIX)/deploy/mtest cd sqlite-autoconf-3090200 && make cd sqlite-autoconf-3090200 && make install - CSC_OPTIONS='-I$(PREFIX)/deploy/mtest/include -L$(PREFIX)/deploy/mtest/' chicken-install -deploy -p $(PREFIX)/deploy/mtest sqlite3 + CSC_OPTIONS='-I$(PREFIX)/deploy/mtest/include -L$(PREFIX)/deploy/mtest/' chicken-install -deploy -p $(PREFIX)/deploy/mtest sqlite3 check-errors:1.13.0 matt: $(PREFIX)/deploy/mtest/stml.so $(PREFIX)/deploy/mtest/stml.so: wget -c -O stml.tar.gz 'http://www.kiatoa.com/fossils/stml/tarball?name=stml&uuid=trunk' @@ -82,10 +128,39 @@ wget -c -O opensrc.tar.gz 'http://www.kiatoa.com/fossils/opensrc/tarball?name=opensrc&uuid=trunk' tar -xzf opensrc.tar.gz cd opensrc/mutils && chicken-install -deploy -p $(PREFIX)/deploy/mtest cd opensrc/dbi && chicken-install -deploy -p $(PREFIX)/deploy/mtest cd opensrc/margs && chicken-install -deploy -p $(PREFIX)/deploy/mtest + cd opensrc/pkts && chicken-install -deploy -p $(PREFIX)/deploy/mtest + +nanomsg: $(PREFIX)/deploy/mtest/libnanomsg.so.1.0.0 + +$(PREFIX)/deploy/mtest/libnanomsg.so.1.0.0: + wget --no-check-certificate https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz + mv 1.0.0 1.0.0.tar.gz + tar xf 1.0.0.tar.gz + cd nanomsg-1.0.0 && ./configure --prefix=$(PREFIX)/deploy/mtest + cd nanomsg-1.0.0 && make + cd nanomsg-1.0.0 && make install + CSC_OPTIONS="-I$(PREFIX)/deploy/mtest/include -L$(PREFIX)/deploy/mtest/lib -L$(PREFIX)/deploy/mtest/lib64/" chicken-install -deploy -p $(PREFIX)/deploy/mtest nanomsg + +$(PREFIX)/deploy/mtest/bin/pg_config: + wget -c https://ftp.postgresql.org/pub/source/v9.6.4/postgresql-9.6.4.tar.gz + tar xfz postgresql-9.6.4.tar.gz + cd postgresql-9.6.4 && ./configure --prefix=$(PREFIX)/deploy/mtest/ --with-openssl; + cd postgresql-9.6.4 && make + cd postgresql-9.6.4 && make install + +$(PREFIX)/deploy/mtest/postgresql.so: + CSC_OPTIONS="-I$(PREFIX)/deploy/mtest/include -L$(PREFIX)/deploy/mtest/lib -L$(PREFIX)/deploy/mtest/lib64/" chicken-install -deploy -p $(PREFIX)/deploy/mtest postgresql + +postgres: $(PREFIX)/deploy/mtest/bin/pg_config $(PREFIX)/deploy/mtest/postgresql.so + +ducttape: $(PREFIX)/deploy/mtest/ducttape.so + +$(PREFIX)/deploy/mtest/ducttape.so: + cd ducttape && chicken-install -p $(PREFIX)/deploy/mtest -deploy iup: $(PREFIX)/deploy/mtest/iup.so $(PREFIX)/deploy/mtest/iup.so: wget -c http://www.kiatoa.com/matt/chicken-build/cd/cd-${CDVER}_Linux${KTYPE}_${ARCHSIZE}lib.tar.gz @@ -95,31 +170,42 @@ tar -xzvf im-${IMVER}_Linux${KTYPE}_${ARCHSIZE}lib.tar.gz -C $(PREFIX)/deploy/mtest/ tar -xzvf iup-${IUPVER}_Linux${KTYPE}_${ARCHSIZE}lib.tar.gz -C $(PREFIX)/deploy/mtest/ cp $(PREFIX)/deploy/mtest/ftgl/lib/*/* $(PREFIX)/deploy/mtest/ wget -c -O ffcall.tar.gz 'http://www.kiatoa.com/fossils/ffcall/tarball?name=ffcall&uuid=trunk' tar -xzf ffcall.tar.gz - cd ffcall && ./configure --prefix=`realpath $(PREFIX)/deploy/mtest/` --enable-shared + cd ffcall && ./configure --prefix=$(PREFIX)/deploy/mtest/ --enable-shared cd ffcall && make CC="gcc -fPIC" cd ffcall && make install - CSC_OPTIONS="-I$(PREFIX)/deploy/mtest/include -L$(PREFIX)/deploy/mtest" chicken-install -deploy -p $(PREFIX)/deploy/mtest -D no-library-checks -feature disable-iup-web iup - CSC_OPTIONS="-I$(PREFIX)/deploy/mtest/include -L$(PREFIX)/deploy/mtest" chicken-install -deploy -p $(PREFIX)/deploy/mtest -D no-library-checks canvas-draw + CSC_OPTIONS="-I$(PREFIX)/include -I$(PREFIX)/deploy/mtest/include -L$(PREFIX)/deploy/mtest" chicken-install -deploy -p $(PREFIX)/deploy/mtest -D no-library-checks -feature disable-iup-web iup + CSC_OPTIONS="-I$(PREFIX)/include -I$(PREFIX)/deploy/mtest//include -L$(PREFIX)/deploy/mtest" chicken-install -deploy -p $(PREFIX)/deploy/mtest -D no-library-checks canvas-draw -dboard: $(OFILES) $(GOFILES) dashboard.scm - csc $(CSCOPTS) $(OFILES) dashboard.scm $(GOFILES) -o $(PREFIX)/deploy/mtest/dboard2 +dboard: $(OFILES) $(GOFILES) dashboard.scm $(MOFILES) + csc $(CSCOPTS) $(OFILES) dashboard.scm $(GOFILES) $(MOFILES) -o $(PREFIX)/deploy/mtest/dboard2 cp $(PREFIX)/deploy/mtest/dboard2/dboard2 $(PREFIX)/deploy/mtest/dboard ndboard : newdashboard.scm $(OFILES) $(GOFILES) csc $(CSCOPTS) $(OFILES) $(GOFILES) newdashboard.scm -o $(PREFIX)/deploy/mtest/newdboard +mtut : $(OFILES) megatest-fossil-hash.scm mtut.scm + csc $(CSCOPTS) $(OFILES) mtut.scm -o $(PREFIX)/deploy/mtest/mtut + # install documentation to $(PREFIX)/docs # DOES NOT REBUILD DOCS # $(PREFIX)/share/docs/megatest_manual.html : docs/manual/megatest_manual.html mkdir -p $(PREFIX)/share/docs $(INSTALL) docs/manual/megatest_manual.html $(PREFIX)/share/docs/megatest_manual.html for png in $(PNGFILES);do $(INSTALL) docs/manual/$$png $(PREFIX)/share/docs/$$png;done +js : java-script-lib/jquery-3.1.0.slim.min.js + mkdir -p $(PREFIX)/share/js + cp java-script-lib/jquery-3.1.0.slim.min.js $(PREFIX)/share/js/jquery-3.1.0.slim.min.js + +$(PREFIX)/share/db/mt-pg.sql : mt-pg.sql + mkdir -p $(PREFIX)/share/db + $(INSTALL) mt-pg.sql $(PREFIX)/share/db/mt-pg.sql + #multi-dboard : multi-dboard.scm $(OFILES) $(GOFILES) # csc $(CSCOPTS) $(OFILES) $(GOFILES) multi-dboard.scm -o multi-dboard # # $(PREFIX)/bin/revtagfsl : utils/revtagfsl.scm @@ -155,10 +241,23 @@ utils/mk_wrapper $(PREFIX) mtest $(PREFIX)/bin/megatest chmod a+x $(PREFIX)/bin/megatest $(PREFIX)/bin/.$(ARCHSTR)/ndboard : ndboard $(INSTALL) ndboard $(PREFIX)/bin/.$(ARCHSTR)/ndboard + +$(PREFIX)/bin/.$(ARCHSTR)/mtut : mtut + $(INSTALL) mtut $(PREFIX)/bin/.$(ARCHSTR)/mtut + +install-mtut : mtut + echo $(INSTALL) + #$(INSTALL) mtut $(PREFIX)/bin/mtut + +$(PREFIX)/bin/mtutil : $(PREFIX)/bin/.$(ARCHSTR)/mtut utils/mk_wrapper + utils/mk_wrapper $(PREFIX) mtut $(PREFIX)/bin/mtutil + chmod a+x $(PREFIX)/bin/mtutil + +mtutil: $(PREFIX)/bin/mtutil $(PREFIX)/bin/newdashboard : $(PREFIX)/bin/.$(ARCHSTR)/ndboard utils/mk_wrapper utils/mk_wrapper $(PREFIX) ndboard $(PREFIX)/bin/newdashboard chmod a+x $(PREFIX)/bin/newdashboard @@ -203,10 +302,15 @@ $(PREFIX)/bin/loadrunner : utils/loadrunner $(INSTALL) $< $@ chmod a+x $@ +$(PREFIX)/bin/mtest-reaper: helpers/mtest-reaper.scm helpers/ducttape-lib.scm helpers/inteldate.scm helpers/mimetypes.scm + make -C helpers $@ PREFIX=$(PREFIX) INSTALL=$(INSTALL) ARCHSTR=$(ARCHSTR) + +mtest-reaper: $(PREFIX)/bin/mtest-reaper + # $(PREFIX)/bin/refdb : refdb # $(INSTALL) $< $@ # chmod a+x $@ deploytarg/nbfake : utils/nbfake @@ -226,16 +330,21 @@ utils/mk_wrapper $(PREFIX) dboard $(PREFIX)/bin/dashboard chmod a+x $(PREFIX)/bin/dashboard $(INSTALL) dboard $(PREFIX)/bin/.$(ARCHSTR)/dboard install : $(PREFIX)/bin/.$(ARCHSTR) $(PREFIX)/bin/.$(ARCHSTR)/mtest $(PREFIX)/bin/megatest \ - $(PREFIX)/bin/.$(ARCHSTR)/dboard $(PREFIX)/bin/dashboard $(HELPERS) $(PREFIX)/bin/nbfake \ - $(PREFIX)/bin/nbfind $(PREFIX)/bin/loadrunner $(PREFIX)/bin/viewscreen $(PREFIX)/bin/mt_xterm \ - $(PREFIX)/share/docs/megatest_manual.html + $(PREFIX)/bin/.$(ARCHSTR)/dboard $(PREFIX)/bin/dashboard $(HELPERS) $(PREFIX)/bin/nbfake \ + $(PREFIX)/bin/nbfind $(PREFIX)/bin/loadrunner $(PREFIX)/bin/viewscreen $(PREFIX)/bin/mt_xterm \ + $(PREFIX)/share/docs/megatest_manual.html $(PREFIX)/bin/remrun \ + $(PREFIX)/share/docs/megatest_manual.html $(PREFIX)/bin/remrun $(PREFIX)/bin/mtutil \ + $(PREFIX)/bin/tcmt $(PREFIX)/share/db/mt-pg.sql \ + js + $(PREFIX)/bin/.$(ARCHSTR) : mkdir -p $(PREFIX)/bin/.$(ARCHSTR) + mkdir -p $(PREFIX)/bin/.$(ARCHSTR)/lib test: tests/tests.scm cd tests;csi -I .. -b -n tests.scm ext-tests/.fslckout : $(MTQA_FOSSIL) @@ -262,19 +371,21 @@ $(DEPLOYHELPERS) : utils/mt_* $(INSTALL) $< $@ chmod a+X $@ deploytarg/apropos.so : Makefile - chicken-install -p deploytarg -deploy -keep-installed $(EGGS) - + for egg in $(EGGS); do \ + echo "chicken-install -p deploytarg -deploy -keep-installed $$egg "; \ + chicken-install -p deploytarg -deploy -keep-installed $$egg ; \ + done # for i in 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 check-errors synch matchable sql-null tcp-server rpc blob-utils string-utils variable-item defstruct uri-generic sendfile opensll openssl lookup-table list-utils stack; do \ # chicken-install -prefix deploytarg -deploy $$i;done # deploytarg/libsqlite3.so : # CSC_OPTIONS="-Ideploytarg -Ldeploytarg" $CHICKEN_INSTALL -prefix deploytarg -deploy sqlite3 -deploy : deploytarg/mtest deploytarg/dboard $(DEPLOYHELPERS) deploytarg/nbfake deploytarg/viewsceen deploytarg/nbfind deploytarg/apropos.so +deploy : deploytarg/mtest deploytarg/dboard $(DEPLOYHELPERS) deploytarg/nbfake deploytarg/remrun deploytarg/viewsceen deploytarg/nbfind deploytarg/apropos.so # deploytarg/libiupcd.so : $(CKPATH)/lib/libiupcd.so # for i in iup im cd av call sqlite; do \ # cp $(CKPATH)/lib/lib$$i* deploytarg/ ; \ # done @@ -331,11 +442,24 @@ echo ";; optional alternate db setup" > altdb.scm echo "(define *available-db* (make-hash-table))" >> altdb.scm if csi -ne '(use mysql-client)';then \ echo "(use mysql-client)(hash-table-set! *available-db* 'mysql #t)" >> altdb.scm; \ fi - if csi -ne '(use postgresql)';then \ - echo "(use postgresql)(hash-table-set! *available-db* 'postgresql #t)" >> altdb.scm;\ - fi +# if csi -ne '(use postgresql)';then \ +# echo "(use postgresql)(hash-table-set! *available-db* 'postgresql #t)" >> altdb.scm;\ +# fi portlogger-example : portlogger-example.scm api.o archive.o client.o common.o configf.o daemon.o dashboard-tests.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o megatest-version.o mt.o ods.o portlogger.o process.o rmt.o rpc-transport.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o csc $(CSCOPTS) portlogger-example.scm api.o archive.o client.o common.o configf.o daemon.o dashboard-tests.o db.o dcommon.o ezsteps.o filedb.o genexample.o gutils.o http-transport.o items.o keys.o launch.o lock-queue.o margs.o megatest-version.o mt.o ods.o portlogger.o process.o rmt.o rpc-transport.o runconfig.o runs.o sdb.o server.o synchash.o tasks.o tdb.o tests.o tree.o + +# create a pdf dot graphviz diagram from notations in rmt.scm +rmt.pdf : rmt.scm + grep ';;DOT' rmt.scm | sed -e 's/.*;;DOT //' > rmt.dot;dot -Tpdf rmt.dot -o rmt.pdf + +wrappers: wrappers/cfg.sh wrappers/megatest wrappers/dashboard + mkdir $(PREFIX)/deploy/mtest/.$(ARCHSTR) -p + cat wrappers/cfg.sh | sed 's#PREFIX#$(PREFIX)\/deploy\/mtest#g' > $(PREFIX)/deploy/mtest/.$(ARCHSTR)/cfg.sh + cat wrappers/megatest | sed 's#PREFIX#$(PREFIX)\/deploy\/mtest#g' | sed 's#ARCHSTR#.$(ARCHSTR)#g' > $(PREFIX)/deploy/mtest/megatest + cat wrappers/dashboard | sed 's#PREFIX#$(PREFIX)\/deploy\/mtest#g'| sed 's#ARCHSTR#.$(ARCHSTR)#g' > $(PREFIX)/deploy/mtest/dashboard + chmod +x $(PREFIX)/deploy/mtest/megatest + chmod +x $(PREFIX)/deploy/mtest/dashboard + Index: NOTES ================================================================== --- NOTES +++ NOTES @@ -1,5 +1,22 @@ +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . + ===================================================================== NOTES from looking at branch v1.62-rpc ===================================================================== *last-db-access* or *db-last-access* ==> which is it to be? Index: README ================================================================== --- README +++ README @@ -1,9 +1,26 @@ +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . + Megatest To build: -1. Install chicken scheme. See utils/Makefile.installall +1. Install chicken scheme. See opensrc repo utils/installall.sh http://www.kiatoa.com/fossils/opensrc 2. Compile with "make -j install PREFIX=/some/path" 3. To test .... Index: TODO ================================================================== --- TODO +++ TODO @@ -1,5 +1,21 @@ +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . TODO ==== . Dashboard should resist running from non-homehost @@ -12,5 +28,7 @@ . Re-work the dbstruct data structure? .. Move main.db to global? .. [ run-id.db inmemdb last-mod last-read last-sync inuse ] . Re-work all queries to use run-id to dereference server . Open main.db directly in calls to -runtests etc. No need to talk remote? +. remove common:faux-lock + Index: api.scm ================================================================== --- api.scm +++ api.scm @@ -1,14 +1,23 @@ ;;====================================================================== ;; Copyright 2006-2013, Matthew Welland. ;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. ;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . +;; ;;====================================================================== (use srfi-69 posix) (declare (unit api)) @@ -23,10 +32,12 @@ get-var get-keys get-key-vals test-toplevel-num-items get-test-info-by-id + get-steps-info-by-id + get-data-info-by-id test-get-rundir-from-test-id get-count-tests-running-for-testname get-count-tests-running get-count-tests-running-in-jobgroup get-previous-test-run-record @@ -39,32 +50,40 @@ get-prereqs-not-met get-count-tests-running-for-run-id get-run-info get-run-status get-run-stats + get-run-times get-targets get-target ;; register-run get-tests-tags + get-test-times get-tests-for-run get-test-id get-tests-for-runs-mindata + get-tests-for-run-mindata get-run-name-from-id get-runs + simple-get-runs get-num-runs + get-runs-cnt-by-patt get-all-run-ids get-prev-run-ids get-run-ids-matching-target get-runs-by-patt get-steps-data get-steps-for-test read-test-data + read-test-data* login tasks-get-last testmeta-get-record have-incompletes? synchash-get + get-changed-record-ids + get-run-record-ids )) (define api:write-queries '( get-keys-write ;; dummy "write" query to force server start @@ -126,10 +145,11 @@ (cond ((not (vector? dat)) ;; it is an error to not receive a vector (vector #f (vector #f "remote must be called with a vector"))) ((> *api-process-request-count* 20) ;; 20) (debug:print 0 *default-log-port* "WARNING: api:execute-requests received an overloaded message.") + (set! *server-overloaded* #t) (vector #f (vector #f 'overloaded))) ;; the inner vector is what gets returned. nope, don't know why. please refactor! (else (let* ((cmd-in (vector-ref dat 0)) (cmd (if (symbol? cmd-in) cmd-in @@ -152,11 +172,26 @@ ;; SERVERS ((start-server) (apply server:kind-run params)) ((kill-server) (set! *server-run* #f)) ;; TESTS - ((test-set-state-status-by-id) (apply mt:test-set-state-status-by-id dbstruct params)) + + ;;((test-set-state-status-by-id) (apply mt:test-set-state-status-by-id dbstruct params)) + ;;BB - commented out above because it was calling below, eventually, incorrectly (dbstruct passed to mt:test-set-state-status-by-id, which previosly did more, but now only passes thru to db:set-state-status-and-roll-up-items. + ((test-set-state-status-by-id) + + ;; (define (db:set-state-status-and-roll-up-items dbstruct run-id test-name item-path state status comment) + (db:set-state-status-and-roll-up-items + dbstruct + (list-ref params 0) ; run-id + (list-ref params 1) ; test-name + #f ; item-path + (list-ref params 2) ; state + (list-ref params 3) ; status + (list-ref params 4) ; comment + )) + ((delete-test-records) (apply db:delete-test-records dbstruct params)) ((delete-old-deleted-test-records) (apply db:delete-old-deleted-test-records dbstruct params)) ((test-set-state-status) (apply db:test-set-state-status dbstruct params)) ((test-set-top-process-pid) (apply db:test-set-top-process-pid dbstruct params)) ((set-state-status-and-roll-up-items) (apply db:set-state-status-and-roll-up-items dbstruct params)) @@ -193,10 +228,16 @@ ;; TASKS ((tasks-add) (apply tasks:add dbstruct params)) ((tasks-set-state-given-param-key) (apply tasks:set-state-given-param-key dbstruct params)) ((tasks-get-last) (apply tasks:get-last dbstruct params)) + ;; NO SYNC DB + ((no-sync-set) (apply db:no-sync-set *no-sync-db* params)) + ((no-sync-get/default) (apply db:no-sync-get/default *no-sync-db* params)) + ((no-sync-del!) (apply db:no-sync-del! *no-sync-db* params)) + ((no-sync-get-lock) (apply db:no-sync-get-lock *no-sync-db* params)) + ;; ARCHIVES ;; ((archive-get-allocations) ((archive-register-disk) (apply db:archive-register-disk dbstruct params)) ((archive-register-block-name)(apply db:archive-register-block-name dbstruct params)) ((archive-allocate-testsuite/area-to-block)(apply db:archive-allocate-testsuite/area-to-block dbstruct block-id testsuite-name areakey)) @@ -232,35 +273,43 @@ ((test-get-paths-matching-keynames-target-new) (apply db:test-get-paths-matching-keynames-target-new dbstruct params)) ((get-prereqs-not-met) (apply db:get-prereqs-not-met dbstruct params)) ((get-count-tests-running-for-run-id) (apply db:get-count-tests-running-for-run-id dbstruct params)) ((synchash-get) (apply synchash:server-get dbstruct params)) ((get-raw-run-stats) (apply db:get-raw-run-stats dbstruct params)) + ((get-test-times) (apply db:get-test-times dbstruct params)) ;; RUNS ((get-run-info) (apply db:get-run-info dbstruct params)) ((get-run-status) (apply db:get-run-status dbstruct params)) ((set-run-status) (apply db:set-run-status dbstruct params)) ((get-tests-for-run) (apply db:get-tests-for-run dbstruct params)) ((get-test-id) (apply db:get-test-id dbstruct params)) ((get-tests-for-run-mindata) (apply db:get-tests-for-run-mindata dbstruct params)) + ((get-tests-for-runs-mindata) (apply db:get-tests-for-runs-mindata dbstruct params)) ((get-runs) (apply db:get-runs dbstruct params)) + ((simple-get-runs) (apply db:simple-get-runs dbstruct params)) ((get-num-runs) (apply db:get-num-runs dbstruct params)) + ((get-runs-cnt-by-patt) (apply db:get-runs-cnt-by-patt dbstruct params)) ((get-all-run-ids) (db:get-all-run-ids dbstruct)) ((get-prev-run-ids) (apply db:get-prev-run-ids dbstruct params)) ((get-run-ids-matching-target) (apply db:get-run-ids-matching-target dbstruct params)) ((get-runs-by-patt) (apply db:get-runs-by-patt dbstruct params)) ((get-run-name-from-id) (apply db:get-run-name-from-id dbstruct params)) ((get-main-run-stats) (apply db:get-main-run-stats dbstruct params)) ((get-var) (apply db:get-var dbstruct params)) ((get-run-stats) (apply db:get-run-stats dbstruct params)) + ((get-run-times) (apply db:get-run-times dbstruct params)) ;; STEPS ((get-steps-data) (apply db:get-steps-data dbstruct params)) ((get-steps-for-test) (apply db:get-steps-for-test dbstruct params)) + ((get-steps-info-by-id) (apply db:get-steps-info-by-id dbstruct params)) ;; TEST DATA ((read-test-data) (apply db:read-test-data dbstruct params)) + ((read-test-data*) (apply db:read-test-data* dbstruct params)) + ((get-data-info-by-id) (apply db:get-data-info-by-id dbstruct params)) ;; MISC ((get-latest-host-load) (apply db:get-latest-host-load dbstruct params)) ((have-incompletes?) (apply db:have-incompletes? dbstruct params)) ((login) (apply db:login dbstruct params)) @@ -268,12 +317,12 @@ (run-id (cadr params)) (realparams (cddr params))) (db:general-call dbstruct stmtname realparams))) ((sdb-qry) (apply sdb:qry params)) ((ping) (current-process-id)) - ((get-changed-record-ids) (apply db:get-changed-record-ids dbstruct params)) - + ((get-changed-record-ids) (apply db:get-changed-record-ids dbstruct params)) + ((get-run-record-ids) (apply db:get-run-record-ids dbstruct params)) ;; TESTMETA ((testmeta-get-record) (apply db:testmeta-get-record dbstruct params)) ;; TASKS ((find-task-queue-records) (apply tasks:find-task-queue-records dbstruct params)) Index: archive.scm ================================================================== --- archive.scm +++ archive.scm @@ -1,18 +1,26 @@ ;; Copyright 2006-2014, Matthew Welland. ;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. ;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . +;; ;; strftime('%m/%d/%Y %H:%M:%S','now','localtime') -(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking format md5 message-digest srfi-18) -(import (prefix sqlite3 sqlite3:)) +(use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 format md5 message-digest srfi-18) (declare (unit archive)) (declare (uses db)) (declare (uses common)) @@ -30,11 +38,11 @@ (flavor 'plain) ;; type of machine to run jobs on (maxload 1.5) ;; max allowed load for this work (adisks (archive:get-archive-disks))) ;; get testdir size ;; - hand off du to job mgr - (if (and (file-exists? testdir) + (if (and (common:file-exists? testdir) (file-is-writable? testdir)) (let* ((dused (jobrunner:run-job flavor ;; machine type maxload ;; max allowed load '() ;; prevars - environment vars to set for the job @@ -72,29 +80,49 @@ (or (common:get-disk-with-most-free-space candidate-disks dused) (archive:allocate-new-archive-block #f #f #f)))) ;; BROKEN. testname itempath)))) ;; allocate a new archive area ;; -(define (archive:allocate-new-archive-block run-area-home testsuite-name dneeded) - (let* ((adisks (archive:get-archive-disks)) - (best-disk (common:get-disk-with-most-free-space adisks dneeded))) - (if best-disk - (let* ((bdisk-name (car best-disk)) - (bdisk-path (cdr best-disk)) - (area-key (substring (message-digest-string (md5-primitive) run-area-home) 0 5)) - (bdisk-id (rmt:archive-register-disk bdisk-name bdisk-path (get-df bdisk-path))) - (archive-name (let ((sec (current-seconds))) - (conc (time->string (seconds->local-time sec) "%Y") - "_q" (seconds->quarter sec) "/" - testsuite-name "_" area-key))) - (archive-path (conc bdisk-path "/" archive-name)) - (block-id (rmt:archive-register-block-name bdisk-id archive-path))) - ;; (allocation-id (rmt:archive-allocate-testsuite/area-to-block block-id testsuite-name area-key))) - (if block-id ;; (and block-id allocation-id) - (cons block-id archive-path) - #f)) - #f))) +(define (archive:allocate-new-archive-block blockid-cache run-area-home testsuite-name dneeded target run-name test-name) + (let ((key (conc testsuite-name "/" target "/" run-name "/" test-name))) + (if (hash-table-exists? blockid-cache key) + (hash-table-ref blockid-cache key) + (let* ((pscript (configf:lookup *configdat* "archive" "pathscript")) + (pscript-cmd (conc pscript " " testsuite-name " " target " " run-name " " test-name)) + (apath (if pscript + (handle-exceptions + exn + (begin + (debug:print 0 "ERROR: script \"" pscript-cmd "\" failed to run properly.") + (exit 1)) + (with-input-from-pipe + pscript-cmd + read-line)) + #f)) ;; this is the user-calculated archive path + (adisks (archive:get-archive-disks)) + (best-disk (common:get-disk-with-most-free-space adisks dneeded))) + (if best-disk + (let* ((bdisk-name (car best-disk)) + (bdisk-path (cdr best-disk)) + (area-key (substring (message-digest-string (md5-primitive) run-area-home) 0 5)) + (bdisk-id (rmt:archive-register-disk bdisk-name bdisk-path (get-df bdisk-path))) + (archive-name (if apath + apath + (let ((sec (current-seconds))) + (conc (time->string (seconds->local-time sec) "%Y") + "_q" (seconds->quarter sec) "/" + testsuite-name "_" area-key)))) + (archive-path (conc bdisk-path "/" archive-name)) + (block-id (rmt:archive-register-block-name bdisk-id archive-path))) + ;; (allocation-id (rmt:archive-allocate-testsuite/area-to-block block-id testsuite-name area-key))) + (if block-id ;; (and block-id allocation-id) + (let ((res (cons block-id archive-path))) + (hash-table-set! blockid-cache key res) + res) + #f)) + #f)) ;; no best disk found + ))) ;; archive - run bup ;; ;; 1. create the bup dir if not exists ;; 2. start the du of each directory @@ -103,28 +131,31 @@ ;; (define (archive:run-bup archive-command run-id run-name tests rp-mutex bup-mutex) ;; move the getting of archive space down into the below block so that a single run can ;; allocate as needed should a disk fill up ;; - (let* ((min-space (string->number (or (configf:lookup *configdat* "archive" "minspace") "1000"))) - (archive-info (archive:allocate-new-archive-block *toppath* (common:get-testsuite-name) min-space)) - (archive-dir (if archive-info (cdr archive-info) #f)) - (archive-id (if archive-info (car archive-info) -1)) - (disk-groups (make-hash-table)) - (test-groups (make-hash-table)) ;; these two (disk and test groups) could be combined nicely - (bup-exe (or (configf:lookup *configdat* "archive" "bup") "bup")) - (compress (or (configf:lookup *configdat* "archive" "compress") "9")) - (linktree (common:get-linktree))) ;; (configf:lookup *configdat* "setup" "linktree"))) - - (if (not archive-dir) ;; no archive disk found, this is fatal - (begin - (debug:print 0 *default-log-port* "FATAL: No archive disks found. Please add disks with at least " min-space " MB space to the [archive-disks] section of megatest.config") - (debug:print 0 *default-log-port* " use [archive] minspace to specify minimum available space") - (debug:print 0 *default-log-port* " disks: " (string-intersperse (map cadr (archive:get-archive-disks)) "\n ")) - (exit 1)) - (debug:print-info 0 *default-log-port* "Using path " archive-dir " for archiving")) - + (let* ((blockid-cache (make-hash-table)) + (tsname (common:get-testsuite-name)) + (min-space (string->number (or (configf:lookup *configdat* "archive" "minspace") "1000"))) + (arch-groups (make-hash-table)) ;; archive groups, each corrosponds to a bup area + (disk-groups (make-hash-table)) ;; + (test-groups (make-hash-table)) ;; these two (disk and test groups) could be combined nicely + (test-dirs (make-hash-table)) + (bup-exe (or (configf:lookup *configdat* "archive" "bup") "bup")) + (compress (or (configf:lookup *configdat* "archive" "compress") "9")) + (linktree (common:get-linktree)) ;; (configf:lookup *configdat* "setup" "linktree"))) + (archiver (let ((s (configf:lookup *configdat* "archive" "archiver"))) + (if s (string->symbol s) 'bup))) + (archiver-cmd (case archiver + ((tar) "tar cfj ARCHIVE_NAME.tar.bz2 ") + ((7z) " 7z u -t7z -m0=lzma -mx=9 -mfb=64 -md=32m -ms=on ARCHIVE_NAME.7z ") + (else #f))) + (print-prefix "Running: ") ;; change to #f to turn off printing + (preclean-spec (configf:get-section *configdat* "archive-preclean"))) + + ;; (tests:match patt testname itempath) + ;; from the test info bin the path to the test by stem ;; (for-each (lambda (test-dat) (let* ((item-path (db:test-get-item-path test-dat)) @@ -137,78 +168,146 @@ (> (rmt:test-toplevel-num-items run-id test-name) 0))) (test-partial-path (conc target "/" run-name "/" (db:test-make-full-name test-name item-path))) ;; note the trailing slash to get the dir inspite of it being a link (test-path (conc linktree "/" test-partial-path)) (mutex-lock! rp-mutex) - (test-physical-path (if (file-exists? test-path) + (test-physical-path (if (common:file-exists? test-path) (common:real-path test-path) #f)) (mutex-unlock! rp-mutex) (partial-path-index (if test-physical-path (substring-index test-partial-path test-physical-path) #f)) (test-base (if (and partial-path-index test-physical-path ) (substring test-physical-path 0 partial-path-index) - #f))) + #f)) + ;; we need our archive dir checked for every test to enable folks who want to store other ways. + (archive-info (archive:allocate-new-archive-block blockid-cache *toppath* tsname min-space target run-name test-name)) + (archive-dir (if archive-info (cdr archive-info) #f)) + (archive-id (if archive-info (car archive-info) -1)) + + ) - (cond + (if (not archive-dir) ;; no archive disk found, this is fatal + (begin + (debug:print 0 *default-log-port* "FATAL: No archive disks found. Please add disks with at least " + min-space " MB space to the [archive-disks] section of megatest.config") + (debug:print 0 *default-log-port* " use [archive] minspace to specify minimum available space") + (debug:print 0 *default-log-port* " disks: " + (string-intersperse (map cadr (archive:get-archive-disks)) "\n ")) + (exit 1)) + (debug:print-info 0 *default-log-port* "Using path " archive-dir " for archiving test " test-path)) + + ;; preclean the test directory per the spec if provided + (if (not (null? preclean-spec)) ;; we've been asked to preclean before archiving + (let loop ((spec (car preclean-spec)) + (tail (cdr preclean-spec))) + (if (> (length spec) 1) + (let ((testspec (car spec)) + (rules (cadr spec))) + (if (tests:match testspec test-name item-path) + (begin + (debug:print 0 *default-log-port* "INFO: cleanup requested for " test-physical-path) + (common:dir-clean-up test-physical-path rules remove-empty: #t)) + (if (not (null? tail)) + (loop (car tail)(cdr tail))))) + (begin + (debug:print 0 *default-log-port* "ERROR: bad spec line in [archive-preclean] section. \"" spec "\"") + (if (not (null? tail))(loop (car tail)(cdr tail))))))) + (cond (toplevel/children - (debug:print 0 *default-log-port* "WARNING: cannot archive " test-name " with id " test-id " as it is a toplevel test with children")) - ((not (file-exists? test-path)) - (debug:print 0 *default-log-port* "WARNING: Cannot archive " test-name "/" item-path " as path " test-path " does not exist")) + (debug:print 0 *default-log-port* "WARNING: cannot archive " test-name " with id " test-id + " as it is a toplevel test with children")) + ((not (common:file-exists? test-path)) + (debug:print 0 *default-log-port* "WARNING: Cannot archive " test-name "/" item-path + " as path " test-path " does not exist")) (else (debug:print 0 *default-log-port* "From test-dat=" test-dat " derived the following:\n" "test-partial-path = " test-partial-path "\n" "test-path = " test-path "\n" "test-physical-path = " test-physical-path "\n" "partial-path-index = " partial-path-index "\n" "test-base = " test-base) - (hash-table-set! disk-groups test-base (cons test-physical-path (hash-table-ref/default disk-groups test-base '()))) - (hash-table-set! test-groups test-base (cons test-dat (hash-table-ref/default test-groups test-base '()))) - test-path)))) - tests) - ;; for each disk-group - (for-each - (lambda (disk-group) - (debug:print 0 *default-log-port* "Processing disk-group " disk-group) - (let* ((test-paths (hash-table-ref disk-groups disk-group)) - ;; ((string-intersperse (map cadr (rmt:get-key-val-pairs 1)) "-") - (bup-init-params (list "-d" archive-dir "init")) - (bup-index-params (append (list "-d" archive-dir "index") test-paths)) - (bup-save-params (append (list "-d" archive-dir "save" ;; (conc "--strip-path=" linktree) - (conc "-" compress) ;; or (conc "--compress=" compress) - "-n" (conc (common:get-testsuite-name) "-" run-id) - (conc "--strip-path=" disk-group)) - test-paths)) - (print-prefix #f)) ;; "Running: ")) ;; change to #f to turn off printing - (if (not (file-exists? archive-dir)) - (create-directory archive-dir #t)) - (if (not (file-exists? (conc archive-dir "/HEAD"))) - (begin - ;; replace this with jobrunner stuff enventually - (debug:print-info 0 *default-log-port* "Init bup in " archive-dir) - ;; (mutex-lock! bup-mutex) - (run-n-wait bup-exe params: bup-init-params print-cmd: print-prefix) - ;; (mutex-unlock! bup-mutex) - )) - (debug:print-info 0 *default-log-port* "Indexing data to be archived") - ;; (mutex-lock! bup-mutex) - (run-n-wait bup-exe params: bup-index-params print-cmd: print-prefix) - (debug:print-info 0 *default-log-port* "Archiving data with bup") - (run-n-wait bup-exe params: bup-save-params print-cmd: print-prefix) - ;; (mutex-unlock! bup-mutex) - (for-each - (lambda (test-dat) - (let ((test-id (db:test-get-id test-dat)) - (run-id (db:test-get-run_id test-dat))) - (rmt:test-set-archive-block-id run-id test-id archive-id) - (if (member archive-command '("save-remove")) - (runs:remove-test-directory test-dat 'archive-remove)))) - (hash-table-ref test-groups disk-group)))) - (hash-table-keys disk-groups)) + (hash-table-set! disk-groups test-base + (cons test-physical-path (hash-table-ref/default disk-groups test-base '()))) + (hash-table-set! test-groups test-base + (cons test-dat (hash-table-ref/default test-groups test-base '()))) + (hash-table-set! arch-groups test-base + (cons archive-info (hash-table-ref/default arch-groups test-base '()))) + (hash-table-set! test-dirs test-id test-path))))) + ;; test-path)))) + tests) + (debug:print 0 *default-log-port* "INFO: DISK GROUPS=" (hash-table->alist disk-groups)) + ;; for each disk-group, initialize the bup area if needed + (for-each + (lambda (test-base) + (let* ((disk-group (hash-table-ref disk-groups test-base)) + (arch-group (hash-table-ref arch-groups test-base)) + (arch-info (car arch-group)) ;; don't know yet how this will work, can I get more than one possibility? + (archive-id (car arch-info)) + (archive-dir (cdr arch-info))) + (debug:print 0 *default-log-port* "Processing disk-group " test-base) + (let* ((test-paths (hash-table-ref disk-groups test-base))) + (if (not (common:file-exists? archive-dir)) + (create-directory archive-dir #t)) + (case archiver + ((bup) ;; Archive using bup + (let* ((bup-init-params (list "-d" archive-dir "init")) + (bup-index-params (append (list "-d" archive-dir "index") test-paths)) + (bup-save-params (append (list "-d" archive-dir "save" ;; (conc "--strip-path=" linktree) + (conc "-" compress) ;; or (conc "--compress=" compress) + "-n" (conc (common:get-testsuite-name) "-" run-id) + (conc "--strip-path=" test-base) ;; if we push to the directory do we need this? + ) + test-paths))) + (if (not (common:file-exists? (conc archive-dir "/HEAD"))) + (begin + ;; replace this with jobrunner stuff enventually + (debug:print-info 0 *default-log-port* "Init bup in " archive-dir) + ;; (mutex-lock! bup-mutex) + (run-n-wait bup-exe params: bup-init-params print-cmd: print-prefix) + ;; (mutex-unlock! bup-mutex) + )) + (debug:print-info 0 *default-log-port* "Indexing data to be archived") + ;; (mutex-lock! bup-mutex) + (run-n-wait bup-exe params: bup-index-params print-cmd: print-prefix) + (debug:print-info 0 *default-log-port* "Archiving data with bup") + (run-n-wait bup-exe params: bup-save-params print-cmd: print-prefix))) + ((7z tar) + (for-each + (lambda (test-dat) + (let* ((test-id (db:test-get-id test-dat)) + (test-name (db:test-get-testname test-dat)) + (item-path (db:test-get-item-path test-dat)) + (test-full-name (db:test-make-full-name test-name item-path)) + (run-id (db:test-get-run_id test-dat)) + (target (string-intersperse (map cadr (rmt:get-key-val-pairs run-id)) "/")) + (run-name (rmt:get-run-name-from-id run-id)) + (source-dir (hash-table-ref test-dirs test-id)) ;; (conc test-base "/" test-name "/" item-path)) + (target-dir (string-substitute "/$" "" (conc archive-dir "/" target "/" run-name "/" test-full-name)))) + ;; create the test and item-path levels under archive-dir + (create-directory (pathname-directory target-dir) #t) + (run-n-wait + (conc + (string-substitute "ARCHIVE_NAME" target-dir archiver-cmd) " " + "." + ) + print-cmd: print-prefix + run-dir: source-dir))) + (hash-table-ref test-groups test-base)))) + ;; (mutex-unlock! bup-mutex) + (for-each + (lambda (test-dat) + (let ((test-id (db:test-get-id test-dat)) + (run-id (db:test-get-run_id test-dat))) + (rmt:test-set-archive-block-id run-id test-id archive-id) + (if (member archive-command '("save-remove")) + (runs:remove-test-directory test-dat 'archive-remove)))) + (hash-table-ref test-groups test-base))))) + (hash-table-keys disk-groups)) #t)) (define (archive:bup-restore archive-command run-id run-name tests rp-mutex bup-mutex) ;; move the getting of archive space down into the below block so that a single run can ;; allocate as needed should a disk fill up ;; @@ -233,11 +332,11 @@ (test-partial-path (conc target "/" run-name "/" (db:test-make-full-name test-name item-path))) ;; note the trailing slash to get the dir inspite of it being a link (test-path (conc linktree "/" test-partial-path)) ;; if the old path was not deleted then prev-test-physical-path will end up pointing to a real directory (mutex-lock! rp-mutex) - (prev-test-physical-path (if (file-exists? test-path) + (prev-test-physical-path (if (common:file-exists? test-path) ;; (read-symbolic-link test-path #t) (common:real-path test-path) #f)) (mutex-unlock! rp-mutex) (new-test-physical-path (conc best-disk "/" test-partial-path)) @@ -250,11 +349,11 @@ ;; some sanity checks, move an existing path out of the way - iif it is not a toplevel with children ;; (if (and (not toplevel/children) ;; special handling needed for toplevel with children prev-test-physical-path - (file-exists? prev-test-physical-path)) ;; what to do? abort or clean up or link it in? + (common:file-exists? prev-test-physical-path)) ;; what to do? abort or clean up or link it in? (let* ((base (pathname-directory prev-test-physical-path)) (dirn (pathname-file prev-test-physical-path)) (newn (conc base "/." dirn))) (debug:print-error 0 *default-log-port* "the old directory " prev-test-physical-path ", still exists! Moving it to " newn) (rename-file prev-test-physical-path newn))) DELETED batchsim/Makefile Index: batchsim/Makefile ================================================================== --- batchsim/Makefile +++ /dev/null @@ -1,8 +0,0 @@ -RUN=default.scm - -all : batchsim - ./batchsim $(RUN) - -batchsim : batchsim.scm - csc batchsim.scm - DELETED batchsim/batchsim.scm Index: batchsim/batchsim.scm ================================================================== --- batchsim/batchsim.scm +++ /dev/null @@ -1,417 +0,0 @@ -(use ezxdisp srfi-18) - -(define *ezx* (ezx-init 650 650 "Batch simulator")) -(require-library ezxgui) -(define *green* (make-ezx-color 0 1 0)) -(define *black* (make-ezx-color 0 0 0)) -(define *grey* (make-ezx-color 0.1 0.1 0.1)) -(define *blue* (make-ezx-color 0 0 1)) -(define *cyan* (make-ezx-color 0 1 1)) -(define *green* (make-ezx-color 0 1 0)) -(define *purple* (make-ezx-color 1 0 1)) -(define *red* (make-ezx-color 1 0 0)) -(define *white* (make-ezx-color 1 1 1)) -(define *yellow* (make-ezx-color 1 1 0)) - -(define *user-colors-palette* - (list - *green* - *blue* - *cyan* - *purple* - *red* - *yellow* - *black*)) - -(define *dark-green* (get-color "dark-green")) -(define *brown* (get-color "brown")) - -(ezx-select-layer *ezx* 1) -(ezx-wipe-layer *ezx* 1) - -;; (ezx-str-2d *ezx* 30 30 "Hello" *white*) -;; (ezx-fillrect-2d *ezx* 100 100 120 120 *brown*) -(ezx-redraw *ezx*) - -(define *last-draw* (current-milliseconds)) -(define *draw-delta* 40) ;; milliseconds between drawing - -(define (wait-for-next-draw-time) - (let* ((cm (current-milliseconds)) - (delta (- *draw-delta* (- cm *last-draw*)))) - (if (> delta 0) - (thread-sleep! (/ delta 1000))) - (set! *last-draw* (current-milliseconds)))) - -(include "events.scm") - -;; System spec (to be moved into loaded file) -;; -;; x y w gap x-min x-max -(define *cpu-grid* (vector 500 50 15 2 500 600)) -(define (make-cpu:grid)(make-vector 6)) -(define *queues* (make-hash-table)) ;; name -> (list (list user duration num-cpus num-gigs) ... ) -(define *cpus* (make-hash-table)) ;; cpu-name => (vector user job-len num-cpu mem x-loc y-loc) -(define *obj-locations* (make-hash-table)) ;; name -> (x y layer) -(define *queue-spec* - (vector - 80 ;; start-x - 300 ;; start-y - 300 ;; delta-y how far to next queue - 15 ;; height - 400 ;; length - )) -(define *use-log* #f) -(define *job-log-scale* 10) - -;;====================================================================== -;; CPU -;;====================================================================== - -(define-record cpu name num-cores mem job x y) - -;;====================================================================== -;; CPU Pool -;;====================================================================== - -(define-record pool name x y w h gap boxw cpus delta nrows ncols cpunum) - -(define (new-pool name x y nrows ncols gap boxw) - (let* ((delta (+ gap boxw)) - ;; (nrows (quotient h (+ gap delta))) - ;; (ncols (quotient w (+ gap delta))) - (w (+ gap (* nrows delta))) - (h (+ gap (* ncols delta))) - (cpus (make-vector (* nrows ncols) #f)) - (npool (make-pool name x y w h gap boxw cpus delta nrows ncols 0))) - npool)) - -(define (pool:add-cpu pool name num-cores mem) - (let* ((cpu (make-cpu name num-cores mem #f #f #f))) - (vector-set! (pool-cpus pool)(pool-cpunum pool) cpu) - (pool-cpunum-set! pool (+ 1 (pool-cpunum pool))) - cpu)) - -(define (pool:draw ezx pool) - (let ((nrows (pool-nrows pool)) - (ncols (pool-ncols pool)) - (x (pool-x pool)) - (y (pool-y pool)) - (w (pool-w pool)) - (h (pool-h pool)) - (gap (pool-gap pool)) - (boxw (pool-boxw pool)) - (delta (pool-delta pool)) - (cpus (pool-cpus pool))) - (ezx-select-layer ezx 1) - ;(ezx-wipe-layer ezx 1) - ;; draw time at upper right - (ezx-str-2d ezx x y (pool-name pool) *black*) - (ezx-rect-2d ezx x y (+ x w)(+ y h) *black* 1) - (let loop ((row 0) - (col 0) - (cpunum 0)) - (let* ((cpu (vector-ref cpus cpunum)) - (xval (+ x gap (* row delta))) - (yval (+ y gap (* col delta)))) - (if cpu - (begin - (cpu-x-set! cpu xval) - (cpu-y-set! cpu yval)) - (vector-set! cpus cpunum (make-cpu (conc cpunum) 1 1 #f xval yval))) - ;; (print "box at " xval ", " yval) - (ezx-rect-2d ezx xval yval (+ xval boxw) (+ yval boxw) *grey* 1) - (if (< col (- ncols 1)) - (loop row (+ col 1)(+ cpunum 1)) - (if (< row (- nrows 1)) - (loop (+ row 1) 0 (+ cpunum 1)))))) - (ezx-redraw ezx))) - - -;;====================================================================== -;; Users -;;====================================================================== - -(define *user-colors* (make-hash-table)) - -(define (get-user-color user) - (let ((color (hash-table-ref/default *user-colors* user #f))) - (if color - color - (let* ((color-num (+ (length (hash-table-keys *user-colors*)) 1)) - (color (list-ref *user-colors-palette* color-num))) - (hash-table-set! *user-colors* user color) - color)))) - -;;====================================================================== -;; Job Queues -;;====================================================================== - -;; jobs - -(define (make-queue:job)(make-vector 4)) -(define-inline (queue:job-get-user vec) (vector-ref vec 0)) -(define-inline (queue:job-get-duration vec) (vector-ref vec 1)) -(define-inline (queue:job-get-num-cpu vec) (vector-ref vec 2)) -(define-inline (queue:job-get-num-gigs vec) (vector-ref vec 3)) -(define-inline (queue:job-set-user! vec val)(vector-set! vec 0 val)) -(define-inline (queue:job-set-duration! vec val)(vector-set! vec 1 val)) -(define-inline (queue:job-set-num-cpu! vec val)(vector-set! vec 2 val)) -(define-inline (queue:job-set-num-gigs! vec val)(vector-set! vec 3 val)) - -;; add a job to the queue -;; -(define (add-job queue-name user duration num-cpu num-gigs) - (let* ((queue-dat (hash-table-ref/default *queues* queue-name '())) - (new-queue (append - queue-dat - (list (vector user duration num-cpu num-gigs))))) - (hash-table-set! *queues* queue-name new-queue) - (draw-queue-jobs queue-name))) - -;; peek for jobs to do in queue -;; -(define (peek-job queue-name) - (let ((queue (hash-table-ref/default *queues* queue-name '()))) - (if (null? queue) - #f - (car queue)))) - -;; take job from queue -;; -(define (take-job queue-name) - (let ((queue (hash-table-ref/default *queues* queue-name '()))) - (if (null? queue) - #f - (begin - (hash-table-set! *queues* queue-name (cdr queue)) - (draw-queue-jobs queue-name) - (car queue))))) - -;;====================================================================== -;; CPUs -;;====================================================================== - -(define (make-cpu:dat)(make-vector 6 #f)) -(define-inline (cpu:dat-get-user vec) (vector-ref vec 0)) -(define-inline (cpu:dat-get-job-len vec) (vector-ref vec 1)) -(define-inline (cpu:dat-get-num-cpu vec) (vector-ref vec 2)) -(define-inline (cpu:dat-get-mem vec) (vector-ref vec 3)) -(define-inline (cpu:dat-get-x vec) (vector-ref vec 4)) -(define-inline (cpu:dat-get-y vec) (vector-ref vec 5)) -(define-inline (cpu:dat-set-user! vec val)(vector-set! vec 0 val)) -(define-inline (cpu:dat-set-job-len! vec val)(vector-set! vec 1 val)) -(define-inline (cpu:dat-set-num-cpu! vec val)(vector-set! vec 2 val)) -(define-inline (cpu:dat-set-mem! vec val)(vector-set! vec 3 val)) -(define-inline (cpu:dat-set-x! vec val)(vector-set! vec 4 val)) -(define-inline (cpu:dat-set-y! vec val)(vector-set! vec 5 val)) - -(define-inline (cpu:grid-get-x vec) (vector-ref vec 0)) -(define-inline (cpu:grid-get-y vec) (vector-ref vec 1)) -(define-inline (cpu:grid-get-w vec) (vector-ref vec 2)) -(define-inline (cpu:grid-get-gap vec) (vector-ref vec 3)) -(define-inline (cpu:grid-get-x-min vec) (vector-ref vec 4)) -(define-inline (cpu:grid-get-x-max vec) (vector-ref vec 5)) -(define-inline (cpu:grid-set-x! vec val)(vector-set! vec 0 val)) -(define-inline (cpu:grid-set-y! vec val)(vector-set! vec 1 val)) -(define-inline (cpu:grid-set-w! vec val)(vector-set! vec 2 val)) -(define-inline (cpu:grid-set-gap! vec val)(vector-set! vec 3 val)) -(define-inline (cpu:grid-set-x-min! vec val)(vector-set! vec 4 val)) -(define-inline (cpu:grid-set-x-max! vec val)(vector-set! vec 5 val)) - -(define (add-cpu name num-cores mem) - (let ((x (cpu:grid-get-x *cpu-grid*)) - (y (cpu:grid-get-y *cpu-grid*)) - (delta (+ (cpu:grid-get-w *cpu-grid*)(cpu:grid-get-gap *cpu-grid*))) - (x-max (cpu:grid-get-x-max *cpu-grid*))) - (hash-table-set! *cpus* name (vector #f #f num-cores mem x y)) - (if (> x x-max) - (begin - (cpu:grid-set-x! *cpu-grid* (cpu:grid-get-x-min *cpu-grid*)) - (cpu:grid-set-y! *cpu-grid* (+ y delta))) - (cpu:grid-set-x! *cpu-grid* (+ x delta))))) - -;; draw grey box for each cpu on layer 2 -;; jobs are drawn on layer 1 -;; -(define (draw-cpus) ;; call once after init'ing all cpus - (ezx-select-layer *ezx* 1) - (ezx-wipe-layer *ezx* 1) - ;; draw time at upper right - (ezx-str-2d *ezx* 20 20 (seconds->h:m:s *now*) *black*) - (for-each - (lambda (cpu) - (let ((x (cpu:dat-get-x cpu)) - (y (cpu:dat-get-y cpu)) - (w (cpu:grid-get-w *cpu-grid*))) - (ezx-rect-2d *ezx* x y (+ x w) (+ y w) *grey* 1))) - (hash-table-values *cpus*)) - (ezx-redraw *ezx*)) - -(define (draw-jobs) - ;; (draw-cpus) - (ezx-select-layer *ezx* 2) - (ezx-wipe-layer *ezx* 2) - (for-each - (lambda (cpu) - (let* ((x (cpu:dat-get-x cpu)) - (y (cpu:dat-get-y cpu)) - (w (cpu:grid-get-w *cpu-grid*)) - (u (cpu:dat-get-user cpu))) - (if u ;; job running if not #f - (let ((color (get-user-color u))) - (ezx-fillrect-2d *ezx* (+ x 2)(+ 2 y)(+ x 9) (+ y 9) color))))) - (hash-table-values *cpus*)) - (ezx-redraw *ezx*)) - -(define (end-job cpu-name user) - (let ((cpu (hash-table-ref/default *cpus* cpu-name #f))) - (if cpu - (let ((curr-user (cpu:dat-get-user cpu))) ;; if it is a user name then job is not done - error - (if (or (not curr-user) - (not (equal? curr-user user))) - (print "ERROR: cpu " cpu-name " not running job for " user "!") - (begin - (cpu:dat-set-user! cpu #f) - (cpu:dat-set-job-len! cpu #f) - (draw-jobs)))) ;; hash-table-set! *cpus* cpu-name (make-cpu:dat)))) - (print "ERROR: no cpu " cpu-name " found. Ensure it is registered before addressing it.")))) - -(define (run-job cpu-name job) - (let* ((user (queue:job-get-user job)) - (job-len (queue:job-get-duration job)) - (cpu (hash-table-ref/default *cpus* cpu-name #f))) - (if cpu - (let ((curr-user (cpu:dat-get-user cpu))) ;; if it is a user name then job is not done - error - (if curr-user - (begin - (print "ERROR: cpu already busy! Adding more jobs not supported yet. " cpu-name) - #f) - (begin - (cpu:dat-set-user! cpu user) - (cpu:dat-set-job-len! cpu job-len) - (draw-jobs) - (hash-table-set! *cpus* cpu-name cpu) - (event (+ *now* job-len) (lambda ()(end-job cpu-name user))) - #t))) - #f))) - -(define (get-cpu) - (let ((all-cpus (hash-table-keys *cpus*))) - (if (null? all-cpus) - #f - (let loop ((hed (car all-cpus)) - (tal (cdr all-cpus))) - (if (cpu:dat-get-user (hash-table-ref/default *cpus* hed '(#f #f))) ;; if user is #f then cpu is available - (if (null? tal) - #f - (loop (car tal)(cdr tal))) - hed))))) - -;;====================================================================== -;; Animation -;;====================================================================== - -;; make-vector-record queue spec x y delta-y height length -(define (make-queue:spec)(make-vector 5)) -(define-inline (queue:spec-get-x vec) (vector-ref vec 0)) -(define-inline (queue:spec-get-y vec) (vector-ref vec 1)) -(define-inline (queue:spec-get-delta-y vec) (vector-ref vec 2)) -(define-inline (queue:spec-get-height vec) (vector-ref vec 3)) -(define-inline (queue:spec-get-length vec) (vector-ref vec 4)) -(define-inline (queue:spec-set-x! vec val)(vector-set! vec 0 val)) -(define-inline (queue:spec-set-y! vec val)(vector-set! vec 1 val)) -(define-inline (queue:spec-set-delta-y! vec val)(vector-set! vec 2 val)) -(define-inline (queue:spec-set-height! vec val)(vector-set! vec 3 val)) -(define-inline (queue:spec-set-length! vec val)(vector-set! vec 4 val)) - -;; queues are drawn on layer 3 but boxes (jobs) are drawn on the numbered layer -;; -(define (draw-queues) - (let* ((text-offset 3) - (queue-names (sort (hash-table-keys *queues*) string>=?)) - (start-x (vector-ref *queue-spec* 0)) - (text-x (+ start-x text-offset)) - (delta-y (vector-ref *queue-spec* 1)) - (delta-x (vector-ref *queue-spec* 2)) - (height (vector-ref *queue-spec* 3)) - (length (vector-ref *queue-spec* 4)) - (end-x (+ start-x length))) - (ezx-select-layer *ezx* 3) - (ezx-wipe-layer *ezx* 3) - (let loop ((y (vector-ref *queue-spec* 1)) - (qname (car queue-names)) - (tail (cdr queue-names)) - (layer 4)) - (print "Drawing queue at x=" start-x ", y=" y) - (ezx-fillrect-2d *ezx* start-x y end-x (+ y height) *brown*) - (ezx-str-2d *ezx* text-x (- (+ y height) text-offset) qname *white*) - (hash-table-set! *obj-locations* qname (list start-x y layer)) - (if (not (null? tail)) - (loop (+ y height delta-y) - (car tail) - (cdr tail) - (+ layer 1)))) - (ezx-redraw *ezx*))) - -;; compress queue data to (vector user count) list -;; -(define (draw-queue-compress-queue-data queue-dat) - (let loop ((hed (car queue-dat)) - (tal (cdr queue-dat)) - (curr #f) ;; (vector name count) - (res '())) - (let ((user (queue:job-get-user hed))) - (cond - ((not curr) ;; first time through only? - (if (null? tal) - (append res (list (vector user 1))) - (loop (car tal)(cdr tal)(vector user 1) res))) - ((equal? (vector-ref curr 0) user) - (vector-set! curr 1 (+ (vector-ref curr 1) 1)) - (if (null? tal) - (append res (list curr)) - (loop (car tal)(cdr tal) curr res))) - (else ;; names are different, add curr to queue and create new curr - (let ((newcurr (vector user 1))) - (if (null? tal) - (append res (list newcurr)) - (loop (car tal)(cdr tal) newcurr (append res (list curr)))))))))) - -;; draw jobs for a given queue -;; -(define (draw-queue-jobs queue-name) - (let* ((queue-dat (hash-table-ref/default *queues* queue-name #f)) ;; list of jobs in the queue - (obj-spec (hash-table-ref/default *obj-locations* queue-name #f))) ;; x, y etc. of the drawn queue - (if obj-spec - (let ((origin-x (list-ref obj-spec 0)) - (origin-y (list-ref obj-spec 1)) - (bar-width 10) - (queue-len (queue:spec-get-length *queue-spec*)) - (layer (list-ref obj-spec 2))) - (ezx-select-layer *ezx* layer) - (ezx-wipe-layer *ezx* layer) - (if (not (null? queue-dat)) - (let ((res (draw-queue-compress-queue-data queue-dat))) - (if (not (null? res)) - (let loop ((hed (car res)) - (tal (cdr res)) - (x2 (+ origin-x queue-len))) - (let* ((user (vector-ref hed 0)) - (h (let ((numjobs (vector-ref hed 1))) - (if *use-log* - (inexact->exact (round (log (+ 1 (* *job-log-scale* numjobs))))) - numjobs))) - (x1 (- x2 bar-width)) - (y2 (- origin-y h))) - ;; (print "x1 " x1 ", origin-y " origin-y ", x2 " x2 ", y2 " y2) - (ezx-fillrect-2d *ezx* x1 y2 x2 origin-y (get-user-color user)) - (if (not (null? tal)) - (loop (car tal)(cdr tal) x1))))) - (ezx-redraw *ezx*))))))) - -(let* ((args (argv)) - (fname (if (> (length args) 1) - (cadr args) - "default.scm"))) - (load (if (file-exists? fname) fname "default.scm"))) DELETED batchsim/default.scm Index: batchsim/default.scm ================================================================== --- batchsim/default.scm +++ /dev/null @@ -1,133 +0,0 @@ -;; run sim for four hours -;; -(define *end-time* (* 60 50)) - -;; create the cpus -;; -(let loop ((count 200)) - (add-cpu (conc "cpu_" count) 1 1) - (if (>= count 0)(loop (- count 1)))) - -(draw-cpus) - -(define *pool1* (new-pool "generic" 100 100 100 100 2 10)) -(let loop ((count 10)) - (pool:add-cpu *pool1* (conc count) 1 1) - (if (> count 0) - (loop (- count 1)))) - -(pool:draw *ezx* *pool1*) - -;; init the queues -;; -(hash-table-set! *queues* "normal" '()) -(hash-table-set! *queues* "quick" '()) -(draw-queues) - -;; user k adds 200 jobs at time zero -;; -(event *start-time* - (lambda () - (let loop ((count 300)) ;; add 500 jobs - (add-job "normal" "k" 600 1 1) - (if (>= count 0)(loop (- count 1)))))) - -;; one minute in user m runs ten jobs -;; -(event (+ 600 *start-time*) - (lambda () - (let loop ((count 300)) ;; add 100 jobs - (add-job "normal" "m" 600 1 1) - (if (> count 0)(loop (- count 1)))))) - -;; every minute user j runs ten jobs -;; -(define *user-j-jobs* 300) -(event (+ 600 *start-time*) - (lambda () - (let f () - (schedule 60) - (if (> *user-j-jobs* 0) - (begin - (let loop ((count 5)) ;; add 100 jobs - (add-job "quick" "j" 600 1 1) - (if (> count 0)(loop (- count 1)))) - (set! *user-j-jobs* (- *user-j-jobs* 5)))) - (if (and (not *done*) - (> *user-j-jobs* 0)) - (f))))) ;; Megatest user running 200 jobs - -;; every minute user j runs ten jobs -;; -(define *user-j-jobs* 300) -(event (+ 630 *start-time*) - (lambda () - (let f () - (schedule 60) - (if (> *user-j-jobs* 0) - (begin - (let loop ((count 5)) ;; add 100 jobs - (add-job "quick" "n" 600 1 1) - (if (> count 0)(loop (- count 1)))) - (set! *user-j-jobs* (- *user-j-jobs* 5)))) - (if (and (not *done*) - (> *user-j-jobs* 0)) - (f))))) ;; Megatest user running 200 jobs - -;; ;; -;; (event *start-time* -;; (lambda () -;; (let f ((count 200)) -;; (schedule 10) -;; (add-job "normal" "t" 60 1 1) -;; (if (and (not *done*) -;; (>= count 0)) -;; (f (- count 1)))))) - -;; every 3 seconds check for available machines and launch a job -;; -(event *start-time* - (lambda () - (let f () - (schedule 3) - (let ((queue-names (random-sort (hash-table-keys *queues*)))) - (let loop ((cpu (get-cpu)) - (count (+ (length queue-names) 4)) - (qname (car queue-names)) - (remq (cdr queue-names))) - (if (and cpu - (> count 0)) - (begin - (if (peek-job qname) ;; any jobs to do in normal queue - (let ((job (take-job qname))) - (run-job cpu job))) - (loop (get-cpu) - (- count 1) - (if (null? remq) - (car queue-names) - (car remq)) - (if (null? remq) - (cdr queue-names) - (cdr remq))))))) - (if (not *done*)(f))))) - -;; screen updates -;; -(event *start-time* (lambda () - (let f () - (schedule 60) ;; update the screen every 60 seconds of sim time - (draw-cpus) ;; (print "Now: " *now* " queue: " (hash-table->alist *queues*)) - (wait-for-next-draw-time) - (if (not *done*) (f))))) - - -;; end the simulation -;; -(event *end-time* - (lambda () - (set! *event-list* '()) - (set! *done* #t))) - -(start) -;; (exit 0) - DELETED batchsim/events.scm Index: batchsim/events.scm ================================================================== --- batchsim/events.scm +++ /dev/null @@ -1,79 +0,0 @@ - -;;====================================================================== -;; Event Processing and Simulator -;;====================================================================== - -;; The global event list -(define *event-list* '()) -(define *start-time* 0) -(define *end-time* (* 60 60 4)) ;; four hours -(define *now* *start-time*) -(define *done* #f) - -(define (random-sort l) - (sort l - (lambda (x y) - (equal? 0 (random 2))))) - -;; Each item in the event list is a list of a scheduled time and the thunk -;; (time thunk). Sort the list so that the next event is the earliest. -;; -(define event-sort - (lambda (@a @b) - (< (car @a)(car @b)))) - -(define event - (lambda ($time $thunk) ;; add a sort based on scheduled time here -- improve later - ;; to use an insert algorythm. - (set! *event-list* (sort (cons (list $time $thunk) *event-list*) event-sort)))) - -(define start - (lambda () - (let ((next (car *event-list*))) - (set! *event-list* (cdr *event-list*)) - (set! *now* (car next)) - (if (not *done*) ;; note that the second item in the list is the thunk - ((car (cdr next))))))) - -(define pause - (lambda () - (call/cc - (lambda (k) - (event (lambda () (k #f))) - (start))))) - -(define schedule - (lambda ($time) - (call/cc - (lambda (k) - (event (+ *now* $time) (lambda () (k #f))) - (start))))) - -;; (event (lambda () (let f () (pause) (display "h") (f)))) - -(define years->seconds - (lambda ($yrs) - (* $yrs 365 24 3600))) - -(define weeks->seconds - (lambda ($wks) - (* $wks 7 24 3600))) - -(define days->seconds - (lambda ($days) - (* $days 24 3600))) - -(define months->seconds - (lambda ($months) - (* $months (/ 365 12) 24 3600))) - -(define seconds->date - (lambda ($seconds) - (posix-strftime "%D" (posix-localtime (inexact->exact $seconds))))) - -(define (seconds->h:m:s seconds) - (let* ((hours (quotient seconds 3600)) - (rem1 (- seconds (* hours 3600))) - (minutes (quotient rem1 60)) - (rem-sec (- rem1 (* minutes 60)))) - (conc hours "h " minutes "m " rem-sec "s"))) DELETED batchsim/testing.scm Index: batchsim/testing.scm ================================================================== --- batchsim/testing.scm +++ /dev/null @@ -1,135 +0,0 @@ -;; run sim for four hours -;; -(define *end-time* (* 60 50)) - -;; create the cpus -;; -(let loop ((count 200)) - (add-cpu (conc "cpu_" count) 1 1) - (if (>= count 0)(loop (- count 1)))) - -;; (draw-cpus) - -(define *pool1* (new-pool "generic" 20 20 12 80 2 4)) -(let loop ((count 10)) - (pool:add-cpu *pool1* (conc count) 1 1) - (if (> count 0) - (loop (- count 1)))) - -(pool:draw *ezx* *pool1*) - -;; ;; init the queues -;; ;; -;; (hash-table-set! *queues* "normal" '()) -;; (hash-table-set! *queues* "quick" '()) -;; (draw-queues) -;; -;; ;; user k adds 200 jobs at time zero -;; ;; -;; (event *start-time* -;; (lambda () -;; (let loop ((count 300)) ;; add 500 jobs -;; (add-job "normal" "k" 600 1 1) -;; (if (>= count 0)(loop (- count 1)))))) -;; -;; ;; one minute in user m runs ten jobs -;; ;; -;; (event (+ 600 *start-time*) -;; (lambda () -;; (let loop ((count 300)) ;; add 100 jobs -;; (add-job "normal" "m" 600 1 1) -;; (if (> count 0)(loop (- count 1)))))) -;; -;; ;; every minute user j runs ten jobs -;; ;; -;; (define *user-j-jobs* 300) -;; (event (+ 600 *start-time*) -;; (lambda () -;; (let f () -;; (schedule 60) -;; (if (> *user-j-jobs* 0) -;; (begin -;; (let loop ((count 5)) ;; add 100 jobs -;; (add-job "quick" "j" 600 1 1) -;; (if (> count 0)(loop (- count 1)))) -;; (set! *user-j-jobs* (- *user-j-jobs* 5)))) -;; (if (and (not *done*) -;; (> *user-j-jobs* 0)) -;; (f))))) ;; Megatest user running 200 jobs -;; -;; ;; every minute user j runs ten jobs -;; ;; -;; (define *user-j-jobs* 300) -;; (event (+ 630 *start-time*) -;; (lambda () -;; (let f () -;; (schedule 60) -;; (if (> *user-j-jobs* 0) -;; (begin -;; (let loop ((count 5)) ;; add 100 jobs -;; (add-job "quick" "n" 600 1 1) -;; (if (> count 0)(loop (- count 1)))) -;; (set! *user-j-jobs* (- *user-j-jobs* 5)))) -;; (if (and (not *done*) -;; (> *user-j-jobs* 0)) -;; (f))))) ;; Megatest user running 200 jobs -;; -;; ;; ;; -;; ;; (event *start-time* -;; ;; (lambda () -;; ;; (let f ((count 200)) -;; ;; (schedule 10) -;; ;; (add-job "normal" "t" 60 1 1) -;; ;; (if (and (not *done*) -;; ;; (>= count 0)) -;; ;; (f (- count 1)))))) -;; -;; ;; every 3 seconds check for available machines and launch a job -;; ;; -;; (event *start-time* -;; (lambda () -;; (let f () -;; (schedule 3) -;; (let ((queue-names (random-sort (hash-table-keys *queues*)))) -;; (let loop ((cpu (get-cpu)) -;; (count (+ (length queue-names) 4)) -;; (qname (car queue-names)) -;; (remq (cdr queue-names))) -;; (if (and cpu -;; (> count 0)) -;; (begin -;; (if (peek-job qname) ;; any jobs to do in normal queue -;; (let ((job (take-job qname))) -;; (run-job cpu job))) -;; (loop (get-cpu) -;; (- count 1) -;; (if (null? remq) -;; (car queue-names) -;; (car remq)) -;; (if (null? remq) -;; (cdr queue-names) -;; (cdr remq))))))) -;; (if (not *done*)(f))))) -;; -;; ;; screen updates -;; ;; -(event *start-time* (lambda () - (let f () - (schedule 60) ;; update the screen every 60 seconds of sim time - ;; (draw-cpus) ;; (print "Now: " *now* " queue: " (hash-table->alist *queues*)) - (pool:draw *ezx* *pool1*) - - (wait-for-next-draw-time) - (if (not *done*) (f))))) -;; -;; -;; ;; end the simulation -;; ;; -(event *end-time* - (lambda () - (set! *event-list* '()) - (set! *done* #t))) -;; -(start) -;; ;; (exit 0) -;; DELETED bin/sleeprunner Index: bin/sleeprunner ================================================================== --- bin/sleeprunner +++ /dev/null @@ -1,7 +0,0 @@ -#!/bin/bash - -if [[ $SLEEPRUNNER == "" ]];then -SLEEPRUNNER=0 -fi - -echo "nbfake $@ &> /dev/null" | at now + $SLEEPRUNNER minutes &> /dev/null DELETED cgisetup/README Index: cgisetup/README ================================================================== --- cgisetup/README +++ /dev/null @@ -1,10 +0,0 @@ -1. copy megatest.config to cgi-bin/.megatest.config -2. edit cgi-bin/.megatest.config, change appropriate settings - i. sroot => points to your models and pages - ii. logs, twikidir (legacy, will be removed in future) must be - writeable. - iii. domain is used to construct the return URLs (to be fixed). - iv. debug mode give a useful stack dump on hitting errors. -3. compile mtutil and copy the mtut binary (look in the bin dir) - to cgi-bin/megatest -4. use mtutil to populate your database schema DELETED cgisetup/cgi-bin/models Index: cgisetup/cgi-bin/models ================================================================== --- cgisetup/cgi-bin/models +++ /dev/null @@ -1,1 +0,0 @@ -../models DELETED cgisetup/cgi-bin/pages Index: cgisetup/cgi-bin/pages ================================================================== --- cgisetup/cgi-bin/pages +++ /dev/null @@ -1,1 +0,0 @@ -../pages DELETED cgisetup/css/pjhatwal-modal.css Index: cgisetup/css/pjhatwal-modal.css ================================================================== --- cgisetup/css/pjhatwal-modal.css +++ /dev/null @@ -1,43 +0,0 @@ -.modal { - display: none; /* Hidden by default */ - position: fixed; /* Stay in place */ - z-index: 1; /* Sit on top */ - padding-top: 100px; /* Location of the box */ - left: 0; - top: 0; - width: 100%; /* Full width */ - height: 100%; /* Full height */ - overflow: auto; /* Enable scroll if needed */ - background-color: rgb(0,0,0); /* Fallback color */ - background-color: rgba(0,0,0,0.4); /* Black w/ opacity */ -} - -/* Modal Content */ -.modal-content { - background-color: #fefefe; - margin: auto; - padding: 20px; - border: 1px solid #888; - width: 80%; - top: 50% -} - -/* The Close Button */ -.close { - color: #aaaaaa; - float: right; - font-size: 28px; - font-weight: bold; -} - -.close:hover, -.close:focus { - color: #000; - text-decoration: none; - cursor: pointer; -} - -.vote { - color: #faaaaa; -} - DELETED cgisetup/js/pjhatwal-modal.js Index: cgisetup/js/pjhatwal-modal.js ================================================================== --- cgisetup/js/pjhatwal-modal.js +++ /dev/null @@ -1,15 +0,0 @@ -$(document).ready(function(){ - $(".viewmodal").click(function(){ - var modal = document.getElementById("myModal" + this.id); - // alert(this.id); - modal.style.display = "block"; - - }); - $(".close").click(function(){ - var modal = document.getElementById("myModal" + this.id); - // alert(this.id); - modal.style.display = "none"; - - }); -}); - DELETED cgisetup/megatest.config Index: cgisetup/megatest.config ================================================================== --- cgisetup/megatest.config +++ /dev/null @@ -1,12 +0,0 @@ -'(sroot "/path/to/models" - logfile "/path/to/logs/megatest.log" ;; this is now required! - twikidir "/path/to/writable/work/area" - dbtype pg ;; 'sqlite3 ;; or 'pg - dbinit '((dbname . "megatest_db") - (user . "username") - (password . "secretpassword") - (host . "localhost")) - domain "yourdomain.com" - page-dir-style flat - debugmode #t) - Index: cgisetup/models/pgdb.scm ================================================================== --- cgisetup/models/pgdb.scm +++ cgisetup/models/pgdb.scm @@ -1,14 +1,23 @@ ;;====================================================================== ;; Copyright 2017, Matthew Welland. ;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. ;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . + ;;====================================================================== (declare (unit pgdb)) (declare (uses configf)) @@ -90,48 +99,160 @@ (print-call-chain) (debug:print 0 *default-log-port* "ERROR: cannot create ttype entry, " ((condition-property-accessor 'exn 'message) exn)) #f) (dbi:exec dbh "INSERT INTO ttype (target_spec) VALUES (?);" target-spec)) (pgdb:get-ttype dbh target-spec))))) + +;;====================================================================== +;; T A G S +;;====================================================================== + + +(define (pgdb:get-tag-info-by-name dbh tag) + (dbi:get-one-row dbh "SELECT id,tag_name FROM tags where tag_name=?;" tag)) + +(define (pgdb:insert-tag dbh name ) + (dbi:exec dbh "INSERT INTO tags (tag_name) VALUES (?)" name )) + +(define (pgdb:insert-area-tag dbh tag-id area-id ) + (dbi:exec dbh "INSERT INTO area_tags (tag_id, area_id) VALUES (?,?)" tag-id area-id )) + +(define (pgdb:is-area-taged dbh area-id) + (let ((area-tag-id (dbi:get-one dbh "SELECT id FROM area_tags WHERE area_id=?;" area-id))) + (if area-tag-id + #t + #f))) + +(define (pgdb:is-area-taged-with-a-tag dbh tag-id area-id) + (let ((area-tag-id (dbi:get-one dbh "SELECT id FROM area_tags WHERE area_id=? and tag_id=?;" area-id tag-id))) + (if area-tag-id + #t + #f))) + ;;====================================================================== ;; R U N S ;;====================================================================== ;; given a target spec id, target and run-name return the run-id ;; if no run found return #f ;; -(define (pgdb:get-run-id dbh spec-id target run-name) - (dbi:get-one dbh "SELECT id FROM runs WHERE ttype_id=? AND target=? AND run_name=?;" - spec-id target run-name)) +(define (pgdb:get-run-id dbh spec-id target run-name area-id) + (dbi:get-one dbh "SELECT id FROM runs WHERE ttype_id=? AND target=? AND run_name=? and area_id=?;" + spec-id target run-name area-id)) + +;; given a target spec id, target and run-name return the run-id +;; if no run found return #f +;; +(define (pgdb:get-run-last-update dbh id ) + (dbi:get-one dbh "SELECT last_update FROM runs WHERE id=?;" + id)) ;; given a run-id return all the run info ;; -(define (pgdb:get-run-info dbh run-id) ;; to join ttype or not? +(define (pgdb:get-run-info dbh run-id ) ;; to join ttype or not? (dbi:get-one-row dbh ;; 0 1 2 3 4 5 6 7 8 9 10 11 12 "SELECT id,target,ttype_id,run_name,state,status,owner,event_time,comment,fail_count,pass_count,last_update,area_id - FROM runs WHERE id=?;" run-id)) + FROM runs WHERE id=? ;" run-id )) ;; refresh the data in a run record ;; -(define (pgdb:refresh-run-info dbh run-id state status owner event-time comment fail-count pass-count) ;; area-id) +(define (pgdb:refresh-run-info dbh run-id state status owner event-time comment fail-count pass-count area-id last_update) ;; area-id) (dbi:exec dbh "UPDATE runs SET - state=?,status=?,owner=?,event_time=?,comment=?,fail_count=?,pass_count=? - WHERE id=?;" - state status owner event-time comment fail-count pass-count run-id)) + state=?,status=?,owner=?,event_time=?,comment=?,fail_count=?,pass_count=?,last_update=? + WHERE id=? and area_id=?;" + state status owner event-time comment fail-count pass-count last_update run-id area-id )) ;; given all needed info create run record ;; -(define (pgdb:insert-run dbh ttype-id target run-name state status owner event-time comment fail-count pass-count) +(define (pgdb:insert-run dbh ttype-id target run-name state status owner event-time comment fail-count pass-count area-id last-update) + (dbi:exec + dbh + "INSERT INTO runs (ttype_id,target,run_name,state,status,owner,event_time,comment,fail_count,pass_count,area_id,last_update) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?);" + ttype-id target run-name state status owner event-time comment fail-count pass-count area-id last-update)) + +;;====================================================================== +;; T E S T - S T E P S +;;====================================================================== + +(define (pgdb:get-test-step-id dbh test-id stepname state) + (dbi:get-one + dbh + "SELECT id FROM test_steps WHERE test_id=? AND stepname=? and state = ? ;" + test-id stepname state)) + +(define (pgdb:get-test-step-last-update dbh id ) + (dbi:get-one + dbh + "SELECT last_update FROM test_steps WHERE id=? ;" + id)) + +(define (pgdb:insert-test-step dbh test-id stepname state status event_time comment logfile last-update) + (dbi:exec + dbh + "INSERT INTO test_steps (test_id,stepname,state,status,event_time,logfile,comment,last_update) + VALUES (?,?,?,?,?,?,?, ? );" + test-id stepname state status event_time logfile comment last-update)) + +(define (pgdb:update-test-step dbh step-id test-id stepname state status event_time comment logfile last-update) + (dbi:exec + dbh + "UPDATE test_steps SET + test_id=?,stepname=?,state=?,status=?,event_time=?,logfile=?,comment=?,last_update=? + WHERE id=?;" + test-id stepname state status event_time logfile comment last-update step-id)) + + +;;====================================================================== +;; T E S T - D A T A +;;====================================================================== + +(define (pgdb:get-test-data-id dbh test-id category variable) + (dbi:get-one + dbh + "SELECT id FROM test_data WHERE test_id=? AND category=? and variable = ? ;" + test-id category variable)) + +(define (pgdb:get-test-data-last-update dbh test-data-id ) + (dbi:get-one + dbh + "SELECT last_update FROM test_data WHERE id=? ;" + test-data-id)) + +(define (pgdb:insert-test-data dbh test-id category variable value expected tol units comment status type last-update) + ; (print "INSERT INTO test_data (test_id, category, variable, value, expected, tol, units, comment, status, type) + ; VALUES (?,?,?,?,?,?,?,?,?,?) " test-id " " category " " variable " " value " " expected " " tol " " units " " comment " " status " " type) + (if (not (string? units)) + (set! units "" )) + (if (not (string? variable)) + (set! variable "" )) + (if (not (real? value)) + (set! value 0 )) + (if (not (real? expected)) + (set! expected 0 )) +(if (not (real? tol)) + (set! tol 0 )) + + (dbi:exec + dbh + "INSERT INTO test_data (test_id, category, variable, value, expected, tol, units, comment, status, type, last_update) + VALUES (?,?,?,?,?,?,?,?,?,?, ?);" + test-id category variable value expected tol units comment status type last-update)) + +(define (pgdb:update-test-data dbh data-id test-id category variable value expected tol units comment status type last-update) (dbi:exec - dbh - "INSERT INTO runs (ttype_id,target,run_name,state,status,owner,event_time,comment,fail_count,pass_count) - VALUES (?,?,?,?,?,?,?,?,?,?);" - ttype-id target run-name state status owner event-time comment fail-count pass-count)) + dbh + "UPDATE test_data SET + test_id=?, category=?, variable=?, value=?, expected=?, tol=?, units=?, comment=?, status=?, type=?, last_update=? + WHERE id=?;" + test-id category variable value expected tol units comment status type last-update data-id )) + + ;;====================================================================== ;; T E S T S ;;====================================================================== @@ -140,33 +261,40 @@ (define (pgdb:get-test-id dbh run-id test-name item-path) (dbi:get-one dbh "SELECT id FROM tests WHERE run_id=? AND test_name=? AND item_path=?;" run-id test-name item-path)) + +(define (pgdb:get-test-last-update dbh id) + (dbi:get-one + dbh + "SELECT last_update FROM tests WHERE id=? ;" + id )) + ;; create new test record ;; -(define (pgdb:insert-test dbh run-id test-name item-path state status host cpuload diskfree uname run-dir log-file run-duration comment event-time archived) +(define (pgdb:insert-test dbh run-id test-name item-path state status host cpuload diskfree uname run-dir log-file run-duration comment event-time archived last-update) (dbi:exec dbh - "INSERT INTO tests (run_id,test_name,item_path,state,status,host,cpuload,diskfree,uname,rundir,final_logf,run_duration,comment,event_time,archived) - VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?);" + "INSERT INTO tests (run_id,test_name,item_path,state,status,host,cpuload,diskfree,uname,rundir,final_logf,run_duration,comment,event_time,archived,last_update) + VALUES (?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?);" run-id test-name item-path state status host cpuload diskfree uname - run-dir log-file run-duration comment event-time archived)) + run-dir log-file run-duration comment event-time archived last-update)) ;; update existing test record ;; -(define (pgdb:update-test dbh test-id run-id test-name item-path state status host cpuload diskfree uname run-dir log-file run-duration comment event-time archived) +(define (pgdb:update-test dbh test-id run-id test-name item-path state status host cpuload diskfree uname run-dir log-file run-duration comment event-time archived last-update) (dbi:exec dbh "UPDATE tests SET - run_id=?,test_name=?,item_path=?,state=?,status=?,host=?,cpuload=?,diskfree=?,uname=?,rundir=?,final_logf=?,run_duration=?,comment=?,event_time=?,archived=? + run_id=?,test_name=?,item_path=?,state=?,status=?,host=?,cpuload=?,diskfree=?,uname=?,rundir=?,final_logf=?,run_duration=?,comment=?,event_time=?,archived=?,last_update=? WHERE id=?;" run-id test-name item-path state status host cpuload diskfree uname - run-dir log-file run-duration comment event-time archived test-id)) + run-dir log-file run-duration comment event-time archived last-update test-id)) (define (pgdb:get-tests dbh target-patt) (dbi:get-rows dbh "SELECT t.id,t.run_id,t.test_name,t.item_path,t.state,t.status,t.host,t.cpuload,t.diskfree,t.uname,t.rundir,t.final_logf,t.run_duration,t.comment,t.event_time,t.archived, DELETED cgisetup/pages/filter-defs-template.scm Index: cgisetup/pages/filter-defs-template.scm ================================================================== --- cgisetup/pages/filter-defs-template.scm +++ /dev/null @@ -1,3 +0,0 @@ -(define *p* '("a" "b" "c")) -(define *k* '("all" "a")) -(define *d* '("all" 1 2 3 6 5 8 11 12)) DELETED cgisetup/pages/home.scm Index: cgisetup/pages/home.scm ================================================================== --- cgisetup/pages/home.scm +++ /dev/null @@ -1,17 +0,0 @@ -;;====================================================================== -;; Copyright 2017, Matthew Welland. -;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. -;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. -;;====================================================================== - -(use regex) -(load "models/pgdb.scm") -(include "pages/filter-defs.scm") -(include "pages/home_ctrl.scm") -(include "pages/home_view.scm") - DELETED cgisetup/pages/home_ctrl.scm Index: cgisetup/pages/home_ctrl.scm ================================================================== --- cgisetup/pages/home_ctrl.scm +++ /dev/null @@ -1,30 +0,0 @@ -;;====================================================================== -;; Copyright 2017, Matthew Welland. -;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. -;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. -;;====================================================================== - -;; a function -action is called on POST - -(define (home-action action) - (case (string->symbol action) - ((filter) - (let ((dot (s:get-input 'dot)) - (type (s:get-input 'kit-type)) - (rel (s:get-input 'rel-num)) - (bp (s:get-input 'bp))) - ;; - ;; s:set! is a page local var. Better than s:session-var-set! but still not a good idea. - ;; - - (s:set! "dot" dot) - (s:set! "type" type) - (s:set! "bp" bp) - - (s:set! "rel" rel))))) - DELETED cgisetup/pages/home_view.scm Index: cgisetup/pages/home_view.scm ================================================================== --- cgisetup/pages/home_view.scm +++ /dev/null @@ -1,159 +0,0 @@ -;;====================================================================== -;; Copyright 2017, Matthew Welland. -;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. -;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. -;;====================================================================== - -(define (pages:home session db shared) - - (let* ((dbh (s:db)) - (limit 50) - (curr-page (if (or (equal? (s:get-param "pg") "") (equal? (s:get-param "pg") #f)) - 1 - (string->number (s:get-param "pg")))) - - (offset (- (* limit curr-page) limit)) - (dot (if (s:get-param "dot") - (string->number (s:get-param "dot")) - (if (and (s:get "dot") (not (equal? (s:get "dot") "all"))) - (string->number (s:get "dot")) - "all"))) - (type (if (s:get-param "type") - (s:get-param "type") - (if (and (s:get "type") (not (equal? (s:get "type") "all"))) - (s:get "type") - "all"))) - (bp (if (s:get-param "bp") - (s:get-param "bp") - (if (s:get "bp") - (s:get "bp") - "p1273"))) - (rel (if (s:get-param "rel") - (s:get-param "rel") - (if (and (s:get "rel") (not (equal? (s:get "rel") "all"))) - (s:get "rel") - ""))) - (pattern (pgdb:mk-pattern dot type bp rel)) - ; (targets (pgdb:get-targets-of-type dbh selected tfilter)) - - (all-data (pgdb:get-latest-run-stats-given-pattern dbh pattern limit offset)) - ;'() ) - ; (pgdb:get-stats-given-type-target dbh selected tfilter) - ; (pgdb:get-stats-given-target dbh tfilter) - - (cnt (pgdb:get-latest-run-cnt-by-pattern dbh pattern)) - (total-pages (ceiling (/ cnt limit))) - (page-lst (pgdb:get-pg-lst total-pages)) - (ordered-data (pgdb:coalesce-runs1 all-data)) - (rel-val (if (equal? rel "") - "%" - rel))) - (s:div 'class "col_12" - (s:ul 'class "tabs left" - - (map (lambda (x) - (s:li (s:a 'href (conc "#" x) x))) - *process*)) - (map (lambda (x) - - (s:div 'id x 'class "tab-content" - (s:div 'class "col_11" - (s:fieldset "Area type and target filter" - (s:form - 'action (conc "home.filter#" x) 'method "post" - (s:div 'class "col_12" - (s:div 'class "col_3" - (s:label "Release Type") (s:select (map (lambda (x) - (if (equal? x type) - (list x x x #t) - (list x x x #f)) ) - *kit-types*) - 'name "kit-type")) - (s:div 'class "col_3" - (s:label "Dot") (s:select (map (lambda (x) - (if (equal? x dot) - (list x x x #t) - (list x x x #f))) - *dots*) - 'name "dot")) - - (s:div 'class "col_3" - (s:input 'type "hidden" 'value x 'name "bp") - (s:label "Release #") (s:input 'type "text" 'name "rel-num" 'value rel-val)) - (s:div 'class "col_2" - (s:input 'type "submit" 'name "set-filter-vals" 'value "Submit"))))) - (s:br) - ;(s:p (conc dot(string? dot) )) - (s:p (map - (lambda (i) - (s:span (s:a 'href (s:link-to "home" 'pg i ) "PAGE " i )" | ")) - page-lst)) - (s:p "  Result Format:   total / pass / fail / other") - (if (equal? x bp) - (begin - (s:fieldset (conc "Runs data for " pattern) - (let* ((a-keys (pgdb:ordered-data->a-keys ordered-data)) - (b-keys (pgdb:ordered-data->b-keys ordered-data a-keys))) - (s:table 'class "striped" - (s:tr (s:th 'class "heading" ) - (map - (lambda (th-key) - (s:th 'class "heading" th-key )) - a-keys)) - (map - (lambda (row-key) - (s:tr (s:td row-key) - (map - (lambda (col-key) - (let ((val (let* ((ht (hash-table-ref/default ordered-data col-key #f))) - (if ht (hash-table-ref/default ht row-key #f))))) - (if val - (let* ((total (vector-ref val 2)) - (event-time (vector-ref val 1)) - (pass (vector-ref val 3)) - (fail (vector-ref val 4)) - (other (vector-ref val 5)) - (id (vector-ref val 6)) - (passper (round (* (/ pass total) 100))) - (failper (- 100 passper)) - (history (pgdb:get-run-stats-history-given-target dbh 1 (conc col-key "/" row-key))) - (history-hash (pgdb:get-history-hash history)) - (history-keys (sort (hash-table-keys history-hash) string>=?)) - (run-key (string-substitute "[/]" "_x_" (conc col-key "/" row-key) 'all))) - (s:td 'style (conc "background: -webkit-linear-gradient(left, green " passper "%, red); background: -o-linear-gradient(right, green " passper "%, red); background: -moz-linear-gradient(right, green " passper "%, red); background: linear-gradient(to right, green " passper "%, red);") - (s:a 'class "white" 'href (s:link-to "run" 'target run-key) - (conc "Latest:" total "/" pass "/" fail "/" other)) (s:span " | ") (s:a 'id id 'class "viewmodal" 'title "Click to see description" "History") (s:br) - (s:div 'id (conc "myModal" id) 'class "modal" - (s:div 'class "modal-content" - (s:span 'id id 'class "close" "×") - ;(s:p (conc "Modal " id "..")) - (s:div - (s:table - (s:tr - (s:th "Runame") - (s:th "Result") - ) - (map - (lambda (history-key) - (let* ((history-row (hash-table-ref/default history-hash history-key #f)) - (htotal (vector-ref history-row 1)) - (hpass (vector-ref history-row 2)) - (hfail (vector-ref history-row 3)) - (hother (vector-ref history-row 4)) - (passper (round (* (/ hpass htotal) 100)))) - (s:tr (s:td history-key) - (s:td 'style (conc "background: -webkit-linear-gradient(left, green " passper "%, red); background: -o-linear-gradient(right, green " passper "%, red); background: -moz-linear-gradient(right, green " passper "%, red); background: linear-gradient(to right, green " passper "%, red);") -(conc htotal "/" hpass "/" hfail "/" hother ))))) - history-keys))))))) - (s:td "")))) - a-keys))) - b-keys)))) -) -(begin -(s:p "")))))) - *process*)))) DELETED cgisetup/pages/index.scm Index: cgisetup/pages/index.scm ================================================================== --- cgisetup/pages/index.scm +++ /dev/null @@ -1,17 +0,0 @@ -;;====================================================================== -;; Copyright 2017, Matthew Welland. -;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. -;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. -;;====================================================================== - -(use regex) - -;; (load "models/pgdb.scm") -(include "pages/index_ctrl.scm") -(include "pages/index_view.scm") - DELETED cgisetup/pages/index_ctrl.scm Index: cgisetup/pages/index_ctrl.scm ================================================================== --- cgisetup/pages/index_ctrl.scm +++ /dev/null @@ -1,72 +0,0 @@ -;;====================================================================== -;; Copyright 2017, Matthew Welland. -;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. -;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. -;;====================================================================== - -;; a function -action is called on POST - -(define (index-action action) - (case (string->symbol action) - (else #f))) - -;;====================================================================== -;; Below are the raw chunks of html, css and jquery stuff needed to make -;; html kickstart and other useful things work -;;====================================================================== - -(define index:kickstart-junk -#< - - - - - - - - - -EOF -) - -(define index:jquery - (if #t - -#< - -EOF - -#< - -EOF -)) - -(define index:javascript -#< PRETTIFY --> - - -EOF -) - DELETED cgisetup/pages/index_view.scm Index: cgisetup/pages/index_view.scm ================================================================== --- cgisetup/pages/index_view.scm +++ /dev/null @@ -1,39 +0,0 @@ -;;====================================================================== -;; Copyright 2017, Matthew Welland. -;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. -;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. -;;====================================================================== - -(define (pages:index session db shared) - (let* ((dbh (s:db)) - (page-name (sdat-get-page s:session))) - (if (equal? page-name "api") - (s:call page-name) ;; go straight to the api - (list - "" - (s:html - (s:title (conc "Megatest")) - (s:head - index:kickstart-junk - ) - (s:body - (s:div 'class "grid flex" 'id "top_of_page" - ;; add visible to columns to help visualize them e.g. "col_12 visible" - (s:ul 'class "menu" -(s:li (s:a 'href "" (s:i 'class "fa fa-inbox") "QA Summary") - (s:ul - (s:li (s:a 'href "/cgi-bin/megatest.sh/home" "Component Snapshot")) - (s:li (s:a 'href "/cgi-bin/megatest.sh/kitprogress" "Kit/Contour progress")) - ))) -;(s:li (s:a 'href (s:link-to "run" ) "Runs"))) - (case (string->symbol page-name) - ((index) (s:call "home")) - (else (s:call page-name)))) - index:jquery - index:javascript - )))))) DELETED cgisetup/pages/log.scm Index: cgisetup/pages/log.scm ================================================================== --- cgisetup/pages/log.scm +++ /dev/null @@ -1,15 +0,0 @@ -;;====================================================================== -;; Copyright 2017, Matthew Welland. -;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. -;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. -;;====================================================================== - -(load "models/pgdb.scm") -(include "pages/log_ctrl.scm") -(include "pages/log_view.scm") - DELETED cgisetup/pages/log_ctrl.scm Index: cgisetup/pages/log_ctrl.scm ================================================================== --- cgisetup/pages/log_ctrl.scm +++ /dev/null @@ -1,19 +0,0 @@ -;;====================================================================== -;; Copyright 2017, Matthew Welland. -;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. -;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. -;;====================================================================== - -;; a function -action is called on POST - -(define (log-action action) - (case (string->symbol action) - ((dosomething) - (dosomething)))) - - DELETED cgisetup/pages/log_view.scm Index: cgisetup/pages/log_view.scm ================================================================== --- cgisetup/pages/log_view.scm +++ /dev/null @@ -1,38 +0,0 @@ -;;====================================================================== -;; Copyright 2017, Matthew Welland. -;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. -;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. -;;====================================================================== -(define (readlines filename) - (call-with-input-file filename - (lambda (p) - (let loop ((line (read-line p)) - (result '())) - (if (eof-object? line) - (reverse result) - (loop (read-line p) (cons line result))))))) - -(define (pages:log session db shared) - (let* ((dbh (s:db)) - (id (s:get-param 'testid)) - (tests (pgdb:get-test-by-id dbh id))) - - (if (eq? (length tests) 1) - (begin - (s:div 'class "col_12" - (s:fieldset - (conc "Show a runs for Target: " ) - (let* ((test (car tests)) - (html-path (conc (vector-ref test 2) "/" (vector-ref test 3))) - (html-data (readlines html-path))) - (s:p html-data))))) - (begin - (s:div 'class "col_12" - "Log not found"))) -)) - DELETED cgisetup/pages/run.scm Index: cgisetup/pages/run.scm ================================================================== --- cgisetup/pages/run.scm +++ /dev/null @@ -1,15 +0,0 @@ -;;====================================================================== -;; Copyright 2017, Matthew Welland. -;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. -;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. -;;====================================================================== - -(load "models/pgdb.scm") -(include "pages/run_ctrl.scm") -(include "pages/run_view.scm") - DELETED cgisetup/pages/run_ctrl.scm Index: cgisetup/pages/run_ctrl.scm ================================================================== --- cgisetup/pages/run_ctrl.scm +++ /dev/null @@ -1,22 +0,0 @@ -;;====================================================================== -;; Copyright 2017, Matthew Welland. -;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. -;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. -;;====================================================================== - -;; a function -action is called on POST - -(define (run-action action) - (case (string->symbol action) - ((filter) - (let ((run-name-filter (s:get-input 'run-name-filter)) - (target (s:get-input 'target))) - (s:set! "run-name-filter" run-name-filter) - (s:set! "target" target))))) - - DELETED cgisetup/pages/run_view.scm Index: cgisetup/pages/run_view.scm ================================================================== --- cgisetup/pages/run_view.scm +++ /dev/null @@ -1,75 +0,0 @@ -;;====================================================================== -;; Copyright 2017, Matthew Welland. -;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. -;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. -;;====================================================================== -(define (pages:run session db shared) - (let* ((dbh (s:db)) - (target-param (s:get-param 'target)) - (target1 (if (s:get "target") - (s:get "target") - (s:get-param 'target))) - (target (if (equal? target1 #f) - "%" - (string-substitute "_x_" "/" target1 'all) - )) - - (run-filter (or (or (s:get "run-name-filter") (s:get-param 'run)) "%")) - (runs (pgdb:get-runs-by-target dbh target run-filter)) - (ordered-runs (pgdb:runs-to-hash runs))) - - (s:div 'class "col_12" - (s:fieldset - "Run filter" - (s:form - 'action "run.filter" 'method "post" - (s:div 'class "col_12" - (s:div 'class "col_6" - ;(s:p (conc "param" (s:get-param 'target)) ) - ; (s:p (conc "get" (s:get "target")) ) - ;(s:p target1) - (s:input-preserve 'name "run-name-filter" 'placeholder "Filter by run names") - (s:input 'type "hidden" 'value target 'name "target" )) - - (s:div 'class "col_6" - (s:input 'type "submit" 'name "set-filter-vals" 'value "Submit"))) - )) - - (s:fieldset - (conc "Show a runs for Target: " target) - (let* ((a-keys (sort (hash-table-keys ordered-runs) string>=?)) - (b-keys (delete-duplicates(sort (apply - append - (map (lambda (sub-key) - (let ((subdat (hash-table-ref ordered-runs sub-key))) - (hash-table-keys subdat))) - a-keys)) - string>=?)))) - - (s:table - (s:tr (s:th "") (map s:th a-keys)) - (map - (lambda (row-key) - (s:tr (s:td row-key) - (map - (lambda (col-key) - (let ((val (let* ((ht (hash-table-ref/default ordered-runs col-key #f))) - (if ht (hash-table-ref/default ht row-key #f))))) - (if val - (let* ((result (vector-ref val 2)) - (test-id (vector-ref val 4)) - (bg (if (equal? result "PASS") - "green" - "red"))) - (s:td 'style (conc "background: " bg ) - (s:a 'class "white" 'href (s:link-to "log" 'testid test-id) - result))) - (s:td "")))) - a-keys))) - b-keys))))))) - DELETED cgisetup/www/README.md Index: cgisetup/www/README.md ================================================================== --- cgisetup/www/README.md +++ /dev/null @@ -1,37 +0,0 @@ -# HTML KickStart # -by Joshua Gatcke -http://www.99lime.com -Version: 0.94 - -## What is HTML KickStart? ## - -HTML KickStart is an ultra–lean set of HTML5, CSS, and jQuery (javascript) files, layouts, and elements designed to give you a headstart and save you 10's of hours on your next web project. - -HTML KickStart includes everything you need to rapidly create website layouts – things like slideshows, menus, flexible grids, image placeholders, buttons, and more – saving you a ton of time so you can produce faster and make more money. - -Bonus! All HTML KickStart Elements are fully Browser tested, they even gracefully degrade ;) - -## Perfect for Wireframing in HTML ## - -HTML KickStart has everything you need to rapidly create HTML Page Layouts, perfect for Wireframing in HTML. -Layouts that used to take hours now take minutes. - -## Getting Started ## - -1. Download HTML KickStart -2. Open blank.html in your favorite text editor -3. Start adding KickStart Elements to blank.html: (http://www.99lime.com/elements/) -4. Save blank.html and open in your favorite Web Browser -5. Have fun! - - -## HTML KickStart is FREE and Open Source. ## -### Release Under the MIT Open Source License. ### - -Copyright © 2011-2012 Joshua Gatcke http://www.99lime.com | HTML KickStart - -Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions: - -The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. DELETED cgisetup/www/blank.html Index: cgisetup/www/blank.html ================================================================== --- cgisetup/www/blank.html +++ /dev/null @@ -1,28 +0,0 @@ - - - - - HTML KickStart Elements - - - - - - - - - - - - - -
-
-

-

- This example is blank

-

Add some HTML KickStart Elements to see the magic happen

-
-
- - DELETED cgisetup/www/composer.json Index: cgisetup/www/composer.json ================================================================== --- cgisetup/www/composer.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "name": "99lime/html-kickstart", - "license": "MIT", - "description": "Ultra–Lean HTML Building Blocks for Rapid Website Production", - "minimum-stability": "dev", - "authors": [ - { - "name": "Joshua Gatcke", - "email": "joshua@99lime.com" - } - ] -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/css/font-awesome.css Index: cgisetup/www/css/fonts/font-awesome-4.2.0/css/font-awesome.css ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/css/font-awesome.css +++ /dev/null @@ -1,1672 +0,0 @@ -/*! - * Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome - * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) - */ -/* FONT PATH - * -------------------------- */ -@font-face { - font-family: 'FontAwesome'; - src: url('../fonts/fontawesome-webfont.eot?v=4.2.0'); - src: url('../fonts/fontawesome-webfont.eot?#iefix&v=4.2.0') format('embedded-opentype'), url('../fonts/fontawesome-webfont.woff?v=4.2.0') format('woff'), url('../fonts/fontawesome-webfont.ttf?v=4.2.0') format('truetype'), url('../fonts/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular') format('svg'); - font-weight: normal; - font-style: normal; -} -.fa { - display: inline-block; - font: normal normal normal 14px/1 FontAwesome; - font-size: inherit; - text-rendering: auto; - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} -/* makes the font 33% larger relative to the icon container */ -.fa-lg { - font-size: 1.33333333em; - line-height: 0.75em; - vertical-align: -15%; -} -.fa-2x { - font-size: 2em; -} -.fa-3x { - font-size: 3em; -} -.fa-4x { - font-size: 4em; -} -.fa-5x { - font-size: 5em; -} -.fa-fw { - width: 1.28571429em; - text-align: center; -} -.fa-ul { - padding-left: 0; - margin-left: 2.14285714em; - list-style-type: none; -} -.fa-ul > li { - position: relative; -} -.fa-li { - position: absolute; - left: -2.14285714em; - width: 2.14285714em; - top: 0.14285714em; - text-align: center; -} -.fa-li.fa-lg { - left: -1.85714286em; -} -.fa-border { - padding: .2em .25em .15em; - border: solid 0.08em #eeeeee; - border-radius: .1em; -} -.pull-right { - float: right; -} -.pull-left { - float: left; -} -.fa.pull-left { - margin-right: .3em; -} -.fa.pull-right { - margin-left: .3em; -} -.fa-spin { - -webkit-animation: fa-spin 2s infinite linear; - animation: fa-spin 2s infinite linear; -} -@-webkit-keyframes fa-spin { - 0% { - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(359deg); - transform: rotate(359deg); - } -} -@keyframes fa-spin { - 0% { - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(359deg); - transform: rotate(359deg); - } -} -.fa-rotate-90 { - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=1); - -webkit-transform: rotate(90deg); - -ms-transform: rotate(90deg); - transform: rotate(90deg); -} -.fa-rotate-180 { - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2); - -webkit-transform: rotate(180deg); - -ms-transform: rotate(180deg); - transform: rotate(180deg); -} -.fa-rotate-270 { - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=3); - -webkit-transform: rotate(270deg); - -ms-transform: rotate(270deg); - transform: rotate(270deg); -} -.fa-flip-horizontal { - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1); - -webkit-transform: scale(-1, 1); - -ms-transform: scale(-1, 1); - transform: scale(-1, 1); -} -.fa-flip-vertical { - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1); - -webkit-transform: scale(1, -1); - -ms-transform: scale(1, -1); - transform: scale(1, -1); -} -:root .fa-rotate-90, -:root .fa-rotate-180, -:root .fa-rotate-270, -:root .fa-flip-horizontal, -:root .fa-flip-vertical { - filter: none; -} -.fa-stack { - position: relative; - display: inline-block; - width: 2em; - height: 2em; - line-height: 2em; - vertical-align: middle; -} -.fa-stack-1x, -.fa-stack-2x { - position: absolute; - left: 0; - width: 100%; - text-align: center; -} -.fa-stack-1x { - line-height: inherit; -} -.fa-stack-2x { - font-size: 2em; -} -.fa-inverse { - color: #ffffff; -} -/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen - readers do not read off random characters that represent icons */ -.fa-glass:before { - content: "\f000"; -} -.fa-music:before { - content: "\f001"; -} -.fa-search:before { - content: "\f002"; -} -.fa-envelope-o:before { - content: "\f003"; -} -.fa-heart:before { - content: "\f004"; -} -.fa-star:before { - content: "\f005"; -} -.fa-star-o:before { - content: "\f006"; -} -.fa-user:before { - content: "\f007"; -} -.fa-film:before { - content: "\f008"; -} -.fa-th-large:before { - content: "\f009"; -} -.fa-th:before { - content: "\f00a"; -} -.fa-th-list:before { - content: "\f00b"; -} -.fa-check:before { - content: "\f00c"; -} -.fa-remove:before, -.fa-close:before, -.fa-times:before { - content: "\f00d"; -} -.fa-search-plus:before { - content: "\f00e"; -} -.fa-search-minus:before { - content: "\f010"; -} -.fa-power-off:before { - content: "\f011"; -} -.fa-signal:before { - content: "\f012"; -} -.fa-gear:before, -.fa-cog:before { - content: "\f013"; -} -.fa-trash-o:before { - content: "\f014"; -} -.fa-home:before { - content: "\f015"; -} -.fa-file-o:before { - content: "\f016"; -} -.fa-clock-o:before { - content: "\f017"; -} -.fa-road:before { - content: "\f018"; -} -.fa-download:before { - content: "\f019"; -} -.fa-arrow-circle-o-down:before { - content: "\f01a"; -} -.fa-arrow-circle-o-up:before { - content: "\f01b"; -} -.fa-inbox:before { - content: "\f01c"; -} -.fa-play-circle-o:before { - content: "\f01d"; -} -.fa-rotate-right:before, -.fa-repeat:before { - content: "\f01e"; -} -.fa-refresh:before { - content: "\f021"; -} -.fa-list-alt:before { - content: "\f022"; -} -.fa-lock:before { - content: "\f023"; -} -.fa-flag:before { - content: "\f024"; -} -.fa-headphones:before { - content: "\f025"; -} -.fa-volume-off:before { - content: "\f026"; -} -.fa-volume-down:before { - content: "\f027"; -} -.fa-volume-up:before { - content: "\f028"; -} -.fa-qrcode:before { - content: "\f029"; -} -.fa-barcode:before { - content: "\f02a"; -} -.fa-tag:before { - content: "\f02b"; -} -.fa-tags:before { - content: "\f02c"; -} -.fa-book:before { - content: "\f02d"; -} -.fa-bookmark:before { - content: "\f02e"; -} -.fa-print:before { - content: "\f02f"; -} -.fa-camera:before { - content: "\f030"; -} -.fa-font:before { - content: "\f031"; -} -.fa-bold:before { - content: "\f032"; -} -.fa-italic:before { - content: "\f033"; -} -.fa-text-height:before { - content: "\f034"; -} -.fa-text-width:before { - content: "\f035"; -} -.fa-align-left:before { - content: "\f036"; -} -.fa-align-center:before { - content: "\f037"; -} -.fa-align-right:before { - content: "\f038"; -} -.fa-align-justify:before { - content: "\f039"; -} -.fa-list:before { - content: "\f03a"; -} -.fa-dedent:before, -.fa-outdent:before { - content: "\f03b"; -} -.fa-indent:before { - content: "\f03c"; -} -.fa-video-camera:before { - content: "\f03d"; -} -.fa-photo:before, -.fa-image:before, -.fa-picture-o:before { - content: "\f03e"; -} -.fa-pencil:before { - content: "\f040"; -} -.fa-map-marker:before { - content: "\f041"; -} -.fa-adjust:before { - content: "\f042"; -} -.fa-tint:before { - content: "\f043"; -} -.fa-edit:before, -.fa-pencil-square-o:before { - content: "\f044"; -} -.fa-share-square-o:before { - content: "\f045"; -} -.fa-check-square-o:before { - content: "\f046"; -} -.fa-arrows:before { - content: "\f047"; -} -.fa-step-backward:before { - content: "\f048"; -} -.fa-fast-backward:before { - content: "\f049"; -} -.fa-backward:before { - content: "\f04a"; -} -.fa-play:before { - content: "\f04b"; -} -.fa-pause:before { - content: "\f04c"; -} -.fa-stop:before { - content: "\f04d"; -} -.fa-forward:before { - content: "\f04e"; -} -.fa-fast-forward:before { - content: "\f050"; -} -.fa-step-forward:before { - content: "\f051"; -} -.fa-eject:before { - content: "\f052"; -} -.fa-chevron-left:before { - content: "\f053"; -} -.fa-chevron-right:before { - content: "\f054"; -} -.fa-plus-circle:before { - content: "\f055"; -} -.fa-minus-circle:before { - content: "\f056"; -} -.fa-times-circle:before { - content: "\f057"; -} -.fa-check-circle:before { - content: "\f058"; -} -.fa-question-circle:before { - content: "\f059"; -} -.fa-info-circle:before { - content: "\f05a"; -} -.fa-crosshairs:before { - content: "\f05b"; -} -.fa-times-circle-o:before { - content: "\f05c"; -} -.fa-check-circle-o:before { - content: "\f05d"; -} -.fa-ban:before { - content: "\f05e"; -} -.fa-arrow-left:before { - content: "\f060"; -} -.fa-arrow-right:before { - content: "\f061"; -} -.fa-arrow-up:before { - content: "\f062"; -} -.fa-arrow-down:before { - content: "\f063"; -} -.fa-mail-forward:before, -.fa-share:before { - content: "\f064"; -} -.fa-expand:before { - content: "\f065"; -} -.fa-compress:before { - content: "\f066"; -} -.fa-plus:before { - content: "\f067"; -} -.fa-minus:before { - content: "\f068"; -} -.fa-asterisk:before { - content: "\f069"; -} -.fa-exclamation-circle:before { - content: "\f06a"; -} -.fa-gift:before { - content: "\f06b"; -} -.fa-leaf:before { - content: "\f06c"; -} -.fa-fire:before { - content: "\f06d"; -} -.fa-eye:before { - content: "\f06e"; -} -.fa-eye-slash:before { - content: "\f070"; -} -.fa-warning:before, -.fa-exclamation-triangle:before { - content: "\f071"; -} -.fa-plane:before { - content: "\f072"; -} -.fa-calendar:before { - content: "\f073"; -} -.fa-random:before { - content: "\f074"; -} -.fa-comment:before { - content: "\f075"; -} -.fa-magnet:before { - content: "\f076"; -} -.fa-chevron-up:before { - content: "\f077"; -} -.fa-chevron-down:before { - content: "\f078"; -} -.fa-retweet:before { - content: "\f079"; -} -.fa-shopping-cart:before { - content: "\f07a"; -} -.fa-folder:before { - content: "\f07b"; -} -.fa-folder-open:before { - content: "\f07c"; -} -.fa-arrows-v:before { - content: "\f07d"; -} -.fa-arrows-h:before { - content: "\f07e"; -} -.fa-bar-chart-o:before, -.fa-bar-chart:before { - content: "\f080"; -} -.fa-twitter-square:before { - content: "\f081"; -} -.fa-facebook-square:before { - content: "\f082"; -} -.fa-camera-retro:before { - content: "\f083"; -} -.fa-key:before { - content: "\f084"; -} -.fa-gears:before, -.fa-cogs:before { - content: "\f085"; -} -.fa-comments:before { - content: "\f086"; -} -.fa-thumbs-o-up:before { - content: "\f087"; -} -.fa-thumbs-o-down:before { - content: "\f088"; -} -.fa-star-half:before { - content: "\f089"; -} -.fa-heart-o:before { - content: "\f08a"; -} -.fa-sign-out:before { - content: "\f08b"; -} -.fa-linkedin-square:before { - content: "\f08c"; -} -.fa-thumb-tack:before { - content: "\f08d"; -} -.fa-external-link:before { - content: "\f08e"; -} -.fa-sign-in:before { - content: "\f090"; -} -.fa-trophy:before { - content: "\f091"; -} -.fa-github-square:before { - content: "\f092"; -} -.fa-upload:before { - content: "\f093"; -} -.fa-lemon-o:before { - content: "\f094"; -} -.fa-phone:before { - content: "\f095"; -} -.fa-square-o:before { - content: "\f096"; -} -.fa-bookmark-o:before { - content: "\f097"; -} -.fa-phone-square:before { - content: "\f098"; -} -.fa-twitter:before { - content: "\f099"; -} -.fa-facebook:before { - content: "\f09a"; -} -.fa-github:before { - content: "\f09b"; -} -.fa-unlock:before { - content: "\f09c"; -} -.fa-credit-card:before { - content: "\f09d"; -} -.fa-rss:before { - content: "\f09e"; -} -.fa-hdd-o:before { - content: "\f0a0"; -} -.fa-bullhorn:before { - content: "\f0a1"; -} -.fa-bell:before { - content: "\f0f3"; -} -.fa-certificate:before { - content: "\f0a3"; -} -.fa-hand-o-right:before { - content: "\f0a4"; -} -.fa-hand-o-left:before { - content: "\f0a5"; -} -.fa-hand-o-up:before { - content: "\f0a6"; -} -.fa-hand-o-down:before { - content: "\f0a7"; -} -.fa-arrow-circle-left:before { - content: "\f0a8"; -} -.fa-arrow-circle-right:before { - content: "\f0a9"; -} -.fa-arrow-circle-up:before { - content: "\f0aa"; -} -.fa-arrow-circle-down:before { - content: "\f0ab"; -} -.fa-globe:before { - content: "\f0ac"; -} -.fa-wrench:before { - content: "\f0ad"; -} -.fa-tasks:before { - content: "\f0ae"; -} -.fa-filter:before { - content: "\f0b0"; -} -.fa-briefcase:before { - content: "\f0b1"; -} -.fa-arrows-alt:before { - content: "\f0b2"; -} -.fa-group:before, -.fa-users:before { - content: "\f0c0"; -} -.fa-chain:before, -.fa-link:before { - content: "\f0c1"; -} -.fa-cloud:before { - content: "\f0c2"; -} -.fa-flask:before { - content: "\f0c3"; -} -.fa-cut:before, -.fa-scissors:before { - content: "\f0c4"; -} -.fa-copy:before, -.fa-files-o:before { - content: "\f0c5"; -} -.fa-paperclip:before { - content: "\f0c6"; -} -.fa-save:before, -.fa-floppy-o:before { - content: "\f0c7"; -} -.fa-square:before { - content: "\f0c8"; -} -.fa-navicon:before, -.fa-reorder:before, -.fa-bars:before { - content: "\f0c9"; -} -.fa-list-ul:before { - content: "\f0ca"; -} -.fa-list-ol:before { - content: "\f0cb"; -} -.fa-strikethrough:before { - content: "\f0cc"; -} -.fa-underline:before { - content: "\f0cd"; -} -.fa-table:before { - content: "\f0ce"; -} -.fa-magic:before { - content: "\f0d0"; -} -.fa-truck:before { - content: "\f0d1"; -} -.fa-pinterest:before { - content: "\f0d2"; -} -.fa-pinterest-square:before { - content: "\f0d3"; -} -.fa-google-plus-square:before { - content: "\f0d4"; -} -.fa-google-plus:before { - content: "\f0d5"; -} -.fa-money:before { - content: "\f0d6"; -} -.fa-caret-down:before { - content: "\f0d7"; -} -.fa-caret-up:before { - content: "\f0d8"; -} -.fa-caret-left:before { - content: "\f0d9"; -} -.fa-caret-right:before { - content: "\f0da"; -} -.fa-columns:before { - content: "\f0db"; -} -.fa-unsorted:before, -.fa-sort:before { - content: "\f0dc"; -} -.fa-sort-down:before, -.fa-sort-desc:before { - content: "\f0dd"; -} -.fa-sort-up:before, -.fa-sort-asc:before { - content: "\f0de"; -} -.fa-envelope:before { - content: "\f0e0"; -} -.fa-linkedin:before { - content: "\f0e1"; -} -.fa-rotate-left:before, -.fa-undo:before { - content: "\f0e2"; -} -.fa-legal:before, -.fa-gavel:before { - content: "\f0e3"; -} -.fa-dashboard:before, -.fa-tachometer:before { - content: "\f0e4"; -} -.fa-comment-o:before { - content: "\f0e5"; -} -.fa-comments-o:before { - content: "\f0e6"; -} -.fa-flash:before, -.fa-bolt:before { - content: "\f0e7"; -} -.fa-sitemap:before { - content: "\f0e8"; -} -.fa-umbrella:before { - content: "\f0e9"; -} -.fa-paste:before, -.fa-clipboard:before { - content: "\f0ea"; -} -.fa-lightbulb-o:before { - content: "\f0eb"; -} -.fa-exchange:before { - content: "\f0ec"; -} -.fa-cloud-download:before { - content: "\f0ed"; -} -.fa-cloud-upload:before { - content: "\f0ee"; -} -.fa-user-md:before { - content: "\f0f0"; -} -.fa-stethoscope:before { - content: "\f0f1"; -} -.fa-suitcase:before { - content: "\f0f2"; -} -.fa-bell-o:before { - content: "\f0a2"; -} -.fa-coffee:before { - content: "\f0f4"; -} -.fa-cutlery:before { - content: "\f0f5"; -} -.fa-file-text-o:before { - content: "\f0f6"; -} -.fa-building-o:before { - content: "\f0f7"; -} -.fa-hospital-o:before { - content: "\f0f8"; -} -.fa-ambulance:before { - content: "\f0f9"; -} -.fa-medkit:before { - content: "\f0fa"; -} -.fa-fighter-jet:before { - content: "\f0fb"; -} -.fa-beer:before { - content: "\f0fc"; -} -.fa-h-square:before { - content: "\f0fd"; -} -.fa-plus-square:before { - content: "\f0fe"; -} -.fa-angle-double-left:before { - content: "\f100"; -} -.fa-angle-double-right:before { - content: "\f101"; -} -.fa-angle-double-up:before { - content: "\f102"; -} -.fa-angle-double-down:before { - content: "\f103"; -} -.fa-angle-left:before { - content: "\f104"; -} -.fa-angle-right:before { - content: "\f105"; -} -.fa-angle-up:before { - content: "\f106"; -} -.fa-angle-down:before { - content: "\f107"; -} -.fa-desktop:before { - content: "\f108"; -} -.fa-laptop:before { - content: "\f109"; -} -.fa-tablet:before { - content: "\f10a"; -} -.fa-mobile-phone:before, -.fa-mobile:before { - content: "\f10b"; -} -.fa-circle-o:before { - content: "\f10c"; -} -.fa-quote-left:before { - content: "\f10d"; -} -.fa-quote-right:before { - content: "\f10e"; -} -.fa-spinner:before { - content: "\f110"; -} -.fa-circle:before { - content: "\f111"; -} -.fa-mail-reply:before, -.fa-reply:before { - content: "\f112"; -} -.fa-github-alt:before { - content: "\f113"; -} -.fa-folder-o:before { - content: "\f114"; -} -.fa-folder-open-o:before { - content: "\f115"; -} -.fa-smile-o:before { - content: "\f118"; -} -.fa-frown-o:before { - content: "\f119"; -} -.fa-meh-o:before { - content: "\f11a"; -} -.fa-gamepad:before { - content: "\f11b"; -} -.fa-keyboard-o:before { - content: "\f11c"; -} -.fa-flag-o:before { - content: "\f11d"; -} -.fa-flag-checkered:before { - content: "\f11e"; -} -.fa-terminal:before { - content: "\f120"; -} -.fa-code:before { - content: "\f121"; -} -.fa-mail-reply-all:before, -.fa-reply-all:before { - content: "\f122"; -} -.fa-star-half-empty:before, -.fa-star-half-full:before, -.fa-star-half-o:before { - content: "\f123"; -} -.fa-location-arrow:before { - content: "\f124"; -} -.fa-crop:before { - content: "\f125"; -} -.fa-code-fork:before { - content: "\f126"; -} -.fa-unlink:before, -.fa-chain-broken:before { - content: "\f127"; -} -.fa-question:before { - content: "\f128"; -} -.fa-info:before { - content: "\f129"; -} -.fa-exclamation:before { - content: "\f12a"; -} -.fa-superscript:before { - content: "\f12b"; -} -.fa-subscript:before { - content: "\f12c"; -} -.fa-eraser:before { - content: "\f12d"; -} -.fa-puzzle-piece:before { - content: "\f12e"; -} -.fa-microphone:before { - content: "\f130"; -} -.fa-microphone-slash:before { - content: "\f131"; -} -.fa-shield:before { - content: "\f132"; -} -.fa-calendar-o:before { - content: "\f133"; -} -.fa-fire-extinguisher:before { - content: "\f134"; -} -.fa-rocket:before { - content: "\f135"; -} -.fa-maxcdn:before { - content: "\f136"; -} -.fa-chevron-circle-left:before { - content: "\f137"; -} -.fa-chevron-circle-right:before { - content: "\f138"; -} -.fa-chevron-circle-up:before { - content: "\f139"; -} -.fa-chevron-circle-down:before { - content: "\f13a"; -} -.fa-html5:before { - content: "\f13b"; -} -.fa-css3:before { - content: "\f13c"; -} -.fa-anchor:before { - content: "\f13d"; -} -.fa-unlock-alt:before { - content: "\f13e"; -} -.fa-bullseye:before { - content: "\f140"; -} -.fa-ellipsis-h:before { - content: "\f141"; -} -.fa-ellipsis-v:before { - content: "\f142"; -} -.fa-rss-square:before { - content: "\f143"; -} -.fa-play-circle:before { - content: "\f144"; -} -.fa-ticket:before { - content: "\f145"; -} -.fa-minus-square:before { - content: "\f146"; -} -.fa-minus-square-o:before { - content: "\f147"; -} -.fa-level-up:before { - content: "\f148"; -} -.fa-level-down:before { - content: "\f149"; -} -.fa-check-square:before { - content: "\f14a"; -} -.fa-pencil-square:before { - content: "\f14b"; -} -.fa-external-link-square:before { - content: "\f14c"; -} -.fa-share-square:before { - content: "\f14d"; -} -.fa-compass:before { - content: "\f14e"; -} -.fa-toggle-down:before, -.fa-caret-square-o-down:before { - content: "\f150"; -} -.fa-toggle-up:before, -.fa-caret-square-o-up:before { - content: "\f151"; -} -.fa-toggle-right:before, -.fa-caret-square-o-right:before { - content: "\f152"; -} -.fa-euro:before, -.fa-eur:before { - content: "\f153"; -} -.fa-gbp:before { - content: "\f154"; -} -.fa-dollar:before, -.fa-usd:before { - content: "\f155"; -} -.fa-rupee:before, -.fa-inr:before { - content: "\f156"; -} -.fa-cny:before, -.fa-rmb:before, -.fa-yen:before, -.fa-jpy:before { - content: "\f157"; -} -.fa-ruble:before, -.fa-rouble:before, -.fa-rub:before { - content: "\f158"; -} -.fa-won:before, -.fa-krw:before { - content: "\f159"; -} -.fa-bitcoin:before, -.fa-btc:before { - content: "\f15a"; -} -.fa-file:before { - content: "\f15b"; -} -.fa-file-text:before { - content: "\f15c"; -} -.fa-sort-alpha-asc:before { - content: "\f15d"; -} -.fa-sort-alpha-desc:before { - content: "\f15e"; -} -.fa-sort-amount-asc:before { - content: "\f160"; -} -.fa-sort-amount-desc:before { - content: "\f161"; -} -.fa-sort-numeric-asc:before { - content: "\f162"; -} -.fa-sort-numeric-desc:before { - content: "\f163"; -} -.fa-thumbs-up:before { - content: "\f164"; -} -.fa-thumbs-down:before { - content: "\f165"; -} -.fa-youtube-square:before { - content: "\f166"; -} -.fa-youtube:before { - content: "\f167"; -} -.fa-xing:before { - content: "\f168"; -} -.fa-xing-square:before { - content: "\f169"; -} -.fa-youtube-play:before { - content: "\f16a"; -} -.fa-dropbox:before { - content: "\f16b"; -} -.fa-stack-overflow:before { - content: "\f16c"; -} -.fa-instagram:before { - content: "\f16d"; -} -.fa-flickr:before { - content: "\f16e"; -} -.fa-adn:before { - content: "\f170"; -} -.fa-bitbucket:before { - content: "\f171"; -} -.fa-bitbucket-square:before { - content: "\f172"; -} -.fa-tumblr:before { - content: "\f173"; -} -.fa-tumblr-square:before { - content: "\f174"; -} -.fa-long-arrow-down:before { - content: "\f175"; -} -.fa-long-arrow-up:before { - content: "\f176"; -} -.fa-long-arrow-left:before { - content: "\f177"; -} -.fa-long-arrow-right:before { - content: "\f178"; -} -.fa-apple:before { - content: "\f179"; -} -.fa-windows:before { - content: "\f17a"; -} -.fa-android:before { - content: "\f17b"; -} -.fa-linux:before { - content: "\f17c"; -} -.fa-dribbble:before { - content: "\f17d"; -} -.fa-skype:before { - content: "\f17e"; -} -.fa-foursquare:before { - content: "\f180"; -} -.fa-trello:before { - content: "\f181"; -} -.fa-female:before { - content: "\f182"; -} -.fa-male:before { - content: "\f183"; -} -.fa-gittip:before { - content: "\f184"; -} -.fa-sun-o:before { - content: "\f185"; -} -.fa-moon-o:before { - content: "\f186"; -} -.fa-archive:before { - content: "\f187"; -} -.fa-bug:before { - content: "\f188"; -} -.fa-vk:before { - content: "\f189"; -} -.fa-weibo:before { - content: "\f18a"; -} -.fa-renren:before { - content: "\f18b"; -} -.fa-pagelines:before { - content: "\f18c"; -} -.fa-stack-exchange:before { - content: "\f18d"; -} -.fa-arrow-circle-o-right:before { - content: "\f18e"; -} -.fa-arrow-circle-o-left:before { - content: "\f190"; -} -.fa-toggle-left:before, -.fa-caret-square-o-left:before { - content: "\f191"; -} -.fa-dot-circle-o:before { - content: "\f192"; -} -.fa-wheelchair:before { - content: "\f193"; -} -.fa-vimeo-square:before { - content: "\f194"; -} -.fa-turkish-lira:before, -.fa-try:before { - content: "\f195"; -} -.fa-plus-square-o:before { - content: "\f196"; -} -.fa-space-shuttle:before { - content: "\f197"; -} -.fa-slack:before { - content: "\f198"; -} -.fa-envelope-square:before { - content: "\f199"; -} -.fa-wordpress:before { - content: "\f19a"; -} -.fa-openid:before { - content: "\f19b"; -} -.fa-institution:before, -.fa-bank:before, -.fa-university:before { - content: "\f19c"; -} -.fa-mortar-board:before, -.fa-graduation-cap:before { - content: "\f19d"; -} -.fa-yahoo:before { - content: "\f19e"; -} -.fa-google:before { - content: "\f1a0"; -} -.fa-reddit:before { - content: "\f1a1"; -} -.fa-reddit-square:before { - content: "\f1a2"; -} -.fa-stumbleupon-circle:before { - content: "\f1a3"; -} -.fa-stumbleupon:before { - content: "\f1a4"; -} -.fa-delicious:before { - content: "\f1a5"; -} -.fa-digg:before { - content: "\f1a6"; -} -.fa-pied-piper:before { - content: "\f1a7"; -} -.fa-pied-piper-alt:before { - content: "\f1a8"; -} -.fa-drupal:before { - content: "\f1a9"; -} -.fa-joomla:before { - content: "\f1aa"; -} -.fa-language:before { - content: "\f1ab"; -} -.fa-fax:before { - content: "\f1ac"; -} -.fa-building:before { - content: "\f1ad"; -} -.fa-child:before { - content: "\f1ae"; -} -.fa-paw:before { - content: "\f1b0"; -} -.fa-spoon:before { - content: "\f1b1"; -} -.fa-cube:before { - content: "\f1b2"; -} -.fa-cubes:before { - content: "\f1b3"; -} -.fa-behance:before { - content: "\f1b4"; -} -.fa-behance-square:before { - content: "\f1b5"; -} -.fa-steam:before { - content: "\f1b6"; -} -.fa-steam-square:before { - content: "\f1b7"; -} -.fa-recycle:before { - content: "\f1b8"; -} -.fa-automobile:before, -.fa-car:before { - content: "\f1b9"; -} -.fa-cab:before, -.fa-taxi:before { - content: "\f1ba"; -} -.fa-tree:before { - content: "\f1bb"; -} -.fa-spotify:before { - content: "\f1bc"; -} -.fa-deviantart:before { - content: "\f1bd"; -} -.fa-soundcloud:before { - content: "\f1be"; -} -.fa-database:before { - content: "\f1c0"; -} -.fa-file-pdf-o:before { - content: "\f1c1"; -} -.fa-file-word-o:before { - content: "\f1c2"; -} -.fa-file-excel-o:before { - content: "\f1c3"; -} -.fa-file-powerpoint-o:before { - content: "\f1c4"; -} -.fa-file-photo-o:before, -.fa-file-picture-o:before, -.fa-file-image-o:before { - content: "\f1c5"; -} -.fa-file-zip-o:before, -.fa-file-archive-o:before { - content: "\f1c6"; -} -.fa-file-sound-o:before, -.fa-file-audio-o:before { - content: "\f1c7"; -} -.fa-file-movie-o:before, -.fa-file-video-o:before { - content: "\f1c8"; -} -.fa-file-code-o:before { - content: "\f1c9"; -} -.fa-vine:before { - content: "\f1ca"; -} -.fa-codepen:before { - content: "\f1cb"; -} -.fa-jsfiddle:before { - content: "\f1cc"; -} -.fa-life-bouy:before, -.fa-life-buoy:before, -.fa-life-saver:before, -.fa-support:before, -.fa-life-ring:before { - content: "\f1cd"; -} -.fa-circle-o-notch:before { - content: "\f1ce"; -} -.fa-ra:before, -.fa-rebel:before { - content: "\f1d0"; -} -.fa-ge:before, -.fa-empire:before { - content: "\f1d1"; -} -.fa-git-square:before { - content: "\f1d2"; -} -.fa-git:before { - content: "\f1d3"; -} -.fa-hacker-news:before { - content: "\f1d4"; -} -.fa-tencent-weibo:before { - content: "\f1d5"; -} -.fa-qq:before { - content: "\f1d6"; -} -.fa-wechat:before, -.fa-weixin:before { - content: "\f1d7"; -} -.fa-send:before, -.fa-paper-plane:before { - content: "\f1d8"; -} -.fa-send-o:before, -.fa-paper-plane-o:before { - content: "\f1d9"; -} -.fa-history:before { - content: "\f1da"; -} -.fa-circle-thin:before { - content: "\f1db"; -} -.fa-header:before { - content: "\f1dc"; -} -.fa-paragraph:before { - content: "\f1dd"; -} -.fa-sliders:before { - content: "\f1de"; -} -.fa-share-alt:before { - content: "\f1e0"; -} -.fa-share-alt-square:before { - content: "\f1e1"; -} -.fa-bomb:before { - content: "\f1e2"; -} -.fa-soccer-ball-o:before, -.fa-futbol-o:before { - content: "\f1e3"; -} -.fa-tty:before { - content: "\f1e4"; -} -.fa-binoculars:before { - content: "\f1e5"; -} -.fa-plug:before { - content: "\f1e6"; -} -.fa-slideshare:before { - content: "\f1e7"; -} -.fa-twitch:before { - content: "\f1e8"; -} -.fa-yelp:before { - content: "\f1e9"; -} -.fa-newspaper-o:before { - content: "\f1ea"; -} -.fa-wifi:before { - content: "\f1eb"; -} -.fa-calculator:before { - content: "\f1ec"; -} -.fa-paypal:before { - content: "\f1ed"; -} -.fa-google-wallet:before { - content: "\f1ee"; -} -.fa-cc-visa:before { - content: "\f1f0"; -} -.fa-cc-mastercard:before { - content: "\f1f1"; -} -.fa-cc-discover:before { - content: "\f1f2"; -} -.fa-cc-amex:before { - content: "\f1f3"; -} -.fa-cc-paypal:before { - content: "\f1f4"; -} -.fa-cc-stripe:before { - content: "\f1f5"; -} -.fa-bell-slash:before { - content: "\f1f6"; -} -.fa-bell-slash-o:before { - content: "\f1f7"; -} -.fa-trash:before { - content: "\f1f8"; -} -.fa-copyright:before { - content: "\f1f9"; -} -.fa-at:before { - content: "\f1fa"; -} -.fa-eyedropper:before { - content: "\f1fb"; -} -.fa-paint-brush:before { - content: "\f1fc"; -} -.fa-birthday-cake:before { - content: "\f1fd"; -} -.fa-area-chart:before { - content: "\f1fe"; -} -.fa-pie-chart:before { - content: "\f200"; -} -.fa-line-chart:before { - content: "\f201"; -} -.fa-lastfm:before { - content: "\f202"; -} -.fa-lastfm-square:before { - content: "\f203"; -} -.fa-toggle-off:before { - content: "\f204"; -} -.fa-toggle-on:before { - content: "\f205"; -} -.fa-bicycle:before { - content: "\f206"; -} -.fa-bus:before { - content: "\f207"; -} -.fa-ioxhost:before { - content: "\f208"; -} -.fa-angellist:before { - content: "\f209"; -} -.fa-cc:before { - content: "\f20a"; -} -.fa-shekel:before, -.fa-sheqel:before, -.fa-ils:before { - content: "\f20b"; -} -.fa-meanpath:before { - content: "\f20c"; -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/css/font-awesome.min.css Index: cgisetup/www/css/fonts/font-awesome-4.2.0/css/font-awesome.min.css ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/css/font-awesome.min.css +++ /dev/null @@ -1,4 +0,0 @@ -/*! - * Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome - * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) - */@font-face{font-family:'FontAwesome';src:url('../fonts/fontawesome-webfont.eot?v=4.2.0');src:url('../fonts/fontawesome-webfont.eot?#iefix&v=4.2.0') format('embedded-opentype'),url('../fonts/fontawesome-webfont.woff?v=4.2.0') format('woff'),url('../fonts/fontawesome-webfont.ttf?v=4.2.0') format('truetype'),url('../fonts/fontawesome-webfont.svg?v=4.2.0#fontawesomeregular') format('svg');font-weight:normal;font-style:normal}.fa{display:inline-block;font:normal normal normal 14px/1 FontAwesome;font-size:inherit;text-rendering:auto;-webkit-font-smoothing:antialiased;-moz-osx-font-smoothing:grayscale}.fa-lg{font-size:1.33333333em;line-height:.75em;vertical-align:-15%}.fa-2x{font-size:2em}.fa-3x{font-size:3em}.fa-4x{font-size:4em}.fa-5x{font-size:5em}.fa-fw{width:1.28571429em;text-align:center}.fa-ul{padding-left:0;margin-left:2.14285714em;list-style-type:none}.fa-ul>li{position:relative}.fa-li{position:absolute;left:-2.14285714em;width:2.14285714em;top:.14285714em;text-align:center}.fa-li.fa-lg{left:-1.85714286em}.fa-border{padding:.2em .25em .15em;border:solid .08em #eee;border-radius:.1em}.pull-right{float:right}.pull-left{float:left}.fa.pull-left{margin-right:.3em}.fa.pull-right{margin-left:.3em}.fa-spin{-webkit-animation:fa-spin 2s infinite linear;animation:fa-spin 2s infinite linear}@-webkit-keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}@keyframes fa-spin{0%{-webkit-transform:rotate(0deg);transform:rotate(0deg)}100%{-webkit-transform:rotate(359deg);transform:rotate(359deg)}}.fa-rotate-90{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=1);-webkit-transform:rotate(90deg);-ms-transform:rotate(90deg);transform:rotate(90deg)}.fa-rotate-180{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2);-webkit-transform:rotate(180deg);-ms-transform:rotate(180deg);transform:rotate(180deg)}.fa-rotate-270{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=3);-webkit-transform:rotate(270deg);-ms-transform:rotate(270deg);transform:rotate(270deg)}.fa-flip-horizontal{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=0, mirror=1);-webkit-transform:scale(-1, 1);-ms-transform:scale(-1, 1);transform:scale(-1, 1)}.fa-flip-vertical{filter:progid:DXImageTransform.Microsoft.BasicImage(rotation=2, mirror=1);-webkit-transform:scale(1, -1);-ms-transform:scale(1, -1);transform:scale(1, -1)}:root .fa-rotate-90,:root .fa-rotate-180,:root .fa-rotate-270,:root .fa-flip-horizontal,:root .fa-flip-vertical{filter:none}.fa-stack{position:relative;display:inline-block;width:2em;height:2em;line-height:2em;vertical-align:middle}.fa-stack-1x,.fa-stack-2x{position:absolute;left:0;width:100%;text-align:center}.fa-stack-1x{line-height:inherit}.fa-stack-2x{font-size:2em}.fa-inverse{color:#fff}.fa-glass:before{content:"\f000"}.fa-music:before{content:"\f001"}.fa-search:before{content:"\f002"}.fa-envelope-o:before{content:"\f003"}.fa-heart:before{content:"\f004"}.fa-star:before{content:"\f005"}.fa-star-o:before{content:"\f006"}.fa-user:before{content:"\f007"}.fa-film:before{content:"\f008"}.fa-th-large:before{content:"\f009"}.fa-th:before{content:"\f00a"}.fa-th-list:before{content:"\f00b"}.fa-check:before{content:"\f00c"}.fa-remove:before,.fa-close:before,.fa-times:before{content:"\f00d"}.fa-search-plus:before{content:"\f00e"}.fa-search-minus:before{content:"\f010"}.fa-power-off:before{content:"\f011"}.fa-signal:before{content:"\f012"}.fa-gear:before,.fa-cog:before{content:"\f013"}.fa-trash-o:before{content:"\f014"}.fa-home:before{content:"\f015"}.fa-file-o:before{content:"\f016"}.fa-clock-o:before{content:"\f017"}.fa-road:before{content:"\f018"}.fa-download:before{content:"\f019"}.fa-arrow-circle-o-down:before{content:"\f01a"}.fa-arrow-circle-o-up:before{content:"\f01b"}.fa-inbox:before{content:"\f01c"}.fa-play-circle-o:before{content:"\f01d"}.fa-rotate-right:before,.fa-repeat:before{content:"\f01e"}.fa-refresh:before{content:"\f021"}.fa-list-alt:before{content:"\f022"}.fa-lock:before{content:"\f023"}.fa-flag:before{content:"\f024"}.fa-headphones:before{content:"\f025"}.fa-volume-off:before{content:"\f026"}.fa-volume-down:before{content:"\f027"}.fa-volume-up:before{content:"\f028"}.fa-qrcode:before{content:"\f029"}.fa-barcode:before{content:"\f02a"}.fa-tag:before{content:"\f02b"}.fa-tags:before{content:"\f02c"}.fa-book:before{content:"\f02d"}.fa-bookmark:before{content:"\f02e"}.fa-print:before{content:"\f02f"}.fa-camera:before{content:"\f030"}.fa-font:before{content:"\f031"}.fa-bold:before{content:"\f032"}.fa-italic:before{content:"\f033"}.fa-text-height:before{content:"\f034"}.fa-text-width:before{content:"\f035"}.fa-align-left:before{content:"\f036"}.fa-align-center:before{content:"\f037"}.fa-align-right:before{content:"\f038"}.fa-align-justify:before{content:"\f039"}.fa-list:before{content:"\f03a"}.fa-dedent:before,.fa-outdent:before{content:"\f03b"}.fa-indent:before{content:"\f03c"}.fa-video-camera:before{content:"\f03d"}.fa-photo:before,.fa-image:before,.fa-picture-o:before{content:"\f03e"}.fa-pencil:before{content:"\f040"}.fa-map-marker:before{content:"\f041"}.fa-adjust:before{content:"\f042"}.fa-tint:before{content:"\f043"}.fa-edit:before,.fa-pencil-square-o:before{content:"\f044"}.fa-share-square-o:before{content:"\f045"}.fa-check-square-o:before{content:"\f046"}.fa-arrows:before{content:"\f047"}.fa-step-backward:before{content:"\f048"}.fa-fast-backward:before{content:"\f049"}.fa-backward:before{content:"\f04a"}.fa-play:before{content:"\f04b"}.fa-pause:before{content:"\f04c"}.fa-stop:before{content:"\f04d"}.fa-forward:before{content:"\f04e"}.fa-fast-forward:before{content:"\f050"}.fa-step-forward:before{content:"\f051"}.fa-eject:before{content:"\f052"}.fa-chevron-left:before{content:"\f053"}.fa-chevron-right:before{content:"\f054"}.fa-plus-circle:before{content:"\f055"}.fa-minus-circle:before{content:"\f056"}.fa-times-circle:before{content:"\f057"}.fa-check-circle:before{content:"\f058"}.fa-question-circle:before{content:"\f059"}.fa-info-circle:before{content:"\f05a"}.fa-crosshairs:before{content:"\f05b"}.fa-times-circle-o:before{content:"\f05c"}.fa-check-circle-o:before{content:"\f05d"}.fa-ban:before{content:"\f05e"}.fa-arrow-left:before{content:"\f060"}.fa-arrow-right:before{content:"\f061"}.fa-arrow-up:before{content:"\f062"}.fa-arrow-down:before{content:"\f063"}.fa-mail-forward:before,.fa-share:before{content:"\f064"}.fa-expand:before{content:"\f065"}.fa-compress:before{content:"\f066"}.fa-plus:before{content:"\f067"}.fa-minus:before{content:"\f068"}.fa-asterisk:before{content:"\f069"}.fa-exclamation-circle:before{content:"\f06a"}.fa-gift:before{content:"\f06b"}.fa-leaf:before{content:"\f06c"}.fa-fire:before{content:"\f06d"}.fa-eye:before{content:"\f06e"}.fa-eye-slash:before{content:"\f070"}.fa-warning:before,.fa-exclamation-triangle:before{content:"\f071"}.fa-plane:before{content:"\f072"}.fa-calendar:before{content:"\f073"}.fa-random:before{content:"\f074"}.fa-comment:before{content:"\f075"}.fa-magnet:before{content:"\f076"}.fa-chevron-up:before{content:"\f077"}.fa-chevron-down:before{content:"\f078"}.fa-retweet:before{content:"\f079"}.fa-shopping-cart:before{content:"\f07a"}.fa-folder:before{content:"\f07b"}.fa-folder-open:before{content:"\f07c"}.fa-arrows-v:before{content:"\f07d"}.fa-arrows-h:before{content:"\f07e"}.fa-bar-chart-o:before,.fa-bar-chart:before{content:"\f080"}.fa-twitter-square:before{content:"\f081"}.fa-facebook-square:before{content:"\f082"}.fa-camera-retro:before{content:"\f083"}.fa-key:before{content:"\f084"}.fa-gears:before,.fa-cogs:before{content:"\f085"}.fa-comments:before{content:"\f086"}.fa-thumbs-o-up:before{content:"\f087"}.fa-thumbs-o-down:before{content:"\f088"}.fa-star-half:before{content:"\f089"}.fa-heart-o:before{content:"\f08a"}.fa-sign-out:before{content:"\f08b"}.fa-linkedin-square:before{content:"\f08c"}.fa-thumb-tack:before{content:"\f08d"}.fa-external-link:before{content:"\f08e"}.fa-sign-in:before{content:"\f090"}.fa-trophy:before{content:"\f091"}.fa-github-square:before{content:"\f092"}.fa-upload:before{content:"\f093"}.fa-lemon-o:before{content:"\f094"}.fa-phone:before{content:"\f095"}.fa-square-o:before{content:"\f096"}.fa-bookmark-o:before{content:"\f097"}.fa-phone-square:before{content:"\f098"}.fa-twitter:before{content:"\f099"}.fa-facebook:before{content:"\f09a"}.fa-github:before{content:"\f09b"}.fa-unlock:before{content:"\f09c"}.fa-credit-card:before{content:"\f09d"}.fa-rss:before{content:"\f09e"}.fa-hdd-o:before{content:"\f0a0"}.fa-bullhorn:before{content:"\f0a1"}.fa-bell:before{content:"\f0f3"}.fa-certificate:before{content:"\f0a3"}.fa-hand-o-right:before{content:"\f0a4"}.fa-hand-o-left:before{content:"\f0a5"}.fa-hand-o-up:before{content:"\f0a6"}.fa-hand-o-down:before{content:"\f0a7"}.fa-arrow-circle-left:before{content:"\f0a8"}.fa-arrow-circle-right:before{content:"\f0a9"}.fa-arrow-circle-up:before{content:"\f0aa"}.fa-arrow-circle-down:before{content:"\f0ab"}.fa-globe:before{content:"\f0ac"}.fa-wrench:before{content:"\f0ad"}.fa-tasks:before{content:"\f0ae"}.fa-filter:before{content:"\f0b0"}.fa-briefcase:before{content:"\f0b1"}.fa-arrows-alt:before{content:"\f0b2"}.fa-group:before,.fa-users:before{content:"\f0c0"}.fa-chain:before,.fa-link:before{content:"\f0c1"}.fa-cloud:before{content:"\f0c2"}.fa-flask:before{content:"\f0c3"}.fa-cut:before,.fa-scissors:before{content:"\f0c4"}.fa-copy:before,.fa-files-o:before{content:"\f0c5"}.fa-paperclip:before{content:"\f0c6"}.fa-save:before,.fa-floppy-o:before{content:"\f0c7"}.fa-square:before{content:"\f0c8"}.fa-navicon:before,.fa-reorder:before,.fa-bars:before{content:"\f0c9"}.fa-list-ul:before{content:"\f0ca"}.fa-list-ol:before{content:"\f0cb"}.fa-strikethrough:before{content:"\f0cc"}.fa-underline:before{content:"\f0cd"}.fa-table:before{content:"\f0ce"}.fa-magic:before{content:"\f0d0"}.fa-truck:before{content:"\f0d1"}.fa-pinterest:before{content:"\f0d2"}.fa-pinterest-square:before{content:"\f0d3"}.fa-google-plus-square:before{content:"\f0d4"}.fa-google-plus:before{content:"\f0d5"}.fa-money:before{content:"\f0d6"}.fa-caret-down:before{content:"\f0d7"}.fa-caret-up:before{content:"\f0d8"}.fa-caret-left:before{content:"\f0d9"}.fa-caret-right:before{content:"\f0da"}.fa-columns:before{content:"\f0db"}.fa-unsorted:before,.fa-sort:before{content:"\f0dc"}.fa-sort-down:before,.fa-sort-desc:before{content:"\f0dd"}.fa-sort-up:before,.fa-sort-asc:before{content:"\f0de"}.fa-envelope:before{content:"\f0e0"}.fa-linkedin:before{content:"\f0e1"}.fa-rotate-left:before,.fa-undo:before{content:"\f0e2"}.fa-legal:before,.fa-gavel:before{content:"\f0e3"}.fa-dashboard:before,.fa-tachometer:before{content:"\f0e4"}.fa-comment-o:before{content:"\f0e5"}.fa-comments-o:before{content:"\f0e6"}.fa-flash:before,.fa-bolt:before{content:"\f0e7"}.fa-sitemap:before{content:"\f0e8"}.fa-umbrella:before{content:"\f0e9"}.fa-paste:before,.fa-clipboard:before{content:"\f0ea"}.fa-lightbulb-o:before{content:"\f0eb"}.fa-exchange:before{content:"\f0ec"}.fa-cloud-download:before{content:"\f0ed"}.fa-cloud-upload:before{content:"\f0ee"}.fa-user-md:before{content:"\f0f0"}.fa-stethoscope:before{content:"\f0f1"}.fa-suitcase:before{content:"\f0f2"}.fa-bell-o:before{content:"\f0a2"}.fa-coffee:before{content:"\f0f4"}.fa-cutlery:before{content:"\f0f5"}.fa-file-text-o:before{content:"\f0f6"}.fa-building-o:before{content:"\f0f7"}.fa-hospital-o:before{content:"\f0f8"}.fa-ambulance:before{content:"\f0f9"}.fa-medkit:before{content:"\f0fa"}.fa-fighter-jet:before{content:"\f0fb"}.fa-beer:before{content:"\f0fc"}.fa-h-square:before{content:"\f0fd"}.fa-plus-square:before{content:"\f0fe"}.fa-angle-double-left:before{content:"\f100"}.fa-angle-double-right:before{content:"\f101"}.fa-angle-double-up:before{content:"\f102"}.fa-angle-double-down:before{content:"\f103"}.fa-angle-left:before{content:"\f104"}.fa-angle-right:before{content:"\f105"}.fa-angle-up:before{content:"\f106"}.fa-angle-down:before{content:"\f107"}.fa-desktop:before{content:"\f108"}.fa-laptop:before{content:"\f109"}.fa-tablet:before{content:"\f10a"}.fa-mobile-phone:before,.fa-mobile:before{content:"\f10b"}.fa-circle-o:before{content:"\f10c"}.fa-quote-left:before{content:"\f10d"}.fa-quote-right:before{content:"\f10e"}.fa-spinner:before{content:"\f110"}.fa-circle:before{content:"\f111"}.fa-mail-reply:before,.fa-reply:before{content:"\f112"}.fa-github-alt:before{content:"\f113"}.fa-folder-o:before{content:"\f114"}.fa-folder-open-o:before{content:"\f115"}.fa-smile-o:before{content:"\f118"}.fa-frown-o:before{content:"\f119"}.fa-meh-o:before{content:"\f11a"}.fa-gamepad:before{content:"\f11b"}.fa-keyboard-o:before{content:"\f11c"}.fa-flag-o:before{content:"\f11d"}.fa-flag-checkered:before{content:"\f11e"}.fa-terminal:before{content:"\f120"}.fa-code:before{content:"\f121"}.fa-mail-reply-all:before,.fa-reply-all:before{content:"\f122"}.fa-star-half-empty:before,.fa-star-half-full:before,.fa-star-half-o:before{content:"\f123"}.fa-location-arrow:before{content:"\f124"}.fa-crop:before{content:"\f125"}.fa-code-fork:before{content:"\f126"}.fa-unlink:before,.fa-chain-broken:before{content:"\f127"}.fa-question:before{content:"\f128"}.fa-info:before{content:"\f129"}.fa-exclamation:before{content:"\f12a"}.fa-superscript:before{content:"\f12b"}.fa-subscript:before{content:"\f12c"}.fa-eraser:before{content:"\f12d"}.fa-puzzle-piece:before{content:"\f12e"}.fa-microphone:before{content:"\f130"}.fa-microphone-slash:before{content:"\f131"}.fa-shield:before{content:"\f132"}.fa-calendar-o:before{content:"\f133"}.fa-fire-extinguisher:before{content:"\f134"}.fa-rocket:before{content:"\f135"}.fa-maxcdn:before{content:"\f136"}.fa-chevron-circle-left:before{content:"\f137"}.fa-chevron-circle-right:before{content:"\f138"}.fa-chevron-circle-up:before{content:"\f139"}.fa-chevron-circle-down:before{content:"\f13a"}.fa-html5:before{content:"\f13b"}.fa-css3:before{content:"\f13c"}.fa-anchor:before{content:"\f13d"}.fa-unlock-alt:before{content:"\f13e"}.fa-bullseye:before{content:"\f140"}.fa-ellipsis-h:before{content:"\f141"}.fa-ellipsis-v:before{content:"\f142"}.fa-rss-square:before{content:"\f143"}.fa-play-circle:before{content:"\f144"}.fa-ticket:before{content:"\f145"}.fa-minus-square:before{content:"\f146"}.fa-minus-square-o:before{content:"\f147"}.fa-level-up:before{content:"\f148"}.fa-level-down:before{content:"\f149"}.fa-check-square:before{content:"\f14a"}.fa-pencil-square:before{content:"\f14b"}.fa-external-link-square:before{content:"\f14c"}.fa-share-square:before{content:"\f14d"}.fa-compass:before{content:"\f14e"}.fa-toggle-down:before,.fa-caret-square-o-down:before{content:"\f150"}.fa-toggle-up:before,.fa-caret-square-o-up:before{content:"\f151"}.fa-toggle-right:before,.fa-caret-square-o-right:before{content:"\f152"}.fa-euro:before,.fa-eur:before{content:"\f153"}.fa-gbp:before{content:"\f154"}.fa-dollar:before,.fa-usd:before{content:"\f155"}.fa-rupee:before,.fa-inr:before{content:"\f156"}.fa-cny:before,.fa-rmb:before,.fa-yen:before,.fa-jpy:before{content:"\f157"}.fa-ruble:before,.fa-rouble:before,.fa-rub:before{content:"\f158"}.fa-won:before,.fa-krw:before{content:"\f159"}.fa-bitcoin:before,.fa-btc:before{content:"\f15a"}.fa-file:before{content:"\f15b"}.fa-file-text:before{content:"\f15c"}.fa-sort-alpha-asc:before{content:"\f15d"}.fa-sort-alpha-desc:before{content:"\f15e"}.fa-sort-amount-asc:before{content:"\f160"}.fa-sort-amount-desc:before{content:"\f161"}.fa-sort-numeric-asc:before{content:"\f162"}.fa-sort-numeric-desc:before{content:"\f163"}.fa-thumbs-up:before{content:"\f164"}.fa-thumbs-down:before{content:"\f165"}.fa-youtube-square:before{content:"\f166"}.fa-youtube:before{content:"\f167"}.fa-xing:before{content:"\f168"}.fa-xing-square:before{content:"\f169"}.fa-youtube-play:before{content:"\f16a"}.fa-dropbox:before{content:"\f16b"}.fa-stack-overflow:before{content:"\f16c"}.fa-instagram:before{content:"\f16d"}.fa-flickr:before{content:"\f16e"}.fa-adn:before{content:"\f170"}.fa-bitbucket:before{content:"\f171"}.fa-bitbucket-square:before{content:"\f172"}.fa-tumblr:before{content:"\f173"}.fa-tumblr-square:before{content:"\f174"}.fa-long-arrow-down:before{content:"\f175"}.fa-long-arrow-up:before{content:"\f176"}.fa-long-arrow-left:before{content:"\f177"}.fa-long-arrow-right:before{content:"\f178"}.fa-apple:before{content:"\f179"}.fa-windows:before{content:"\f17a"}.fa-android:before{content:"\f17b"}.fa-linux:before{content:"\f17c"}.fa-dribbble:before{content:"\f17d"}.fa-skype:before{content:"\f17e"}.fa-foursquare:before{content:"\f180"}.fa-trello:before{content:"\f181"}.fa-female:before{content:"\f182"}.fa-male:before{content:"\f183"}.fa-gittip:before{content:"\f184"}.fa-sun-o:before{content:"\f185"}.fa-moon-o:before{content:"\f186"}.fa-archive:before{content:"\f187"}.fa-bug:before{content:"\f188"}.fa-vk:before{content:"\f189"}.fa-weibo:before{content:"\f18a"}.fa-renren:before{content:"\f18b"}.fa-pagelines:before{content:"\f18c"}.fa-stack-exchange:before{content:"\f18d"}.fa-arrow-circle-o-right:before{content:"\f18e"}.fa-arrow-circle-o-left:before{content:"\f190"}.fa-toggle-left:before,.fa-caret-square-o-left:before{content:"\f191"}.fa-dot-circle-o:before{content:"\f192"}.fa-wheelchair:before{content:"\f193"}.fa-vimeo-square:before{content:"\f194"}.fa-turkish-lira:before,.fa-try:before{content:"\f195"}.fa-plus-square-o:before{content:"\f196"}.fa-space-shuttle:before{content:"\f197"}.fa-slack:before{content:"\f198"}.fa-envelope-square:before{content:"\f199"}.fa-wordpress:before{content:"\f19a"}.fa-openid:before{content:"\f19b"}.fa-institution:before,.fa-bank:before,.fa-university:before{content:"\f19c"}.fa-mortar-board:before,.fa-graduation-cap:before{content:"\f19d"}.fa-yahoo:before{content:"\f19e"}.fa-google:before{content:"\f1a0"}.fa-reddit:before{content:"\f1a1"}.fa-reddit-square:before{content:"\f1a2"}.fa-stumbleupon-circle:before{content:"\f1a3"}.fa-stumbleupon:before{content:"\f1a4"}.fa-delicious:before{content:"\f1a5"}.fa-digg:before{content:"\f1a6"}.fa-pied-piper:before{content:"\f1a7"}.fa-pied-piper-alt:before{content:"\f1a8"}.fa-drupal:before{content:"\f1a9"}.fa-joomla:before{content:"\f1aa"}.fa-language:before{content:"\f1ab"}.fa-fax:before{content:"\f1ac"}.fa-building:before{content:"\f1ad"}.fa-child:before{content:"\f1ae"}.fa-paw:before{content:"\f1b0"}.fa-spoon:before{content:"\f1b1"}.fa-cube:before{content:"\f1b2"}.fa-cubes:before{content:"\f1b3"}.fa-behance:before{content:"\f1b4"}.fa-behance-square:before{content:"\f1b5"}.fa-steam:before{content:"\f1b6"}.fa-steam-square:before{content:"\f1b7"}.fa-recycle:before{content:"\f1b8"}.fa-automobile:before,.fa-car:before{content:"\f1b9"}.fa-cab:before,.fa-taxi:before{content:"\f1ba"}.fa-tree:before{content:"\f1bb"}.fa-spotify:before{content:"\f1bc"}.fa-deviantart:before{content:"\f1bd"}.fa-soundcloud:before{content:"\f1be"}.fa-database:before{content:"\f1c0"}.fa-file-pdf-o:before{content:"\f1c1"}.fa-file-word-o:before{content:"\f1c2"}.fa-file-excel-o:before{content:"\f1c3"}.fa-file-powerpoint-o:before{content:"\f1c4"}.fa-file-photo-o:before,.fa-file-picture-o:before,.fa-file-image-o:before{content:"\f1c5"}.fa-file-zip-o:before,.fa-file-archive-o:before{content:"\f1c6"}.fa-file-sound-o:before,.fa-file-audio-o:before{content:"\f1c7"}.fa-file-movie-o:before,.fa-file-video-o:before{content:"\f1c8"}.fa-file-code-o:before{content:"\f1c9"}.fa-vine:before{content:"\f1ca"}.fa-codepen:before{content:"\f1cb"}.fa-jsfiddle:before{content:"\f1cc"}.fa-life-bouy:before,.fa-life-buoy:before,.fa-life-saver:before,.fa-support:before,.fa-life-ring:before{content:"\f1cd"}.fa-circle-o-notch:before{content:"\f1ce"}.fa-ra:before,.fa-rebel:before{content:"\f1d0"}.fa-ge:before,.fa-empire:before{content:"\f1d1"}.fa-git-square:before{content:"\f1d2"}.fa-git:before{content:"\f1d3"}.fa-hacker-news:before{content:"\f1d4"}.fa-tencent-weibo:before{content:"\f1d5"}.fa-qq:before{content:"\f1d6"}.fa-wechat:before,.fa-weixin:before{content:"\f1d7"}.fa-send:before,.fa-paper-plane:before{content:"\f1d8"}.fa-send-o:before,.fa-paper-plane-o:before{content:"\f1d9"}.fa-history:before{content:"\f1da"}.fa-circle-thin:before{content:"\f1db"}.fa-header:before{content:"\f1dc"}.fa-paragraph:before{content:"\f1dd"}.fa-sliders:before{content:"\f1de"}.fa-share-alt:before{content:"\f1e0"}.fa-share-alt-square:before{content:"\f1e1"}.fa-bomb:before{content:"\f1e2"}.fa-soccer-ball-o:before,.fa-futbol-o:before{content:"\f1e3"}.fa-tty:before{content:"\f1e4"}.fa-binoculars:before{content:"\f1e5"}.fa-plug:before{content:"\f1e6"}.fa-slideshare:before{content:"\f1e7"}.fa-twitch:before{content:"\f1e8"}.fa-yelp:before{content:"\f1e9"}.fa-newspaper-o:before{content:"\f1ea"}.fa-wifi:before{content:"\f1eb"}.fa-calculator:before{content:"\f1ec"}.fa-paypal:before{content:"\f1ed"}.fa-google-wallet:before{content:"\f1ee"}.fa-cc-visa:before{content:"\f1f0"}.fa-cc-mastercard:before{content:"\f1f1"}.fa-cc-discover:before{content:"\f1f2"}.fa-cc-amex:before{content:"\f1f3"}.fa-cc-paypal:before{content:"\f1f4"}.fa-cc-stripe:before{content:"\f1f5"}.fa-bell-slash:before{content:"\f1f6"}.fa-bell-slash-o:before{content:"\f1f7"}.fa-trash:before{content:"\f1f8"}.fa-copyright:before{content:"\f1f9"}.fa-at:before{content:"\f1fa"}.fa-eyedropper:before{content:"\f1fb"}.fa-paint-brush:before{content:"\f1fc"}.fa-birthday-cake:before{content:"\f1fd"}.fa-area-chart:before{content:"\f1fe"}.fa-pie-chart:before{content:"\f200"}.fa-line-chart:before{content:"\f201"}.fa-lastfm:before{content:"\f202"}.fa-lastfm-square:before{content:"\f203"}.fa-toggle-off:before{content:"\f204"}.fa-toggle-on:before{content:"\f205"}.fa-bicycle:before{content:"\f206"}.fa-bus:before{content:"\f207"}.fa-ioxhost:before{content:"\f208"}.fa-angellist:before{content:"\f209"}.fa-cc:before{content:"\f20a"}.fa-shekel:before,.fa-sheqel:before,.fa-ils:before{content:"\f20b"}.fa-meanpath:before{content:"\f20c"} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/FontAwesome.otf Index: cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/FontAwesome.otf ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/FontAwesome.otf +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/fontawesome-webfont.eot Index: cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/fontawesome-webfont.eot ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/fontawesome-webfont.eot +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/fontawesome-webfont.svg Index: cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/fontawesome-webfont.svg ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/fontawesome-webfont.svg +++ /dev/null @@ -1,520 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/fontawesome-webfont.ttf Index: cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/fontawesome-webfont.ttf ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/fontawesome-webfont.ttf +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/fontawesome-webfont.woff Index: cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/fontawesome-webfont.woff ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/fonts/fontawesome-webfont.woff +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/less/bordered-pulled.less Index: cgisetup/www/css/fonts/font-awesome-4.2.0/less/bordered-pulled.less ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/less/bordered-pulled.less +++ /dev/null @@ -1,16 +0,0 @@ -// Bordered & Pulled -// ------------------------- - -.@{fa-css-prefix}-border { - padding: .2em .25em .15em; - border: solid .08em @fa-border-color; - border-radius: .1em; -} - -.pull-right { float: right; } -.pull-left { float: left; } - -.@{fa-css-prefix} { - &.pull-left { margin-right: .3em; } - &.pull-right { margin-left: .3em; } -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/less/core.less Index: cgisetup/www/css/fonts/font-awesome-4.2.0/less/core.less ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/less/core.less +++ /dev/null @@ -1,11 +0,0 @@ -// Base Class Definition -// ------------------------- - -.@{fa-css-prefix} { - display: inline-block; - font: normal normal normal 14px/1 FontAwesome; // shortening font declaration - font-size: inherit; // can't have font-size inherit on line above, so need to override - text-rendering: auto; // optimizelegibility throws things off #1094 - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/less/fixed-width.less Index: cgisetup/www/css/fonts/font-awesome-4.2.0/less/fixed-width.less ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/less/fixed-width.less +++ /dev/null @@ -1,6 +0,0 @@ -// Fixed Width Icons -// ------------------------- -.@{fa-css-prefix}-fw { - width: (18em / 14); - text-align: center; -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/less/font-awesome.less Index: cgisetup/www/css/fonts/font-awesome-4.2.0/less/font-awesome.less ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/less/font-awesome.less +++ /dev/null @@ -1,17 +0,0 @@ -/*! - * Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome - * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) - */ - -@import "variables.less"; -@import "mixins.less"; -@import "path.less"; -@import "core.less"; -@import "larger.less"; -@import "fixed-width.less"; -@import "list.less"; -@import "bordered-pulled.less"; -@import "spinning.less"; -@import "rotated-flipped.less"; -@import "stacked.less"; -@import "icons.less"; DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/less/icons.less Index: cgisetup/www/css/fonts/font-awesome-4.2.0/less/icons.less ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/less/icons.less +++ /dev/null @@ -1,552 +0,0 @@ -/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen - readers do not read off random characters that represent icons */ - -.@{fa-css-prefix}-glass:before { content: @fa-var-glass; } -.@{fa-css-prefix}-music:before { content: @fa-var-music; } -.@{fa-css-prefix}-search:before { content: @fa-var-search; } -.@{fa-css-prefix}-envelope-o:before { content: @fa-var-envelope-o; } -.@{fa-css-prefix}-heart:before { content: @fa-var-heart; } -.@{fa-css-prefix}-star:before { content: @fa-var-star; } -.@{fa-css-prefix}-star-o:before { content: @fa-var-star-o; } -.@{fa-css-prefix}-user:before { content: @fa-var-user; } -.@{fa-css-prefix}-film:before { content: @fa-var-film; } -.@{fa-css-prefix}-th-large:before { content: @fa-var-th-large; } -.@{fa-css-prefix}-th:before { content: @fa-var-th; } -.@{fa-css-prefix}-th-list:before { content: @fa-var-th-list; } -.@{fa-css-prefix}-check:before { content: @fa-var-check; } -.@{fa-css-prefix}-remove:before, -.@{fa-css-prefix}-close:before, -.@{fa-css-prefix}-times:before { content: @fa-var-times; } -.@{fa-css-prefix}-search-plus:before { content: @fa-var-search-plus; } -.@{fa-css-prefix}-search-minus:before { content: @fa-var-search-minus; } -.@{fa-css-prefix}-power-off:before { content: @fa-var-power-off; } -.@{fa-css-prefix}-signal:before { content: @fa-var-signal; } -.@{fa-css-prefix}-gear:before, -.@{fa-css-prefix}-cog:before { content: @fa-var-cog; } -.@{fa-css-prefix}-trash-o:before { content: @fa-var-trash-o; } -.@{fa-css-prefix}-home:before { content: @fa-var-home; } -.@{fa-css-prefix}-file-o:before { content: @fa-var-file-o; } -.@{fa-css-prefix}-clock-o:before { content: @fa-var-clock-o; } -.@{fa-css-prefix}-road:before { content: @fa-var-road; } -.@{fa-css-prefix}-download:before { content: @fa-var-download; } -.@{fa-css-prefix}-arrow-circle-o-down:before { content: @fa-var-arrow-circle-o-down; } -.@{fa-css-prefix}-arrow-circle-o-up:before { content: @fa-var-arrow-circle-o-up; } -.@{fa-css-prefix}-inbox:before { content: @fa-var-inbox; } -.@{fa-css-prefix}-play-circle-o:before { content: @fa-var-play-circle-o; } -.@{fa-css-prefix}-rotate-right:before, -.@{fa-css-prefix}-repeat:before { content: @fa-var-repeat; } -.@{fa-css-prefix}-refresh:before { content: @fa-var-refresh; } -.@{fa-css-prefix}-list-alt:before { content: @fa-var-list-alt; } -.@{fa-css-prefix}-lock:before { content: @fa-var-lock; } -.@{fa-css-prefix}-flag:before { content: @fa-var-flag; } -.@{fa-css-prefix}-headphones:before { content: @fa-var-headphones; } -.@{fa-css-prefix}-volume-off:before { content: @fa-var-volume-off; } -.@{fa-css-prefix}-volume-down:before { content: @fa-var-volume-down; } -.@{fa-css-prefix}-volume-up:before { content: @fa-var-volume-up; } -.@{fa-css-prefix}-qrcode:before { content: @fa-var-qrcode; } -.@{fa-css-prefix}-barcode:before { content: @fa-var-barcode; } -.@{fa-css-prefix}-tag:before { content: @fa-var-tag; } -.@{fa-css-prefix}-tags:before { content: @fa-var-tags; } -.@{fa-css-prefix}-book:before { content: @fa-var-book; } -.@{fa-css-prefix}-bookmark:before { content: @fa-var-bookmark; } -.@{fa-css-prefix}-print:before { content: @fa-var-print; } -.@{fa-css-prefix}-camera:before { content: @fa-var-camera; } -.@{fa-css-prefix}-font:before { content: @fa-var-font; } -.@{fa-css-prefix}-bold:before { content: @fa-var-bold; } -.@{fa-css-prefix}-italic:before { content: @fa-var-italic; } -.@{fa-css-prefix}-text-height:before { content: @fa-var-text-height; } -.@{fa-css-prefix}-text-width:before { content: @fa-var-text-width; } -.@{fa-css-prefix}-align-left:before { content: @fa-var-align-left; } -.@{fa-css-prefix}-align-center:before { content: @fa-var-align-center; } -.@{fa-css-prefix}-align-right:before { content: @fa-var-align-right; } -.@{fa-css-prefix}-align-justify:before { content: @fa-var-align-justify; } -.@{fa-css-prefix}-list:before { content: @fa-var-list; } -.@{fa-css-prefix}-dedent:before, -.@{fa-css-prefix}-outdent:before { content: @fa-var-outdent; } -.@{fa-css-prefix}-indent:before { content: @fa-var-indent; } -.@{fa-css-prefix}-video-camera:before { content: @fa-var-video-camera; } -.@{fa-css-prefix}-photo:before, -.@{fa-css-prefix}-image:before, -.@{fa-css-prefix}-picture-o:before { content: @fa-var-picture-o; } -.@{fa-css-prefix}-pencil:before { content: @fa-var-pencil; } -.@{fa-css-prefix}-map-marker:before { content: @fa-var-map-marker; } -.@{fa-css-prefix}-adjust:before { content: @fa-var-adjust; } -.@{fa-css-prefix}-tint:before { content: @fa-var-tint; } -.@{fa-css-prefix}-edit:before, -.@{fa-css-prefix}-pencil-square-o:before { content: @fa-var-pencil-square-o; } -.@{fa-css-prefix}-share-square-o:before { content: @fa-var-share-square-o; } -.@{fa-css-prefix}-check-square-o:before { content: @fa-var-check-square-o; } -.@{fa-css-prefix}-arrows:before { content: @fa-var-arrows; } -.@{fa-css-prefix}-step-backward:before { content: @fa-var-step-backward; } -.@{fa-css-prefix}-fast-backward:before { content: @fa-var-fast-backward; } -.@{fa-css-prefix}-backward:before { content: @fa-var-backward; } -.@{fa-css-prefix}-play:before { content: @fa-var-play; } -.@{fa-css-prefix}-pause:before { content: @fa-var-pause; } -.@{fa-css-prefix}-stop:before { content: @fa-var-stop; } -.@{fa-css-prefix}-forward:before { content: @fa-var-forward; } -.@{fa-css-prefix}-fast-forward:before { content: @fa-var-fast-forward; } -.@{fa-css-prefix}-step-forward:before { content: @fa-var-step-forward; } -.@{fa-css-prefix}-eject:before { content: @fa-var-eject; } -.@{fa-css-prefix}-chevron-left:before { content: @fa-var-chevron-left; } -.@{fa-css-prefix}-chevron-right:before { content: @fa-var-chevron-right; } -.@{fa-css-prefix}-plus-circle:before { content: @fa-var-plus-circle; } -.@{fa-css-prefix}-minus-circle:before { content: @fa-var-minus-circle; } -.@{fa-css-prefix}-times-circle:before { content: @fa-var-times-circle; } -.@{fa-css-prefix}-check-circle:before { content: @fa-var-check-circle; } -.@{fa-css-prefix}-question-circle:before { content: @fa-var-question-circle; } -.@{fa-css-prefix}-info-circle:before { content: @fa-var-info-circle; } -.@{fa-css-prefix}-crosshairs:before { content: @fa-var-crosshairs; } -.@{fa-css-prefix}-times-circle-o:before { content: @fa-var-times-circle-o; } -.@{fa-css-prefix}-check-circle-o:before { content: @fa-var-check-circle-o; } -.@{fa-css-prefix}-ban:before { content: @fa-var-ban; } -.@{fa-css-prefix}-arrow-left:before { content: @fa-var-arrow-left; } -.@{fa-css-prefix}-arrow-right:before { content: @fa-var-arrow-right; } -.@{fa-css-prefix}-arrow-up:before { content: @fa-var-arrow-up; } -.@{fa-css-prefix}-arrow-down:before { content: @fa-var-arrow-down; } -.@{fa-css-prefix}-mail-forward:before, -.@{fa-css-prefix}-share:before { content: @fa-var-share; } -.@{fa-css-prefix}-expand:before { content: @fa-var-expand; } -.@{fa-css-prefix}-compress:before { content: @fa-var-compress; } -.@{fa-css-prefix}-plus:before { content: @fa-var-plus; } -.@{fa-css-prefix}-minus:before { content: @fa-var-minus; } -.@{fa-css-prefix}-asterisk:before { content: @fa-var-asterisk; } -.@{fa-css-prefix}-exclamation-circle:before { content: @fa-var-exclamation-circle; } -.@{fa-css-prefix}-gift:before { content: @fa-var-gift; } -.@{fa-css-prefix}-leaf:before { content: @fa-var-leaf; } -.@{fa-css-prefix}-fire:before { content: @fa-var-fire; } -.@{fa-css-prefix}-eye:before { content: @fa-var-eye; } -.@{fa-css-prefix}-eye-slash:before { content: @fa-var-eye-slash; } -.@{fa-css-prefix}-warning:before, -.@{fa-css-prefix}-exclamation-triangle:before { content: @fa-var-exclamation-triangle; } -.@{fa-css-prefix}-plane:before { content: @fa-var-plane; } -.@{fa-css-prefix}-calendar:before { content: @fa-var-calendar; } -.@{fa-css-prefix}-random:before { content: @fa-var-random; } -.@{fa-css-prefix}-comment:before { content: @fa-var-comment; } -.@{fa-css-prefix}-magnet:before { content: @fa-var-magnet; } -.@{fa-css-prefix}-chevron-up:before { content: @fa-var-chevron-up; } -.@{fa-css-prefix}-chevron-down:before { content: @fa-var-chevron-down; } -.@{fa-css-prefix}-retweet:before { content: @fa-var-retweet; } -.@{fa-css-prefix}-shopping-cart:before { content: @fa-var-shopping-cart; } -.@{fa-css-prefix}-folder:before { content: @fa-var-folder; } -.@{fa-css-prefix}-folder-open:before { content: @fa-var-folder-open; } -.@{fa-css-prefix}-arrows-v:before { content: @fa-var-arrows-v; } -.@{fa-css-prefix}-arrows-h:before { content: @fa-var-arrows-h; } -.@{fa-css-prefix}-bar-chart-o:before, -.@{fa-css-prefix}-bar-chart:before { content: @fa-var-bar-chart; } -.@{fa-css-prefix}-twitter-square:before { content: @fa-var-twitter-square; } -.@{fa-css-prefix}-facebook-square:before { content: @fa-var-facebook-square; } -.@{fa-css-prefix}-camera-retro:before { content: @fa-var-camera-retro; } -.@{fa-css-prefix}-key:before { content: @fa-var-key; } -.@{fa-css-prefix}-gears:before, -.@{fa-css-prefix}-cogs:before { content: @fa-var-cogs; } -.@{fa-css-prefix}-comments:before { content: @fa-var-comments; } -.@{fa-css-prefix}-thumbs-o-up:before { content: @fa-var-thumbs-o-up; } -.@{fa-css-prefix}-thumbs-o-down:before { content: @fa-var-thumbs-o-down; } -.@{fa-css-prefix}-star-half:before { content: @fa-var-star-half; } -.@{fa-css-prefix}-heart-o:before { content: @fa-var-heart-o; } -.@{fa-css-prefix}-sign-out:before { content: @fa-var-sign-out; } -.@{fa-css-prefix}-linkedin-square:before { content: @fa-var-linkedin-square; } -.@{fa-css-prefix}-thumb-tack:before { content: @fa-var-thumb-tack; } -.@{fa-css-prefix}-external-link:before { content: @fa-var-external-link; } -.@{fa-css-prefix}-sign-in:before { content: @fa-var-sign-in; } -.@{fa-css-prefix}-trophy:before { content: @fa-var-trophy; } -.@{fa-css-prefix}-github-square:before { content: @fa-var-github-square; } -.@{fa-css-prefix}-upload:before { content: @fa-var-upload; } -.@{fa-css-prefix}-lemon-o:before { content: @fa-var-lemon-o; } -.@{fa-css-prefix}-phone:before { content: @fa-var-phone; } -.@{fa-css-prefix}-square-o:before { content: @fa-var-square-o; } -.@{fa-css-prefix}-bookmark-o:before { content: @fa-var-bookmark-o; } -.@{fa-css-prefix}-phone-square:before { content: @fa-var-phone-square; } -.@{fa-css-prefix}-twitter:before { content: @fa-var-twitter; } -.@{fa-css-prefix}-facebook:before { content: @fa-var-facebook; } -.@{fa-css-prefix}-github:before { content: @fa-var-github; } -.@{fa-css-prefix}-unlock:before { content: @fa-var-unlock; } -.@{fa-css-prefix}-credit-card:before { content: @fa-var-credit-card; } -.@{fa-css-prefix}-rss:before { content: @fa-var-rss; } -.@{fa-css-prefix}-hdd-o:before { content: @fa-var-hdd-o; } -.@{fa-css-prefix}-bullhorn:before { content: @fa-var-bullhorn; } -.@{fa-css-prefix}-bell:before { content: @fa-var-bell; } -.@{fa-css-prefix}-certificate:before { content: @fa-var-certificate; } -.@{fa-css-prefix}-hand-o-right:before { content: @fa-var-hand-o-right; } -.@{fa-css-prefix}-hand-o-left:before { content: @fa-var-hand-o-left; } -.@{fa-css-prefix}-hand-o-up:before { content: @fa-var-hand-o-up; } -.@{fa-css-prefix}-hand-o-down:before { content: @fa-var-hand-o-down; } -.@{fa-css-prefix}-arrow-circle-left:before { content: @fa-var-arrow-circle-left; } -.@{fa-css-prefix}-arrow-circle-right:before { content: @fa-var-arrow-circle-right; } -.@{fa-css-prefix}-arrow-circle-up:before { content: @fa-var-arrow-circle-up; } -.@{fa-css-prefix}-arrow-circle-down:before { content: @fa-var-arrow-circle-down; } -.@{fa-css-prefix}-globe:before { content: @fa-var-globe; } -.@{fa-css-prefix}-wrench:before { content: @fa-var-wrench; } -.@{fa-css-prefix}-tasks:before { content: @fa-var-tasks; } -.@{fa-css-prefix}-filter:before { content: @fa-var-filter; } -.@{fa-css-prefix}-briefcase:before { content: @fa-var-briefcase; } -.@{fa-css-prefix}-arrows-alt:before { content: @fa-var-arrows-alt; } -.@{fa-css-prefix}-group:before, -.@{fa-css-prefix}-users:before { content: @fa-var-users; } -.@{fa-css-prefix}-chain:before, -.@{fa-css-prefix}-link:before { content: @fa-var-link; } -.@{fa-css-prefix}-cloud:before { content: @fa-var-cloud; } -.@{fa-css-prefix}-flask:before { content: @fa-var-flask; } -.@{fa-css-prefix}-cut:before, -.@{fa-css-prefix}-scissors:before { content: @fa-var-scissors; } -.@{fa-css-prefix}-copy:before, -.@{fa-css-prefix}-files-o:before { content: @fa-var-files-o; } -.@{fa-css-prefix}-paperclip:before { content: @fa-var-paperclip; } -.@{fa-css-prefix}-save:before, -.@{fa-css-prefix}-floppy-o:before { content: @fa-var-floppy-o; } -.@{fa-css-prefix}-square:before { content: @fa-var-square; } -.@{fa-css-prefix}-navicon:before, -.@{fa-css-prefix}-reorder:before, -.@{fa-css-prefix}-bars:before { content: @fa-var-bars; } -.@{fa-css-prefix}-list-ul:before { content: @fa-var-list-ul; } -.@{fa-css-prefix}-list-ol:before { content: @fa-var-list-ol; } -.@{fa-css-prefix}-strikethrough:before { content: @fa-var-strikethrough; } -.@{fa-css-prefix}-underline:before { content: @fa-var-underline; } -.@{fa-css-prefix}-table:before { content: @fa-var-table; } -.@{fa-css-prefix}-magic:before { content: @fa-var-magic; } -.@{fa-css-prefix}-truck:before { content: @fa-var-truck; } -.@{fa-css-prefix}-pinterest:before { content: @fa-var-pinterest; } -.@{fa-css-prefix}-pinterest-square:before { content: @fa-var-pinterest-square; } -.@{fa-css-prefix}-google-plus-square:before { content: @fa-var-google-plus-square; } -.@{fa-css-prefix}-google-plus:before { content: @fa-var-google-plus; } -.@{fa-css-prefix}-money:before { content: @fa-var-money; } -.@{fa-css-prefix}-caret-down:before { content: @fa-var-caret-down; } -.@{fa-css-prefix}-caret-up:before { content: @fa-var-caret-up; } -.@{fa-css-prefix}-caret-left:before { content: @fa-var-caret-left; } -.@{fa-css-prefix}-caret-right:before { content: @fa-var-caret-right; } -.@{fa-css-prefix}-columns:before { content: @fa-var-columns; } -.@{fa-css-prefix}-unsorted:before, -.@{fa-css-prefix}-sort:before { content: @fa-var-sort; } -.@{fa-css-prefix}-sort-down:before, -.@{fa-css-prefix}-sort-desc:before { content: @fa-var-sort-desc; } -.@{fa-css-prefix}-sort-up:before, -.@{fa-css-prefix}-sort-asc:before { content: @fa-var-sort-asc; } -.@{fa-css-prefix}-envelope:before { content: @fa-var-envelope; } -.@{fa-css-prefix}-linkedin:before { content: @fa-var-linkedin; } -.@{fa-css-prefix}-rotate-left:before, -.@{fa-css-prefix}-undo:before { content: @fa-var-undo; } -.@{fa-css-prefix}-legal:before, -.@{fa-css-prefix}-gavel:before { content: @fa-var-gavel; } -.@{fa-css-prefix}-dashboard:before, -.@{fa-css-prefix}-tachometer:before { content: @fa-var-tachometer; } -.@{fa-css-prefix}-comment-o:before { content: @fa-var-comment-o; } -.@{fa-css-prefix}-comments-o:before { content: @fa-var-comments-o; } -.@{fa-css-prefix}-flash:before, -.@{fa-css-prefix}-bolt:before { content: @fa-var-bolt; } -.@{fa-css-prefix}-sitemap:before { content: @fa-var-sitemap; } -.@{fa-css-prefix}-umbrella:before { content: @fa-var-umbrella; } -.@{fa-css-prefix}-paste:before, -.@{fa-css-prefix}-clipboard:before { content: @fa-var-clipboard; } -.@{fa-css-prefix}-lightbulb-o:before { content: @fa-var-lightbulb-o; } -.@{fa-css-prefix}-exchange:before { content: @fa-var-exchange; } -.@{fa-css-prefix}-cloud-download:before { content: @fa-var-cloud-download; } -.@{fa-css-prefix}-cloud-upload:before { content: @fa-var-cloud-upload; } -.@{fa-css-prefix}-user-md:before { content: @fa-var-user-md; } -.@{fa-css-prefix}-stethoscope:before { content: @fa-var-stethoscope; } -.@{fa-css-prefix}-suitcase:before { content: @fa-var-suitcase; } -.@{fa-css-prefix}-bell-o:before { content: @fa-var-bell-o; } -.@{fa-css-prefix}-coffee:before { content: @fa-var-coffee; } -.@{fa-css-prefix}-cutlery:before { content: @fa-var-cutlery; } -.@{fa-css-prefix}-file-text-o:before { content: @fa-var-file-text-o; } -.@{fa-css-prefix}-building-o:before { content: @fa-var-building-o; } -.@{fa-css-prefix}-hospital-o:before { content: @fa-var-hospital-o; } -.@{fa-css-prefix}-ambulance:before { content: @fa-var-ambulance; } -.@{fa-css-prefix}-medkit:before { content: @fa-var-medkit; } -.@{fa-css-prefix}-fighter-jet:before { content: @fa-var-fighter-jet; } -.@{fa-css-prefix}-beer:before { content: @fa-var-beer; } -.@{fa-css-prefix}-h-square:before { content: @fa-var-h-square; } -.@{fa-css-prefix}-plus-square:before { content: @fa-var-plus-square; } -.@{fa-css-prefix}-angle-double-left:before { content: @fa-var-angle-double-left; } -.@{fa-css-prefix}-angle-double-right:before { content: @fa-var-angle-double-right; } -.@{fa-css-prefix}-angle-double-up:before { content: @fa-var-angle-double-up; } -.@{fa-css-prefix}-angle-double-down:before { content: @fa-var-angle-double-down; } -.@{fa-css-prefix}-angle-left:before { content: @fa-var-angle-left; } -.@{fa-css-prefix}-angle-right:before { content: @fa-var-angle-right; } -.@{fa-css-prefix}-angle-up:before { content: @fa-var-angle-up; } -.@{fa-css-prefix}-angle-down:before { content: @fa-var-angle-down; } -.@{fa-css-prefix}-desktop:before { content: @fa-var-desktop; } -.@{fa-css-prefix}-laptop:before { content: @fa-var-laptop; } -.@{fa-css-prefix}-tablet:before { content: @fa-var-tablet; } -.@{fa-css-prefix}-mobile-phone:before, -.@{fa-css-prefix}-mobile:before { content: @fa-var-mobile; } -.@{fa-css-prefix}-circle-o:before { content: @fa-var-circle-o; } -.@{fa-css-prefix}-quote-left:before { content: @fa-var-quote-left; } -.@{fa-css-prefix}-quote-right:before { content: @fa-var-quote-right; } -.@{fa-css-prefix}-spinner:before { content: @fa-var-spinner; } -.@{fa-css-prefix}-circle:before { content: @fa-var-circle; } -.@{fa-css-prefix}-mail-reply:before, -.@{fa-css-prefix}-reply:before { content: @fa-var-reply; } -.@{fa-css-prefix}-github-alt:before { content: @fa-var-github-alt; } -.@{fa-css-prefix}-folder-o:before { content: @fa-var-folder-o; } -.@{fa-css-prefix}-folder-open-o:before { content: @fa-var-folder-open-o; } -.@{fa-css-prefix}-smile-o:before { content: @fa-var-smile-o; } -.@{fa-css-prefix}-frown-o:before { content: @fa-var-frown-o; } -.@{fa-css-prefix}-meh-o:before { content: @fa-var-meh-o; } -.@{fa-css-prefix}-gamepad:before { content: @fa-var-gamepad; } -.@{fa-css-prefix}-keyboard-o:before { content: @fa-var-keyboard-o; } -.@{fa-css-prefix}-flag-o:before { content: @fa-var-flag-o; } -.@{fa-css-prefix}-flag-checkered:before { content: @fa-var-flag-checkered; } -.@{fa-css-prefix}-terminal:before { content: @fa-var-terminal; } -.@{fa-css-prefix}-code:before { content: @fa-var-code; } -.@{fa-css-prefix}-mail-reply-all:before, -.@{fa-css-prefix}-reply-all:before { content: @fa-var-reply-all; } -.@{fa-css-prefix}-star-half-empty:before, -.@{fa-css-prefix}-star-half-full:before, -.@{fa-css-prefix}-star-half-o:before { content: @fa-var-star-half-o; } -.@{fa-css-prefix}-location-arrow:before { content: @fa-var-location-arrow; } -.@{fa-css-prefix}-crop:before { content: @fa-var-crop; } -.@{fa-css-prefix}-code-fork:before { content: @fa-var-code-fork; } -.@{fa-css-prefix}-unlink:before, -.@{fa-css-prefix}-chain-broken:before { content: @fa-var-chain-broken; } -.@{fa-css-prefix}-question:before { content: @fa-var-question; } -.@{fa-css-prefix}-info:before { content: @fa-var-info; } -.@{fa-css-prefix}-exclamation:before { content: @fa-var-exclamation; } -.@{fa-css-prefix}-superscript:before { content: @fa-var-superscript; } -.@{fa-css-prefix}-subscript:before { content: @fa-var-subscript; } -.@{fa-css-prefix}-eraser:before { content: @fa-var-eraser; } -.@{fa-css-prefix}-puzzle-piece:before { content: @fa-var-puzzle-piece; } -.@{fa-css-prefix}-microphone:before { content: @fa-var-microphone; } -.@{fa-css-prefix}-microphone-slash:before { content: @fa-var-microphone-slash; } -.@{fa-css-prefix}-shield:before { content: @fa-var-shield; } -.@{fa-css-prefix}-calendar-o:before { content: @fa-var-calendar-o; } -.@{fa-css-prefix}-fire-extinguisher:before { content: @fa-var-fire-extinguisher; } -.@{fa-css-prefix}-rocket:before { content: @fa-var-rocket; } -.@{fa-css-prefix}-maxcdn:before { content: @fa-var-maxcdn; } -.@{fa-css-prefix}-chevron-circle-left:before { content: @fa-var-chevron-circle-left; } -.@{fa-css-prefix}-chevron-circle-right:before { content: @fa-var-chevron-circle-right; } -.@{fa-css-prefix}-chevron-circle-up:before { content: @fa-var-chevron-circle-up; } -.@{fa-css-prefix}-chevron-circle-down:before { content: @fa-var-chevron-circle-down; } -.@{fa-css-prefix}-html5:before { content: @fa-var-html5; } -.@{fa-css-prefix}-css3:before { content: @fa-var-css3; } -.@{fa-css-prefix}-anchor:before { content: @fa-var-anchor; } -.@{fa-css-prefix}-unlock-alt:before { content: @fa-var-unlock-alt; } -.@{fa-css-prefix}-bullseye:before { content: @fa-var-bullseye; } -.@{fa-css-prefix}-ellipsis-h:before { content: @fa-var-ellipsis-h; } -.@{fa-css-prefix}-ellipsis-v:before { content: @fa-var-ellipsis-v; } -.@{fa-css-prefix}-rss-square:before { content: @fa-var-rss-square; } -.@{fa-css-prefix}-play-circle:before { content: @fa-var-play-circle; } -.@{fa-css-prefix}-ticket:before { content: @fa-var-ticket; } -.@{fa-css-prefix}-minus-square:before { content: @fa-var-minus-square; } -.@{fa-css-prefix}-minus-square-o:before { content: @fa-var-minus-square-o; } -.@{fa-css-prefix}-level-up:before { content: @fa-var-level-up; } -.@{fa-css-prefix}-level-down:before { content: @fa-var-level-down; } -.@{fa-css-prefix}-check-square:before { content: @fa-var-check-square; } -.@{fa-css-prefix}-pencil-square:before { content: @fa-var-pencil-square; } -.@{fa-css-prefix}-external-link-square:before { content: @fa-var-external-link-square; } -.@{fa-css-prefix}-share-square:before { content: @fa-var-share-square; } -.@{fa-css-prefix}-compass:before { content: @fa-var-compass; } -.@{fa-css-prefix}-toggle-down:before, -.@{fa-css-prefix}-caret-square-o-down:before { content: @fa-var-caret-square-o-down; } -.@{fa-css-prefix}-toggle-up:before, -.@{fa-css-prefix}-caret-square-o-up:before { content: @fa-var-caret-square-o-up; } -.@{fa-css-prefix}-toggle-right:before, -.@{fa-css-prefix}-caret-square-o-right:before { content: @fa-var-caret-square-o-right; } -.@{fa-css-prefix}-euro:before, -.@{fa-css-prefix}-eur:before { content: @fa-var-eur; } -.@{fa-css-prefix}-gbp:before { content: @fa-var-gbp; } -.@{fa-css-prefix}-dollar:before, -.@{fa-css-prefix}-usd:before { content: @fa-var-usd; } -.@{fa-css-prefix}-rupee:before, -.@{fa-css-prefix}-inr:before { content: @fa-var-inr; } -.@{fa-css-prefix}-cny:before, -.@{fa-css-prefix}-rmb:before, -.@{fa-css-prefix}-yen:before, -.@{fa-css-prefix}-jpy:before { content: @fa-var-jpy; } -.@{fa-css-prefix}-ruble:before, -.@{fa-css-prefix}-rouble:before, -.@{fa-css-prefix}-rub:before { content: @fa-var-rub; } -.@{fa-css-prefix}-won:before, -.@{fa-css-prefix}-krw:before { content: @fa-var-krw; } -.@{fa-css-prefix}-bitcoin:before, -.@{fa-css-prefix}-btc:before { content: @fa-var-btc; } -.@{fa-css-prefix}-file:before { content: @fa-var-file; } -.@{fa-css-prefix}-file-text:before { content: @fa-var-file-text; } -.@{fa-css-prefix}-sort-alpha-asc:before { content: @fa-var-sort-alpha-asc; } -.@{fa-css-prefix}-sort-alpha-desc:before { content: @fa-var-sort-alpha-desc; } -.@{fa-css-prefix}-sort-amount-asc:before { content: @fa-var-sort-amount-asc; } -.@{fa-css-prefix}-sort-amount-desc:before { content: @fa-var-sort-amount-desc; } -.@{fa-css-prefix}-sort-numeric-asc:before { content: @fa-var-sort-numeric-asc; } -.@{fa-css-prefix}-sort-numeric-desc:before { content: @fa-var-sort-numeric-desc; } -.@{fa-css-prefix}-thumbs-up:before { content: @fa-var-thumbs-up; } -.@{fa-css-prefix}-thumbs-down:before { content: @fa-var-thumbs-down; } -.@{fa-css-prefix}-youtube-square:before { content: @fa-var-youtube-square; } -.@{fa-css-prefix}-youtube:before { content: @fa-var-youtube; } -.@{fa-css-prefix}-xing:before { content: @fa-var-xing; } -.@{fa-css-prefix}-xing-square:before { content: @fa-var-xing-square; } -.@{fa-css-prefix}-youtube-play:before { content: @fa-var-youtube-play; } -.@{fa-css-prefix}-dropbox:before { content: @fa-var-dropbox; } -.@{fa-css-prefix}-stack-overflow:before { content: @fa-var-stack-overflow; } -.@{fa-css-prefix}-instagram:before { content: @fa-var-instagram; } -.@{fa-css-prefix}-flickr:before { content: @fa-var-flickr; } -.@{fa-css-prefix}-adn:before { content: @fa-var-adn; } -.@{fa-css-prefix}-bitbucket:before { content: @fa-var-bitbucket; } -.@{fa-css-prefix}-bitbucket-square:before { content: @fa-var-bitbucket-square; } -.@{fa-css-prefix}-tumblr:before { content: @fa-var-tumblr; } -.@{fa-css-prefix}-tumblr-square:before { content: @fa-var-tumblr-square; } -.@{fa-css-prefix}-long-arrow-down:before { content: @fa-var-long-arrow-down; } -.@{fa-css-prefix}-long-arrow-up:before { content: @fa-var-long-arrow-up; } -.@{fa-css-prefix}-long-arrow-left:before { content: @fa-var-long-arrow-left; } -.@{fa-css-prefix}-long-arrow-right:before { content: @fa-var-long-arrow-right; } -.@{fa-css-prefix}-apple:before { content: @fa-var-apple; } -.@{fa-css-prefix}-windows:before { content: @fa-var-windows; } -.@{fa-css-prefix}-android:before { content: @fa-var-android; } -.@{fa-css-prefix}-linux:before { content: @fa-var-linux; } -.@{fa-css-prefix}-dribbble:before { content: @fa-var-dribbble; } -.@{fa-css-prefix}-skype:before { content: @fa-var-skype; } -.@{fa-css-prefix}-foursquare:before { content: @fa-var-foursquare; } -.@{fa-css-prefix}-trello:before { content: @fa-var-trello; } -.@{fa-css-prefix}-female:before { content: @fa-var-female; } -.@{fa-css-prefix}-male:before { content: @fa-var-male; } -.@{fa-css-prefix}-gittip:before { content: @fa-var-gittip; } -.@{fa-css-prefix}-sun-o:before { content: @fa-var-sun-o; } -.@{fa-css-prefix}-moon-o:before { content: @fa-var-moon-o; } -.@{fa-css-prefix}-archive:before { content: @fa-var-archive; } -.@{fa-css-prefix}-bug:before { content: @fa-var-bug; } -.@{fa-css-prefix}-vk:before { content: @fa-var-vk; } -.@{fa-css-prefix}-weibo:before { content: @fa-var-weibo; } -.@{fa-css-prefix}-renren:before { content: @fa-var-renren; } -.@{fa-css-prefix}-pagelines:before { content: @fa-var-pagelines; } -.@{fa-css-prefix}-stack-exchange:before { content: @fa-var-stack-exchange; } -.@{fa-css-prefix}-arrow-circle-o-right:before { content: @fa-var-arrow-circle-o-right; } -.@{fa-css-prefix}-arrow-circle-o-left:before { content: @fa-var-arrow-circle-o-left; } -.@{fa-css-prefix}-toggle-left:before, -.@{fa-css-prefix}-caret-square-o-left:before { content: @fa-var-caret-square-o-left; } -.@{fa-css-prefix}-dot-circle-o:before { content: @fa-var-dot-circle-o; } -.@{fa-css-prefix}-wheelchair:before { content: @fa-var-wheelchair; } -.@{fa-css-prefix}-vimeo-square:before { content: @fa-var-vimeo-square; } -.@{fa-css-prefix}-turkish-lira:before, -.@{fa-css-prefix}-try:before { content: @fa-var-try; } -.@{fa-css-prefix}-plus-square-o:before { content: @fa-var-plus-square-o; } -.@{fa-css-prefix}-space-shuttle:before { content: @fa-var-space-shuttle; } -.@{fa-css-prefix}-slack:before { content: @fa-var-slack; } -.@{fa-css-prefix}-envelope-square:before { content: @fa-var-envelope-square; } -.@{fa-css-prefix}-wordpress:before { content: @fa-var-wordpress; } -.@{fa-css-prefix}-openid:before { content: @fa-var-openid; } -.@{fa-css-prefix}-institution:before, -.@{fa-css-prefix}-bank:before, -.@{fa-css-prefix}-university:before { content: @fa-var-university; } -.@{fa-css-prefix}-mortar-board:before, -.@{fa-css-prefix}-graduation-cap:before { content: @fa-var-graduation-cap; } -.@{fa-css-prefix}-yahoo:before { content: @fa-var-yahoo; } -.@{fa-css-prefix}-google:before { content: @fa-var-google; } -.@{fa-css-prefix}-reddit:before { content: @fa-var-reddit; } -.@{fa-css-prefix}-reddit-square:before { content: @fa-var-reddit-square; } -.@{fa-css-prefix}-stumbleupon-circle:before { content: @fa-var-stumbleupon-circle; } -.@{fa-css-prefix}-stumbleupon:before { content: @fa-var-stumbleupon; } -.@{fa-css-prefix}-delicious:before { content: @fa-var-delicious; } -.@{fa-css-prefix}-digg:before { content: @fa-var-digg; } -.@{fa-css-prefix}-pied-piper:before { content: @fa-var-pied-piper; } -.@{fa-css-prefix}-pied-piper-alt:before { content: @fa-var-pied-piper-alt; } -.@{fa-css-prefix}-drupal:before { content: @fa-var-drupal; } -.@{fa-css-prefix}-joomla:before { content: @fa-var-joomla; } -.@{fa-css-prefix}-language:before { content: @fa-var-language; } -.@{fa-css-prefix}-fax:before { content: @fa-var-fax; } -.@{fa-css-prefix}-building:before { content: @fa-var-building; } -.@{fa-css-prefix}-child:before { content: @fa-var-child; } -.@{fa-css-prefix}-paw:before { content: @fa-var-paw; } -.@{fa-css-prefix}-spoon:before { content: @fa-var-spoon; } -.@{fa-css-prefix}-cube:before { content: @fa-var-cube; } -.@{fa-css-prefix}-cubes:before { content: @fa-var-cubes; } -.@{fa-css-prefix}-behance:before { content: @fa-var-behance; } -.@{fa-css-prefix}-behance-square:before { content: @fa-var-behance-square; } -.@{fa-css-prefix}-steam:before { content: @fa-var-steam; } -.@{fa-css-prefix}-steam-square:before { content: @fa-var-steam-square; } -.@{fa-css-prefix}-recycle:before { content: @fa-var-recycle; } -.@{fa-css-prefix}-automobile:before, -.@{fa-css-prefix}-car:before { content: @fa-var-car; } -.@{fa-css-prefix}-cab:before, -.@{fa-css-prefix}-taxi:before { content: @fa-var-taxi; } -.@{fa-css-prefix}-tree:before { content: @fa-var-tree; } -.@{fa-css-prefix}-spotify:before { content: @fa-var-spotify; } -.@{fa-css-prefix}-deviantart:before { content: @fa-var-deviantart; } -.@{fa-css-prefix}-soundcloud:before { content: @fa-var-soundcloud; } -.@{fa-css-prefix}-database:before { content: @fa-var-database; } -.@{fa-css-prefix}-file-pdf-o:before { content: @fa-var-file-pdf-o; } -.@{fa-css-prefix}-file-word-o:before { content: @fa-var-file-word-o; } -.@{fa-css-prefix}-file-excel-o:before { content: @fa-var-file-excel-o; } -.@{fa-css-prefix}-file-powerpoint-o:before { content: @fa-var-file-powerpoint-o; } -.@{fa-css-prefix}-file-photo-o:before, -.@{fa-css-prefix}-file-picture-o:before, -.@{fa-css-prefix}-file-image-o:before { content: @fa-var-file-image-o; } -.@{fa-css-prefix}-file-zip-o:before, -.@{fa-css-prefix}-file-archive-o:before { content: @fa-var-file-archive-o; } -.@{fa-css-prefix}-file-sound-o:before, -.@{fa-css-prefix}-file-audio-o:before { content: @fa-var-file-audio-o; } -.@{fa-css-prefix}-file-movie-o:before, -.@{fa-css-prefix}-file-video-o:before { content: @fa-var-file-video-o; } -.@{fa-css-prefix}-file-code-o:before { content: @fa-var-file-code-o; } -.@{fa-css-prefix}-vine:before { content: @fa-var-vine; } -.@{fa-css-prefix}-codepen:before { content: @fa-var-codepen; } -.@{fa-css-prefix}-jsfiddle:before { content: @fa-var-jsfiddle; } -.@{fa-css-prefix}-life-bouy:before, -.@{fa-css-prefix}-life-buoy:before, -.@{fa-css-prefix}-life-saver:before, -.@{fa-css-prefix}-support:before, -.@{fa-css-prefix}-life-ring:before { content: @fa-var-life-ring; } -.@{fa-css-prefix}-circle-o-notch:before { content: @fa-var-circle-o-notch; } -.@{fa-css-prefix}-ra:before, -.@{fa-css-prefix}-rebel:before { content: @fa-var-rebel; } -.@{fa-css-prefix}-ge:before, -.@{fa-css-prefix}-empire:before { content: @fa-var-empire; } -.@{fa-css-prefix}-git-square:before { content: @fa-var-git-square; } -.@{fa-css-prefix}-git:before { content: @fa-var-git; } -.@{fa-css-prefix}-hacker-news:before { content: @fa-var-hacker-news; } -.@{fa-css-prefix}-tencent-weibo:before { content: @fa-var-tencent-weibo; } -.@{fa-css-prefix}-qq:before { content: @fa-var-qq; } -.@{fa-css-prefix}-wechat:before, -.@{fa-css-prefix}-weixin:before { content: @fa-var-weixin; } -.@{fa-css-prefix}-send:before, -.@{fa-css-prefix}-paper-plane:before { content: @fa-var-paper-plane; } -.@{fa-css-prefix}-send-o:before, -.@{fa-css-prefix}-paper-plane-o:before { content: @fa-var-paper-plane-o; } -.@{fa-css-prefix}-history:before { content: @fa-var-history; } -.@{fa-css-prefix}-circle-thin:before { content: @fa-var-circle-thin; } -.@{fa-css-prefix}-header:before { content: @fa-var-header; } -.@{fa-css-prefix}-paragraph:before { content: @fa-var-paragraph; } -.@{fa-css-prefix}-sliders:before { content: @fa-var-sliders; } -.@{fa-css-prefix}-share-alt:before { content: @fa-var-share-alt; } -.@{fa-css-prefix}-share-alt-square:before { content: @fa-var-share-alt-square; } -.@{fa-css-prefix}-bomb:before { content: @fa-var-bomb; } -.@{fa-css-prefix}-soccer-ball-o:before, -.@{fa-css-prefix}-futbol-o:before { content: @fa-var-futbol-o; } -.@{fa-css-prefix}-tty:before { content: @fa-var-tty; } -.@{fa-css-prefix}-binoculars:before { content: @fa-var-binoculars; } -.@{fa-css-prefix}-plug:before { content: @fa-var-plug; } -.@{fa-css-prefix}-slideshare:before { content: @fa-var-slideshare; } -.@{fa-css-prefix}-twitch:before { content: @fa-var-twitch; } -.@{fa-css-prefix}-yelp:before { content: @fa-var-yelp; } -.@{fa-css-prefix}-newspaper-o:before { content: @fa-var-newspaper-o; } -.@{fa-css-prefix}-wifi:before { content: @fa-var-wifi; } -.@{fa-css-prefix}-calculator:before { content: @fa-var-calculator; } -.@{fa-css-prefix}-paypal:before { content: @fa-var-paypal; } -.@{fa-css-prefix}-google-wallet:before { content: @fa-var-google-wallet; } -.@{fa-css-prefix}-cc-visa:before { content: @fa-var-cc-visa; } -.@{fa-css-prefix}-cc-mastercard:before { content: @fa-var-cc-mastercard; } -.@{fa-css-prefix}-cc-discover:before { content: @fa-var-cc-discover; } -.@{fa-css-prefix}-cc-amex:before { content: @fa-var-cc-amex; } -.@{fa-css-prefix}-cc-paypal:before { content: @fa-var-cc-paypal; } -.@{fa-css-prefix}-cc-stripe:before { content: @fa-var-cc-stripe; } -.@{fa-css-prefix}-bell-slash:before { content: @fa-var-bell-slash; } -.@{fa-css-prefix}-bell-slash-o:before { content: @fa-var-bell-slash-o; } -.@{fa-css-prefix}-trash:before { content: @fa-var-trash; } -.@{fa-css-prefix}-copyright:before { content: @fa-var-copyright; } -.@{fa-css-prefix}-at:before { content: @fa-var-at; } -.@{fa-css-prefix}-eyedropper:before { content: @fa-var-eyedropper; } -.@{fa-css-prefix}-paint-brush:before { content: @fa-var-paint-brush; } -.@{fa-css-prefix}-birthday-cake:before { content: @fa-var-birthday-cake; } -.@{fa-css-prefix}-area-chart:before { content: @fa-var-area-chart; } -.@{fa-css-prefix}-pie-chart:before { content: @fa-var-pie-chart; } -.@{fa-css-prefix}-line-chart:before { content: @fa-var-line-chart; } -.@{fa-css-prefix}-lastfm:before { content: @fa-var-lastfm; } -.@{fa-css-prefix}-lastfm-square:before { content: @fa-var-lastfm-square; } -.@{fa-css-prefix}-toggle-off:before { content: @fa-var-toggle-off; } -.@{fa-css-prefix}-toggle-on:before { content: @fa-var-toggle-on; } -.@{fa-css-prefix}-bicycle:before { content: @fa-var-bicycle; } -.@{fa-css-prefix}-bus:before { content: @fa-var-bus; } -.@{fa-css-prefix}-ioxhost:before { content: @fa-var-ioxhost; } -.@{fa-css-prefix}-angellist:before { content: @fa-var-angellist; } -.@{fa-css-prefix}-cc:before { content: @fa-var-cc; } -.@{fa-css-prefix}-shekel:before, -.@{fa-css-prefix}-sheqel:before, -.@{fa-css-prefix}-ils:before { content: @fa-var-ils; } -.@{fa-css-prefix}-meanpath:before { content: @fa-var-meanpath; } DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/less/larger.less Index: cgisetup/www/css/fonts/font-awesome-4.2.0/less/larger.less ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/less/larger.less +++ /dev/null @@ -1,13 +0,0 @@ -// Icon Sizes -// ------------------------- - -/* makes the font 33% larger relative to the icon container */ -.@{fa-css-prefix}-lg { - font-size: (4em / 3); - line-height: (3em / 4); - vertical-align: -15%; -} -.@{fa-css-prefix}-2x { font-size: 2em; } -.@{fa-css-prefix}-3x { font-size: 3em; } -.@{fa-css-prefix}-4x { font-size: 4em; } -.@{fa-css-prefix}-5x { font-size: 5em; } DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/less/list.less Index: cgisetup/www/css/fonts/font-awesome-4.2.0/less/list.less ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/less/list.less +++ /dev/null @@ -1,19 +0,0 @@ -// List Icons -// ------------------------- - -.@{fa-css-prefix}-ul { - padding-left: 0; - margin-left: @fa-li-width; - list-style-type: none; - > li { position: relative; } -} -.@{fa-css-prefix}-li { - position: absolute; - left: -@fa-li-width; - width: @fa-li-width; - top: (2em / 14); - text-align: center; - &.@{fa-css-prefix}-lg { - left: (-@fa-li-width + (4em / 14)); - } -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/less/mixins.less Index: cgisetup/www/css/fonts/font-awesome-4.2.0/less/mixins.less ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/less/mixins.less +++ /dev/null @@ -1,25 +0,0 @@ -// Mixins -// -------------------------- - -.fa-icon() { - display: inline-block; - font: normal normal normal 14px/1 FontAwesome; // shortening font declaration - font-size: inherit; // can't have font-size inherit on line above, so need to override - text-rendering: auto; // optimizelegibility throws things off #1094 - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -.fa-icon-rotate(@degrees, @rotation) { - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=@rotation); - -webkit-transform: rotate(@degrees); - -ms-transform: rotate(@degrees); - transform: rotate(@degrees); -} - -.fa-icon-flip(@horiz, @vert, @rotation) { - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=@rotation, mirror=1); - -webkit-transform: scale(@horiz, @vert); - -ms-transform: scale(@horiz, @vert); - transform: scale(@horiz, @vert); -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/less/path.less Index: cgisetup/www/css/fonts/font-awesome-4.2.0/less/path.less ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/less/path.less +++ /dev/null @@ -1,14 +0,0 @@ -/* FONT PATH - * -------------------------- */ - -@font-face { - font-family: 'FontAwesome'; - src: url('@{fa-font-path}/fontawesome-webfont.eot?v=@{fa-version}'); - src: url('@{fa-font-path}/fontawesome-webfont.eot?#iefix&v=@{fa-version}') format('embedded-opentype'), - url('@{fa-font-path}/fontawesome-webfont.woff?v=@{fa-version}') format('woff'), - url('@{fa-font-path}/fontawesome-webfont.ttf?v=@{fa-version}') format('truetype'), - url('@{fa-font-path}/fontawesome-webfont.svg?v=@{fa-version}#fontawesomeregular') format('svg'); -// src: url('@{fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts - font-weight: normal; - font-style: normal; -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/less/rotated-flipped.less Index: cgisetup/www/css/fonts/font-awesome-4.2.0/less/rotated-flipped.less ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/less/rotated-flipped.less +++ /dev/null @@ -1,20 +0,0 @@ -// Rotated & Flipped Icons -// ------------------------- - -.@{fa-css-prefix}-rotate-90 { .fa-icon-rotate(90deg, 1); } -.@{fa-css-prefix}-rotate-180 { .fa-icon-rotate(180deg, 2); } -.@{fa-css-prefix}-rotate-270 { .fa-icon-rotate(270deg, 3); } - -.@{fa-css-prefix}-flip-horizontal { .fa-icon-flip(-1, 1, 0); } -.@{fa-css-prefix}-flip-vertical { .fa-icon-flip(1, -1, 2); } - -// Hook for IE8-9 -// ------------------------- - -:root .@{fa-css-prefix}-rotate-90, -:root .@{fa-css-prefix}-rotate-180, -:root .@{fa-css-prefix}-rotate-270, -:root .@{fa-css-prefix}-flip-horizontal, -:root .@{fa-css-prefix}-flip-vertical { - filter: none; -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/less/spinning.less Index: cgisetup/www/css/fonts/font-awesome-4.2.0/less/spinning.less ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/less/spinning.less +++ /dev/null @@ -1,29 +0,0 @@ -// Spinning Icons -// -------------------------- - -.@{fa-css-prefix}-spin { - -webkit-animation: fa-spin 2s infinite linear; - animation: fa-spin 2s infinite linear; -} - -@-webkit-keyframes fa-spin { - 0% { - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(359deg); - transform: rotate(359deg); - } -} - -@keyframes fa-spin { - 0% { - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(359deg); - transform: rotate(359deg); - } -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/less/stacked.less Index: cgisetup/www/css/fonts/font-awesome-4.2.0/less/stacked.less ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/less/stacked.less +++ /dev/null @@ -1,20 +0,0 @@ -// Stacked Icons -// ------------------------- - -.@{fa-css-prefix}-stack { - position: relative; - display: inline-block; - width: 2em; - height: 2em; - line-height: 2em; - vertical-align: middle; -} -.@{fa-css-prefix}-stack-1x, .@{fa-css-prefix}-stack-2x { - position: absolute; - left: 0; - width: 100%; - text-align: center; -} -.@{fa-css-prefix}-stack-1x { line-height: inherit; } -.@{fa-css-prefix}-stack-2x { font-size: 2em; } -.@{fa-css-prefix}-inverse { color: @fa-inverse; } DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/less/variables.less Index: cgisetup/www/css/fonts/font-awesome-4.2.0/less/variables.less ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/less/variables.less +++ /dev/null @@ -1,561 +0,0 @@ -// Variables -// -------------------------- - -@fa-font-path: "../fonts"; -//@fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.2.0/fonts"; // for referencing Bootstrap CDN font files directly -@fa-css-prefix: fa; -@fa-version: "4.2.0"; -@fa-border-color: #eee; -@fa-inverse: #fff; -@fa-li-width: (30em / 14); - -@fa-var-adjust: "\f042"; -@fa-var-adn: "\f170"; -@fa-var-align-center: "\f037"; -@fa-var-align-justify: "\f039"; -@fa-var-align-left: "\f036"; -@fa-var-align-right: "\f038"; -@fa-var-ambulance: "\f0f9"; -@fa-var-anchor: "\f13d"; -@fa-var-android: "\f17b"; -@fa-var-angellist: "\f209"; -@fa-var-angle-double-down: "\f103"; -@fa-var-angle-double-left: "\f100"; -@fa-var-angle-double-right: "\f101"; -@fa-var-angle-double-up: "\f102"; -@fa-var-angle-down: "\f107"; -@fa-var-angle-left: "\f104"; -@fa-var-angle-right: "\f105"; -@fa-var-angle-up: "\f106"; -@fa-var-apple: "\f179"; -@fa-var-archive: "\f187"; -@fa-var-area-chart: "\f1fe"; -@fa-var-arrow-circle-down: "\f0ab"; -@fa-var-arrow-circle-left: "\f0a8"; -@fa-var-arrow-circle-o-down: "\f01a"; -@fa-var-arrow-circle-o-left: "\f190"; -@fa-var-arrow-circle-o-right: "\f18e"; -@fa-var-arrow-circle-o-up: "\f01b"; -@fa-var-arrow-circle-right: "\f0a9"; -@fa-var-arrow-circle-up: "\f0aa"; -@fa-var-arrow-down: "\f063"; -@fa-var-arrow-left: "\f060"; -@fa-var-arrow-right: "\f061"; -@fa-var-arrow-up: "\f062"; -@fa-var-arrows: "\f047"; -@fa-var-arrows-alt: "\f0b2"; -@fa-var-arrows-h: "\f07e"; -@fa-var-arrows-v: "\f07d"; -@fa-var-asterisk: "\f069"; -@fa-var-at: "\f1fa"; -@fa-var-automobile: "\f1b9"; -@fa-var-backward: "\f04a"; -@fa-var-ban: "\f05e"; -@fa-var-bank: "\f19c"; -@fa-var-bar-chart: "\f080"; -@fa-var-bar-chart-o: "\f080"; -@fa-var-barcode: "\f02a"; -@fa-var-bars: "\f0c9"; -@fa-var-beer: "\f0fc"; -@fa-var-behance: "\f1b4"; -@fa-var-behance-square: "\f1b5"; -@fa-var-bell: "\f0f3"; -@fa-var-bell-o: "\f0a2"; -@fa-var-bell-slash: "\f1f6"; -@fa-var-bell-slash-o: "\f1f7"; -@fa-var-bicycle: "\f206"; -@fa-var-binoculars: "\f1e5"; -@fa-var-birthday-cake: "\f1fd"; -@fa-var-bitbucket: "\f171"; -@fa-var-bitbucket-square: "\f172"; -@fa-var-bitcoin: "\f15a"; -@fa-var-bold: "\f032"; -@fa-var-bolt: "\f0e7"; -@fa-var-bomb: "\f1e2"; -@fa-var-book: "\f02d"; -@fa-var-bookmark: "\f02e"; -@fa-var-bookmark-o: "\f097"; -@fa-var-briefcase: "\f0b1"; -@fa-var-btc: "\f15a"; -@fa-var-bug: "\f188"; -@fa-var-building: "\f1ad"; -@fa-var-building-o: "\f0f7"; -@fa-var-bullhorn: "\f0a1"; -@fa-var-bullseye: "\f140"; -@fa-var-bus: "\f207"; -@fa-var-cab: "\f1ba"; -@fa-var-calculator: "\f1ec"; -@fa-var-calendar: "\f073"; -@fa-var-calendar-o: "\f133"; -@fa-var-camera: "\f030"; -@fa-var-camera-retro: "\f083"; -@fa-var-car: "\f1b9"; -@fa-var-caret-down: "\f0d7"; -@fa-var-caret-left: "\f0d9"; -@fa-var-caret-right: "\f0da"; -@fa-var-caret-square-o-down: "\f150"; -@fa-var-caret-square-o-left: "\f191"; -@fa-var-caret-square-o-right: "\f152"; -@fa-var-caret-square-o-up: "\f151"; -@fa-var-caret-up: "\f0d8"; -@fa-var-cc: "\f20a"; -@fa-var-cc-amex: "\f1f3"; -@fa-var-cc-discover: "\f1f2"; -@fa-var-cc-mastercard: "\f1f1"; -@fa-var-cc-paypal: "\f1f4"; -@fa-var-cc-stripe: "\f1f5"; -@fa-var-cc-visa: "\f1f0"; -@fa-var-certificate: "\f0a3"; -@fa-var-chain: "\f0c1"; -@fa-var-chain-broken: "\f127"; -@fa-var-check: "\f00c"; -@fa-var-check-circle: "\f058"; -@fa-var-check-circle-o: "\f05d"; -@fa-var-check-square: "\f14a"; -@fa-var-check-square-o: "\f046"; -@fa-var-chevron-circle-down: "\f13a"; -@fa-var-chevron-circle-left: "\f137"; -@fa-var-chevron-circle-right: "\f138"; -@fa-var-chevron-circle-up: "\f139"; -@fa-var-chevron-down: "\f078"; -@fa-var-chevron-left: "\f053"; -@fa-var-chevron-right: "\f054"; -@fa-var-chevron-up: "\f077"; -@fa-var-child: "\f1ae"; -@fa-var-circle: "\f111"; -@fa-var-circle-o: "\f10c"; -@fa-var-circle-o-notch: "\f1ce"; -@fa-var-circle-thin: "\f1db"; -@fa-var-clipboard: "\f0ea"; -@fa-var-clock-o: "\f017"; -@fa-var-close: "\f00d"; -@fa-var-cloud: "\f0c2"; -@fa-var-cloud-download: "\f0ed"; -@fa-var-cloud-upload: "\f0ee"; -@fa-var-cny: "\f157"; -@fa-var-code: "\f121"; -@fa-var-code-fork: "\f126"; -@fa-var-codepen: "\f1cb"; -@fa-var-coffee: "\f0f4"; -@fa-var-cog: "\f013"; -@fa-var-cogs: "\f085"; -@fa-var-columns: "\f0db"; -@fa-var-comment: "\f075"; -@fa-var-comment-o: "\f0e5"; -@fa-var-comments: "\f086"; -@fa-var-comments-o: "\f0e6"; -@fa-var-compass: "\f14e"; -@fa-var-compress: "\f066"; -@fa-var-copy: "\f0c5"; -@fa-var-copyright: "\f1f9"; -@fa-var-credit-card: "\f09d"; -@fa-var-crop: "\f125"; -@fa-var-crosshairs: "\f05b"; -@fa-var-css3: "\f13c"; -@fa-var-cube: "\f1b2"; -@fa-var-cubes: "\f1b3"; -@fa-var-cut: "\f0c4"; -@fa-var-cutlery: "\f0f5"; -@fa-var-dashboard: "\f0e4"; -@fa-var-database: "\f1c0"; -@fa-var-dedent: "\f03b"; -@fa-var-delicious: "\f1a5"; -@fa-var-desktop: "\f108"; -@fa-var-deviantart: "\f1bd"; -@fa-var-digg: "\f1a6"; -@fa-var-dollar: "\f155"; -@fa-var-dot-circle-o: "\f192"; -@fa-var-download: "\f019"; -@fa-var-dribbble: "\f17d"; -@fa-var-dropbox: "\f16b"; -@fa-var-drupal: "\f1a9"; -@fa-var-edit: "\f044"; -@fa-var-eject: "\f052"; -@fa-var-ellipsis-h: "\f141"; -@fa-var-ellipsis-v: "\f142"; -@fa-var-empire: "\f1d1"; -@fa-var-envelope: "\f0e0"; -@fa-var-envelope-o: "\f003"; -@fa-var-envelope-square: "\f199"; -@fa-var-eraser: "\f12d"; -@fa-var-eur: "\f153"; -@fa-var-euro: "\f153"; -@fa-var-exchange: "\f0ec"; -@fa-var-exclamation: "\f12a"; -@fa-var-exclamation-circle: "\f06a"; -@fa-var-exclamation-triangle: "\f071"; -@fa-var-expand: "\f065"; -@fa-var-external-link: "\f08e"; -@fa-var-external-link-square: "\f14c"; -@fa-var-eye: "\f06e"; -@fa-var-eye-slash: "\f070"; -@fa-var-eyedropper: "\f1fb"; -@fa-var-facebook: "\f09a"; -@fa-var-facebook-square: "\f082"; -@fa-var-fast-backward: "\f049"; -@fa-var-fast-forward: "\f050"; -@fa-var-fax: "\f1ac"; -@fa-var-female: "\f182"; -@fa-var-fighter-jet: "\f0fb"; -@fa-var-file: "\f15b"; -@fa-var-file-archive-o: "\f1c6"; -@fa-var-file-audio-o: "\f1c7"; -@fa-var-file-code-o: "\f1c9"; -@fa-var-file-excel-o: "\f1c3"; -@fa-var-file-image-o: "\f1c5"; -@fa-var-file-movie-o: "\f1c8"; -@fa-var-file-o: "\f016"; -@fa-var-file-pdf-o: "\f1c1"; -@fa-var-file-photo-o: "\f1c5"; -@fa-var-file-picture-o: "\f1c5"; -@fa-var-file-powerpoint-o: "\f1c4"; -@fa-var-file-sound-o: "\f1c7"; -@fa-var-file-text: "\f15c"; -@fa-var-file-text-o: "\f0f6"; -@fa-var-file-video-o: "\f1c8"; -@fa-var-file-word-o: "\f1c2"; -@fa-var-file-zip-o: "\f1c6"; -@fa-var-files-o: "\f0c5"; -@fa-var-film: "\f008"; -@fa-var-filter: "\f0b0"; -@fa-var-fire: "\f06d"; -@fa-var-fire-extinguisher: "\f134"; -@fa-var-flag: "\f024"; -@fa-var-flag-checkered: "\f11e"; -@fa-var-flag-o: "\f11d"; -@fa-var-flash: "\f0e7"; -@fa-var-flask: "\f0c3"; -@fa-var-flickr: "\f16e"; -@fa-var-floppy-o: "\f0c7"; -@fa-var-folder: "\f07b"; -@fa-var-folder-o: "\f114"; -@fa-var-folder-open: "\f07c"; -@fa-var-folder-open-o: "\f115"; -@fa-var-font: "\f031"; -@fa-var-forward: "\f04e"; -@fa-var-foursquare: "\f180"; -@fa-var-frown-o: "\f119"; -@fa-var-futbol-o: "\f1e3"; -@fa-var-gamepad: "\f11b"; -@fa-var-gavel: "\f0e3"; -@fa-var-gbp: "\f154"; -@fa-var-ge: "\f1d1"; -@fa-var-gear: "\f013"; -@fa-var-gears: "\f085"; -@fa-var-gift: "\f06b"; -@fa-var-git: "\f1d3"; -@fa-var-git-square: "\f1d2"; -@fa-var-github: "\f09b"; -@fa-var-github-alt: "\f113"; -@fa-var-github-square: "\f092"; -@fa-var-gittip: "\f184"; -@fa-var-glass: "\f000"; -@fa-var-globe: "\f0ac"; -@fa-var-google: "\f1a0"; -@fa-var-google-plus: "\f0d5"; -@fa-var-google-plus-square: "\f0d4"; -@fa-var-google-wallet: "\f1ee"; -@fa-var-graduation-cap: "\f19d"; -@fa-var-group: "\f0c0"; -@fa-var-h-square: "\f0fd"; -@fa-var-hacker-news: "\f1d4"; -@fa-var-hand-o-down: "\f0a7"; -@fa-var-hand-o-left: "\f0a5"; -@fa-var-hand-o-right: "\f0a4"; -@fa-var-hand-o-up: "\f0a6"; -@fa-var-hdd-o: "\f0a0"; -@fa-var-header: "\f1dc"; -@fa-var-headphones: "\f025"; -@fa-var-heart: "\f004"; -@fa-var-heart-o: "\f08a"; -@fa-var-history: "\f1da"; -@fa-var-home: "\f015"; -@fa-var-hospital-o: "\f0f8"; -@fa-var-html5: "\f13b"; -@fa-var-ils: "\f20b"; -@fa-var-image: "\f03e"; -@fa-var-inbox: "\f01c"; -@fa-var-indent: "\f03c"; -@fa-var-info: "\f129"; -@fa-var-info-circle: "\f05a"; -@fa-var-inr: "\f156"; -@fa-var-instagram: "\f16d"; -@fa-var-institution: "\f19c"; -@fa-var-ioxhost: "\f208"; -@fa-var-italic: "\f033"; -@fa-var-joomla: "\f1aa"; -@fa-var-jpy: "\f157"; -@fa-var-jsfiddle: "\f1cc"; -@fa-var-key: "\f084"; -@fa-var-keyboard-o: "\f11c"; -@fa-var-krw: "\f159"; -@fa-var-language: "\f1ab"; -@fa-var-laptop: "\f109"; -@fa-var-lastfm: "\f202"; -@fa-var-lastfm-square: "\f203"; -@fa-var-leaf: "\f06c"; -@fa-var-legal: "\f0e3"; -@fa-var-lemon-o: "\f094"; -@fa-var-level-down: "\f149"; -@fa-var-level-up: "\f148"; -@fa-var-life-bouy: "\f1cd"; -@fa-var-life-buoy: "\f1cd"; -@fa-var-life-ring: "\f1cd"; -@fa-var-life-saver: "\f1cd"; -@fa-var-lightbulb-o: "\f0eb"; -@fa-var-line-chart: "\f201"; -@fa-var-link: "\f0c1"; -@fa-var-linkedin: "\f0e1"; -@fa-var-linkedin-square: "\f08c"; -@fa-var-linux: "\f17c"; -@fa-var-list: "\f03a"; -@fa-var-list-alt: "\f022"; -@fa-var-list-ol: "\f0cb"; -@fa-var-list-ul: "\f0ca"; -@fa-var-location-arrow: "\f124"; -@fa-var-lock: "\f023"; -@fa-var-long-arrow-down: "\f175"; -@fa-var-long-arrow-left: "\f177"; -@fa-var-long-arrow-right: "\f178"; -@fa-var-long-arrow-up: "\f176"; -@fa-var-magic: "\f0d0"; -@fa-var-magnet: "\f076"; -@fa-var-mail-forward: "\f064"; -@fa-var-mail-reply: "\f112"; -@fa-var-mail-reply-all: "\f122"; -@fa-var-male: "\f183"; -@fa-var-map-marker: "\f041"; -@fa-var-maxcdn: "\f136"; -@fa-var-meanpath: "\f20c"; -@fa-var-medkit: "\f0fa"; -@fa-var-meh-o: "\f11a"; -@fa-var-microphone: "\f130"; -@fa-var-microphone-slash: "\f131"; -@fa-var-minus: "\f068"; -@fa-var-minus-circle: "\f056"; -@fa-var-minus-square: "\f146"; -@fa-var-minus-square-o: "\f147"; -@fa-var-mobile: "\f10b"; -@fa-var-mobile-phone: "\f10b"; -@fa-var-money: "\f0d6"; -@fa-var-moon-o: "\f186"; -@fa-var-mortar-board: "\f19d"; -@fa-var-music: "\f001"; -@fa-var-navicon: "\f0c9"; -@fa-var-newspaper-o: "\f1ea"; -@fa-var-openid: "\f19b"; -@fa-var-outdent: "\f03b"; -@fa-var-pagelines: "\f18c"; -@fa-var-paint-brush: "\f1fc"; -@fa-var-paper-plane: "\f1d8"; -@fa-var-paper-plane-o: "\f1d9"; -@fa-var-paperclip: "\f0c6"; -@fa-var-paragraph: "\f1dd"; -@fa-var-paste: "\f0ea"; -@fa-var-pause: "\f04c"; -@fa-var-paw: "\f1b0"; -@fa-var-paypal: "\f1ed"; -@fa-var-pencil: "\f040"; -@fa-var-pencil-square: "\f14b"; -@fa-var-pencil-square-o: "\f044"; -@fa-var-phone: "\f095"; -@fa-var-phone-square: "\f098"; -@fa-var-photo: "\f03e"; -@fa-var-picture-o: "\f03e"; -@fa-var-pie-chart: "\f200"; -@fa-var-pied-piper: "\f1a7"; -@fa-var-pied-piper-alt: "\f1a8"; -@fa-var-pinterest: "\f0d2"; -@fa-var-pinterest-square: "\f0d3"; -@fa-var-plane: "\f072"; -@fa-var-play: "\f04b"; -@fa-var-play-circle: "\f144"; -@fa-var-play-circle-o: "\f01d"; -@fa-var-plug: "\f1e6"; -@fa-var-plus: "\f067"; -@fa-var-plus-circle: "\f055"; -@fa-var-plus-square: "\f0fe"; -@fa-var-plus-square-o: "\f196"; -@fa-var-power-off: "\f011"; -@fa-var-print: "\f02f"; -@fa-var-puzzle-piece: "\f12e"; -@fa-var-qq: "\f1d6"; -@fa-var-qrcode: "\f029"; -@fa-var-question: "\f128"; -@fa-var-question-circle: "\f059"; -@fa-var-quote-left: "\f10d"; -@fa-var-quote-right: "\f10e"; -@fa-var-ra: "\f1d0"; -@fa-var-random: "\f074"; -@fa-var-rebel: "\f1d0"; -@fa-var-recycle: "\f1b8"; -@fa-var-reddit: "\f1a1"; -@fa-var-reddit-square: "\f1a2"; -@fa-var-refresh: "\f021"; -@fa-var-remove: "\f00d"; -@fa-var-renren: "\f18b"; -@fa-var-reorder: "\f0c9"; -@fa-var-repeat: "\f01e"; -@fa-var-reply: "\f112"; -@fa-var-reply-all: "\f122"; -@fa-var-retweet: "\f079"; -@fa-var-rmb: "\f157"; -@fa-var-road: "\f018"; -@fa-var-rocket: "\f135"; -@fa-var-rotate-left: "\f0e2"; -@fa-var-rotate-right: "\f01e"; -@fa-var-rouble: "\f158"; -@fa-var-rss: "\f09e"; -@fa-var-rss-square: "\f143"; -@fa-var-rub: "\f158"; -@fa-var-ruble: "\f158"; -@fa-var-rupee: "\f156"; -@fa-var-save: "\f0c7"; -@fa-var-scissors: "\f0c4"; -@fa-var-search: "\f002"; -@fa-var-search-minus: "\f010"; -@fa-var-search-plus: "\f00e"; -@fa-var-send: "\f1d8"; -@fa-var-send-o: "\f1d9"; -@fa-var-share: "\f064"; -@fa-var-share-alt: "\f1e0"; -@fa-var-share-alt-square: "\f1e1"; -@fa-var-share-square: "\f14d"; -@fa-var-share-square-o: "\f045"; -@fa-var-shekel: "\f20b"; -@fa-var-sheqel: "\f20b"; -@fa-var-shield: "\f132"; -@fa-var-shopping-cart: "\f07a"; -@fa-var-sign-in: "\f090"; -@fa-var-sign-out: "\f08b"; -@fa-var-signal: "\f012"; -@fa-var-sitemap: "\f0e8"; -@fa-var-skype: "\f17e"; -@fa-var-slack: "\f198"; -@fa-var-sliders: "\f1de"; -@fa-var-slideshare: "\f1e7"; -@fa-var-smile-o: "\f118"; -@fa-var-soccer-ball-o: "\f1e3"; -@fa-var-sort: "\f0dc"; -@fa-var-sort-alpha-asc: "\f15d"; -@fa-var-sort-alpha-desc: "\f15e"; -@fa-var-sort-amount-asc: "\f160"; -@fa-var-sort-amount-desc: "\f161"; -@fa-var-sort-asc: "\f0de"; -@fa-var-sort-desc: "\f0dd"; -@fa-var-sort-down: "\f0dd"; -@fa-var-sort-numeric-asc: "\f162"; -@fa-var-sort-numeric-desc: "\f163"; -@fa-var-sort-up: "\f0de"; -@fa-var-soundcloud: "\f1be"; -@fa-var-space-shuttle: "\f197"; -@fa-var-spinner: "\f110"; -@fa-var-spoon: "\f1b1"; -@fa-var-spotify: "\f1bc"; -@fa-var-square: "\f0c8"; -@fa-var-square-o: "\f096"; -@fa-var-stack-exchange: "\f18d"; -@fa-var-stack-overflow: "\f16c"; -@fa-var-star: "\f005"; -@fa-var-star-half: "\f089"; -@fa-var-star-half-empty: "\f123"; -@fa-var-star-half-full: "\f123"; -@fa-var-star-half-o: "\f123"; -@fa-var-star-o: "\f006"; -@fa-var-steam: "\f1b6"; -@fa-var-steam-square: "\f1b7"; -@fa-var-step-backward: "\f048"; -@fa-var-step-forward: "\f051"; -@fa-var-stethoscope: "\f0f1"; -@fa-var-stop: "\f04d"; -@fa-var-strikethrough: "\f0cc"; -@fa-var-stumbleupon: "\f1a4"; -@fa-var-stumbleupon-circle: "\f1a3"; -@fa-var-subscript: "\f12c"; -@fa-var-suitcase: "\f0f2"; -@fa-var-sun-o: "\f185"; -@fa-var-superscript: "\f12b"; -@fa-var-support: "\f1cd"; -@fa-var-table: "\f0ce"; -@fa-var-tablet: "\f10a"; -@fa-var-tachometer: "\f0e4"; -@fa-var-tag: "\f02b"; -@fa-var-tags: "\f02c"; -@fa-var-tasks: "\f0ae"; -@fa-var-taxi: "\f1ba"; -@fa-var-tencent-weibo: "\f1d5"; -@fa-var-terminal: "\f120"; -@fa-var-text-height: "\f034"; -@fa-var-text-width: "\f035"; -@fa-var-th: "\f00a"; -@fa-var-th-large: "\f009"; -@fa-var-th-list: "\f00b"; -@fa-var-thumb-tack: "\f08d"; -@fa-var-thumbs-down: "\f165"; -@fa-var-thumbs-o-down: "\f088"; -@fa-var-thumbs-o-up: "\f087"; -@fa-var-thumbs-up: "\f164"; -@fa-var-ticket: "\f145"; -@fa-var-times: "\f00d"; -@fa-var-times-circle: "\f057"; -@fa-var-times-circle-o: "\f05c"; -@fa-var-tint: "\f043"; -@fa-var-toggle-down: "\f150"; -@fa-var-toggle-left: "\f191"; -@fa-var-toggle-off: "\f204"; -@fa-var-toggle-on: "\f205"; -@fa-var-toggle-right: "\f152"; -@fa-var-toggle-up: "\f151"; -@fa-var-trash: "\f1f8"; -@fa-var-trash-o: "\f014"; -@fa-var-tree: "\f1bb"; -@fa-var-trello: "\f181"; -@fa-var-trophy: "\f091"; -@fa-var-truck: "\f0d1"; -@fa-var-try: "\f195"; -@fa-var-tty: "\f1e4"; -@fa-var-tumblr: "\f173"; -@fa-var-tumblr-square: "\f174"; -@fa-var-turkish-lira: "\f195"; -@fa-var-twitch: "\f1e8"; -@fa-var-twitter: "\f099"; -@fa-var-twitter-square: "\f081"; -@fa-var-umbrella: "\f0e9"; -@fa-var-underline: "\f0cd"; -@fa-var-undo: "\f0e2"; -@fa-var-university: "\f19c"; -@fa-var-unlink: "\f127"; -@fa-var-unlock: "\f09c"; -@fa-var-unlock-alt: "\f13e"; -@fa-var-unsorted: "\f0dc"; -@fa-var-upload: "\f093"; -@fa-var-usd: "\f155"; -@fa-var-user: "\f007"; -@fa-var-user-md: "\f0f0"; -@fa-var-users: "\f0c0"; -@fa-var-video-camera: "\f03d"; -@fa-var-vimeo-square: "\f194"; -@fa-var-vine: "\f1ca"; -@fa-var-vk: "\f189"; -@fa-var-volume-down: "\f027"; -@fa-var-volume-off: "\f026"; -@fa-var-volume-up: "\f028"; -@fa-var-warning: "\f071"; -@fa-var-wechat: "\f1d7"; -@fa-var-weibo: "\f18a"; -@fa-var-weixin: "\f1d7"; -@fa-var-wheelchair: "\f193"; -@fa-var-wifi: "\f1eb"; -@fa-var-windows: "\f17a"; -@fa-var-won: "\f159"; -@fa-var-wordpress: "\f19a"; -@fa-var-wrench: "\f0ad"; -@fa-var-xing: "\f168"; -@fa-var-xing-square: "\f169"; -@fa-var-yahoo: "\f19e"; -@fa-var-yelp: "\f1e9"; -@fa-var-yen: "\f157"; -@fa-var-youtube: "\f167"; -@fa-var-youtube-play: "\f16a"; -@fa-var-youtube-square: "\f166"; - DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_bordered-pulled.scss Index: cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_bordered-pulled.scss ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_bordered-pulled.scss +++ /dev/null @@ -1,16 +0,0 @@ -// Bordered & Pulled -// ------------------------- - -.#{$fa-css-prefix}-border { - padding: .2em .25em .15em; - border: solid .08em $fa-border-color; - border-radius: .1em; -} - -.pull-right { float: right; } -.pull-left { float: left; } - -.#{$fa-css-prefix} { - &.pull-left { margin-right: .3em; } - &.pull-right { margin-left: .3em; } -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_core.scss Index: cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_core.scss ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_core.scss +++ /dev/null @@ -1,11 +0,0 @@ -// Base Class Definition -// ------------------------- - -.#{$fa-css-prefix} { - display: inline-block; - font: normal normal normal 14px/1 FontAwesome; // shortening font declaration - font-size: inherit; // can't have font-size inherit on line above, so need to override - text-rendering: auto; // optimizelegibility throws things off #1094 - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_fixed-width.scss Index: cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_fixed-width.scss ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_fixed-width.scss +++ /dev/null @@ -1,6 +0,0 @@ -// Fixed Width Icons -// ------------------------- -.#{$fa-css-prefix}-fw { - width: (18em / 14); - text-align: center; -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_icons.scss Index: cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_icons.scss ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_icons.scss +++ /dev/null @@ -1,552 +0,0 @@ -/* Font Awesome uses the Unicode Private Use Area (PUA) to ensure screen - readers do not read off random characters that represent icons */ - -.#{$fa-css-prefix}-glass:before { content: $fa-var-glass; } -.#{$fa-css-prefix}-music:before { content: $fa-var-music; } -.#{$fa-css-prefix}-search:before { content: $fa-var-search; } -.#{$fa-css-prefix}-envelope-o:before { content: $fa-var-envelope-o; } -.#{$fa-css-prefix}-heart:before { content: $fa-var-heart; } -.#{$fa-css-prefix}-star:before { content: $fa-var-star; } -.#{$fa-css-prefix}-star-o:before { content: $fa-var-star-o; } -.#{$fa-css-prefix}-user:before { content: $fa-var-user; } -.#{$fa-css-prefix}-film:before { content: $fa-var-film; } -.#{$fa-css-prefix}-th-large:before { content: $fa-var-th-large; } -.#{$fa-css-prefix}-th:before { content: $fa-var-th; } -.#{$fa-css-prefix}-th-list:before { content: $fa-var-th-list; } -.#{$fa-css-prefix}-check:before { content: $fa-var-check; } -.#{$fa-css-prefix}-remove:before, -.#{$fa-css-prefix}-close:before, -.#{$fa-css-prefix}-times:before { content: $fa-var-times; } -.#{$fa-css-prefix}-search-plus:before { content: $fa-var-search-plus; } -.#{$fa-css-prefix}-search-minus:before { content: $fa-var-search-minus; } -.#{$fa-css-prefix}-power-off:before { content: $fa-var-power-off; } -.#{$fa-css-prefix}-signal:before { content: $fa-var-signal; } -.#{$fa-css-prefix}-gear:before, -.#{$fa-css-prefix}-cog:before { content: $fa-var-cog; } -.#{$fa-css-prefix}-trash-o:before { content: $fa-var-trash-o; } -.#{$fa-css-prefix}-home:before { content: $fa-var-home; } -.#{$fa-css-prefix}-file-o:before { content: $fa-var-file-o; } -.#{$fa-css-prefix}-clock-o:before { content: $fa-var-clock-o; } -.#{$fa-css-prefix}-road:before { content: $fa-var-road; } -.#{$fa-css-prefix}-download:before { content: $fa-var-download; } -.#{$fa-css-prefix}-arrow-circle-o-down:before { content: $fa-var-arrow-circle-o-down; } -.#{$fa-css-prefix}-arrow-circle-o-up:before { content: $fa-var-arrow-circle-o-up; } -.#{$fa-css-prefix}-inbox:before { content: $fa-var-inbox; } -.#{$fa-css-prefix}-play-circle-o:before { content: $fa-var-play-circle-o; } -.#{$fa-css-prefix}-rotate-right:before, -.#{$fa-css-prefix}-repeat:before { content: $fa-var-repeat; } -.#{$fa-css-prefix}-refresh:before { content: $fa-var-refresh; } -.#{$fa-css-prefix}-list-alt:before { content: $fa-var-list-alt; } -.#{$fa-css-prefix}-lock:before { content: $fa-var-lock; } -.#{$fa-css-prefix}-flag:before { content: $fa-var-flag; } -.#{$fa-css-prefix}-headphones:before { content: $fa-var-headphones; } -.#{$fa-css-prefix}-volume-off:before { content: $fa-var-volume-off; } -.#{$fa-css-prefix}-volume-down:before { content: $fa-var-volume-down; } -.#{$fa-css-prefix}-volume-up:before { content: $fa-var-volume-up; } -.#{$fa-css-prefix}-qrcode:before { content: $fa-var-qrcode; } -.#{$fa-css-prefix}-barcode:before { content: $fa-var-barcode; } -.#{$fa-css-prefix}-tag:before { content: $fa-var-tag; } -.#{$fa-css-prefix}-tags:before { content: $fa-var-tags; } -.#{$fa-css-prefix}-book:before { content: $fa-var-book; } -.#{$fa-css-prefix}-bookmark:before { content: $fa-var-bookmark; } -.#{$fa-css-prefix}-print:before { content: $fa-var-print; } -.#{$fa-css-prefix}-camera:before { content: $fa-var-camera; } -.#{$fa-css-prefix}-font:before { content: $fa-var-font; } -.#{$fa-css-prefix}-bold:before { content: $fa-var-bold; } -.#{$fa-css-prefix}-italic:before { content: $fa-var-italic; } -.#{$fa-css-prefix}-text-height:before { content: $fa-var-text-height; } -.#{$fa-css-prefix}-text-width:before { content: $fa-var-text-width; } -.#{$fa-css-prefix}-align-left:before { content: $fa-var-align-left; } -.#{$fa-css-prefix}-align-center:before { content: $fa-var-align-center; } -.#{$fa-css-prefix}-align-right:before { content: $fa-var-align-right; } -.#{$fa-css-prefix}-align-justify:before { content: $fa-var-align-justify; } -.#{$fa-css-prefix}-list:before { content: $fa-var-list; } -.#{$fa-css-prefix}-dedent:before, -.#{$fa-css-prefix}-outdent:before { content: $fa-var-outdent; } -.#{$fa-css-prefix}-indent:before { content: $fa-var-indent; } -.#{$fa-css-prefix}-video-camera:before { content: $fa-var-video-camera; } -.#{$fa-css-prefix}-photo:before, -.#{$fa-css-prefix}-image:before, -.#{$fa-css-prefix}-picture-o:before { content: $fa-var-picture-o; } -.#{$fa-css-prefix}-pencil:before { content: $fa-var-pencil; } -.#{$fa-css-prefix}-map-marker:before { content: $fa-var-map-marker; } -.#{$fa-css-prefix}-adjust:before { content: $fa-var-adjust; } -.#{$fa-css-prefix}-tint:before { content: $fa-var-tint; } -.#{$fa-css-prefix}-edit:before, -.#{$fa-css-prefix}-pencil-square-o:before { content: $fa-var-pencil-square-o; } -.#{$fa-css-prefix}-share-square-o:before { content: $fa-var-share-square-o; } -.#{$fa-css-prefix}-check-square-o:before { content: $fa-var-check-square-o; } -.#{$fa-css-prefix}-arrows:before { content: $fa-var-arrows; } -.#{$fa-css-prefix}-step-backward:before { content: $fa-var-step-backward; } -.#{$fa-css-prefix}-fast-backward:before { content: $fa-var-fast-backward; } -.#{$fa-css-prefix}-backward:before { content: $fa-var-backward; } -.#{$fa-css-prefix}-play:before { content: $fa-var-play; } -.#{$fa-css-prefix}-pause:before { content: $fa-var-pause; } -.#{$fa-css-prefix}-stop:before { content: $fa-var-stop; } -.#{$fa-css-prefix}-forward:before { content: $fa-var-forward; } -.#{$fa-css-prefix}-fast-forward:before { content: $fa-var-fast-forward; } -.#{$fa-css-prefix}-step-forward:before { content: $fa-var-step-forward; } -.#{$fa-css-prefix}-eject:before { content: $fa-var-eject; } -.#{$fa-css-prefix}-chevron-left:before { content: $fa-var-chevron-left; } -.#{$fa-css-prefix}-chevron-right:before { content: $fa-var-chevron-right; } -.#{$fa-css-prefix}-plus-circle:before { content: $fa-var-plus-circle; } -.#{$fa-css-prefix}-minus-circle:before { content: $fa-var-minus-circle; } -.#{$fa-css-prefix}-times-circle:before { content: $fa-var-times-circle; } -.#{$fa-css-prefix}-check-circle:before { content: $fa-var-check-circle; } -.#{$fa-css-prefix}-question-circle:before { content: $fa-var-question-circle; } -.#{$fa-css-prefix}-info-circle:before { content: $fa-var-info-circle; } -.#{$fa-css-prefix}-crosshairs:before { content: $fa-var-crosshairs; } -.#{$fa-css-prefix}-times-circle-o:before { content: $fa-var-times-circle-o; } -.#{$fa-css-prefix}-check-circle-o:before { content: $fa-var-check-circle-o; } -.#{$fa-css-prefix}-ban:before { content: $fa-var-ban; } -.#{$fa-css-prefix}-arrow-left:before { content: $fa-var-arrow-left; } -.#{$fa-css-prefix}-arrow-right:before { content: $fa-var-arrow-right; } -.#{$fa-css-prefix}-arrow-up:before { content: $fa-var-arrow-up; } -.#{$fa-css-prefix}-arrow-down:before { content: $fa-var-arrow-down; } -.#{$fa-css-prefix}-mail-forward:before, -.#{$fa-css-prefix}-share:before { content: $fa-var-share; } -.#{$fa-css-prefix}-expand:before { content: $fa-var-expand; } -.#{$fa-css-prefix}-compress:before { content: $fa-var-compress; } -.#{$fa-css-prefix}-plus:before { content: $fa-var-plus; } -.#{$fa-css-prefix}-minus:before { content: $fa-var-minus; } -.#{$fa-css-prefix}-asterisk:before { content: $fa-var-asterisk; } -.#{$fa-css-prefix}-exclamation-circle:before { content: $fa-var-exclamation-circle; } -.#{$fa-css-prefix}-gift:before { content: $fa-var-gift; } -.#{$fa-css-prefix}-leaf:before { content: $fa-var-leaf; } -.#{$fa-css-prefix}-fire:before { content: $fa-var-fire; } -.#{$fa-css-prefix}-eye:before { content: $fa-var-eye; } -.#{$fa-css-prefix}-eye-slash:before { content: $fa-var-eye-slash; } -.#{$fa-css-prefix}-warning:before, -.#{$fa-css-prefix}-exclamation-triangle:before { content: $fa-var-exclamation-triangle; } -.#{$fa-css-prefix}-plane:before { content: $fa-var-plane; } -.#{$fa-css-prefix}-calendar:before { content: $fa-var-calendar; } -.#{$fa-css-prefix}-random:before { content: $fa-var-random; } -.#{$fa-css-prefix}-comment:before { content: $fa-var-comment; } -.#{$fa-css-prefix}-magnet:before { content: $fa-var-magnet; } -.#{$fa-css-prefix}-chevron-up:before { content: $fa-var-chevron-up; } -.#{$fa-css-prefix}-chevron-down:before { content: $fa-var-chevron-down; } -.#{$fa-css-prefix}-retweet:before { content: $fa-var-retweet; } -.#{$fa-css-prefix}-shopping-cart:before { content: $fa-var-shopping-cart; } -.#{$fa-css-prefix}-folder:before { content: $fa-var-folder; } -.#{$fa-css-prefix}-folder-open:before { content: $fa-var-folder-open; } -.#{$fa-css-prefix}-arrows-v:before { content: $fa-var-arrows-v; } -.#{$fa-css-prefix}-arrows-h:before { content: $fa-var-arrows-h; } -.#{$fa-css-prefix}-bar-chart-o:before, -.#{$fa-css-prefix}-bar-chart:before { content: $fa-var-bar-chart; } -.#{$fa-css-prefix}-twitter-square:before { content: $fa-var-twitter-square; } -.#{$fa-css-prefix}-facebook-square:before { content: $fa-var-facebook-square; } -.#{$fa-css-prefix}-camera-retro:before { content: $fa-var-camera-retro; } -.#{$fa-css-prefix}-key:before { content: $fa-var-key; } -.#{$fa-css-prefix}-gears:before, -.#{$fa-css-prefix}-cogs:before { content: $fa-var-cogs; } -.#{$fa-css-prefix}-comments:before { content: $fa-var-comments; } -.#{$fa-css-prefix}-thumbs-o-up:before { content: $fa-var-thumbs-o-up; } -.#{$fa-css-prefix}-thumbs-o-down:before { content: $fa-var-thumbs-o-down; } -.#{$fa-css-prefix}-star-half:before { content: $fa-var-star-half; } -.#{$fa-css-prefix}-heart-o:before { content: $fa-var-heart-o; } -.#{$fa-css-prefix}-sign-out:before { content: $fa-var-sign-out; } -.#{$fa-css-prefix}-linkedin-square:before { content: $fa-var-linkedin-square; } -.#{$fa-css-prefix}-thumb-tack:before { content: $fa-var-thumb-tack; } -.#{$fa-css-prefix}-external-link:before { content: $fa-var-external-link; } -.#{$fa-css-prefix}-sign-in:before { content: $fa-var-sign-in; } -.#{$fa-css-prefix}-trophy:before { content: $fa-var-trophy; } -.#{$fa-css-prefix}-github-square:before { content: $fa-var-github-square; } -.#{$fa-css-prefix}-upload:before { content: $fa-var-upload; } -.#{$fa-css-prefix}-lemon-o:before { content: $fa-var-lemon-o; } -.#{$fa-css-prefix}-phone:before { content: $fa-var-phone; } -.#{$fa-css-prefix}-square-o:before { content: $fa-var-square-o; } -.#{$fa-css-prefix}-bookmark-o:before { content: $fa-var-bookmark-o; } -.#{$fa-css-prefix}-phone-square:before { content: $fa-var-phone-square; } -.#{$fa-css-prefix}-twitter:before { content: $fa-var-twitter; } -.#{$fa-css-prefix}-facebook:before { content: $fa-var-facebook; } -.#{$fa-css-prefix}-github:before { content: $fa-var-github; } -.#{$fa-css-prefix}-unlock:before { content: $fa-var-unlock; } -.#{$fa-css-prefix}-credit-card:before { content: $fa-var-credit-card; } -.#{$fa-css-prefix}-rss:before { content: $fa-var-rss; } -.#{$fa-css-prefix}-hdd-o:before { content: $fa-var-hdd-o; } -.#{$fa-css-prefix}-bullhorn:before { content: $fa-var-bullhorn; } -.#{$fa-css-prefix}-bell:before { content: $fa-var-bell; } -.#{$fa-css-prefix}-certificate:before { content: $fa-var-certificate; } -.#{$fa-css-prefix}-hand-o-right:before { content: $fa-var-hand-o-right; } -.#{$fa-css-prefix}-hand-o-left:before { content: $fa-var-hand-o-left; } -.#{$fa-css-prefix}-hand-o-up:before { content: $fa-var-hand-o-up; } -.#{$fa-css-prefix}-hand-o-down:before { content: $fa-var-hand-o-down; } -.#{$fa-css-prefix}-arrow-circle-left:before { content: $fa-var-arrow-circle-left; } -.#{$fa-css-prefix}-arrow-circle-right:before { content: $fa-var-arrow-circle-right; } -.#{$fa-css-prefix}-arrow-circle-up:before { content: $fa-var-arrow-circle-up; } -.#{$fa-css-prefix}-arrow-circle-down:before { content: $fa-var-arrow-circle-down; } -.#{$fa-css-prefix}-globe:before { content: $fa-var-globe; } -.#{$fa-css-prefix}-wrench:before { content: $fa-var-wrench; } -.#{$fa-css-prefix}-tasks:before { content: $fa-var-tasks; } -.#{$fa-css-prefix}-filter:before { content: $fa-var-filter; } -.#{$fa-css-prefix}-briefcase:before { content: $fa-var-briefcase; } -.#{$fa-css-prefix}-arrows-alt:before { content: $fa-var-arrows-alt; } -.#{$fa-css-prefix}-group:before, -.#{$fa-css-prefix}-users:before { content: $fa-var-users; } -.#{$fa-css-prefix}-chain:before, -.#{$fa-css-prefix}-link:before { content: $fa-var-link; } -.#{$fa-css-prefix}-cloud:before { content: $fa-var-cloud; } -.#{$fa-css-prefix}-flask:before { content: $fa-var-flask; } -.#{$fa-css-prefix}-cut:before, -.#{$fa-css-prefix}-scissors:before { content: $fa-var-scissors; } -.#{$fa-css-prefix}-copy:before, -.#{$fa-css-prefix}-files-o:before { content: $fa-var-files-o; } -.#{$fa-css-prefix}-paperclip:before { content: $fa-var-paperclip; } -.#{$fa-css-prefix}-save:before, -.#{$fa-css-prefix}-floppy-o:before { content: $fa-var-floppy-o; } -.#{$fa-css-prefix}-square:before { content: $fa-var-square; } -.#{$fa-css-prefix}-navicon:before, -.#{$fa-css-prefix}-reorder:before, -.#{$fa-css-prefix}-bars:before { content: $fa-var-bars; } -.#{$fa-css-prefix}-list-ul:before { content: $fa-var-list-ul; } -.#{$fa-css-prefix}-list-ol:before { content: $fa-var-list-ol; } -.#{$fa-css-prefix}-strikethrough:before { content: $fa-var-strikethrough; } -.#{$fa-css-prefix}-underline:before { content: $fa-var-underline; } -.#{$fa-css-prefix}-table:before { content: $fa-var-table; } -.#{$fa-css-prefix}-magic:before { content: $fa-var-magic; } -.#{$fa-css-prefix}-truck:before { content: $fa-var-truck; } -.#{$fa-css-prefix}-pinterest:before { content: $fa-var-pinterest; } -.#{$fa-css-prefix}-pinterest-square:before { content: $fa-var-pinterest-square; } -.#{$fa-css-prefix}-google-plus-square:before { content: $fa-var-google-plus-square; } -.#{$fa-css-prefix}-google-plus:before { content: $fa-var-google-plus; } -.#{$fa-css-prefix}-money:before { content: $fa-var-money; } -.#{$fa-css-prefix}-caret-down:before { content: $fa-var-caret-down; } -.#{$fa-css-prefix}-caret-up:before { content: $fa-var-caret-up; } -.#{$fa-css-prefix}-caret-left:before { content: $fa-var-caret-left; } -.#{$fa-css-prefix}-caret-right:before { content: $fa-var-caret-right; } -.#{$fa-css-prefix}-columns:before { content: $fa-var-columns; } -.#{$fa-css-prefix}-unsorted:before, -.#{$fa-css-prefix}-sort:before { content: $fa-var-sort; } -.#{$fa-css-prefix}-sort-down:before, -.#{$fa-css-prefix}-sort-desc:before { content: $fa-var-sort-desc; } -.#{$fa-css-prefix}-sort-up:before, -.#{$fa-css-prefix}-sort-asc:before { content: $fa-var-sort-asc; } -.#{$fa-css-prefix}-envelope:before { content: $fa-var-envelope; } -.#{$fa-css-prefix}-linkedin:before { content: $fa-var-linkedin; } -.#{$fa-css-prefix}-rotate-left:before, -.#{$fa-css-prefix}-undo:before { content: $fa-var-undo; } -.#{$fa-css-prefix}-legal:before, -.#{$fa-css-prefix}-gavel:before { content: $fa-var-gavel; } -.#{$fa-css-prefix}-dashboard:before, -.#{$fa-css-prefix}-tachometer:before { content: $fa-var-tachometer; } -.#{$fa-css-prefix}-comment-o:before { content: $fa-var-comment-o; } -.#{$fa-css-prefix}-comments-o:before { content: $fa-var-comments-o; } -.#{$fa-css-prefix}-flash:before, -.#{$fa-css-prefix}-bolt:before { content: $fa-var-bolt; } -.#{$fa-css-prefix}-sitemap:before { content: $fa-var-sitemap; } -.#{$fa-css-prefix}-umbrella:before { content: $fa-var-umbrella; } -.#{$fa-css-prefix}-paste:before, -.#{$fa-css-prefix}-clipboard:before { content: $fa-var-clipboard; } -.#{$fa-css-prefix}-lightbulb-o:before { content: $fa-var-lightbulb-o; } -.#{$fa-css-prefix}-exchange:before { content: $fa-var-exchange; } -.#{$fa-css-prefix}-cloud-download:before { content: $fa-var-cloud-download; } -.#{$fa-css-prefix}-cloud-upload:before { content: $fa-var-cloud-upload; } -.#{$fa-css-prefix}-user-md:before { content: $fa-var-user-md; } -.#{$fa-css-prefix}-stethoscope:before { content: $fa-var-stethoscope; } -.#{$fa-css-prefix}-suitcase:before { content: $fa-var-suitcase; } -.#{$fa-css-prefix}-bell-o:before { content: $fa-var-bell-o; } -.#{$fa-css-prefix}-coffee:before { content: $fa-var-coffee; } -.#{$fa-css-prefix}-cutlery:before { content: $fa-var-cutlery; } -.#{$fa-css-prefix}-file-text-o:before { content: $fa-var-file-text-o; } -.#{$fa-css-prefix}-building-o:before { content: $fa-var-building-o; } -.#{$fa-css-prefix}-hospital-o:before { content: $fa-var-hospital-o; } -.#{$fa-css-prefix}-ambulance:before { content: $fa-var-ambulance; } -.#{$fa-css-prefix}-medkit:before { content: $fa-var-medkit; } -.#{$fa-css-prefix}-fighter-jet:before { content: $fa-var-fighter-jet; } -.#{$fa-css-prefix}-beer:before { content: $fa-var-beer; } -.#{$fa-css-prefix}-h-square:before { content: $fa-var-h-square; } -.#{$fa-css-prefix}-plus-square:before { content: $fa-var-plus-square; } -.#{$fa-css-prefix}-angle-double-left:before { content: $fa-var-angle-double-left; } -.#{$fa-css-prefix}-angle-double-right:before { content: $fa-var-angle-double-right; } -.#{$fa-css-prefix}-angle-double-up:before { content: $fa-var-angle-double-up; } -.#{$fa-css-prefix}-angle-double-down:before { content: $fa-var-angle-double-down; } -.#{$fa-css-prefix}-angle-left:before { content: $fa-var-angle-left; } -.#{$fa-css-prefix}-angle-right:before { content: $fa-var-angle-right; } -.#{$fa-css-prefix}-angle-up:before { content: $fa-var-angle-up; } -.#{$fa-css-prefix}-angle-down:before { content: $fa-var-angle-down; } -.#{$fa-css-prefix}-desktop:before { content: $fa-var-desktop; } -.#{$fa-css-prefix}-laptop:before { content: $fa-var-laptop; } -.#{$fa-css-prefix}-tablet:before { content: $fa-var-tablet; } -.#{$fa-css-prefix}-mobile-phone:before, -.#{$fa-css-prefix}-mobile:before { content: $fa-var-mobile; } -.#{$fa-css-prefix}-circle-o:before { content: $fa-var-circle-o; } -.#{$fa-css-prefix}-quote-left:before { content: $fa-var-quote-left; } -.#{$fa-css-prefix}-quote-right:before { content: $fa-var-quote-right; } -.#{$fa-css-prefix}-spinner:before { content: $fa-var-spinner; } -.#{$fa-css-prefix}-circle:before { content: $fa-var-circle; } -.#{$fa-css-prefix}-mail-reply:before, -.#{$fa-css-prefix}-reply:before { content: $fa-var-reply; } -.#{$fa-css-prefix}-github-alt:before { content: $fa-var-github-alt; } -.#{$fa-css-prefix}-folder-o:before { content: $fa-var-folder-o; } -.#{$fa-css-prefix}-folder-open-o:before { content: $fa-var-folder-open-o; } -.#{$fa-css-prefix}-smile-o:before { content: $fa-var-smile-o; } -.#{$fa-css-prefix}-frown-o:before { content: $fa-var-frown-o; } -.#{$fa-css-prefix}-meh-o:before { content: $fa-var-meh-o; } -.#{$fa-css-prefix}-gamepad:before { content: $fa-var-gamepad; } -.#{$fa-css-prefix}-keyboard-o:before { content: $fa-var-keyboard-o; } -.#{$fa-css-prefix}-flag-o:before { content: $fa-var-flag-o; } -.#{$fa-css-prefix}-flag-checkered:before { content: $fa-var-flag-checkered; } -.#{$fa-css-prefix}-terminal:before { content: $fa-var-terminal; } -.#{$fa-css-prefix}-code:before { content: $fa-var-code; } -.#{$fa-css-prefix}-mail-reply-all:before, -.#{$fa-css-prefix}-reply-all:before { content: $fa-var-reply-all; } -.#{$fa-css-prefix}-star-half-empty:before, -.#{$fa-css-prefix}-star-half-full:before, -.#{$fa-css-prefix}-star-half-o:before { content: $fa-var-star-half-o; } -.#{$fa-css-prefix}-location-arrow:before { content: $fa-var-location-arrow; } -.#{$fa-css-prefix}-crop:before { content: $fa-var-crop; } -.#{$fa-css-prefix}-code-fork:before { content: $fa-var-code-fork; } -.#{$fa-css-prefix}-unlink:before, -.#{$fa-css-prefix}-chain-broken:before { content: $fa-var-chain-broken; } -.#{$fa-css-prefix}-question:before { content: $fa-var-question; } -.#{$fa-css-prefix}-info:before { content: $fa-var-info; } -.#{$fa-css-prefix}-exclamation:before { content: $fa-var-exclamation; } -.#{$fa-css-prefix}-superscript:before { content: $fa-var-superscript; } -.#{$fa-css-prefix}-subscript:before { content: $fa-var-subscript; } -.#{$fa-css-prefix}-eraser:before { content: $fa-var-eraser; } -.#{$fa-css-prefix}-puzzle-piece:before { content: $fa-var-puzzle-piece; } -.#{$fa-css-prefix}-microphone:before { content: $fa-var-microphone; } -.#{$fa-css-prefix}-microphone-slash:before { content: $fa-var-microphone-slash; } -.#{$fa-css-prefix}-shield:before { content: $fa-var-shield; } -.#{$fa-css-prefix}-calendar-o:before { content: $fa-var-calendar-o; } -.#{$fa-css-prefix}-fire-extinguisher:before { content: $fa-var-fire-extinguisher; } -.#{$fa-css-prefix}-rocket:before { content: $fa-var-rocket; } -.#{$fa-css-prefix}-maxcdn:before { content: $fa-var-maxcdn; } -.#{$fa-css-prefix}-chevron-circle-left:before { content: $fa-var-chevron-circle-left; } -.#{$fa-css-prefix}-chevron-circle-right:before { content: $fa-var-chevron-circle-right; } -.#{$fa-css-prefix}-chevron-circle-up:before { content: $fa-var-chevron-circle-up; } -.#{$fa-css-prefix}-chevron-circle-down:before { content: $fa-var-chevron-circle-down; } -.#{$fa-css-prefix}-html5:before { content: $fa-var-html5; } -.#{$fa-css-prefix}-css3:before { content: $fa-var-css3; } -.#{$fa-css-prefix}-anchor:before { content: $fa-var-anchor; } -.#{$fa-css-prefix}-unlock-alt:before { content: $fa-var-unlock-alt; } -.#{$fa-css-prefix}-bullseye:before { content: $fa-var-bullseye; } -.#{$fa-css-prefix}-ellipsis-h:before { content: $fa-var-ellipsis-h; } -.#{$fa-css-prefix}-ellipsis-v:before { content: $fa-var-ellipsis-v; } -.#{$fa-css-prefix}-rss-square:before { content: $fa-var-rss-square; } -.#{$fa-css-prefix}-play-circle:before { content: $fa-var-play-circle; } -.#{$fa-css-prefix}-ticket:before { content: $fa-var-ticket; } -.#{$fa-css-prefix}-minus-square:before { content: $fa-var-minus-square; } -.#{$fa-css-prefix}-minus-square-o:before { content: $fa-var-minus-square-o; } -.#{$fa-css-prefix}-level-up:before { content: $fa-var-level-up; } -.#{$fa-css-prefix}-level-down:before { content: $fa-var-level-down; } -.#{$fa-css-prefix}-check-square:before { content: $fa-var-check-square; } -.#{$fa-css-prefix}-pencil-square:before { content: $fa-var-pencil-square; } -.#{$fa-css-prefix}-external-link-square:before { content: $fa-var-external-link-square; } -.#{$fa-css-prefix}-share-square:before { content: $fa-var-share-square; } -.#{$fa-css-prefix}-compass:before { content: $fa-var-compass; } -.#{$fa-css-prefix}-toggle-down:before, -.#{$fa-css-prefix}-caret-square-o-down:before { content: $fa-var-caret-square-o-down; } -.#{$fa-css-prefix}-toggle-up:before, -.#{$fa-css-prefix}-caret-square-o-up:before { content: $fa-var-caret-square-o-up; } -.#{$fa-css-prefix}-toggle-right:before, -.#{$fa-css-prefix}-caret-square-o-right:before { content: $fa-var-caret-square-o-right; } -.#{$fa-css-prefix}-euro:before, -.#{$fa-css-prefix}-eur:before { content: $fa-var-eur; } -.#{$fa-css-prefix}-gbp:before { content: $fa-var-gbp; } -.#{$fa-css-prefix}-dollar:before, -.#{$fa-css-prefix}-usd:before { content: $fa-var-usd; } -.#{$fa-css-prefix}-rupee:before, -.#{$fa-css-prefix}-inr:before { content: $fa-var-inr; } -.#{$fa-css-prefix}-cny:before, -.#{$fa-css-prefix}-rmb:before, -.#{$fa-css-prefix}-yen:before, -.#{$fa-css-prefix}-jpy:before { content: $fa-var-jpy; } -.#{$fa-css-prefix}-ruble:before, -.#{$fa-css-prefix}-rouble:before, -.#{$fa-css-prefix}-rub:before { content: $fa-var-rub; } -.#{$fa-css-prefix}-won:before, -.#{$fa-css-prefix}-krw:before { content: $fa-var-krw; } -.#{$fa-css-prefix}-bitcoin:before, -.#{$fa-css-prefix}-btc:before { content: $fa-var-btc; } -.#{$fa-css-prefix}-file:before { content: $fa-var-file; } -.#{$fa-css-prefix}-file-text:before { content: $fa-var-file-text; } -.#{$fa-css-prefix}-sort-alpha-asc:before { content: $fa-var-sort-alpha-asc; } -.#{$fa-css-prefix}-sort-alpha-desc:before { content: $fa-var-sort-alpha-desc; } -.#{$fa-css-prefix}-sort-amount-asc:before { content: $fa-var-sort-amount-asc; } -.#{$fa-css-prefix}-sort-amount-desc:before { content: $fa-var-sort-amount-desc; } -.#{$fa-css-prefix}-sort-numeric-asc:before { content: $fa-var-sort-numeric-asc; } -.#{$fa-css-prefix}-sort-numeric-desc:before { content: $fa-var-sort-numeric-desc; } -.#{$fa-css-prefix}-thumbs-up:before { content: $fa-var-thumbs-up; } -.#{$fa-css-prefix}-thumbs-down:before { content: $fa-var-thumbs-down; } -.#{$fa-css-prefix}-youtube-square:before { content: $fa-var-youtube-square; } -.#{$fa-css-prefix}-youtube:before { content: $fa-var-youtube; } -.#{$fa-css-prefix}-xing:before { content: $fa-var-xing; } -.#{$fa-css-prefix}-xing-square:before { content: $fa-var-xing-square; } -.#{$fa-css-prefix}-youtube-play:before { content: $fa-var-youtube-play; } -.#{$fa-css-prefix}-dropbox:before { content: $fa-var-dropbox; } -.#{$fa-css-prefix}-stack-overflow:before { content: $fa-var-stack-overflow; } -.#{$fa-css-prefix}-instagram:before { content: $fa-var-instagram; } -.#{$fa-css-prefix}-flickr:before { content: $fa-var-flickr; } -.#{$fa-css-prefix}-adn:before { content: $fa-var-adn; } -.#{$fa-css-prefix}-bitbucket:before { content: $fa-var-bitbucket; } -.#{$fa-css-prefix}-bitbucket-square:before { content: $fa-var-bitbucket-square; } -.#{$fa-css-prefix}-tumblr:before { content: $fa-var-tumblr; } -.#{$fa-css-prefix}-tumblr-square:before { content: $fa-var-tumblr-square; } -.#{$fa-css-prefix}-long-arrow-down:before { content: $fa-var-long-arrow-down; } -.#{$fa-css-prefix}-long-arrow-up:before { content: $fa-var-long-arrow-up; } -.#{$fa-css-prefix}-long-arrow-left:before { content: $fa-var-long-arrow-left; } -.#{$fa-css-prefix}-long-arrow-right:before { content: $fa-var-long-arrow-right; } -.#{$fa-css-prefix}-apple:before { content: $fa-var-apple; } -.#{$fa-css-prefix}-windows:before { content: $fa-var-windows; } -.#{$fa-css-prefix}-android:before { content: $fa-var-android; } -.#{$fa-css-prefix}-linux:before { content: $fa-var-linux; } -.#{$fa-css-prefix}-dribbble:before { content: $fa-var-dribbble; } -.#{$fa-css-prefix}-skype:before { content: $fa-var-skype; } -.#{$fa-css-prefix}-foursquare:before { content: $fa-var-foursquare; } -.#{$fa-css-prefix}-trello:before { content: $fa-var-trello; } -.#{$fa-css-prefix}-female:before { content: $fa-var-female; } -.#{$fa-css-prefix}-male:before { content: $fa-var-male; } -.#{$fa-css-prefix}-gittip:before { content: $fa-var-gittip; } -.#{$fa-css-prefix}-sun-o:before { content: $fa-var-sun-o; } -.#{$fa-css-prefix}-moon-o:before { content: $fa-var-moon-o; } -.#{$fa-css-prefix}-archive:before { content: $fa-var-archive; } -.#{$fa-css-prefix}-bug:before { content: $fa-var-bug; } -.#{$fa-css-prefix}-vk:before { content: $fa-var-vk; } -.#{$fa-css-prefix}-weibo:before { content: $fa-var-weibo; } -.#{$fa-css-prefix}-renren:before { content: $fa-var-renren; } -.#{$fa-css-prefix}-pagelines:before { content: $fa-var-pagelines; } -.#{$fa-css-prefix}-stack-exchange:before { content: $fa-var-stack-exchange; } -.#{$fa-css-prefix}-arrow-circle-o-right:before { content: $fa-var-arrow-circle-o-right; } -.#{$fa-css-prefix}-arrow-circle-o-left:before { content: $fa-var-arrow-circle-o-left; } -.#{$fa-css-prefix}-toggle-left:before, -.#{$fa-css-prefix}-caret-square-o-left:before { content: $fa-var-caret-square-o-left; } -.#{$fa-css-prefix}-dot-circle-o:before { content: $fa-var-dot-circle-o; } -.#{$fa-css-prefix}-wheelchair:before { content: $fa-var-wheelchair; } -.#{$fa-css-prefix}-vimeo-square:before { content: $fa-var-vimeo-square; } -.#{$fa-css-prefix}-turkish-lira:before, -.#{$fa-css-prefix}-try:before { content: $fa-var-try; } -.#{$fa-css-prefix}-plus-square-o:before { content: $fa-var-plus-square-o; } -.#{$fa-css-prefix}-space-shuttle:before { content: $fa-var-space-shuttle; } -.#{$fa-css-prefix}-slack:before { content: $fa-var-slack; } -.#{$fa-css-prefix}-envelope-square:before { content: $fa-var-envelope-square; } -.#{$fa-css-prefix}-wordpress:before { content: $fa-var-wordpress; } -.#{$fa-css-prefix}-openid:before { content: $fa-var-openid; } -.#{$fa-css-prefix}-institution:before, -.#{$fa-css-prefix}-bank:before, -.#{$fa-css-prefix}-university:before { content: $fa-var-university; } -.#{$fa-css-prefix}-mortar-board:before, -.#{$fa-css-prefix}-graduation-cap:before { content: $fa-var-graduation-cap; } -.#{$fa-css-prefix}-yahoo:before { content: $fa-var-yahoo; } -.#{$fa-css-prefix}-google:before { content: $fa-var-google; } -.#{$fa-css-prefix}-reddit:before { content: $fa-var-reddit; } -.#{$fa-css-prefix}-reddit-square:before { content: $fa-var-reddit-square; } -.#{$fa-css-prefix}-stumbleupon-circle:before { content: $fa-var-stumbleupon-circle; } -.#{$fa-css-prefix}-stumbleupon:before { content: $fa-var-stumbleupon; } -.#{$fa-css-prefix}-delicious:before { content: $fa-var-delicious; } -.#{$fa-css-prefix}-digg:before { content: $fa-var-digg; } -.#{$fa-css-prefix}-pied-piper:before { content: $fa-var-pied-piper; } -.#{$fa-css-prefix}-pied-piper-alt:before { content: $fa-var-pied-piper-alt; } -.#{$fa-css-prefix}-drupal:before { content: $fa-var-drupal; } -.#{$fa-css-prefix}-joomla:before { content: $fa-var-joomla; } -.#{$fa-css-prefix}-language:before { content: $fa-var-language; } -.#{$fa-css-prefix}-fax:before { content: $fa-var-fax; } -.#{$fa-css-prefix}-building:before { content: $fa-var-building; } -.#{$fa-css-prefix}-child:before { content: $fa-var-child; } -.#{$fa-css-prefix}-paw:before { content: $fa-var-paw; } -.#{$fa-css-prefix}-spoon:before { content: $fa-var-spoon; } -.#{$fa-css-prefix}-cube:before { content: $fa-var-cube; } -.#{$fa-css-prefix}-cubes:before { content: $fa-var-cubes; } -.#{$fa-css-prefix}-behance:before { content: $fa-var-behance; } -.#{$fa-css-prefix}-behance-square:before { content: $fa-var-behance-square; } -.#{$fa-css-prefix}-steam:before { content: $fa-var-steam; } -.#{$fa-css-prefix}-steam-square:before { content: $fa-var-steam-square; } -.#{$fa-css-prefix}-recycle:before { content: $fa-var-recycle; } -.#{$fa-css-prefix}-automobile:before, -.#{$fa-css-prefix}-car:before { content: $fa-var-car; } -.#{$fa-css-prefix}-cab:before, -.#{$fa-css-prefix}-taxi:before { content: $fa-var-taxi; } -.#{$fa-css-prefix}-tree:before { content: $fa-var-tree; } -.#{$fa-css-prefix}-spotify:before { content: $fa-var-spotify; } -.#{$fa-css-prefix}-deviantart:before { content: $fa-var-deviantart; } -.#{$fa-css-prefix}-soundcloud:before { content: $fa-var-soundcloud; } -.#{$fa-css-prefix}-database:before { content: $fa-var-database; } -.#{$fa-css-prefix}-file-pdf-o:before { content: $fa-var-file-pdf-o; } -.#{$fa-css-prefix}-file-word-o:before { content: $fa-var-file-word-o; } -.#{$fa-css-prefix}-file-excel-o:before { content: $fa-var-file-excel-o; } -.#{$fa-css-prefix}-file-powerpoint-o:before { content: $fa-var-file-powerpoint-o; } -.#{$fa-css-prefix}-file-photo-o:before, -.#{$fa-css-prefix}-file-picture-o:before, -.#{$fa-css-prefix}-file-image-o:before { content: $fa-var-file-image-o; } -.#{$fa-css-prefix}-file-zip-o:before, -.#{$fa-css-prefix}-file-archive-o:before { content: $fa-var-file-archive-o; } -.#{$fa-css-prefix}-file-sound-o:before, -.#{$fa-css-prefix}-file-audio-o:before { content: $fa-var-file-audio-o; } -.#{$fa-css-prefix}-file-movie-o:before, -.#{$fa-css-prefix}-file-video-o:before { content: $fa-var-file-video-o; } -.#{$fa-css-prefix}-file-code-o:before { content: $fa-var-file-code-o; } -.#{$fa-css-prefix}-vine:before { content: $fa-var-vine; } -.#{$fa-css-prefix}-codepen:before { content: $fa-var-codepen; } -.#{$fa-css-prefix}-jsfiddle:before { content: $fa-var-jsfiddle; } -.#{$fa-css-prefix}-life-bouy:before, -.#{$fa-css-prefix}-life-buoy:before, -.#{$fa-css-prefix}-life-saver:before, -.#{$fa-css-prefix}-support:before, -.#{$fa-css-prefix}-life-ring:before { content: $fa-var-life-ring; } -.#{$fa-css-prefix}-circle-o-notch:before { content: $fa-var-circle-o-notch; } -.#{$fa-css-prefix}-ra:before, -.#{$fa-css-prefix}-rebel:before { content: $fa-var-rebel; } -.#{$fa-css-prefix}-ge:before, -.#{$fa-css-prefix}-empire:before { content: $fa-var-empire; } -.#{$fa-css-prefix}-git-square:before { content: $fa-var-git-square; } -.#{$fa-css-prefix}-git:before { content: $fa-var-git; } -.#{$fa-css-prefix}-hacker-news:before { content: $fa-var-hacker-news; } -.#{$fa-css-prefix}-tencent-weibo:before { content: $fa-var-tencent-weibo; } -.#{$fa-css-prefix}-qq:before { content: $fa-var-qq; } -.#{$fa-css-prefix}-wechat:before, -.#{$fa-css-prefix}-weixin:before { content: $fa-var-weixin; } -.#{$fa-css-prefix}-send:before, -.#{$fa-css-prefix}-paper-plane:before { content: $fa-var-paper-plane; } -.#{$fa-css-prefix}-send-o:before, -.#{$fa-css-prefix}-paper-plane-o:before { content: $fa-var-paper-plane-o; } -.#{$fa-css-prefix}-history:before { content: $fa-var-history; } -.#{$fa-css-prefix}-circle-thin:before { content: $fa-var-circle-thin; } -.#{$fa-css-prefix}-header:before { content: $fa-var-header; } -.#{$fa-css-prefix}-paragraph:before { content: $fa-var-paragraph; } -.#{$fa-css-prefix}-sliders:before { content: $fa-var-sliders; } -.#{$fa-css-prefix}-share-alt:before { content: $fa-var-share-alt; } -.#{$fa-css-prefix}-share-alt-square:before { content: $fa-var-share-alt-square; } -.#{$fa-css-prefix}-bomb:before { content: $fa-var-bomb; } -.#{$fa-css-prefix}-soccer-ball-o:before, -.#{$fa-css-prefix}-futbol-o:before { content: $fa-var-futbol-o; } -.#{$fa-css-prefix}-tty:before { content: $fa-var-tty; } -.#{$fa-css-prefix}-binoculars:before { content: $fa-var-binoculars; } -.#{$fa-css-prefix}-plug:before { content: $fa-var-plug; } -.#{$fa-css-prefix}-slideshare:before { content: $fa-var-slideshare; } -.#{$fa-css-prefix}-twitch:before { content: $fa-var-twitch; } -.#{$fa-css-prefix}-yelp:before { content: $fa-var-yelp; } -.#{$fa-css-prefix}-newspaper-o:before { content: $fa-var-newspaper-o; } -.#{$fa-css-prefix}-wifi:before { content: $fa-var-wifi; } -.#{$fa-css-prefix}-calculator:before { content: $fa-var-calculator; } -.#{$fa-css-prefix}-paypal:before { content: $fa-var-paypal; } -.#{$fa-css-prefix}-google-wallet:before { content: $fa-var-google-wallet; } -.#{$fa-css-prefix}-cc-visa:before { content: $fa-var-cc-visa; } -.#{$fa-css-prefix}-cc-mastercard:before { content: $fa-var-cc-mastercard; } -.#{$fa-css-prefix}-cc-discover:before { content: $fa-var-cc-discover; } -.#{$fa-css-prefix}-cc-amex:before { content: $fa-var-cc-amex; } -.#{$fa-css-prefix}-cc-paypal:before { content: $fa-var-cc-paypal; } -.#{$fa-css-prefix}-cc-stripe:before { content: $fa-var-cc-stripe; } -.#{$fa-css-prefix}-bell-slash:before { content: $fa-var-bell-slash; } -.#{$fa-css-prefix}-bell-slash-o:before { content: $fa-var-bell-slash-o; } -.#{$fa-css-prefix}-trash:before { content: $fa-var-trash; } -.#{$fa-css-prefix}-copyright:before { content: $fa-var-copyright; } -.#{$fa-css-prefix}-at:before { content: $fa-var-at; } -.#{$fa-css-prefix}-eyedropper:before { content: $fa-var-eyedropper; } -.#{$fa-css-prefix}-paint-brush:before { content: $fa-var-paint-brush; } -.#{$fa-css-prefix}-birthday-cake:before { content: $fa-var-birthday-cake; } -.#{$fa-css-prefix}-area-chart:before { content: $fa-var-area-chart; } -.#{$fa-css-prefix}-pie-chart:before { content: $fa-var-pie-chart; } -.#{$fa-css-prefix}-line-chart:before { content: $fa-var-line-chart; } -.#{$fa-css-prefix}-lastfm:before { content: $fa-var-lastfm; } -.#{$fa-css-prefix}-lastfm-square:before { content: $fa-var-lastfm-square; } -.#{$fa-css-prefix}-toggle-off:before { content: $fa-var-toggle-off; } -.#{$fa-css-prefix}-toggle-on:before { content: $fa-var-toggle-on; } -.#{$fa-css-prefix}-bicycle:before { content: $fa-var-bicycle; } -.#{$fa-css-prefix}-bus:before { content: $fa-var-bus; } -.#{$fa-css-prefix}-ioxhost:before { content: $fa-var-ioxhost; } -.#{$fa-css-prefix}-angellist:before { content: $fa-var-angellist; } -.#{$fa-css-prefix}-cc:before { content: $fa-var-cc; } -.#{$fa-css-prefix}-shekel:before, -.#{$fa-css-prefix}-sheqel:before, -.#{$fa-css-prefix}-ils:before { content: $fa-var-ils; } -.#{$fa-css-prefix}-meanpath:before { content: $fa-var-meanpath; } DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_larger.scss Index: cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_larger.scss ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_larger.scss +++ /dev/null @@ -1,13 +0,0 @@ -// Icon Sizes -// ------------------------- - -/* makes the font 33% larger relative to the icon container */ -.#{$fa-css-prefix}-lg { - font-size: (4em / 3); - line-height: (3em / 4); - vertical-align: -15%; -} -.#{$fa-css-prefix}-2x { font-size: 2em; } -.#{$fa-css-prefix}-3x { font-size: 3em; } -.#{$fa-css-prefix}-4x { font-size: 4em; } -.#{$fa-css-prefix}-5x { font-size: 5em; } DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_list.scss Index: cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_list.scss ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_list.scss +++ /dev/null @@ -1,19 +0,0 @@ -// List Icons -// ------------------------- - -.#{$fa-css-prefix}-ul { - padding-left: 0; - margin-left: $fa-li-width; - list-style-type: none; - > li { position: relative; } -} -.#{$fa-css-prefix}-li { - position: absolute; - left: -$fa-li-width; - width: $fa-li-width; - top: (2em / 14); - text-align: center; - &.#{$fa-css-prefix}-lg { - left: -$fa-li-width + (4em / 14); - } -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_mixins.scss Index: cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_mixins.scss ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_mixins.scss +++ /dev/null @@ -1,25 +0,0 @@ -// Mixins -// -------------------------- - -@mixin fa-icon() { - display: inline-block; - font: normal normal normal 14px/1 FontAwesome; // shortening font declaration - font-size: inherit; // can't have font-size inherit on line above, so need to override - text-rendering: auto; // optimizelegibility throws things off #1094 - -webkit-font-smoothing: antialiased; - -moz-osx-font-smoothing: grayscale; -} - -@mixin fa-icon-rotate($degrees, $rotation) { - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation}); - -webkit-transform: rotate($degrees); - -ms-transform: rotate($degrees); - transform: rotate($degrees); -} - -@mixin fa-icon-flip($horiz, $vert, $rotation) { - filter: progid:DXImageTransform.Microsoft.BasicImage(rotation=#{$rotation}); - -webkit-transform: scale($horiz, $vert); - -ms-transform: scale($horiz, $vert); - transform: scale($horiz, $vert); -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_path.scss Index: cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_path.scss ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_path.scss +++ /dev/null @@ -1,14 +0,0 @@ -/* FONT PATH - * -------------------------- */ - -@font-face { - font-family: 'FontAwesome'; - src: url('#{$fa-font-path}/fontawesome-webfont.eot?v=#{$fa-version}'); - src: url('#{$fa-font-path}/fontawesome-webfont.eot?#iefix&v=#{$fa-version}') format('embedded-opentype'), - url('#{$fa-font-path}/fontawesome-webfont.woff?v=#{$fa-version}') format('woff'), - url('#{$fa-font-path}/fontawesome-webfont.ttf?v=#{$fa-version}') format('truetype'), - url('#{$fa-font-path}/fontawesome-webfont.svg?v=#{$fa-version}#fontawesomeregular') format('svg'); - //src: url('#{$fa-font-path}/FontAwesome.otf') format('opentype'); // used when developing fonts - font-weight: normal; - font-style: normal; -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_rotated-flipped.scss Index: cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_rotated-flipped.scss ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_rotated-flipped.scss +++ /dev/null @@ -1,20 +0,0 @@ -// Rotated & Flipped Icons -// ------------------------- - -.#{$fa-css-prefix}-rotate-90 { @include fa-icon-rotate(90deg, 1); } -.#{$fa-css-prefix}-rotate-180 { @include fa-icon-rotate(180deg, 2); } -.#{$fa-css-prefix}-rotate-270 { @include fa-icon-rotate(270deg, 3); } - -.#{$fa-css-prefix}-flip-horizontal { @include fa-icon-flip(-1, 1, 0); } -.#{$fa-css-prefix}-flip-vertical { @include fa-icon-flip(1, -1, 2); } - -// Hook for IE8-9 -// ------------------------- - -:root .#{$fa-css-prefix}-rotate-90, -:root .#{$fa-css-prefix}-rotate-180, -:root .#{$fa-css-prefix}-rotate-270, -:root .#{$fa-css-prefix}-flip-horizontal, -:root .#{$fa-css-prefix}-flip-vertical { - filter: none; -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_spinning.scss Index: cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_spinning.scss ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_spinning.scss +++ /dev/null @@ -1,29 +0,0 @@ -// Spinning Icons -// -------------------------- - -.#{$fa-css-prefix}-spin { - -webkit-animation: fa-spin 2s infinite linear; - animation: fa-spin 2s infinite linear; -} - -@-webkit-keyframes fa-spin { - 0% { - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(359deg); - transform: rotate(359deg); - } -} - -@keyframes fa-spin { - 0% { - -webkit-transform: rotate(0deg); - transform: rotate(0deg); - } - 100% { - -webkit-transform: rotate(359deg); - transform: rotate(359deg); - } -} DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_stacked.scss Index: cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_stacked.scss ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_stacked.scss +++ /dev/null @@ -1,20 +0,0 @@ -// Stacked Icons -// ------------------------- - -.#{$fa-css-prefix}-stack { - position: relative; - display: inline-block; - width: 2em; - height: 2em; - line-height: 2em; - vertical-align: middle; -} -.#{$fa-css-prefix}-stack-1x, .#{$fa-css-prefix}-stack-2x { - position: absolute; - left: 0; - width: 100%; - text-align: center; -} -.#{$fa-css-prefix}-stack-1x { line-height: inherit; } -.#{$fa-css-prefix}-stack-2x { font-size: 2em; } -.#{$fa-css-prefix}-inverse { color: $fa-inverse; } DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_variables.scss Index: cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_variables.scss ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/scss/_variables.scss +++ /dev/null @@ -1,561 +0,0 @@ -// Variables -// -------------------------- - -$fa-font-path: "../fonts" !default; -//$fa-font-path: "//netdna.bootstrapcdn.com/font-awesome/4.2.0/fonts" !default; // for referencing Bootstrap CDN font files directly -$fa-css-prefix: fa !default; -$fa-version: "4.2.0" !default; -$fa-border-color: #eee !default; -$fa-inverse: #fff !default; -$fa-li-width: (30em / 14) !default; - -$fa-var-adjust: "\f042"; -$fa-var-adn: "\f170"; -$fa-var-align-center: "\f037"; -$fa-var-align-justify: "\f039"; -$fa-var-align-left: "\f036"; -$fa-var-align-right: "\f038"; -$fa-var-ambulance: "\f0f9"; -$fa-var-anchor: "\f13d"; -$fa-var-android: "\f17b"; -$fa-var-angellist: "\f209"; -$fa-var-angle-double-down: "\f103"; -$fa-var-angle-double-left: "\f100"; -$fa-var-angle-double-right: "\f101"; -$fa-var-angle-double-up: "\f102"; -$fa-var-angle-down: "\f107"; -$fa-var-angle-left: "\f104"; -$fa-var-angle-right: "\f105"; -$fa-var-angle-up: "\f106"; -$fa-var-apple: "\f179"; -$fa-var-archive: "\f187"; -$fa-var-area-chart: "\f1fe"; -$fa-var-arrow-circle-down: "\f0ab"; -$fa-var-arrow-circle-left: "\f0a8"; -$fa-var-arrow-circle-o-down: "\f01a"; -$fa-var-arrow-circle-o-left: "\f190"; -$fa-var-arrow-circle-o-right: "\f18e"; -$fa-var-arrow-circle-o-up: "\f01b"; -$fa-var-arrow-circle-right: "\f0a9"; -$fa-var-arrow-circle-up: "\f0aa"; -$fa-var-arrow-down: "\f063"; -$fa-var-arrow-left: "\f060"; -$fa-var-arrow-right: "\f061"; -$fa-var-arrow-up: "\f062"; -$fa-var-arrows: "\f047"; -$fa-var-arrows-alt: "\f0b2"; -$fa-var-arrows-h: "\f07e"; -$fa-var-arrows-v: "\f07d"; -$fa-var-asterisk: "\f069"; -$fa-var-at: "\f1fa"; -$fa-var-automobile: "\f1b9"; -$fa-var-backward: "\f04a"; -$fa-var-ban: "\f05e"; -$fa-var-bank: "\f19c"; -$fa-var-bar-chart: "\f080"; -$fa-var-bar-chart-o: "\f080"; -$fa-var-barcode: "\f02a"; -$fa-var-bars: "\f0c9"; -$fa-var-beer: "\f0fc"; -$fa-var-behance: "\f1b4"; -$fa-var-behance-square: "\f1b5"; -$fa-var-bell: "\f0f3"; -$fa-var-bell-o: "\f0a2"; -$fa-var-bell-slash: "\f1f6"; -$fa-var-bell-slash-o: "\f1f7"; -$fa-var-bicycle: "\f206"; -$fa-var-binoculars: "\f1e5"; -$fa-var-birthday-cake: "\f1fd"; -$fa-var-bitbucket: "\f171"; -$fa-var-bitbucket-square: "\f172"; -$fa-var-bitcoin: "\f15a"; -$fa-var-bold: "\f032"; -$fa-var-bolt: "\f0e7"; -$fa-var-bomb: "\f1e2"; -$fa-var-book: "\f02d"; -$fa-var-bookmark: "\f02e"; -$fa-var-bookmark-o: "\f097"; -$fa-var-briefcase: "\f0b1"; -$fa-var-btc: "\f15a"; -$fa-var-bug: "\f188"; -$fa-var-building: "\f1ad"; -$fa-var-building-o: "\f0f7"; -$fa-var-bullhorn: "\f0a1"; -$fa-var-bullseye: "\f140"; -$fa-var-bus: "\f207"; -$fa-var-cab: "\f1ba"; -$fa-var-calculator: "\f1ec"; -$fa-var-calendar: "\f073"; -$fa-var-calendar-o: "\f133"; -$fa-var-camera: "\f030"; -$fa-var-camera-retro: "\f083"; -$fa-var-car: "\f1b9"; -$fa-var-caret-down: "\f0d7"; -$fa-var-caret-left: "\f0d9"; -$fa-var-caret-right: "\f0da"; -$fa-var-caret-square-o-down: "\f150"; -$fa-var-caret-square-o-left: "\f191"; -$fa-var-caret-square-o-right: "\f152"; -$fa-var-caret-square-o-up: "\f151"; -$fa-var-caret-up: "\f0d8"; -$fa-var-cc: "\f20a"; -$fa-var-cc-amex: "\f1f3"; -$fa-var-cc-discover: "\f1f2"; -$fa-var-cc-mastercard: "\f1f1"; -$fa-var-cc-paypal: "\f1f4"; -$fa-var-cc-stripe: "\f1f5"; -$fa-var-cc-visa: "\f1f0"; -$fa-var-certificate: "\f0a3"; -$fa-var-chain: "\f0c1"; -$fa-var-chain-broken: "\f127"; -$fa-var-check: "\f00c"; -$fa-var-check-circle: "\f058"; -$fa-var-check-circle-o: "\f05d"; -$fa-var-check-square: "\f14a"; -$fa-var-check-square-o: "\f046"; -$fa-var-chevron-circle-down: "\f13a"; -$fa-var-chevron-circle-left: "\f137"; -$fa-var-chevron-circle-right: "\f138"; -$fa-var-chevron-circle-up: "\f139"; -$fa-var-chevron-down: "\f078"; -$fa-var-chevron-left: "\f053"; -$fa-var-chevron-right: "\f054"; -$fa-var-chevron-up: "\f077"; -$fa-var-child: "\f1ae"; -$fa-var-circle: "\f111"; -$fa-var-circle-o: "\f10c"; -$fa-var-circle-o-notch: "\f1ce"; -$fa-var-circle-thin: "\f1db"; -$fa-var-clipboard: "\f0ea"; -$fa-var-clock-o: "\f017"; -$fa-var-close: "\f00d"; -$fa-var-cloud: "\f0c2"; -$fa-var-cloud-download: "\f0ed"; -$fa-var-cloud-upload: "\f0ee"; -$fa-var-cny: "\f157"; -$fa-var-code: "\f121"; -$fa-var-code-fork: "\f126"; -$fa-var-codepen: "\f1cb"; -$fa-var-coffee: "\f0f4"; -$fa-var-cog: "\f013"; -$fa-var-cogs: "\f085"; -$fa-var-columns: "\f0db"; -$fa-var-comment: "\f075"; -$fa-var-comment-o: "\f0e5"; -$fa-var-comments: "\f086"; -$fa-var-comments-o: "\f0e6"; -$fa-var-compass: "\f14e"; -$fa-var-compress: "\f066"; -$fa-var-copy: "\f0c5"; -$fa-var-copyright: "\f1f9"; -$fa-var-credit-card: "\f09d"; -$fa-var-crop: "\f125"; -$fa-var-crosshairs: "\f05b"; -$fa-var-css3: "\f13c"; -$fa-var-cube: "\f1b2"; -$fa-var-cubes: "\f1b3"; -$fa-var-cut: "\f0c4"; -$fa-var-cutlery: "\f0f5"; -$fa-var-dashboard: "\f0e4"; -$fa-var-database: "\f1c0"; -$fa-var-dedent: "\f03b"; -$fa-var-delicious: "\f1a5"; -$fa-var-desktop: "\f108"; -$fa-var-deviantart: "\f1bd"; -$fa-var-digg: "\f1a6"; -$fa-var-dollar: "\f155"; -$fa-var-dot-circle-o: "\f192"; -$fa-var-download: "\f019"; -$fa-var-dribbble: "\f17d"; -$fa-var-dropbox: "\f16b"; -$fa-var-drupal: "\f1a9"; -$fa-var-edit: "\f044"; -$fa-var-eject: "\f052"; -$fa-var-ellipsis-h: "\f141"; -$fa-var-ellipsis-v: "\f142"; -$fa-var-empire: "\f1d1"; -$fa-var-envelope: "\f0e0"; -$fa-var-envelope-o: "\f003"; -$fa-var-envelope-square: "\f199"; -$fa-var-eraser: "\f12d"; -$fa-var-eur: "\f153"; -$fa-var-euro: "\f153"; -$fa-var-exchange: "\f0ec"; -$fa-var-exclamation: "\f12a"; -$fa-var-exclamation-circle: "\f06a"; -$fa-var-exclamation-triangle: "\f071"; -$fa-var-expand: "\f065"; -$fa-var-external-link: "\f08e"; -$fa-var-external-link-square: "\f14c"; -$fa-var-eye: "\f06e"; -$fa-var-eye-slash: "\f070"; -$fa-var-eyedropper: "\f1fb"; -$fa-var-facebook: "\f09a"; -$fa-var-facebook-square: "\f082"; -$fa-var-fast-backward: "\f049"; -$fa-var-fast-forward: "\f050"; -$fa-var-fax: "\f1ac"; -$fa-var-female: "\f182"; -$fa-var-fighter-jet: "\f0fb"; -$fa-var-file: "\f15b"; -$fa-var-file-archive-o: "\f1c6"; -$fa-var-file-audio-o: "\f1c7"; -$fa-var-file-code-o: "\f1c9"; -$fa-var-file-excel-o: "\f1c3"; -$fa-var-file-image-o: "\f1c5"; -$fa-var-file-movie-o: "\f1c8"; -$fa-var-file-o: "\f016"; -$fa-var-file-pdf-o: "\f1c1"; -$fa-var-file-photo-o: "\f1c5"; -$fa-var-file-picture-o: "\f1c5"; -$fa-var-file-powerpoint-o: "\f1c4"; -$fa-var-file-sound-o: "\f1c7"; -$fa-var-file-text: "\f15c"; -$fa-var-file-text-o: "\f0f6"; -$fa-var-file-video-o: "\f1c8"; -$fa-var-file-word-o: "\f1c2"; -$fa-var-file-zip-o: "\f1c6"; -$fa-var-files-o: "\f0c5"; -$fa-var-film: "\f008"; -$fa-var-filter: "\f0b0"; -$fa-var-fire: "\f06d"; -$fa-var-fire-extinguisher: "\f134"; -$fa-var-flag: "\f024"; -$fa-var-flag-checkered: "\f11e"; -$fa-var-flag-o: "\f11d"; -$fa-var-flash: "\f0e7"; -$fa-var-flask: "\f0c3"; -$fa-var-flickr: "\f16e"; -$fa-var-floppy-o: "\f0c7"; -$fa-var-folder: "\f07b"; -$fa-var-folder-o: "\f114"; -$fa-var-folder-open: "\f07c"; -$fa-var-folder-open-o: "\f115"; -$fa-var-font: "\f031"; -$fa-var-forward: "\f04e"; -$fa-var-foursquare: "\f180"; -$fa-var-frown-o: "\f119"; -$fa-var-futbol-o: "\f1e3"; -$fa-var-gamepad: "\f11b"; -$fa-var-gavel: "\f0e3"; -$fa-var-gbp: "\f154"; -$fa-var-ge: "\f1d1"; -$fa-var-gear: "\f013"; -$fa-var-gears: "\f085"; -$fa-var-gift: "\f06b"; -$fa-var-git: "\f1d3"; -$fa-var-git-square: "\f1d2"; -$fa-var-github: "\f09b"; -$fa-var-github-alt: "\f113"; -$fa-var-github-square: "\f092"; -$fa-var-gittip: "\f184"; -$fa-var-glass: "\f000"; -$fa-var-globe: "\f0ac"; -$fa-var-google: "\f1a0"; -$fa-var-google-plus: "\f0d5"; -$fa-var-google-plus-square: "\f0d4"; -$fa-var-google-wallet: "\f1ee"; -$fa-var-graduation-cap: "\f19d"; -$fa-var-group: "\f0c0"; -$fa-var-h-square: "\f0fd"; -$fa-var-hacker-news: "\f1d4"; -$fa-var-hand-o-down: "\f0a7"; -$fa-var-hand-o-left: "\f0a5"; -$fa-var-hand-o-right: "\f0a4"; -$fa-var-hand-o-up: "\f0a6"; -$fa-var-hdd-o: "\f0a0"; -$fa-var-header: "\f1dc"; -$fa-var-headphones: "\f025"; -$fa-var-heart: "\f004"; -$fa-var-heart-o: "\f08a"; -$fa-var-history: "\f1da"; -$fa-var-home: "\f015"; -$fa-var-hospital-o: "\f0f8"; -$fa-var-html5: "\f13b"; -$fa-var-ils: "\f20b"; -$fa-var-image: "\f03e"; -$fa-var-inbox: "\f01c"; -$fa-var-indent: "\f03c"; -$fa-var-info: "\f129"; -$fa-var-info-circle: "\f05a"; -$fa-var-inr: "\f156"; -$fa-var-instagram: "\f16d"; -$fa-var-institution: "\f19c"; -$fa-var-ioxhost: "\f208"; -$fa-var-italic: "\f033"; -$fa-var-joomla: "\f1aa"; -$fa-var-jpy: "\f157"; -$fa-var-jsfiddle: "\f1cc"; -$fa-var-key: "\f084"; -$fa-var-keyboard-o: "\f11c"; -$fa-var-krw: "\f159"; -$fa-var-language: "\f1ab"; -$fa-var-laptop: "\f109"; -$fa-var-lastfm: "\f202"; -$fa-var-lastfm-square: "\f203"; -$fa-var-leaf: "\f06c"; -$fa-var-legal: "\f0e3"; -$fa-var-lemon-o: "\f094"; -$fa-var-level-down: "\f149"; -$fa-var-level-up: "\f148"; -$fa-var-life-bouy: "\f1cd"; -$fa-var-life-buoy: "\f1cd"; -$fa-var-life-ring: "\f1cd"; -$fa-var-life-saver: "\f1cd"; -$fa-var-lightbulb-o: "\f0eb"; -$fa-var-line-chart: "\f201"; -$fa-var-link: "\f0c1"; -$fa-var-linkedin: "\f0e1"; -$fa-var-linkedin-square: "\f08c"; -$fa-var-linux: "\f17c"; -$fa-var-list: "\f03a"; -$fa-var-list-alt: "\f022"; -$fa-var-list-ol: "\f0cb"; -$fa-var-list-ul: "\f0ca"; -$fa-var-location-arrow: "\f124"; -$fa-var-lock: "\f023"; -$fa-var-long-arrow-down: "\f175"; -$fa-var-long-arrow-left: "\f177"; -$fa-var-long-arrow-right: "\f178"; -$fa-var-long-arrow-up: "\f176"; -$fa-var-magic: "\f0d0"; -$fa-var-magnet: "\f076"; -$fa-var-mail-forward: "\f064"; -$fa-var-mail-reply: "\f112"; -$fa-var-mail-reply-all: "\f122"; -$fa-var-male: "\f183"; -$fa-var-map-marker: "\f041"; -$fa-var-maxcdn: "\f136"; -$fa-var-meanpath: "\f20c"; -$fa-var-medkit: "\f0fa"; -$fa-var-meh-o: "\f11a"; -$fa-var-microphone: "\f130"; -$fa-var-microphone-slash: "\f131"; -$fa-var-minus: "\f068"; -$fa-var-minus-circle: "\f056"; -$fa-var-minus-square: "\f146"; -$fa-var-minus-square-o: "\f147"; -$fa-var-mobile: "\f10b"; -$fa-var-mobile-phone: "\f10b"; -$fa-var-money: "\f0d6"; -$fa-var-moon-o: "\f186"; -$fa-var-mortar-board: "\f19d"; -$fa-var-music: "\f001"; -$fa-var-navicon: "\f0c9"; -$fa-var-newspaper-o: "\f1ea"; -$fa-var-openid: "\f19b"; -$fa-var-outdent: "\f03b"; -$fa-var-pagelines: "\f18c"; -$fa-var-paint-brush: "\f1fc"; -$fa-var-paper-plane: "\f1d8"; -$fa-var-paper-plane-o: "\f1d9"; -$fa-var-paperclip: "\f0c6"; -$fa-var-paragraph: "\f1dd"; -$fa-var-paste: "\f0ea"; -$fa-var-pause: "\f04c"; -$fa-var-paw: "\f1b0"; -$fa-var-paypal: "\f1ed"; -$fa-var-pencil: "\f040"; -$fa-var-pencil-square: "\f14b"; -$fa-var-pencil-square-o: "\f044"; -$fa-var-phone: "\f095"; -$fa-var-phone-square: "\f098"; -$fa-var-photo: "\f03e"; -$fa-var-picture-o: "\f03e"; -$fa-var-pie-chart: "\f200"; -$fa-var-pied-piper: "\f1a7"; -$fa-var-pied-piper-alt: "\f1a8"; -$fa-var-pinterest: "\f0d2"; -$fa-var-pinterest-square: "\f0d3"; -$fa-var-plane: "\f072"; -$fa-var-play: "\f04b"; -$fa-var-play-circle: "\f144"; -$fa-var-play-circle-o: "\f01d"; -$fa-var-plug: "\f1e6"; -$fa-var-plus: "\f067"; -$fa-var-plus-circle: "\f055"; -$fa-var-plus-square: "\f0fe"; -$fa-var-plus-square-o: "\f196"; -$fa-var-power-off: "\f011"; -$fa-var-print: "\f02f"; -$fa-var-puzzle-piece: "\f12e"; -$fa-var-qq: "\f1d6"; -$fa-var-qrcode: "\f029"; -$fa-var-question: "\f128"; -$fa-var-question-circle: "\f059"; -$fa-var-quote-left: "\f10d"; -$fa-var-quote-right: "\f10e"; -$fa-var-ra: "\f1d0"; -$fa-var-random: "\f074"; -$fa-var-rebel: "\f1d0"; -$fa-var-recycle: "\f1b8"; -$fa-var-reddit: "\f1a1"; -$fa-var-reddit-square: "\f1a2"; -$fa-var-refresh: "\f021"; -$fa-var-remove: "\f00d"; -$fa-var-renren: "\f18b"; -$fa-var-reorder: "\f0c9"; -$fa-var-repeat: "\f01e"; -$fa-var-reply: "\f112"; -$fa-var-reply-all: "\f122"; -$fa-var-retweet: "\f079"; -$fa-var-rmb: "\f157"; -$fa-var-road: "\f018"; -$fa-var-rocket: "\f135"; -$fa-var-rotate-left: "\f0e2"; -$fa-var-rotate-right: "\f01e"; -$fa-var-rouble: "\f158"; -$fa-var-rss: "\f09e"; -$fa-var-rss-square: "\f143"; -$fa-var-rub: "\f158"; -$fa-var-ruble: "\f158"; -$fa-var-rupee: "\f156"; -$fa-var-save: "\f0c7"; -$fa-var-scissors: "\f0c4"; -$fa-var-search: "\f002"; -$fa-var-search-minus: "\f010"; -$fa-var-search-plus: "\f00e"; -$fa-var-send: "\f1d8"; -$fa-var-send-o: "\f1d9"; -$fa-var-share: "\f064"; -$fa-var-share-alt: "\f1e0"; -$fa-var-share-alt-square: "\f1e1"; -$fa-var-share-square: "\f14d"; -$fa-var-share-square-o: "\f045"; -$fa-var-shekel: "\f20b"; -$fa-var-sheqel: "\f20b"; -$fa-var-shield: "\f132"; -$fa-var-shopping-cart: "\f07a"; -$fa-var-sign-in: "\f090"; -$fa-var-sign-out: "\f08b"; -$fa-var-signal: "\f012"; -$fa-var-sitemap: "\f0e8"; -$fa-var-skype: "\f17e"; -$fa-var-slack: "\f198"; -$fa-var-sliders: "\f1de"; -$fa-var-slideshare: "\f1e7"; -$fa-var-smile-o: "\f118"; -$fa-var-soccer-ball-o: "\f1e3"; -$fa-var-sort: "\f0dc"; -$fa-var-sort-alpha-asc: "\f15d"; -$fa-var-sort-alpha-desc: "\f15e"; -$fa-var-sort-amount-asc: "\f160"; -$fa-var-sort-amount-desc: "\f161"; -$fa-var-sort-asc: "\f0de"; -$fa-var-sort-desc: "\f0dd"; -$fa-var-sort-down: "\f0dd"; -$fa-var-sort-numeric-asc: "\f162"; -$fa-var-sort-numeric-desc: "\f163"; -$fa-var-sort-up: "\f0de"; -$fa-var-soundcloud: "\f1be"; -$fa-var-space-shuttle: "\f197"; -$fa-var-spinner: "\f110"; -$fa-var-spoon: "\f1b1"; -$fa-var-spotify: "\f1bc"; -$fa-var-square: "\f0c8"; -$fa-var-square-o: "\f096"; -$fa-var-stack-exchange: "\f18d"; -$fa-var-stack-overflow: "\f16c"; -$fa-var-star: "\f005"; -$fa-var-star-half: "\f089"; -$fa-var-star-half-empty: "\f123"; -$fa-var-star-half-full: "\f123"; -$fa-var-star-half-o: "\f123"; -$fa-var-star-o: "\f006"; -$fa-var-steam: "\f1b6"; -$fa-var-steam-square: "\f1b7"; -$fa-var-step-backward: "\f048"; -$fa-var-step-forward: "\f051"; -$fa-var-stethoscope: "\f0f1"; -$fa-var-stop: "\f04d"; -$fa-var-strikethrough: "\f0cc"; -$fa-var-stumbleupon: "\f1a4"; -$fa-var-stumbleupon-circle: "\f1a3"; -$fa-var-subscript: "\f12c"; -$fa-var-suitcase: "\f0f2"; -$fa-var-sun-o: "\f185"; -$fa-var-superscript: "\f12b"; -$fa-var-support: "\f1cd"; -$fa-var-table: "\f0ce"; -$fa-var-tablet: "\f10a"; -$fa-var-tachometer: "\f0e4"; -$fa-var-tag: "\f02b"; -$fa-var-tags: "\f02c"; -$fa-var-tasks: "\f0ae"; -$fa-var-taxi: "\f1ba"; -$fa-var-tencent-weibo: "\f1d5"; -$fa-var-terminal: "\f120"; -$fa-var-text-height: "\f034"; -$fa-var-text-width: "\f035"; -$fa-var-th: "\f00a"; -$fa-var-th-large: "\f009"; -$fa-var-th-list: "\f00b"; -$fa-var-thumb-tack: "\f08d"; -$fa-var-thumbs-down: "\f165"; -$fa-var-thumbs-o-down: "\f088"; -$fa-var-thumbs-o-up: "\f087"; -$fa-var-thumbs-up: "\f164"; -$fa-var-ticket: "\f145"; -$fa-var-times: "\f00d"; -$fa-var-times-circle: "\f057"; -$fa-var-times-circle-o: "\f05c"; -$fa-var-tint: "\f043"; -$fa-var-toggle-down: "\f150"; -$fa-var-toggle-left: "\f191"; -$fa-var-toggle-off: "\f204"; -$fa-var-toggle-on: "\f205"; -$fa-var-toggle-right: "\f152"; -$fa-var-toggle-up: "\f151"; -$fa-var-trash: "\f1f8"; -$fa-var-trash-o: "\f014"; -$fa-var-tree: "\f1bb"; -$fa-var-trello: "\f181"; -$fa-var-trophy: "\f091"; -$fa-var-truck: "\f0d1"; -$fa-var-try: "\f195"; -$fa-var-tty: "\f1e4"; -$fa-var-tumblr: "\f173"; -$fa-var-tumblr-square: "\f174"; -$fa-var-turkish-lira: "\f195"; -$fa-var-twitch: "\f1e8"; -$fa-var-twitter: "\f099"; -$fa-var-twitter-square: "\f081"; -$fa-var-umbrella: "\f0e9"; -$fa-var-underline: "\f0cd"; -$fa-var-undo: "\f0e2"; -$fa-var-university: "\f19c"; -$fa-var-unlink: "\f127"; -$fa-var-unlock: "\f09c"; -$fa-var-unlock-alt: "\f13e"; -$fa-var-unsorted: "\f0dc"; -$fa-var-upload: "\f093"; -$fa-var-usd: "\f155"; -$fa-var-user: "\f007"; -$fa-var-user-md: "\f0f0"; -$fa-var-users: "\f0c0"; -$fa-var-video-camera: "\f03d"; -$fa-var-vimeo-square: "\f194"; -$fa-var-vine: "\f1ca"; -$fa-var-vk: "\f189"; -$fa-var-volume-down: "\f027"; -$fa-var-volume-off: "\f026"; -$fa-var-volume-up: "\f028"; -$fa-var-warning: "\f071"; -$fa-var-wechat: "\f1d7"; -$fa-var-weibo: "\f18a"; -$fa-var-weixin: "\f1d7"; -$fa-var-wheelchair: "\f193"; -$fa-var-wifi: "\f1eb"; -$fa-var-windows: "\f17a"; -$fa-var-won: "\f159"; -$fa-var-wordpress: "\f19a"; -$fa-var-wrench: "\f0ad"; -$fa-var-xing: "\f168"; -$fa-var-xing-square: "\f169"; -$fa-var-yahoo: "\f19e"; -$fa-var-yelp: "\f1e9"; -$fa-var-yen: "\f157"; -$fa-var-youtube: "\f167"; -$fa-var-youtube-play: "\f16a"; -$fa-var-youtube-square: "\f166"; - DELETED cgisetup/www/css/fonts/font-awesome-4.2.0/scss/font-awesome.scss Index: cgisetup/www/css/fonts/font-awesome-4.2.0/scss/font-awesome.scss ================================================================== --- cgisetup/www/css/fonts/font-awesome-4.2.0/scss/font-awesome.scss +++ /dev/null @@ -1,17 +0,0 @@ -/*! - * Font Awesome 4.2.0 by @davegandy - http://fontawesome.io - @fontawesome - * License - http://fontawesome.io/license (Font: SIL OFL 1.1, CSS: MIT License) - */ - -@import "variables"; -@import "mixins"; -@import "path"; -@import "core"; -@import "larger"; -@import "fixed-width"; -@import "list"; -@import "bordered-pulled"; -@import "spinning"; -@import "rotated-flipped"; -@import "stacked"; -@import "icons"; DELETED cgisetup/www/css/img/breadcrumbs-bg.gif Index: cgisetup/www/css/img/breadcrumbs-bg.gif ================================================================== --- cgisetup/www/css/img/breadcrumbs-bg.gif +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/bx_loader.gif Index: cgisetup/www/css/img/bx_loader.gif ================================================================== --- cgisetup/www/css/img/bx_loader.gif +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/controls.png Index: cgisetup/www/css/img/controls.png ================================================================== --- cgisetup/www/css/img/controls.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/blank.gif Index: cgisetup/www/css/img/fancybox/blank.gif ================================================================== --- cgisetup/www/css/img/fancybox/blank.gif +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_close.png Index: cgisetup/www/css/img/fancybox/fancy_close.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_close.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_loading.png Index: cgisetup/www/css/img/fancybox/fancy_loading.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_loading.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_nav_left.png Index: cgisetup/www/css/img/fancybox/fancy_nav_left.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_nav_left.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_nav_right.png Index: cgisetup/www/css/img/fancybox/fancy_nav_right.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_nav_right.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_shadow_e.png Index: cgisetup/www/css/img/fancybox/fancy_shadow_e.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_shadow_e.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_shadow_n.png Index: cgisetup/www/css/img/fancybox/fancy_shadow_n.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_shadow_n.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_shadow_ne.png Index: cgisetup/www/css/img/fancybox/fancy_shadow_ne.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_shadow_ne.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_shadow_nw.png Index: cgisetup/www/css/img/fancybox/fancy_shadow_nw.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_shadow_nw.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_shadow_s.png Index: cgisetup/www/css/img/fancybox/fancy_shadow_s.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_shadow_s.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_shadow_se.png Index: cgisetup/www/css/img/fancybox/fancy_shadow_se.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_shadow_se.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_shadow_sw.png Index: cgisetup/www/css/img/fancybox/fancy_shadow_sw.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_shadow_sw.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_shadow_w.png Index: cgisetup/www/css/img/fancybox/fancy_shadow_w.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_shadow_w.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_title_left.png Index: cgisetup/www/css/img/fancybox/fancy_title_left.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_title_left.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_title_main.png Index: cgisetup/www/css/img/fancybox/fancy_title_main.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_title_main.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_title_over.png Index: cgisetup/www/css/img/fancybox/fancy_title_over.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_title_over.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancy_title_right.png Index: cgisetup/www/css/img/fancybox/fancy_title_right.png ================================================================== --- cgisetup/www/css/img/fancybox/fancy_title_right.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancybox-x.png Index: cgisetup/www/css/img/fancybox/fancybox-x.png ================================================================== --- cgisetup/www/css/img/fancybox/fancybox-x.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancybox-y.png Index: cgisetup/www/css/img/fancybox/fancybox-y.png ================================================================== --- cgisetup/www/css/img/fancybox/fancybox-y.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/fancybox.png Index: cgisetup/www/css/img/fancybox/fancybox.png ================================================================== --- cgisetup/www/css/img/fancybox/fancybox.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/fancybox/jquery.easing-1.3.pack.js Index: cgisetup/www/css/img/fancybox/jquery.easing-1.3.pack.js ================================================================== --- cgisetup/www/css/img/fancybox/jquery.easing-1.3.pack.js +++ /dev/null @@ -1,72 +0,0 @@ -/* - * jQuery Easing v1.3 - http://gsgd.co.uk/sandbox/jquery/easing/ - * - * Uses the built in easing capabilities added In jQuery 1.1 - * to offer multiple easing options - * - * TERMS OF USE - jQuery Easing - * - * Open source under the BSD License. - * - * Copyright © 2008 George McGinley Smith - * All rights reserved. - * - * Redistribution and use in source and binary forms, with or without modification, - * are permitted provided that the following conditions are met: - * - * Redistributions of source code must retain the above copyright notice, this list of - * conditions and the following disclaimer. - * Redistributions in binary form must reproduce the above copyright notice, this list - * of conditions and the following disclaimer in the documentation and/or other materials - * provided with the distribution. - * - * Neither the name of the author nor the names of contributors may be used to endorse - * or promote products derived from this software without specific prior written permission. - * - * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND ANY - * EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF - * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - * COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - * EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE - * GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED - * AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED - * OF THE POSSIBILITY OF SUCH DAMAGE. - * -*/ - -// t: current time, b: begInnIng value, c: change In value, d: duration -eval(function(p,a,c,k,e,r){e=function(c){return(c35?String.fromCharCode(c+29):c.toString(36))};if(!''.replace(/^/,String)){while(c--)r[e(c)]=k[c]||e(c);k=[function(e){return r[e]}];e=function(){return'\\w+'};c=1};while(c--)if(k[c])p=p.replace(new RegExp('\\b'+e(c)+'\\b','g'),k[c]);return p}('h.i[\'1a\']=h.i[\'z\'];h.O(h.i,{y:\'D\',z:9(x,t,b,c,d){6 h.i[h.i.y](x,t,b,c,d)},17:9(x,t,b,c,d){6 c*(t/=d)*t+b},D:9(x,t,b,c,d){6-c*(t/=d)*(t-2)+b},13:9(x,t,b,c,d){e((t/=d/2)<1)6 c/2*t*t+b;6-c/2*((--t)*(t-2)-1)+b},X:9(x,t,b,c,d){6 c*(t/=d)*t*t+b},U:9(x,t,b,c,d){6 c*((t=t/d-1)*t*t+1)+b},R:9(x,t,b,c,d){e((t/=d/2)<1)6 c/2*t*t*t+b;6 c/2*((t-=2)*t*t+2)+b},N:9(x,t,b,c,d){6 c*(t/=d)*t*t*t+b},M:9(x,t,b,c,d){6-c*((t=t/d-1)*t*t*t-1)+b},L:9(x,t,b,c,d){e((t/=d/2)<1)6 c/2*t*t*t*t+b;6-c/2*((t-=2)*t*t*t-2)+b},K:9(x,t,b,c,d){6 c*(t/=d)*t*t*t*t+b},J:9(x,t,b,c,d){6 c*((t=t/d-1)*t*t*t*t+1)+b},I:9(x,t,b,c,d){e((t/=d/2)<1)6 c/2*t*t*t*t*t+b;6 c/2*((t-=2)*t*t*t*t+2)+b},G:9(x,t,b,c,d){6-c*8.C(t/d*(8.g/2))+c+b},15:9(x,t,b,c,d){6 c*8.n(t/d*(8.g/2))+b},12:9(x,t,b,c,d){6-c/2*(8.C(8.g*t/d)-1)+b},Z:9(x,t,b,c,d){6(t==0)?b:c*8.j(2,10*(t/d-1))+b},Y:9(x,t,b,c,d){6(t==d)?b+c:c*(-8.j(2,-10*t/d)+1)+b},W:9(x,t,b,c,d){e(t==0)6 b;e(t==d)6 b+c;e((t/=d/2)<1)6 c/2*8.j(2,10*(t-1))+b;6 c/2*(-8.j(2,-10*--t)+2)+b},V:9(x,t,b,c,d){6-c*(8.o(1-(t/=d)*t)-1)+b},S:9(x,t,b,c,d){6 c*8.o(1-(t=t/d-1)*t)+b},Q:9(x,t,b,c,d){e((t/=d/2)<1)6-c/2*(8.o(1-t*t)-1)+b;6 c/2*(8.o(1-(t-=2)*t)+1)+b},P:9(x,t,b,c,d){f s=1.l;f p=0;f a=c;e(t==0)6 b;e((t/=d)==1)6 b+c;e(!p)p=d*.3;e(a<8.w(c)){a=c;f s=p/4}m f s=p/(2*8.g)*8.r(c/a);6-(a*8.j(2,10*(t-=1))*8.n((t*d-s)*(2*8.g)/p))+b},H:9(x,t,b,c,d){f s=1.l;f p=0;f a=c;e(t==0)6 b;e((t/=d)==1)6 b+c;e(!p)p=d*.3;e(a<8.w(c)){a=c;f s=p/4}m f s=p/(2*8.g)*8.r(c/a);6 a*8.j(2,-10*t)*8.n((t*d-s)*(2*8.g)/p)+c+b},T:9(x,t,b,c,d){f s=1.l;f p=0;f a=c;e(t==0)6 b;e((t/=d/2)==2)6 b+c;e(!p)p=d*(.3*1.5);e(a<8.w(c)){a=c;f s=p/4}m f s=p/(2*8.g)*8.r(c/a);e(t<1)6-.5*(a*8.j(2,10*(t-=1))*8.n((t*d-s)*(2*8.g)/p))+b;6 a*8.j(2,-10*(t-=1))*8.n((t*d-s)*(2*8.g)/p)*.5+c+b},F:9(x,t,b,c,d,s){e(s==u)s=1.l;6 c*(t/=d)*t*((s+1)*t-s)+b},E:9(x,t,b,c,d,s){e(s==u)s=1.l;6 c*((t=t/d-1)*t*((s+1)*t+s)+1)+b},16:9(x,t,b,c,d,s){e(s==u)s=1.l;e((t/=d/2)<1)6 c/2*(t*t*(((s*=(1.B))+1)*t-s))+b;6 c/2*((t-=2)*t*(((s*=(1.B))+1)*t+s)+2)+b},A:9(x,t,b,c,d){6 c-h.i.v(x,d-t,0,c,d)+b},v:9(x,t,b,c,d){e((t/=d)<(1/2.k)){6 c*(7.q*t*t)+b}m e(t<(2/2.k)){6 c*(7.q*(t-=(1.5/2.k))*t+.k)+b}m e(t<(2.5/2.k)){6 c*(7.q*(t-=(2.14/2.k))*t+.11)+b}m{6 c*(7.q*(t-=(2.18/2.k))*t+.19)+b}},1b:9(x,t,b,c,d){e(t')[0], { prop: 0 }), - - isIE6 = $.browser.msie && $.browser.version < 7 && !window.XMLHttpRequest, - - /* - * Private methods - */ - - _abort = function() { - loading.hide(); - - imgPreloader.onerror = imgPreloader.onload = null; - - if (ajaxLoader) { - ajaxLoader.abort(); - } - - tmp.empty(); - }, - - _error = function() { - if (false === selectedOpts.onError(selectedArray, selectedIndex, selectedOpts)) { - loading.hide(); - busy = false; - return; - } - - selectedOpts.titleShow = false; - - selectedOpts.width = 'auto'; - selectedOpts.height = 'auto'; - - tmp.html( '

The requested content cannot be loaded.
Please try again later.

' ); - - _process_inline(); - }, - - _start = function() { - var obj = selectedArray[ selectedIndex ], - href, - type, - title, - str, - emb, - ret; - - _abort(); - - selectedOpts = $.extend({}, $.fn.fancybox.defaults, (typeof $(obj).data('fancybox') == 'undefined' ? selectedOpts : $(obj).data('fancybox'))); - - ret = selectedOpts.onStart(selectedArray, selectedIndex, selectedOpts); - - if (ret === false) { - busy = false; - return; - } else if (typeof ret == 'object') { - selectedOpts = $.extend(selectedOpts, ret); - } - - title = selectedOpts.title || (obj.nodeName ? $(obj).attr('title') : obj.title) || ''; - - if (obj.nodeName && !selectedOpts.orig) { - selectedOpts.orig = $(obj).children("img:first").length ? $(obj).children("img:first") : $(obj); - } - - if (title === '' && selectedOpts.orig && selectedOpts.titleFromAlt) { - title = selectedOpts.orig.attr('alt'); - } - - href = selectedOpts.href || (obj.nodeName ? $(obj).attr('href') : obj.href) || null; - - if ((/^(?:javascript)/i).test(href) || href == '#') { - href = null; - } - - if (selectedOpts.type) { - type = selectedOpts.type; - - if (!href) { - href = selectedOpts.content; - } - - } else if (selectedOpts.content) { - type = 'html'; - - } else if (href) { - if (href.match(imgRegExp)) { - type = 'image'; - - } else if (href.match(swfRegExp)) { - type = 'swf'; - - } else if ($(obj).hasClass("iframe")) { - type = 'iframe'; - - } else if (href.indexOf("#") === 0) { - type = 'inline'; - - } else { - type = 'ajax'; - } - } - - if (!type) { - _error(); - return; - } - - if (type == 'inline') { - obj = href.substr(href.indexOf("#")); - type = $(obj).length > 0 ? 'inline' : 'ajax'; - } - - selectedOpts.type = type; - selectedOpts.href = href; - selectedOpts.title = title; - - if (selectedOpts.autoDimensions) { - if (selectedOpts.type == 'html' || selectedOpts.type == 'inline' || selectedOpts.type == 'ajax') { - selectedOpts.width = 'auto'; - selectedOpts.height = 'auto'; - } else { - selectedOpts.autoDimensions = false; - } - } - - if (selectedOpts.modal) { - selectedOpts.overlayShow = true; - selectedOpts.hideOnOverlayClick = false; - selectedOpts.hideOnContentClick = false; - selectedOpts.enableEscapeButton = false; - selectedOpts.showCloseButton = false; - } - - selectedOpts.padding = parseInt(selectedOpts.padding, 10); - selectedOpts.margin = parseInt(selectedOpts.margin, 10); - - tmp.css('padding', (selectedOpts.padding + selectedOpts.margin)); - - $('.fancybox-inline-tmp').unbind('fancybox-cancel').bind('fancybox-change', function() { - $(this).replaceWith(content.children()); - }); - - switch (type) { - case 'html' : - tmp.html( selectedOpts.content ); - _process_inline(); - break; - - case 'inline' : - if ( $(obj).parent().is('#fancybox-content') === true) { - busy = false; - return; - } - - $('
') - .hide() - .insertBefore( $(obj) ) - .bind('fancybox-cleanup', function() { - $(this).replaceWith(content.children()); - }).bind('fancybox-cancel', function() { - $(this).replaceWith(tmp.children()); - }); - - $(obj).appendTo(tmp); - - _process_inline(); - break; - - case 'image': - busy = false; - - $.fancybox.showActivity(); - - imgPreloader = new Image(); - - imgPreloader.onerror = function() { - _error(); - }; - - imgPreloader.onload = function() { - busy = true; - - imgPreloader.onerror = imgPreloader.onload = null; - - _process_image(); - }; - - imgPreloader.src = href; - break; - - case 'swf': - selectedOpts.scrolling = 'no'; - - str = ''; - emb = ''; - - $.each(selectedOpts.swf, function(name, val) { - str += ''; - emb += ' ' + name + '="' + val + '"'; - }); - - str += ''; - - tmp.html(str); - - _process_inline(); - break; - - case 'ajax': - busy = false; - - $.fancybox.showActivity(); - - selectedOpts.ajax.win = selectedOpts.ajax.success; - - ajaxLoader = $.ajax($.extend({}, selectedOpts.ajax, { - url : href, - data : selectedOpts.ajax.data || {}, - error : function(XMLHttpRequest, textStatus, errorThrown) { - if ( XMLHttpRequest.status > 0 ) { - _error(); - } - }, - success : function(data, textStatus, XMLHttpRequest) { - var o = typeof XMLHttpRequest == 'object' ? XMLHttpRequest : ajaxLoader; - if (o.status == 200) { - if ( typeof selectedOpts.ajax.win == 'function' ) { - ret = selectedOpts.ajax.win(href, data, textStatus, XMLHttpRequest); - - if (ret === false) { - loading.hide(); - return; - } else if (typeof ret == 'string' || typeof ret == 'object') { - data = ret; - } - } - - tmp.html( data ); - _process_inline(); - } - } - })); - - break; - - case 'iframe': - _show(); - break; - } - }, - - _process_inline = function() { - var - w = selectedOpts.width, - h = selectedOpts.height; - - if (w.toString().indexOf('%') > -1) { - w = parseInt( ($(window).width() - (selectedOpts.margin * 2)) * parseFloat(w) / 100, 10) + 'px'; - - } else { - w = w == 'auto' ? 'auto' : w + 'px'; - } - - if (h.toString().indexOf('%') > -1) { - h = parseInt( ($(window).height() - (selectedOpts.margin * 2)) * parseFloat(h) / 100, 10) + 'px'; - - } else { - h = h == 'auto' ? 'auto' : h + 'px'; - } - - tmp.wrapInner('
'); - - selectedOpts.width = tmp.width(); - selectedOpts.height = tmp.height(); - - _show(); - }, - - _process_image = function() { - selectedOpts.width = imgPreloader.width; - selectedOpts.height = imgPreloader.height; - - $("").attr({ - 'id' : 'fancybox-img', - 'src' : imgPreloader.src, - 'alt' : selectedOpts.title - }).appendTo( tmp ); - - _show(); - }, - - _show = function() { - var pos, equal; - - loading.hide(); - - if (wrap.is(":visible") && false === currentOpts.onCleanup(currentArray, currentIndex, currentOpts)) { - $.event.trigger('fancybox-cancel'); - - busy = false; - return; - } - - busy = true; - - $(content.add( overlay )).unbind(); - - $(window).unbind("resize.fb scroll.fb"); - $(document).unbind('keydown.fb'); - - if (wrap.is(":visible") && currentOpts.titlePosition !== 'outside') { - wrap.css('height', wrap.height()); - } - - currentArray = selectedArray; - currentIndex = selectedIndex; - currentOpts = selectedOpts; - - if (currentOpts.overlayShow) { - overlay.css({ - 'background-color' : currentOpts.overlayColor, - 'opacity' : currentOpts.overlayOpacity, - 'cursor' : currentOpts.hideOnOverlayClick ? 'pointer' : 'auto', - 'height' : $(document).height() - }); - - if (!overlay.is(':visible')) { - if (isIE6) { - $('select:not(#fancybox-tmp select)').filter(function() { - return this.style.visibility !== 'hidden'; - }).css({'visibility' : 'hidden'}).one('fancybox-cleanup', function() { - this.style.visibility = 'inherit'; - }); - } - - overlay.show(); - } - } else { - overlay.hide(); - } - - final_pos = _get_zoom_to(); - - _process_title(); - - if (wrap.is(":visible")) { - $( close.add( nav_left ).add( nav_right ) ).hide(); - - pos = wrap.position(), - - start_pos = { - top : pos.top, - left : pos.left, - width : wrap.width(), - height : wrap.height() - }; - - equal = (start_pos.width == final_pos.width && start_pos.height == final_pos.height); - - content.fadeTo(currentOpts.changeFade, 0.3, function() { - var finish_resizing = function() { - content.html( tmp.contents() ).fadeTo(currentOpts.changeFade, 1, _finish); - }; - - $.event.trigger('fancybox-change'); - - content - .empty() - .removeAttr('filter') - .css({ - 'border-width' : currentOpts.padding, - 'width' : final_pos.width - currentOpts.padding * 2, - 'height' : selectedOpts.autoDimensions ? 'auto' : final_pos.height - titleHeight - currentOpts.padding * 2 - }); - - if (equal) { - finish_resizing(); - - } else { - fx.prop = 0; - - $(fx).animate({prop: 1}, { - duration : currentOpts.changeSpeed, - easing : currentOpts.easingChange, - step : _draw, - complete : finish_resizing - }); - } - }); - - return; - } - - wrap.removeAttr("style"); - - content.css('border-width', currentOpts.padding); - - if (currentOpts.transitionIn == 'elastic') { - start_pos = _get_zoom_from(); - - content.html( tmp.contents() ); - - wrap.show(); - - if (currentOpts.opacity) { - final_pos.opacity = 0; - } - - fx.prop = 0; - - $(fx).animate({prop: 1}, { - duration : currentOpts.speedIn, - easing : currentOpts.easingIn, - step : _draw, - complete : _finish - }); - - return; - } - - if (currentOpts.titlePosition == 'inside' && titleHeight > 0) { - title.show(); - } - - content - .css({ - 'width' : final_pos.width - currentOpts.padding * 2, - 'height' : selectedOpts.autoDimensions ? 'auto' : final_pos.height - titleHeight - currentOpts.padding * 2 - }) - .html( tmp.contents() ); - - wrap - .css(final_pos) - .fadeIn( currentOpts.transitionIn == 'none' ? 0 : currentOpts.speedIn, _finish ); - }, - - _format_title = function(title) { - if (title && title.length) { - if (currentOpts.titlePosition == 'float') { - return '
' + title + '
'; - } - - return '
' + title + '
'; - } - - return false; - }, - - _process_title = function() { - titleStr = currentOpts.title || ''; - titleHeight = 0; - - title - .empty() - .removeAttr('style') - .removeClass(); - - if (currentOpts.titleShow === false) { - title.hide(); - return; - } - - titleStr = $.isFunction(currentOpts.titleFormat) ? currentOpts.titleFormat(titleStr, currentArray, currentIndex, currentOpts) : _format_title(titleStr); - - if (!titleStr || titleStr === '') { - title.hide(); - return; - } - - title - .addClass('fancybox-title-' + currentOpts.titlePosition) - .html( titleStr ) - .appendTo( 'body' ) - .show(); - - switch (currentOpts.titlePosition) { - case 'inside': - title - .css({ - 'width' : final_pos.width - (currentOpts.padding * 2), - 'marginLeft' : currentOpts.padding, - 'marginRight' : currentOpts.padding - }); - - titleHeight = title.outerHeight(true); - - title.appendTo( outer ); - - final_pos.height += titleHeight; - break; - - case 'over': - title - .css({ - 'marginLeft' : currentOpts.padding, - 'width' : final_pos.width - (currentOpts.padding * 2), - 'bottom' : currentOpts.padding - }) - .appendTo( outer ); - break; - - case 'float': - title - .css('left', parseInt((title.width() - final_pos.width - 40)/ 2, 10) * -1) - .appendTo( wrap ); - break; - - default: - title - .css({ - 'width' : final_pos.width - (currentOpts.padding * 2), - 'paddingLeft' : currentOpts.padding, - 'paddingRight' : currentOpts.padding - }) - .appendTo( wrap ); - break; - } - - title.hide(); - }, - - _set_navigation = function() { - if (currentOpts.enableEscapeButton || currentOpts.enableKeyboardNav) { - $(document).bind('keydown.fb', function(e) { - if (e.keyCode == 27 && currentOpts.enableEscapeButton) { - e.preventDefault(); - $.fancybox.close(); - - } else if ((e.keyCode == 37 || e.keyCode == 39) && currentOpts.enableKeyboardNav && e.target.tagName !== 'INPUT' && e.target.tagName !== 'TEXTAREA' && e.target.tagName !== 'SELECT') { - e.preventDefault(); - $.fancybox[ e.keyCode == 37 ? 'prev' : 'next'](); - } - }); - } - - if (!currentOpts.showNavArrows) { - nav_left.hide(); - nav_right.hide(); - return; - } - - if ((currentOpts.cyclic && currentArray.length > 1) || currentIndex !== 0) { - nav_left.show(); - } - - if ((currentOpts.cyclic && currentArray.length > 1) || currentIndex != (currentArray.length -1)) { - nav_right.show(); - } - }, - - _finish = function () { - if (!$.support.opacity) { - content.get(0).style.removeAttribute('filter'); - wrap.get(0).style.removeAttribute('filter'); - } - - if (selectedOpts.autoDimensions) { - content.css('height', 'auto'); - } - - wrap.css('height', 'auto'); - - if (titleStr && titleStr.length) { - title.show(); - } - - if (currentOpts.showCloseButton) { - close.show(); - } - - _set_navigation(); - - if (currentOpts.hideOnContentClick) { - content.bind('click', $.fancybox.close); - } - - if (currentOpts.hideOnOverlayClick) { - overlay.bind('click', $.fancybox.close); - } - - $(window).bind("resize.fb", $.fancybox.resize); - - if (currentOpts.centerOnScroll) { - $(window).bind("scroll.fb", $.fancybox.center); - } - - if (currentOpts.type == 'iframe') { - $('').appendTo(content); - } - - wrap.show(); - - busy = false; - - $.fancybox.center(); - - currentOpts.onComplete(currentArray, currentIndex, currentOpts); - - _preload_images(); - }, - - _preload_images = function() { - var href, - objNext; - - if ((currentArray.length -1) > currentIndex) { - href = currentArray[ currentIndex + 1 ].href; - - if (typeof href !== 'undefined' && href.match(imgRegExp)) { - objNext = new Image(); - objNext.src = href; - } - } - - if (currentIndex > 0) { - href = currentArray[ currentIndex - 1 ].href; - - if (typeof href !== 'undefined' && href.match(imgRegExp)) { - objNext = new Image(); - objNext.src = href; - } - } - }, - - _draw = function(pos) { - var dim = { - width : parseInt(start_pos.width + (final_pos.width - start_pos.width) * pos, 10), - height : parseInt(start_pos.height + (final_pos.height - start_pos.height) * pos, 10), - - top : parseInt(start_pos.top + (final_pos.top - start_pos.top) * pos, 10), - left : parseInt(start_pos.left + (final_pos.left - start_pos.left) * pos, 10) - }; - - if (typeof final_pos.opacity !== 'undefined') { - dim.opacity = pos < 0.5 ? 0.5 : pos; - } - - wrap.css(dim); - - content.css({ - 'width' : dim.width - currentOpts.padding * 2, - 'height' : dim.height - (titleHeight * pos) - currentOpts.padding * 2 - }); - }, - - _get_viewport = function() { - return [ - $(window).width() - (currentOpts.margin * 2), - $(window).height() - (currentOpts.margin * 2), - $(document).scrollLeft() + currentOpts.margin, - $(document).scrollTop() + currentOpts.margin - ]; - }, - - _get_zoom_to = function () { - var view = _get_viewport(), - to = {}, - resize = currentOpts.autoScale, - double_padding = currentOpts.padding * 2, - ratio; - - if (currentOpts.width.toString().indexOf('%') > -1) { - to.width = parseInt((view[0] * parseFloat(currentOpts.width)) / 100, 10); - } else { - to.width = currentOpts.width + double_padding; - } - - if (currentOpts.height.toString().indexOf('%') > -1) { - to.height = parseInt((view[1] * parseFloat(currentOpts.height)) / 100, 10); - } else { - to.height = currentOpts.height + double_padding; - } - - if (resize && (to.width > view[0] || to.height > view[1])) { - if (selectedOpts.type == 'image' || selectedOpts.type == 'swf') { - ratio = (currentOpts.width ) / (currentOpts.height ); - - if ((to.width ) > view[0]) { - to.width = view[0]; - to.height = parseInt(((to.width - double_padding) / ratio) + double_padding, 10); - } - - if ((to.height) > view[1]) { - to.height = view[1]; - to.width = parseInt(((to.height - double_padding) * ratio) + double_padding, 10); - } - - } else { - to.width = Math.min(to.width, view[0]); - to.height = Math.min(to.height, view[1]); - } - } - - to.top = parseInt(Math.max(view[3] - 20, view[3] + ((view[1] - to.height - 40) * 0.5)), 10); - to.left = parseInt(Math.max(view[2] - 20, view[2] + ((view[0] - to.width - 40) * 0.5)), 10); - - return to; - }, - - _get_obj_pos = function(obj) { - var pos = obj.offset(); - - pos.top += parseInt( obj.css('paddingTop'), 10 ) || 0; - pos.left += parseInt( obj.css('paddingLeft'), 10 ) || 0; - - pos.top += parseInt( obj.css('border-top-width'), 10 ) || 0; - pos.left += parseInt( obj.css('border-left-width'), 10 ) || 0; - - pos.width = obj.width(); - pos.height = obj.height(); - - return pos; - }, - - _get_zoom_from = function() { - var orig = selectedOpts.orig ? $(selectedOpts.orig) : false, - from = {}, - pos, - view; - - if (orig && orig.length) { - pos = _get_obj_pos(orig); - - from = { - width : pos.width + (currentOpts.padding * 2), - height : pos.height + (currentOpts.padding * 2), - top : pos.top - currentOpts.padding - 20, - left : pos.left - currentOpts.padding - 20 - }; - - } else { - view = _get_viewport(); - - from = { - width : currentOpts.padding * 2, - height : currentOpts.padding * 2, - top : parseInt(view[3] + view[1] * 0.5, 10), - left : parseInt(view[2] + view[0] * 0.5, 10) - }; - } - - return from; - }, - - _animate_loading = function() { - if (!loading.is(':visible')){ - clearInterval(loadingTimer); - return; - } - - $('div', loading).css('top', (loadingFrame * -40) + 'px'); - - loadingFrame = (loadingFrame + 1) % 12; - }; - - /* - * Public methods - */ - - $.fn.fancybox = function(options) { - if (!$(this).length) { - return this; - } - - $(this) - .data('fancybox', $.extend({}, options, ($.metadata ? $(this).metadata() : {}))) - .unbind('click.fb') - .bind('click.fb', function(e) { - e.preventDefault(); - - if (busy) { - return; - } - - busy = true; - - $(this).blur(); - - selectedArray = []; - selectedIndex = 0; - - var rel = $(this).attr('rel') || ''; - - if (!rel || rel == '' || rel === 'nofollow') { - selectedArray.push(this); - - } else { - selectedArray = $("a[rel=" + rel + "], area[rel=" + rel + "]"); - selectedIndex = selectedArray.index( this ); - } - - _start(); - - return; - }); - - return this; - }; - - $.fancybox = function(obj) { - var opts; - - if (busy) { - return; - } - - busy = true; - opts = typeof arguments[1] !== 'undefined' ? arguments[1] : {}; - - selectedArray = []; - selectedIndex = parseInt(opts.index, 10) || 0; - - if ($.isArray(obj)) { - for (var i = 0, j = obj.length; i < j; i++) { - if (typeof obj[i] == 'object') { - $(obj[i]).data('fancybox', $.extend({}, opts, obj[i])); - } else { - obj[i] = $({}).data('fancybox', $.extend({content : obj[i]}, opts)); - } - } - - selectedArray = jQuery.merge(selectedArray, obj); - - } else { - if (typeof obj == 'object') { - $(obj).data('fancybox', $.extend({}, opts, obj)); - } else { - obj = $({}).data('fancybox', $.extend({content : obj}, opts)); - } - - selectedArray.push(obj); - } - - if (selectedIndex > selectedArray.length || selectedIndex < 0) { - selectedIndex = 0; - } - - _start(); - }; - - $.fancybox.showActivity = function() { - clearInterval(loadingTimer); - - loading.show(); - loadingTimer = setInterval(_animate_loading, 66); - }; - - $.fancybox.hideActivity = function() { - loading.hide(); - }; - - $.fancybox.next = function() { - return $.fancybox.pos( currentIndex + 1); - }; - - $.fancybox.prev = function() { - return $.fancybox.pos( currentIndex - 1); - }; - - $.fancybox.pos = function(pos) { - if (busy) { - return; - } - - pos = parseInt(pos); - - selectedArray = currentArray; - - if (pos > -1 && pos < currentArray.length) { - selectedIndex = pos; - _start(); - - } else if (currentOpts.cyclic && currentArray.length > 1) { - selectedIndex = pos >= currentArray.length ? 0 : currentArray.length - 1; - _start(); - } - - return; - }; - - $.fancybox.cancel = function() { - if (busy) { - return; - } - - busy = true; - - $.event.trigger('fancybox-cancel'); - - _abort(); - - selectedOpts.onCancel(selectedArray, selectedIndex, selectedOpts); - - busy = false; - }; - - // Note: within an iframe use - parent.$.fancybox.close(); - $.fancybox.close = function() { - if (busy || wrap.is(':hidden')) { - return; - } - - busy = true; - - if (currentOpts && false === currentOpts.onCleanup(currentArray, currentIndex, currentOpts)) { - busy = false; - return; - } - - _abort(); - - $(close.add( nav_left ).add( nav_right )).hide(); - - $(content.add( overlay )).unbind(); - - $(window).unbind("resize.fb scroll.fb"); - $(document).unbind('keydown.fb'); - - content.find('iframe').attr('src', isIE6 && /^https/i.test(window.location.href || '') ? 'javascript:void(false)' : 'about:blank'); - - if (currentOpts.titlePosition !== 'inside') { - title.empty(); - } - - wrap.stop(); - - function _cleanup() { - overlay.fadeOut('fast'); - - title.empty().hide(); - wrap.hide(); - - $.event.trigger('fancybox-cleanup'); - - content.empty(); - - currentOpts.onClosed(currentArray, currentIndex, currentOpts); - - currentArray = selectedOpts = []; - currentIndex = selectedIndex = 0; - currentOpts = selectedOpts = {}; - - busy = false; - } - - if (currentOpts.transitionOut == 'elastic') { - start_pos = _get_zoom_from(); - - var pos = wrap.position(); - - final_pos = { - top : pos.top , - left : pos.left, - width : wrap.width(), - height : wrap.height() - }; - - if (currentOpts.opacity) { - final_pos.opacity = 1; - } - - title.empty().hide(); - - fx.prop = 1; - - $(fx).animate({ prop: 0 }, { - duration : currentOpts.speedOut, - easing : currentOpts.easingOut, - step : _draw, - complete : _cleanup - }); - - } else { - wrap.fadeOut( currentOpts.transitionOut == 'none' ? 0 : currentOpts.speedOut, _cleanup); - } - }; - - $.fancybox.resize = function() { - if (overlay.is(':visible')) { - overlay.css('height', $(document).height()); - } - - $.fancybox.center(true); - }; - - $.fancybox.center = function() { - var view, align; - - if (busy) { - return; - } - - align = arguments[0] === true ? 1 : 0; - view = _get_viewport(); - - if (!align && (wrap.width() > view[0] || wrap.height() > view[1])) { - return; - } - - wrap - .stop() - .animate({ - 'top' : parseInt(Math.max(view[3] - 20, view[3] + ((view[1] - content.height() - 40) * 0.5) - currentOpts.padding)), - 'left' : parseInt(Math.max(view[2] - 20, view[2] + ((view[0] - content.width() - 40) * 0.5) - currentOpts.padding)) - }, typeof arguments[0] == 'number' ? arguments[0] : 200); - }; - - $.fancybox.init = function() { - if ($("#fancybox-wrap").length) { - return; - } - - $('body').append( - tmp = $('
'), - loading = $('
'), - overlay = $('
'), - wrap = $('
') - ); - - outer = $('
') - .append('
') - .appendTo( wrap ); - - outer.append( - content = $('
'), - close = $(''), - title = $('
'), - - nav_left = $(''), - nav_right = $('') - ); - - close.click($.fancybox.close); - loading.click($.fancybox.cancel); - - nav_left.click(function(e) { - e.preventDefault(); - $.fancybox.prev(); - }); - - nav_right.click(function(e) { - e.preventDefault(); - $.fancybox.next(); - }); - - if ($.fn.mousewheel) { - wrap.bind('mousewheel.fb', function(e, delta) { - if (busy) { - e.preventDefault(); - - } else if ($(e.target).get(0).clientHeight == 0 || $(e.target).get(0).scrollHeight === $(e.target).get(0).clientHeight) { - e.preventDefault(); - $.fancybox[ delta > 0 ? 'prev' : 'next'](); - } - }); - } - - if (!$.support.opacity) { - wrap.addClass('fancybox-ie'); - } - - if (isIE6) { - loading.addClass('fancybox-ie6'); - wrap.addClass('fancybox-ie6'); - - $('').prependTo(outer); - } - }; - - $.fn.fancybox.defaults = { - padding : 10, - margin : 40, - opacity : false, - modal : false, - cyclic : false, - scrolling : 'auto', // 'auto', 'yes' or 'no' - - width : 560, - height : 340, - - autoScale : true, - autoDimensions : true, - centerOnScroll : false, - - ajax : {}, - swf : { wmode: 'transparent' }, - - hideOnOverlayClick : true, - hideOnContentClick : false, - - overlayShow : true, - overlayOpacity : 0.7, - overlayColor : '#777', - - titleShow : true, - titlePosition : 'float', // 'float', 'outside', 'inside' or 'over' - titleFormat : null, - titleFromAlt : false, - - transitionIn : 'fade', // 'elastic', 'fade' or 'none' - transitionOut : 'fade', // 'elastic', 'fade' or 'none' - - speedIn : 300, - speedOut : 300, - - changeSpeed : 300, - changeFade : 'fast', - - easingIn : 'swing', - easingOut : 'swing', - - showCloseButton : true, - showNavArrows : true, - enableEscapeButton : true, - enableKeyboardNav : true, - - onStart : function(){}, - onCancel : function(){}, - onComplete : function(){}, - onCleanup : function(){}, - onClosed : function(){}, - onError : function(){} - }; - - $(document).ready(function() { - $.fancybox.init(); - }); - -})(jQuery); DELETED cgisetup/www/css/img/fancybox/jquery.fancybox-1.3.4.pack.js Index: cgisetup/www/css/img/fancybox/jquery.fancybox-1.3.4.pack.js ================================================================== --- cgisetup/www/css/img/fancybox/jquery.fancybox-1.3.4.pack.js +++ /dev/null @@ -1,46 +0,0 @@ -/* - * FancyBox - jQuery Plugin - * Simple and fancy lightbox alternative - * - * Examples and documentation at: http://fancybox.net - * - * Copyright (c) 2008 - 2010 Janis Skarnelis - * That said, it is hardly a one-person project. Many people have submitted bugs, code, and offered their advice freely. Their support is greatly appreciated. - * - * Version: 1.3.4 (11/11/2010) - * Requires: jQuery v1.3+ - * - * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - */ - -;(function(b){var m,t,u,f,D,j,E,n,z,A,q=0,e={},o=[],p=0,d={},l=[],G=null,v=new Image,J=/\.(jpg|gif|png|bmp|jpeg)(.*)?$/i,W=/[^\.]\.(swf)\s*$/i,K,L=1,y=0,s="",r,i,h=false,B=b.extend(b("
")[0],{prop:0}),M=b.browser.msie&&b.browser.version<7&&!window.XMLHttpRequest,N=function(){t.hide();v.onerror=v.onload=null;G&&G.abort();m.empty()},O=function(){if(false===e.onError(o,q,e)){t.hide();h=false}else{e.titleShow=false;e.width="auto";e.height="auto";m.html('

The requested content cannot be loaded.
Please try again later.

'); -F()}},I=function(){var a=o[q],c,g,k,C,P,w;N();e=b.extend({},b.fn.fancybox.defaults,typeof b(a).data("fancybox")=="undefined"?e:b(a).data("fancybox"));w=e.onStart(o,q,e);if(w===false)h=false;else{if(typeof w=="object")e=b.extend(e,w);k=e.title||(a.nodeName?b(a).attr("title"):a.title)||"";if(a.nodeName&&!e.orig)e.orig=b(a).children("img:first").length?b(a).children("img:first"):b(a);if(k===""&&e.orig&&e.titleFromAlt)k=e.orig.attr("alt");c=e.href||(a.nodeName?b(a).attr("href"):a.href)||null;if(/^(?:javascript)/i.test(c)|| -c=="#")c=null;if(e.type){g=e.type;if(!c)c=e.content}else if(e.content)g="html";else if(c)g=c.match(J)?"image":c.match(W)?"swf":b(a).hasClass("iframe")?"iframe":c.indexOf("#")===0?"inline":"ajax";if(g){if(g=="inline"){a=c.substr(c.indexOf("#"));g=b(a).length>0?"inline":"ajax"}e.type=g;e.href=c;e.title=k;if(e.autoDimensions)if(e.type=="html"||e.type=="inline"||e.type=="ajax"){e.width="auto";e.height="auto"}else e.autoDimensions=false;if(e.modal){e.overlayShow=true;e.hideOnOverlayClick=false;e.hideOnContentClick= -false;e.enableEscapeButton=false;e.showCloseButton=false}e.padding=parseInt(e.padding,10);e.margin=parseInt(e.margin,10);m.css("padding",e.padding+e.margin);b(".fancybox-inline-tmp").unbind("fancybox-cancel").bind("fancybox-change",function(){b(this).replaceWith(j.children())});switch(g){case "html":m.html(e.content);F();break;case "inline":if(b(a).parent().is("#fancybox-content")===true){h=false;break}b('
').hide().insertBefore(b(a)).bind("fancybox-cleanup",function(){b(this).replaceWith(j.children())}).bind("fancybox-cancel", -function(){b(this).replaceWith(m.children())});b(a).appendTo(m);F();break;case "image":h=false;b.fancybox.showActivity();v=new Image;v.onerror=function(){O()};v.onload=function(){h=true;v.onerror=v.onload=null;e.width=v.width;e.height=v.height;b("").attr({id:"fancybox-img",src:v.src,alt:e.title}).appendTo(m);Q()};v.src=c;break;case "swf":e.scrolling="no";C='';P="";b.each(e.swf,function(x,H){C+='';P+=" "+x+'="'+H+'"'});C+='";m.html(C);F();break;case "ajax":h=false;b.fancybox.showActivity();e.ajax.win=e.ajax.success;G=b.ajax(b.extend({},e.ajax,{url:c,data:e.ajax.data||{},error:function(x){x.status>0&&O()},success:function(x,H,R){if((typeof R=="object"?R:G).status==200){if(typeof e.ajax.win== -"function"){w=e.ajax.win(c,x,H,R);if(w===false){t.hide();return}else if(typeof w=="string"||typeof w=="object")x=w}m.html(x);F()}}}));break;case "iframe":Q()}}else O()}},F=function(){var a=e.width,c=e.height;a=a.toString().indexOf("%")>-1?parseInt((b(window).width()-e.margin*2)*parseFloat(a)/100,10)+"px":a=="auto"?"auto":a+"px";c=c.toString().indexOf("%")>-1?parseInt((b(window).height()-e.margin*2)*parseFloat(c)/100,10)+"px":c=="auto"?"auto":c+"px";m.wrapInner('
');e.width=m.width();e.height=m.height();Q()},Q=function(){var a,c;t.hide();if(f.is(":visible")&&false===d.onCleanup(l,p,d)){b.event.trigger("fancybox-cancel");h=false}else{h=true;b(j.add(u)).unbind();b(window).unbind("resize.fb scroll.fb");b(document).unbind("keydown.fb");f.is(":visible")&&d.titlePosition!=="outside"&&f.css("height",f.height());l=o;p=q;d=e;if(d.overlayShow){u.css({"background-color":d.overlayColor, -opacity:d.overlayOpacity,cursor:d.hideOnOverlayClick?"pointer":"auto",height:b(document).height()});if(!u.is(":visible")){M&&b("select:not(#fancybox-tmp select)").filter(function(){return this.style.visibility!=="hidden"}).css({visibility:"hidden"}).one("fancybox-cleanup",function(){this.style.visibility="inherit"});u.show()}}else u.hide();i=X();s=d.title||"";y=0;n.empty().removeAttr("style").removeClass();if(d.titleShow!==false){if(b.isFunction(d.titleFormat))a=d.titleFormat(s,l,p,d);else a=s&&s.length? -d.titlePosition=="float"?'
'+s+'
':'
'+s+"
":false;s=a;if(!(!s||s==="")){n.addClass("fancybox-title-"+d.titlePosition).html(s).appendTo("body").show();switch(d.titlePosition){case "inside":n.css({width:i.width-d.padding*2,marginLeft:d.padding,marginRight:d.padding}); -y=n.outerHeight(true);n.appendTo(D);i.height+=y;break;case "over":n.css({marginLeft:d.padding,width:i.width-d.padding*2,bottom:d.padding}).appendTo(D);break;case "float":n.css("left",parseInt((n.width()-i.width-40)/2,10)*-1).appendTo(f);break;default:n.css({width:i.width-d.padding*2,paddingLeft:d.padding,paddingRight:d.padding}).appendTo(f)}}}n.hide();if(f.is(":visible")){b(E.add(z).add(A)).hide();a=f.position();r={top:a.top,left:a.left,width:f.width(),height:f.height()};c=r.width==i.width&&r.height== -i.height;j.fadeTo(d.changeFade,0.3,function(){var g=function(){j.html(m.contents()).fadeTo(d.changeFade,1,S)};b.event.trigger("fancybox-change");j.empty().removeAttr("filter").css({"border-width":d.padding,width:i.width-d.padding*2,height:e.autoDimensions?"auto":i.height-y-d.padding*2});if(c)g();else{B.prop=0;b(B).animate({prop:1},{duration:d.changeSpeed,easing:d.easingChange,step:T,complete:g})}})}else{f.removeAttr("style");j.css("border-width",d.padding);if(d.transitionIn=="elastic"){r=V();j.html(m.contents()); -f.show();if(d.opacity)i.opacity=0;B.prop=0;b(B).animate({prop:1},{duration:d.speedIn,easing:d.easingIn,step:T,complete:S})}else{d.titlePosition=="inside"&&y>0&&n.show();j.css({width:i.width-d.padding*2,height:e.autoDimensions?"auto":i.height-y-d.padding*2}).html(m.contents());f.css(i).fadeIn(d.transitionIn=="none"?0:d.speedIn,S)}}}},Y=function(){if(d.enableEscapeButton||d.enableKeyboardNav)b(document).bind("keydown.fb",function(a){if(a.keyCode==27&&d.enableEscapeButton){a.preventDefault();b.fancybox.close()}else if((a.keyCode== -37||a.keyCode==39)&&d.enableKeyboardNav&&a.target.tagName!=="INPUT"&&a.target.tagName!=="TEXTAREA"&&a.target.tagName!=="SELECT"){a.preventDefault();b.fancybox[a.keyCode==37?"prev":"next"]()}});if(d.showNavArrows){if(d.cyclic&&l.length>1||p!==0)z.show();if(d.cyclic&&l.length>1||p!=l.length-1)A.show()}else{z.hide();A.hide()}},S=function(){if(!b.support.opacity){j.get(0).style.removeAttribute("filter");f.get(0).style.removeAttribute("filter")}e.autoDimensions&&j.css("height","auto");f.css("height","auto"); -s&&s.length&&n.show();d.showCloseButton&&E.show();Y();d.hideOnContentClick&&j.bind("click",b.fancybox.close);d.hideOnOverlayClick&&u.bind("click",b.fancybox.close);b(window).bind("resize.fb",b.fancybox.resize);d.centerOnScroll&&b(window).bind("scroll.fb",b.fancybox.center);if(d.type=="iframe")b('').appendTo(j); -f.show();h=false;b.fancybox.center();d.onComplete(l,p,d);var a,c;if(l.length-1>p){a=l[p+1].href;if(typeof a!=="undefined"&&a.match(J)){c=new Image;c.src=a}}if(p>0){a=l[p-1].href;if(typeof a!=="undefined"&&a.match(J)){c=new Image;c.src=a}}},T=function(a){var c={width:parseInt(r.width+(i.width-r.width)*a,10),height:parseInt(r.height+(i.height-r.height)*a,10),top:parseInt(r.top+(i.top-r.top)*a,10),left:parseInt(r.left+(i.left-r.left)*a,10)};if(typeof i.opacity!=="undefined")c.opacity=a<0.5?0.5:a;f.css(c); -j.css({width:c.width-d.padding*2,height:c.height-y*a-d.padding*2})},U=function(){return[b(window).width()-d.margin*2,b(window).height()-d.margin*2,b(document).scrollLeft()+d.margin,b(document).scrollTop()+d.margin]},X=function(){var a=U(),c={},g=d.autoScale,k=d.padding*2;c.width=d.width.toString().indexOf("%")>-1?parseInt(a[0]*parseFloat(d.width)/100,10):d.width+k;c.height=d.height.toString().indexOf("%")>-1?parseInt(a[1]*parseFloat(d.height)/100,10):d.height+k;if(g&&(c.width>a[0]||c.height>a[1]))if(e.type== -"image"||e.type=="swf"){g=d.width/d.height;if(c.width>a[0]){c.width=a[0];c.height=parseInt((c.width-k)/g+k,10)}if(c.height>a[1]){c.height=a[1];c.width=parseInt((c.height-k)*g+k,10)}}else{c.width=Math.min(c.width,a[0]);c.height=Math.min(c.height,a[1])}c.top=parseInt(Math.max(a[3]-20,a[3]+(a[1]-c.height-40)*0.5),10);c.left=parseInt(Math.max(a[2]-20,a[2]+(a[0]-c.width-40)*0.5),10);return c},V=function(){var a=e.orig?b(e.orig):false,c={};if(a&&a.length){c=a.offset();c.top+=parseInt(a.css("paddingTop"), -10)||0;c.left+=parseInt(a.css("paddingLeft"),10)||0;c.top+=parseInt(a.css("border-top-width"),10)||0;c.left+=parseInt(a.css("border-left-width"),10)||0;c.width=a.width();c.height=a.height();c={width:c.width+d.padding*2,height:c.height+d.padding*2,top:c.top-d.padding-20,left:c.left-d.padding-20}}else{a=U();c={width:d.padding*2,height:d.padding*2,top:parseInt(a[3]+a[1]*0.5,10),left:parseInt(a[2]+a[0]*0.5,10)}}return c},Z=function(){if(t.is(":visible")){b("div",t).css("top",L*-40+"px");L=(L+1)%12}else clearInterval(K)}; -b.fn.fancybox=function(a){if(!b(this).length)return this;b(this).data("fancybox",b.extend({},a,b.metadata?b(this).metadata():{})).unbind("click.fb").bind("click.fb",function(c){c.preventDefault();if(!h){h=true;b(this).blur();o=[];q=0;c=b(this).attr("rel")||"";if(!c||c==""||c==="nofollow")o.push(this);else{o=b("a[rel="+c+"], area[rel="+c+"]");q=o.index(this)}I()}});return this};b.fancybox=function(a,c){var g;if(!h){h=true;g=typeof c!=="undefined"?c:{};o=[];q=parseInt(g.index,10)||0;if(b.isArray(a)){for(var k= -0,C=a.length;ko.length||q<0)q=0;I()}};b.fancybox.showActivity=function(){clearInterval(K);t.show();K=setInterval(Z,66)};b.fancybox.hideActivity=function(){t.hide()};b.fancybox.next=function(){return b.fancybox.pos(p+ -1)};b.fancybox.prev=function(){return b.fancybox.pos(p-1)};b.fancybox.pos=function(a){if(!h){a=parseInt(a);o=l;if(a>-1&&a1){q=a>=l.length?0:l.length-1;I()}}};b.fancybox.cancel=function(){if(!h){h=true;b.event.trigger("fancybox-cancel");N();e.onCancel(o,q,e);h=false}};b.fancybox.close=function(){function a(){u.fadeOut("fast");n.empty().hide();f.hide();b.event.trigger("fancybox-cleanup");j.empty();d.onClosed(l,p,d);l=e=[];p=q=0;d=e={};h=false}if(!(h||f.is(":hidden"))){h= -true;if(d&&false===d.onCleanup(l,p,d))h=false;else{N();b(E.add(z).add(A)).hide();b(j.add(u)).unbind();b(window).unbind("resize.fb scroll.fb");b(document).unbind("keydown.fb");j.find("iframe").attr("src",M&&/^https/i.test(window.location.href||"")?"javascript:void(false)":"about:blank");d.titlePosition!=="inside"&&n.empty();f.stop();if(d.transitionOut=="elastic"){r=V();var c=f.position();i={top:c.top,left:c.left,width:f.width(),height:f.height()};if(d.opacity)i.opacity=1;n.empty().hide();B.prop=1; -b(B).animate({prop:0},{duration:d.speedOut,easing:d.easingOut,step:T,complete:a})}else f.fadeOut(d.transitionOut=="none"?0:d.speedOut,a)}}};b.fancybox.resize=function(){u.is(":visible")&&u.css("height",b(document).height());b.fancybox.center(true)};b.fancybox.center=function(a){var c,g;if(!h){g=a===true?1:0;c=U();!g&&(f.width()>c[0]||f.height()>c[1])||f.stop().animate({top:parseInt(Math.max(c[3]-20,c[3]+(c[1]-j.height()-40)*0.5-d.padding)),left:parseInt(Math.max(c[2]-20,c[2]+(c[0]-j.width()-40)*0.5- -d.padding))},typeof a=="number"?a:200)}};b.fancybox.init=function(){if(!b("#fancybox-wrap").length){b("body").append(m=b('
'),t=b('
'),u=b('
'),f=b('
'));D=b('
').append('
').appendTo(f); -D.append(j=b('
'),E=b(''),n=b('
'),z=b(''),A=b(''));E.click(b.fancybox.close);t.click(b.fancybox.cancel);z.click(function(a){a.preventDefault();b.fancybox.prev()});A.click(function(a){a.preventDefault();b.fancybox.next()}); -b.fn.mousewheel&&f.bind("mousewheel.fb",function(a,c){if(h)a.preventDefault();else if(b(a.target).get(0).clientHeight==0||b(a.target).get(0).scrollHeight===b(a.target).get(0).clientHeight){a.preventDefault();b.fancybox[c>0?"prev":"next"]()}});b.support.opacity||f.addClass("fancybox-ie");if(M){t.addClass("fancybox-ie6");f.addClass("fancybox-ie6");b('').prependTo(D)}}}; -b.fn.fancybox.defaults={padding:10,margin:40,opacity:false,modal:false,cyclic:false,scrolling:"auto",width:560,height:340,autoScale:true,autoDimensions:true,centerOnScroll:false,ajax:{},swf:{wmode:"transparent"},hideOnOverlayClick:true,hideOnContentClick:false,overlayShow:true,overlayOpacity:0.7,overlayColor:"#777",titleShow:true,titlePosition:"float",titleFormat:null,titleFromAlt:false,transitionIn:"fade",transitionOut:"fade",speedIn:300,speedOut:300,changeSpeed:300,changeFade:"fast",easingIn:"swing", -easingOut:"swing",showCloseButton:true,showNavArrows:true,enableEscapeButton:true,enableKeyboardNav:true,onStart:function(){},onCancel:function(){},onComplete:function(){},onCleanup:function(){},onClosed:function(){},onError:function(){}};b(document).ready(function(){b.fancybox.init()})})(jQuery); DELETED cgisetup/www/css/img/fancybox/jquery.mousewheel-3.0.4.pack.js Index: cgisetup/www/css/img/fancybox/jquery.mousewheel-3.0.4.pack.js ================================================================== --- cgisetup/www/css/img/fancybox/jquery.mousewheel-3.0.4.pack.js +++ /dev/null @@ -1,14 +0,0 @@ -/*! Copyright (c) 2010 Brandon Aaron (http://brandonaaron.net) -* Licensed under the MIT License (LICENSE.txt). -* -* Thanks to: http://adomas.org/javascript-mouse-wheel/ for some pointers. -* Thanks to: Mathias Bank(http://www.mathias-bank.de) for a scope bug fix. -* Thanks to: Seamus Leahy for adding deltaX and deltaY -* -* Version: 3.0.4 -* -* Requires: 1.2.2+ -*/ - -(function(d){function g(a){var b=a||window.event,i=[].slice.call(arguments,1),c=0,h=0,e=0;a=d.event.fix(b);a.type="mousewheel";if(a.wheelDelta)c=a.wheelDelta/120;if(a.detail)c=-a.detail/3;e=c;if(b.axis!==undefined&&b.axis===b.HORIZONTAL_AXIS){e=0;h=-1*c}if(b.wheelDeltaY!==undefined)e=b.wheelDeltaY/120;if(b.wheelDeltaX!==undefined)h=-1*b.wheelDeltaX/120;i.unshift(a,c,h,e);return d.event.handle.apply(this,i)}var f=["DOMMouseScroll","mousewheel"];d.event.special.mousewheel={setup:function(){if(this.addEventListener)for(var a= -f.length;a;)this.addEventListener(f[--a],g,false);else this.onmousewheel=g},teardown:function(){if(this.removeEventListener)for(var a=f.length;a;)this.removeEventListener(f[--a],g,false);else this.onmousewheel=null}};d.fn.extend({mousewheel:function(a){return a?this.bind("mousewheel",a):this.trigger("mousewheel")},unmousewheel:function(a){return this.unbind("mousewheel",a)}})})(jQuery); DELETED cgisetup/www/css/img/gray_jean.png Index: cgisetup/www/css/img/gray_jean.png ================================================================== --- cgisetup/www/css/img/gray_jean.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/img/icon-arrow-right.png Index: cgisetup/www/css/img/icon-arrow-right.png ================================================================== --- cgisetup/www/css/img/icon-arrow-right.png +++ /dev/null cannot compute difference between binary files DELETED cgisetup/www/css/jquery.fancybox-1.3.4.css Index: cgisetup/www/css/jquery.fancybox-1.3.4.css ================================================================== --- cgisetup/www/css/jquery.fancybox-1.3.4.css +++ /dev/null @@ -1,366 +0,0 @@ -/* - * FancyBox - jQuery Plugin - * Simple and fancy lightbox alternative - * - * Examples and documentation at: http://fancybox.net - * - * Copyright (c) 2008 - 2010 Janis Skarnelis - * That said, it is hardly a one-person project. Many people have submitted bugs, code, and offered their advice freely. Their support is greatly appreciated. - * - * Version: 1.3.4 (11/11/2010) - * Requires: jQuery v1.3+ - * - * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - */ - -#fancybox-loading { - position: fixed; - top: 50%; - left: 50%; - width: 40px; - height: 40px; - margin-top: -20px; - margin-left: -20px; - cursor: pointer; - overflow: hidden; - z-index: 1104; - display: none; -} - -#fancybox-loading div { - position: absolute; - top: 0; - left: 0; - width: 40px; - height: 480px; - background-image: url('img/fancybox/fancybox.png'); -} - -#fancybox-overlay { - position: absolute; - top: 0; - left: 0; - width: 100%; - z-index: 1100; - display: none; -} - -#fancybox-tmp { - padding: 0; - margin: 0; - border: 0; - overflow: auto; - display: none; -} - -#fancybox-wrap { - position: absolute; - top: 0; - left: 0; - padding: 20px; - z-index: 1101; - outline: none; - display: none; -} - -#fancybox-outer { - position: relative; - width: 100%; - height: 100%; - background: #fff; -} - -#fancybox-wrap, -#fancybox-wrap *{ --webkit-box-sizing: content-box; /* Safari/Chrome, other WebKit */ --moz-box-sizing: content-box; /* Firefox, other Gecko */ -box-sizing: content-box; /* Opera/IE 8+ */ -} - -#fancybox-content { - width: 0; - height: 0; - padding: 0; - outline: none; - position: relative; - overflow: hidden; - z-index: 1102; - border: 0 solid #fff; -} - -#fancybox-hide-sel-frame { - position: absolute; - top: 0; - left: 0; - width: 100%; - height: 100%; - background: transparent; - z-index: 1101; -} - -#fancybox-close { - position: absolute; - top: -15px; - right: -15px; - width: 30px; - height: 30px; - background: transparent url('img/fancybox/fancybox.png') -40px 0; - cursor: pointer; - z-index: 1103; - display: none; -} - -#fancybox-error { - color: #444; - font: normal 12px/20px Arial; - padding: 14px; - margin: 0; -} - -#fancybox-img { - width: 100%; - height: 100%; - padding: 0; - margin: 0; - border: none; - outline: none; - line-height: 0; - vertical-align: top; -} - -#fancybox-frame { - width: 100%; - height: 100%; - border: none; - display: block; -} - -#fancybox-left, #fancybox-right { - position: absolute; - bottom: 0; - height: 100%; - width: 35%; - cursor: pointer; - outline: none; - background: transparent url('img/fancybox/blank.gif'); - z-index: 1102; - display: none; -} - -#fancybox-left { - left: 0; -} - -#fancybox-right { - right: 0; -} - -#fancybox-left-ico, #fancybox-right-ico { - position: absolute; - top: 50%; - left: -9999px; - width: 30px; - height: 30px; - margin-top: -15px; - cursor: pointer; - z-index: 1102; - display: block; -} - -#fancybox-left-ico { - background-image: url('img/fancybox/fancybox.png'); - background-position: -40px -30px; -} - -#fancybox-right-ico { - background-image: url('img/fancybox/fancybox.png'); - background-position: -40px -60px; -} - -#fancybox-left:hover, #fancybox-right:hover { - visibility: visible; /* IE6 */ -} - -#fancybox-left:hover span { - left: 20px; -} - -#fancybox-right:hover span { - left: auto; - right: 20px; -} - -.fancybox-bg { - position: absolute; - padding: 0; - margin: 0; - border: 0; - width: 20px; - height: 20px; - z-index: 1001; -} - -#fancybox-bg-n { - top: -20px; - left: 0; - width: 100%; - background-image: url('img/fancybox/fancybox-x.png'); -} - -#fancybox-bg-ne { - top: -20px; - right: -20px; - background-image: url('img/fancybox/fancybox.png'); - background-position: -40px -162px; -} - -#fancybox-bg-e { - top: 0; - right: -20px; - height: 100%; - background-image: url('img/fancybox/fancybox-y.png'); - background-position: -20px 0; -} - -#fancybox-bg-se { - bottom: -20px; - right: -20px; - background-image: url('img/fancybox/fancybox.png'); - background-position: -40px -182px; -} - -#fancybox-bg-s { - bottom: -20px; - left: 0; - width: 100%; - background-image: url('img/fancybox/fancybox-x.png'); - background-position: 0 -20px; -} - -#fancybox-bg-sw { - bottom: -20px; - left: -20px; - background-image: url('img/fancybox/fancybox.png'); - background-position: -40px -142px; -} - -#fancybox-bg-w { - top: 0; - left: -20px; - height: 100%; - background-image: url('img/fancybox/fancybox-y.png'); -} - -#fancybox-bg-nw { - top: -20px; - left: -20px; - background-image: url('img/fancybox/fancybox.png'); - background-position: -40px -122px; -} - -#fancybox-title { - font-family: Helvetica; - font-size: 12px; - z-index: 1102; -} - -.fancybox-title-inside { - padding-bottom: 10px; - text-align: center; - color: #333; - background: #fff; - position: relative; -} - -.fancybox-title-outside { - padding-top: 10px; - color: #fff; -} - -.fancybox-title-over { - position: absolute; - bottom: 0; - left: 0; - color: #FFF; - text-align: left; -} - -#fancybox-title-over { - padding: 10px; - background-image: url('img/fancybox/fancy_title_over.png'); - display: block; -} - -.fancybox-title-float { - position: absolute; - left: 0; - bottom: -20px; - height: 32px; -} - -#fancybox-title-float-wrap { - border: none; - border-collapse: collapse; - width: auto; -} - -#fancybox-title-float-wrap td { - border: none; - white-space: nowrap; -} - -#fancybox-title-float-left { - padding: 0 0 0 15px; - background: url('img/fancybox/fancybox.png') -40px -90px no-repeat; -} - -#fancybox-title-float-main { - color: #FFF; - line-height: 29px; - font-weight: bold; - padding: 0 0 3px 0; - background: url('img/fancybox/fancybox-x.png') 0 -40px; -} - -#fancybox-title-float-right { - padding: 0 0 0 15px; - background: url('img/fancybox/fancybox.png') -55px -90px no-repeat; -} - -/* IE6 */ - -.fancybox-ie6 #fancybox-close { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_close.png', sizingMethod='scale'); } - -.fancybox-ie6 #fancybox-left-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_nav_left.png', sizingMethod='scale'); } -.fancybox-ie6 #fancybox-right-ico { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_nav_right.png', sizingMethod='scale'); } - -.fancybox-ie6 #fancybox-title-over { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_title_over.png', sizingMethod='scale'); zoom: 1; } -.fancybox-ie6 #fancybox-title-float-left { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_title_left.png', sizingMethod='scale'); } -.fancybox-ie6 #fancybox-title-float-main { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_title_main.png', sizingMethod='scale'); } -.fancybox-ie6 #fancybox-title-float-right { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_title_right.png', sizingMethod='scale'); } - -.fancybox-ie6 #fancybox-bg-w, .fancybox-ie6 #fancybox-bg-e, .fancybox-ie6 #fancybox-left, .fancybox-ie6 #fancybox-right, #fancybox-hide-sel-frame { - height: expression(this.parentNode.clientHeight + "px"); -} - -#fancybox-loading.fancybox-ie6 { - position: absolute; margin-top: 0; - top: expression( (-20 + (document.documentElement.clientHeight ? document.documentElement.clientHeight/2 : document.body.clientHeight/2 ) + ( ignoreMe = document.documentElement.scrollTop ? document.documentElement.scrollTop : document.body.scrollTop )) + 'px'); -} - -#fancybox-loading.fancybox-ie6 div { background: transparent; filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_loading.png', sizingMethod='scale'); } - -/* IE6, IE7, IE8 */ - -.fancybox-ie .fancybox-bg { background: transparent !important; } - -.fancybox-ie #fancybox-bg-n { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_shadow_n.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-ne { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_shadow_ne.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-e { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_shadow_e.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-se { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_shadow_se.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-s { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_shadow_s.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-sw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_shadow_sw.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-w { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_shadow_w.png', sizingMethod='scale'); } -.fancybox-ie #fancybox-bg-nw { filter: progid:DXImageTransform.Microsoft.AlphaImageLoader(src='img/fancybox/fancy_shadow_nw.png', sizingMethod='scale'); } DELETED cgisetup/www/css/kickstart-buttons.css Index: cgisetup/www/css/kickstart-buttons.css ================================================================== --- cgisetup/www/css/kickstart-buttons.css +++ /dev/null @@ -1,369 +0,0 @@ -/* - 99Lime.com HTML KickStart by Joshua Gatcke - kickstart-buttons.css - - Super Easy Cross Browser CSS3 Gradients - http://www.colorzilla.com/gradient-editor/ -*/ - -/*--------------------------------- - BUTTONS ------------------------------------*/ -button, -a.btn, -a.btn:visited, -a.button, -a.button:visited, -input[type="submit"], -input[type="reset"], -input[type="button"]{ -position:relative; -top:0; -left:0; -vertical-align: middle; -margin:0; -padding:10px 15px; -line-height:100%; --moz-border-radius:5px; --webkit-border-radius:5px; -border-radius:5px; -cursor: pointer; -width:auto; -overflow:visible; -font-weight:normal; -font-size:14px; /*Pixels for consistancy*/ -text-shadow:0 1px 0 #fff; -color:#666; -text-decoration:none; -vertical-align: middle; --webkit-box-sizing: border-box; --moz-box-sizing: border-box; -box-sizing: border-box; -display:inline-block; -*display:inline;/*IE ONLY*/ -zoom:1; -border:1px solid #ccc; -background: rgb(252,252,252); /* Old browsers */ -background: -moz-linear-gradient(top, rgba(252,252,252,1) 0%, rgba(224,224,224,1) 100%); /* FF3.6+ */ -background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(252,252,252,1)), color-stop(100%,rgba(224,224,224,1))); /* Chrome,Safari4+ */ -background: -webkit-linear-gradient(top, rgba(252,252,252,1) 0%,rgba(224,224,224,1) 100%); /* Chrome10+,Safari5.1+ */ -background: -o-linear-gradient(top, rgba(252,252,252,1) 0%,rgba(224,224,224,1) 100%); /* Opera11.10+ */ -filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fcfcfc', endColorstr='#e0e0e0',GradientType=0 ); /* IE6-9 */ -background: linear-gradient(top, rgba(252,252,252,1) 0%,rgba(224,224,224,1) 100%); /* W3C */ -} - -button:active, -a.btn:active, -a.btn:visited:active, -a.button:active, -a.button:visited:active, -input[type="submit"]:active, -input[type="reset"]:active, -input[type="button"]:active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.2),inset 0 -10px 20px rgba(0,0,0,0.07);-moz-box-shadow:inset 0 3px 5px rgba(0,0,0,0.2),inset 0 -10px 20px rgba(0,0,0,0.07);box-shadow:inset 0 3px 5px rgba(0,0,0,0.2),inset 0 -10px 20px rgba(0,0,0,0.07);} -button[disabled],.disabled:active{-webkit-box-shadow:none;-moz-box-shadow:none;box-shadow:none;} - -button, -input[type="submit"], -input[type="reset"], -input[type="button"]{*padding:7px 15px;}/*IE 7 ONLY*/ - - a.btn,a.button{}/*overrides*/ - button.small, a.btn.small, a.button.small{font-size:0.8em;padding:5px 10px;} - button.medium, a.btn.medium, a.button.medium{}/*default*/ - button.large, a.btn.large, a.button.large{font-size:1.3em;padding:10px 20px;} - button.disabled, a.btn.disabled, a.button.disabled{color:#ccc;cursor:default;background:#efefef;} - button.disabled:hover, a.btn.disabled:hover, a.button.disabled:hover{border:1px solid #ccc;background:#efefef;} - - button:hover, - a.btn:hover, - a.button:hover, - input[type="submit"]:hover, - input[type="reset"]:hover, - input[type="button"]:hover{ - border:1px solid #bbb; - background: rgb(252,252,252); /* Old browsers */ - background: -moz-linear-gradient(top, rgba(252,252,252,1) 0%, rgba(237,237,237,1) 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(252,252,252,1)), color-stop(100%,rgba(237,237,237,1))); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, rgba(252,252,252,1) 0%,rgba(237,237,237,1) 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, rgba(252,252,252,1) 0%,rgba(237,237,237,1) 100%); /* Opera11.10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fcfcfc', endColorstr='#ededed',GradientType=0 ); /* IE6-9 */ - background: linear-gradient(top, rgba(252,252,252,1) 0%,rgba(237,237,237,1) 100%); /* W3C */ - } - - -/*--------------------------------- - BUTTON BAR ------------------------------------*/ -ul.button-bar{ -display:inline-block; -*display:inline; -margin:0; -padding:0; -font-size:0; -position:relative; -top:0; -left:0; -zoom:1; -border:0; -background:0; -} - - ul.button-bar li{ - display:inline-block; - *display:inline; - position:relative; - top:0; - left:0; - zoom:1; - margin:0 -1px 0 0; - padding:0; - line-height:100%; - font-size:0px; - border:1px solid #ccc; - background: rgb(252,252,252); /* Old browsers */ - background: -moz-linear-gradient(top, rgba(252,252,252,1) 0%, rgba(224,224,224,1) 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(252,252,252,1)), color-stop(100%,rgba(224,224,224,1))); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, rgba(252,252,252,1) 0%,rgba(224,224,224,1) 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, rgba(252,252,252,1) 0%,rgba(224,224,224,1) 100%); /* Opera11.10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fcfcfc', endColorstr='#e0e0e0',GradientType=0 ); /* IE6-9 */ - background: linear-gradient(top, rgba(252,252,252,1) 0%,rgba(224,224,224,1) 100%); /* W3C */ - } - - ul.button-bar li a{ - margin:0; - display:inline-block; - *display:inline; - padding:7px 10px; - position:relative; - top:0; - left:0; - zoom:1; - font-weight:normal; - font-size:14px; /*Pixels for consistancy*/ - text-shadow:0 1px 0 #fff; - color:#666; - text-decoration:none; - vertical-align: middle; - line-height:100%; - border-left:1px solid #fff; - } - - ul.button-bar li.first, - ul.button-bar li.first a{ - -moz-border-radius-bottomleft: 5px; - -moz-border-radius-topleft: 5px; - -webkit-border-bottom-left-radius: 5px; - -webkit-border-top-left-radius: 5px; - border-top-left-radius: 5px; - border-bottom-left-radius: 5px; - -moz-background-clip:content-box; - -webkit-background-clip: border; - background-clip: content-box; - } - - ul.button-bar li.last, - ul.button-bar li.last a{ - -moz-border-radius-bottomright: 5px; - -moz-border-radius-topright: 5px; - -webkit-border-bottom-right-radius: 5px; - -webkit-border-top-right-radius: 5px; - border-top-right-radius: 5px; - border-bottom-right-radius: 5px; - -moz-background-clip:content-box; - -webkit-background-clip: border; - } - - ul.button-bar li a:hover{ - background: rgb(252,252,252); /* Old browsers */ - background: -moz-linear-gradient(top, rgba(252,252,252,1) 0%, rgba(237,237,237,1) 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(252,252,252,1)), color-stop(100%,rgba(237,237,237,1))); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, rgba(252,252,252,1) 0%,rgba(237,237,237,1) 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, rgba(252,252,252,1) 0%,rgba(237,237,237,1) 100%); /* Opera11.10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#fcfcfc', endColorstr='#ededed',GradientType=0 ); /* IE6-9 */ - background: linear-gradient(top, rgba(252,252,252,1) 0%,rgba(237,237,237,1) 100%); /* W3C */ - } - - ul.button-bar li a:active{-webkit-box-shadow:inset 0 3px 5px rgba(0,0,0,0.2),inset 0 -10px 20px rgba(0,0,0,0.07);-moz-box-shadow:inset 0 3px 5px rgba(0,0,0,0.2),inset 0 -10px 20px rgba(0,0,0,0.07);box-shadow:inset 0 3px 5px rgba(0,0,0,0.2),inset 0 -10px 20px rgba(0,0,0,0.07);border-left:1px solid #ccc;} - -/*--------------------------------- - STYLES ------------------------------------*/ -.pill{-webkit-border-radius:200em;-moz-border-radius:200em;border-radius:200em;} -.pop{-webkit-box-shadow:0px 1px 5px rgba(0,0,0,0.2);-moz-box-shadow:0px 1px 5px rgba(0,0,0,0.2);box-shadow:0px 1px 5px rgba(0,0,0,0.2);} -.inset{-webkit-box-shadow:inset 0 1px 3px rgba(0,0,0,0.3);-moz-box-shadow:inset 0 1px 3px rgba(0,0,0,0.3);box-shadow:inset 0 1px 3px rgba(0,0,0,0.3);} -.square{-moz-border-radius:0;-webkit-border-radius:0;border-radius:0;} - -/*--------------------------------- - ORANGE ------------------------------------*/ -button.orange, -a.btn.orange, -a.button.orange, -input[type=submit].orange, -input[type=reset].orange, -input[type=button].orange{ -text-shadow:0 -1px 0 #FC730A; -color:#fff; -border:1px solid #FC730A; -background: rgb(255,168,76); /* Old browsers */ -background: -moz-linear-gradient(top, rgba(255,168,76,1) 0%, rgba(255,123,13,1) 100%); /* FF3.6+ */ -background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,168,76,1)), color-stop(100%,rgba(255,123,13,1))); /* Chrome,Safari4+ */ -background: -webkit-linear-gradient(top, rgba(255,168,76,1) 0%,rgba(255,123,13,1) 100%); /* Chrome10+,Safari5.1+ */ -background: -o-linear-gradient(top, rgba(255,168,76,1) 0%,rgba(255,123,13,1) 100%); /* Opera 11.10+ */ -background: linear-gradient(top, rgba(255,168,76,1) 0%,rgba(255,123,13,1) 100%); /* W3C */ -filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffa84c', endColorstr='#ff7b0d',GradientType=0 ); /* IE6-9 */ -} - - button.orange:hover, - a.btn.orange:hover, - a.button.orange:hover{ - text-shadow:0 1px 0 #FC730A; - border:1px solid #FC730A; - background: rgb(249,191,74); /* Old browsers */ - background: -moz-linear-gradient(top, rgba(249,191,74,1) 0%, rgba(249,181,9,1) 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(249,191,74,1)), color-stop(100%,rgba(249,181,9,1))); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, rgba(249,191,74,1) 0%,rgba(249,181,9,1) 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, rgba(249,191,74,1) 0%,rgba(249,181,9,1) 100%); /* Opera 11.10+ */ - background: linear-gradient(top, rgba(249,191,74,1) 0%,rgba(249,181,9,1) 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#f9bf4a', endColorstr='#f9b509',GradientType=0 ); /* IE6-9 */ - } - -/*--------------------------------- - BLUE ------------------------------------*/ -button.blue, -a.btn.blue, -a.button.blue, -input[type=submit].blue, -input[type=reset].blue, -input[type=button].blue{ -text-shadow:0 -1px 0 #1D6DC1; -color:#fff; -border:1px solid #1D6DC1; -background: rgb(122,188,255); /* Old browsers */ -background: -moz-linear-gradient(top, rgba(122,188,255,1) 0%, rgba(96,171,248,1) 44%, rgba(64,150,238,1) 100%); /* FF3.6+ */ -background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(122,188,255,1)), color-stop(44%,rgba(96,171,248,1)), color-stop(100%,rgba(64,150,238,1))); /* Chrome,Safari4+ */ -background: -webkit-linear-gradient(top, rgba(122,188,255,1) 0%,rgba(96,171,248,1) 44%,rgba(64,150,238,1) 100%); /* Chrome10+,Safari5.1+ */ -background: -o-linear-gradient(top, rgba(122,188,255,1) 0%,rgba(96,171,248,1) 44%,rgba(64,150,238,1) 100%); /* Opera11.10+ */ -filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7abcff', endColorstr='#4096ee',GradientType=0 ); /* IE6-9 */ -background: linear-gradient(top, rgba(122,188,255,1) 0%,rgba(96,171,248,1) 44%,rgba(64,150,238,1) 100%); /* W3C */ -} - - button.blue:hover, - a.btn.blue:hover, - a.button.blue:hover{ - text-shadow:0 1px 0 #1D6DC1; - border:1px solid #1D6DC1; - background: rgb(155,205,255); /* Old browsers */ - background: -moz-linear-gradient(top, rgba(155,205,255,1) 0%, rgba(134,192,250,1) 44%, rgba(110,176,242,1) 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(155,205,255,1)), color-stop(44%,rgba(134,192,250,1)), color-stop(100%,rgba(110,176,242,1))); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, rgba(155,205,255,1) 0%,rgba(134,192,250,1) 44%,rgba(110,176,242,1) 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, rgba(155,205,255,1) 0%,rgba(134,192,250,1) 44%,rgba(110,176,242,1) 100%); /* Opera 11.10+ */ - background: linear-gradient(top, rgba(155,205,255,1) 0%,rgba(134,192,250,1) 44%,rgba(110,176,242,1) 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#9bcdff', endColorstr='#6eb0f2',GradientType=0 ); /* IE6-9 */ - } - -/*--------------------------------- - PINK ------------------------------------*/ -button.pink, -a.btn.pink, -a.button.pink, -input[type=submit].pink, -input[type=reset].pink, -input[type=button].pink{ -text-shadow:0 -1px 0 #EF0251; -color:#fff; -border:1px solid #EF0251; -background: rgb(255,93,177); /* Old browsers */ -background: -moz-linear-gradient(top, rgba(255,93,177,1) 0%, rgba(239,1,124,1) 100%); /* FF3.6+ */ -background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,93,177,1)), color-stop(100%,rgba(239,1,124,1))); /* Chrome,Safari4+ */ -background: -webkit-linear-gradient(top, rgba(255,93,177,1) 0%,rgba(239,1,124,1) 100%); /* Chrome10+,Safari5.1+ */ -background: -o-linear-gradient(top, rgba(255,93,177,1) 0%,rgba(239,1,124,1) 100%); /* Opera 11.10+ */ -background: linear-gradient(top, rgba(255,93,177,1) 0%,rgba(239,1,124,1) 100%); /* W3C */ -filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ff5db1', endColorstr='#ef017c',GradientType=0 ); /* IE6-9 */ -} - - button.pink:hover, - a.btn.pink:hover, - a.button.pink:hover{ - text-shadow:0 1px 0 #EF0251; - border:1px solid #EF0251; - background: rgb(255,169,213); /* Old browsers */ - background: -moz-linear-gradient(top, rgba(255,169,213,1) 0%, rgba(254,112,185,1) 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(255,169,213,1)), color-stop(100%,rgba(254,112,185,1))); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, rgba(255,169,213,1) 0%,rgba(254,112,185,1) 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, rgba(255,169,213,1) 0%,rgba(254,112,185,1) 100%); /* Opera 11.10+ */ - background: linear-gradient(top, rgba(255,169,213,1) 0%,rgba(254,112,185,1) 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ffa9d5', endColorstr='#fe70b9',GradientType=0 ); /* IE6-9 */ - } - -/*--------------------------------- - GREEN ------------------------------------*/ -button.green, -a.btn.green, -a.button.green, -input[type=submit].green, -input[type=reset].green, -input[type=button].green{ -text-shadow:0 -1px 0 #669E00; -color:#fff; -border:1px solid #669E00; -background: rgb(143,196,0); /* Old browsers */ -background: -moz-linear-gradient(top, rgba(143,196,0,1) 0%, rgba(107,165,0,1) 100%); /* FF3.6+ */ -background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(143,196,0,1)), color-stop(100%,rgba(107,165,0,1))); /* Chrome,Safari4+ */ -background: -webkit-linear-gradient(top, rgba(143,196,0,1) 0%,rgba(107,165,0,1) 100%); /* Chrome10+,Safari5.1+ */ -background: -o-linear-gradient(top, rgba(143,196,0,1) 0%,rgba(107,165,0,1) 100%); /* Opera 11.10+ */ -background: linear-gradient(top, rgba(143,196,0,1) 0%,rgba(107,165,0,1) 100%); /* W3C */ -filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#8fc400', endColorstr='#6ba500',GradientType=0 ); /* IE6-9 */ -} - - button.green:hover, - a.btn.green:hover, - a.button.green:hover{ - text-shadow:0 1px 0 #669E00; - border:1px solid #669E00; - background: rgb(198,226,120); /* Old browsers */ - background: -moz-linear-gradient(top, rgba(198,226,120,1) 0%, rgba(167,211,44,1) 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(198,226,120,1)), color-stop(100%,rgba(167,211,44,1))); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, rgba(198,226,120,1) 0%,rgba(167,211,44,1) 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, rgba(198,226,120,1) 0%,rgba(167,211,44,1) 100%); /* Opera 11.10+ */ - background: linear-gradient(top, rgba(198,226,120,1) 0%,rgba(167,211,44,1) 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#c6e278', endColorstr='#a7d32c',GradientType=0 ); /* IE6-9 */ - } - -/*--------------------------------- - RED ------------------------------------*/ -button.red, -a.btn.red, -a.button.red, -input[type=submit].red, -input[type=reset].red, -input[type=button].red{ -text-shadow:0 -1px 0 #B21203; -color:#fff; -border:1px solid #B21203; -background: rgb(229,60,22); /* Old browsers */ -background: -moz-linear-gradient(top, rgba(229,60,22,1) 0%, rgba(207,4,4,1) 100%); /* FF3.6+ */ -background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(229,60,22,1)), color-stop(100%,rgba(207,4,4,1))); /* Chrome,Safari4+ */ -background: -webkit-linear-gradient(top, rgba(229,60,22,1) 0%,rgba(207,4,4,1) 100%); /* Chrome10+,Safari5.1+ */ -background: -o-linear-gradient(top, rgba(229,60,22,1) 0%,rgba(207,4,4,1) 100%); /* Opera 11.10+ */ -background: linear-gradient(top, rgba(229,60,22,1) 0%,rgba(207,4,4,1) 100%); /* W3C */ -filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#e53c16', endColorstr='#cf0404',GradientType=0 ); /* IE6-9 */ -} - - button.red:hover, - a.btn.red:hover, - a.button.red:hover{ - text-shadow:0 1px 0 #B21203; - border:1px solid #B21203; - background: rgb(238,106,76); /* Old browsers */ - background: -moz-linear-gradient(top, rgba(238,106,76,1) 0%, rgba(251,33,33,1) 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(238,106,76,1)), color-stop(100%,rgba(251,33,33,1))); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, rgba(238,106,76,1) 0%,rgba(251,33,33,1) 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, rgba(238,106,76,1) 0%,rgba(251,33,33,1) 100%); /* Opera 11.10+ */ - background: linear-gradient(top, rgba(238,106,76,1) 0%,rgba(251,33,33,1) 100%); /* W3C */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#ee6a4c', endColorstr='#fb2121',GradientType=0 ); /* IE6-9 */ - } DELETED cgisetup/www/css/kickstart-forms.css Index: cgisetup/www/css/kickstart-forms.css ================================================================== --- cgisetup/www/css/kickstart-forms.css +++ /dev/null @@ -1,290 +0,0 @@ -/*--------------------------------- - FORMS ------------------------------------*/ -form{ -padding:0; -margin:0; -} - -fieldset{ -margin:30px 0 20px 0; -padding:5px 15px 15px 15px; -border:1px solid #ccc; -background:#f5f5f5; --moz-border-radius:5px; --webkit-border-radius:5px; -border-radius:5px; -position: relative; -top:0; -left:0; -} - - legend{ - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; - border:1px solid #ccc; - background:#f5f5f5; - padding:2px 10px; - margin:0 0 0 0; - display:block; - position: relative; - top:0; - left:0; - } - - /*IE ONLY - I know, this is a stop gap*/ - .msie fieldset{padding-top:25px;} - .msie legend{position:absolute;top:-0.7em;left:10px;} - -label{ -display:inline-block; -*display:inline; -vertical-align: middle; -margin:0; -padding:0; -position:relative; -top:0; -left:0; -zoom:1; --moz-box-sizing: border-box; --webkit-box-sizing: border-box; -box-sizing: border-box; -} - - label.inline{ - display:inline; - margin:0; - } - - label span{ - color:#999; - font-size:0.9em; - } - - label span.right{ - position:absolute; - bottom:0; - right:0; - text-align:right; - display:inline-block; - *display:inline; - } - - label.disabled{ - color:#ccc; - } - -input{ -display:inline-block; -*display:inline; -vertical-align: middle; -width:auto; -zoom:1; -margin:0; -border:1px solid #ccc; -font-size:1em; -padding:5px 0; -text-indent: 5px; --moz-border-radius:5px; --webkit-border-radius:5px; -border-radius:5px; -background:#fff; --moz-box-shadow:inset 0 0 6px #ccc; --webkit-box-shadow:inset 0 1px 6px #ccc; -box-shadow:inset 0 1px 6px #ccc; --moz-box-sizing: border-box; --webkit-box-sizing: border-box; -box-sizing: border-box; -} - - input::-webkit-input-placeholder, - input:-moz-placeholder, - .placeholder{ - color:#bbb; - } - - input::-moz-focus-inner {border:0;} - - input[disabled="disabled"], input.disabled{ - color:#999; - background:#f5f5f5; - -moz-box-shadow:inset 0 0 2px #ddd; - -webkit-box-shadow:inset 0 1px 2px #ddd; - box-shadow:inset 0 1px 2px #ddd; - } - - /* FOCUS STATES */ - input[type="text"]:focus, - textarea:focus, - button:focus, - a.button:focus, - select:focus, - input[type="file"]:focus, - input[type="password"]:focus{ - -webkit-box-shadow: 0 0 7px #6DB9FF; - -moz-box-shadow : 0 0 7px #6DB9FF; - box-shadow : 0 0 7px #6DB9FF; - border: 1px solid #50B1FE; - outline: none; - } - - /* TRANSITION */ - input[type="text"], - textarea, - button, - a.button, - a, - input[type="file"]{ - -moz-transition: -moz-box-shadow 0.5s, border 0.5s, background 0.5s; - -webkit-transition: -webkit-box-shadow 0.5s, border 0.5s, background 0.5s; - -o-transition: box-shadow 0.5s, border 0.5s, background 0.5s; - transition: box-shadow 0.5s, border 0.5s, background 0.5s; - } - -input.checkbox, -input[type="checkbox"]{ -display:inline; -width:auto; -margin:0; -padding:0; -border:0; -background:none; -vertical-align:center; -*vertical-align: top; -} - -input.radio, -input[type="radio"]{ -display:inline; -width:auto; -margin:0; -padding:0; -border:0; -background:none; -vertical-align:center; -*vertical-align: top; -} - - input[type="radio"]:focus, - input[ type="checkbox"]:focus{ - -webkit-box-shadow: 0 0 5px #6DB9FF; - -moz-box-shadow : 0 0 5px #6DB9FF; - box-shadow : 0 0 5px #6DB9FF; - outline-color: #6DB9FF; - } - -input.file, -input[type="file"]{ -/*font-size:0.8em;*/ --moz-box-shadow:none; --webkit-box-shadow:none; -box-shadow:none; -border:none; -} - -select{ -display:inline; -width:auto; -margin:0; -border:1px solid #ccc; -line-height:100%; -padding:3px; -vertical-align: middle; -} - - select[disabled="disabled"], select.disabled{ - color:#999; - background:#f5f5f5; - -moz-box-shadow:inset 0 0 2px #ddd; - -webkit-box-shadow:inset 0 1px 2px #ddd; - box-shadow:inset 0 1px 2px #ddd; - } - -textarea{ -width:auto; -height:200px; -margin:0; -border:1px solid #ccc; -padding:5px; -vertical-align: middle; -font-family:inherit; -font-size:0.9em; --moz-border-radius:5px; --webkit-border-radius:5px; -border-radius:5px; --moz-box-shadow:inset 0 0 6px #ccc; --webkit-box-shadow:inset 0 1px 6px #ccc; -box-shadow:inset 0 1px 6px #ccc; --moz-box-sizing: border-box; --webkit-box-sizing: border-box; -box-sizing: border-box; -} - -/*--------------------------------- - COLUMN SIZES ------------------------------------*/ - -/* sizes */ -input[class*="col_"], -select[class*="col_"], -label[class*="col_"]{ -float:none;display:inline-block;*display:inline;margin-bottom:0; -*margin-left: 0.5%;*margin-right: 0.5%;/* this is for IE 7 Only and is not a good fix - work needed here */ -} - -/*--------------------------------- - FORMS VERTICAL ------------------------------------*/ -form.vertical{ - -} - - form.vertical label{display:block;} - form.vertical input, - form.vertical select, - form.vertical textarea{width:100%;display:block;margin-bottom:10px;} - form.vertical .chzn-container{display:block;margin-bottom:10px;} - form.vertical .chzn-choices{display:block;margin-bottom:10px;} - - /* radios & checks */ - form.vertical input.checkbox, - form.vertical input[type="checkbox"], - form.vertical input.radio, - form.vertical input[type="radio"], - form.vertical label.inline{display:inline;width:auto;margin:0;} -/*--------------------------------- - FORM VALIDATION ------------------------------------*/ -label.error{color:red;} -input.error{border:1px solid red;} -select.error{border:1px solid red;} - -/*--------------------------------- - NOTICES ------------------------------------*/ -.notice{ -border:1px solid gold; -background:lightyellow; -padding:10px 20px 10px 40px; -margin:10px 0; --moz-border-radius:5px; --webkit-border-radius:5px; -border-radius:5px; -color:#DEAE00; -line-height:120%; -vertical-align: center; -text-shadow:0px 1px rgba(255,255,255,0.5); -position:relative; -top:0; -left:0; -clear:both; -} - - .notice.warning{}/*default*/ - .notice.error{border:1px solid red;background:pink;color:red;} - .notice.success{border:1px solid green;background:lightgreen;color:green;} - .notice i[class*='fa-']{position:absolute;top:50%;left:0.8em;margin-top:-0.6em;} - .notice a[class*='fa-remove'], - .notice a[class*='fa-remove']:active, - .notice a[class*='fa-remove']:visited{text-decoration:none;font-size:12px;position:absolute;top:5px;right:5px;left:auto;color:inherit;margin-top:0;left:auto;} DELETED cgisetup/www/css/kickstart-grid.css Index: cgisetup/www/css/kickstart-grid.css ================================================================== --- cgisetup/www/css/kickstart-grid.css +++ /dev/null @@ -1,167 +0,0 @@ -/* - 99Lime.com HTML KickStart by Joshua Gatcke - kickstart-grids.css - - DO NOT EDIT THIS FILE unless you know what you are doing. -*/ -/*--------------------------------- - GRID/COLUMNS ------------------------------------ - tinyfluidgrid.com - & girlfriendnyc.com - with changes by 99Lime ------------------------------------*/ - /* - & Columns : 12 - & Gutter %: 20% - & MaxWidth: 1280px - */ - -.grid{ -max-width:1220px; -margin:0 auto; -padding:0 2em; -} - -.grid.flex{ -width:100%; -max-width:100%; -padding:0 2%; -padding:2em; -} - -.row{ -display:block; -overflow:hidden; -clear:both; -} - -*[class*="col_"].alpha{margin-left:0;} -*[class*="col_"].omega{margin-right:0;} - -.col_1 { width: 6.6666666666667%; } -.col_2 { width: 15%; } -.col_3 { width: 23.333333333333%; } -.col_4 { width: 31.666666666667%; } -.col_5 { width: 40%; } -.col_6 { width: 48.333333333333%; } -.col_7 { width: 56.666666666667%; } -.col_8 { width: 65%; } -.col_9 { width: 73.333333333333%; } -.col_10 { width: 81.666666666667%; } -.col_11 { width: 90%; } -.col_12 { width: 98.333333333333%; } - -*[class*="col_"]{ -margin-left: 0.83333333333333%; -margin-right: 0.83333333333333%; -margin-top:0.5em; -margin-bottom:0.5em; -float: left; -display: block; -} - -.grid img{ -max-width: 100%; -height:auto; -} - -.clear{clear:both;display:block;overflow:hidden;visibility:hidden;width:0;height:0} -.clearfix:after{clear:both;content:' ';display:block;font-size:0;line-height:0;visibility:hidden;width:0;height:0} -* html .clearfix, *:first-child+html .clearfix{zoom:1} - -/* Viewable Grids - To view your grids, add the class .visible to any grid container. - This will add a background color so you can see the layout of your grids. -*/ -*[class*="col_"].visible{ -background:#eee; -border:1px dotted #ccc; -} - - -/*--------------------------------- - Responsive Grid Media Queries - 1280, 1024, 768, 480 - 1280-1024 - desktop (default grid) - 1024-768 - tablet landscape - 768-480 - tablet - 480-less - phone landscape & smaller ------------------------------------*/ -@media all and (min-width: 1024px) and (max-width: 1280px) { - - .grid *[class*="col_"]{} - .grid{max-width: 1024px;} - .show-desktop {display:block;} - .hide-desktop {display:none;} - .show-tablet {display:none;} - .hide-tablet {display:block;} - .show-phone {display:none;} - .hide-phone {display:block;} - -} - -@media all and (min-width: 768px) and (max-width: 1024px) { - - .grid *[class*="col_"]{} - .grid{max-width: 768px;} - .show-desktop {display:none;} - .hide-desktop {display:block;} - .show-tablet {display:block;} - .hide-tablet {display:none;} - .show-phone {display:none;} - .hide-phone {display:block;} - -} - - -@media all and (min-width: 480px) and (max-width: 768px) { - - .grid *[class*="col_"]{ - float:none; - width:auto; - clear:both; - display:block; - } - - /* columns inside of columns */ - .grid *[class*="col_"] [class*="col_"]{ - margin-left:0; - margin-right:0; - width:100%; - } - - .grid{max-width: 480px;} - .show-desktop {display:none;} - .hide-desktop {display:block;} - .show-tablet {display:block;} - .hide-tablet {display:none;} - .show-phone {display:none;} - .hide-phone {display:block;} - -} - -@media all and (max-width: 480px) { - - .grid *[class*="col_"]{ - float:none; - width:auto; - clear:both; - display:block; - } - - /* columns inside of columns */ - .grid *[class*="col_"] [class*="col_"]{ - margin-left:0; - margin-right:0; - width:100%; - } - - .grid{max-width: 100%;/*320*/} - .show-desktop {display:none;} - .hide-desktop {display:block;} - .show-tablet {display:none;} - .hide-tablet {display:block;} - .show-phone {display:block;} - .hide-phone {display:none;} - -} DELETED cgisetup/www/css/kickstart-menus.css Index: cgisetup/www/css/kickstart-menus.css ================================================================== --- cgisetup/www/css/kickstart-menus.css +++ /dev/null @@ -1,180 +0,0 @@ -/* - 99Lime.com HTML KickStart by Joshua Gatcke - kickstart-menus.css -*/ - -/*--------------------------------- - MENU LAYOUT - DO NOT EDIT This Section (unless you know what you are doing) ------------------------------------*/ -.menu{margin:0;padding:0;line-height:100%; -font-size:0; /* Kill white space gap between LI elements */ -position:relative;z-index:1000;} - - .menu:after{clear:both;content:' ';display:block;font-size:0;line-height:0;visibility:hidden;width:0;height:0} - .menu li{margin:0;padding:0;list-style-type:none;display:inline-block;*display:inline;position:relative;zoom:1;line-height:inherit; - top:0;left:0;font-size:16px; /* fixed font-size to replace font-size:0 in parent .menu 1em/16px default */} - .menu li a{margin:0;padding:0;display:block;display:inline;display:inline-block;position:relative;zoom:1;line-height:100%;top:0;left:0;} - - -/*--------------Sub Menus-------------------*/ - /*.menu li:hover > ul{display:block;}*/ - .menu ul{margin:0;padding:0;position: absolute;top:100%;left:0;display:none;min-width:150px;max-width:150%;*width:150px;} - .menu ul li{display:block;width:100%;} - .menu ul li a{display:block;} - .menu ul ul{top:0;left:100%;} - -/*--------------Dividers-------------------*/ - .menu ul li.divider{border-top:1px solid #ccc;} - .menu ul li.divider a{border-top:1px solid #fff;} - - -/*--------------Right---------------------*/ - .menu li.right{float:right;} - - -/*--------------Arrows-------------------*/ - .menu li.has-menu a{padding-right:25px;} - .menu li.has-menu span.arrow{border-style:solid;border-width:5px; - display:block;position:absolute;top:50%;right:5px;font-size:0;line-height:0;height:0;width:0;} - .menu li li.has-menu span.arrow{margin-top:-4px;} - -/*--------------Vertical Menu Layout-------------------*/ -.menu.vertical{} - .menu.vertical li{display:block;} - .menu.vertical li a{display:block;} - .menu.vertical ul{top:0;left:100%;} - .menu.vertical li.has-menu span.arrow{margin-top:-4px;} - -/*--------------Vertical Right Menu Layout-------------------*/ -.menu.vertical.right{text-align:left;} - .menu.vertical.right ul{top:0;right:100%;left:auto;} - .menu.vertical.right li a{padding-left:25px;padding-right:20px;} - .menu.vertical.right li.has-menu span.arrow{right:auto;left:5px;margin-top:-4px;} - - -/*--------------------------------- - MENU STYLES - EDIT BELOW THIS LINE TO CUSTOMIZE ------------------------------------*/ -.menu{ -border:1px solid #ccc; -background: #eee; /* Old browsers */ -background: -moz-linear-gradient(top, rgba(252,252,252,1) 0%, rgba(224,224,224,1) 100%); /* FF3.6+ */ -background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(252,252,252,1)), color-stop(100%,rgba(224,224,224,1))); /* Chrome,Safari4+ */ -background: -webkit-linear-gradient(top, rgba(252,252,252,1) 0%,rgba(224,224,224,1) 100%); /* Chrome10+,Safari5.1+ */ -background: -o-linear-gradient(top, rgba(252,252,252,1) 0%,rgba(224,224,224,1) 100%); /* Opera11.10+ */ -background: linear-gradient(top, rgba(252,252,252,1) 0%,rgba(224,224,224,1) 100%); /* W3C */ -z-index:600; -} - - .menu li{} - - .menu li a{ - text-shadow:0px 1px 1px #fff; - padding:15px 20px; - text-decoration:none; - font-size:0.9em; - color: #777; - } - - .menu li.current>a, - .menu li.current>a:hover, - .menu li.current.hover>a{ - background: rgb(122,188,255); /* Old browsers */ - background: -moz-linear-gradient(top, rgba(122,188,255,1) 0%, rgba(96,171,248,1) 44%, rgba(64,150,238,1) 100%); /* FF3.6+ */ - background: -webkit-gradient(linear, left top, left bottom, color-stop(0%,rgba(122,188,255,1)), color-stop(44%,rgba(96,171,248,1)), color-stop(100%,rgba(64,150,238,1))); /* Chrome,Safari4+ */ - background: -webkit-linear-gradient(top, rgba(122,188,255,1) 0%,rgba(96,171,248,1) 44%,rgba(64,150,238,1) 100%); /* Chrome10+,Safari5.1+ */ - background: -o-linear-gradient(top, rgba(122,188,255,1) 0%,rgba(96,171,248,1) 44%,rgba(64,150,238,1) 100%); /* Opera11.10+ */ - filter: progid:DXImageTransform.Microsoft.gradient( startColorstr='#7abcff', endColorstr='#4096ee',GradientType=0 ); /* IE6-9 */ - background: linear-gradient(top, rgba(122,188,255,1) 0%,rgba(96,171,248,1) 44%,rgba(64,150,238,1) 100%); /* W3C */ - color:#fff; - text-shadow:0px -1px 0 rgba(0,0,0,0.2); - cursor: default; - } - - .menu li a:hover, - .menu li.hover>a{ - background:#f5f5f5; - } - - /* sub menus */ - .menu ul{ - background: #efefef; - border:1px solid #ccc; - } - - .menu ul li{} - .menu ul li a{} - - /* sub-sub menus */ - .menu ul ul{} - .menu ul ul li{} - .menu ul ul li a{} - - /* arrows */ - /* arrow down */ .menu li.has-menu span.arrow{border-color-top:#ccc;border-color:#ccc transparent transparent transparent;} - /* arrow left */ .menu li li.has-menu span.arrow, .menu.vertical li.has-menu span.arrow - {border-color-left:#ccc;border-color:transparent transparent transparent #ccc;} - /* arrow right */ .menu.vertical.right li.has-menu span.arrow{border-color-right:#ccc;border-color:transparent #ccc transparent transparent;} - - /* dividers */ .menu ul li.divider{border-top:1px solid #ccc;} - .menu ul li.divider a{border-top:1px solid #fff;} - - - -/*--------------------------------- - RESPONSIVE MENU STYLES - DO NOT EDIT unless you know what you are doing ------------------------------------*/ - -.menu li.menu-toggle{display:none;} - - -@media all and (max-width: 768px) { - - .grid .menu li, - .grid .menu.vertical li, - .grid .menu.vertical.right li{ - display:block; - display:none; - } - - .grid .menu li.menu-toggle, - .grid .menu.vertical li.menu-toggle, - .grid .menu.vertical.right li.menu-toggle{ - display:block; - } - - .grid .menu:hover li, - .grid .menu.vertical:hover li, - .grid .menu.vertical.right:hover li{ - display:block; - } - - /* arrows */ - .grid .menu li.has-menu span.arrow, - .grid .menu.vertical li.has-menu span.arrow, - .grid .menu.vertical.right li.has-menu span.arrow, - .grid .menu li li.has-menu span.arrow, .menu.vertical li.has-menu span.arrow - {border-color-top:#ccc;border-color:#ccc transparent transparent transparent;} - - .grid .menu.vertical.right li.has-menu span.arrow{ - right:5px;left:auto; - } - - .grid .menu li a{ - display:block; - } - - .grid .menu ul, - .grid .menu ul ul, - .grid .menu.vertical ul, - .grid .menu.vertical.right ul{ - position:relative; - top:0; - left:0; - margin:10px; - } - -} DELETED cgisetup/www/css/kickstart-slideshow.css Index: cgisetup/www/css/kickstart-slideshow.css ================================================================== --- cgisetup/www/css/kickstart-slideshow.css +++ /dev/null @@ -1,223 +0,0 @@ -/*--------------------------------- - SLIDESHOW2 - Slight Fixes for the slideshow layout *needs work ------------------------------------*/ - - .slideshow{ - clear:both; - margin:0; - padding:0; - width:auto; - height:auto; - overflow:hidden; - } - - .slideshow li{ - list-style-type:none; - margin:0; - padding:0; - float:left; - display:block; - } - -/** - * BxSlider v4.0 - Fully loaded, responsive content slider - * http://bxslider.com - * - * Written by: Steven Wanderski, 2012 - * http://stevenwanderski.com - * (while drinking Belgian ales and listening to jazz) - * - * CEO and founder of bxCreative, LTD - * http://bxcreative.com - */ - - -/** RESET AND LAYOUT -===================================*/ -.bx-wrapper, .bx-wrapper *{ - -webkit-box-sizing: content-box; /* Safari/Chrome, other WebKit */ - -moz-box-sizing: content-box; /* Firefox, other Gecko */ - box-sizing: content-box; /* Opera/IE 8+ */ -} - -.bx-wrapper { - position: relative; - margin: 0 0 60px; - padding: 0; - *zoom: 1; -} - -.bx-wrapper img { - width: 100%; - display: block; -} - -/** THEME -===================================*/ - -.bx-wrapper .bx-viewport { - -moz-box-shadow: 0 0 5px #ccc; - -webkit-box-shadow: 0 0 5px #ccc; - box-shadow: 0 0 5px #ccc; - border: solid #fff 5px; - left: 0; - background: #fff; -} - -.bx-wrapper .bx-pager, -.bx-wrapper .bx-controls-auto { - position: absolute; - bottom: -30px; - width: 100%; -} - -/* LOADER */ - -.bx-wrapper .bx-loading { - min-height: 50px; - background: url(img/bx_loader.gif) center center no-repeat #fff; - height: 100%; - width: 100%; - position: absolute; - top: 0; - left: 0; - z-index: 2000; -} - -/* PAGER */ - -.bx-wrapper .bx-pager { - text-align: center; - font-size: .85em; - font-family: Arial; - font-weight: bold; - color: #666; - padding-top: 20px; -} - -.bx-wrapper .bx-pager .bx-pager-item, -.bx-wrapper .bx-controls-auto .bx-controls-auto-item { - display: inline-block; - *zoom: 1; - *display: inline; -} - -.bx-wrapper .bx-pager.bx-default-pager a { - background: #666; - text-indent: -9999px; - display: block; - width: 10px; - height: 10px; - margin: 0 5px; - outline: 0; - -moz-border-radius: 5px; - -webkit-border-radius: 5px; - border-radius: 5px; -} - -.bx-wrapper .bx-pager.bx-default-pager a:hover, -.bx-wrapper .bx-pager.bx-default-pager a.active { - background: #000; -} - -/* DIRECTION CONTROLS (NEXT / PREV) */ - -.bx-wrapper .bx-prev { - left: 10px; - background: url(img/controls.png) no-repeat 0 -32px; -} - -.bx-wrapper .bx-next { - right: 10px; - background: url(img/controls.png) no-repeat -43px -32px; -} - -.bx-wrapper .bx-prev:hover { - background-position: 0 0; -} - -.bx-wrapper .bx-next:hover { - background-position: -43px 0; -} - -.bx-wrapper .bx-controls-direction a { - position: absolute; - top: 50%; - margin-top: -16px; - outline: 0; - width: 32px; - height: 32px; - text-indent: -9999px; - z-index: 9999; -} - -.bx-wrapper .bx-controls-direction a.disabled { - display: none; -} - -/* AUTO CONTROLS (START / STOP) */ - -.bx-wrapper .bx-controls-auto { - text-align: center; -} - -.bx-wrapper .bx-controls-auto .bx-start { - display: block; - text-indent: -9999px; - width: 10px; - height: 11px; - outline: 0; - background: url(img/controls.png) -86px -11px no-repeat; - margin: 0 3px; -} - -.bx-wrapper .bx-controls-auto .bx-start:hover, -.bx-wrapper .bx-controls-auto .bx-start.active { - background-position: -86px 0; -} - -.bx-wrapper .bx-controls-auto .bx-stop { - display: block; - text-indent: -9999px; - width: 9px; - height: 11px; - outline: 0; - background: url(img/controls.png) -86px -44px no-repeat; - margin: 0 3px; -} - -.bx-wrapper .bx-controls-auto .bx-stop:hover, -.bx-wrapper .bx-controls-auto .bx-stop.active { - background-position: -86px -33px; -} - -/* PAGER WITH AUTO-CONTROLS HYBRID LAYOUT */ - -.bx-wrapper .bx-controls.bx-has-controls-auto.bx-has-pager .bx-pager { - text-align: left; - width: 80%; -} - -.bx-wrapper .bx-controls.bx-has-controls-auto.bx-has-pager .bx-controls-auto { - right: 0; - width: 35px; -} - -/* IMAGE CAPTIONS */ - -.bx-wrapper .bx-caption { - position: absolute; - bottom: 0; - left: 0; - background: #666\9; - background: rgba(80, 80, 80, 0.75); - width: 100%; -} - -.bx-wrapper .bx-caption span { - color: #fff; - font-family: Arial; - display: block; - font-size: .85em; - padding: 10px; -} DELETED cgisetup/www/css/kickstart.css Index: cgisetup/www/css/kickstart.css ================================================================== --- cgisetup/www/css/kickstart.css +++ /dev/null @@ -1,519 +0,0 @@ -/* - 99Lime.com HTML KickStart by Joshua Gatcke - kickstart.css - - Don't edit the file if you want HTML KickStart to be upgradeable. - Instead, copy any CSS selectors you want to modify to your style.css file. - - // Colors - blue: #4D99E0; -*/ -/*--------------------------------- - IMPORTS ------------------------------------*/ -@import url(kickstart-buttons.css); -@import url(kickstart-forms.css); -@import url(kickstart-menus.css); -@import url(kickstart-grid.css); -@import url(jquery.fancybox-1.3.4.css); -@import url(kickstart-slideshow.css); -@import url(prettify.css); -@import url(tiptip.css); -@import url(fonts/font-awesome-4.2.0/css/font-awesome.min.css); - -/*--------------------------------- - HTML ELEMENTS ------------------------------------*/ -*{ --webkit-box-sizing: border-box; /* Safari/Chrome, other WebKit */ --moz-box-sizing: border-box; /* Firefox, other Gecko */ -box-sizing: border-box; /* Opera/IE 8+ */ -} -a{color:#4D99E0;outline:0;} -a:active{color:inherit;} -a:visited{} -a:hover{} -a img{border:0;} -a [class^="icon-"]{color:inherit;text-decoration:none;} -strong,b{color:#000;font-weight:bold;} -strike{} -em,i{} -.hide{display:none;} -.show{display:block;} - -/*--------------------------------- - UTILITY ------------------------------------*/ -.center{text-align:center;} -.left{text-align:left;} -.right{text-align:right;} - -/*--------------------------------- - HR ------------------------------------*/ -hr{clear:both;border-bottom:0;border-top:1px dotted #ccc;border-right:0;border-left:0;margin:30px 0;min-height: 0;height:1px;} -hr.alt1{border-style: solid;} -hr.alt2{border-style: dashed;} - -/*--------------------------------- - HTML5 ELEMENTS (shim) ------------------------------------*/ -article,aside,details,figcaption,figure, -footer,header,hgroup,menu,nav,section { -display:block; -} - -/*--------------------------------- - HEADINGS ------------------------------------*/ -h1,h2,h3,h4,h5,h6{ -font-weight:bold; -line-height:140%; -} - -h1{ -font-size:3.5em; -margin:10px 0 10px 0; -} - -h2{ -font-size:3em; -margin:10px 0 10px 0; -} - -h3{ -font-size:2.5em; -margin:10px 0 10px 0; -line-height:130%; -} - -h4{ -font-size:2em; -margin:10px 0 10px 0; -} - -h5{ -font-size:1.5em; -margin:10px 0 10px 0; -} - -h6{ -font-size:1.2em; -margin:10px 0 5px 0; -} - -/*--------------------------------- - PARAGRAPHS ------------------------------------*/ -p{ -margin:10px 0; -} - -/*--------------------------------- - BLOCKQUOTES ------------------------------------*/ -blockquote{ -font-size:1.5em; -line-height:1.5em; -font-style: italic; -margin:30px 30px 30px 0; -padding:0 0 0 20px; -border-left:1px solid #ccc; -} - - blockquote span{font-size:0.7em;display:block;} - blockquote.small{font-size:1.2em;} - -/*--------------------------------- - LISTS ------------------------------------*/ -ul, ol{ -padding:0; -margin:0 0 20px 25px; -} - -li{ -padding:5px 0; -margin:0; -} - -ul.list-unstyled{ -padding:0; -margin:0 0 20px 0; -} - -ul.list-unstyled li{ -padding:5px 0; -margin:0; -list-style-type:none; - -} - -ul.alt{ -padding:0; -margin:0 0 20px 0; -} - -ul.alt li{ -list-style-type:none; -border-top:1px dotted #ccc; -border-bottom:1px dotted #ccc; -margin:0 0 -1px 0; -background:url(img/icon-arrow-right.png) no-repeat 5px 0.7em; -padding-left:20px; -} - -ul.icons{ -margin:0 0 20px 0; -padding:0; -} - -ul.icons li{ -list-style-type:none; -margin:0; -padding:5px 0; -} - -/*--------------------------------- - PRE & CODE ------------------------------------*/ -code{ -font-family: Consolas, "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier, monospace; -font-size:0.9em; -border:1px solid lightblue; -padding:3px; --moz-border-radius:3px; --webkit-border-radius:3px; -border-radius:3px; -color:#518BAB; -} - -pre{ -white-space: pre-wrap; /* css-3 */ -white-space: -moz-pre-wrap !important; /* Mozilla, since 1999 */ -white-space: -pre-wrap; /* Opera 4-6 */ -white-space: -o-pre-wrap; /* Opera 7 */ -word-wrap: break-word; /* Internet Explorer 5.5+ */ -margin: 0 0 0 0; -padding:5px 5px 3px 5px; -background:#fff; --moz-border-radius:5px; --webkit-border-radius:5px; -border-radius:5px; --webkit-box-shadow:inset 0 0 7px rgba(0,0,0,0.2); --moz-box-shadow:inset 0 0 7px rgba(0,0,0,0.2); -box-shadow:inset 0 0 7px rgba(0,0,0,0.2); -padding:10px; -margin:0 0; -border:1px solid #ddd; -font-family: Consolas, "Andale Mono WT", "Andale Mono", "Lucida Console", "Lucida Sans Typewriter", "DejaVu Sans Mono", "Bitstream Vera Sans Mono", "Liberation Mono", "Nimbus Mono L", Monaco, "Courier New", Courier, monospace; -font-size:0.9em; -} - -/*--------------------------------- - TABLES ------------------------------------*/ -table{width:100%;margin:0 0 10px 0;text-align:left;border-collapse: collapse;} - thead, tbody{margin:0;padding:0;} - th, td{padding:7px 10px;font-size:0.9em;border-bottom:1px dotted #ddd;text-align:left;} - thead th{font-size:0.9em;padding:3px 10px;border-bottom:1px solid #ddd;} - tbody tr.last th, - tbody tr.last td{border-bottom:0;} - -/* striped */ -table.striped{} - table.striped tr.alt{background:#f5f5f5;} - table.striped thead th{background:#fff;} - table.striped tbody th{background:#f5f5f5;text-align:right;padding-right:15px;border-right:1px dotted #e5e5e5;} - table.striped tbody tr.alt th{background:#efefef;} - -/* tight */ -table.tight{} - table.tight th, .tight td{padding:2px 10px;} - -/* sortable */ -table.sortable{border:1px solid #ddd;} - table.sortable thead th{cursor: pointer;position:relative;top:0;left:0;border-right:1px solid #ddd;} - table.sortable thead th:hover{background:#efefef;} - table.sortable span.arrow{border-style:solid;border-width:5px; - display:block;position:absolute;top:50%;right:5px;font-size:0; - border-color:#ccc transparent transparent transparent; - line-height:0;height:0;width:0;margin-top:-2px;} - table.sortable span.arrow.up{border-color:transparent transparent #ccc transparent;margin-top:-7px;} - -/*--------------------------------- - TABS ------------------------------------*/ -ul.tabs{ -margin:10px 0 -1px 0; -padding:0; -width:100%; -border-bottom:1px solid #e5e5e5; -float:left; -font-size:0; -} - - ul.tabs.left{text-align:left;} - ul.tabs.center{text-align:center;} - ul.tabs.right{text-align:right;} - ul.tabs.right li{margin:0 0 0 -2px;} - - ul.tabs li{ - font-size:14px; - list-style-type:none; - margin:0 -2px 0 0; - padding:0; - display:inline-block; - *display:inline;/*IE ONLY*/ - position:relative; - top:0; - left:0; - *top:1px;/*IE 7 ONLY*/ - zoom:1; - } - - ul.tabs li a{ - text-decoration:none; - color:#666; - display:inline-block; - padding:9px 15px; - position: relative; - top:0; - left:0; - line-height:100%; - background:#f5f5f5; - -webkit-box-shadow: inset 0 -3px 3px rgba(0,0,0,0.03); - -moz-box-shadow: inset 0 -3px 3px rgba(0,0,0,0.03); - box-shadow: inset 0 -3px 3px rgba(0,0,0,0.03); - border:1px solid #e5e5e5; - border-bottom:0; - font-size:0.9em; - zoom:1; - } - - ul.tabs li a:hover{ - background:#fff; - } - - ul.tabs li.current a{ - position:relative; - top:1px; - left:0; - background:#fff; - -webkit-box-shadow: none; - -moz-box-shadow: none; - box-shadow: none; - color:#222; - } - - .tab-content{ - border:1px solid #efefef; - border:1px solid #e5e5e5; - background:#fff; - clear:both; - padding:20px; - margin:0 0 40px 0; - } - - -/*--------------------------------- - BREADCRUMBS ------------------------------------*/ -ul.breadcrumbs{ -margin:10px 0; -padding:0; -line-height:0%; -font-size:0; -} - - ul.breadcrumbs li{ - list-style-type:none; - margin:0; - padding:0; - display:inline-block; - *display:inline; /* IE ONLY*/ - position:relative; - zoom:1; - line-height:100%; - font-size:14px; /* 0.8em default to override font-size:0; on parent*/ - } - - ul.breadcrumbs li a{ - display:inline-block; - *display:inline; /* IE ONLY*/ - position:relative; - padding:5px 15px 5px 5px; - font-size:0.9em; - zoom:1; - margin:0; - background:url(img/icon-arrow-right.png) no-repeat right center; - } - - ul.breadcrumbs li.last a{ - color:#333; - cursor: default; - text-decoration:none; - background:none; - } - - ul.breadcrumbs li.last a:hover{ - text-decoration:none; - } - - /* Alternative Style */ - ul.breadcrumbs.alt1{ - border:1px solid transparent; - font-size:0; - } - - ul.breadcrumbs.alt1 li a{ - padding:10px 25px 10px 15px; - background:url(img/breadcrumbs-bg.gif) no-repeat right center; - text-decoration:none; - border-top:1px solid #efefef; - border-bottom:1px solid #efefef; - font-size:12px; - } - - ul.breadcrumbs.alt1 a:hover{ - text-decoration:underline; - } - - ul.breadcrumbs.alt1 li.first a{ - border-left:1px solid #efefef; - } - - ul.breadcrumbs.alt1 li.last a{ - background:none; - border-right:1px solid #efefef; - } - -/*--------------------------------- - IMAGES ------------------------------------*/ -/* - for img .style1, .style2, .style3 - view js/kickstart.js Image Style Helpers -*/ -img{ -margin:0; -padding:0; -display:inline-block; -position:relative; -zoom:1; -vertical-align: bottom; -} - - img.align-left, .img-wrap.align-left{float:left;margin:0 10px 5px 0;} - img.align-right, .img-wrap.align-right{float:right;margin:0 0 5px 10px;} - img.full-width{clear:both;display:block;width:100%;height:auto;margin:0 0 10px 0;} - - div.caption{ - background:#f5f5f5; - border:1px solid #ddd; - padding:3px; - max-width:100%; - display:inline-block; - height:auto; - } - - div.caption img{ - display:block; - padding:0; - margin:0; - width:100%; - height:auto; - } - - div.caption span{ - display:block; - margin-top:3px; - font-size:0.8em; - color:#666; - padding:0px 5px; - } - - .gallery{} - - .gallery a{ - display:inline-block; - position:relative; - border:1px solid #ddd; - background:#fff; - padding:3px; - margin:5px; - -moz-border-radius:5px; - -webkit-border-radius:5px; - border-radius:5px; - } - - .gallery a img{ - display: block; - position: relative; - margin:0; - padding:0; - } - -/*--------------------------------- - SLIDESHOW2 ------------------------------------*/ -.slideshow-wrap{ -clear:both; -margin:0; -padding:0; -position:relative; -top:0; -left:0; -overflow:hidden; -clear:both; -} - - .slideshow-inner{ - overflow:hidden; - clear:both; - position:relative; - top:0; - left:0; - border:1px solid #efefef; - } - - .slideshow{ - clear:both; - margin:0; - padding:0; - width:auto; - height:auto; - overflow:hidden; - } - - .slideshow li{ - list-style-type:none; - margin:0; - padding:0; - float:left; - display:block; - } - - .slideshow img{vertical-align: bottom;} - - .slideshow-buttons{ - text-align:right; - margin:3px 0 0 0; - padding:0; - } - - .slideshow-buttons li{display:inline;position:relative;top:0;left:0;line-height:100%;margin:0;padding:0;} - .slideshow-buttons li.current a{background:#ddd;} - - .slideshow-buttons a{ - display:inline; - position:relative; - top:0; - left:0; - padding:1px 3px; - margin:0 1px; - line-height:100%; - border:1px solid #efefef; - text-decoration:none; - font-size:0.8em; - } DELETED cgisetup/www/css/prettify.css Index: cgisetup/www/css/prettify.css ================================================================== --- cgisetup/www/css/prettify.css +++ /dev/null @@ -1,1 +0,0 @@ -.pln{color:#000}@media screen{.str{color:#080}.kwd{color:#008}.com{color:#800}.typ{color:#606}.lit{color:#066}.pun,.opn,.clo{color:#660}.tag{color:#008}.atn{color:#606}.atv{color:#080}.dec,.var{color:#606}.fun{color:red}}@media print,projection{.str{color:#060}.kwd{color:#006;font-weight:bold}.com{color:#600;font-style:italic}.typ{color:#404;font-weight:bold}.lit{color:#044}.pun,.opn,.clo{color:#440}.tag{color:#006;font-weight:bold}.atn{color:#404}.atv{color:#060}}pre.prettyprint{}ol.linenums{margin-top:0;margin-bottom:0}li.L0,li.L1,li.L2,li.L3,li.L5,li.L6,li.L7,li.L8{list-style-type:none}li.L1,li.L3,li.L5,li.L7,li.L9{background:#eee} DELETED cgisetup/www/css/tiptip.css Index: cgisetup/www/css/tiptip.css ================================================================== --- cgisetup/www/css/tiptip.css +++ /dev/null @@ -1,99 +0,0 @@ -/* - TipTip CSS - Version 1.2 - http://code.drewwilson.com/entry/tiptip-jquery-plugin -*/ - -#tiptip_holder { display: none; position: absolute; top: 0; left: 0; z-index: 99999; } -#tiptip_holder.tip_top { padding-bottom: 5px; } -#tiptip_holder.tip_bottom { padding-top: 5px; } -#tiptip_holder.tip_right { padding-left: 5px; } -#tiptip_holder.tip_left { padding-right: 5px; } - -#tiptip_content { -font-size: 11px; -color: #fff; -text-shadow: 0 0 2px #000; -padding: 4px 8px; -border: 1px solid rgba(255,255,255,0.25); -background:#212121; -background-color: rgba(25,25,25,0.92); -background-image: -webkit-gradient(linear, 0% 0%, 0% 100%, from(transparent), to(#000)); --webkit-border-radius: 3px; --moz-border-radius: 3px; -border-radius: 3px; --webkit-box-shadow: 0 0 3px #555; --moz-box-shadow: 0 0 3px #555; -box-shadow: 0 0 3px #555; -*background:#212121; -} - -#tiptip_arrow, #tiptip_arrow_inner { -position: absolute; -border-color: transparent; -border-style: solid; -border-width: 6px; -height: 0; -width: 0; -} - -#tiptip_holder.tip_top #tiptip_arrow { -border-top-color: #fff; -border-top-color: rgba(255,255,255,0.35); -} - -#tiptip_holder.tip_bottom #tiptip_arrow { -border-bottom-color: #fff; -border-bottom-color: rgba(255,255,255,0.35); -} - -#tiptip_holder.tip_right #tiptip_arrow { -border-right-color: #fff; -border-right-color: rgba(255,255,255,0.35); -} - -#tiptip_holder.tip_left #tiptip_arrow { -border-left-color: #fff; -border-left-color: rgba(255,255,255,0.35); -} - -#tiptip_holder.tip_top #tiptip_arrow_inner { -margin-top: -7px; -margin-left: -6px; -border-top-color: rgb(25,25,25); -border-top-color: rgba(25,25,25,0.92); -} - -#tiptip_holder.tip_bottom #tiptip_arrow_inner { -margin-top: -5px; -margin-left: -6px; -border-bottom-color: rgb(25,25,25); -border-bottom-color: rgba(25,25,25,0.92); -} - -#tiptip_holder.tip_right #tiptip_arrow_inner { -margin-top: -6px; -margin-left: -5px; -border-right-color: rgb(25,25,25); -border-right-color: rgba(25,25,25,0.92); -} - -#tiptip_holder.tip_left #tiptip_arrow_inner { -margin-top: -6px; -margin-left: -7px; -border-left-color: rgb(25,25,25); -border-left-color: rgba(25,25,25,0.92); -} - -/* Webkit Hacks */ -@media screen and (-webkit-min-device-pixel-ratio:0) { - #tiptip_content { - padding: 4px 8px 5px 8px; - background-color: rgba(45,45,45,0.88); - } - #tiptip_holder.tip_bottom #tiptip_arrow_inner { - border-bottom-color: rgba(45,45,45,0.88); - } - #tiptip_holder.tip_top #tiptip_arrow_inner { - border-top-color: rgba(20,20,20,0.92); - } -} DELETED cgisetup/www/elements.html Index: cgisetup/www/elements.html ================================================================== --- cgisetup/www/elements.html +++ /dev/null @@ -1,1816 +0,0 @@ - - -HTML KickStart Elements - - - - - - - - - - - -
-
-

HTML KickStart

-

Ultra–Lean HTML5, CSS, & JS Building Blocks
for Rapid Website Production

-
-
- Responsive -
- -
-
- MIT Open Source -
- -
-
- 479 Icons
-
- -
-
- Designer Friendly - -
-

- Download (Github) - - -
-

Downloaded over 91036 Times :)

-
-
- -
- - -

Getting Started

- - -
-
-

Setup

-
    -
  1. Download HTML KickStart
    2. -
  2. Include jQuery and HTML KickStart -
    -<script src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
-<script src="js/kickstart.js"></script> <!-- KICKSTART -->
-<link rel="stylesheet" href="css/kickstart.css" media="all" /> <!-- KICKSTART -->
-
    -
    3. -
  3. Copy Elements into your HTML
    4. -
-
-
-
-

Browsers

- HTML KickStart Tested and working in IE 8+, Safari, Chrome, Firefox, Opera, Safari IOS, Browser and Chrome Android. -

Notes

- Don't forget to use an HTML5 Doctype - <!DOCTYPE html> -
-
- - - - -

Buttons

- - - - -
-
-

Buttons

-
- A.button
-
-
-
- -
- - -
-

With Icons

-
-
-
-
- - -
-

Colors

-
- .orange
-
-
- -
- - -
-

Styles

-
-
- .pop
-
- -
- -
-

Button Bar

-    - -
    -
    • -
    • -
    • -
    • -
   - -    - -
    -
    • -
    • -
-
-
- -
-
-<!-- Button Sizes -->
-<button>Button</button>
-<a class="button" href="">A.button</a>
-<button class="small">Small</button>
-<button class="small" disabled="disabled">Small (disabled)</button>
-<button class="medium">Medium</button>
-<button class="large">Large</button>
-
- -
-
-<!-- Buttons w/Icons -->
-<button class="small"><i class="fa fa-picture-o"></i> Small</button>
-<button class="medium"><i class="fa fa-coffee"></i> Medium</button>
-<button class="large"><i class="fa fa-leaf"></i> Large</button>
-
- -
-
-<!-- Buttons w/Colors -->
-<button class="blue"><i class="fa fa-star"></i> .blue</button>
-<a class="button orange" href=""><i class="fa fa-music"></i> .orange</a>
-<button class="small pink"><i class="fa fa-plus-square"></i> .pink</button>
-<button class="medium green"><i class="fa fa-play-circle"></i> .green</button>
-<button class="large red"><i class="fa fa-minus-square"></i> .red</button>
-
- -
-
-<!-- Default (no style) -->
-<button>default</button>
-
-<!-- Pill -->
-<button class="pill"><i class="fa fa-star"></i> .pill</button>
-
-<!-- Pop -->
-<a class="button pop" href=""><i class="fa fa-music"></i> .pop</a>
-
-<!-- Inset -->
-<button class="inset"><i class="fa fa-plus-square"></i> .inset</button>
-
-<!-- Square -->
-<button class="square"><i class="icon-minus-square"></i> .square</button>
-
-
- -
-
-<!-- Button Bar w/icons -->
-<ul class="button-bar">
-<li><a href=""><i class="fa fa-pencil"></i> Edit</a></li>
-<li><a href=""><i class="fa fa-tag"></i> Tag</a></li>
-<li><a href=""><i class="fa fa-upload"></i> Upload</a></li>
-<li><a href=""><i class="fa fa-plus-sign"></i></a></li>
-</ul>
-
-
- - -

Lists

- - -
-
-

Unordered List

-
    -
  • Apple
    • -
  • Banana
    • -
  • Orange
    • -
  • Pear
    • -
-
- -
-

Ordered List

-
    -
  1. Apple
    2. -
  2. Banana
    3. -
  3. Orange
    4. -
  4. Pear
    5. -
-
- -
-

UL.icons

-
    -
  • Apple
    • -
  • Banana
    • -
  • Orange
    • -
  • Pear
    • -
-
- -
-

UL.alt

-
    -
  • Apple
    • -
  • Banana
    • -
  • Orange
    • -
  • Pear
    • -
-
-
- -
-
-<!-- Unordered List -->
-<ul>
-<li>Apple</li>
-<li>Banana</li>
-<li>Orange</li>
-<li>Pear</li>
-</ul>
-
- -
-
-<!-- Ordered List -->
-<ol>
-<li>Apple</li>
-<li>Banana</li>
-<li>Orange</li>
-<li>Pear</li>
-</ol>
-
- -
-
-<!-- List Icons -->
-<ul class="icons">
-<li><i class="fa fa-check"></i>Apple</li>
-<li><i class="fa fa-check"></i>Banana</li>
-<li><i class="fa fa-check"></i>Orange</li>
-<li><i class="fa fa-remove"></i>Pear</li>
-</ul>
-
- -
-
-<!-- List Alternative Style -->
-<ul class="alt">
-<li>Apple</li>
-<li>Banana</li>
-<li>Orange</li>
-<li>Pear</li>
-</ul>
-
- - - - - -
-

These Menus are optionally responsive when using a responsive grid: .grid or .grid.flex

- -
-

Vertical Left

- -
- - -
-

Horizontal

- -
- - -
-

Vertical Right

- -
-
- -
-
-<!-- Menu Vertical Left -->
-<ul class="menu vertical">
-<li class="current"><a href="">Item 1</a></li>
-<li><a href="">Item 2</a></li>
-<li><a href="">Item 3</a>
-	<ul>
-	<li><a href="">Sub Item that is super long and we don't want it to break the menu</a></li>
-	<li><a href="">Sub Item</a>
-		<ul>
-		<li><a href="">Sub Item</a></li>
-		<li><a href="">Sub Item</a></li>
-		<li><a href="">Sub Item</a></li>
-		<li><a href="">Sub Item</a></li>
-		</ul>
-	</li>
-	<li><a href="">Sub Item</a></li>
-	</ul>
-</li>
-<li><a href="">Item 4</a></li>
-</ul>
-
- -
-
-<!-- Menu Horizontal -->
-<ul class="menu">
-<li class="current"><a href="">Item 1</a></li>
-<li><a href="">Item 2</a></li>
-<li><a href=""><i class="fa fa-inbox"></i> Item 3</a>
-	<ul>
-	<li><a href=""><i class="fa fa-cog"></i> Sub Item</a></li>
-	<li><a href=""><i class="fa fa-envelope"></i> Sub Item</a>
-		<ul>
-		<li><a href=""><i class="fa fa-wrench"></i> Sub Item</a></li>
-		<li><a href=""><i class="fa fa-camera-retro"></i> Sub Item</a></li>
-		<li><a href=""><i class="fa fa-coffee"></i> Sub Item</a></li>
-		<li><a href=""><i class="fa fa-twitter"></i> Sub Item</a></li>
-		</ul>
-	</li>
-	<li class="divider"><a href=""><i class="fa fa-trash"></i> li.divider</a></li>
-	</ul>
-</li>
-<li><a href="">Item 4</a></li>
-</ul>
-
- -
-
-<!-- Menu Vertical Right -->
-<ul class="menu vertical right">
-<li><a href="">Item 1</a></li>
-<li><a href="">Item 2</a></li>
-<li><a href="">Item 3</a>
-	<ul>
-	<li><a href="">Sub Item</a></li>
-	<li class="current"><a href="">Sub Item</a>
-		<ul>
-		<li><a href="">Sub Item</a></li>
-		<li><a href="">Sub Item</a></li>
-		<li><a href="">Sub Item</a></li>
-		<li><a href="">Sub Item</a></li>
-		</ul>
-	</li>
-	<li><a href="">Sub Item</a></li>
-	</ul>
-</li>
-<li><a href="">Item 4</a></li>
-</ul></pre>
-
- - -

Tables

- - -
-
-

Table (default)

- - - - - - - - - - - - - - - - - - - - - - - -
Item1Item2Item3
Item1Item2Item3
Item1Item2Item3
Item1Item2Item3
Item1Item2Item3
-
- -
-

Table.striped

- - - - - - - - - - - - - - - - - - - - - - - -
 Item2Item3
Item1Item2Item3
Item1Item2Item3
Item1Item2Item3
Item1Item2Item3
-
- -
-

Table.tight

- - - - - - - - - - - - - - - - - - - - - - - -
Item1Item2Item3
Item1Item2Item3
Item1Item2Item3
Item1Item2Item3
Item1Item2Item3
-
- -
-

Table.sortable

- - - - - - - - - - - - - - - - - - - - - - - - - - - - -
NameNumberColorActions
Joshua555-4325Blue -
Peter555-5698Gold -
Mary666-7654Red -
Gretty555-6732Pink -
-
-
- -
-
-<!-- Table -->
-<table cellspacing="0" cellpadding="0">
-<thead><tr>
-	<th>Item1</th>
-	<th>Item2</th>
-	<th>Item3</th>
-</tr></thead>
-<tbody><tr>
-	<td>Item1</td>
-	<td>Item2</td>
-	<td>Item3</td>
-</tr><tr>
-	<td>Item1</td>
-	<td>Item2</td>
-	<td>Item3</td>
-</tr><tr>
-	<td>Item1</td>
-	<td>Item2</td>
-	<td>Item3</td>
-</tr><tr>
-	<td>Item1</td>
-	<td>Item2</td>
-	<td>Item3</td>
-</tr></tbody>
-</table>
-
- -
-
-<!-- Table w/Side -->
-<table cellspacing="0" cellpadding="0">
-<thead><tr>
-	<th> </th>
-	<th>Item2</th>
-	<th>Item3</th>
-</tr></thead>
-<tbody><tr>
-	<th>Item1</th>
-	<td>Item2</td>
-	<td>Item3</td>
-</tr><tr>
-	<th>Item1</th>
-	<td>Item2</td>
-	<td>Item3</td>
-</tr><tr>
-	<th>Item1</th>
-	<td>Item2</td>
-	<td>Item3</td>
-</tr><tr>
-	<th>Item1</th>
-	<td>Item2</td>
-	<td>Item3</td>
-</tr></tbody>
-</table>
-
- -
-
-<!-- Table striped -->
-<table class="striped">
-...
-</table>
-
-<!-- Table tight -->
-<table class="tight">
-...
-</table>
-
-<!-- Table sortable -->
-<table class="sortable">
-...
-</table>
-
-<!-- Table combined Styles -->
-<table class="striped tight sortable">
-...
-</table>
-
-
- - -

ToolTips

- - -
-
-

Tooltips

-

Tooltips are awesome. These tooltips are designed to mimic the default browser tooltips - smart, aware of the edge of the browser window. Simple.

-

Hover over the examples on the right to preview.

-

Use:
- class="tooltip" +
- title="my tooltip content"

-
- -
-

Tooltip Positions

-
    -
  • .tooltip (default)
    • -
  • .tooltip-top
    • -
  • .tooltip-right
    • -
  • .tooltip-left
    • -
  • .tooltip-bottom
    • -
-
- -
-

Tooltips with HTML Content

- .tooltip + data-content="#ID" -
-   - -
HTML Content
- -

This is more HTML content. You can place any HTML in this tooltip.

-
-
- -
-
-<!-- Tooltip Default (top) -->
-<span class="tooltip" title="This is a default (top) tooltip">.tooltip</span>
-
-<!-- Tooltip Top -->
-<span class="tooltip-top" title="This is a Top tooltip">.tooltip-top</span>
-
-<!-- Tooltip Right -->
-<span class="tooltip-right" title="This is a Right tooltip">.tooltip-right</span>
-
-<!-- Tooltip Left -->
-<span class="tooltip-left" title="This is a Left tooltip">.tooltip-left</span>
-
-<!-- Tooltip Bottom -->
-<span class="tooltip-bottom" title="This is a Bottom tooltip">.tooltip-bottom</span>
-
-
- -
-
-<!-- Hover Action -->
-<button class="tooltip medium orange pill" data-content="#tooltipcontentID">Hover Over Me</button>
-
-<!-- Click Action -->
-<button class="tooltip medium blue pill" data-content="#tooltipcontentID" data-action="click">Click Me</button>
-
-<!-- Tooltip Content -->
-<div class="tooltip-content" id="tooltipcontentID"><h5>HTML Content</h5>
-<img src="http://placehold.it/180x150/4D99E0/ffffff.png&text=180x150" width="180" height="150" />
-<p>This is more HTML content. You can place any HTML in this tooltip.</p></div>
-
-
- - - -

Typography

- - -
-
-

Paragraphs

-

Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore - magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper - suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in - hendrerit in vulputate velit esse molestie consequat

-

El illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim - qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam - liber tempor cum soluta nobis eleifend option congue nihil imperdiet doming id quod mazim - placerat facer possim assum.

- - -

Blockquote

-

lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit - in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan - et iusto odio - Someone Important

- - -

Blockquote Small

-

lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit - in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan - et iusto odio - Someone Important

-
- - -
-

Inline Styles

-
    -
  • Strong
    • -
  • Emphasis
    • -
  • Inline Link
    • -
  • Strike
    • -
  • Inline Icons
    • -
  • <h1>Sample Code</h1>
    • -
-
- -

Heading 1

-

Heading 2

-

Heading 3

-

Heading 4

-
Heading 5
-
Heading 6
-
- -

Address

-

- 1234 South Creek Lane
- Calgary, Alberta, Canada
- T4B–1S6 -

-
-
-
- -
-
-<!-- Headings 1–6 -->
-<h1>Heading 1</h1>
-<h2>Heading 2</h2>
-<h3>Heading 3</h3>
-<h4>Heading 4</h4>
-<h5>Heading 5</h5>
-<h6>Heading 6</h6>
-
- -
-
-<!-- Paragraph -->
-<p>Consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt...</p>
-<p>El illum dolore eu feugiat nulla facilisis at vero eros et accumsan...</p>
-
- -
-
-<!-- Blockquote -->
-<blockquote>
-<p>
-lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit 
-in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan 
-et iusto odio
-<span>Someone Important</span>
-</p>
-</blockquote>
-
- -
-
-<!-- Blockquote Small -->
-<blockquote class="small">
-<p>
-lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit 
-in vulputate velit esse molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan 
-et iusto odio
-<span>Someone Important</span>
-</p>
-</blockquote>
-
- -
-
<!-- Strong -->
-<strong>Strong</strong>
-
-<!-- Emphasis -->
-<em>Emphasis</em>
-
-<!-- Inline Link -->
-<a href="">Inline Link</a>
-
-<!-- Strike -->
-<strike>Strike</strike>
-
-<!--Inline Icons -->
-Inline <i class="icon-film"></i> Icons
-
-<!--Sample Code (encoded entities) -->
-<code>&lt;h1&gt;Sample Code&lt;/h1&gt;</code>
-
- -
-
-<!-- Address -->
-<address><p>
-1234 South Creek Lane<br />
-Calgary, Alberta, Canada<br />
-T4B–1S6
-</p>
-</address>
-
- - -

Horizontal Rules

- - -
-
-

HR

-
-
- -
-

HR.alt1

-
-
- -
-

HR.alt2

-
-
-
- -
-
-<!-- HR -->
-<hr />
-
-<!-- HR.alt1 -->
-<hr class="alt1" />
-
-<!-- HR.alt2 -->
-<hr class="alt2" />
-
- - - - -

Icons/Glyphs

-
-
-

HTML KickStart now using
Font Awesome 4.2.0 Icons!

- How to use icons: <i class="fa fa-globe"></i>. -
Replace fa-globe with the icon you would like to use from the Cheatsheet.
-
- - - - -
- To increase the size of icons relative to its container, use fa-large, fa-2x, fa-3x, or fa-4x.
-
- .pull-left Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam. Fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. -
-
- .pull-right Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam. Fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. -
-
- .fa-border Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam. Fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum. -
-
-
- - -

Code/Pre

- - -
-
-

PRE HTML

- 
-<html>
-<head><title>This is a title</title></head>
-<body class="subpage">
-	<!-- Content Here -->
-</body>
-</html>
-
- - -
-

PRE CSS

- 
-body{
-font-weight:bold;
-color:#000;
-line-height:150%;
-}
-
- - -
-

PRE JS

- 
-$(document).ready(function(){
-	alert('jQuery');
-});
-
-
- -
-
-<!-- Code HTML -->
-<pre>
-…code goes here… 
-</pre>
-
- -
-
-<!-- Code CSS -->
-<pre>
-…code goes here… 
-</pre>
-
- -
-
-<!-- Code Javascript -->
-<pre>
-…code goes here… 
-</pre>
-
- -
-
-<!-- Code PHP -->
-<pre>
-…code goes here… 
-</pre>
-
- - -

Tabs

- - -
-
-

Tabs.left

- - -
Tab1
-
Tab2
-
Tab3
-
- - -
-

Tabs.center

- - -
Tab1
-
Tab2 has an icon.
-
Tab3
-
- - -
-

Tabs.right

- - -
Tab1
-
Tab2
-
Tab3
-
-
- -
-
-<!-- Tabs Left -->
-<ul class="tabs left">
-<li><a href="#tabr1">Tab1</a></li>
-<li><a href="#tabr2">Tab2</a></li>
-<li><a href="#tabr3">Tab3</a></li>
-</ul>
-
-<div id="tabr1" class="tab-content">Tab1</div>
-<div id="tabr2" class="tab-content">Tab2</div>
-<div id="tabr3" class="tab-content">Tab3</div>
-
- -
-
-<!-- Tabs Center -->
-<ul class="tabs center">
-<li><a href="#tabc1">Tab1</a></li>
-<li><a href="#tabc2"><i class="fa fa-folder-open"></i> Tab2</a></li>
-<li><a href="#tabc3">Tab3</a></li>
-</ul>
-
-<div id="tabc1" class="tab-content">Tab1</div>
-<div id="tabc2" class="tab-content">Tab2 has an icon.</div>
-<div id="tabc3" class="tab-content">Tab3</div>
-
- -
-
-<!-- Tabs Right -->
-<ul class="tabs right">
-<li><a href="#tabr1">Tab1</a></li>
-<li><a href="#tabr2">Tab2</a></li>
-<li><a href="#tabr3">Tab3</a></li>
-</ul>
-
-<div id="tabr1" class="tab-content">Tab1</div>
-<div id="tabr2" class="tab-content">Tab2</div>
-<div id="tabr3" class="tab-content">Tab3</div>
-
- - - - - -
-
-

Breadcrumbs

- -
- -
-

Breadcrumbs.alt1

- -
-
- -
-
-<!-- Breadcrumbs -->
-<ul class="breadcrumbs">
-<li><a href="">Home</a></li>
-<li><a href="">Category</a></li>
-<li><a href="">Sub Category</a></li>
-<li><a href="">Page Title</a></li>
-</ul>
-
- -
-
-<!-- Alternative Style -->
-<ul class="breadcrumbs alt1">
-<li><a href="">Home</a></li>
-<li><a href="">Category</a></li>
-<li><a href="">Sub Category</a></li>
-<li><a href="">Page Title</a></li>
-</ul>
-
- - - - -

Grids/Columns

- - -
-

Responsive & Flexible Grid

-

Responsive functionality is optional. Only use .grid & .grid.flex if you - want a responsive grid. Resize your browser to see it in action.

-

Responsive Grid:
<div class="grid">

-

Flexible Responsive Grid:
<div class="grid flex">

-

Grid Helper Classes:
- .show-desktop - .hide-desktop - .show-tablet - .hide-tablet - .show-phone - .hide-phone -

-
All columns automatically have the class .column. Apply padding and borders directly to columns -
.column{border:1px solid red;padding:10px;}
-
- -
col_12
-
col_1
col_11
-
col_2
col_10
-
col_3
col_9
-
col_4
col_8
-
col_5
col_7
-
col_6
col_6
-
col_7
col_5
-
col_8
col_4
-
col_9
col_3
-
col_10
col_2
-
col_11
col_1
-
col_12
- - -
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy - nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.
-
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy - nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.
-
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy - nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.
-
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy - nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.
- - -
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy - nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.
-
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy - nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.
-
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy - nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.
- - -
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy - nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.
-
Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy - nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.
-
- -
-
-<!-- Columns/Grid -->
-<div class="col_12">col_12</div>
-<div class="col_1">col_1</div><div class="col_11">col_11</div>
-<div class="col_2">col_2</div><div class="col_10">col_10</div>
-<div class="col_3">col_3</div><div class="col_9">col_9</div>
-<div class="col_4">col_4</div><div class="col_8">col_8</div>
-<div class="col_5">col_5</div><div class="col_7">col_7</div>
-<div class="col_6">col_6</div><div class="col_6">col_6</div>
-<div class="col_7">col_7</div><div class="col_5">col_5</div>
-<div class="col_8">col_8</div><div class="col_4">col_4</div>
-<div class="col_9">col_9</div><div class="col_3">col_3</div>
-<div class="col_10">col_10</div><div class="col_2">col_2</div>
-<div class="col_11">col_11</div><div class="col_1">col_1</div>
-<div class="col_12">col_12</div>
-
-<!-- FOURTHS -->
-<div class="col_3">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy 
-nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.</div>
-<div class="col_3">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy 
-nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.</div>
-<div class="col_3">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy 
-nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.</div>
-<div class="col_3">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy 
-nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.</div>
-
-<!-- THIRDS -->
-<div class="col_4">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy 
-nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.</div>
-<div class="col_4">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy 
-nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.</div>
-<div class="col_4">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy 
-nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.</div>
-
-<!-- HALF & HALF -->
-<div class="col_6">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy 
-nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.</div>
-<div class="col_6">Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy 
-nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam.</div>
-
- - -

Images

- - -
-
-

IMG.caption

- -
- -
-

DIV.gallery

- - - - - - - - -
- -
 
- -
-

IMG.align-left

- -

Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt - ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation - ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor - in hendrerit in vulputate velit esse molestie consequat.

-
- -
-

IMG.align-right

- -

Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt - ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation - ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor - in hendrerit in vulputate velit esse molestie consequat.

-
- -
-

IMG.full-width

- -
-
- -
-
-<!-- Caption -->
-<img class="caption" title="This is the image caption" src="http://placehold.it/400x350/4D99E0/ffffff.png&text=400x350" width="400" height="350" />
-
- -
-
-<!-- Align Left -->
-<img class="align-left" src="http://placehold.it/100x100/4D99E0/ffffff.png&text=100x100" width="100" height="100" />
-<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt 
-ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation 
-ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor 
-in hendrerit in vulputate velit esse molestie consequat.</p>
-
- -
-
-<!-- Align Right -->
-<img class="align-right" src="http://placehold.it/100x100/4D99E0/ffffff.png&text=100x100" width="100" height="100" />
-<p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt 
-ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation 
-ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor 
-in hendrerit in vulputate velit esse molestie consequat.</p>
-
- -
-
-<!-- Full Width -->
-<img class="full-width" src="http://placehold.it/260x200/4D99E0/ffffff.png&text=full+width" />
-
- -
-
-<!-- Gallery -->
-<div class="gallery">
-<a href="http://placehold.it/600x450/4D99E0/ffffff.png&text=600x450"><img src="http://placehold.it/100x100/4D99E0/ffffff.png&text=100x100" width="100" height="100" /></a>
-<a href="http://placehold.it/600x450/75CC00/ffffff.png&text=600x450"><img src="http://placehold.it/100x100/75CC00/ffffff.png&text=100x100" width="100" height="100" /></a>
-<a href="http://placehold.it/600x450/E49800/ffffff.png&text=600x450"><img src="http://placehold.it/100x100/E49800/ffffff.png&text=100x100" width="100" height="100" /></a>
-<a href="http://placehold.it/600x450/E4247E/ffffff.png&text=600x450"><img src="http://placehold.it/100x100/E4247E/ffffff.png&text=100x100" width="100" height="100" /></a>
-<a href="http://placehold.it/600x450/00C6E4/ffffff.png&text=600x450"><img src="http://placehold.it/100x100/00C6E4/ffffff.png&text=100x100" width="100" height="100" /></a>
-<a href="http://placehold.it/600x450/E4DB0F/ffffff.png&text=600x450"><img src="http://placehold.it/100x100/E4DB0F/ffffff.png&text=100x100" width="100" height="100" /></a>
-<a href="http://placehold.it/600x450/7400E4/ffffff.png&text=600x450"><img src="http://placehold.it/100x100/7400E4/ffffff.png&text=100x100" width="100" height="100" /></a>
-<a href="http://placehold.it/600x450/C50000/ffffff.png&text=600x450"><img src="http://placehold.it/100x100/C50000/ffffff.png&text=100x100" width="100" height="100" /></a>
-</div>
-
- - -

Slideshow

- - -
-

Fully responsive slideshow. Touch enabled. Uses the awesome & highly configurable BXSlider.

-
-
    -
    • -
    • -
    • -
-
- -
-

Features

-
    -
  • Slide Any HTML Content
    • -
  • Responsive
    • -
  • Touch Enabled
    • -
  • Iframes
    • -
  • Videos
    • -
  • Images
    • -
  • Lightweight
    • -
  • Multiple Slideshows
    • -
  • Zero Setup Required
    • -
  • Unordered List (default)
    • -
-
-
- -
-
-<!-- Slideshow -->
-<ul class="slideshow">
-<li><img src="http://placehold.it/550x350/4D99E0/ffffff.png&text=550x350" width="550" height="350" /></li>
-<li><img src="http://placehold.it/550x350/75CC00/ffffff.png&text=550x350" width="550" height="350" /></li>
-<li><img src="http://placehold.it/550x350/E49800/ffffff.png&text=550x350" width="550" height="350" /></li>
-<li><h3>Slide Anything</h3><p>Lorem ipsum dolor sit amet, consectetuer adipiscing elit, 
-sed diam nonummy nibh euismod tincidunt ut laoreet dolore magna aliquam erat volutpat.</p></li>
-</ul>
-
- - - -

Forms

- - -
-

Form.vertical

-
- - - - - - - - - - - - - - - - - -
- -
- - - - - - -
- Checkboxes -
-
- -
- -
- Radios -
-
- -
- - - -
- -
-
This is an Error Notice -
-
This is a Warning Notice -
-
This is a Success Notice -
- - - - - -
-
-
- -
-

Inline Form Fields (default)

-
- - - -   - - - -
-
-
- - - -
-

Input/Label Sizes

- - - - - - - - - - - - - -
-
- -
-
-<!-- Text Field -->
-<label for="text1">Text Field</label>
-<input id="text1" type="text" />
-
-<!-- Placeholder Text -->
-<label for="text2">Placeholder</label>
-<input id="text2" type="text" placeholder="Placeholder Text" />
-
-<!-- Disabled Field -->
-<label for="text3" class="disabled">Disabled Field</label>
-<input id="text3" type="text" disabled="disabled" />
-
-<!-- Label with Right Hint -->
-<label for="text4">Label with Right Hint <span class="right">A-Z, 0-9</span></label>
-<input id="text4" type="text" />
-
-<!-- Label with Hint -->
-<label for="text5">Label with Hint <span>A-Z, 0-9</span></label>
-<input id="text5" type="text" />
-
-<!-- Text Field Error -->
-<label for="text6" class="error">Text Field (Error)</label>
-<input id="text6" class="error" type="text" />
-
- -
-
-<!-- Select -->
-<label for="select1">Select Field</label>
-<select id="select1">
-<option value="0">-- Choose --</option>
-<option value="1">Option 1</option>
-<option value="2">Option 2</option>
-<option value="3">Option 3</option>
-</select>
-
- -
-
-<!-- Checkbox -->
-<input type="checkbox" id="check1" />
-<label for="check1" class="inline">Checkbox Field</label>
-
- -
-
-<!-- Radio -->
-<input type="radio" name="radio" id="radio1" />
-<label for="radio1" class="inline">Option1</label>
-
- -
-
-<!-- Fieldset -->
-<fieldset>
-<legend>Checkboxes</legend>
-	<!-- Form Fields Here -->
-</fieldset>
-
- -
-
-<!-- Textarea -->
-<textarea id="textarea1" placeholder="Placeholder Text"></textarea>
-
- -
-
-<!-- Error -->
-<div class="notice error"><i class="icon-remove-sign icon-large"></i> This is an Error Notice 
-<a href="#close" class="icon-remove"></a></div>
-
-<!-- Warning -->
-<div class="notice warning"><i class="icon-warning-sign icon-large"></i> This is a Warning Notice 
-<a href="#close" class="icon-remove"></a></div>
-
-<!-- Success -->
-<div class="notice success"><i class="icon-ok icon-large"></i> This is a Success Notice 
-<a href="#close" class="icon-remove"></a></div>
-
- - -

Extras/Helpers

- - -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
ItemDescription
.left .center .rightAlign Text
a.lightboxOpen Link in lightbox. Auto Detects, iframe, inline content, etc.
.clearAdd this class to a div or other element to clear floats.
.clearfixAdd this class to containers that have floating children inside to clear inner floats.
li.first li.lastFirst and Last <li></li> items automatically get classes .first and .last respectively.
.columnAll columns have the class .column added to them automatically for easy global styling.
.visibleAdd this to columns to view during production. Adds light grey background color to columns.
.hide .show.hide to hide content (display:none). .show to show content (display:block).
tr.first tr.lastFirst and Last <tr></tr> items automatically get classes .first and .last respectively.
tr.altEvery second table row automatically gets class .alt.
-
- - -
- -
-
- Download (Github) - - -
-

Downloaded over 91036 Times :)

-
-
- - -
-
- -
-

99Lime Announcements and Releases.

- - - -
- -
- - -
-
-
- - - - -
- - - - - DELETED cgisetup/www/example.html Index: cgisetup/www/example.html ================================================================== --- cgisetup/www/example.html +++ /dev/null @@ -1,116 +0,0 @@ - - -HTML KickStart Elements - - - - - - - - - - - - - -
- - - -
-
-

Paragraphs

-

- Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod - tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis - nostrud exerci tation ullamcorper suscipit lobortis nisl ut aliquip ex ea commodo consequat. - Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat

- -

El illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio - dignissim qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam - liber tempor cum soluta nobis eleifend <h1>Sample Code</h1> option - congue nihil imperdiet doming id quod mazim placerat facer possim assum.

- -

- Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore - magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis - nisl ut aliquip ex ea commodo consequat. Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse - molestie consequat, vel illum dolore eu feugiat nulla facilisis at vero eros et accumsan et iusto odio dignissim - qui blandit praesent luptatum zzril delenit augue duis dolore te feugait nulla facilisi. Nam liber tempor cum - soluta nobis eleifend option congue nihil imperdiet doming id quod mazim placerat facer possim assum.

-
- -
-
Icon List
-
    -
  • Apple
    • -
  • Banana
    • -
  • Orange
    • -
  • Pear
    • -
- -
Sample Icons
- - - - - -
Button w/Icon
- RSS -
- -
- -
-

Column

-

Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore - magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis

-
- -
-

Column

-

Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore - magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis

-
- -
-

Column

-

Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore - magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis

-
- -
-

Column

-

Lorem ipsum dolor sit amet, consectetuer adipiscing elit, sed diam nonummy nibh euismod tincidunt ut laoreet dolore - magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis nostrud exerci tation ullamcorper suscipit lobortis

-
-
- -
- - -
- - - DELETED cgisetup/www/index.html Index: cgisetup/www/index.html ================================================================== --- cgisetup/www/index.html +++ /dev/null @@ -1,6 +0,0 @@ - -blah - -Hello - - DELETED cgisetup/www/js/kickstart.js Index: cgisetup/www/js/kickstart.js ================================================================== --- cgisetup/www/js/kickstart.js +++ /dev/null @@ -1,424 +0,0 @@ -/* - 99Lime.com HTML KickStart by Joshua Gatcke - kickstart.js -*/ - -jQuery(document).ready(function($){ - - /*--------------------------------- - MENU Dropdowns - -----------------------------------*/ - $('ul.menu').each(function(){ - // add the menu toggle - $(this).prepend('
  • Menu
    • '); - - // find menu items with children. - $(this).find('li').has('ul').addClass('has-menu') - .find('a:first').append(' '); - }); - - $('ul.menu li').hover(function(){ - $(this).find('ul:first').stop(true, true).fadeIn('fast'); - $(this).addClass('hover'); - }, - function(){ - $(this).find('ul').stop(true, true).fadeOut('slow'); - $(this).removeClass('hover'); - }); - - /*--------------------------------- - Slideshow - -----------------------------------*/ - $('.slideshow').bxSlider({ - mode: 'horizontal', // 'horizontal', 'vertical', 'fade' - video: true, - useCSS: true, - pager: true, - speed: 500, // transition time - startSlide: 0, - infiniteLoop: true, - captions: true, - adaptiveHeight: false, - touchEnabled: true, - pause: 4000, - autoControls: false, - controls: false, - autoStart: true, - auto: true - }); - - /*--------------------------------- - Fancybox Lightbox - -----------------------------------*/ - $('.gallery').each(function(i){ - $(this).find('a').attr('rel', 'gallery'+i) - .fancybox({ - overlayOpacity: 0.2, - overlayColor: '#000' - }); - }); - - // lightbox links - $('a.lightbox').fancybox({ - overlayOpacity: 0.2, - overlayColor: '#000' - }); - - /*--------------------------------- - Tabs - -----------------------------------*/ - // tab setup - $('.tab-content').addClass('clearfix').not(':first').hide(); - $('ul.tabs').each(function(){ - var current = $(this).find('li.current'); - if(current.length < 1) { $(this).find('li:first').addClass('current'); } - current = $(this).find('li.current a').attr('href'); - $(current).show(); - }); - - // tab click - $(document).on('click', 'ul.tabs a[href^="#"]', function(e){ - e.preventDefault(); - var tabs = $(this).parents('ul.tabs').find('li'); - var tab_next = $(this).attr('href'); - var tab_current = tabs.filter('.current').find('a').attr('href'); - $(tab_current).hide(); - tabs.removeClass('current'); - $(this).parent().addClass('current'); - $(tab_next).show(); - history.pushState( null, null, window.location.search + $(this).attr('href') ); - return false; - }); - - // tab hashtag identification and auto-focus - var wantedTag = window.location.hash; - if (wantedTag != "") - { - // This code can and does fail, hard, killing the entire app. - // Esp. when used with the jQuery.Address project. - try { - var allTabs = $("ul.tabs a[href^=" + wantedTag + "]").parents('ul.tabs').find('li'); - var defaultTab = allTabs.filter('.current').find('a').attr('href'); - $(defaultTab).hide(); - allTabs.removeClass('current'); - $("ul.tabs a[href^=" + wantedTag + "]").parent().addClass('current'); - $("#" + wantedTag.replace('#','')).show(); - } catch(e) { - // I have no idea what to do here, so I'm leaving this for the maintainer. - } - } - - /*--------------------------------- - Image Caption - -----------------------------------*/ - $('img.caption').each(function(){ - $(this).wrap('
    '); - $(this).parents('div.caption') - .attr('class', 'img-wrap '+$(this).attr('class')); - if($(this).attr('title')){ - $(this).parents('div.caption') - .append(''+$(this).attr('title')+''); - } - }); - - /*--------------------------------- - Notice - -----------------------------------*/ - $(document).on('click', '.notice a[class^="icon-remove"]', function(e){ - e.preventDefault(); - var notice = $(this).parents('.notice'); - $(this).hide(); - notice.fadeOut('slow'); - }); - - /*--------------------------------- - ToolTip - TipTip - -----------------------------------*/ - - // Standard tooltip - $('.tooltip, .tooltip-top, .tooltip-bottom, .tooltip-right, .tooltip-left').each(function(){ - // variables - var tpos = 'top'; - var content = $(this).attr('title'); - var dataContent = $(this).attr('data-content'); - var keepAlive = false; - var action = 'hover'; - var delay = $(this).attr('data-delay'); - if (delay === undefined) {delay = 1000;} - - // position - if($(this).hasClass('tooltip-top')) { tpos = 'top'; } - if($(this).hasClass('tooltip-right')) { tpos = 'right'; } - if($(this).hasClass('tooltip-bottom')) { tpos = 'bottom'; } - if($(this).hasClass('tooltip-left')) { tpos = 'left'; } - - // content - $('.tooltip-content').removeClass('hide').wrap('
    '); - if(dataContent) { content = $(dataContent).html(); keepAlive = true; } - - // action (hover or click) defaults to hover - if($(this).attr('data-action') == 'click') { action = 'click'; } - - // tooltip - $(this).attr('title','') - .tipTip({defaultPosition: tpos, content: content, keepAlive: keepAlive, activation: action, delay: delay}); - }); - - /*--------------------------------- - Table Sort - -----------------------------------*/ - // init - var aAsc = []; - $('table.sortable').each(function(){ - $(this).find('thead th').each(function(index){$(this).attr('rel', index);}); - $(this).find('th,td').each(function(){$(this).attr('value', $(this).text());}); - }); - - // table click - $(document).on('click', 'table.sortable thead th', function(e){ - // update arrow icon - $(this).parents('table.sortable').find('span.arrow').remove(); - $(this).append(''); - - // sort direction - var nr = $(this).attr('rel'); - aAsc[nr] = aAsc[nr]=='asc'?'desc':'asc'; - if(aAsc[nr] == 'desc'){ $(this).find('span.arrow').addClass('up'); } - - // sort rows - var rows = $(this).parents('table.sortable').find('tbody tr'); - rows.tsort('td:eq('+nr+')',{order:aAsc[nr],attr:'value'}); - - // fix row classes - rows.removeClass('alt first last'); - var table = $(this).parents('table.sortable'); - table.find('tr:even').addClass('alt'); - table.find('tr:first').addClass('first'); - table.find('tr:last').addClass('last'); - }); - - /*--------------------------------- - CSS Helpers - -----------------------------------*/ - $('input[type=checkbox]').addClass('checkbox'); - $('input[type=radio]').addClass('radio'); - $('input[type=file]').addClass('file'); - $('[disabled=disabled]').addClass('disabled'); - $('table').find('tr:even').addClass('alt'); - $('table').find('tr:first-child').addClass('first'); - $('table').find('tr:last-child').addClass('last'); - $('ul').find('li:first-child').addClass('first'); - $('ul').find('li:last-child').addClass('last'); - $('hr').before('
     
    '); - $('[class*="col_"]').addClass('column'); - $('pre').addClass('prettyprint');prettyPrint(); - -}); - -/* - * FancyBox - jQuery Plugin - * Simple and fancy lightbox alternative - * - * Examples and documentation at: http://fancybox.net - * - * Copyright (c) 2008 - 2010 Janis Skarnelis - * That said, it is hardly a one-person project. Many people have submitted bugs, code, and offered their advice freely. Their support is greatly appreciated. - * - * Version: 1.3.4 (11/11/2010) - * Requires: jQuery v1.3+ - * - * Dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - */ -(function(a){var p,u,v,e,B,m,C,j,y,z,s=0,d={},q=[],r=0,c={},k=[],E=null,n=new Image,H=/\.(jpg|gif|png|bmp|jpeg)(.*)?$/i,S=/[^\.]\.(swf)\s*$/i,I,J=1,x=0,w="",t,g,l=!1,A=a.extend(a("
    ")[0],{prop:0}),K=navigator.userAgent.match(/msie [6]/i)&&!window.XMLHttpRequest,L=function(){u.hide();n.onerror=n.onload=null;E&&E.abort();p.empty()},M=function(){!1===d.onError(q,s,d)?(u.hide(),l=!1):(d.titleShow=!1,d.width="auto",d.height="auto",p.html('

    The requested content cannot be loaded.
    Please try again later.

    '), -D())},G=function(){var b=q[s],c,f,e,g,k,j;L();d=a.extend({},a.fn.fancybox.defaults,"undefined"==typeof a(b).data("fancybox")?d:a(b).data("fancybox"));j=d.onStart(q,s,d);if(!1===j)l=!1;else{"object"==typeof j&&(d=a.extend(d,j));e=d.title||(b.nodeName?a(b).attr("title"):b.title)||"";b.nodeName&&!d.orig&&(d.orig=a(b).children("img:first").length?a(b).children("img:first"):a(b));""===e&&(d.orig&&d.titleFromAlt)&&(e=d.orig.attr("alt"));c=d.href||(b.nodeName?a(b).attr("href"):b.href)||null;if(/^(?:javascript)/i.test(c)|| -"#"==c)c=null;d.type?(f=d.type,c||(c=d.content)):d.content?f="html":c&&(f=c.match(H)?"image":c.match(S)?"swf":a(b).hasClass("iframe")?"iframe":0===c.indexOf("#")?"inline":"ajax");if(f)switch("inline"==f&&(b=c.substr(c.indexOf("#")),f=0').hide().insertBefore(a(b)).bind("fancybox-cleanup",function(){a(this).replaceWith(m.children())}).bind("fancybox-cancel", -function(){a(this).replaceWith(p.children())});a(b).appendTo(p);D();break;case "image":l=!1;a.fancybox.showActivity();n=new Image;n.onerror=function(){M()};n.onload=function(){l=!0;n.onerror=n.onload=null;d.width=n.width;d.height=n.height;a("").attr({id:"fancybox-img",src:n.src,alt:d.title}).appendTo(p);N()};n.src=c;break;case "swf":d.scrolling="no";g=''; -k="";a.each(d.swf,function(a,b){g+='';k+=" "+a+'="'+b+'"'});g+='";p.html(g);D();break;case "ajax":l=!1;a.fancybox.showActivity();d.ajax.win=d.ajax.success;E=a.ajax(a.extend({},d.ajax,{url:c,data:d.ajax.data||{},error:function(a){0
    ');d.width=p.width();d.height=p.height();N()},N=function(){var b,h;u.hide();if(e.is(":visible")&&!1===c.onCleanup(k,r,c))a.event.trigger("fancybox-cancel"),l=!1;else{l=!0;a(m.add(v)).unbind();a(window).unbind("resize.fb scroll.fb");a(document).unbind("keydown.fb");e.is(":visible")&&"outside"!==c.titlePosition&&e.css("height",e.height());k=q;r=s;c=d;if(c.overlayShow){if(v.css({"background-color":c.overlayColor,opacity:c.overlayOpacity, -cursor:c.hideOnOverlayClick?"pointer":"auto",height:a(document).height()}),!v.is(":visible")){if(K)a("select:not(#fancybox-tmp select)").filter(function(){return"hidden"!==this.style.visibility}).css({visibility:"hidden"}).one("fancybox-cleanup",function(){this.style.visibility="inherit"});v.show()}}else v.hide();b=O();var f={},F=c.autoScale,n=2*c.padding;f.width=-1b[0]||f.height>b[1]))"image"==d.type||"swf"==d.type?(F=c.width/c.height,f.width>b[0]&&(f.width=b[0],f.height=parseInt((f.width-n)/F+n,10)),f.height>b[1]&&(f.height=b[1],f.width=parseInt((f.height-n)*F+n,10))):(f.width=Math.min(f.width,b[0]),f.height=Math.min(f.height,b[1]));f.top=parseInt(Math.max(b[3]-20,b[3]+0.5*(b[1]-f.height-40)),10);f.left=parseInt(Math.max(b[2]-20,b[2]+0.5*(b[0]-f.width-40)),10);g=f;w=c.title||"";x=0;j.empty().removeAttr("style").removeClass(); -if(!1!==c.titleShow&&(w=a.isFunction(c.titleFormat)?c.titleFormat(w,k,r,c):w&&w.length?"float"==c.titlePosition?'
    '+w+'
    ':'
    '+w+"
    ":!1)&&""!==w)switch(j.addClass("fancybox-title-"+c.titlePosition).html(w).appendTo("body").show(),c.titlePosition){case "inside":j.css({width:g.width- -2*c.padding,marginLeft:c.padding,marginRight:c.padding});x=j.outerHeight(!0);j.appendTo(B);g.height+=x;break;case "over":j.css({marginLeft:c.padding,width:g.width-2*c.padding,bottom:c.padding}).appendTo(B);break;case "float":j.css("left",-1*parseInt((j.width()-g.width-40)/2,10)).appendTo(e);break;default:j.css({width:g.width-2*c.padding,paddingLeft:c.padding,paddingRight:c.padding}).appendTo(e)}j.hide();e.is(":visible")?(a(C.add(y).add(z)).hide(),b=e.position(),t={top:b.top,left:b.left,width:e.width(), -height:e.height()},h=t.width==g.width&&t.height==g.height,m.fadeTo(c.changeFade,0.3,function(){var b=function(){m.html(p.contents()).fadeTo(c.changeFade,1,P)};a.event.trigger("fancybox-change");m.empty().removeAttr("filter").css({"border-width":c.padding,width:g.width-2*c.padding,height:d.autoDimensions?"auto":g.height-x-2*c.padding});h?b():(A.prop=0,a(A).animate({prop:1},{duration:c.changeSpeed,easing:c.easingChange,step:Q,complete:b}))})):(e.removeAttr("style"),m.css("border-width",c.padding),"elastic"== -c.transitionIn?(t=R(),m.html(p.contents()),e.show(),c.opacity&&(g.opacity=0),A.prop=0,a(A).animate({prop:1},{duration:c.speedIn,easing:c.easingIn,step:Q,complete:P})):("inside"==c.titlePosition&&0').appendTo(m);e.show();l=!1;a.fancybox.center();c.onComplete(k,r,c);var b,h;k.length-1>r&&(b=k[r+1].href,"undefined"!==typeof b&&b.match(H)&&(h=new Image,h.src=b));0b?0.5:b);e.css(a);m.css({width:a.width-2*c.padding,height:a.height-x*b-2*c.padding})},O=function(){return[a(window).width()-2*c.margin,a(window).height()-2*c.margin,a(document).scrollLeft()+c.margin,a(document).scrollTop()+c.margin]},R=function(){var b=d.orig?a(d.orig):!1,h={};b&&b.length?(h=b.offset(),h.top+=parseInt(b.css("paddingTop"),10)||0,h.left+=parseInt(b.css("paddingLeft"),10)||0,h.top+=parseInt(b.css("border-top-width"),10)||0,h.left+= -parseInt(b.css("border-left-width"),10)||0,h.width=b.width(),h.height=b.height(),h={width:h.width+2*c.padding,height:h.height+2*c.padding,top:h.top-c.padding-20,left:h.left-c.padding-20}):(b=O(),h={width:2*c.padding,height:2*c.padding,top:parseInt(b[3]+0.5*b[1],10),left:parseInt(b[2]+0.5*b[0],10)});return h},T=function(){u.is(":visible")?(a("div",u).css("top",-40*J+"px"),J=(J+1)%12):clearInterval(I)};a.fn.fancybox=function(b){if(!a(this).length)return this;a(this).data("fancybox",a.extend({},b,a.metadata? -a(this).metadata():{})).unbind("click.fb").bind("click.fb",function(b){b.preventDefault();l||(l=!0,a(this).blur(),q=[],s=0,b=a(this).attr("rel")||"",!b||""==b||"nofollow"===b?q.push(this):(q=a("a[rel="+b+"], area[rel="+b+"], img[rel="+b+"]"),s=q.index(this)),G())});return this};a.fancybox=function(b,c){var d;if(!l){l=!0;d="undefined"!==typeof c?c:{};q=[];s=parseInt(d.index,10)||0;if(a.isArray(b)){for(var e=0,g=b.length;eq.length||0>s)s=0;G()}};a.fancybox.showActivity=function(){clearInterval(I);u.show();I=setInterval(T,66)};a.fancybox.hideActivity=function(){u.hide()};a.fancybox.next=function(){return a.fancybox.pos(r+1)};a.fancybox.prev=function(){return a.fancybox.pos(r-1)};a.fancybox.pos=function(b){l||(b=parseInt(b), -q=k,-1=k.length?0:k.length-1,G()))};a.fancybox.cancel=function(){l||(l=!0,a.event.trigger("fancybox-cancel"),L(),d.onCancel(q,s,d),l=!1)};a.fancybox.close=function(){function b(){v.fadeOut("fast");j.empty().hide();e.hide();a.event.trigger("fancybox-cleanup");m.empty();c.onClosed(k,r,c);k=d=[];r=s=0;c=d={};l=!1}if(!l&&!e.is(":hidden"))if(l=!0,c&&!1===c.onCleanup(k,r,c))l=!1;else if(L(),a(C.add(y).add(z)).hide(),a(m.add(v)).unbind(),a(window).unbind("resize.fb scroll.fb"), -a(document).unbind("keydown.fb"),m.find("iframe").attr("src",K&&/^https/i.test(window.location.href||"")?"javascript:void(false)":"about:blank"),"inside"!==c.titlePosition&&j.empty(),e.stop(),"elastic"==c.transitionOut){t=R();var h=e.position();g={top:h.top,left:h.left,width:e.width(),height:e.height()};c.opacity&&(g.opacity=1);j.empty().hide();A.prop=1;a(A).animate({prop:0},{duration:c.speedOut,easing:c.easingOut,step:Q,complete:b})}else e.fadeOut("none"==c.transitionOut?0:c.speedOut,b)};a.fancybox.resize= -function(){v.is(":visible")&&v.css("height",a(document).height());a.fancybox.center(!0)};a.fancybox.center=function(b){var a,d;if(!l&&(d=!0===b?1:0,a=O(),d||!(e.width()>a[0]||e.height()>a[1])))e.stop().animate({top:parseInt(Math.max(a[3]-20,a[3]+0.5*(a[1]-m.height()-40)-c.padding)),left:parseInt(Math.max(a[2]-20,a[2]+0.5*(a[0]-m.width()-40)-c.padding))},"number"==typeof b?b:200)};a.fancybox.init=function(){a("#fancybox-wrap").length||(a("body").append(p=a('
    '),u=a('
    '), -v=a('
    '),e=a('
    ')),B=a('
    ').append('
    ').appendTo(e), -B.append(m=a('
    '),C=a(''),j=a('
    '),y=a(''),z=a('')),C.click(a.fancybox.close),u.click(a.fancybox.cancel),y.click(function(b){b.preventDefault();a.fancybox.prev()}),z.click(function(b){b.preventDefault();a.fancybox.next()}), -a.fn.mousewheel&&e.bind("mousewheel.fb",function(b,c){if(l)b.preventDefault();else if(0==a(b.target).get(0).clientHeight||a(b.target).get(0).scrollHeight===a(b.target).get(0).clientHeight)b.preventDefault(),a.fancybox[0').prependTo(B)))}; -a.fn.fancybox.defaults={padding:10,margin:40,opacity:!1,modal:!1,cyclic:!1,scrolling:"auto",width:560,height:340,autoScale:!0,autoDimensions:!0,centerOnScroll:!1,ajax:{},swf:{wmode:"transparent"},hideOnOverlayClick:!0,hideOnContentClick:!1,overlayShow:!0,overlayOpacity:0.7,overlayColor:"#777",titleShow:!0,titlePosition:"float",titleFormat:null,titleFromAlt:!1,transitionIn:"fade",transitionOut:"fade",speedIn:300,speedOut:300,changeSpeed:300,changeFade:"fast",easingIn:"swing",easingOut:"swing",showCloseButton:!0, -showNavArrows:!0,enableEscapeButton:!0,enableKeyboardNav:!0,onStart:function(){},onCancel:function(){},onComplete:function(){},onCleanup:function(){},onClosed:function(){},onError:function(){}};a(document).ready(function(){a.fancybox.init()})})(jQuery); - - - /* - * TipTip - * Copyright 2010 Drew Wilson - * www.drewwilson.com - * code.drewwilson.com/entry/tiptip-jquery-plugin - * - * Version 1.3 - Updated: Mar. 23, 2010 - * - * This Plug-In will create a custom tooltip to replace the default - * browser tooltip. It is extremely lightweight and very smart in - * that it detects the edges of the browser window and will make sure - * the tooltip stays within the current window size. As a result the - * tooltip will adjust itself to be displayed above, below, to the left - * or to the right depending on what is necessary to stay within the - * browser window. It is completely customizable as well via CSS. - * - * This TipTip jQuery plug-in is dual licensed under the MIT and GPL licenses: - * http://www.opensource.org/licenses/mit-license.php - * http://www.gnu.org/licenses/gpl.html - */ -(function($){$.fn.tipTip=function(options){var defaults={activation:"hover",keepAlive:false,maxWidth:"200px",edgeOffset:3,defaultPosition:"bottom",delay:400,fadeIn:200,fadeOut:200,attribute:"title",content:false,enter:function(){},exit:function(){}};var opts=$.extend(defaults,options);if($("#tiptip_holder").length<=0){var tiptip_holder=$('
    ');var tiptip_content=$('
    ');var tiptip_arrow=$('
    ');$("body").append(tiptip_holder.html(tiptip_content).prepend(tiptip_arrow.html('
    ')))}else{var tiptip_holder=$("#tiptip_holder");var tiptip_content=$("#tiptip_content");var tiptip_arrow=$("#tiptip_arrow")}return this.each(function(){var org_elem=$(this);if(opts.content){var org_title=opts.content}else{var org_title=org_elem.attr(opts.attribute)}if(org_title!=""){if(!opts.content){org_elem.removeAttr(opts.attribute)}var timeout=false;if(opts.activation=="hover"){org_elem.hover(function(){active_tiptip()},function(){if(!opts.keepAlive){deactive_tiptip()}});if(opts.keepAlive){tiptip_holder.hover(function(){},function(){deactive_tiptip()})}}else if(opts.activation=="focus"){org_elem.focus(function(){active_tiptip()}).blur(function(){deactive_tiptip()})}else if(opts.activation=="click"){org_elem.click(function(){active_tiptip();return false}).hover(function(){},function(){if(!opts.keepAlive){deactive_tiptip()}});if(opts.keepAlive){tiptip_holder.hover(function(){},function(){deactive_tiptip()})}}function active_tiptip(){opts.enter.call(this);tiptip_content.html(org_title);tiptip_holder.hide().removeAttr("class").css("margin","0");tiptip_arrow.removeAttr("style");var top=parseInt(org_elem.offset()['top']);var left=parseInt(org_elem.offset()['left']);var org_width=parseInt(org_elem.outerWidth());var org_height=parseInt(org_elem.outerHeight());var tip_w=tiptip_holder.outerWidth();var tip_h=tiptip_holder.outerHeight();var w_compare=Math.round((org_width-tip_w)/2);var h_compare=Math.round((org_height-tip_h)/2);var marg_left=Math.round(left+w_compare);var marg_top=Math.round(top+org_height+opts.edgeOffset);var t_class="";var arrow_top="";var arrow_left=Math.round(tip_w-12)/2;if(opts.defaultPosition=="bottom"){t_class="_bottom"}else if(opts.defaultPosition=="top"){t_class="_top"}else if(opts.defaultPosition=="left"){t_class="_left"}else if(opts.defaultPosition=="right"){t_class="_right"}var right_compare=(w_compare+left)parseInt($(window).width());if((right_compare&&w_compare<0)||(t_class=="_right"&&!left_compare)||(t_class=="_left"&&left<(tip_w+opts.edgeOffset+5))){t_class="_right";arrow_top=Math.round(tip_h-13)/2;arrow_left=-12;marg_left=Math.round(left+org_width+opts.edgeOffset);marg_top=Math.round(top+h_compare)}else if((left_compare&&w_compare<0)||(t_class=="_left"&&!right_compare)){t_class="_left";arrow_top=Math.round(tip_h-13)/2;arrow_left=Math.round(tip_w);marg_left=Math.round(left-(tip_w+opts.edgeOffset+5));marg_top=Math.round(top+h_compare)}var top_compare=(top+org_height+opts.edgeOffset+tip_h+8)>parseInt($(window).height()+$(window).scrollTop());var bottom_compare=((top+org_height)-(opts.edgeOffset+tip_h+8))<0;if(top_compare||(t_class=="_bottom"&&top_compare)||(t_class=="_top"&&!bottom_compare)){if(t_class=="_top"||t_class=="_bottom"){t_class="_top"}else{t_class=t_class+"_top"}arrow_top=tip_h;marg_top=Math.round(top-(tip_h+5+opts.edgeOffset))}else if(bottom_compare|(t_class=="_top"&&bottom_compare)||(t_class=="_bottom"&&!top_compare)){if(t_class=="_top"||t_class=="_bottom"){t_class="_bottom"}else{t_class=t_class+"_bottom"}arrow_top=-12;marg_top=Math.round(top+org_height+opts.edgeOffset)}if(t_class=="_right_top"||t_class=="_left_top"){marg_top=marg_top+5}else if(t_class=="_right_bottom"||t_class=="_left_bottom"){marg_top=marg_top-5}if(t_class=="_left_top"||t_class=="_left_bottom"){marg_left=marg_left+5}tiptip_arrow.css({"margin-left":arrow_left+"px","margin-top":arrow_top+"px"});tiptip_holder.css({"margin-left":marg_left+"px","margin-top":marg_top+"px"}).attr("class","tip"+t_class);if(timeout){clearTimeout(timeout)}timeout=setTimeout(function(){tiptip_holder.stop(true,true).fadeIn(opts.fadeIn)},opts.delay)}function deactive_tiptip(){opts.exit.call(this);if(timeout){clearTimeout(timeout)}tiptip_holder.fadeOut(opts.fadeOut)}}})}})(jQuery); - -/* TINY SORT */ -(function(e){var a=false,g=null,f=parseFloat,b=/(\d+\.?\d*)$/g;e.tinysort={id:"TinySort",version:"1.2.18",copyright:"Copyright (c) 2008-2012 Ron Valstar",uri:"http://tinysort.sjeiti.com/",licenced:{MIT:"http://www.opensource.org/licenses/mit-license.php",GPL:"http://www.gnu.org/licenses/gpl.html"},defaults:{order:"asc",attr:g,data:g,useVal:a,place:"start",returns:a,cases:a,forceStrings:a,sortFunction:g}};e.fn.extend({tinysort:function(m,h){if(m&&typeof(m)!="string"){h=m;m=g}var n=e.extend({},e.tinysort.defaults,h),s,B=this,x=e(this).length,C={},p=!(!m||m==""),q=!(n.attr===g||n.attr==""),w=n.data!==g,j=p&&m[0]==":",k=j?B.filter(m):B,r=n.sortFunction,v=n.order=="asc"?1:-1,l=[];if(!r){r=n.order=="rand"?function(){return Math.random()<0.5?1:-1}:function(F,E){var i=!n.cases?d(F.s):F.s,K=!n.cases?d(E.s):E.s;if(!n.forceStrings){var H=i.match(b),G=K.match(b);if(H&&G){var J=i.substr(0,i.length-H[0].length),I=K.substr(0,K.length-G[0].length);if(J==I){i=f(H[0]);K=f(G[0])}}}return v*(iK?1:0))}}B.each(function(G,H){var I=e(H),E=p?(j?k.filter(H):I.find(m)):I,J=w?E.data(n.data):(q?E.attr(n.attr):(n.useVal?E.val():E.text())),F=I.parent();if(!C[F]){C[F]={s:[],n:[]}}if(E.length>0){C[F].s.push({s:J,e:I,n:G})}else{C[F].n.push({e:I,n:G})}});for(s in C){C[s].s.sort(r)}for(s in C){var y=C[s],A=[],D=x,u=[0,0],z;switch(n.place){case"first":e.each(y.s,function(E,F){D=Math.min(D,F.n)});break;case"org":e.each(y.s,function(E,F){A.push(F.n)});break;case"end":D=y.n.length;break;default:D=0}for(z=0;z=D&&z
    ').parent('.fluid-width-video-wrapper').css('padding-top', (aspectRatio * 100)+"%"); - $this.removeAttr('height').removeAttr('width'); - }); - }); - }; -})( jQuery ); - - -/** - * BxSlider v4.0 - Fully loaded, responsive content slider - * http://bxslider.com - * - * Copyright 2012, Steven Wanderski - http://stevenwanderski.com - http://bxcreative.com - * Written while drinking Belgian ales and listening to jazz - * - * Released under the WTFPL license - http://sam.zoy.org/wtfpl/ - */ -(function(t){var e={},n={mode:"horizontal",slideSelector:"",infiniteLoop:!0,hideControlOnEnd:!1,speed:500,easing:null,slideMargin:0,startSlide:0,randomStart:!1,captions:!1,ticker:!1,tickerHover:!1,adaptiveHeight:!1,adaptiveHeightSpeed:500,touchEnabled:!0,swipeThreshold:50,video:!1,useCSS:!0,pager:!0,pagerType:"full",pagerShortSeparator:" / ",pagerSelector:null,buildPager:null,pagerCustom:null,controls:!0,nextText:"Next",prevText:"Prev",nextSelector:null,prevSelector:null,autoControls:!1,startText:"Start",stopText:"Stop",autoControlsCombine:!1,autoControlsSelector:null,auto:!1,pause:4e3,autoStart:!0,autoDirection:"next",autoHover:!1,autoDelay:0,minSlides:1,maxSlides:1,moveSlides:0,slideWidth:0,onSliderLoad:function(){},onSlideBefore:function(){},onSlideAfter:function(){},onSlideNext:function(){},onSlidePrev:function(){}};t.fn.bxSlider=function(s){if(0!=this.length){if(this.length>1)return this.each(function(){t(this).bxSlider(s)}),this;var o={},r=this;e.el=this;var a=t(window).width(),l=t(window).height(),d=function(){o.settings=t.extend({},n,s),o.children=r.children(o.settings.slideSelector),o.children.length1||o.settings.maxSlides>1,o.minThreshold=o.settings.minSlides*o.settings.slideWidth+(o.settings.minSlides-1)*o.settings.slideMargin,o.maxThreshold=o.settings.maxSlides*o.settings.slideWidth+(o.settings.maxSlides-1)*o.settings.slideMargin,o.working=!1,o.controls={},o.interval=null,o.animProp="vertical"==o.settings.mode?"top":"left",o.usingCSS=o.settings.useCSS&&"fade"!=o.settings.mode&&function(){var t=document.createElement("div"),e=["WebkitPerspective","MozPerspective","OPerspective","msPerspective"];for(var i in e)if(void 0!==t.style[e[i]])return o.cssPrefix=e[i].replace("Perspective","").toLowerCase(),o.animProp="-"+o.cssPrefix+"-transform",!0;return!1}(),"vertical"==o.settings.mode&&(o.settings.maxSlides=o.settings.minSlides),c()},c=function(){if(r.wrap('
    '),o.viewport=r.parent(),o.loader=t('
    '),o.viewport.prepend(o.loader),r.css({width:"horizontal"==o.settings.mode?215*o.children.length+"%":"auto",position:"relative"}),o.usingCSS&&o.settings.easing?r.css("-"+o.cssPrefix+"-transition-timing-function",o.settings.easing):o.settings.easing||(o.settings.easing="swing"),o.viewport.css({width:"100%",overflow:"hidden",position:"relative"}),o.children.css({"float":"horizontal"==o.settings.mode?"left":"none",listStyle:"none",position:"relative"}),o.children.width(h()),"horizontal"==o.settings.mode&&o.settings.slideMargin>0&&o.children.css("marginRight",o.settings.slideMargin),"vertical"==o.settings.mode&&o.settings.slideMargin>0&&o.children.css("marginBottom",o.settings.slideMargin),"fade"==o.settings.mode&&(o.children.css({position:"absolute",zIndex:0,display:"none"}),o.children.eq(o.settings.startSlide).css({zIndex:50,display:"block"})),o.controls.el=t('
    '),o.settings.captions&&T(),o.settings.infiniteLoop&&"fade"!=o.settings.mode&&!o.settings.ticker){var e="vertical"==o.settings.mode?o.settings.minSlides:o.settings.maxSlides,i=o.children.slice(0,e).clone().addClass("bx-clone"),n=o.children.slice(-e).clone().addClass("bx-clone");r.append(i).prepend(n)}o.active.last=o.settings.startSlide==v()-1,o.settings.video&&r.fitVids(),o.settings.ticker||(o.settings.pager&&S(),o.settings.controls&&b(),o.settings.auto&&o.settings.autoControls&&w(),(o.settings.controls||o.settings.autoControls||o.settings.pager)&&o.viewport.after(o.controls.el)),r.children().imagesLoaded(function(){o.loader.remove(),f(),"vertical"==o.settings.mode&&(o.settings.adaptiveHeight=!0),o.viewport.height(g()),o.settings.onSliderLoad(o.active.index),o.initialized=!0,t(window).bind("resize",O),o.settings.auto&&o.settings.autoStart&&L(),o.settings.ticker&&D(),o.settings.pager&&y(o.settings.startSlide),o.settings.controls&&q(),o.settings.touchEnabled&&!o.settings.ticker&&H()})},g=function(){var e=0,n=t();if("vertical"==o.settings.mode||o.settings.adaptiveHeight)if(o.carousel){var s=1==o.settings.moveSlides?o.active.index:o.active.index*p();for(n=o.children.eq(s),i=1;o.settings.maxSlides-1>=i;i++)n=s+i>=o.children.length?n.add(o.children.eq(i-1)):n.add(o.children.eq(s+i))}else n=o.children.eq(o.active.index);else n=o.children;return"vertical"==o.settings.mode?(n.each(function(){e+=t(this).outerHeight()}),o.settings.slideMargin>0&&(e+=o.settings.slideMargin*(o.settings.minSlides-1))):e=Math.max.apply(Math,n.map(function(){return t(this).outerHeight(!1)}).get()),e},h=function(){var t=o.settings.slideWidth,e=o.viewport.width();return 0==o.settings.slideWidth?t=e:e>o.maxThreshold?t=(e-o.settings.slideMargin*(o.settings.maxSlides-1))/o.settings.maxSlides:o.minThreshold>e&&(t=(e-o.settings.slideMargin*(o.settings.minSlides-1))/o.settings.minSlides),t},u=function(){var t=1;if("horizontal"==o.settings.mode)if(o.viewport.width()o.maxThreshold)t=o.settings.maxSlides;else{var e=o.children.first().width();t=Math.floor(o.viewport.width()/e)}else"vertical"==o.settings.mode&&(t=o.settings.minSlides);return t},v=function(){var t=0;if(o.settings.moveSlides>0)if(o.settings.infiniteLoop)t=o.children.length/p();else for(var e=0,i=0;o.children.length>e;)++t,e=i+u(),i+=o.settings.moveSlides<=u()?o.settings.moveSlides:u();else t=Math.ceil(o.children.length/u());return t},p=function(){return o.settings.moveSlides>0&&o.settings.moveSlides<=u()?o.settings.moveSlides:u()},f=function(){if(o.active.last&&!o.settings.infiniteLoop){if("horizontal"==o.settings.mode){var t=o.children.last(),e=t.position();x(-(e.left-(o.viewport.width()-t.width())),"reset",0)}else if("vertical"==o.settings.mode){var i=o.children.length-o.settings.minSlides,e=o.children.eq(i).position();x(-e.top,"reset",0)}}else{var e=o.children.eq(o.active.index*p()).position();o.active.index==v()-1&&(o.active.last=!0),void 0!=e&&("horizontal"==o.settings.mode?x(-e.left,"reset",0):"vertical"==o.settings.mode&&x(-e.top,"reset",0))}},x=function(t,e,i,n){if(o.usingCSS){var s="vertical"==o.settings.mode?"translate3d(0, "+t+"px, 0)":"translate3d("+t+"px, 0, 0)";r.css("-"+o.cssPrefix+"-transition-duration",i/1e3+"s"),"slide"==e?(r.css(o.animProp,s),r.bind("transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd",function(){r.unbind("transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd"),z()})):"reset"==e?r.css(o.animProp,s):"ticker"==e&&(r.css("-"+o.cssPrefix+"-transition-timing-function","linear"),r.css(o.animProp,s),r.bind("transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd",function(){r.unbind("transitionend webkitTransitionEnd oTransitionEnd MSTransitionEnd"),x(n.resetValue,"reset",0),I()}))}else{var a={};a[o.animProp]=t,"slide"==e?r.animate(a,i,o.settings.easing,function(){z()}):"reset"==e?r.css(o.animProp,t):"ticker"==e&&r.animate(a,speed,"linear",function(){x(n.resetValue,"reset",0),I()})}},m=function(){var e="";pagerQty=v();for(var i=0;pagerQty>i;i++){var n="";o.settings.buildPager&&t.isFunction(o.settings.buildPager)?(n=o.settings.buildPager(i),o.pagerEl.addClass("bx-custom-pager")):(n=i+1,o.pagerEl.addClass("bx-default-pager")),e+='
    '+n+"
    "}o.pagerEl.html(e)},S=function(){o.settings.pagerCustom?o.pagerEl=t(o.settings.pagerCustom):(o.pagerEl=t('
    '),o.settings.pagerSelector?t(o.settings.pagerSelector).html(o.pagerEl):o.controls.el.addClass("bx-has-pager").append(o.pagerEl),m()),o.pagerEl.delegate("a","click",k)},b=function(){o.controls.next=t(''+o.settings.nextText+""),o.controls.prev=t(''+o.settings.prevText+""),o.controls.next.bind("click",C),o.controls.prev.bind("click",E),o.settings.nextSelector&&t(o.settings.nextSelector).append(o.controls.next),o.settings.prevSelector&&t(o.settings.prevSelector).append(o.controls.prev),o.settings.nextSelector||o.settings.prevSelector||(o.controls.directionEl=t('
    '),o.controls.directionEl.append(o.controls.prev).append(o.controls.next),o.controls.el.addClass("bx-has-controls-direction").append(o.controls.directionEl))},w=function(){o.controls.start=t('
    '+o.settings.startText+"
    "),o.controls.stop=t('
    '+o.settings.stopText+"
    "),o.controls.autoEl=t('
    '),o.controls.autoEl.delegate(".bx-start","click",A),o.controls.autoEl.delegate(".bx-stop","click",P),o.settings.autoControlsCombine?o.controls.autoEl.append(o.controls.start):o.controls.autoEl.append(o.controls.start).append(o.controls.stop),o.settings.autoControlsSelector?t(o.settings.autoControlsSelector).html(o.controls.autoEl):o.controls.el.addClass("bx-has-controls-auto").append(o.controls.autoEl),M(o.settings.autoStart?"stop":"start")},T=function(){o.children.each(function(){var e=t(this).find("img:first").attr("title");void 0!=e&&t(this).append('
    '+e+"
    ")})},C=function(t){o.settings.auto&&r.stopAuto(),r.goToNextSlide(),t.preventDefault()},E=function(t){o.settings.auto&&r.stopAuto(),r.goToPrevSlide(),t.preventDefault()},A=function(t){r.startAuto(),t.preventDefault()},P=function(t){r.stopAuto(),t.preventDefault()},k=function(e){o.settings.auto&&r.stopAuto();var i=t(e.currentTarget),n=parseInt(i.attr("data-slide-index"));n!=o.active.index&&r.goToSlide(n),e.preventDefault()},y=function(e){return"short"==o.settings.pagerType?(o.pagerEl.html(e+1+o.settings.pagerShortSeparator+o.children.length),void 0):(o.pagerEl.find("a").removeClass("active"),o.pagerEl.each(function(i,n){t(n).find("a").eq(e).addClass("active")}),void 0)},z=function(){if(o.settings.infiniteLoop){var t="";0==o.active.index?t=o.children.eq(0).position():o.active.index==v()-1&&o.carousel?t=o.children.eq((v()-1)*p()).position():o.active.index==o.children.length-1&&(t=o.children.eq(o.children.length-1).position()),"horizontal"==o.settings.mode?x(-t.left,"reset",0):"vertical"==o.settings.mode&&x(-t.top,"reset",0)}o.working=!1,o.settings.onSlideAfter(o.children.eq(o.active.index),o.oldIndex,o.active.index)},M=function(t){o.settings.autoControlsCombine?o.controls.autoEl.html(o.controls[t]):(o.controls.autoEl.find("a").removeClass("active"),o.controls.autoEl.find("a:not(.bx-"+t+")").addClass("active"))},q=function(){!o.settings.infiniteLoop&&o.settings.hideControlOnEnd&&(0==o.active.index?(o.controls.prev.addClass("disabled"),o.controls.next.removeClass("disabled")):o.active.index==v()-1?(o.controls.next.addClass("disabled"),o.controls.prev.removeClass("disabled")):(o.controls.prev.removeClass("disabled"),o.controls.next.removeClass("disabled")))},L=function(){o.settings.autoDelay>0?setTimeout(r.startAuto,o.settings.autoDelay):r.startAuto(),o.settings.autoHover&&r.hover(function(){o.interval&&(r.stopAuto(!0),o.autoPaused=!0)},function(){o.autoPaused&&(r.startAuto(!0),o.autoPaused=null)})},D=function(){var e=0;if("next"==o.settings.autoDirection)r.append(o.children.clone().addClass("bx-clone"));else{r.prepend(o.children.clone().addClass("bx-clone"));var i=o.children.first().position();e="horizontal"==o.settings.mode?-i.left:-i.top}x(e,"reset",0),o.settings.pager=!1,o.settings.controls=!1,o.settings.autoControls=!1,o.settings.tickerHover&&!o.usingCSS&&o.viewport.hover(function(){r.stop()},function(){var e=0;o.children.each(function(){e+="horizontal"==o.settings.mode?t(this).outerWidth(!0):t(this).outerHeight(!0)});var i=o.settings.speed/e,n="horizontal"==o.settings.mode?"left":"top",s=i*(e-Math.abs(parseInt(r.css(n))));I(s)}),I()},I=function(t){speed=t?t:o.settings.speed;var e={left:0,top:0},i={left:0,top:0};"next"==o.settings.autoDirection?e=r.find(".bx-clone").first().position():i=o.children.first().position();var n="horizontal"==o.settings.mode?-e.left:-e.top,s="horizontal"==o.settings.mode?-i.left:-i.top,a={resetValue:s};x(n,"ticker",speed,a)},H=function(){o.touch={start:{x:0,y:0},end:{x:0,y:0}},o.viewport.bind("touchstart",W)},W=function(t){if(o.working)t.preventDefault();else{o.touch.originalPos=r.position();var e=t.originalEvent;o.touch.start.x=e.changedTouches[0].pageX,o.touch.start.y=e.changedTouches[0].pageY,o.viewport.bind("touchmove",N),o.viewport.bind("touchend",B)}},N=function(t){if(t.preventDefault(),"fade"!=o.settings.mode){var e=t.originalEvent,i=0;if("horizontal"==o.settings.mode){var n=e.changedTouches[0].pageX-o.touch.start.x;i=o.touch.originalPos.left+n}else{var n=e.changedTouches[0].pageY-o.touch.start.y;i=o.touch.originalPos.top+n}x(i,"reset",0)}},B=function(t){o.viewport.unbind("touchmove",N);var e=t.originalEvent,i=0;if(o.touch.end.x=e.changedTouches[0].pageX,o.touch.end.y=e.changedTouches[0].pageY,"fade"==o.settings.mode){var n=Math.abs(o.touch.start.x-o.touch.end.x);n>=o.settings.swipeThreshold&&(o.touch.start.x>o.touch.end.x?r.goToNextSlide():r.goToPrevSlide(),r.stopAuto())}else{var n=0;"horizontal"==o.settings.mode?(n=o.touch.end.x-o.touch.start.x,i=o.touch.originalPos.left):(n=o.touch.end.y-o.touch.start.y,i=o.touch.originalPos.top),!o.settings.infiniteLoop&&(0==o.active.index&&n>0||o.active.last&&0>n)?x(i,"reset",200):Math.abs(n)>=o.settings.swipeThreshold?(0>n?r.goToNextSlide():r.goToPrevSlide(),r.stopAuto()):x(i,"reset",200)}o.viewport.unbind("touchend",B)},O=function(){var e=t(window).width(),i=t(window).height();(a!=e||l!=i)&&(a=e,l=i,o.children.add(r.find(".bx-clone")).width(h()),o.viewport.css("height",g()),o.active.last&&(o.active.index=v()-1),o.active.index>=v()&&(o.active.last=!0),o.settings.pager&&!o.settings.pagerCustom&&(m(),y(o.active.index)),o.settings.ticker||f())};return r.goToSlide=function(e,i){if(!o.working&&o.active.index!=e)if(o.working=!0,o.oldIndex=o.active.index,o.active.index=0>e?v()-1:e>=v()?0:e,o.settings.onSlideBefore(o.children.eq(o.active.index),o.oldIndex,o.active.index),"next"==i?o.settings.onSlideNext(o.children.eq(o.active.index),o.oldIndex,o.active.index):"prev"==i&&o.settings.onSlidePrev(o.children.eq(o.active.index),o.oldIndex,o.active.index),o.active.last=o.active.index>=v()-1,o.settings.pager&&y(o.active.index),o.settings.controls&&q(),"fade"==o.settings.mode)o.settings.adaptiveHeight&&o.viewport.height()!=g()&&o.viewport.animate({height:g()},o.settings.adaptiveHeightSpeed),o.children.filter(":visible").fadeOut(o.settings.speed).css({zIndex:0}),o.children.eq(o.active.index).css("zIndex",51).fadeIn(o.settings.speed,function(){t(this).css("zIndex",50),z()});else{o.settings.adaptiveHeight&&o.viewport.height()!=g()&&o.viewport.animate({height:g()},o.settings.adaptiveHeightSpeed);var n=0,s={left:0,top:0};if(!o.settings.infiniteLoop&&o.carousel&&o.active.last)if("horizontal"==o.settings.mode){var a=o.children.eq(o.children.length-1);s=a.position(),n=o.viewport.width()-a.width()}else{var l=o.children.length-o.settings.minSlides;s=o.children.eq(l).position()}else if(o.carousel&&o.active.last&&"prev"==i){var d=1==o.settings.moveSlides?o.settings.maxSlides-p():(v()-1)*p()-(o.children.length-o.settings.maxSlides),a=r.children(".bx-clone").eq(d);s=a.position()}else if("next"==i&&0==o.active.index)s=r.find(".bx-clone").eq(o.settings.maxSlides).position(),o.active.last=!1;else if(e>=0){var c=e*p();s=o.children.eq(c).position()}var h="horizontal"==o.settings.mode?-(s.left-n):-s.top;x(h,"slide",o.settings.speed)}},r.goToNextSlide=function(){if(o.settings.infiniteLoop||!o.active.last){var t=o.active.index+1;r.goToSlide(t,"next")}},r.goToPrevSlide=function(){if(o.settings.infiniteLoop||0!=o.active.index){var t=o.active.index-1;r.goToSlide(t,"prev")}},r.startAuto=function(t){o.interval||(o.interval=setInterval(function(){"next"==o.settings.autoDirection?r.goToNextSlide():r.goToPrevSlide()},o.settings.pause),o.settings.autoControls&&1!=t&&M("stop"))},r.stopAuto=function(t){o.interval&&(clearInterval(o.interval),o.interval=null,o.settings.autoControls&&1!=t&&M("start"))},r.getCurrentSlide=function(){return o.active.index},r.getSlideCount=function(){return o.children.length},r.destroySlider=function(){o.initialized&&(o.initialized=!1,t(".bx-clone",this).remove(),o.children.removeAttr("style"),this.removeAttr("style").unwrap().unwrap(),o.controls.el&&o.controls.el.remove(),o.controls.next&&o.controls.next.remove(),o.controls.prev&&o.controls.prev.remove(),o.pagerEl&&o.pagerEl.remove(),t(".bx-caption",this).remove(),o.controls.autoEl&&o.controls.autoEl.remove(),clearInterval(o.interval),t(window).unbind("resize",O))},r.reloadSlider=function(t){void 0!=t&&(s=t),r.destroySlider(),d()},d(),this}}})(jQuery),function(t,e){var i="data:image/gif;base64,R0lGODlhAQABAIAAAAAAAP///ywAAAAAAQABAAACAUwAOw==";t.fn.imagesLoaded=function(n){function s(){var e=t(g),i=t(h);a&&(h.length?a.reject(d,e,i):a.resolve(d)),t.isFunction(n)&&n.call(r,d,e,i)}function o(e,n){e.src===i||-1!==t.inArray(e,c)||(c.push(e),n?h.push(e):g.push(e),t.data(e,"imagesLoaded",{isBroken:n,src:e.src}),l&&a.notifyWith(t(e),[n,d,t(g),t(h)]),d.length===c.length&&(setTimeout(s),d.unbind(".imagesLoaded")))}var r=this,a=t.isFunction(t.Deferred)?t.Deferred():0,l=t.isFunction(a.notify),d=r.find("img").add(r.filter("img")),c=[],g=[],h=[];return t.isPlainObject(n)&&t.each(n,function(t,e){"callback"===t?n=e:a&&a[t](e)}),d.length?d.bind("load.imagesLoaded error.imagesLoaded",function(t){o(t.target,"error"===t.type)}).each(function(n,s){var r=s.src,a=t.data(s,"imagesLoaded");a&&a.src===r?o(s,a.isBroken):s.complete&&s.naturalWidth!==e?o(s,0===s.naturalWidth||0===s.naturalHeight):(s.readyState||s.complete)&&(s.src=i,s.src=r)}):s(),a?a.promise(r):r}}(jQuery); - - -/* - Prettify JS -*/ -var q=null;window.PR_SHOULD_USE_CONTINUATION=!0; -(function(){function L(a){function m(a){var f=a.charCodeAt(0);if(f!==92)return f;var b=a.charAt(1);return(f=r[b])?f:"0"<=b&&b<="7"?parseInt(a.substring(1),8):b==="u"||b==="x"?parseInt(a.substring(2),16):a.charCodeAt(1)}function e(a){if(a<32)return(a<16?"\\x0":"\\x")+a.toString(16);a=String.fromCharCode(a);if(a==="\\"||a==="-"||a==="["||a==="]")a="\\"+a;return a}function h(a){for(var f=a.substring(1,a.length-1).match(/\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\[0-3][0-7]{0,2}|\\[0-7]{1,2}|\\[\S\s]|[^\\]/g),a= -[],b=[],o=f[0]==="^",c=o?1:0,i=f.length;c122||(d<65||j>90||b.push([Math.max(65,j)|32,Math.min(d,90)|32]),d<97||j>122||b.push([Math.max(97,j)&-33,Math.min(d,122)&-33]))}}b.sort(function(a,f){return a[0]-f[0]||f[1]-a[1]});f=[];j=[NaN,NaN];for(c=0;ci[0]&&(i[1]+1>i[0]&&b.push("-"),b.push(e(i[1])));b.push("]");return b.join("")}function y(a){for(var f=a.source.match(/\[(?:[^\\\]]|\\[\S\s])*]|\\u[\dA-Fa-f]{4}|\\x[\dA-Fa-f]{2}|\\\d+|\\[^\dux]|\(\?[!:=]|[()^]|[^()[\\^]+/g),b=f.length,d=[],c=0,i=0;c=2&&a==="["?f[c]=h(j):a!=="\\"&&(f[c]=j.replace(/[A-Za-z]/g,function(a){a=a.charCodeAt(0);return"["+String.fromCharCode(a&-33,a|32)+"]"}));return f.join("")}for(var t=0,s=!1,l=!1,p=0,d=a.length;p=5&&"lang-"===b.substring(0,5))&&!(o&&typeof o[1]==="string"))c=!1,b="src";c||(r[f]=b)}i=d;d+=f.length;if(c){c=o[1];var j=f.indexOf(c),k=j+c.length;o[2]&&(k=f.length-o[2].length,j=k-c.length);b=b.substring(5);B(l+i,f.substring(0,j),e,p);B(l+i+j,c,C(b,c),p);B(l+i+k,f.substring(k),e,p)}else p.push(l+i,b)}a.e=p}var h={},y;(function(){for(var e=a.concat(m), -l=[],p={},d=0,g=e.length;d=0;)h[n.charAt(k)]=r;r=r[1];n=""+r;p.hasOwnProperty(n)||(l.push(r),p[n]=q)}l.push(/[\S\s]/);y=L(l)})();var t=m.length;return e}function u(a){var m=[],e=[];a.tripleQuotedStrings?m.push(["str",/^(?:'''(?:[^'\\]|\\[\S\s]|''?(?=[^']))*(?:'''|$)|"""(?:[^"\\]|\\[\S\s]|""?(?=[^"]))*(?:"""|$)|'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$))/,q,"'\""]):a.multiLineStrings?m.push(["str",/^(?:'(?:[^'\\]|\\[\S\s])*(?:'|$)|"(?:[^"\\]|\\[\S\s])*(?:"|$)|`(?:[^\\`]|\\[\S\s])*(?:`|$))/, -q,"'\"`"]):m.push(["str",/^(?:'(?:[^\n\r'\\]|\\.)*(?:'|$)|"(?:[^\n\r"\\]|\\.)*(?:"|$))/,q,"\"'"]);a.verbatimStrings&&e.push(["str",/^@"(?:[^"]|"")*(?:"|$)/,q]);var h=a.hashComments;h&&(a.cStyleComments?(h>1?m.push(["com",/^#(?:##(?:[^#]|#(?!##))*(?:###|$)|.*)/,q,"#"]):m.push(["com",/^#(?:(?:define|elif|else|endif|error|ifdef|include|ifndef|line|pragma|undef|warning)\b|[^\n\r]*)/,q,"#"]),e.push(["str",/^<(?:(?:(?:\.\.\/)*|\/?)(?:[\w-]+(?:\/[\w-]+)+)?[\w-]+\.h|[a-z]\w*)>/,q])):m.push(["com",/^#[^\n\r]*/, -q,"#"]));a.cStyleComments&&(e.push(["com",/^\/\/[^\n\r]*/,q]),e.push(["com",/^\/\*[\S\s]*?(?:\*\/|$)/,q]));a.regexLiterals&&e.push(["lang-regex",/^(?:^^\.?|[!+-]|!=|!==|#|%|%=|&|&&|&&=|&=|\(|\*|\*=|\+=|,|-=|->|\/|\/=|:|::|;|<|<<|<<=|<=|=|==|===|>|>=|>>|>>=|>>>|>>>=|[?@[^]|\^=|\^\^|\^\^=|{|\||\|=|\|\||\|\|=|~|break|case|continue|delete|do|else|finally|instanceof|return|throw|try|typeof)\s*(\/(?=[^*/])(?:[^/[\\]|\\[\S\s]|\[(?:[^\\\]]|\\[\S\s])*(?:]|$))+\/)/]);(h=a.types)&&e.push(["typ",h]);a=(""+a.keywords).replace(/^ | $/g, -"");a.length&&e.push(["kwd",RegExp("^(?:"+a.replace(/[\s,]+/g,"|")+")\\b"),q]);m.push(["pln",/^\s+/,q," \r\n\t\xa0"]);e.push(["lit",/^@[$_a-z][\w$@]*/i,q],["typ",/^(?:[@_]?[A-Z]+[a-z][\w$@]*|\w+_t\b)/,q],["pln",/^[$_a-z][\w$@]*/i,q],["lit",/^(?:0x[\da-f]+|(?:\d(?:_\d+)*\d*(?:\.\d*)?|\.\d\+)(?:e[+-]?\d+)?)[a-z]*/i,q,"0123456789"],["pln",/^\\[\S\s]?/,q],["pun",/^.[^\s\w"-$'./@\\`]*/,q]);return x(m,e)}function D(a,m){function e(a){switch(a.nodeType){case 1:if(k.test(a.className))break;if("BR"===a.nodeName)h(a), -a.parentNode&&a.parentNode.removeChild(a);else for(a=a.firstChild;a;a=a.nextSibling)e(a);break;case 3:case 4:if(p){var b=a.nodeValue,d=b.match(t);if(d){var c=b.substring(0,d.index);a.nodeValue=c;(b=b.substring(d.index+d[0].length))&&a.parentNode.insertBefore(s.createTextNode(b),a.nextSibling);h(a);c||a.parentNode.removeChild(a)}}}}function h(a){function b(a,d){var e=d?a.cloneNode(!1):a,f=a.parentNode;if(f){var f=b(f,1),g=a.nextSibling;f.appendChild(e);for(var h=g;h;h=g)g=h.nextSibling,f.appendChild(h)}return e} -for(;!a.nextSibling;)if(a=a.parentNode,!a)return;for(var a=b(a.nextSibling,0),e;(e=a.parentNode)&&e.nodeType===1;)a=e;d.push(a)}var k=/(?:^|\s)nocode(?:\s|$)/,t=/\r\n?|\n/,s=a.ownerDocument,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=s.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);for(l=s.createElement("LI");a.firstChild;)l.appendChild(a.firstChild);for(var d=[l],g=0;g=0;){var h=m[e];A.hasOwnProperty(h)?window.console&&console.warn("cannot override language handler %s",h):A[h]=a}}function C(a,m){if(!a||!A.hasOwnProperty(a))a=/^\s*=o&&(h+=2);e>=c&&(a+=2)}}catch(w){"console"in window&&console.log(w&&w.stack?w.stack:w)}}var v=["break,continue,do,else,for,if,return,while"],w=[[v,"auto,case,char,const,default,double,enum,extern,float,goto,int,long,register,short,signed,sizeof,static,struct,switch,typedef,union,unsigned,void,volatile"], -"catch,class,delete,false,import,new,operator,private,protected,public,this,throw,true,try,typeof"],F=[w,"alignof,align_union,asm,axiom,bool,concept,concept_map,const_cast,constexpr,decltype,dynamic_cast,explicit,export,friend,inline,late_check,mutable,namespace,nullptr,reinterpret_cast,static_assert,static_cast,template,typeid,typename,using,virtual,where"],G=[w,"abstract,boolean,byte,extends,final,finally,implements,import,instanceof,null,native,package,strictfp,super,synchronized,throws,transient"], -H=[G,"as,base,by,checked,decimal,delegate,descending,dynamic,event,fixed,foreach,from,group,implicit,in,interface,internal,into,is,lock,object,out,override,orderby,params,partial,readonly,ref,sbyte,sealed,stackalloc,string,select,uint,ulong,unchecked,unsafe,ushort,var"],w=[w,"debugger,eval,export,function,get,null,set,undefined,var,with,Infinity,NaN"],I=[v,"and,as,assert,class,def,del,elif,except,exec,finally,from,global,import,in,is,lambda,nonlocal,not,or,pass,print,raise,try,with,yield,False,True,None"], -J=[v,"alias,and,begin,case,class,def,defined,elsif,end,ensure,false,in,module,next,nil,not,or,redo,rescue,retry,self,super,then,true,undef,unless,until,when,yield,BEGIN,END"],v=[v,"case,done,elif,esac,eval,fi,function,in,local,set,then,until"],K=/^(DIR|FILE|vector|(de|priority_)?queue|list|stack|(const_)?iterator|(multi)?(set|map)|bitset|u?(int|float)\d*)/,N=/\S/,O=u({keywords:[F,H,w,"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END"+ -I,J,v],hashComments:!0,cStyleComments:!0,multiLineStrings:!0,regexLiterals:!0}),A={};k(O,["default-code"]);k(x([],[["pln",/^[^]*(?:>|$)/],["com",/^<\!--[\S\s]*?(?:--\>|$)/],["lang-",/^<\?([\S\s]+?)(?:\?>|$)/],["lang-",/^<%([\S\s]+?)(?:%>|$)/],["pun",/^(?:<[%?]|[%?]>)/],["lang-",/^]*>([\S\s]+?)<\/xmp\b[^>]*>/i],["lang-js",/^]*>([\S\s]*?)(<\/script\b[^>]*>)/i],["lang-css",/^]*>([\S\s]*?)(<\/style\b[^>]*>)/i],["lang-in.tag",/^(<\/?[a-z][^<>]*>)/i]]), -["default-markup","htm","html","mxml","xhtml","xml","xsl"]);k(x([["pln",/^\s+/,q," \t\r\n"],["atv",/^(?:"[^"]*"?|'[^']*'?)/,q,"\"'"]],[["tag",/^^<\/?[a-z](?:[\w-.:]*\w)?|\/?>$/i],["atn",/^(?!style[\s=]|on)[a-z](?:[\w:-]*\w)?/i],["lang-uq.val",/^=\s*([^\s"'>]*(?:[^\s"'/>]|\/(?=\s)))/],["pun",/^[/<->]+/],["lang-js",/^on\w+\s*=\s*"([^"]+)"/i],["lang-js",/^on\w+\s*=\s*'([^']+)'/i],["lang-js",/^on\w+\s*=\s*([^\s"'>]+)/i],["lang-css",/^style\s*=\s*"([^"]+)"/i],["lang-css",/^style\s*=\s*'([^']+)'/i],["lang-css", -/^style\s*=\s*([^\s"'>]+)/i]]),["in.tag"]);k(x([],[["atv",/^[\S\s]+/]]),["uq.val"]);k(u({keywords:F,hashComments:!0,cStyleComments:!0,types:K}),["c","cc","cpp","cxx","cyc","m"]);k(u({keywords:"null,true,false"}),["json"]);k(u({keywords:H,hashComments:!0,cStyleComments:!0,verbatimStrings:!0,types:K}),["cs"]);k(u({keywords:G,cStyleComments:!0}),["java"]);k(u({keywords:v,hashComments:!0,multiLineStrings:!0}),["bsh","csh","sh"]);k(u({keywords:I,hashComments:!0,multiLineStrings:!0,tripleQuotedStrings:!0}), -["cv","py"]);k(u({keywords:"caller,delete,die,do,dump,elsif,eval,exit,foreach,for,goto,if,import,last,local,my,next,no,our,print,package,redo,require,sub,undef,unless,until,use,wantarray,while,BEGIN,END",hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["perl","pl","pm"]);k(u({keywords:J,hashComments:!0,multiLineStrings:!0,regexLiterals:!0}),["rb"]);k(u({keywords:w,cStyleComments:!0,regexLiterals:!0}),["js"]);k(u({keywords:"all,and,by,catch,class,else,extends,false,finally,for,if,in,is,isnt,loop,new,no,not,null,of,off,on,or,return,super,then,true,try,unless,until,when,while,yes", -hashComments:3,cStyleComments:!0,multilineStrings:!0,tripleQuotedStrings:!0,regexLiterals:!0}),["coffee"]);k(x([],[["str",/^[\S\s]+/]]),["regex"]);window.prettyPrintOne=function(a,m,e){var h=document.createElement("PRE");h.innerHTML=a;e&&D(h,e);E({g:m,i:e,h:h});return h.innerHTML};window.prettyPrint=function(a){function m(){for(var e=window.PR_SHOULD_USE_CONTINUATION?l.now()+250:Infinity;p=0){var k=k.match(g),f,b;if(b= -!k){b=n;for(var o=void 0,c=b.firstChild;c;c=c.nextSibling)var i=c.nodeType,o=i===1?o?b:c:i===3?N.test(c.nodeValue)?b:o:o;b=(f=o===b?void 0:o)&&"CODE"===f.tagName}b&&(k=f.className.match(g));k&&(k=k[1]);b=!1;for(o=n.parentNode;o;o=o.parentNode)if((o.tagName==="pre"||o.tagName==="code"||o.tagName==="xmp")&&o.className&&o.className.indexOf("prettyprint")>=0){b=!0;break}b||((b=(b=n.className.match(/\blinenums\b(?::(\d+))?/))?b[1]&&b[1].length?+b[1]:!0:!1)&&D(n,b),d={g:k,h:n,i:b},E(d))}}particle,aside,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}"; -c=d.insertBefore(c.lastChild,d.firstChild);b.hasCSS=!!c}g||t(a,b);return a}var k=l.html5||{},s=/^<|^(?:button|map|select|textarea|object|iframe|option|optgroup)$/i,r=/^(?:a|b|code|div|fieldset|h1|h2|h3|h4|h5|h6|i|label|li|ol|p|q|span|strong|style|table|tbody|td|th|tr|ul)$/i,j,o="_html5shiv",h=0,n={},g;(function(){try{var a=f.createElement("a");a.innerHTML="";j="hidden"in a;var b;if(!(b=1==a.childNodes.length)){f.createElement("a");var c=f.createDocumentFragment();b="undefined"==typeof c.cloneNode|| -"undefined"==typeof c.createDocumentFragment||"undefined"==typeof c.createElement}g=b}catch(d){g=j=!0}})();var e={elements:k.elements||"abbr article aside audio bdi canvas data datalist details figcaption figure footer header hgroup main mark meter nav output progress section summary time video",version:"3.6.2pre",shivCSS:!1!==k.shivCSS,supportsUnknownElements:g,shivMethods:!1!==k.shivMethods,type:"default",shivDocument:q,createElement:p,createDocumentFragment:function(a,b){a||(a=f);if(g)return a.createDocumentFragment(); -for(var b=b||i(a),c=b.frag.cloneNode(),d=0,e=m(),h=e.length;d. ;;====================================================================== ;; C L I E N T S ;;====================================================================== -(require-extension (srfi 18) extras tcp s11n) - -(use srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest matchable) -;; (use zmq) - -(use (prefix sqlite3 sqlite3:)) - -(use spiffy uri-common intarweb http-client spiffy-request-vars uri-common intarweb directory-utils) +(use srfi-18 extras tcp s11n srfi-1 posix regex srfi-69 hostinfo md5 + message-digest matchable spiffy uri-common intarweb http-client + spiffy-request-vars uri-common intarweb directory-utils) (declare (unit client)) (declare (uses common)) (declare (uses db)) ADDED codescanlib.scm Index: codescanlib.scm ================================================================== --- /dev/null +++ codescanlib.scm @@ -0,0 +1,144 @@ +;; Copyright 2006-2017, Matthew Welland. +;; +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . +;; + +;; gotta compile with csc, doesn't work with csi -s for whatever reason + +(use srfi-69) +(use matchable) +(use utils) +(use ports) +(use extras) +(use srfi-1) +(use posix) +(use srfi-12) + +;; turn scheme file to a list of sexps, sexps of interest will be in the form of (define ( ) ) +(define (load-scm-file scm-file) + ;;(print "load "scm-file) + (handle-exceptions + exn + '() + (with-input-from-string + (conc "(" + (with-input-from-file scm-file read-all) + ")" ) + read))) + +;; extract a list of procname, filename, args and body of procedures defined in filename, input from load-scm-file +;; -- be advised: +;; * this may be fooled by macros, since this code does not take them into account. +;; * this code does only checks for form (define ( ... ) ) +;; so it excludes from reckoning +;; - generated functions, as in things like foo-set! from defstructs, +;; - define-inline, ( +;; - define procname (lambda .. +;; - etc... +(define (get-toplevel-procs+file+args+body filename) + (let* ((scm-tree (load-scm-file filename)) + (procs + (filter identity + (map + (match-lambda + [('define ('uses args ...) body ...) #f] ;; filter out (define (uses ... + [('define ('unit args ...) body ...) #f] ;; filter out (define (unit ... + [('define ('prefix args ...) body ...) #f] ;; filter out (define (prefix ... + [('define (defname args ...) body ...) ;; match (define (procname ) ) + (if (atom? defname) ;; filter out things we dont understand (procname is a list, what??) + (list defname filename args body) + #f)] + [else #f] ) scm-tree)))) + procs)) + + +;; given a sexp, return a flat list of atoms in that sexp +(define (get-atoms-in-body body) + (cond + ((null? body) '()) + ((atom? body) (list body)) + (else + (apply append (map get-atoms-in-body body))))) + +;; given a file, return a list of procname, file, list of atoms in said procname +(define (get-procs+file+atoms file) + (let* ((toplevel-proc-items (get-toplevel-procs+file+args+body file)) + (res + (map + (lambda (item) + (let* ((proc (car item)) + (file (cadr item)) + (args (caddr item)) + (body (cadddr item)) + (atoms (append (get-atoms-in-body args) (get-atoms-in-body body)))) + (list proc file atoms))) + toplevel-proc-items))) + res)) + +;; uniquify a list of atoms +(define (unique-atoms lst) + (let loop ((lst (flatten lst)) (res '())) + (if (null? lst) + (reverse res) + (let ((c (car lst))) + (loop (cdr lst) (if (member c res) res (cons c res))))))) + +;; given a list of procname, filename, list of procs called from procname, cross reference and reverse +;; returning alist mapping procname to procname that calls said procname +(define (get-callers-alist all-procs+file+calls) + (let* ((all-procs (map car all-procs+file+calls)) + (caller-ht (make-hash-table))) + ;; let's cross reference with a hash table + (for-each (lambda (proc) (hash-table-set! caller-ht proc '())) all-procs) + (for-each (lambda (item) + (let* ((proc (car item)) + (file (cadr item)) + (calls (caddr item))) + (for-each (lambda (callee) + (hash-table-set! caller-ht callee + (cons proc + (hash-table-ref caller-ht callee)))) + calls))) + all-procs+file+calls) + (map (lambda (x) + (let ((k (car x)) + (r (unique-atoms (cdr x)))) + (cons k r))) + (hash-table->alist caller-ht)))) + +;; create a handy cross-reference of callees to callers in the form of an alist. +(define (get-xref all-scm-files) + (let* ((all-procs+file+atoms + (apply append (map get-procs+file+atoms all-scm-files))) + (all-procs (map car all-procs+file+atoms)) + (all-procs+file+calls ; proc calls things in calls list + (map (lambda (item) + (let* ((proc (car item)) + (file (cadr item)) + (atoms (caddr item)) + (calls + (filter identity + (map + (lambda (x) + (if (and ;; (not (equal? x proc)) ;; uncomment to prevent listing self + (member x all-procs)) + x + #f)) + atoms)))) + (list proc file calls))) + all-procs+file+atoms)) + (callers (get-callers-alist all-procs+file+calls))) + callers)) Index: common.scm ================================================================== --- common.scm +++ common.scm @@ -1,29 +1,38 @@ ;;====================================================================== ;; Copyright 2006-2012, Matthew Welland. ;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. ;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . + ;;====================================================================== -(use srfi-1 posix regex-case base64 format dot-locking csv-xml z3 sql-de-lite hostinfo md5 message-digest typed-records directory-utils stack - matchable) -(require-extension regex posix) - -(require-extension (srfi 18) extras tcp rpc) - -(import (prefix sqlite3 sqlite3:)) -(import (prefix base64 base64:)) +(use srfi-1 data-structures posix regex-case (prefix base64 base64:) + format dot-locking csv-xml z3 ;; sql-de-lite + hostinfo md5 message-digest typed-records directory-utils stack + matchable regex posix (srfi 18) extras ;; tcp + (prefix nanomsg nmsg:) + (prefix sqlite3 sqlite3:) + pkts (prefix dbi dbi:) + ) (declare (unit common)) -(declare (uses keys)) (include "common_records.scm") + ;; (require-library margs) ;; (include "margs.scm") ;; (define old-exit exit) @@ -31,14 +40,31 @@ ;; (define (exit . code) ;; (if (null? code) ;; (old-exit) ;; (old-exit code))) + +;; execute thunk, return value. If exception thrown, trap exception, return #f, and emit nonfatal condition note to *default-log-port* . +;; arguments - thunk, message +(define (common:fail-safe thunk warning-message-on-exception) + (handle-exceptions + exn + (begin + (debug:print-info 0 *default-log-port* "notable but nonfatal condition - "warning-message-on-exception) + (debug:print-info 0 *default-log-port* + (string-substitute "\n?Error:" "nonfatal condition:" + (with-output-to-string + (lambda () + (print-error-message exn) )))) + (debug:print-info 0 *default-log-port* " -- continuing after nonfatal condition...") + #f) + (thunk))) + (define getenv get-environment-variable) (define (safe-setenv key val) - (if (substring-index ":" key) ;; variables containing : are for internal use and cannot be environment variables. - (debug:print-error 4 *default-log-port* "skip setting internal use only variables containing \":\"") + (if (or (substring-index "!" key) (substring-index ":" key)) ;; variables containing : are for internal use and cannot be environment variables. + (debug:print-error 4 *default-log-port* "skip setting internal use only variables containing \":\" or starting with \"!\"") (if (and (string? val) (string? key)) (handle-exceptions exn (debug:print-error 0 *default-log-port* "bad value for setenv, key=" key ", value=" val) @@ -46,11 +72,21 @@ (debug:print-error 0 *default-log-port* "bad value for setenv, key=" key ", value=" val)))) (define home (getenv "HOME")) (define user (getenv "USER")) -;; GLOBAL GLETCHES + +;; returns list of fd count, socket count +(define (get-file-descriptor-count #!key (pid (current-process-id ))) + (list + (length (glob (conc "/proc/" pid "/fd/*"))) + (length (filter identity (map socket? (glob (conc "/proc/" pid "/fd/*"))))) + ) +) + + +;; GLOBALS ;; CONTEXTS (defstruct cxt (taskdb #f) (cmutex (make-mutex))) @@ -76,10 +112,11 @@ ;; (define *user-hash-data* (make-hash-table)) (define *db-keys* #f) +(define *pkts-info* (make-hash-table)) ;; store stuff like the last parent here (define *configinfo* #f) ;; raw results from setup, includes toppath and table from megatest.config (define *runconfigdat* #f) ;; run configs data (define *configdat* #f) ;; megatest.config data (define *configstatus* #f) ;; status of data; 'fulldata : all processing done, #f : no data yet, 'partialdata : partial read done (define *toppath* #f) @@ -90,10 +127,11 @@ (define *passnum* 0) ;; when running track calls to run-tests or similar ;; (define *alt-log-file* #f) ;; used by -log (define *common:denoise* (make-hash-table)) ;; for low noise printing (define *default-log-port* (current-error-port)) (define *time-zero* (current-seconds)) ;; for the watchdog +(define *default-area-tag* "local") ;; DATABASE (define *dbstruct-db* #f) ;; used to cache the dbstruct in db:setup. Goal is to remove this. ;; db stats (define *db-stats* (make-hash-table)) ;; hash of vectors < count duration-total > @@ -111,18 +149,20 @@ (define *db-access-mutex* (make-mutex)) (define *db-transaction-mutex* (make-mutex)) (define *db-cache-path* #f) (define *db-with-db-mutex* (make-mutex)) (define *db-api-call-time* (make-hash-table)) ;; hash of command => (list of times) +;; no sync db +(define *no-sync-db* #f) ;; SERVER (define *my-client-signature* #f) (define *transport-type* 'http) ;; override with [server] transport http|rpc|nmsg (define *runremote* #f) ;; if set up for server communication this will hold ;; (define *max-cache-size* 0) (define *logged-in-clients* (make-hash-table)) -;; (define *server-id* #f) +(define *server-id* #f) (define *server-info* #f) ;; good candidate for easily convert to non-global (define *time-to-exit* #f) (define *server-run* #t) (define *run-id* #f) (define *server-kind-run* (make-hash-table)) @@ -129,10 +169,11 @@ (define *home-host* #f) ;; (define *total-non-write-delay* 0) (define *heartbeat-mutex* (make-mutex)) (define *api-process-request-count* 0) (define *max-api-process-requests* 0) +(define *server-overloaded* #f) ;; client (define *rmt-mutex* (make-mutex)) ;; remote access calls mutex ;; RPC transport @@ -148,18 +189,57 @@ (define *test-info* (make-hash-table)) ;; cache the test info records, update the state, status, run_duration etc. from testdat.db (define *run-info-cache* (make-hash-table)) ;; run info is stable, no need to reget (define *launch-setup-mutex* (make-mutex)) ;; need to be able to call launch:setup often so mutex it and re-call the real deal only if *toppath* not set (define *homehost-mutex* (make-mutex)) + +;; Miscellaneous +(define *triggers-mutex* (make-mutex)) ;; block overlapping processing of triggers + +(use posix-extras pathname-expand files) + +;; this plugs a hole in posix-extras in recent chicken versions > 4.9) +(let-values (( (chicken-release-number chicken-major-version) + (apply values + (map string->number + (take + (string-split (chicken-version) ".") + 2))))) + (let ((resolve-pathname-broken? + (or (> chicken-release-number 4) + (and (eq? 4 chicken-release-number) (> chicken-major-version 9))))) + (if resolve-pathname-broken? + (define ##sys#expand-home-path pathname-expand)))) + +(define (realpath x) (resolve-pathname (pathname-expand (or x "/dev/null")) )) + +(define (common:get-this-exe-fullpath #!key (argv (argv))) + (let* ((this-script + (cond + ((and (> (length argv) 2) + (string-match "^(.*/csi|csi)$" (car argv)) + (string-match "^-(s|ss|sx|script)$" (cadr argv))) + (caddr argv)) + (else (car argv)))) + (fullpath (realpath this-script))) + fullpath)) +(define *common:this-exe-fullpath* (common:get-this-exe-fullpath)) +(define *common:this-exe-dir* (pathname-directory *common:this-exe-fullpath*)) +(define *common:this-exe-name* (pathname-strip-directory *common:this-exe-fullpath*)) + + + + + (defstruct remote (hh-dat (common:get-homehost)) ;; homehost record ( addr . hhflag ) (server-url (if *toppath* (server:check-if-running *toppath*))) ;; (server:check-if-running *toppath*) #f)) (last-server-check 0) ;; last time we checked to see if the server was alive (conndat #f) (transport *transport-type*) - (server-timeout (server:get-timeout)) ;; default from server:get-timeout + (server-timeout (server:expiration-timeout)) (force-server #f) (ro-mode #f) (ro-mode-checked #f)) ;; flag that indicates we have checked for ro-mode ;; launching and hosts @@ -225,30 +305,124 @@ (substring (common:get-last-run-version) 0 6))) (define (common:set-last-run-version) (rmt:set-var "MEGATEST_VERSION" (common:version-signature))) +;; postive number if megatest version > db version +;; negative number if megatest version < db version +(define (common:version-db-delta) + (- megatest-version (common:get-last-run-version-number))) + (define (common:version-changed?) (not (equal? (common:get-last-run-version) - (common:version-signature)))) + (common:version-signature)))) +(define (common:api-changed?) + (not (equal? (substring (->string megatest-version) 0 4) + (substring (conc (common:get-last-run-version)) 0 4)))) + ;; Move me elsewhere ... ;; RADT => Why do we meed the version check here, this is called only if version misma ;; -(define (common:cleanup-db dbstruct) - (db:multi-db-sync +(define (common:cleanup-db dbstruct #!key (full #f)) + (apply db:multi-db-sync dbstruct + 'schema ;; 'new2old 'killservers - 'dejunk - ;; 'adj-testids + 'adj-target ;; 'old2new 'new2old - 'schema) - (if (common:version-changed?) + ;; (if full + '(dejunk) + ;; '()) + ) + (if (common:api-changed?) (common:set-last-run-version))) +(define (common:snapshot-file filepath #!key (subdir ".") ) + (if (file-exists? filepath) + (let* ((age-sec (lambda (file) + (if (file-exists? file) + (- (current-seconds) (file-modification-time file)) + 1000000000))) ;; return really old value if file doesn't exist. we want to clobber it if old or not exist. + (ok-flag #t) + (age-mins (lambda (file) (/ (age-sec file) 60))) + (age-hrs (lambda (file) (/ (age-mins file) 60))) + (age-days (lambda (file) (/ (age-hrs file) 24))) + (age-wks (lambda (file) (/ (age-days file) 7))) + (docmd (lambda (cmd) + (cond + (ok-flag + (let ((res (system cmd))) + (cond + ((eq? 0 res) + #t) + (else + (set! ok-flag #f) + (debug:print 0 *default-log-port* "ERROR: ["(common:human-time)"] Command failed with exit code " + (if (< res 0) + res + (/ res 8)) " ["cmd"]" ) + #f)))) + (else + (debug:print 0 *default-log-port* "ERROR: ["(common:human-time)"] Not runnining command due to prior error. ["cmd"]") + #f)))) + (copy (lambda (src dest) (docmd (conc "/bin/cp '"src"' '"dest"'")))) + (copy+zip (lambda (src dest) (docmd (conc "gzip -c - < '"src"' > '"dest"'")))) + (fullpath (realpath filepath)) + (basedir (pathname-directory fullpath)) + (basefile (pathname-strip-directory fullpath)) + ;;(prevfile (conc filepath ".prev.gz")) + (minsfile (conc basedir "/" subdir "/" basefile ".mins.gz")) + (hrsfile (conc basedir "/" subdir "/" basefile ".hrs.gz")) + (daysfile (conc basedir "/" subdir "/" basefile ".days.gz")) + (wksfile (conc basedir "/" subdir "/" basefile ".weeks.gz"))) + + ;; create subdir it not exists + (if (not (directory-exists? (conc basedir "/" subdir))) + (docmd (conc "/bin/mkdir -p '"(conc basedir "/" subdir)"'"))) + + ;; copy&zip to .mins if not exists + (if (not (file-exists? minsfile)) + (copy+zip filepath minsfile)) + ;; copy .mins to .hrs if not exists + (if (not (file-exists? hrsfile)) + (copy minsfile hrsfile)) + ;; copy .hrs to .days if not exists + (if (not (file-exists? daysfile)) + (copy hrsfile daysfile)) + ;; copy .days to .weeks if not exists + (if (not (file-exists? wksfile)) + (copy daysfile wksfile)) + + + ;; if age(.mins.gz) >= 1h: + ;; copy .mins.gz .hrs.gz + ;; copy .mins.gz + (when (>= (age-mins minsfile) 1) + (copy minsfile hrsfile) + (copy+zip filepath minsfile)) + + ;; if age(.hrs.gz) >= 1d: + ;; copy .hrs.gz .days.gz + ;; copy .mins.gz .hrs.gz + (when (>= (age-days hrsfile) 1) + (copy hrsfile daysfile) + (copy minsfile hrsfile)) + + ;; if age(.days.gz) >= 1w: + ;; copy .days.gz .weeks.gz + ;; copy .hrs.gz .days.gz + (when (>= (age-wks daysfile) 1) + (copy daysfile wksfile) + (copy hrsfile daysfile)) + #t) + #f)) + + + ;; Rotate logs, logic: ;; if > 500k and older than 1 week: ;; remove previous compressed log and compress this log ;; WARNING: This proc operates assuming that it is in the directory above the ;; logs directory you wish to log-rotate. @@ -266,11 +440,11 @@ (> (file-size fullname) 200000)) (and (string-match "^server-.*.log" file) (> (- (current-seconds) (file-modification-time fullname)) (* 8 60 60)))) (let ((gzfile (conc fullname ".gz"))) - (if (file-exists? gzfile) + (if (common:file-exists? gzfile) (begin (debug:print-info 0 *default-log-port* "removing " gzfile) (delete-file gzfile))) (debug:print-info 0 *default-log-port* "compressing " file) (system (conc "gzip " fullname))) @@ -285,22 +459,22 @@ ;; Force a megatest cleanup-db if version is changed and skip-version-check not specified ;; Do NOT check if not on homehost! ;; (define (common:exit-on-version-changed) (if (common:on-homehost?) - (if (common:version-changed?) + (if (common:api-changed?) (let* ((mtconf (conc (get-environment-variable "MT_RUN_AREA_HOME") "/megatest.config")) (dbfile (conc (get-environment-variable "MT_RUN_AREA_HOME") "/megatest.db")) (read-only (not (file-write-access? dbfile))) - (dbstruct (db:setup))) + (dbstruct (db:setup #t))) (debug:print 0 *default-log-port* "WARNING: Version mismatch!\n" " expected: " (common:version-signature) "\n" " got: " (common:get-last-run-version)) (cond ((get-environment-variable "MT_SKIP_DB_MIGRATE") #t) - ((and (file-exists? mtconf) (file-exists? dbfile) (not read-only) + ((and (common:file-exists? mtconf) (common:file-exists? dbfile) (not read-only) (eq? (current-user-id)(file-owner mtconf))) ;; safe to run -cleanup-db (debug:print 0 *default-log-port* " I see you are the owner of megatest.config, attempting to cleanup and reset to new version") (handle-exceptions exn (begin @@ -307,14 +481,14 @@ (debug:print 0 *default-log-port* "Failed to switch versions.") (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn)) (print-call-chain (current-error-port)) (exit 1)) (common:cleanup-db dbstruct))) - ((not (file-exists? mtconf)) + ((not (common:file-exists? mtconf)) (debug:print 0 *default-log-port* " megatest.config does not exist in this area. Cannot proceed with megatest version migration.") (exit 1)) - ((not (file-exists? dbfile)) + ((not (common:file-exists? dbfile)) (debug:print 0 *default-log-port* " megatest.db does not exist in this area. Cannot proceed with megatest version migration.") (exit 1)) ((not (eq? (current-user-id)(file-owner mtconf))) (debug:print 0 *default-log-port* " You do not own megatest.db in this area. Cannot proceed with megatest version migration.") (exit 1)) @@ -321,14 +495,14 @@ (read-only (debug:print 0 *default-log-port* " You have read-only access to this area. Cannot proceed with megatest version migration.") (exit 1)) (else (debug:print 0 *default-log-port* " to switch versions you can run: \"megatest -cleanup-db\"") - (exit 1))))) - (begin - (debug:print 0 *default-log-port* "ERROR: cannot migrate version unless on homehost. Exiting.") - (exit 1)))) + (exit 1))))))) +;; (begin +;; (debug:print 0 *default-log-port* "ERROR: cannot migrate version unless on homehost. Exiting.") +;; (exit 1)))) ;;====================================================================== ;; S P A R S E A R R A Y S ;;====================================================================== @@ -390,10 +564,13 @@ (map common:to-alist (hash-table->alist dat))) (else (if dat dat "")))) + +(define (common:alist-ref/default key alist default) + (or (alist-ref key alist) default)) (define (common:low-noise-print waitval . keys) (let* ((key (string-intersperse (map conc keys) "-" )) (lasttime (hash-table-ref/default *common:denoise* key 0)) (currtime (current-seconds))) @@ -424,11 +601,11 @@ ;; (define (common:simple-file-lock fname #!key (expire-time 300)) (handle-exceptions exn #f ;; don't really care what went wrong right now. NOTE: I have not seen this one actually fail. - (if (file-exists? fname) + (if (common:file-exists? fname) (if (> (- (current-seconds)(file-modification-time fname)) expire-time) (begin (delete-file* fname) (common:simple-file-lock fname expire-time: expire-time)) #f) @@ -435,11 +612,11 @@ (let ((key-string (conc (get-host-name) "-" (current-process-id)))) (with-output-to-file fname (lambda () (print key-string))) (thread-sleep! 0.25) - (if (file-exists? fname) + (if (common:file-exists? fname) (with-input-from-file fname (lambda () (equal? key-string (read-line)))) #f))))) @@ -462,12 +639,14 @@ ;;====================================================================== ;; S T A T E S A N D S T A T U S E S ;;====================================================================== -(define *common:std-states* - '((0 "ARCHIVED") +;; BBnote: *common:std-states* - dashboard filter control and test control state buttons defined here; used in set-fields-panel and dboard:make-controls +(define *common:std-states* ;; for toggle buttons in dashboard + '( + (0 "ARCHIVED") (1 "STUCK") (2 "KILLREQ") (3 "KILLED") (4 "NOT_STARTED") (5 "COMPLETED") @@ -474,36 +653,59 @@ (6 "LAUNCHED") (7 "REMOTEHOSTSTART") (8 "RUNNING") )) +(define *common:dont-roll-up-states* + '("DELETED" + "REMOVING" + "CLEANING" + "ARCHIVE_REMOVING" + )) + +;; BBnote: *common:std-statuses* dashboard filter control and test control status buttons defined here; used in set-fields-panel and dboard:make-controls +;; note these statuses are sorted from better to worse. +;; This sort order is important to dcommon:status-compare3 and db:set-state-status-and-roll-up-items (define *common:std-statuses* - '(;; (0 "DELETED") + '(;; (0 "DELETED") (1 "n/a") (2 "PASS") - (3 "CHECK") - (4 "SKIP") - (5 "WARN") - (6 "WAIVED") + (3 "SKIP") + (4 "WARN") + (5 "WAIVED") + (6 "CHECK") (7 "STUCK/DEAD") - (8 "FAIL") - (9 "ABORT"))) + (8 "DEAD") + (9 "FAIL") + (10 "PREQ_FAIL") + (11 "PREQ_DISCARDED") + (12 "ABORT"))) (define *common:ended-states* ;; states which indicate the test is stopped and will not proceed - '("COMPLETED" "ARCHIVED" "KILLED" "KILLREQ" "STUCK" "INCOMPLETE")) + '("COMPLETED" "ARCHIVED" "KILLED" "KILLREQ" "STUCK" "INCOMPLETE" )) (define *common:badly-ended-states* ;; these roll up as CHECK, i.e. results need to be checked '("KILLED" "KILLREQ" "STUCK" "INCOMPLETE" "DEAD")) +(define *common:well-ended-states* ;; an item's prereq in this state allows item to proceed + '("PASS" "WARN" "CHECK" "WAIVED" "SKIP")) + +;; BBnote: *common:running-states* used from db:set-state-status-and-roll-up-items (define *common:running-states* ;; test is either running or can be run - '("RUNNING" "REMOTEHOSTSTART" "LAUNCHED")) + '("RUNNING" "REMOTEHOSTSTART" "LAUNCHED" "STARTED")) (define *common:cant-run-states* ;; These are stopping conditions that prevent a test from being run '("COMPLETED" "KILLED" "UNKNOWN" "INCOMPLETE" "ARCHIVED")) (define *common:not-started-ok-statuses* ;; if not one of these statuses when in not_started state treat as dead '("n/a" "na" "PASS" "FAIL" "WARN" "CHECK" "WAIVED" "DEAD" "SKIP")) + +;; group tests into buckets corresponding to rollup +;;; Running, completed-pass, completed-non-pass + worst status, not started. +;; filter out +;(define (common:categorize-items-for-rollup in-tests) +; ( (define (common:special-sort items order comp) (let ((items-order (map reverse order)) (acomp (or comp >))) (sort items @@ -588,20 +790,26 @@ (pathname-file *toppath*) #f))) ;; (pathname-file (current-directory))))) (define common:get-area-name common:get-testsuite-name) -(define (common:get-db-tmp-area) +(define (common:get-db-tmp-area . junk) (if *db-cache-path* *db-cache-path* - (if *toppath* - (let ((dbpath (create-directory (conc "/tmp/" (current-user-name) - "/megatest_localdb/" - (common:get-testsuite-name) "/" - (string-translate *toppath* "/" ".")) #t))) - (set! *db-cache-path* dbpath) - dbpath) + (if *toppath* ;; common:get-create-writeable-dir + (handle-exceptions + exn + (begin + (debug:print-error 0 *default-log-port* "Couldn't create path to " dbdir) + (exit 1)) + (let ((dbpath (common:get-create-writeable-dir + (list (conc "/tmp/" (current-user-name) + "/megatest_localdb/" + (common:get-testsuite-name) "/" + (string-translate *toppath* "/" ".")))))) ;; #t)))) + (set! *db-cache-path* dbpath) + dbpath)) #f))) (define (common:get-area-path-signature) (message-digest-string (md5-primitive) *toppath*)) @@ -618,33 +826,24 @@ ;; (let ((ohh (common:on-homehost?)) ;; (srv (args:get-arg "-server"))) ;; (and ohh srv))) ;; (debug:print-info 0 *default-log-port* "common:run-sync? ohh=" ohh ", srv=" srv) - -;;;; run-ids -;; if #f use *db-local-sync* : or 'local-sync-flags -;; if #t use timestamps : or 'timestamps -(define (common:sync-to-megatest.db dbstruct) - (let ((start-time (current-seconds)) - (res (db:multi-db-sync dbstruct 'new2old))) - (let ((sync-time (- (current-seconds) start-time))) - (debug:print-info 3 *default-log-port* "Sync of newdb to olddb completed in " sync-time " seconds pid="(current-process-id)) - (if (common:low-noise-print 30 "sync new to old") - (debug:print-info 0 *default-log-port* "Sync of newdb to olddb completed in " sync-time " seconds pid="(current-process-id)))) - res)) - (define *wdnum* 0) (define *wdnum*mutex (make-mutex)) + + +(define (common:human-time) + (time->string (seconds->local-time (current-seconds)) "%Y-%m-%d %H:%M:%S")) + + ;; currently the primary job of the watchdog is to run the sync back to megatest.db from the db in /tmp ;; if we are on the homehost and we are a server (by definition we are on the homehost if we are a server) ;; - - (define (common:readonly-watchdog dbstruct) (thread-sleep! 0.05) ;; delay for startup (debug:print-info 13 *default-log-port* "common:readonly-watchdog entered.") ;; sync megatest.db to /tmp/.../megatst.db (let* ((sync-cool-off-duration 3) @@ -661,102 +860,34 @@ (< duration-since-last-sync sync-cool-off-duration)) (thread-sleep! (- sync-cool-off-duration duration-since-last-sync))) (if (not *time-to-exit*) (let ((golden-mtdb-mtime (file-modification-time golden-mtpath)) (tmp-mtdb-mtime (file-modification-time tmp-mtpath))) - (if (> golden-mtdb-mtime tmp-mtdb-mtime) - (let ((res (db:multi-db-sync dbstruct 'old2new))) - (debug:print-info 13 *default-log-port* "rosync called, " res " records transferred."))) + (if (> golden-mtdb-mtime tmp-mtdb-mtime) + (if (< golden-mtdb-mtime (- (current-seconds) 3)) ;; file has NOT been touched in past three seconds, this way multiple servers won't fight to sync back + (let ((res (db:multi-db-sync dbstruct 'old2new))) + (debug:print-info 13 *default-log-port* "rosync called, " res " records transferred.")))) (loop (current-seconds))) #t))) (debug:print-info 0 *default-log-port* "Exiting readonly-watchdog timer, *time-to-exit* = " *time-to-exit*" pid="(current-process-id)" mtpath="golden-mtpath))) - - -(define (common:writable-watchdog dbstruct) - (thread-sleep! 0.05) ;; delay for startup - (let ((legacy-sync (common:run-sync?)) - (debug-mode (debug:debug-mode 1)) - (last-time (current-seconds)) - (this-wd-num (begin (mutex-lock! *wdnum*mutex) (let ((x *wdnum*)) (set! *wdnum* (add1 *wdnum*)) (mutex-unlock! *wdnum*mutex) x)))) - (debug:print-info 2 *default-log-port* "Periodic sync thread started.") - (debug:print-info 3 *default-log-port* "watchdog starting. legacy-sync is " legacy-sync" pid="(current-process-id)" this-wd-num="this-wd-num) - (if (and legacy-sync (not *time-to-exit*)) - (let* (;;(dbstruct (db:setup)) - (mtdb (dbr:dbstruct-mtdb dbstruct)) - (mtpath (db:dbdat-get-path mtdb))) - (debug:print-info 0 *default-log-port* "Server running, periodic sync started.") - (let loop () - ;; sync for filesystem local db writes - ;; - (mutex-lock! *db-multi-sync-mutex*) - (let* ((need-sync (>= *db-last-access* *db-last-sync*)) ;; no sync since last write - (sync-in-progress *db-sync-in-progress*) - (should-sync (and (not *time-to-exit*) - (> (- (current-seconds) *db-last-sync*) 5))) ;; sync every five seconds minimum - (start-time (current-seconds)) - (mt-mod-time (file-modification-time mtpath)) - (recently-synced (< (- start-time mt-mod-time) 4)) - (will-sync (and (or need-sync should-sync) - (not sync-in-progress) - (not recently-synced)))) - (debug:print-info 13 *default-log-port* "WD writable-watchdog top of loop. need-sync="need-sync" sync-in-progress="sync-in-progress" should-sync="should-sync" start-time="start-time" mt-mod-time="mt-mod-time" recently-synced="recently-synced" will-sync="will-sync) - ;; (if recently-synced (debug:print-info 0 *default-log-port* "Skipping sync due to recently-synced flag=" recently-synced)) - ;; (debug:print-info 0 *default-log-port* "need-sync: " need-sync " sync-in-progress: " sync-in-progress " should-sync: " should-sync " will-sync: " will-sync) - (if will-sync (set! *db-sync-in-progress* #t)) - (mutex-unlock! *db-multi-sync-mutex*) - (if will-sync - (let ((res (common:sync-to-megatest.db dbstruct))) ;; did we sync any data? If so need to set the db touched flag to keep the server alive - (if (> res 0) ;; some records were transferred, keep the db alive - (begin - (mutex-lock! *heartbeat-mutex*) - (set! *db-last-access* (current-seconds)) - (mutex-unlock! *heartbeat-mutex*) - (debug:print-info 0 *default-log-port* "sync called, " res " records transferred.")) - (debug:print-info 2 *default-log-port* "sync called but zero records transferred")))) - (if will-sync - (begin - (mutex-lock! *db-multi-sync-mutex*) - (set! *db-sync-in-progress* #f) - (set! *db-last-sync* start-time) - (mutex-unlock! *db-multi-sync-mutex*))) - (if (and debug-mode - (> (- start-time last-time) 60)) - (begin - (set! last-time start-time) - (debug:print-info 4 *default-log-port* "timestamp -> " (seconds->time-string (current-seconds)) ", time since start -> " (seconds->hr-min-sec (- (current-seconds) *time-zero*)))))) - - ;; keep going unless time to exit - ;; - (if (not *time-to-exit*) - (let delay-loop ((count 0)) - ;;(debug:print-info 13 *default-log-port* "delay-loop top; count="count" pid="(current-process-id)" this-wd-num="this-wd-num" *time-to-exit*="*time-to-exit*) - - (if (and (not *time-to-exit*) - (< count 4)) ;; was 11, changing to 4. - (begin - (thread-sleep! 1) - (delay-loop (+ count 1)))) - (if (not *time-to-exit*) (loop)))) - (if (common:low-noise-print 30) - (debug:print-info 0 *default-log-port* "Exiting watchdog timer, *time-to-exit* = " *time-to-exit*" pid="(current-process-id)" this-wd-num="this-wd-num))))))) - ;; TODO: for multiple areas, we will have multiple watchdogs; and multiple threads to manage (define (common:watchdog) (debug:print-info 13 *default-log-port* "common:watchdog entered.") - (if (common:on-homehost?) - (let ((dbstruct (db:setup))) - (debug:print-info 13 *default-log-port* "after db:setup with dbstruct="dbstruct) - (cond - ((dbr:dbstruct-read-only dbstruct) - (debug:print-info 13 *default-log-port* "loading read-only watchdog") - (common:readonly-watchdog dbstruct)) - (else - (debug:print-info 13 *default-log-port* "loading writable-watchdog.") - (common:writable-watchdog dbstruct))) - (debug:print-info 13 *default-log-port* "watchdog done.")) - (debug:print-info 13 *default-log-port* "no need for watchdog on non-homehost"))) + (if (launch:setup) + (if (common:on-homehost?) + (let ((dbstruct (db:setup #t))) + (debug:print-info 13 *default-log-port* "after db:setup with dbstruct=" dbstruct) + (cond + ((dbr:dbstruct-read-only dbstruct) + (debug:print-info 13 *default-log-port* "loading read-only watchdog") + (common:readonly-watchdog dbstruct)) + (else + (debug:print-info 13 *default-log-port* "loading writable-watchdog.") + (server:writable-watchdog dbstruct))) + (debug:print-info 13 *default-log-port* "watchdog done.")) + (debug:print-info 13 *default-log-port* "no need for watchdog on non-homehost")))) (define (std-exit-procedure) (on-exit (lambda () 0)) ;;(debug:print-info 13 *default-log-port* "std-exit-procedure called; *time-to-exit*="*time-to-exit*) @@ -776,14 +907,15 @@ (begin (sqlite3:interrupt! db) (sqlite3:finalize! db #t) ;; (vector-set! *task-db* 0 #f) (set! *task-db* #f))))) - (if (and *runremote* - (remote-conndat *runremote*)) - (begin - (http-client#close-all-connections!))) ;; for http-client + (http-client#close-all-connections!) + ;; (if (and *runremote* + ;; (remote-conndat *runremote*)) + ;; (begin + ;; (http-client#close-all-connections!))) ;; for http-client (if (not (eq? *default-log-port* (current-error-port))) (close-output-port *default-log-port*)) (set! *default-log-port* (current-error-port))) "Cleanup db exit thread")) (th2 (make-thread (lambda () (debug:print 4 *default-log-port* "Attempting clean exit. Please be patient and wait a few seconds...") @@ -805,16 +937,27 @@ (define (std-signal-handler signum) ;; (signal-mask! signum) (set! *time-to-exit* #t) ;;(debug:print-info 13 *default-log-port* "got signal "signum) - (debug:print-error 0 *default-log-port* "Received signal " signum " exiting promptly") + (debug:print-error 0 *default-log-port* "Received signal " signum " aaa exiting promptly") + ;; (std-exit-procedure) ;; shouldn't need this since we are exiting and it will be called anyway + (exit)) + +(define (special-signal-handler signum) + ;; (signal-mask! signum) + (set! *time-to-exit* #t) + ;;(debug:print-info 13 *default-log-port* "got signal "signum) + (debug:print-error 0 *default-log-port* "Received signal " signum " sending email befor exiting!!") + ;;TODO send email to notify admin contact listed in the config that the lisner got killed ;; (std-exit-procedure) ;; shouldn't need this since we are exiting and it will be called anyway (exit)) + (set-signal-handler! signal/int std-signal-handler) ;; ^C (set-signal-handler! signal/term std-signal-handler) + ;; (set-signal-handler! signal/stop std-signal-handler) ;; ^Z NO, do NOT handle ^Z! ;;====================================================================== ;; M I S C U T I L S ;;====================================================================== @@ -858,19 +1001,19 @@ #f (let loop ((hed (car cmds)) (tal (cdr cmds))) (let ((res (with-input-from-pipe (conc "which " hed) read-line))) (if (and (string? res) - (file-exists? res)) + (common:file-exists? res)) res (if (null? tal) #f (loop (car tal)(cdr tal)))))))) (define (common:get-install-area) (let ((exe-path (car (argv)))) - (if (file-exists? exe-path) + (if (common:file-exists? exe-path) (handle-exceptions exn #f (pathname-directory (pathname-directory @@ -886,12 +1029,14 @@ (tal (cdr dirs))) (let ((res (or (and (directory? hed) (file-write-access? hed) hed) (handle-exceptions - exn - #f + exn + (begin + (debug:print-info 0 *default-log-port* "could not create " hed ", this might cause problems down the road.") + #f) (create-directory hed #t))))) (if (and (string? res) (directory? res)) res (if (null? tal) @@ -965,14 +1110,18 @@ (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 (if (args:get-arg "--modepatt") (args:get-arg "--modepatt") "TESTPATT")) + (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 "%" ;; (tags-testpatt ;; (debug:print-info 0 *default-log-port* "-tagexpr "tagexpr" selects testpatt "tags-testpatt) ;; tags-testpatt) ((and (equal? args-testpatt "%") rtestpatt) (debug:print-info 0 *default-log-port* "testpatt defined in "testpatt-key" from runconfigs: " rtestpatt) @@ -986,44 +1135,60 @@ (begin (if message (debug:print-info 0 *default-log-port* message)) #f) (thunk) )) -(define (common:file-exists? path-string) +(define (common:file-exists? path-string #!key (silent #f)) ;; this avoids stack dumps in the case where ;;;; TODO: catch permission denied exceptions and emit appropriate warnings, eg: system error while trying to access file: "/nfs/pdx/disks/icf_env_disk001/bjbarcla/gwa/issues/mtdev/randy-slow/reproduce/q... (common:false-on-exception (lambda () (file-exists? path-string)) - message: (conc "Unable to access path: " path-string) + message: (if (not silent) + (conc "Unable to access path: " path-string) + #f) )) (define (common:directory-exists? path-string) ;;;; TODO: catch permission denied exceptions and emit appropriate warnings, eg: system error while trying to access file: "/nfs/pdx/disks/icf_env_disk001/bjbarcla/gwa/issues/mtdev/randy-slow/reproduce/q... (common:false-on-exception (lambda () (directory-exists? path-string)) message: (conc "Unable to access path: " path-string) )) +;; does the directory exist and do we have write access? +;; +;; returns the directory or #f +;; +(define (common:directory-writable? path-string) + (handle-exceptions + exn + #f + (if (and (directory-exists? path-string) + (file-write-access? path-string)) + path-string + #f))) (define (common:get-linktree) (or (getenv "MT_LINKTREE") - (or (and *configdat* - (configf:lookup *configdat* "setup" "linktree")) + (if *configdat* + (configf:lookup *configdat* "setup" "linktree") (if *toppath* (conc *toppath* "/lt") - (if (file-exists? "megatest.config") ;; we are in the toppath (new area, mtutils compatible) - (conc (current-directory) "/lt") - #f))))) + #f)))) (define (common:args-get-runname) (let ((res (or (args:get-arg "-runname") (args:get-arg ":runname") (getenv "MT_RUNNAME")))) ;; (if res (set-environment-variable "MT_RUNNAME" res)) ;; not sure if this is a good idea. side effect and all ... res)) + +(define (common:get-fields cfgdat) + (let ((fields (hash-table-ref/default cfgdat "fields" '()))) + (map car fields))) (define (common:args-get-target #!key (split #f)(exit-if-bad #f)) - (let* ((keys (if (hash-table? *configdat*) (keys:config-get-fields *configdat*) '())) + (let* ((keys (if (hash-table? *configdat*) (common:get-fields *configdat*) '())) (numkeys (length keys)) (target (or (args:get-arg "-reqtarg") (args:get-arg "-target") (getenv "MT_TARGET"))) (tlist (if target (string-split target "/" #t) '())) @@ -1041,10 +1206,20 @@ (begin (debug:print-error 0 *default-log-port* "Invalid target, spaces or blanks not allowed \"" target "\", target should be: " (string-intersperse keys "/") ", have " tlist " for elements") (if exit-if-bad (exit 1)) #f) #f)))) + +;; looking only (at least for now) at the MT_ variables craft the full testname +;; +(define (common:get-full-test-name) + (if (getenv "MT_TEST_NAME") + (if (and (getenv "MT_ITEMPATH") + (not (equal? (getenv "MT_ITEMPATH") ""))) + (getenv "MT_TEST_NAME") + (conc (getenv "MT_TEST_NAME") "/" (getenv "MT_ITEMPATH"))) + #f)) ;; logic for getting homehost. Returns (host . at-home) ;; IF *toppath* is not set, wait up to five seconds trying every two seconds ;; (this is to accomodate the watchdog) ;; @@ -1071,19 +1246,19 @@ (handle-exceptions exn (if (> trynum 0) (let ((delay-time (* (- 5 trynum) 5))) (mutex-unlock! *homehost-mutex*) - (debug:print 0 *default-log-port* "ERROR: Failed to read .homehost file, delaying " delay-time " seconds and trying again, message: " ((condition-property-accessor 'exn 'message) exn)) + (debug:print 0 *default-log-port* "ERROR: ["(common:human-time)"] Failed to read .homehost file, delaying " delay-time " seconds and trying again, message: " ((condition-property-accessor 'exn 'message) exn)) (thread-sleep! delay-time) (common:get-homehost trynum: (- trynum 1))) (begin (mutex-unlock! *homehost-mutex*) - (debug:print 0 *default-log-port* "ERROR: Failed to read .homehost file after trying five times. Giving up and exiting, message: " ((condition-property-accessor 'exn 'message) exn)) + (debug:print 0 *default-log-port* "ERROR: ["(common:human-time)"] Failed to read .homehost file after trying five times. Giving up and exiting, message: " ((condition-property-accessor 'exn 'message) exn)) (exit 1))) (let ((hhf (conc *toppath* "/.homehost"))) - (if (file-exists? hhf) + (if (common:file-exists? hhf) (with-input-from-file hhf read-line) (if (file-write-access? *toppath*) (begin (with-output-to-file hhf (lambda () @@ -1107,14 +1282,24 @@ #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"))))) - + (let ((res #t)) ;; priority by order of evaluation + (if *configdat* ;; sillyness here. can't use setup/use-cache to know if we can use the cached files! + (if (equal? (configf:lookup *configdat* "setup" "use-cache") "no") + (set! res #f) + (if (equal? (configf:lookup *configdat* "setup" "use-cache") "yes") + (set! res #t)))) + (if (args:get-arg "-no-cache")(set! res #f)) ;; overrides setting in "setup" + (if (getenv "MT_USE_CACHE") + (if (equal? (getenv "MT_USE_CACHE") "yes") + (set! res #t) + (if (equal? (getenv "MT_USE_CACHE") "no") + (set! res #f)))) ;; overrides -no-cache switch + res)) + ;; force use of server? ;; (define (common:force-server?) (let* ((force-setting (configf:lookup *configdat* "server" "force")) (force-type (if force-setting (string->symbol force-setting) #f)) @@ -1131,17 +1316,10 @@ (begin (debug:print-info 0 *default-log-port* "forcing use of server, force setting is \"" force-setting "\".") #t) #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 @@ -1295,10 +1473,33 @@ new-rownames new-colnames (if (> curr-rownum rownum) curr-rownum rownum) (if (> curr-colnum colnum) curr-colnum colnum) )))))) + +;; if it looks like a number -> convert it to a number, else return it +;; +(define (common:lazy-convert inval) + (let* ((as-num (if (string? inval)(string->number inval) #f))) + (or as-num inval))) + +;; convert string a=1; b=2; c=a silly thing; d= +;; to '((a . 1)(b . 2)(c . "a silly thing")(d . "")) +;; +(define (common:val->alist val #!key (convert #f)) + (let ((val-list (string-split-fields ";\\s*" val #:infix))) + (if val-list + (map (lambda (x) + (let ((f (string-split-fields "\\s*=\\s*" x #:infix))) + (case (length f) + ((0) `(,#f)) ;; null string case + ((1) `(,(string->symbol (car f)))) + ((2) `(,(string->symbol (car f)) . ,(let ((inval (cadr f))) + (if convert (common:lazy-convert inval) inval)))) + (else f)))) + val-list) + '()))) ;;====================================================================== ;; S Y S T E M S T U F F ;;====================================================================== @@ -1358,77 +1559,133 @@ ;; (let ((newval (string->number (cadr match)))) ;; (if (number? newval) ;; (set! cpu-load newval)))))) ;; (car load-res)) ;; cpu-load)) + +;; get values from cached info from dropping file in logs dir +;; e.g. key is host and dtype is normalized-load +;; +(define (common:get-cached-info key dtype #!key (age 5)) + (let* ((fullpath (conc *toppath* "/logs/" key "-" dtype ".log"))) + (if (and (file-exists? fullpath) + (file-read-access? fullpath)) + (handle-exceptions + exn + #f + (debug:print 2 *default-log-port* "reading file " fullpath) + (let ((real-age (- (current-seconds)(file-change-time fullpath)))) + (if (< real-age age) + (with-input-from-file fullpath read) + (begin + (debug:print 2 *default-log-port* "file " fullpath " is too old (" real-age" seconds)to trust, skipping reading it") + #f)))) + (begin + (debug:print 2 *default-log-port* "not reading file " fullpath) + #f)))) + +(define (common:write-cached-info key dtype dat) + (let* ((fullpath (conc *toppath* "/logs/" key "-" dtype ".log"))) + (handle-exceptions + exn + #f + (with-output-to-file fullpath (lambda ()(pp dat)))))) ;; get cpu load by reading from /proc/loadavg, return all three values ;; (define (common:get-cpu-load remote-host) - (if remote-host - (map (lambda (res) - (if (eof-object? res) 9e99 res)) - (with-input-from-pipe - (conc "ssh " remote-host " cat /proc/loadavg") - (lambda ()(list (read)(read)(read))))) - (with-input-from-file "/proc/loadavg" - (lambda ()(list (read)(read)(read)))))) + (let* ((actual-hostname (or remote-host (get-host-name) "localhost"))) + (or (common:get-cached-info actual-hostname "cpu-load") + (let ((result (if remote-host + (map (lambda (res) + (if (eof-object? res) 9e99 res)) + (with-input-from-pipe + (conc "ssh " remote-host " cat /proc/loadavg") + (lambda ()(list (read)(read)(read))))) + (with-input-from-file "/proc/loadavg" + (lambda ()(list (read)(read)(read))))))) + (common:write-cached-info actual-hostname "cpu-load" result) + result)))) ;; get normalized cpu load by reading from /proc/loadavg and /proc/cpuinfo return all three values and the number of real cpus and the number of threads ;; returns alist '((adj-cpu-load . normalized-proc-load) ... etc. ;; keys: adj-proc-load, adj-core-load, 1m-load, 5m-load, 15m-load ;; (define (common:get-normalized-cpu-load remote-host) - (let ((data (if remote-host - (with-input-from-pipe - (conc "ssh " remote-host " cat /proc/loadavg;cat /proc/cpuinfo;echo end") - read-lines) - (append - (with-input-from-file "/proc/loadavg" - read-lines) - (with-input-from-file "/proc/cpuinfo" - read-lines) - (list "end")))) - (load-rx (regexp "^([\\d\\.]+)\\s+([\\d\\.]+)\\s+([\\d\\.]+)\\s+.*$")) - (proc-rx (regexp "^processor\\s+:\\s+(\\d+)\\s*$")) - (core-rx (regexp "^core id\\s+:\\s+(\\d+)\\s*$")) - (phys-rx (regexp "^physical id\\s+:\\s+(\\d+)\\s*$")) - (max-num (lambda (p n)(max (string->number p) n)))) - ;; (print "data=" data) - (if (null? data) ;; something went wrong - #f - (let loop ((hed (car data)) - (tal (cdr data)) - (loads #f) - (proc-num 0) ;; processor includes threads - (phys-num 0) ;; physical chip on motherboard - (core-num 0)) ;; core - ;; (print hed ", " loads ", " proc-num ", " phys-num ", " core-num) - (if (null? tal) ;; have all our data, calculate normalized load and return result - (let* ((act-proc (+ proc-num 1)) - (act-phys (+ phys-num 1)) - (act-core (+ core-num 1)) - (adj-proc-load (/ (car loads) act-proc)) - (adj-core-load (/ (car loads) act-core))) - (append (list (cons 'adj-proc-load adj-proc-load) - (cons 'adj-core-load adj-core-load)) - (list (cons '1m-load (car loads)) - (cons '5m-load (cadr loads)) - (cons '15m-load (caddr loads))) - (list (cons 'proc act-proc) - (cons 'core act-core) - (cons 'phys act-phys)))) - (regex-case - hed - (load-rx ( x l1 l5 l15 ) (loop (car tal)(cdr tal)(map string->number (list l1 l5 l15)) proc-num phys-num core-num)) - (proc-rx ( x p ) (loop (car tal)(cdr tal) loads (max-num p proc-num) phys-num core-num)) - (phys-rx ( x p ) (loop (car tal)(cdr tal) loads proc-num (max-num p phys-num) core-num)) - (core-rx ( x c ) (loop (car tal)(cdr tal) loads proc-num phys-num (max-num c core-num))) - (else - (begin - ;; (print "NO MATCH: " hed) - (loop (car tal)(cdr tal) loads proc-num phys-num core-num))))))))) + (let ((res (common:get-normalized-cpu-load-raw remote-host)) + (default `((adj-proc-load . 2) ;; there is no right answer + (adj-core-load . 2) + (1m-load . 2) + (5m-load . 0) ;; causes a large delta - thus causing default of throttling if stuff goes wrong + (15m-load . 0) + (proc . 1) + (core . 1) + (phys . 1) + (error . #t)))) + (cond + ((and (list? res) + (> (length res) 2)) + res) + ((eq? res #f) default) ;; add messages? + ((eq? res #f) default) ;; this would be the #eof + (else default)))) + +(define (common:get-normalized-cpu-load-raw remote-host) + (let* ((actual-host (or remote-host (get-host-name)))) ;; #f is localhost + (or (common:get-cached-info actual-host "normalized-load") + (let ((data (if remote-host + (with-input-from-pipe + (conc "ssh " remote-host " cat /proc/loadavg;cat /proc/cpuinfo;echo end") + read-lines) + (append + (with-input-from-file "/proc/loadavg" + read-lines) + (with-input-from-file "/proc/cpuinfo" + read-lines) + (list "end")))) + (load-rx (regexp "^([\\d\\.]+)\\s+([\\d\\.]+)\\s+([\\d\\.]+)\\s+.*$")) + (proc-rx (regexp "^processor\\s+:\\s+(\\d+)\\s*$")) + (core-rx (regexp "^core id\\s+:\\s+(\\d+)\\s*$")) + (phys-rx (regexp "^physical id\\s+:\\s+(\\d+)\\s*$")) + (max-num (lambda (p n)(max (string->number p) n)))) + ;; (print "data=" data) + (if (null? data) ;; something went wrong + #f + (let loop ((hed (car data)) + (tal (cdr data)) + (loads #f) + (proc-num 0) ;; processor includes threads + (phys-num 0) ;; physical chip on motherboard + (core-num 0)) ;; core + ;; (print hed ", " loads ", " proc-num ", " phys-num ", " core-num) + (if (null? tal) ;; have all our data, calculate normalized load and return result + (let* ((act-proc (+ proc-num 1)) + (act-phys (+ phys-num 1)) + (act-core (+ core-num 1)) + (adj-proc-load (/ (car loads) act-proc)) + (adj-core-load (/ (car loads) act-core)) + (result + (append (list (cons 'adj-proc-load adj-proc-load) + (cons 'adj-core-load adj-core-load)) + (list (cons '1m-load (car loads)) + (cons '5m-load (cadr loads)) + (cons '15m-load (caddr loads))) + (list (cons 'proc act-proc) + (cons 'core act-core) + (cons 'phys act-phys))))) + (common:write-cached-info actual-host "normalized-load" result) + result) + (regex-case + hed + (load-rx ( x l1 l5 l15 ) (loop (car tal)(cdr tal)(map string->number (list l1 l5 l15)) proc-num phys-num core-num)) + (proc-rx ( x p ) (loop (car tal)(cdr tal) loads (max-num p proc-num) phys-num core-num)) + (phys-rx ( x p ) (loop (car tal)(cdr tal) loads proc-num (max-num p phys-num) core-num)) + (core-rx ( x c ) (loop (car tal)(cdr tal) loads proc-num phys-num (max-num c core-num))) + (else + (begin + ;; (print "NO MATCH: " hed) + (loop (car tal)(cdr tal) loads proc-num phys-num core-num))))))))))) (define (common:unix-ping hostname) (let ((res (system (conc "ping -c 1 " hostname " > /dev/null")))) (eq? res 0))) @@ -1435,16 +1692,16 @@ ;; ideally put all this info into the db, no need to preserve it across moving homehost ;; ;; return list of ;; ( reachable? cpuload update-time ) (define (common:get-host-info hostname) - (let* ((loadinfo (rmt:get-latest-host-load hostname)) - (load (car loadinfo)) - (load-sample-time (cdr loadinfo)) - (load-sample-age (- (current-seconds) load-sample-time)) - (loadinfo-timeout-seconds 20) - (host-last-update-timeout-seconds 10) + (let* ((loadinfo (rmt:get-latest-host-load hostname)) ;; if this host happens to have been recently used by a test reuse the load data + (load (car loadinfo)) + (load-sample-time (cdr loadinfo)) + (load-sample-age (- (current-seconds) load-sample-time)) + (loadinfo-timeout-seconds 6) ;; this was 20 seconds, seems way too lax. Switch to 6 seconds + (host-last-update-timeout-seconds 4) (host-rec (hash-table-ref/default *host-loads* hostname #f)) ) (cond ((< load-sample-age loadinfo-timeout-seconds) (list #t @@ -1456,14 +1713,18 @@ (host-last-update host-rec) (host-last-cpuload host-rec ))) ((common:unix-ping hostname) (list #t (current-seconds) - (alist-ref 'adj-core-load (common:get-normalized-cpu-load hostname)))) + (alist-ref 'adj-core-load (common:get-normalized-cpu-load hostname)))) ;; this is cheaper than you might think. get-normalized-cpu-load is cached for up to 5 seconds (else - (list #f 0 -1))))) - + (list #f 0 -1) ;; bad host, don't use! + )))) + +;; see defstruct host at top of file. +;; host: reachable last-update last-used last-cpuload +;; (define (common:update-host-loads-table hosts-raw) (let* ((hosts (filter (lambda (x) (string-match (regexp "^\\S+$") x)) hosts-raw))) (for-each @@ -1481,80 +1742,137 @@ (host-reachable-set! rec is-reachable) (host-last-update-set! rec last-reached-time) (host-last-cpuload-set! rec load))) hosts))) -(define (common:get-least-loaded-host hosts-raw) - (let* ((hosts (filter (lambda (x) - (string-match (regexp "^\\S+$") x)) - hosts-raw)) - (best-host #f) +;; go through the hosts from least recently used to most recently used, pick the first that meets the load criteral from the +;; [host-rules] section. +;; +(define (common:get-least-loaded-host hosts-raw host-type configdat) + (let* ((rdat (configf:lookup configdat "host-rules" host-type)) + (rules (common:val->alist (or rdat "") convert: #t)) ;; maxnload, maxnjobs, maxjobrate + (maxnload (common:alist-ref/default 'maxnload rules 1.5)) ;; max normalized load + (maxnjobs (common:alist-ref/default 'maxnjobs rules 1.5)) ;; max normalized number of jobs + (maxjobrate (common:alist-ref/default 'maxjobrate rules (/ 1 6))) ;; max rate of submitting jobs to a given host in jobs/second + (hosts (filter (lambda (x) + (string-match (regexp "^\\S+$") x)) + hosts-raw)) + ;; (best-host #f) + (get-rec (lambda (hostname) + ;; (print "get-rec hostname=" hostname) + (let ((h (hash-table-ref/default *host-loads* hostname #f))) + (if h + h + (let ((h (make-host))) + (hash-table-set! *host-loads* hostname h) + h))))) (best-load 99999) - (curr-time (current-seconds))) - (common:update-host-loads-table hosts) - (for-each - (lambda (hostname) - (let* ((rec - (let ((h (hash-table-ref/default *host-loads* hostname #f))) - (if h - h - (let ((h (make-host))) - (hash-table-set! *host-loads* hostname h) - h)))) - (reachable (host-reachable rec)) - (load (host-last-cpuload rec))) - (cond - ((not reachable) #f) - ((< (+ load (/ (random 250) 1000)) ;; add a random factor to keep from getting in a rut - (+ best-load (/ (random 250) 1000)) ) - (set! best-load load) - (set! best-host hostname))))) - hosts) - best-host)) - - - - -(define (common:wait-for-cpuload maxload numcpus waitdelay #!key (count 1000) (msg #f)(remote-host #f)) + (curr-time (current-seconds)) + (get-hosts-sorted (lambda (hosts) + (sort hosts (lambda (a b) + (let ((a-rec (get-rec a)) + (b-rec (get-rec b))) + ;; (print "a=" a " a-rec=" a-rec " host-last-used=" (host-last-used a-rec)) + ;; (print "b=" b " b-rec=" b-rec " host-last-used=" (host-last-used b-rec)) + (< (host-last-used a-rec) + (host-last-used b-rec)))))))) + (debug:print 0 *default-log-port* "INFO: hosts-sorted=" (get-hosts-sorted hosts)) + (if (null? hosts) + #f ;; no hosts to select from. All done and giving up now. + (let ((hosts-sorted (get-hosts-sorted hosts))) + (common:update-host-loads-table hosts) + (let loop ((hostname (car hosts-sorted)) + (tal (cdr hosts-sorted)) + (best-host #f)) + (let* ((rec (get-rec hostname)) + (reachable (host-reachable rec)) + (load (host-last-cpuload rec)) + (last-used (host-last-used rec)) + (delta (- curr-time last-used)) + (job-rate (if (> delta 0) + (/ 1 delta) + 999)) ;; jobs per second + (new-best + (cond + ((not reachable) + (debug:print 0 *default-log-port* "Skipping host " hostname " as it cannot be reached.") + best-host) + ((and (< load maxnload) ;; load is acceptable + (< job-rate maxjobrate)) ;; job rate is acceptable + (set! best-load load) + hostname) + (else best-host)))) + (debug:print 0 *default-log-port* "INFO: Trying host " hostname " with load " load ", last used " delta " seconds ago, with job-rate " job-rate " for running a test." ) + (if new-best + (begin ;; found a host, return it + (debug:print 0 *default-log-port* "INFO: Found host: " new-best " load: " load " last-used: " delta " seconds ago, with job-rate: " job-rate) + (host-last-used-set! rec curr-time) + new-best) + (if (null? tal) #f (loop (car tal)(cdr tal) best-host))))))))) + +(define (common:wait-for-cpuload maxload-in numcpus-in waitdelay #!key (count 1000) (msg #f)(remote-host #f)(force-maxload #f)) (let* ((loadavg (common:get-cpu-load remote-host)) + (numcpus (if (< 1 numcpus-in) ;; not possible + (common:get-num-cpus remote-host) + numcpus-in)) + (maxload (if force-maxload + maxload-in + (max maxload-in 0.5))) ;; so maxload must be greater than 0.5 for now BUG - FIXME? (first (car loadavg)) (next (cadr loadavg)) - (adjload (* maxload numcpus)) - (loadjmp (- first next))) + (adjload (* maxload (max 1 numcpus))) ;; possible bug where numcpus (or could be maxload) is zero, crude fallback is to at least use 1 + (loadjmp (- first next)) + (adjwait (min (+ 300 (random 10)) (* (+ (random 10)(/ (- 1000 count) 10) waitdelay) (- first adjload) ) ))) ;; add some randomness to the time to break any alignment where netbatch dumps many jobs to machines simultaneously + (debug:print-info 1 *default-log-port* "Checking cpuload on " (or remote-host "localhost") ", maxload: " maxload + ", load: " first ", adjload: " adjload ", loadjmp: " loadjmp) (cond ((and (> first adjload) (> count 0)) - (debug:print-info 0 *default-log-port* "waiting " waitdelay " seconds due to load " first " exceeding max of " adjload (if msg msg "")) - (thread-sleep! waitdelay) - (common:wait-for-cpuload maxload numcpus waitdelay count: (- count 1))) + (debug:print-info 0 *default-log-port* "server start delayed " adjwait " seconds due to load " first " exceeding max of " adjload " on server " (or remote-host (get-host-name)) " (normalized load-limit: " maxload ") " (if msg msg "")) + (thread-sleep! adjwait) + (common:wait-for-cpuload maxload numcpus waitdelay count: (- count 1) msg: msg remote-host: remote-host)) ((and (> loadjmp numcpus) (> count 0)) - (debug:print-info 0 *default-log-port* "waiting " waitdelay " seconds due to load jump " loadjmp " > numcpus " numcpus (if msg msg "")) - (thread-sleep! waitdelay) - (common:wait-for-cpuload maxload numcpus waitdelay count: (- count 1)))))) + (debug:print-info 0 *default-log-port* "waiting " adjwait " seconds due to load jump " loadjmp " > numcpus " numcpus (if msg msg "")) + (thread-sleep! adjwait) + (common:wait-for-cpuload maxload numcpus waitdelay count: (- count 1) msg: msg remote-host: remote-host))))) + +(define (common:wait-for-homehost-load maxload msg) + (let* ((hh-dat (if (common:on-homehost?) ;; if we are on the homehost then pass in #f so the calls are local. + #f + (common:get-homehost))) + (hh (if hh-dat (car hh-dat) #f)) + (numcpus (common:get-num-cpus hh))) + (common:wait-for-normalized-load maxload msg hh))) (define (common:get-num-cpus remote-host) - (let ((proc (lambda () - (let loop ((numcpu 0) - (inl (read-line))) - (if (eof-object? inl) - numcpu - (loop (if (string-match "^processor\\s+:\\s+\\d+$" inl) - (+ numcpu 1) - numcpu) - (read-line))))))) - (if remote-host - (with-input-from-pipe - (conc "ssh " remote-host " cat /proc/cpuinfo") - proc) - (with-input-from-file "/proc/cpuinfo" proc)))) + (let* ((actual-host (or remote-host (get-host-name)))) + (or (common:get-cached-info actual-host "num-cpus" age: 86400) ;; hosts had better not be changing the number of cpus too often! + (let* ((proc (lambda () + (let loop ((numcpu 0) + (inl (read-line))) + (if (eof-object? inl) + (begin + (common:write-cached-info remote-host "num-cpus" numcpu) + numcpu) + (loop (if (string-match "^processor\\s+:\\s+\\d+$" inl) + (+ numcpu 1) + numcpu) + (read-line)))))) + (result (if remote-host + (with-input-from-pipe + (conc "ssh " remote-host " cat /proc/cpuinfo") + proc) + (with-input-from-file "/proc/cpuinfo" proc)))) + (common:write-cached-info actual-host "num-cpus" result) + result)))) ;; wait for normalized cpu load to drop below maxload ;; -(define (common:wait-for-normalized-load maxload #!key (msg #f)(remote-host #f)) +(define (common:wait-for-normalized-load maxload msg remote-host) (let ((num-cpus (common:get-num-cpus remote-host))) - (common:wait-for-cpuload maxload num-cpus 15 msg: msg))) + (common:wait-for-cpuload maxload num-cpus 15 msg: msg remote-host: remote-host))) (define (get-uname . params) (let* ((uname-res (process:cmd-run->list (conc "uname " (if (null? params) "-a" (car params))))) (uname #f)) (if (null? (car uname-res)) @@ -1679,10 +1997,86 @@ (set! bestsize freespc))))) (map car disks)) (if (and best (> bestsize minsize)) best #f))) ;; #f means no disk candidate found + +;; convert a spec string to a list of vectors #( rx action rx-string ) +(define (common:spec-string->list-of-specs spec-string actions) + (let ((spec-strings (string-split-fields "\\s*;\\s*" spec-string #:infix)) + (actions-regex (regexp (conc "^(.*)\\s+(" (string-intersperse (map conc actions) "|") ")")))) + (filter + (lambda (x) x) + (map (lambda (s) + (let ((m (string-match actions-regex s))) + (if m + (vector (regexp (cadr m))(string->symbol (caddr m))(cadr m)) + (begin + (debug:print 0 *default-log-port* "WARNING: Unrecognised rule \"" s "\" in clean-up specification.") + #f)))) + spec-strings)))) + +;; given a list of specs rx . rule and a file return the first matching rule +;; +(define (common:file-find-rule fname rules) ;; rule is vector #( rx action rx-string) + (let loop ((rule (car rules)) + (tail (cdr rules))) + (let ((rx (vector-ref rule 0)) + (rn (vector-ref rule 1))) ;; rule name + (if (string-match rx fname) + rule ;; return the whole rule so regex can be printed etc. + (if (null? tail) + #f + (loop (car tail)(cdr tail))))))) + +;; given a spec apply some rules to a directory +;; +;; WARNING: This function will REMOVE files - be sure your spec and path is correct! +;; +;; spec format: +;; file-regex1 action; file-regex2 action; ... +;; e.g. +;; .*\.log$ keep; .* remove +;; --> keep all .log files, remove everything else +;; limitations: +;; cannot have a rule with ; as part of the spec +;; not very flexible, would be nice to return binned file names? +;; supported rules: +;; keep - keep this file +;; remove - remove this file +;; compress - compress this file +;; +(define (common:dir-clean-up path spec-string #!key (compress "gzip")(actions '(keep remove compress))(remove-empty #f)) + (let* ((specs (common:spec-string->list-of-specs spec-string actions)) + (keepers (make-hash-table)) + (directories (make-hash-table))) + (find-files + path + action: (lambda (p res) + (let ((rule (common:file-find-rule p specs))) + (cond + ((directory? p)(hash-table-set! directories p #t)) + (else + (case (vector-ref rule 1) + ((keep)(hash-table-set! keepers p rule)) + ((remove) + (print "Removing file " p) + (delete-file p)) + ((compress) + (print "Compressing file " p) + (system (conc compress " " p))) + (else + (print "No match for file " p)))))))) + (if remove-empty + (for-each + (lambda (d) + (if (null? (glob (conc d "/.*")(conc d "/*"))) + (begin + (print "Removing empty directory " d) + (delete-directory d)))) + (sort (hash-table-keys directories) (lambda (a b)(> (string-length a)(string-length b)))))) + )) ;;====================================================================== ;; E N V I R O N M E N T V A R S ;;====================================================================== (define (bb-check-path #!key (msg "check-path: ")) @@ -1708,11 +2102,12 @@ (let* ((key (car keyval)) (val (cdr keyval)) (delim (if (string-search whitesp val) "\"" ""))) - (print (if (member key ignorevars) + (print (if (or (member key ignorevars) + (string-search whitesp key)) "# setenv " "setenv ") key " " delim (mungeval val) delim))) envvars))) (with-output-to-file (conc fname ".sh") @@ -1722,37 +2117,83 @@ (val (cdr keyval)) (delim (if (string-search whitesp val) "\"" ""))) (print (if (or (member key ignorevars) + (string-search whitesp key) (string-search ":" key)) ;; internal only values to be skipped. "# export " "export ") key "=" delim (mungeval val) delim))) envvars))))) + +(define (common:get-param-mapping #!key (flavor #f)) + "returns alist mapping string keys in testconfig/subrun to megatest command line switches; if flavor is switch-symbol, maps tcmt symbolic switches to megatest switches" + (let ((default '(("tag-expr" . "-tagexpr") + ("mode-patt" . "-modepatt") + ("run-name" . "-runname") + ("contour" . "-contour") + ("target" . "-target") + ("test-patt" . "-testpatt") + ("msg" . "-m") + ("log" . "-log") + ("start-dir" . "-start-dir") + ("new" . "-set-state-status")))) + (if (eq? flavor 'switch-symbol) + (map (lambda (x) + (cons (string->symbol (conc "-" (car x))) (cdr x))) + default) + default))) + ;; set some env vars from an alist, return an alist with original values ;; (("VAR" "value") ...) +;; a value of #f means "unset this var" +;; (define (alist->env-vars lst) (if (list? lst) (let ((res '())) (for-each (lambda (p) (let* ((var (car p)) (val (cadr p)) (prv (get-environment-variable var))) (set! res (cons (list var prv) res)) (if val - (setenv var (->string val)) + (safe-setenv var (->string val)) (unsetenv var)))) lst) res) '())) + ;; clear vars matching pattern, run proc, set vars back ;; if proc is a string run that string as a command with ;; system. ;; +(define *common:orig-env* + (let ((envvars (get-environment-variables))) + (if (get-environment-variable "MT_ORIG_ENV") + (with-input-from-string + (z3:decode-buffer (base64:base64-decode (get-environment-variable "MT_ORIG_ENV"))) + read) + (filter-map (lambda (x) + (if (string-match "^MT_.*" (car x)) + #f + x)) + envvars)))) + +(define (common:with-orig-env proc) + (let ((current-env (get-environment-variables))) + (for-each (lambda (x) (unsetenv (car x))) current-env) + (for-each (lambda (x) (setenv (car x) (cdr x))) *common:orig-env*) + (let ((rv (cond + ((string? proc)(system proc)) + (proc (proc))))) + (for-each (lambda (x) (unsetenv (car x))) *common:orig-env*) + (for-each (lambda (x) (setenv (car x) (cdr x))) current-env) + rv))) + (define (common:without-vars proc . var-patts) (let ((vars (make-hash-table))) (for-each (lambda (vardat) ;; each env var (for-each @@ -1771,44 +2212,49 @@ vars (lambda (var val) (setenv var val))) vars)) -(define (common:run-a-command cmd #!key (with-vars #f)) + +(define (common:run-a-command cmd #!key (with-vars #f) (with-orig-env #f)) (let* ((pre-cmd (dtests:get-pre-command)) (post-cmd (dtests:get-post-command)) (fullcmd (if (or pre-cmd post-cmd) (conc pre-cmd cmd post-cmd) (conc "viewscreen " cmd)))) (debug:print-info 02 *default-log-port* "Running command: " fullcmd) - (if with-vars - (common:without-vars cmd) - (common:without-vars fullcmd "MT_.*")))) + (cond + (with-vars (common:without-vars fullcmd)) + (with-orig-env (common:with-orig-env fullcmd)) + (else (common:without-vars fullcmd "MT_.*"))))) ;;====================================================================== ;; T I M E A N D D A T E ;;====================================================================== ;; Convert strings like "5s 2h 3m" => 60x60x2 + 3x60 + 5 (define (common:hms-string->seconds tstr) - (let ((parts (string-split tstr)) + (let ((parts (string-split-fields "\\w+" tstr)) (time-secs 0) - ;; s=seconds, m=minutes, h=hours, d=days - (trx (regexp "(\\d+)([smhd])"))) + ;; s=seconds, m=minutes, h=hours, d=days, M=months, y=years, w=weeks + (trx (regexp "(\\d+)([smhdMyw])"))) (for-each (lambda (part) (let ((match (string-match trx part))) (if match (let ((val (string->number (cadr match))) (unt (caddr match))) (if val (set! time-secs (+ time-secs (* val (case (string->symbol unt) ((s) 1) - ((m) 60) - ((h) (* 60 60)) - ((d) (* 24 60 60)) - (else 0)))))))))) + ((m) 60) ;; minutes + ((h) 3600) + ((d) 86400) + ((w) 604800) + ((M) 2628000) ;; aproximately one month + ((y) 31536000) + (else #f)))))))))) parts) time-secs)) (define (seconds->hr-min-sec secs) (let* ((hrs (quotient secs 3600)) @@ -2091,25 +2537,51 @@ (number->string x 16)) (map string->number (string-split instr))) "/")) -(define (common:faux-lock keyname) - (if (rmt:get-var keyname) - #f +;;====================================================================== +;; L O C K I N G M E C H A N I S M S +;;====================================================================== + +;; faux-lock is deprecated. Please use simple-lock below +;; +(define (common:faux-lock keyname #!key (wait-time 8)(allow-lock-steal #t)) + (if (rmt:no-sync-get/default keyname #f) ;; do not be tempted to compare to pid. locking is a one-shot action, if already locked for this pid it doesn't actually count + (if (> wait-time 0) + (begin + (thread-sleep! 1) + (if (eq? wait-time 1) ;; only one second left, steal the lock + (begin + (debug:print-info 0 *default-log-port* "stealing lock for " keyname) + (common:faux-unlock keyname force: #t))) + (common:faux-lock keyname wait-time: (- wait-time 1))) + #f) (begin - (rmt:set-var keyname (conc (current-process-id))) - (equal? (conc (current-process-id)) (conc (rmt:get-var keyname)))))) + (rmt:no-sync-set keyname (conc (current-process-id))) + (equal? (conc (current-process-id)) (conc (rmt:no-sync-get/default keyname #f)))))) (define (common:faux-unlock keyname #!key (force #f)) - (if (or force (equal? (conc (current-process-id)) (conc (rmt:get-var keyname)))) + (if (or force (equal? (conc (current-process-id)) (conc (rmt:no-sync-get/default keyname #f)))) (begin - (if (rmt:get-var keyname) (rmt:del-var keyname)) + (if (rmt:no-sync-get/default keyname #f) (rmt:no-sync-del! keyname)) #t) #f)) - +;; simple lock. improve and converge on this one. +;; +(define (common:simple-lock keyname) + (rmt:no-sync-get-lock keyname)) + +(define (common:simple-unlock keyname #!key (force #f)) + (rmt:no-sync-del! keyname)) + + +;;====================================================================== +;; +;;====================================================================== + (define (common:in-running-test?) (and (args:get-arg "-execute") (get-environment-variable "MT_CMDINFO"))) (define (common:get-color-from-status status) (cond @@ -2120,93 +2592,81 @@ ((equal? status "KILLREQ") "purple") ((equal? status "RUNNING") "blue") ((equal? status "ABORT") "brown") (else "black"))) -;;====================================================================== -;; N A N O M S G C L I E N T -;;====================================================================== - -(define (server:get-best-guess-address hostname) - (let ((res #f)) - (for-each - (lambda (adr) - (if (not (eq? (u8vector-ref adr 0) 127)) - (set! res adr))) - ;; NOTE: This can fail when there is no mention of the host in /etc/hosts. FIXME - (vector->list (hostinfo-addresses (hostname->hostinfo hostname)))) - (string-intersperse - (map number->string - (u8vector->list - (if res res (hostname->ip hostname)))) "."))) - - -(define (common:send-dboard-main-changed) - (let* ((dashboard-ips (mddb:get-dashboards))) - (for-each - (lambda (ipadr) - (let* ((soc (common:open-nm-req (conc "tcp://" ipadr))) - (msg (conc "main " *toppath*)) - (res (common:nm-send-receive-timeout soc msg))) - (if (not res) ;; couldn't reach that dashboard - remove it from db - (print "ERROR: couldn't reach dashboard " ipadr)) - res)) - dashboard-ips))) - - -;;====================================================================== -;; D A S H B O A R D D B -;;====================================================================== - -(define (mddb:open-db) - (let* ((db (open-database (conc (get-environment-variable "HOME") "/.dashboard.db")))) - (set-busy-handler! db (busy-timeout 10000)) - (for-each - (lambda (qry) - (exec (sql db qry))) - (list - "CREATE TABLE IF NOT EXISTS vars (id INTEGER PRIMARY KEY,key TEXT, val TEXT, CONSTRAINT varsconstraint UNIQUE (key));" - "CREATE TABLE IF NOT EXISTS dashboards ( - id INTEGER PRIMARY KEY, - pid INTEGER, - username TEXT, - hostname TEXT, - ipaddr TEXT, - portnum INTEGER, - start_time TIMESTAMP DEFAULT (strftime('%s','now')), - CONSTRAINT hostport UNIQUE (hostname,portnum) - );" - )) - db)) - -;; register a dashboard -;; -(define (mddb:register-dashboard port) - (let* ((pid (current-process-id)) - (hostname (get-host-name)) - (ipaddr (server:get-best-guess-address hostname)) - (username (current-user-name)) ;; (car userinfo))) - (db (mddb:open-db))) - (print "Register monitor, pid: " pid ", hostname: " hostname ", port: " port ", username: " username) - (exec (sql db "INSERT OR REPLACE INTO dashboards (pid,username,hostname,ipaddr,portnum) VALUES (?,?,?,?,?);") - pid username hostname ipaddr port) - (close-database db))) - -;; unregister a monitor -;; -(define (mddb:unregister-dashboard host port) - (let* ((db (mddb:open-db))) - (print "Register unregister monitor, host:port=" host ":" port) - (exec (sql db "DELETE FROM dashboards WHERE hostname=? AND portnum=?;") host port) - (close-database db))) - -;; get registered dashboards -;; -(define (mddb:get-dashboards) - (let ((db (mddb:open-db))) - (query fetch-column - (sql db "SELECT ipaddr || ':' || portnum FROM dashboards;")))) +;; ;;====================================================================== +;; ;; N A N O M S G C L I E N T +;; ;;====================================================================== +;; +;; +;; +;; (define (common:send-dboard-main-changed) +;; (let* ((dashboard-ips (mddb:get-dashboards))) +;; (for-each +;; (lambda (ipadr) +;; (let* ((soc (common:open-nm-req (conc "tcp://" ipadr))) +;; (msg (conc "main " *toppath*)) +;; (res (common:nm-send-receive-timeout soc msg))) +;; (if (not res) ;; couldn't reach that dashboard - remove it from db +;; (print "ERROR: couldn't reach dashboard " ipadr)) +;; res)) +;; dashboard-ips))) +;; +;; +;; ;;====================================================================== +;; ;; D A S H B O A R D D B +;; ;;====================================================================== +;; +;; (define (mddb:open-db) +;; (let* ((db (open-database (conc (get-environment-variable "HOME") "/.dashboard.db")))) +;; (set-busy-handler! db (busy-timeout 10000)) +;; (for-each +;; (lambda (qry) +;; (exec (sql db qry))) +;; (list +;; "CREATE TABLE IF NOT EXISTS vars (id INTEGER PRIMARY KEY,key TEXT, val TEXT, CONSTRAINT varsconstraint UNIQUE (key));" +;; "CREATE TABLE IF NOT EXISTS dashboards ( +;; id INTEGER PRIMARY KEY, +;; pid INTEGER, +;; username TEXT, +;; hostname TEXT, +;; ipaddr TEXT, +;; portnum INTEGER, +;; start_time TIMESTAMP DEFAULT (strftime('%s','now')), +;; CONSTRAINT hostport UNIQUE (hostname,portnum) +;; );" +;; )) +;; db)) +;; +;; ;; register a dashboard +;; ;; +;; (define (mddb:register-dashboard port) +;; (let* ((pid (current-process-id)) +;; (hostname (get-host-name)) +;; (ipaddr (server:get-best-guess-address hostname)) +;; (username (current-user-name)) ;; (car userinfo))) +;; (db (mddb:open-db))) +;; (print "Register monitor, pid: " pid ", hostname: " hostname ", port: " port ", username: " username) +;; (exec (sql db "INSERT OR REPLACE INTO dashboards (pid,username,hostname,ipaddr,portnum) VALUES (?,?,?,?,?);") +;; pid username hostname ipaddr port) +;; (close-database db))) +;; +;; ;; unregister a monitor +;; ;; +;; (define (mddb:unregister-dashboard host port) +;; (let* ((db (mddb:open-db))) +;; (print "Register unregister monitor, host:port=" host ":" port) +;; (exec (sql db "DELETE FROM dashboards WHERE hostname=? AND portnum=?;") host port) +;; (close-database db))) +;; +;; ;; 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 ;;====================================================================== ;; @@ -2217,10 +2677,16 @@ ;; ;; [host-types] ;; general #MTLOWESTLOAD #{g hosts allhosts} ;; arm #MTLOWESTLOAD #{g hosts arm} ;; nbgeneral nbjob run JOBCOMMAND -log $MT_LINKTREE/$MT_TARGET/$MT_RUNNAME.$MT_TESTNAME-$MT_ITEM_PATH.lgo +;; +;; [host-rules] +;; # maxnload => max normalized load +;; # maxnjobs => max jobs per cpu +;; # maxjobrate => max jobs per second +;; general maxnload=1.1; maxnjobs=1.2; maxjobrate=0.1 ;; ;; [launchers] ;; envsetup general ;; xor/%/n 4C16G ;; % nbgeneral @@ -2247,12 +2713,23 @@ (let ((launcher (configf:lookup configdat "host-types" host-type))) (if launcher (let* ((launcher-parts (string-split launcher)) (launcher-exe (car launcher-parts))) (if (equal? launcher-exe "#MTLOWESTLOAD") ;; this is our special case, we will find the lowest load and craft a nbfake commandline - (let ((targ-host (common:get-least-loaded-host (cdr launcher-parts)))) - (conc "remrun " targ-host)) + (let host-loop ((targ-host (common:get-least-loaded-host (cdr launcher-parts) host-type configdat)) + (count 100)) + (if targ-host + (conc "remrun " targ-host) + (if (> count 0) + (begin + (debug:print 0 *default-log-port* "INFO: Waiting for a host for host-type " host-type) + (thread-sleep! (- 101 count)) + (host-loop (common:get-least-loaded-host (cdr launcher-parts) host-type configdat) + (- count 1))) + (begin + (debug:print 0 *default-log-port* "FATAL: Failed to find a host from #MTLOWESTLOAD for host-type " host-type) + (exit))))) launcher)) (begin (debug:print-info 0 *default-log-port* "WARNING: no launcher found for host-type " host-type) (if (null? tal) fallback-launcher @@ -2260,11 +2737,51 @@ ;; no match, try again (if (null? tal) fallback-launcher (loop (car tal)(cdr tal)))))))) fallback-launcher))) + +;;====================================================================== +;; NMSG AND NEW API +;;====================================================================== + +;; nm based server experiment, keep around for now. +;; +(define (nm:start-server dbconn #!key (given-host-name #f)) + (let* ((srvdat (start-raw-server given-host-name: given-host-name)) + (host-name (srvdat-host srvdat)) + (soc (srvdat-soc srvdat))) + + ;; start the queue processor (save for second round of development) + ;; + (thread-start! (make-thread! (lambda ()(queue-processor dbconn) "Queue processor"))) + ;; msg is an alist + ;; 'r host:port <== where to return the data + ;; 'p params <== data to apply the command to + ;; 'e j|s|l <== encoding of the params. default is s (sexp), if not specified is assumed to be default + ;; 'c command <== look up the function to call using this key + ;; + (let loop ((msg-in (nn-recv soc))) + (if (not (equal? msg-in "quit")) + (let* ((dat (decode msg-in)) + (host-port (alist-ref 'r dat)) ;; this is for the reverse req rep where the server is a client of the original client + (params (alist-ref 'p dat)) + (command (let ((c (alist-ref 'c dat)))(if c (string->symbol c) #f))) + (all-good (and host-port params command (hash-table-exists? *commands* command)))) + (if all-good + (let ((cmddat (make-qitem + command: command + host-port: host-port + params: params))) + (queue-push cmddat) ;; put request into the queue + (nn-send soc "queued")) ;; reply with "queued" + (print "ERROR: ["(common:human-time)"] BAD request " dat)) + (loop (nn-recv soc))))) + (nn-close soc))) + + ;;====================================================================== ;; D A S H B O A R D U S E R V I E W S ;;====================================================================== ;; first read ~/views.config if it exists, then read $MTRAH/views.config if it exists @@ -2271,12 +2788,266 @@ ;; (define (common:load-views-config) (let* ((view-cfgdat (make-hash-table)) (home-cfgfile (conc (get-environment-variable "HOME") "/.mtviews.config")) (mthome-cfgfile (conc *toppath* "/.mtviews.config"))) - (if (file-exists? mthome-cfgfile) + (if (common:file-exists? mthome-cfgfile) (read-config mthome-cfgfile view-cfgdat #t)) ;; we load the home dir file AFTER the MTRAH file so the user can clobber settings when running the dashboard in read-only areas - (if (file-exists? home-cfgfile) + (if (common:file-exists? home-cfgfile) (read-config home-cfgfile view-cfgdat #t)) view-cfgdat)) +;;====================================================================== +;; H I E R A R C H I C A L H A S H T A B L E S +;;====================================================================== + +;; Every element including top element is a vector: +;; + +(define (hh:make-hh #!key (ht #f)(value #f)) + (vector (or ht (make-hash-table)) value)) + +;; used internally +(define-inline (hh:set-ht! hh ht) (vector-set! hh 0 ht)) +(define-inline (hh:get-ht hh) (vector-ref hh 0)) +(define-inline (hh:set-value! hh value) (vector-set! hh 1 value)) +(define-inline (hh:get-value hh value) (vector-ref hh 1)) + +;; given a hierarchial hash and some keys look up the value ... +;; +(define (hh:get hh . keys) + (if (null? keys) + (vector-ref hh 1) ;; we have reached the end of the line, return the value sought + (let ((sub-ht (hh:get-ht hh))) + (if sub-ht ;; yes, there is more hierarchy + (let ((sub-hh (hash-table-ref/default sub-ht (car keys) #f))) + (if sub-hh + (apply hh:get sub-hh (cdr keys)) + #f)) + #f)))) + +;; given a hierarchial hash, a value and some keys, add needed hierarcy and insert the value +;; +(define (hh:set! hh value . keys) + (if (null? keys) + (hh:set-value! hh value) ;; we have reached the end of the line, store the value + (let ((sub-ht (hh:get-ht hh))) + (if sub-ht ;; yes, there is more hierarchy + (let ((sub-hh (hash-table-ref/default sub-ht (car keys) #f))) + (if (not sub-hh) ;; we'll need to add the next level of hierarchy + (let ((new-sub-hh (hh:make-hh))) + (hash-table-set! sub-ht (car keys) new-sub-hh) + (apply hh:set! new-sub-hh value (cdr keys))) + (apply hh:set! sub-hh value (cdr keys)))) ;; call the sub-hierhash with remaining keys + (begin + (hh:set-ht! hh (make-hash-table)) + (apply hh:set! hh value keys)))))) + +;; Manage pkts, used in servers, tests and likely other contexts so put +;; in common +;;====================================================================== + +(define common:pkts-spec + '((default . ((parent . P) + (action . a) + (filename . f))) + (configf . ((parent . P) + (action . a) + (filename . f))) + (server . ((action . a) + (pid . d) + (ipaddr . i) + (port . p) + (parent . P))) + + (test . ((cpuuse . c) + (diskuse . d) + (item-path . i) + (runname . r) + (state . s) + (target . t) + (status . u) + (parent . P))))) + +(define (common:get-pkts-dirs mtconf use-lt) + (let* ((pktsdirs-str (or (configf:lookup mtconf "setup" "pktsdirs") + (and use-lt + (conc (or *toppath* + (current-directory)) + "/lt/.pkts")))) + (pktsdirs (if pktsdirs-str + (string-split pktsdirs-str " ") + #f))) + pktsdirs)) + +;; use-lt is use linktree "lt" link to find pkts dir +(define (common:save-pkt pktalist-in mtconf use-lt #!key (add-only #f)) ;; add-only saves the pkt only if there is a parent already + (if (or add-only + (hash-table-exists? *pkts-info* 'last-parent)) + (let* ((parent (hash-table-ref/default *pkts-info* 'last-parent #f)) + (pktalist (if parent + (cons `(parent . ,parent) + pktalist-in) + pktalist-in))) + (let-values (((uuid pkt) + (alist->pkt pktalist common:pkts-spec))) + (hash-table-set! *pkts-info* 'last-parent uuid) + (let ((pktsdir (or (hash-table-ref/default *pkts-info* 'pkts-dir #f) + (let* ((pktsdirs (common:get-pkts-dirs mtconf use-lt)) + (pktsdir (car pktsdirs))) ;; assume it is there + (hash-table-set! *pkts-info* 'pkts-dir pktsdir) + pktsdir)))) + (handle-exceptions + exn + (debug:print-info 0 "failed to write out packet to " pktsdir) ;; don't care if this failed for now but MUST FIX - BUG!! + (if (not (file-exists? pktsdir)) + (create-directory pktsdir #t)) + (with-output-to-file + (conc pktsdir "/" uuid ".pkt") + (lambda () + (print pkt))))))))) + +(define (common:with-queue-db mtconf proc #!key (use-lt #f)(toppath-in #f)) + (let* ((pktsdirs (common:get-pkts-dirs mtconf use-lt)) + (pktsdir (if pktsdirs (car pktsdirs) #f)) + (toppath (or (configf:lookup mtconf "scratchdat" "toppath") + toppath-in)) + (pdbpath (or (configf:lookup mtconf "setup" "pdbpath") pktsdir))) + (cond + ((not (and pktsdir toppath pdbpath)) + (debug:print 0 *default-log-port* "ERROR: settings are missing in your megatest.config for area management.") + (debug:print 0 *default-log-port* " you need to have pktsdirs in the [setup] section.")) + ((not (common:file-exists? pktsdir)) + (debug:print 0 *default-log-port* "ERROR: pkts directory not found " pktsdir)) + ((not (equal? (file-owner pktsdir)(current-effective-user-id))) + (debug:print 0 *default-log-port* "ERROR: directory " pktsdir " is not owned by " (current-effective-user-name))) + (else + (let* ((pdb (open-queue-db pdbpath "pkts.db" + schema: '("CREATE TABLE groups (id INTEGER PRIMARY KEY,groupname TEXT, CONSTRAINT group_constraint UNIQUE (groupname));")))) + (proc pktsdirs pktsdir pdb) + (dbi:close pdb)))))) + +(define (common:load-pkts-to-db mtconf #!key (use-lt #f)) + (common:with-queue-db + mtconf + (lambda (pktsdirs pktsdir pdb) + (for-each + (lambda (pktsdir) ;; look at all + (cond + ((not (common:file-exists? pktsdir)) + (debug:print 0 *default-log-port* "ERROR: packets directory " pktsdir " does not exist.")) + ((not (directory? pktsdir)) + (debug:print 0 *default-log-port* "ERROR: packets directory path " pktsdir " is not a directory.")) + ((not (file-read-access? pktsdir)) + (debug:print 0 *default-log-port* "ERROR: packets directory path " pktsdir " is not readable.")) + (else + (debug:print-info 0 *default-log-port* "Loading packets found in " pktsdir) + (let ((pkts (glob (conc pktsdir "/*.pkt")))) + (for-each + (lambda (pkt) + (let* ((uuid (cadr (string-match ".*/([0-9a-f]+).pkt" pkt))) + (exists (lookup-by-uuid pdb uuid #f))) + (if (not exists) + (let* ((pktdat (string-intersperse + (with-input-from-file pkt read-lines) + "\n")) + (apkt (pkt->alist pktdat)) + (ptype (alist-ref 'T apkt))) + (add-to-queue pdb pktdat uuid (or ptype 'cmd) #f 0) + (debug:print 4 *default-log-port* "Added " uuid " of type " ptype " to queue")) + (debug:print 4 *default-log-port* "pkt: " uuid " exists, skipping...") + ))) + pkts))))) + pktsdirs)) + use-lt: use-lt)) + +(define (common:get-pkt-alists pkts) + (map (lambda (x) + (alist-ref 'apkt x)) ;; 'pkta pulls out the alist from the read pkt + pkts)) + +;; given list of pkts (alist mode) return list of D cards as Unix epoch, sorted descending +;; also delete duplicates by target i.e. (car pkt) +;; +(define (common:get-pkt-times pkts) + (delete-duplicates + (sort + (map (lambda (x) + `(,(alist-ref 't x) . ,(string->number (alist-ref 'D x)))) + pkts) + (lambda (a b)(> (cdr a)(cdr b)))) ;; sort descending + (lambda (a b)(equal? (car a)(car b))))) ;; remove duplicates by target + + + +;; accept an alist or hash table containing envvar/env value pairs (value of #f causes unset) +;; execute thunk in context of environment modified as per this list +;; restore env to prior state then return value of eval'd thunk. +;; ** this is not thread safe ** +(define (common:with-env-vars delta-env-alist-or-hash-table thunk) + (let* ((delta-env-alist (if (hash-table? delta-env-alist-or-hash-table) + (hash-table->alist delta-env-alist-or-hash-table) + delta-env-alist-or-hash-table)) + (restore-thunks + (filter + identity + (map (lambda (env-pair) + (let* ((env-var (car env-pair)) + (new-val (let ((tmp (cdr env-pair))) + (if (list? tmp) (car tmp) tmp))) + (current-val (get-environment-variable env-var)) + (restore-thunk + (cond + ((not current-val) (lambda () (unsetenv env-var))) + ((not (string? new-val)) #f) + ((eq? current-val new-val) #f) + (else + (lambda () (setenv env-var current-val)))))) + ;;(when (not (string? new-val)) + ;; (debug:print 0 *default-log-port* " PROBLEM: not a string: "new-val"\n from env-alist:\n"delta-env-alist) + ;; (pp delta-env-alist) + ;; (exit 1)) + + + (cond + ((not new-val) ;; modify env here + (unsetenv env-var)) + ((string? new-val) + (setenv env-var new-val))) + restore-thunk)) + delta-env-alist)))) + (let ((rv (thunk))) + (for-each (lambda (x) (x)) restore-thunks) ;; restore env to original state + rv))) + +(define *common:thread-punchlist* (make-hash-table)) +(define (common:send-thunk-to-background-thread thunk #!key (name #f)) + ;;(BB> "launched thread " name) + + ;; we need a unique name for the thread. + (let* ((realname (if name + (if (not (hash-table-ref/default *common:thread-punchlist* name #f)) + name + (conc name"-" (symbol->string (gensym)))) + (conc "anonymous-"(symbol->string (gensym))))) + (realthunk (lambda () + (let ((res (thunk))) + (hash-table-delete! *common:thread-punchlist* realname) + res))) + (thread (make-thread realthunk realname))) + (hash-table-set! *common:thread-punchlist* realname thread) + (thread-start! thread) + )) + +(define (common:join-backgrounded-threads) + ;; may need to trap and ignore exceptions -- dunno how atomic threads are... + (for-each + (lambda (thread-name) + (let* ((thread (hash-table-ref/default *common:thread-punchlist* thread-name #f))) + (if thread + (handle-exceptions + exn + #t ;; just ignore it, it might have died in the meantime so joining it will throw an exception + (thread-join! thread)) + ))) + (hash-table-keys *common:thread-punchlist*))) Index: common_records.scm ================================================================== --- common_records.scm +++ common_records.scm @@ -1,14 +1,23 @@ ;;====================================================================== ;; Copyright 2006-2012, Matthew Welland. ;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. ;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . +;; ;;====================================================================== ;; (use trace) (include "altdb.scm") @@ -147,15 +156,17 @@ (temp (string-split (->string this-loc) " ")) (this-func (if (and (list? temp) (> (length temp) 1)) (cadr temp) "???"))) (if (equal? this-func "BB>") (set! location this-loc)))) stack) - (let ((dp-args - (append - (list 0 *default-log-port* - (conc location "@"(/ (- (current-milliseconds) *BB-process-starttime*) 1000)" ") ) - in-args))) + (let* ((color-on "\x1b[1m") + (color-off "\x1b[0m") + (dp-args + (append + (list 0 *default-log-port* + (conc color-on location "@"(/ (- (current-milliseconds) *BB-process-starttime*) 1000) color-off " ") ) + in-args))) (apply debug:print dp-args)))) (define *BBpp_custom_expanders_list* (make-hash-table)) Index: commonstructs ================================================================== --- commonstructs +++ commonstructs @@ -1,5 +1,21 @@ +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . The database keys, runs are indexed on this keys: (db:get-keys #f) => (#("OS" "TEXT") Index: configf.scm ================================================================== --- configf.scm +++ configf.scm @@ -1,14 +1,23 @@ ;;====================================================================== ;; Copyright 2006-2012, Matthew Welland. ;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. ;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . + ;;====================================================================== ;;====================================================================== ;; Config file handling ;;====================================================================== @@ -23,18 +32,18 @@ ;; return list (path fullpath configname) (define (find-config configname #!key (toppath #f)) (if toppath (let ((cfname (conc toppath "/" configname))) - (if (file-exists? cfname) + (if (common:file-exists? cfname) (list toppath cfname configname) (list #f #f #f))) (let* ((cwd (string-split (current-directory) "/"))) (let loop ((dir cwd)) (let* ((path (conc "/" (string-intersperse dir "/"))) (fullpath (conc path "/" configname))) - (if (file-exists? fullpath) + (if (common:file-exists? fullpath) (list path fullpath configname) (let ((remcwd (take dir (- (length dir) 1)))) (if (null? remcwd) (list #f #f #f) ;; #f #f) (loop remcwd))))))))) @@ -50,18 +59,21 @@ (config:assoc-safe-add (hash-table-ref/default cfgdat section-name '()) var value metadata: metadata))) (define (config:eval-string-in-environment str) - (handle-exceptions - exn - (begin - (debug:print-error 0 *default-log-port* "problem evaluating \"" str "\" in the shell environment") - #f) - (let ((cmdres (process:cmd-run->list (conc "echo " str)))) - (if (null? cmdres) "" - (caar cmdres))))) + ;; (if (or (string-null? str) + ;; (equal? "!" (substring str 0 1))) ;; null string or starts with ! are preserved but NOT set in the environment + str + (handle-exceptions + exn + (begin + (debug:print-error 0 *default-log-port* "problem evaluating \"" str "\" in the shell environment") + #f) + (let ((cmdres (process:cmd-run->list (conc "echo " str)))) + (if (null? cmdres) "" + (caar cmdres))))) ;; ) ;;====================================================================== ;; Make the regexp's needed globally available ;;====================================================================== @@ -77,10 +89,14 @@ (define configf:settings (regexp "^\\[configf:settings\\s+(\\S+)\\s+(\\S+)]\\s*$")) ;; read a line and process any #{ ... } constructs (define configf:var-expand-regex (regexp "^(.*)#\\{(scheme|system|shell|getenv|get|runconfigs-get|rget|scm|sh|rp|gv|g|mtrah)\\s+([^\\}\\{]*)\\}(.*)")) + +(define (configf:system ht cmd) + (system cmd) + ) (define (configf:process-line l ht allow-system #!key (linenum #f)) (let loop ((res l)) (if (string? res) (let ((matchdat (string-search configf:var-expand-regex res))) @@ -92,11 +108,11 @@ (result #f) (start-time (current-seconds)) (cmdsym (string->symbol cmdtype)) (fullcmd (case cmdsym ((scheme scm) (conc "(lambda (ht)" cmd ")")) - ((system) (conc "(lambda (ht)(system \"" cmd "\"))")) + ((system) (conc "(lambda (ht)(configf:system ht \"" cmd "\"))")) ((shell sh) (conc "(lambda (ht)(string-translate (shell \"" cmd "\") \"\n\" \" \"))")) ((realpath rp)(conc "(lambda (ht)(common:nice-path \"" cmd "\"))")) ((getenv gv) (conc "(lambda (ht)(get-environment-variable \"" cmd "\"))")) ((mtrah) (conc "(lambda (ht)" " (let ((extra \"" cmd "\"))" @@ -176,11 +192,27 @@ (configf:process-line inl ht allow-processing))))) (if (and (string? res) (not (equal? (hash-table-ref/default settings "trim-trailing-spaces" "no") "no"))) (string-substitute "\\s+$" "" res) res)))))) - + +(define (configf:cfgdat->env-alist section cfgdat-ht allow-system) + (filter + (lambda (pair) + (let* ((var (car pair)) + (val (cdr pair))) + (cons var + (cond + ((and allow-system (procedure? val)) ;; if we decided to use something other than #t or #f for allow-system ('return-procs or 'return-string) , this may become problematic + (val)) + ((procedure? val) #f) + ((string? val) val) + (else "#f"))))) + (append + (hash-table-ref/default cfgdat-ht "default" '()) + (if (equal? section "default") '() (hash-table-ref/default cfgdat-ht section '()))))) + (define (calc-allow-system allow-system section sections) (if sections (and (or (equal? "default" section) (member section sections)) allow-system) ;; account for sections and return allow-system as it might be a symbol such as return-strings @@ -217,22 +249,34 @@ ;; read a config file, returns hash table of alists ;; read a config file, returns hash table of alists ;; adds to ht if given (must be #f otherwise) +;; allow-system: +;; #f - do not evaluate [system +;; #t - immediately evaluate [system and store result as string +;; 'return-procs -- return a proc taking ht as an argument that may be evaulated at some future time +;; 'return-string -- return a string representing a proc taking ht as an argument that may be evaulated at some future time ;; envion-patt is a regex spec that identifies sections that will be eval'd ;; in the environment on the fly ;; sections: #f => get all, else list of sections to gather ;; post-section-procs alist of section-pattern => proc, where: (proc section-name next-section-name ht curr-path) ;; apply-wildcards: #t/#f - apply vars from targets with % wildcards to all matching sections ;; -(define (read-config path ht allow-system #!key (environ-patt #f) (curr-section #f) +(define (read-config path ht allow-system #!key (environ-patt #f) (curr-section #f) (sections #f) (settings (make-hash-table)) (keep-filenames #f) - (post-section-procs '()) (apply-wildcards #t)) + (post-section-procs '()) (apply-wildcards #t) ) (debug:print 9 *default-log-port* "START: " path) +;; (if *configdat* +;; (common:save-pkt `((action . read-config) +;; (f . ,(cond ((string? path) path) +;; ((port? path) "port") +;; (else (conc path)))) +;; (T . configf)) +;; *configdat* #t add-only: #t)) (if (and (not (port? path)) - (not (file-exists? path))) ;; for case where we are handed a port + (not (common:file-exists? path))) ;; for case where we are handed a port (begin (debug:print-info 1 *default-log-port* "read-config - file not found " path " current path: " (current-directory)) ;; WARNING: This is a risky change but really, we should not return an empty hash table if no file read? #f) ;; (if (not ht)(make-hash-table) ht)) (let ((inp (if (string? path) @@ -265,146 +309,189 @@ (lambda (section) (if (not (member section sections)) (hash-table-delete! res section))) ;; we are using "" as a dumping ground and must remove it before returning the ht (hash-table-keys res))) (debug:print 9 *default-log-port* "END: " path) - res) + res + ) ;; retval (regex-case inl - (configf:comment-rx _ (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)) - (configf:blank-l-rx _ (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)) - (configf:settings ( x setting val ) (begin - (hash-table-set! settings setting val) - (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f))) - (configf:include-rx ( x include-file ) (let* ((curr-conf-dir (pathname-directory path)) - (full-conf (if (absolute-pathname? include-file) - include-file - (common:nice-path - (conc (if curr-conf-dir - curr-conf-dir - ".") - "/" include-file))))) - (if (file-exists? full-conf) - (begin - ;; (push-directory conf-dir) - (debug:print 9 *default-log-port* "Including: " full-conf) - (read-config full-conf res allow-system environ-patt: environ-patt curr-section: curr-section-name sections: sections settings: settings keep-filenames: keep-filenames) - ;; (pop-directory) - (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)) - (begin - (debug:print '(2 9) #f "INFO: include file " include-file " not found (called from " path ")") - (debug:print 2 *default-log-port* " " full-conf) - (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f))))) + (configf:comment-rx _ (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) + curr-section-name #f #f)) + + (configf:blank-l-rx _ (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) + curr-section-name #f #f)) + (configf:settings ( x setting val ) + (begin + (hash-table-set! settings setting val) + (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) + curr-section-name #f #f))) + + (configf:include-rx ( x include-file ) + (let* ((curr-conf-dir (pathname-directory path)) + (full-conf (if (and (absolute-pathname? include-file) (file-exists? include-file)) + include-file + (common:nice-path + (conc (if curr-conf-dir + curr-conf-dir + ".") + "/" include-file))))) + (let ((all-matches (sort (handle-exceptions exn (list) (glob full-conf)) string<=?))) + (if (null? all-matches) + (begin + (debug:print '(2 9) #f "INFO: include file(s) matching " include-file " not found (called from " path ")") + (debug:print 2 *default-log-port* " " full-conf)) + (for-each + (lambda (fpath) + ;; (push-directory conf-dir) + (debug:print 9 *default-log-port* "Including: " full-conf) + (read-config fpath res allow-system environ-patt: environ-patt + curr-section: curr-section-name sections: sections settings: settings + keep-filenames: keep-filenames)) + all-matches)) + (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) + curr-section-name #f #f)))) (configf:script-rx ( x include-script params);; handle-exceptions ;; exn ;; (begin ;; (debug:print '(0 2 9) #f "INFO: include from script " include-script " failed.") ;; (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)) - (if (and (file-exists? include-script)(file-execute-access? include-script)) - (let* ((new-inp-port (open-input-pipe (conc include-script " " params)))) - (debug:print '(2 9) *default-log-port* "Including from script output: " include-script) - ;; (print "We got here, calling read-config next. Port is: " new-inp-port) - (read-config new-inp-port res allow-system environ-patt: environ-patt curr-section: curr-section-name sections: sections settings: settings keep-filenames: keep-filenames) - (close-input-port new-inp-port) - (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)) - (begin - (debug:print 0 *default-log-port* "Script not found or not exectutable: " include-script) - (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f))) - ) ;; ) - (configf:section-rx ( x section-name ) (begin - ;; call post-section-procs - (for-each - (lambda (dat) - (let ((patt (car dat)) - (proc (cdr dat))) - (if (string-match patt curr-section-name) - (proc curr-section-name section-name res path)))) - post-section-procs) - ;; after gathering the vars for a section and if apply-wildcards is true and if there is a wildcard in the section name process wildcards - ;; NOTE: we are processing the curr-section-name, NOT section-name. - (process-wildcards res curr-section-name) - (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) - ;; if we have the sections list then force all settings into "" and delete it later? - ;; (if (or (not sections) - ;; (member section-name sections)) - ;; section-name "") ;; stick everything into "". NOPE: We need new strategy. Put stuff in correct sections and then delete all sections later. - section-name - #f #f))) - (configf:key-sys-pr ( x key cmd ) (if (calc-allow-system allow-system curr-section-name sections) - (let ((alist (hash-table-ref/default res curr-section-name '())) - (val-proc (lambda () - (let* ((start-time (current-seconds)) - (cmdres (process:cmd-run->list cmd)) - (delta (- (current-seconds) start-time)) - (status (cadr cmdres)) - (res (car cmdres))) - (debug:print-info 4 *default-log-port* "" inl "\n => " (string-intersperse res "\n")) - (if (not (eq? status 0)) - (begin - (debug:print-error 0 *default-log-port* "problem with " inl ", return code " status - " output: " cmdres))) - (if (> delta 2) - (debug:print-info 0 *default-log-port* "for line \"" inl "\"\n command: " cmd " took " delta " seconds to run with output:\n " res) - (debug:print-info 9 *default-log-port* "for line \"" inl "\"\n command: " cmd " took " delta " seconds to run with output:\n " res)) - (if (null? res) - "" - (string-intersperse res " ")))))) - (hash-table-set! res curr-section-name - (config:assoc-safe-add alist - key - (case (calc-allow-system allow-system curr-section-name sections) - ((return-procs) val-proc) - ((return-string) cmd) - (else (val-proc))) - metadata: metapath)) - (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)) - (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f))) - (configf:key-no-val ( x key val) (let* ((alist (hash-table-ref/default res curr-section-name '())) - (fval (or (if (string? val) val #f) ""))) ;; fval should be either "" or " " (one or more spaces) - (debug:print 10 *default-log-port* " setting: [" curr-section-name "] " key " = #t") - (safe-setenv key fval) - (hash-table-set! res curr-section-name - (config:assoc-safe-add alist key fval metadata: metapath)) - (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name key #f))) - (configf:key-val-pr ( x key unk1 val unk2 ) (let* ((alist (hash-table-ref/default res curr-section-name '())) - (envar (and environ-patt (string-search (regexp environ-patt) curr-section-name))) - (realval (if envar - (config:eval-string-in-environment val) - val))) - (debug:print-info 6 *default-log-port* "read-config env setting, envar: " envar " realval: " realval " val: " val " key: " key " curr-section-name: " curr-section-name) - (if envar (safe-setenv key realval)) - (debug:print 10 *default-log-port* " setting: [" curr-section-name "] " key " = " val) - (hash-table-set! res curr-section-name - (config:assoc-safe-add alist key realval metadata: metapath)) - (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name key #f))) + (if (and (common:file-exists? include-script)(file-execute-access? include-script)) + (let* ((local-allow-system (calc-allow-system allow-system curr-section-name sections)) + (env-delta (configf:cfgdat->env-alist curr-section-name res local-allow-system)) + (new-inp-port + (common:with-env-vars + env-delta + (lambda () + (open-input-pipe (conc include-script " " params)))))) + (debug:print '(2 9) *default-log-port* "Including from script output: " include-script) + ;; (print "We got here, calling read-config next. Port is: " new-inp-port) + (read-config new-inp-port res allow-system environ-patt: environ-patt curr-section: curr-section-name sections: sections settings: settings keep-filenames: keep-filenames) + (close-input-port new-inp-port) + (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)) + (begin + (debug:print 0 *default-log-port* "Script not found or not exectutable: " include-script) + (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f))) + ) ;; ) + (configf:section-rx ( x section-name ) + (begin + ;; call post-section-procs + (for-each + (lambda (dat) + (let ((patt (car dat)) + (proc (cdr dat))) + (if (string-match patt curr-section-name) + (proc curr-section-name section-name res path)))) + post-section-procs) + ;; after gathering the vars for a section and if apply-wildcards is true and if there is a wildcard in the section name process wildcards + ;; NOTE: we are processing the curr-section-name, NOT section-name. + (process-wildcards res curr-section-name) + (if (not (hash-table-ref/default res section-name #f))(hash-table-set! res section-name '())) ;; ensure that mere mention of a section is not lost + (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) + ;; if we have the sections list then force all settings into "" and delete it later? + ;; (if (or (not sections) + ;; (member section-name sections)) + ;; section-name "") ;; stick everything into "". NOPE: We need new strategy. Put stuff in correct sections and then delete all sections later. + section-name + #f #f))) + (configf:key-sys-pr ( x key cmd ) + (if (calc-allow-system allow-system curr-section-name sections) + (let ((alist (hash-table-ref/default res curr-section-name '())) + (val-proc (lambda () + (let* ((start-time (current-seconds)) + (local-allow-system (calc-allow-system allow-system curr-section-name sections)) + (env-delta (configf:cfgdat->env-alist curr-section-name res local-allow-system)) + (cmdres (process:cmd-run->list cmd delta-env-alist-or-hash-table: env-delta)) ;; BB: here is where [system is exec'd. needs to have env from other vars! + (delta (- (current-seconds) start-time)) + (status (cadr cmdres)) + (res (car cmdres))) + (debug:print-info 4 *default-log-port* "" inl "\n => " (string-intersperse res "\n")) + (if (not (eq? status 0)) + (begin + (debug:print-error 0 *default-log-port* "problem with " inl ", return code " status + " output: " cmdres))) + (if (> delta 2) + (debug:print-info 0 *default-log-port* "for line \"" inl "\"\n command: " cmd " took " delta " seconds to run with output:\n " res) + (debug:print-info 9 *default-log-port* "for line \"" inl "\"\n command: " cmd " took " delta " seconds to run with output:\n " res)) + (if (null? res) + "" + (string-intersperse res " ")))))) + (hash-table-set! res curr-section-name + (config:assoc-safe-add alist + key + (case (calc-allow-system allow-system curr-section-name sections) + ((return-procs) val-proc) + ((return-string) cmd) + (else (val-proc))) + metadata: metapath)) + (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)) + (loop (configf:read-line inp res + (calc-allow-system allow-system curr-section-name sections) + settings) + curr-section-name #f #f))) + + (configf:key-no-val ( x key val) + (let* ((alist (hash-table-ref/default res curr-section-name '())) + (fval (or (if (string? val) val #f) ""))) ;; fval should be either "" or " " (one or more spaces) + (debug:print 10 *default-log-port* " setting: [" curr-section-name "] " key " = #t") + (safe-setenv key fval) + (hash-table-set! res curr-section-name + (config:assoc-safe-add alist key fval metadata: metapath)) + (loop (configf:read-line inp res + (calc-allow-system allow-system curr-section-name sections) + settings) + curr-section-name key #f))) + + (configf:key-val-pr ( x key unk1 val unk2 ) + (let* ((alist (hash-table-ref/default res curr-section-name '())) + (envar (and environ-patt + (string-search (regexp environ-patt) curr-section-name) ;; does the section match the envionpatt? + (and (not (string-null? key)) + (not (equal? "!" (substring key 0 1)))) ;; ! as leading character is a signature to NOT export to the environment + ;; (string-match "^.*:.*:.*$" key) ;; ;; something:something:something reserved for triggers in runconfigs + )) + (realval (if envar + (config:eval-string-in-environment val) + val))) + (debug:print-info 6 *default-log-port* "read-config env setting, envar: " envar " realval: " realval " val: " val " key: " key " curr-section-name: " curr-section-name) + (if envar (safe-setenv key realval)) + (debug:print 10 *default-log-port* " setting: [" curr-section-name "] " key " = " val) + (hash-table-set! res curr-section-name + (config:assoc-safe-add alist key realval metadata: metapath)) + (loop (configf:read-line inp res + (calc-allow-system allow-system curr-section-name sections) settings) + curr-section-name key #f))) ;; if a continued line - (configf:cont-ln-rx ( x whsp val ) (let ((alist (hash-table-ref/default res curr-section-name '()))) - (if var-flag ;; if set to a string then we have a continued var - (let ((newval (conc - (config-lookup res curr-section-name var-flag) "\n" - ;; trim lead from the incoming whsp to support some indenting. - (if lead - (string-substitute (regexp lead) "" whsp) - "") - val))) - ;; (print "val: " val "\nnewval: \"" newval "\"\nvarflag: " var-flag) - (hash-table-set! res curr-section-name - (config:assoc-safe-add alist var-flag newval metadata: metapath)) - (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name var-flag (if lead lead whsp))) - (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)))) + (configf:cont-ln-rx ( x whsp val ) + (let ((alist (hash-table-ref/default res curr-section-name '()))) + (if var-flag ;; if set to a string then we have a continued var + (let ((newval (conc + (config-lookup res curr-section-name var-flag) "\n" + ;; trim lead from the incoming whsp to support some indenting. + (if lead + (string-substitute (regexp lead) "" whsp) + "") + val))) + ;; (print "val: " val "\nnewval: \"" newval "\"\nvarflag: " var-flag) + (hash-table-set! res curr-section-name + (config:assoc-safe-add alist var-flag newval metadata: metapath)) + (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name var-flag (if lead lead whsp))) + (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)))) (else (debug:print-error 0 *default-log-port* "problem parsing " path ",\n \"" inl "\"") (set! var-flag #f) - (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)))))))) + (loop (configf:read-line inp res (calc-allow-system allow-system curr-section-name sections) settings) curr-section-name #f #f)))) + ) ;; end loop + ))) ;; pathenvvar will set the named var to the path of the config (define (find-and-read-config fname #!key (environ-patt #f)(given-toppath #f)(pathenvvar #f)) (let* ((curr-dir (current-directory)) (configinfo (find-config fname toppath: given-toppath)) (toppath (car configinfo)) (configfile (cadr configinfo)) (set-fields (lambda (curr-section next-section ht path) - (let ((field-names (if ht (keys:config-get-fields ht) '())) + (let ((field-names (if ht (common:get-fields ht) '())) (target (or (getenv "MT_TARGET")(args:get-arg "-reqtarg")(args:get-arg "-target")))) (debug:print-info 9 *default-log-port* "set-fields with field-names=" field-names " target=" target " curr-section=" curr-section " next-section=" next-section " path=" path " ht=" ht) (if (not (null? field-names))(keys:target-set-args field-names target #f)))))) (if toppath (change-directory toppath)) (if (and toppath pathenvvar)(setenv pathenvvar toppath)) @@ -423,21 +510,51 @@ (cadr match) #f)) )) #f)) +;; use to have definitive setting: +;; [foo] +;; var yes +;; +;; (configf:var-is? cfgdat "foo" "var" "yes") => #t +;; +(define (configf:var-is? cfgdat section var expected-val) + (equal? (configf:lookup cfgdat section var) expected-val)) + (define configf:lookup config-lookup) (define configf:read-file read-config) + +;; safely look up a value that is expected to be a number, return +;; a default (#f unless provided) +;; +(define (configf:lookup-number cfdat section varname #!key (default #f)) + (let* ((val (configf:lookup *configdat* section varname)) + (res (if val + (string->number (string-substitute "\\s+" "" val #t)) + #f))) + (cond + (res res) + (val (debug:print 0 *default-log-port* "ERROR: no number found for [" section "], " varname ", got: " val)) + (else default)))) (define (configf:section-vars cfgdat section) (let ((sectdat (hash-table-ref/default cfgdat section '()))) (if (null? sectdat) '() (map car sectdat)))) (define (configf:get-section cfgdat section) (hash-table-ref/default cfgdat section '())) + +(define (configf:set-section-var cfgdat section var val) + (let ((sectdat (configf:get-section cfgdat section))) + (hash-table-set! cfgdat section + (config:assoc-safe-add sectdat var val)))) + + ;;(append (filter (lambda (x)(not (assoc var sectdat))) sectdat) + ;; (list var val)))) (define (setup) (let* ((configf (find-config "megatest.config")) (config (if configf (read-config configf #f #t) #f))) (if config @@ -487,11 +604,11 @@ (if (null? tal) newres (loop (car tal)(cdr tal) newres)))))) (define (configf:file->list fname) - (if (file-exists? fname) + (if (common:file-exists? fname) (let ((inp (open-input-file fname))) (let loop ((inl (read-line inp)) (res '())) (if (eof-object? inl) (begin @@ -591,11 +708,11 @@ ;; reads a refdb into an assoc array of assoc arrays ;; returns (list dat msg) (define (configf:read-refdb refdb-path) (let ((sheets-file (conc refdb-path "/sheet-names.cfg"))) - (if (not (file-exists? sheets-file)) + (if (not (common:file-exists? sheets-file)) (list #f (conc "ERROR: no refdb found at " refdb-path)) (if (not (file-read-access? sheets-file)) (list #f (conc "ERROR: refdb file not readable at " refdb-path)) (let* ((sheets (with-input-from-file sheets-file (lambda () @@ -663,36 +780,33 @@ #f (configf:alist->config (with-input-from-file fname read)))) (define (configf:write-alist cdat fname) - (if (common:faux-lock fname) - (let* ((dat (configf:config->alist cdat)) - (res - (begin - (with-output-to-file fname ;; first write out the file - (lambda () - (pp dat))) - - (if (common:file-exists? fname) ;; now verify it is readable - (if (configf:read-alist fname) - #t ;; data is good. - (begin - (handle-exceptions - exn - #f - (debug:print 0 *default-log-port* "WARNING: content " dat " for cache " fname " is not readable. Deleting generated file.") - (delete-file fname)) - #f)) - #f)))) - - (common:faux-unlock fname) - res) - (begin - (debug:print 0 *default-log-port* "WARNING: could not get faux-lock on " fname) - #f))) - + (if (not (common:faux-lock fname)) + (debug:print 0 *default-log-port* "INFO: Could not get lock on " fname)) + (let* ((dat (configf:config->alist cdat)) + (res + (begin + (with-output-to-file fname ;; first write out the file + (lambda () + (pp dat))) + + (if (common:file-exists? fname) ;; now verify it is readable + (if (configf:read-alist fname) + #t ;; data is good. + (begin + (handle-exceptions + exn + #f + (debug:print 0 *default-log-port* "WARNING: content " dat " for cache " fname " is not readable. Deleting generated file.") + (delete-file fname)) + #f)) + #f)))) + (common:faux-unlock fname) + res)) + ;; convert hierarchial list to ini format ;; (define (configf:config->ini data) (map (lambda (section) DELETED daemon.scm Index: daemon.scm ================================================================== --- daemon.scm +++ /dev/null @@ -1,45 +0,0 @@ -;; Taken from the chicken 3.x daemon egg -;; -;; Copyright (c) 2007 Hans Bulfone -;; All rights reserved. -;; -;; Redistribution and use in source and binary forms, with or without -;; modification, are permitted provided that the following conditions are met: -;; -;; * Redistributions of source code must retain the above copyright notice, -;; this list of conditions and the following disclaimer. -;; * Redistributions in binary form must reproduce the above copyright -;; notice, this list of conditions and the following disclaimer in the -;; documentation and/or other materials provided with the distribution. -;; * Neither the name of the author nor the names of his contributors may -;; be used to endorse or promote products derived from this software -;; without specific prior written permission. -;; -;; THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -;; AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -;; THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -;; PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR -;; CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, -;; EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, -;; PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; -;; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, -;; WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR -;; OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF -;; ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -(declare (unit daemon)) - -(define (daemon:ize) - (change-directory "/") - (let ((fd-r (file-open "/dev/null" open/rdonly)) - (fd-w (file-open "/dev/null" open/wronly))) - (duplicate-fileno fd-r 0) - (duplicate-fileno fd-w 1) - (file-close fd-r) - (file-close fd-w)) - (let ((child-pid (process-fork))) - (if (not (zero? child-pid)) - (exit 0))) - (create-session) - (duplicate-fileno 1 2) - (void)) ADDED dashboard-context-menu.scm Index: dashboard-context-menu.scm ================================================================== --- /dev/null +++ dashboard-context-menu.scm @@ -0,0 +1,357 @@ +;;====================================================================== +;; Copyright 2006-2012, Matthew Welland. +;; +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . + +;;====================================================================== + +;;====================================================================== +;; implementation of context menu that pops up on +;; right click on test cell in Runs & Runs Summary Tabs +;;====================================================================== + +(use format fmt) +(require-library iup) +(import (prefix iup iup:)) + +(use canvas-draw) + +(use srfi-1 posix regex regex-case srfi-69) +(use (prefix sqlite3 sqlite3:)) + +(declare (unit dashboard-context-menu)) +(declare (uses common)) +(declare (uses db)) +(declare (uses gutils)) +(declare (uses rmt)) +(declare (uses ezsteps)) +;; (declare (uses sdb)) +;; (declare (uses filedb)) +(declare (uses subrun)) + +(include "common_records.scm") +(include "db_records.scm") +(include "run_records.scm") + +(define (dboard:launch-testpanel run-id test-id) + (let* (;; (cfg-sh (conc *common:this-exe-dir* "/cfg.sh")) + ;; (cmd (conc + ;; (if (common:file-exists? cfg-sh) + ;; (conc "source "cfg-sh" && ") + ;; "") + ;; *common:this-exe-fullpath* + ;; " -test " run-id "," test-id + ;; " &")) + (cmd (conc *common:this-exe-dir*"/../dashboard " + "-test " run-id "," test-id + " &"))) + (system cmd))) + + +(define (dashboard:run-menu-items run-id test-id target runname test-name testpatt item-test-path test-info) + (list + (iup:menu-item + (conc "Rerun " testpatt) + #:action + (lambda (obj) + ;; (print " run-id: " run-id " test-id: " test-id " target: " target " runname: " runname " test-name: " test-name " testpatt: " testpatt "item-path : " item-path) + (common:run-a-command + (conc "megatest -run -target " target + " -runname " runname + " -testpatt " testpatt + " -preclean -clean-cache") + ))) + (iup:menu-item + "Rerun Complete Run" + #:action + (lambda (obj) + (common:run-a-command + (conc "megatest -set-state-status NOT_STARTED,n/a -run -target " target + " -runname " runname + " -testpatt % " + " -preclean -clean-cache")))) + (iup:menu-item + "Clean Complete Run" + #:action + (lambda (obj) + (common:run-a-command + (conc "megatest -remove-runs -target " target + " -runname " runname + " -testpatt % ")))) + (iup:menu-item + "Kill Complete Run" + #:action + (lambda (obj) + (common:run-a-command + (conc "megatest -set-state-status KILLREQ,n/a -target " target + " -runname " runname + " -testpatt % " + " -state RUNNING,REMOTEHOSTSTART,LAUNCHED,NOT_STARTED")))) + (iup:menu-item + "Delete Run Data" + #:action + (lambda (obj) + (common:run-a-command + (conc "megatest -remove-runs -target " target + " -runname " runname + " -testpatt % " + " -keep-records")))))) + +(define (dashboard:test-menu-items run-id test-id target runname test-name testpatt item-test-path test-info) + (list + (iup:menu-item + (conc "Rerun " item-test-path) + #:action + (lambda (obj) + (common:run-a-command + (conc "megatest -set-state-status NOT_STARTED,n/a -run -target " target + " -runname " runname + " -testpatt " item-test-path + " -preclean -clean-cache")))) + (iup:menu-item + (conc "Kill " item-test-path) + #:action + (lambda (obj) + ;; (rmt:test-set-state-status-by-id run-id test-id "KILLREQ" #f #f) + (common:run-a-command + (conc "megatest -set-state-status KILLREQ,n/a -target " target + " -runname " runname + " -testpatt " item-test-path + " -state RUNNING,REMOTEHOSTSTART,LAUNCHED")))) + (iup:menu-item + (conc "Delete data : " item-test-path) + #:action + (lambda (obj) + (common:run-a-command + (conc "megatest -remove-runs -target " target + " -runname " runname + " -testpatt " item-test-path + " -keep-records")))) + (iup:menu-item + (conc "Clean "item-test-path) + #:action + (lambda (obj) + (common:run-a-command + (conc "megatest -remove-runs -target " target + " -runname " runname + " -testpatt " item-test-path)))) + (iup:menu-item + "Start xterm" + #:action + (lambda (obj) + (dcommon:examine-xterm run-id test-id))) + ;;(let* ((cmd (conc (car (argv)) " -xterm " run-id "," test-id "&"))) + ;; (system cmd)))) + (iup:menu-item + "Edit testconfig" + #:action + (lambda (obj) + (let* ((all-tests (tests:get-all)) + (editor-rx (or (configf:lookup *configdat* "setup" "editor-regex") + "\\b(vim?|nano|pico)\\b")) + (editor (or (configf:lookup *configdat* "setup" "editor") + (get-environment-variable "VISUAL") + (get-environment-variable "EDITOR") "vi")) + (tconfig (conc (hash-table-ref all-tests test-name) "/testconfig")) + (cmd (conc (if (string-search editor-rx editor) + (conc "xterm -e " editor) + editor) + " " tconfig " &"))) + (system cmd)))))) + +(define (dashboard:step-logs-menu-item run-id test-id target runname test-name testpatt item-test-path test-info) + (let* ((steps (tests:get-compressed-steps run-id test-id)) ;; # + (rundir (db:test-get-rundir test-info))) + + (iup:menu-item + "Step logs" + (apply iup:menu + (map (lambda (step) + (let ((stepname (vector-ref step 0)) + (logfile (vector-ref step 5)) + (status (vector-ref step 3))) + (iup:menu-item + (conc stepname "/" (if (string=? logfile "") "no log!" logfile) " (" status ")") + #:action (lambda (obj) + (let ((fullfile (conc rundir "/" logfile))) + (if (common:file-exists? fullfile) + (dcommon:run-html-viewer fullfile) + (message-window (conc "file " fullfile " not found")))))))) + steps))))) + +(define (dashboard:toplevel-menu-items run-id test-id target runname test-name testpatt item-test-path test-info) + (list + + (iup:menu-item + "Test Control Panel" + #:action + (lambda (obj) + (dboard:launch-testpanel run-id test-id))) + + (dashboard:step-logs-menu-item run-id test-id target runname test-name testpatt item-test-path test-info) + + (iup:menu-item + (conc "Rerun " item-test-path) + #:action + (lambda (obj) + (common:run-a-command + (conc "megatest -set-state-status NOT_STARTED,n/a -run -target " target + " -runname " runname + " -testpatt " item-test-path + " -preclean -clean-cache")))) + + (iup:menu-item + "Start xterm" + #:action + (lambda (obj) + (dcommon:examine-xterm run-id test-id))) + + (iup:menu-item + (conc "Kill " item-test-path) + #:action + (lambda (obj) + ;; (rmt:test-set-state-status-by-id run-id test-id "KILLREQ" #f #f) + (common:run-a-command + (conc "megatest -set-state-status KILLREQ,n/a -target " target + " -runname " runname + " -testpatt " item-test-path + " -state RUNNING,REMOTEHOSTSTART,LAUNCHED,NOT_STARTED")))) + + (let* ((rundir (db:test-get-rundir test-info)) + (has-subrun (subrun:subrun-test-initialized? rundir))) + (if has-subrun + (iup:menu-item + "Launch subrun dashboard" + #:action + (lambda (obj) + (subrun:launch-dashboard rundir))) + (iup:vbox))) + + (iup:menu-item + (conc "View Log " item-test-path) + #:action + (lambda (obj) + (let* ((rundir (db:test-get-rundir test-info)) + (logf (db:test-get-final_logf test-info)) + (fullfile (conc rundir "/" logf))) + (if (common:file-exists? fullfile) + (dcommon:run-html-viewer fullfile) + (message-window (conc "file " fullfile " not found."))))) + ) + )) +;; example section for megatest.config: +;; +;; +;; [custom-context-menu-items] +;; # : +;; item1 custom show run-id (%run-id%):echo "%run-id%" +;; item2 custom show test-id (%test-id%):echo "%test-id%" +;; item3 custom show target (%target%):echo "%target%" +;; item4 custom show test-name (%test-name%):echo "%test-name%" +;; item5 custom show test-patt (%test-patt%):echo "%test-patt%" +;; item6 custom show test-run-dir (%test-run-dir%):echo "%test-run-dir%" +;; item7 custom show run-area-home (%run-area-home%):echo "%run-area-home%" +;; item8 custom show megatest root (%mt-root%):echo "%mt-root%" +;; item9 custom ls : ls -lrt +;; item10 custom see $MT_RUN_AREA_HOME (not yet implemented) : echo $MT_RUN_AREA_HOME + +(define (dashboard:custom-menu-items run-id test-id target run-name test-name testpatt item-test-path test-info) + (let* ((vars (configf:section-vars *configdat* "custom-context-menu-items")) + (item-path (db:test-get-item-path test-info)) + (mt-root (pathname-directory (pathname-directory *common:this-exe-dir* )))) + (filter-map + (lambda (var) + (let* ((val (configf:lookup *configdat* "custom-context-menu-items" var)) + (m (string-match "^\\s*([^:]+?)\\s*:\\s*(.*?)\\s*$" val))) + (if m + (let* ((menu-item-text-raw (list-ref m 1)) + (command-line-raw (list-ref m 2)) + (subst-alist ;; template vars + `(( "%run-id%" . ,run-id ) + ( "%test-id%" . ,test-id ) + ( "%target%" . ,target ) + ( "%test-name%" . ,test-name) + ( "%test-patt%" . ,testpatt) + ( "%test-run-dir%" . ,(db:test-get-rundir test-info)) + ( "%mt-root%" . ,mt-root) + ( "%run-name%" . ,run-name) + ( "%run-area-home%" . ,*toppath*) + ( "%item-path%" . ,item-path) + ( "%item-test-patt%" . ,item-test-path ))) + (command-line ;; replace template vars + (foldr + (lambda (x i) + (string-substitute + (car x) + (->string (cdr x)) + i + #t)) + command-line-raw + subst-alist)) + (menu-item-text ;; replace template vars + (foldr + (lambda (x i) + (string-substitute + (car x) + (->string (cdr x)) + i + #t)) + menu-item-text-raw + subst-alist))) + (iup:menu-item + (conc "*"menu-item-text) + #:action + (lambda (obj) + + (let* ((scheme-match (string-match "^#(\\(.*)" command-line))) + ;;(BB> "cmdline is >"command-line"<") + (common:with-env-vars + ;; TODO: with-env-vars + ;; TODO: with-env-vars MT_* + (runs:get-mt-env-alist run-id run-name target test-name item-path) + + (lambda () + (if scheme-match + (begin + (handle-exceptions + exn + (print "error with custom menu scheme") + (begin + ;;(BB> "gonna eval it!") + (eval (with-input-from-string (cadr scheme-match) read))))) + (common:run-a-command command-line with-vars: #t)))))))) + #f))) + vars))) + +(define (dashboard:context-menu run-id test-id target runname test-name testpatt item-test-path test-info) + (let* ((run-menu-items + (dashboard:run-menu-items run-id test-id target runname test-name testpatt item-test-path test-info)) + (test-menu-items + (dashboard:test-menu-items run-id test-id target runname test-name testpatt item-test-path test-info)) + (custom-menu-items + (dashboard:custom-menu-items run-id test-id target runname test-name testpatt item-test-path test-info)) + (toplevel-menu-items + (dashboard:toplevel-menu-items run-id test-id target runname test-name testpatt item-test-path test-info)) + ) + (apply iup:menu + `(,@toplevel-menu-items + ,(iup:menu-item + "Run" + (apply iup:menu run-menu-items)) + ,(iup:menu-item + "Test" + (apply iup:menu test-menu-items)) + ,@custom-menu-items)))) Index: dashboard-guimonitor.scm ================================================================== --- dashboard-guimonitor.scm +++ dashboard-guimonitor.scm @@ -1,14 +1,23 @@ ;;====================================================================== ;; Copyright 2006-2012, Matthew Welland. ;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. ;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . +;; ;;====================================================================== ;;====================================================================== ;; Test info panel ;;====================================================================== Index: dashboard-tests.scm ================================================================== --- dashboard-tests.scm +++ dashboard-tests.scm @@ -1,14 +1,23 @@ ;;====================================================================== ;; Copyright 2006-2012, Matthew Welland. ;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. ;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . + ;;====================================================================== ;;====================================================================== ;; Test info panel ;;====================================================================== @@ -28,10 +37,11 @@ (declare (uses gutils)) (declare (uses rmt)) (declare (uses ezsteps)) ;; (declare (uses sdb)) ;; (declare (uses filedb)) +(declare (uses subrun)) (include "common_records.scm") (include "db_records.scm") (include "run_records.scm") @@ -40,16 +50,26 @@ ;;====================================================================== (define *dashboard-comment-share-slot* #f) (define (dtests:get-pre-command #!key (default-override #f)) - (let ((cfg-ovrd (configf:lookup *configdat* "dashboard" "pre-command"))) - (or cfg-ovrd default-override "viewscreen "))) ;; "xterm -geometry 180x20 -e \""))) + (let* ((orig-pre-command "export CMD='") + (viewscreen-pre-command "viewscreen ") + (use-viewscreen (configf:lookup *configdat* "dashboard" "use-viewscreen")) + (default-pre-command (if use-viewscreen viewscreen-pre-command orig-pre-command)) + (cfg-ovrd (configf:lookup *configdat* "dashboard" "pre-command"))) + (or cfg-ovrd default-override default-pre-command))) ;; "xterm -geometry 180x20 -e \"")) + (define (dtests:get-post-command #!key (default-override #f)) - (let ((cfg-ovrd (configf:lookup *configdat* "dashboard" "post-command"))) - (or cfg-ovrd default-override " &"))) ;; ";echo Press any key to continue;bash -c 'read -n 1 -s'\" &"))) + (let* ((orig-post-command (conc "';xterm -geometry 180x20 -e \"(echo; echo -n START:;date +ww%U.%w-$H:%M:%S;echo;echo $CMD;echo;$CMD)|&" + "tee -a runlog-`date +ww%U.%w-%H:%M`.log;echo Press any key to continue;bash -c 'read -n 1 -s'\" &")) + (viewscreen-post-command "") + (use-viewscreen (configf:lookup *configdat* "dashboard" "use-viewscreen")) + (default-post-command (if use-viewscreen viewscreen-post-command orig-post-command)) + (cfg-ovrd (configf:lookup *configdat* "dashboard" "post-command"))) + (or cfg-ovrd default-override default-post-command))) ;; ";echo Press any key to continue;bash -c 'read -n 1 -s'\" &"))) (define (test-info-panel testdat store-label widgets) (iup:frame #:title "Test Info" ; #:expand "YES" @@ -233,20 +253,20 @@ ))))) ;; if there is a submegatest create a button to launch dashboard in that area ;; (define (submegatest-panel dbstruct keydat testdat runname testconfig) - (let* ((subarea (configf:lookup testconfig "setup" "submegatest")) - (area-exists (and subarea (file-exists? subarea)))) - ;; (debug:print-info 0 *default-log-port* "Megatest subarea=" subarea ", area-exists=" area-exists) + (let* ((test-run-dir (db:test-get-rundir testdat)) + (subarea (subrun:get-runarea test-run-dir)) + (area-exists (and subarea (common:file-exists? subarea silent: #t)))) (if subarea (iup:frame #:title "Megatest Run Info" ; #:expand "YES" (iup:button "Launch Dashboard" #:action (lambda (obj) - (system (conc "cd " subarea ";env -i PATH=$PATH DISPLAY=$DISPLAY HOME=$HOME USER=$USER dashboard &"))))) + (subrun:launch-dashboard test-run-dir)))) (iup:vbox)))) ;; use a global for setting the buttons colors ;; state status teststeps (define *state-status* (vector #f #f #f)) @@ -340,34 +360,53 @@ btns)))))) (define (dashboard-tests:run-a-step info) #t) -(define (dashboard-tests:step-run-control testdat stepname testconfig) - (iup:dialog ;; #:close_cb (lambda (a)(exit)) ; #:expand "YES" - #:title stepname - (iup:vbox ; #:expand "YES" - (iup:label (conc "Step: " stepname "\nNB// These buttons only run the test step\nfor the purpose of debugging.\nNot all database updates are done.")) - (iup:button "Re-run" - #:expand "HORIZONTAL" - #:action (lambda (obj) - (thread-start! - (make-thread (lambda () - (ezsteps:run-from testdat stepname #t)) - (conc "ezstep run single step " stepname))))) - (iup:button "Re-run and continue" - #:expand "HORIZONTAL" - #:action (lambda (obj) - (thread-start! - (make-thread (lambda () - (ezsteps:run-from testdat stepname #f)) - (conc "ezstep run from step " stepname))))) - ;; (iup:button "Refresh test data" - ;; #:expand "HORIZONTAL" - ;; #:action (lambda (obj) - ;; (print "Refresh test data " stepname)) - ))) +;; (define (dashboard-tests:step-run-control testdat stepname testconfig) +;; (let* ((mutex (make-mutex))) +;; (letrec ((dlg +;; (iup:dialog ;; #:close_cb (lambda (a)(exit)) ; #:expand "YES" +;; #:title stepname +;; (iup:vbox ; #:expand "YES" +;; (iup:label (conc "Step: " stepname "\nNB// These buttons only run the test step\nfor the purpose of debugging.\nNot all database updates are done.")) +;; (iup:button "Re-run" +;; #:expand "HORIZONTAL" +;; #:action (lambda (obj) +;; (debug:catch-and-dump (lambda () +;; (thread-start! +;; (make-thread +;; (lambda () +;; (print "BB> started ezsteps:run-from") +;; (debug:catch-and-dump +;; (lambda () +;; (ezsteps:run-from testdat stepname #t)) +;; "dashboard-tests:step-run-control -> ezstep:run-from (1)") +;; (print "BB> done ezsteps:run-from") +;; 'foo) +;; (conc "ezstep run single step " stepname))) +;; ) +;; "step-run-control action"))) +;; (iup:button "Re-run and continue" +;; #:expand "HORIZONTAL" +;; #:action (lambda (obj) +;; (debug:catch-and-dump +;; (lambda () +;; (thread-start! +;; (make-thread (lambda () +;; (ezsteps:run-from testdat stepname #f)) +;; (conc "ezstep run from step " stepname)))) +;; "dashboard-tests:step-run-control -> ezstep:run-from (2)"))) +;; (iup:button "Close" +;; #:action (lambda (obj) +;; (iup:destroy! dlg))) +;; ;; (iup:button "Refresh test data" +;; ;; #:expand "HORIZONTAL" +;; ;; #:action (lambda (obj) +;; ;; (print "Refresh test data " stepname)) +;; )))) +;; dlg))) (define (dashboard-tests:waiver run-id testdat ovrdval cmtcmd) (let* ((wpatt (configf:lookup *configdat* "setup" "waivercommentpatt")) (wregx (if (string? wpatt)(regexp wpatt) #f)) (wmesg (iup:label (if wpatt (conc "Comment must match pattern " wpatt) ""))) @@ -439,11 +478,19 @@ (logfile "/this/dir/better/not/exist") (rundir (if testdat (db:test-get-rundir testdat) logfile)) ;; (testdat-path (conc rundir "/testdat.db")) ;; this gets recalculated until found - (teststeps (if testdat (tests:get-compressed-steps run-id test-id) '())) + (augment-teststeps (lambda (inlov) + (map + (lambda (invec) + (list->vector + `( + ,@(reverse (cdr (reverse (vector->list invec)))) + "rerun this step" "restart from here" ))) + inlov))) + (teststeps (if testdat (augment-teststeps (tests:get-compressed-steps run-id test-id)) '())) (testfullname (if testdat (db:test-get-fullname testdat) "Gathering data ...")) (testname (if testdat (db:test-get-testname testdat) "n/a")) ;; (tests:get-testconfig testdat testname 'return-procs)) (testmeta (if testdat (let ((tm (rmt:testmeta-get-record testname))) @@ -458,11 +505,11 @@ "/")) (item-path (db:test-get-item-path testdat)) ;; this next block was added to fix a bug where variables were ;; needed. Revisit this. (runconfig (let ((runconfigf (conc *toppath* "/runconfigs.config"))) ;; no rush but it would be good to convert this call to use runconfig:read - (if (file-exists? runconfigf) + (if (common:file-exists? runconfigf) (handle-exceptions exn #f ;; do nothing, just keep on trucking .... (setup-env-defaults runconfigf run-id (make-hash-table) keydat environ-patt: keystring)) (make-hash-table)))) @@ -469,21 +516,21 @@ (testconfig (begin ;; (runs:set-megatest-env-vars run-id inrunname: runname testname: test-name itempath: item-path) (runs:set-megatest-env-vars run-id inkeyvals: keydat inrunname: runname intarget: keystring testname: testname itempath: item-path) ;; these may be needed by the launching process (handle-exceptions exn ;; NOTE: I've no idea why this was written this way. Research, study and fix needed! - (tests:get-testconfig (db:test-get-testname testdat) (db:test-get-item-path testdat) test-registry #f) - (tests:get-testconfig (db:test-get-testname testdat) item-path test-registry #t)))) + (tests:get-testconfig (db:test-get-testname testdat) (db:test-get-item-path testdat) test-registry #f allow-write-cache: #f) + (tests:get-testconfig (db:test-get-testname testdat) item-path test-registry #t allow-write-cache: #f)))) (viewlog (lambda (x) - (if (file-exists? logfile) + (if (common:file-exists? logfile) ;(system (conc "firefox " logfile "&")) (dcommon:run-html-viewer logfile) (message-window (conc "File " logfile " not found"))))) (view-a-log (lambda (lfile) (let ((lfilename (conc rundir "/" lfile))) ;; (print "lfilename: " lfilename) - (if (file-exists? lfilename) + (if (common:file-exists? lfilename) ;(system (conc "firefox " logfile "&")) (dcommon:run-html-viewer lfilename) (message-window (conc "File " lfilename " not found")))))) (xterm (lambda (x) (if (directory-exists? rundir) @@ -496,11 +543,11 @@ "MT_.*")) (message-window (conc "Directory " rundir " not found"))))) (widgets (make-hash-table)) (refreshdat (lambda () (let* ((curr-mod-time (file-modification-time db-path)) - ;; (max ..... (if (file-exists? testdat-path) + ;; (max ..... (if (common:file-exists? testdat-path) ;; (file-modification-time testdat-path) ;; (begin ;; (set! testdat-path (conc rundir "/testdat.db")) ;; 0)))) (need-update (or (and (>= curr-mod-time db-mod-time) @@ -515,11 +562,11 @@ (rmt:get-test-info-by-id run-id test-id ))))) ;; (print "INFO: need-update= " need-update " curr-mod-time = " curr-mod-time) (cond ((and need-update newtestdat) (set! testdat newtestdat) - (set! teststeps (tests:get-compressed-steps run-id test-id)) + (set! teststeps (augment-teststeps (tests:get-compressed-steps run-id test-id))) (set! logfile (conc (db:test-get-rundir testdat) "/" (db:test-get-final_logf testdat))) (set! rundir ;; (filedb:get-path *fdb* (db:test-get-rundir testdat)) ;; ) (set! testfullname (db:test-get-fullname testdat)) ;; (debug:print 0 *default-log-port* "INFO: teststeps=" (intersperse teststeps "\n ")) @@ -574,11 +621,11 @@ ))))) lbl)) (store-button store-label) (command-proc (lambda (command-text-box) (let* ((cmd (iup:attribute command-text-box "VALUE"))) - (common:run-a-command cmd)))) + (common:run-a-command cmd with-orig-env: #t)))) (command-text-box (iup:textbox #:expand "HORIZONTAL" #:font "Courier New, -10" #:action (lambda (obj cnum val) ;; (print "cnum=" cnum) @@ -616,15 +663,16 @@ " -testpatt " (conc testname "/" (if (equal? item-path "") "%" item-path)) " -v")))) (clean-run-execute (lambda (x) - (let ((cmd (conc "megatest -remove-runs -target " keystring " -runname " runname + (let ((cmd (conc ;; "megatest -remove-runs -target " keystring " -runname " runname + "megatest -set-state-status NOT_STARTED,n/a -target " keystring " -runname " runname " -testpatt " (conc testname "/" (if (equal? item-path "") "%" item-path)) - ";megatest -target " keystring " -runname " runname + ";megatest -target " keystring " -runname " runname " -run -preclean -testpatt " (conc testname "/" (if (equal? item-path "") "%" item-path)) " -clean-cache" ))) @@ -685,25 +733,25 @@ ;; Replace here with matrix (let ((steps-matrix (iup:matrix #:font "Courier New, -8" #:expand "YES" #:scrollbar "YES" - #:numcol 7 + #:numcol 9 #:numlin 100 - #:numcol-visible 7 + #:numcol-visible 9 #:numlin-visible 5 #:click-cb (lambda (obj lin col status) ;; (if (equal? col 6) - (let* ((mtrx-rc (conc lin ":" 6)) - (fname (iup:attribute obj mtrx-rc))) ;; col)))) - (if (eq? col 6) - (view-a-log fname) - (iup:show - (dashboard-tests:step-run-control - testdat - (iup:attribute obj (conc lin ":" 1)) - teststeps)))))))) + (let* ((mtrx-rc (conc lin ":" 6)) + (fname (iup:attribute obj mtrx-rc)) + (stepname (iup:attribute obj (conc lin ":" 1))) (comment (iup:attribute obj (conc lin ":" 7)))) + (case col + + ((7) (print "Comment from step "stepname": "comment)) + ((8) (ezsteps:spawn-run-from testdat stepname #t)) + ((9) (ezsteps:spawn-run-from testdat stepname #f)) + (else (view-a-log fname)))))))) ;; (let loop ((count 0)) ;; (iup:attribute-set! steps-matrix "FITTOTEXT" (conc "L" count)) ;; (if (< count 30) ;; (loop (+ count 1)))) (iup:attribute-set! steps-matrix "0:1" "Step Name") @@ -713,10 +761,15 @@ (iup:attribute-set! steps-matrix "0:4" "Status") (iup:attribute-set! steps-matrix "WIDTH4" "50") (iup:attribute-set! steps-matrix "0:5" "Duration") (iup:attribute-set! steps-matrix "0:6" "Log File") (iup:attribute-set! steps-matrix "0:7" "Comment") + (iup:attribute-set! steps-matrix "0:8" "rerun only") + (iup:attribute-set! steps-matrix "BGCOLOR0:9" "149 208 252") + (iup:attribute-set! steps-matrix "BGCOLOR0:8" "149 208 252") + (iup:attribute-set! steps-matrix "BGCOLOR0:7" "149 208 252") + (iup:attribute-set! steps-matrix "0:9" "rerun & continue") (iup:attribute-set! steps-matrix "ALIGNMENT1" "ALEFT") ;; (iup:attribute-set! steps-matrix "FIXTOTEXT" "C1") (iup:attribute-set! steps-matrix "RESIZEMATRIX" "YES") (let ((proc (lambda (testdat) Index: dashboard.scm ================================================================== --- dashboard.scm +++ dashboard.scm @@ -1,24 +1,33 @@ ;;====================================================================== ;; Copyright 2006-2016, Matthew Welland. ;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. ;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . +;; ;;====================================================================== (use format) (require-library iup) (import (prefix iup iup:)) (use canvas-draw) (import canvas-draw-iup) - +(use ducttape-lib) (use sqlite3 srfi-1 posix regex regex-case srfi-69 typed-records sparse-vectors) ;; defstruct (import (prefix sqlite3 sqlite3:)) (declare (uses common)) (declare (uses margs)) @@ -31,12 +40,13 @@ (declare (uses runs)) (declare (uses dashboard-tests)) (declare (uses dashboard-guimonitor)) (declare (uses tree)) (declare (uses dcommon)) +(declare (uses dashboard-context-menu)) (declare (uses vg)) - +(declare (uses subrun)) ;; (declare (uses dashboard-main)) (declare (uses megatest-version)) (declare (uses mt)) (include "common_records.scm") @@ -47,11 +57,11 @@ (include "vg_records.scm") (define help (conc "Megatest Dashboard, documentation at http://www.kiatoa.com/fossils/megatest version " megatest-version " - license GPL, Copyright (C) Matt Welland 2012-2016 + license GPL, Copyright (C) Matt Welland 2012-2017 Usage: dashboard [options] -h : this help -test run-id,test-id : control test identified by testid -skip-version-check : skip the version check @@ -75,10 +85,11 @@ "-test" "-xterm" "-debug" "-host" "-transport" + "-start-dir" ) (list "-h" "-use-server" "-guimonitor" "-main" @@ -85,13 +96,27 @@ "-v" "-q" "-use-db-cache" "-skip-version-check" "-repl" + "-rh5.11" ;; fix to allow running on rh5.11 ) args:arg-hash 0)) + +;; check for MT_* environment variables and exit if found +(if (not (args:get-arg "-test")) + (begin + (display "Checking for MT_ vars: ") + (for-each (lambda (var) + (display " ")(display var) + (if (get-environment-variable var) + (begin + (print "ERROR: environment variable " var " is set in this terminal, this will cause you problems. Exiting now.") + (exit 1)))) + '("MT_RUN_AREA_HOME" "MT_MEGATEST" "MT_CMDINFO" "MT_TEST_RUN_DIR" "MT_LINKTREE" "MT_TESTSUITENAME")) + (print ". Done. All ok."))) (if (not (null? remargs)) (begin (print "Unrecognised arguments: " (string-intersperse remargs " ")) (exit))) @@ -98,17 +123,34 @@ (if (args:get-arg "-h") (begin (print help) (exit))) + +(if (args:get-arg "-start-dir") + (if (directory-exists? (args:get-arg "-start-dir")) + (let ((fullpath (common:real-path (args:get-arg "-start-dir")))) + (setenv "PWD" fullpath) + (change-directory fullpath)) + (begin + (debug:print-error 0 *default-log-port* "non-existant start dir " (args:get-arg "-start-dir") " specified, exiting.") + (exit 1)))) ;; TODO: Move this inside (main) ;; (if (not (launch:setup)) (begin (print "Failed to find megatest.config, exiting") (exit 1))) + +;; deal with RH 5.11 gtk lib or iup lib missing detachbox feature +;; first check for the switch +;; +(if (or (args:get-arg "-rh5.11") + (configf:lookup *configdat* "dashboard" "no-detachbox") + (not (file-exists? "/etc/os-release"))) + (set! iup:detachbox iup:vbox)) (if (not (common:on-homehost?)) (begin (debug:print 0 *default-log-port* "WARNING: Current policy requires running dashboard on homehost: " (common:get-homehost)))) @@ -204,11 +246,13 @@ ((allruns-by-id (make-hash-table)) : hash-table) ;; hash of run-id -> dboard:rundat records ((done-runs '()) : list) ;; list of runs already drawn ((not-done-runs '()) : list) ;; list of runs not yet drawn (header #f) ;; header for decoding the run records (keys #f) ;; keys for this run (i.e. target components) - ((numruns (string->number (or (args:get-arg "-cols") "10"))) : number) ;; + ((numruns (string->number (or (args:get-arg "-cols") + (configf:lookup *configdat* "dashboard" "cols") + "8"))) : number) ;; ((tot-runs 0) : number) ((last-data-update 0) : number) ;; last time the data in allruns was updated ((last-runs-update 0) : number) ;; last time we pulled the runs info to update the tree (runs-mutex (make-mutex)) ;; use to prevent parallel access to draw objects ((run-update-times (make-hash-table)) : hash-table) ;; update times indexed by run-id @@ -222,11 +266,11 @@ (runs-matrix #f) ;; used in newdashboard ((start-run-offset 0) : number) ;; left-right slider value ((start-test-offset 0) : number) ;; up-down slider value ((runs-btn-height (or (configf:lookup *configdat* "dashboard" "btn-height") "x16")) : string) ;; was 12 ((runs-btn-fontsz (or (configf:lookup *configdat* "dashboard" "btn-fontsz") "10")) : string) ;; was 8 - ((runs-cell-width (or (configf:lookup *configdat* "dashboard" "cell-width") "60")) : string) ;; was 50 + ((runs-cell-width (or (configf:lookup *configdat* "dashboard" "cell-width") "50")) : string) ;; was 50 ((all-test-names '()) : list) ;; Canvas and drawing data (cnv #f) (cnv-obj #f) @@ -313,10 +357,12 @@ (filter (lambda (alist-entry) (member (car alist-entry) '(allruns-by-id allruns))) ;; FIELDS OF INTEREST (dboard:tabdat->alist tabdat-item))))) + + (define (dboard:tabdat-target-string vec) (let ((targ (dboard:tabdat-target vec))) (if (list? targ)(string-intersperse targ "/") "no-target-specified"))) @@ -339,11 +385,11 @@ (dboard:tabdat-monitor-db-path-set! tabdat (conc (dboard:tabdat-dbdir tabdat) "/monitor.db")) ;; HACK ALERT: this is a hack, please fix. (dboard:tabdat-ro-set! tabdat (not (file-read-access? (dboard:tabdat-dbfpath tabdat)))) - (dboard:tabdat-keys-set! tabdat (db:dispatch-query (db:get-access-mode) rmt:get-keys db:get-keys)) + (dboard:tabdat-keys-set! tabdat (rmt:get-keys)) (dboard:tabdat-dbkeys-set! tabdat (append (dboard:tabdat-keys tabdat) (list "runname"))) (dboard:tabdat-tot-runs-set! tabdat (rmt:get-num-runs "%")) ) ;; RADT => Matrix defstruct addition @@ -567,12 +613,11 @@ (db-modified (>= db-mod-time last-db-time)) (multi-get (> (dboard:rundat-run-data-offset run-dat) 0)) ;; multi-get in progress (tmptests (if (or do-not-use-db-file-timestamps (dboard:tabdat-filters-changed tabdat) db-modified) - (db:dispatch-query access-mode rmt:get-tests-for-run db:get-tests-for-run - run-id testnamepatt states statuses ;; run-id testpatt states statuses + (rmt:get-tests-for-run run-id testnamepatt states statuses ;; run-id testpatt states statuses (dboard:rundat-run-data-offset run-dat) ;; query offset num-to-get (dboard:tabdat-hide-not-hide tabdat) ;; no-in sort-by ;; sort-by sort-order ;; sort-order @@ -642,17 +687,15 @@ ;; create a virtual table of all the tests ;; keypatts: ( (KEY1 "abc%def")(KEY2 "%") ) ;; (define (update-rundat tabdat runnamepatt numruns testnamepatt keypatts) (let* ((access-mode (dboard:tabdat-access-mode tabdat)) - (keys (db:dispatch-query access-mode rmt:get-keys db:get-keys)) + (keys (rmt:get-keys)) (last-runs-update (- (dboard:tabdat-last-runs-update tabdat) 2)) - (allruns (db:dispatch-query access-mode rmt:get-runs db:get-runs - runnamepatt numruns (dboard:tabdat-start-run-offset tabdat) keypatts)) + (allruns (rmt:get-runs runnamepatt numruns (dboard:tabdat-start-run-offset tabdat) keypatts)) ;;(allruns-tree (rmt:get-runs-by-patt (dboard:tabdat-keys tabdat) "%" #f #f #f #f)) - (allruns-tree (db:dispatch-query access-mode rmt:get-runs-by-patt db:get-runs-by-patt - keys "%" #f #f #f #f last-runs-update));;'("id" "runname") + (allruns-tree (rmt:get-runs-by-patt keys "%" #f #f #f #f last-runs-update)) ;;'("id" "runname") (header (db:get-header allruns)) (runs (db:get-rows allruns)) ;; RA => Filtered as per runpatt selected (runs-tree (db:get-rows allruns-tree)) ;; RA => Returns complete list of runs (start-time (current-seconds)) (runs-hash (let ((ht (make-hash-table))) @@ -725,15 +768,13 @@ ;; (define (dboard:update-rundat tabdat runnamepatt numruns testnamepatt keypatts) (let* ((access-mode (dboard:tabdat-access-mode tabdat)) (keys (dboard:tabdat-keys tabdat)) ;; (db:dispatch-query access-mode rmt:get-keys db:get-keys))) (last-runs-update (- (dboard:tabdat-last-runs-update tabdat) 2)) - (allruns (db:dispatch-query access-mode rmt:get-runs db:get-runs - runnamepatt numruns (dboard:tabdat-start-run-offset tabdat) keypatts)) + (allruns (rmt:get-runs runnamepatt numruns (dboard:tabdat-start-run-offset tabdat) keypatts)) ;;(allruns-tree (rmt:get-runs-by-patt (dboard:tabdat-keys tabdat) "%" #f #f #f #f)) - (allruns-tree (db:dispatch-query access-mode rmt:get-runs-by-patt db:get-runs-by-patt - keys "%" #f #f #f #f 0)) ;; last-runs-update));;'("id" "runname") + (allruns-tree (rmt:get-runs-by-patt keys "%" #f #f #f #f 0)) ;; last-runs-update));;'("id" "runname") (header (db:get-header allruns)) (runs (db:get-rows allruns)) ;; RA => Filtered as per runpatt selected (runs-tree (db:get-rows allruns-tree)) ;; RA => Returns complete list of runs (start-time (current-seconds)) (runs-hash (let ((ht (make-hash-table))) @@ -792,11 +833,20 @@ (hash-table-delete! (dboard:tabdat-allruns-by-id tabdat) run-id) (hash-table-set! (dboard:tabdat-allruns-by-id tabdat) run-id run-struct)) (if (or (null? tal) (> elapsed-time 2)) ;; stop loading data after 5 seconds, on the next call more data *should* be loaded since get-tests-for-run uses last update (begin - (if (> elapsed-time 2)(print "NOTE: updates are taking a long time, " elapsed-time "s elapsed.")) + (when (> elapsed-time 2) + (debug:print 0 *default-log-port* "NOTE: updates are taking a long time, " elapsed-time "s elapsed.") + (let* ((old-val (iup:attribute *tim* "TIME")) + (new-val (number->string (inexact->exact (floor (* 2 (string->number old-val))))))) + (if (< (string->number new-val) 5000) + ((debug:print 0 *default-log-port* "NOTE: increasing poll interval from "old-val" to "new-val) + (iup:attribute-set! *tim* "TIME" new-val)))) + + + ) (dboard:tabdat-allruns-set! tabdat new-res) maxtests) (if (> (dboard:rundat-run-data-offset run-struct) 0) (loop run tal new-res newmaxtests) ;; not done getting data for this run (loop (car tal)(cdr tal) new-res newmaxtests))))))) @@ -811,11 +861,11 @@ (parts (string-split fulltestname "(")) (basetestname (if (null? parts) "" (car parts)))) ;(print "Toggling " basetestname " currently " (hash-table-ref/default *collapsed* basetestname #f)) (if (hash-table-ref/default *collapsed* basetestname #f) (begin - ;(iup:attribute-set! btn "FGCOLOR" "0 0 0") + ;(iup:attribute-set! btn "FGCOLOR" "0 0 0")s (hash-table-delete! *collapsed* basetestname)) (begin ;(iup:attribute-set! btn "FGCOLOR" "0 192 192") (hash-table-set! *collapsed* basetestname #t))))) @@ -1001,11 +1051,11 @@ (testsdat-by-name (dboard:rundat-tests-by-name rundat)) (key-val-dat (dboard:rundat-key-vals rundat)) (run-id (db:get-value-by-header run (dboard:tabdat-header tabdat) "id")) (key-vals (append key-val-dat (list (let ((x (db:get-value-by-header run (dboard:tabdat-header tabdat) "runname"))) - (if x x ""))))) + (if (string? x) x ""))))) (run-key (string-intersperse key-vals "\n"))) ;; fill in the run header key values ;; (let ((rown 0) @@ -1085,10 +1135,11 @@ (dboard:tabdat-filters-changed-set! tabdat #t))) (define (update-search commondat tabdat x val) (hash-table-set! (dboard:tabdat-searchpatts tabdat) x val) (dboard:tabdat-filters-changed-set! tabdat #t) + (mark-for-update tabdat) (set-bg-on-filter commondat tabdat)) ;; force ALL updates to zero (effectively) ;; (define (mark-for-update tabdat) @@ -1373,16 +1424,19 @@ ;; (iup:split ;; #:value 300 ;; Target, testpatt, state and status input boxes ;; - (iup:vbox - ;; Command to run, placed over the top of the canvas - (dcommon:command-action-selector commondat tabdat tab-num: tab-num) - (dboard:runs-tree-browser commondat tabdat) - (dcommon:command-runname-selector commondat tabdat tab-num: tab-num) - (dcommon:command-testname-selector commondat tabdat update-keyvals)) + (iup:split + #:orientation "HORIZONTAL" + (iup:vbox + ;; Command to run, placed over the top of the canvas + (dcommon:command-action-selector commondat tabdat tab-num: tab-num) + (dboard:runs-tree-browser commondat tabdat)) + (iup:vbox + (dcommon:command-runname-selector commondat tabdat tab-num: tab-num) + (dcommon:command-testname-selector commondat tabdat update-keyvals))) ;; key-listboxes)) (dcommon:command-tests-tasks-canvas tabdat test-records sorted-testnames tests-draw-state)))) (tb (dboard:tabdat-runs-tree tabdat))) (dboard:commondat-add-updater commondat @@ -1397,14 +1451,20 @@ ;; (let ((logs-tb (iup:textbox #:expand "YES" ;; #:multiline "YES"))) ;; (dboard:tabdat-logs-textbox-set! tabdat logs-tb) ;; logs-tb)) +;; browse runs as a tree. Used in both "Runs" tab and +;; in the runs control panel. +;; (define (dboard:runs-tree-browser commondat tabdat) - (let* ((txtbox (iup:textbox #:action (lambda (val a b) + (let* ( + (txtbox (iup:textbox #:action (lambda (val a b) (debug:catch-and-dump (lambda () + ;; for the Runs view we put the list of keyvals into tabdat target + ;; for the Run Controls we put then update the run-command (if b (dboard:tabdat-target-set! tabdat (string-split b "/"))) (dashboard:update-run-command tabdat)) "command-testname-selector tb action")) #:value (dboard:test-patt->lines (dboard:tabdat-test-patts-use tabdat)) @@ -1412,13 +1472,13 @@ ;; #:size "10x30" )) (tb (iup:treebox #:value 0 - #:name "Runs" + #:title "Runs" ;; was #:name -- iup 3.19 changed this... "Changed: [DEPRECATED REMOVED] removed the old attribute NAMEid from IupTree to avoid conflict with the common attribute NAME. Use the TITLEid attribute." #:expand "YES" - #:addexpanded "NO" + #:addexpanded "YES" #:size "10x" #:selection-cb (lambda (obj id state) (debug:catch-and-dump (lambda () @@ -1440,11 +1500,14 @@ (debug:print-error 5 *default-log-port* "tree-path->run-id returned non-number " run-id)))) "treebox")) ;; (print "path: " (tree:node->path obj id) " run-id: " run-id) ))) (dboard:tabdat-runs-tree-set! tabdat tb) - (iup:vbox tb txtbox))) + (iup:detachbox + (iup:vbox + tb + txtbox)))) ;;====================================================================== ;; R U N C O N T R O L S ;;====================================================================== ;; @@ -1509,11 +1572,11 @@ (iup:vbox (iup:split #:orientation "HORIZONTAL" #:value 800 (let* ((cnv-obj (iup:canvas - ;; #:size "500x400" + ;; #:size "250x250" ;; "500x400" #:expand "YES" #:scrollbar "YES" #:posx "0.5" #:posy "0.5" #:action (make-canvas-action @@ -1554,15 +1617,15 @@ (let* ((hb1 (iup:hbox)) (graph-cell-table (dboard:tabdat-graph-cell-table tabdat)) (changed #f) (graph-matrix (iup:matrix #:alignment1 "ALEFT" - #:expand "YES" ;; "HORIZONTAL" + ;; #:expand "YES" ;; "HORIZONTAL" #:scrollbar "YES" #:numcol 10 #:numlin 20 - #:numcol-visible (min 8) + #:numcol-visible 5 ;; (min 8) #:numlin-visible 1 #:click-cb (lambda (obj row col status) (let* ((graph-cell (conc row ":" col)) @@ -1611,35 +1674,35 @@ (define (tree-path->run-id tabdat path) (if (not (null? path)) (hash-table-ref/default (dboard:tabdat-path-run-ids tabdat) path #f) #f)) -(define (dboard:get-tests-dat tabdat run-id last-update) - (let* ((access-mode (dboard:tabdat-access-mode tabdat)) - (tdat (if run-id (db:dispatch-query access-mode rmt:get-tests-for-run db:get-tests-for-run - run-id - (hash-table-ref/default (dboard:tabdat-searchpatts tabdat) "test-name" "%/%") - (hash-table-keys (dboard:tabdat-state-ignore-hash tabdat)) ;; '() - (hash-table-keys (dboard:tabdat-status-ignore-hash tabdat)) ;; '() - #f #f ;; offset limit - (dboard:tabdat-hide-not-hide tabdat) ;; not-in - #f #f ;; sort-by sort-order - #f ;; get all? "id,testname,item_path,state,status,event_time,run_duration" ;; qryval - (if (dboard:tabdat-filters-changed tabdat) - 0 - last-update) - *dashboard-mode*) - '()))) ;; get 'em all - ;; (debug:print 0 *default-log-port* "dboard:get-tests-dat: got " (length tdat) " test records for run " run-id) - (sort tdat (lambda (a b) - (let* ((aval (vector-ref a 2)) - (bval (vector-ref b 2)) - (anum (string->number aval)) - (bnum (string->number bval))) - (if (and anum bnum) - (< anum bnum) - (string<= aval bval))))))) +;; (define (dboard:get-tests-dat tabdat run-id last-update) +;; (let* ((access-mode (dboard:tabdat-access-mode tabdat)) +;; (tdat (if run-id (db:dispatch-query access-mode rmt:get-tests-for-run db:get-tests-for-run +;; run-id +;; (hash-table-ref/default (dboard:tabdat-searchpatts tabdat) "test-name" "%/%") +;; (hash-table-keys (dboard:tabdat-state-ignore-hash tabdat)) ;; '() +;; (hash-table-keys (dboard:tabdat-status-ignore-hash tabdat)) ;; '() +;; #f #f ;; offset limit +;; (dboard:tabdat-hide-not-hide tabdat) ;; not-in +;; #f #f ;; sort-by sort-order +;; #f ;; get all? "id,testname,item_path,state,status,event_time,run_duration" ;; qryval +;; (if (dboard:tabdat-filters-changed tabdat) +;; 0 +;; last-update) +;; *dashboard-mode*) +;; '()))) ;; get 'em all +;; ;; (debug:print 0 *default-log-port* "dboard:get-tests-dat: got " (length tdat) " test records for run " run-id) +;; (sort tdat (lambda (a b) +;; (let* ((aval (vector-ref a 2)) +;; (bval (vector-ref b 2)) +;; (anum (string->number aval)) +;; (bnum (string->number bval))) +;; (if (and anum bnum) +;; (< anum bnum) +;; (string<= aval bval))))))) (define (dashboard:safe-cadr-assoc name lst) (let ((res (assoc name lst))) (if (and res (> (length res) 1)) @@ -1655,16 +1718,17 @@ (time-a (db:get-value-by-header record-a runs-header "event_time")) (time-b (db:get-value-by-header record-b runs-header "event_time"))) (< time-a time-b))))) (changed #f) (last-runs-update (dboard:tabdat-last-runs-update tabdat)) - (runs-dat (db:dispatch-query access-mode rmt:get-runs-by-patt db:get-runs-by-patt - (dboard:tabdat-keys tabdat) "%" #f #f #f #f last-runs-update))) + (runs-dat (rmt:get-runs-by-patt (dboard:tabdat-keys tabdat) "%" #f #f #f #f last-runs-update))) (dboard:tabdat-last-runs-update-set! tabdat (- (current-seconds) 2)) (for-each (lambda (run-id) (let* ((run-record (hash-table-ref/default runs-hash run-id #f)) - (key-vals (map (lambda (key)(db:get-value-by-header run-record runs-header key)) + (key-vals (map (lambda (key) + (let ((val (db:get-value-by-header run-record runs-header key))) + (if (string? val) val ""))) (dboard:tabdat-keys tabdat))) (run-name (db:get-value-by-header run-record runs-header "runname")) (col-name (conc (string-intersperse key-vals "\n") "\n" run-name)) (run-path (append key-vals (list run-name)))) (if (not (hash-table-ref/default (dboard:tabdat-path-run-ids tabdat) run-path #f)) @@ -1689,16 +1753,20 @@ (hash-table-values tests-ht) (lambda (a b) (let ((a-test-name (db:test-get-testname a)) (a-item-path (db:test-get-item-path a)) (b-test-name (db:test-get-testname b)) - (b-item-path (db:test-get-item-path b))) - (cond - ((< 0 (string-compare3 a-test-name b-test-name)) #t) - ((> 0 (string-compare3 a-test-name b-test-name)) #f) - ((< 0 (string-compare3 a-item-path b-item-path)) #t) - (else #f))))))) + (b-item-path (db:test-get-item-path b)) + (a-event-time (db:test-get-event_time a)) + (b-event-time (db:test-get-event_time b))) + (if (not (equal? a-test-name b-test-name)) + (> a-event-time b-event-time) + (cond + ((< 0 (string-compare3 a-test-name b-test-name)) #t) + ((> 0 (string-compare3 a-test-name b-test-name)) #f) + ((< 0 (string-compare3 a-item-path b-item-path)) #t) + (else #f)))))))) (define (dashboard:run-id->tests-mindat run-id tabdat runs-hash) (let* ((run (hash-table-ref/default runs-hash run-id #f)) (key-vals (rmt:get-key-vals run-id)) @@ -1727,12 +1795,11 @@ (define (dashboard:get-runs-hash tabdat) (let* ((access-mode (dboard:tabdat-access-mode tabdat)) (last-runs-update 0);;(dboard:tabdat-last-runs-update tabdat)) - (runs-dat (db:dispatch-query access-mode rmt:get-runs-by-patt db:get-runs-by-patt - (dboard:tabdat-keys tabdat) "%" #f #f #f #f last-runs-update)) + (runs-dat (rmt:get-runs-by-patt (dboard:tabdat-keys tabdat) "%" #f #f #f #f last-runs-update)) (runs-header (vector-ref runs-dat 0)) ;; 0 is header, 1 is list of records (runs (vector-ref runs-dat 1)) (run-id (dboard:tabdat-curr-run-id tabdat)) (runs-hash (let ((ht (make-hash-table))) (for-each (lambda (run) @@ -1744,13 +1811,11 @@ (define (dashboard:runs-summary-updater commondat tabdat tb cell-lookup run-matrix) ;; (if (dashboard:database-changed? commondat tabdat context-key: 'runs-summary-rundat) (dashboard:do-update-rundat tabdat) ;; ) (dboard:runs-summary-control-panel-updater tabdat) (let* ((last-runs-update (dboard:tabdat-last-runs-update tabdat)) - (runs-dat (db:dispatch-query (dboard:tabdat-access-mode tabdat) - rmt:get-runs-by-patt db:get-runs-by-patt - (dboard:tabdat-keys tabdat) "%" #f #f #f #f last-runs-update)) + (runs-dat (rmt:get-runs-by-patt (dboard:tabdat-keys tabdat) "%" #f #f #f #f last-runs-update)) (runs-header (vector-ref runs-dat 0)) ;; 0 is header, 1 is list of records (runs (vector-ref runs-dat 1)) (run-id (dboard:tabdat-curr-run-id tabdat)) (runs-hash (dashboard:get-runs-hash tabdat)) ;; (runs-hash (let ((ht (make-hash-table))) @@ -1865,11 +1930,11 @@ (define (dashboard:summary commondat tabdat #!key (tab-num #f)) (let* ((rawconfig (read-config (conc *toppath* "/megatest.config") #f #f)) ;; changed to #f since I want #{} to be expanded by [system ...] to NOT be expanded. WAS: 'return-string))) (changed #f)) (iup:vbox (iup:split - #:value 500 + #:value 300 (iup:frame #:title "General Info" (iup:vbox (iup:hbox (iup:label "Area Path") @@ -1902,11 +1967,11 @@ (let* ((success #t) ;; at any stage of the process set this flag to #f to skip downstream steps. Intention here is to recover gracefully if user provided tabs fail to load. (source (configf:lookup views-cfgdat view-name "source")) (viewgen (configf:lookup views-cfgdat view-name "viewgen")) (updater (configf:lookup views-cfgdat view-name "updater")) (result-child #f)) - (if (and (file-exists? source) + (if (and (common:file-exists? source) (file-read-access? source)) (handle-exceptions exn (begin (print-call-chain) @@ -2046,13 +2111,14 @@ ;; (define (dashboard:runs-summary commondat tabdat #!key (tab-num #f)) (let* ((update-mutex (dboard:commondat-update-mutex commondat)) (tb (iup:treebox #:value 0 - #:name "Runs" + ;;#:name "Runs" + #:title "Runs" ;; was #:name -- iup 3.19 changed this... "Changed: [DEPRECATED REMOVED] removed the old attribute NAMEid from IupTree to avoid conflict with the common attribute NAME. Use the TITLEid attribute." #:expand "YES" - #:addexpanded "NO" + #:addexpanded "YES" #:selection-cb (lambda (obj id state) (debug:catch-and-dump (lambda () ;; (print "obj: " obj ", id: " id ", state: " state) @@ -2108,27 +2174,27 @@ (item-path (db:test-get-item-path (rmt:get-test-info-by-id run-id test-id))) (item-test-path (conc test-name "/" (if (equal? item-path "") "%" item-path))) (status-chars (char-set->list (string->char-set status))) - (testpanel-cmd (conc toolpath " -test " (dboard:tabdat-curr-run-id tabdat) "," test-id " &"))) + (run-id (dboard:tabdat-curr-run-id tabdat))) (debug:print-info 13 *default-log-port* "status-chars=["status-chars"] status=["status"]") (cond ((member #\1 status-chars) ;; 1 is left mouse button - (system testpanel-cmd)) + (dboard:launch-testpanel run-id test-id)) ((member #\2 status-chars) ;; 2 is middle mouse button (debug:print-info 13 *default-log-port* "mmb- test-name="test-name" testpatt="testpatt) - (iup:show (dashboard:popup-menu run-id test-id target runname test-name testpatt item-test-path test-info) ;; popup-menu + (iup:show (dashboard:context-menu run-id test-id target runname test-name testpatt item-test-path test-info) ;; popup-menu #:x 'mouse #:y 'mouse #:modal? "NO") ) (else (debug:print-info 13 *default-log-port* "unhandled status in run-summary-click-cb. Doing right click action. (status is corrupted on Brandon's ubuntu host - bad/buggy iup install??" ) - (iup:show (dashboard:popup-menu run-id test-id target runname test-name testpatt item-test-path test-info) ;; popup-menu + (iup:show (dashboard:context-menu run-id test-id target runname test-name testpatt item-test-path test-info) ;; popup-menu #:x 'mouse #:y 'mouse #:modal? "NO") ) ) @@ -2159,10 +2225,28 @@ ;;====================================================================== ;; R U N S ;;====================================================================== +(define (dboard:squarify toggles size) + (let loop ((hed (car toggles)) + (tal (cdr toggles)) + (cur '()) + (res '())) + (let* ((ovrflo (>= (length cur) size)) + (newcur (if ovrflo + (list hed) + (cons hed cur))) + (newres (if ovrflo + (cons cur res) + res))) + (if (null? tal) + (if ovrflo + newres + (cons newcur res)) + (loop (car tal)(cdr tal) newcur newres))))) + (define (dboard:make-controls commondat tabdat #!key (extra-widget #f) ) (let ((btn-fontsz (dboard:tabdat-runs-btn-fontsz tabdat))) (iup:hbox (iup:vbox (iup:frame @@ -2181,10 +2265,20 @@ (iup:hbox (iup:button "Quit" #:action (lambda (obj) (exit)) #:expand "NO" #:size "40x15") (iup:button "Refresh" #:action (lambda (obj) + (dboard:tabdat-last-data-update-set! tabdat 0) + (dboard:tabdat-last-runs-update-set! tabdat 0) + (dboard:tabdat-run-update-times-set! tabdat (make-hash-table)) + (dboard:tabdat-last-test-dat-set! tabdat (make-hash-table)) + (dboard:tabdat-allruns-set! tabdat '()) + (dboard:tabdat-allruns-by-id-set! tabdat (make-hash-table)) + (dboard:tabdat-done-runs-set! tabdat '()) + (dboard:tabdat-not-done-runs-set! tabdat '()) + (dboard:tabdat-view-changed-set! tabdat #t) + (dboard:commondat-please-update-set! commondat #t) (mark-for-update tabdat)) #:expand "NO" #:size "40x15") (iup:button "Collapse" #:action (lambda (obj) (debug:catch-and-dump (lambda () @@ -2223,17 +2317,17 @@ (mark-for-update tabdat)))) (default-cmd (car (list-ref *tests-sort-type-index* *tests-sort-reverse*)))) (iuplistbox-fill-list sort-lb cmds-list selected-item: default-cmd) - (set! hide-empty (iup:button "HideEmpty" - ;; #:expand HORIZONTAL" - #:expand "NO" #:size "80x15" - #:action (lambda (obj) - (dboard:tabdat-hide-empty-runs-set! tabdat (not (dboard:tabdat-hide-empty-runs tabdat))) - (iup:attribute-set! obj "TITLE" (if (dboard:tabdat-hide-empty-runs tabdat) "+HideE" "-HideE")) - (mark-for-update tabdat)))) + ;; (set! hide-empty (iup:button "HideEmpty" + ;; ;; #:expand HORIZONTAL" + ;; #:expand "NO" #:size "80x15" + ;; #:action (lambda (obj) + ;; (dboard:tabdat-hide-empty-runs-set! tabdat (not (dboard:tabdat-hide-empty-runs tabdat))) + ;; (iup:attribute-set! obj "TITLE" (if (dboard:tabdat-hide-empty-runs tabdat) "+HideE" "-HideE")) + ;; (mark-for-update tabdat)))) (set! hide (iup:button "Hide" #:expand "NO" #:size "40x15" ;; #:expand "HORIZONTAL" #:action (lambda (obj) (dboard:tabdat-hide-not-hide-set! tabdat #t) ;; (not (dboard:tabdat-hide-not-hide tabdat))) ;; (iup:attribute-set! obj "TITLE" (if (dboard:tabdat-hide-not-hide tabdat) "HideTests" "NotHide")) @@ -2263,217 +2357,80 @@ ))) - (iup:frame - #:title "state/status filter" - (iup:vbox - (apply - iup:hbox - (map (lambda (status) - (iup:toggle (conc status " ") - #:fontsize btn-fontsz ;; "10" - #:expand "HORIZONTAL" - #:action (lambda (obj val) - (mark-for-update tabdat) - (if (eq? val 1) - (hash-table-set! (dboard:tabdat-status-ignore-hash tabdat) status #t) - (hash-table-delete! (dboard:tabdat-status-ignore-hash tabdat) status)) - (set-bg-on-filter commondat tabdat)))) - (map cadr *common:std-statuses*))) ;; '("PASS" "FAIL" "WARN" "CHECK" "WAIVED" "STUCK/DEAD" "n/a" "SKIP"))) - (apply - iup:hbox - (map (lambda (state) - (iup:toggle (conc state " ") - #:fontsize btn-fontsz - #:expand "HORIZONTAL" - #:action (lambda (obj val) - (mark-for-update tabdat) - (if (eq? val 1) - (hash-table-set! (dboard:tabdat-state-ignore-hash tabdat) state #t) - (hash-table-delete! (dboard:tabdat-state-ignore-hash tabdat) state)) - (set-bg-on-filter commondat tabdat)))) - (map cadr *common:std-states*))) ;; '("RUNNING" "COMPLETED" "INCOMPLETE" "LAUNCHED" "NOT_STARTED" "KILLED" "DELETED"))) - (iup:valuator #:valuechanged_cb (lambda (obj) - (let ((val (inexact->exact (round (/ (string->number (iup:attribute obj "VALUE")) 10)))) - (oldmax (string->number (iup:attribute obj "MAX"))) - (maxruns (dboard:tabdat-tot-runs tabdat))) - (dboard:tabdat-start-run-offset-set! tabdat val) - (mark-for-update tabdat) - (debug:print 6 *default-log-port* "(dboard:tabdat-start-run-offset tabdat) " (dboard:tabdat-start-run-offset tabdat) " maxruns: " maxruns ", val: " val " oldmax: " oldmax) - (iup:attribute-set! obj "MAX" (* maxruns 10)))) - #:expand "HORIZONTAL" - #:max (* 10 (max (hash-table-size (dboard:tabdat-allruns-by-id tabdat)) 10)) - #:min 0 - #:step 0.01))) - ;;(iup:button "inc rows" #:action (lambda (obj)(dboard:tabdat-num-tests-set! tabdat (+ (dboard:tabdat-num-tests tabdat) 1)))) - ;(iup:button "dec rows" #:action (lambda (obj)(dboard:tabdat-num-tests-set! tabdat (if (> (dboard:tabdat-num-tests tabdat) 0)(- (dboard:tabdat-num-tests tabdat) 1) 0)))) - ))) - -(define (dashboard:popup-menu run-id test-id target runname test-name testpatt item-test-path test-info) - (iup:menu - (iup:menu-item - "Test Control Panel" - #:action - (lambda (obj) - (let* ((toolpath (car (argv))) - (testpanel-cmd - (conc toolpath " -test " run-id "," test-id " &"))) - (system testpanel-cmd) - ))) - - (iup:menu-item - (conc "View Log " item-test-path) - #:action - (lambda (obj) - (let* ((rundir (db:test-get-rundir test-info)) - (logf (db:test-get-final_logf test-info)) - (fullfile (conc rundir "/" logf))) - (if (common:file-exists? fullfile) - (dcommon:run-html-viewer fullfile) - (message-window (conc "file " fullfile " not found."))))) - ) - (let* ((steps (tests:get-compressed-steps run-id test-id)) ;; # - (rundir (db:test-get-rundir test-info))) - (iup:menu-item - "Step logs" - (apply iup:menu - (map (lambda (step) - (let ((stepname (vector-ref step 0)) - (logfile (vector-ref step 5)) - (status (vector-ref step 3))) - (iup:menu-item - (conc stepname "/" (if (string=? logfile "") "no log!" logfile) " (" status ")") - #:action (lambda (obj) - (let ((fullfile (conc rundir "/" logfile))) - (if (common:file-exists? fullfile) - (dcommon:run-html-viewer fullfile) - (message-window (conc "file " fullfile " not found")))))))) - steps)))) - (iup:menu-item - (conc "Rerun " item-test-path) - #:action - (lambda (obj) - (common:run-a-command - (conc "megatest -set-state-status NOT_STARTED,n/a -run -target " target - " -runname " runname - " -testpatt " item-test-path - " -preclean -clean-cache")))) - - (iup:menu-item - "Start xterm" - #:action - (lambda (obj) - (dcommon:examine-xterm run-id test-id))) - - (iup:menu-item - (conc "Kill " item-test-path) - #:action - (lambda (obj) - ;; (rmt:test-set-state-status-by-id run-id test-id "KILLREQ" #f #f) - (common:run-a-command - (conc "megatest -set-state-status KILLREQ,n/a -target " target - " -runname " runname - " -testpatt " item-test-path - " -state RUNNING,REMOTEHOSTSTART,LAUNCHED")))) - - - (iup:menu-item - "Run" - (iup:menu - (iup:menu-item - (conc "Rerun " testpatt) - #:action - (lambda (obj) - ;; (print " run-id: " run-id " test-id: " test-id " target: " target " runname: " runname " test-name: " test-name " testpatt: " testpatt "item-path : " item-path) - (common:run-a-command - (conc "megatest -run -target " target - " -runname " runname - " -testpatt " testpatt - " -preclean -clean-cache") - ))) - (iup:menu-item - "Rerun Complete Run" - #:action - (lambda (obj) - (common:run-a-command - (conc "megatest -set-state-status NOT_STARTED,n/a -run -target " target - " -runname " runname - " -testpatt % " - " -preclean -clean-cache")))) - (iup:menu-item - "Clean Complete Run" - #:action - (lambda (obj) - (common:run-a-command - (conc "megatest -remove-runs -target " target - " -runname " runname - " -testpatt % ")))) - (iup:menu-item - "Kill Complete Run" - #:action - (lambda (obj) - (common:run-a-command - (conc "megatest -set-state-status KILLREQ,n/a -target " target - " -runname " runname - " -testpatt % " - " -state RUNNING,REMOTEHOSTSTART,LAUNCHED")))))) - (iup:menu-item - "Test" - (iup:menu - (iup:menu-item - (conc "Rerun " item-test-path) - #:action - (lambda (obj) - (common:run-a-command - (conc "megatest -set-state-status NOT_STARTED,n/a -run -target " target - " -runname " runname - " -testpatt " item-test-path - " -preclean -clean-cache")))) - (iup:menu-item - (conc "Kill " item-test-path) - #:action - (lambda (obj) - ;; (rmt:test-set-state-status-by-id run-id test-id "KILLREQ" #f #f) - (common:run-a-command - (conc "megatest -set-state-status KILLREQ,n/a -target " target - " -runname " runname - " -testpatt " item-test-path - " -state RUNNING,REMOTEHOSTSTART,LAUNCHED")))) - (iup:menu-item - (conc "Clean "item-test-path) - #:action - (lambda (obj) - (common:run-a-command - (conc "megatest -remove-runs -target " target - " -runname " runname - " -testpatt " item-test-path)))) - (iup:menu-item - "Start xterm" - #:action - (lambda (obj) - (dcommon:examine-xterm run-id test-id))) - ;;(let* ((cmd (conc (car (argv)) " -xterm " run-id "," test-id "&"))) - ;; (system cmd)))) - (iup:menu-item - "Edit testconfig" - #:action - (lambda (obj) - (let* ((all-tests (tests:get-all)) - (editor-rx (or (configf:lookup *configdat* "setup" "editor-regex") - "\\b(vim?|nano|pico)\\b")) - (editor (or (configf:lookup *configdat* "setup" "editor") - (get-environment-variable "VISUAL") - (get-environment-variable "EDITOR") "vi")) - (tconfig (conc (hash-table-ref all-tests test-name) "/testconfig")) - (cmd (conc (if (string-search editor-rx editor) - (conc "xterm -e " editor) - editor) - " " tconfig " &"))) - (system cmd)))) - )))) + (let* ((status-toggles (map (lambda (status) + (iup:toggle (conc status) + #:fontsize 8 ;; btn-fontsz ;; "10" + ;; #:expand "HORIZONTAL" + #:action (lambda (obj val) + (mark-for-update tabdat) + (if (eq? val 1) + (hash-table-set! (dboard:tabdat-status-ignore-hash tabdat) status #t) + (hash-table-delete! (dboard:tabdat-status-ignore-hash tabdat) status)) + (set-bg-on-filter commondat tabdat)))) + (map cadr *common:std-statuses*))) ;; '("PASS" "FAIL" "WARN" "CHECK" "WAIVED" "STUCK/DEAD" "n/a" "SKIP"))) + (state-toggles (map (lambda (state) + (iup:toggle (conc state) + #:fontsize 8 ;; btn-fontsz + ;; #:expand "HORIZONTAL" + #:action (lambda (obj val) + (mark-for-update tabdat) + (if (eq? val 1) + (hash-table-set! (dboard:tabdat-state-ignore-hash tabdat) state #t) + (hash-table-delete! (dboard:tabdat-state-ignore-hash tabdat) state)) + (set-bg-on-filter commondat tabdat)))) + (map cadr *common:std-states*))) ;; '("RUNNING" "COMPLETED" "INCOMPLETE" "LAUNCHED" "NOT_STARTED" "KILLED" "DELETED"))) + (num-toggle-cols (inexact->exact (round (/ (max (length status-toggles)(length state-toggles)) 3))))) + (iup:vbox + (iup:hbox + (iup:frame + #:title "states" + (apply + iup:hbox + (map (lambda (colgrp) + (apply iup:vbox colgrp)) + (dboard:squarify state-toggles 3)))) + (iup:frame + #:title "statuses" + (apply + iup:hbox + (map (lambda (colgrp) + (apply iup:vbox colgrp)) + (dboard:squarify status-toggles 3))))) + ;; + ;; (iup:frame + ;; #:title "state/status filter" + ;; (iup:vbox + ;; (apply + ;; iup:hbox + ;; (map + ;; (lambda (status-toggle state-toggle) + ;; (iup:vbox + ;; status-toggle + ;; state-toggle)) + ;; status-toggles state-toggles)) + + ;; horizontal slider was here + + ))))) + +(define (dashboard:runs-horizontal-slider tabdat ) + (iup:valuator #:valuechanged_cb (lambda (obj) + (let ((val (inexact->exact (round (/ (string->number (iup:attribute obj "VALUE")) 10)))) + (oldmax (string->number (iup:attribute obj "MAX"))) + (maxruns (dboard:tabdat-tot-runs tabdat))) + (dboard:tabdat-start-run-offset-set! tabdat val) + (mark-for-update tabdat) + (debug:print 6 *default-log-port* "(dboard:tabdat-start-run-offset tabdat) " (dboard:tabdat-start-run-offset tabdat) " maxruns: " maxruns ", val: " val " oldmax: " oldmax) + (iup:attribute-set! obj "MAX" (* maxruns 10)))) + #:expand "HORIZONTAL" + #:max (* 10 (max (hash-table-size (dboard:tabdat-allruns-by-id tabdat)) 10)) + #:min 0 + #:step 0.01)) + (define (make-dashboard-buttons commondat) ;; runs-sum-dat new-view-dat) (let* ((stats-dat (dboard:tabdat-make-data)) (runs-dat (dboard:tabdat-make-data)) (onerun-dat (dboard:tabdat-make-data)) ;; name for run-summary structure @@ -2506,10 +2463,13 @@ (map (lambda (x) (let ((res (iup:hbox #:expand "HORIZONTAL" (iup:label x #:size (conc 40 btn-height) #:fontsize btn-fontsz #:expand "NO") ;; "HORIZONTAL") (iup:textbox #:size (conc 35 btn-height) #:fontsize btn-fontsz #:value "%" #:expand "NO" ;; "HORIZONTAL" #:action (lambda (obj unk val) + ;; each field (field name is "x" var) live updates + ;; the search filter as it is typed + (dboard:tabdat-target-set! runs-dat #f) ;; ensure the fields text boxes are used and not the info from the tree (mark-for-update runs-dat) (update-search commondat runs-dat x val)))))) (set! i (+ i 1)) res)) keynames))))) @@ -2605,24 +2565,22 @@ "%"))) (item-path (db:test-get-item-path (rmt:get-test-info-by-id run-id test-id))) (item-test-path (conc test-name "/" (if (equal? item-path "") "%" item-path)))) - (iup:show (dashboard:popup-menu run-id test-id target runname test-name testpatt item-test-path test-info) ;; popup-menu + (iup:show (dashboard:context-menu run-id test-id target runname test-name testpatt item-test-path test-info) ;; popup-menu #:x 'mouse #:y 'mouse #:modal? "NO") ;; (print "got here") )) (if (eq? pressed 0) (let* ((toolpath (car (argv))) (buttndat (hash-table-ref (dboard:tabdat-buttondat runs-dat) button-key)) (test-id (db:test-get-id (vector-ref buttndat 3))) - (run-id (db:test-get-run_id (vector-ref buttndat 3))) - (cmd (conc toolpath " -test " run-id "," test-id "&"))) - (system cmd))) - ))))) + (run-id (db:test-get-run_id (vector-ref buttndat 3)))) + (dboard:launch-testpanel run-id test-id)))))))) (hash-table-set! (dboard:tabdat-buttondat runs-dat) button-key (vector 0 "100 100 100" button-key #f #f)) (vector-set! testvec testnum butn) (loop runnum (+ testnum 1) testvec (cons butn res)))))) ;; now assemble the hdrlst and bdylst and kick off the dialog (iup:show @@ -2630,20 +2588,23 @@ #:title (conc "Megatest dashboard " (current-user-name) ":" *toppath*) #:menu (dcommon:main-menu) (let* ((runs-view (iup:vbox (iup:split #:orientation "VERTICAL" ;; "HORIZONTAL" - #:value 150 + #:value 100 (dboard:runs-tree-browser commondat runs-dat) (iup:split + #:value 100 ;; left most block, including row names (apply iup:vbox lftlst) ;; right hand block, including cells (iup:vbox + #:expand "YES" ;; the header (apply iup:hbox (reverse hdrlst)) - (apply iup:hbox (reverse bdylst))))) + (apply iup:hbox (reverse bdylst)) + (dashboard:runs-horizontal-slider runs-dat)))) controls )) (views-cfgdat (common:load-views-config)) (additional-tabnames '()) (tab-start-num 5) ;; DON'T FORGET TO UPDATE THIS WHEN CHANGING THE STANDARD TABS BELOW @@ -2688,10 +2649,11 @@ runs-view (dashboard:runs-summary commondat onerun-dat tab-num: 2) ;; (dashboard:new-view db data new-view-dat tab-num: 3) (dashboard:run-controls commondat runcontrols-dat tab-num: 3) (dashboard:run-times commondat runtimes-dat tab-num: 4) + ;; (dashboard:runs-summary commondat onerun-dat tab-num: 4) additional-views))) ;; (set! (iup:callback tabs tabchange-cb:) (lambda (a b c)(print "SWITCHED TO TAB: " a " " b " " c))) (iup:attribute-set! tabs "TABTITLE0" "Summary") (iup:attribute-set! tabs "TABTITLE1" "Runs") (iup:attribute-set! tabs "TABTITLE2" "Run Summary") @@ -2758,11 +2720,11 @@ (glob (conc dbdir "/*.db*")))))) (define (dashboard:monitor-changed? commondat tabdat) (let* ((run-update-time (current-seconds)) (monitor-db-path (dboard:tabdat-monitor-db-path tabdat)) - (monitor-modtime (if (and monitor-db-path (file-exists? monitor-db-path)) + (monitor-modtime (if (and monitor-db-path (common:file-exists? monitor-db-path)) (file-modification-time monitor-db-path) -1))) (if (and (eq? (dboard:commondat-curr-tab-num commondat) 0) (or (> monitor-modtime *last-monitor-update-time*) (> (- run-update-time *last-monitor-update-time*) 5))) ;; update every 1/2 minute just in case @@ -2887,13 +2849,11 @@ ;; run times tab data updater ;; (define (dashboard:run-times-tab-run-data-updater commondat tabdat tab-num) (let* ((access-mode (dboard:tabdat-access-mode tabdat)) (last-runs-update (dboard:tabdat-last-runs-update tabdat)) - (runs-dat (db:dispatch-query access-mode - rmt:get-runs-by-patt db:get-runs-by-patt - (dboard:tabdat-keys tabdat) "%" #f #f #f #f last-runs-update)) + (runs-dat (rmt:get-runs-by-patt (dboard:tabdat-keys tabdat) "%" #f #f #f #f last-runs-update)) (runs-header (vector-ref runs-dat 0)) ;; 0 is header, 1 is list of records (runs-hash (let ((ht (make-hash-table))) (for-each (lambda (run) (hash-table-set! ht (db:get-value-by-header run runs-header "id") run)) (vector-ref runs-dat 1)) @@ -3475,19 +3435,19 @@ ;; The heavy lifting starts here ;;====================================================================== (define (main) (let ((mtdb-path (conc *toppath* "/megatest.db"))) ;; - (if (and (file-exists? mtdb-path) + (if (and (common:file-exists? mtdb-path) (file-write-access? mtdb-path)) (if (not (args:get-arg "-skip-version-check")) (common:exit-on-version-changed))) (let* ((commondat (dboard:commondat-make))) ;; Move this stuff to db.scm? I'm not sure that is the right thing to do... (cond ((args:get-arg "-test") ;; run-id,test-id - (let* ((dat (let ((d (map string->number (string-split (args:get-arg "-test") ",")))) + (let* ((dat (let ((d (map string->number (string-split (args:get-arg "-test") ",")))) (if (> (length d) 1) d (list #f #f)))) (run-id (car dat)) (test-id (cadr dat))) @@ -3510,21 +3470,21 @@ tab-num: 1) (iup:callback-set! *tim* "ACTION_CB" (lambda (time-obj) (let ((update-is-running #f)) - (mutex-lock! (dboard:commondat-update-mutex commondat)) - (set! update-is-running (dboard:commondat-updating commondat)) - (if (not update-is-running) - (dboard:commondat-updating-set! commondat #t)) - (mutex-unlock! (dboard:commondat-update-mutex commondat)) - (if (not update-is-running) ;; we know that the update was not running and we now have a lock on doing an update - (begin - (dboard:common-run-curr-updaters commondat) ;; (dashboard:run-update commondat) - (mutex-lock! (dboard:commondat-update-mutex commondat)) - (dboard:commondat-updating-set! commondat #f) - (mutex-unlock! (dboard:commondat-update-mutex commondat))) + (mutex-lock! (dboard:commondat-update-mutex commondat)) + (set! update-is-running (dboard:commondat-updating commondat)) + (if (not update-is-running) + (dboard:commondat-updating-set! commondat #t)) + (mutex-unlock! (dboard:commondat-update-mutex commondat)) + (if (not update-is-running) ;; we know that the update was not running and we now have a lock on doing an update + (begin + (dboard:common-run-curr-updaters commondat) ;; (dashboard:run-update commondat) + (mutex-lock! (dboard:commondat-update-mutex commondat)) + (dboard:commondat-updating-set! commondat #f) + (mutex-unlock! (dboard:commondat-update-mutex commondat))) )) 1)))) (let ((th1 (make-thread (lambda () (thread-sleep! 1) @@ -3534,12 +3494,12 @@ (thread-start! th2) (thread-join! th2))))) ;; ease debugging by loading ~/.dashboardrc (let ((debugcontrolf (conc (get-environment-variable "HOME") "/.dashboardrc"))) - (if (file-exists? debugcontrolf) + (if (common:file-exists? debugcontrolf) (load debugcontrolf))) (if (args:get-arg "-repl") (repl) (main)) Index: datashare-testing/.sd.config ================================================================== --- datashare-testing/.sd.config +++ datashare-testing/.sd.config @@ -1,5 +1,22 @@ +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . +# # Read in the users vars first (so the offical data cannot be overridden [include ~/.datashare.config] # Read in local overrides [include datashare.config] Index: datashare-testing/.spublish.config ================================================================== --- datashare-testing/.spublish.config +++ datashare-testing/.spublish.config @@ -1,5 +1,22 @@ +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . +# [settings] target-dir #{scheme (create-directory "/tmp/#{getenv USER}/target" #t)} allowed-users matt mrwellan pjhatwal allowed-chars [0-9a-zA-Z\-\.]+ admins matt Index: datashare-testing/.sretrieve.config ================================================================== --- datashare-testing/.sretrieve.config +++ datashare-testing/.sretrieve.config @@ -1,8 +1,25 @@ +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . +# [settings] base-dir /tmp/delme_data -allowed-users matt +allowed-users matt allowed-chars [0-9a-zA-Z\-\.]+ allowed-sub-paths [0-9a-zA-Z\-\.]+ [database] location #{scheme (create-directory "/tmp/#{getenv USER}" #t)} Index: datashare-testing/NOTES ================================================================== --- datashare-testing/NOTES +++ datashare-testing/NOTES @@ -1,3 +1,20 @@ +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . + To test sretrieve first publish megatest as v1.60 at least twice to get iterations 0 and 1 Index: datashare-testing/megatest.config ================================================================== --- datashare-testing/megatest.config +++ datashare-testing/megatest.config @@ -1,4 +1,21 @@ +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . +# [v1.60] status released iteration 1 Index: datashare-testing/packages.config ================================================================== --- datashare-testing/packages.config +++ datashare-testing/packages.config @@ -1,4 +1,21 @@ +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . +# [v1.60] status released iteration 1 Index: datashare.scm ================================================================== --- datashare.scm +++ datashare.scm @@ -1,14 +1,22 @@ ;; Copyright 2006-2013, Matthew Welland. ;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. ;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . (use ssax) (use sxml-serializer) (use sxml-modifications) (use regex) @@ -226,11 +234,11 @@ (if (and path (directory? path) (file-read-access? path)) (let* ((dbpath (conc path "/datashare.db")) (writeable (file-write-access? dbpath)) - (dbexists (file-exists? dbpath)) + (dbexists (common:file-exists? dbpath)) (handler (make-busy-timeout 136000))) (handle-exceptions exn (begin (debug:print 2 *default-log-port* "ERROR: problem accessing db " dbpath @@ -413,11 +421,11 @@ paths)) ;; remove existing link and if possible ... ;; create path to next of tip of target, create link back to source (define (datashare:build-dir-make-link source target) - (if (file-exists? target)(datashare:backup-move target)) + (if (common:file-exists? target)(datashare:backup-move target)) (create-directory (pathname-directory target) #t) (create-symbolic-link source target)) (define (datashare:backup-move path) (let* ((trashdir (conc (pathname-directory path) "/.trash")) @@ -518,11 +526,11 @@ (define (datashare:path->lst path) (string-split path "/")) (define (datashare:pathdat-apply-heuristics configdat path) (cond - ((file-exists? path) "found") + ((common:file-exists? path) "found") (else (conc path " not installed")))) (define (datashare:get-view configdat) (iup:vbox (iup:hbox @@ -692,11 +700,11 @@ (define (datashare:find name paths) (if (null? paths) #f (let loop ((hed (car paths)) (tal (cdr paths))) - (if (file-exists? (conc hed "/" name)) + (if (common:file-exists? (conc hed "/" name)) hed (if (null? tal) #f (loop (car tal)(cdr tal))))))) @@ -706,11 +714,11 @@ (define (datashare:load-config exe-dir exe-name) (let* ((fname (conc exe-dir "/." exe-name ".config"))) (ini:property-separator-patt " * *") (ini:property-separator #\space) - (if (file-exists? fname) + (if (common:file-exists? fname) ;; (ini:read-ini fname) (read-config fname #f #t) (make-hash-table)))) (define (datashare:process-action configdat action . args) @@ -785,11 +793,11 @@ versions) (sqlite3:finalize! db))))) ;; ease debugging by loading ~/.dashboardrc - REMOVE FROM PRODUCTION! (let ((debugcontrolf (conc (get-environment-variable "HOME") "/.datasharerc"))) - (if (file-exists? debugcontrolf) + (if (common:file-exists? debugcontrolf) (load debugcontrolf))) (define (main) (let* ((args (argv)) (prog (car args)) Index: db.scm ================================================================== --- db.scm +++ db.scm @@ -1,14 +1,23 @@ -;;====================================================================== +;====================================================================== ;; Copyright 2006-2016, Matthew Welland. ;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. ;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . +;; ;;====================================================================== ;;====================================================================== ;; Database access ;;====================================================================== @@ -188,55 +197,48 @@ ;; NB// #f => return dbdir only ;; (was planned to be; zeroth db with name=main.db) ;; ;; If run-id is #f return to create and retrieve the path where the db will live. ;; -(define (db:dbfile-path . junk) ;; run-id) - (let* ((dbdir (common:get-db-tmp-area))) - (handle-exceptions - exn - (begin - (debug:print-error 0 *default-log-port* "Couldn't create path to " dbdir) - (exit 1)) - (if (not (directory? dbdir))(create-directory dbdir #t))) - dbdir)) +(define db:dbfile-path common:get-db-tmp-area) (define (db:set-sync db) (let ((syncprag (configf:lookup *configdat* "setup" "sychronous"))) (sqlite3:execute db (conc "PRAGMA synchronous = " (or syncprag 0) ";")))) ;; open an sql database inside a file lock ;; returns: db existed-prior-to-opening ;; RA => Returns a db handler; sets the lock if opened in writable mode ;; -;;(define *db-open-mutex* (make-mutex)) +;; (define *db-open-mutex* (make-mutex)) (define (db:lock-create-open fname initproc) (let* ((parent-dir (or (pathname-directory fname)(current-directory))) ;; no parent? go local (raw-fname (pathname-file fname)) (dir-writable (file-write-access? parent-dir)) - (file-exists (file-exists? fname)) + (file-exists (common:file-exists? fname)) (file-write (if file-exists (file-write-access? fname) dir-writable ))) - ;;(mutex-lock! *db-open-mutex*) ;; tried this mutex, not clear it helped. + ;; (mutex-lock! *db-open-mutex*) ;; tried this mutex, not clear it helped. (if file-write ;; dir-writable (condition-case (let* ((lockfname (conc fname ".lock")) (readyfname (conc parent-dir "/.ready-" raw-fname)) - (readyexists (file-exists? readyfname))) + (readyexists (common:file-exists? readyfname))) (if (not readyexists) (common:simple-file-lock-and-wait lockfname)) (let ((db (sqlite3:open-database fname))) (sqlite3:set-busy-handler! db (make-busy-timeout 136000)) (sqlite3:execute db "PRAGMA synchronous = 0;") (if (not file-exists) (begin + (if (and (configf:lookup *configdat* "setup" "use-wal") (string-match "^/tmp/.*" fname)) ;; this is a file in /tmp (sqlite3:execute db "PRAGMA journal_mode=WAL;") - (print "Creating " fname " in NON-WAL mode.")) + (debug:print 2 *default-log-port* "Creating " fname " in NON-WAL mode.")) (initproc db))) (if (not readyexists) (begin (common:simple-file-release-lock lockfname) (with-output-to-file @@ -254,11 +256,11 @@ (condition-case (begin (debug:print 2 *default-log-port* "WARNING: opening db in non-writable dir " fname) (let ((db (sqlite3:open-database fname))) - ;;(mutex-unlock! *db-open-mutex*) + ;; (mutex-unlock! *db-open-mutex*) db)) (exn (io-error) (debug:print 0 *default-log-port* "ERROR: i/o error with " fname ". Check permissions, disk space etc. and try again.")) (exn (corrupt) (debug:print 0 *default-log-port* "ERROR: database " fname " is corrupt. Repair it to proceed.")) (exn (busy) (debug:print 0 *default-log-port* "ERROR: database " fname " is locked. Try copying to another location, remove original and copy back.")) (exn (permission)(debug:print 0 *default-log-port* "ERROR: database " fname " has some permissions problem.")) @@ -272,11 +274,11 @@ ;; ;; This routine creates the db. It is only called if the db is not already opened ;; ;; ;; (define (db:open-rundb dbstruct run-id #!key (attemptnum 0)(do-not-open #f)) ;; (conc *toppath* "/megatest.db") (car *configinfo*))) ;; (let* ((dbfile (db:dbfile-path run-id)) ;; (conc toppath "/db/" run-id ".db")) -;; (dbexists (file-exists? dbfile)) +;; (dbexists (common:file-exists? dbfile)) ;; (db (db:lock-create-open dbfile (lambda (db) ;; (handle-exceptions ;; exn ;; (begin ;; ;; (release-dot-lock dbpath) @@ -307,30 +309,40 @@ ;; (db:sync-tables db:sync-tests-only *megatest-db* db) ;; db)) ;; This routine creates the db if not already present. It is only called if the db is not already opened ;; -(define (db:open-db dbstruct #!key (areapath #f)) ;; TODO: actually use areapath +(define (db:open-db dbstruct #!key (areapath #f)(do-sync #t)) ;; TODO: actually use areapath (let ((tmpdb-stack (dbr:dbstruct-dbstack dbstruct))) ;; RA => Returns the first reference in dbstruct (if (stack? tmpdb-stack) (db:get-db tmpdb-stack) ;; get previously opened db (will create new db handle if all in the stack are already used (let* ((dbpath (db:dbfile-path )) ;; path to tmp db area - (dbexists (file-exists? dbpath)) + (dbexists (common:file-exists? dbpath)) (tmpdbfname (conc dbpath "/megatest.db")) - (dbfexists (file-exists? tmpdbfname)) ;; (conc dbpath "/megatest.db"))) - (mtdbexists (file-exists? (conc *toppath* "/megatest.db"))) - + (dbfexists (common:file-exists? tmpdbfname)) ;; (conc dbpath "/megatest.db"))) + (mtdbexists (common:file-exists? (conc *toppath* "/megatest.db"))) + + (mtdbmodtime (if mtdbexists (common:lazy-sqlite-db-modification-time (conc *toppath* "/megatest.db")) #f)) + (tmpdbmodtime (if dbfexists (common:lazy-sqlite-db-modification-time tmpdbfname) #f)) (mtdb (db:open-megatest-db)) (mtdbpath (db:dbdat-get-path mtdb)) (tmpdb (db:open-megatest-db path: dbpath)) ;; lock-create-open dbpath db:initialize-main-db)) (refndb (db:open-megatest-db path: dbpath name: "megatest_ref.db")) (write-access (file-write-access? mtdbpath)) - (mtdbmodtime (if mtdbexists (common:lazy-sqlite-db-modification-time mtdbpath) #f)) - (tmpdbmodtime (if dbfexists (common:lazy-sqlite-db-modification-time tmpdbfname) #f)) + ;(mtdbmodtime (if mtdbexists (common:lazy-sqlite-db-modification-time mtdbpath) #f)) ; moving this before db:open-megatest-db is called. if wal mode is on -WAL and -shm file get created with causing the tmpdbmodtime timestamp always greater than mtdbmodtime + ;(tmpdbmodtime (if dbfexists (common:lazy-sqlite-db-modification-time tmpdbfname) #f)) + ;if wal mode is on -WAL and -shm file get created when db:open-megatest-db is called. modtimedelta will always be < 10 so db in tmp not get synced + ;(tmpdbmodtime (if dbfexists (db:get-last-update-time (car tmpdb)) #f)) + ;(fmt (file-modification-time tmpdbfname)) (modtimedelta (and mtdbmodtime tmpdbmodtime (- mtdbmodtime tmpdbmodtime)))) - - ;;(debug:print-info 13 *default-log-port* "db:open-db>> mtdbpath="mtdbpath" mtdbexists="mtdbexists" and write-access="write-access) + + (when write-access + (sqlite3:execute (car mtdb) "drop trigger if exists update_tests_trigger") + (sqlite3:execute (car mtdb) "drop trigger if exists update_runs_trigger")) + + ;(print "mtdbmodtime " mtdbmodtime " tmpdbmodtime " tmpdbmodtime " mtdbpath " mtdbpath " " (conc *toppath* "/megatest.db")) + ;;(debug:print-info 13 *default-log-port* "db:open-db>> mtdbpath="mtdbpath" mtdbexists="mtdbexists" and write-access="write-access) (if (and dbexists (not write-access)) (begin (set! *db-write-access* #f) (dbr:dbstruct-read-only-set! dbstruct #t))) (dbr:dbstruct-mtdb-set! dbstruct mtdb) @@ -337,39 +349,55 @@ (dbr:dbstruct-tmpdb-set! dbstruct tmpdb) (dbr:dbstruct-dbstack-set! dbstruct (make-stack)) ;; BB: why a stack? Why would the number of db's be indeterminate? Is this a legacy of 1.db 2.db .. ? (stack-push! (dbr:dbstruct-dbstack dbstruct) tmpdb) ;; olddb is already a (cons db path) (dbr:dbstruct-refndb-set! dbstruct refndb) ;; (mutex-unlock! *rundb-mutex*) - (if (or (not dbfexists) - (and modtimedelta - (> modtimedelta 10))) ;; if db in tmp is over ten seconds older than the file in MTRA then do a sync back + (if (and (or (not dbfexists) + (and modtimedelta + (> modtimedelta 10))) ;; if db in tmp is over ten seconds older than the file in MTRA then do a sync back + do-sync) (begin - (debug:print 4 *default-log-port* "filling db " (db:dbdat-get-path tmpdb) " with data \n from " (db:dbdat-get-path mtdb) " mod time delta: " modtimedelta) + (debug:print 1 *default-log-port* "filling db " (db:dbdat-get-path tmpdb) " with data \n from " (db:dbdat-get-path mtdb) " mod time delta: " modtimedelta) (db:sync-tables (db:sync-all-tables-list dbstruct) #f mtdb refndb tmpdb) + ;touch tmp db to avoid wal mode wierdness + (set! (file-modification-time tmpdbfname) (current-seconds)) (debug:print-info 13 *default-log-port* "db:sync-all-tables-list done.") ) (debug:print 4 *default-log-port* " db, " (db:dbdat-get-path tmpdb) " already exists or fresh enough, not propogating data from\n " (db:dbdat-get-path mtdb) " mod time delta: " modtimedelta) ) ;; (db:multi-db-sync dbstruct 'old2new)) ;; migrate data from megatest.db automatically tmpdb)))) + +(define (db:get-last-update-time db) +; (db:with-db +; dbstruct #f #f +; (lambda (db) + (let ((last-update-time #f)) + (sqlite3:for-each-row + (lambda (lup) + (set! last-update-time lup)) + db + "select max(lup) from ( select max(last_update) as lup from tests union select max(last_update) as lup from runs);") + last-update-time)) +;)) + ;; Make the dbstruct, setup up auxillary db's and call for main db at least once ;; ;; called in http-transport and replicated in rmt.scm for *local* access. ;; -(define (db:setup #!key (areapath #f)) +(define (db:setup do-sync #!key (areapath #f)) ;; - (cond (*dbstruct-db* *dbstruct-db*);; TODO: when multiple areas are supported, this optimization will be a hazard (else ;;(common:on-homehost?) (debug:print-info 13 *default-log-port* "db:setup entered (first time, not cached.)") (let* ((dbstruct (make-dbr:dbstruct))) (when (not *toppath*) (debug:print-info 13 *default-log-port* "in db:setup, *toppath* not set; calling launch:setup") (launch:setup areapath: areapath)) (debug:print-info 13 *default-log-port* "Begin db:open-db") - (db:open-db dbstruct areapath: areapath) + (db:open-db dbstruct areapath: areapath do-sync: do-sync) (debug:print-info 13 *default-log-port* "Done db:open-db") (set! *dbstruct-db* dbstruct) ;;(debug:print-info 13 *default-log-port* "new dbstruct = "(dbr:dbstruct->alist dbstruct)) dbstruct)))) ;; (else @@ -381,11 +409,11 @@ ;; NOTE: returns a dbdat not a dbstruct! ;; (define (db:open-megatest-db #!key (path #f)(name #f)) (let* ((dbdir (or path *toppath*)) (dbpath (conc dbdir "/" (or name "megatest.db"))) - (dbexists (file-exists? dbpath)) + (dbexists (common:file-exists? dbpath)) (db (db:lock-create-open dbpath (lambda (db) (db:initialize-main-db db) ;;(db:initialize-run-id-db db) ))) @@ -410,10 +438,25 @@ (mutex-lock! *db-multi-sync-mutex*) (set! *db-last-sync* start-t) (set! *db-last-access* start-t) (mutex-unlock! *db-multi-sync-mutex*) (stack-push! (dbr:dbstruct-dbstack dbstruct) tmpdb))) + +(define (db:safely-close-sqlite3-db db #!key (try-num 3)) + (if (<= try-num 0) + #f + (handle-exceptions + exn + (begin + (thread-sleep! 3) + (sqlite3:interrupt! db) + (db:safely-close-sqlite3-db db try-num: (- try-num 1))) + (if (sqlite3:database? db) + (begin + (sqlite3:finalize! db) + #t) + #f)))) ;; close all opened run-id dbs (define (db:close-all dbstruct) (if (dbr:dbstruct? dbstruct) (handle-exceptions @@ -425,15 +468,16 @@ (let ((tdbs (map db:dbdat-get-db (stack->list (dbr:dbstruct-dbstack dbstruct)))) (mdb (db:dbdat-get-db (dbr:dbstruct-mtdb dbstruct))) (rdb (db:dbdat-get-db (dbr:dbstruct-refndb dbstruct)))) (map (lambda (db) - (if (sqlite3:database? db) - (sqlite3:finalize! db))) + (db:safely-close-sqlite3-db db)) +;; (if (sqlite3:database? db) +;; (sqlite3:finalize! db))) tdbs) - (if (sqlite3:database? mdb) (sqlite3:finalize! mdb)) - (if (sqlite3:database? rdb) (sqlite3:finalize! rdb)))))) + (db:safely-close-sqlite3-db mdb) ;; (if (sqlite3:database? mdb) (sqlite3:finalize! mdb)) + (db:safely-close-sqlite3-db rdb))))) ;; (if (sqlite3:database? rdb) (sqlite3:finalize! rdb)))))) ;; (let ((locdbs (dbr:dbstruct-locdbs dbstruct))) ;; (if (hash-table? locdbs) ;; (for-each (lambda (run-id) ;; (db:close-run-db dbstruct run-id)) @@ -471,20 +515,22 @@ '("run_duration" #f) '("comment" #f) '("event_time" #f) '("fail_count" #f) '("pass_count" #f) - '("archived" #f)) + '("archived" #f) + '("last_update" #f)) (list "test_steps" '("id" #f) '("test_id" #f) '("stepname" #f) '("state" #f) '("status" #f) '("event_time" #f) '("comment" #f) - '("logfile" #f)) + '("logfile" #f) + '("last_update" #f)) (list "test_data" '("id" #f) '("test_id" #f) '("category" #f) '("variable" #f) @@ -492,11 +538,12 @@ '("expected" #f) '("tol" #f) '("units" #f) '("comment" #f) '("status" #f) - '("type" #f)))) + '("type" #f) + '("last_update" #f)))) ;; needs db to get keys, this is for syncing all tables ;; (define (db:sync-main-list dbstruct) (let ((keys (db:get-keys dbstruct))) @@ -508,11 +555,11 @@ (list "metadat" '("var" #f) '("val" #f)) (append (list "runs" '("id" #f)) (map (lambda (k)(list k #f)) (append keys - (list "runname" "state" "status" "owner" "event_time" "comment" "fail_count" "pass_count" "contour")))) + (list "runname" "state" "status" "owner" "event_time" "comment" "fail_count" "pass_count" "contour" "last_update")))) (list "test_meta" '("id" #f) '("testname" #f) '("owner" #f) '("description" #f) @@ -537,11 +584,11 @@ (tmpname (conc fname "." (current-process-id))) (tmpjnl (conc fnamejnl "." (current-process-id)))) (debug:print-error 0 *default-log-port* "" fname " appears corrupted. Making backup \"old/" fname "\"") (system (conc "cd " dbdir ";mkdir -p old;cat " fname " > old/" tmpname)) (system (conc "rm -f " dbpath)) - (if (file-exists? fnamejnl) + (if (common:file-exists? fnamejnl) (begin (debug:print-error 0 *default-log-port* "" fnamejnl " found, moving it to old dir as " tmpjnl) (system (conc "cd " dbdir ";mkdir -p old;cat " fnamejnl " > old/" tmpjnl)) (system (conc "rm -f " dbdir "/" fnamejnl)))) ;; attempt to recreate database @@ -613,11 +660,11 @@ exn (begin (debug:print 0 *default-log-port* "EXCEPTION: database probably overloaded or unreadable in db:sync-tables.") (print-call-chain (current-error-port)) (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn)) - (print "exn=" (condition->list exn)) + (debug:print 5 *default-log-port* "exn=" (condition->list exn)) (debug:print 0 *default-log-port* " status: " ((condition-property-accessor 'sqlite3 'status) exn)) (debug:print 0 *default-log-port* " src db: " (db:dbdat-get-path fromdb)) (for-each (lambda (dbdat) (let ((dbpath (db:dbdat-get-path dbdat))) (debug:print 0 *default-log-port* " dbpath: " dbpath) @@ -661,36 +708,55 @@ (numrecs (make-hash-table)) (start-time (current-milliseconds)) (tot-count 0)) (for-each ;; table (lambda (tabledat) - (let* ((tablename (car tabledat)) - (fields (cdr tabledat)) - (use-last-update (if last-update - (if (pair? last-update) - (member (car last-update) ;; last-update field name - (map car fields)) - (begin - (debug:print 0 *default-log-port* "ERROR: parameter last-update for db:sync-tables must be a pair, received: " last-update) ;; found in fields - #f)) - #f)) + (let* ((tablename (car tabledat)) + (fields (cdr tabledat)) + (has-last-update (member "last_update" fields)) + (use-last-update (cond + ((and has-last-update + (member "last_update" fields)) + #t) ;; if given a number, just use it for all fields + ((number? last-update) #f) ;; if not matched first entry then ignore last-update for this table + ((and (pair? last-update) + (member (car last-update) ;; last-update field name + (map car fields))) #t) + (last-update + (debug:print 0 *default-log-port* "ERROR: parameter last-update for db:sync-tables must be a pair or a number, received: " last-update) ;; found in fields + #f) + (else + #f))) + (last-update-value (if use-last-update ;; no need to check for has-last-update - it is already accounted for + (if (number? last-update) + last-update + (cdr last-update)) + #f)) + (last-update-field (if use-last-update + (if (number? last-update) + "last_update" + (car last-update)) + #f)) (num-fields (length fields)) (field->num (make-hash-table)) - (num->field (apply vector (map car fields))) + (num->field (apply vector (map car fields))) ;; BBHERE (full-sel (conc "SELECT " (string-intersperse (map car fields) ",") " FROM " tablename (if use-last-update ;; apply last-update criteria - (conc " " (car last-update) ">=" (cdr last-update)) + (conc " WHERE " last-update-field " >= " last-update-value) "") ";")) (full-ins (conc "INSERT OR REPLACE INTO " tablename " ( " (string-intersperse (map car fields) ",") " ) " " VALUES ( " (string-intersperse (make-list num-fields "?") ",") " );")) (fromdat '()) (fromdats '()) (totrecords 0) (batch-len (string->number (or (configf:lookup *configdat* "sync" "batchsize") "100"))) (todat (make-hash-table)) - (count 0)) + (count 0) + + (delay-handicap (string->number (or (configf:lookup *configdat* "sync" "delay-handicap") "0"))) + ) ;; set up the field->num table (for-each (lambda (field) (hash-table-set! field->num field count) @@ -714,17 +780,23 @@ (set! fromdats (cons fromdat fromdats))) (if (common:low-noise-print 120 "sync-records") (debug:print-info 4 *default-log-port* "found " totrecords " records to sync")) - ;; read the target table + ;; read the target table; BBHERE (sqlite3:for-each-row (lambda (a . b) (hash-table-set! todat a (apply vector a b))) (db:dbdat-get-db todb) full-sel) + (when (and delay-handicap (> delay-handicap 0)) + (debug:print-info 0 *default-log-port* "imposing synthetic sync delay of "delay-handicap" seconds since sync/delay-handicap is configured") + (thread-sleep! delay-handicap) + (debug:print-info 0 *default-log-port* "synthetic sync delay of "delay-handicap" seconds completed") + ) + ;; first pass implementation, just insert all changed rows (for-each (lambda (targdb) (let* ((db (db:dbdat-get-db targdb)) (stmth (sqlite3:prepare db full-ins))) @@ -834,12 +906,50 @@ (sqlite3:execute maindb "CREATE TRIGGER IF NOT EXISTS update_run_stats_trigger AFTER UPDATE ON run_stats FOR EACH ROW BEGIN UPDATE run_stats SET last_update=(strftime('%s','now')) WHERE id=old.id; - END;")) + END;") + (sqlite3:execute maindb "CREATE TABLE IF NOT EXISTS test_rundat ( + id INTEGER PRIMARY KEY, + test_id INTEGER, + update_time TIMESTAMP, + cpuload INTEGER DEFAULT -1, + diskfree INTEGER DEFAULT -1, + diskusage INTGER DEFAULT -1, + run_duration INTEGER DEFAULT 0);")) +(define (db:adj-target db) + (let ((fields (configf:get-section *configdat* "fields")) + (field-num 0)) + ;; because we will be refreshing the keys table it is best to clear it here + (sqlite3:execute db "DELETE FROM keys;") + (for-each + (lambda (field) + (let ((column (car field)) + (spec (cadr field))) + (handle-exceptions + exn + (if (string-match ".*duplicate.*" ((condition-property-accessor 'exn 'message) exn)) + (debug:print 0 *default-log-port* "Target field " column " already exists in the runs table") + (db:general-sqlite-error-dump exn "alter table runs ..." #f "none")) + ;; Add the column if needed + (sqlite3:execute + db + (conc "ALTER TABLE runs ADD COLUMN " column " " spec))) + ;; correct the entry in the keys column + (sqlite3:execute + db + "INSERT INTO keys (id,fieldname,fieldtype) VALUES (?,?,?);" + field-num column spec) + ;; fill in blanks (not allowed as it would be part of the path + (sqlite3:execute + db + (conc "UPDATE runs SET " column "='x' WHERE " column "='';")) + (set! field-num (+ field-num 1)))) + fields))) + (define *global-db-store* (make-hash-table)) (define (db:get-access-mode) (if (args:get-arg "-use-db-cache") 'cached 'rmt)) @@ -857,11 +967,11 @@ (define (db:cache-for-read-only source target #!key (use-last-update #f)) (if (and (hash-table-ref/default *global-db-store* target #f) (>= (file-modification-time target)(file-modification-time source))) (hash-table-ref *global-db-store* target) (let* ((toppath (launch:setup)) - (targ-db-last-mod (if (file-exists? target) + (targ-db-last-mod (if (common:file-exists? target) (file-modification-time target) 0)) (cache-db (or (hash-table-ref/default *global-db-store* target #f) (db:open-megatest-db path: target))) (source-db (db:open-megatest-db path: source)) @@ -871,41 +981,41 @@ (db:sync-tables (db:sync-main-list source-db) last-update source-db cache-db) (db:sync-tables db:sync-tests-only last-update source-db cache-db) (hash-table-set! *global-db-store* target cache-db) cache-db))) -;; call a proc with a cached db -;; -(define (db:call-with-cached-db proc . params) - ;; first cache the db in /tmp - (let* ((cname-part (conc "megatest_cache/" (common:get-testsuite-name))) - (fname (conc (common:get-area-path-signature) ".db")) - (cache-dir (common:get-create-writeable-dir - (list (conc "/tmp/" (current-user-name) "/" cname-part) - (conc "/tmp/" (current-user-name) "-" cname-part) - (conc "/tmp/" (current-user-name) "_" cname-part)))) - (megatest-db (conc *toppath* "/megatest.db"))) - ;; (debug:print-info 0 *default-log-port* "Using cache dir " cache-dir) - (if (not cache-dir) - (begin - (debug:print 0 *default-log-port* "ERROR: Failed to find an area to write the cache db") - (exit 1)) - (let* ((th1 (make-thread - (lambda () - (if (and (file-exists? megatest-db) - (file-write-access? megatest-db)) - (begin - (common:sync-to-megatest.db 'timestamps) ;; internally mutexes on *db-local-sync* - (debug:print-info 2 *default-log-port* "Done syncing to megatest.db")))) - "call-with-cached-db sync-to-megatest.db")) - (cache-db (db:cache-for-read-only - megatest-db - (conc cache-dir "/" fname) - use-last-update: #t))) - (thread-start! th1) - (apply proc cache-db params) - )))) +;; ;; call a proc with a cached db +;; ;; +;; (define (db:call-with-cached-db proc . params) +;; ;; first cache the db in /tmp +;; (let* ((cname-part (conc "megatest_cache/" (common:get-testsuite-name))) +;; (fname (conc (common:get-area-path-signature) ".db")) +;; (cache-dir (common:get-create-writeable-dir +;; (list (conc "/tmp/" (current-user-name) "/" cname-part) +;; (conc "/tmp/" (current-user-name) "-" cname-part) +;; (conc "/tmp/" (current-user-name) "_" cname-part)))) +;; (megatest-db (conc *toppath* "/megatest.db"))) +;; ;; (debug:print-info 0 *default-log-port* "Using cache dir " cache-dir) +;; (if (not cache-dir) +;; (begin +;; (debug:print 0 *default-log-port* "ERROR: Failed to find an area to write the cache db") +;; (exit 1)) +;; (let* ((th1 (make-thread +;; (lambda () +;; (if (and (common:file-exists? megatest-db) +;; (file-write-access? megatest-db)) +;; (begin +;; (db:sync-to-megatest.db dbstruct 'timestamps) ;; internally mutexes on *db-local-sync* +;; (debug:print-info 2 *default-log-port* "Done syncing to megatest.db")))) +;; "call-with-cached-db sync-to-megatest.db")) +;; (cache-db (db:cache-for-read-only +;; megatest-db +;; (conc cache-dir "/" fname) +;; use-last-update: #t))) +;; (thread-start! th1) +;; (apply proc cache-db params) +;; )))) ;; options: ;; ;; 'killservers - kills all servers ;; 'dejunk - removes junk records @@ -915,147 +1025,114 @@ ;; 'closeall - close all opened dbs ;; 'schema - attempt to apply schema changes ;; run-ids: '(1 2 3 ...) or #f (for all) ;; (define (db:multi-db-sync dbstruct . options) - (if (not (launch:setup)) - (debug:print 0 *default-log-port* "ERROR: not able to setup up for megatest.") - (let* ((mtdb (dbr:dbstruct-mtdb dbstruct)) - (tmpdb (db:get-db dbstruct)) - (refndb (dbr:dbstruct-refndb dbstruct)) - (allow-cleanup #t) ;; (if run-ids #f #t)) - (servers (server:get-list *toppath*)) ;; (tasks:get-all-servers (db:delay-if-busy tdbdat))) - (data-synced 0)) ;; count of changed records (I hope) - - ;; kill servers - (if (member 'killservers options) - (for-each - (lambda (server) - (match-let (((mod-time host port start-time pid) server)) - (if (and host pid) - (tasks:kill-server host pid)))) - servers)) - - ;; clear out junk records - ;; - (if (member 'dejunk options) - (begin - (db:delay-if-busy mtdb) ;; ok to delay on mtdb - (db:clean-up mtdb) - (db:clean-up tmpdb) - (db:clean-up refndb))) - - ;; adjust test-ids to fit into proper range - ;; - ;; (if (member 'adj-testids options) - ;; (begin - ;; (db:delay-if-busy mtdb) - ;; (db:prep-megatest.db-for-migration mtdb))) - - ;; sync runs, test_meta etc. - ;; - (if (member 'old2new options) - ;; (begin - (set! data-synced - (+ (db:sync-tables (db:sync-all-tables-list dbstruct) #f mtdb tmpdb refndb) - data-synced))) - ;; (db:sync-main-list mtdb) mtdb (db:get-db dbstruct #f)) -;; (for-each -;; (lambda (run-id) -;; (db:delay-if-busy mtdb) -;; (let ((testrecs (db:get-all-tests-info-by-run-id mtdb run-id))) -;; ;; (dbstruct (if toppath (make-dbr:dbstruct path: toppath local: #t) #f))) -;; (debug:print 0 *default-log-port* "INFO: Propagating " (length testrecs) " records for run-id=" run-id " to run specific db") -;; (db:replace-test-records dbstruct run-id testrecs) -;; (sqlite3:finalize! (db:dbdat-get-db (dbr:dbstruct-rundb dbstruct))))) -;; run-ids))) - - ;; now ensure all newdb data are synced to megatest.db - ;; do not use the run-ids list passed in to the function - ;; - (if (member 'new2old options) - (set! data-synced - (+ (db:sync-tables (db:sync-all-tables-list dbstruct) #f tmpdb refndb mtdb) - data-synced))) - - - - (if (member 'schema options) - (begin - (db:patch-schema-maindb (db:dbdat-get-db mtdb)) - (db:patch-schema-maindb (db:dbdat-get-db tmpdb)) - (db:patch-schema-maindb (db:dbdat-get-db refndb)) - (db:patch-schema-rundb (db:dbdat-get-db mtdb)) - (db:patch-schema-rundb (db:dbdat-get-db tmpdb)) - (db:patch-schema-rundb (db:dbdat-get-db refndb)))) - - ;; (let* ((maindb (make-dbr:dbstruct path: toppath local: #t)) - ;; (src-run-ids (if run-ids run-ids (db:get-all-run-ids (db:dbdat-get-db (db:get-db maindb 0))))) - ;; (all-run-ids (sort (delete-duplicates (cons 0 src-run-ids)) <)) - ;; (count 1) - ;; (total (length all-run-ids)) - ;; (dead-runs '())) - ;; ;; first fix schema if needed - ;; (map - ;; (lambda (th) - ;; (thread-join! th)) - ;; (map - ;; (lambda (run-id) - ;; (thread-start! - ;; (make-thread - ;; (lambda () - ;; (let* ((fromdb (if toppath (make-dbr:dbstruct path: toppath local: #t) #f)) -;; (if (member 'schema options) - ;; (if (eq? run-id 0) - ;; (let ((maindb (db:dbdat-get-db (db:get-db fromdb #f)))) - ;; (db:patch-schema-maindb run-id maindb)) - ;; (db:patch-schema-rundb run-id frundb))) - ;; (set! count (+ count 1)) - ;; (debug:print 0 *default-log-port* "Finished patching schema for " (if (eq? run-id 0) " main.db " (conc run-id ".db")) ", " count " of " total))))) - ;; all-run-ids)) - ;; ;; Then sync and fix db's - ;; (set! count 0) - ;; (process-fork - ;; (lambda () - ;; (map - ;; (lambda (th) - ;; (thread-join! th)) - ;; (map - ;; (lambda (run-id) - ;; (thread-start! - ;; (make-thread - ;; (lambda () - ;; (let* ((fromdb (if toppath (make-dbr:dbstruct path: toppath local: #t) #f)) - ;; (frundb (db:dbdat-get-db (db:get-db fromdb run-id)))) - ;; (if (eq? run-id 0) - ;; (let ((maindb (db:dbdat-get-db (db:get-db fromdb #f)))) -;; (db:sync-tables (db:sync-main-list dbstruct) #f (db:get-db fromdb #f) mtdb) - ;; (set! dead-runs (db:clean-up-maindb (db:get-db fromdb #f)))) - ;; (begin - ;; ;; NB// must sync first to ensure deleted tests get marked as such in megatest.db -;; (db:sync-tables db:sync-tests-only #f (db:get-db fromdb run-id) mtdb) - ;; (db:clean-up-rundb (db:get-db fromdb run-id))))) - ;; (set! count (+ count 1)) - ;; (debug:print 0 *default-log-port* "Finished clean up of " - ;; (if (eq? run-id 0) - ;; " main.db " (conc run-id ".db")) ", " count " of " total))))) - ;; all-run-ids)))) - - ;; removed deleted runs -;; (let ((dbdir (tasks:get-task-db-path))) -;; (for-each (lambda (run-id) -;; (let ((fullname (conc dbdir "/" run-id ".db"))) -;; (if (file-exists? fullname) -;; (begin -;; (debug:print 0 *default-log-port* "Removing database file for deleted run " fullname) -;; (delete-file fullname))))) -;; dead-runs)))) -;; - ;; (db:close-all dbstruct) - ;; (sqlite3:finalize! mdb) - (stack-push! (dbr:dbstruct-dbstack dbstruct) tmpdb) - data-synced))) + ;; (if (not (launch:setup)) + ;; (debug:print 0 *default-log-port* "ERROR: not able to setup up for megatest.") + (let* ((mtdb (dbr:dbstruct-mtdb dbstruct)) + (tmpdb (db:get-db dbstruct)) + (refndb (dbr:dbstruct-refndb dbstruct)) + (allow-cleanup #t) ;; (if run-ids #f #t)) + (servers (server:get-list *toppath*)) ;; (tasks:get-all-servers (db:delay-if-busy tdbdat))) + (data-synced 0)) ;; count of changed records (I hope) + + (for-each + (lambda (option) + + (case option + ;; kill servers + ((killservers) + (for-each + (lambda (server) + (match-let (((mod-time host port start-time pid) server)) + (if (and host pid) + (tasks:kill-server host pid)))) + servers)) + + ;; clear out junk records + ;; + ((dejunk) + (db:delay-if-busy mtdb) ;; ok to delay on mtdb + (db:clean-up mtdb) + (db:clean-up tmpdb) + (db:clean-up refndb)) + + ;; sync runs, test_meta etc. + ;; + ((old2new) + (set! data-synced + (+ (db:sync-tables (db:sync-all-tables-list dbstruct) #f mtdb tmpdb refndb) + data-synced))) + + ;; now ensure all newdb data are synced to megatest.db + ;; do not use the run-ids list passed in to the function + ;; + ((new2old) + (set! data-synced + (+ (db:sync-tables (db:sync-all-tables-list dbstruct) #f tmpdb refndb mtdb) + data-synced))) + + ((adj-target) + (db:adj-target (db:dbdat-get-db mtdb)) + (db:adj-target (db:dbdat-get-db tmpdb)) + (db:adj-target (db:dbdat-get-db refndb))) + + ((schema) + (db:patch-schema-maindb (db:dbdat-get-db mtdb)) + (db:patch-schema-maindb (db:dbdat-get-db tmpdb)) + (db:patch-schema-maindb (db:dbdat-get-db refndb)) + (db:patch-schema-rundb (db:dbdat-get-db mtdb)) + (db:patch-schema-rundb (db:dbdat-get-db tmpdb)) + (db:patch-schema-rundb (db:dbdat-get-db refndb)))) + + (stack-push! (dbr:dbstruct-dbstack dbstruct) tmpdb)) + options) + data-synced)) + +(define (db:tmp->megatest.db-sync dbstruct last-update) + (let* ((mtdb (dbr:dbstruct-mtdb dbstruct)) + (tmpdb (db:get-db dbstruct)) + (refndb (dbr:dbstruct-refndb dbstruct)) + (res (db:sync-tables (db:sync-all-tables-list dbstruct) last-update tmpdb refndb mtdb))) + (stack-push! (dbr:dbstruct-dbstack dbstruct) tmpdb) + res)) + +;;;; run-ids +;; if #f use *db-local-sync* : or 'local-sync-flags +;; if #t use timestamps : or 'timestamps +;; +;; NB// no-sync-db is the db handle, not a flag! +;; +(define (db:sync-to-megatest.db dbstruct #!key (no-sync-db #f)) + (let* ((start-time (current-seconds)) + (last-full-update (if no-sync-db + (db:no-sync-get/default no-sync-db "LAST_FULL_UPDATE" 0) + 0)) + (full-sync-needed (> (- start-time last-full-update) 3600)) ;; every hour do a full sync + (last-update (if full-sync-needed + 0 + (if no-sync-db + (db:no-sync-get/default no-sync-db "LAST_UPDATE" 0) + 0))) ;; (or (db:get-var dbstruct "LAST_UPDATE") 0)) + (sync-needed (> (- start-time last-update) 6)) + (res (if (or sync-needed ;; don't sync if a sync already occurred in the past 6 seconds + full-sync-needed) + (begin + (if no-sync-db + (begin + (if full-sync-needed (db:no-sync-set no-sync-db "LAST_FULL_UPDATE" start-time)) + (db:no-sync-set no-sync-db "LAST_UPDATE" start-time))) + (db:tmp->megatest.db-sync dbstruct last-update)) + 0)) + (sync-time (- (current-seconds) start-time))) + (debug:print-info 3 *default-log-port* "Sync of newdb to olddb completed in " sync-time " seconds pid="(current-process-id)) + (if (common:low-noise-print 30 "sync new to old") + (if sync-needed + (debug:print-info 0 *default-log-port* "Sync of " res " records from newdb to olddb completed in " sync-time " seconds pid="(current-process-id)) + (debug:print-info 0 *default-log-port* "No sync needed, last updated " (- start-time last-update) " seconds ago"))) + res)) ;; keeping it around for debugging purposes only (define (open-run-close-no-exception-handling proc idb . params) (debug:print-info 11 *default-log-port* "open-run-close-no-exception-handling START given a db=" (if idb "yes " "no ") ", params=" params) (print "I don't work anymore. open-run-close-no-exception-handling needs fixing or removing...") @@ -1084,11 +1161,11 @@ ((busy) (thread-sleep! sleep-time)) (else (debug:print 0 *default-log-port* "EXCEPTION: database probably overloaded or unreadable.") (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn)) - (print "exn=" (condition->list exn)) + (debug:print 5 *default-log-port* "exn=" (condition->list exn)) (debug:print 0 *default-log-port* " status: " ((condition-property-accessor 'sqlite3 'status) exn)) (print-call-chain (current-error-port)) (thread-sleep! sleep-time) (debug:print-info 0 *default-log-port* "trying db call one more time....this may never recover, if necessary kill process " (current-process-id) " on host " (get-host-name) " to clean up"))) (apply open-run-close-exception-handling proc idb params)) @@ -1105,31 +1182,36 @@ (launch:setup)) ;; added because Elena was getting stack dump because *configinfo* below was #f. (let* ((configdat (car *configinfo*)) ;; tut tut, global warning... (keys (keys:config-get-fields configdat)) (havekeys (> (length keys) 0)) (keystr (keys->keystr keys)) - (fieldstr (keys->key/field keys)) + (fieldstr (keys:make-key/field-string configdat)) (db (db:dbdat-get-db dbdat))) (for-each (lambda (key) (let ((keyn key)) (if (member (string-downcase keyn) (list "runname" "state" "status" "owner" "event_time" "comment" "fail_count" - "pass_count")) + "pass_count" "contour")) (begin (print "ERROR: your key cannot be named " keyn " as this conflicts with the same named field in the runs table, you must remove your megatest.db and /.db before trying again.") (exit 1))))) keys) (sqlite3:with-transaction db (lambda () - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS keys (id INTEGER PRIMARY KEY, fieldname TEXT, fieldtype TEXT, CONSTRAINT keyconstraint UNIQUE (fieldname));") - (for-each (lambda (key) - (sqlite3:execute db "INSERT OR REPLACE INTO keys (fieldname,fieldtype) VALUES (?,?);" key "TEXT")) - keys) - (sqlite3:execute db (conc - "CREATE TABLE IF NOT EXISTS runs (id INTEGER PRIMARY KEY, \n " - fieldstr (if havekeys "," "") " + ;; handle-exceptions + ;; exn + ;; (begin + ;; (debug:print 0 "ERROR: Failed to create tables. Look at your [fields] section, should be: fieldname TEXT DEFAULT 'yourdefault'") + ;; (exit)) + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS keys (id INTEGER PRIMARY KEY, fieldname TEXT, fieldtype TEXT, CONSTRAINT keyconstraint UNIQUE (fieldname));") + (for-each (lambda (key) + (sqlite3:execute db "INSERT OR REPLACE INTO keys (fieldname,fieldtype) VALUES (?,?);" key "TEXT")) + keys) + (sqlite3:execute db (conc + "CREATE TABLE IF NOT EXISTS runs (id INTEGER PRIMARY KEY, \n " + fieldstr (if havekeys "," "") " runname TEXT DEFAULT 'norun', contour TEXT DEFAULT '', state TEXT DEFAULT '', status TEXT DEFAULT '', owner TEXT DEFAULT '', @@ -1137,30 +1219,30 @@ comment TEXT DEFAULT '', fail_count INTEGER DEFAULT 0, pass_count INTEGER DEFAULT 0, last_update INTEGER DEFAULT (strftime('%s','now')), CONSTRAINT runsconstraint UNIQUE (runname" (if havekeys "," "") keystr "));")) - (sqlite3:execute db "CREATE TRIGGER IF NOT EXISTS update_runs_trigger AFTER UPDATE ON runs + (sqlite3:execute db "CREATE TRIGGER IF NOT EXISTS update_runs_trigger AFTER UPDATE ON runs FOR EACH ROW BEGIN UPDATE runs SET last_update=(strftime('%s','now')) WHERE id=old.id; END;") - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS run_stats ( + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS run_stats ( id INTEGER PRIMARY KEY, run_id INTEGER, state TEXT, status TEXT, count INTEGER, last_update INTEGER DEFAULT (strftime('%s','now')))") - (sqlite3:execute db "CREATE TRIGGER IF NOT EXISTS update_run_stats_trigger AFTER UPDATE ON run_stats + (sqlite3:execute db "CREATE TRIGGER IF NOT EXISTS update_run_stats_trigger AFTER UPDATE ON run_stats FOR EACH ROW BEGIN UPDATE run_stats SET last_update=(strftime('%s','now')) WHERE id=old.id; END;") - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS test_meta ( + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS test_meta ( id INTEGER PRIMARY KEY, testname TEXT DEFAULT '', author TEXT DEFAULT '', owner TEXT DEFAULT '', description TEXT DEFAULT '', @@ -1169,11 +1251,11 @@ avg_runtime REAL, avg_disk REAL, tags TEXT DEFAULT '', jobgroup TEXT DEFAULT 'default', CONSTRAINT test_meta_constraint UNIQUE (testname));") - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS tasks_queue (id INTEGER PRIMARY KEY, + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS tasks_queue (id INTEGER PRIMARY KEY, action TEXT DEFAULT '', owner TEXT, state TEXT DEFAULT 'new', target TEXT DEFAULT '', name TEXT DEFAULT '', @@ -1180,57 +1262,57 @@ testpatt TEXT DEFAULT '', keylock TEXT, params TEXT, creation_time TIMESTAMP DEFAULT (strftime('%s','now')), execution_time TIMESTAMP);") - ;; archive disk areas, cached info from [archive-disks] - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS archive_disks ( + ;; archive disk areas, cached info from [archive-disks] + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS archive_disks ( id INTEGER PRIMARY KEY, archive_area_name TEXT, disk_path TEXT, last_df INTEGER DEFAULT -1, last_df_time TIMESTAMP DEFAULT (strftime('%s','now')), creation_time TIMESTAMP DEFAULT (strftime('%','now')));") - ;; individual bup (or tar) data chunks - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS archive_blocks ( + ;; individual bup (or tar) data chunks + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS archive_blocks ( id INTEGER PRIMARY KEY, archive_disk_id INTEGER, disk_path TEXT, last_du INTEGER DEFAULT -1, last_du_time TIMESTAMP DEFAULT (strftime('%s','now')), creation_time TIMESTAMP DEFAULT (strftime('%','now')));") - ;; tests allocated to what chunks. reusing a chunk for a test/item_path is very efficient - ;; NB// the per run/test recording of where the archive is stored is done in the test - ;; record. - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS archive_allocations ( + ;; tests allocated to what chunks. reusing a chunk for a test/item_path is very efficient + ;; NB// the per run/test recording of where the archive is stored is done in the test + ;; record. + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS archive_allocations ( id INTEGER PRIMARY KEY, archive_block_id INTEGER, testname TEXT, item_path TEXT, creation_time TIMESTAMP DEFAULT (strftime('%','now')));") - ;; move this clean up call somewhere else - (sqlite3:execute db "DELETE FROM tasks_queue WHERE state='done' AND creation_time < ?;" (- (current-seconds)(* 24 60 60))) ;; remove older than 24 hrs - (sqlite3:execute db (conc "CREATE INDEX IF NOT EXISTS runs_index ON runs (runname" (if havekeys "," "") keystr ");")) - ;; (sqlite3:execute db "CREATE VIEW runs_tests AS SELECT * FROM runs INNER JOIN tests ON runs.id=tests.run_id;") - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS extradat (id INTEGER PRIMARY KEY, run_id INTEGER, key TEXT, val TEXT);") - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS metadat (id INTEGER PRIMARY KEY, var TEXT, val TEXT, + ;; move this clean up call somewhere else + (sqlite3:execute db "DELETE FROM tasks_queue WHERE state='done' AND creation_time < ?;" (- (current-seconds)(* 24 60 60))) ;; remove older than 24 hrs + (sqlite3:execute db (conc "CREATE INDEX IF NOT EXISTS runs_index ON runs (runname" (if havekeys "," "") keystr ");")) + ;; (sqlite3:execute db "CREATE VIEW runs_tests AS SELECT * FROM runs INNER JOIN tests ON runs.id=tests.run_id;") + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS extradat (id INTEGER PRIMARY KEY, run_id INTEGER, key TEXT, val TEXT);") + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS metadat (id INTEGER PRIMARY KEY, var TEXT, val TEXT, CONSTRAINT metadat_constraint UNIQUE (var));") - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS access_log (id INTEGER PRIMARY KEY, user TEXT, accessed TIMESTAMP, args TEXT);") - ;; Must do this *after* running patch db !! No more. - ;; cannot use db:set-var since it will deadlock, hardwire the code here - (sqlite3:execute db "INSERT OR REPLACE INTO metadat (var,val) VALUES (?,?);" "MEGATEST_VERSION" (common:version-signature)) - (debug:print-info 11 *default-log-port* "db:initialize END") ;; )))) - - ;;====================================================================== - ;; R U N S P E C I F I C D B - ;;====================================================================== - - ;; (define (db:initialize-run-id-db db) - ;; (sqlite3:with-transaction - ;; db - ;; (lambda () - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS tests + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS access_log (id INTEGER PRIMARY KEY, user TEXT, accessed TIMESTAMP, args TEXT);") + ;; Must do this *after* running patch db !! No more. + ;; cannot use db:set-var since it will deadlock, hardwire the code here + (sqlite3:execute db "INSERT OR REPLACE INTO metadat (var,val) VALUES (?,?);" "MEGATEST_VERSION" (common:version-signature)) + (debug:print-info 11 *default-log-port* "db:initialize END") ;; )))) + + ;;====================================================================== + ;; R U N S P E C I F I C D B + ;;====================================================================== + + ;; (define (db:initialize-run-id-db db) + ;; (sqlite3:with-transaction + ;; db + ;; (lambda () + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS tests (id INTEGER PRIMARY KEY, run_id INTEGER DEFAULT -1, testname TEXT DEFAULT 'noname', host TEXT DEFAULT 'n/a', cpuload REAL DEFAULT -1, @@ -1250,18 +1332,23 @@ fail_count INTEGER DEFAULT 0, pass_count INTEGER DEFAULT 0, archived INTEGER DEFAULT 0, -- 0=no, > 1=archive block id where test data can be found last_update INTEGER DEFAULT (strftime('%s','now')), CONSTRAINT testsconstraint UNIQUE (run_id, testname, item_path));") - (sqlite3:execute db "CREATE INDEX IF NOT EXISTS tests_index ON tests (run_id, testname, item_path, uname);") - (sqlite3:execute db "CREATE TRIGGER IF NOT EXISTS update_tests_trigger AFTER UPDATE ON tests + ;; deprecated -- (sqlite3:execute db "CREATE INDEX IF NOT EXISTS tests_index ON tests (run_id, testname, item_path, uname);") + + (sqlite3:execute db "CREATE INDEX IF NOT EXISTS tests_run_id_index ON tests (run_id);") ;; new + (sqlite3:execute db "CREATE INDEX IF NOT EXISTS tests_testname_index ON tests (testname,item_path);") ;; new + (sqlite3:execute db "CREATE INDEX IF NOT EXISTS tests_state_status_index ON tests (state, status); ") ;; new + + (sqlite3:execute db "CREATE TRIGGER IF NOT EXISTS update_tests_trigger AFTER UPDATE ON tests FOR EACH ROW BEGIN UPDATE tests SET last_update=(strftime('%s','now')) WHERE id=old.id; END;") - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS test_steps + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS test_steps (id INTEGER PRIMARY KEY, test_id INTEGER, stepname TEXT, state TEXT DEFAULT 'NOT_STARTED', status TEXT DEFAULT 'n/a', @@ -1268,18 +1355,18 @@ event_time TIMESTAMP, comment TEXT DEFAULT '', logfile TEXT DEFAULT '', last_update INTEGER DEFAULT (strftime('%s','now')), CONSTRAINT test_steps_constraint UNIQUE (test_id,stepname,state));") - (sqlite3:execute db "CREATE INDEX IF NOT EXISTS teststeps_index ON tests (run_id, testname, item_path);") - (sqlite3:execute db "CREATE TRIGGER IF NOT EXISTS update_teststeps_trigger AFTER UPDATE ON test_steps + (sqlite3:execute db "CREATE INDEX IF NOT EXISTS teststeps_index ON tests (run_id, testname, item_path);") + (sqlite3:execute db "CREATE TRIGGER IF NOT EXISTS update_teststeps_trigger AFTER UPDATE ON test_steps FOR EACH ROW BEGIN UPDATE test_steps SET last_update=(strftime('%s','now')) WHERE id=old.id; END;") - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS test_data (id INTEGER PRIMARY KEY, + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS test_data (id INTEGER PRIMARY KEY, test_id INTEGER, category TEXT DEFAULT '', variable TEXT, value REAL, expected REAL, @@ -1288,34 +1375,34 @@ comment TEXT DEFAULT '', status TEXT DEFAULT 'n/a', type TEXT DEFAULT '', last_update INTEGER DEFAULT (strftime('%s','now')), CONSTRAINT test_data_constraint UNIQUE (test_id,category,variable));") - (sqlite3:execute db "CREATE INDEX IF NOT EXISTS test_data_index ON test_data (test_id);") - (sqlite3:execute db "CREATE TRIGGER IF NOT EXISTS update_test_data_trigger AFTER UPDATE ON test_data + (sqlite3:execute db "CREATE INDEX IF NOT EXISTS test_data_index ON test_data (test_id);") + (sqlite3:execute db "CREATE TRIGGER IF NOT EXISTS update_test_data_trigger AFTER UPDATE ON test_data FOR EACH ROW BEGIN UPDATE test_data SET last_update=(strftime('%s','now')) WHERE id=old.id; END;") - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS test_rundat ( + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS test_rundat ( id INTEGER PRIMARY KEY, test_id INTEGER, update_time TIMESTAMP, cpuload INTEGER DEFAULT -1, diskfree INTEGER DEFAULT -1, diskusage INTGER DEFAULT -1, run_duration INTEGER DEFAULT 0);") - (sqlite3:execute db "CREATE TABLE IF NOT EXISTS archives ( + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS archives ( id INTEGER PRIMARY KEY, test_id INTEGER, state TEXT DEFAULT 'new', status TEXT DEFAULT 'n/a', archive_type TEXT DEFAULT 'bup', du INTEGER, archive_path TEXT);"))) - db)) + db)) ;; ) ;;====================================================================== ;; A R C H I V E S ;;====================================================================== @@ -1347,10 +1434,11 @@ "SELECT d.id,d.archive_area_name,disk_path,last_df,last_df_time FROM archive_disks AS d INNER JOIN archive_blocks AS b ON d.id=b.archive_disk_id WHERE b.id IN (" (string-intersperse (map conc res) ",") ") AND last_df > ?;") dneeded)) + (stack-push! (dbr:dbstruct-dbstack dbstruct) dbdat) blocks)) ;; returns id of the record, register a disk allocated to archiving and record it's last known ;; available space ;; @@ -1403,11 +1491,13 @@ res) (begin (sqlite3:execute db "INSERT OR REPLACE INTO archive_blocks (archive_disk_id,disk_path,last_du) VALUES (?,?,?);" bdisk-id archive-path (or du 0)) - (db:archive-register-block-name dbstruct bdisk-id archive-path du: du))))) + (db:archive-register-block-name dbstruct bdisk-id archive-path du: du))) + (stack-push! (dbr:dbstruct-dbstack dbstruct) dbdat) + res)) ;; The "archived" field in tests is overloaded; 0 = not archived, > 0 archived in block with given id ;; (define (db:test-set-archive-block-id dbstruct run-id test-id archive-block-id) @@ -1448,11 +1538,11 @@ ;; L O G G I N G D B ;;====================================================================== (define (open-logging-db) (let* ((dbpath (conc (if *toppath* (conc *toppath* "/") "") "logging.db")) ;; fname) - (dbexists (file-exists? dbpath)) + (dbexists (common:file-exists? dbpath)) (db (sqlite3:open-database dbpath)) (handler (make-busy-timeout (if (args:get-arg "-override-timeout") (string->number (args:get-arg "-override-timeout")) 136000)))) ;; 136000))) (sqlite3:set-busy-handler! db handler) @@ -1491,11 +1581,11 @@ (toplevels '()) (deadtime-str (configf:lookup *configdat* "setup" "deadtime")) (deadtime (if (and deadtime-str (string->number deadtime-str)) (string->number deadtime-str) - 7200))) ;; two hours + 72000))) ;; twenty hours (db:with-db dbstruct #f #f (lambda (db) (if (number? ovr-deadtime)(set! deadtime ovr-deadtime)) @@ -1546,17 +1636,17 @@ ;; select end_time-now from ;; (select testname,item_path,event_time+run_duration as ;; end_time,strftime('%s','now') as now from tests where state in -;; ('RUNNING','REMOTEHOSTSTART','LAUNCED')); +;; ('RUNNING','REMOTEHOSTSTART','LAUNCHED')); (define (db:find-and-mark-incomplete dbstruct run-id ovr-deadtime) (let* ((incompleted '()) (oldlaunched '()) (toplevels '()) - (deadtime-str (configf:lookup *configdat* "setup" "deadtime")) + (deadtime-str (configf:lookup *configdat* "setup" "deadtime")) ;; FIXME suspect test run time & deadtime are not well matched; resulting in COMPLETED/DEAD status of an a-ok running test (deadtime (if (and deadtime-str (string->number deadtime-str)) (string->number deadtime-str) 7200))) ;; two hours (db:with-db @@ -1604,11 +1694,11 @@ ;; ;; (db:delay-if-busy dbdat) (let* (;; (min-incompleted (filter (lambda (x) ;; (let* ((testpath (cadr x)) ;; (tdatpath (conc testpath "/testdat.db")) - ;; (dbexists (file-exists? tdatpath))) + ;; (dbexists (common:file-exists? tdatpath))) ;; (or (not dbexists) ;; if no file then something wrong - mark as incomplete ;; (> (- (current-seconds)(file-modification-time tdatpath)) 600)))) ;; no change in 10 minutes to testdat.db - she's dead Jim ;; incompleted)) (min-incompleted-ids (map car incompleted)) ;; do 'em all (all-ids (append min-incompleted-ids (map car oldlaunched)))) @@ -1615,11 +1705,12 @@ (if (> (length all-ids) 0) (begin (debug:print 0 *default-log-port* "WARNING: Marking test(s); " (string-intersperse (map conc all-ids) ", ") " as INCOMPLETE") (for-each (lambda (test-id) - (db:test-set-state-status dbstruct run-id test-id "COMPLETED" "DEAD" "Test failed to complete")) ;; fix for one aspect of Randy's ticket 1405717332 + (db:test-set-state-status dbstruct run-id test-id "COMPLETED" "DEAD" "Test failed to complete")) ;; fix for one aspect of Randy's ticket 1405717332 ;; TODO - fix problem where test goes to COMPLETED/DEAD while in progress, only later to go to COMPLETED/PASS. ref ticket 220546828 + all-ids)))))))) ;; ALL REPLACED BY THE BLOCK ABOVE ;; ;; (sqlite3:execute @@ -1655,28 +1746,37 @@ ;; a. If have tests that are not deleted, set state='unknown' ;; b. .... ;; (define (db:clean-up dbdat) ;; (debug:print 0 *default-log-port* "WARNING: db clean up not fully ported to v1.60, cleanup action will be on megatest.db") - (let* ((db (db:dbdat-get-db dbdat)) + (let* ((keep-record-age ( - (current-seconds) (common:hms-string->seconds (or (configf:lookup *configdat* "setup" "delete-record-age") "30d")))) + (db (db:dbdat-get-db dbdat)) (count-stmt (sqlite3:prepare db "SELECT (SELECT count(id) FROM tests)+(SELECT count(id) FROM runs);")) (statements (map (lambda (stmt) (sqlite3:prepare db stmt)) (list ;; delete all tests that belong to runs that are 'deleted' - "DELETE FROM tests WHERE run_id in (SELECT id FROM runs WHERE state='deleted');" + (conc "DELETE FROM tests WHERE run_id in (SELECT id FROM runs WHERE state='deleted') and last_update < " keep-record-age ";") ;; delete all tests that are 'DELETED' - "DELETE FROM tests WHERE state='DELETED';" + (conc "DELETE FROM tests WHERE state='DELETED' and last_update < " keep-record-age " ;") ;; delete all tests that have no run - "DELETE FROM tests WHERE run_id NOT IN (SELECT DISTINCT id FROM runs);" + (conc "DELETE FROM tests WHERE run_id NOT IN (SELECT DISTINCT id FROM runs) and last_update < " keep-record-age "; ") ;; delete all runs that are state='deleted' - "DELETE FROM runs WHERE state='deleted';" + (conc "DELETE FROM runs WHERE state='deleted' and last_update < " keep-record-age ";") ;; delete empty runs - "DELETE FROM runs WHERE id NOT IN (SELECT DISTINCT r.id FROM runs AS r INNER JOIN tests AS t ON t.run_id=r.id);" + (conc "DELETE FROM runs WHERE id NOT IN (SELECT DISTINCT r.id FROM runs AS r INNER JOIN tests AS t ON t.run_id=r.id) and last_update < " keep-record-age ";") + ;; remove orphaned test_rundat entries + (conc "DELETE FROM test_rundat where test_id NOT IN (SELECT id FROM tests);") + ;; remove orphaned test_steps entries + (conc "DELETE FROM test_steps WHERE test_id NOT IN (SELECT id FROM tests);") + ;; remove orphaned test_dat entries + (conc "DELETE FROM test_data WHERE test_id NOT IN (SELECT id FROM tests);") + )))) ;; (db:delay-if-busy dbdat) + ;(debug:print-info 0 *default-log-port* statements) (sqlite3:with-transaction db (lambda () (sqlite3:for-each-row (lambda (tot) (debug:print-info 0 *default-log-port* "Records count before clean: " tot)) @@ -1822,10 +1922,87 @@ (define (db:del-var dbstruct var) (db:with-db dbstruct #f #t (lambda (db) (sqlite3:execute db "DELETE FROM metadat WHERE var=?;" var)))) + +;;====================================================================== +;; no-sync.db - small bits of data to be shared between servers +;;====================================================================== + +(define (db:open-no-sync-db) + (let* ((dbpath (db:dbfile-path)) + (dbname (conc dbpath "/no-sync.db")) + (db-exists (common:file-exists? dbname)) + (db (sqlite3:open-database dbname))) + (sqlite3:set-busy-handler! db (make-busy-timeout 136000)) + (if (not db-exists) + (begin + (sqlite3:execute db "PRAGMA synchronous = 0;") + (sqlite3:execute db "CREATE TABLE IF NOT EXISTS no_sync_metadat (var TEXT,val TEXT, CONSTRAINT no_sync_metadat_constraint UNIQUE (var));") + (sqlite3:execute db "PRAGMA journal_mode=WAL;"))) + db)) + +;; if we are not a server create a db handle. this is not finalized +;; so watch for problems. I'm still not clear if it is needed to manually +;; finalize sqlite3 dbs with the sqlite3 egg. +;; +(define (db:no-sync-db db-in) + (mutex-lock! *db-access-mutex*) + (let ((res (if db-in + db-in + (let ((db (db:open-no-sync-db))) + (set! *no-sync-db* db) + db)))) + (mutex-unlock! *db-access-mutex*) + res)) + +(define (db:no-sync-set db var val) + (sqlite3:execute (db:no-sync-db db) "INSERT OR REPLACE INTO no_sync_metadat (var,val) VALUES (?,?);" var val)) + +(define (db:no-sync-del! db var) + (sqlite3:execute (db:no-sync-db db) "DELETE FROM no_sync_metadat WHERE var=?;" var)) + +(define (db:no-sync-get/default db var default) + (let ((res default)) + (sqlite3:for-each-row + (lambda (val) + (set! res val)) + (db:no-sync-db db) + "SELECT val FROM no_sync_metadat WHERE var=?;" + var) + (if res + (let ((newres (if (string? res) + (string->number res) + #f))) + (if newres + newres + res)) + res))) + +(define (db:no-sync-close-db db) + (db:safely-close-sqlite3-db db)) + +;; transaction protected lock aquisition +;; either: +;; fails returns (#f . lock-creation-time) +;; succeeds (returns (#t . lock-creation-time) +;; use (db:no-sync-del! db keyname) to release the lock +;; +(define (db:no-sync-get-lock db-in keyname) + (let ((db (db:no-sync-db db-in))) + (sqlite3:with-transaction + db + (lambda () + (handle-exceptions + exn + (let ((lock-time (current-seconds))) + (sqlite3:execute db "INSERT INTO no_sync_metadat (var,val) VALUES(?,?);" keyname lock-time) + `(#t . ,lock-time)) + `(#f . ,(sqlite3:first-result db "SELECT val FROM no_sync_metadat WHERE var=?;" keyname))))))) + + ;; use a global for some primitive caching, it is just silly to ;; re-read the db over and over again for the keys since they never ;; change @@ -1848,14 +2025,19 @@ ;; look up values in a header/data structure (define (db:get-value-by-header row header field) (if (or (null? header) (not row)) #f (let loop ((hed (car header)) - (tal (cdr header)) - (n 0)) - (if (equal? hed field) - (vector-ref row n) + (tal (cdr header)) + (n 0)) + (if (equal? hed field) + (handle-exceptions + exn + (begin + (debug:print 0 *default-log-port* "WARNING: attempt to read non-existant field, row=" row " header=" header " field=" field) + #f) + (vector-ref row n)) (if (null? tal) #f (loop (car tal)(cdr tal)(+ n 1))))))) ;; Accessors for the header/data structure ;; get rows and header from (define (db:get-header vec)(vector-ref vec 0)) @@ -1862,10 +2044,34 @@ (define (db:get-rows vec)(vector-ref vec 1)) ;;====================================================================== ;; R U N S ;;====================================================================== + + + + + +(define (db:get-run-times dbstruct run-patt target-patt) +(let ((res `()) + (qry (conc "select runname, (max(end_time)-min(event_time))/60 as runtime, target from (select runname, run_id,tests.event_time,tests.event_time+run_duration AS end_time, " (string-join (db:get-keys dbstruct) " || '/' || ") " as target from tests inner join runs on tests.run_id = runs.id where runs.runname like ? and target like ?) group by run_id ;"))) +;(print qry) +(db:with-db + dbstruct + #f ;; this is for the main runs db + #f ;; does not modify db + (lambda (db) + (sqlite3:for-each-row + (lambda (runname runtime target ) + (set! res (cons (vector runname runtime target) res))) + db + qry + run-patt target-patt) + + res)))) + + (define (db:get-run-name-from-id dbstruct run-id) (db:with-db dbstruct #f ;; this is for the main runs db @@ -1992,10 +2198,48 @@ qrystr ))) (debug:print-info 11 *default-log-port* "db:get-runs END qrystr: " qrystr " keypatts: " keypatts " offset: " offset " limit: " count) (vector header res))) + +(define-record simple-run target id runname state status owner event_time) +(define-record-printer (simple-run x out) + (fprintf out "#,(simple-run ~S ~S ~S ~S)" + (simple-run-target x) (simple-run-id x) (simple-run-runname x) (time->string (seconds->local-time (simple-run-event_time x) )))) + +;; simple get-runs +;; +(define (db:simple-get-runs dbstruct runpatt count offset target) + (let* ((res '()) + (keys (db:get-keys dbstruct)) + (runpattstr (db:patt->like "runname" runpatt)) + (remfields (list "id" "runname" "state" "status" "owner" "event_time")) + (targstr (string-intersperse keys "||'/'||")) + (keystr (conc targstr " AS target," + (string-intersperse remfields ","))) + (qrystr (conc "SELECT " keystr " FROM runs WHERE (" runpattstr ") " ;; runname LIKE ? " + ;; Generate: " AND x LIKE 'keypatt' ..." + " AND target LIKE '" target "'" + " AND state != 'deleted' ORDER BY event_time DESC " + (if (number? count) + (conc " LIMIT " count) + "") + (if (number? offset) + (conc " OFFSET " offset) + "")))) + (debug:print-info 11 *default-log-port* "db:get-runs START qrystr: " qrystr " target: " target " offset: " offset " limit: " count) + (db:with-db dbstruct #f #f + (lambda (db) + (sqlite3:for-each-row + (lambda (target id runname state status owner event_time) + (set! res (cons (make-simple-run target id runname state status owner event_time) res))) + db + qrystr + ))) + (debug:print-info 11 *default-log-port* "db:get-runs END qrystr: " qrystr " target: " target " offset: " offset " limit: " count) + res)) + ;; TODO: Switch this to use max(update_time) from each run db? Then if using a server there is no disk traffic (using inmem db) ;; (define (db:get-changed-run-ids since-time) (let* ((dbdir (db:dbfile-path)) ;; (configf:lookup *configdat* "setup" "dbdir")) (alldbs (glob (conc dbdir "/[0-9]*.db"))) @@ -2052,10 +2296,47 @@ (set! numruns count)) db "SELECT COUNT(id) FROM runs WHERE runname LIKE ? AND state != 'deleted';" runpatt) (debug:print-info 11 *default-log-port* "db:get-num-runs END " runpatt) numruns)))) + +;; just get count of runs +(define (db:get-runs-cnt-by-patt dbstruct runpatt targetpatt keys) + (db:with-db + dbstruct + #f + #f + (lambda (db) + (let ((numruns 0) + (qry-str #f) + (key-patt "") + (keyvals (if targetpatt (keys:target->keyval keys targetpatt) '()))) + + (for-each (lambda (keyval) + (let* ((key (car keyval)) + (patt (cadr keyval)) + (fulkey (conc ":" key)) + (wildtype (if (substring-index "%" patt) "like" "glob"))) + + (if patt + (set! key-patt (conc key-patt " AND " key " " wildtype " '" patt "'")) + (begin + (debug:print-error 0 *default-log-port* "searching for runs with no pattern set for " fulkey) + (exit 6))))) + keyvals) + ;(print runpatt " -- " key-patt) + (set! qry-str (conc "SELECT COUNT(id) FROM runs WHERE state != 'deleted' AND runname like '" runpatt "'" key-patt)) + ;(print qry-str ) + + (sqlite3:for-each-row + (lambda (count) + (set! numruns count)) + db + qry-str) + (debug:print-info 11 *default-log-port* "db:get-num-runs END " runpatt) + numruns)))) + ;; (sqlite3#fold-row proc3670 init3671 db-or-stmt3672 . params3673)> ;; (define (db:get-raw-run-stats dbstruct run-id) (db:with-db @@ -2205,11 +2486,11 @@ ;; register a test run with the db ;; ;; Use: (db:get-value-by-header (db:get-header runinfo)(db:get-rows runinfo)) ;; to extract info from the structure returned ;; -(define (db:get-runs-by-patt dbstruct keys runnamepatt targpatt offset limit fields last-update) ;; test-name) +(define (db:get-runs-by-patt dbstruct keys runnamepatt targpatt offset limit fields last-update sort-order ) ;; test-name) (let* ((tmp (runs:get-std-run-fields keys (or fields '("id" "runname" "state" "status" "owner" "event_time")))) (keystr (car tmp)) (header (cadr tmp)) (key-patt "") (runwildtype (if (substring-index "%" runnamepatt) "like" "glob")) @@ -2228,15 +2509,17 @@ keyvals) (set! qry-str (conc "SELECT " keystr " FROM runs WHERE state != 'deleted' AND runname " runwildtype " ? " key-patt (if last-update (conc " AND last_update >= " last-update " ") " ") - " ORDER BY event_time " + " ORDER BY event_time " sort-order " " (if limit (conc " LIMIT " limit) "") (if offset (conc " OFFSET " offset) "") ";")) (debug:print-info 4 *default-log-port* "runs:get-runs-by-patt qry=" qry-str " " runnamepatt) + ;(print "runs:get-runs-by-patt qry=" qry-str " " runnamepatt) + (vector header (reverse (db:with-db dbstruct #f #f ;; reads db, does not write to it. (lambda (db) (sqlite3:fold-row @@ -2254,23 +2537,24 @@ (define (db:get-run-info dbstruct run-id) ;;(if (hash-table-ref/default *run-info-cache* run-id #f) ;; (hash-table-ref *run-info-cache* run-id) (let* ((res (vector #f #f #f #f)) (keys (db:get-keys dbstruct)) - (remfields (list "id" "runname" "state" "status" "owner" "event_time" "comment" "fail_count" "pass_count" "contour")) ;; "area_id")) + (remfields (list "id" "runname" "state" "status" "owner" "event_time" "comment" "fail_count" "pass_count" "contour" "last_update")) ;; "area_id")) (header (append keys remfields)) (keystr (conc (keys->keystr keys) "," (string-intersperse remfields ",")))) (debug:print-info 11 *default-log-port* "db:get-run-info run-id: " run-id " header: " header " keystr: " keystr) + (db:with-db dbstruct #f #f (lambda (db) (sqlite3:for-each-row (lambda (a . x) (set! res (apply vector a x))) db - (conc "SELECT " keystr " FROM runs WHERE id=? AND state != 'deleted';") + (conc "SELECT " keystr " FROM runs WHERE id=?;") run-id))) (debug:print-info 11 *default-log-port* "db:get-run-info run-id: " run-id " header: " header " keystr: " keystr) (let ((finalres (vector header res))) ;; (hash-table-set! *run-info-cache* run-id finalres) finalres))) @@ -2351,11 +2635,11 @@ (for-each (lambda (key) (let ((qry (conc "SELECT " key " FROM runs WHERE id=?;"))) (sqlite3:for-each-row (lambda (key-val) - (set! res (cons (list key key-val) res))) + (set! res (cons (list key (if (string? key-val) key-val "")) res))) ;; replace non-string bad values with empty string to prevent crashes. This scenario can happen when Megatest is killed on updating the db db qry run-id))) keys))) (reverse res))) ;; get key vals for a given run-id @@ -2369,11 +2653,11 @@ (lambda (key) (let ((qry (conc "SELECT " key " FROM runs WHERE id=?;"))) ;; (db:delay-if-busy dbdat) (sqlite3:for-each-row (lambda (key-val) - (set! res (cons key-val res))) + (set! res (cons (if (string? key-val) key-val "") res))) ;; check that the key-val is a string for cases where a crash injected bad data in the megatest.db db qry run-id))) keys))) (let ((final-res (reverse res))) (hash-table-set! *keyvals* run-id final-res) final-res))) @@ -2680,11 +2964,11 @@ (lambda (db) (sqlite3:first-result db ;; WARNING BUG EDIT ME - merged from v1.55 - not sure what is right here ... ;; "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id NOT IN (SELECT id FROM runs WHERE state='deleted') AND NOT (uname = 'n/a' AND item_path = '');") - "SELECT count(id) FROM tests WHERE state in ('RUNNING','REMOTEHOSTSTART') AND run_id=?;" + "SELECT count(id) FROM tests WHERE state in ('RUNNING','REMOTEHOSTSTART','LAUNCHED') AND run_id=?;" run-id)))) ;; NOT IN (SELECT id FROM runs WHERE state='deleted');") ;; NEW BEHAVIOR: Look only at single run with run-id ;; ;; (define (db:get-running-stats dbstruct run-id) @@ -2694,11 +2978,11 @@ run-id #f (lambda (db) (sqlite3:first-result db - "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id=? AND NOT (uname = 'n/a' AND item_path = '');" run-id)))) + "SELECT count(id) FROM tests WHERE state in ('RUNNING','LAUNCHED','REMOTEHOSTSTART') AND run_id=?;" run-id)))) ;; For a given testname how many items are running? Used to determine ;; probability for regenerating html ;; (define (db:get-count-tests-running-for-testname dbstruct run-id testname) @@ -2793,11 +3077,11 @@ #f test-id)))) (define db:test-record-fields '("id" "run_id" "testname" "state" "status" "event_time" "host" "cpuload" "diskfree" "uname" "rundir" "item_path" - "run_duration" "final_logf" "comment" "shortdir" "attemptnum" "archived")) + "run_duration" "final_logf" "comment" "shortdir" "attemptnum" "archived" "last_update")) ;; fields *must* be a non-empty list ;; (define (db:field->number fieldname fields) (if (null? fields) @@ -2898,13 +3182,13 @@ #f ;; run-id #f (lambda (db) (let ((res #f)) (sqlite3:for-each-row ;; attemptnum added to hold pid of top process (not Megatest) controlling a test - (lambda (id run-id testname state status event-time host cpuload diskfree uname rundir-id item-path run_duration final-logf-id comment short-dir-id attemptnum archived) + (lambda (id run-id testname state status event-time host cpuload diskfree uname rundir-id item-path run_duration final-logf-id comment short-dir-id attemptnum archived last-update) ;; 0 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 - (set! res (vector id run-id testname state status event-time host cpuload diskfree uname rundir-id item-path run_duration final-logf-id comment short-dir-id attemptnum archived))) + (set! res (vector id run-id testname state status event-time host cpuload diskfree uname rundir-id item-path run_duration final-logf-id comment short-dir-id attemptnum archived last-update))) db (conc "SELECT " db:test-record-qry-selector " FROM tests WHERE id=?;") test-id) res)))) @@ -2951,10 +3235,44 @@ (db:first-result-default db "SELECT rundir FROM tests WHERE id=?;" #f ;; default result test-id)))) + +(define (db:get-test-times dbstruct run-name target) + (let ((res `()) + (qry (conc "select testname, item_path, run_duration, " (string-join (db:get-keys dbstruct) " || '/' || ") " as target from tests inner join runs on tests.run_id = runs.id where runs.runname = ? and target = ? ;"))) + + (db:with-db + dbstruct + #f ;; this is for the main runs db + #f ;; does not modify db + (lambda (db) + (sqlite3:for-each-row + (lambda (test-name item-path test-time target ) + (set! res (cons (vector test-name item-path test-time) res))) + db + qry + run-name target) + res)))) + +(define (db:get-test-times dbstruct run-name target) + (let ((res `()) + (qry (conc "select testname, item_path, run_duration, " (string-join (db:get-keys dbstruct) " || '/' || ") " as target from tests inner join runs on tests.run_id = runs.id where runs.runname = ? and target = ? ;"))) + + (db:with-db + dbstruct + #f ;; this is for the main runs db + #f ;; does not modify db + (lambda (db) + (sqlite3:for-each-row + (lambda (test-name item-path test-time target ) + (set! res (cons (vector test-name item-path test-time) res))) + db + qry + run-name target) + res)))) ;;====================================================================== ;; S T E P S ;;====================================================================== @@ -2984,10 +3302,25 @@ (set! res (cons (vector id test-id stepname state status event-time (if (string? logfile) logfile "") comment) res))) db "SELECT id,test_id,stepname,state,status,event_time,logfile,comment FROM test_steps WHERE status != 'DELETED' AND test_id=? ORDER BY id ASC;" ;; event_time DESC,id ASC; test-id) (reverse res))))) + + (define (db:get-steps-info-by-id dbstruct test-step-id) + (db:with-db + dbstruct + #f + #f + (lambda (db) + (let* ((res (vector #f #f #f #f #f #f #f #f #f))) + (sqlite3:for-each-row + (lambda (id test-id stepname state status event-time logfile comment last-update) + (set! res (vector id test-id stepname state status event-time (if (string? logfile) logfile "") comment last-update))) + db + "SELECT id,test_id,stepname,state,status,event_time,logfile,comment,last_update FROM test_steps WHERE id=? ORDER BY id ASC;" ;; event_time DESC,id ASC; + test-step-id) + res)))) (define (db:get-steps-data dbstruct run-id test-id) (db:with-db dbstruct run-id @@ -3003,10 +3336,26 @@ (reverse res))))) ;;====================================================================== ;; T E S T D A T A ;;====================================================================== + + (define (db:get-data-info-by-id dbstruct test-data-id) + (db:with-db + dbstruct + #f + #f + (lambda (db) + (let* ((res (vector #f #f #f #f #f #f #f #f #f #f #f #f))) + (sqlite3:for-each-row + (lambda (id test-id category variable value expected tol units comment status type last-update) + (set! res (vector id test-id category variable value expected tol units comment status type last-update))) + db + "SELECT id,test_id, category, variable, value, expected, tol, units, comment, status, type, last_update FROM test_data WHERE id=? ORDER BY id ASC;" ;; event_time DESC,id ASC; + test-data-id) + res)))) + ;; WARNING: Do NOT call this for the parent test on an iterated test ;; Roll up test_data pass/fail results ;; look at the test_data status field, ;; if all are pass (any case) and the test status is PASS or NULL or '' then set test status to PASS. @@ -3077,12 +3426,12 @@ (configf:lookup dat entry-name "message") ;; 4 ;; Comment (configf:lookup dat entry-name "exit-status") ;; 5 ;; Status "logpro" ;; 6 ;; Type )))) (let* ((value (or (configf:lookup dat entry-name "measured") "n/a")) - (expected (or (configf:lookup dat entry-name "expected") "n/a")) - (tolerance (or (configf:lookup dat entry-name "tolerance") "n/a")) + (expected (or (configf:lookup dat entry-name "expected") 0.0)) + (tolerance (or (configf:lookup dat entry-name "tolerance") 0.0)) (comment (or (configf:lookup dat entry-name "comment") (configf:lookup dat entry-name "desc") "n/a")) (status (or (configf:lookup dat entry-name "status") "n/a")) (type (or (configf:lookup dat entry-name "expected") "n/a"))) (set! res (append @@ -3183,10 +3532,25 @@ (lambda (id test_id category variable value expected tol units comment status type) (set! res (cons (vector id test_id category variable value expected tol units comment status type) res))) db "SELECT id,test_id,category,variable,value,expected,tol,units,comment,status,type FROM test_data WHERE test_id=? AND category LIKE ? ORDER BY category,variable;" test-id categorypatt) (reverse res))))) + +;; This routine moved from tdb.scm, :read-test-data +;; +(define (db:read-test-data* dbstruct run-id test-id categorypatt varpatt) + (let* ((res '())) + (db:with-db + dbstruct #f #f + (lambda (db) + (sqlite3:for-each-row + (lambda (id test_id category variable value expected tol units comment status type) + (set! res (cons (vector id test_id category variable value expected tol units comment status type) res))) + db + "SELECT id,test_id,category,variable,value,expected,tol,units,comment,status,type FROM test_data WHERE test_id=? AND category LIKE ? AND variable LIKE ? ORDER BY category,variable;" test-id categorypatt varpatt) + (reverse res))))) + ;;====================================================================== ;; Misc. test related queries ;;====================================================================== @@ -3302,20 +3666,24 @@ ;; ;; if test-name is an integer work off that instead of test-name test-path ;; (define (db:set-state-status-and-roll-up-items dbstruct run-id test-name item-path state status comment) ;; establish info on incoming test followed by info on top level test + ;; BBnote - for mode itemwait, linkage between upstream test & matching item status is propagated to run queue in db:prereqs-not-met + (let* ((testdat (if (number? test-name) (db:get-test-info-by-id dbstruct run-id test-name) ;; test-name is actually a test-id (db:get-test-info dbstruct run-id test-name item-path))) (test-id (db:test-get-id testdat)) (test-name (if (number? test-name) (db:test-get-testname testdat) test-name)) (item-path (db:test-get-item-path testdat)) (tl-testdat (db:get-test-info dbstruct run-id test-name "")) - (tl-test-id (db:test-get-id tl-testdat))) + (tl-test-id (if tl-testdat + (db:test-get-id tl-testdat) + #f))) (if (member state '("LAUNCHED" "REMOTEHOSTSTART")) (db:general-call dbstruct 'set-test-start-time (list test-id))) (mutex-lock! *db-transaction-mutex*) (db:with-db dbstruct #f #f @@ -3325,11 +3693,11 @@ db (lambda () ;; NB// Pass the db so it is part fo the transaction (db:test-set-state-status db run-id test-id state status comment) ;; this call sets the item state/status (if (not (equal? item-path "")) ;; only roll up IF incoming test is an item - (let* ((state-status-counts (db:get-all-state-status-counts-for-test dbstruct run-id test-name item-path)) ;; item-path is used to exclude current state/status of THIS test + (let* ((state-status-counts (db:get-all-state-status-counts-for-test dbstruct run-id test-name item-path state status)) ;; item-path is used to exclude current state/status of THIS test (running (length (filter (lambda (x) (member (dbr:counts-state x) *common:running-states*)) state-status-counts))) (bad-not-started (length (filter (lambda (x) (and (equal? (dbr:counts-state x) "NOT_STARTED") @@ -3338,52 +3706,120 @@ state-status-counts))) ;; (non-completes (filter (lambda (x) ;; (not (equal? (dbr:counts-state x) "COMPLETED"))) ;; state-status-counts)) (all-curr-states (common:special-sort ;; worst -> best (sort of) - (delete-duplicates - (cons state (map dbr:counts-state state-status-counts))) - *common:std-states* >)) + (delete-duplicates + (if (not (member state *common:dont-roll-up-states*)) + (cons state (map dbr:counts-state state-status-counts)) + (map dbr:counts-state state-status-counts))) + *common:std-states* >)) (all-curr-statuses (common:special-sort ;; worst -> best (delete-duplicates - (cons status (map dbr:counts-status state-status-counts))) + (if (not (member state *common:dont-roll-up-states*)) + (cons status (map dbr:counts-status state-status-counts)) + (map dbr:counts-status state-status-counts))) *common:std-statuses* >)) (non-completes (filter (lambda (x) - (not (equal? x "COMPLETED"))) + (not (member x (cons "COMPLETED" *common:dont-roll-up-states*)))) all-curr-states)) + (preq-fails (filter (lambda (x) + (equal? x "PREQ_FAIL")) + all-curr-statuses)) + (num-non-completes (length non-completes)) (newstate (cond - ((> (length non-completes) 0) ;; - (car non-completes)) ;; (remove (lambda (x)(equal? "COMPLETED" x)) all-curr-states))) - (else - (car all-curr-states)))) + ((> running 0) "RUNNING") ;; anything running, call the situation running + ((> (length preq-fails) 0) + "NOT_STARTED") + ((> bad-not-started 0) "COMPLETED") ;; we have an ugly situation, it is completed in the sense we cannot do more. + ((> num-non-completes 0) (car non-completes)) ;; (remove (lambda (x)(equal? "COMPLETED" x)) all-curr-states))) ;; only rollup DELETED if all DELETED + (else (car all-curr-states)))) ;; (if (> running 0) ;; "RUNNING" ;; (if (> bad-not-started 0) ;; "COMPLETED" ;; (car all-curr-states)))) - (newstatus (if (> bad-not-started 0) - "CHECK" - (car all-curr-statuses)))) + (newstatus (cond + ((> (length preq-fails) 0) + "PREQ_FAIL") + ((or (> bad-not-started 0) + (and (equal? newstate "NOT_STARTED") + (> num-non-completes 0))) + "STARTED") + (else + (car all-curr-statuses))))) + + (debug:print-info 2 *default-log-port* + "\n--> probe db:set-state-status-and-roll-up-items: " + "\n--> state-status-counts: "(map dbr:counts->alist state-status-counts) + "\n--> running: "running + "\n--> bad-not-started: "bad-not-started + "\n--> non-non-completes: "num-non-completes + "\n--> non-completes: "non-completes + "\n--> all-curr-states: "all-curr-states + "\n--> all-curr-statuses: "all-curr-statuses + "\n--> newstate "newstate + "\n--> newstatus "newstatus + "\n\n") + ;; (print "bad-not-supported: " bad-not-support " all-curr-states: " all-curr-states " all-curr-statuses: " all-curr-states) ;; " newstate: " newstate " newstatus: " newstatus) ;; NB// Pass the db so it is part of the transaction - (db:test-set-state-status db run-id tl-test-id newstate newstatus #f))))))) + (debug:print 4 *default-log-port* "BB> tl-test-id="tl-test-id" ; "test-name":"item-path"> bad-not-started="bad-not-started" newstate="newstate" newstatus="newstatus" num-non-completes="num-non-completes" non-completes="non-completes "len(sscs)="(length state-status-counts) " state-status-counts: " + (apply conc + (map (lambda (x) + (conc + (with-output-to-string (lambda () (pp (dbr:counts->alist x)))) " | ")) + state-status-counts)) + + ); end debug:print + (if tl-test-id + (db:test-set-state-status db run-id tl-test-id newstate newstatus #f)) ;; we are still in the transaction - must access the db and not the dbstruct + )))))) + (mutex-unlock! *db-transaction-mutex*) (if (and test-id state status (equal? status "AUTO")) (db:test-data-rollup dbstruct run-id test-id status)) tr-res))))) - -(define (db:get-all-state-status-counts-for-test dbstruct run-id test-name item-path) - (db:with-db - dbstruct #f #f - (lambda (db) - (sqlite3:map-row - (lambda (state status count) - (make-dbr:counts state: state status: status count: count)) - db - "SELECT state,status,count(id) FROM tests WHERE run_id=? AND testname=? AND item_path != '' AND item_path !=? GROUP BY state,status;" - run-id test-name item-path)))) +;; BBnote: db:get-all-state-status-counts-for-test returns dbr:counts object aggregating state and status of items of a given test, *not including rollup state/status* +(define (db:get-all-state-status-counts-for-test dbstruct run-id test-name item-path item-state-in item-status-in) + + + (let* ((test-info (db:get-test-info dbstruct run-id test-name item-path)) + (item-state (or item-state-in (db:test-get-state test-info))) + (item-status (or item-status-in (db:test-get-status test-info))) + (other-items-count-recs (db:with-db + dbstruct #f #f + (lambda (db) + (sqlite3:map-row + (lambda (state status count) + (make-dbr:counts state: state status: status count: count)) + db + ;; ignore current item because we have changed its value in the current transation so this select will see the old value. + "SELECT state,status,count(id) FROM tests WHERE run_id=? AND testname=? AND item_path != '' AND item_path !=? GROUP BY state,status;" + run-id test-name item-path)))) + + ;; add current item to tally outside of sql query + (match-countrec-lambda (lambda (countrec) + (and (equal? (dbr:counts-state countrec) item-state) + (equal? (dbr:counts-status countrec) item-status)))) + + (already-have-count-rec-list + (filter match-countrec-lambda other-items-count-recs)) ;; will have either 0 or 1 count recs depending if another item shares this item's state/status + + (updated-count-rec (if (null? already-have-count-rec-list) + (make-dbr:counts state: item-state status: item-status count: 1) + (let* ((our-count-rec (car already-have-count-rec-list)) + (new-count (add1 (dbr:counts-count our-count-rec)))) + (make-dbr:counts state: item-state status: item-status count: new-count)))) + + (nonmatch-countrec-lambda (lambda (countrec) (not (match-countrec-lambda countrec)))) + + (unrelated-rec-list + (filter nonmatch-countrec-lambda other-items-count-recs))) + + (cons updated-count-rec unrelated-rec-list))) ;; (define (db:get-all-item-states db run-id test-name) ;; (sqlite3:map-row ;; (lambda (a) a) ;; db @@ -3719,11 +4155,11 @@ exn (begin (debug:print-info 0 *default-log-port* "WARNING: failed to test for existance of " dbfj) (thread-sleep! 1) (db:delay-if-busy count (- count 1))) - (file-exists? dbfj)) + (common:file-exists? dbfj)) (case count ((6) (thread-sleep! 0.2) (db:delay-if-busy count: 5)) ((5) @@ -3783,11 +4219,11 @@ (delete-duplicates (cons testname (hash-table-ref/default res tag '()))))) tags))) db "SELECT testname,tags FROM test_meta") - res)))) + (hash-table->alist res))))) ;; read the record given a testname (define (db:testmeta-get-record dbstruct testname) (let ((res #f)) (db:with-db @@ -3872,19 +4308,35 @@ (let loop ((hed (car all-patts)) (tal (cdr all-patts)) (res item-path)) (let* ((parts (string-split hed)) (patt (car parts)) + (repl (if (> (length parts) 1)(cadr parts) "")) + (newr (if (and patt repl) - (string-substitute patt repl res) + (begin + (handle-exceptions + exn + (begin + (debug:print 0 *default-log-port* + "WARNING: itemmap has problem \"" itemmap "\", patt: " patt ", repl: " repl) + res) + (string-substitute patt repl res)) + + + ) (begin - (debug:print 0 *default-log-port* "WARNING: itemmap has problem \"" itemmap "\", patt: " patt ", repl: " repl) + (debug:print 0 *default-log-port* + "WARNING: itemmap has problem \"" itemmap "\", patt: " patt ", repl: " repl) res)))) (if (null? tal) newr (loop (car tal)(cdr tal) newr))))))) + + + ;; the new prereqs calculation, looks also at itempath if specified ;; all prereqs must be met ;; if prereq test with itempath='' is COMPLETED and PASS, WARN, CHECK, or WAIVED then prereq is met ;; if prereq test with itempath=ref-item-path and COMPLETED with PASS, WARN, CHECK, or WAIVED then prereq is met @@ -3894,10 +4346,11 @@ ;; mode 'itemmatch or 'itemwait means that tests items must be COMPLETED and (PASS|WARN|WAIVED|CHECK) [[ NB// NOT IMPLEMENTED YET ]] ;; mode 'exclusive means this test/item cannot run if the same test/item is LAUNCHED,REMOTEHOSTSTART or RUNNING ;; ;; (define (db:get-prereqs-not-met dbstruct run-id waitons ref-item-path mode) (define (db:get-prereqs-not-met dbstruct run-id waitons ref-test-name ref-item-path mode itemmaps) ;; #!key (mode '(normal))(itemmap #f)) + ;; BBnote - rollup of an itemized test's overall state/status done in db:set-state-status-and-roll-up-items (append (if (member 'exclusive mode) (let ((running-tests (db:get-tests-for-run dbstruct #f ;; run-id of #f means for all runs. (if (string=? ref-item-path "") ;; testpatt @@ -3920,74 +4373,149 @@ ;; (conc (db:test-get-testname testdat) ;; "/" ;; (db:test-get-item-path testdat)))) running-tests) ;; calling functions want the entire data '()) + + ;; collection of: for each waiton - + ;; if this ref-test-name is an item in an itemized test and mode is itemwait/itemmatch: + ;; if waiton is not itemized - if waiton is not both completed and in ok status, add as unmet prerequisite + ;; if waiton is itemized: + ;; and waiton's items are not expanded, add as unmet prerequisite + ;; else if matching waiton item is not both completed and in an ok status, add as unmet prerequisite + ;; else + ;; if waiton toplevel is not in both completed and ok status, add as unmet prerequisite + (if (or (not waitons) (null? waitons)) '() - (let* ((unmet-pre-reqs '()) - (result '())) - (for-each + (let* ((ref-test-itemized-mode (not (null? (lset-intersection eq? mode '(itemmatch itemwait))))) + (ref-test-toplevel-mode (not (null? (lset-intersection eq? mode '(toplevel))))) + (ref-test-is-toplevel (equal? ref-item-path "")) + (ref-test-is-item (not ref-test-is-toplevel)) + (unmet-pre-reqs '()) + (result '()) + (unmet-prereq-items '()) + ) + (for-each ; waitons (lambda (waitontest-name) ;; by getting the tests with matching name we are looking only at the matching test ;; and related sub items ;; next should be using mt:get-tests-for-run? - (let ((tests (db:get-tests-for-run-state-status dbstruct run-id waitontest-name)) + + (let (;(waiton-is-itemized ...) + ;(waiton-items-are-expanded ...) + (waiton-tests (db:get-tests-for-run-state-status dbstruct run-id waitontest-name)) (ever-seen #f) (parent-waiton-met #f) - (item-waiton-met #f)) - (for-each - (lambda (test) - ;; (if (equal? waitontest-name (db:test-get-testname test)) ;; by defintion this had better be true ... - (let* ((state (db:test-get-state test)) - (status (db:test-get-status test)) - (item-path (db:test-get-item-path test)) - (is-completed (equal? state "COMPLETED")) - (is-running (equal? state "RUNNING")) - (is-killed (equal? state "KILLED")) - (is-ok (member status '("PASS" "WARN" "CHECK" "WAIVED" "SKIP"))) + (item-waiton-met #f) + + ) + (for-each ; test expanded from waiton + (lambda (waiton-test) + (let* ((waiton-state (db:test-get-state waiton-test)) + (waiton-status (db:test-get-status waiton-test)) + (waiton-item-path (db:test-get-item-path waiton-test)) ;; BB- this is the upstream itempath + (waiton-is-toplevel (equal? waiton-item-path "")) + (waiton-is-item (not waiton-is-toplevel)) + (waiton-is-completed (member waiton-state *common:ended-states*)) + (waiton-is-running (member waiton-state *common:running-states*)) + (waiton-is-killed (member waiton-state *common:badly-ended-states*)) + (waiton-is-ok (member waiton-status *common:well-ended-states*)) ;; testname-b path-a path-b - (same-itempath (db:compare-itempaths ref-test-name item-path ref-item-path itemmaps))) ;; (equal? ref-item-path item-path))) + (same-itempath (db:compare-itempaths ref-test-name waiton-item-path ref-item-path itemmaps))) ;; (equal? ref-item-path waiton-item-path))) (set! ever-seen #t) - (cond - ;; case 1, non-item (parent test) is - ((and (equal? item-path "") ;; this is the parent test of the waiton being examined - is-completed - (or is-ok (not (null? (lset-intersection eq? mode '(toplevel)))))) ;; itemmatch itemwait)))))) + ;;(BB> "***consider waiton "waiton-test"/"waiton-item-path"***") + (cond + ;; case 0 - toplevel of an itemized test, at least one item in prereq has completed + ((and waiton-is-item ref-test-is-toplevel ref-test-itemized-mode waiton-is-completed) + (set! parent-waiton-met #t)) + + ;; case 1, non-item (parent test) is + ((and waiton-is-toplevel ;; this is the parent test of the waiton being examined + waiton-is-completed + ;;(BB> "cond1") + (or waiton-is-ok ref-test-toplevel-mode)) ;; itemmatch itemwait)))))) (set! parent-waiton-met #t)) ;; Special case for toplevel and KILLED - ((and (equal? item-path "") ;; this is the parent test - is-killed + ((and waiton-is-toplevel ;; this is the parent test + waiton-is-killed (member 'toplevel mode)) + ;;(BB> "cond2") (set! parent-waiton-met #t)) ;; For itemwait mode IFF the previous matching item is good the set parent-waiton-met - ((and (not (null? (lset-intersection eq? mode '(itemmatch itemwait)))) ;; how is that different from (member mode '(itemmatch itemwait)) ????? - ;; (not (equal? item-path "")) ;; this applies to both top level (to allow launching of next batch) and items - same-itempath) - (if (and is-completed is-ok) - (set! item-waiton-met #t)) - (if (and (equal? item-path "") - (or is-completed is-running));; this is the parent, set it to run if completed or running + ((and ref-test-itemized-mode ref-test-is-item same-itempath) + ;;(BB> "cond3") + (if (and waiton-is-completed (or waiton-is-ok ref-test-toplevel-mode)) + (set! item-waiton-met #t) + (set! unmet-prereq-items (cons waiton-test unmet-prereq-items))) + (if (and waiton-is-toplevel ;; if upstream rollup test is completed, parent-waiton-met is set + (or waiton-is-completed waiton-is-running)) (set! parent-waiton-met #t))) ;; normal checking of parent items, any parent or parent item not ok blocks running - ((and is-completed - (or is-ok + ((and waiton-is-completed + (or waiton-is-ok (member 'toplevel mode)) ;; toplevel does not block on FAIL - (and is-ok (member 'itemmatch mode))) ;; itemmatch blocks on not ok - (set! item-waiton-met #t))))) - tests) + (and waiton-is-ok (member 'itemmatch mode) ;; itemmatch blocks on not ok ;; TODO: THIS IS PROBABLY A BUG. ITEMMATCH AND ITEMWAIT ARE SYNONYMS!! WHAT HAPPENED OT ITEMWAIT??? + )) + ;;(BB> "cond4") + (set! item-waiton-met #t)) + + ((and waiton-is-completed waiton-is-ok same-itempath) + ;;(BB> "cond5") + (set! item-waiton-met #t)) + (else + #t + ;;(BB> "condelse") + )))) + waiton-tests) ;; both requirements, parent and item-waiton must be met to NOT add item to ;; prereq's not met list - (if (not (or parent-waiton-met item-waiton-met)) - (set! result (append (if (null? tests) (list waitontest-name) tests) result))) ;; appends the string if the full record is not available + ;; (BB> + ;; "\n* waiton-tests "waiton-tests + ;; "\n* parent-waiton-met "parent-waiton-met + ;; "\n* item-waiton-met "item-waiton-met + ;; "\n* ever-seen "ever-seen + ;; "\n* ref-test-itemized-mode "ref-test-itemized-mode + ;; "\n* unmet-prereq-items "unmet-prereq-items + ;; "\n* result (pre) "result + ;; "\n* ever-seen "ever-seen + ;; "\n") + + (cond + ((and ref-test-itemized-mode ref-test-is-item (not (null? unmet-prereq-items))) + (set! result (append unmet-prereq-items result))) + ((not (or parent-waiton-met item-waiton-met)) + (set! result (append (if (null? waiton-tests) (list waitontest-name) waiton-tests) result))) ;; appends the string if the full record is not available ;; if the test is not found then clearly the waiton is not met... ;; (if (not ever-seen)(set! result (cons waitontest-name result))))) - (if (not ever-seen) - (set! result (append (if (null? tests)(list waitontest-name) tests) result))))) + ((not ever-seen) + (set! result (append (if (null? waiton-tests)(list waitontest-name) waiton-tests) result)))))) waitons) (delete-duplicates result))))) +;;====================================================================== +;; To sync individual run +;;====================================================================== +(define (db:get-run-record-ids dbstruct target run keynames test-patt) +(let ((backcons (lambda (lst item)(cons item lst)))) + (db:with-db + dbstruct #f #f + (lambda (db) + (let* ((keystr (string-intersperse + (map (lambda (key val) + (conc key " like '" val "'")) + keynames + (string-split target "/")) + " AND ")) + (run-qry (conc "SELECT id FROM runs WHERE " keystr " and runname='" run"'")) + (test-qry (conc "SELECT id FROM tests WHERE run_id in (" run-qry ") and testname like '" test-patt "'"))) + ;(print run-qry) + `((runs . ,(fold-row backcons '() db run-qry)) + (tests . ,(fold-row backcons '() db test-qry)) + (test_steps . ,(fold-row backcons '() db (conc "SELECT id FROM test_steps WHERE test_id in (" test-qry ")"))) + (test_data . ,(fold-row backcons '() db (conc "SELECT id FROM test_data WHERE test_id in (" test-qry ")" ))) + )))))) ;;====================================================================== ;; Just for sync, procedures to make sync easy ;;====================================================================== @@ -3998,16 +4526,16 @@ ;; no transaction, allow the db to be accessed between the big queries (let ((backcons (lambda (lst item)(cons item lst)))) (db:with-db dbstruct #f #f (lambda (db) - `((runs . ,(fold-row backcons '() db "SELECT id FROM runs WHERE last_update>?" since-time)) - (tests . ,(fold-row backcons '() db "SELECT id FROM tests WHERE last_update>?" since-time)) - (test_steps . ,(fold-row backcons '() db "SELECT id FROM test_steps WHERE last_update>?" since-time)) - (test_data . ,(fold-row backcons '() db "SELECT id FROM test_data WHERE last_update>?" since-time)) + `((runs . ,(fold-row backcons '() db "SELECT id FROM runs WHERE last_update>=?" since-time)) + (tests . ,(fold-row backcons '() db "SELECT id FROM tests WHERE last_update>=?" since-time)) + (test_steps . ,(fold-row backcons '() db "SELECT id FROM test_steps WHERE last_update>=?" since-time)) + (test_data . ,(fold-row backcons '() db "SELECT id FROM test_data WHERE last_update>=?" since-time)) ;; (test_meta . ,(fold-row backcons '() db "SELECT id FROM test_meta WHERE last_update>?" since-time)) - (run_stats . ,(fold-row backcons '() db "SELECT id FROM run_stats WHERE last_update>?" since-time)) + (run_stats . ,(fold-row backcons '() db "SELECT id FROM run_stats WHERE last_update>=?" since-time)) ))))) ;;====================================================================== ;; Extract ods file from the db ;;====================================================================== @@ -4083,12 +4611,12 @@ (testname (vector-ref vb (+ 2 numkeys))) (item-path (vector-ref vb (+ 3 numkeys))) (final-log (vector-ref vb (+ 7 numkeys))) (run-dir (vector-ref vb (+ 18 numkeys))) (log-fpath (conc run-dir "/" final-log))) ;; (string-intersperse keyvals "/") "/" testname "/" item-path "/" - (debug:print 4 *default-log-port* "log: " log-fpath " exists: " (file-exists? log-fpath)) - (vector-set! vb (+ 7 numkeys) (if (file-exists? log-fpath) + (debug:print 4 *default-log-port* "log: " log-fpath " exists: " (common:file-exists? log-fpath)) + (vector-set! vb (+ 7 numkeys) (if (common:file-exists? log-fpath) (let ((newpath (conc pathmod "/" (string-intersperse keyvals "/") "/" runname "/" testname "/" (if (string=? item-path "") "" (conc "/" item-path)) final-log))) @@ -4131,10 +4659,11 @@ (begin (debug:print 0 *default-log-port* "WARNING: path given, " outputfile " is relative, prefixing with current directory") (conc (current-directory) "/" outputfile))) results) ;; brutal clean up + (stack-push! (dbr:dbstruct-dbstack dbstruct) dbdat) (system "rm -rf tempdir"))) ;; (db:extract-ods-file db "outputfile.ods" '(("sysname" "%")("fsname" "%")("datapath" "%")) "%") Index: db_records.scm ================================================================== --- db_records.scm +++ db_records.scm @@ -1,5 +1,22 @@ +;; Copyright 2006-2017, Matthew Welland. +;; +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . + ;;====================================================================== ;; dbstruct ;;====================================================================== ;; @@ -85,10 +102,11 @@ (define-inline (db:test-get-run_duration vec) (vector-ref vec 12)) (define-inline (db:test-get-final_logf vec) (vector-ref vec 13)) (define-inline (db:test-get-comment vec) (vector-ref vec 14)) (define-inline (db:test-get-process_id vec) (vector-ref vec 16)) (define-inline (db:test-get-archived vec) (vector-ref vec 17)) +(define-inline (db:test-get-last_update vec) (vector-ref vec 18)) ;; (define-inline (db:test-get-pass_count vec) (vector-ref vec 15)) ;; (define-inline (db:test-get-fail_count vec) (vector-ref vec 16)) (define-inline (db:test-get-fullname vec) (conc (db:test-get-testname vec) "/" (db:test-get-item-path vec))) @@ -147,10 +165,16 @@ (define-inline (db:testmeta-set-description! vec val)(vector-set! vec 4 val)) (define-inline (db:testmeta-set-reviewed! vec val)(vector-set! vec 5 val)) (define-inline (db:testmeta-set-iterated! vec val)(vector-set! vec 6 val)) (define-inline (db:testmeta-set-avg_runtime! vec val)(vector-set! vec 7 val)) (define-inline (db:testmeta-set-avg_disk! vec val)(vector-set! vec 8 val)) + +;;====================================================================== +;; S I M P L E R U N +;;====================================================================== + +;; (defstruct id "runname" "state" "status" "owner" "event_time" ;;====================================================================== ;; T E S T D A T A ;;====================================================================== (define (make-db:test-data)(make-vector 10)) @@ -163,10 +187,11 @@ (define-inline (db:test-data-get-tol vec) (vector-ref vec 6)) (define-inline (db:test-data-get-units vec) (vector-ref vec 7)) (define-inline (db:test-data-get-comment vec) (vector-ref vec 8)) (define-inline (db:test-data-get-status vec) (vector-ref vec 9)) (define-inline (db:test-data-get-type vec) (vector-ref vec 10)) +(define-inline (db:test-data-get-last_update vec) (vector-ref vec 11)) (define-inline (db:test-data-set-id! vec val)(vector-set! vec 0 val)) (define-inline (db:test-data-set-test_id! vec val)(vector-set! vec 1 val)) (define-inline (db:test-data-set-category! vec val)(vector-set! vec 2 val)) (define-inline (db:test-data-set-variable! vec val)(vector-set! vec 3 val)) @@ -181,27 +206,28 @@ ;;====================================================================== ;; S T E P S ;;====================================================================== ;; Run steps ;; make-vector-record "Run steps" db step id test_id stepname step_complete step_pass event_time -(define (make-db:step)(make-vector 7)) +(define (make-db:step)(make-vector 9)) (define-inline (tdb:step-get-id vec) (vector-ref vec 0)) (define-inline (tdb:step-get-test_id vec) (vector-ref vec 1)) (define-inline (tdb:step-get-stepname vec) (vector-ref vec 2)) (define-inline (tdb:step-get-state vec) (vector-ref vec 3)) (define-inline (tdb:step-get-status vec) (vector-ref vec 4)) (define-inline (tdb:step-get-event_time vec) (vector-ref vec 5)) (define-inline (tdb:step-get-logfile vec) (vector-ref vec 6)) (define-inline (tdb:step-get-comment vec) (vector-ref vec 7)) +(define-inline (tdb:step-get-last_update vec) (vector-ref vec 8)) (define-inline (tdb:step-set-id! vec val)(vector-set! vec 0 val)) (define-inline (tdb:step-set-test_id! vec val)(vector-set! vec 1 val)) (define-inline (tdb:step-set-stepname! vec val)(vector-set! vec 2 val)) (define-inline (tdb:step-set-state! vec val)(vector-set! vec 3 val)) (define-inline (tdb:step-set-status! vec val)(vector-set! vec 4 val)) (define-inline (tdb:step-set-event_time! vec val)(vector-set! vec 5 val)) (define-inline (tdb:step-set-logfile! vec val)(vector-set! vec 6 val)) -(define-inline (tdb:step-set-comment! vec vak)(vector-set! vec 7 val)) +(define-inline (tdb:step-set-comment! vec val)(vector-set! vec 7 val)) ;; The steps table (define (make-db:steps-table)(make-vector 5)) (define-inline (tdb:steps-table-get-stepname vec) (vector-ref vec 0)) DELETED dbwars/NOTES Index: dbwars/NOTES ================================================================== --- dbwars/NOTES +++ /dev/null @@ -1,31 +0,0 @@ -Before using prepare: - -matt@xena:/tmp/megatest/dbwars$ ./sqlite3-test insert -Adding 1047 test3 item/39 host0-0.3-200000-240-this one sucks eh? (added 51886 records so far) -Adding 1122 test5 item/52 host2-0.2-200000-120-this is a good one eh? (added 78889 records so far) -Adding 1050 test7 item/31 host1-0.1-100000-120-this is a good one eh? (added 110641 records so far) -create-tests ran register-test 144000 times in 41.0 seconds - -After using prepare: - -matt@xena:/tmp/megatest/dbwars$ csc sqlite3-test.scm && ./sqlite3-test insert -Adding 1082 test4 item/74 host1-0.3-100000-120-this is a good one eh? (added 61281 records so far) -Adding 1138 test7 item/43 host2-0.3-200000-120-this is a good one eh? (added 109001 records so far) -Adding 1023 test9 item/00 host0-0.2-100000-240-this one sucks eh? (added 143878 records so far) -create-tests ran register-test 144000 times in 38.0 seconds - -After moving the prepare outside the call (so it isn't done each time): - -matt@xena:/tmp/megatest/dbwars$ ./sqlite3-test insert -Adding 1042 test4 item/59 host0-0.3-200000-120-this is a good one eh? (added 63401 records so far) -Adding 1011 test6 item/40 host0-0.1-200000-120-this one sucks eh? (added 94906 records so far) -Adding 1076 test9 item/34 host1-0.2-200000-120-just eh, eh? (added 139035 records so far) -create-tests ran register-test 144000 times in 33.0 seconds - -Using sql-de-lite with very similar code: - -matt@xena:/tmp/megatest/dbwars$ ./sql-de-lite-test insert -Adding 1029 test4 item/53 host0-0.2-200000-240- (added 64252 records so far) -Adding 1134 test7 item/64 host2-0.3-100000-240-this is a good one eh? (added 105973 records so far) -create-tests ran register-test 144000 times in 31.0 seconds - DELETED dbwars/sql-de-lite-test.scm Index: dbwars/sql-de-lite-test.scm ================================================================== --- dbwars/sql-de-lite-test.scm +++ /dev/null @@ -1,19 +0,0 @@ - -(use sql-de-lite) -(include "test-common.scm") - -(define db (open-database "test.db")) - -(exec (sql db test-table-defn)) -(exec (sql db syncsetup)) - -(define (register-test stmth run-id testname host cpuload diskfree uname rundir shortdir item-path state status final-logf run-duration comment event-time) - (exec - stmth ;; (sql db test-insert) - run-id - testname host cpuload diskfree uname rundir shortdir item-path state status final-logf run-duration comment event-time)) - -(let ((stmth (sql db test-insert))) - (create-tests stmth)) - -(close-database db) DELETED dbwars/sqlite3-test.scm Index: dbwars/sqlite3-test.scm ================================================================== --- dbwars/sqlite3-test.scm +++ /dev/null @@ -1,20 +0,0 @@ - -(use sqlite3) -(include "test-common.scm") - -(define db (open-database "test.db")) - -(execute db test-table-defn) -(execute db syncsetup) - - -(define (register-test stmth run-id testname host cpuload diskfree uname rundir shortdir item-path state status final-logf run-duration comment event-time) - (execute stmth - run-id - testname host cpuload diskfree uname rundir shortdir item-path state status final-logf run-duration comment event-time)) - -(let ((stmth (prepare db test-insert))) - (create-tests stmth) - (finalize! stmth)) - -(finalize! db) DELETED dbwars/test-common.scm Index: dbwars/test-common.scm ================================================================== --- dbwars/test-common.scm +++ /dev/null @@ -1,129 +0,0 @@ -(use srfi-18 srfi-69 apropos) - -(define args (argv)) - -(if (not (eq? (length args) 2)) - (begin - (print "Usage: sqlitecompare [insert|update]") - (exit 0))) - -(define action (string->symbol (cadr args))) - -(system "rm -f test.db") - -(define test-table-defn - "CREATE TABLE IF NOT EXISTS tests - (id INTEGER PRIMARY KEY, - run_id INTEGER, - testname TEXT, - host TEXT DEFAULT 'n/a', - cpuload REAL DEFAULT -1, - diskfree INTEGER DEFAULT -1, - uname TEXT DEFAULT 'n/a', - rundir TEXT DEFAULT 'n/a', - shortdir TEXT DEFAULT '', - item_path TEXT DEFAULT '', - state TEXT DEFAULT 'NOT_STARTED', - status TEXT DEFAULT 'FAIL', - attemptnum INTEGER DEFAULT 0, - final_logf TEXT DEFAULT 'logs/final.log', - logdat BLOB, - run_duration INTEGER DEFAULT 0, - comment TEXT DEFAULT '', - event_time TIMESTAMP, - fail_count INTEGER DEFAULT 0, - pass_count INTEGER DEFAULT 0, - archived INTEGER DEFAULT 0, -- 0=no, 1=in progress, 2=yes - CONSTRAINT testsconstraint UNIQUE (run_id, testname, item_path) - );") - -(define test-insert "INSERT INTO tests (run_id,testname,host,cpuload,diskfree,uname,rundir,shortdir,item_path,state,status,final_logf,run_duration,comment,event_time) - values (?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ? );") -(define syncsetup "PRAGMA synchronous = OFF;") - -(define tests '("test0" "test1" "test2" "test3" "test4" "test5" "test6" "test7" "test8" "test9")) -(define items '()) -(for-each - (lambda (n) - (for-each - (lambda (m) - (set! items (cons (conc "item/" n m) items))) - '(0 1 2 3 4 5 6 7 8 9))) - '(0 1 2 3 4 5 6 7 8 9)) -(define hosts '("host0" "host1" "host2")) ;; "host3" "host4" "host5" "host6" "host7" "host8" "host9")) -(define cpuloads '(0.1 0.2 0.3)) ;; 0.4 0.5 0.6 0.7 0.8 0.9)) -(define diskfrees '(100000 200000)) ;; 300000 400000 500000 600000 700000 800000 900000)) -(define uname "Linux xena 3.5.0-40-generic #62~precise1-Ubuntu SMP Fri Aug 23 17:59:10 UTC 2013 i686 i686 i386 GNU/Linux") -(define basedir "/mfs/matt/data/megatest/runs/testing") -(define final-logf "finallog.html") -(define run-durations (list 120 240)) ;; 260)) -(define comments '("" "this is a good one eh?" "this one sucks eh?" "just eh, eh?")) - -(define run-ids (make-hash-table)) -(define max-run-id 1000) - -(define (test-factors->run-id host cpuload diskfree run-duration comment) - (let* ((factor (conc host "-" cpuload "-" diskfree "-" run-duration "-" comment)) - (run-id (hash-table-ref/default run-ids factor #f))) - (if run-id - (list run-id factor) - (let ((new-id (+ max-run-id 1))) - (set! max-run-id new-id) - (hash-table-set! run-ids factor new-id) - (list new-id factor))))) - - -(define (create-tests stmth) - (let ((num-created 0) - (last-print (current-seconds)) - (start-time (current-seconds))) - (for-each - (lambda (test) - (for-each - (lambda (item) - (for-each - (lambda (host) - (for-each - (lambda (cpuload) - (for-each - (lambda (diskfree) - (for-each - (lambda (run-duration) - (for-each - (lambda (comment) - (let* ((run-id-dat (test-factors->run-id host cpuload diskfree run-duration comment)) - (run-id (car run-id-dat)) - (factor (cadr run-id-dat)) - (curr-time (current-seconds))) - (if (> (- curr-time last-print) 10) - (begin - (print "Adding " run-id " " test " " item " " factor " (added " num-created " records so far)") - (set! last-print curr-time))) - (set! num-created (+ num-created 1)) - (register-test stmth ;; db - run-id - test ;; testname - host - cpuload - diskfree - uname - (conc basedir "/" test "/" item) ;; rundir - (conc test "/" item) ;; shortdir - item ;; item-path - "NOT_STARTED" ;; state - "NA" ;; status - final-logf - run-duration - comment - (current-seconds)))) - comments)) - run-durations)) - diskfrees)) - cpuloads)) - hosts)) - items)) - tests) - (print "create-tests ran register-test " num-created " times in " (- (current-seconds) start-time) " seconds"))) - - - Index: dcommon.scm ================================================================== --- dcommon.scm +++ dcommon.scm @@ -1,14 +1,23 @@ ;;====================================================================== ;; Copyright 2006-2013, Matthew Welland. ;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. ;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . +;; ;;====================================================================== (use format) (require-library iup) (import (prefix iup iup:)) @@ -19,11 +28,11 @@ (declare (unit dcommon)) (declare (uses megatest-version)) (declare (uses gutils)) (declare (uses db)) -(declare (uses synchash)) +;; (declare (uses synchash)) (include "common_records.scm") (include "db_records.scm") (include "key_records.scm") (include "run_records.scm") @@ -85,185 +94,185 @@ ;; 3. Add extraction of filters to synchash calls ;; ;; NOTE: Used in newdashboard ;; ;; Mode is 'full or 'incremental for full refresh or incremental refresh -(define (dcommon:run-update keys data runname keypatts testpatt states statuses mode window-id) - (let* (;; count and offset => #f so not used - ;; the synchash calls modify the "data" hash - (changed #f) - (get-runs-sig (conc (client:get-signature) " get-runs")) - (get-tests-sig (conc (client:get-signature) " get-tests")) - (get-details-sig (conc (client:get-signature) " get-test-details")) - - ;; test-ids to get and display are indexed on window-id in curr-test-ids hash - (test-ids (hash-table-values (dboard:tabdat-curr-test-ids data))) - ;; run-id is #f in next line to send the query to server 0 - (run-changes (synchash:client-get 'db:get-runs get-runs-sig (length keypatts) data #f runname #f #f keypatts)) - (tests-detail-changes (if (not (null? test-ids)) - (synchash:client-get 'db:get-test-info-by-ids get-details-sig 0 data #f test-ids) - '())) - - ;; Now can calculate the run-ids - (run-hash (hash-table-ref/default data get-runs-sig #f)) - (run-ids (if run-hash (filter number? (hash-table-keys run-hash)) '())) - - (all-test-changes (let ((res (make-hash-table))) - (for-each (lambda (run-id) - (if (> run-id 0) - (hash-table-set! res run-id (synchash:client-get 'db:get-tests-for-run-mindata get-tests-sig 0 data run-id 1 testpatt states statuses #f)))) - run-ids) - res)) - (runs-hash (hash-table-ref/default data get-runs-sig #f)) - (header (hash-table-ref/default runs-hash "header" #f)) - (run-ids (sort (filter number? (hash-table-keys runs-hash)) - (lambda (a b) - (let* ((record-a (hash-table-ref runs-hash a)) - (record-b (hash-table-ref runs-hash b)) - (time-a (db:get-value-by-header record-a header "event_time")) - (time-b (db:get-value-by-header record-b header "event_time"))) - (> time-a time-b))) - )) - (runid-to-col (hash-table-ref *cachedata* "runid-to-col")) - (testname-to-row (hash-table-ref *cachedata* "testname-to-row")) - (colnum 1) - (rownum 0) - (cellname (conc rownum ":" colnum))) ;; rownum = 0 is the header -;; (debug:print 0 *default-log-port* "test-ids " test-ids ", tests-detail-changes " tests-detail-changes) - - ;; tests related stuff - ;; (all-testnames (delete-duplicates (map db:test-get-testname test-changes)))) - - ;; Given a run-id and testname/item_path calculate a cell R:C - - ;; NOTE: Also build the test tree browser and look up table - ;; - ;; Each run is unique on its keys and runname or run-id, store in hash on colnum - (for-each (lambda (run-id) - (let* ((run-record (hash-table-ref/default runs-hash run-id #f)) - (key-vals (map (lambda (key)(db:get-value-by-header run-record header key)) - keys)) - (run-name (db:get-value-by-header run-record header "runname")) - (col-name (conc (string-intersperse key-vals "\n") "\n" run-name)) - (run-path (append key-vals (list run-name)))) - (hash-table-set! (dboard:tabdat-run-keys data) run-id run-path) - ;; modify cell - but only if changed - (set! changed (dcommon:modifiy-if-different (dboard:tabdat-runs-matrix data) cellname col-name changed)) - (hash-table-set! runid-to-col run-id (list colnum run-record)) - ;; Here we update the tests treebox and tree keys - (tree:add-node (dboard:tabdat-tests-tree data) "Runs" (append key-vals (list run-name)) - userdata: (conc "run-id: " run-id)) - (set! colnum (+ colnum 1)))) - run-ids) - - ;; Scan all tests to be displayed and organise all the test names, respecting what is in the hash table - ;; Do this analysis in the order of the run-ids, the most recent run wins - (for-each (lambda (run-id) - (let* ((run-path (hash-table-ref (dboard:tabdat-run-keys data) run-id)) - (test-changes (hash-table-ref all-test-changes run-id)) - (new-test-dat (car test-changes)) - (removed-tests (cadr test-changes)) - (tests (sort (map cadr (filter (lambda (testrec) - (eq? run-id (db:mintest-get-run_id (cadr testrec)))) - new-test-dat)) - (lambda (a b) - (let ((time-a (db:mintest-get-event_time a)) - (time-b (db:mintest-get-event_time b))) - (> time-a time-b))))) - ;; test-changes is a list of (( id record ) ... ) - ;; Get list of test names sorted by time, remove tests - (test-names (delete-duplicates (map (lambda (t) - (let ((i (db:mintest-get-item_path t)) - (n (db:mintest-get-testname t))) - (if (string=? i "") - (conc " " i) - n))) - tests))) - (colnum (car (hash-table-ref runid-to-col run-id)))) - ;; for each test name get the slot if it exists and fill in the cell - ;; or take the next slot and fill in the cell, deal with items in the - ;; run view panel? The run view panel can have a tree selector for - ;; browsing the tests/items - - ;; SWITCH THIS TO USING CHANGED TESTS ONLY - (for-each (lambda (test) - (let* ((test-id (db:mintest-get-id test)) - (state (db:mintest-get-state test)) - (status (db:mintest-get-status test)) - (testname (db:mintest-get-testname test)) - (itempath (db:mintest-get-item_path test)) - (fullname (conc testname "/" itempath)) - (dispname (if (string=? itempath "") testname (conc " " itempath))) - (rownum (hash-table-ref/default testname-to-row fullname #f)) - (test-path (append run-path (if (equal? itempath "") - (list testname) - (list testname itempath)))) - (tb (dboard:tabdat-tests-tree data))) - (print "INFONOTE: run-path: " run-path) - (tree:add-node (dboard:tabdat-tests-tree data) "Runs" - test-path - userdata: (conc "test-id: " test-id)) - (let ((node-num (tree:find-node tb (cons "Runs" test-path))) - (color (car (gutils:get-color-for-state-status state status)))) - (debug:print 0 *default-log-port* "node-num: " node-num ", color: " color) - - (set! changed (dcommon:modifiy-if-different - tb - (conc "COLOR" node-num) - color changed)) - - ;; (iup:attribute-set! tb (conc "COLOR" node-num) color) - ) - (hash-table-set! (dboard:tabdat-path-test-ids data) test-path test-id) - (if (not rownum) - (let ((rownums (hash-table-values testname-to-row))) - (set! rownum (if (null? rownums) - 1 - (+ 1 (common:max rownums)))) - (hash-table-set! testname-to-row fullname rownum) - ;; create the label - (set! changed (dcommon:modifiy-if-different - (dboard:tabdat-runs-matrix data) - (conc rownum ":" 0) - dispname - changed)) - ;; (iup:attribute-set! (dboard:tabdat-runs-matrix data) - ;; (conc rownum ":" 0) dispname) - )) - ;; set the cell text and color - ;; (debug:print 2 *default-log-port* "rownum:colnum=" rownum ":" colnum ", state=" status) - (set! changed (dcommon:modifiy-if-different - (dboard:tabdat-runs-matrix data) - (conc rownum ":" colnum) - (if (member state '("ARCHIVED" "COMPLETED")) - status - state) - changed)) - ;; (iup:attribute-set! (dboard:tabdat-runs-matrix data) - ;; (conc rownum ":" colnum) - ;; (if (member state '("ARCHIVED" "COMPLETED")) - ;; status - ;; state)) - (set! changed (dcommon:modifiy-if-different - (dboard:tabdat-runs-matrix data) - (conc "BGCOLOR" rownum ":" colnum) - (car (gutils:get-color-for-state-status state status)) - changed)) - ;; (iup:attribute-set! (dboard:tabdat-runs-matrix data) - ;; (conc "BGCOLOR" rownum ":" colnum) - ;; (car (gutils:get-color-for-state-status state status))) - )) - tests))) - run-ids) - - (let ((updater (hash-table-ref/default (dboard:commondat-updaters commondat) window-id #f))) - (if updater (updater (hash-table-ref/default data get-details-sig #f)))) - - (if changed (iup:attribute-set! (dboard:tabdat-runs-matrix data) "REDRAW" "ALL")) - ;; (debug:print 2 *default-log-port* "run-changes: " run-changes) - ;; (debug:print 2 *default-log-port* "test-changes: " test-changes) - (list run-changes all-test-changes))) +;; (define (dcommon:run-update keys data runname keypatts testpatt states statuses mode window-id) +;; (let* (;; count and offset => #f so not used +;; ;; the synchash calls modify the "data" hash +;; (changed #f) +;; (get-runs-sig (conc (client:get-signature) " get-runs")) +;; (get-tests-sig (conc (client:get-signature) " get-tests")) +;; (get-details-sig (conc (client:get-signature) " get-test-details")) +;; +;; ;; test-ids to get and display are indexed on window-id in curr-test-ids hash +;; (test-ids (hash-table-values (dboard:tabdat-curr-test-ids data))) +;; ;; run-id is #f in next line to send the query to server 0 +;; (run-changes (synchash:client-get 'db:get-runs get-runs-sig (length keypatts) data #f runname #f #f keypatts)) +;; (tests-detail-changes (if (not (null? test-ids)) +;; (synchash:client-get 'db:get-test-info-by-ids get-details-sig 0 data #f test-ids) +;; '())) +;; +;; ;; Now can calculate the run-ids +;; (run-hash (hash-table-ref/default data get-runs-sig #f)) +;; (run-ids (if run-hash (filter number? (hash-table-keys run-hash)) '())) +;; +;; (all-test-changes (let ((res (make-hash-table))) +;; (for-each (lambda (run-id) +;; (if (> run-id 0) +;; (hash-table-set! res run-id (synchash:client-get 'db:get-tests-for-run-mindata get-tests-sig 0 data run-id 1 testpatt states statuses #f)))) +;; run-ids) +;; res)) +;; (runs-hash (hash-table-ref/default data get-runs-sig #f)) +;; (header (hash-table-ref/default runs-hash "header" #f)) +;; (run-ids (sort (filter number? (hash-table-keys runs-hash)) +;; (lambda (a b) +;; (let* ((record-a (hash-table-ref runs-hash a)) +;; (record-b (hash-table-ref runs-hash b)) +;; (time-a (db:get-value-by-header record-a header "event_time")) +;; (time-b (db:get-value-by-header record-b header "event_time"))) +;; (> time-a time-b))) +;; )) +;; (runid-to-col (hash-table-ref *cachedata* "runid-to-col")) +;; (testname-to-row (hash-table-ref *cachedata* "testname-to-row")) +;; (colnum 1) +;; (rownum 0) +;; (cellname (conc rownum ":" colnum))) ;; rownum = 0 is the header +;; ;; (debug:print 0 *default-log-port* "test-ids " test-ids ", tests-detail-changes " tests-detail-changes) +;; +;; ;; tests related stuff +;; ;; (all-testnames (delete-duplicates (map db:test-get-testname test-changes)))) +;; +;; ;; Given a run-id and testname/item_path calculate a cell R:C +;; +;; ;; NOTE: Also build the test tree browser and look up table +;; ;; +;; ;; Each run is unique on its keys and runname or run-id, store in hash on colnum +;; (for-each (lambda (run-id) +;; (let* ((run-record (hash-table-ref/default runs-hash run-id #f)) +;; (key-vals (map (lambda (key)(db:get-value-by-header run-record header key)) +;; keys)) +;; (run-name (db:get-value-by-header run-record header "runname")) +;; (col-name (conc (string-intersperse key-vals "\n") "\n" run-name)) +;; (run-path (append key-vals (list run-name)))) +;; (hash-table-set! (dboard:tabdat-run-keys data) run-id run-path) +;; ;; modify cell - but only if changed +;; (set! changed (dcommon:modifiy-if-different (dboard:tabdat-runs-matrix data) cellname col-name changed)) +;; (hash-table-set! runid-to-col run-id (list colnum run-record)) +;; ;; Here we update the tests treebox and tree keys +;; (tree:add-node (dboard:tabdat-tests-tree data) "Runs" (append key-vals (list run-name)) +;; userdata: (conc "run-id: " run-id)) +;; (set! colnum (+ colnum 1)))) +;; run-ids) +;; +;; ;; Scan all tests to be displayed and organise all the test names, respecting what is in the hash table +;; ;; Do this analysis in the order of the run-ids, the most recent run wins +;; (for-each (lambda (run-id) +;; (let* ((run-path (hash-table-ref (dboard:tabdat-run-keys data) run-id)) +;; (test-changes (hash-table-ref all-test-changes run-id)) +;; (new-test-dat (car test-changes)) +;; (removed-tests (cadr test-changes)) +;; (tests (sort (map cadr (filter (lambda (testrec) +;; (eq? run-id (db:mintest-get-run_id (cadr testrec)))) +;; new-test-dat)) +;; (lambda (a b) +;; (let ((time-a (db:mintest-get-event_time a)) +;; (time-b (db:mintest-get-event_time b))) +;; (> time-a time-b))))) +;; ;; test-changes is a list of (( id record ) ... ) +;; ;; Get list of test names sorted by time, remove tests +;; (test-names (delete-duplicates (map (lambda (t) +;; (let ((i (db:mintest-get-item_path t)) +;; (n (db:mintest-get-testname t))) +;; (if (string=? i "") +;; (conc " " i) +;; n))) +;; tests))) +;; (colnum (car (hash-table-ref runid-to-col run-id)))) +;; ;; for each test name get the slot if it exists and fill in the cell +;; ;; or take the next slot and fill in the cell, deal with items in the +;; ;; run view panel? The run view panel can have a tree selector for +;; ;; browsing the tests/items +;; +;; ;; SWITCH THIS TO USING CHANGED TESTS ONLY +;; (for-each (lambda (test) +;; (let* ((test-id (db:mintest-get-id test)) +;; (state (db:mintest-get-state test)) +;; (status (db:mintest-get-status test)) +;; (testname (db:mintest-get-testname test)) +;; (itempath (db:mintest-get-item_path test)) +;; (fullname (conc testname "/" itempath)) +;; (dispname (if (string=? itempath "") testname (conc " " itempath))) +;; (rownum (hash-table-ref/default testname-to-row fullname #f)) +;; (test-path (append run-path (if (equal? itempath "") +;; (list testname) +;; (list testname itempath)))) +;; (tb (dboard:tabdat-tests-tree data))) +;; (print "INFONOTE: run-path: " run-path) +;; (tree:add-node (dboard:tabdat-tests-tree data) "Runs" +;; test-path +;; userdata: (conc "test-id: " test-id)) +;; (let ((node-num (tree:find-node tb (cons "Runs" test-path))) +;; (color (car (gutils:get-color-for-state-status state status)))) +;; (debug:print 0 *default-log-port* "node-num: " node-num ", color: " color) +;; +;; (set! changed (dcommon:modifiy-if-different +;; tb +;; (conc "COLOR" node-num) +;; color changed)) +;; +;; ;; (iup:attribute-set! tb (conc "COLOR" node-num) color) +;; ) +;; (hash-table-set! (dboard:tabdat-path-test-ids data) test-path test-id) +;; (if (not rownum) +;; (let ((rownums (hash-table-values testname-to-row))) +;; (set! rownum (if (null? rownums) +;; 1 +;; (+ 1 (common:max rownums)))) +;; (hash-table-set! testname-to-row fullname rownum) +;; ;; create the label +;; (set! changed (dcommon:modifiy-if-different +;; (dboard:tabdat-runs-matrix data) +;; (conc rownum ":" 0) +;; dispname +;; changed)) +;; ;; (iup:attribute-set! (dboard:tabdat-runs-matrix data) +;; ;; (conc rownum ":" 0) dispname) +;; )) +;; ;; set the cell text and color +;; ;; (debug:print 2 *default-log-port* "rownum:colnum=" rownum ":" colnum ", state=" status) +;; (set! changed (dcommon:modifiy-if-different +;; (dboard:tabdat-runs-matrix data) +;; (conc rownum ":" colnum) +;; (if (member state '("ARCHIVED" "COMPLETED")) +;; status +;; state) +;; changed)) +;; ;; (iup:attribute-set! (dboard:tabdat-runs-matrix data) +;; ;; (conc rownum ":" colnum) +;; ;; (if (member state '("ARCHIVED" "COMPLETED")) +;; ;; status +;; ;; state)) +;; (set! changed (dcommon:modifiy-if-different +;; (dboard:tabdat-runs-matrix data) +;; (conc "BGCOLOR" rownum ":" colnum) +;; (car (gutils:get-color-for-state-status state status)) +;; changed)) +;; ;; (iup:attribute-set! (dboard:tabdat-runs-matrix data) +;; ;; (conc "BGCOLOR" rownum ":" colnum) +;; ;; (car (gutils:get-color-for-state-status state status))) +;; )) +;; tests))) +;; run-ids) +;; +;; (let ((updater (hash-table-ref/default (dboard:commondat-updaters commondat) window-id #f))) +;; (if updater (updater (hash-table-ref/default data get-details-sig #f)))) +;; +;; (if changed (iup:attribute-set! (dboard:tabdat-runs-matrix data) "REDRAW" "ALL")) +;; ;; (debug:print 2 *default-log-port* "run-changes: " run-changes) +;; ;; (debug:print 2 *default-log-port* "test-changes: " test-changes) +;; (list run-changes all-test-changes))) (define (dcommon:runsdat-get-col-num dat target runname force-set) (let* ((runs-index (dboard:runsdat-runs-index dat)) (col-name (conc target "/" runname)) (res (hash-table-ref/default runs-index col-name #f))) @@ -313,11 +322,12 @@ (let* ((test-id (db:test-get-id hed)) ;; look at the tests-dat spec for locations (test-name (db:test-get-testname hed)) (item-path (db:test-get-item-path hed)) (state (db:test-get-state hed)) (status (db:test-get-status hed)) - (newitem (list test-name item-path (list test-id state status)))) + (event-time (db:test-get-event_time hed)) + (newitem (list test-name item-path (list test-id state status event-time)))) (if (null? tal) (reverse (cons newitem res)) (loop (car tal)(cdr tal)(cons newitem res))))))) (define (dcommon:tests-mindat->hash tests-mindat) @@ -333,11 +343,14 @@ ;; return 1 if status1 is better ;; return 0 if status1 and 2 are equally good ;; return -1 if status2 is better (define (dcommon:status-compare3 status1 status2) (let* - ((status-goodness-ranking (list "PASS" "WARN" "WAIVED" "SKIP" "FAIL" "ABORT" #f)) + ((status-goodness-ranking (cdr ;; cdr to drop first item -- "n/a" + (append (map cadr *common:std-statuses*) + '(#f)) ;; algorithm requres last item to be #f + ) ) (mem1 (member status1 status-goodness-ranking)) (mem2 (member status2 status-goodness-ranking)) ) (cond ((and (not mem1) (not mem2)) 0) @@ -491,11 +504,11 @@ (define (dcommon:section-matrix rawconfig sectionname varcolname valcolname #!key (title #f)) (let* ((curr-row-num 1) (key-vals (configf:section-vars rawconfig sectionname)) (section-matrix (iup:matrix #:alignment1 "ALEFT" - #:expand "YES" ;; "HORIZONTAL" + ;; #:expand "YES" ;; "HORIZONTAL" #:numcol 1 #:numlin (length key-vals) #:numcol-visible 1 #:numlin-visible (min 10 (length key-vals)) #:scrollbar "YES"))) @@ -1137,28 +1150,29 @@ ;; (apply iup:hbox ;; (let* ((dat (dashboard:update-target-selector tabdat action-proc: update-keyvals)) ;; (key-lb (car dat)) ;; (combos (cadr dat))) ;; combos))) - (iup:hbox - ;; Text box for STATES - (iup:frame - #:title "States" - (dashboard:text-list-toggle-box - ;; Move these definitions to common and find the other useages and replace! - (map cadr *common:std-states*) ;; '("COMPLETED" "RUNNING" "STUCK" "INCOMPLETE" "LAUNCHED" "REMOTEHOSTSTART" "KILLED") - (lambda (all) - (dboard:tabdat-states-set! tabdat all) - (dashboard:update-run-command tabdat)))) - ;; Text box for STATES - (iup:frame - #:title "Statuses" - (dashboard:text-list-toggle-box - (map cadr *common:std-statuses*) ;; '("PASS" "FAIL" "n/a" "CHECK" "WAIVED" "SKIP" "DELETED" "STUCK/DEAD") - (lambda (all) - (dboard:tabdat-statuses-set! tabdat all) - (dashboard:update-run-command tabdat))))))) + ;; (iup:hbox + ;; ;; Text box for STATES + ;; (iup:frame + ;; #:title "States" + ;; (dashboard:text-list-toggle-box + ;; ;; Move these definitions to common and find the other useages and replace! + ;; (map cadr *common:std-states*) ;; '("COMPLETED" "RUNNING" "STUCK" "INCOMPLETE" "LAUNCHED" "REMOTEHOSTSTART" "KILLED") + ;; (lambda (all) + ;; (dboard:tabdat-states-set! tabdat all) + ;; (dashboard:update-run-command tabdat)))) + ;; ;; Text box for STATES + ;; (iup:frame + ;; #:title "Statuses" + ;; (dashboard:text-list-toggle-box + ;; (map cadr *common:std-statuses*) ;; '("PASS" "FAIL" "n/a" "CHECK" "WAIVED" "SKIP" "DELETED" "STUCK/DEAD") + ;; (lambda (all) + ;; (dboard:tabdat-statuses-set! tabdat all) + ;; (dashboard:update-run-command tabdat))))) + )) (define (dcommon:command-tests-tasks-canvas tabdat test-records sorted-testnames tests-draw-state) (iup:frame #:title "Tests and Tasks" (let* ((updater #f) @@ -1185,11 +1199,11 @@ (* scalef 0.01) (* scalef -0.01)))) (if the-cnv (dashboard:draw-tests the-cnv last-xadj last-yadj tests-draw-state sorted-testnames test-records)) )) - ;; #:size "50x50" + ;; #:size "250x250" #:expand "YES" #:scrollbar "YES" #:posx "0.5" #:posy "0.5" #:button-cb (lambda (obj btn pressed x y status) @@ -1243,26 +1257,39 @@ ;;====================================================================== ;; S T E P S ;;====================================================================== (define (dcommon:populate-steps teststeps steps-matrix) - (let ((max-row 0) - (max-col 7)) + (let ((max-row 0) + (max-col 9) + (white "255 255 255") + (running-color (car (gutils:get-color-for-state-status "RUNNING" "STARTED"))) + (failcolor (car (gutils:get-color-for-state-status "COMPLETED" "FAIL")))) (if (null? teststeps) (iup:attribute-set! steps-matrix "CLEARVALUE" "CONTENTS") (let loop ((hed (car teststeps)) (tal (cdr teststeps)) (rownum 1) (colnum 1)) (if (> rownum max-row)(set! max-row rownum)) - (let ((val (vector-ref hed (- colnum 1))) - (mtrx-rc (conc rownum ":" colnum))) + (let* ((status (vector-ref hed 3)) + (val (vector-ref hed (- colnum 1))) + (bgcolor (cond + ((member (conc status) '("" "-" "#")) + running-color) + ((member (conc status) '("0" 0)) + white) + (else failcolor))) + (mtrx-rc (conc rownum ":" colnum))) + ;;(print "BB> status=>"status"< bgcolor="bgcolor) (iup:attribute-set! steps-matrix mtrx-rc (if val (conc val) "")) + (if (< colnum 5) + (iup:attribute-set! steps-matrix (conc "BGCOLOR" mtrx-rc) bgcolor)) (if (< colnum max-col) (loop hed tal rownum (+ colnum 1)) (if (not (null? tal)) - (loop (car tal)(cdr tal)(+ rownum 1) 1)))))) + (loop (car tal) (cdr tal) (+ rownum 1) 1)))))) (if (> max-row 0) (begin ;; we are going to speculatively clear rows until we find a row that is already cleared (let loop ((rownum (+ max-row 1)) (colnum 0) DELETED defunct/multi-dboard.scm Index: defunct/multi-dboard.scm ================================================================== --- defunct/multi-dboard.scm +++ /dev/null @@ -1,801 +0,0 @@ -;;====================================================================== -;; Copyright 2006-2013, Matthew Welland. -;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. -;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. -;;====================================================================== - -(use format numbers sql-de-lite srfi-1 posix regex regex-case srfi-69 srfi-18 call-with-environment-variables) -(require-library iup) -(import (prefix iup iup:)) -(use canvas-draw) - -(declare (uses margs)) -(declare (uses megatest-version)) -(declare (uses gutils)) -(declare (uses tree)) -(declare (uses configf)) -(declare (uses portlogger)) -(declare (uses keys)) -(declare (uses common)) - -(include "common_records.scm") -;; (include "db_records.scm") -;; (include "key_records.scm") - -(define help (conc - "Megatest Dashboard, documentation at http://www.kiatoa.com/fossils/megatest - version " megatest-version " - license GPL, Copyright (C) Matt Welland 2011 - -Usage: dashboard [options] - -h : this help - -group groupname : display this group of areas - -test testid : control test identified by testid - -guimonitor : control panel for runs - -Misc - -rows N : set number of rows -")) - -;; process args -(define remargs (args:get-args - (argv) - (list "-group" ;; display this group of areas - "-debug" - ) - (list "-h" - "-v" - "-q" - ) - args:arg-hash - 0)) - -(if (args:get-arg "-h") - (begin - (print help) - (exit))) - -;; (if (args:get-arg "-host") -;; (begin -;; (set! (common:get-remote remote) (string-split (args:get-arg "-host" ":"))) -;; (client:launch)) -;; (client:launch)) - -(define *runremote* #f) -(define *windows* (make-hash-table)) -(define *changed-main* (make-hash-table)) ;; set path/... => #t -(define *changed-mutex* (make-mutex)) ;; use for all incoming change requests -(define *searchpatts* (make-hash-table)) - -(debug:setup) - -(define *tim* (iup:timer)) -(define *ord* #f) - -(iup:attribute-set! *tim* "TIME" 300) -(iup:attribute-set! *tim* "RUN" "YES") - -(define (message-window msg) - (iup:show - (iup:dialog - (iup:vbox - (iup:label msg #:margin "40x40"))))) - -(define (iuplistbox-fill-list lb items . default) - (let ((i 1) - (selected-item (if (null? default) #f (car default)))) - (iup:attribute-set! lb "VALUE" (if selected-item selected-item "")) - (for-each (lambda (item) - (iup:attribute-set! lb (number->string i) item) - (if selected-item - (if (equal? selected-item item) - (iup:attribute-set! lb "VALUE" item))) ;; (number->string i)))) - (set! i (+ i 1))) - items) - i)) - -(define (pad-list l n)(append l (make-list (- n (length l))))) - - -(define (mkstr . x) - (string-intersperse (map conc x) ",")) - -(define (update-search x val) - (hash-table-set! *searchpatts* x val)) - - -;;====================================================================== -;; R E C O R D S -;;====================================================================== - -;; NOTE: Consider switching to defstruct. - -;; data for an area (regression or testsuite) -;; -(define-record areadat - name ;; area name - path ;; mt run area home - configdat ;; megatest config - denoise ;; focal point for not putting out same messages over and over - client-signature ;; key for client-server conversation - remote ;; hash of all the client side connnections - run-keys ;; target keys for this area - runs ;; used in dashboard, hash of run-ids -> rundat - read-only ;; can I write to this area? - monitordb ;; db handle for monitor.db - maindb ;; db handle for main.db - ) - -;; rundat, basic run data -;; -(define-record rundat - id ;; the run-id - target ;; val1/val2 ... corrosponding to run-keys in areadat - runname - state ;; state of the run, symbol - status ;; status of the run, symbol - event-time ;; when the run was initiated - tests ;; hash of test-id -> testdat, QUESTION: separate by run-id? - db ;; db handle - ) - -;; testdat, basic test data -(define-record testdat - run-id ;; what run is this from - id ;; test id - testname ;; test name - itempath ;; item path - state ;; test state, symbol - status ;; test status, symbol - event-time ;; when the test started - duration ;; how long the test took - ) - -;; general data for the dboard application -;; -(define-record data - cfgdat ;; data from ~/.megatest/.dat - areas ;; hash of areaname -> area-rec - current-window-id ;; - current-tab-id ;; - update-needed ;; flag to indicate that the tab pointed to by current tab id needs refreshing immediately - tabs ;; hash of tab-id -> areaname (??) should be of type "tab" - ) - -;; all the components of an area display, all fits into a tab but -;; parts may be swapped in/out as needed -;; -(define-record tab - tree - matrix ;; the spreadsheet - areadat ;; the one-structure (one day dbstruct will be put in here) - view-path ;; //... - view-type ;; standard, etc. - controls ;; the controls - data ;; all the data kept in sync with db - filters ;; user filters, alist name -> filter record, eventually store these in ~/.megatest/.dat? - run-id ;; the current run-id - test-ids ;; the current test id hash, run-id => test-id - command ;; the command from the entry field - headers ;; hash of header -> colnum - rows ;; hash of rowname -> rownum - ) - -(define-record filter - target ;; hash of widgets for the target - runname ;; the runname widget - testpatt ;; the testpatt widget - ) - -;;====================================================================== -;; D B -;;====================================================================== - -;; These are all using sql-de-lite and independent of area so cannot use stuff -;; from db.scm - -;; NB// run-id=#f => return dbdir only -;; -(define (areadb:dbfile-path areadat run-id) - (let* ((cfgdat (areadat-configdat areadat)) - (dbdir (or (configf:lookup cfgdat "setup" "dbdir") - (conc (configf:lookup cfgdat "setup" "linktree") "/.db"))) - (fname (if run-id - (case run-id - ((-1) "monitor.db") - ((0) "main.db") - (else (conc run-id ".db"))) - #f))) - (handle-exceptions - exn - (begin - (debug:print-error 0 *default-log-port* "Couldn't create path to " dbdir) - (exit 1)) - (if (not (directory? dbdir))(create-directory dbdir #t))) - (if fname - (conc dbdir "/" fname) - dbdir))) - -;; -1 => monitor.db -;; 0 => main.db -;; >1 => .db -;; -(define (areadb:open areadat run-id) - (let* ((runs (areadat-runs areadat)) - (rundat (if (> run-id 0) ;; it is a run - (hash-table-ref/default runs run-id #f) - #f)) - (db (case run-id ;; if already opened, get the db and return it - ((-1) (areadat-monitordb areadat)) - ((0) (areadat-maindb areadat)) - (else (if rundat - (rundat-db rundat) - #f))))) - (if db - db ;; merely return the already opened db - (let* ((dbfile (areadb:dbfile-path areadat run-id)) ;; not already opened, so open it - (db (if (file-exists? dbfile) - (open-database dbfile) - (begin - (debug:print-error 0 *default-log-port* "I was asked to open " dbfile ", but file does not exist or is not readable.") - #f)))) - (case run-id - ((-1)(areadat-monitordb-set! areadat db)) - ((0) (areadat-maindb-set! areadat db)) - (else (rundat-db-set! rundat db))) - db)))) - -;; populate the areadat tests info, does NOT fill the tests data itself unless asked -;; -(define (areadb:populate-run-info areadat) - (let* ((runs (or (areadat-runs areadat) (make-hash-table))) - (keys (areadat-run-keys areadat)) - (maindb (areadb:open areadat 0))) - (if maindb - (query (for-each-row (lambda (row) - (let ((id (list-ref row 0)) - (dat (apply make-rundat (append row (list #f #f))))) ;; add placeholders for tests and db - (print row) - (hash-table-set! runs id dat)))) - (sql maindb (conc "SELECT id," - (string-intersperse keys "||'/'||") - ",runname,state,status,event_time FROM runs WHERE state != 'deleted';"))) - (debug:print-error 0 *default-log-port* "no main.db found at " (areadb:dbfile-path areadat 0))) - areadat)) - -;; given an areadat and target/runname patt fill up runs data -;; -;; ?????/ - -;; given a list of run-ids refresh/retrieve runs data into areadat -;; -(define (areadb:fill-tests areadat #!key (run-ids #f)) - (let* ((runs (or (areadat-runs areadat) (make-hash-table)))) - (for-each - (lambda (run-id) - (let* ((rundat (hash-table-ref/default runs run-id #f)) - (tests (if (and rundat - (rundat-tests rundat)) ;; re-use existing hash table? - (rundat-tests rundat) - (let ((ht (make-hash-table))) - (rundat-tests-set! rundat ht) - ht))) - (rundb (areadb:open areadat run-id))) - (query (for-each-row (lambda (row) - (let* ((id (list-ref row 0)) - (testname (list-ref row 1)) - (itempath (list-ref row 2)) - (state (list-ref row 3)) - (status (list-ref row 4)) - (eventtim (list-ref row 5)) - (duration (list-ref row 6))) - (hash-table-set! tests id - (make-testdat run-id id testname itempath state status eventtim duration))))) - (sql rundb "SELECT id,testname,item_path,state,status,event_time,run_duration FROM tests WHERE state != 'DELETED';")))) - (or run-ids (hash-table-keys runs))) - areadat)) - - -;; initialize and refresh data -;; -(define (dboard:general-updater con port) - (for-each - (lambda (window-id) - ;; (print "Processing for window-id " window-id) - (let* ((window-dat (hash-table-ref *windows* window-id)) - (areas (data-areas window-dat)) - ;; (keys (areadat-run-keys area-dat)) - (tabs (data-tabs window-dat)) - (tab-ids (hash-table-keys tabs)) - (current-tab (if (null? tab-ids) - #f - (hash-table-ref tabs (car tab-ids)))) - (current-tree (if (null? tab-ids) #f (tab-tree current-tab))) - (current-node (if (null? tab-ids) 0 (string->number (iup:attribute current-tree "VALUE")))) - (current-path (if (eq? current-node 0) - "Areas" - (string-intersperse (tree:node->path current-tree current-node) "/"))) - (current-matrix (if (null? tab-ids) #f (tab-matrix current-tab))) - (seen-nodes (make-hash-table)) - (path-changed (if current-tab - (equal? current-path (tab-view-path current-tab)) - #t))) - ;; (debug:print-info 0 *default-log-port* "Current path: " current-path) - ;; now for each area in the window gather the data - (if path-changed - (begin - (debug:print-info 0 *default-log-port* "clearing matrix - path changed") - (dboard:clear-matrix current-tab))) - (for-each - (lambda (area-name) - ;; (print "Processing for area-name " area-name) - (let* ((area-dat (hash-table-ref areas area-name)) - (area-path (areadat-path area-dat)) - (runs (areadat-runs area-dat))) - (if (hash-table-ref/default *changed-main* area-path 'processed) - (begin - (print "Processing " area-dat " for area-name " area-name) - (hash-table-set! *changed-main* area-path #f) - (areadb:populate-run-info area-dat) - (for-each - (lambda (run-id) - (let* ((run (hash-table-ref runs run-id)) - (target (rundat-target run)) - (runname (rundat-runname run))) - (if current-tree - (let* ((partial-path (append (string-split target "/")(list runname))) - (full-path (cons area-name partial-path))) - (if (not (hash-table-exists? seen-nodes full-path)) - (begin - (print "INFO: Adding node " partial-path " to section " area-name) - (tree:add-node current-tree "Areas" full-path) - (areadb:fill-tests area-dat run-ids: (list run-id)))) - (hash-table-set! seen-nodes full-path #t))))) - (hash-table-keys runs)))) - (if (or (equal? "Areas" current-path) - (string-match (conc "^Areas/" area-name "(|\\/.*)$") current-path)) - (dboard:redraw-area area-name area-dat current-tab current-matrix current-path)))) - (hash-table-keys areas)))) - (hash-table-keys *windows*))) - -;;====================================================================== -;; D A S H B O A R D D B -;;====================================================================== - -;; All moved to common.scm - -;;====================================================================== -;; T R E E -;;====================================================================== - -;; - - - - - -(define (dashboard:tree-browser data adat window-id) - ;; (iup:split - (let* ((tb (iup:treebox - #:value 0 - #:title "Areas" - #:expand "YES" - #:addexpanded "NO" - #:selection-cb - (lambda (obj id state) - ;; (print "obj: " obj ", id: " id ", state: " state) - (let* ((tree-path (tree:node->path obj id)) - (area (car tree-path)) - (areadat-path (cdr tree-path))) - #f - ;; (test-id (tree-path->test-id (cdr run-path)))) - ;; (if test-id - ;; (hash-table-set! (dboard:data-curr-test-ids *data*) - ;; window-id test-id)) - ;; (print "path: " (tree:node->path obj id) " test-id: " test-id)))))) - ))))) - ;; (iup:attribute-set! tb "VALUE" "0") - ;; (iup:attribute-set! tb "NAME" "Runs") - ;; (iup:attribute-set! tb "ADDEXPANDED" "NO") - ;; (dboard:data-tests-tree-set! *data* tb) - tb)) - -;;====================================================================== -;; M A I N M A T R I X -;;====================================================================== - -;; General displayer -;; -(define (dashboard:main-matrix data adat window-id) - (let* (;; (tab-dat (areadat- - (view-matrix (iup:matrix - ;; (runs-for-targ (db:get-runs-by-patt *dbstruct-local* *keys* "%" target #f #f #f)) - #:expand "YES" - ;; #:fittosize "YES" - #:resizematrix "YES" - #:scrollbar "YES" - #:numcol 100 - #:numlin 100 - #:numcol-visible 3 - #:numlin-visible 20 - #:click-cb (lambda (obj lin col status) - (print "obj: " obj " lin: " lin " col: " col " status: " status " value: " (iup:attribute obj "VALUE")))))) - - ;; (iup:attribute-set! view-matrix "RESIZEMATRIX" "YES") - (iup:attribute-set! view-matrix "WIDTH0" "100") - ;; (dboard:data-runs-matrix-set! *data* runs-matrix) - ;; (iup:hbox - ;; (iup:frame - ;; #:title "Runs browser" - ;; (iup:vbox - view-matrix)) - -;;====================================================================== -;; A R E A S -;;====================================================================== - -(define (dashboard:init-area data area-name apath) - (let* ((mtconf (dboard:read-mtconf apath)) - (area-dat (let ((ad (make-areadat - area-name ;; area name - apath ;; path to area - ;; 'http ;; transport - mtconf ;; megatest.config - (make-hash-table) ;; denoise hash - #f ;; client-signature - #f ;; remote connections - (keys:config-get-fields mtconf) ;; run keys - (make-hash-table) ;; run-id -> (hash of test-ids => dat) - (and (file-exists? apath)(file-write-access? apath)) ;; read-only - #f - #f - ))) - (hash-table-set! (data-areas data) area-name ad) - ad))) - area-dat)) - -;; given the keys for an area and a path from the tree browser -;; return the level: areas area runs run tests test -;; -(define (dboard:get-view-type keys current-path) - (let* ((path-parts (string-split current-path "/")) - (path-len (length path-parts))) - (cond - ((equal? current-path "Areas") 'areas) - ((eq? path-len 2) 'area) - ((<= (+ (length keys) 2) path-len) 'runs) - (else 'run)))) - -(define (dboard:clear-matrix tab) - (if tab - (begin - (iup:attribute-set! (tab-matrix tab) "CLEARVALUE" "ALL") - (tab-headers-set! tab (make-hash-table)) - (tab-rows-set! tab (make-hash-table))))) - -;; full redraw of a given area -;; -(define (dboard:redraw-area area-name area-dat tab-dat current-matrix current-path) - (let* ((keys (areadat-run-keys area-dat)) - (runs (areadat-runs area-dat)) - (headers (tab-headers tab-dat)) - (rows (tab-rows tab-dat)) - (used-cols (hash-table-values headers)) - (used-rows (hash-table-values rows)) - (touched (make-hash-table)) ;; (vector row col) ==> true, touched cell - (view-type (dboard:get-view-type keys current-path)) - (changed #f) - (state-statuses (list "PASS" "FAIL" "WARN" "CHECK" "SKIP" "RUNNING" "LAUNCHED"))) - ;; (debug:print 0 *default-log-port* "current-matrix=" current-matrix) - (case view-type - ((areas) ;; find row for this area, if not found, create new entry - (let* ((curr-rownum (hash-table-ref/default rows area-name #f)) - (next-rownum (+ (apply max (cons 0 used-rows)) 1)) - (rownum (or curr-rownum next-rownum)) - (coord (conc rownum ":0"))) - (if (not curr-rownum)(hash-table-set! rows area-name rownum)) - (if (not (equal? (iup:attribute current-matrix coord) area-name)) - (begin - (let loop ((hed (car state-statuses)) - (tal (cdr state-statuses)) - (count 1)) - (if (not (equal? (iup:attribute current-matrix (conc "0:" count)) hed)) - (iup:attribute-set! current-matrix (conc "0:" count) hed)) - (iup:attribute-set! current-matrix (conc rownum ":" count) "0") - (if (not (null? tal)) - (loop (car tal)(cdr tal)(+ count 1)))) - (debug:print-info 0 *default-log-port* "view-type=" view-type ", rownum=" rownum ", curr-rownum=" curr-rownum ", next-rownum=" next-rownum ", coord=" coord ", area-name=" area-name) - (iup:attribute-set! current-matrix coord area-name) - (set! changed #t)))))) - (if changed (iup:attribute-set! current-matrix "REDRAW" "ALL")))) - - - - ;; (dboard:clear-matrix current-matrix used-cols used-rows touched) ;; clear all - - - -;;====================================================================== -;; D A S H B O A R D -;;====================================================================== - -(define (dashboard:area-panel aname data window-id) - (let* ((apath (configf:lookup (data-cfgdat data) aname "path")) ;; (hash-table-ref (dboard:data-cfgdat data) area-name)) - ;; (hash-table-ref (dboard:data-cfgdat data) aname)) - (area-dat (dashboard:init-area data aname apath)) - (tb (dashboard:tree-browser data area-dat window-id)) ;; (dboard:areas-tree-browser data) - (ad (dashboard:main-matrix data area-dat window-id)) - (areas (data-areas data)) - (dboard-dat (make-tab - #f ;; tree - #f ;; matrix - area-dat ;; - #f ;; view path - 'default ;; view type - #f ;; controls - (make-hash-table) ;; cached data? not sure how to use this yet :) - #f ;; filters - #f ;; the run-id - (make-hash-table) ;; run-id -> test-id, for current test id - "" - (make-hash-table) ;; headername -> colnum - (make-hash-table) ;; rowname -> rownum - ))) - (hash-table-set! (data-areas data) aname area-dat) ;; dboard-dat) - (hash-table-set! (data-tabs data) window-id dboard-dat) - (tab-tree-set! dboard-dat tb) - (tab-matrix-set! dboard-dat ad) - (iup:split - #:value 200 - tb ad))) - - -;; Main Panel -;; -(define (dashboard:main-panel data window-id) - (iup:dialog - #:title "Megatest Control Panel" -;; #:menu (dcommon:main-menu data) - #:shrink "YES" - (iup:vbox - (let* ((area-names (hash-table-keys (data-cfgdat data))) - (area-panels (map (lambda (aname) - (dashboard:area-panel aname data window-id)) - area-names)) - (tabtop (apply iup:tabs - #:tabchangepos-cb (lambda (obj curr prev) - (data-current-tab-id-set! data curr) - (data-update-needed-set! data #t) - (print "Tab is: " curr ", prev was " prev)) - area-panels)) - (tabs (data-tabs data))) - (if (not (null? area-names)) - (let loop ((index 0) - (hed (car area-names)) - (tal (cdr area-names))) - ;; (hash-table-set! tabs index hed) - (debug:print 0 *default-log-port* "Adding area " hed " with index " index " to dashboard") - (iup:attribute-set! tabtop (conc "TABTITLE" index) hed) - (if (not (null? tal)) - (loop (+ index 1)(car tal)(cdr tal))))) - tabtop)))) - - -;;====================================================================== -;; N A N O M S G S E R V E R -;;====================================================================== - -(define (dboard:server-service soc port) - (print "server starting") - (let loop ((msg-in (nn-recv soc)) - (count 0)) - (if (eq? 0 (modulo count 1000)) - (print "server received: " msg-in ", count=" count)) - (cond - ;; - ;; quit - ;; - ((equal? msg-in "quit") - (nn-send soc "Ok, quitting")) - ;; - ;; ping - ;; - ((and (>= (string-length msg-in) 4) - (equal? (substring msg-in 0 4) "ping")) - (nn-send soc (conc (current-process-id))) - (loop (nn-recv soc)(+ count 1))) - ;; - ;; main changed - ;; - ((and (>= (string-length msg-in) 4) - (equal? (substring msg-in 0 4) "main")) - (let ((parts (string-split msg-in " "))) - (hash-table-set! *changed-main* (cadr parts) #t) - (nn-send soc "got it!"))) - ;; - ;; ?? - ;; - (else - (nn-send soc "hello " msg-in " you got to the else clause!"))) - (loop (nn-recv soc)(if (> count 20000000) - 0 - (+ count 1))))) - -(define (dboard:one-time-ping-receive soc port) - (let ((msg-in (nn-recv soc))) - (if (and (>= (string-length msg-in) 4) - (equal? (substring msg-in 0 4) "ping")) - (nn-send soc (conc (current-process-id)))))) - -(define (dboard:server-start given-port #!key (num-tries 200)) - (let* ((rep (nn-socket 'rep)) - (port (or given-port (portlogger:main "find"))) - (con (conc "tcp://*:" port))) - ;; register this connect here .... - (nn-bind rep con) - (thread-start! - (make-thread (lambda () - (dboard:one-time-ping-receive rep port)) - "one time receive thread")) - (if (dboard:ping-self "localhost" port) - (begin - (print "INFO: dashboard nanomsg server started on " port) - (values rep port)) - (begin - (print "WARNING: couldn't create server on port " port) - (portlogger:main "set" "failed") - (if (> num-tries 0) - (dboard:server-start #f (- num-tries 1)) - (begin - (print "ERROR: failed to start nanomsg server") - (values #f #f))))))) - -(define (dboard:server-close con port) - (nn-close con) - (portlogger:main "set" port "released")) - -(define (dboard:ping-self host port #!key (return-socket #t)) - ;; send a random number along with pid and check that we get it back - (let* ((req (nn-socket 'req)) - (key "ping") - (success #f) - (keepwaiting #t) - (ping (make-thread - (lambda () - (print "ping: sending string \"" key "\", expecting " (current-process-id)) - (nn-send req key) - (let ((result (nn-recv req))) - (if (equal? (conc (current-process-id)) result) - (begin - (print "ping, success: received \"" result "\"") - (set! success #t)) - (begin - (print "ping, failed: received key \"" result "\"") - (set! keepwaiting #f) - (set! success #f))))) - "ping")) - (timeout (make-thread (lambda () - (let loop ((count 0)) - (thread-sleep! 1) - (print "still waiting after " count " seconds...") - (if (and keepwaiting (< count 10)) - (loop (+ count 1)))) - (if keepwaiting - (begin - (print "timeout waiting for ping") - (thread-terminate! ping)))) - "timeout"))) - (nn-connect req (conc "tcp://" host ":" port)) - (handle-exceptions - exn - (begin - (print-call-chain) - (print 0 " message: " ((condition-property-accessor 'exn 'message) exn)) - (print "exn=" (condition->list exn)) - (print "ping failed to connect to " host ":" port)) - (thread-start! timeout) - (thread-start! ping) - (thread-join! ping) - (if success (thread-terminate! timeout))) - (if return-socket - (if success req #f) - (begin - (nn-close req) - success)))) - -;;====================================================================== -;; C O N F I G U R A T I O N -;;====================================================================== - -;; Get the configuration file for a group name, if the group name is "default" and it doesn't -;; exist, create it and add the current path if it contains megatest.config -;; -(define (dboard:get-config group-name) - (let* ((fname (conc (getenv "HOME") "/.megatest/" group-name ".dat"))) - (if (file-exists? fname) - (read-config fname (make-hash-table) #t) - (if (dboard:create-config fname) - (dboard:get-config group-name) - (make-hash-table))))) - -(define (dboard:create-config fname) - ;; (handle-exceptions - ;; exn - ;; - ;; #f ;; failed to create - just give up - (let* ((dirname (pathname-directory fname)) - (file-name (pathname-strip-directory fname)) - (curr-mtcfgdat (find-config "megatest.config" - toppath: (or (get-environment-variable "MT_RUN_AREA_HOME")(current-directory)))) - (curr-mtcfg (if (and curr-mtcfgdat (not (null? curr-mtcfgdat)))(cadr curr-mtcfgdat) #f)) - (curr-mtpath (if curr-mtcfg (car curr-mtcfgdat) #f))) - (if curr-mtpath - (begin - (debug:print-info 0 *default-log-port* "Creating config file " fname) - (if (not (file-exists? dirname)) - (create-directory dirname #t)) - (with-output-to-file fname - (lambda () - (let ((aname (pathname-strip-directory curr-mtpath))) - (print "[" aname "]") - (print "path " curr-mtpath)))) - #t) - (begin - (debug:print-info 0 *default-log-port* "Need to create a config but no megatest.config found: " curr-mtcfgdat) - #f)))) -;; ) - -(define (dboard:read-mtconf apath) - (let* ((mtconffile (conc apath "/megatest.config"))) - (call-with-environment-variables - (list (cons "MT_RUN_AREA_HOME" apath)) - (lambda () - (read-config mtconffile (make-hash-table) #f)) ;; megatest.config - ))) - - -;;====================================================================== -;; G U I S T U F F -;;====================================================================== - -;;; main. Theoretically could have multiple windows (each with a group of tags, thus window-id -;;; -(define (dboard:make-window window-id) - (let* (;; (window-id 0) - (groupn (or (args:get-arg "-group") "default")) - (cfgdat (dboard:get-config groupn)) - ;; (cfgdat (if (file-exists? cfname)(read-config cfname (make-hash-table) #t)(make-hash-table))) - (data (make-data - cfgdat ;; this is the data from ~/.megatest for the selected group - (make-hash-table) ;; areaname -> area-rec - 0 ;; current window id - 0 ;; current tab id - #f ;; redraw needed for current tab id - (make-hash-table) ;; tab-id -> areaname - ))) - (hash-table-set! *windows* window-id data) - (iup:show (dashboard:main-panel data window-id)) - (iup:main-loop))) - -;; ease debugging by loading ~/.dashboardrc -(let ((debugcontrolf (conc (get-environment-variable "HOME") "/.dashboardrc"))) - (if (file-exists? debugcontrolf) - (load debugcontrolf))) - -(define (main) - (let-values - (((con port)(dboard:server-start #f))) - (let ((portnum (if (string? port)(string->number port) port))) - ;; got here, monitor/dashboard was started - (mddb:register-dashboard portnum) - (thread-start! (make-thread (lambda ()(dboard:server-service con portnum)) "server service")) - (thread-start! (make-thread (lambda () - (let loop () - (dboard:general-updater con portnum) - (thread-sleep! 1) - (loop))) "general updater")) - (dboard:make-window 0) - (mddb:unregister-dashboard (get-host-name) portnum) - (dboard:server-close con port)))) - DELETED defunct/nmsg-transport.scm Index: defunct/nmsg-transport.scm ================================================================== --- defunct/nmsg-transport.scm +++ /dev/null @@ -1,358 +0,0 @@ - -;; Copyright 2006-2012, Matthew Welland. -;; -;; This program is made available under the GNU GPL version 2.0 or -;; greater. See the accompanying file COPYING for details. -;; -;; This program is distributed WITHOUT ANY WARRANTY; without even the -;; implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR -;; PURPOSE. - -(require-extension (srfi 18) extras tcp s11n) - -(use sqlite3 srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest) -(import (prefix sqlite3 sqlite3:)) - -;; (use nanomsg) - -(declare (unit nmsg-transport)) - -(declare (uses common)) -(declare (uses db)) -(declare (uses tests)) -(declare (uses tasks)) ;; tasks are where stuff is maintained about what is running. -(declare (uses server)) - -(include "common_records.scm") -(include "db_records.scm") - -;; Transition to pub --> sub with pull <-- push -;; -;; 1. client sends request to server via push to the pull port -;; 2. server puts request in queue or processes immediately as appropriate -;; 3. server puts responses from completed requests into pub port -;; -;; TODO -;; -;; Done Tested -;; [x] [ ] 1. Add columns pullport pubport to servers table -;; [x] [ ] 2. Add rm of monitor.db if older than 11/12/2012 -;; [x] [ ] 3. Add create of pullport and pubport with finding of available ports -;; [x] [ ] 4. Add client compose of request -;; [x] [ ] - name of client: testname/itempath-test_id-hostname -;; [x] [ ] - name of request: callname, params -;; [x] [ ] - request key: f(clientname, callname, params) -;; [x] [ ] 5. Add processing of subscription hits -;; [x] [ ] - done when get key -;; [x] [ ] - return results -;; [x] [ ] 6. Add timeout processing -;; [x] [ ] - after 60 seconds -;; [ ] [ ] i. check server alive, connect to new if necessary -;; [ ] [ ] ii. resend request -;; [ ] [ ] 7. Turn self ping back on - -(define (nmsg-transport:make-server-url hostport #!key (bindall #f)) - (if (not hostport) - #f - (conc "tcp://" (if bindall "*" (car hostport)) ":" (cadr hostport)))) - -(define *server-loop-heart-beat* (current-seconds)) -(define *heartbeat-mutex* (make-mutex)) - -;;====================================================================== -;; S E R V E R -;;====================================================================== - -(define (nmsg-transport:run dbstruct hostn run-id server-id #!key (retrynum 1000)) - (debug:print 2 *default-log-port* "Attempting to start the server ...") - (let* ((start-port (portlogger:open-run-close portlogger:find-port)) - (server-thread (make-thread (lambda () - (nmsg-transport:try-start-server dbstruct run-id start-port server-id)) - "server thread")) - (tdbdat (tasks:open-db))) - (thread-start! server-thread) - (thread-sleep! 0.1) - (if (nmsg-transport:ping hostn start-port timeout: 2 expected-key: (current-process-id)) - (let ((interface (if (equal? hostn "-")(get-host-name) hostn))) - (tasks:server-set-interface-port (db:delay-if-busy tdbdat) server-id interface start-port) - (tasks:server-set-state! (db:delay-if-busy tdbdat) server-id "dbprep") - (set! *server-info* (list hostn start-port)) ;; probably not needed anymore? currently used by keep-running - (thread-sleep! 3) ;; give some margin for queries to complete before switching from file based access to server based access - ;; (set! *inmemdb* dbstruct) - (tasks:server-set-state! (db:delay-if-busy tdbdat) server-id "running") - (thread-start! (make-thread - (lambda ()(nmsg-transport:keep-running server-id run-id)) - "keep running")) - (thread-join! server-thread)) - (if (> retrynum 0) - (begin - (debug:print 0 *default-log-port* "WARNING: Failed to connect to server (self) on host " hostn ":" start-port ", trying again.") - (tasks:server-delete-record (db:delay-if-busy tdbdat) server-id "failed to start, never received server alive signature") - (portlogger:open-run-close portlogger:set-failed start-port) - (nmsg-transport:run dbstruct hostn run-id server-id)) - (begin - (debug:print-error 0 *default-log-port* "could not find an open port to start server on. Giving up") - (exit 1)))))) - -(define (nmsg-transport:try-start-server dbstruct run-id portnum server-id) - (let ((repsoc (nn-socket 'rep))) - (nn-bind repsoc (conc "tcp://*:" portnum)) - (let loop ((msg-in (nn-recv repsoc))) - (let* ((dat (db:string->obj msg-in transport: 'nmsg))) - (debug:print 0 *default-log-port* "server, received: " dat) - (let ((result (api:execute-requests dbstruct dat))) - (debug:print 0 *default-log-port* "server, sending: " result) - (nn-send repsoc (db:obj->string result transport: 'nmsg))) - (loop (nn-recv repsoc)))))) - -;; all routes though here end in exit ... -;; -(define (nmsg-transport:launch run-id) - (let* ((tdbdat (tasks:open-db)) - (dbstruct (db:setup run-id)) - (hostn (or (args:get-arg "-server") "-"))) - (set! *run-id* run-id) - (set! *inmemdb* dbstruct) - ;; with nbfake daemonize isn't really needed - ;; - ;; (if (args:get-arg "-daemonize") - ;; (begin - ;; (daemon:ize) - ;; (if *alt-log-file* ;; we should re-connect to this port, I think daemon:ize disrupts it - ;; (begin - ;; (current-error-port *alt-log-file*) - ;; (current-output-port *alt-log-file*))))) - (if (server:check-if-running run-id) - (begin - (debug:print-info 0 *default-log-port* "Server for run-id " run-id " already running") - (exit 0))) - (let loop ((server-id (tasks:server-lock-slot (db:delay-if-busy tdbdat) run-id)) - (remtries 4)) - (if (not server-id) - (if (> remtries 0) - (begin - (thread-sleep! 2) - (if (not (server:check-if-running run-id)) - (loop (tasks:server-lock-slot (db:delay-if-busy tdbdat) run-id) - (- remtries 1)) - (begin - (debug:print-info 0 *default-log-port* "Another server took the slot, exiting") - (exit 0)))) - (begin - ;; since we didn't get the server lock we are going to clean up and bail out - (debug:print-info 2 *default-log-port* "INFO: server pid=" (current-process-id) ", hostname=" (get-host-name) " not starting due to other candidates ahead in start queue") - (tasks:server-delete-records-for-this-pid (db:delay-if-busy tdbdat) " http-transport:launch") - )) - ;; locked in a server id, try to start up - (nmsg-transport:run dbstruct hostn run-id server-id)) - (set! *didsomething* #t) - (exit)))) - -;;====================================================================== -;; S E R V E R U T I L I T I E S -;;====================================================================== - -(define (nmsg-transport:mk-signature) - (message-digest-string (md5-primitive) - (with-output-to-string - (lambda () - (write (list (current-directory) - (argv))))))) - -;;====================================================================== -;; C L I E N T S -;;====================================================================== - -;; ping the server at host:port -;; return the open socket if successful (return-socket == #t) -;; expect the key expected-key returned in payload -;; send our-key or #f as payload -;; -(define (nmsg-transport:ping hostn port #!key (timeout 3)(return-socket #t)(expected-key #f)(our-key #f)(socket #f)) - ;; send a random number along with pid and check that we get it back - (let* ((host (if (or (not hostn) - (equal? hostn "-")) ;; use localhost - (get-host-name) - hostn)) - (req (or socket - (let ((soc (nn-socket 'req))) - (nn-connect soc (conc "tcp://" host ":" port)) - soc))) - (success #t) - (dat (vector "ping" our-key)) - (result (condition-case - (nmsg-transport:client-api-send-receive-raw req dat timeout: timeout) - ((timeout)(set! success #f) #f))) - (key (if success - (vector-ref result 1) - #f))) - (debug:print 0 *default-log-port* "success=" success ", key=" key ", expected-key=" expected-key ", equal? " (equal? key expected-key)) - (if (and success - (or (not expected-key) ;; just getting a reply is good enough then - (equal? key expected-key))) - (if return-socket - req - (begin - (if (not socket)(nn-close req)) ;; don't want a side effect of closing socket if handed it - #t)) - (begin - (if (not socket)(nn-close req)) ;; failed to ping, close socket as side effect - #f)))) - -;; send data to server, wait max of timeout seconds for a response. -;; return #( success/fail result ) -;; -;; for effiency it is easier to do the obj->string and string->obj here. -;; -(define (nmsg-transport:client-api-send-receive-raw socreq indat #!key (enable-send #t)(timeout 25)) - (let* ((success #f) - (result #f) - (keepwaiting #t) - (dat (db:obj->string indat transport: 'nmsg)) - (send-recv (make-thread - (lambda () - (nn-send socreq dat) - (let* ((res (nn-recv socreq))) - (set! success #t) - (set! result (db:string->obj res transport: 'nmsg)))) - "send-recv")) - (timeout (make-thread - (lambda () - (let loop ((count 0)) - (thread-sleep! 1) - (debug:print-info 1 *default-log-port* "send-receive-raw, still waiting after " count " seconds...") - (if (and keepwaiting (< count timeout)) ;; yes, this is very aproximate - (loop (+ count 1)))) - (if keepwaiting - (begin - (print "timeout waiting for ping") - (thread-terminate! send-recv)))) - "timeout"))) - ;; replace with condition-case? - (handle-exceptions - exn - (set! result "timeout") - (thread-start! timeout) - (thread-start! send-recv) - (thread-join! send-recv) - (if success (thread-terminate! timeout))) - ;; raise timeout error if timed out - (if success - (if (and (vector? result) - (vector-ref result 0)) ;; did it fail at the server? - result ;; nope, all good - (begin - (debug:print-error 0 *default-log-port* "error occured at server, info=" (vector-ref result 2)) - (debug:print 0 *default-log-port* " client call chain:") - (print-call-chain (current-error-port)) - (debug:print 0 *default-log-port* " server call chain:") - (pp (vector-ref result 1) (current-error-port)) - (signal (vector-ref result 0)))) - (signal (make-composite-condition - (make-property-condition 'timeout 'message "nmsg-transport:client-api-send-receive-raw timed out talking to server")))))) - -;; run nmsg-transport:keep-running in a parallel thread to monitor that the db is being -;; used and to shutdown after sometime if it is not. -;; -(define (nmsg-transport:keep-running server-id run-id) - ;; if none running or if > 20 seconds since - ;; server last used then start shutdown - ;; This thread waits for the server to come alive - (let* ((server-info (let loop () - (let ((sdat #f)) - (mutex-lock! *heartbeat-mutex*) - (set! sdat *server-info*) - (mutex-unlock! *heartbeat-mutex*) - (if sdat - (begin - (debug:print-info 0 *default-log-port* "keep-running got sdat=" sdat) - sdat) - (begin - (thread-sleep! 0.5) - (loop)))))) - (iface (car server-info)) - (port (cadr server-info)) - (last-access 0) - (tdbdat (tasks:open-db)) - (server-timeout (let ((tmo (configf:lookup *configdat* "server" "timeout"))) - (if (and (string? tmo) - (string->number tmo)) - (* 60 60 (string->number tmo)) - ;; (* 3 24 60 60) ;; default to three days - (* 60 1) ;; default to one minute - ;; (* 60 60 25) ;; default to 25 hours - )))) - (print "Keep-running got server pid " server-id ", using iface " iface " and port " port) - (let loop ((count 0)) - (thread-sleep! 4) ;; no need to do this very often - ;; NB// sync currently does NOT return queue-length - (let () ;; (queue-len (cdb:client-call server-info 'sync #t 1))) - ;; (print "Server running, count is " count) - (if (< count 1) ;; 3x3 = 9 secs aprox - (loop (+ count 1))) - - (mutex-lock! *heartbeat-mutex*) - (set! last-access *last-db-access*) - (mutex-unlock! *heartbeat-mutex*) - (db:sync-touched *inmemdb* run-id force-sync: #t) - (if (and *server-run* - (> (+ last-access server-timeout) - (current-seconds))) - (begin - (debug:print-info 0 *default-log-port* "Server continuing, seconds since last db access: " (- (current-seconds) last-access)) - (loop 0)) - (begin - (debug:print-info 0 *default-log-port* "Starting to shutdown the server.") - (set! *time-to-exit* #t) - (db:sync-touched *inmemdb* run-id force-sync: #t) - (tasks:server-delete-record (db:delay-if-busy tdbdat) server-id " http-transport:keep-running") - (debug:print-info 0 *default-log-port* "Server shutdown complete. Exiting") - (exit) - )))))) - -;;====================================================================== -;; C L I E N T S -;;====================================================================== - -(define (nmsg-transport:client-connect iface portnum) - (let* ((reqsoc (nmsg-transport:ping iface portnum return-socket: #t))) - (vector iface portnum #f #f #f (current-seconds) reqsoc))) - -;; returns result, there is no sucess/fail flag - handled via excpections -;; -(define (nmsg-transport:client-api-send-receive run-id connection-info cmd param #!key (remtries 5)) - ;; NB// In the html version of this routine there is a call to - ;; tasks:kill-server-run-id when there is an exception - (mutex-lock! *http-mutex*) - (let* ((packet (vector cmd param)) - (reqsoc (http-transport:server-dat-get-socket connection-info)) - (res (nmsg-transport:client-api-send-receive-raw reqsoc packet))) -;; (status (vector-ref rawres 0)) -;; (result (vector-ref rawres 1))) - (mutex-unlock! *http-mutex*) - res)) ;; (vector status (if status (db:string->obj result transport: 'nmsg) result)))) - -;;====================================================================== -;; J U N K -;;====================================================================== - -;; DO NOT USE -;; -(define (nmsg-transport:client-signal-handler signum) - (handle-exceptions - exn - (debug:print 0 *default-log-port* " ... exiting ...") - (let ((th1 (make-thread (lambda () - (if (not *received-response*) - (receive-message* *runremote*))) ;; flush out last call if applicable - "eat response")) - (th2 (make-thread (lambda () - (debug:print-error 0 *default-log-port* "Received ^C, attempting clean exit. Please be patient and wait a few seconds before hitting ^C again.") - (thread-sleep! 3) ;; give the flush three seconds to do it's stuff - (debug:print 0 *default-log-port* " Done.") - (exit 4)) - "exit on ^C timer"))) - (thread-start! th2) - (thread-start! th1) - (thread-join! th2)))) - Index: diff-report.scm ================================================================== --- diff-report.scm +++ diff-report.scm @@ -1,5 +1,22 @@ +;; Copyright 2006-2017, Matthew Welland. +;; +;; This file is part of Megatest. +;; +;; Megatest is free software: you can redistribute it and/or modify +;; it under the terms of the GNU General Public License as published by +;; the Free Software Foundation, either version 3 of the License, or +;; (at your option) any later version. +;; +;; Megatest is distributed in the hope that it will be useful, +;; but WITHOUT ANY WARRANTY; without even the implied warranty of +;; MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +;; GNU General Public License for more details. +;; +;; You should have received a copy of the GNU General Public License +;; along with Megatest. If not, see . +;; (declare (unit diff-report)) (declare (uses common)) (declare (uses rmt)) Index: docs/Makefile ================================================================== --- docs/Makefile +++ docs/Makefile @@ -1,5 +1,23 @@ +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . +# + ASCPATH = $(shell which asciidoc) EXEPATH = $(shell readlink -f $(ASCPATH)) BINPATH = $(shell dirname $(EXEPATH)) DISPATH = $(shell dirname $(BINPATH)) @@ -13,5 +31,7 @@ fossil add html/* megatest.pdf : megatest.lyx lyx -e pdf2 megatest.lyx +pkts.pdf : pkts.dot + dot -Tpdf pkts.dot -o pkts.pdf DELETED docs/api.html Index: docs/api.html ================================================================== --- docs/api.html +++ /dev/null @@ -1,1024 +0,0 @@ - - - - - -Megatest Web App API Specificiation - - - - - -
    -
    -
    -

    Megatest Web App

    -
      -
    1. -

      -See runs -

      -
      2. -
    2. -

      -Manage jobs -

      -
      3. -
    3. -

      -Debug -

      -
      4. -
    -
    -
    -
    -

    Example Abstract

    -
    -

    The Megatest Web App aims to make as much of the power of the dashboard available to the web based user.

    -
    -
    -
    -

    1. Common

    -
    -

    This is an example endpoint. You will need to use your own cgi server to serve out your megatest runs.

    -

    Endpoint: http://kiatoa.com/cgi-bin/megatest

    -
    -

    1.1. Error format response

    -

    All API errors are returned in the following format:

    -
    -
    -

    { "error" : "Error message" }

    -
    -
    -
    -

    1.2. Get List of Runs

    -

    URL: <base>/runs

    -

    Method: GET

    -

    Filter Params: target, testpatt, offset, limit

    -

    Megatest Cmd: megatest -start-dir <path to megatest area> -list-runs % -target % -dumpmode json -fields runs:runname,id+tests:state,status:id

    -

    Response:

    -
    -
    -

    [ - { - "run_id" : "1", - "name" : "runname1", - "target" : "target1", - "tests" : - [ - "test": - [ - {"id": 1, "name":test1, "item_path": "", "shortdir": "/temp/foo/bar/target1/runname1/test1", "final_logf": "megatest-rollup-test1.html", "status": "PASS#"} - {"id": 2, "name":test2, "item_path": "", "shortdir": "/temp/foo/bar/target1/runname1/test2", "final_logf": "megatest-rollup-test2.html", "status": "PASS"} - {"id": 3, "name":test3, "item_path": "", "shortdir": "/temp/foo/bar/target1/runname1/test3", "final_logf": "megatest-rollup-test3.html", "status": "PASS"} - ] - ] - }, - { - "run_id" : "2", - "name" : "runname2", - "target" : "target2", - "tests" : - [ - "test: - [ - {"id": 4, "name":[blue]test1, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test1", "final_logf": "megatest-rollup-test1.html", "status": "PASS"} - {"id": 5, "name":[blue]test2, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test2", "final_logf": "megatest-rollup-test2.html", "status": "FAIL"} - {"id": 6, "name":test3, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test3", "final_logf": "megatest-rollup-test3.html", "status": "PASS"} - ] - ] - } -]

    -
    -
    -
    -

    1.3. Trigger a new Run

    -

    URL: <base>/runs

    -

    Method: POST

    -

    Megatest Cmd: megatest -runtests % -target <target> :runname <run_name> -run

    -

    Request Params:

    -
    -
    -

    {"target": "target_value", "runname" : "runname", "test_pattern": "optional test pattern"}

    -
    -

    Response:

    -

    If Error

    -
    -
    -

    { "error" : "Error message" }

    -
    -

    If Success returns the results of the run

    -
    -
    -

    [ - { - "run_id" : "2", - "name" : "runname2", - "target" : "target2", - "tests" : - [ - "test: - [ - {"id": 4, "name":[blue]test1, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test1", "final_logf": "megatest-rollup-test1.html", "status": "PASS"} - {"id": 5, "name":[blue]test2, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test2", "final_logf": "megatest-rollup-test2.html", "status": "FAIL"} - {"id": 6, "name":test3, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test3", "final_logf": "megatest-rollup-test3.html", "status": "PASS"} - ] - ] - } -]

    -
    -
    -
    -

    1.4. Get perticular Run

    -

    URL: <base>/runs/:id

    -

    Method: GET

    -

    Filter Params: testpatt

    -

    Megatest Cmd: megatest -start-dir <path to megatest area> -list-runs <runname> -target % -dumpmode json -fields runs:runname,id+tests:state,status:id

    -

    Response:

    -
    -
    -

    [ - { - "run_id" : "2", - "name" : "runname2", - "target" : "target2", - "tests" : - [ - "test": - [ - {"id": 4, "name":[blue]test1, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test1", "final_logf": "megatest-rollup-test1.html", "status": "PASS"} - {"id": 5, "name":[blue]test2, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test2", "final_logf": "megatest-rollup-test2.html", "status": "FAIL"} - {"id": 6, "name":test3, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test3", "final_logf": "megatest-rollup-test3.html", "status": "PASS"} - ] - ] - } -]

    -
    -
    -
    -

    1.5. Re-execute a run

    -

    URL: <base>/runs/:id

    -

    Method: PUT/PATCH

    -

    Request Params: {"testpatt" : "pattern"}

    -

    Response:

    -
    -
    -

    [ - { - "run_id" : "2", - "name" : "runname2", - "target" : "target2", - "tests" : - [ - "test": - [ - {"id": 4, "name":[blue]test1, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test1", "final_logf": "megatest-rollup-test1.html", "status": "PASS"} - {"id": 5, "name":[blue]test2, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test2", "final_logf": "megatest-rollup-test2.html", "status": "FAIL"} - {"id": 6, "name":test3, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test3", "final_logf": "megatest-rollup-test3.html", "status": "PASS"} - ] - ] - } -]

    -
    -
    -
    -

    1.6. Get List of tests within a run

    -

    URL: <base>/runs/:id/tests

    -

    Method: GET

    -

    Megatest Cmd: megatest -start-dir <path to megatest area> -list-runs <runname> -target % -dumpmode json -fields runs:runname,id+tests:state,status:id

    -

    Response:

    -
    -
    -

    [ - "tests" : - [ - {"id": 4, "name":[blue]test1, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test1", "final_logf": "megatest-rollup-test1.html", "status": "PASS"} - {"id": 5, "name":[blue]test2, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test2", "final_logf": "megatest-rollup-test2.html", "status": "FAIL"} - {"id": 6, "name":test3, "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test3", "final_logf": "megatest-rollup-test3.html", "status": "PASS"} - ] -]

    -
    -
    -
    -

    1.7. Re-execute a test within a run

    -

    URL: <base>/runs/:id/tests/:id

    -

    Method: PUT/PATCH

    -

    Response:

    -
    -
    -

    {"id": "4", "name":"test1", "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test1", "final_logf": "megatest-rollup-test1.html", "status": "PASS"}

    -
    -
    -
    -

    1.8. Get perticular test that belongs to a Runs

    -

    URL: <base>/runs/:id/tests/:id

    -

    Method: GET

    -

    Megatest Cmd: megatest -start-dir <path to megatest area> -list-runs <runname> -target % -testpattern <pattern> -dumpmode json -fields runs:runname,id+tests:state,status:id

    -

    Response:

    -
    -
    -

    {"id": "4", "name":"test1", "item_path": "", "shortdir": "/temp/foo/bar/target2/runname2/test1", "final_logf": "megatest-rollup-test1.html", "status": "PASS"}

    -
    -
    -
    -
    -
    -

    2. Notes

    -
    -

    Misc …

    -
      -
    1. -

      -blah -

      -
      2. -
    2. -

      -baz -

      -
      3. -
    -
    -
    -
    -
    - - - Index: docs/api.txt ================================================================== --- docs/api.txt +++ docs/api.txt @@ -15,10 +15,29 @@ ---------------- The Megatest Web App aims to make as much of the power of the dashboard available to the web based user. :numbered: + +// Copyright 2006-2017, Matthew Welland. +// +// This file is part of Megatest. +// +// Megatest is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Megatest is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Megatest. If not, see . + + Common ------ This is an example endpoint. You will need to use your own cgi server to serve out your megatest runs. ADDED docs/architecture-brainstorming.fig Index: docs/architecture-brainstorming.fig ================================================================== --- /dev/null +++ docs/architecture-brainstorming.fig @@ -0,0 +1,118 @@ +#FIG 3.2 Produced by xfig version 3.2.5-alpha5 +Landscape +Center +Inches +Letter +100.00 +Single +-2 +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . +1200 2 +6 1425 2475 2925 4050 +1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 2175 2812 750 263 1425 3075 2925 2550 +1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 2175 3713 750 263 1425 3976 2925 3451 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 1425 2850 1425 3750 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 2925 2850 2925 3750 +-6 +6 8775 2625 10275 4200 +1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 9525 2962 750 263 8775 3225 10275 2700 +1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 9525 3863 750 263 8775 4126 10275 3601 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 8775 3000 8775 3900 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 10275 3000 10275 3900 +-6 +6 450 750 1950 2325 +1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 1200 1087 750 263 450 1350 1950 825 +1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 1200 1988 750 263 450 2251 1950 1726 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 450 1125 450 2025 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 1950 1125 1950 2025 +-6 +6 11775 5100 13275 6675 +1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 12525 5437 750 263 11775 5700 13275 5175 +1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 12525 6338 750 263 11775 6601 13275 6076 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 11775 5475 11775 6375 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 13275 5475 13275 6375 +-6 +6 225 4950 11250 9225 +6 4125 6300 5625 7875 +1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 4875 6637 750 263 4125 6900 5625 6375 +1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 4875 7538 750 263 4125 7801 5625 7276 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 4125 6675 4125 7575 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 5625 6675 5625 7575 +-6 +6 9000 5700 10500 7275 +1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 9750 6037 750 263 9000 6300 10500 5775 +1 2 0 1 0 7 50 -1 -1 0.000 1 0.0000 9750 6938 750 263 9000 7201 10500 6676 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 9000 6075 9000 6975 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 + 10500 6075 10500 6975 +-6 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 1 2 + 0 0 1.00 60.00 120.00 + 0 0 1.00 60.00 120.00 + 5850 7050 8775 6375 +2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 + 225 4950 11250 4950 11250 9225 225 9225 225 4950 +4 0 0 50 -1 0 12 0.0000 4 150 780 9300 5325 IDEA #1\001 +4 0 0 50 -1 0 12 0.0000 4 195 2160 3975 8100 megatest.db in main area\001 +4 0 0 50 -1 0 12 0.0000 4 195 2400 8625 7350 megatest.db in satellite area\001 +4 0 0 50 -1 0 12 0.0000 4 195 1740 8850 7650 (compatible targets)\001 +4 0 0 50 -1 0 12 0.0000 4 150 765 3900 8775 NEEDS:\001 +4 0 0 50 -1 0 12 0.0000 4 195 5565 3900 9030 enhancements to dashboard to make viewing mulitple areas easy\001 +-6 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 2925 3225 8700 3300 +2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 + 14700 4950 16500 4950 16500 6900 14700 6900 14700 4950 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 13275 5925 14700 5925 +2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 + 0 0 1.00 60.00 120.00 + 16500 6000 17625 6000 +2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 + 17625 4050 20250 4050 20250 7875 17625 7875 17625 4050 +2 4 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5 + 14325 5850 14325 4950 13575 4950 13575 5850 14325 5850 +2 4 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5 + 17550 5925 17550 5025 16575 5025 16575 5925 17550 5925 +2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 + 225 300 11250 300 11250 4725 225 4725 225 300 +4 0 0 50 -1 0 12 0.0000 4 195 1440 1275 4425 tmp megatest.db\001 +4 0 0 50 -1 0 12 0.0000 4 195 1065 8775 4500 megatest.db\001 +4 0 0 50 -1 0 12 0.0000 4 150 1065 750 2475 ref database\001 +4 0 0 50 -1 0 12 0.0000 4 150 510 9300 825 NOW\001 +4 0 0 50 -1 0 12 0.0000 4 150 210 12300 7050 db\001 +4 0 0 50 -1 0 12 0.0000 4 150 525 15150 7125 cache\001 +4 0 0 50 -1 0 12 0.0000 4 195 600 18225 8100 display\001 +4 0 0 50 -1 0 12 0.0000 4 150 390 13650 5250 filter\001 +4 0 0 50 -1 0 12 0.0000 4 150 255 13650 5505 via\001 +4 0 0 50 -1 0 12 0.0000 4 195 240 13650 5760 sql\001 +4 0 0 50 -1 0 12 0.0000 4 150 315 16725 5325 2nd\001 +4 0 0 50 -1 0 12 0.0000 4 150 390 16725 5580 filter\001 DELETED docs/html/dashboard-test.png Index: docs/html/dashboard-test.png ================================================================== --- docs/html/dashboard-test.png +++ /dev/null cannot compute difference between binary files DELETED docs/html/dashboard.png Index: docs/html/dashboard.png ================================================================== --- docs/html/dashboard.png +++ /dev/null cannot compute difference between binary files DELETED docs/html/megatest.html Index: docs/html/megatest.html ================================================================== --- docs/html/megatest.html +++ /dev/null @@ -1,1717 +0,0 @@ - - - - - - - - -Megatest User Manual - - -
    -
    - -
    -
    - -
    -
    - -
    -

    -Megatest User Manual -

    -

    -Matthew Welland -

    -

    -Jan. 29, 2012 -

    -
    -


    -

    -©2011 Matthew Welland. All rights reserved. -
    -
    -Megatest is free software released under the General Public License v2.0. Please see the file COPYING in the source distribution for details. -
    -
    -
    Email: matt@kiatoa.com. -
    -
    -Web: www.kiatoa.com/fossils/megatest -
    -
    -
    This document is believed to be acurate at the time of writing but as with any opensource project the source code itself is the reference. It is the responsibility of the end user to validate that the code will perform as they expect. The author assumes no responsibility for any inaccuracies that this document may contain. In no event will Matthew Welland be liable for direct, indirect, special, exemplary, incidental, or consequential damages resulting from any defect or omission in this document, even if advised of the possibility of such damages. -
    -
    -This document is a snapshot in time and Megatest software has likely changed since publication. This document and Megatest may be improved at any time, without notice or obligation. -
    -
    -


    -

    - -
    -

    -Megatest/document Revision History -

    -
    -Notable revisions of the software are occasionally documented here. -
    -
    -
    - - - - - - - - - - - - - - - - -
    -Version - -Author - -Description - -Date -
    -v1.25 - -matt - -converted to new document template - -\thedate -
    - -
    - -
    -
    -


    -

    -
    -
    -Table of Contents -
    -
    -
    -Section: Megatest/document Revision History -
    -
    -Section 1: Introduction -
    -
    -
    -Subsection 1.1: Megatest design philosophy -
    -
    -Subsection 1.2: Megatest architecture -
    -
    -
    -Section 2: Installation -
    -
    -
    -Subsection 2.1: Dependencies -
    -
    -Subsection 2.2: Build and Install -
    -
    -
    -Section 3: Setup -
    -
    -
    -Subsection 3.1: Create megatest.config -
    -
    -Subsection 3.2: Create runconfigs.config -
    -
    -Subsection 3.3: Create the tests directory and your first test -
    -
    -Subsection 3.4: Create the testconfig file for your test -
    -
    -Subsection 3.5: Create your test running script, main.sh -
    -
    -Subsection 3.6: Run megatest and watch your run progress -
    -
    -
    -Section 4: Choose Flow or Unstructured Run? -
    -
    -Section 5: How to Write Tests -
    -
    -
    -Subsection 5.1: A Simple Test with one Step -
    -
    -Subsection 5.2: Create your testconfig file -
    -
    -Subsection 5.3: Create the main.csh script -
    -
    -Subsection 5.4: Simple Test with Multiple Steps -
    -
    -
    -Section 6: Simple Test with Multiple Steps, Some in Parallel -
    -
    -
    -Subsection 6.1: The Makefile -
    -
    -Subsection 6.2: The main.csh file -
    -
    -
    -Section 7: Simple Test with Iteration -
    -
    -
    -Subsection 7.1: Update your testconfig file for iteration -
    -
    -Subsection 7.2: Rewrite your main.csh for iteration -
    -
    -Subsection 7.3: Tests with Inter-test dependencies -
    -
    -Subsection 7.4: Rolling up Miscellaneous Data -
    -
    -Subsection 7.5: Rolling up Runs -
    -
    -
    -Section 8: Dashboard -
    -
    -Section 9: Generating an OpenDocument Spreadsheet from the Database -
    -
    -Section 10: Introspection -
    -
    -
    -Subsection 10.1: Getting previous test paths -
    -
    -
    -Section 11: Flows -
    -
    -Section 12: Flow Specification and Running (Not released yet) -
    -
    -
    -Subsection 12.1: Write your flow file -
    -
    -Subsection 12.2: Run the flow -
    -
    -
    -Section 13: Monitor based running -
    -
    -
    -Subsection 13.1: Monitor logic -
    -
    -
    -Section 14: Reference -
    -
    -
    -Subsection 14.1: Configuration file Syntax -
    -
    -
    -Subsubsection 14.1.1: Sections -
    -
    -Subsubsection 14.1.2: Variables -
    -
    -Subsubsection 14.1.3: Includes -
    -
    -Subsubsection 14.1.4: Setting a variable by running a command -
    -
    -Subsubsection 14.1.5: Notes -
    -
    -
    -Subsection 14.2: Environment variables -
    -
    -Subsection 14.3: megatest.config -
    -
    -Subsection 14.4: runconfigs.config file -
    -
    -Subsection 14.5: Writing tests -
    -
    -
    -Subsubsection 14.5.1: testconfig file -
    -
    -Subsubsection 14.5.2: Command line -
    -
    -
    -
    -Appendix A: Data -
    -
    -Appendix B: References -
    -
    - -
    - -
    -
    -


    -

    - -
    -

    -1 Introduction -

    -

    -1.1 Megatest design philosophy -

    -
    -Megatest is intended to provide the minimum needed resources to make writing a suite of tests and implementing continuous build for software, design engineering or process control (via owlfs for example) without being specialized for any specific problem space. Megatest in of itself does not know what constitutes a PASS or FAIL of a test. In most cases megatest is best used in conjunction with logpro or a similar tool to parse, analyze and decide on the test outcome. -
    -

    -1.2 Megatest architecture -

    -
    -All data to specify the tests and configure the system is stored in plain text files. All system state is stored in an sqlite3 database. Tests are launched using the launching system available for the distributed compute platform in use. A template script is provided which can launch jobs on local and remote Linux hosts. Currently megatest uses the network filesystem to “call home” to your master sqlite3 database. -
    -

    -2 Installation -

    -

    -2.1 Dependencies -

    -
    -Chicken scheme and a number of “eggs” are required for building megatest. See the file utils/installall.sh for an automated way to install the dependencies on Linux. -
    -

    -2.2 Build and Install -

    -
    -Run “make test” to create the megatest executable. You may wish to copy the executable to a centrally accessible location. -
    -

    -3 Setup -

    -

    -3.1 Create megatest.config -

    -
    -Create the file megatest.config using the megatest.config template from the tests directory. At a minimum you need the following: -
    -
    -
    -
    # Fields are the keys under which your test runs are organized
-[fields]
-field1 TEXT
-field2 TEXT
-​
-[jobtools]
-# The launcher launches jobs to the local or remote hosts,
-# the job is managed on the target host by megatest,
-# comment out launcher to run local only. An example launcher
-# "nbfake" can be found in the utils directory. 
-launcher nbfake
-​
-# The disks section specifies where the tests will be run. As you
-# run out of space in a partition you can add additional disks
-# entries.
-# Format is:
-# name /path/to/area 
-[disks]
-disk1 /tmp 
-
    -
    - -
    -

    -3.2 Create runconfigs.config -

    -
    -This file is used to set environment variables that are run specific. You can simply create an empty file to start. -
    -
    -
    -
    # runconfigs.config
-
    -
    - -
    -

    -3.3 Create the tests directory and your first test -

    -
    -
    -
    mt
-|-- megatest.config
-|-- runconfigs.config
-‘-- tests
-    ‘-- mytest
-        |-- main.sh
-        ‘-- testconfig
-
    -
    - -
    -

    -3.4 Create the testconfig file for your test -

    -
    -
    -
    [setup]
-runscript main.sh
-
    -
    - -
    -

    -3.5 Create your test running script, main.sh -

    -
    -
    -
    #!/bin/bash
-​
-$MT_MEGATEST -runstep mystep1 "sleep 20;echo Done" -m "mystep1 is done"
-$MT_MEGATEST -test-status :state COMPLETED :status PASS -m "This is a comment"
-
    -
    - -
    -

    -3.6 Run megatest and watch your run progress -

    -
    -
    -
    megatest :field1 abc :field2 def :runname 2011week08.4a -runall
-​
-watch megatest -list-runs %
-​
-# OR use the dashboard
-​
-dashboard &
-
    -
    - -
    -

    -4 Choose Flow or Unstructured Run? -

    -
    -A flow is a structured and specifically sequenced set of tests. See the Flows chapter to understand the difference. -
    -

    -5 How to Write Tests -

    -

    -5.1 A Simple Test with one Step -

    -
    -
    -
    mkdir simpletest
-cd simpletest
-
    -
    - -
    -

    -5.2 Create your testconfig file -

    -
    -
    -
    # testconfig
-​
-[setup]
-runscript main.csh
-
    -
    - -
    -

    -5.3 Create the main.csh script -

    -
    -Note: Using csh is NOT recommended. Use bash, perl, ruby, zsh or anything other than csh. We use csh here because it is popular in the EDA industry for which Megatest was originally created. -
    -
    -
    -
    -
    #!/bin/tcsh -x
-​
-# run the cpu1 simulation.
-#   The step name is "run_simulation"
-#   The commandline being run for this step is "runsim cpu1"
-#   The logpro file to validate the output from the run is "runsim.logpro"
-​
-$MT_MEGATEST -runstep run_simulation -logpro runsim.logpro "runsim cpu1"
-$MT_MEGATEST -test-status :state COMPLETED :status $?
-
    -
    - -
    - -
    -
    -You can now run megatest and the created test directory will contain the new files “run_simulation.html” and “run_simulation.log”. If you are using the dashboard you can click on the run and then push the “View log” button to view the log file in firefox. -
    -

    -5.4 Simple Test with Multiple Steps -

    -
    -To run multiple steps simply add them to the main.csh file. Here we add a step to test “cpu2”. The second step that tests cpu2 will only run after the step that tested “cpu1” completes. -
    -
    -
    -
    #!/bin/tcsh -x
-​
-# run the cpu1 simulation.
-#   The step name is "run_simulation"
-#   The commandline being run for this step is "runsim cpu1"
-#   The logpro file to validate the output from the run is "runsim.logpro"
-​
-$MT_MEGATEST -runstep run_simulation_cpu1 -logpro runsim.logpro "runsim cpu1" && \
-$MT_MEGATEST -runstep run_simulation_cpu2 -logpro runsim.logpro "runsim cpu2"
-$MT_MEGATEST -test-status :state COMPLETED :status $?
-
    -
    - -
    -

    -6 Simple Test with Multiple Steps, Some in Parallel -

    -

    -6.1 The Makefile -

    -
    -A good way to run steps in parallel within a single test, especially when there are following steps, is to use the Unix Make utility. Writing Makefiles is beyond the scope of this document but here is a minimal example that will run “runsim cpu1” and “runsim cpu2” in parallel. For more information on make try “info make” at the Linux command prompt. -
    -
    -
    -
    # Example Makefile to run two steps in parallel
-​
-RTLDIR=/path/to/rtl
-CPUS = cpu1 cpu2
-​
-run_simulation_$(CPUS).html : $(RTLDIR)/$(CPUS)
-	$(MT_MEGATEST) -runstep run_simulation_$(CPUS) -logpro runsim.logpro "runsim $(CPUS)
-
    -
    - -
    -

    -6.2 The main.csh file -

    -
    -
    -
    #!/bin/tcsh -x
-​
-# run the cpu1 and cpu2 simulations in parallel. 
-# The -j parameter tells make how many jobs it may run in parallel
-​
-
    
-make -j 2 
-
    
-
-$MT_MEGATEST -test-status :state COMPLETED :status $?
-
    -
    - -
    -

    -7 Simple Test with Iteration -

    -
    -Since no jobs run after the cpu1 and cpu2 simulations in this test it is possible to use iterated mode. -
    -

    -7.1 Update your testconfig file for iteration -

    -
    -
    -
    [setup]
-runscript main.csh
-
    
-
-
    
-
-[items]
-CPU cpu1 cpu2
-
    -
    - -
    -

    -7.2 Rewrite your main.csh for iteration -

    -
    -
    -
    #!/bin/tcsh -x
-
-# run the cpu simulation but now use the environment variable $CPU
-# to select what cpu to run the simulation against
-
-$MT_MEGATEST -runstep run_simulation -logpro runsim.logpro "runsim $CPU"
-# As of version 1.07 Megatest automatically converts a status of "0"
-# to "PASS", any other number to "FAIL" and directly uses the value of
-# a string passed in.
-$MT_MEGATEST -test-status :state COMPLETED :status $?
-
    -
    - -
    -

    -7.3 Tests with Inter-test dependencies -

    -
    -Sometimes a test depends on the output from a previous test or it may not make sense to run a test is another test does not complete with status “PASS”. In either of these scenarios you can use the “waiton” keyword in your testconfig file to indicate that this test must wait on one or more tests to complete before being launched. In this example there is no point in running the “system” test if the “cpu” and “mem” tests either do not complete or complete but with status “FAIL”. -
    -
    -
    -
    # testconfig for the "system" test
-[setup]
-runscript main.csh
-waiton cpu mem
-
    -
    - -
    -

    -7.4 Rolling up Miscellaneous Data -

    -
    -Use the -load-test-data switch to roll up arbitrary data from a test into the test_data table. -
    -
    -
    -
    # Fields are:
-# category,variable,value,expected,tol,units,comment,status
-​
-$MT_MEGATEST -load-test-data << EOF
-foo,bar,1.2,1.9,>
-foo,rab,1.0e9,10e9,1e9
-foo,bla,1.2,1.9,<
-foo,bal,1.2,1.2,<,,Check for overload
-foo,alb,1.2,1.2,<=,Amps,This is the high power circuit test
-foo,abl,1.2,1.3,0.1
-foo,bra,1.2,pass,silly stuff
-faz,bar,10,8mA,,,"this is a comment"
-EOF
-
    -
    - -
    -
    -New entries are keyed on the category and variable. If a new record is inserted with a category and variable that have already been used the new record will replace the old record. -
    -
    -Where value, expected and tol are specified the behavior is as follows. -
    -
      -
    • -If value, expected and tol are numbers then status is calculated as PASS if (expected-tol) <= value <= (expected+tol) -
      • -
    • -If value and expected are numbers and tol is >, <, >= or <= then value is compared with expected using the operator given by tol -
      • -
    • -If status is specified its value overrides the above calculations. -
      • - -
    -

    -7.5 Rolling up Runs -

    -
    -To roll up a number of tests in a sequence of runs to a single run use the -rollup command. -
    -
    -
    -
    megatest -rollup :sysname ubuntu :fsname nfs :datapath none :runname rollup_ww38
-
    -
    - -
    -
    -All keys must be specified and the runname is the name of the run that will be created. All paths are kept original inside the database. When -remove-runs is used to delete runs the data is not deleted if there are rollups that refer to the data. -
    -

    -8 Dashboard -

    -
    -
    -
    > dashboard &
-
    -
    - -
    -
    -figure dashboard.png - -
    -
    -Pushing one of the buttons on the main dashboard will bring up the test specific dashboard. Values are updated in semi-real time as the test runs. -
    -
    -figure dashboard-test.png - -
    -

    -9 Generating an OpenDocument Spreadsheet from the Database -

    -
    -And OpenDocument multi-paned spreadsheet can be generated from the megatest.db file by running -extract-ods -
    -
    -
    -
    megatest -extract-ods results.ods :runname % 
-
    -
    - -
    -
    -You can optionally specify the keys for your database to limit further the runs to extract into the spreadsheet. The first sheet contains all the run data and subsequent sheets contain data rolled up for the individual tests. -
    -

    -10 Introspection -

    -

    -10.1 Getting previous test paths -

    -
    -
    -
    megatest -test-paths -target %/%/% :runname % -testpatt % -itempatt % :status PASS 
-
    -
    - -
    -

    -11 Flows -

    -
    -A flow specifies the tests to run, the order and dependencies and is managed by a running megatest process. -
    -

    -12 Flow Specification and Running (Not released yet) -

    -

    -12.1 Write your flow file -

    -
    -flows/<flowname>.config -
    -
    -
    -
    # Flow: <flowname>
-[flowconfig]
-# turn on item level dependencies
-itemdeps on
-​
-[flowsteps]
-# <testname>[,<predecessor>]
-​
-# Run the test "copydata"
-copydata
-​
-# Run the test "setup" after copydata completes with PASS, WARN or WAIVE
-setup,copydata
-​
-# once the test "setup" completes successfully run sim1, sim2 and sim3
-sim1,setup
-sim2,setup
-sim3,setup
-
    -
    - -
    -

    -12.2 Run the flow -

    -
    -
    -
    megatest -runflow <flowname> :FIELD1 val1 :FIELD2 val2 :runname wk32.4
-
    -
    - -
    -

    -13 Monitor based running -

    -

    -13.1 Monitor logic -

    -
    -Note: The monitor is usable but incomplete as of Megatest v1.31. Click on the “Monitor” button on the dashboard to start the monitor and give it a try. -
    -
    -figure monitor-state-diagram.png - -
    -

    -14 Reference -

    -

    -14.1 Configuration file Syntax -

    -
    -Note: whitespace is preserved including at the end of line. Ensure your entries only have whitespace at the end of line when needed to avoid problems. -
    -

    -14.1.1 Sections -

    -
    -
    -
    [section name]
-
    -
    - -
    -
    -This creates a section named “section name” -
    -

    -14.1.2 Variables -

    -
    -
    -
    VARX has this value
-
    -
    - -
    -
    -The variable “VARX” will have the value “has this value” -
    -

    -14.1.3 Includes -

    -
    -
    -
    [include filename]
-
    -
    - -
    -
    -The file named “filename” will be included as if part of the calling file. NOTE: This means no section can be named “include “ (with the whitespace). -
    -

    -14.1.4 Setting a variable by running a command -

    -
    -
    -
    VARNAME [system ls /tmp]
-
    -
    - -
    -
    -The variable “VARNAME” will get a value created by the Unix command “ls /tmp”. All lines of output from the command will be joined with a space. -
    -

    -14.1.5 Notes -

    -
      -
    • -Some variables are infered as lists. Each token on the line separated by whitespace will be member of the list. -
      • -
    • -Comments (lines starting with #) and blank lines are ignored. -
      • - -
    -

    -14.2 Environment variables -

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -Variable - -Purpose -
    -MT_CMDINFO - -Conveys test variables to the megatest test runner. -
    -MT_TEST_RUN_DIR - -Directory assigned by megatest for the test to run. -
    -MT_TEST_NAME - -Name of the test, corrosponds to the directory name under tests. -
    -MT_ITEM_INFO - -Iterated tests will set this to a sequence of key/values ((KEY val) ...) -
    -MT_RUN_AREA_HOME - -Directory where megatest was launched from and where the tests code can be found -
    -MT_RUNNAME - -Name of this run as set by the :runname parameter -
    -MT_MEGATEST - -Path/Filename to megatest executable. Found either from called path or but using the “exectuable” keyword in the [setup] section. -
    -<field1> .... - -The field values as set on the megatest -runall command line (e.g. :field1 abc) -
    - -
    -

    -14.3 megatest.config -

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -section - -variable - -value - -required - -comment -
    -[setup] - -max_concurrent_jobs - -if variable is not defined no limit on jobs - -no - - -
    - - -executable - -full path to megatest binary - -no - -Use only if necessary, megatest will extract the location from where it used to launch and add append that to the PATH for test runs. -
    - - -runsdir - -full path to where the link tree to all runs will be created - -no - -Because your runs may be spread out over several disk partitions a central link tree is created to make finding all the runs easy. -
    -[fields] - -string of letters, numbers and underscore - -string of letters, numbers and underscore - -at least one - - -
    -[jobtools] - -launcher - -command line used to launch jobs - the job command (megatest -execute) will be appended to this - -no - - -
    - - -workhosts - -list of hostnames to run jobs on NOT SUPPORTED RIGHT NOW - -n/a - - -
    -[jobgroups] - -string of letters, numbers and underscore - -number - -no - -Control number of jobs allowed to concurrently run in categories. See [jobgroup] in testconfig -
    -[env-override] - -string of letters, numbers and underscore - -any string - -no - -These are set on the test launching machine, not the test running machine. Typical usage is to control the host or run queue for launching tests. These values will not be seen by the test when it runs. -
    -[disks] - -string of letters, numbers and underscore - -a valid path writable by the test launching process and by the test process - -yes - -The disk usage balancing algorithm is to choose the disk with the least space for each test run. -
    - -
    -

    -14.4 runconfigs.config file -

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -section - -variable - -value - -required? - -comment -
    -[default] - -string of letters, numbers and underscore - -any - -no - -variables set in this section will be available for all runs, defining the same variable in another section will override the value from the default section -
    -[field1value/field2value...] - -string of letters, numbers and underscore - -any - -no - -the values in this section will be set for any run where field1 is field1value, field2 is field2value and fieldN is fieldNvalue. -
    - -
    -
    -Example: a test suite that checks that a piece of software works correctly for different customer configurations and locations each of which is done as a separate release regression run. The fields, CUSTOMER and LOCATION were chosen. The following runconfigs.config file would set some variables specific to runs for megacorp in India and femtocorp in the Cook Islands and New Zealand: -
    -
    -
    -
    # runconfigs.config
-[default]
-ENCRYTION true
-​
-[megacorp/india]
-TESTPATH /nfs/testing/megacorp_runs
-​
-[femtocorp/cook_islands]
-ENCRYTION false
-TESTPATH /afs/kiatoa/testing/cook_islands
-​
-[femtocorp/new_zealand]
-TESTPATH /afs/kiatoa/testing/new_zealand
-​
-[megacorp/new_zealand]
-TESTPATH /nfs/testing/megacorp_runs
-
    -
    - -
    -
    -Running megatest like this: -
    -
    -megatest :CUSTOMER megacorp :LOCATION new_zealand :runname week12_2011_run1 -runall -
    -
    -Would set: -
    -
    -ENCRYPTION true -
    -
    -TESTPATH /nfs/testing/megacorp_runs -
    -

    -14.5 Writing tests -

    -

    -14.5.1 testconfig file -

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -section - -variable - -value - -required? - -comments -
    -[setup] - -runscript - -name of script to execute for this test - -yes - -The script must be executable and either provide the full path or put a copy at the top of your test directory -
    -[requirements] - -waiton - -list of valid test names - -no - -This test will not run until the named tests are state completed and status PASS -
    - - -jobgroup - - - - - - -
    -[items] - -any valid - -list of values - -no - -The test will be repeated once for each item with the variable name set to the value. If there is more than one variable then the test will be run against all unique combinations of the values -
    -[eztests] - -any valid - -stepname command - -no - -Use in addition to or instead of runscript for easy implementation of steps. If <stepname>.logpro exists it will be applied to the <stepname>.log and resulting exit code will be used to determine PASS/FAIL/WARN -
    - -
    -

    -14.5.2 Command line -

    -
    - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
    -switch or param - -parameter - -purpose - -comments -
    --h - - - -brief help - - -
    --runall - - - -run all tests - - -
    --runtests - -test1,test2,... - -run one or more tests - - -
    --step - -stepname - -record a step - -requires :state and :status -
    --test-status - - - -record the test status - -requires :state and :status -
    --setlog - -logfilename - -set the logfile name for a test - -path is assumed to be relative to the test run directory -
    --set-toplog - -logfilename - -set the logfile name for the top test in an iterated test run - -each sub test can have its own logfile set -
    --m - -“comment” - -sets a comment for the step, test or run - - -
    -:runname - -[a-zA-Z0-9_-]+ - -directory in which this run will be stored in the test run area - - -
    -:state - -any value - -Set the step or test state, this is stored in the state field in the steps or tests table respectively - -For tests Megatest recognises “INCOMPLETE”, “COMPLETE” -
    -:status - -any value - -Set the step or test status, this is stored in the status field in the steps or tests table respectively - -For tests Megatest recognises “PASS”, “FAIL”, and “CHECK” -
    --list-runs - -any value, % is wildcard - -Respects -itempatt and -testpatt for filters - - -
    --testpatt - -any value, % is wildcard - - - - -
    --itempatt - -any value, % is wildcard - - - - -
    --showkeys - - - -Print the keys being used for this database - - -
    --force - - - -Test will not re-run if in the “PASS”, “CHECK” or “KILLED”, using -force will force the run to be launched. - -WARNING: The -force switch will bypass any “waiton” dependencies. -
    --xterm - - - -Launch an xterm instead of run the test. The xterm will have the environment that the test would see. - - -
    --remove-runs - - - -Remove a run, test or subtest from the database and the disk. Cannot be undone. Requires -testpatt, -itempatt, :runname and all keys be specified. - - -
    -Test helpers - - - - - - -
    --runstep - - - -Used inside a test to run a step, record the start and end of the step and optionally analyze the output using logpro. - - -
    --logpro - - - -If using logpro to acess the PASS/FAIL status of the step you specify the logpro file with this parameter. - - -
    - -
    -

    -A Data -

    -

    -B References -

    - -
    - -
    - - DELETED docs/html/monitor-state-diagram.png Index: docs/html/monitor-state-diagram.png ================================================================== --- docs/html/monitor-state-diagram.png +++ /dev/null cannot compute difference between binary files Index: docs/inprogress/graph-draw-arch.fig ================================================================== --- docs/inprogress/graph-draw-arch.fig +++ docs/inprogress/graph-draw-arch.fig @@ -5,10 +5,26 @@ Letter 100.00 Single -2 1200 2 +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . 6 5700 3075 8400 3675 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 5700 3075 8400 3075 8400 3675 5700 3675 5700 3075 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 9 5700 3525 5925 3525 5925 3225 6750 3225 6750 3450 7350 3450 Index: docs/inprogress/megatest-architecture-2.fig ================================================================== --- docs/inprogress/megatest-architecture-2.fig +++ docs/inprogress/megatest-architecture-2.fig @@ -5,10 +5,26 @@ Letter 100.00 Single -2 1200 2 +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 750 975 5850 975 5850 7425 750 7425 750 975 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 6000 975 9975 975 9975 7425 6000 7425 6000 975 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 Index: docs/inprogress/megatest-architecture-proposed-2.fig ================================================================== --- docs/inprogress/megatest-architecture-proposed-2.fig +++ docs/inprogress/megatest-architecture-proposed-2.fig @@ -5,10 +5,26 @@ Letter 100.00 Single -2 1200 2 +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . 6 600 1350 1575 2400 1 1 0 1 0 7 50 -1 -1 0.000 1 0.0000 1125 1500 450 150 1125 1500 1575 1650 1 1 0 1 0 7 50 -1 -1 0.000 1 0.0000 1124 2177 450 150 1124 2177 1574 2327 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 675 1575 675 2175 Index: docs/inprogress/megatest-architecture-proposed.fig ================================================================== --- docs/inprogress/megatest-architecture-proposed.fig +++ docs/inprogress/megatest-architecture-proposed.fig @@ -5,10 +5,26 @@ Letter 100.00 Single -2 1200 2 +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . 6 600 1350 1575 2400 1 1 0 1 0 7 50 -1 -1 0.000 1 0.0000 1125 1500 450 150 1125 1500 1575 1650 1 1 0 1 0 7 50 -1 -1 0.000 1 0.0000 1124 2177 450 150 1124 2177 1574 2327 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 675 1575 675 2175 Index: docs/inprogress/megatest-architecture.fig ================================================================== --- docs/inprogress/megatest-architecture.fig +++ docs/inprogress/megatest-architecture.fig @@ -5,10 +5,26 @@ Letter 100.00 Single -2 1200 2 +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . 6 600 1350 1575 2400 1 1 0 1 0 7 50 -1 -1 0.000 1 0.0000 1125 1500 450 150 1125 1500 1575 1650 1 1 0 1 0 7 50 -1 -1 0.000 1 0.0000 1124 2177 450 150 1124 2177 1574 2327 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 675 1575 675 2175 Index: docs/inprogress/megatest-query-view.fig ================================================================== --- docs/inprogress/megatest-query-view.fig +++ docs/inprogress/megatest-query-view.fig @@ -5,10 +5,26 @@ Letter 100.00 Single -2 1200 2 +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 900 675 4350 675 4350 1650 900 1650 900 675 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 0 0 1.00 60.00 120.00 4350 1200 6975 1725 Index: docs/inprogress/megatest_qa.fig ================================================================== --- docs/inprogress/megatest_qa.fig +++ docs/inprogress/megatest_qa.fig @@ -5,10 +5,26 @@ Letter 100.00 Single -2 1200 2 +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2 6000 300 6000 9675 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 525 675 4500 675 4500 2550 525 2550 525 675 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 Index: docs/manual/Makefile ================================================================== --- docs/manual/Makefile +++ docs/manual/Makefile @@ -1,10 +1,27 @@ - +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# ASCPATH = $(shell which asciidoc) EXEPATH = $(shell readlink -f $(ASCPATH)) BINPATH = $(shell dirname $(EXEPATH)) DISPATH = $(shell dirname $(BINPATH)) +SRCFSL = $(shell fossil info | grep repository: | awk '{print $$2}') +INPAGES = plan.in howto.in reference.in getting_started.in # broad_goals.csv needed_features.csv : tables/*.dat # ./refdb2csv tables # in a makefile recipe, $< denotes the first dependency; $@ the target @@ -13,15 +30,15 @@ # asciidoc -b html5 -a icons -a iconsdir=$(DISPATH)/images/icons -a toc2 design_spec.txt # all : server.ps megatest_manual.html client.ps complex-itemmap.png -megatest_manual.html : megatest_manual.txt getting_started.txt writing_tests.txt reference.txt ../plan.txt howto.txt installation.txt *png +megatest_manual.html : megatest_manual.txt $(INPAGES) writing_tests.txt installation.txt *png asciidoc -b html5 -a icons -a iconsdir=$(DISPATH)/images/icons -a toc2 megatest_manual.txt # dos2unix megatest_manual.html -megatest.pdf : megatest_manual.txt getting_started.txt writing_tests.txt reference.txt ../plan.txt howto.txt *png +megatest.pdf : megatest_manual.txt $(INPAGES) writing_tests.txt *png a2x -a toc -f pdf megatest_manual.txt server.ps : server.dot dot -Tps server.dot > server.ps @@ -30,7 +47,13 @@ complex-itemmap.png : complex-itemmap.dot dot -Tpng complex-itemmap.dot -o complex-itemmap.png dot -Tpdf complex-itemmap.dot -o complex-itemmap.pdf +%.in : $(SRCFSL) + fossil wiki export $* $*.in + +# %.txt : %.in +# cp $*.in $*.txt + clean: rm -f megatest_manual.html Index: docs/manual/client.dot ================================================================== --- docs/manual/client.dot +++ docs/manual/client.dot @@ -1,5 +1,22 @@ +// Copyright 2006-2017, Matthew Welland. +// +// This file is part of Megatest. +// +// Megatest is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Megatest is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Megatest. If not, see . + digraph G { // put client after server so server_start node is visible // subgraph cluster_2 { Index: docs/manual/complex-itemmap.dot ================================================================== --- docs/manual/complex-itemmap.dot +++ docs/manual/complex-itemmap.dot @@ -1,5 +1,22 @@ +// Copyright 2006-2017, Matthew Welland. +// +// This file is part of Megatest. +// +// Megatest is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Megatest is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Megatest. If not, see . + digraph G { // put client after server so server_start node is visible // subgraph cluster_1 { @@ -38,10 +55,10 @@ label = "Test E"; "C/1/bb" -> "E/1/res"; "C/2/bb" -> "E/2/res"; } - label = "Complex Itemmapping"; + label = "Complex Itemmapping (arrows indicate order of execution)"; color=green; } } Index: docs/manual/complex-itemmap.png ================================================================== --- docs/manual/complex-itemmap.png +++ docs/manual/complex-itemmap.png cannot compute difference between binary files ADDED docs/manual/getting_started.in Index: docs/manual/getting_started.in ================================================================== --- /dev/null +++ docs/manual/getting_started.in @@ -0,0 +1,115 @@ +// This file is part of Megatest. +// +// Megatest is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Megatest is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Megatest. If not, see . +// +// Copyright 2006-2012, Matthew Welland. + +Getting Started +--------------- + +[partintro] +.Getting started with Megatest +-- +Creating a testsuite or flow and your first test or task. +-- + +After installing Megatest you can create a flow or testsuite and add some +tests using the helpers. Here is a quickstart sequence to get you up and +running your first automated testsuite. + +Creating a Megatest Area +~~~~~~~~~~~~~~~~~~~~~~~~ + +Choose Target Keys +^^^^^^^^^^^^^^^^^^ + +First choose your "target" keys. These are used to organise your runs in a +way that is meaningful to your project. If you are unsure about what to use +for keys just use a single generic key such as "RUNTYPE". These keys will be +used to hand values to your tests via environment variables so ensure they +are unique. Prefixing them with something such as PROJKEYS_ is a good +strategy. + +Examples of keys: + +.Example keys +[width="60%",options="header"] +|============================================== +| Option | Description +| RELEASE/ITERATION | This example is used by Megatest for its internal QA. +| ARCH/OS/RELEASE | For a software project targeting multiple platforms +| UCTRLR/NODETYPE | Microcontroller project with different controllers +running same software +|============================================== + +Create Area Config Files +^^^^^^^^^^^^^^^^^^^^^^^^ + +You will need to choose locations for your runs (the data generated every +time you run the testsuite) and link tree. For getting started answer the +prompts with "runs" and "links". We use the Unix editor "vi" in the examples +below but you can use any plain text editor. + +.Using the helper to create a Megatest area +------------------ +megatest -create-megatest-area + +# optional: verify that the settings are ok +vi megatest.config +vi runconfigs.config +------------------ + +Creating a Test +~~~~~~~~~~~~~~~ + +Choose the test name for your first test and run the helper. You can edit +the files after the initial creation. You will need to enter names and +scripts for the steps to be run and then edit the +tests//testconfig file and modify the logpro rules to properly +process the log output from your steps. For your first test just hit enter +for the "waiton", "priority" and iteration variable prompts. + +Hint: for geting started make your logpro rules very liberal. expect:error +patterns should match nothing and comment out expect:required rules. + +.Using the helper to create a Megatest test +--------------- +megatest -create-test myfirsttest + +# then edit the generated config +vi tests/myfirsttest/testconfig +--------------- + +Running your test +~~~~~~~~~~~~~~~~~ + +First choose a target and runname. If you have a two-place target such as +RELEASE/ITERATION a target would look like v1.0/aff3 where v1.0 is the +RELEASE and aff3 is the ITERATION. For a run name just use something like +run1. + +.Running all tests (testpatt of "%" matches all tests) +--------------- +megatest -run -target v1.0/aff3 -runname run1 -testpatt % -log run1.log +--------------- + +Viewing the results +~~~~~~~~~~~~~~~~~~~ + +Start the dashboard and browse your run in the "Runs" tab. + +.Starting dashboard +---------------- +dashboard -rows 24 +---------------- DELETED docs/manual/getting_started.txt Index: docs/manual/getting_started.txt ================================================================== --- docs/manual/getting_started.txt +++ /dev/null @@ -1,99 +0,0 @@ - -Getting Started ---------------- - -[partintro] -.Getting started with Megatest --- -Creating a testsuite or flow and your first test or task. --- - -After installing Megatest you can create a flow or testsuite and add some -tests using the helpers. Here is a quickstart sequence to get you up and -running your first automated testsuite. - -Creating a Megatest Area -~~~~~~~~~~~~~~~~~~~~~~~~ - -Choose Target Keys -^^^^^^^^^^^^^^^^^^ - -First choose your "target" keys. These are used to organise your runs in a -way that is meaningful to your project. If you are unsure about what to use -for keys just use a single generic key such as "RUNTYPE". These keys will be -used to hand values to your tests via environment variables so ensure they -are unique. Prefixing them with something such as PROJKEYS_ is a good -strategy. - -Examples of keys: - -.Example keys -[width="60%",options="header"] -|============================================== -| Option | Description -| RELEASE/ITERATION | This example is used by Megatest for its internal QA. -| ARCH/OS/RELEASE | For a software project targeting multiple platforms -| UCTRLR/NODETYPE | Microcontroller project with different controllers -running same software -|============================================== - -Create Area Config Files -^^^^^^^^^^^^^^^^^^^^^^^^ - -You will need to choose locations for your runs (the data generated every -time you run the testsuite) and link tree. For getting started answer the -prompts with "runs" and "links". We use the Unix editor "vi" in the examples -below but you can use any plain text editor. - -.Using the helper to create a Megatest area ------------------- -megatest -create-megatest-area - -# optional: verify that the settings are ok -vi megatest.config -vi runconfigs.config ------------------- - -Creating a Test -~~~~~~~~~~~~~~~ - -Choose the test name for your first test and run the helper. You can edit -the files after the initial creation. You will need to enter names and -scripts for the steps to be run and then edit the -tests//testconfig file and modify the logpro rules to properly -process the log output from your steps. For your first test just hit enter -for the "waiton", "priority" and iteration variable prompts. - -Hint: for geting started make your logpro rules very liberal. expect:error -patterns should match nothing and comment out expect:required rules. - -.Using the helper to create a Megatest test ---------------- -megatest -create-test myfirsttest - -# then edit the generated config -vi tests/myfirsttest/testconfig ---------------- - -Running your test -~~~~~~~~~~~~~~~~~ - -First choose a target and runname. If you have a two-place target such as -RELEASE/ITERATION a target would look like v1.0/aff3 where v1.0 is the -RELEASE and aff3 is the ITERATION. For a run name just use something like -run1. - -.Running all tests (testpatt of "%" matches all tests) ---------------- -megatest -run -target v1.0/aff3 -runname run1 -testpatt % -log run1.log ---------------- - -Viewing the results -~~~~~~~~~~~~~~~~~~~ - -Start the dashboard and browse your run in the "Runs" tab. - -.Starting dashboard ----------------- -dashboard -rows 24 ----------------- ADDED docs/manual/howto.in Index: docs/manual/howto.in ================================================================== --- /dev/null +++ docs/manual/howto.in @@ -0,0 +1,208 @@ +// This file is part of Megatest. +// +// Megatest is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Megatest is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Megatest. If not, see . +// +// Copyright 2006-2012, Matthew Welland. + +How To Do Things +---------------- + +Process Runs +~~~~~~~~~~~~ + +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 +~~~~~~~~~~~~~~~~~~~~~~~~~~ + +The following example will limit a test in the jobgroup "group1" to no more than 10 tests simultaneously. + +In your testconfig: + +---------------- +[test_meta] +jobgroup group1 +---------------- + +In your megatest.config: + +--------------- +[jobgroups] +group1 10 +custdes 4 +--------------- + +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. + +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: + +.Original items table +----------------- +[items] +CELLNAME [system getcellname.sh] +----------------- + +.Items table modified for debug +----------------- +[items] +DEBUG [system xterm] +CELLNAME [system getcellnames.sh] +----------------- + +When this test is run an xterm will pop up. In that xterm the +environment is exactly that in which the script "getcellnames.sh" +would run. You can now debug the script to find out why it isn't +working as expected. + +Organising Your Tests and Tasks +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +The default location "tests" for storing tests can be extended by +adding to your tests-paths section. + +---------------------------- +[misc] +parent #{shell dirname $(readlink -f .)} + +[tests-paths] +1 #{get misc parent}/simplerun/tests +---------------------------- + +The above example shows how you can use addition sections in your +config file to do complex processing. By putting results of relatively +slow operations into variables the processing of your configs can be +kept fast. + +Alternative Method for Running your Job Script +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +.Directly running job in testconfig +------------------- +[setup] +runscript main.csh +------------------- + +The runscript method is essentially a brute force way to run scripts where the +user is responsible for setting STATE and STATUS and managing the details of running a test. + +Debugging Server Problems +~~~~~~~~~~~~~~~~~~~~~~~~~ + +Some handy Unix commands to track down issues with servers not +communicating with your test manager processes. Please put in tickets +at https://www.kiatoa.com/fossils/megatest if you have problems with +servers getting stuck. + +---------------- +sudo lsof -i +sudo netstat -lptu +sudo netstat -tulpn +---------------- DELETED docs/manual/howto.txt Index: docs/manual/howto.txt ================================================================== --- docs/manual/howto.txt +++ /dev/null @@ -1,192 +0,0 @@ - -How To Do Things ----------------- - -Process Runs -~~~~~~~~~~~~ - -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 -~~~~~~~~~~~~~~~~~~~~~~~~~~ - -The following example will limit a test in the jobgroup "group1" to no more than 10 tests simultaneously. - -In your testconfig: - ----------------- -[test_meta] -jobgroup group1 ----------------- - -In your megatest.config: - ---------------- -[jobgroups] -group1 10 -custdes 4 ---------------- - -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. - -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: - -.Original items table ------------------ -[items] -CELLNAME [system getcellname.sh] ------------------ - -.Items table modified for debug ------------------ -[items] -DEBUG [system xterm] -CELLNAME [system getcellnames.sh] ------------------ - -When this test is run an xterm will pop up. In that xterm the -environment is exactly that in which the script "getcellnames.sh" -would run. You can now debug the script to find out why it isn't -working as expected. - -Organising Your Tests and Tasks -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -The default location "tests" for storing tests can be extended by -adding to your tests-paths section. - ----------------------------- -[misc] -parent #{shell dirname $(readlink -f .)} - -[tests-paths] -1 #{get misc parent}/simplerun/tests ----------------------------- - -The above example shows how you can use addition sections in your -config file to do complex processing. By putting results of relatively -slow operations into variables the processing of your configs can be -kept fast. - -Alternative Method for Running your Job Script -^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ - -.Directly running job in testconfig -------------------- -[setup] -runscript main.csh -------------------- - -The runscript method is essentially a brute force way to run scripts where the -user is responsible for setting STATE and STATUS and managing the details of running a test. - -Debugging Server Problems -~~~~~~~~~~~~~~~~~~~~~~~~~ - -Some handy Unix commands to track down issues with servers not -communicating with your test manager processes. Please put in tickets -at https://www.kiatoa.com/fossils/megatest if you have problems with -servers getting stuck. - ----------------- -sudo lsof -i -sudo netstat -lptu -sudo netstat -tulpn ----------------- Index: docs/manual/installation.txt ================================================================== --- docs/manual/installation.txt +++ docs/manual/installation.txt @@ -1,5 +1,22 @@ +// Copyright 2006-2017, Matthew Welland. +// +// This file is part of Megatest. +// +// Megatest is free software: you can redistribute it and/or modify +// it under the terms of the GNU General Public License as published by +// the Free Software Foundation, either version 3 of the License, or +// (at your option) any later version. +// +// Megatest is distributed in the hope that it will be useful, +// but WITHOUT ANY WARRANTY; without even the implied warranty of +// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +// GNU General Public License for more details. +// +// You should have received a copy of the GNU General Public License +// along with Megatest. If not, see . + Installation ------------ Dependencies ~~~~~~~~~~~~ Index: docs/manual/itemmap.fig ================================================================== --- docs/manual/itemmap.fig +++ docs/manual/itemmap.fig @@ -1,6 +1,6 @@ -#FIG 3.2 Produced by xfig version 3.2.5c +#FIG 3.2 Produced by xfig version 3.2.5-alpha5 Landscape Center Metric A4 100.00 @@ -38,10 +38,26 @@ 0 60 #000049 0 61 #797979 0 62 #303430 0 63 #414141 0 64 #c7b696 +# Copyright 2006-2017, Matthew Welland. +# +# This file is part of Megatest. +# +# Megatest is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Megatest is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Megatest. If not, see . 6 3600 2700 4455 3555 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 3600 2700 4050 2700 4050 3150 3600 3150 3600 2700 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 3690 3150 3690 3285 4185 3285 4185 2790 4050 2790 @@ -89,23 +105,23 @@ 5625 5085 5625 5220 6120 5220 6120 4725 5985 4725 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5 5760 5220 5760 5355 6255 5355 6255 4860 6120 4860 -6 6 6840 2790 8910 3420 -4 0 0 50 -1 0 12 0.0000 4 180 1260 6840 2970 [requirements]\001 -4 0 0 50 -1 0 12 0.0000 4 135 990 6840 3165 waiton TstE\001 -4 0 0 50 -1 0 12 0.0000 4 180 2070 6840 3360 itemap foo/(\\d+) \\1/bar\001 +4 0 0 50 -1 0 12 0.0000 4 195 1290 6840 2970 [requirements]\001 +4 0 0 50 -1 0 12 0.0000 4 150 1050 6840 3165 waiton TstE\001 +4 0 0 50 -1 0 12 0.0000 4 195 1950 6840 3360 itemap foo/(\\d+) \\1/bar\001 -6 6 6840 6345 8910 6975 -4 0 0 50 -1 0 12 0.0000 4 180 1260 6840 6525 [requirements]\001 -4 0 0 50 -1 0 12 0.0000 4 135 990 6840 6720 waiton TstE\001 -4 0 0 50 -1 0 12 0.0000 4 180 2070 6840 6915 itemap baz/(\\d+) \\1/bar\001 +4 0 0 50 -1 0 12 0.0000 4 195 1290 6840 6525 [requirements]\001 +4 0 0 50 -1 0 12 0.0000 4 150 1050 6840 6720 waiton TstE\001 +4 0 0 50 -1 0 12 0.0000 4 195 1980 6840 6915 itemap baz/(\\d+) \\1/bar\001 -6 6 3600 6570 4860 7200 -4 0 0 50 -1 0 12 0.0000 4 180 810 3600 6750 [itemmap]\001 -4 0 0 50 -1 0 12 0.0000 4 150 1260 3600 6945 TstA .*/ foo/\001 -4 0 0 50 -1 0 12 0.0000 4 165 1080 3600 7140 TstB ab/ xy/\001 +4 0 0 50 -1 0 12 0.0000 4 195 900 3600 6750 [itemmap]\001 +4 0 0 50 -1 0 12 0.0000 4 180 1140 3600 6945 TstA .*/ foo/\001 +4 0 0 50 -1 0 12 0.0000 4 195 1050 3600 7140 TstB ab/ xy/\001 -6 2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 0 0 1.00 60.00 120.00 5355 4455 4500 3600 2 1 0 2 0 7 50 -1 -1 0.000 0 0 -1 1 0 2 @@ -132,18 +148,18 @@ 2 1 0 2 23 7 50 -1 -1 0.000 0 0 -1 1 0 3 0 0 1.00 60.00 120.00 7065 6255 7065 5715 6390 5130 2 2 0 2 7 7 50 -1 -1 0.000 0 0 -1 0 0 5 900 0 9000 0 9000 7425 900 7425 900 0 -4 0 0 50 -1 0 12 0.0000 4 135 360 1935 4725 TstB\001 -4 0 0 50 -1 0 12 0.0000 4 135 360 5445 1170 TstC\001 -4 0 0 50 -1 0 12 0.0000 4 135 360 5445 4770 TstD\001 -4 0 0 50 -1 0 12 0.0000 4 135 360 3600 2970 TstE\001 -4 0 0 50 -1 0 12 0.0000 4 135 360 1845 1170 TstA\001 -4 0 0 50 -1 0 12 0.0000 4 135 720 5085 450 runthird\001 -4 0 0 50 -1 0 12 0.0000 4 135 810 3330 405 runsecond\001 -4 0 0 50 -1 0 12 0.0000 4 135 720 1575 405 runfirst\001 -4 0 0 50 -1 0 12 0.0000 4 150 1260 6750 1005 2. TstE starts\001 -4 0 0 50 -1 0 12 0.0000 4 150 1800 6750 1215 3. TstC & TstD start\001 -4 0 0 50 -1 0 12 0.0000 4 150 1800 6750 810 1. TstA & TstB start\001 -4 0 0 50 -1 0 12 0.0000 4 180 1260 3600 6165 [requirements]\001 -4 0 0 50 -1 0 12 0.0000 4 135 1440 3600 6360 waiton TstA TstB\001 +4 0 0 50 -1 0 12 0.0000 4 150 420 1935 4725 TstB\001 +4 0 0 50 -1 0 12 0.0000 4 150 435 5445 1170 TstC\001 +4 0 0 50 -1 0 12 0.0000 4 150 435 5445 4770 TstD\001 +4 0 0 50 -1 0 12 0.0000 4 150 420 3600 2970 TstE\001 +4 0 0 50 -1 0 12 0.0000 4 150 450 1845 1170 TstA\001 +4 0 0 50 -1 0 12 0.0000 4 150 675 5085 450 runthird\001 +4 0 0 50 -1 0 12 0.0000 4 150 900 3330 405 runsecond\001 +4 0 0 50 -1 0 12 0.0000 4 150 615 1575 405 runfirst\001 +4 0 0 50 -1 0 12 0.0000 4 150 1155 6750 1005 2. TstE starts\001 +4 0 0 50 -1 0 12 0.0000 4 150 1770 6750 1215 3. TstC & TstD start\001 +4 0 0 50 -1 0 12 0.0000 4 150 1770 6750 810 1. TstA & TstB start\001 +4 0 0 50 -1 0 12 0.0000 4 195 1290 3600 6165 [requirements]\001 +4 0 0 50 -1 0 12 0.0000 4 150 1545 3600 6360 waiton TstA TstB\001 Index: docs/manual/megatest_manual.html ================================================================== --- docs/manual/megatest_manual.html +++ docs/manual/megatest_manual.html @@ -783,10 +783,30 @@

    Preface

    This book is organised as three sub-books; getting started, writing tests and reference.

    +
    +
    License
    +
    +
        Copyright 2006-2017, Matthew Welland.
+
+    This document is part of Megatest.
+
+    Megatest is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Megatest is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Megatest.  If not, see <http://www.gnu.org/licenses/>.
    +

    Why Megatest?

    @@ -801,18 +821,17 @@

    Megatest Design Philosophy

    -

    Megatest is intended to provide the minimum needed resources to make -writing a suite of tests and tasks for implementing continuous build -for software, design engineering or process control (via owlfs for -example) without being specialized for any specific problem -space. Megatest in of itself does not know what constitutes a PASS or -FAIL of a test or task. In most cases megatest is best used in -conjunction with logpro or a similar tool to parse, analyze and decide -on the test outcome.

    +

    Megatest is a distributed system intended to provide the minimum needed +resources to make writing a suite of tests and tasks for implementing +continuous build for software, design engineering or process control (via +owlfs for example) without being specialized for any specific problem +space. Megatest in of itself does not know what constitutes a PASS or FAIL +of a test or task. In most cases megatest is best used in conjunction with +logpro or a similar tool to parse, analyze and decide on the test outcome.

    • Self-checking -Repeatable strive for directed or self-checking test as opposed to delta based tests @@ -867,33 +886,272 @@

    Road Map

    -

    Note 1: This road-map is still evolving and subject to change without notice.

    +

    Note 1: This road-map continues to evolve and subject to change without notice.

    +
    +

    Here is a smattering of ideas for Megatest 2.0

    +
      +
    1. +

      +Add variable $MT_RUNPATH = $MT_LINKTREE/$MT_TARGET/$MT_RUNNAME +

      +
      2. +
    +
    +
    +
    [db]
+api legacy|new
    +
    +
      +
    1. +

      +One big lesson from the 1.63-1.65 generation was that the main.db, 1.db … model was really good at scaling. I’d like to combine that model with the current also-very-good model. Obviously this is a disruptive change. I think making the old model the default and the new model an option for at least one generation would be fair. +

      +
      2. +
    2. +

      +Rigorous megatest.config and runconfig.config caching. +

      +
        +
      1. +

        +Cache the configs in $MT_RUNPATH +

        +
        2. +
      2. +

        +Following invocations of –run, -rerun* will calculate the new config but only overwrite the cached file IF changed +

        +
        3. +
      +
      3. +
    3. +

      +If the cached file changes ALL existing tests go from COMPLETED → STALE, I’m not sure what to do about RUNNING tests +

      +
      4. +
    4. +

      +!VARS in runconfigs are not exported to the environment. They are accessed via rget as if the ! was not there. +

      +
      5. +
    5. +

      +Per test copy commands (crude example below is not correct). +

      +
      6. +
    +
    +
    +
    [testcopy]
+%/iind% unison SRC DEST
+% cp –r SRC DEST
    +
    +
      +
    1. +

      +Test management via pkts (optional?) +

      +
        +
      1. +

        +Control pkt types: run, kill, rerunclean, clean, archive, status? +

        +
        2. +
      2. +

        +Status pkt types: ack, step, status_change +

        +
        3. +
      +
      2. +
    2. +

      +Add nanomsg as a transport option +. +

      +
      3. +
    +
    +
    +

    RFC M01: Add ability to move runs to other Areas

    +

    Purpose: allow shrinking megatest.db data by moving runs to an alternate + Megatest area with same keys.

    +

    Method: extend db sync to take a different megatest area as a destination.

    +

    Design:

    +
      +
    1. +

      +add param -destination [area|path]. when specified runs are copied to new + area and removed from local db. +

      +
      2. +
    2. +

      +the data move would involve these steps +

      +
        +
      1. +

        +copy the run data to destination area megatest.db +

        +
        2. +
      2. +

        +mark the run records as deleted, do not remove the run data on disk +

        +
        3. +
      +
      3. +
    3. +

      +accessing the data would be by running dashboard in the satellite area +

      +
      4. +
    4. +

      +future versions of Megatest dashboard should support displaying areas in a + merged way. +

      +
      5. +
    5. +

      +some new controls would be supported in the config +

      +
        +
      1. +

        +[setup] ⇒ allow-runs [no|yes] ⇐= used to disallow runs +

        +
        2. +
      2. +

        +[setup] ⇒ auto-migrate=[areaname|path] ⇐= used to automatically + migrate data to a satellite area. +

        +
        3. +
      +
      6. +
    +

    Branch: This work is taking place on branch v1.65-reduce-records

    +
    +
    +

    RFC M02: Move data into completed-runs.db

    +

    Purpose: shrink megatest.db data to enable lower load and higher performance.

    +

    Method: add a completed-runs.db and automatically move runs data from megatest.db to that db

    +

    Design:

    +
      +
    1. +

      +completed-runs.db is a full megatest database with complete schema +

      +
      2. +
    2. +

      +the data move would involve these steps +

      +
        +
      1. +

        +copy the run data to completed-runs.db +

        +
        2. +
      2. +

        +remove the run data, first from /tmp/…/megatest.db and /tmp/…/megatest_ref.db, followed by megatest.db +

        +
        3. +
      +
      3. +
    3. +

      +accessing the data would be unchanged for most operations. +

      +
      4. +
    4. +

      +a mode -full-db will be added which when specified would attach the completed-runs.db to megatest.db before doing the query +

      +
      5. +
    5. +

      +mechanisms for moving runs to/from the megatest.db would be added +

      +
        +
      1. +

        +-reduce-records ⇒ move runs to completed-runs.db +

        +
        2. +
      2. +

        +-restore-records ⇒ move runs from completed-runs.db to megatest.db +

        +
        3. +
      +
      6. +
    +

    Branch: This work is taking place on branch v1.65-reduce-records

    +
    +
    +

    RFC M03: Automatic homehost migrations

    +

    Purpose: Automatically migrate homehost.

    +

    Method: Check that there are no tests running, launched or remotehoststart in past ½ hour then if not on homehost migrate the db to current host

    +

    Design:

    +
      +
    1. +

      +Check that the system is quiescent, i.e. that there are no runs in flight or recently run +

      +
      2. +
    2. +

      +Create a lock +

      +
      3. +
    3. +

      +Migrate the /tmp cache db to the current host +

      +
      4. +
    4. +

      +Update the .homehost file +

      +
      5. +
    5. +

      +Remove the lock +

      +
      6. +
    +

    Branch: This work not yet started

    +

    Architecture Refactor

    Goals

    1. Reduce load on the file system. Sqlite3 files on network filesystem can be - a burden. + a burden. [DONE]

    2. Reduce number of servers and frequency of start/stop. This is mostly an - issue of clutter but also a reduction in "moving parts". + issue of clutter but also a reduction in "moving parts". [DONE]

    3. Coalesce activities to a single home host where possible. Give the user feedback that they have started the dashboard on a host other than the - home host. + home host. [DONE]

    4. Reduce number of processes involved in managing running tests. @@ -905,35 +1163,35 @@

      Changes Needed

      1. ACID compliant db will be on /tmp and synced to megatest.db with a five - second max delay. + second max delay. [DONE]

      2. Read/writes to db for processes on homehost will go direct to /tmp - megatest.db file. + megatest.db file. [DONE]

      3. Read/wites fron non-homehost processes will go through one server. Bulk reads (e.g. for dashboard or list-runs) will be cached on the current host - in /tmp and synced from the home megatest.db in the testsuite area. + in /tmp and synced from the home megatest.db in the testsuite area. [DONE]

      4. -Db syncs rely on the target db file timestame minus some margin. +Db syncs rely on the target db file timestame minus some margin. [DONE]

      5. Since bulk reads do not use the server we can switch to simple RPC for the - network transport. + network transport. [DONE]

      6. Test running manager process extended to manage multiple running tests. @@ -947,31 +1205,32 @@

        ww05 - migrate to inmem-db

        1. -Switch to inmem db with fast sync to on disk db’s [DONE] +Switch to inmem db with fast sync to on disk db’s [DONE]

        2. Server polls tasks table for next action

          1. -Task table used for tracking runner process [DONE] +Task table used for tracking runner process [Replaced by mtutil]

          2. -Task table used for jobs to run +Task table used for jobs to run [Replaced by mtutil]

          3. -Task table used for queueing runner actions (remove runs, cleanRunExecute, etc) +Task table used for queueing runner actions (remove runs, + cleanRunExecute, etc) [Replaced by mtutil]

        @@ -1324,18 +1583,79 @@

      Reference

      +
      +

      Megatest Use Modes

      + + ++++ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
      Table 2. Base commands
      Use case Megatest command mtutil

      Start from scratch

      -rerun-all

      restart

      Rerun non-good completed

      -rerun-clean

      rerunclean

      Rerun all non-good and not completed yet

      -set-state-status KILLREQ; -rerun-

      clean

      killrerun

      Continue run

      -run

      resume

      Remove run

      -remove-runs

      clean

      Lock run

      -lock

      lock

      Unlock run

      -unlock

      unlock

      killrun

      -set-state-status KILLREQ; -kill-run

      +

      Config File Helpers

      Various helpers for more advanced config files.

      - + @@ -1415,15 +1735,35 @@ 
      [items]
 A a b c
 B d e f

      Then the config file would effectively appear to contain an items section -exactly like the output from the script. This is extremely useful when -dynamically creating items, itemstables and other config structures. You can -see the expansion of the call by looking in the cached files (look in your -linktree for megatest.config and runconfigs.config cache files and in your -test run areas for the expanded and cached testconfig).

      +exactly like the output from the script. This is useful when dynamically +creating items, itemstables and other config structures. You can see the +expansion of the call by looking in the cached files (look in your linktree +for megatest.config and runconfigs.config cache files and in your test run +areas for the expanded and cached testconfig).

      +

      Wildcards and regexes in Targets

      +
      +
      +
      [a/2/b]
+VAR1 VAL1
+
+[a/%/b]
+VAR1 VAL2
      +
      +

      Will result in:

      +
      +
      +
      [a/2/b]
+VAR1 VAL2
      +
      +

      Can use either wildcard of "%" or a regular expression:

      +
      +
      +
      [/abc.*def/]
      +

      Disk Space Checks

      Some parameters you can put in the [setup] section of megatest.config:

      @@ -1490,10 +1830,19 @@
      In megatest.config
      [setup]
 reruns 5
      +

      Replace the default blacklisted environment variables with user supplied +list.

      +

      Default list: USER HOME DISPLAY LS_COLORS XKEYSYMDB EDITOR MAKEFLAGS MAKEF MAKEOVERRIDES

      +
      Add a "bad" variable "PROMPT" to the variables that will be commented out

      in the megatest.sh and megatest.csh files:

      +
      +
      +
      [setup]
+blacklistvars USER HOME DISPLAY LS_COLORS XKEYSYMDB EDITOR MAKEFLAGS PROMPT
      +
      Run time limit
      @@ -1524,10 +1873,43 @@ 
      [setup]
 nodot
      +
      +
      +

      Capturing Test Data

      +

      In a test you can capture arbitrary variables and roll them up in the +megatest database for viewing on the dashboard or web app.

      +
      +
      In a test as a script
      +
      +
      $MT_MEGATEST -load-test-data << EOF
+foo,bar,   1.2,  1.9, >
+foo,rab, 1.0e9, 10e9, 1e9
+foo,bla,   1.2,  1.9, <
+foo,bal,   1.2,  1.2, <   ,     ,Check for overload
+foo,alb,   1.2,  1.2, <=  , Amps,This is the high power circuit test
+foo,abl,   1.2,  1.3, 0.1
+foo,bra,   1.2, pass, silly stuff
+faz,bar,    10,  8mA,     ,     ,"this is a comment"
+EOF
      +
      +

      Alternatively you can use logpro triggers to capture values and inject them +into megatest using the -set-values mechanism:

      +
      +
      Megatest help related to -set-values
      +
      +
      Test data capture
+  -set-values             : update or set values in the testdata table
+  :category               : set the category field (optional)
+  :variable               : set the variable name (optional)
+  :value                  : value measured (required)
+  :expected               : value expected (required)
+  :tol                    : |value-expect| <= tol (required, can be <, >, >=, <= or number)
+  :units                  : name of the units for value, expected_value etc. (optional)
      +

      Dashboard settings

      Runs tab buttons, font and size
      @@ -1542,11 +1924,11 @@

      Database settings

      Table 2. HelpersTable 3. Helpers
      - + @@ -1563,16 +1945,10 @@ - - - - - - @@ -1697,92 +2073,152 @@

      Itemmap Handling

      For cases were the dependent test has a similar but not identical itempath to the downstream test an itemmap can allow for itemmatch mode

      +
      example for removing part of itemmap for waiton test (eg: item foo-x/bar depends on waiton’s item y/bar)
      [requirements]
-mode itemmatch
-itemmap .*x/ y/
-
-# ## pattern replacement notes
+mode itemwait
+# itemmap <item pattern for this test>  <item replacement pattern for waiton test>
+itemmap .*x/ y/
      +
      +
      +
      example for removing part of itemmap for waiton test (eg: item foo/bar/baz in this test depends on waiton’s item baz)
      +
      +
      # ## pattern replacement notes
 #
 # ## Example
 # ## Remove everything up to the last /
-itemmap .*/
-#
+[requirements]
+mode itemwait
+# itemmap <item pattern for this test> <nothing here indicates removal>
+itemmap .*/
      +
      +
      +
      example replacing part of itemmap for (eg: item foo/1234 will imply waiton’s item bar/1234)
      +
      +
      #
 # ## Example
 # ## Replace foo/ with bar/
-itemmap foo/ bar/
-
-# multi-line; matches are applied in the listed order
+[requirements]
+mode itemwait
+# itemmap <item pattern for this test>  <item replacement pattern for waiton test>
+itemmap foo/ bar/
      +
      +
      +
      example for backreference (eg: item foo23/thud will imply waiton’s item num-23/bar/thud
      +
      +
      #
+# ## Example
+# ## can use \{number} in replacement pattern to backreference a (capture) from matching pattern similar to sed or perl
+[requirements]
+mode itemwait
+# itemmap <item pattern for this test>  <item replacement pattern for waiton test>
+itemmap foo(\d+)/ num-\1/bar/
      +
      +
      +
      example multiple itemmaps
      +
      +
      # multi-line; matches are applied in the listed order
 # The following would map:
 #   a123b321 to b321fooa123 then to 321fooa123p
 #
+[requirements]
 itemmap (a\d+)(b\d+) \2foo\1
   b(.*) \1p
      -

      Complex mappings

      -

      Complex mappings can be handled with the [itemmap] section

      +

      Complex mapping

      +

      Complex mappings can be handled with a separate [itemmap] section (instead if an itemmap line in the [requirements] section)

      +

      Each line in an itemmap section starts with a waiton test name followed by an itemmap expression

      +
      +
      eg: The following causes waiton test A item bar/1234 to run when our test’s foo/1234 item is requested as well as causing waiton test B’s blah item to run when our test’s stuff/blah item is requested
      +
      +
      [itemmap]
+A foo/ bar/
+B stuff/
      +
      +
      +
      +

      Complex mapping example

      complex-itemmap.png
      -

      Example:

      -
        -
      1. -

        -Request to run D/1/res -

        -
        2. -
      2. -

        -Megatest uses rule "(\d+)/res" → "\1/aa" to create item C/1/aa from D/1/res -

        -
        3. -
      3. -

        -Full list to be run is now: D/1/res, C/1/aa -

        -
        4. -
      4. -

        -Megatest uses rule "(\d+)/aa" → "aa/\1" to create item A/aa/1 -

        -
        5. -
      5. -

        -Full list to be run is now: D/1/res, C/1/aa, A/aa/1 -

        -
        6. -
      +

      We accomplish this by configuring the testconfigs of our tests C D and E as follows:

      -
      Testconfig for Test C
      +
      Testconfig for Test E has
      [requirements]
-waiton A B
-
-[itemmap]
-A (\d+)/aa aa/\1
-B (\d+)/bb
      +waiton C +itemmap (\d+)/res \1/bb
      -
      Testconfig for Test D
      +
      Testconfig for Test D has
      [requirements]
 waiton C
 itemmap (\d+)/res \1/aa
      -
      Testconfig for Test E
      +
      Testconfig for Test C has
      [requirements]
-waiton C
-itemmap (\d+)/res \1/bb
      +waiton A B + +[itemmap] +A (\d+)/aa aa/\1 +B (\d+)/bb bb/\1 +
      +
      +
      Testconfigs for Test B and Test A have no waiton or itemmap configured
      +
      +
      
 
      
+
      Walk through one item — we want the following to happen for testpatt D/1/res (see blue boxes in complex itemmaping figure above):
        
+
      1. 
+
        
+eg from command line megatest -run -testpatt D/1/res -target mytarget -runname myrunname
+
        
+
        2. 
+
      2. 
+
        
+Full list to be run is now: D/1/res
+
        
+
        3. 
+
      3. 
+
        
+Test D has a waiton - test C.  Test D’s itemmap rule itemmap (\d+)/res \1/aa →  causes C/1/aa to run before D/1/res
+
        
+
        4. 
+
      4. 
+
        
+Full list to be run is now: D/1/res, C/1/aa
+
        
+
        5. 
+
      5. 
+
        
+Test C was a waiton - test A. Test C’s rule A (\d+)/aa aa/\1 → causes A/aa/1 to run before C/1/aa
+
        
+
        6. 
+
      6. 
+
        
+Full list to be run is now: D/1/res, C/1/aa, A/aa/1
+
        
+
        7. 
+
      7. 
+
        
+Test A has no waitons.  All waitons of all tests in full list have been processed.  Full list is finalized.
+
        
+
        8. 
+
      
+
      
+
      
+
      itemstable
      
+
      An alternative to defining items is the itemstable section.  This lets you define the itempath in a table format rather than specifying components and relying on getting all permutations of those components.
      
 
      
 
      Dynamic Flow Dependency Tree
      
 
      
 
      Autogeneration waiton list for dynamic flow dependency trees
      
@@ -1893,11 +2329,11 @@
 
      $MT_MEGATEST -env2file .ezsteps/${stepname}
      
 
      
 
      Triggers
      
-
      In your testconfig triggers can be specified
      
+
      In your testconfig or megatest.config triggers can be specified
      
 
      
 
      
 
      [triggers]
 
 # Call script running.sh when test goes to state=RUNNING, status=PASS
@@ -1907,11 +2343,11 @@
 RUNNING/ running.sh
 
 # Call script onpass.sh any time status goes to PASS
 PASS/ onpass.sh
      
 
      
-
      Scripts called will have; test-id test-rundir trigger, added to the commandline.
      
+
      Scripts called will have; test-id test-rundir trigger test-name item-path state status event-time, added to the commandline.
      
 
      HINT
      
 
      To start an xterm (useful for debugging), use a command line like the following:
      
 
      
 
      
 
      [triggers]
@@ -1923,10 +2359,78 @@
 Note
 
 
      Table 3. Database config settings in [setup] section of megatest.configTable 4. Database config settings in [setup] section of megatest.config
 
 
 
 
 
      Prevent concurrent access issues
      		
 
      yes|no or not defined
      		
 
      Default=no, may help on some network file systems, may slow things down also.
      		
 
      
 
      daemonize
      Daemonize the server on start
      yes|no or not defined
      Default=no
      
 
      faststart
      		
 
      All direct file access to sqlite db files
      		
 
      yes|no or not defined
      		
 
      Default=yes, suggest no for central automated systems and yes for interactive use
      		
 
      
 
 
 
 
 
 
      There is a trailing space after the --
 
      
 
      
+
      There are a number of environment variables available to the trigger script
+but since triggers can be called in various contexts not all variables are
+available at all times. The trigger script should check for the variable and
+fail gracefully if it doesn’t exist.
      
+
+
+++
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
      Table 5. Environment variables visible to the trigger script


      Variable              Purpose
      MT_TEST_RUN_DIR
      The directory where Megatest ran this test
      MT_CMDINFO
      Encoded command data for the test
      MT_DEBUG_MODE
      Used to pass the debug mode to nested calls to Megatest
      MT_RUN_AREA_HOME
      Megatest home area
      MT_TESTSUITENAME
      The name of this testsuite or area
      MT_TEST_NAME
      The name of this test
      MT_ITEM_INFO
      The variable and values for the test item
      MT_MEGATEST
      Which Megatest binary is being used by this area
      MT_TARGET
      The target variable values, separated by /
      MT_LINKTREE
      The base of the link tree where all run tests can be found
      MT_ITEMPATH
      The values of the item path variables, separated by /
      MT_RUNNAME
      The name of the run
      
 
      
 
      
 
      Override the Toplevel HTML File
      
 
      Megatest generates a simple html file summary for top level tests of
 iterated tests. The generation can be overridden. NOTE: the output of
@@ -1996,26 +2500,111 @@
 
      Then in runconfigs.config
      
 
      
 
      Example of using modified.config in a testconfig
      
 
      
 
      cat testconfig
-
 [pre-launch-env-vars]
 [include modified.config]
      
 
      
 
      
 
      
+
      
+
      
+
      Managing Old Runs
      
+
      
+
      It is often desired to keep some older runs around but this must be balanced with the costs of disk space.
      
+
        
+
      1. 
+
        
+Use -remove-keep
+
        
+
        2. 
+
      2. 
+
        
+Use -archive (can also be done from the -remove-keep interface)
+
        
+
        3. 
+
      3. 
+
        
+use -remove-runs with -keep-records
+
        
+
        4. 
+
      
+
      
+
      For each target, remove all runs but the most recent 3 if they are over 1 week old
      
+
      
+
      # use -precmd 'sleep 5;nbfake' to limit overloading the host computer but to allow the removes to run in parallel.
+megatest -actions print,remove-runs -remove-keep 3 -target %/%/%/% -runname % -age 1w -precmd 'sleep 5;nbfake'"
      
+
      
+
      
+
      
+
      
+
      Nested Runs
      
+
      
+
      A Megatest test can run a full Megatest run in either the same
+Megatest area or in another area. This is a powerful way of chaining
+complex suites of tests and or actions.
      
+
      If you are not using the current area you can use ezsteps to retrieve
+and setup the sub-Megatest run area.
      
+
      In the testconfig:
      
+
      
+
      
+
      [subrun]
+
+# Required: wait for the run or just launch it
+#           if no then the run will be an automatic PASS irrespective of the actual result
+run-wait yes|no
+
+# Optional: where to execute the run. Default is the current runarea
+run-area /some/path/to/megatest/area
+
+# Optional: method to use to determine pass/fail status of the run
+#   auto (default) - roll up the net state/status of the sub-run
+#   logpro         - use the provided logpro rules, happens automatically if there is a logpro section
+# passfail auto|logpro
+# Example of logpro:
+passfail logpro
+
+# Optional:
+logpro ;; if this section exists then logpro is used to determine pass/fail
+  (expect:required in "LogFileBody" >= 1 "At least one pass" #/PASS/)
+  (expect:error     in "LogFileBody"  = 0 "No FAILs allowed"  #/FAIL/)
+
+# Optional: target translator, default is to use the parent target
+target #{shell somescript.sh}
+
+# Optional: runname translator/generator, default is to use the parent runname
+run-name #{somescript.sh}
+
+# Optional: testpatt spec, default is to first look for TESTPATT spec from runconfigs unless there is a contour spec
+test-patt %/item1,test2
+
+# Optional: contour spec, use the named contour from the megatest.config contour spec
+contour contourname ### NOTE: Not implemented yet! Let us know if you need this feature.
+
+# Optional: mode-patt, use this spec for testpatt from runconfigs
+mode-patt TESTPATT
+
+# Optional: tag-expr, use this tag-expr to select tests
+tag-expr quick
+
+# Optional: (not yet implemented, remove-runs is always propagated at this time), propagate these actions from the parent
+#           test
+#   Note// default is % for all
+propagate remove-runs archive ...
      
+
      
+
      
 
      
 
      
 
      Programming API
      
 
      
 
      These routines can be called from the megatest repl.
      
 
-
+
@@ -2063,10 +2652,10 @@
 
      

Index: docs/manual/megatest_manual.txt
==================================================================
--- docs/manual/megatest_manual.txt
+++ docs/manual/megatest_manual.txt
@@ -9,10 +9,31 @@
 Preface
 -------
 
 This book is organised as three sub-books; getting started, writing tests and reference.
 
+.License
+----------------------------
+    Copyright 2006-2017, Matthew Welland.
+
+    This document is part of Megatest.
+
+    Megatest is free software: you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation, either version 3 of the License, or
+    (at your option) any later version.
+
+    Megatest is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with Megatest.  If not, see .
+
+----------------------------
+
 Why Megatest?
 -------------
 
 The Megatest project was started for two reasons, the first was an
 immediate and pressing need for a generalized tool to manage a suite
@@ -24,18 +45,17 @@
 qualification.
 
 Megatest Design Philosophy
 --------------------------
 
-Megatest is intended to provide the minimum needed resources to make
-writing a suite of tests and tasks for implementing continuous build
-for software, design engineering or process control (via owlfs for
-example) without being specialized for any specific problem
-space. Megatest in of itself does not know what constitutes a PASS or
-FAIL of a test or task. In most cases megatest is best used in
-conjunction with logpro or a similar tool to parse, analyze and decide
-on the test outcome. 
+Megatest is a distributed system intended to provide the minimum needed
+resources to make writing a suite of tests and tasks for implementing
+continuous build for software, design engineering or process control (via
+owlfs for example) without being specialized for any specific problem
+space. Megatest in of itself does not know what constitutes a PASS or FAIL
+of a test or task. In most cases megatest is best used in conjunction with
+logpro or a similar tool to parse, analyze and decide on the test outcome.
 
  * Self-checking -Repeatable strive for directed or self-checking test
    as opposed to delta based tests
 
  * Traceable - environment variables, host OS and other possibly influential
@@ -62,24 +82,24 @@
 the distributed compute platform in use. A template script is provided
 which can launch jobs on local and remote Linux hosts. Currently
 megatest uses the network filesystem to call home to your master
 sqlite3 database.
 
-include::../plan.txt[]
+include::plan.in[]
 // to allow the getting_started.txt to be a stand-alone document use level
 shifting, note that the preceding blank line is needed.
 // :leveloffset: 2
 
 include::installation.txt[]
 
-include::getting_started.txt[]
+include::getting_started.in[]
 
 :leveloffset: 0
 
 include::writing_tests.txt[]
-include::howto.txt[]
-include::reference.txt[]
+include::howto.in[]
+include::reference.in[]
 
 Megatest Internals
 ------------------
 
 ["graphviz", "server.png"]

ADDED   docs/manual/plan.in
Index: docs/manual/plan.in
==================================================================
--- /dev/null
+++ docs/manual/plan.in
@@ -0,0 +1,232 @@
+Road Map
+--------
+
+// This file is part of Megatest.
+// 
+//     Megatest is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+// 
+//     Megatest is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+// 
+//     You should have received a copy of the GNU General Public License
+//     along with Megatest.  If not, see .
+
+// Copyright 2006-2012, Matthew Welland.
+
+Note 1: This road-map continues to evolve and subject to change without notice.
+
+Here is a smattering of ideas for Megatest 2.0
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+. Add variable $MT_RUNPATH = $MT_LINKTREE/$MT_TARGET/$MT_RUNNAME
+----------------
+[db]
+api legacy|new
+----------------
+. One big lesson from the 1.63-1.65 generation was that the main.db, 1.db … model was really good at scaling. I’d like to combine that model with the current also-very-good model. Obviously this is a disruptive change. I think making the old model the default and the new model an option for at least one generation would be fair.
+.   Rigorous megatest.config and runconfig.config caching.
+..  Cache the configs in $MT_RUNPATH
+..  Following invocations of –run, -rerun* will calculate the new config but only overwrite the cached file IF changed
+. If the cached file changes ALL existing tests go from COMPLETED -> STALE, I’m not sure what to do about RUNNING tests
+. !VARS in runconfigs are not exported to the environment. They are accessed via rget as if the ! was not there.
+. Per test copy commands (crude example below is not correct).
+----------------
+[testcopy]
+%/iind% unison SRC DEST
+% cp –r SRC DEST
+----------------
+.	Test management via pkts (optional?)
+..	Control pkt types: run, kill, rerunclean, clean, archive, status?
+..	Status pkt types: ack, step, status_change
+.	Add nanomsg as a transport option
+.	
+
+RFC M01: Add ability to move runs to other Areas
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+*Purpose*: allow shrinking megatest.db data by moving runs to an alternate
+ Megatest area with same keys.
+
+*Method*: extend db sync to take a different megatest area as a destination.
+
+*Design*:
+
+. add param -destination [area|path]. when specified runs are copied to new
+  area and removed from local db.
+. the data move would involve these steps
+.. copy the run data to destination area megatest.db
+.. mark the run records as deleted, do not remove the run data on disk
+. accessing the data would be by running dashboard in the satellite area
+. future versions of Megatest dashboard should support displaying areas in a
+  merged way.
+. some new controls would be supported in the config
+.. [setup] => allow-runs [no|yes]  <== used to disallow runs
+.. [setup] => auto-migrate=[areaname|path]  <== used to automatically
+   migrate data to a satellite area.
+
+*Branch*: This work is taking place on branch v1.65-reduce-records
+
+RFC M02: Move data into completed-runs.db
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+*Purpose*: shrink megatest.db data to enable lower load and higher performance.
+
+*Method*: add a completed-runs.db and automatically move runs data from megatest.db to that db
+
+*Design*:
+
+. completed-runs.db is a full megatest database with complete schema
+. the data move would involve these steps
+.. copy the run data to completed-runs.db
+.. remove the run data, first from /tmp/…/megatest.db and /tmp/…/megatest_ref.db, followed by megatest.db
+. accessing the data would be unchanged for most operations.
+. a mode -full-db will be added which when specified would attach the completed-runs.db to megatest.db before doing the query
+. mechanisms for moving runs to/from the megatest.db would be added
+.. -reduce-records => move runs to completed-runs.db
+.. -restore-records => move runs from completed-runs.db to megatest.db
+
+*Branch*: This work is taking place on branch v1.65-reduce-records
+
+RFC M03: Automatic homehost migrations
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+*Purpose*: Automatically migrate homehost.
+
+*Method*: Check that there are no tests running, launched or remotehoststart in past ½ hour then if not on homehost migrate the db to current host
+
+*Design*:
+
+. Check that the system is quiescent, i.e. that there are no runs in flight or recently run
+. Create a lock
+. Migrate the /tmp cache db to the current host
+. Update the .homehost file
+. Remove the lock
+
+*Branch*: This work not yet started
+
+Architecture Refactor
+~~~~~~~~~~~~~~~~~~~~~
+
+Goals
+^^^^^
+
+. Reduce load on the file system. Sqlite3 files on network filesystem can be
+  a burden. [green]#[DONE]#
+. Reduce number of servers and frequency of start/stop. This is mostly an
+  issue of clutter but also a reduction in "moving parts". [green]#[DONE]#
+. Coalesce activities to a single home host where possible. Give the user
+  feedback that they have started the dashboard on a host other than the
+  home host. [green]#[DONE]#
+. Reduce number of processes involved in managing running tests.
+
+Changes Needed
+^^^^^^^^^^^^^^
+
+. ACID compliant db will be on /tmp and synced to megatest.db with a five
+  second max delay. [green]#[DONE]#
+. Read/writes to db for processes on homehost will go direct to /tmp
+  megatest.db file. [green]#[DONE]#
+. Read/wites fron non-homehost processes will go through one server. Bulk
+  reads (e.g. for dashboard or list-runs) will be cached on the current host
+  in /tmp and synced from the home megatest.db in the testsuite area. [green]#[DONE]#
+. Db syncs rely on the target db file timestame minus some margin. [green]#[DONE]#
+. Since bulk reads do not use the server we can switch to simple RPC for the
+  network transport. [green]#[DONE]#
+. Test running manager process extended to manage multiple running tests.
+
+Current Items
+~~~~~~~~~~~~~
+
+ww05 - migrate to inmem-db
+^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+. Switch to inmem db with fast sync to on disk db's [green]#[DONE]#
+. Server polls tasks table for next action
+.. Task table used for tracking runner process [red]#[Replaced by mtutil]#
+.. Task table used for jobs to run [red]#[Replaced by mtutil]#
+.. Task table used for queueing runner actions (remove runs,
+   cleanRunExecute, etc)  [red]#[Replaced by mtutil#]
+
+
+// ww32
+// ~~~~
+// 
+// . Rerun step and or subsequent steps from gui
+// . Refresh test area files from gui
+// . Clean and re-run button
+// . Clean up STATE and STATUS handling.
+// .. Dashboard and Test control panel are reverse order - choose and fix
+// .. Move seldom used states and status to drop down selector
+// . Access test control panel when clicking on Run Summary tests
+// . Feature: -generate-index-tree
+// . Change specifing of state and status to use STATE1/STATUS1,STATE2/STATUS2
+// 
+// ww33
+// ~~~~
+// 
+// . http api available for use with Perl, Ruby etc. scripts
+// . megatest.config setup entries for:
+// .. run launching (e.g. /bin/sh %CMD% > /dev/null)
+// .. browser "konqueror %FNAME%
+// 
+// ww34
+// ~~~~
+// 
+// . Mark dependent tests for clean/rerun -rerun-downstream
+// . On run start check for defunct tests in RUNNING, LAUNCHED or REMOTEHOSTSTART and correct or notify
+// . Fix: refresh of gui sometimes fails on last item (race condition?)
+// 
+// ww35
+// ~~~~
+// 
+// . refdb: Add export of csv, json and sexp
+// . Convert to using call-with-environment-variables where possible. Should allow handling of parallel runs in same process.
+// . Re-work text interface wizards. Several bugs on record. Possibly convert to gui based.
+// . Add to testconfig requirements section; launchlimiter scriptname, calls scriptname to check if ok to launch test
+// . Refactor Run Summary view, currently very clumsy
+// . Add option to show steps in Run Summary view
+// 
+// ww36
+// ~~~~
+// 
+// . Refactor guis for resizeablity
+// . Add filters to Run Summary view and Run Control view
+// . Add to megatest.config or testconfig; rerunok STATE/STATUS,STATE/STATUS...
+// . Launch gates for diskspace; /path/one>1G,/path/two>200M,/tmp>5G,#{scheme *toppath*}>1G
+// 
+// Bin List
+// ~~~~~~~~
+// 
+// .	Quality improvements
+// ..	Server stutters occasionally
+// ..	Large number of items or tests still has some issues.
+// ..	Code refactoring
+// ..	Replace remote process with true API using json (supports Web app also)
+// .	Streamline the gui
+// ..	Everything resizable
+// ..	Less clutter
+// ..	Tool tips
+// ..	Filters on Run Summary, Summary and Run Control panel
+// ..	Built in log viewer (partially implemented)
+// ..	Refactor the test control panel
+// .	Help and documentation
+// ..	Complete the user manual (I’ve been working on this lately).
+// ..	Online help in the gui
+// .	Streamlined install
+// ..	Deployed version (download a location independent ready to run binary bundle)
+// ..	Install Makefile (in progress, needed for Mike to install on VMs)
+// ..	Added option to compile IUP (needed for VMs)
+// .	Server side run launching
+// .	Support for re-running, cleaning etc. of individual steps (ezsteps makes this very easy to implement).
+// .	Launch process needs built in daemonizing (easy to do, just need to test it thoroughly).
+// .	Wizards for creating tests, regression areas (current ones are text only and limited).
+// .	Fully functional built in web service (currently you can browse runs but it is very simplistic).
+// .	Wildcards in runconfigs: e.g. [p1271/9/%/%]
+// .	Gui panels for editing megatest.config and runconfigs.config
+// .	Fully isolated tests (no use of NFS to see regression area files)
+// .	Windows version

ADDED   docs/manual/reference.in
Index: docs/manual/reference.in
==================================================================
--- /dev/null
+++ docs/manual/reference.in
@@ -0,0 +1,839 @@
+// This file is part of Megatest.
+// 
+//     Megatest is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+// 
+//     Megatest is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+// 
+//     You should have received a copy of the GNU General Public License
+//     along with Megatest.  If not, see .
+
+Reference
+---------
+
+Megatest Use Modes
+~~~~~~~~~~~~~~~~~~
+
+.Base commands
+[width="80%",cols="^,2m,2m",frame="topbot",options="header"]
+|======================
+|Use case	         | Megatest command	|  mtutil
+|Start from scratch       |	-rerun-all	|  restart	
+|Rerun non-good completed |	-rerun-clean	|  rerunclean	
+|Rerun all non-good and not completed yet | -set-state-status KILLREQ; -rerun-|clean | killrerun	
+|Continue run             |	-run	        |  resume	
+|Remove run	         |      -remove-runs	|  clean	
+|Lock run	         |      -lock	        |  lock	
+|Unlock run	         |      -unlock	        |  unlock	
+|killrun	                 | -set-state-status KILLREQ; -kill-run	| killrun	
+|======================
+
+Config File Helpers
+~~~~~~~~~~~~~~~~~~~
+
+Various helpers for more advanced config files.
+
+.Helpers
+[width="80%",cols="^,2m,2m,2m",frame="topbot",options="header"]
+|======================
+|Helper                      | Purpose                       | Valid values            | Comments
+| #{scheme (scheme code...)} | Execute arbitrary scheme code | Any valid scheme        | Value returned from the call is converted to a string and processed as part of the config file
+| #{system command}          | Execute program, inserts exit code  | Any valid Unix command  | Discards the output from the program
+| #{shell  command} or #{sh ...}  | Execute program, inserts result from stdout | Any valid Unix command | Value returned from the call is converted to a string and processed as part of the config file
+| #{realpath path} or #{rp ...}   | Replace with normalized path | Must be a valid path |
+| #{getenv VAR} or #{gv VAR}      | Replace with content of env variable | Must be a valid var |
+| #{get s v} or #{g s v}     | Replace with variable v from section s | Variable must be defined before use |
+| #{rget v}                  | Replace with variable v from target or default of runconfigs file | |
+| #{mtrah}                   | Replace with the path to the megatest testsuite area | | 
+|======================
+
+Config File Settings
+~~~~~~~~~~~~~~~~~~~~
+
+Settings in megatest.config
+
+Config File Additional Features
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Including output from a script as if it was inline to the config file:
+
+-------------------------
+[scriptinc myscript.sh]
+-------------------------
+
+If the script outputs:
+
+-------------------------
+[items]
+A a b c
+B d e f
+-------------------------
+
+Then the config file would effectively appear to contain an items section
+exactly like the output from the script. This is useful when dynamically
+creating items, itemstables and other config structures. You can see the
+expansion of the call by looking in the cached files (look in your linktree
+for megatest.config and runconfigs.config cache files and in your test run
+areas for the expanded and cached testconfig).
+
+Wildcards and regexes in Targets
+
+-------------------------
+[a/2/b]
+VAR1 VAL1
+
+[a/%/b]
+VAR1 VAL2
+-------------------------
+
+Will result in:
+
+-------------------------
+[a/2/b]
+VAR1 VAL2
+-------------------------
+
+Can use either wildcard of "%" or a regular expression:
+
+-------------------------
+[/abc.*def/]
+-------------------------
+
+Disk Space Checks
+^^^^^^^^^^^^^^^^^
+
+Some parameters you can put in the [setup] section of megatest.config:
+
+-------------------
+# minimum space required in a run disk 
+minspace 10000000
+
+# minimum space required in dbdir:
+dbdir-space-required 100000
+
+# script that takes path as parameter and returns number of bytes available:
+free-space-script check-space.sh
+-------------------
+
+Trim trailing spaces
+^^^^^^^^^^^^^^^^^^^^
+
+------------------
+[configf:settings trim-trailing-spaces yes]
+------------------
+
+Job Submission Control
+^^^^^^^^^^^^^^^^^^^^^^
+
+Submit jobs to Host Types based on Test Name
+++++++++++++++++++++++++++++++++++++++++++++
+
+.In megatest.config
+------------------------
+[host-types]
+general   nbfake
+remote    bsub
+
+[launchers]
+runfirst/sum% remote
+% general
+
+[jobtools]
+launcher bsub
+# if defined and not "no" flexi-launcher will bypass launcher unless 
+# there is no host-type match.
+flexi-launcher yes
+------------------------
+
+host-types
+++++++++++
+
+List of host types and the commandline to run a job on that host type.
+
+.host-type => launch command
+------------
+general nbfake
+------------
+
+launchers
++++++++++
+
+.test/itempath => host-type
+------------
+runfirst/sum% remote
+------------
+
+Miscellaneous Setup Items
++++++++++++++++++++++++++
+
+Attempt to rerun tests in "STUCK/DEAD", "n/a", "ZERO_ITEMS" states.
+
+.In megatest.config
+------------------
+[setup]
+reruns 5
+------------------
+
+Replace the default blacklisted environment variables with user supplied
+list.
+
+Default list: USER HOME DISPLAY LS_COLORS XKEYSYMDB EDITOR MAKEFLAGS MAKEF MAKEOVERRIDES
+
+.Add a "bad" variable "PROMPT" to the variables that will be commented out
+in the megatest.sh and megatest.csh files:
+-----------------
+[setup]
+blacklistvars USER HOME DISPLAY LS_COLORS XKEYSYMDB EDITOR MAKEFLAGS PROMPT
+-----------------
+
+Run time limit
+++++++++++++++
+
+-----------------
+[setup]
+# this will automatically kill the test if it runs for more than 1h 2m and 3s
+runtimelim 1h 2m 3s
+-----------------
+
+Tests browser view
+~~~~~~~~~~~~~~~~~~
+
+The tests browser (see the Run Control tab on the dashboard) has two views for displaying the tests. 
+
+. Dot (graphviz) based tree
+. No dot, plain listing
+
+The default is the graphviz based tree but if your tests don't view
+well in that mode then use "nodot" to turn it off.
+
+-----------------
+[setup]
+nodot
+-----------------
+
+Capturing Test Data
+~~~~~~~~~~~~~~~~~~~
+
+In a test you can capture arbitrary variables and roll them up in the
+megatest database for viewing on the dashboard or web app.
+
+.In a test as a script
+------------------------
+$MT_MEGATEST -load-test-data << EOF
+foo,bar,   1.2,  1.9, >
+foo,rab, 1.0e9, 10e9, 1e9
+foo,bla,   1.2,  1.9, <
+foo,bal,   1.2,  1.2, <   ,     ,Check for overload
+foo,alb,   1.2,  1.2, <=  , Amps,This is the high power circuit test
+foo,abl,   1.2,  1.3, 0.1
+foo,bra,   1.2, pass, silly stuff
+faz,bar,    10,  8mA,     ,     ,"this is a comment"
+EOF
+------------------------
+
+Alternatively you can use logpro triggers to capture values and inject them
+into megatest using the -set-values mechanism:
+
+.Megatest help related to -set-values
+------------------------
+Test data capture
+  -set-values             : update or set values in the testdata table
+  :category               : set the category field (optional)
+  :variable               : set the variable name (optional)
+  :value                  : value measured (required)
+  :expected               : value expected (required)
+  :tol                    : |value-expect| <= tol (required, can be <, >, >=, <= or number)
+  :units                  : name of the units for value, expected_value etc. (optional)
+------------------------
+
+Dashboard settings
+~~~~~~~~~~~~~~~~~~
+
+.Runs tab buttons, font and size
+------------------
+[dashboard]
+btn-height x14
+btn-fontsz 10
+cell-width 60
+------------------
+
+Database settings
+~~~~~~~~~~~~~~~~~
+
+.Database config settings in [setup] section of megatest.config
+[width="70%",cols="^,2m,2m,2m",frame="topbot",options="header"]
+|======================
+|Var                       | Purpose            | Valid values            | Comments
+|delay-on-busy             | Prevent concurrent access issues | yes\|no or not defined | Default=no, may help on some network file systems, may slow things down also.
+|faststart		   | All direct file access to sqlite db files | yes\|no or not defined | Default=yes, suggest no for central automated systems and yes for interactive use
+|homehost 		   | Start servers on this host |  | Defaults to local host
+|hostname		   | Hostname to bind to | \|-	  | On multi-homed hosts allows binding to specific hostname
+|lowport		   | Start searching for a port at this portnum| 32768 | 
+|required		   | Server required    | yes\|no or not defined  | Default=no, force start of server always
+|server-query-threshold	   | Start server when queries take longer than this | number in milliseconds | Default=300
+|timeout		   | http api timeout 	| number in hours	  | Default is 1 minute, do not change
+|======================
+
+The testconfig File
+-------------------
+
+Setup section
+~~~~~~~~~~~~~
+
+Header
+^^^^^^
+
+-------------------
+[setup]
+-------------------
+
+The runscript method is a brute force way to run scripts where the
+user is responsible for setting STATE and STATUS
+
+-------------------
+runscript main.csh
+-------------------
+
+Requirements section
+~~~~~~~~~~~~~~~~~~~~
+
+.Header
+-------------------
+[requirements]
+-------------------
+
+Wait on Other Tests
+^^^^^^^^^^^^^^^^^^^
+
+-------------------
+# A normal waiton waits for the prior tests to be COMPLETED 
+# and PASS, CHECK or WAIVED
+waiton test1 test2
+-------------------
+
+Mode
+^^^^
+
+The default (i.e. if mode is not specified) is normal. All pre-dependent tests
+must be COMPLETED and PASS, CHECK or WAIVED before the test will start
+
+-------------------
+[requirements]
+mode   normal
+-------------------
+
+The toplevel mode requires only that the prior tests are COMPLETED.
+
+-------------------
+[requirements]
+mode toplevel
+-------------------
+
+A item based waiton will start items in a test when the same-named
+item is COMPLETED and PASS, CHECK or WAIVED in the prior test. This
+was historically called "itemwait" mode. The terms "itemwait" and
+"itemmatch" are synonyms.
+
+-------------------
+[requirements]
+mode itemmatch
+-------------------
+
+Overriding Enviroment Variables
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Override variables before starting the test. Can include files (perhaps generated by megatest -envdelta or similar).
+
+--------------------
+[pre-launch-env-vars]
+VAR1 value1
+
+# Get some generated settings
+[include ../generated-vars.config]
+
+# Use this trick to unset variables
+#{scheme (unsetenv "FOOBAR")}
+--------------------
+
+Itemmap Handling
+~~~~~~~~~~~~~~~~
+
+For cases were the dependent test has a similar but not identical
+itempath to the downstream test an itemmap can allow for itemmatch
+mode
+
+.example for removing part of itemmap for waiton test (eg: item +foo-x/bar+ depends on waiton's item +y/bar+)
+-------------------
+[requirements]
+mode itemwait
+# itemmap   
+itemmap .*x/ y/
+
+-------------------
+
+.example for removing part of itemmap for waiton test (eg: item +foo/bar/baz+ in this test depends on waiton's item +baz+)
+-------------------
+
+# ## pattern replacement notes
+#
+# ## Example
+# ## Remove everything up to the last /
+[requirements]
+mode itemwait
+# itemmap  
+itemmap .*/
+-------------------
+
+.example replacing part of itemmap for (eg: item +foo/1234+ will imply waiton's item +bar/1234+)
+-------------------
+
+#
+# ## Example
+# ## Replace foo/ with bar/
+[requirements]
+mode itemwait
+# itemmap   
+itemmap foo/ bar/
+
+-------------------
+
+.example for backreference (eg: item +foo23/thud+ will imply waiton's item +num-23/bar/thud+
+-------------------
+#
+# ## Example
+# ## can use \{number} in replacement pattern to backreference a (capture) from matching pattern similar to sed or perl
+[requirements]
+mode itemwait
+# itemmap   
+itemmap foo(\d+)/ num-\1/bar/
+
+-------------------
+
+.example multiple itemmaps
+-------------------
+
+# multi-line; matches are applied in the listed order
+# The following would map:
+#   a123b321 to b321fooa123 then to 321fooa123p
+#
+[requirements]
+itemmap (a\d+)(b\d+) \2foo\1
+  b(.*) \1p
+-------------------
+
+
+Complex mapping
+^^^^^^^^^^^^^^^
+Complex mappings can be handled with a separate [itemmap] section (instead if an itemmap line in the [requirements] section)
+
+Each line in an itemmap section starts with a waiton test name followed by an itemmap expression
+
+.eg: The following causes waiton test A item +bar/1234+ to run when our test's +foo/1234+ item is requested as well as causing waiton test B's +blah+ item to run when our test's +stuff/blah+ item is requested
+--------------
+[itemmap]
+A foo/ bar/
+B stuff/
+--------------
+
+
+Complex mapping example
+^^^^^^^^^^^^^^^^^^^^^^^
+
+
+
+// image::itemmap.png[]
+image::complex-itemmap.png[]
+
+
+We accomplish this by configuring the testconfigs of our tests C D and E as follows:
+
+.Testconfig for Test E has
+----------------------
+[requirements]
+waiton C
+itemmap (\d+)/res \1/bb
+----------------------
+
+.Testconfig for Test D has
+----------------------
+[requirements]
+waiton C
+itemmap (\d+)/res \1/aa
+----------------------
+
+.Testconfig for Test C has
+----------------------
+[requirements]
+waiton A B
+
+[itemmap]
+A (\d+)/aa aa/\1
+B (\d+)/bb bb/\1
+----------------------
+
+.Testconfigs for Test B and Test A have no waiton or itemmap configured
+-------------------
+-------------------
+
+.Walk through one item -- we want the following to happen for testpatt +D/1/res+ (see blue boxes in complex itemmaping figure above):
+
+. eg from command line +megatest -run -testpatt D/1/res -target mytarget -runname myrunname+
+. Full list to be run is now: +D/1/res+
+. Test D has a waiton - test C.  Test D's itemmap rule +itemmap (\d+)/res \1/aa+ ->  causes +C/1/aa+ to run before +D/1/res+
+. Full list to be run is now: +D/1/res+, +C/1/aa+
+. Test C was a waiton - test A. Test C's rule +A (\d+)/aa aa/\1+ -> causes +A/aa/1+ to run before +C/1/aa+
+. Full list to be run is now: +D/1/res+, +C/1/aa+, +A/aa/1+
+. Test A has no waitons.  All waitons of all tests in full list have been processed.  Full list is finalized.
+
+
+
+itemstable
+^^^^^^^^^^
+An alternative to defining items is the itemstable section.  This lets you define the itempath in a table format rather than specifying components and relying on getting all permutations of those components.
+
+
+
+
+
+Dynamic Flow Dependency Tree
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.Autogeneration waiton list for dynamic flow dependency trees
+-------------------
+[requirements]
+# With a toplevel test you may wish to generate your list 
+# of tests to run dynamically
+#
+waiton #{shell get-valid-tests-to-run.sh}
+-------------------
+
+Run time limit
+^^^^^^^^^^^^^^
+
+-----------------
+[requirements]
+runtimelim 1h 2m 3s  # this will automatically kill the test if it runs for more than 1h 2m and 3s
+-----------------
+
+Skip
+^^^^
+
+A test with a skip section will conditional skip running.
+
+.Skip section example
+-----------------
+[skip]
+prevrunning x
+# rundelay 30m 15s
+-----------------
+
+Skip on Still-running Tests
+^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+-----------------
+# NB// If the prevrunning line exists with *any* value the test will
+# automatically SKIP if the same-named test is currently RUNNING. The
+# "x" can be any string. Comment out the prevrunning line to turn off
+# skip.
+
+[skip]
+prevrunning x
+-----------------
+
+Skip if a File Exists
+^^^^^^^^^^^^^^^^^^^^^
+
+-----------------
+[skip]
+fileexists /path/to/a/file # skip if /path/to/a/file exists
+-----------------
+
+Skip if test ran more recently than specified time
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+.Skip if this test has been run in the past fifteen minutes and 15 seconds.
+-----------------
+[skip]
+rundelay 15m 15s
+-----------------
+
+Disks
+^^^^^
+
+A disks section in testconfig will override the disks section in
+megatest.config. This can be used to allocate disks on a per-test or per item
+basis.
+
+Controlled waiver propagation
+^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
+
+If test is FAIL and previous test in run with same MT_TARGET is WAIVED then apply the following rules from the testconfig:
+If a waiver check is specified in the testconfig apply the check and if it passes then set this FAIL to WAIVED
+
+Waiver check has two parts, 1) a list of waiver, rulename, filepatterns and 2) the rulename script spec (note that "diff" and "logpro" are predefined)
+
+-----------------
+###### EXAMPLE FROM testconfig #########
+# matching file(s) will be diff'd with previous run and logpro applied
+# if PASS or WARN result from logpro then WAIVER state is set
+#
+[waivers]
+# logpro_file    rulename      input_glob
+waiver_1         logpro        lookittmp.log
+
+[waiver_rules]
+
+# This builtin rule is the default if there is no .logpro file
+# diff   diff %file1% %file2%
+
+# This builtin rule is applied if a .logpro file exists
+# logpro diff %file1% %file2% | logpro %waivername%.logpro %waivername%.html
+-----------------
+
+Ezsteps
+~~~~~~~
+
+.Example ezsteps with logpro rules
+-----------------
+[ezsteps]
+lookittmp   ls /tmp
+
+[logpro]
+lookittmp ;; Note: config file format supports multi-line entries where leading whitespace is removed from each line
+  ;;     a blank line indicates the end of the block of text 
+  (expect:required in "LogFileBody" > 0 "A file name that should never exist!" #/This is a awfully stupid file name that should never be found in the temp dir/)
+
+-----------------
+
+To transfer the environment to the next step you can do the following:
+
+----------------------------
+$MT_MEGATEST -env2file .ezsteps/${stepname}	  
+----------------------------
+
+Triggers
+~~~~~~~~
+
+In your testconfig or megatest.config triggers can be specified 
+
+-----------------
+[triggers]
+
+# Call script running.sh when test goes to state=RUNNING, status=PASS
+RUNNING/PASS running.sh
+
+# Call script running.sh any time state goes to RUNNING
+RUNNING/ running.sh
+
+# Call script onpass.sh any time status goes to PASS
+PASS/ onpass.sh
+-----------------
+
+Scripts called will have; test-id test-rundir trigger test-name item-path state status event-time, added to the commandline.
+
+HINT
+
+To start an xterm (useful for debugging), use a command line like the following:
+
+-----------------
+[triggers]
+COMPLETED/ xterm -e bash -s -- 
+-----------------
+
+NOTE: There is a trailing space after the --
+
+There are a number of environment variables available to the trigger script
+but since triggers can be called in various contexts not all variables are
+available at all times. The trigger script should check for the variable and
+fail gracefully if it doesn't exist.
+
+.Environment variables visible to the trigger script
+[width="90%",cols="^,2m",frame="topbot",options="header"]
+|======================
+|Variable             | Purpose            
+| MT_TEST_RUN_DIR     | The directory where Megatest ran this test                   
+| MT_CMDINFO          | Encoded command data for the test                   
+| MT_DEBUG_MODE       | Used to pass the debug mode to nested calls to Megatest                   
+| MT_RUN_AREA_HOME    | Megatest home area 
+| MT_TESTSUITENAME    | The name of this testsuite or area                   
+| MT_TEST_NAME        | The name of this test
+| MT_ITEM_INFO        | The variable and values for the test item
+| MT_MEGATEST         | Which Megatest binary is being used by this area
+| MT_TARGET           | The target variable values, separated by '/'
+| MT_LINKTREE         | The base of the link tree where all run tests can be found
+| MT_ITEMPATH         | The values of the item path variables, separated by '/'
+| MT_RUNNAME          | The name of the run
+|======================
+
+
+Override the Toplevel HTML File
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+Megatest generates a simple html file summary for top level tests of
+iterated tests. The generation can be overridden. NOTE: the output of
+the script is captured from stdout to create the html.
+
+
+.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:
+#  /
+# Within the archive the data is structured like this:
+#  ///
+archive0 /mfs/myarchive-data/adisk1
+--------------
+
+Handling Environment Variables
+------------------------------
+
+It is often necessary to capture and or manipulate environment
+variables. Megatest has some facilities built in to help.
+
+Capture variables
+~~~~~~~~~~~~~~~~~
+
+.Commands
+------------------------------
+# capture the current enviroment into a db called envdat.db under
+# the context "before"
+megatest -envcap before
+
+# capture the current environment into a db called startup.db with 
+# context "after"
+megatest -envcap after startup.db
+
+# write the diff from before to after
+megatest -envdelta before-after -dumpmode bash
+------------------------------
+
+Dump modes include bash, csh and config. You can include config data
+into megatest.config or runconfigs.config.
+
+.Example of generating and using config data
+------------------------------
+megatest -envcap original
+# do some stuff here
+megatest -envcap munged
+megatest -envdelta original-munged -dumpmode ini -o modified.config
+------------------------------
+
+Then in runconfigs.config
+
+.Example of using modified.config in a testconfig
+------------------------------
+cat testconfig
+[pre-launch-env-vars]
+[include modified.config]
+------------------------------
+
+Managing Old Runs
+-----------------
+
+It is often desired to keep some older runs around but this must be balanced with the costs of disk space.
+
+. Use -remove-keep
+. Use -archive (can also be done from the -remove-keep interface)
+. use -remove-runs with -keep-records
+
+.For each target, remove all runs but the most recent 3 if they are over 1 week old
+---------------------
+# use -precmd 'sleep 5;nbfake' to limit overloading the host computer but to allow the removes to run in parallel.
+megatest -actions print,remove-runs -remove-keep 3 -target %/%/%/% -runname % -age 1w -precmd 'sleep 5;nbfake'"
+---------------------
+
+Nested Runs
+-----------
+
+A Megatest test can run a full Megatest run in either the same
+Megatest area or in another area. This is a powerful way of chaining
+complex suites of tests and or actions.
+
+If you are not using the current area you can use ezsteps to retrieve
+and setup the sub-Megatest run area.
+
+In the testconfig:
+---------------
+[subrun]
+
+# Required: wait for the run or just launch it
+#           if no then the run will be an automatic PASS irrespective of the actual result
+run-wait yes|no
+
+# Optional: where to execute the run. Default is the current runarea
+run-area /some/path/to/megatest/area
+
+# Optional: method to use to determine pass/fail status of the run
+#   auto (default) - roll up the net state/status of the sub-run
+#   logpro         - use the provided logpro rules, happens automatically if there is a logpro section
+# passfail auto|logpro
+# Example of logpro:
+passfail logpro
+
+# Optional: 
+logpro ;; if this section exists then logpro is used to determine pass/fail
+  (expect:required in "LogFileBody" >= 1 "At least one pass" #/PASS/)
+  (expect:error     in "LogFileBody"  = 0 "No FAILs allowed"  #/FAIL/)
+
+# Optional: target translator, default is to use the parent target
+target #{shell somescript.sh}
+
+# Optional: runname translator/generator, default is to use the parent runname
+run-name #{somescript.sh}
+
+# Optional: testpatt spec, default is to first look for TESTPATT spec from runconfigs unless there is a contour spec
+test-patt %/item1,test2
+
+# Optional: contour spec, use the named contour from the megatest.config contour spec
+contour contourname ### NOTE: Not implemented yet! Let us know if you need this feature.
+
+# Optional: mode-patt, use this spec for testpatt from runconfigs
+mode-patt TESTPATT
+
+# Optional: tag-expr, use this tag-expr to select tests
+tag-expr quick
+
+# Optional: (not yet implemented, remove-runs is always propagated at this time), propagate these actions from the parent
+#           test
+#   Note// default is % for all
+propagate remove-runs archive ...
+
+---------------
+
+Programming API
+---------------
+
+These routines can be called from the megatest repl. 
+
+.API Keys Related Calls
+[width="70%",cols="^,2m,2m,2m",frame="topbot",options="header,footer"]
+|======================
+|API Call                        | Purpose comments   | Returns                 | Comments
+|(rmt:get-keys run-id)           |                    | ( key1 key2 ... )       | 
+| (rmt:get-key-val-pairs run-id) |                    | #t=success/#f=fail      | Works only if the server is still reachable
+|======================
+
+
+:numbered!:

DELETED docs/manual/reference.txt
Index: docs/manual/reference.txt
==================================================================
--- docs/manual/reference.txt
+++ /dev/null
@@ -1,597 +0,0 @@
-
-Reference
----------
-
-Config File Helpers
-~~~~~~~~~~~~~~~~~~~
-
-Various helpers for more advanced config files.
-
-.Helpers
-[width="80%",cols="^,2m,2m,2m",frame="topbot",options="header"]
-|======================
-|Helper                      | Purpose                       | Valid values            | Comments
-| #{scheme (scheme code...)} | Execute arbitrary scheme code | Any valid scheme        | Value returned from the call is converted to a string and processed as part of the config file
-| #{system command}          | Execute program, inserts exit code  | Any valid Unix command  | Discards the output from the program
-| #{shell  command} or #{sh ...}  | Execute program, inserts result from stdout | Any valid Unix command | Value returned from the call is converted to a string and processed as part of the config file
-| #{realpath path} or #{rp ...}   | Replace with normalized path | Must be a valid path |
-| #{getenv VAR} or #{gv VAR}      | Replace with content of env variable | Must be a valid var |
-| #{get s v} or #{g s v}     | Replace with variable v from section s | Variable must be defined before use |
-| #{rget v}                  | Replace with variable v from target or default of runconfigs file | |
-| #{mtrah}                   | Replace with the path to the megatest testsuite area | | 
-|======================
-
-Config File Settings
-~~~~~~~~~~~~~~~~~~~~
-
-Settings in megatest.config
-
-Config File Additional Features
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Including output from a script as if it was inline to the config file:
-
--------------------------
-[scriptinc myscript.sh]
--------------------------
-
-If the script outputs:
-
--------------------------
-[items]
-A a b c
-B d e f
--------------------------
-
-Then the config file would effectively appear to contain an items section
-exactly like the output from the script. This is useful when dynamically
-creating items, itemstables and other config structures. You can see the
-expansion of the call by looking in the cached files (look in your linktree
-for megatest.config and runconfigs.config cache files and in your test run
-areas for the expanded and cached testconfig).
-
-Wildcards and regexes in Targets
-
--------------------------
-[a/2/b]
-VAR1 VAL1
-
-[a/%/b]
-VAR1 VAL2
--------------------------
-
-Will result in:
-
--------------------------
-[a/2/b]
-VAR1 VAL2
--------------------------
-
-Can use either wildcard of "%" or a regular expression:
-
-[/abc.*def/]
-
-Disk Space Checks
-^^^^^^^^^^^^^^^^^
-
-Some parameters you can put in the [setup] section of megatest.config:
-
--------------------
-# minimum space required in a run disk 
-minspace 10000000
-
-# minimum space required in dbdir:
-dbdir-space-required 100000
-
-# script that takes path as parameter and returns number of bytes available:
-free-space-script check-space.sh
--------------------
-
-Trim trailing spaces
-^^^^^^^^^^^^^^^^^^^^
-
-------------------
-[configf:settings trim-trailing-spaces yes]
-------------------
-
-Job Submission Control
-^^^^^^^^^^^^^^^^^^^^^^
-
-Submit jobs to Host Types based on Test Name
-++++++++++++++++++++++++++++++++++++++++++++
-
-.In megatest.config
-------------------------
-[host-types]
-general   nbfake
-remote    bsub
-
-[launchers]
-runfirst/sum% remote
-% general
-
-[jobtools]
-launcher bsub
-# if defined and not "no" flexi-launcher will bypass launcher unless 
-# there is no host-type match.
-flexi-launcher yes
-------------------------
-
-host-types
-++++++++++
-
-List of host types and the commandline to run a job on that host type.
-
-.host-type => launch command
-------------
-general nbfake
-------------
-
-launchers
-+++++++++
-
-.test/itempath => host-type
-------------
-runfirst/sum% remote
-------------
-
-Miscellaneous Setup Items
-+++++++++++++++++++++++++
-
-Attempt to rerun tests in "STUCK/DEAD", "n/a", "ZERO_ITEMS" states.
-
-.In megatest.config
-------------------
-[setup]
-reruns 5
-------------------
-
-Run time limit
-++++++++++++++
-
------------------
-[setup]
-# this will automatically kill the test if it runs for more than 1h 2m and 3s
-runtimelim 1h 2m 3s
------------------
-
-Tests browser view
-~~~~~~~~~~~~~~~~~~
-
-The tests browser (see the Run Control tab on the dashboard) has two views for displaying the tests. 
-
-. Dot (graphviz) based tree
-. No dot, plain listing
-
-The default is the graphviz based tree but if your tests don't view
-well in that mode then use "nodot" to turn it off.
-
------------------
-[setup]
-nodot
------------------
-
-Dashboard settings
-~~~~~~~~~~~~~~~~~~
-
-.Runs tab buttons, font and size
-------------------
-[dashboard]
-btn-height x14
-btn-fontsz 10
-cell-width 60
-------------------
-
-Database settings
-~~~~~~~~~~~~~~~~~
-
-.Database config settings in [setup] section of megatest.config
-[width="70%",cols="^,2m,2m,2m",frame="topbot",options="header"]
-|======================
-|Var                       | Purpose            | Valid values            | Comments
-|delay-on-busy             | Prevent concurrent access issues | yes\|no or not defined | Default=no, may help on some network file systems, may slow things down also.
-|daemonize                 | Daemonize the server on start | yes\|no or not defined | Default=no
-|faststart		   | All direct file access to sqlite db files | yes\|no or not defined | Default=yes, suggest no for central automated systems and yes for interactive use
-|homehost 		   | Start servers on this host |  | Defaults to local host
-|hostname		   | Hostname to bind to | \|-	  | On multi-homed hosts allows binding to specific hostname
-|lowport		   | Start searching for a port at this portnum| 32768 | 
-|required		   | Server required    | yes\|no or not defined  | Default=no, force start of server always
-|server-query-threshold	   | Start server when queries take longer than this | number in milliseconds | Default=300
-|timeout		   | http api timeout 	| number in hours	  | Default is 1 minute, do not change
-|======================
-
-The testconfig File
--------------------
-
-Setup section
-~~~~~~~~~~~~~
-
-Header
-^^^^^^
-
--------------------
-[setup]
--------------------
-
-The runscript method is a brute force way to run scripts where the
-user is responsible for setting STATE and STATUS
-
--------------------
-runscript main.csh
--------------------
-
-Requirements section
-~~~~~~~~~~~~~~~~~~~~
-
-.Header
--------------------
-[requirements]
--------------------
-
-Wait on Other Tests
-^^^^^^^^^^^^^^^^^^^
-
--------------------
-# A normal waiton waits for the prior tests to be COMPLETED 
-# and PASS, CHECK or WAIVED
-waiton test1 test2
--------------------
-
-Mode
-^^^^
-
-The default (i.e. if mode is not specified) is normal. All pre-dependent tests
-must be COMPLETED and PASS, CHECK or WAIVED before the test will start
-
--------------------
-[requirements]
-mode   normal
--------------------
-
-The toplevel mode requires only that the prior tests are COMPLETED.
-
--------------------
-[requirements]
-mode toplevel
--------------------
-
-A item based waiton will start items in a test when the same-named
-item is COMPLETED and PASS, CHECK or WAIVED in the prior test. This
-was historically called "itemwait" mode. The terms "itemwait" and
-"itemmatch" are synonyms.
-
--------------------
-[requirements]
-mode itemmatch
--------------------
-
-Overriding Enviroment Variables
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Override variables before starting the test. Can include files (perhaps generated by megatest -envdelta or similar).
-
---------------------
-[pre-launch-env-vars]
-VAR1 value1
-
-# Get some generated settings
-[include ../generated-vars.config]
-
-# Use this trick to unset variables
-#{scheme (unsetenv "FOOBAR")}
---------------------
-
-Itemmap Handling
-~~~~~~~~~~~~~~~~
-
-For cases were the dependent test has a similar but not identical
-itempath to the downstream test an itemmap can allow for itemmatch
-mode
-
--------------------
-[requirements]
-mode itemmatch
-itemmap .*x/ y/
-
-# ## pattern replacement notes
-#
-# ## Example
-# ## Remove everything up to the last /
-itemmap .*/
-#
-# ## Example
-# ## Replace foo/ with bar/
-itemmap foo/ bar/
-
-# multi-line; matches are applied in the listed order
-# The following would map:
-#   a123b321 to b321fooa123 then to 321fooa123p
-#
-itemmap (a\d+)(b\d+) \2foo\1
-  b(.*) \1p
--------------------
-
-Complex mappings
-^^^^^^^^^^^^^^^^
-
-Complex mappings can be handled with the [itemmap] section
-
-// image::itemmap.png[]
-image::complex-itemmap.png[]
-
-Example:
-
-. Request to run D/1/res
-. Megatest uses rule "(\d+)/res" -> "\1/aa" to create item C/1/aa from D/1/res
-. Full list to be run is now: D/1/res, C/1/aa
-. Megatest uses rule "(\d+)/aa" -> "aa/\1" to create item A/aa/1
-. Full list to be run is now: D/1/res, C/1/aa, A/aa/1
-
-.Testconfig for Test C
-----------------------
-[requirements]
-waiton A B
-
-[itemmap]
-A (\d+)/aa aa/\1
-B (\d+)/bb 
-----------------------
-
-.Testconfig for Test D
-----------------------
-[requirements]
-waiton C
-itemmap (\d+)/res \1/aa
-----------------------
-
-.Testconfig for Test E
-----------------------
-[requirements]
-waiton C
-itemmap (\d+)/res \1/bb
-----------------------
-
-Dynamic Flow Dependency Tree
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-.Autogeneration waiton list for dynamic flow dependency trees
--------------------
-[requirements]
-# With a toplevel test you may wish to generate your list 
-# of tests to run dynamically
-#
-waiton #{shell get-valid-tests-to-run.sh}
--------------------
-
-Run time limit
-^^^^^^^^^^^^^^
-
------------------
-[requirements]
-runtimelim 1h 2m 3s  # this will automatically kill the test if it runs for more than 1h 2m and 3s
------------------
-
-Skip
-^^^^
-
-A test with a skip section will conditional skip running.
-
-.Skip section example
------------------
-[skip]
-prevrunning x
-# rundelay 30m 15s
------------------
-
-Skip on Still-running Tests
-^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
------------------
-# NB// If the prevrunning line exists with *any* value the test will
-# automatically SKIP if the same-named test is currently RUNNING. The
-# "x" can be any string. Comment out the prevrunning line to turn off
-# skip.
-
-[skip]
-prevrunning x
------------------
-
-Skip if a File Exists
-^^^^^^^^^^^^^^^^^^^^^
-
------------------
-[skip]
-fileexists /path/to/a/file # skip if /path/to/a/file exists
------------------
-
-Skip if test ran more recently than specified time
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-.Skip if this test has been run in the past fifteen minutes and 15 seconds.
------------------
-[skip]
-rundelay 15m 15s
------------------
-
-Disks
-^^^^^
-
-A disks section in testconfig will override the disks section in
-megatest.config. This can be used to allocate disks on a per-test or per item
-basis.
-
-Controlled waiver propagation
-^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-If test is FAIL and previous test in run with same MT_TARGET is WAIVED then apply the following rules from the testconfig:
-If a waiver check is specified in the testconfig apply the check and if it passes then set this FAIL to WAIVED
-
-Waiver check has two parts, 1) a list of waiver, rulename, filepatterns and 2) the rulename script spec (note that "diff" and "logpro" are predefined)
-
------------------
-###### EXAMPLE FROM testconfig #########
-# matching file(s) will be diff'd with previous run and logpro applied
-# if PASS or WARN result from logpro then WAIVER state is set
-#
-[waivers]
-# logpro_file    rulename      input_glob
-waiver_1         logpro        lookittmp.log
-
-[waiver_rules]
-
-# This builtin rule is the default if there is no .logpro file
-# diff   diff %file1% %file2%
-
-# This builtin rule is applied if a .logpro file exists
-# logpro diff %file1% %file2% | logpro %waivername%.logpro %waivername%.html
------------------
-
-Ezsteps
-~~~~~~~
-
-.Example ezsteps with logpro rules
------------------
-[ezsteps]
-lookittmp   ls /tmp
-
-[logpro]
-lookittmp ;; Note: config file format supports multi-line entries where leading whitespace is removed from each line
-  ;;     a blank line indicates the end of the block of text 
-  (expect:required in "LogFileBody" > 0 "A file name that should never exist!" #/This is a awfully stupid file name that should never be found in the temp dir/)
-
------------------
-
-To transfer the environment to the next step you can do the following:
-
-----------------------------
-$MT_MEGATEST -env2file .ezsteps/${stepname}	  
-----------------------------
-
-Triggers
-~~~~~~~~
-
-In your testconfig triggers can be specified 
-
------------------
-[triggers]
-
-# Call script running.sh when test goes to state=RUNNING, status=PASS
-RUNNING/PASS running.sh
-
-# Call script running.sh any time state goes to RUNNING
-RUNNING/ running.sh
-
-# Call script onpass.sh any time status goes to PASS
-PASS/ onpass.sh
------------------
-
-Scripts called will have; test-id test-rundir trigger, added to the commandline.
-
-HINT
-
-To start an xterm (useful for debugging), use a command line like the following:
-
------------------
-[triggers]
-COMPLETED/ xterm -e bash -s -- 
------------------
-
-NOTE: There is a trailing space after the --
-
-
-Override the Toplevel HTML File
-~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-
-Megatest generates a simple html file summary for top level tests of
-iterated tests. The generation can be overridden. NOTE: the output of
-the script is captured from stdout to create the html.
-
-
-.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:
-#  /
-# Within the archive the data is structured like this:
-#  ///
-archive0 /mfs/myarchive-data/adisk1
---------------
-
-Handling Environment Variables
-------------------------------
-
-It is often necessary to capture and or manipulate environment
-variables. Megatest has some facilities built in to help.
-
-Capture variables
-~~~~~~~~~~~~~~~~~
-
-.Commands
-------------------------------
-# capture the current enviroment into a db called envdat.db under
-# the context "before"
-megatest -envcap before
-
-# capture the current environment into a db called startup.db with 
-# context "after"
-megatest -envcap after startup.db
-
-# write the diff from before to after
-megatest -envdelta before-after -dumpmode bash
-------------------------------
-
-Dump modes include bash, csh and config. You can include config data
-into megatest.config or runconfigs.config.
-
-.Example of generating and using config data
-------------------------------
-megatest -envcap original
-# do some stuff here
-megatest -envcap munged
-megatest -envdelta original-munged -dumpmode ini -o modified.config
-------------------------------
-
-Then in runconfigs.config
-
-.Example of using modified.config in a testconfig
-------------------------------
-cat testconfig
-
-[pre-launch-env-vars]
-[include modified.config]
-------------------------------
-
-
-Programming API
----------------
-
-These routines can be called from the megatest repl. 
-
-.API Keys Related Calls
-[width="70%",cols="^,2m,2m,2m",frame="topbot",options="header,footer"]
-|======================
-|API Call                        | Purpose comments   | Returns                 | Comments
-|(rmt:get-keys run-id)           |                    | ( key1 key2 ... )       | 
-| (rmt:get-key-val-pairs run-id) |                    | #t=success/#f=fail      | Works only if the server is still reachable
-|======================
-
-
-:numbered!:
-

Index: docs/manual/server.dot
==================================================================
--- docs/manual/server.dot
+++ docs/manual/server.dot
@@ -1,5 +1,21 @@
+//  Copyright 2006-2017, Matthew Welland.
+// 
+// This file is part of Megatest.
+// 
+//     Megatest is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+// 
+//     Megatest is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+// 
+//     You should have received a copy of the GNU General Public License
+//     along with Megatest.  If not, see .
 digraph G {
 
     subgraph cluster_1 {
         node [style=filled,shape=box];
 

Index: docs/manual/thoughts.fig
==================================================================
--- docs/manual/thoughts.fig
+++ docs/manual/thoughts.fig
@@ -1,49 +1,65 @@
-#FIG 3.2
+#FIG 3.2  Produced by xfig version 3.2.5-alpha5
 Landscape
 Center
 Inches
 Letter  
 100.00
 Single
 -2
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 1200 2
 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
 	 1800 3000 10800 3000 10800 4800 1800 4800 1800 3000
 2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
 	 14475 975 15975 975 15975 1500 14475 1500 14475 975
 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
 	 15075 2550 14100 3675
 2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
 	 14175 4275 15150 5475
-4 0 0 50 -1 0 24 0.0000 4 255 990 3150 1800 -runall\001
-4 0 0 50 -1 0 24 0.0000 4 330 4665 2175 5190 (expect:ignore Test: abc FAIL/)\001
-4 0 0 50 -1 0 24 0.0000 4 330 1095 2400 6225 [group]\001
-4 0 0 50 -1 0 24 0.0000 4 330 2415 2625 8085 megatest -runall\001
-4 0 0 50 -1 0 24 0.0000 4 360 1185 5250 8025 $(TAG)\001
-4 0 0 50 -1 0 24 0.0000 4 255 3045 4650 8700 make TARGET=foo\001
-4 0 0 50 -1 0 24 0.0000 4 330 4755 2625 6825 TAG1 envsetup test1 test2 testx\001
-4 0 0 50 -1 0 24 0.0000 4 330 1440 7875 1425 testconfig\001
-4 0 0 50 -1 0 24 0.0000 4 330 2190 7875 1845 [requirements]\001
-4 0 0 50 -1 0 24 0.0000 4 255 2670 3150 2220 -runtests standard\001
-4 0 0 50 -1 0 24 0.0000 4 300 1320 14625 2325 envsetup\001
-4 0 0 50 -1 0 24 0.0000 4 255 705 13650 4125 test1\001
-4 0 0 50 -1 0 24 0.0000 4 255 1410 14550 5850 testsuite2\001
-4 0 0 50 -1 0 24 0.0000 4 255 795 10200 6300 waito\001
-4 0 0 50 -1 0 24 0.0000 4 330 3990 7875 2265 testmode normal | toplevel \001
-4 0 0 50 -1 0 24 0.0000 4 330 2610 7875 2685 waitoncompleted \001
-4 0 0 50 -1 0 24 0.0000 4 360 9255 2175 4350 megatest -list-runs $MT_RUNNAME -target $MT_TARGET\001
-4 0 0 50 -1 0 24 0.0000 4 330 1860 10050 7275 test_toplevel\001
-4 0 0 50 -1 0 24 0.0000 4 330 2190 10050 7695 [requirements]\001
-4 0 0 50 -1 0 24 0.0000 4 330 2580 10050 8115 testmode toplevel\001
-4 0 0 50 -1 0 24 0.0000 4 330 2580 10050 8535 waiton testx testy\001
-4 0 0 50 -1 0 24 0.0000 4 225 810 10050 9375 testx:\001
-4 0 0 50 -1 0 24 0.0000 4 315 1050 10050 9795 [items]\001
-4 0 0 50 -1 0 24 0.0000 4 300 780 10050 11055 testy:\001
-4 0 0 50 -1 0 24 0.0000 4 315 1050 10050 11475 [items]\001
-4 0 0 50 -1 0 24 0.0000 4 330 2190 10800 13170 [requirements]\001
-4 0 0 50 -1 0 24 0.0000 4 300 780 10050 12735 testy:\001
-4 0 0 50 -1 0 24 0.0000 4 330 3330 10800 13590 waitoncompleted testx\001
-4 0 0 50 -1 0 24 0.0000 4 255 2610 10800 14010 waitonitems testx\001
-4 0 0 50 -1 0 24 0.0000 4 255 1605 10050 10215 X A B D E\001
-4 0 0 50 -1 0 24 0.0000 4 255 1245 10050 11895 Y A B C\001
-4 0 0 50 -1 0 24 0.0000 4 330 6660 2100 3450 waiton #{shell get-valid-tests-for-dotproc.sh}\001
+4 0 0 50 -1 0 24 0.0000 4 270 1050 3150 1800 -runall\001
+4 0 0 50 -1 0 24 0.0000 4 375 5040 2175 5190 (expect:ignore Test: abc FAIL/)\001
+4 0 0 50 -1 0 24 0.0000 4 375 1200 2400 6225 [group]\001
+4 0 0 50 -1 0 24 0.0000 4 375 2610 2625 8085 megatest -runall\001
+4 0 0 50 -1 0 24 0.0000 4 405 1275 5250 8025 $(TAG)\001
+4 0 0 50 -1 0 24 0.0000 4 270 3255 4650 8700 make TARGET=foo\001
+4 0 0 50 -1 0 24 0.0000 4 375 5160 2625 6825 TAG1 envsetup test1 test2 testx\001
+4 0 0 50 -1 0 24 0.0000 4 375 1575 7875 1425 testconfig\001
+4 0 0 50 -1 0 24 0.0000 4 375 2400 7875 1845 [requirements]\001
+4 0 0 50 -1 0 24 0.0000 4 270 2910 3150 2220 -runtests standard\001
+4 0 0 50 -1 0 24 0.0000 4 345 1440 14625 2325 envsetup\001
+4 0 0 50 -1 0 24 0.0000 4 270 780 13650 4125 test1\001
+4 0 0 50 -1 0 24 0.0000 4 270 1545 14550 5850 testsuite2\001
+4 0 0 50 -1 0 24 0.0000 4 270 855 10200 6300 waito\001
+4 0 0 50 -1 0 24 0.0000 4 375 4290 7875 2265 testmode normal | toplevel \001
+4 0 0 50 -1 0 24 0.0000 4 375 2820 7875 2685 waitoncompleted \001
+4 0 0 50 -1 0 24 0.0000 4 420 9900 2175 4350 megatest -list-runs $MT_RUNNAME -target $MT_TARGET\001
+4 0 0 50 -1 0 24 0.0000 4 375 2010 10050 7275 test_toplevel\001
+4 0 0 50 -1 0 24 0.0000 4 375 2400 10050 7695 [requirements]\001
+4 0 0 50 -1 0 24 0.0000 4 375 2805 10050 8115 testmode toplevel\001
+4 0 0 50 -1 0 24 0.0000 4 375 2805 10050 8535 waiton testx testy\001
+4 0 0 50 -1 0 24 0.0000 4 240 885 10050 9375 testx:\001
+4 0 0 50 -1 0 24 0.0000 4 345 1155 10050 9795 [items]\001
+4 0 0 50 -1 0 24 0.0000 4 345 855 10050 11055 testy:\001
+4 0 0 50 -1 0 24 0.0000 4 345 1155 10050 11475 [items]\001
+4 0 0 50 -1 0 24 0.0000 4 375 2400 10800 13170 [requirements]\001
+4 0 0 50 -1 0 24 0.0000 4 345 855 10050 12735 testy:\001
+4 0 0 50 -1 0 24 0.0000 4 375 3615 10800 13590 waitoncompleted testx\001
+4 0 0 50 -1 0 24 0.0000 4 270 2835 10800 14010 waitonitems testx\001
+4 0 0 50 -1 0 24 0.0000 4 270 1680 10050 10215 X A B D E\001
+4 0 0 50 -1 0 24 0.0000 4 270 1335 10050 11895 Y A B C\001
+4 0 0 50 -1 0 24 0.0000 4 375 7170 2100 3450 waiton #{shell get-valid-tests-for-dotproc.sh}\001

Index: docs/manual/writing_tests.txt
==================================================================
--- docs/manual/writing_tests.txt
+++ docs/manual/writing_tests.txt
@@ -1,5 +1,21 @@
+//  Copyright 2006-2017, Matthew Welland.
+// 
+// This file is part of Megatest.
+// 
+//     Megatest is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+// 
+//     Megatest is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+// 
+//     You should have received a copy of the GNU General Public License
+//     along with Megatest.  If not, see .
 
 Writing Tests
 -------------
 
 Creating a new Test

ADDED   docs/megatest-desktop.png
Index: docs/megatest-desktop.png
==================================================================
--- /dev/null
+++ docs/megatest-desktop.png
cannot compute difference between binary files

Index: docs/megatest-state-status.dot
==================================================================
--- docs/megatest-state-status.dot
+++ docs/megatest-state-status.dot
@@ -1,5 +1,23 @@
+//  Copyright 2006-2017, Matthew Welland.
+// 
+// This file is part of Megatest.
+// 
+//     Megatest is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+// 
+//     Megatest is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+// 
+//     You should have received a copy of the GNU General Public License
+//     along with Megatest.  If not, see .
+//
+
 digraph megatest_state_status {
   ranksep=0.05
   // rankdir=LR
 
 node [shape=box,style=filled];
@@ -31,11 +49,11 @@
      label="{RUNNING|{n/a| PASS | FAIL}}";
   ]
 
   "COMPLETED" [
       shape="record";
-      label = "{COMPLETED|{PASS |  FAIL | CHECK| SKIP}}";
+      label = "{COMPLETED|{PASS | SKIP | WAIVED | FAIL | CHECK| ABORT}}";
   ]
 
 
 "RUNNING" -> "COMPLETED";
 "RUNNING" -> "INCOMPLETE" [label="test dead for > 24hrs"];

DELETED docs/megatest.lyx
Index: docs/megatest.lyx
==================================================================
--- docs/megatest.lyx
+++ /dev/null
@@ -1,4102 +0,0 @@
-#LyX 2.0 created this file. For more info see http://www.lyx.org/
-\lyxformat 413
-\begin_document
-\begin_header
-\textclass article
-\begin_preamble
-% Include the proper LaTeX packages:
-%----------------------------------------------------------------------------------------------------
-\usepackage{graphicx}
-\usepackage{titling}
-\usepackage{ifthen}
-\usepackage[absolute]{textpos}
-\usepackage[colorlinks=true,
-                       pagecolor=black,
-                       menucolor=black,
-                       linkcolor=black,
-                       citecolor=blue,
-                       pagebordercolor=1 1 1,
-                       urlcolor=red,
-                       plainpages=false,
-                       pdfpagelabels=true,
-                       bookmarksnumbered=true]{hyperref}
-\usepackage{lastpage}
-
-\newcommand{\reportTopic}{}
-\newcommand{\revisionNumber}{}
-\newcommand{\documentNumber}{}
-
-
-% Setup the right-hand header to display the current doc section:
-%----------------------------------------------------------------------------------------------------
-\renewcommand{\sectionmark}[1]{\markright{#1}}
-\renewcommand{\subsectionmark}[1]{\markright{#1}}
-
-% Setup for roman numeral page numbers until TOC:
-%----------------------------------------------------------------------------------------------------
-\newboolean{romanpn}
-
-\pagenumbering{roman}
-\setboolean{romanpn}{true}
-\let\myTOC\tableofcontents
-
-\renewcommand\tableofcontents{%
-\myTOC
-\clearpage
-\pagenumbering{arabic}
-\setboolean{romanpn}{false}
-}
-
-% Modify titlepage format:
-%----------------------------------------------------------------------------------------------------
-\setlength{\TPHorizModule}{1in}
-\setlength{\TPVertModule}{\TPHorizModule}
-\textblockorigin{3.25in}{1in}
-
-\pretitle
- {
-    \begin{flushright}\LARGE\sffamily 
-    \thispagestyle{empty}
-    \begin{textblock}{4}(0,0)
-    \includegraphics[width=2in,keepaspectratio=true]
-{/home/matt/data/megatest/docs/megatest_logo.png}
-    \end{textblock}
-    \vspace{1in}
-  }
-
-\posttitle{\par\end{flushright}}
-
-\preauthor{\begin{flushright} \large \sffamily \lineskip 0.5em 
-\begin{tabular}[t]{c}}
-\postauthor{\end{tabular} \par\end{flushright}}
-
-\predate{\begin{flushright}\large \sffamily Document Number: \documentNumber \\ Revision Number: \revisionNumber \\}
-
-\postdate{
-\vspace{2in}
-\\Matt Welland.
-\par\end{flushright}}
-
-% Setup "fancy" page layout:
-%----------------------------------------------------------------------------------------------------
-\fancyhf{}
-\setlength{\topmargin}{-1in}
-\setlength{\headheight}{1in}
-\setlength{\headsep}{0.5in}
-\setlength{\oddsidemargin}{0.25in}
-\setlength{\evensidemargin}{\oddsidemargin}
-\setlength{\textwidth}{6in}
-\setlength{\headwidth}{\textwidth}
-\setlength{\textheight}{8.375in}
-\setlength{\footskip}{0.5in}
-
-% Setup header:
-%------------------------------------------------------------------------------------------
-\fancyhead[L]{\sffamily \bfseries \large Megatest.\\\mdseries \reportTopic}
-\fancyhead[R]{\sffamily \bfseries \large User Manual\\ \mdseries \nouppercase{\rightmark}}
-
-% Setup footer:
-%------------------------------------------------------------------------------------------
-\renewcommand{\footrulewidth}{0.4pt}
-\fancyfoot[L]{\sffamily \bfseries \documentNumber \\ \mdseries Revision:  \revisionNumber}
-\fancyfoot[C]{\sffamily \bfseries\thedate \\ \mdseries Free Software. License: GPL v2.0}
-\fancyfoot[R]{\ifthenelse{\boolean{romanpn}}{\sffamily  \thepage}{\sffamily \bfseries Page \thepage\ of \pageref{LastPage}}}
-\end_preamble
-\use_default_options false
-\maintain_unincluded_children false
-\language english
-\language_package default
-\inputencoding auto
-\fontencoding global
-\font_roman times
-\font_sans helvet
-\font_typewriter courier
-\font_default_family default
-\use_non_tex_fonts false
-\font_sc false
-\font_osf false
-\font_sf_scale 100
-\font_tt_scale 100
-
-\graphics default
-\default_output_format default
-\output_sync 0
-\bibtex_command default
-\index_command default
-\paperfontsize 11
-\spacing single
-\use_hyperref false
-\papersize letterpaper
-\use_geometry false
-\use_amsmath 1
-\use_esint 0
-\use_mhchem 0
-\use_mathdots 1
-\cite_engine basic
-\use_bibtopic false
-\use_indices false
-\paperorientation portrait
-\suppress_date false
-\use_refstyle 0
-\index Index
-\shortcut idx
-\color #008000
-\end_index
-\secnumdepth 3
-\tocdepth 3
-\paragraph_separation skip
-\defskip medskip
-\quotes_language english
-\papercolumns 1
-\papersides 1
-\paperpagestyle fancy
-\tracking_changes false
-\output_changes false
-\html_math_output 0
-\html_css_as_file 0
-\html_be_strict false
-\end_header
-
-\begin_body
-
-\begin_layout Standard
-\begin_inset ERT
-status open
-
-\begin_layout Plain Layout
-
-
-\backslash
-renewcommand{
-\backslash
-documentNumber}{TSETAGEM-011}
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\begin_inset ERT
-status open
-
-\begin_layout Plain Layout
-
-
-\backslash
-renewcommand{
-\backslash
-reportTopic}{Megatest User Manual}
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\begin_inset ERT
-status open
-
-\begin_layout Plain Layout
-
-
-\backslash
-renewcommand{
-\backslash
-revisionNumber}{v1.36}
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Title
-Megatest User Manual
-\end_layout
-
-\begin_layout Author
-Matthew Welland
-\end_layout
-
-\begin_layout Date
-Jan.
- 29, 2012 
-\end_layout
-
-\begin_layout Standard
-\begin_inset Newpage newpage
-\end_inset
-
-
-\begin_inset ERT
-status collapsed
-
-\begin_layout Plain Layout
-
-
-\backslash
-copyright
-\end_layout
-
-\end_inset
-
-2011 Matthew Welland.
- All rights reserved.
- 
-\end_layout
-
-\begin_layout Standard
-Megatest is free software released under the General Public License v2.0.
- Please see the file COPYING in the source distribution for details.
- 
-\end_layout
-
-\begin_layout Standard
-\begin_inset VSpace medskip
-\end_inset
-
-Email: matt@kiatoa.com.
- 
-\end_layout
-
-\begin_layout Standard
-Web: www.kiatoa.com/fossils/megatest
-\end_layout
-
-\begin_layout Standard
-\begin_inset VSpace medskip
-\end_inset
-
-This document is believed to be acurate at the time of writing but as with
- any opensource project the source code itself is the reference.
- It is the responsibility of the end user to validate that the code will
- perform as they expect.
- The author assumes no responsibility for any inaccuracies that this document
- may contain.
- In no event will Matthew Welland be liable for direct, indirect, special,
- exemplary, incidental, or consequential damages resulting from any defect
- or omission in this document, even if advised of the possibility of such
- damages.
- 
-\end_layout
-
-\begin_layout Standard
-This document is a snapshot in time and Megatest software has likely changed
- since publication.
- This document and Megatest may be improved at any time, without notice
- or obligation.
- 
-\end_layout
-
-\begin_layout Standard
-\begin_inset Newpage newpage
-\end_inset
-
-
-\end_layout
-
-\begin_layout Section*
-Megatest/document Revision History
-\end_layout
-
-\begin_layout Standard
-
-\shape italic
-Notable revisions of the software are occasionally documented here
-\shape default
-.
-\end_layout
-
-\begin_layout Standard
-\align center
-\begin_inset Tabular
-
-
-
-
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Version
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Author
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Description
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Date
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-v1.25
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-matt
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-converted to new document template
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset ERT
-status open
-
-\begin_layout Plain Layout
-
-
-\backslash
-thedate
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\end_inset
-
-
-
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\begin_inset Newpage newpage
-\end_inset
-
-
-\begin_inset CommandInset toc
-LatexCommand tableofcontents
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\begin_inset Newpage newpage
-\end_inset
-
-
-\end_layout
-
-\begin_layout Section
-Introduction
-\end_layout
-
-\begin_layout Subsection
-Megatest design philosophy
-\end_layout
-
-\begin_layout Standard
-Megatest is intended to provide the minimum needed resources to make writing
- a suite of tests and implementing continuous build for software, design
- engineering or process control (via owlfs for example) without being specialize
-d for any specific problem space.
- Megatest in of itself does not know what constitutes a PASS or FAIL of
- a test.
- In most cases megatest is best used in conjunction with logpro or a similar
- tool to parse, analyze and decide on the test outcome.
-\end_layout
-
-\begin_layout Subsection
-Megatest architecture
-\end_layout
-
-\begin_layout Standard
-All data to specify the tests and configure the system is stored in plain
- text files.
- All system state is stored in an sqlite3 database.
- Tests are launched using the launching system available for the distributed
- compute platform in use.
- A template script is provided which can launch jobs on local and remote
- Linux hosts.
- Currently megatest uses the network filesystem to 
-\begin_inset Quotes eld
-\end_inset
-
-call home
-\begin_inset Quotes erd
-\end_inset
-
- to your master sqlite3 database.
-\end_layout
-
-\begin_layout Section
-Installation
-\end_layout
-
-\begin_layout Subsection
-Dependencies
-\end_layout
-
-\begin_layout Standard
-Chicken scheme and a number of 
-\begin_inset Quotes eld
-\end_inset
-
-eggs
-\begin_inset Quotes erd
-\end_inset
-
- are required for building megatest.
- See the file utils/installall.sh for an automated way to install the dependencie
-s on Linux.
-\end_layout
-
-\begin_layout Subsection
-Build and Install
-\end_layout
-
-\begin_layout Standard
-Run “make test” to create the megatest executable.
- You may wish to copy the executable to a centrally accessible location.
-\end_layout
-
-\begin_layout Section
-Setup
-\end_layout
-
-\begin_layout Subsection
-Create megatest.config
-\end_layout
-
-\begin_layout Standard
-Create the file megatest.config using the megatest.config template from the
- tests directory.
- At a minimum you need the following:
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-# Fields are the keys under which your test runs are organized
-\end_layout
-
-\begin_layout Plain Layout
-
-[fields]
-\end_layout
-
-\begin_layout Plain Layout
-
-field1 TEXT
-\end_layout
-
-\begin_layout Plain Layout
-
-field2 TEXT
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-[jobtools]
-\end_layout
-
-\begin_layout Plain Layout
-
-# The launcher launches jobs to the local or remote hosts,
-\end_layout
-
-\begin_layout Plain Layout
-
-# the job is managed on the target host by megatest,
-\end_layout
-
-\begin_layout Plain Layout
-
-# comment out launcher to run local only.
- An example launcher
-\end_layout
-
-\begin_layout Plain Layout
-
-# "nbfake" can be found in the utils directory.
- 
-\end_layout
-
-\begin_layout Plain Layout
-
-launcher nbfake
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-# The disks section specifies where the tests will be run.
- As you
-\end_layout
-
-\begin_layout Plain Layout
-
-# run out of space in a partition you can add additional disks
-\end_layout
-
-\begin_layout Plain Layout
-
-# entries.
-\end_layout
-
-\begin_layout Plain Layout
-
-# Format is:
-\end_layout
-
-\begin_layout Plain Layout
-
-# name /path/to/area 
-\end_layout
-
-\begin_layout Plain Layout
-
-[disks]
-\end_layout
-
-\begin_layout Plain Layout
-
-disk1 /tmp 
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-Create runconfigs.config
-\end_layout
-
-\begin_layout Standard
-This file is used to set environment variables that are run specific.
- You can simply create an empty file to start.
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-# runconfigs.config
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-Create the tests directory and your first test
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-mt
-\end_layout
-
-\begin_layout Plain Layout
-
-|-- megatest.config
-\end_layout
-
-\begin_layout Plain Layout
-
-|-- runconfigs.config
-\end_layout
-
-\begin_layout Plain Layout
-
-`-- tests
-\end_layout
-
-\begin_layout Plain Layout
-
-    `-- mytest
-\end_layout
-
-\begin_layout Plain Layout
-
-        |-- main.sh
-\end_layout
-
-\begin_layout Plain Layout
-
-        `-- testconfig
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-Create the testconfig file for your test
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-[setup]
-\end_layout
-
-\begin_layout Plain Layout
-
-runscript main.sh
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-Create your test running script, main.sh
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-#!/bin/bash
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-$MT_MEGATEST -runstep mystep1 "sleep 20;echo Done" -m "mystep1 is done"
-\end_layout
-
-\begin_layout Plain Layout
-
-$MT_MEGATEST -test-status :state COMPLETED :status PASS -m "This is a comment"
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-Run megatest and watch your run progress
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-megatest :field1 abc :field2 def :runname 2011week08.4a -runall
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-watch megatest -list-runs %
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-# OR use the dashboard
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-dashboard &
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Section
-Choose Flow or Unstructured Run?
-\end_layout
-
-\begin_layout Standard
-A flow is a structured and specifically sequenced set of tests.
- See the Flows chapter to understand the difference.
-\end_layout
-
-\begin_layout Section
-How to Write Tests
-\end_layout
-
-\begin_layout Subsection
-A Simple Test with one Step
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-mkdir simpletest
-\end_layout
-
-\begin_layout Plain Layout
-
-cd simpletest
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-Create your testconfig file
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-inline false
-status open
-
-\begin_layout Plain Layout
-
-# testconfig
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-[setup]
-\end_layout
-
-\begin_layout Plain Layout
-
-runscript main.csh
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-Create the main.csh script
-\end_layout
-
-\begin_layout Standard
-Note: Using csh is NOT recommended.
- Use bash, perl, ruby, zsh or anything other than csh.
- We use csh here because it is popular in the EDA industry for which Megatest
- was originally created.
- 
-\end_layout
-
-\begin_layout Standard
-\noindent
-\align left
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-#!/bin/tcsh -x
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-# run the cpu1 simulation.
-\end_layout
-
-\begin_layout Plain Layout
-
-#   The step name is "run_simulation"
-\end_layout
-
-\begin_layout Plain Layout
-
-#   The commandline being run for this step is "runsim cpu1"
-\end_layout
-
-\begin_layout Plain Layout
-
-#   The logpro file to validate the output from the run is "runsim.logpro"
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-$MT_MEGATEST -runstep run_simulation -logpro runsim.logpro "runsim cpu1"
-\end_layout
-
-\begin_layout Plain Layout
-
-$MT_MEGATEST -test-status :state COMPLETED :status $?
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-You can now run megatest and the created test directory will contain the
- new files “run_simulation.html” and “run_simulation.log”.
- If you are using the dashboard you can click on the run and then push the
- “View log” button to view the log file in firefox.
-\end_layout
-
-\begin_layout Subsection
-Simple Test with Multiple Steps 
-\end_layout
-
-\begin_layout Standard
-To run multiple steps simply add them to the main.csh file.
- Here we add a step to test “cpu2”.
- The second step that tests cpu2 will only run after the step that tested
- “cpu1” completes.
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-#!/bin/tcsh -x
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-# run the cpu1 simulation.
-\end_layout
-
-\begin_layout Plain Layout
-
-#   The step name is "run_simulation"
-\end_layout
-
-\begin_layout Plain Layout
-
-#   The commandline being run for this step is "runsim cpu1"
-\end_layout
-
-\begin_layout Plain Layout
-
-#   The logpro file to validate the output from the run is "runsim.logpro"
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-$MT_MEGATEST -runstep run_simulation_cpu1 -logpro runsim.logpro "runsim cpu1"
- && 
-\backslash
-
-\end_layout
-
-\begin_layout Plain Layout
-
-$MT_MEGATEST -runstep run_simulation_cpu2 -logpro runsim.logpro "runsim cpu2"
-\end_layout
-
-\begin_layout Plain Layout
-
-$MT_MEGATEST -test-status :state COMPLETED :status $?
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Section
-Simple Test with Multiple Steps, Some in Parallel
-\end_layout
-
-\begin_layout Subsection
-The Makefile
-\end_layout
-
-\begin_layout Standard
-A good way to run steps in parallel within a single test, especially when
- there are following steps, is to use the Unix Make utility.
- Writing Makefiles is beyond the scope of this document but here is a minimal
- example that will run “runsim cpu1” and “runsim cpu2” in parallel.
- For more information on make try “info make” at the Linux command prompt.
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-# Example Makefile to run two steps in parallel
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-RTLDIR=/path/to/rtl
-\end_layout
-
-\begin_layout Plain Layout
-
-CPUS = cpu1 cpu2
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-run_simulation_$(CPUS).html : $(RTLDIR)/$(CPUS)
-\end_layout
-
-\begin_layout Plain Layout
-
-	$(MT_MEGATEST) -runstep run_simulation_$(CPUS) -logpro runsim.logpro "runsim
- $(CPUS)
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-The main.csh file
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-#!/bin/tcsh -x
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-# run the cpu1 and cpu2 simulations in parallel.
- 
-\end_layout
-
-\begin_layout Plain Layout
-
-# The -j parameter tells make how many jobs it may run in parallel
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-\noindent
-\align left
-
-make -j 2 
-\end_layout
-
-\begin_layout Plain Layout
-
-$MT_MEGATEST -test-status :state COMPLETED :status $?
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Section
-Simple Test with Iteration
-\end_layout
-
-\begin_layout Standard
-Since no jobs run after the cpu1 and cpu2 simulations in this test it is
- possible to use iterated mode.
-\end_layout
-
-\begin_layout Subsection
-Update your testconfig file for iteration
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-[setup]
-\end_layout
-
-\begin_layout Plain Layout
-
-runscript main.csh
-\end_layout
-
-\begin_layout Plain Layout
-\noindent
-\align left
-
-\end_layout
-
-\begin_layout Plain Layout
-
-[items]
-\end_layout
-
-\begin_layout Plain Layout
-
-CPU cpu1 cpu2
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-Rewrite your main.csh for iteration
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-\noindent
-
-#!/bin/tcsh -x
-\end_layout
-
-\begin_layout Plain Layout
-\noindent
-
-\end_layout
-
-\begin_layout Plain Layout
-\noindent
-
-# run the cpu simulation but now use the environment variable $CPU
-\end_layout
-
-\begin_layout Plain Layout
-\noindent
-
-# to select what cpu to run the simulation against
-\end_layout
-
-\begin_layout Plain Layout
-\noindent
-
-\end_layout
-
-\begin_layout Plain Layout
-\noindent
-
-$MT_MEGATEST -runstep run_simulation -logpro runsim.logpro "runsim $CPU"
-\end_layout
-
-\begin_layout Plain Layout
-\noindent
-
-# As of version 1.07 Megatest automatically converts a status of "0"
-\end_layout
-
-\begin_layout Plain Layout
-\noindent
-
-# to "PASS", any other number to "FAIL" and directly uses the value of
-\end_layout
-
-\begin_layout Plain Layout
-\noindent
-
-# a string passed in.
-\end_layout
-
-\begin_layout Plain Layout
-\noindent
-
-$MT_MEGATEST -test-status :state COMPLETED :status $?
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-Tests with Inter-test dependencies
-\end_layout
-
-\begin_layout Standard
-Sometimes a test depends on the output from a previous test or it may not
- make sense to run a test is another test does not complete with status
- “PASS”.
- In either of these scenarios you can use the “waiton” keyword in your testconfi
-g file to indicate that this test must wait on one or more tests to complete
- before being launched.
- In this example there is no point in running the “system” test if the “cpu”
- and “mem” tests either do not complete or complete but with status “FAIL”.
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-\noindent
-
-# testconfig for the "system" test
-\end_layout
-
-\begin_layout Plain Layout
-\noindent
-
-[setup]
-\end_layout
-
-\begin_layout Plain Layout
-\noindent
-
-runscript main.csh
-\end_layout
-
-\begin_layout Plain Layout
-\noindent
-
-waiton cpu mem
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-Rolling up Miscellaneous Data
-\end_layout
-
-\begin_layout Standard
-Use the -load-test-data switch to roll up arbitrary data from a test into
- the test_data table.
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-# Fields are:
-\end_layout
-
-\begin_layout Plain Layout
-
-# category,variable,value,expected,tol,units,comment,status
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-$MT_MEGATEST -load-test-data << EOF
-\end_layout
-
-\begin_layout Plain Layout
-
-foo,bar,1.2,1.9,>
-\end_layout
-
-\begin_layout Plain Layout
-
-foo,rab,1.0e9,10e9,1e9
-\end_layout
-
-\begin_layout Plain Layout
-
-foo,bla,1.2,1.9,<
-\end_layout
-
-\begin_layout Plain Layout
-
-foo,bal,1.2,1.2,<,,Check for overload
-\end_layout
-
-\begin_layout Plain Layout
-
-foo,alb,1.2,1.2,<=,Amps,This is the high power circuit test
-\end_layout
-
-\begin_layout Plain Layout
-
-foo,abl,1.2,1.3,0.1
-\end_layout
-
-\begin_layout Plain Layout
-
-foo,bra,1.2,pass,silly stuff
-\end_layout
-
-\begin_layout Plain Layout
-
-faz,bar,10,8mA,,,"this is a comment"
-\end_layout
-
-\begin_layout Plain Layout
-
-EOF
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-New entries are keyed on the category and variable.
- If a new record is inserted with a category and variable that have already
- been used the new record will replace the old record.
-\end_layout
-
-\begin_layout Standard
-Where value, expected and tol are specified the behavior is as follows.
-\end_layout
-
-\begin_layout Itemize
-If value, expected and tol are numbers then status is calculated as PASS
- if (expected-tol) <= value <= (expected+tol)
-\end_layout
-
-\begin_layout Itemize
-If value and expected are numbers and tol is >, <, >= or <= then value is
- compared with expected using the operator given by tol
-\end_layout
-
-\begin_layout Itemize
-If status is specified its value overrides the above calculations.
-\end_layout
-
-\begin_layout Subsection
-Rolling up Runs
-\end_layout
-
-\begin_layout Standard
-To roll up a number of tests in a sequence of runs to a single run use the
- -rollup command.
- 
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-megatest -rollup :sysname ubuntu :fsname nfs :datapath none :runname rollup_ww38
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-All keys must be specified and the runname is the name of the run that will
- be created.
- All paths are kept original inside the database.
- When -remove-runs is used to delete runs the data is not deleted if there
- are rollups that refer to the data.
- 
-\end_layout
-
-\begin_layout Section
-Dashboard
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-> dashboard &
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-\begin_inset Graphics
-	filename dashboard.png
-	scale 80
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-Pushing one of the buttons on the main dashboard will bring up the test
- specific dashboard.
- Values are updated in semi-real time as the test runs.
-\end_layout
-
-\begin_layout Standard
-\begin_inset Graphics
-	filename dashboard-test.png
-	scale 80
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Section
-Generating an OpenDocument Spreadsheet from the Database
-\end_layout
-
-\begin_layout Standard
-And OpenDocument multi-paned spreadsheet can be generated from the megatest.db
- file by running -extract-ods
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-megatest -extract-ods results.ods :runname % 
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-You can optionally specify the keys for your database to limit further the
- runs to extract into the spreadsheet.
- The first sheet contains all the run data and subsequent sheets contain
- data rolled up for the individual tests.
-\end_layout
-
-\begin_layout Section
-Introspection
-\end_layout
-
-\begin_layout Subsection
-Getting previous test paths
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-megatest -test-paths -target %/%/% :runname % -testpatt % -itempatt % :status
- PASS 
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Section
-Flows
-\end_layout
-
-\begin_layout Standard
-A flow specifies the tests to run, the order and dependencies and is managed
- by a running megatest process.
-\end_layout
-
-\begin_layout Section
-Flow Specification and Running (Not released yet)
-\end_layout
-
-\begin_layout Subsection
-Write your flow file
-\end_layout
-
-\begin_layout Standard
-flows/.config
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-# Flow: 
-\end_layout
-
-\begin_layout Plain Layout
-
-[flowconfig]
-\end_layout
-
-\begin_layout Plain Layout
-
-# turn on item level dependencies
-\end_layout
-
-\begin_layout Plain Layout
-
-itemdeps on
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-[flowsteps]
-\end_layout
-
-\begin_layout Plain Layout
-
-# [,]
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-# Run the test "copydata"
-\end_layout
-
-\begin_layout Plain Layout
-
-copydata
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-# Run the test "setup" after copydata completes with PASS, WARN or WAIVE
-\end_layout
-
-\begin_layout Plain Layout
-
-setup,copydata
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-# once the test "setup" completes successfully run sim1, sim2 and sim3
-\end_layout
-
-\begin_layout Plain Layout
-
-sim1,setup
-\end_layout
-
-\begin_layout Plain Layout
-
-sim2,setup
-\end_layout
-
-\begin_layout Plain Layout
-
-sim3,setup
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-Run the flow
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-megatest -runflow  :FIELD1 val1 :FIELD2 val2 :runname wk32.4
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Section
-Monitor based running
-\end_layout
-
-\begin_layout Subsection
-Monitor logic
-\end_layout
-
-\begin_layout Standard
-Note: The monitor is usable but incomplete as of Megatest v1.31.
- Click on the 
-\begin_inset Quotes eld
-\end_inset
-
-Monitor
-\begin_inset Quotes erd
-\end_inset
-
- button on the dashboard to start the monitor and give it a try.
-\end_layout
-
-\begin_layout Standard
-\begin_inset Graphics
-	filename monitor-state-diagram.svg
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Section
-Reference
-\end_layout
-
-\begin_layout Subsection
-Configuration file Syntax
-\end_layout
-
-\begin_layout Standard
-Note: whitespace is preserved including at the end of line.
- Ensure your entries only have whitespace at the end of line when needed
- to avoid problems.
-\end_layout
-
-\begin_layout Subsubsection
-Sections
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily}"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-[section name]
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-This creates a section named “section name”
-\end_layout
-
-\begin_layout Subsubsection
-Variables
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily}"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-VARX has this value
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-The variable “VARX” will have the value “has this value”
-\end_layout
-
-\begin_layout Subsubsection
-Includes
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-inline false
-status open
-
-\begin_layout Plain Layout
-
-[include filename]
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-The file named “filename” will be included as if part of the calling file.
- NOTE: This means no section can be named “include “ (with the whitespace).
-\end_layout
-
-\begin_layout Subsubsection
-Setting a variable by running a command
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily}"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-VARNAME [system ls /tmp]
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-The variable “VARNAME” will get a value created by the Unix command “ls
- /tmp”.
- All lines of output from the command will be joined with a space.
-\end_layout
-
-\begin_layout Subsubsection
-Notes
-\end_layout
-
-\begin_layout Itemize
-Some variables are infered as lists.
- Each token on the line separated by whitespace will be member of the list.
-\end_layout
-
-\begin_layout Itemize
-Comments (lines starting with #) and blank lines are ignored.
-\end_layout
-
-\begin_layout Subsection
-Environment variables
-\end_layout
-
-\begin_layout Standard
-\begin_inset Tabular
-
-
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Variable
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Purpose
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-MT_CMDINFO
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Conveys test variables to the megatest test runner.
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-MT_TEST_RUN_DIR
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Directory assigned by megatest for the test to run.
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-MT_TEST_NAME
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Name of the test, corrosponds to the directory name under tests.
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-MT_ITEM_INFO
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Iterated tests will set this to a sequence of key/values ((KEY val) ...) 
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-MT_RUN_AREA_HOME
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Directory where megatest was launched from and where the tests code can
- be found
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-MT_RUNNAME
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Name of this run as set by the :runname parameter
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-MT_MEGATEST
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Path/Filename to megatest executable.
- Found either from called path or but using the “exectuable” keyword in
- the [setup] section.
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
- ....
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-The field values as set on the megatest -runall command line (e.g.
- :field1 abc)
-\end_layout
-
-\end_inset
-
-
-
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-megatest.config
-\end_layout
-
-\begin_layout Standard
-\begin_inset Tabular
-
-
-
-
-
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-section
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-variable
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-value
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-required
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-comment
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-[setup]
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-max_concurrent_jobs
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-if variable is not defined no limit on jobs
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-executable
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-full path to megatest binary
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Use only if necessary, megatest will extract the location from where it
- used to launch and add append that to the PATH for test runs.
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-runsdir
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-full path to where the link tree to all runs will be created
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Because your runs may be spread out over several disk partitions a central
- link tree is created to make finding all the runs easy.
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-[fields]
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-string of letters, numbers and underscore
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-string of letters, numbers and underscore
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-at least one
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-[jobtools]
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-launcher
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-command line used to launch jobs - the job command (megatest -execute) will
- be appended to this
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-workhosts
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-list of hostnames to run jobs on NOT SUPPORTED RIGHT NOW
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-n/a
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-[jobgroups]
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-string of letters, numbers and underscore
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-number
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Control number of jobs allowed to concurrently run in categories.
- See [jobgroup] in testconfig
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-[env-override]
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-string of letters, numbers and underscore
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-any string
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-These are set on the test launching machine, not the test running machine.
- Typical usage is to control the host or run queue for launching tests.
- These values will not be seen by the test when it runs.
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-[disks]
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-string of letters, numbers and underscore
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-a valid path writable by the test launching process and by the test process
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-yes
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-The disk usage balancing algorithm is to choose the disk with the least
- space for each test run.
- 
-\end_layout
-
-\end_inset
-
-
-
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-runconfigs.config file
-\end_layout
-
-\begin_layout Standard
-\begin_inset Tabular
-
-
-
-
-
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-section
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-variable
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-value
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-required?
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-comment
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-[default]
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-string of letters, numbers and underscore
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-any
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-variables set in this section will be available for all runs, defining the
- same variable in another section will override the value from the default
- section
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-[field1value/field2value...]
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-string of letters, numbers and underscore
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-any
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-the values in this section will be set for any run where field1 is field1value,
- field2 is field2value and fieldN is fieldNvalue.
- 
-\end_layout
-
-\end_inset
-
-
-
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Standard
-Example: a test suite that checks that a piece of software works correctly
- for different customer configurations and locations each of which is done
- as a separate release regression run.
- The fields, CUSTOMER and LOCATION were chosen.
- The following runconfigs.config file would set some variables specific to
- runs for megacorp in India and femtocorp in the Cook Islands and New Zealand:
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-# runconfigs.config
-\end_layout
-
-\begin_layout Plain Layout
-
-[default]
-\end_layout
-
-\begin_layout Plain Layout
-
-ENCRYTION true
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-[megacorp/india]
-\end_layout
-
-\begin_layout Plain Layout
-
-TESTPATH /nfs/testing/megacorp_runs
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-[femtocorp/cook_islands]
-\end_layout
-
-\begin_layout Plain Layout
-
-ENCRYTION false
-\end_layout
-
-\begin_layout Plain Layout
-
-TESTPATH /afs/kiatoa/testing/cook_islands
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-[femtocorp/new_zealand]
-\end_layout
-
-\begin_layout Plain Layout
-
-TESTPATH /afs/kiatoa/testing/new_zealand
-\end_layout
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\begin_layout Plain Layout
-
-[megacorp/new_zealand]
-\end_layout
-
-\begin_layout Plain Layout
-
-TESTPATH /nfs/testing/megacorp_runs
-\end_layout
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Paragraph*
-Running megatest like this:
-\end_layout
-
-\begin_layout Code
-megatest :CUSTOMER megacorp :LOCATION new_zealand :runname week12_2011_run1
- -runall
-\end_layout
-
-\begin_layout Paragraph*
-Would set:
-\end_layout
-
-\begin_layout Code
-ENCRYPTION true
-\end_layout
-
-\begin_layout Code
-TESTPATH /nfs/testing/megacorp_runs
-\end_layout
-
-\begin_layout Subsection
-Writing tests
-\end_layout
-
-\begin_layout Subsubsection
-testconfig file
-\end_layout
-
-\begin_layout Standard
-\begin_inset Tabular
-
-
-
-
-
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-section
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-variable
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-value
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-required?
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-comments
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-[setup]
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-runscript
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-name of script to execute for this test
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-yes
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-The script must be executable and either provide the full path or put a
- copy at the top of your test directory
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-[requirements]
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-waiton
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-list of valid test names
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-This test will not run until the named tests are state completed and status
- PASS
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-jobgroup
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-[items]
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-any valid
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-list of values
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-The test will be repeated once for each item with the variable name set
- to the value.
- If there is more than one variable then the test will be run against all
- unique combinations of the values
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-[eztests]
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-any valid
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-stepname command
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Use in addition to or instead of runscript for easy implementation of steps.
- If .logpro exists it will be applied to the .log and
- resulting exit code will be used to determine PASS/FAIL/WARN
-\end_layout
-
-\end_inset
-
-
-
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsubsection
-Command line
-\end_layout
-
-\begin_layout Standard
-\begin_inset Tabular
-
-
-
-
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-switch or param
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-parameter
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-purpose
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-comments
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--h
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-brief help
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--runall
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-run all tests
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--runtests
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-test1,test2,...
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-run one or more tests
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--step
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-stepname
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-record a step
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-requires :state and :status
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--test-status
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-record the test status
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-requires :state and :status
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--setlog
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-logfilename
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-set the logfile name for a test
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-path is assumed to be relative to the test run directory
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--set-toplog
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-logfilename
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-set the logfile name for the top test in an iterated test run
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-each sub test can have its own logfile set
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--m
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset Quotes eld
-\end_inset
-
-comment
-\begin_inset Quotes erd
-\end_inset
-
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-sets a comment for the step, test or run
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-:runname
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-[a-zA-Z0-9_-]+
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-directory in which this run will be stored in the test run area 
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-:state
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-any value
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Set the step or test state, this is stored in the state field in the steps
- or tests table respectively
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-For tests Megatest recognises 
-\begin_inset Quotes eld
-\end_inset
-
-INCOMPLETE
-\begin_inset Quotes erd
-\end_inset
-
-, 
-\begin_inset Quotes eld
-\end_inset
-
-COMPLETE
-\begin_inset Quotes erd
-\end_inset
-
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-:status
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-any value
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Set the step or test status, this is stored in the status field in the steps
- or tests table respectively
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-For tests Megatest recognises 
-\begin_inset Quotes eld
-\end_inset
-
-PASS
-\begin_inset Quotes erd
-\end_inset
-
-, 
-\begin_inset Quotes eld
-\end_inset
-
-FAIL
-\begin_inset Quotes erd
-\end_inset
-
-, and 
-\begin_inset Quotes eld
-\end_inset
-
-CHECK
-\begin_inset Quotes erd
-\end_inset
-
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--list-runs
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-any value, % is wildcard
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Respects -itempatt and -testpatt for filters
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--testpatt
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-any value, % is wildcard
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--itempatt
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-any value, % is wildcard
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--showkeys
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Print the keys being used for this database
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--force
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Test will not re-run if in the 
-\begin_inset Quotes eld
-\end_inset
-
-PASS
-\begin_inset Quotes erd
-\end_inset
-
-, 
-\begin_inset Quotes eld
-\end_inset
-
-CHECK
-\begin_inset Quotes erd
-\end_inset
-
- or 
-\begin_inset Quotes eld
-\end_inset
-
-KILLED
-\begin_inset Quotes erd
-\end_inset
-
-, using -force will force the run to be launched.
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-WARNING: The -force switch will bypass any 
-\begin_inset Quotes eld
-\end_inset
-
-waiton
-\begin_inset Quotes erd
-\end_inset
-
- dependencies.
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--xterm
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Launch an xterm instead of run the test.
- The xterm will have the environment that the test would see.
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--remove-runs
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Remove a run, test or subtest from the database and the disk.
- Cannot be undone.
- Requires -testpatt, -itempatt, :runname and all keys be specified.
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\shape italic
-Test helpers
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--runstep
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-Used inside a test to run a step, record the start and end of the step and
- optionally analyze the output using logpro.
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
--logpro
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-If using logpro to acess the PASS/FAIL status of the step you specify the
- logpro file with this parameter.
-\end_layout
-
-\end_inset
-
-
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-
-
-
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Section
-\start_of_appendix
-Data
-\end_layout
-
-\begin_layout Section
-References
-\end_layout
-
-\end_body
-\end_document

Index: docs/mt/megatest.config
==================================================================
--- docs/mt/megatest.config
+++ docs/mt/megatest.config
@@ -0,0 +1,17 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+

Index: docs/mt/runconfigs.config
==================================================================
--- docs/mt/runconfigs.config
+++ docs/mt/runconfigs.config
@@ -0,0 +1,17 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+

Index: docs/mt/tests/mytest/main.sh
==================================================================
--- docs/mt/tests/mytest/main.sh
+++ docs/mt/tests/mytest/main.sh
@@ -0,0 +1,17 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+

Index: docs/mt/tests/mytest/testconfig
==================================================================
--- docs/mt/tests/mytest/testconfig
+++ docs/mt/tests/mytest/testconfig
@@ -0,0 +1,17 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+

ADDED   docs/pkts.dot
Index: docs/pkts.dot
==================================================================
--- /dev/null
+++ docs/pkts.dot
@@ -0,0 +1,76 @@
+//  Copyright 2006-2017, Matthew Welland.
+// 
+// This file is part of Megatest.
+// 
+//     Megatest is free software: you can redistribute it and/or modify
+//     it under the terms of the GNU General Public License as published by
+//     the Free Software Foundation, either version 3 of the License, or
+//     (at your option) any later version.
+// 
+//     Megatest is distributed in the hope that it will be useful,
+//     but WITHOUT ANY WARRANTY; without even the implied warranty of
+//     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+//     GNU General Public License for more details.
+// 
+//     You should have received a copy of the GNU General Public License
+//     along with Megatest.  If not, see .
+// 
+digraph megatest_pkts {
+  ranksep=0.05
+  // rankdir=LR
+
+node [shape=box,style=filled];
+  
+  "SENSORS" [ label = "{ Sensor Processing | { file | git | fossil | script }}"
+	      shape = "record"; ];
+  
+  "RUNS"    [ label = "{ Runs Processing | { launch | clean | re-run | archive } | { dispatcher }}";
+	      shape = "record"; ];
+
+  "WORK"    [ label = "{ Work Items | { start task | task competed }}";
+	      shape = "record"; ];
+
+  "USERREQ" [ label = "{ User Requests (Unix and Web) | { launch | clean | re-run | archive }}";
+	      shape = "record"; ];
+
+  "MTAREA1" [ label = "{ Megatest Area 1 | { parallel job\nmanagement | test\nmanagement | data\nrollup }}";
+	      shape = "record"; ];
+  
+  "MTAREA2" [ label = "{ Megatest Area 2 | { parallel job\nmanagement | test\nmanagement | data\nrollup }}";
+	      shape = "record"; ];
+  
+  "MTAREA3" [ label = "More Megatest Areas ... ";
+	      shape = "record"; ];
+
+  "PGDB"    [ label = "postgres database";
+	      shape = "cylinder"; ];
+
+  "WEBAPP"  [ label = "{ Web View | { Runs | Contours | Control | Time View }}";
+	      shape = "record"; ];
+
+  // "WEBCTRL" [ label = "{ Web View \n(control) }";
+  //	      shape = "record"; ];
+  
+  "SENSORS" -> "SPKTS";
+  "RUNS"    -> "run pkts";
+  "run pkts" -> "RUNS";
+  "WORK"    -> "work pkts";
+  "work pkts" -> "RUNS";
+  "USERREQ" -> "user request pkts";
+  "SPKTS"   -> "RUNS";
+  "user request pkts" -> "RUNS";
+  "RUNS"    -> "MTAREA1" -> "PGDB";
+  "RUNS"    -> "MTAREA2" -> "PGDB";
+  "RUNS"    -> "MTAREA3" -> "PGDB";
+  "PGDB"    -> "WEBAPP";
+  // "WEBCTRL" -> "run pkts";
+  
+  subgraph cluster_pkts {
+    label="Packets";
+    "SPKTS" [ label = "Sensor Packets" ];
+    "run pkts";
+    "work pkts";
+    "user request pkts";
+  }
+}
+

ADDED   docs/pkts.pdf
Index: docs/pkts.pdf
==================================================================
--- /dev/null
+++ docs/pkts.pdf
cannot compute difference between binary files

DELETED docs/plan.txt
Index: docs/plan.txt
==================================================================
--- docs/plan.txt
+++ /dev/null
@@ -1,126 +0,0 @@
-Road Map
---------
-
-Note 1: This road-map is still evolving and subject to change without notice.
-
-Architecture Refactor
-~~~~~~~~~~~~~~~~~~~~~
-
-Goals
-^^^^^
-
-. Reduce load on the file system. Sqlite3 files on network filesystem can be
-  a burden.
-. Reduce number of servers and frequency of start/stop. This is mostly an
-  issue of clutter but also a reduction in "moving parts".
-. Coalesce activities to a single home host where possible. Give the user
-  feedback that they have started the dashboard on a host other than the
-  home host.
-. Reduce number of processes involved in managing running tests.
-
-Changes Needed
-^^^^^^^^^^^^^^
-
-. ACID compliant db will be on /tmp and synced to megatest.db with a five
-  second max delay.
-. Read/writes to db for processes on homehost will go direct to /tmp
-  megatest.db file.
-. Read/wites fron non-homehost processes will go through one server. Bulk
-  reads (e.g. for dashboard or list-runs) will be cached on the current host
-  in /tmp and synced from the home megatest.db in the testsuite area.
-. Db syncs rely on the target db file timestame minus some margin.
-. Since bulk reads do not use the server we can switch to simple RPC for the
-  network transport.
-. Test running manager process extended to manage multiple running tests.
-
-Current Items
-~~~~~~~~~~~~~
-
-ww05 - migrate to inmem-db
-^^^^^^^^^^^^^^^^^^^^^^^^^^
-
-. Switch to inmem db with fast sync to on disk db's [DONE]
-. Server polls tasks table for next action
-.. Task table used for tracking runner process [DONE]
-.. Task table used for jobs to run
-.. Task table used for queueing runner actions (remove runs, cleanRunExecute, etc)
-
-
-// ww32
-// ~~~~
-// 
-// . Rerun step and or subsequent steps from gui
-// . Refresh test area files from gui
-// . Clean and re-run button
-// . Clean up STATE and STATUS handling.
-// .. Dashboard and Test control panel are reverse order - choose and fix
-// .. Move seldom used states and status to drop down selector
-// . Access test control panel when clicking on Run Summary tests
-// . Feature: -generate-index-tree
-// . Change specifing of state and status to use STATE1/STATUS1,STATE2/STATUS2
-// 
-// ww33
-// ~~~~
-// 
-// . http api available for use with Perl, Ruby etc. scripts
-// . megatest.config setup entries for:
-// .. run launching (e.g. /bin/sh %CMD% > /dev/null)
-// .. browser "konqueror %FNAME%
-// 
-// ww34
-// ~~~~
-// 
-// . Mark dependent tests for clean/rerun -rerun-downstream
-// . On run start check for defunct tests in RUNNING, LAUNCHED or REMOTEHOSTSTART and correct or notify
-// . Fix: refresh of gui sometimes fails on last item (race condition?)
-// 
-// ww35
-// ~~~~
-// 
-// . refdb: Add export of csv, json and sexp
-// . Convert to using call-with-environment-variables where possible. Should allow handling of parallel runs in same process.
-// . Re-work text interface wizards. Several bugs on record. Possibly convert to gui based.
-// . Add to testconfig requirements section; launchlimiter scriptname, calls scriptname to check if ok to launch test
-// . Refactor Run Summary view, currently very clumsy
-// . Add option to show steps in Run Summary view
-// 
-// ww36
-// ~~~~
-// 
-// . Refactor guis for resizeablity
-// . Add filters to Run Summary view and Run Control view
-// . Add to megatest.config or testconfig; rerunok STATE/STATUS,STATE/STATUS...
-// . Launch gates for diskspace; /path/one>1G,/path/two>200M,/tmp>5G,#{scheme *toppath*}>1G
-// 
-// Bin List
-// ~~~~~~~~
-// 
-// .	Quality improvements
-// ..	Server stutters occasionally
-// ..	Large number of items or tests still has some issues.
-// ..	Code refactoring
-// ..	Replace remote process with true API using json (supports Web app also)
-// .	Streamline the gui
-// ..	Everything resizable
-// ..	Less clutter
-// ..	Tool tips
-// ..	Filters on Run Summary, Summary and Run Control panel
-// ..	Built in log viewer (partially implemented)
-// ..	Refactor the test control panel
-// .	Help and documentation
-// ..	Complete the user manual (I’ve been working on this lately).
-// ..	Online help in the gui
-// .	Streamlined install
-// ..	Deployed version (download a location independent ready to run binary bundle)
-// ..	Install Makefile (in progress, needed for Mike to install on VMs)
-// ..	Added option to compile IUP (needed for VMs)
-// .	Server side run launching
-// .	Support for re-running, cleaning etc. of individual steps (ezsteps makes this very easy to implement).
-// .	Launch process needs built in daemonizing (easy to do, just need to test it thoroughly).
-// .	Wizards for creating tests, regression areas (current ones are text only and limited).
-// .	Fully functional built in web service (currently you can browse runs but it is very simplistic).
-// .	Wildcards in runconfigs: e.g. [p1271/9/%/%]
-// .	Gui panels for editing megatest.config and runconfigs.config
-// .	Fully isolated tests (no use of NFS to see regression area files)
-// .	Windows version
-

DELETED ducttape/Makefile
Index: ducttape/Makefile
==================================================================
--- ducttape/Makefile
+++ /dev/null
@@ -1,33 +0,0 @@
-help:
-	@echo ""
-	@echo "make targets:"
-	@echo "============="
-	@echo "install      - build and install general_lib egg as icfadm"
-	@echo "test         - run unit tests on ducttape-lib.scm (tests code, not egg)"
-	@echo "eggs-info     - show chicken-install commands to get eggs upon which ducttape-lib depends"
-	@echo "test_example - compile an example scm against installed general_lib egg"
-	@echo "clean        - remove binaries and other build artifacts"
-	@echo ""
-
-clean:
-	rm -f *.so *.import.scm test_ducttape test_example foo *.c *.o
-
-install:
-	chicken-install
-
-test:
-	chicken-install -no-install
-	csc test_ducttape.scm
-
-	./test_ducttape
-	rm -f foo
-
-test_example:
-	@csc test_example.scm
-	@./test_example
-	@rm test_example
-
-eggs-info:
-	@echo chicken-install ansi-escape-sequences
-	@echo chicken-install slice
-	@echo chicken-install rfc3339

DELETED ducttape/README
Index: ducttape/README
==================================================================
--- ducttape/README
+++ /dev/null
@@ -1,8 +0,0 @@
-This directory holds the "ducttape" chicken scheme egg used by megatest.
-
-Run "make test" to ensure this egg works on your system.
-
-Run "make install" as your admin user with chicken on your $PATH to install this egg.
-
-
-

DELETED ducttape/ducttape-lib.meta
Index: ducttape/ducttape-lib.meta
==================================================================
--- ducttape/ducttape-lib.meta
+++ /dev/null
@@ -1,13 +0,0 @@
-;;; ducttape-lib.meta -*- Hen -*-
-
-((egg "ducttape-lib.egg")
- (synopsis "Miscellaneous tool and standard print routines.")
- (category env)
- (author "Brandon Barclay")
- (doc-from-wiki)
- (license "GPL-2")
- ;; srfi-69, posix, srfi-18
- (depends regex)
- (test-depends test)
- ; suspicious - (files "ducttape-lib")
- )

DELETED ducttape/ducttape-lib.scm
Index: ducttape/ducttape-lib.scm
==================================================================
--- ducttape/ducttape-lib.scm
+++ /dev/null
@@ -1,747 +0,0 @@
-(module ducttape-lib
-    (
-     runs-ok
-     ducttape-debug-level
-     ducttape-debug-regex-filter
-     ducttape-silent-mode
-     ducttape-quiet-mode
-     ducttape-log-file
-     ducttape-color-mode
-     iputs-preamble
-     script-name
-     idbg
-     ierr
-     iwarn
-     inote
-     iputs
-     re-match?
-                                        ;     launch-repl
-     keyword-skim
-     skim-cmdline-opts-noarg-by-regex
-     skim-cmdline-opts-withargs-by-regex 
-     concat-lists
-     ducttape-process-command-line
-     ducttape-append-logfile
-     ducttape-activate-logfile
-     isys
-     do-or-die
-     counter-maker
-     dir-is-writable?
-     mktemp
-     get-tmpdir
-     sendmail
-     find-exe
-
-     zeropad
-     string-leftpad
-     string-rightpad
-     seconds->isodate
-     seconds->wwdate
-     seconds->wwdate-values
-     isodate->seconds
-     isodate->wwdate
-     wwdate->seconds
-     wwdate->isodate
-     current-wwdate
-     current-isodate
-     
-     )
-
-  (import scheme chicken extras ports data-structures )
-  (use posix regex ansi-escape-sequences test srfi-1 irregex slice srfi-13 rfc3339)
-  ;;scsh-process ;; dropping scsh-process, it was clobbering posix's process and process*
-  (use directory-utils uuid-lib filepath srfi-19 ) ; linenoise
-  
-  (include "mimetypes.scm") ; provides ext->mimetype
-  (include "workweekdate.scm")
-  (define ducttape-lib-version 1.00)
-  (define (toplevel-command sym proc) (lambda () #f))
-;;;; utility procedures
-
-  ;; begin credit: megatest's process.scm
-  (define (port->list fh )
-    (if (eof-object? fh) #f
-        (let loop ((curr (read-line fh))
-                   (result '()))
-          (if (not (eof-object? curr))
-              (loop (read-line fh)
-                    (append result (list curr)))
-              result))))
-
-  (define (conservative-read port)
-    (let loop ((res ""))
-      (if (not (eof-object? (peek-char port)))
-          (loop (conc res (read-char port)))
-          res)))
-  ;; end credit: megatest's process.scm
-
-  (define (counter-maker)
-    (let ((acc 0))
-      (lambda ( #!optional (increment 1) )
-        (set! acc (+ increment acc))
-        acc)))
-
-  (define (port->string port #!optional ) ; todo - add newline 
-    (let ((linelist (port->list port)))
-      (if linelist
-          (string-join linelist "\n")
-          "")))
-
-
-  (define (outport->foreach outport foreach-thunk)
-    (let loop ((line (foreach-thunk)))
-      (if line
-          (begin
-            (write-line line outport)
-            (loop (foreach-thunk))
-            )
-          (begin
-            ;;http://bugs.call-cc.org/ticket/766
-            ;;close-[input|output]-port implicitly calling process-wait on process pipe ports. This leads to errors like
-            ;;Error: (process-wait) waiting for child process failed - No child processes: 10872
-            (close-output-port outport)
-            #f))))
-  
-  ;; weird - alist-ref arg order changes signature csc vs. csi... explitly defining.
-  (define (my-alist-ref key alist)
-    (let ((res (assoc key alist)))
-      (if res (cdr res) #f)))
-
-  (define (keyword-skim-alist args alist)
-    (let loop ((result-alist '()) (result-args args) (rest-alist alist))
-      (cond
-       ((null? rest-alist) (values result-alist result-args))
-       (else
-        (let ((keyword (caar rest-alist))
-              (defval (cdar rest-alist)))
-          (let-values (((kwval result-args2)
-                        (keyword-skim
-                         keyword
-                         defval
-                         result-args)))
-            (loop
-             (cons (cons keyword kwval) result-alist)
-             result-args2
-             (cdr rest-alist))))))))
-  
-  (define (isys command . rest-args)
-    (let-values
-        (((opt-alist args)
-          (keyword-skim-alist
-           rest-args
-           '( ( foreach-stdout-thunk: . #f )
-              ( foreach-stdin-thunk: . #f )
-              ( stdin-proc: . #f ) ) )))
-      (let* ((foreach-stdout-thunk
-              (my-alist-ref foreach-stdout-thunk: opt-alist))
-             (foreach-stdin-thunk
-              (my-alist-ref foreach-stdin-thunk: opt-alist))
-             (stdin-proc
-              (if foreach-stdin-thunk
-                  (lambda (port)
-                    (outport->foreach port foreach-stdin-thunk))
-                  (my-alist-ref stdin-proc: opt-alist))))
-
-        ;; TODO: support command is list.
-        
-        (let-values (((stdout stdin pid stderr)
-                      (if (null? args)
-                          (process* command)
-                          (process* command args))))
-          
-                                        ;(if foreach-stdin-thunk
-                                        ;    (set! stdin-proc
-                                        ;          (lambda (port)
-                                        ;            (outport->foreach port foreach-stdin-thunk))))
-          
-          (if stdin-proc
-              (stdin-proc stdin))
-          
-          (let ((stdout-res 
-                 (if foreach-stdout-thunk  ;; don't accumulate stdout if we have a thunk; probably doing this because stdout is BIG so lets not waste memory
-                     (begin
-                       (port-for-each foreach-stdout-thunk (lambda () (read-line stdout)))
-                       "foreach-stdout-thunk ate stdout"
-                       )
-                     (if stdin-proc
-                         "foreach-stdin-thunk/stdin-proc blocks stdout"
-                         (port->string stdout))))
-                (stderr-res
-                 (if stdin-proc
-                     "foreach-stdin-thunk/stdin-proc blocks stdout"
-                     (port->string stderr))))
-
-            ;; if we've used a stdin-proc, we've closed stdin port, which unfortunately causes a wait-pid internally, causing stdout and stderr ports to auto-close.  don't close them again.  (so sad - we lost stdout and stderr contents when we write to stdin)
-            ;; see - http://bugs.call-cc.org/ticket/766
-            (if (not stdin-proc)
-                (close-input-port stdout)
-                (close-input-port stderr))
-            
-            (let-values (((anotherpid normalexit? exitstatus)  (process-wait pid)))
-              (values exitstatus stdout-res stderr-res)))))))
-  
-  (define (do-or-die command   #!key nodie (foreach-stdout #f) (stdin-proc #f))
-    (let-values (((exit-code stdout-str stderr-str) (isys command foreach-stdout-thunk: foreach-stdout stdin-proc: stdin-proc )))
-      (if (equal? 0 exit-code)
-          stdout-str
-          (begin
-            (ierr (conc "Command  > " command " "  "< failed with " exit-code " because: \n" stderr-str) )
-            (if nodie #f (exit exit-code))))))
-
-
-  ;; runs-ok: evaluate expression while suppressing exceptions.
-                                        ;    on caught exception, returns #f
-                                        ;    otherwise, returns expression value
-  (define (runs-ok thunk)
-    (handle-exceptions exn #f (begin (thunk) #t)))
-
-  ;; concat-lists: result list = lista + listb
-  (define (concat-lists lista listb) ;; ok, I just reimplemented append...
-    (foldr cons listb lista))
-  
-
-;;; setup general_lib env var parameters
-
-  ;; show warning/note/error/debug prefixes using ansi colors
-  (define ducttape-color-mode
-    (make-parameter (get-environment-variable "DUCTTAPE_COLORIZE")))
-
-  ;; if defined, has number value.  if number value > 0, show debug messages
-  ;; value should be decremented in subshells -- idea is raising debug level will show debug messages deeper and deeper in process call stack
-  (define ducttape-debug-level
-    (make-parameter
-     (let ( (raw-debug-level (get-environment-variable "DUCTTAPE_DEBUG_LEVEL")) )
-       (if raw-debug-level
-           (let ((num-debug-level (runs-ok (string->number raw-debug-level))))
-             (if (integer? num-debug-level)
-                 (begin
-                   (let ((new-num-debug-level (- num-debug-level 1)))
-                     (if (> new-num-debug-level 0) ;; decrement
-                         (setenv "DUCTTAPE_DEBUG_LEVEL" (number->string new-num-debug-level))
-                         (unsetenv "DUCTTAPE_DEBUG_LEVEL")))
-                   num-debug-level) ; it was set and > 0, mode is value
-                 (begin
-                   (unsetenv "DUCTTAPE_DEBUG_LEVEL") ;; value was invalid, unset it
-                   #f))) ; value was invalid, mode is f
-           #f)))) ; var not set, mode is f
-
-
-  (define ducttape-debug-mode (if (ducttape-debug-level)  #t  #f))
-
-  ;; ducttape-debug-regex-filter suppresses non-matching debug messages
-  (define ducttape-debug-regex-filter
-    (make-parameter
-     (let ((raw-debug-pattern (get-environment-variable "DUCTTAPE_DEBUG_PATTERN")))
-       (if raw-debug-pattern
-           raw-debug-pattern
-           "."))))
-
-  ;; silent mode suppresses Note and Warning type messages
-  (define ducttape-silent-mode
-    (make-parameter (get-environment-variable "DUCTTAPE_SILENT_MODE")))
-
-  ;; quiet mode suppresses Note type messages
-  (define ducttape-quiet-mode
-    (make-parameter (get-environment-variable "DUCTTAPE_QUIET_MODE")))
-
-  ;; if log file is defined, warning/note/error/debug messages are appended
-  ;; to named logfile.
-  (define ducttape-log-file
-    (make-parameter (get-environment-variable "DUCTTAPE_LOG_FILE")))
-
-
-
-
-  
-  
-;;; standard messages printing implementation
-
-                                        ; get the name of the current script/binary being run
-  (define (script-name)
-    (car (reverse (string-split (car (argv)) "/"))))
-
-  (define (ducttape-timestamp)
-    (rfc3339->string (time->rfc3339 (seconds->local-time))))
-
-
-  (define (iputs-preamble msg-type #!optional (suppress-color #f))
-    (let ((do-color (and
-                     (not suppress-color)
-                     (ducttape-color-mode)
-                     (terminal-port? (current-error-port)))))
-      (case msg-type
-        ((note)
-         (if do-color
-             (set-text (list 'fg-green 'bg-black 'bold) "Note:")
-             "Note:"
-             ))
-        ((warn)
-         (if do-color
-             (set-text (list 'fg-yellow 'bg-black 'bold) "Warning:")
-             "Warning:"
-             ))
-        ((err)
-         (if do-color
-             (set-text (list 'fg-red 'bg-black 'bold) "Error:")
-             "Error:"
-             ))
-        ((dbg)
-         (if do-color
-             (set-text (list 'fg-blue 'bg-magenta) "Debug:")
-             "Debug:"
-             )))))
-
-  (define (ducttape-append-logfile msg-type message #!optional (suppress-preamble #f))
-    (let
-        ((txt 
-          (string-join 
-           (list 
-            (ducttape-timestamp) 
-            (script-name)
-            (if suppress-preamble
-                message
-                (string-join  (list (iputs-preamble msg-type #t) message) " ")))
-           " | ")))
-
-      (if (ducttape-log-file)
-          (runs-ok
-           (call-with-output-file (ducttape-log-file)
-             (lambda (output-port)
-               (format output-port "~A ~%" txt)
-               )
-             #:append))
-          #t)))
-
-  (define (ducttape-activate-logfile #!optional (logfile #f))
-    ;; from python ducttape-lib.py
-                                        ; message = "START - pid=%d ppid=%d argv=(%s) pwd=%s user=%s host=%s"%(pid,ppid," ".join("'"+x+"'" for x in sys.argv),os.environ['PWD'],os.getenv('USER','nouser'),os.getenv('HOST','nohost') )
-    (let ((pid (number->string (current-process-id)))
-          (ppid (number->string (parent-process-id)))
-          (argv 
-           (string-join 
-            (map 
-             (lambda (x) 
-               (string-join (list "\"" x "\"")  "" ))
-             (argv))
-            " "))
-          (pwd (or (get-environment-variable "PWD") "nopwd"))
-          (user (or (get-environment-variable "USER") "nouser"))
-          (host (or (get-environment-variable "HOST") "nohost")))
-      (if logfile
-          (begin
-            (ducttape-log-file logfile)
-            (setenv "DUCTTAPE_LOG_FILE" (ducttape-log-file))))
-      (ducttape-append-logfile 'note (format #f "START - pid=~A ppid=~A argv=(~A) pwd=~A user=~A host=~A" pid ppid argv pwd user host) #t)))         
-
-
-  ;; log exit code
-  (define (set-ducttape-log-exit-handler)
-    (let ((orig-exit-handler (exit-handler)))
-      (exit-handler 
-       (lambda (exitcode) 
-         (ducttape-append-logfile 'note (format #f "Exit ~A by sys.exit" exitcode) #t)
-         (orig-exit-handler exitcode)))))
-
-
-  (define (idbg first-message  . rest-args)
-    (let* ((debug-level-threshold
-            (if (> (length rest-args) 0) (car rest-args) 1))
-           (message-list
-            (if (> (length rest-args) 1)
-                (cons first-message (cdr rest-args))
-                (list first-message)) )
-           (message (apply conc
-                  (map ->string message-list))))
-
-      (ducttape-append-logfile 'dbg message)
-      (if (ducttape-debug-level)
-          (if (<= debug-level-threshold (ducttape-debug-level))
-              (if (string-search (ducttape-debug-regex-filter) message)
-                  (begin 
-                    (format (current-error-port) "~A ~A (~A)~%" (iputs-preamble 'dbg) message (script-name))))))))
-
-  (define (ierr message-first  . message-rest)
-    (let* ((message
-            (apply conc
-             (map ->string (cons message-first message-rest)))))
-      (ducttape-append-logfile 'err message)
-      (format (current-error-port) "~A ~A (~A)~%" (iputs-preamble 'err) message (script-name))))
-
-  (define (iwarn message-first  . message-rest)
-    (let* ((message
-            (apply conc
-             (map ->string (cons message-first message-rest)))))
-      (ducttape-append-logfile 'warn message)
-      (if (not (ducttape-silent-mode))
-          (begin
-            (format (current-error-port) "~A ~A (~A)~%" (iputs-preamble 'warn) message (script-name))))))
-
-  (define (inote message-first  . message-rest)
-    (let* ((message
-            (apply conc
-             (map ->string (cons message-first message-rest)))))
-      (ducttape-append-logfile 'note message)
-      (if (not (or (ducttape-silent-mode) (ducttape-quiet-mode)))
-          (begin 
-            (format (current-error-port) "~A ~A (~A)~%" (iputs-preamble 'note) message (script-name))))))
-
-  
-  (define (iputs kind message #!optional (debug-level-threshold 1))
-    (cond
-     ((member kind (string-split "NOTE/Note/note/n/N" "/")) (inote message))
-     ((member kind (string-split "Error/ERROR/error/Err/ERR/err/E/e" "/")) (ierr message))
-     ((member kind
-              (string-split "Warning/WARNING/warning/Warn/WARN/warn/W/w" "/"))
-      (iwarn message))
-     ((member kind (string-split "Debug/DEBUG/debug/Dbg/DBG/dbg/D/d" "/"))
-      (idbg message debug-level-threshold))))
-
-  (define (mkdir-recursive path-so-far hier-list-to-create)
-    (if (null? hier-list-to-create)
-        path-so-far
-        (let* ((next-hier-item (car hier-list-to-create))
-               (rest-hier-items (cdr hier-list-to-create))
-               (path-to-mkdir (string-concatenate (list path-so-far "/" next-hier-item))))
-          (if (runs-ok (lambda () (create-directory path-to-mkdir)))
-              (mkdir-recursive path-to-mkdir rest-hier-items)
-              #f))))
-
-                                        ; ::mkdir-if-not-exists::
-                                        ; make a dir recursively if it does not 
-                                        ; already exist.
-                                        ; on success - returns path
-                                        ; on fail - returns #f
-  (define (mkdirp-if-not-exists the-dir)
-    (let ( (path-list (string-split the-dir "/")))
-      (mkdir-recursive "/" path-list)))
-
-                                        ; ::mkdir-if-not-exists::
-                                        ; make a dir recursively if it does not 
-                                        ; already exist.
-                                        ; on success - returns path
-                                        ; on fail - returns #f
-
-
-  (define (mkdirp-if-not-exists the-dir)
-    (let ( (path-list (string-split the-dir "/")))
-      (mkdir-recursive "/" path-list)))
-
-  (define (dir-is-writable? the-dir)
-    (let ((dummy-file (string-concatenate (list the-dir "/.dummyfile"))))
-      (and
-       (file-exists? the-dir)
-       (cond 
-        ((runs-ok (lambda ()(with-output-to-file dummy-file (lambda () (print "foo")))))
-         (begin
-           (runs-ok (lambda () (delete-file dummy-file) ))
-           the-dir))
-        (else #f)))))
-
-
-  (define (get-tmpdir )
-    (let* ((tmproot
-            (dir-is-writable?
-             (or 
-              (get-environment-variable "TMPDIR") 
-              "/tmp")))
-
-           (user
-            (or
-             (get-environment-variable "USER")
-             "USER_Envvar_not_set"))
-           (tmppath
-            (string-concatenate 
-             (list tmproot "/env21-general-" user ))))
-
-      (dir-is-writable?
-       (mkdirp-if-not-exists
-        tmppath))))
-
-  (define (mktemp
-           #!optional
-           (prefix "general_lib_tmpfile")
-           (dir #f))
-    (let-values
-        (((fd path) 
-          (file-mkstemp 
-           (conc 
-            (if dir  dir  (get-tmpdir))
-            "/" prefix ".XXXXXX"))))
-      (close-output-port (open-output-file* fd))
-      path))
-
-
-
-  ;;http://stackoverflow.com/questions/11134857/using-sendmail-for-html-body-and-binary-attachment
-  ;; write send-email using:
-  ;;   - isys-foreach-stdin-line
-  ;;   - formatting in http://stackoverflow.com/questions/11134857/using-sendmail-for-html-body-and-binary-attachment
-  (define (sendmail to_addr subject body
-                    #!key
-                    (from_addr "admin")
-                    cc_addr
-                    bcc_addr
-                    more-headers
-                    use_html
-                    (attach-files-list '())
-                    (images-with-content-id-alist '())
-                    )
-
-    (define (sendmail-proc sendmail-port)
-      (define (wl line-str)
-        (write-line line-str sendmail-port))
-
-      (define (get-uuid)
-        (string-upcase (uuid->string (uuid-generate))))
-
-      (let ((mailpart-uuid (get-uuid))
-            (mailpart-body-uuid (get-uuid)))
-        
-        (define (boundary)
-          (wl (conc "--" mailpart-uuid)))
-
-        (define (body-boundary)
-          (wl (conc "--" mailpart-body-uuid)))
-
-
-        (define (email-mime-header)
-          (wl (conc "From: " from_addr))
-          (wl (conc "To: " to_addr))
-          (if cc_addr
-              (wl (conc "Cc: " cc_addr)))
-          (if bcc_addr
-              (wl (conc "Bcc: " bcc_addr)))
-          (if more-headers
-              (wl more-headers))
-          (wl (conc "Subject: " subject))
-          (wl "MIME-Version: 1.0")
-          (wl (conc "Content-Type: multipart/mixed; boundary=\"" mailpart-uuid "\""))
-          (wl "")
-          (boundary)
-          (wl (conc "Content-Type: multipart/alternative; boundary=\"" mailpart-body-uuid "\""))
-          (wl "")
-          )
-
-        
-        (define (email-text-body)
-          (body-boundary)
-          (wl "Content-Type: text/plain; charset=ISO-8859-1")
-          (wl "Content-Disposition: inline")
-          (wl "")
-          (wl body)
-          (body-boundary))
-        
-        (define (email-html-body)
-          (body-boundary)
-          (wl "Content-Type: text/plain; charset=ISO-8859-1")
-          (wl "")
-          (wl "You need to enable HTML option for email")
-          (body-boundary)
-          (wl "Content-Type: text/html; charset=ISO-8859-1")
-          (wl "Content-Disposition: inline")
-          (wl "")
-          (wl body)
-          (body-boundary))
-
-        (define (attach-file file #!key (content-id #f))
-          (let* ((filename
-                  (filepath:take-file-name file))
-                 (ext-with-dot
-                  (filepath:take-extension file))
-                 (ext (string-take-right
-                       ext-with-dot
-                       (- (string-length ext-with-dot) 1)))
-                 (mimetype (ext->mimetype ext))
-                 (uuencode-command (conc "uuencode " file " " filename)))
-            (boundary)
-            (wl (conc "Content-Type: " mimetype "; name=\"" filename "\""))
-            (wl "Content-Transfer-Encoding: uuencode")
-            (if content-id
-                (wl (conc "Content-Id: " content-id)))
-            (wl (conc "Content-Disposition: attachment; filename=\"" filename "\""))
-            (wl "")
-            (do-or-die
-             uuencode-command
-             foreach-stdout:
-             (lambda (line)
-               (wl line)))))
-
-        (define (embed-image file+content-id)
-          (let ((file (car file+content-id))
-                (content-id (cdr file+content-id)))
-            (attach-file file content-id: content-id)))
-        
-        ;; send the email
-        (email-mime-header)
-        (if use_html
-            (email-html-body)
-            (email-text-body))
-        (for-each attach-file attach-files-list)
-        (for-each embed-image images-with-content-id-alist)
-        (boundary)
-        (close-output-port sendmail-port)))
-    
-    (do-or-die "/usr/sbin/sendmail -t"
-               stdin-proc: sendmail-proc))
-
-  ;; like shell "which" command
-  (define (find-exe exe)
-    (let* ((path-items
-            (string-split
-             (or
-              (get-environment-variable "PATH") "")
-             ":")))
-
-      (let loop ((rest-path-items path-items))
-        (if (null? rest-path-items)
-            #f
-            (let* ((this-dir (car rest-path-items))
-                   (next-rest (cdr rest-path-items))
-                   (candidate (conc this-dir "/" exe)))
-              (if (file-execute-access? candidate)
-                  candidate
-                  (loop next-rest)))))))
-
-
-;;;; process command line options
-
-  ;; get command line switches (have no subsequent arg; eg. [-foo])
-  ;;  assumes these are switches without arguments
-  ;;  will return list of matches
-  ;;  removes matches from command-line-arguments parameter
-  (define (skim-cmdline-opts-noarg-by-regex switch-pattern)
-    (let* (
-           (irr (irregex switch-pattern))
-           (matches (filter
-                     (lambda (x)
-                       (irregex-match irr x))
-                     (command-line-arguments)))
-           (non-matches (filter
-                         (lambda (x)
-                           (not (member x matches)))
-                         (command-line-arguments))))
-
-      (command-line-arguments non-matches)
-      matches))
-
-  (define (keyword-skim keyword default args #!optional (eqpred equal?))
-    (let loop ( (kwval default) (args-remaining args) (args-to-return '()) )
-      (cond 
-       ((null? args-remaining)
-        (values
-         (if (list? kwval) (reverse kwval) kwval)
-         (reverse args-to-return)))
-       ((and (> (length args-remaining) 1) (eqpred keyword (car args-remaining)))
-        (if (list? default)
-            (if (equal? default kwval)
-                (loop (list (cadr args-remaining)) (cddr args-remaining) args-to-return)
-                (loop (cons (cadr args-remaining) kwval) (cddr args-remaining) args-to-return))
-            (loop (cadr args-remaining) (cddr args-remaining) args-to-return)))
-       (else (loop kwval (cdr args-remaining) (cons (car args-remaining) args-to-return))))))
-
-
-
-  ;; get command line switches (have a subsequent arg; eg. [-foo bar])
-  ;;  assumes these are switches without arguments
-  ;;  will return list of arguments to matches
-  ;;  removes matches from command-line-arguments parameter
-
-  (define (re-match? re str)
-    (irregex-match re str))
-
-  (define (skim-cmdline-opts-withargs-by-regex switch-pattern)
-    (let-values
-        (((result new-cmdline-args)
-          (keyword-skim switch-pattern
-                        '()
-                        (command-line-arguments)
-                        re-match?
-                        )))
-      (command-line-arguments new-cmdline-args)
-      result))
-  
-  
-
-  ;; recognize ducttape-lib command line switches (--quiet, --silent, --color, -d.., -dp.., -logfile)
-  ;;    - reset parameters; reset DUCTTAPE_* env vars to match user specified intent
-  ;;    - mutate (command-line-arguments) parameter to subtract these recognized and handled switches
-  ;;       * beware -- now (argv) and (command-line-arguments) are inconsistent... cannot mutate (argv) alas.  Use (command-line-arguments)
-  ;; WARNING: this defines command line arguments that may clash with your program.  Only call this if you
-  ;; are sure they can coexist.
-  (define (ducttape-process-command-line)
-
-    ;; --quiet
-    (let ((quiet-opts (skim-cmdline-opts-noarg-by-regex "--?quiet")))
-      (if (not (null? quiet-opts))
-          (begin
-            (setenv "DUCTTAPE_QUIET_MODE" "1")
-            (ducttape-quiet-mode "1"))))
-
-    ;; --silent
-    (let ((silent-opts (skim-cmdline-opts-noarg-by-regex "--?silent")))
-      (if (not (null? silent-opts))
-          (begin
-            (setenv "DUCTTAPE_SILENT_MODE" "1")
-            (ducttape-silent-mode "1"))))
-
-    ;; -color
-    (let ((color-opts (skim-cmdline-opts-noarg-by-regex "--?colou?r(ize)?")))
-      (if (not (null? color-opts))
-          (begin
-            (setenv "DUCTTAPE_COLORIZE" "1")
-            (ducttape-color-mode "1"))))
-
-    ;; -nocolor
-    (let ((nocolor-opts (skim-cmdline-opts-noarg-by-regex "--?nocolou?r(ize)?")))
-      (if (not (null? nocolor-opts))
-          (begin
-            (unsetenv "DUCTTAPE_COLORIZE" )
-            (ducttape-color-mode #f))))
-
-    ;; -logfile
-    (let ((logfile-opts (skim-cmdline-opts-withargs-by-regex "--?log(-?file)?")))
-      (if (not (null? logfile-opts))
-          (begin
-            (ducttape-log-file (car (reverse logfile-opts)))
-            (setenv "DUCTTAPE_LOG_FILE" (ducttape-log-file)))))
-
-    ;; -d -dd -d#
-    (let ((debug-opts (skim-cmdline-opts-noarg-by-regex "-d(d*|\\d+)"))
-          (initial-debuglevel (if (ducttape-debug-level) (ducttape-debug-level) 0) ))
-      (if (not (null? debug-opts))
-          (begin
-            (ducttape-debug-level
-             (let loop ((opts debug-opts) (debuglevel initial-debuglevel))
-               (if (null? opts)
-                   debuglevel
-                   (let*
-                       ( (curopt (car opts))
-                         (restopts (cdr opts))
-                         (ds (string-match "-(d+)" curopt))
-                         (dnum (string-match "-d(\\d+)" curopt)))
-                     (cond
-                      (ds (loop restopts (+ debuglevel (string-length (cadr ds)))))
-                      (dnum  (loop restopts (string->number (cadr dnum)))))))))
-            (setenv "DUCTTAPE_DEBUG_LEVEL" (number->string (ducttape-debug-level))))))
-
-
-    ;; -dp  / --debug-pattern 
-    (let ((debugpat-opts (skim-cmdline-opts-withargs-by-regex "--?(debug-pattern|dp)")))
-      (if (not (null? debugpat-opts))
-          (begin
-            (ducttape-debug-regex-filter (string-join debugpat-opts "|"))
-            (setenv "DUCTTAPE_DEBUG_PATTERN" (ducttape-debug-regex-filter)))))) 
-
-
-  ;;; following code commented out; side effects not wanted on startup
-  ;; immediately activate logfile (will be noop if logfile disabled)
-  ;;(ducttape-activate-logfile)
-  ;;(set-ducttape-log-exit-handler)
-  
-  ;; TODO: hook exception handler so we can log exception before we sign off.
-
-  ;; handle command line immediately; 
-  ;;(process-command-line)                    
-
-
-  ) ; end module

DELETED ducttape/ducttape-lib.setup
Index: ducttape/ducttape-lib.setup
==================================================================
--- ducttape/ducttape-lib.setup
+++ /dev/null
@@ -1,1 +0,0 @@
-(standard-extension 'ducttape-lib '1.0.0)

DELETED ducttape/mimetypes.scm
Index: ducttape/mimetypes.scm
==================================================================
--- ducttape/mimetypes.scm
+++ /dev/null
@@ -1,782 +0,0 @@
-;; gathered from macosx:
-;;   cat /etc/apache2/mime.types | grep -v '^#' | perl -ne 'print "(\"$2\" . \"$1\")\n" if /(\S+)\s+(\S+)/' > mimetypes.scm
-;; + manual manipulation
-
-(define ducttape_ext2mimetype '(("ez" . "application/andrew-inset")
-("aw" . "application/applixware")
-("atom" . "application/atom+xml")
-("atomcat" . "application/atomcat+xml")
-("atomsvc" . "application/atomsvc+xml")
-("ccxml" . "application/ccxml+xml")
-("cdmia" . "application/cdmi-capability")
-("cdmic" . "application/cdmi-container")
-("cdmid" . "application/cdmi-domain")
-("cdmio" . "application/cdmi-object")
-("cdmiq" . "application/cdmi-queue")
-("cu" . "application/cu-seeme")
-("davmount" . "application/davmount+xml")
-("dbk" . "application/docbook+xml")
-("dssc" . "application/dssc+der")
-("xdssc" . "application/dssc+xml")
-("ecma" . "application/ecmascript")
-("emma" . "application/emma+xml")
-("epub" . "application/epub+zip")
-("exi" . "application/exi")
-("pfr" . "application/font-tdpfr")
-("gml" . "application/gml+xml")
-("gpx" . "application/gpx+xml")
-("gxf" . "application/gxf")
-("stk" . "application/hyperstudio")
-("ink" . "application/inkml+xml")
-("ipfix" . "application/ipfix")
-("jar" . "application/java-archive")
-("ser" . "application/java-serialized-object")
-("class" . "application/java-vm")
-("js" . "application/javascript")
-("json" . "application/json")
-("jsonml" . "application/jsonml+json")
-("lostxml" . "application/lost+xml")
-("hqx" . "application/mac-binhex40")
-("cpt" . "application/mac-compactpro")
-("mads" . "application/mads+xml")
-("mrc" . "application/marc")
-("mrcx" . "application/marcxml+xml")
-("ma" . "application/mathematica")
-("mathml" . "application/mathml+xml")
-("mbox" . "application/mbox")
-("mscml" . "application/mediaservercontrol+xml")
-("metalink" . "application/metalink+xml")
-("meta4" . "application/metalink4+xml")
-("mets" . "application/mets+xml")
-("mods" . "application/mods+xml")
-("m21" . "application/mp21")
-("mp4s" . "application/mp4")
-("doc" . "application/msword")
-("mxf" . "application/mxf")
-("bin" . "application/octet-stream")
-("oda" . "application/oda")
-("opf" . "application/oebps-package+xml")
-("ogx" . "application/ogg")
-("omdoc" . "application/omdoc+xml")
-("onetoc" . "application/onenote")
-("oxps" . "application/oxps")
-("xer" . "application/patch-ops-error+xml")
-("pdf" . "application/pdf")
-("pgp" . "application/pgp-encrypted")
-("asc" . "application/pgp-signature")
-("prf" . "application/pics-rules")
-("p10" . "application/pkcs10")
-("p7m" . "application/pkcs7-mime")
-("p7s" . "application/pkcs7-signature")
-("p8" . "application/pkcs8")
-("ac" . "application/pkix-attr-cert")
-("cer" . "application/pkix-cert")
-("crl" . "application/pkix-crl")
-("pkipath" . "application/pkix-pkipath")
-("pki" . "application/pkixcmp")
-("pls" . "application/pls+xml")
-("ai" . "application/postscript")
-("cww" . "application/prs.cww")
-("pskcxml" . "application/pskc+xml")
-("rdf" . "application/rdf+xml")
-("rif" . "application/reginfo+xml")
-("rnc" . "application/relax-ng-compact-syntax")
-("rl" . "application/resource-lists+xml")
-("rld" . "application/resource-lists-diff+xml")
-("rs" . "application/rls-services+xml")
-("gbr" . "application/rpki-ghostbusters")
-("mft" . "application/rpki-manifest")
-("roa" . "application/rpki-roa")
-("rsd" . "application/rsd+xml")
-("rss" . "application/rss+xml")
-("rtf" . "application/rtf")
-("sbml" . "application/sbml+xml")
-("scq" . "application/scvp-cv-request")
-("scs" . "application/scvp-cv-response")
-("spq" . "application/scvp-vp-request")
-("spp" . "application/scvp-vp-response")
-("sdp" . "application/sdp")
-("setpay" . "application/set-payment-initiation")
-("setreg" . "application/set-registration-initiation")
-("shf" . "application/shf+xml")
-("smi" . "application/smil+xml")
-("rq" . "application/sparql-query")
-("srx" . "application/sparql-results+xml")
-("gram" . "application/srgs")
-("grxml" . "application/srgs+xml")
-("sru" . "application/sru+xml")
-("ssdl" . "application/ssdl+xml")
-("ssml" . "application/ssml+xml")
-("tei" . "application/tei+xml")
-("tfi" . "application/thraud+xml")
-("tsd" . "application/timestamped-data")
-("plb" . "application/vnd.3gpp.pic-bw-large")
-("psb" . "application/vnd.3gpp.pic-bw-small")
-("pvb" . "application/vnd.3gpp.pic-bw-var")
-("tcap" . "application/vnd.3gpp2.tcap")
-("pwn" . "application/vnd.3m.post-it-notes")
-("aso" . "application/vnd.accpac.simply.aso")
-("imp" . "application/vnd.accpac.simply.imp")
-("acu" . "application/vnd.acucobol")
-("atc" . "application/vnd.acucorp")
-("air" . "application/vnd.adobe.air-application-installer-package+zip")
-("fcdt" . "application/vnd.adobe.formscentral.fcdt")
-("fxp" . "application/vnd.adobe.fxp")
-("xdp" . "application/vnd.adobe.xdp+xml")
-("xfdf" . "application/vnd.adobe.xfdf")
-("ahead" . "application/vnd.ahead.space")
-("azf" . "application/vnd.airzip.filesecure.azf")
-("azs" . "application/vnd.airzip.filesecure.azs")
-("azw" . "application/vnd.amazon.ebook")
-("acc" . "application/vnd.americandynamics.acc")
-("ami" . "application/vnd.amiga.ami")
-("apk" . "application/vnd.android.package-archive")
-("cii" . "application/vnd.anser-web-certificate-issue-initiation")
-("fti" . "application/vnd.anser-web-funds-transfer-initiation")
-("atx" . "application/vnd.antix.game-component")
-("mpkg" . "application/vnd.apple.installer+xml")
-("m3u8" . "application/vnd.apple.mpegurl")
-("swi" . "application/vnd.aristanetworks.swi")
-("iota" . "application/vnd.astraea-software.iota")
-("aep" . "application/vnd.audiograph")
-("mpm" . "application/vnd.blueice.multipass")
-("bmi" . "application/vnd.bmi")
-("rep" . "application/vnd.businessobjects")
-("cdxml" . "application/vnd.chemdraw+xml")
-("mmd" . "application/vnd.chipnuts.karaoke-mmd")
-("cdy" . "application/vnd.cinderella")
-("cla" . "application/vnd.claymore")
-("rp9" . "application/vnd.cloanto.rp9")
-("c4g" . "application/vnd.clonk.c4group")
-("c11amc" . "application/vnd.cluetrust.cartomobile-config")
-("c11amz" . "application/vnd.cluetrust.cartomobile-config-pkg")
-("csp" . "application/vnd.commonspace")
-("cdbcmsg" . "application/vnd.contact.cmsg")
-("cmc" . "application/vnd.cosmocaller")
-("clkx" . "application/vnd.crick.clicker")
-("clkk" . "application/vnd.crick.clicker.keyboard")
-("clkp" . "application/vnd.crick.clicker.palette")
-("clkt" . "application/vnd.crick.clicker.template")
-("clkw" . "application/vnd.crick.clicker.wordbank")
-("wbs" . "application/vnd.criticaltools.wbs+xml")
-("pml" . "application/vnd.ctc-posml")
-("ppd" . "application/vnd.cups-ppd")
-("car" . "application/vnd.curl.car")
-("pcurl" . "application/vnd.curl.pcurl")
-("dart" . "application/vnd.dart")
-("rdz" . "application/vnd.data-vision.rdz")
-("uvf" . "application/vnd.dece.data")
-("uvt" . "application/vnd.dece.ttml+xml")
-("uvx" . "application/vnd.dece.unspecified")
-("uvz" . "application/vnd.dece.zip")
-("fe_launch" . "application/vnd.denovo.fcselayout-link")
-("dna" . "application/vnd.dna")
-("mlp" . "application/vnd.dolby.mlp")
-("dpg" . "application/vnd.dpgraph")
-("dfac" . "application/vnd.dreamfactory")
-("kpxx" . "application/vnd.ds-keypoint")
-("ait" . "application/vnd.dvb.ait")
-("svc" . "application/vnd.dvb.service")
-("geo" . "application/vnd.dynageo")
-("mag" . "application/vnd.ecowin.chart")
-("nml" . "application/vnd.enliven")
-("esf" . "application/vnd.epson.esf")
-("msf" . "application/vnd.epson.msf")
-("qam" . "application/vnd.epson.quickanime")
-("slt" . "application/vnd.epson.salt")
-("ssf" . "application/vnd.epson.ssf")
-("es3" . "application/vnd.eszigno3+xml")
-("ez2" . "application/vnd.ezpix-album")
-("ez3" . "application/vnd.ezpix-package")
-("fdf" . "application/vnd.fdf")
-("mseed" . "application/vnd.fdsn.mseed")
-("seed" . "application/vnd.fdsn.seed")
-("gph" . "application/vnd.flographit")
-("ftc" . "application/vnd.fluxtime.clip")
-("fm" . "application/vnd.framemaker")
-("fnc" . "application/vnd.frogans.fnc")
-("ltf" . "application/vnd.frogans.ltf")
-("fsc" . "application/vnd.fsc.weblaunch")
-("oas" . "application/vnd.fujitsu.oasys")
-("oa2" . "application/vnd.fujitsu.oasys2")
-("oa3" . "application/vnd.fujitsu.oasys3")
-("fg5" . "application/vnd.fujitsu.oasysgp")
-("bh2" . "application/vnd.fujitsu.oasysprs")
-("ddd" . "application/vnd.fujixerox.ddd")
-("xdw" . "application/vnd.fujixerox.docuworks")
-("xbd" . "application/vnd.fujixerox.docuworks.binder")
-("fzs" . "application/vnd.fuzzysheet")
-("txd" . "application/vnd.genomatix.tuxedo")
-("ggb" . "application/vnd.geogebra.file")
-("ggt" . "application/vnd.geogebra.tool")
-("gex" . "application/vnd.geometry-explorer")
-("gxt" . "application/vnd.geonext")
-("g2w" . "application/vnd.geoplan")
-("g3w" . "application/vnd.geospace")
-("gmx" . "application/vnd.gmx")
-("kml" . "application/vnd.google-earth.kml+xml")
-("kmz" . "application/vnd.google-earth.kmz")
-("gqf" . "application/vnd.grafeq")
-("gac" . "application/vnd.groove-account")
-("ghf" . "application/vnd.groove-help")
-("gim" . "application/vnd.groove-identity-message")
-("grv" . "application/vnd.groove-injector")
-("gtm" . "application/vnd.groove-tool-message")
-("tpl" . "application/vnd.groove-tool-template")
-("vcg" . "application/vnd.groove-vcard")
-("hal" . "application/vnd.hal+xml")
-("zmm" . "application/vnd.handheld-entertainment+xml")
-("hbci" . "application/vnd.hbci")
-("les" . "application/vnd.hhe.lesson-player")
-("hpgl" . "application/vnd.hp-hpgl")
-("hpid" . "application/vnd.hp-hpid")
-("hps" . "application/vnd.hp-hps")
-("jlt" . "application/vnd.hp-jlyt")
-("pcl" . "application/vnd.hp-pcl")
-("pclxl" . "application/vnd.hp-pclxl")
-("sfd-hdstx" . "application/vnd.hydrostatix.sof-data")
-("mpy" . "application/vnd.ibm.minipay")
-("afp" . "application/vnd.ibm.modcap")
-("irm" . "application/vnd.ibm.rights-management")
-("sc" . "application/vnd.ibm.secure-container")
-("icc" . "application/vnd.iccprofile")
-("igl" . "application/vnd.igloader")
-("ivp" . "application/vnd.immervision-ivp")
-("ivu" . "application/vnd.immervision-ivu")
-("igm" . "application/vnd.insors.igm")
-("xpw" . "application/vnd.intercon.formnet")
-("i2g" . "application/vnd.intergeo")
-("qbo" . "application/vnd.intu.qbo")
-("qfx" . "application/vnd.intu.qfx")
-("rcprofile" . "application/vnd.ipunplugged.rcprofile")
-("irp" . "application/vnd.irepository.package+xml")
-("xpr" . "application/vnd.is-xpr")
-("fcs" . "application/vnd.isac.fcs")
-("jam" . "application/vnd.jam")
-("rms" . "application/vnd.jcp.javame.midlet-rms")
-("jisp" . "application/vnd.jisp")
-("joda" . "application/vnd.joost.joda-archive")
-("ktz" . "application/vnd.kahootz")
-("karbon" . "application/vnd.kde.karbon")
-("chrt" . "application/vnd.kde.kchart")
-("kfo" . "application/vnd.kde.kformula")
-("flw" . "application/vnd.kde.kivio")
-("kon" . "application/vnd.kde.kontour")
-("kpr" . "application/vnd.kde.kpresenter")
-("ksp" . "application/vnd.kde.kspread")
-("kwd" . "application/vnd.kde.kword")
-("htke" . "application/vnd.kenameaapp")
-("kia" . "application/vnd.kidspiration")
-("kne" . "application/vnd.kinar")
-("skp" . "application/vnd.koan")
-("sse" . "application/vnd.kodak-descriptor")
-("lasxml" . "application/vnd.las.las+xml")
-("lbd" . "application/vnd.llamagraphics.life-balance.desktop")
-("lbe" . "application/vnd.llamagraphics.life-balance.exchange+xml")
-("123" . "application/vnd.lotus-1-2-3")
-("apr" . "application/vnd.lotus-approach")
-("pre" . "application/vnd.lotus-freelance")
-("nsf" . "application/vnd.lotus-notes")
-("org" . "application/vnd.lotus-organizer")
-("scm" . "application/vnd.lotus-screencam")
-("lwp" . "application/vnd.lotus-wordpro")
-("portpkg" . "application/vnd.macports.portpkg")
-("mcd" . "application/vnd.mcd")
-("mc1" . "application/vnd.medcalcdata")
-("cdkey" . "application/vnd.mediastation.cdkey")
-("mwf" . "application/vnd.mfer")
-("mfm" . "application/vnd.mfmp")
-("flo" . "application/vnd.micrografx.flo")
-("igx" . "application/vnd.micrografx.igx")
-("mif" . "application/vnd.mif")
-("daf" . "application/vnd.mobius.daf")
-("dis" . "application/vnd.mobius.dis")
-("mbk" . "application/vnd.mobius.mbk")
-("mqy" . "application/vnd.mobius.mqy")
-("msl" . "application/vnd.mobius.msl")
-("plc" . "application/vnd.mobius.plc")
-("txf" . "application/vnd.mobius.txf")
-("mpn" . "application/vnd.mophun.application")
-("mpc" . "application/vnd.mophun.certificate")
-("xul" . "application/vnd.mozilla.xul+xml")
-("cil" . "application/vnd.ms-artgalry")
-("cab" . "application/vnd.ms-cab-compressed")
-("xls" . "application/vnd.ms-excel")
-("xlam" . "application/vnd.ms-excel.addin.macroenabled.12")
-("xlsb" . "application/vnd.ms-excel.sheet.binary.macroenabled.12")
-("xlsm" . "application/vnd.ms-excel.sheet.macroenabled.12")
-("xltm" . "application/vnd.ms-excel.template.macroenabled.12")
-("eot" . "application/vnd.ms-fontobject")
-("chm" . "application/vnd.ms-htmlhelp")
-("ims" . "application/vnd.ms-ims")
-("lrm" . "application/vnd.ms-lrm")
-("thmx" . "application/vnd.ms-officetheme")
-("cat" . "application/vnd.ms-pki.seccat")
-("stl" . "application/vnd.ms-pki.stl")
-("ppt" . "application/vnd.ms-powerpoint")
-("ppam" . "application/vnd.ms-powerpoint.addin.macroenabled.12")
-("pptm" . "application/vnd.ms-powerpoint.presentation.macroenabled.12")
-("sldm" . "application/vnd.ms-powerpoint.slide.macroenabled.12")
-("ppsm" . "application/vnd.ms-powerpoint.slideshow.macroenabled.12")
-("potm" . "application/vnd.ms-powerpoint.template.macroenabled.12")
-("mpp" . "application/vnd.ms-project")
-("docm" . "application/vnd.ms-word.document.macroenabled.12")
-("dotm" . "application/vnd.ms-word.template.macroenabled.12")
-("wps" . "application/vnd.ms-works")
-("wpl" . "application/vnd.ms-wpl")
-("xps" . "application/vnd.ms-xpsdocument")
-("mseq" . "application/vnd.mseq")
-("mus" . "application/vnd.musician")
-("msty" . "application/vnd.muvee.style")
-("taglet" . "application/vnd.mynfc")
-("nlu" . "application/vnd.neurolanguage.nlu")
-("ntf" . "application/vnd.nitf")
-("nnd" . "application/vnd.noblenet-directory")
-("nns" . "application/vnd.noblenet-sealer")
-("nnw" . "application/vnd.noblenet-web")
-("ngdat" . "application/vnd.nokia.n-gage.data")
-("n-gage" . "application/vnd.nokia.n-gage.symbian.install")
-("rpst" . "application/vnd.nokia.radio-preset")
-("rpss" . "application/vnd.nokia.radio-presets")
-("edm" . "application/vnd.novadigm.edm")
-("edx" . "application/vnd.novadigm.edx")
-("ext" . "application/vnd.novadigm.ext")
-("odc" . "application/vnd.oasis.opendocument.chart")
-("otc" . "application/vnd.oasis.opendocument.chart-template")
-("odb" . "application/vnd.oasis.opendocument.database")
-("odf" . "application/vnd.oasis.opendocument.formula")
-("odft" . "application/vnd.oasis.opendocument.formula-template")
-("odg" . "application/vnd.oasis.opendocument.graphics")
-("otg" . "application/vnd.oasis.opendocument.graphics-template")
-("odi" . "application/vnd.oasis.opendocument.image")
-("oti" . "application/vnd.oasis.opendocument.image-template")
-("odp" . "application/vnd.oasis.opendocument.presentation")
-("otp" . "application/vnd.oasis.opendocument.presentation-template")
-("ods" . "application/vnd.oasis.opendocument.spreadsheet")
-("ots" . "application/vnd.oasis.opendocument.spreadsheet-template")
-("odt" . "application/vnd.oasis.opendocument.text")
-("odm" . "application/vnd.oasis.opendocument.text-master")
-("ott" . "application/vnd.oasis.opendocument.text-template")
-("oth" . "application/vnd.oasis.opendocument.text-web")
-("xo" . "application/vnd.olpc-sugar")
-("dd2" . "application/vnd.oma.dd2+xml")
-("oxt" . "application/vnd.openofficeorg.extension")
-("pptx" . "application/vnd.openxmlformats-officedocument.presentationml.presentation")
-("sldx" . "application/vnd.openxmlformats-officedocument.presentationml.slide")
-("ppsx" . "application/vnd.openxmlformats-officedocument.presentationml.slideshow")
-("potx" . "application/vnd.openxmlformats-officedocument.presentationml.template")
-("xlsx" . "application/vnd.openxmlformats-officedocument.spreadsheetml.sheet")
-("xltx" . "application/vnd.openxmlformats-officedocument.spreadsheetml.template")
-("docx" . "application/vnd.openxmlformats-officedocument.wordprocessingml.document")
-("dotx" . "application/vnd.openxmlformats-officedocument.wordprocessingml.template")
-("mgp" . "application/vnd.osgeo.mapguide.package")
-("dp" . "application/vnd.osgi.dp")
-("esa" . "application/vnd.osgi.subsystem")
-("pdb" . "application/vnd.palm")
-("paw" . "application/vnd.pawaafile")
-("str" . "application/vnd.pg.format")
-("ei6" . "application/vnd.pg.osasli")
-("efif" . "application/vnd.picsel")
-("wg" . "application/vnd.pmi.widget")
-("plf" . "application/vnd.pocketlearn")
-("pbd" . "application/vnd.powerbuilder6")
-("box" . "application/vnd.previewsystems.box")
-("mgz" . "application/vnd.proteus.magazine")
-("qps" . "application/vnd.publishare-delta-tree")
-("ptid" . "application/vnd.pvi.ptid1")
-("qxd" . "application/vnd.quark.quarkxpress")
-("bed" . "application/vnd.realvnc.bed")
-("mxl" . "application/vnd.recordare.musicxml")
-("musicxml" . "application/vnd.recordare.musicxml+xml")
-("cryptonote" . "application/vnd.rig.cryptonote")
-("cod" . "application/vnd.rim.cod")
-("rm" . "application/vnd.rn-realmedia")
-("rmvb" . "application/vnd.rn-realmedia-vbr")
-("link66" . "application/vnd.route66.link66+xml")
-("st" . "application/vnd.sailingtracker.track")
-("see" . "application/vnd.seemail")
-("sema" . "application/vnd.sema")
-("semd" . "application/vnd.semd")
-("semf" . "application/vnd.semf")
-("ifm" . "application/vnd.shana.informed.formdata")
-("itp" . "application/vnd.shana.informed.formtemplate")
-("iif" . "application/vnd.shana.informed.interchange")
-("ipk" . "application/vnd.shana.informed.package")
-("twd" . "application/vnd.simtech-mindmapper")
-("mmf" . "application/vnd.smaf")
-("teacher" . "application/vnd.smart.teacher")
-("sdkm" . "application/vnd.solent.sdkm+xml")
-("dxp" . "application/vnd.spotfire.dxp")
-("sfs" . "application/vnd.spotfire.sfs")
-("sdc" . "application/vnd.stardivision.calc")
-("sda" . "application/vnd.stardivision.draw")
-("sdd" . "application/vnd.stardivision.impress")
-("smf" . "application/vnd.stardivision.math")
-("sdw" . "application/vnd.stardivision.writer")
-("sgl" . "application/vnd.stardivision.writer-global")
-("smzip" . "application/vnd.stepmania.package")
-("sm" . "application/vnd.stepmania.stepchart")
-("sxc" . "application/vnd.sun.xml.calc")
-("stc" . "application/vnd.sun.xml.calc.template")
-("sxd" . "application/vnd.sun.xml.draw")
-("std" . "application/vnd.sun.xml.draw.template")
-("sxi" . "application/vnd.sun.xml.impress")
-("sti" . "application/vnd.sun.xml.impress.template")
-("sxm" . "application/vnd.sun.xml.math")
-("sxw" . "application/vnd.sun.xml.writer")
-("sxg" . "application/vnd.sun.xml.writer.global")
-("stw" . "application/vnd.sun.xml.writer.template")
-("sus" . "application/vnd.sus-calendar")
-("svd" . "application/vnd.svd")
-("sis" . "application/vnd.symbian.install")
-("xsm" . "application/vnd.syncml+xml")
-("bdm" . "application/vnd.syncml.dm+wbxml")
-("xdm" . "application/vnd.syncml.dm+xml")
-("tao" . "application/vnd.tao.intent-module-archive")
-("pcap" . "application/vnd.tcpdump.pcap")
-("tmo" . "application/vnd.tmobile-livetv")
-("tpt" . "application/vnd.trid.tpt")
-("mxs" . "application/vnd.triscape.mxs")
-("tra" . "application/vnd.trueapp")
-("ufd" . "application/vnd.ufdl")
-("utz" . "application/vnd.uiq.theme")
-("umj" . "application/vnd.umajin")
-("unityweb" . "application/vnd.unity")
-("uoml" . "application/vnd.uoml+xml")
-("vcx" . "application/vnd.vcx")
-("vsd" . "application/vnd.visio")
-("vis" . "application/vnd.visionary")
-("vsf" . "application/vnd.vsf")
-("wbxml" . "application/vnd.wap.wbxml")
-("wmlc" . "application/vnd.wap.wmlc")
-("wmlsc" . "application/vnd.wap.wmlscriptc")
-("wtb" . "application/vnd.webturbo")
-("nbp" . "application/vnd.wolfram.player")
-("wpd" . "application/vnd.wordperfect")
-("wqd" . "application/vnd.wqd")
-("stf" . "application/vnd.wt.stf")
-("xar" . "application/vnd.xara")
-("xfdl" . "application/vnd.xfdl")
-("hvd" . "application/vnd.yamaha.hv-dic")
-("hvs" . "application/vnd.yamaha.hv-script")
-("hvp" . "application/vnd.yamaha.hv-voice")
-("osf" . "application/vnd.yamaha.openscoreformat")
-("osfpvg" . "application/vnd.yamaha.openscoreformat.osfpvg+xml")
-("saf" . "application/vnd.yamaha.smaf-audio")
-("spf" . "application/vnd.yamaha.smaf-phrase")
-("cmp" . "application/vnd.yellowriver-custom-menu")
-("zir" . "application/vnd.zul")
-("zaz" . "application/vnd.zzazz.deck+xml")
-("vxml" . "application/voicexml+xml")
-("wgt" . "application/widget")
-("hlp" . "application/winhlp")
-("wsdl" . "application/wsdl+xml")
-("wspolicy" . "application/wspolicy+xml")
-("7z" . "application/x-7z-compressed")
-("abw" . "application/x-abiword")
-("ace" . "application/x-ace-compressed")
-("dmg" . "application/x-apple-diskimage")
-("aab" . "application/x-authorware-bin")
-("aam" . "application/x-authorware-map")
-("aas" . "application/x-authorware-seg")
-("bcpio" . "application/x-bcpio")
-("torrent" . "application/x-bittorrent")
-("blb" . "application/x-blorb")
-("bz" . "application/x-bzip")
-("bz2" . "application/x-bzip2")
-("cbr" . "application/x-cbr")
-("vcd" . "application/x-cdlink")
-("cfs" . "application/x-cfs-compressed")
-("chat" . "application/x-chat")
-("pgn" . "application/x-chess-pgn")
-("nsc" . "application/x-conference")
-("cpio" . "application/x-cpio")
-("csh" . "application/x-csh")
-("deb" . "application/x-debian-package")
-("dgc" . "application/x-dgc-compressed")
-("dir" . "application/x-director")
-("wad" . "application/x-doom")
-("ncx" . "application/x-dtbncx+xml")
-("dtb" . "application/x-dtbook+xml")
-("res" . "application/x-dtbresource+xml")
-("dvi" . "application/x-dvi")
-("evy" . "application/x-envoy")
-("eva" . "application/x-eva")
-("bdf" . "application/x-font-bdf")
-("gsf" . "application/x-font-ghostscript")
-("psf" . "application/x-font-linux-psf")
-("otf" . "application/x-font-otf")
-("pcf" . "application/x-font-pcf")
-("snf" . "application/x-font-snf")
-("ttf" . "application/x-font-ttf")
-("pfa" . "application/x-font-type1")
-("woff" . "application/x-font-woff")
-("arc" . "application/x-freearc")
-("spl" . "application/x-futuresplash")
-("gca" . "application/x-gca-compressed")
-("ulx" . "application/x-glulx")
-("gnumeric" . "application/x-gnumeric")
-("gramps" . "application/x-gramps-xml")
-("gtar" . "application/x-gtar")
-("hdf" . "application/x-hdf")
-("install" . "application/x-install-instructions")
-("iso" . "application/x-iso9660-image")
-("jnlp" . "application/x-java-jnlp-file")
-("latex" . "application/x-latex")
-("lzh" . "application/x-lzh-compressed")
-("mie" . "application/x-mie")
-("prc" . "application/x-mobipocket-ebook")
-("m3u8" . "application/x-mpegurl")
-("application" . "application/x-ms-application")
-("lnk" . "application/x-ms-shortcut")
-("wmd" . "application/x-ms-wmd")
-("wmz" . "application/x-ms-wmz")
-("xbap" . "application/x-ms-xbap")
-("mdb" . "application/x-msaccess")
-("obd" . "application/x-msbinder")
-("crd" . "application/x-mscardfile")
-("clp" . "application/x-msclip")
-("exe" . "application/x-msdownload")
-("mvb" . "application/x-msmediaview")
-("wmf" . "application/x-msmetafile")
-("mny" . "application/x-msmoney")
-("pub" . "application/x-mspublisher")
-("scd" . "application/x-msschedule")
-("trm" . "application/x-msterminal")
-("wri" . "application/x-mswrite")
-("nc" . "application/x-netcdf")
-("nzb" . "application/x-nzb")
-("p12" . "application/x-pkcs12")
-("p7b" . "application/x-pkcs7-certificates")
-("p7r" . "application/x-pkcs7-certreqresp")
-("rar" . "application/x-rar-compressed")
-("ris" . "application/x-research-info-systems")
-("sh" . "application/x-sh")
-("shar" . "application/x-shar")
-("swf" . "application/x-shockwave-flash")
-("xap" . "application/x-silverlight-app")
-("sql" . "application/x-sql")
-("sit" . "application/x-stuffit")
-("sitx" . "application/x-stuffitx")
-("srt" . "application/x-subrip")
-("sv4cpio" . "application/x-sv4cpio")
-("sv4crc" . "application/x-sv4crc")
-("t3" . "application/x-t3vm-image")
-("gam" . "application/x-tads")
-("tar" . "application/x-tar")
-("tcl" . "application/x-tcl")
-("tex" . "application/x-tex")
-("tfm" . "application/x-tex-tfm")
-("texinfo" . "application/x-texinfo")
-("obj" . "application/x-tgif")
-("ustar" . "application/x-ustar")
-("src" . "application/x-wais-source")
-("der" . "application/x-x509-ca-cert")
-("fig" . "application/x-xfig")
-("xlf" . "application/x-xliff+xml")
-("xpi" . "application/x-xpinstall")
-("xz" . "application/x-xz")
-("z1" . "application/x-zmachine")
-("xaml" . "application/xaml+xml")
-("xdf" . "application/xcap-diff+xml")
-("xenc" . "application/xenc+xml")
-("xhtml" . "application/xhtml+xml")
-("xml" . "application/xml")
-("dtd" . "application/xml-dtd")
-("xop" . "application/xop+xml")
-("xpl" . "application/xproc+xml")
-("xslt" . "application/xslt+xml")
-("xspf" . "application/xspf+xml")
-("mxml" . "application/xv+xml")
-("yang" . "application/yang")
-("yin" . "application/yin+xml")
-("zip" . "application/zip")
-("adp" . "audio/adpcm")
-("au" . "audio/basic")
-("mid" . "audio/midi")
-("mp4a" . "audio/mp4")
-("m4a" . "audio/mp4a-latm")
-("mpga" . "audio/mpeg")
-("oga" . "audio/ogg")
-("s3m" . "audio/s3m")
-("sil" . "audio/silk")
-("uva" . "audio/vnd.dece.audio")
-("eol" . "audio/vnd.digital-winds")
-("dra" . "audio/vnd.dra")
-("dts" . "audio/vnd.dts")
-("dtshd" . "audio/vnd.dts.hd")
-("lvp" . "audio/vnd.lucent.voice")
-("pya" . "audio/vnd.ms-playready.media.pya")
-("ecelp4800" . "audio/vnd.nuera.ecelp4800")
-("ecelp7470" . "audio/vnd.nuera.ecelp7470")
-("ecelp9600" . "audio/vnd.nuera.ecelp9600")
-("rip" . "audio/vnd.rip")
-("weba" . "audio/webm")
-("aac" . "audio/x-aac")
-("aif" . "audio/x-aiff")
-("caf" . "audio/x-caf")
-("flac" . "audio/x-flac")
-("mka" . "audio/x-matroska")
-("m3u" . "audio/x-mpegurl")
-("wax" . "audio/x-ms-wax")
-("wma" . "audio/x-ms-wma")
-("ram" . "audio/x-pn-realaudio")
-("rmp" . "audio/x-pn-realaudio-plugin")
-("wav" . "audio/x-wav")
-("xm" . "audio/xm")
-("cdx" . "chemical/x-cdx")
-("cif" . "chemical/x-cif")
-("cmdf" . "chemical/x-cmdf")
-("cml" . "chemical/x-cml")
-("csml" . "chemical/x-csml")
-("xyz" . "chemical/x-xyz")
-("bmp" . "image/bmp")
-("cgm" . "image/cgm")
-("g3" . "image/g3fax")
-("gif" . "image/gif")
-("ief" . "image/ief")
-("jp2" . "image/jp2")
-("jpeg" . "image/jpeg")
-("ktx" . "image/ktx")
-("pict" . "image/pict")
-("png" . "image/png")
-("btif" . "image/prs.btif")
-("sgi" . "image/sgi")
-("svg" . "image/svg+xml")
-("tiff" . "image/tiff")
-("psd" . "image/vnd.adobe.photoshop")
-("uvi" . "image/vnd.dece.graphic")
-("sub" . "image/vnd.dvb.subtitle")
-("djvu" . "image/vnd.djvu")
-("dwg" . "image/vnd.dwg")
-("dxf" . "image/vnd.dxf")
-("fbs" . "image/vnd.fastbidsheet")
-("fpx" . "image/vnd.fpx")
-("fst" . "image/vnd.fst")
-("mmr" . "image/vnd.fujixerox.edmics-mmr")
-("rlc" . "image/vnd.fujixerox.edmics-rlc")
-("mdi" . "image/vnd.ms-modi")
-("wdp" . "image/vnd.ms-photo")
-("npx" . "image/vnd.net-fpx")
-("wbmp" . "image/vnd.wap.wbmp")
-("xif" . "image/vnd.xiff")
-("webp" . "image/webp")
-("3ds" . "image/x-3ds")
-("ras" . "image/x-cmu-raster")
-("cmx" . "image/x-cmx")
-("fh" . "image/x-freehand")
-("ico" . "image/x-icon")
-("pntg" . "image/x-macpaint")
-("sid" . "image/x-mrsid-image")
-("pcx" . "image/x-pcx")
-("pic" . "image/x-pict")
-("pnm" . "image/x-portable-anymap")
-("pbm" . "image/x-portable-bitmap")
-("pgm" . "image/x-portable-graymap")
-("ppm" . "image/x-portable-pixmap")
-("qtif" . "image/x-quicktime")
-("rgb" . "image/x-rgb")
-("tga" . "image/x-tga")
-("xbm" . "image/x-xbitmap")
-("xpm" . "image/x-xpixmap")
-("xwd" . "image/x-xwindowdump")
-("eml" . "message/rfc822")
-("igs" . "model/iges")
-("msh" . "model/mesh")
-("dae" . "model/vnd.collada+xml")
-("dwf" . "model/vnd.dwf")
-("gdl" . "model/vnd.gdl")
-("gtw" . "model/vnd.gtw")
-("mts" . "model/vnd.mts")
-("vtu" . "model/vnd.vtu")
-("wrl" . "model/vrml")
-("x3db" . "model/x3d+binary")
-("x3dv" . "model/x3d+vrml")
-("x3d" . "model/x3d+xml")
-("manifest" . "text/cache-manifest")
-("appcache" . "text/cache-manifest")
-("ics" . "text/calendar")
-("css" . "text/css")
-("csv" . "text/csv")
-("html" . "text/html")
-("n3" . "text/n3")
-("txt" . "text/plain")
-("dsc" . "text/prs.lines.tag")
-("rtx" . "text/richtext")
-("sgml" . "text/sgml")
-("tsv" . "text/tab-separated-values")
-("t" . "text/troff")
-("ttl" . "text/turtle")
-("uri" . "text/uri-list")
-("vcard" . "text/vcard")
-("curl" . "text/vnd.curl")
-("dcurl" . "text/vnd.curl.dcurl")
-("scurl" . "text/vnd.curl.scurl")
-("mcurl" . "text/vnd.curl.mcurl")
-("sub" . "text/vnd.dvb.subtitle")
-("fly" . "text/vnd.fly")
-("flx" . "text/vnd.fmi.flexstor")
-("gv" . "text/vnd.graphviz")
-("3dml" . "text/vnd.in3d.3dml")
-("spot" . "text/vnd.in3d.spot")
-("jad" . "text/vnd.sun.j2me.app-descriptor")
-("wml" . "text/vnd.wap.wml")
-("wmls" . "text/vnd.wap.wmlscript")
-("s" . "text/x-asm")
-("c" . "text/x-c")
-("f" . "text/x-fortran")
-("java" . "text/x-java-source")
-("opml" . "text/x-opml")
-("p" . "text/x-pascal")
-("nfo" . "text/x-nfo")
-("etx" . "text/x-setext")
-("sfv" . "text/x-sfv")
-("uu" . "text/x-uuencode")
-("vcs" . "text/x-vcalendar")
-("vcf" . "text/x-vcard")
-("3gp" . "video/3gpp")
-("3g2" . "video/3gpp2")
-("h261" . "video/h261")
-("h263" . "video/h263")
-("h264" . "video/h264")
-("jpgv" . "video/jpeg")
-("jpm" . "video/jpm")
-("mj2" . "video/mj2")
-("ts" . "video/mp2t")
-("mp4" . "video/mp4")
-("mpeg" . "video/mpeg")
-("ogv" . "video/ogg")
-("qt" . "video/quicktime")
-("uvh" . "video/vnd.dece.hd")
-("uvm" . "video/vnd.dece.mobile")
-("uvp" . "video/vnd.dece.pd")
-("uvs" . "video/vnd.dece.sd")
-("uvv" . "video/vnd.dece.video")
-("dvb" . "video/vnd.dvb.file")
-("fvt" . "video/vnd.fvt")
-("mxu" . "video/vnd.mpegurl")
-("pyv" . "video/vnd.ms-playready.media.pyv")
-("uvu" . "video/vnd.uvvu.mp4")
-("viv" . "video/vnd.vivo")
-("dv" . "video/x-dv")
-("webm" . "video/webm")
-("f4v" . "video/x-f4v")
-("fli" . "video/x-fli")
-("flv" . "video/x-flv")
-("m4v" . "video/x-m4v")
-("mkv" . "video/x-matroska")
-("mng" . "video/x-mng")
-("asf" . "video/x-ms-asf")
-("vob" . "video/x-ms-vob")
-("wm" . "video/x-ms-wm")
-("wmv" . "video/x-ms-wmv")
-("wmx" . "video/x-ms-wmx")
-("wvx" . "video/x-ms-wvx")
-("avi" . "video/x-msvideo")
-("movie" . "video/x-sgi-movie")
-("smv" . "video/x-smv")
-("ice" . "x-conference/x-cooltalk")))
-
-(define (ext->mimetype ext)
-  (let ((x (assoc ext ducttape_ext2mimetype)))
-   (if x (cdr x) "text/plain")))

DELETED ducttape/sample_ducttape.scm
Index: ducttape/sample_ducttape.scm
==================================================================
--- ducttape/sample_ducttape.scm
+++ /dev/null
@@ -1,4 +0,0 @@
-(include "ducttape-lib.scm")
-(import ducttape-lib)
-(inote "hello world")
-(exit 0)

DELETED ducttape/test_ducttape.scm
Index: ducttape/test_ducttape.scm
==================================================================
--- ducttape/test_ducttape.scm
+++ /dev/null
@@ -1,355 +0,0 @@
-#!/usr/bin/env csi -script
-(use test)
-(include "ducttape-lib.scm")
-(import ducttape-lib)
-(import ansi-escape-sequences)
-(use trace)
-(set! systype (do-or-die (if (file-exists? "/bin/uname") "/bin/uname" "/usr/bin/uname")))
-;(trace skim-cmdline-opts-withargs-by-regex)
-;(trace keyword-skim)
-;(trace re-match?)
-(define (reset-ducttape)
-  (unsetenv "DUCTTAPE_DEBUG_LEVEL")
-  (ducttape-debug-level #f)
-
-  (unsetenv "DUCTTAPE_DEBUG_PATTERN")
-  (ducttape-debug-regex-filter ".")
-
-  (unsetenv "DUCTTAPE_LOG_FILE")
-  (ducttape-log-file #f)
-
-  (unsetenv "DUCTTAPE_SILENT_MODE")
-  (ducttape-silent-mode #f)
-
-  (unsetenv "DUCTTAPE_QUIET_MODE")
-  (ducttape-quiet-mode #f)
-
-  (unsetenv "DUCTTAPE_COLOR_MODE")
-  (ducttape-color-mode #f)
-)
-
-(define (reset-ducttape-with-cmdline-list cmdline-list)
-  (reset-ducttape)
-
-  (command-line-arguments cmdline-list)
-  (ducttape-process-command-line)
-)
-
-
-(define (direct-iputs-test)
-  (ducttape-color-mode #f)
-  (ierr "I'm an error")
-  (iwarn "I'm a warning")
-  (inote "I'm a note")
-
-  (ducttape-debug-level 1)
-  (idbg "I'm a debug statement")
-  (ducttape-debug-level #f)
-  (idbg "I'm a hidden debug statement")
-
-  (ducttape-silent-mode #t)
-  (iwarn "I shouldn't show up")
-  (inote "I shouldn't show up either")
-  (ierr "I should show up 1")
-  (ducttape-silent-mode #f)
-
-  (ducttape-quiet-mode #t)
-  (iwarn "I should show up 2")
-  (inote "I shouldn't show up though")
-  (ierr "I should show up 3")
-  (ducttape-quiet-mode #f)
-
-  (ducttape-debug-level 1)
-  (idbg "foo")
-  (iputs "dbg" "debug message")
-  (iputs "e" "error message")
-  (iputs "w" "warning message")
-  (iputs "n" "note message")
-
-  (ducttape-color-mode #t)
-  (ierr "I'm an error COLOR")
-  (iwarn "I'm a warning COLOR")
-  (inote "I'm a note COLOR")
-  (idbg "I'm a debug COLOR")
-
-
-  )
-
-(define (test-argprocessor-funcs)
-  
-  (test-group
-   "Command line processor utility functions"
-
-   (set! testargs1 '( "-d" "-d" "-d3" "-ddd" "-foo" "fooarg" "-foo" "fooarg2" "-lastArgIsDecoy" "-foo"))
-   (command-line-arguments testargs1)
-   (set! expected_result '("-d" "-d" "-d3" "-ddd"))
-   (set! expected_sideeffect '("-foo" "fooarg" "-foo" "fooarg2" "-lastArgIsDecoy" "-foo"))
-
-   (test "skim-cmdline-opts-noarg-by-regex result" expected_result (skim-cmdline-opts-noarg-by-regex "-d(d+|\\d+)?"))
-   (test "skim-cmdline-opts-noarg-by-regex sideeffect" expected_sideeffect (command-line-arguments))
-
-
-  
-   (command-line-arguments testargs1)
-   (set! expected_result '("fooarg" "fooarg2" ))
-   (set! expected_sideeffect '( "-d" "-d" "-d3" "-ddd" "-lastArgIsDecoy" "-foo"))
-   (test
-    "skim-cmdline-opts-withargs-by-regex result"
-    expected_result
-    (skim-cmdline-opts-withargs-by-regex "--?foo"))
-   
-   (test
-    "skim-cmdline-opts-withargs-by-regex sideeffect"
-    expected_sideeffect
-    (command-line-arguments))
-
-   ))
-
-(define (test-misc)
-  (test-group
-   "misc"
-   (let ((tmpfile (mktemp)))
-     (test-assert "mktemp: temp file created" (file-exists? tmpfile))
-     (if (file-exists? tmpfile)
-         (delete-file tmpfile))
-
-     )))
-
-
-
-(define (test-systemstuff)
-  (test-group
-   "system commands"
-
-   (let-values (((ec o e) (isys (find-exe "true"))))
-     (test-assert "isys: /bin/true should have exit code 0" (equal? ec 0)))
-   (let-values (((ec o e) (isys (find-exe "false"))))
-     (test-assert "isys: /bin/false should have exit code 1" (equal? ec 1)))
-
-   (let-values (((ec o e) (isys "/bin/echo" "foo" "bar" "baz")))
-     (test-assert "isys: /bin/echo should have exit code 0" (equal? ec 0))
-     (test-assert "isys: /bin/echo should have stdout 'foo bar baz'" (equal? o "foo bar baz")))
-   
-   (let-values (((ec o e) (isys "/bin/ls /zzzzz")))
-     (let ((expected-code
-            (if (equal? systype "Darwin") 1 2))
-           (expected-err
-            (if (equal? systype "Darwin")
-                "ls: /zzzzz: No such file or directory"
-                "/bin/ls: cannot access /zzzzz: No such file or directory"))
-
-           )
-       (test "isys: /bin/ls /zzzzz should have exit code 2" expected-code ec)
-       (test "isys: /bin/ls /zzzzz should have empty stdout" "" o)
-       (test
-        "isys: /bin/ls /zzzzz should have stderr"
-        expected-err
-        e))
-     )
-
-   (let-values (((ec o e) (isys "/bin/ls /etc/passwd")))
-     (test "isys: /bin/ls /etc/passwd should have exit code 0" 0 ec)
-     (test "isys: /bin/ls /etc/passwd should have stdout" "/etc/passwd" o)
-     (test
-      "isys: /bin/ls /etc/passwd should have empty stderr"
-      ""
-      e))
-
-      (let ((res (do-or-die "/bin/ls /etc/passwd")))
-        (test
-         "do-or-die: ls /etc/passwd should work"
-         "/etc/passwd" res ))
-
-      (let ((res (do-or-die "/bin/ls /zzzzz" nodie: #t)))
-        (test
-         "do-or-die: ls /zzzzz should die"
-         #f res ))
-
-      ; test reading from process stdout line at a time
-      (let* (
-             (lineno (counter-maker))
-
-             ; print each line with an index
-             (eachline-fn (lambda (line)
-                         (print "GOTLINE " (lineno) "> " line)))
-
-             (res
-              (do-or-die "/bin/ls -l /etc | head; true"
-                         foreach-stdout: eachline-fn )))
-        
-        (test-assert "ls -l /etc should not be empty"
-                     (not (equal? res ""))))
-      ;; test writing to process stdout line at a time
-
-      (let* ((tmpfile (mktemp))
-             (cmd (conc "cat > " tmpfile)))
-        (let-values (((c o e)
-                      (isys cmd stdin-proc:
-                       (lambda (myport)
-                         (write-line "hello" myport)
-                         (write-line "hello2" myport)
-                         (close-output-port myport)))))
-          (test "isys-sp: cat should exit 0" 0 c)
-          (let ((mycmd (conc "cat " tmpfile)))
-            (test "isys-sp: cat output should match input" "hello\nhello2" (do-or-die mycmd)))
-
-          (delete-file tmpfile)
-        ))
-
-      (let* ((tmpfile (mktemp))
-             (cmd (conc "cat > " tmpfile)))
-        (do-or-die cmd stdin-proc:
-                   (lambda (myport)
-                     (write-line "hello" myport)
-                     (write-line "hello2" myport)
-                     (close-output-port myport))
-                   cmd)
-        (test "dod-sp: cat output should match input" "hello\nhello2" (do-or-die (conc "cat " tmpfile)))
-        (delete-file tmpfile))
-
-
-
-      
-
-      (let*
-          ((thefile (conc "/tmp/" (get-environment-variable "USER")  "9-lines"))
-           (counter (counter-maker))
-           (stdin-writer
-            (lambda ()
-              (if (< (counter) 10)
-                  (number->string (counter 0))
-                  #f)))
-            (cmd (conc "cat > " thefile)))
-        (let-values
-            (((c o e)
-              (isys cmd foreach-stdin-thunk: stdin-writer)))
-
-          (test-assert "isys-fsl: cat should return 0" (equal? c 0))
-
-          (test-assert
-           "isys-fsl: cat should have written a file"
-           (file-exists? thefile))
-          
-          (if
-           (file-exists? thefile)
-           (begin
-             (test "isys-fsl: cat file should have right contents" "1\n2\n3\n4\n5\n6\n7\n8\n9" (do-or-die (conc "cat " thefile)))
-             (delete-file thefile)))))
-      
-   ) ; end test-group
-  ) ; end define
-
-   
-(define (test-argprocessor )
-  (test-group
-   "Command line processor parameter settings"
-
-   (reset-ducttape-with-cmdline-list '())
-   (test-assert "(nil) debug mode should be off" (not (ducttape-debug-level)))
-   (test-assert "(nil): debug pattern should be '.'" (equal? "." (ducttape-debug-regex-filter)))
-   (test-assert "(nil): colors should be off" (not (ducttape-color-mode)))
-   (test-assert "(nil): silent mode should be off" (not (ducttape-silent-mode)))
-   (test-assert "(nil): quiet mode should be off" (not (ducttape-quiet-mode)))
-   (test-assert "(nil): logfile should be off" (not (ducttape-log-file)))
-
-   (reset-ducttape-with-cmdline-list '("-d"))
-   (test-assert "-d: debug mode should be on at level 1" (eq? 1 (ducttape-debug-level)))
-
-   (reset-ducttape-with-cmdline-list '("-dd"))
-   (test "-dd: debug level should be 2" 2 (ducttape-debug-level))
-
-   (reset-ducttape-with-cmdline-list '("-ddd"))
-   (test "-ddd: debug level should be 3" 3 (ducttape-debug-level))
-
-   (reset-ducttape-with-cmdline-list '("-d2"))
-   (test "-d2: debug level should be 2" 2 (ducttape-debug-level))
-
-   (reset-ducttape-with-cmdline-list '("-d3"))
-   (test "-d3: debug level should be 3" 3 (ducttape-debug-level))
-
-   (reset-ducttape-with-cmdline-list '("-dp" "foo"))
-   (test "-dp foo: debug pattern should be 'foo'" "foo" (ducttape-debug-regex-filter))
-
-   (reset-ducttape-with-cmdline-list '("--debug-pattern" "foo"))
-   (test "--debug-pattern foo: debug pattern should be 'foo'" "foo" (ducttape-debug-regex-filter))
-
-   (reset-ducttape-with-cmdline-list '("-dp" "foo" "-dp" "bar"))
-   (test "-dp foo -dp bar: debug pattern should be 'foo|bar'"  "foo|bar" (ducttape-debug-regex-filter))
-
-   (reset-ducttape-with-cmdline-list '("--quiet"))
-   (test-assert "-quiet: quiet mode should be active" (ducttape-quiet-mode))
-
-   (reset-ducttape-with-cmdline-list '("--silent"))
-   (test-assert "-silent: silent mode should be active" (ducttape-silent-mode))
-
-   (reset-ducttape-with-cmdline-list '("--color"))
-   (test-assert "-color: color mode should be active" (ducttape-color-mode))
-
-   (reset-ducttape-with-cmdline-list '("--log" "foo"))
-   (test "--log foo: logfile should be 'foo'" "foo" (ducttape-log-file))
-
-))
-
-(define (test-wwdate)
-  (test-group
-   "wwdate conversion tests"
-   (let ((test-table
-          '(("16ww01.5" . "2016-01-01")
-            ("16ww18.5" . "2016-04-29")
-            ("1999ww33.5" . "1999-08-13")
-            ("16ww18.4" . "2016-04-28")
-            ("16ww18.3" . "2016-04-27")
-            ("13ww01.0" . "2012-12-30")
-            ("13ww52.6" . "2013-12-28")
-            ("16ww53.3" . "2016-12-28"))))
-     (for-each
-      (lambda (test-pair)
-        (let ((wwdate (car test-pair))
-              (isodate (cdr test-pair)))
-          (test
-           (conc "(isodate->wwdate "isodate ") => "wwdate)
-           wwdate
-           (isodate->wwdate isodate))
-          
-          (test
-           (conc "(wwdate->isodate "wwdate ")   => "isodate)
-           isodate
-           (wwdate->isodate wwdate))))
-      test-table))))
-
-(define (main)
-  ;; (test   )
-  
-;  (test-group "silly settext group"
-;              (test #f "\x1b[1mfoo\x1b[0m" (set-text (list 'bold) "foo"))
-;              (test "settext bold" "\x1b[1mfoo\x1b[0m" (set-text (list 'bold) "foo"))
-;              )
-
-  ; visually inspect this
-  (direct-iputs-test)
-
-  ; following use unit test test-egg
-  (reset-ducttape)
-  (test-argprocessor-funcs)
-  (reset-ducttape)
-  (test-argprocessor)
-  (test-systemstuff)
-  (test-misc)
-  (test-wwdate)
-  ) ; end main()
-
-(main)
-(sendmail "brandon.j.barclay@intel.com" "6hello subject"  "test body" )
-
-;(let* ((image-file "/nfs/site/home/bjbarcla/megatest-logo.png")
-;       (cid "mtlogo")
-;       (image-alist (list (cons image-file cid)))
-;       (body  (conc "Hello world
      \"test
      bye!")))
-
-;  (sendmail "brandon.j.barclay@intel.com" "7hello subject"  body use_html: #t images-with-content-id-alist: image-alist)
-;  (print "sent image mail"))
-;(sendmail "bjbarcla" "2hello subject html"  "test body
      hello
      italics" use_html: #t)
-;(sendmail "bb" "4hello attach subject html"  "
      hmm
      " use_html: #t attach-files-list: '( "/Users/bb/Downloads/wdmycloud-manual-4779-705103.pdf" ) )
-
-;(launch-repl)
-(test-exit)

DELETED ducttape/test_example.scm
Index: ducttape/test_example.scm
==================================================================
--- ducttape/test_example.scm
+++ /dev/null
@@ -1,3 +0,0 @@
-(use ducttape-lib)
-
-(inote "Hello world")

DELETED ducttape/useargs-example.scm
Index: ducttape/useargs-example.scm
==================================================================
--- ducttape/useargs-example.scm
+++ /dev/null
@@ -1,19 +0,0 @@
-(use ducttape-lib)
-
-(let (
-      (customers (skim-cmdline-opts-withargs-by-regex "--cust(omer)?"))
-      (magicmode (skim-cmdline-opts-noarg-by-regex "--magic"))
-      )
-  (print "your customers are " customers)
-  (if (null? magicmode)
-      (print "no unicorns for you")
-      (print "magic!")
-  )
-  )
-
-(idbg "hello")
-(idbg "hello2" 2)
-(idbg "hello2" 3)
-(inote "note")
-(iwarn "warn")
-(ierr "err")

DELETED ducttape/workweekdate.scm
Index: ducttape/workweekdate.scm
==================================================================
--- ducttape/workweekdate.scm
+++ /dev/null
@@ -1,193 +0,0 @@
-(use srfi-19)
-(use test)
-;;(use format)
-(use regex)
-;(declare (unit wwdate))
-;; utility procedures to convert among
-;; different ways to express date (wwdate, seconds since epoch, isodate)
-;;
-;; samples:
-;; isodate   -> "2016-01-01"
-;; wwdate -> "16ww01.5"
-;; seconds   -> 1451631600
-
-;; procedures provided:
-;; ====================
-;; seconds->isodate
-;; seconds->wwdate
-;;
-;; isodate->seconds
-;; isodate->wwdate
-;;
-;; wwdate->seconds
-;; wwdate->isodate
-
-;; srfi-19 used extensively; this doc is better tha the eggref:
-;; http://srfi.schemers.org/srfi-19/srfi-19.html
-
-;; Author: brandon.j.barclay@intel.com 16ww18.6
-
-(define (date->seconds date)
-  (inexact->exact
-   (string->number
-    (date->string date "~s"))))
-
-(define (seconds->isodate seconds)
-  (let* ((date (seconds->date seconds))
-         (result (date->string date "~Y-~m-~d")))
-    result))
-
-(define (isodate->seconds isodate)
-  "Takes a string input of the form 'YY-MM-DD' or 'YYYY-MM-DD' and returns epoch time; for YY, assume after Y2K"
-  (let* ((numlist (map string->number (string-split isodate "-")))
-        (raw-year (car numlist))
-        (year (if (< raw-year 100) (+ raw-year 2000) raw-year))
-        (month (list-ref numlist 1))
-        (day (list-ref numlist 2))
-        (date (make-date 0 0 0 0 day month year))
-        (seconds (date->seconds date)))
-
-    seconds))
-
-;; adapted from perl Intel::WorkWeek perl module
-;; workweek year consists of numbered weeks starting from week 1
-;;   days of week are numbered starting from 0 on sunday
-;;   weeks begin on sunday- day number 0 and end saturday- day 6
-;;   week 1 is defined as the week containing jan 1 of the year
-;;   workweek year does not match calendar year in workweek 1
-;;     since workweek 1 contains jan1 and workweek begins sunday,
-;;     days prior to jan1 in workweek 1 belong to the next workweek year
-(define (seconds->wwdate-values seconds)
-  (define (date-difference->seconds d1 d2)
-    (- (date->seconds d1) (date->seconds d2)))
-
-  (let* ((thisdate (seconds->date seconds))
-         (thisdow (string->number (date->string thisdate "~w")))
-
-         (year (date-year thisdate))
-         ;; intel workweek 1 begins on sunday of week containing jan1
-         (jan1 (make-date 0 0 0 0 1 1 year))
-         (jan1dow (date-week-day jan1))
-         (ww01 (date-subtract-duration jan1 (seconds->time (* 60 60 24 jan1dow))))
-
-         (ww01_delta_seconds (date-difference->seconds thisdate ww01))
-         (wwnum_initial (inexact->exact (add1 (floor (/ ww01_delta_seconds 24 3600 7) ))))
-         
-         ;; we could be in ww1 of next year
-         (this-saturday (seconds->date
-                         (+ seconds
-                            (* 60 60 24 (- 6 thisdow)))))
-         (this-week-ends-next-year?
-          (> (date-year this-saturday) year))
-         (intelyear
-          (if this-week-ends-next-year?
-              (add1 year)
-              year))
-         (intelweek
-          (if this-week-ends-next-year?
-              1
-              wwnum_initial)))
-   (values intelyear intelweek thisdow)))
-
-(define (string-leftpad in width pad-char)
-  (let* ((unpadded-str (->string in))
-         (padlen_temp (- width (string-length unpadded-str)))
-         (padlen (if (< padlen_temp 0) 0 padlen_temp))
-         (padding (make-string padlen pad-char)))
-    (conc padding unpadded-str)))
-
-(define (string-rightpad in width pad-char)
-  (let* ((unpadded-str (->string in))
-         (padlen_temp (- width (string-length unpadded-str)))
-         (padlen (if (< padlen_temp 0) 0 padlen_temp))
-         (padding (make-string padlen pad-char)))
-    (conc unpadded-str padding)))
-
-(define (zeropad num width)
-  (string-leftpad num width #\0))
-
-(define (seconds->wwdate seconds)
-
-  (let-values (((intelyear intelweek day-of-week-num)
-                (seconds->wwdate-values seconds)))
-    (let ((intelyear-str
-           (zeropad
-            (->string
-             (if (> intelyear 1999)
-                 (- intelyear 2000) intelyear))
-            2))
-          (intelweek-str
-           (zeropad (->string intelweek) 2))
-          (dow-str (->string day-of-week-num)))
-      (conc intelyear-str "ww" intelweek-str "." dow-str))))
-
-(define (isodate->wwdate isodate)
-  (seconds->wwdate
-   (isodate->seconds isodate)))
-
-(define (wwdate->seconds wwdate)
-  (let ((match (string-match "^(\\d+)ww(\\d+).(\\d)$" wwdate)))
-    (if
-     (not match)
-     #f
-     (let* (
-            (intelyear-raw (string->number (list-ref match 1)))
-            (intelyear (if (< intelyear-raw 100)
-                           (+ intelyear-raw 2000)
-                           intelyear-raw))
-            (intelww (string->number (list-ref match 2)))
-            (dayofweek (string->number (list-ref match 3)))
-
-            (day-of-seconds (* 60 60 24 ))
-            (week-of-seconds (* day-of-seconds 7))
-            
-
-            ;; get seconds at ww1.0
-            (new-years-date (make-date 0 0 0 0 1 1 intelyear))
-            (new-years-seconds
-             (date->seconds new-years-date))
-            (new-years-dayofweek (date-week-day new-years-date))
-            (ww1.0_seconds (- new-years-seconds
-                              (* day-of-seconds
-                                 new-years-dayofweek)))
-            (workweek-adjustment (* week-of-seconds (sub1 intelww)))
-            (weekday-adjustment (* dayofweek day-of-seconds))
-
-            (result (+ ww1.0_seconds workweek-adjustment weekday-adjustment)))
-       result))))
-
-(define (wwdate->isodate wwdate)
-  (seconds->isodate (wwdate->seconds wwdate)))
-
-(define (current-wwdate)
-  (seconds->wwdate (current-seconds)))
-
-(define (current-isodate)
-  (seconds->isodate (current-seconds)))
-
-(define (wwdate-tests)
-  (test-group
-   "date conversion tests"
-   (let ((test-table
-          '(("16ww01.5" . "2016-01-01")
-            ("16ww18.5" . "2016-04-29")
-            ("1999ww33.5" . "1999-08-13")
-            ("16ww18.4" . "2016-04-28")
-            ("16ww18.3" . "2016-04-27")
-            ("13ww01.0" . "2012-12-30")
-            ("13ww52.6" . "2013-12-28")
-            ("16ww53.3" . "2016-12-28"))))
-     (for-each
-      (lambda (test-pair)
-        (let ((wwdate (car test-pair))
-              (isodate (cdr test-pair)))
-          (test
-           (conc "(isodate->wwdate "isodate ") => "wwdate)
-           wwdate
-           (isodate->wwdate isodate))
-          
-          (test
-           (conc "(wwdate->isodate "wwdate ")   => "isodate)
-           isodate
-           (wwdate->isodate wwdate))))
-      test-table))))

Index: env.scm
==================================================================
--- env.scm
+++ env.scm
@@ -1,22 +1,31 @@
 ;;======================================================================
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;;======================================================================
 
 (declare (unit env))
 
 (use sql-de-lite) ;; srfi-1 posix regex regex-case srfi-69 srfi-18 call-with-environment-variables)
 
 (define (env:open-db fname)
-  (let* ((db-exists (file-exists? fname))
+  (let* ((db-exists (common:file-exists? fname))
 	 (db        (open-database fname)))
     (if (not db-exists)
 	(begin
 	  (exec (sql db "CREATE TABLE envvars (
                     id INTEGER PRIMARY KEY,
@@ -108,11 +117,11 @@
       (lambda (row)
 	(let ((var  (car row))
 	      (val  (cadr row)))
 	  (hash-table-set! result var val))))
      (sql db "SELECT var,val FROM envvars AS a WHERE context=? AND val != (SELECT val FROM envvars WHERE var=a.var AND context=?)")
-     contexta contextb)
+     contextb contexta)
     result))
 
 ;;
 (define (env:blind-merge l1 l2)
   (if (null? l1) l2

ADDED   example/README
Index: example/README
==================================================================
--- /dev/null
+++ example/README
@@ -0,0 +1,21 @@
+;;======================================================================
+;; Copyright 2006-2012, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
+You can get the example from the Megatest tests fossil at:
+
+    http://www.kiatoa.com/fossils/megatest_qa

DELETED example/cfg/machines.dat
Index: example/cfg/machines.dat
==================================================================
--- example/cfg/machines.dat
+++ /dev/null
@@ -1,16 +0,0 @@
-[]
-[maxload]
-zeus 0.40000000000000002
-xena 0.20000000000000001
-myth2 0.01
-hades 1
-[minfree]
-zeus 1000
-xena 20000
-myth2 300000
-hades 4000000
-[reqprocs]
-zeus mfsmount mythbackend mfschunkserver
-xena mfsmount
-myth2 mfsmount mythfrontend mfschunkserver
-hades mfsmount mfsmetalogger mfschunkserver

DELETED example/cfg/sheet-names.cfg
Index: example/cfg/sheet-names.cfg
==================================================================
--- example/cfg/sheet-names.cfg
+++ /dev/null
@@ -1,1 +0,0 @@
-machines

DELETED example/cfg/sxml/_sheets.sxml
Index: example/cfg/sxml/_sheets.sxml
==================================================================
--- example/cfg/sxml/_sheets.sxml
+++ /dev/null
@@ -1,47 +0,0 @@
-((@ (http://www.w3.org/2001/XMLSchema-instance:schemaLocation
-      "http://www.gnumeric.org/v9.xsd"))
- (http://www.gnumeric.org/v10.dtd:Version
-   (@ (Minor "17") (Major "10") (Full "1.10.17") (Epoch "1")))
- (http://www.gnumeric.org/v10.dtd:Attributes
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name
-       "WorkbookView::show_horizontal_scrollbar")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name
-       "WorkbookView::show_vertical_scrollbar")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name "WorkbookView::show_notebook_tabs")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name "WorkbookView::do_auto_completion")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name "WorkbookView::is_protected")
-     (http://www.gnumeric.org/v10.dtd:value "FALSE")))
- (urn:oasis:names:tc:opendocument:xmlns:office:1.0:document-meta
-   (@ (urn:oasis:names:tc:opendocument:xmlns:office:1.0:version "1.2"))
-   (urn:oasis:names:tc:opendocument:xmlns:office:1.0:meta
-     (http://purl.org/dc/elements/1.1/:date "2014-02-14T06:16:26Z")
-     (urn:oasis:names:tc:opendocument:xmlns:meta:1.0:creation-date
-       "2014-02-14T06:16:17Z")))
- (http://www.gnumeric.org/v10.dtd:Calculation
-   (@ (MaxIterations "100")
-      (ManualRecalc "0")
-      (IterationTolerance "0.001")
-      (FloatRadix "2")
-      (FloatDigits "53")
-      (EnableIteration "1")))
- (http://www.gnumeric.org/v10.dtd:SheetNameIndex
-   (http://www.gnumeric.org/v10.dtd:SheetName
-     (@ (http://www.gnumeric.org/v10.dtd:Rows "65536")
-        (http://www.gnumeric.org/v10.dtd:Cols "256"))
-     "machines"))
- (http://www.gnumeric.org/v10.dtd:Geometry (@ (Width "835") (Height "320")))
- (http://www.gnumeric.org/v10.dtd:UIData (@ (SelectedTab "0"))))

DELETED example/cfg/sxml/_workbook.sxml
Index: example/cfg/sxml/_workbook.sxml
==================================================================
--- example/cfg/sxml/_workbook.sxml
+++ /dev/null
@@ -1,1 +0,0 @@
-(*TOP* (*PI* xml "version=\"1.0\" encoding=\"UTF-8\""))

DELETED example/cfg/sxml/machines.sxml
Index: example/cfg/sxml/machines.sxml
==================================================================
--- example/cfg/sxml/machines.sxml
+++ /dev/null
@@ -1,105 +0,0 @@
-(http://www.gnumeric.org/v10.dtd:Sheet
-  (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
-     (OutlineSymbolsRight "1")
-     (OutlineSymbolsBelow "1")
-     (HideZero "0")
-     (HideRowHeader "0")
-     (HideGrid "0")
-     (HideColHeader "0")
-     (GridColor "0:0:0")
-     (DisplayOutlines "1")
-     (DisplayFormulas "0"))
-  (http://www.gnumeric.org/v10.dtd:MaxCol "3")
-  (http://www.gnumeric.org/v10.dtd:MaxRow "4")
-  (http://www.gnumeric.org/v10.dtd:Zoom "1")
-  (http://www.gnumeric.org/v10.dtd:Names
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Print_Area")
-      (http://www.gnumeric.org/v10.dtd:value "#REF!")
-      (http://www.gnumeric.org/v10.dtd:position "A1"))
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Sheet_Title")
-      (http://www.gnumeric.org/v10.dtd:value "\"machines\"")
-      (http://www.gnumeric.org/v10.dtd:position "A1")))
-  (http://www.gnumeric.org/v10.dtd:PrintInformation
-    (http://www.gnumeric.org/v10.dtd:Margins
-      (http://www.gnumeric.org/v10.dtd:top (@ (PrefUnit "mm") (Points "120")))
-      (http://www.gnumeric.org/v10.dtd:bottom
-        (@ (PrefUnit "mm") (Points "120")))
-      (http://www.gnumeric.org/v10.dtd:left (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:right (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:header
-        (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:footer
-        (@ (PrefUnit "mm") (Points "72"))))
-    (http://www.gnumeric.org/v10.dtd:Scale
-      (@ (type "percentage") (percentage "100")))
-    (http://www.gnumeric.org/v10.dtd:vcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:hcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:grid (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:even_if_only_styles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:monochrome (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:draft (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:titles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:do_not_print (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:print_range (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:order "d_then_r")
-    (http://www.gnumeric.org/v10.dtd:orientation "portrait")
-    (http://www.gnumeric.org/v10.dtd:Header
-      (@ (Right "") (Middle "&[TAB]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:Footer
-      (@ (Right "") (Middle "Page &[PAGE]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:paper "na_letter")
-    (http://www.gnumeric.org/v10.dtd:comments "in_place")
-    (http://www.gnumeric.org/v10.dtd:errors "as_displayed"))
-  (http://www.gnumeric.org/v10.dtd:Styles
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "0") (endRow "65535") (endCol "255"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans"))))
-  (http://www.gnumeric.org/v10.dtd:Cols
-    (@ (DefaultSizePts "48"))
-    (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "48") (No "0")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "52.5") (No "1") (HardSize "1")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "48") (No "2")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "182.2") (No "3") (HardSize "1"))))
-  (http://www.gnumeric.org/v10.dtd:Rows
-    (@ (DefaultSizePts "12.75"))
-    (http://www.gnumeric.org/v10.dtd:RowInfo
-      (@ (Unit "13.5") (No "0") (Count "5"))))
-  (http://www.gnumeric.org/v10.dtd:Selections
-    (@ (CursorRow "4") (CursorCol "0"))
-    (http://www.gnumeric.org/v10.dtd:Selection
-      (@ (startRow "4") (startCol "0") (endRow "4") (endCol "0"))))
-  (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A1")))
-  (http://www.gnumeric.org/v10.dtd:Solver
-    (@ (ProgramR "0")
-       (ProblemType "0")
-       (NonNeg "1")
-       (ModelType "0")
-       (MaxTime "60")
-       (MaxIter "1000")
-       (Discr "0")
-       (AutoScale "0"))))

DELETED example/megatest.config
Index: example/megatest.config
==================================================================
--- example/megatest.config
+++ /dev/null
@@ -1,22 +0,0 @@
-[fields]
-CFG_TYPE This is the refdb to use.
-RUN_TYPE Can be: full or quick
-
-[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 MT_RUN_AREA_HOME}/linktree
-
-# Job tools control how your jobs are launched
-[jobtools]
-launcher nbfake
-
-# 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
-
-[include local.megatest.config]
-

DELETED example/runconfigs.config
Index: example/runconfigs.config
==================================================================
--- example/runconfigs.config
+++ /dev/null
@@ -1,9 +0,0 @@
-[default]
-ALLTESTS see this variable
-
-# Your variables here are grouped by targets [SYSTEM/RELEASE]
-[cfg/default]
-ANOTHERVAR only defined if target is SYSTEM_val/RELEASE_val
-
-[include local.runconfigs.config]
-

DELETED example/tests/diskspace/diskspace.logpro
Index: example/tests/diskspace/diskspace.logpro
==================================================================
--- example/tests/diskspace/diskspace.logpro
+++ /dev/null
@@ -1,6 +0,0 @@
-;; Analyze the output from diskspace.sh
-;;
-(expect:error in    "LogFileBody" = 0 "Insufficient space" #/ERROR: available space is less/)
-(expect:error in    "LogFileBody" = 0 "Any error"         #/err/i)
-(expect:required in "LogFileBody" > 1 "Sucess signature"  #/INFO: space available/)
-

DELETED example/tests/diskspace/diskspace.sh
Index: example/tests/diskspace/diskspace.sh
==================================================================
--- example/tests/diskspace/diskspace.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/bash -e
-
-filter=`refdb lookup $MT_RUN_AREA_HOME/$CFG_TYPE machines $TARGETHOST filter`
-
-echo "Using filter: $filter"
-
-diskareas=`mount | egrep 'ext|mfs|nfs'| egrep -v "$filter" | awk '{print $3}'`
-
-for dirname in $diskareas;do
-
-    echo "dirname: $dirname"
-
-    # measure the free space
-    freespace=`df -P -k $dirname | grep $dirname | awk '{print $4}'`
-
-    # get the minfree allowed from the refdb
-    minfree=`refdb lookup $MT_RUN_AREA_HOME/$CFG_TYPE machines $TARGETHOST minfree`
-
-    if [[ "$freespace" -lt "$minfree" ]];then
-	echo "ERROR: available space $freespace is less than minimum allowed of $minfree on $dirname"
-    else
-	echo "INFO: space available of $freespace k on $dirname meets required minimum of $minfree."
-    fi
-done

DELETED example/tests/diskspace/hostname.logpro
Index: example/tests/diskspace/hostname.logpro
==================================================================
--- example/tests/diskspace/hostname.logpro
+++ /dev/null
@@ -1,4 +0,0 @@
-(define hostname (get-host-name))
-
-(expect:required in "LogFileBody" > 0 (conc "Hostname matches " hostname) (regexp (conc "^" hostname "$")))
-

DELETED example/tests/diskspace/testconfig
Index: example/tests/diskspace/testconfig
==================================================================
--- example/tests/diskspace/testconfig
+++ /dev/null
@@ -1,12 +0,0 @@
-# Add steps here. Format is "stepname script"
-[ezsteps]
-hostname  hostname
-diskspace diskspace.sh
-
-[requirements]
-waiton ping
-mode itemwait
-
-# Iteration for your tests are controlled by the items section
-[items]
-TARGETHOST [system refdb getrownames $CFG_TYPE machines]

DELETED example/tests/ping/ping.logpro
Index: example/tests/ping/ping.logpro
==================================================================
--- example/tests/ping/ping.logpro
+++ /dev/null
@@ -1,3 +0,0 @@
-(expect:error in    "LogFileBody" = 0 "Any error"         #/err/i)
-(expect:required in "LogFileBody" = 5 "Successful pings"  #/bytes from.*/)
-

DELETED example/tests/ping/testconfig
Index: example/tests/ping/testconfig
==================================================================
--- example/tests/ping/testconfig
+++ /dev/null
@@ -1,7 +0,0 @@
-# Add steps here. Format is "stepname script"
-[ezsteps]
-ping ping -c 5 $PINGHOST
-
-# Iteration for your tests are controlled by the items section
-[items]
-PINGHOST [system refdb getrownames $CFG_TYPE machines]

Index: ezsteps.scm
==================================================================
--- ezsteps.scm
+++ ezsteps.scm
@@ -1,19 +1,27 @@
 
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking directory-utils)
-(import (prefix sqlite3 sqlite3:))
+(use srfi-1 posix regex srfi-69 directory-utils)
 
 (declare (unit ezsteps))
 (declare (uses db))
 (declare (uses common))
 (declare (uses items))
@@ -23,10 +31,15 @@
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
+
+
+;;(rmt:get-test-info-by-id run-id test-id) -> testdat
+
+
 
 (define (ezsteps:run-from testdat start-step-name run-one)
   (let* ((test-run-dir  ;; (filedb:get-path *fdb* 
 	  (db:test-get-rundir testdat)) ;; )
 	 (testconfig    (read-config (conc test-run-dir "/testconfig") #f #t environ-patt: "pre-launch-env-vars"))
@@ -37,21 +50,22 @@
 	 (test-id       (db:test-get-id testdat))
 	 (run-id        (db:test-get-run_id testdat))
 	 (test-name     (db:test-get-testname testdat))
 	 (kill-job      #f)) ;; for future use (on re-factoring with launch.scm code
     (let loop ((count 5))
-      (if (file-exists? test-run-dir)
+      (if (common:file-exists? test-run-dir)
 	  (push-directory test-run-dir)
 	  (if (> count 0)
 	      (begin
 		(debug:print 0 *default-log-port* "WARNING: ezsteps attempting to run but test run directory " test-run-dir " is not there. Waiting and trying again " count " more times")
 		(sleep 3)
 		(loop (- count 1))))))
     (debug:print-info 0 *default-log-port* "Running in directory " test-run-dir)
-    (if (not (file-exists? ".ezsteps"))(create-directory ".ezsteps"))
+    (if (not (common:file-exists? ".ezsteps"))(create-directory ".ezsteps"))
     ;; if ezsteps was defined then we are sure to have at least one step but check anyway
-    (if (not (> (length ezstepslst) 0))
+    
+     (if (not (> (length ezstepslst) 0))
 	(message-window "ERROR: You can only re-run steps defined via ezsteps")
 	(begin
 	  (let loop ((ezstep   (car ezstepslst))
 		     (tal      (cdr ezstepslst))
 		     (prevstep #f)
@@ -75,11 +89,11 @@
 			      (loop (car tal)(cdr tal) stepname #f))))
 
 		  (debug:print 4 *default-log-port* "ezsteps:\n stepname: " stepname " stepinfo: " stepinfo " stepparts: " stepparts
 			       " stepparms: " stepparms " stepcmd: " stepcmd)
 		  
-		  (if (file-exists? (conc stepname ".logpro"))(set! logpro-used #t))
+		  (if (common:file-exists? (conc stepname ".logpro"))(set! logpro-used #t))
 		  
 		  ;; call the command using mt_ezstep
 		  (set! script (conc "mt_ezstep " stepname " " (if prevstep prevstep "-") " " stepcmd))
 		  
 		  (debug:print 4 *default-log-port* "script: " script)
@@ -100,11 +114,11 @@
 				  ))
 		    (let ((exinfo (vector-ref exit-info 2))
 			  (logfna (if logpro-used (conc stepname ".html") "")))
 		      (rmt:teststep-set-status! run-id test-id stepname "end" exinfo #f logfna))
 		    (if logpro-used
-			(rmt:test-set-log! test-id (conc stepname ".html")))
+			(rmt:test-set-log! run-id test-id (conc stepname ".html")))
 		    ;; set the test final status
 		    (let* ((this-step-status (cond
 					      ((and (eq? (vector-ref exit-info 2) 2) logpro-used) 'warn)
 					      ((eq? (vector-ref exit-info 2) 0)                   'pass)
 					      (else 'fail)))
@@ -122,18 +136,18 @@
 				   " next-status: " next-status " rollup-status: " rollup-status)
 		      (case next-status
 			((warn)
 			 (set! rollup-status 2)
 			 ;; NB// test-set-status! does rdb calls under the hood
-			 (tests:test-set-status! test-id "RUNNING" "WARN" 
+			 (tests:test-set-status! run-id test-id "RUNNING" "WARN" 
 						 (if (eq? this-step-status 'warn) "Logpro warning found" #f)
 						 #f))
 			((pass)
-			 (tests:test-set-status! test-id "RUNNING" "PASS" #f #f))
+			 (tests:test-set-status! run-id test-id "RUNNING" "PASS" #f #f))
 			(else ;; 'fail
 			 (set! rollup-status 1) ;; force fail
-			 (tests:test-set-status! test-id "RUNNING" "FAIL" (conc "Failed at step " stepname) #f)
+			 (tests:test-set-status! run-id test-id "RUNNING" "FAIL" (conc "Failed at step " stepname) #f)
 			 ))))
 		  (if (and (steprun-good? logpro-used (vector-ref exit-info 2))
 			   (not (null? tal)))
 		      (if (not run-one) ;; if we got here we completed the step, if run-one is true, stop
 			  (loop (car tal) (cdr tal) stepname runflag))))
@@ -140,11 +154,11 @@
 		(debug:print 4 *default-log-port* "WARNING: a prior step failed, stopping at " ezstep)))
 	  
 	  ;; Once done with step/steps update the test record
 	  ;;
 	  (let* ((item-path (db:test-get-item-path testdat)) ;; (item-list->path itemdat))
-		 (testinfo  (rmt:get-testinfo-by-id run-id test-id))) ;; refresh the testdat, call it iteminfo in case need prev/curr
+		 (testinfo  (rmt:get-testinfo-state-status run-id test-id))) ;; refresh the testdat, call it iteminfo in case need prev/curr
 	    ;; Am I completed?
 	    (if (equal? (db:test-get-state testinfo) "RUNNING") ;; (not (equal? (db:test-get-state testinfo) "COMPLETED"))
 		(let ((new-state  (if kill-job "KILLED" "COMPLETED") ;; (if (eq? (vector-ref exit-info 2) 0) ;; exited with "good" status
 				  ;; "COMPLETED"
 				  ;; (db:test-get-state testinfo)))   ;; else preseve the state as set within the test
@@ -158,18 +172,27 @@
 				   ((eq? rollup-status 2)
 				    ;; if the current status is AUTO the defer to the calculated value but qualify (i.e. make this AUTO-WARN)
 				    (if (equal? (db:test-get-status testinfo) "AUTO") "AUTO-WARN" "WARN"))
 				   (else "FAIL")))) ;; (db:test-get-status testinfo)))
 		  (debug:print-info 2 *default-log-port* "Test NOT logged as COMPLETED, (state=" (db:test-get-state testinfo) "), updating result, rollup-status is " rollup-status)
-		  (tests:test-set-status! test-id 
+		  (tests:test-set-status! run-id test-id 
 					  new-state
 					  new-status
 					  (args:get-arg "-m") #f)
 		  ;; need to update the top test record if PASS or FAIL and this is a subtest
 		  (if (not (equal? item-path ""))
-		      (cdb:set-state-status-and-roll-up-items *runremote* run-id test-name item-path new-status))))
+                      (rmt:set-state-status-and-roll-up-items run-id test-name item-path new-state new-status #f))))
 	    ;; for automated creation of the rollup html file this is a good place...
 	    (if (not (equal? item-path ""))
-		(tests:summarize-items #f run-id test-id test-name #f)) ;; don't force - just update if no
+	      (tests:summarize-items run-id test-id test-name #f)) ;; don't force - just update if no
 	    )))
     (pop-directory)
     rollup-status))
+
+(define (ezsteps:spawn-run-from testdat start-step-name run-one)
+  (thread-start! 
+   (make-thread
+    (lambda ()
+      (ezsteps:run-from testdat start-step-name run-one))
+    (conc "ezstep run single step " start-step-name " run-one="run-one)))
+  )
+

Index: fdb_records.scm
==================================================================
--- fdb_records.scm
+++ fdb_records.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;; Single record for managing a filedb
 ;; make-vector-record "Filedb record" filedb fdb db dbpath pathcache idcache partcache
 ;; Filedb record
 (define (make-filedb:fdb)(make-vector 5))
 (define-inline (filedb:fdb-get-db          vec)    (vector-ref  vec 0))

Index: filedb.scm
==================================================================
--- filedb.scm
+++ filedb.scm
@@ -1,13 +1,22 @@
 ;; Copyright 2006-2011, Matthew Welland.
 ;;
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 ;;
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
 
 ;; (require-extension synch sqlite3 posix srfi-13 srfi-1 utils regex)
 (use sqlite3 srfi-1 posix regex srfi-69 srfi-13 posix-extras)
 (import (prefix sqlite3 sqlite3:))
 
@@ -16,11 +25,11 @@
 (include "fdb_records.scm")
 ;; (include "settings.scm")
 
 (define (filedb:open-db dbpath)
   (let* ((fdb      (make-filedb:fdb))
-	 (dbexists (file-exists? dbpath))
+	 (dbexists (common:file-exists? dbpath))
 	 (db (sqlite3:open-database dbpath)))
     (filedb:fdb-set-db!        fdb db)
     (filedb:fdb-set-dbpath!    fdb dbpath)
     (filedb:fdb-set-pathcache! fdb (make-hash-table))
     (filedb:fdb-set-idcache!   fdb (make-hash-table))

Index: fs-transport.scm
==================================================================
--- fs-transport.scm
+++ fs-transport.scm
@@ -1,14 +1,22 @@
 
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 (require-extension (srfi 18) extras tcp s11n)
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest)
 (import (prefix sqlite3 sqlite3:))

DELETED fsl-rebase.scm
Index: fsl-rebase.scm
==================================================================
--- fsl-rebase.scm
+++ /dev/null
@@ -1,37 +0,0 @@
-;; given branch and baseline commit generate list of commands to cherry pick commits
-;;
-;;
-;; Usage: fsl-rebase basecommit branch
-;;         
-
-(use regex posix)
-
-(let* ((basecommit (cadr (argv)))
-       (branch     (caddr (argv)))
-       (cmd        (conc "fossil timeline after " basecommit " -n 1000000 -W 0"))
-       (theregex   (conc ;; "^[^\\]]+"
-			 "\\[([a-z0-9]+)\\]\\s+"
-			 "(.*)"
-			 "\\s+\\(.*tags:\\s+" branch 
-			 ;; ".*\\)"
-			 )))
-  (print "basecommit: " basecommit ", branch: " branch ", theregex: " theregex ", cmd: \"" cmd "\"")
-  (with-input-from-pipe
-   cmd
-   (lambda ()
-     (let loop ((inl (read-line))
-		(res '()))
-       (if (not (eof-object? inl))
-	   (let ((have-match (string-search theregex inl)))
-	     (if have-match
-		 (loop (read-line)
-		       (cons (conc "fossil merge --cherrypick " (cadr have-match)
-				   "\nfossil commit -m \"Cherry pick from " (cadr have-match)
-				   ": " (caddr have-match) "\"")
-			     res))
-		 (loop (read-line) res)))
-	   (map print res))))))
-
-;; (print "match: " inl "\n   $1: " (cadr have-match) " $2: " (caddr have-match))
-;; (print "no match: " theregex " " inl))
-;; (loop (read-line))))))))

ADDED   ftail.scm
Index: ftail.scm
==================================================================
--- /dev/null
+++ ftail.scm
@@ -0,0 +1,108 @@
+;;======================================================================
+;; Copyright 2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
+;;======================================================================
+
+(declare (unit ftail))
+
+(module ftail
+    (
+     open-tail-db
+     tail-write
+     tail-get-fid
+     file-tail
+     )
+
+(import scheme chicken data-structures extras)
+(use (prefix sqlite3 sqlite3:) posix typed-records)
+
+(define (open-tail-db )
+  (let* ((basedir   (create-directory (conc "/tmp/" (current-user-name))))
+	 (dbpath    (conc basedir "/megatest_logs.db"))
+	 (dbexists  (file-exists? dbpath))
+	 (db        (sqlite3:open-database dbpath))
+	 (handler   (sqlite3:make-busy-timeout 136000)))
+    (sqlite3:set-busy-handler! db handler)
+    (sqlite3:execute db "PRAGMA synchronous = 0;")
+    (if (not dbexists)
+	(begin
+	  (sqlite3:execute db "CREATE TABLE IF NOT EXISTS log_files (id INTEGER PRIMARY KEY,filename TEXT,event_time TIMESTAMP DEFAULT (strftime('%s','now')));")
+	  (sqlite3:execute db "CREATE TABLE IF NOT EXISTS log_data  (id INTEGER PRIMARY KEY,fid INTEGER,line TEXT,event_time TIMESTAMP DEFAULT (strftime('%s','now')));")
+	  ))
+    db))
+
+(define (tail-write db fid lines)
+  (sqlite3:with-transaction
+   db
+   (lambda ()
+     (for-each
+      (lambda (line)
+	(sqlite3:execute db "INSERT INTO log_data (fid,line) VALUES (?,?);" fid line))
+      lines))))
+
+(define (tail-get-fid db fname)
+  (let ((fid   (handle-exceptions
+		   exn
+		   #f
+		 (sqlite3:first-result db "SELECT id FROM log_files WHERE filename=?;" fname))))
+    (if fid
+	fid
+	(begin
+	  (sqlite3:execute db "INSERT INTO log_files (filename) VALUES (?);" fname)
+	  (tail-get-fid db fname)))))
+
+(define (file-tail fname #!key (db-in #f))
+  (let* ((inp (open-input-file fname))
+	 (db  (or db-in (open-tail-db)))
+	 (fid (tail-get-fid db fname)))
+    (let loop ((inl    (read-line inp))
+	       (lines '())
+	       (lastwr (current-seconds)))
+      (if (eof-object? inl)
+	  (let ((timed-out (> (- (current-seconds) lastwr) 60)))
+	    (if timed-out (tail-write db fid (reverse lines)))
+	    (sleep 1)
+	    (if timed-out
+		(loop (read-line inp) '() (current-seconds))
+		(loop (read-line inp) lines lastwr)))
+	  (let* ((savelines (> (length lines) 19)))
+	    ;; (print inl)
+	    (if savelines (tail-write db fid (reverse lines)))
+	    (loop (read-line inp)
+		  (if savelines
+		      '()
+		      (cons inl lines))
+		  (if savelines
+		      (current-seconds)
+		      lastwr)))))))
+
+;; offset -20 means get last 20 lines
+;;
+(define (tail-get-lines db fid offset count)
+  (if (> offset 0)
+      (sqlite3:map-row (lambda (id line)
+		 (vector id line))
+	       db
+	       "SELECT id,line FROM log_data WHERE fid=? OFFSET ? LIMIT ?;" fid offset count)
+      (reverse ;; get N from the end
+       (sqlite3:map-row (lambda (id line)
+		  (vector id line))
+		db
+		"SELECT id,line FROM log_data WHERE fid=? ORDER BY id DESC LIMIT ?;" fid (abs offset)))))
+
+)

Index: gen-data-for-graph.scm
==================================================================
--- gen-data-for-graph.scm
+++ gen-data-for-graph.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 (use foof-loop sql-de-lite posix)
 
 (define beginning-2016 1451636435.0)
 (define now (current-seconds))
 (define one-year-ago (- now (* 365 24 60 60)))

Index: genexample.scm
==================================================================
--- genexample.scm
+++ genexample.scm
@@ -1,14 +1,23 @@
 ;;======================================================================
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;;======================================================================
 
 (declare (unit genexample))
 (use posix regex)
 
@@ -56,11 +65,11 @@
 	(begin
 	  (print "The path " path " does not exist or is not a directory. Attempting to create it now")
 	  (create-directory path #t)))
 
     ;; First check that the directory is empty!
-    (if (and (file-exists? path)
+    (if (and (common:file-exists? path)
 	     (not (null? (glob (conc path "/*")))))
 	(begin
 	  (print "WARNING: directory " path " is not empty, are you sure you want to continue?")
 	  (display "Enter y/n: ")
 	  (if (equal? "y" (read-line))
@@ -210,22 +219,22 @@
 	(scripts  '())
 	(items    '())
 	(rel-path #f))
 
     (cond
-     ((file-exists? "megatest.config")         (set! rel-path "./"))
-     ((file-exists? "../megatest.config")      (set! rel-path "../"))
-     ((file-exists? "../../megatest.config")   (set! rel-path "../../"))
-     ((file-exists? "../../../megatest.config")(set! rel-path "../../../"))) ;; good enough dang it.
+     ((common:file-exists? "megatest.config")         (set! rel-path "./"))
+     ((common:file-exists? "../megatest.config")      (set! rel-path "../"))
+     ((common:file-exists? "../../megatest.config")   (set! rel-path "../../"))
+     ((common:file-exists? "../../../megatest.config")(set! rel-path "../../../"))) ;; good enough dang it.
 
     ;; Don't gather data or continue if a) megatest.config can't be found or b) testconfig already exists
     (if (not rel-path)
 	(begin
 	  (print "ERROR: I could not find megatest.config, please run -create-test in the top dir of your megatest area")
 	  (exit 1)))
 
-    (if (file-exists? (conc rel-path "tests/" testname "/testconfig"))
+    (if (common:file-exists? (conc rel-path "tests/" testname "/testconfig"))
 	(begin
 	  (print "WARNING: You already have a testconfig in " rel-path "tests/" testname ", do you want to clobber your files?")
 	  (display "Enter y/n: ")
 	  (if (not (equal? "y" (read-line)))
 	      (begin

Index: gentargets.sh
==================================================================
--- gentargets.sh
+++ gentargets.sh
@@ -1,6 +1,23 @@
 #!/bin/bash
 
-echo '[v1.63/tip/dev]'
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+echo '[all/v1.65/tip/dev]'
 echo 'x 1'
-echo '[v1.64/tip/dev]'
+echo '[all/v1.64/tip/dev]'
 echo 'x 1'

ADDED   get-config-settings.sh
Index: get-config-settings.sh
==================================================================
--- /dev/null
+++ get-config-settings.sh
@@ -0,0 +1,19 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+ grep configf:lookup *.scm | sed 's/^.*:lookup//; s/^-number//; s/^ //' | grep -v '^\(section\|test-conf\|tconfig\|testconfig\|dat\|config\|views-cfgdat\)' | perl -pe 's/^\s*(\*configdat\*|configdat|mtconf)//; s/^\s+//; s/\).*$//; s/"//g' | awk '{print $1,$2}' | sort | grep -v section | sort | uniq
+

Index: gutils.scm
==================================================================
--- gutils.scm
+++ gutils.scm
@@ -1,43 +1,66 @@
 ;;======================================================================
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 ;;======================================================================
 
 (require-library iup)
 (import (prefix iup iup:))
 (use canvas-draw)
 
 (use srfi-1 regex regex-case srfi-69)
 (declare (unit gutils))
 
+;; NOTE: These functions will move to iuputils
+
 (define (gutils:colors-similar? color1 color2)
   (let* ((c1 (map string->number (string-split color1)))
 	 (c2 (map string->number (string-split color2)))
 	 (delta (map (lambda (a b)(abs (- a b))) c1 c2)))
     (null? (filter (lambda (x)(> x 3)) delta))))
 
+(define gutils:colors
+  '((PASS . "70 249 73")
+    (FAIL . "253 33 49")
+    (SKIP . "230 230 0")))
+
+(define (gutils:get-color-spec effective-state)
+  (or (alist-ref effective-state gutils:colors)
+      (alist-ref 'FAIL gutils:colors)))
+
+;; BBnote - state status dashboard button color / text defined here
 (define (gutils:get-color-for-state-status state status);; #!key (get-label #f))
   ;; ((if get-label cadr car)
   (case (string->symbol state)
     ((COMPLETED) ;; ARCHIVED)
      (case (string->symbol status)
        ((PASS)        (list "70  249 73" status))
+       ((PREQ_FAIL PREQ_DISCARDED) (list "255 127 127" status))
        ((WARN WAIVED) (list "255 172 13" status))
-       ((SKIP)        (list "230 230 0" status))
+       ((SKIP)        (list (gutils:get-color-spec 'SKIP) status))
+       ((ABORT)       (list "198 36 166" status))
        (else (list "253 33 49" status))))
     ((ARCHIVED)
      (case (string->symbol status)
        ((PASS)        (list "70  170 73" status))
        ((WARN WAIVED) (list "200 130 13" status))
-       ((SKIP)        (list "180 180 0" status))
+       ((SKIP)        (list (gutils:get-color-spec 'SKIP) status))
        (else (list "180 33 49" status))))
     ;;      (if (equal? status "PASS")
     ;;	  '("70 249 73" "PASS")
     ;;	  (if (or (equal? status "WARN")
     ;;		  (equal? status "WAIVED"))
@@ -44,14 +67,16 @@
     ;;	      (list "255 172 13" status)
     ;;	      (list "223 33 49"  status)))) ;; greenish orangeish redish
     ((LAUNCHED)         (list "101 123 142"  state))
     ((CHECK)            (list "255 100 50"   state))
     ((REMOTEHOSTSTART)  (list "50 130 195"   state))
-    ((RUNNING)          (list "9 131 232"    state))
+    ((RUNNING STARTED)          (list "9 131 232"    state))
     ((KILLREQ)          (list "39 82 206"    state))
     ((KILLED)           (list "234 101 17"   state))
-    ((NOT_STARTED)      (list "240 240 240"  state))
+    ((NOT_STARTED)      (case (string->symbol status)
+			  ((CHECK STARTED)(list (gutils:get-color-spec 'SKIP) state))
+			  (else   (list "240 240 240"                 state))))
     ;; for xor mode below
     ;;
     ((CLEAN)
      (case (string->symbol status)
        ((CLEAN-FAIL CLEAN-CHECK CLEAN-ABORT)  (list "200 130 13" status)) ;; orange requested for these

Index: http-transport.scm
==================================================================
--- http-transport.scm
+++ http-transport.scm
@@ -1,19 +1,27 @@
 
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 (require-extension (srfi 18) extras tcp s11n)
 
-(use  srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest posix-extras) ;; sqlite3
-;; (import (prefix sqlite3 sqlite3:))
+
+(use  srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest posix-extras)
 
 (use spiffy uri-common intarweb http-client spiffy-request-vars intarweb spiffy-directory-listing)
 
 ;; Configurations for server
 (tcp-buffer-size 2048)
@@ -24,27 +32,29 @@
 (declare (uses common))
 (declare (uses db))
 (declare (uses tests))
 (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
 (declare (uses server))
-(declare (uses daemon))
+;; (declare (uses daemon))
 (declare (uses portlogger))
 (declare (uses rmt))
 
 (include "common_records.scm")
 (include "db_records.scm")
+(include "js-path.scm")
 
+(require-library stml)
 (define (http-transport:make-server-url hostport)
   (if (not hostport)
       #f
       (conc "http://" (car hostport) ":" (cadr hostport))))
 
 (define *server-loop-heart-beat* (current-seconds))
 
 ;;======================================================================
 ;; S E R V E R
-;;======================================================================
+;; ======================================================================
 
 ;; Call this to start the actual server
 ;;
 
 (define *db:process-queue-mutex* (make-mutex))
@@ -57,12 +67,15 @@
 					   ;; (string-intersperse (map number->string (u8vector->list (hostname->ip hostname))) ".")
 					   (server:get-best-guess-address hostname)
 					   #f)))
 			    (if ipstr ipstr hostn))) ;; hostname))) 
 	 (start-port      (portlogger:open-run-close portlogger:find-port))
-	 (link-tree-path  (common:get-linktree))) ;; (configf:lookup *configdat* "setup" "linktree")))
+	 (link-tree-path  (common:get-linktree))
+	 (tmp-area        (common:get-db-tmp-area))
+	 (start-file      (conc tmp-area "/.server-start")))
     (debug:print-info 0 *default-log-port* "portlogger recommended port: " start-port)
+    ;; set some parameters for the server
     (root-path     (if link-tree-path 
 		       link-tree-path
 		       (current-directory))) ;; WARNING: SECURITY HOLE. FIX ASAP!
     (handle-directory spiffy-directory-listing)
     (handle-exception (lambda (exn chain)
@@ -101,29 +114,45 @@
 					   '(/ any))
 				   (send-response body: "hey there!\n"
 						  headers: '((content-type text/plain))))
 				  ((equal? (uri-path (request-uri (current-request))) 
 					   '(/ "hey"))
-				   (send-response body: "hey there!\n"
+				   (send-response body: "hey there!\n" 
 						  headers: '((content-type text/plain))))
+                                  ((equal? (uri-path (request-uri (current-request))) 
+					   '(/ "jquery3.1.0.js"))
+				   (send-response body: (http-transport:show-jquery) 
+						  headers: '((content-type application/javascript))))
+                                  ((equal? (uri-path (request-uri (current-request))) 
+					   '(/ "test_log"))
+				   (send-response body: (http-transport:html-test-log $) 
+						  headers: '((content-type text/HTML))))    
+                                  ((equal? (uri-path (request-uri (current-request))) 
+					   '(/ "dashboard"))
+				   (send-response body: (http-transport:html-dboard $) 
+						  headers: '((content-type text/HTML)))) 
 				  (else (continue))))))))
+    (with-output-to-file start-file (lambda ()(print (current-process-id))))
     (http-transport:try-start-server ipaddrstr start-port)))
 
 ;; This is recursively run by http-transport:run until sucessful
 ;;
 (define (http-transport:try-start-server ipaddrstr portnum)
-  (let ((config-hostname (configf:lookup *configdat* "server" "hostname")))
+  (let ((config-hostname (configf:lookup *configdat* "server" "hostname"))
+	(config-use-proxy (equal? (configf:lookup *configdat* "client" "use-http_proxy") "yes")))
+    (if (not config-use-proxy)
+	(determine-proxy (constantly #f)))
     (debug:print-info 0 *default-log-port* "http-transport:try-start-server time=" (seconds->time-string (current-seconds)) " ipaddrsstr=" ipaddrstr " portnum=" portnum " config-hostname=" config-hostname)
     (handle-exceptions
 	exn
 	(begin
 	  (print-error-message exn)
 	  (if (< portnum 64000)
 	      (begin 
 		(debug:print 0 *default-log-port* "WARNING: attempt to start server failed. Trying again ...")
 		(debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-		(debug:print 0 *default-log-port* "exn=" (condition->list exn))
+		(debug:print 5 *default-log-port* "exn=" (condition->list exn))
 		(portlogger:open-run-close portlogger:set-failed portnum)
 		(debug:print 0 *default-log-port* "WARNING: failed to start on portnum: " portnum ", trying next port")
 		(thread-sleep! 0.1)
 		
 		;; get_next_port goes here
@@ -233,14 +262,18 @@
 					  (handle-exceptions
 					      exn
 					      (let ((call-chain (get-call-chain))
 						    (msg        ((condition-property-accessor 'exn 'message) exn)))
 						(set! success #f)
-						(debug:print 0 *default-log-port* "WARNING: failure in with-input-from-request to " fullurl ".")
-						(debug:print 0 *default-log-port* " message: " msg)
-						(debug:print 0 *default-log-port* " cmd: " cmd " params: " params)
-						(if runremote
+                                                (if (debug:debug-mode 1)
+                                                    (debug:print-info 0 *default-log-port* "couldn't talk to server, trying again ...")
+                                                    (begin
+                                                      (debug:print 0 *default-log-port* "WARNING: failure in with-input-from-request to " fullurl ".")
+                                                      (debug:print 0 *default-log-port* " message: " msg)
+                                                      (debug:print 0 *default-log-port* " cmd: " cmd " params: " params)
+                                                      (debug:print 0 *default-log-port* " call-chain: " call-chain)))
+                                                (if runremote
 						    (remote-conndat-set! runremote #f))
 						;; Killing associated server to allow clean retry.")
 						;; (tasks:kill-server-run-id run-id)  ;; better to kill the server in the logic that called this routine?
 						(mutex-unlock! *http-mutex*)
 					     ;;; (signal (make-composite-condition
@@ -247,11 +280,11 @@
 					     ;;;          (make-property-condition 'commfail 'message "failed to connect to server")))
 					     ;;; "communications failed"
 						(db:obj->string #f))
 					    (with-input-from-request ;; was dat
 					     fullurl 
-					     (list (cons 'key "thekey")
+					     (list (cons 'key (or *server-id* "thekey"))
 						   (cons 'cmd cmd)
 						   (cons 'params sparams))
 					     read-string))
 					  transport: 'http)
                                          0)) ;; added this speculatively
@@ -292,12 +325,18 @@
 	 (server-dat (if runremote
                          (remote-conndat runremote)
                          #f))) ;; (hash-table-ref/default *runremote* run-id #f)))
     (if (vector? server-dat)
 	(let ((api-dat (http-transport:server-dat-get-api-uri server-dat)))
-	  (close-connection! api-dat)
-	  #t)
+	  (handle-exceptions
+	    exn
+	    (begin
+	      (print-call-chain *default-log-port*)
+	      (debug:print-error 0 *default-log-port* " closing connection failed with error: " ((condition-property-accessor 'exn 'message) exn)))
+	    (close-connection! api-dat)
+            ;;(close-idle-connections!)
+	    #t))
 	#f)))
 
 
 (define (make-http-transport:server-dat)(make-vector 6))
 (define (http-transport:server-dat-get-iface         vec)    (vector-ref  vec 0))
@@ -340,11 +379,13 @@
 (define (http-transport:keep-running) 
   ;; if none running or if > 20 seconds since 
   ;; server last used then start shutdown
   ;; This thread waits for the server to come alive
   (debug:print-info 0 *default-log-port* "Starting the sync-back, keep alive thread in server")
-  (let* ((server-start-time (current-seconds))
+  (let* ((tmp-area          (common:get-db-tmp-area))
+	 (started-file      (conc tmp-area "/.server-started"))
+	 (server-start-time (current-seconds))
 	 (server-info (let loop ((start-time (current-seconds))
 				 (changed    #t)
 				 (last-sdat  "not this"))
                         (let ((sdat #f))
 			  (thread-sleep! 0.01)
@@ -355,36 +396,52 @@
                           (if (and sdat
 				   (not changed)
 				   (> (- (current-seconds) start-time) 2))
 			      (begin
 				(debug:print-info 0 *default-log-port* "Received server alive signature")
+                                (common:save-pkt `((action . alive)
+                                                   (T      . server)
+                                                   (pid    . ,(current-process-id))
+                                                   (ipaddr . ,(car sdat))
+                                                   (port   . ,(cadr sdat)))
+                                                 *configdat* #t)
 				sdat)
                               (begin
 				(debug:print-info 0 *default-log-port* "Still waiting, last-sdat=" last-sdat)
                                 (sleep 4)
 				(if (> (- (current-seconds) start-time) 120) ;; been waiting for two minutes
 				    (begin
 				      (debug:print-error 0 *default-log-port* "transport appears to have died, exiting server")
+                                      (common:save-pkt `((action . died)
+                                                         (T      . server)
+                                                         (pid    . ,(current-process-id))
+                                                         (ipaddr . ,(car sdat))
+                                                         (port   . ,(cadr sdat))
+                                                         (msg    . "Transport died?"))
+                                                 *configdat* #t)
 				      (exit))
 				    (loop start-time
 					  (equal? sdat last-sdat)
 					  sdat)))))))
          (iface       (car server-info))
          (port        (cadr server-info))
          (last-access 0)
-	 (server-timeout (server:get-timeout))
+	 (server-timeout (server:expiration-timeout))
 	 (server-going  #f)
 	 (server-log-file (args:get-arg "-log"))) ;; always set when we are a server
+
+    (with-output-to-file started-file (lambda ()(print (current-process-id))))
+
     (let loop ((count         0)
 	       (server-state 'available)
 	       (bad-sync-count 0)
 	       (start-time     (current-milliseconds)))
       ;; Use this opportunity to sync the tmp db to megatest.db
       (if (not server-going) ;; *dbstruct-db* 
 	  (begin
 	    (debug:print 0 *default-log-port* "SERVER: dbprep")
-	    (set! *dbstruct-db*  (db:setup)) ;;  run-id))
+	    (set! *dbstruct-db*  (db:setup #t)) ;;  run-id))
 	    (set! server-going #t)
 	    (debug:print 0 *default-log-port* "SERVER: running, megatest version: " (common:get-full-version)) ;; NOTE: the server is NOT yet marked as running in the log. We do that in the keep-running routine.
 	    (thread-start! *watchdog*)))
       
       ;; when things go wrong we don't want to be doing the various queries too often
@@ -423,28 +480,23 @@
 	    (flush-output *default-log-port*)))
       (if (common:low-noise-print 60 "dbstats")
 	  (begin
 	    (debug:print 0 *default-log-port* "Server stats:")
 	    (db:print-current-query-stats)))
-      (let* ((hrs-since-start  (/ (- (current-seconds) server-start-time) 3600))
-	     (adjusted-timeout (if (> hrs-since-start 1)
-				   (- server-timeout (inexact->exact (round (* hrs-since-start 60))))  ;; subtract 60 seconds per hour
-				   server-timeout)))
-	(if (common:low-noise-print 120 "server timeout")
-	    (debug:print-info 0 *default-log-port* "Adjusted server timeout: " adjusted-timeout))
+      (let* ((hrs-since-start  (/ (- (current-seconds) server-start-time) 3600)))
 	(cond
          ((and *server-run*
 	       (> (+ last-access server-timeout)
-		  (current-seconds))
-	       (< (- (current-seconds) server-start-time) 3600)) ;; do not update log or touch log if we've been running for more than one hour.
+		  (current-seconds)))
           (if (common:low-noise-print 120 "server continuing")
               (debug:print-info 0 *default-log-port* "Server continuing, seconds since last db access: " (- (current-seconds) last-access))
 	      (let ((curr-time (current-seconds)))
 		(handle-exceptions
 		    exn
 		    (debug:print 0 *default-log-port* "ERROR: Failed to change timestamp on log file " server-log-file ". Are you out of space on that disk?")
-		  (change-file-times server-log-file curr-time curr-time))))
+		  (if (not *server-overloaded*)
+		      (change-file-times server-log-file curr-time curr-time)))))
           (loop 0 server-state bad-sync-count (current-milliseconds)))
          (else
           (debug:print-info 0 *default-log-port* "Server timed out. seconds since last db access: " (- (current-seconds) last-access))
           (http-transport:server-shutdown port)))))))
 
@@ -474,66 +526,128 @@
     ;; 			  (/ *total-non-write-delay* 
     ;; 			     *number-non-write-queries*))
     ;; 		      " ms")
     
     (db:print-current-query-stats)
-    
+    (common:save-pkt `((action . exit)
+                       (T      . server)
+                       (pid    . ,(current-process-id)))
+                     *configdat* #t)
     (debug:print-info 0 *default-log-port* "Server shutdown complete. Exiting")
     (exit)))
 
 ;; all routes though here end in exit ...
 ;;
 ;; start_server? 
 ;;
 (define (http-transport:launch)
-  ;; (if (args:get-arg "-daemonize")
-  ;;     (begin
-  ;; 	(daemon:ize)
-  ;; 	(if *alt-log-file* ;; we should re-connect to this port, I think daemon:ize disrupts it
-  ;; 	    (begin
-  ;; 	      (current-error-port *alt-log-file*)
-  ;; 	      (current-output-port *alt-log-file*)))))
-  (let* ((th2 (make-thread (lambda ()
-			     (debug:print-info 0 *default-log-port* "Server run thread started")
-			     (http-transport:run 
-			      (if (args:get-arg "-server")
-				  (args:get-arg "-server")
-				  "-")
-			      )) "Server run"))
-	 (th3 (make-thread (lambda ()
-			     (debug:print-info 0 *default-log-port* "Server monitor thread started")
-			     (http-transport:keep-running)
-			   "Keep running"))))
-    (thread-start! th2)
-    (thread-sleep! 0.25) ;; give the server time to settle before starting the keep-running monitor.
-    (thread-start! th3)
-    (set! *didsomething* #t)
-    (thread-join! th2)
-    (exit)))
-
-(define (http-transport:server-signal-handler signum)
-  (signal-mask! signum)
-  (handle-exceptions
-   exn
-   (debug:print 0 *default-log-port* " ... exiting ...")
-   (let ((th1 (make-thread (lambda ()
-			     (thread-sleep! 1))
-			   "eat response"))
-	 (th2 (make-thread (lambda ()
-			     (debug:print-error 0 *default-log-port* "Received ^C, attempting clean exit. Please be patient and wait a few seconds before hitting ^C again.")
-			     (thread-sleep! 3) ;; give the flush three seconds to do it's stuff
-			     (debug:print 0 *default-log-port* "       Done.")
-			     (exit 4))
-			   "exit on ^C timer")))
-     (thread-start! th2)
-     (thread-start! th1)
-     (thread-join! th2))))
+  ;; check that a server start is in progress, pause or exit if so
+  (let* ((tmp-area            (common:get-db-tmp-area))
+	 (server-start        (conc tmp-area "/.server-start"))
+	 (server-started      (conc tmp-area "/.server-started"))
+	 (start-time          (common:lazy-modification-time server-start))
+	 (started-time        (common:lazy-modification-time server-started))
+	 (server-starting     (< start-time started-time)) ;; if start-time is less than started-time then a server is still starting
+	 (start-time-old      (> (- (current-seconds) start-time) 5))
+         (cleanup-proc        (lambda (msg)
+                                (let* ((serv-fname      (conc "server-" (current-process-id) "-" (get-host-name) ".log"))
+                                       (full-serv-fname (conc *toppath* "/logs/" serv-fname))
+                                       (new-serv-fname  (conc *toppath* "/logs/" "defunct-" serv-fname)))
+                                  (debug:print 0 *default-log-port* msg)
+                                  (if (common:file-exists? full-serv-fname)
+                                      (system (conc "sleep 1;mv -f " full-serv-fname " " new-serv-fname))
+                                      (debug:print 0 *default-log-port* "INFO: cannot move " full-serv-fname " to " new-serv-fname))
+                                  (exit)))))
+    (if (and (not start-time-old) ;; last server start try was less than five seconds ago
+	     (not server-starting))
+	(begin
+	  (cleanup-proc "NOT starting server, there is either a recently started server or a server in process of starting")
+	  (exit)))
+    ;; lets not even bother to start if there are already three or more server files ready to go
+    (let* ((num-alive   (server:get-num-alive (server:get-list *toppath*))))
+      (if (> num-alive 3)
+          (begin
+            (cleanup-proc (conc "ERROR: Aborting server start because there are already " num-alive " possible servers either running or starting up"))
+            (exit))))
+  (common:save-pkt `((action . start)
+		     (T      . server)
+		     (pid    . ,(current-process-id)))
+		   *configdat* #t)
+    (let* ((th2 (make-thread (lambda ()
+                               (debug:print-info 0 *default-log-port* "Server run thread started")
+                               (http-transport:run 
+                                (if (args:get-arg "-server")
+                                    (args:get-arg "-server")
+                                    "-")
+                                )) "Server run"))
+           (th3 (make-thread (lambda ()
+                               (debug:print-info 0 *default-log-port* "Server monitor thread started")
+                               (http-transport:keep-running)
+                               "Keep running"))))
+      (thread-start! th2)
+      (thread-sleep! 0.25) ;; give the server time to settle before starting the keep-running monitor.
+      (thread-start! th3)
+      (set! *didsomething* #t)
+      (thread-join! th2)
+      (exit))))
+
+;; (define (http-transport:server-signal-handler signum)
+;;   (signal-mask! signum)
+;;   (handle-exceptions
+;;    exn
+;;    (debug:print 0 *default-log-port* " ... exiting ...")
+;;    (let ((th1 (make-thread (lambda ()
+;; 			     (thread-sleep! 1))
+;; 			   "eat response"))
+;; 	 (th2 (make-thread (lambda ()
+;; 			     (debug:print-error 0 *default-log-port* "Received ^C, attempting clean exit. Please be patient and wait a few seconds before hitting ^C again.")
+;; 			     (thread-sleep! 3) ;; give the flush three seconds to do it's stuff
+;; 			     (debug:print 0 *default-log-port* "       Done.")
+;; 			     (exit 4))
+;; 			   "exit on ^C timer")))
+;;      (thread-start! th2)
+;;      (thread-start! th1)
+;;      (thread-join! th2))))
+
+;;===============================================
+;; Java script
+;;===============================================
+(define (http-transport:show-jquery)
+  (let* ((data  (tests:readlines *java-script-lib*)))
+(string-join data "\n")))
+
+
 
 ;;======================================================================
 ;; web pages
 ;;======================================================================
 
+(define (http-transport:html-test-log $)
+   (let* ((run-id ($ 'runid))
+         (test-item ($ 'testname))
+         (parts (string-split test-item ":"))
+         (test-name (car parts))
+             
+         (item-name (if (equal? (length parts) 1)
+             ""
+             (cadr parts))))
+  ;(print $) 
+(tests:get-test-log run-id test-name item-name)))
+
+
+(define (http-transport:html-dboard $)
+  (let* ((page ($ 'page))
+         (oup       (open-output-string)) 
+         (bdy "--------------------------")
+
+         (ret  (tests:dynamic-dboard page)))
+    (s:output-new  oup  ret)
+   (close-output-port oup)
+
+  (set! bdy   (get-output-string oup))
+     (conc "
      Dashboard
      " bdy "
       
       "  )))
+
 (define (http-transport:main-page)
   (let ((linkpath (root-path)))
     (conc "
      " (pathname-strip-directory *toppath*) "
      "
 	  ""
 	  "Run area: " *toppath*

Index: index-tree.scm
==================================================================
--- index-tree.scm
+++ index-tree.scm
@@ -1,14 +1,23 @@
 ;;======================================================================
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 ;;======================================================================
 
 ;;======================================================================
 ;; Tests
 ;;======================================================================

Index: items.scm
==================================================================
--- items.scm
+++ items.scm
@@ -1,14 +1,22 @@
 
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 
 ;; (define itemdat '((ripeness    "green ripe overripe")
 ;; 		     (temperature "cool medium hot")
 ;; 		     (season      "summer winter fall spring")))
@@ -132,16 +140,16 @@
     (set! itemstable (map (lambda (item)
 			    (if (procedure? (cadr item))
 				(list (car item)((cadr item)))  ;; evaluate the proc
 				item))
 			  itemstable))
-    (if (and have-items  (null? items))     (debug:print-error 0 *default-log-port* "[items] section in testconfig but no entries defined"))
-    (if (and have-itable (null? itemstable))(debug:print-error 0 *default-log-port* "[itemstable] section in testconfig but no entries defined"))
+    (if (and have-items  (null? items))     (debug:print 0 *default-log-port* "WARNING:[items] section in testconfig but no entries defined"))
+    (if (and have-itable (null? itemstable))(debug:print 0 *default-log-port* "WARNNG:[itemstable] section in testconfig but no entries defined"))
     (if (or (not (null? items))(not (null? itemstable)))
 	(append (item-assoc->item-list items)
 		(item-table->item-list itemstable))
 	'(()))))
 
 ;; (pp (item-assoc->item-list itemdat))
 
 
 	

ADDED   iup-test/Makefile
Index: iup-test/Makefile
==================================================================
--- /dev/null
+++ iup-test/Makefile
@@ -0,0 +1,5 @@
+LIBSRC = "<$PATH>/chicken-4.10.0-patch"
+
+
+sample : sample.c
+	gcc -I$(LIBSRC)/include/ -L$(LIBSRC)/lib -L$(LIBSRC)/lib64 -liup -liupimglib -o sample sample.c

ADDED   iup-test/matrix.c
Index: iup-test/matrix.c
==================================================================
--- /dev/null
+++ iup-test/matrix.c
@@ -0,0 +1,275 @@
+#include 
+#include 
+#include 
+#include 
+
+#undef __IUPDEF_H
+#include "iup.h"
+#include "iupcontrols.h"
+#include "iupcbs.h"
+#include "iup_plus.h"
+
+
+#define TEST_IMAGE_SIZE 20
+
+static unsigned char image_data_32 [TEST_IMAGE_SIZE*TEST_IMAGE_SIZE*4] = 
+{
+  000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,
+  000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,
+};
+
+static int mousemove_cb(Ihandle *ih, int lin, int col)
+{
+  printf("mousemove_cb(%d, %d)\n", lin, col);
+  return IUP_DEFAULT;
+}
+
+static int drop(Ihandle *self, Ihandle *drop, int lin, int col)
+{
+  printf("drop_cb(%d, %d)\n", lin, col);
+  if(lin == 3 && col == 1)
+  {
+    IupSetAttribute(drop, "1", "A - Test of Very Big String for Dropdown!");
+    IupSetAttribute(drop, "2", "B");
+    IupSetAttribute(drop, "3", "C");
+    IupSetAttribute(drop, "4", "XXX");
+    IupSetAttribute(drop, "5", "5");
+    IupSetAttribute(drop, "6", "6");
+    IupSetAttribute(drop, "7", "7");
+    IupSetAttribute(drop, "8", NULL);
+    IupSetAttribute(drop, "VALUE", "4");
+    return IUP_DEFAULT;
+  }
+  return IUP_IGNORE;
+}
+
+static int dropcheck_cb(Ihandle *self, int lin, int col)
+{
+  if (lin == 3 && col == 1)
+    return IUP_DEFAULT;
+  if (lin == 4 && col == 4)
+    return IUP_CONTINUE;
+  return IUP_IGNORE;
+}
+
+static int togglevalue_cb(Ihandle *self, int lin, int col, int value)
+{
+  printf("togglevalue_cb(%d, %d)=%d\n", lin, col, value);
+  return IUP_DEFAULT;
+}
+
+static int click(Ihandle *self, int lin, int col)
+{
+  printf("click_cb(%d, %d)\n", lin, col);
+  IupSetAttribute(self,"MARKED", NULL);  /* clear all marks */
+  IupSetAttributeId2(self,"MARK", lin, 0, "1");
+  IupSetfAttribute(self,"REDRAW", "L%d", lin);
+  return IUP_DEFAULT;
+}
+
+static int enteritem_cb(Ihandle *ih, int lin, int col)
+{
+  IupSetAttribute(ih,"MARKED", NULL);  /* clear all marks */
+  IupSetAttributeId2(ih,"MARK", lin, 0, "1");
+  IupSetfAttribute(ih,"REDRAW", "L%d", lin);
+  return IUP_DEFAULT;
+}
+
+static Ihandle* create_matrix(void)
+{
+  Ihandle* mat = IupMatrix(NULL); 
+  
+//  IupSetAttribute(mat, "NUMLIN", "3"); 
+  IupSetAttribute(mat, "NUMLIN", "20"); 
+  IupSetAttribute(mat, "NUMCOL", "8"); 
+//  IupSetAttribute(mat, "NUMCOL", "15"); 
+//  IupSetAttribute(mat, "NUMLIN", "3"); 
+//  IupSetAttribute(mat, "NUMCOL", "2"); 
+//  IupSetAttribute(mat, "NUMLIN", "8"); 
+//  IupSetAttribute(mat, "NUMCOL", "5"); 
+//  IupSetAttribute(mat, "ACTIVE", "NO");
+//  IupSetAttribute(mat, "EDITHIDEONFOCUS", "NO");
+//  IupSetAttribute(mat, "EDITALIGN", "Yes");
+//  IupSetAttribute(mat, "EDITFITVALUE", "Yes");
+//  IupSetAttribute(mat, "READONLY", "Yes");
+  
+  //IupSetAttribute(mat, "0:0", "Inflation");
+  //IupSetAttribute(mat, "1:0", "Medicine\nPharma");
+  //IupSetAttribute(mat, "2:0", "Food"); 
+  //IupSetAttribute(mat, "3:0", "Energy"); 
+  //IupSetAttribute(mat, "0:1", "January 2000"); 
+  //IupSetAttribute(mat, "0:2", "February 2000"); 
+  IupSetAttribute(mat, "1:1", "5.6\n3.33");
+  IupSetAttribute(mat, "2:1", "2.2");
+  IupSetAttribute(mat, "3:2", "Very Very Very Very Very Large Text");
+  IupSetAttribute(mat, "1:2", "4.5");
+  if (IupGetInt(NULL, "UTF8MODE"))
+    IupSetAttribute(mat, "2:2", "(çãõáóé)");
+  else
+    IupSetAttribute(mat, "2:2", "(çãõáóé)");
+
+  IupSetAttribute(mat, "3:1", "3.4");
+  IupSetAttribute(mat, "3:3", "Font Test");
+//  IupSetAttribute(mat, "HEIGHT2", "30");
+//  IupSetAttribute(mat, "WIDTH2", "190");
+//  IupSetAttributeId(mat, "WIDTH", 2, "190");
+  IupSetAttribute(mat,"SORTSIGN2","DOWN");
+//  IupSetAttribute(mat, "WIDTHDEF", "34");
+//  IupSetAttribute(mat,"MULTILINE", "YES");
+  IupSetAttribute(mat,"RESIZEMATRIX", "YES");
+//  IupSetAttribute(mat,"HIDDENTEXTMARKS", "YES");
+//  IupSetAttribute(mat,"USETITLESIZE", "YES");
+  //IupSetAttribute(mat,"SCROLLBAR", "NO");
+  //IupSetAttribute(mat, "BGCOLOR1:2", "255 92 255");
+  //IupSetAttribute(mat, "BGCOLOR2:*", "92 92 255");
+  //IupSetAttribute(mat, "BGCOLOR*:3", "255 92 92");
+  //IupSetAttribute(mat, "FGCOLOR1:2", "255 0 0");
+  //IupSetAttribute(mat, "FGCOLOR2:*", "0 128 0");
+  //IupSetAttribute(mat, "FGCOLOR*:3", "0 0 255");
+  IupSetAttribute(mat, "FONT3:3", "Helvetica, 24");
+  //IupSetAttribute(mat, "FONT2:*", "Courier, 14");
+  //IupSetAttribute(mat, "FONT*:3", "Times, Bold 14");
+//  IupSetAttribute(mat, "ALIGNMENT1", "ALEFT");
+//  IupSetAttribute(mat, "ALIGNMENT3", "ARIGHT");
+//  IupSetAttribute(mat, "ALIGN2:1", ":ARIGHT");
+//  IupSetAttribute(mat, "LINEALIGNMENT1", "ATOP");
+  //  IupSetAttribute(mat, "ACTIVE", "NO");
+//  IupSetAttribute(mat, "EXPAND", "NO");
+//  IupSetAttribute(mat, "ALIGNMENT", "ALEFT");
+
+//  IupSetAttribute(mat, "MASK1:3", IUP_MASK_FLOAT);
+//  IupSetAttribute(mat, "MASK1:3", "[a-zA-Z][0-9a-zA-Z_]*");
+//  IupSetAttribute(mat, "MASKFLOAT1:3", "0.0:10.0");
+  IupSetAttribute(mat, "MASK*:3", "[a-zA-Z][0-9a-zA-Z_]*");
+
+  IupSetAttribute(mat, "TYPE4:1", "COLOR");
+  IupSetAttribute(mat, "4:1", "255 0 128");
+
+  IupSetAttribute(mat, "TYPE4:2", "FILL");
+  IupSetAttribute(mat, "4:2", "60");
+  IupSetAttribute(mat, "SHOWFILLVALUE", "Yes");
+
+  {
+    Ihandle* image = IupImageRGBA(TEST_IMAGE_SIZE, TEST_IMAGE_SIZE, image_data_32);
+    IupSetAttribute(mat, "TYPE4:3", "IMAGE");
+    IupSetAttributeHandle(mat, "4:3", image);
+  }
+
+//  IupSetAttribute(mat, "TOGGLEVALUE4:4", "ON");
+//  IupSetAttribute(mat, "VALUE4:4", "1");
+  IupSetAttribute(mat, "TOGGLECENTERED", "Yes");
+
+  IupSetAttribute(mat,"MARKMODE","CELL");
+//  IupSetAttribute(mat,"MARKMODE","LIN");
+//  IupSetAttribute(mat,"MARKMULTIPLE","NO");
+  IupSetAttribute(mat,"MARKMULTIPLE","YES");
+//  IupSetAttribute(mat,"MARKAREA","NOT_CONTINUOUS");
+//  IupSetAttribute(mat,"MARK2:2","YES");
+//  IupSetAttribute(mat,"MARK2:3","YES");
+//  IupSetAttribute(mat,"MARK3:3","YES");
+
+  IupSetAttribute(mat,"FRAMEVERTCOLOR1:2","BGCOLOR");
+  IupSetAttribute(mat,"FRAMEHORIZCOLOR1:2","0 0 255");
+  IupSetAttribute(mat,"FRAMEHORIZCOLOR1:3","0 255 0");
+  IupSetAttribute(mat,"FRAMEVERTCOLOR2:2","255 255 0");
+  IupSetAttribute(mat,"FRAMEVERTCOLOR*:4","0 255 0");
+  IupSetAttribute(mat,"FRAMEVERTCOLOR*:5","BGCOLOR");
+
+//  IupSetAttribute(mat,"MARKMODE","LINCOL");
+
+  //IupSetAttribute(mat, "NUMCOL_VISIBLE_LAST", "YES");
+  //IupSetAttribute(mat, "NUMLIN_VISIBLE_LAST", "YES");
+//  IupSetAttribute(mat, "WIDTHDEF", "15");
+  IupSetAttribute(mat, "20:8", "The End");
+  //IupSetAttribute(mat, "10:0", "Middle Line");
+  //IupSetAttribute(mat, "15:0", "Middle Line");
+  //IupSetAttribute(mat, "0:4", "Middle Column");
+  //IupSetAttribute(mat, "20:0", "Line Title Test");
+  //IupSetAttribute(mat, "0:8", "Column Title Test");
+  IupSetAttribute(mat, "NUMCOL_VISIBLE", "3");
+  IupSetAttribute(mat, "NUMLIN_VISIBLE", "5");
+//  IupSetAttribute(mat,"EDITNEXT","COLCR");
+//  IupSetAttribute(mat, "NUMCOL_NOSCROLL", "1");
+
+//  IupSetAttribute(mat, "LIMITEXPAND", "Yes");
+//  IupSetAttribute(mat, "XAUTOHIDE", "NO");
+//  IupSetAttribute(mat, "YAUTOHIDE", "NO");
+
+//  IupSetAttribute(mat,"RASTERSIZE","x300");
+//  IupSetAttribute(mat,"FITTOSIZE","LINES");
+  
+//  IupSetAttribute(mat,"TYPECOLORINACTIVE","No");
+//  IupSetAttribute(mat, "ACTIVE", "No");
+
+  IupSetAttribute(mat, "FRAMEBORDER", "Yes");
+
+  /* test for custom matrix attributes */
+  //{
+  //  char* v;
+  //  IupSetAttribute(mat, "MTX_LINE_ACTIVE_FLAG3:4", "Test1");
+  //  IupSetAttributeId2(mat, "MTX_LINE_ACTIVE_FLAG", 5, 7, "Test2");
+  //  printf("Test1=%s\n", IupGetAttribute(mat, "MTX_LINE_ACTIVE_FLAG3:4"));
+  //  printf("Test2=%s\n", IupGetAttributeId2(mat, "MTX_LINE_ACTIVE_FLAG", 5, 7));
+  //}
+
+  IupSetCallback(mat, "DROPCHECK_CB", (Icallback)dropcheck_cb);
+  IupSetCallback(mat,"DROP_CB",(Icallback)drop);
+//  IupSetCallback(mat,"MENUDROP_CB",(Icallback)drop);
+//  IupSetCallback(mat, "MOUSEMOVE_CB", (Icallback)mousemove_cb);
+//  IupSetCallback(mat,"CLICK_CB",(Icallback)click);
+//  IupSetCallback(mat,"ENTERITEM_CB",(Icallback)enteritem_cb);
+  IupSetCallback(mat,"TOGGLEVALUE_CB",(Icallback)togglevalue_cb);
+
+  return mat;
+}
+
+void MatrixTest(void)
+{
+  Ihandle* dlg, *box, *mat;
+
+  box = IupVbox(mat = create_matrix(), NULL);
+  IupSetAttribute(box, "MARGIN", "10x10");
+//  IupSetAttribute(box, "FONT", "Arial, 7");
+
+  dlg = IupDialog(box);
+  IupSetAttribute(dlg, "TITLE", "IupMatrix Simple Test");
+  IupShowXY(dlg, IUP_CENTER, IUP_CENTER);
+
+//        IupSetAttribute(mat, "ADDLIN", "1");
+//        IupSetAttribute(mat,"4:0","Teste");
+//        IupSetAttribute(mat, "REDRAW", "ALL");
+}
+
+#ifndef BIG_TEST
+int main(int argc, char* argv[])
+{
+  IupOpen(&argc, &argv);
+  IupControlsOpen();
+
+  MatrixTest();
+
+  IupMainLoop();
+
+  IupClose();
+
+  return EXIT_SUCCESS;
+}
+#endif

ADDED   iup-test/sample.c
Index: iup-test/sample.c
==================================================================
--- /dev/null
+++ iup-test/sample.c
@@ -0,0 +1,684 @@
+#include 
+#include 
+#include 
+#include 
+
+#undef __IUPDEF_H
+#include 
+#include "iupcontrols.h"
+#include "iupcbs.h"
+
+#define TEST_IMAGE_SIZE 20
+
+static unsigned char image_data_32 [TEST_IMAGE_SIZE*TEST_IMAGE_SIZE*4] = 
+{
+  000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255, 
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,000,000,255,255,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,255,255,255,192,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,
+  000,000,000,255,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,000,255,
+  000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,000,000,000,255,
+};
+
+static int drop(Ihandle *self, Ihandle *drop, int lin, int col)
+{
+  printf("drop_cb(%d, %d)\n", lin, col);
+  if(lin == 3 && col == 1)
+  {
+    IupSetAttribute(drop, "1", "A - Test of Very Big String for Dropdown!");
+    IupSetAttribute(drop, "2", "B");
+    IupSetAttribute(drop, "3", "C");
+    IupSetAttribute(drop, "4", "XXX");
+    IupSetAttribute(drop, "5", "5");
+    IupSetAttribute(drop, "6", "6");
+    IupSetAttribute(drop, "7", "7");
+    IupSetAttribute(drop, "8", NULL);
+    IupSetAttribute(drop, "VALUE", "4");
+    return IUP_DEFAULT;
+  }
+  return IUP_IGNORE;
+}
+
+static int togglevalue_cb(Ihandle *self, int lin, int col, int value)
+{
+  printf("togglevalue_cb(%d, %d)=%d\n", lin, col, value);
+  return IUP_DEFAULT;
+}
+
+static Ihandle* load_image_Tecgraf(void)
+{
+  unsigned char imgdata[] = {
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 88, 95, 108, 1, 90, 100, 117, 99, 123, 138, 166, 126, 137, 152, 181, 60, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 95, 105, 123, 147, 122, 137, 165, 255, 136, 152, 183, 255, 132, 149, 179, 250, 133, 149, 178, 69, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 92, 100, 115, 43, 111, 125, 150, 253, 140, 158, 190, 255, 135, 151, 182, 255, 132, 149, 179, 255, 131, 147, 177, 217, 153, 164, 188, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 102, 113, 134, 148, 134, 151, 182, 255, 137, 154, 185, 255, 115, 129, 154, 252, 114, 128, 155, 255, 130, 146, 175, 255, 132, 147, 175, 71, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 158, 159, 162, 3, 108, 121, 145, 230, 144, 162, 195, 255, 137, 154, 185, 197, 74, 79, 86, 45, 41, 46, 55, 246, 120, 134, 162, 255, 129, 145, 174, 156, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 95, 101, 113, 48, 124, 139, 167, 255, 144, 161, 194, 255, 138, 155, 186, 67, 0, 0, 0, 0, 49, 54, 62, 150, 87, 98, 118, 255, 128, 144, 173, 223, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 102, 113, 132, 105, 137, 154, 185, 255, 139, 156, 188, 231, 143, 159, 187, 3, 0, 0, 0, 0, 64, 68, 76, 61, 70, 79, 95, 255, 127, 143, 172, 254, 134, 149, 175, 25, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 109, 121, 142, 153, 141, 159, 191, 255, 139, 156, 188, 164, 0, 0, 0, 0, 0, 0, 0, 0, 79, 82, 87, 3, 69, 77, 92, 241, 122, 137, 165, 255, 127, 142, 170, 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 110, 122, 146, 191, 145, 163, 196, 255, 139, 156, 188, 107, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 77, 86, 101, 190, 115, 129, 156, 255, 126, 141, 170, 113, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 112, 125, 149, 227, 150, 168, 201, 255, 141, 157, 188, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 82, 91, 107, 144, 113, 127, 153, 255, 125, 140, 169, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 163, 165, 167, 2, 112, 125, 150, 252, 155, 173, 203, 255, 143, 159, 189, 26, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 85, 94, 110, 109, 114, 128, 155, 255, 125, 140, 168, 175, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 160, 167, 181, 1, 120, 130, 149, 33, 48, 53, 59, 69, 43, 46, 52, 100, 50, 54, 59, 137, 116, 130, 156, 255, 155, 171, 201, 255, 105, 118, 142, 155, 104, 117, 141, 151, 105, 118, 141, 151, 105, 118, 142, 151, 101, 113, 136, 185, 111, 124, 150, 255, 116, 130, 156, 220, 112, 125, 148, 95, 115, 127, 150, 67, 123, 134, 156, 33, 168, 176, 190, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 119, 129, 147, 5, 109, 121, 142, 71, 106, 118, 140, 140, 105, 117, 140, 197, 107, 120, 144, 242, 120, 135, 162, 255, 123, 137, 163, 255, 44, 49, 58, 255, 28, 32, 39, 255, 125, 139, 164, 255, 150, 167, 197, 255, 138, 155, 186, 255, 131, 148, 178, 255, 125, 141, 170, 255, 119, 134, 162, 255, 114, 128, 154, 255, 108, 122, 147, 255, 104, 117, 141, 255, 102, 115, 138, 255, 103, 116, 139, 255, 107, 120, 145, 255, 111, 124, 149, 245, 113, 126, 151, 200, 113, 127, 152, 140, 116, 129, 154, 71, 122, 135, 158, 5, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 118, 128, 145, 14, 106, 118, 140, 130, 104, 116, 139, 234, 105, 118, 142, 255, 128, 144, 173, 255, 147, 165, 199, 255, 157, 177, 213, 255, 150, 168, 202, 255, 140, 156, 187, 229, 41, 45, 52, 196, 39, 43, 51, 183, 130, 143, 168, 255, 144, 161, 192, 233, 109, 122, 145, 109, 105, 116, 138, 109, 99, 110, 130, 109, 92, 103, 123, 109, 91, 100, 117, 145, 97, 109, 131, 255, 95, 106, 128, 248, 74, 83, 97, 193, 64, 72, 85, 227, 56, 63, 75, 255, 55, 62, 75, 255, 65, 73, 88, 255, 90, 101, 121, 255, 111, 125, 150, 255, 114, 128, 154, 236, 116, 129, 155, 130, 127, 140, 165, 16, 0, 0, 0, 0,
+    95, 101, 113, 22, 103, 115, 137, 220, 103, 116, 140, 255, 110, 123, 148, 255, 146, 165, 198, 255, 147, 165, 197, 232, 142, 158, 188, 147, 131, 144, 169, 78, 115, 123, 139, 20, 0, 0, 0, 0, 0, 0, 0, 0, 91, 97, 108, 68, 128, 142, 167, 255, 144, 162, 193, 212, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 95, 100, 107, 31, 120, 135, 163, 255, 133, 150, 180, 231, 0, 0, 0, 0, 0, 0, 0, 0, 86, 89, 93, 20, 50, 54, 61, 73, 37, 40, 46, 141, 33, 36, 42, 230, 46, 52, 63, 255, 107, 120, 144, 255, 116, 130, 157, 255, 118, 133, 159, 223, 132, 147, 174, 24,
+    76, 83, 95, 114, 104, 117, 140, 255, 105, 117, 141, 255, 118, 133, 160, 253, 139, 155, 184, 116, 134, 143, 161, 7, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 93, 100, 110, 74, 122, 137, 163, 255, 143, 160, 191, 200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 110, 114, 120, 31, 123, 138, 166, 255, 136, 153, 183, 228, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 90, 93, 97, 5, 42, 45, 51, 111, 86, 97, 117, 253, 118, 133, 160, 255, 119, 133, 161, 255, 133, 149, 180, 116,
+    46, 50, 56, 109, 67, 76, 91, 255, 105, 118, 142, 255, 107, 120, 145, 254, 112, 125, 149, 131, 127, 139, 161, 12, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 93, 98, 109, 74, 116, 130, 156, 255, 142, 159, 190, 200, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 112, 115, 122, 31, 128, 143, 172, 255, 141, 157, 185, 228, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 124, 137, 163, 7, 122, 136, 162, 122, 120, 135, 162, 254, 121, 136, 164, 255, 136, 152, 184, 255, 126, 141, 168, 116,
+    71, 74, 79, 17, 31, 35, 41, 206, 42, 47, 57, 255, 77, 87, 105, 255, 103, 116, 140, 255, 110, 124, 149, 239, 112, 125, 150, 157, 115, 128, 153, 89, 122, 134, 158, 30, 147, 158, 177, 2, 0, 0, 0, 0, 81, 87, 96, 65, 109, 123, 148, 255, 141, 158, 190, 212, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 98, 103, 112, 31, 135, 151, 180, 255, 141, 156, 183, 231, 0, 0, 0, 0, 153, 164, 183, 1, 134, 147, 171, 30, 124, 138, 165, 84, 123, 138, 165, 154, 122, 137, 164, 235, 127, 143, 172, 255, 140, 157, 189, 255, 144, 162, 195, 255, 129, 144, 172, 218, 126, 138, 161, 22,
+    0, 0, 0, 0, 64, 68, 73, 7, 39, 43, 49, 118, 32, 36, 42, 225, 30, 35, 42, 255, 50, 57, 68, 255, 72, 81, 97, 255, 91, 102, 123, 255, 105, 118, 142, 255, 113, 127, 152, 240, 115, 129, 155, 204, 111, 124, 149, 196, 111, 125, 150, 255, 126, 141, 170, 234, 119, 133, 159, 120, 120, 134, 160, 116, 121, 135, 161, 117, 121, 135, 162, 119, 116, 130, 155, 152, 127, 142, 170, 255, 125, 140, 168, 248, 123, 138, 166, 199, 130, 145, 173, 235, 140, 155, 183, 255, 143, 160, 190, 255, 143, 161, 193, 255, 147, 165, 199, 255, 145, 164, 197, 255, 132, 148, 177, 230, 127, 140, 166, 126, 124, 134, 151, 12, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 138, 141, 144, 3, 55, 58, 63, 58, 37, 40, 46, 126, 34, 38, 44, 184, 34, 38, 44, 235, 35, 39, 47, 254, 49, 55, 66, 255, 64, 72, 87, 255, 77, 87, 104, 255, 88, 98, 118, 255, 96, 108, 130, 255, 103, 116, 139, 255, 108, 122, 147, 255, 113, 127, 153, 255, 118, 133, 160, 255, 124, 140, 168, 255, 133, 148, 176, 255, 141, 156, 183, 255, 146, 161, 187, 255, 144, 159, 186, 255, 131, 146, 174, 254, 127, 141, 168, 237, 126, 141, 168, 188, 123, 137, 162, 131, 112, 123, 143, 61, 128, 132, 140, 3, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 91, 94, 98, 19, 64, 68, 73, 56, 53, 57, 65, 82, 62, 67, 76, 116, 66, 74, 89, 255, 95, 107, 129, 255, 80, 88, 103, 155, 81, 90, 105, 151, 86, 95, 112, 151, 95, 104, 122, 151, 98, 109, 128, 180, 124, 139, 166, 255, 109, 122, 146, 218, 100, 110, 128, 84, 96, 104, 118, 56, 105, 109, 117, 22, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 173, 174, 176, 2, 74, 83, 98, 252, 131, 147, 178, 255, 140, 155, 184, 29, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 122, 134, 157, 114, 151, 169, 203, 255, 123, 138, 165, 174, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 68, 76, 90, 224, 122, 137, 165, 255, 136, 152, 182, 69, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 125, 139, 165, 147, 146, 164, 198, 255, 122, 137, 165, 144, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 62, 69, 81, 191, 110, 124, 149, 255, 134, 151, 181, 113, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 143, 170, 193, 142, 160, 192, 255, 122, 137, 164, 111, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 58, 63, 74, 150, 94, 105, 127, 255, 133, 149, 179, 166, 0, 0, 0, 0, 0, 0, 0, 0, 115, 119, 128, 5, 130, 145, 174, 242, 137, 154, 186, 255, 125, 139, 166, 70, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 54, 58, 66, 102, 72, 81, 97, 255, 132, 148, 178, 236, 148, 161, 187, 5, 0, 0, 0, 0, 110, 121, 140, 64, 140, 157, 189, 255, 127, 142, 171, 254, 131, 144, 169, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 62, 65, 71, 43, 47, 52, 63, 255, 127, 143, 172, 255, 132, 148, 177, 75, 0, 0, 0, 0, 121, 134, 158, 160, 139, 156, 188, 255, 123, 138, 165, 223, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 154, 156, 158, 1, 36, 39, 46, 227, 106, 119, 143, 255, 130, 145, 175, 203, 114, 125, 147, 51, 123, 138, 166, 247, 131, 147, 177, 255, 123, 138, 165, 151, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 37, 41, 47, 143, 68, 77, 93, 255, 128, 144, 174, 255, 126, 141, 170, 252, 129, 145, 174, 255, 123, 138, 166, 255, 127, 141, 167, 68, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 65, 68, 73, 40, 34, 38, 46, 250, 117, 131, 158, 255, 126, 142, 171, 255, 124, 140, 168, 255, 125, 139, 166, 214, 140, 152, 172, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 41, 44, 50, 134, 58, 66, 79, 255, 123, 138, 166, 255, 123, 138, 166, 250, 127, 140, 165, 66, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 154, 156, 158, 1, 46, 50, 55, 83, 82, 89, 102, 123, 106, 116, 136, 51, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+
+  Ihandle* image = IupImageRGBA(32, 32, imgdata);
+  return image;
+}
+
+static Ihandle* load_image_LogoTecgraf(void)
+{
+  unsigned char imgdata[] = {
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 108, 120, 143, 125, 132, 148, 178, 173, 133, 149, 178, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 100, 110, 130, 48, 130, 147, 177, 254, 124, 139, 167, 254, 131, 147, 176, 137, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 115, 128, 153, 134, 142, 159, 191, 194, 47, 52, 61, 110, 114, 128, 154, 222, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 128, 143, 172, 192, 140, 156, 188, 99, 65, 69, 76, 16, 97, 109, 131, 251, 129, 144, 172, 24, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 131, 147, 175, 232, 140, 157, 188, 43, 0, 0, 0, 0, 100, 112, 134, 211, 126, 141, 169, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 72, 78, 88, 26, 48, 52, 57, 60, 135, 150, 178, 254, 108, 121, 145, 83, 105, 118, 142, 76, 106, 119, 143, 201, 118, 133, 159, 122, 117, 129, 152, 25, 168, 176, 190, 1, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    118, 128, 145, 3, 104, 117, 140, 92, 114, 127, 152, 180, 131, 147, 177, 237, 133, 149, 178, 249, 38, 42, 50, 222, 137, 152, 180, 249, 126, 142, 170, 182, 114, 128, 154, 182, 104, 117, 140, 227, 95, 107, 128, 238, 83, 93, 112, 248, 84, 95, 113, 239, 104, 117, 141, 180, 115, 129, 155, 93, 127, 140, 165, 4,
+    98, 109, 130, 153, 109, 123, 147, 254, 145, 163, 195, 153, 138, 154, 182, 56, 115, 123, 138, 5, 92, 99, 109, 35, 134, 149, 177, 230, 0, 0, 0, 0, 0, 0, 0, 0, 120, 133, 159, 143, 135, 151, 181, 115, 86, 89, 93, 5, 41, 45, 51, 54, 40, 45, 53, 150, 107, 120, 144, 254, 122, 137, 164, 154,
+    51, 57, 66, 147, 83, 93, 112, 255, 108, 121, 145, 159, 113, 126, 151, 62, 123, 136, 159, 8, 87, 93, 103, 35, 125, 141, 169, 230, 0, 0, 0, 0, 0, 0, 0, 0, 129, 143, 169, 143, 140, 156, 184, 115, 134, 147, 172, 8, 124, 138, 165, 60, 124, 139, 167, 155, 131, 147, 177, 255, 131, 147, 176, 153,
+    64, 68, 73, 2, 36, 39, 45, 86, 41, 46, 54, 173, 60, 67, 80, 232, 75, 84, 101, 251, 89, 100, 120, 228, 105, 118, 142, 250, 110, 123, 148, 187, 118, 132, 158, 187, 126, 141, 169, 229, 134, 149, 177, 239, 136, 152, 179, 250, 136, 152, 181, 234, 139, 156, 186, 175, 130, 145, 173, 90, 124, 134, 151, 3,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 71, 74, 79, 19, 60, 64, 73, 50, 92, 103, 124, 254, 86, 95, 111, 84, 90, 100, 117, 76, 126, 141, 168, 201, 113, 126, 150, 119, 99, 105, 117, 19, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 93, 105, 125, 231, 135, 151, 181, 46, 0, 0, 0, 0, 137, 154, 184, 212, 123, 137, 164, 64, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 74, 83, 98, 191, 133, 149, 179, 102, 111, 121, 139, 17, 134, 150, 180, 252, 126, 140, 166, 23, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 48, 57, 132, 121, 136, 164, 197, 121, 135, 161, 115, 130, 146, 175, 221, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 43, 47, 52, 46, 87, 98, 118, 254, 126, 142, 170, 254, 124, 139, 166, 135, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,
+    0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 51, 57, 67, 118, 115, 128, 152, 170, 127, 140, 164, 17, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
+
+  Ihandle* image = IupImageRGBA(16, 16, imgdata);
+  return image;
+}
+
+static unsigned char img_bits1[] = 
+{
+ 1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1
+,1,1,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1
+,1,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1
+,1,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1
+,1,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1
+,1,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1
+,1,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1
+,1,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1
+,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+,2,2,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+,2,2,2,0,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+,2,2,2,0,2,0,2,0,2,2,0,2,2,2,0,0,0,2,2,2,0,0,2,0,2,2,0,0,0,2,2,2
+,2,2,2,0,2,0,0,2,0,0,2,0,2,0,2,2,2,0,2,0,2,2,0,0,2,0,2,2,2,0,2,2
+,2,2,2,0,2,0,2,2,0,2,2,0,2,2,2,2,2,0,2,0,2,2,2,0,2,0,2,2,2,0,2,2
+,2,2,2,0,2,0,2,2,0,2,2,0,2,2,0,0,0,0,2,0,2,2,2,0,2,0,0,0,0,0,2,2
+,2,2,2,0,2,0,2,2,0,2,2,0,2,0,2,2,2,0,2,0,2,2,2,0,2,0,2,2,2,2,2,2
+,2,2,2,0,2,0,2,2,0,2,2,0,2,0,2,2,2,0,2,0,2,2,0,0,2,0,2,2,2,0,2,2
+,2,2,2,0,2,0,2,2,0,2,2,0,2,2,0,0,0,0,2,2,0,0,2,0,2,2,0,0,0,2,2,2
+,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,2,2,2,2,2,2,2
+,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,2,2,2,0,2,2,2,2,2,2,2,2
+,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,0,0,0,2,2,2,2,2,2,2,2,2
+,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+,1,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1
+,1,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1
+,1,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1
+,1,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+,1,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+,1,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+,1,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+,2,2,2,2,2,2,2,2,2,2,2,2,2,2,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+};
+
+static unsigned char img_bits2[] = 
+{
+ 2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2
+,2,2,2,2,2,2,2,2,2,2,2,2,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2
+,2,2,2,2,2,2,2,2,2,2,2,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2
+,2,2,2,2,2,2,2,2,2,2,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2
+,2,2,2,2,2,2,2,2,2,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2
+,2,2,2,2,2,2,2,2,2,2,3,3,3,3,1,1,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2
+,2,2,2,2,2,2,2,2,2,3,3,3,3,3,1,1,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2
+,2,2,2,2,2,2,2,2,3,3,3,3,3,3,1,1,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2,2
+,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3
+,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3
+,3,3,3,0,3,3,3,3,3,3,3,3,3,3,1,1,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3
+,3,3,3,0,3,3,3,3,3,3,3,3,3,3,1,1,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3
+,3,3,3,0,3,0,3,0,3,3,0,3,3,3,1,1,0,3,3,3,0,0,3,0,3,3,0,0,0,3,3,3
+,3,3,3,0,3,0,0,3,0,0,3,0,3,0,1,1,3,0,3,0,3,3,0,0,3,0,3,3,3,0,3,3
+,3,3,3,0,3,0,3,3,0,3,3,0,3,3,1,1,3,0,3,0,3,3,3,0,3,0,3,3,3,0,3,3
+,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1,1
+,3,3,3,0,3,0,3,3,0,3,3,0,3,0,1,1,3,0,3,0,3,3,0,0,3,0,3,3,3,0,3,3
+,3,3,3,0,3,0,3,3,0,3,3,0,3,3,1,1,0,0,3,3,0,0,3,0,3,3,0,0,0,3,3,3
+,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,3,3,3,3,3,3,3,0,3,3,3,3,3,3,3,3
+,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,3,3,3,0,3,3,3,0,3,3,3,3,3,3,3,3
+,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,3,3,3,3,0,0,0,3,3,3,3,3,3,3,3,3
+,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3
+,3,3,3,3,3,3,3,3,3,3,3,3,3,3,1,1,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3,3
+,2,2,2,2,2,2,2,3,3,3,3,3,3,3,1,1,3,3,3,3,3,2,2,2,2,2,2,2,2,2,2,2
+,2,2,2,2,2,2,3,3,3,3,3,3,3,3,1,1,3,3,3,3,2,2,2,2,2,2,2,2,2,2,2,2
+,2,2,2,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2,2,2,2,2,2,2
+,2,2,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+,2,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+,2,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+,2,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+,3,3,3,3,3,3,3,3,3,3,3,3,3,3,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2,2
+};
+
+static int copydata_cb(Ihandle* ih, char* value, int size)
+{
+  printf("COPYDATA(%s, %d)\n", value, size);
+  return IUP_DEFAULT;
+}
+
+static int valuechanged_cb(Ihandle *ih)
+{
+  printf("VALUECHANGED_CB(%s)=%s\n", IupGetClassName(ih), IupGetAttribute(ih, "VALUE"));
+  return IUP_DEFAULT;
+}
+
+static int getfocus_cb(Ihandle *ih)
+{
+  printf("GETFOCUS_CB(%s)\n", IupGetClassName(ih));
+  return IUP_DEFAULT;
+}
+
+static int killfocus_cb(Ihandle *ih)
+{
+  printf("KILLFOCUS_CB(%s)\n", IupGetClassName(ih));
+  return IUP_DEFAULT;
+}
+
+static int leavewindow_cb(Ihandle *ih)
+{
+  printf("LEAVEWINDOW_CB(%s)\n", IupGetClassName(ih));
+  return IUP_DEFAULT;
+}
+
+static int enterwindow_cb(Ihandle *ih)
+{
+  printf("ENTERWINDOW_CB(%s)\n", IupGetClassName(ih));
+  return IUP_DEFAULT;
+}
+
+/* Internal SDK function */
+char *iupKeyCodeToName(int code);
+
+static int k_any(Ihandle *ih, int c)
+{
+  if (iup_isprint(c))
+    printf("K_ANY(%s, %d = %s \'%c\')\n", IupGetClassName(ih), c, iupKeyCodeToName(c), (char)c);
+  else
+    printf("K_ANY(%s, %d = %s)\n", IupGetClassName(ih), c, iupKeyCodeToName(c));
+  if (c==K_r) { IupRecordInput("inputtest.iup", IUP_RECTEXT); return IUP_IGNORE; }  //IUP_RECBINARY, IUP_RECTEXT 
+  if (c==K_s) { IupRecordInput(NULL, 0); IupPlayInput(NULL); return IUP_IGNORE; }
+  if (c==K_p) { IupPlayInput("inputtest.iup"); return IUP_IGNORE; }
+  return IUP_CONTINUE;
+}
+
+static int help_cb(Ihandle* ih)
+{
+  printf("HELP_CB(%s)\n", IupGetClassName(ih));
+  return IUP_DEFAULT;
+}
+
+static void show_menu(Ihandle* ih)
+{
+  int x, y;
+
+  Ihandle* menu_file = IupMenu(
+    IupSetAttributes(IupItem("Item with Image", "item_cb"), "IMAGE=image_tec"),
+    IupSetAttributes(IupItem("Toggle using VALUE", NULL), "VALUE=ON, KEY=K_V"), 
+    IupSetAttributes(IupItem("Auto &Toggle", "item_cb"), "AUTOTOGGLE=YES, VALUE=OFF, IMAGE=image_test, IMPRESS=image_test_pressed"), 
+    IupSeparator(), 
+    IupItem("E&xit (Close)", NULL), 
+    NULL);
+  Ihandle* menu = IupMenu(
+    IupSetAttributes(IupSubmenu("Submenu", menu_file), "KEY=K_S, IMAGE=image_tec"), 
+    IupItem("Item", "item_cb"), 
+    IupSetAttributes(IupItem("Item", "item_cb"), "VALUE=ON"), 
+    IupSetAttributes(IupItem("Item", "item_cb"), "KEY=K_I, IMAGE=image_tec"), 
+    NULL);
+
+  x = IupGetInt(ih, "X");
+  y = IupGetInt(ih, "Y") + IupGetInt2(ih, "RASTERSIZE");
+
+  IupPopup(menu, x, y);
+  IupDestroy(menu);
+}
+
+static int action1_cb(Ihandle* ih)
+{
+//  IupSetAttribute(IupGetDialog(ih), "BACKGROUND", "255 128 128");
+  show_menu(ih);
+  return IUP_DEFAULT;
+}
+
+static int action2_cb(Ihandle* ih)
+{
+  IupSetAttribute(IupGetDialog(ih), "BGCOLOR", "0 128 0");
+  return IUP_DEFAULT;
+}
+
+static int action3_cb(Ihandle* ih)
+{
+  printf("ACTION3\n");
+//  IupSetAttribute(IupGetChild(IupGetDialog(ih), 0), "BGCOLOR", "128 0 0");
+  return IUP_DEFAULT;
+}
+
+static Ihandle* set_callbacks(Ihandle* ih)
+{
+  IupSetCallback(ih, "VALUECHANGED_CB", (Icallback)valuechanged_cb);
+
+//  IupSetCallback(ih, "GETFOCUS_CB", (Icallback)getfocus_cb);
+//  IupSetCallback(ih, "KILLFOCUS_CB", (Icallback)killfocus_cb);
+
+//  IupSetCallback(ih, "ENTERWINDOW_CB", (Icallback)enterwindow_cb);
+//  IupSetCallback(ih, "LEAVEWINDOW_CB", (Icallback)leavewindow_cb);
+
+  IupSetCallback(ih, "K_ANY", (Icallback)k_any);
+//  IupSetCallback(ih, "HELP_CB", (Icallback)help_cb);
+
+  return ih;
+}
+
+int btn_big_button_cb(Ihandle *self, int button, int press)
+{
+  printf("BUTTON_CB(button=%c, press=%d)\n", button, press);
+  return IUP_DEFAULT;
+}
+
+static void globalkeypress_cb(int code, int pressed)
+{
+  printf("GLOBALKEYPRESS_CB(code=%s, pressed=%d)\n", iupKeyCodeToName(code), pressed);
+}
+
+static void globalmotion_cb(int x, int y, char* status)
+{
+  printf("GLOBALMOTION_CB(x=%d, y=%d, status=%s)\n", x, y, status);
+}
+
+static void globalbutton_cb(int button, int pressed, int x, int y, char* status)
+{
+  printf("GLOBALBUTTON_CB(button=%c, pressed=%d, x=%d, y=%d, status=%s)\n", (char)button, pressed, x, y, status);
+}
+
+static void globalwheel_cb(float delta,int x, int y, char* status)
+{
+  printf("GLOBALWHEEL_CB(delta=%g, x=%d, y=%d, status=%s)\n", delta, x, y, status);
+}
+
+int btn_image_button_cb( Ihandle *self,int b, int e )
+{
+  /* If the left button changed its state... */
+  if( b == IUP_BUTTON1 )
+  {
+    /* IUP handles */
+    Ihandle* text;
+    
+    /* Recovers "text" handle */
+    text = IupGetHandle( "text" );
+    
+    /* If the button was pressed... */
+    if(e == 1) 
+    {
+      /* Sets text's value */ 
+      IupSetAttribute( text, "VALUE", "Red button pressed" );
+    }
+    /* else the button was released */
+    else       
+    {
+      /* Sets text's value */ 
+      IupSetAttribute( text, "VALUE", "Red button released" );
+    }
+  }
+  
+  /* Executed function successfully */
+  return IUP_DEFAULT;
+}
+
+void SampleTest(void)
+{
+  Ihandle *mnu, *_hbox_1, *_cnv_1, *_vbox_1, *dlg, *img, 
+    *_frm_1, *_frm_2, *_frm_3, *_frm_4, *_frm_5, *pbar, *val, *tabs,
+    *_list_1, *_list_2, *_list_3, *_text_1, *_ml_1, *tree;
+
+  //img = IupImage(32,32, img_bits1);
+  //IupSetHandle ("img1", img); 
+  //IupSetAttribute (img, "0", "0 0 0"); 
+  //IupSetAttribute (img, "1", "BGCOLOR");
+  //IupSetAttribute (img, "2", "255 0 0");
+
+  img = load_image_Tecgraf();
+  IupSetHandle ("img1", img); 
+
+  img = IupImage(32,32, img_bits2);
+  IupSetHandle ("img2", img); 
+  IupSetAttribute (img, "0", "0 0 0"); 
+  IupSetAttribute (img, "1", "0 255 0");
+  IupSetAttribute (img, "2", "BGCOLOR");
+  IupSetAttribute (img, "3", "255 0 0");
+
+  mnu = IupMenu(
+    IupSubmenu("IupSubmenu 1", IupMenu(
+      IupSetAttributes(IupItem("IupItem 1 Checked", NULL), "VALUE=ON"),
+      IupSeparator(),
+
+      IupSetAttributes(IupItem("IupItem 2 Disabled", NULL), "VALUE=ON"),
+      NULL)),
+    IupItem("IupItem 3", NULL),
+    IupItem("IupItem 4", NULL), 
+    NULL);
+  IupSetHandle("mnu",mnu);
+
+  _frm_1 = IupFrame(
+    IupVbox(
+      set_callbacks(IupSetAttributes(IupButton("Button Text", NULL), "PADDING=5x5")), 
+      IupSetCallbacks(set_callbacks(IupSetAttributes(IupButton("Text", NULL), "IMAGE=img1, PADDING=5x5")),"ACTION", action1_cb, NULL), 
+      IupSetCallbacks(set_callbacks(IupSetAttributes(IupButton(NULL, NULL), "IMAGE=img1")),"ACTION", action2_cb, NULL),
+      IupSetCallbacks(set_callbacks(IupSetAttributes(IupButton("Text", NULL), "IMAGE=img1")),"BUTTON_CB", (Icallback)btn_big_button_cb, NULL),
+      IupSetCallbacks(set_callbacks(IupSetAttributes(IupButton("", NULL), "IMAGE=img1,IMPRESS=img2")),"ACTION", action3_cb, NULL), 
+      IupSetCallbacks(set_callbacks(IupSetAttributes(IupButton(NULL, NULL), "BGCOLOR=\"255 0 128\", SIZE=20x10")),"ACTION", action3_cb, NULL), 
+      NULL));
+  IupSetAttribute(_frm_1,"TITLE","IupButton");
+
+  _frm_2 = IupFrame(
+    IupVbox(
+      IupLabel("Label Text"), 
+      IupSetAttributes(IupLabel(NULL), "SEPARATOR=HORIZONTAL, MAXSIZE=150, NAME=SAMP_SEP"),
+      IupSetAttributes(IupLabel(NULL), "IMAGE=img1"),
+      NULL));
+  IupSetAttribute(_frm_2,"TITLE","IupLabel");
+
+  _frm_3 = IupFrame(
+    IupVbox(
+      set_callbacks(IupSetAttributes(IupToggle("Toggle Text", NULL), "VALUE=ON")),
+      set_callbacks(IupSetAttributes(IupToggle(NULL, NULL), "VALUE=ON,IMAGE=img1,IMPRESS=img2")),
+      set_callbacks(IupSetAttributes(IupToggle(NULL, NULL), "VALUE=ON,IMAGE=img1")),
+      IupSetAttributes(IupFrame(IupRadio(IupVbox(
+        set_callbacks(IupToggle("Toggle Text", NULL)), 
+        set_callbacks(IupToggle("Toggle Text", NULL)), 
+        NULL))), "TITLE=IupRadio"),
+      NULL));
+  IupSetAttribute(_frm_3,"TITLE","IupToggle");
+
+  _text_1 = IupText( NULL);
+  IupSetAttribute(_text_1,"VALUE","Single Line Text");
+  IupSetAttribute(_text_1,"SIZE","80x");
+
+  _ml_1 = IupMultiLine( NULL);
+  IupSetAttribute(_ml_1,"VALUE","Multiline Text\nSecond Line\nThird Line");
+  IupSetAttribute(_ml_1,"EXPAND","YES");
+  IupSetAttribute(_ml_1,"SIZE","80x40");
+
+  _frm_4 = IupFrame(IupVbox(
+    set_callbacks(_text_1),
+    set_callbacks(_ml_1),
+    NULL));
+  IupSetAttribute(_frm_4,"TITLE","IupText");
+
+  _list_1 = IupList( NULL);
+//  IupSetAttribute(_list_1,"EXPAND","YES");
+  IupSetAttribute(_list_1,"VALUE","1");
+  IupSetAttribute(_list_1,"1","Item 1 Text");
+  IupSetAttribute(_list_1,"2","Item 2 Text");
+  IupSetAttribute(_list_1,"3","Item 3 Text");
+  IupSetAttribute(_list_1,"TIP","List 1");
+
+  _list_2 = IupList( NULL);
+  IupSetAttribute(_list_2,"DROPDOWN","YES");
+//  IupSetAttribute(_list_2,"EXPAND","YES");
+  IupSetAttribute(_list_2,"VALUE","2");
+  IupSetAttribute(_list_2,"1","Item 1 Text");
+  IupSetAttribute(_list_2,"2","Item 2 Text");
+  IupSetAttribute(_list_2,"3","Item 3 Text");
+  IupSetAttribute(_list_2,"TIP","List 2");
+
+  _list_3 = IupList( NULL);
+  IupSetAttribute(_list_3,"EDITBOX","YES");
+//  IupSetAttribute(_list_3,"EXPAND","YES");
+  IupSetAttribute(_list_3,"VALUE","3");
+  IupSetAttribute(_list_3,"1","Item 1 Text");
+  IupSetAttribute(_list_3,"2","Item 2 Text");
+  IupSetAttribute(_list_3,"3","Item 3 Text");
+  IupSetAttribute(_list_3,"TIP","List 3");
+
+  _frm_5 =  IupFrame(IupVbox(
+      set_callbacks(_list_1),
+      set_callbacks(_list_2),
+      set_callbacks(_list_3),
+      NULL));
+  IupSetAttribute(_frm_5,"TITLE","IupList");
+
+  _hbox_1 = IupHbox(
+    _frm_1,
+    _frm_2,
+    _frm_3,
+    _frm_4,
+    _frm_5,
+    NULL);
+
+  val = IupVal(NULL);
+  set_callbacks(val);
+  
+  pbar = IupProgressBar();
+  IupSetAttribute(pbar, "VALUE", "0.5");
+  set_callbacks(pbar);
+
+  tabs = IupTabs(IupVbox(IupLabel(""), NULL), IupVbox(IupFill(), NULL), IupVbox(IupFill(), NULL), NULL);
+  IupSetAttribute(tabs,"TABTITLE0","Tab Title 0");
+  IupSetAttribute(tabs,"TABTITLE1","Tab Title 1");
+  IupSetAttributeHandle(tabs,"TABIMAGE1", load_image_LogoTecgraf());
+  IupSetAttribute(tabs,"TABTITLE2","Tab Title 2");
+  IupSetAttribute(tabs,"RASTERSIZE","300x50");
+//  IupSetAttribute(tabs,"TABPADDING","5x5");
+  set_callbacks(tabs);
+
+  tree = IupTree();
+  IupSetAttribute(tree, "SHOWRENAME",   "YES");
+  IupSetAttribute(tree,"RASTERSIZE","100x150");
+  set_callbacks(tree);
+
+  _cnv_1 = IupCanvas(NULL);
+  IupSetAttribute(_cnv_1,"BGCOLOR","128 255 0");
+  IupSetAttribute(_cnv_1,"SCROLLBAR","YES");
+  IupSetAttribute(_cnv_1,"EXPAND","HORIZONTAL");
+  IupSetAttribute(_cnv_1,"RASTERSIZE","x100");
+//  IupSetAttribute(_cnv_1,"CANFOCUS","NO");
+  set_callbacks(_cnv_1);
+
+  _vbox_1 = IupVbox(
+    _hbox_1,
+    IupHbox(IupSetAttributes(IupFrame(IupHbox(val, NULL)), "TITLE=IupVal"),
+            IupSetAttributes(IupFrame(IupHbox(pbar, NULL)), "TITLE=IupProgressBar"),
+            IupSetAttributes(IupFrame(IupHbox(tabs, NULL)), "TITLE=IupTabs"),
+            NULL),
+    IupHbox(IupSetAttributes(IupFrame(IupHbox(_cnv_1, NULL)), "TITLE=IupCanvas"),
+            IupSetAttributes(IupFrame(IupHbox(tree, NULL)), "TITLE=IupTree"),
+            NULL),
+    NULL);
+  IupSetAttribute(_vbox_1,"MARGIN","5x5");
+  IupSetAttribute(_vbox_1,"GAP","5");
+
+  dlg = IupDialog(_vbox_1);
+  IupSetHandle("dlg",dlg);
+  IupSetAttribute(dlg,"MENU","mnu");
+  IupSetAttribute(dlg,"TITLE","Iup Sample Dialog Title");
+//  IupSetAttribute(dlg,"COMPOSITED","YES");   /* Windows Only */
+//  IupSetAttribute(dlg, "OPACITY", "192");
+
+//  IupSetAttribute(dlg, "BGCOLOR", "173 177 194");  // Motif BGCOLOR for documentation
+//  IupSetAttribute(_vbox_1, "BGCOLOR", "92 92 255");
+//  IupSetAttribute(dlg, "BGCOLOR", "92 92 255");
+//  IupSetAttribute(dlg, "BACKGROUND", "200 10 80");
+
+  //IupSetGlobal("DLGBGCOLOR", "92 92 255");
+  //IupSetGlobal("TXTFGCOLOR", "255 92 92");
+  //IupSetGlobal("TXTBGCOLOR", "92 92 255");
+
+//  IupSetAttribute(dlg, "FONT", "Helvetica, 24");
+//  IupSetAttribute(dlg, "FONT", "-*-helvetica-*-r-*-*-18-*-*-*-*-*-*-*");
+  
+//  IupSetAttribute(box, "FGCOLOR", "255 0 0");
+
+//  IupSetAttribute(dlg,"RASTERSIZE","1000x800");
+
+  IupSetCallback(dlg, "COPYDATA_CB", (Icallback)copydata_cb);
+
+  //IupSetGlobal("INPUTCALLBACKS", "Yes");
+  //IupSetFunction("GLOBALKEYPRESS_CB", (Icallback)globalkeypress_cb);
+  //IupSetFunction("GLOBALMOTION_CB", (Icallback)globalmotion_cb);
+  IupSetFunction("GLOBALBUTTON_CB", (Icallback)globalbutton_cb);
+  //IupSetFunction("GLOBALWHEEL_CB", (Icallback)globalwheel_cb);
+
+  IupMap(dlg);
+
+  IupSetAttribute(tree, "TITLE0",         "Figures");  
+  IupSetAttribute(tree, "ADDLEAF0",      "Other");     /* new id=1 */
+  IupSetAttribute(tree, "ADDBRANCH1",   "triangle");  /* new id=2 */     
+  IupSetAttribute(tree, "ADDLEAF2",     "equilateral");  /* ... */
+  IupSetAttribute(tree, "ADDLEAF3",     "isoceles");
+  IupSetAttribute(tree, "ADDLEAF4",     "scalenus");
+
+  IupShow(dlg);
+
+//  IupSetAttribute(dlg,"RASTERSIZE", NULL);
+}
+
+static int dropcheck_cb(Ihandle *self, int lin, int col)
+{
+  if (lin == 3 && col == 1)
+    return IUP_DEFAULT;
+  if (lin == 4 && col == 4)
+    return IUP_CONTINUE;
+  return IUP_IGNORE;
+}
+
+static Ihandle* create_matrix(void)
+{
+  Ihandle *img;
+  
+  Ihandle* mat = IupMatrix(NULL);
+
+  img = IupImage(32,32, img_bits2);
+  IupSetHandle ("img2", img);
+  
+  IupSetAttribute(mat, "NUMLIN", "20");
+  IupSetAttribute(mat, "NUMCOL", "8");
+  
+  IupSetAttribute(mat, "1:1", "5.6\n3.33");
+  IupSetAttribute(mat, "2:1", "2.2");
+  IupSetAttribute(mat, "3:2", "Very Very Very Very Very Large Text");
+  IupSetAttribute(mat, "1:2", "4.5");
+  if (IupGetInt(NULL, "UTF8MODE"))
+    IupSetAttribute(mat, "2:2", "(çãõáóé)");
+  else
+    IupSetAttribute(mat, "2:2", "(çãõáóé)");
+  IupSetAttribute(mat, "3:1", "3.4");
+  IupSetAttribute(mat, "3:3", "Font Test");
+  IupSetAttribute(mat,"SORTSIGN2","DOWN");
+  IupSetAttribute(mat,"RESIZEMATRIX", "YES");
+  IupSetAttribute(mat, "FONT3:3", "Helvetica, 24");
+  IupSetAttribute(mat, "MASK*:3", "[a-zA-Z][0-9a-zA-Z_]*");
+
+  IupSetAttribute(mat, "TYPE4:1", "COLOR");
+  IupSetAttribute(mat, "4:1", "255 0 128");
+
+  IupSetAttribute(mat, "TYPE4:2", "FILL");
+  IupSetAttribute(mat, "4:2", "60");
+  IupSetAttribute(mat, "SHOWFILLVALUE", "Yes");
+
+  {
+    Ihandle* image = IupImageRGBA(TEST_IMAGE_SIZE, TEST_IMAGE_SIZE, image_data_32 );
+    IupSetAttribute(mat, "TYPE4:3", "IMAGE");
+    IupSetAttributeHandle(mat, "4:3", image);
+  }
+  IupSetAttribute(mat, "TOGGLECENTERED", "Yes");
+
+  IupSetAttribute(mat,"MARKMODE","CELL");
+  IupSetAttribute(mat,"MARKMULTIPLE","YES");
+  IupSetAttribute(mat,"FRAMEVERTCOLOR1:2","BGCOLOR");
+  IupSetAttribute(mat,"FRAMEHORIZCOLOR1:2","0 0 255");
+  IupSetAttribute(mat,"FRAMEHORIZCOLOR1:3","0 255 0");
+  IupSetAttribute(mat,"FRAMEVERTCOLOR2:2","255 255 0");
+  IupSetAttribute(mat,"FRAMEVERTCOLOR*:4","0 255 0");
+  IupSetAttribute(mat,"FRAMEVERTCOLOR*:5","BGCOLOR");
+  IupSetAttribute(mat, "20:8", "The End");
+  IupSetAttribute(mat, "NUMCOL_VISIBLE", "3");
+  IupSetAttribute(mat, "NUMLIN_VISIBLE", "5");
+  IupSetAttribute(mat, "FRAMEBORDER", "Yes");
+  IupSetCallback(mat, "DROPCHECK_CB", (Icallback)dropcheck_cb);
+  IupSetCallback(mat,"DROP_CB",(Icallback)drop);
+  IupSetCallback(mat,"TOGGLEVALUE_CB",(Icallback)togglevalue_cb);
+  return mat;
+}
+
+  
+void MatrixTest(void)
+{
+  Ihandle* dlg, *box, *mat;
+
+  box = IupVbox(mat = create_matrix(), NULL);
+  IupSetAttribute(box, "MARGIN", "10x10");
+//  IupSetAttribute(box, "FONT", "Arial, 7");
+
+  dlg = IupDialog(box);
+  IupSetAttribute(dlg, "TITLE", "IupMatrix Simple Test");
+  IupShowXY(dlg, IUP_CENTER, IUP_CENTER);
+
+}
+
+#ifndef BIG_TEST
+int main(int argc, char* argv[])
+{
+  IupOpen(&argc, &argv);
+
+  IupSetGlobal("SINGLEINSTANCE", "Iup Sample");  /* must partially match dialog title so COPYDATA_CB can work */
+  if (!IupGetGlobal("SINGLEINSTANCE"))
+  {
+    IupClose();  
+    return EXIT_SUCCESS;
+  }
+
+  SampleTest();
+
+  MatrixTest();
+
+  IupMainLoop();
+
+  IupClose();
+
+  return EXIT_SUCCESS;
+}
+#endif

ADDED   iup-test/sample.scm
Index: iup-test/sample.scm
==================================================================
--- /dev/null
+++ iup-test/sample.scm
@@ -0,0 +1,9 @@
+(use iup)
+
+(show (dialog (vbox (button "PUSHME"
+                            button-cb: (lambda (obj . param)
+                                        (print "obj: " obj " param: " param))
+                            action: (lambda (obj)
+                                      (print "obj: " obj))))))
+
+(main-loop)

DELETED iupexamples/graph.scm
Index: iupexamples/graph.scm
==================================================================
--- iupexamples/graph.scm
+++ /dev/null
@@ -1,62 +0,0 @@
-(use iup)
-(import iup-pplot)
-
- 
-
-(define (tl)
-  (let* ((lastx 0)
-	 (lastsample 2)
-	 (plt (pplot 
-	       #:title "MyTitle"
-	       #:marginbottom "65"
-	       #:marginleft   "65"
-	       #:axs_xlabel   "Score" 
-	       #:axs_ylabel "Count"
-	       #:legendshow "YES"
-	       ;; #:axs_xmin    "0"
-	       ;; #:axs_ymin    "0"
-	       #:axs_yautomin "YES"
-	       #:axs_xautomin "YES"
-	       #:axs_xautotick "YES"
-	       #:axs_yautotick "YES"
-	       #:ds_showvalues "YES"
-	       #:size "200x200"
-	       ))
-	 (plt1  (call-with-pplot 
-		 plt
-		 (lambda (x)
-		   (pplot-add! plt 10 100)
-		   (pplot-add! plt 20 120)
-		   (pplot-add! plt 30 200))
-		 #:x-string #f
-		 ))
-	 (plt2  (call-with-pplot 
-		 plt
-		 (lambda (x)
-		   (pplot-add! plt 10 180)
-		   (pplot-add! plt 20 125)
-		   (pplot-add! plt 30 100))
-		 #:x-string #f
-		 ))
-	 (dlg (dialog
-	       (vbox
-		plt
-		(hbox
-		;;  (button "Redraw" size: "50x" action: (lambda (obj)
-		;; 					(redraw plt)))
-		 (button "Quit"   size: "50x" action: (lambda (obj)
-							(exit)))
-		 (button "AddPoint" size: "50x" action: (lambda (obj)
-							  (set! lastx (+ lastx 10))
-							  (set! lastsample (+ lastsample 1))
-							  ;; (attribute-set! plt 'current 0)
-							  (print "lastx: " lastx " lastsample: " lastsample)
-							  (pplot-add! plt lastx (random 300) lastsample 1)
-							  (attribute-set! plt "REDRAW" "1"))))))))
-    (set! lastx 30)
-    (attribute-set! plt 'ds_mode "LINE")
-    ;; (attribute-set! plt 'ds_legend "Yada")
-    (show dlg)
-    (main-loop)))
-
-(tl)

DELETED iupexamples/iupwidgetinfo.scm
Index: iupexamples/iupwidgetinfo.scm
==================================================================
--- iupexamples/iupwidgetinfo.scm
+++ /dev/null
@@ -1,191 +0,0 @@
-#! /usr/bin/env csi
-
-(require-library srfi-4 iup)
-(import srfi-4 iup iup-pplot iup-glcanvas)
-
-(define (popup dlg . args)
-  (apply show dlg #:modal? 'yes args)
-  (destroy! dlg))
-
-(define (properties ih)
-  (popup (element-properties-dialog ih))
-  'default)
-
-(define dlg
-  (dialog
-    (vbox
-      (hbox ; headline
-        (fill)
-        (frame (label " Inspect control and dialog classes "
-                      fontsize: 15))
-        (fill)
-        margin: '0x0)
-
-      (label "") 
-      (label "Dialogs" fontsize: 12)
-      (hbox
-        (button "dialog"
-                action: (lambda (self) (properties (dialog (vbox)))))
-        (button "color-dialog"
-                action: (lambda (self) (properties (color-dialog))))
-        (button "file-dialog"
-                action: (lambda (self) (properties (file-dialog))))
-        (button "font-dialog"
-                action: (lambda (self) (properties (font-dialog))))
-        (button "message-dialog"
-                action: (lambda (self) (properties (message-dialog))))
-        (fill)
-        margin: '0x0)
-      (hbox
-        (button "layout-dialog"
-                action: (lambda (self) (properties (layout-dialog))))
-        (button "element-properties-dialog"
-                action: (lambda (self)
-                          (properties
-                            (element-properties-dialog (create 'user)))))
-        (fill)
-        margin: '0x0)
-
-      (label "") 
-      (label "Composition widgets" fontsize: 12)
-      (hbox
-        (button "fill"
-                action: (lambda (self) (properties (fill))))
-        (button "hbox"
-                action: (lambda (self) (properties (hbox))))
-        (button "vbox"
-                action: (lambda (self) (properties (vbox))))
-        (button "zbox"
-                action: (lambda (self) (properties (zbox))))
-        (button "radio"
-                action: (lambda (self) (properties (radio (vbox)))))
-        (button "normalizer"
-                action: (lambda (self) (properties (normalizer))))
-        (button "cbox"
-                action: (lambda (self) (properties (cbox))))
-        (button "sbox"
-                action: (lambda (self) (properties (sbox (vbox)))))
-        (button "split"
-                action: (lambda (self) (properties (split (vbox) (vbox)))))
-        (fill)
-        margin: '0x0)
-
-      (label "") 
-      (label "Standard widgets" fontsize: 12)
-      (hbox
-        (button "button"
-                action: (lambda (self) (properties (button))))
-        (button "canvas"
-                action: (lambda (self) (properties (canvas))))
-        (button "frame"
-                action: (lambda (self) (properties (frame))))
-        (button "label"
-                action: (lambda (self) (properties (label))))
-        (button "listbox"
-                action: (lambda (self) (properties (listbox))))
-        (button "progress-bar"
-                action: (lambda (self) (properties (progress-bar))))
-        (button "spin"
-                action: (lambda (self) (properties (spin))))
-        (fill)
-        margin: '0x0)
-      (hbox
-        (button "tabs"
-                action: (lambda (self) (properties (tabs))))
-        (button "textbox"
-                action: (lambda (self) (properties (textbox))))
-        (button "toggle"
-                action: (lambda (self) (properties (toggle))))
-        (button "treebox"
-                action: (lambda (self) (properties (treebox))))
-        (button "valuator"
-                action: (lambda (self) (properties (valuator ""))))
-        (fill)
-        margin: '0x0)
-
-      (label "") 
-      (label "Additional widgets" fontsize: 12)
-      (hbox
-        (button "cells"
-                action: (lambda (self) (properties (cells))))
-        (button "color-bar"
-                action: (lambda (self) (properties (color-bar))))
-        (button "color-browser"
-                action: (lambda (self) (properties (color-browser))))
-        (button "dial"
-                action: (lambda (self) (properties (dial ""))))
-        (button "matrix"
-                action: (lambda (self) (properties (matrix))))
-        (fill)
-        margin: '0x0)
-      (hbox
-        (button "pplot"
-                action: (lambda (self) (properties (pplot))))
-        (button "glcanvas"
-                action: (lambda (self) (properties (glcanvas))))
-        (button "web-browser"
-                action: (lambda (self) (properties (web-browser))))
-        (fill)
-        margin: '0x0)
-
-      (label "") 
-      (label "Menu widgets" fontsize: 12)
-      (hbox
-        (button "menu"
-                action: (lambda (self) (properties (menu))))
-        (button "menu-item"
-                action: (lambda (self) (properties (menu-item))))
-        (button "menu-separator"
-                action: (lambda (self) (properties (menu-separator))))
-        (fill)
-        margin: '0x0)
-
-      (label "") 
-      (label "Images" fontsize: 12)
-      (hbox
-        (button "image/palette"
-                action: (lambda (self)
-                          (properties
-                            (image/palette 1 1 (u8vector->blob (u8vector 0))))))
-        (button "image/rgb"
-                action: (lambda (self)
-                          (properties
-                            (image/rgb 1 1 (u8vector->blob (u8vector 0))))))
-        (button "image/rgba"
-                action: (lambda (self)
-                          (properties
-                            (image/rgba 1 1 (u8vector->blob (u8vector 0))))))
-        (button "image/file"
-                action: (lambda (self)
-                          (properties
-                            ;; same attributes as image/palette
-                            (image/palette 1 1 (u8vector->blob (u8vector 0))))))
-                            ;; needs a file in current directory
-                            ;(image/file "chicken.ico")))) ; ok
-                            ;(image/file "chicken.png")))) ; doesn't work
-        (fill)
-        margin: '0x0)
-
-      (label "") 
-      (label "Other widgets" fontsize: 12)
-      (hbox
-        (button "clipboard"
-                action: (lambda (self) (properties (clipboard))))
-        (button "timer"
-                action: (lambda (self) (properties (timer))))
-        (button "spinbox"
-                action: (lambda (self) (properties (spinbox (vbox)))))
-        (fill)
-        margin: '0x0)
-
-      (fill)
-      (button "E&xit"
-              expand: 'horizontal
-              action: (lambda (self) 'close))
-      )
-    margin: '15x15
-    title: "Iup inspector"))
-
-(show dlg)
-(main-loop)
-(exit 0)

DELETED iupexamples/tree.scm
Index: iupexamples/tree.scm
==================================================================
--- iupexamples/tree.scm
+++ /dev/null
@@ -1,145 +0,0 @@
-
-(use test)
-(require-library iup)
-(import (prefix iup iup:))
-
-(define t #f) 
-
-(define tree-dialog
-  (iup:dialog
-   #:title "Tree Test"
-   (let ((t1 (iup:treebox
-	      #:selection_cb (lambda (obj id state)
-			       (print "selection_db with id=" id " state=" state)
-			       (print "USERDATA: " (iup:attribute obj "USERDATA"))
-			       (print "SPECIALDATA: " (iup:attribute obj "SPECIALDATA"))
-			       (print "Depth: " (iup:attribute obj "DEPTH"))
-			       ))))
-     (set! t t1)
-     t1)))
-
-(iup:show tree-dialog)
-
-(map (lambda (elname el)
-       (print "Adding " elname " with value " el)
-       (iup:attribute-set! t elname el)
-       (iup:attribute-set! t "USERDATA" el))
-     '("VALUE" "NAME"    "ADDLEAF" "ADDBRANCH1" "ADDLEAF2"    "VALUE")
-     '("0"     "Figures" "Other"   "triangle"   "equilateral" "4")
-     )
-(map (lambda (attr)
-       (print attr " is " (iup:attribute t attr)))
-     '("KIND1" "PARENT2" "STATE1"))
-
-(define (tree-find-node obj path)
-  ;; start at the base of the tree
-  (if (null? path)
-      #f ;; or 0 ????
-      (let loop ((hed      (car path))
-		 (tal      (cdr path))
-		 (depth    0)
-		 (nodenum  0))
-	;; nodes in iup tree are 100% sequential so iterate over nodenum
-	(if (iup:attribute obj (conc "DEPTH" nodenum)) ;; end when no more nodes
-	    (let ((node-depth (string->number (iup:attribute obj (conc "DEPTH" nodenum))))
-		  (node-title (iup:attribute obj (conc "TITLE" nodenum))))
-	      ;; (print 0 "hed: " hed ", depth: " depth ", node-depth: " node-depth ", nodenum: " nodenum ", node-title: " node-title)
-	      (if (and (equal? depth node-depth)
-		       (equal? hed   node-title)) ;; yep, this is the one!
-		  (if (null? tal) ;; end of the line
-		      nodenum
-		      (loop (car tal)(cdr tal)(+ depth 1)(+ 1 nodenum)))
-		  ;; this is the case where we found part of the hierarchy but not 
-		  ;; all of it, i.e. the node-depth went from deep to less deep
-		  (if (> depth node-depth) ;; (+ 1 node-depth))
-		      #f
-		      (loop hed tal depth (+ nodenum 1)))))
-	    #f))))
-
-;; top is the top node name zeroeth node VALUE=0
-(define (tree-add-node obj top nodelst)
-  (if (not (iup:attribute obj "TITLE0"))
-      (iup:attribute-set! obj "ADDBRANCH0" top))
-  (cond
-   ((not (string=? top (iup:attribute obj "TITLE0")))
-    (print "ERROR: top name " top " doesn't match " (iup:attribute obj "TITLE0")))
-   ((null? nodelst))
-   (else
-    (let loop ((hed      (car nodelst))
-	       (tal      (cdr nodelst))
-	       (depth    1)
-	       (pathl    (list top)))
-      ;; Because the tree dialog changes node numbers when
-      ;; nodes are added or removed we must look up nodes
-      ;; each and every time. 0 is the top node so default
-      ;; to that.
-      (let* ((newpath    (append pathl (list hed)))
-	       (parentnode (tree-find-node obj pathl))
-	       (nodenum    (tree-find-node obj newpath)))
-	  ;; (print "newpath: " newpath ", nodenum " nodenum ", hed: " hed ", depth: " depth ", parentnode: " parentnode ", pathl: " pathl)
-	  ;; Add the branch under lastnode if not found
-	  (if (not nodenum)
-	      (begin
-		(iup:attribute-set! obj (conc "ADDBRANCH" parentnode) hed)
-		(if (null? tal)
-		    #t
-		    ;; reset to top
-		    (loop (car nodelst)(cdr nodelst) 1 (list top)))) 
-	      (if (null? tal) ;; if null here then this path has already been added
-		  #t
-		  ;; (if nodenum
-		  (loop (car tal)(cdr tal)(+ depth 1) newpath)))))))) ;;  (if nodenum nodenum lastnode)))))))
-	      ;; 	  (loop hed tal depth pathl lastnode)))))))
-
-(define (tree-node->path obj nodenum)
-  ;; (print "\ncurrnode  nodenum  depth  node-depth  node-title   path")
-  (let loop ((currnode 0)
-	     (depth    0)
-	     (path     '()))
-    (let ((node-depth (iup:attribute obj (conc "DEPTH" currnode)))
-	  (node-title (iup:attribute obj (conc "TITLE" currnode))))
-      ;; (display (conc "\n   "currnode "        " nodenum "       " depth "         " node-depth "          " node-title "         " path))
-      (if (> currnode nodenum)
-	  path
-	  (if (not node-depth) ;; #f if we are out of nodes
-	      '()
-	      (let ((ndepth (string->number node-depth)))
-		(if (eq? ndepth depth)
-		    ;; This next is the match condition depth == node-depth
-		    (if (eq? currnode nodenum)
-			(begin
-			  ;; (display " ")
-			  (append path (list node-title)))
-			(loop (+ currnode 1)
-			      (+ depth 1)
-			      (append path (list node-title))))
-		    ;; didn't match, reset to base path and keep looking
-		    ;; due to more iup odditys we don't reset to base
-		    (begin 
-		      ;; (display " ")
-		      (loop (+ 1 currnode)
-			    2
-			    (append (take path ndepth)(list node-title)))))))))))
-
-(test #f 0  (tree-find-node t '("Figures")))
-(test #f 1  (tree-find-node t '("Figures" "Other")))
-(test #f #f (tree-find-node t '("Figures" "Other"    "equilateral")))
-(test #f 3  (tree-find-node t '("Figures" "triangle" "equilateral")))
-(test #f #t (tree-add-node  t "Figures" '()))
-(test #f #t (tree-add-node  t "Figures" '("a" "b" "c")))
-(test #f 3  (tree-find-node t '("Figures" "a" "b" "c")))
-(test #f #t (tree-add-node  t "Figures" '("d" "b" "c")))
-(test #f 3  (tree-find-node t '("Figures" "d" "b" "c")))
-(test #f 6  (tree-find-node t '("Figures" "a" "b" "c")))
-(test #f #t (tree-add-node  t "Figures" '("a" "e" "c")))
-(test #f 6  (tree-find-node t '("Figures" "a" "e" "c")))
-
-(test #f '("Figures")             (tree-node->path t 0))
-(test #f '("Figures" "d")         (tree-node->path t 1))
-(test #f '("Figures" "d" "b" "c") (tree-node->path t 3))
-(test #f '("Figures" "a")         (tree-node->path t 4))
-(test #f '("Figures" "a" "b" "c")     (tree-node->path t 8)) 
-(test #f '()                      (tree-node->path t 40))
-
-(iup:main-loop)
-

ADDED   js-path.scm
Index: js-path.scm
==================================================================
--- /dev/null
+++ js-path.scm
@@ -0,0 +1,18 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
+(define *java-script-lib* (conc  (common:get-install-area) "/share/js/jquery-3.1.0.slim.min.js")) 

Index: key_records.scm
==================================================================
--- key_records.scm
+++ key_records.scm
@@ -1,22 +1,31 @@
 ;;======================================================================
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;;======================================================================
 
 (define-inline (keys->valslots keys) ;; => ?,?,? ....
   (string-intersperse (map (lambda (x) "?") keys) ","))
 
-(define-inline (keys->key/field keys . additional)
-  (string-join (map (lambda (k)(conc k " TEXT"))
-		    (append keys additional)) ","))
+;; (define-inline (keys->key/field keys . additional)
+;;   (string-join (map (lambda (k)(conc k " TEXT"))
+;; 		    (append keys additional)) ","))
 
 (define-inline (item-list->path itemdat)
   (if (list? itemdat)
       (string-intersperse  (map cadr itemdat) "/")
       ""))

Index: keys.scm
==================================================================
--- keys.scm
+++ keys.scm
@@ -1,14 +1,23 @@
 
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
  
 ;;======================================================================
 ;; Run keys, these are used to hierarchially organise tests and run areas
 ;;======================================================================
 
@@ -64,9 +73,13 @@
 
 ;;======================================================================
 ;; config file related routines
 ;;======================================================================
 
-(define (keys:config-get-fields confdat)
-  (let ((fields (hash-table-ref/default confdat "fields" '())))
-    (map car fields)))
+(define keys:config-get-fields common:get-fields)
+(define (keys:make-key/field-string confdat)
+  (let ((fields (configf:get-section confdat "fields")))
+    (string-join
+     (map (lambda (field)(conc (car field) " " (cadr field)))
+	  fields)
+     ",")))
 

Index: launch.scm
==================================================================
--- launch.scm
+++ launch.scm
@@ -1,14 +1,22 @@
 
 ;; Copyright 2006-2017, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 ;;======================================================================
 ;; launch a task - this runs on the originating host, tests themselves
 ;;
 ;;======================================================================
@@ -18,16 +26,14 @@
 
 (import (prefix base64 base64:))
 (import (prefix sqlite3 sqlite3:))
 
 (declare (unit launch))
+(declare (uses subrun))
 (declare (uses common))
 (declare (uses configf))
 (declare (uses db))
-;; (declare (uses sdb))
-(declare (uses tdb))
-;; (declare (uses filedb))
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 
@@ -61,11 +67,11 @@
 ;; return (conc status ": " comment) from the final section so that
 ;;   the comment can be set in the step record in launch.scm
 ;;
 (define (launch:load-logpro-dat run-id test-id stepname)
   (let ((cname (conc stepname ".dat")))
-    (if (file-exists? cname)
+    (if (common:file-exists? cname)
 	(let* ((dat  (read-config cname #f #f))
 	       (csvr (db:logpro-dat->csv dat stepname))
 	       (csvt (let-values (((fmt-cell fmt-record fmt-csv) (make-format ",")))
 		       (fmt-csv (map list->csv-record csvr))))
 	       (status (configf:lookup dat "final" "exit-status"))
@@ -82,20 +88,31 @@
 	#f)))
 
 (define (launch:runstep ezstep run-id test-id exit-info m tal testconfig)
   (let* ((stepname       (car ezstep))  ;; do stuff to run the step
 	 (stepinfo       (cadr ezstep))
-	 (stepparts      (string-match (regexp "^(\\{([^\\}]*)\\}\\s*|)(.*)$") stepinfo))
-	 (stepparms      (list-ref stepparts 2)) ;; for future use, {VAR=1,2,3}, run step for each 
+	;; (let ((info (cadr ezstep)))
+	;; 		   (if (proc? info) "" info)))
+	;; (stepproc       (let ((info (cadr ezstep)))
+	;; 		   (if (proc? info) info #f)))
+	 (stepparts      (string-match (regexp "^(\\{([^\\}\\{]*)\\}\\s*|)(.*)$") stepinfo))
+	 (stepparams     (list-ref stepparts 2)) ;; for future use, {VAR=1,2,3}, run step for each
+	 (paramparts     (if (string? stepparams)
+			     (map (lambda (x)(string-split x "=")) (string-split-fields "[^;]*=[^;]*" stepparams))
+			     '()))
+	 (subrun         (alist-ref "subrun" paramparts equal?))
 	 (stepcmd        (list-ref stepparts 3))
 	 (script         "") ; "#!/bin/bash\n") ;; yep, we depend on bin/bash FIXME!!!\
 	 (logpro-file    (conc stepname ".logpro"))
 	 (html-file      (conc stepname ".html"))
 	 (dat-file       (conc stepname ".dat"))
 	 (tconfig-logpro (configf:lookup testconfig "logpro" stepname))
-	 (logpro-used    (file-exists? logpro-file)))
+	 (logpro-used    (common:file-exists? logpro-file)))
 
+    (debug:print 0 *default-log-port* "stepparts: " stepparts ", stepparams: " stepparams
+                 ", paramparts: " paramparts ", subrun: " subrun ", stepcmd: " stepcmd)
+    
     (if (and tconfig-logpro
 	     (not logpro-used)) ;; no logpro file found but have a defn in the testconfig
 	(begin
 	  (with-output-to-file logpro-file
 	    (lambda ()
@@ -104,16 +121,16 @@
 	      (print tconfig-logpro)))
 	  (set! logpro-used #t)))
     
     ;; NB// can safely assume we are in test-area directory
     (debug:print 4 *default-log-port* "ezsteps:\n stepname: " stepname " stepinfo: " stepinfo " stepparts: " stepparts
-		 " stepparms: " stepparms " stepcmd: " stepcmd)
+		 " stepparams: " stepparams " stepcmd: " stepcmd)
     
     ;; ;; first source the previous environment
     ;; (let ((prev-env (conc ".ezsteps/" prevstep (if (string-search (regexp "csh") 
     ;;      							 (get-environment-variable "SHELL")) ".csh" ".sh"))))
-    ;;   (if (and prevstep (file-exists? prev-env))
+    ;;   (if (and prevstep (common:file-exists? prev-env))
     ;;       (set! script (conc script "source " prev-env))))
     
     ;; call the command using mt_ezstep
     ;; (set! script (conc "mt_ezstep " stepname " " (if prevstep prevstep "x") " " stepcmd))
     
@@ -122,17 +139,24 @@
     ;; now launch the actual process
     (call-with-environment-variables 
      (list (cons "PATH" (conc (get-environment-variable "PATH") ":.")))
      (lambda () ;; (process-run "/bin/bash" "-c" "exec ls -l /tmp/foobar > /tmp/delme-more.log 2>&1")
        (let* ((cmd (conc stepcmd " > " stepname ".log 2>&1")) ;; >outfile 2>&1 
-	      (pid (process-run "/bin/bash" (list "-c" cmd))))
-
+	      (pid #f))
+	 (let ((proc (lambda ()
+		       (set! pid (process-run "/bin/bash" (list "-c" cmd))))))
+	   (if subrun
+               (begin
+                 (debug:print-info 0 *default-log-port* "Running without MT_.* environment variables.")
+                 (common:without-vars proc "^MT_.*"))
+	       (proc)))
+	 
          (with-output-to-file "Makefile.ezsteps"
            (lambda ()
              (print stepname ".log :")
              (print "\t" cmd)
-             (if (file-exists? (conc stepname ".logpro"))
+             (if (common:file-exists? (conc stepname ".logpro"))
                  (print "\tlogpro " stepname ".logpro " stepname ".html < " stepname ".log"))
              (print)
              (print stepname " : " stepname ".log")
              (print))
            #:append)
@@ -151,11 +175,12 @@
 			     (processloop (+ i 1))))
 		       )))))
     (debug:print-info 0 *default-log-port* "step " stepname " completed with exit code " (launch:einf-exit-code exit-info)) ;; (vector-ref exit-info 2))
     ;; now run logpro if needed
     (if logpro-used
-	(let ((pid (process-run (conc "logpro " logpro-file " " (conc stepname ".html") " < " stepname ".log"))))
+	(let* ((logpro-exe (or (getenv "LOGPRO_EXE") "logpro"))
+               (pid        (process-run (conc "/bin/sh -c '"logpro-exe" "logpro-file " " (conc stepname ".html") " < " stepname ".log > /dev/null'"))))
 	  (let processloop ((i 0))
 	    (let-values (((pid-val exit-status exit-code)(process-wait pid #t)))
 			(mutex-lock! m)
 			;; (make-launch:einf pid: pid exit-status: exit-status exit-code: exit-code)
 			(launch:einf-pid-set!         exit-info pid)         ;; (vector-set! exit-info 0 pid)
@@ -172,11 +197,11 @@
 	  (logfna (if logpro-used (conc stepname ".html") ""))
 	  (comment #f))
       (if logpro-used
 	  (let ((datfile (conc stepname ".dat")))
 	    ;; load the .dat file into the test_data table if it exists
-	    (if (file-exists? datfile)
+	    (if (common:file-exists? datfile)
 		(set! comment (launch:load-logpro-dat run-id test-id stepname)))
 	    (rmt:test-set-log! run-id test-id (conc stepname ".html"))))
       (rmt:teststep-set-status! run-id test-id stepname "end" exinfo comment logfna))
     ;; set the test final status
     (let* ((process-exit-status (launch:einf-exit-code exit-info)) ;; (vector-ref exit-info 2))
@@ -243,11 +268,11 @@
 	 (launch:einf-rollup-status-set! exit-info 1) ;; (vector-set! exit-info 3 1) ;; force fail, this used to be next-state but that doesn't make sense. should always be "COMPLETED" 
 	 (tests:test-set-status! run-id test-id "COMPLETED" "FAIL" (conc "Failed at step " stepname) #f)
 	 )))
     logpro-used))
 
-(define (launch:manage-steps run-id test-id item-path fullrunscript ezsteps test-name tconfigreg exit-info m)
+(define (launch:manage-steps run-id test-id item-path fullrunscript ezsteps subrun test-name tconfigreg exit-info m)
   ;; (let-values
   ;;  (((pid exit-status exit-code)
   ;;    (run-n-wait fullrunscript)))
   ;; (tests:test-set-status! test-id "RUNNING" "n/a" #f #f)
   ;; Since we should have a clean slate at this time there is no need to do 
@@ -277,12 +302,13 @@
 		 (thread-sleep! 2)
 		 (loop (+ i 1)))
 	       )))))
   ;; then, if runscript ran ok (or did not get called)
   ;; do all the ezsteps (if any)
-  (if ezsteps
-      (let* ((testconfig ;; (read-config (conc work-area "/testconfig") #f #t environ-patt: "pre-launch-env-vars")) ;; FIXME??? is allow-system ok here?
+  (if (or ezsteps subrun)
+      (let* ((test-run-dir (tests:get-test-path-from-environment))
+             (testconfig ;; (read-config (conc work-area "/testconfig") #f #t environ-patt: "pre-launch-env-vars")) ;; FIXME??? is allow-system ok here?
 	      ;; NOTE: it is tempting to turn off force-create of testconfig but dynamic
 	      ;;       ezstep names need a full re-eval here.
 	      (tests:get-testconfig test-name item-path tconfigreg #t force-create: #t)) ;; 'return-procs)))
 	     (ezstepslst (if (hash-table? testconfig)
 			     (hash-table-ref/default testconfig "ezsteps" '())
@@ -296,32 +322,55 @@
 	;; after all that, still no testconfig? Time to abort
 	(if (not testconfig)
 	    (begin
 	      (debug:print-error 0 *default-log-port* "Failed to resolve megatest.config, runconfigs.config and testconfig issues. Giving up now")
 	      (exit 1)))
-	(if (not (file-exists? ".ezsteps"))(create-directory ".ezsteps"))
-	;; if ezsteps was defined then we are sure to have at least one step but check anyway
-	(if (not (> (length ezstepslst) 0))
-	    (debug:print-error 0 *default-log-port* "ezsteps defined but ezstepslst is zero length")
-	    (let loop ((ezstep (car ezstepslst))
-		       (tal    (cdr ezstepslst))
-		       (prevstep #f))
-	      ;; check exit-info (vector-ref exit-info 1)
-	      (if (launch:einf-exit-status exit-info) ;; (vector-ref exit-info 1)
-		  (let ((logpro-used (launch:runstep ezstep run-id test-id exit-info m tal testconfig))
-			(stepname    (car ezstep)))
-		    ;; if logpro-used read in the stepname.dat file
-		    (if (and logpro-used (file-exists? (conc stepname ".dat")))
-			(launch:load-logpro-dat run-id test-id stepname))
-		    (if (steprun-good? logpro-used (launch:einf-exit-code exit-info))
-			(if (not (null? tal))
-			    (loop (car tal) (cdr tal) stepname))
-			(debug:print 4 *default-log-port* "WARNING: step " (car ezstep) " failed. Stopping")))
-		  (debug:print 4 *default-log-port* "WARNING: a prior step failed, stopping at " ezstep)))))))
+
+	;; create a proc for the subrun if requested, save that proc in the ezsteps table as the last entry
+	;; 1. get section [runarun]
+	;; 2. unset MT_* vars
+	;; 3. fix target
+	;; 4. fix runname
+	;; 5. fix testpatt or calculate it from contour
+	;; 6. launch the run
+	;; 7. roll up the run result and or roll up the logpro processed result
+	(when (configf:lookup testconfig "subrun" "runwait") ;; we use runwait as the flag that a subrun is requested
+            (subrun:initialize-toprun-test testconfig test-run-dir)
+	    (let* ((mt-cmd (subrun:launch-cmd test-run-dir)))
+              (debug:print-info 0 *default-log-port* "Subrun command is \"" mt-cmd "\"")
+              (set! ezsteps #t) ;; set the needed flag
+	      (set! ezstepslst
+                    (append (or ezstepslst '())
+                            (list (list "subrun" (conc "{subrun=true} " mt-cmd)))))))
+
+	;; process the ezsteps
+	(if ezsteps
+	    (begin
+	      (if (not (common:file-exists? ".ezsteps"))(create-directory ".ezsteps"))
+	      ;; if ezsteps was defined then we are sure to have at least one step but check anyway
+	      (if (not (> (length ezstepslst) 0))
+		  (debug:print-error 0 *default-log-port* "ezsteps defined but ezstepslst is zero length")
+		  (let loop ((ezstep (car ezstepslst))
+			     (tal    (cdr ezstepslst))
+			     (prevstep #f))
+                    (debug:print-info 0 *default-log-port* "Processing ezstep \"" (string-intersperse ezstep " ") "\"")
+		    ;; check exit-info (vector-ref exit-info 1)
+		    (if (launch:einf-exit-status exit-info) ;; (vector-ref exit-info 1)
+			(let ((logpro-used (launch:runstep ezstep run-id test-id exit-info m tal testconfig))
+			      (stepname    (car ezstep)))
+			  ;; if logpro-used read in the stepname.dat file
+			  (if (and logpro-used (common:file-exists? (conc stepname ".dat")))
+			      (launch:load-logpro-dat run-id test-id stepname))
+			  (if (steprun-good? logpro-used (launch:einf-exit-code exit-info))
+			      (if (not (null? tal))
+				  (loop (car tal) (cdr tal) stepname))
+			      (debug:print 0 *default-log-port* "WARNING: step " (car ezstep) " failed. Stopping")))
+			(debug:print 0 *default-log-port* "WARNING: a prior step failed, stopping at " ezstep)))))))))
 
 (define (launch:monitor-job run-id test-id item-path fullrunscript ezsteps test-name tconfigreg exit-info m work-area runtlim misc-flags)
-  (let* ((start-seconds (current-seconds))
+  (let* ((update-period (string->number (or (configf:lookup *configdat* "setup" "test-stats-update-period") "30")))
+         (start-seconds (current-seconds))
 	 (calc-minutes  (lambda ()
 			  (inexact->exact 
 			   (round 
 			    (- 
 			     (current-seconds) 
@@ -330,30 +379,38 @@
     ;; (tests:set-full-meta-info #f test-id run-id (calc-minutes) work-area)
     ;; (tests:set-full-meta-info test-id run-id (calc-minutes) work-area)
     (tests:set-full-meta-info #f test-id run-id (calc-minutes) work-area 10)
     (let loop ((minutes   (calc-minutes))
 	       (cpu-load  (alist-ref 'adj-core-load (common:get-normalized-cpu-load #f)))
-	       (disk-free (get-df (current-directory))))
-      (let ((new-cpu-load (let* ((load  (alist-ref 'adj-core-load (common:get-normalized-cpu-load #f)))
-				 (delta (abs (- load cpu-load))))
-			    (if (> delta 0.1) ;; don't bother updating with small changes
-				load
-				#f)))
-	    (new-disk-free (let* ((df    (get-df (current-directory)))
-				  (delta (abs (- df disk-free))))
-			     (if (> delta 200) ;; ignore changes under 200 Meg
-				 df
-				 #f))))
+	       (disk-free (get-df (current-directory)))
+               (last-sync (current-seconds)))
+      (let* ((over-time     (> (current-seconds) (+ last-sync update-period)))
+             (new-cpu-load  (let* ((load  (alist-ref 'adj-core-load (common:get-normalized-cpu-load #f)))
+                                   (delta (abs (- load cpu-load))))
+                              (if (> delta 0.1) ;; don't bother updating with small changes
+                                  load
+                                  #f)))
+             (new-disk-free (let* ((df    (if over-time ;; only get df every 30 seconds
+                                              (get-df (current-directory))
+                                              disk-free))
+                                   (delta (abs (- df disk-free))))
+                              (if (and (> df 0)
+                                       (> (/ delta df) 0.1)) ;; (> delta 200) ;; ignore changes under 200 Meg
+                                  df
+                                  #f)))
+             (do-sync       (or new-cpu-load new-disk-free over-time)))
+        (debug:print 4 *default-log-port* "cpu: " new-cpu-load " disk: " new-disk-free " last-sync: " last-sync " do-sync: " do-sync)
 	(set! kill-job? (or (test-get-kill-request run-id test-id) ;; run-id test-name itemdat))
 			    (and runtlim (let* ((run-seconds   (- (current-seconds) start-seconds))
 						(time-exceeded (> run-seconds runtlim)))
 					   (if time-exceeded
 					       (begin
 						 (debug:print-info 0 *default-log-port* "KILLING TEST DUE TO TIME LIMIT EXCEEDED! Runtime=" run-seconds " seconds, limit=" runtlim)
 						 #t)
 					       #f)))))
-	(tests:update-central-meta-info run-id test-id new-cpu-load new-disk-free (calc-minutes) #f #f)
+        (if do-sync
+            (tests:update-central-meta-info run-id test-id new-cpu-load new-disk-free (calc-minutes) #f #f))
 	(if kill-job? 
 	    (begin
 	      (mutex-lock! m)
 	      ;; NOTE: The pid can change as different steps are run. Do we need handshaking between this
 	      ;;       section and the runit section? Or add a loop that tries three times with a 1/4 second
@@ -397,11 +454,14 @@
 	      (exit)))
 	(if (hash-table-ref/default misc-flags 'keep-going #f)
 	    (begin
 	      (thread-sleep! 3) ;; (+ 3 (random 6))) ;; add some jitter to the call home time to spread out the db accesses
 	      (if (hash-table-ref/default misc-flags 'keep-going #f)  ;; keep originals for cpu-load and disk-free unless they change more than the allowed delta
-		  (loop (calc-minutes) (or new-cpu-load cpu-load) (or new-disk-free disk-free)))))))
+		  (loop (calc-minutes)
+                        (or new-cpu-load cpu-load)
+                        (or new-disk-free disk-free)
+                        (if do-sync (current-seconds) last-sync)))))))
     (tests:update-central-meta-info run-id test-id (get-cpu-load) (get-df (current-directory))(calc-minutes) #f #f))) ;; NOTE: Checking twice for keep-going is intentional
 
 
 (define (launch:execute encoded-cmd)
   (let* ((cmdinfo    (common:read-encoded-string encoded-cmd))
@@ -414,10 +474,11 @@
 	       (top-path  (assoc/default 'toppath   cmdinfo))
 	       (work-area (assoc/default 'work-area cmdinfo))  ;; work-area is the test run area
 	       (test-name (assoc/default 'test-name cmdinfo))
 	       (runscript (assoc/default 'runscript cmdinfo))
 	       (ezsteps   (assoc/default 'ezsteps   cmdinfo))
+	       (subrun    (assoc/default 'subrun    cmdinfo))
 	       ;; (runremote (assoc/default 'runremote cmdinfo))
 	       ;; (transport (assoc/default 'transport cmdinfo))  ;; not used
 	       ;; (serverinf (assoc/default 'serverinf cmdinfo))
 	       ;; (port      (assoc/default 'port      cmdinfo))
 	       (serverurl (assoc/default 'serverurl cmdinfo))
@@ -439,85 +500,78 @@
 	       (keyvals   #f)
 	       (fullrunscript (if (not runscript)
                                   #f
                                   (if (substring-index "/" runscript)
                                       runscript ;; use unadultered if contains slashes
-                                      (let ((fulln (conc testpath "/" runscript)))
-	                                  (if (and (file-exists? fulln)
+                                      (let ((fulln (conc work-area "/" runscript)))
+	                                  (if (and (common:file-exists? fulln)
                                                    (file-execute-access? fulln))
                                               fulln
                                               runscript))))) ;; assume it is on the path
-	       ) ;; (rollup-status 0)
+               (check-work-area           (lambda ()
+                                            ;; NFS might not have propagated the directory meta data to the run host - give it time if needed
+                                            (let loop ((count 0))
+                                              (if (or (common:directory-exists? work-area)
+                                                      (> count 10))
+                                                  (change-directory work-area)
+                                                  (begin
+                                                    (debug:print 0 *default-log-port* "INFO: Not starting job yet - directory " work-area " not found")
+                                                    (thread-sleep! 10)
+                                                    (loop (+ count 1)))))
+
+                                            (if (not (string=?  (common:real-path work-area)(common:real-path (current-directory))))
+                                                (begin
+                                                  (debug:print 0 *default-log-port*
+                                                               "INFO: we are expecting to be in directory " work-area "\n"
+                                                               "     but we are actually in the directory " (current-directory) "\n"
+                                                               "     doing another change dir.")
+                                                  (change-directory work-area)))
+                                            
+                                            ;; spot check that the files in testpath are available. Too often NFS delays cause problems here.
+                                            (let ((files      (glob (conc testpath "/*")))
+                                                  (bad-files '()))
+                                              (for-each
+                                               (lambda (fullname)
+                                                 (let* ((fname (pathname-strip-directory fullname))
+                                                        (targn (conc work-area "/" fname)))
+                                                   (if (not (file-exists? targn))
+                                                       (set! bad-files (cons fname bad-files)))))
+                                               files)
+                                              (if (not (null? bad-files))
+                                                  (begin
+                                                    (debug:print 0 *default-log-port* "INFO: test data from " testpath " not copied properly or filesystem problems causing data to not be found. Re-running the copy command.")
+                                                    (debug:print 0 *default-log-port* "INFO: missing files from " work-area ": " (string-intersperse bad-files ", "))
+                                                    (launch:test-copy testpath work-area))))
+                                            ;; one more time, change to the work-area directory
+                                            (change-directory work-area)))
+	       ) ;; let*
+
+	  (if contour (setenv "MT_CONTOUR" contour))
+	  
+	  ;; immediated set some key variables from CMDINFO data, yes, these will be set again below ...
+	  ;;
+	  (setenv "MT_TESTSUITENAME" areaname)
+	  (setenv "MT_RUN_AREA_HOME" top-path)
+	  (set! *toppath* top-path)
+          (change-directory *toppath*) ;; temporarily switch to the run area home
+	  (setenv "MT_TEST_RUN_DIR"  work-area)
+
+	  (launch:setup) ;; should be properly in the run area home now
 
 	  (if contour (setenv "MT_CONTOUR" contour))
 	  
 	  ;; immediated set some key variables from CMDINFO data, yes, these will be set again below ...
 	  ;;
 	  (setenv "MT_TESTSUITENAME" areaname)
 	  (setenv "MT_RUN_AREA_HOME" top-path)
 	  (set! *toppath* top-path)
+          (change-directory *toppath*) ;; temporarily switch to the run area home
 	  (setenv "MT_TEST_RUN_DIR"  work-area)
 
-	  ;; On NFS it can be slow and unreliable to get needed startup information.
-	  ;;  i. Check if we are on the homehost, if so, proceed
-	  ;; ii. Check if host and port passed in via CMDINFO are valid and if
-	  ;;     possible use them.
-	  (let ((bestadrs (server:get-best-guess-address (get-host-name)))
-		(needcare #f))
-	    (if (equal? homehost bestadrs) ;; we are likely on the homehost
-		(debug:print-info 0 *default-log-port* "test " test-name " appears to be running on the homehost " homehost)
-		(let ((host-port (if serverurl (string-split serverurl ":") #f)))
-		  (if (not *runremote*)(set! *runremote* (make-remote))) ;; init *runremote*
-		  (if (string? homehost)
-		      (if (and host-port
-			       (> (length host-port) 1))
-			  (let* ((host      (car host-port))
-                                 (port      (cadr host-port))
-                                 (start-res (http-transport:client-connect host port))
-                                 (ping-res  (rmt:login-no-auto-client-setup start-res)))
-			    (if (and start-res
-				     ping-res)
-				;; (begin ;; let ((url  (http-transport:server-dat-make-url start-res)))
-				(begin
-				  (remote-conndat-set! *runremote* start-res)
-				  ;; (remote-server-url-set! *runremote* url)
-				  ;; (if (server:ping url)
-				  (debug:print-info 0 *default-log-port* "connected to " host ":" port " using CMDINFO data."))
-				(begin
-				  (debug:print-info 0 *default-log-port* "have CMDINFO data but failed to connect to " host ":" port)
-				  (set! *runremote* #f))
-				  ;; (remote-conndat-set! *runremote* #f))
-				))
-			  (begin
-			    (set! *runremote* #f)
-			    (debug:print-info 0 *default-log-port* (if host-port
-								       (conc "received invalid host-port information " host-port)
-								       "no host-port information received"))
-			    ;; potential for bad situation if simultaneous starting of hundreds of jobs on servers, set needcare.
-			    (set! needcare #t)))
-		      (begin
-			(set! *runremote* #f)
-			(debug:print-info 0 *default-log-port* "received no homehost information. Please report this to support as it should not happen.")
-			(set! needcare #t)))))
-	    (if needcare  ;; due to very slow NFS we will do a brute force mkdir to ensure that the directory inode it truly available on this host
-		(let ((logdir (conc top-path "/logs"))) ;; we'll try to create this directory
-		  (handle-exceptions
-		      exn
-		      (debug:print 0 *default-log-port* "Failed to create directory " logdir " expect problems, message: " ((condition-property-accessor 'exn 'message) exn))
-		    (create-directory logdir #t)))))
-		  
-	  ;; NFS might not have propagated the directory meta data to the run host - give it time if needed
-	  (let loop ((count 0))
-	    (if (or (file-exists? top-path)
-		    (> count 10))
-		(change-directory top-path)
-		(begin
-		  (debug:print 0 *default-log-port* "INFO: Not starting job yet - directory " top-path " not found")
-		  (thread-sleep! 10)
-		  (loop (+ count 1)))))
-	  (launch:setup) ;; should be properly in the top-path now
-	  (set! tconfigreg (tests:get-all))
+	  (launch:setup) ;; should be properly in the run area home now
+          
+	  (set! tconfigreg (tests:get-all)) ;; mapping of testname => test source path
 	  (let ((sighand (lambda (signum)
 			   ;; (signal-mask! signum) ;; to mask or not? seems to cause issues in exiting
 			   (if (eq? signum signal/stop)
 			       (debug:print-error 0 *default-log-port* "attempt to STOP process. Exiting."))
 			   (set! *time-to-exit* #t)
@@ -540,24 +594,27 @@
 	  
 	  ;; Do not run the test if it is REMOVING, RUNNING, KILLREQ or REMOTEHOSTSTART,
 	  ;; Mark the test as REMOTEHOSTSTART *IMMEDIATELY*
 	  ;;
 	  (let* ((test-info (rmt:get-test-info-by-id run-id test-id))
-		 (test-host (db:test-get-host        test-info))
+		 (test-host (if test-info
+				(db:test-get-host        test-info)
+				(begin
+				  (debug:print 0 *default-log-port* "ERROR: failed to find a record for test-id " test-id ", exiting.")
+				  (exit))))
 		 (test-pid  (db:test-get-process_id  test-info)))
 	    (cond
-	     ((member (db:test-get-state test-info) '("INCOMPLETE" "KILLED" "UNKNOWN" "KILLREQ" "STUCK")) ;; prior run of this test didn't complete, go ahead and try to rerun
+             ;; -mrw- I'm removing KILLREQ from this list so that a test in KILLREQ state is treated as a "do not run" flag.
+	     ((member (db:test-get-state test-info) '("INCOMPLETE" "KILLED" "UNKNOWN" "STUCK")) ;; prior run of this test didn't complete, go ahead and try to rerun
 	      (debug:print 0 *default-log-port* "INFO: test is INCOMPLETE or KILLED, treat this execute call as a rerun request")
 	      ;; (tests:test-force-state-status! run-id test-id "REMOTEHOSTSTART" "n/a")
 	      (rmt:test-set-state-status run-id test-id "REMOTEHOSTSTART" "n/a" #f)
 	      ) ;; prime it for running
 	     ((member (db:test-get-state test-info) '("RUNNING" "REMOTEHOSTSTART"))
 	      (if (process:alive-on-host? test-host test-pid)
 		  (debug:print-error 0 *default-log-port* "test state is "  (db:test-get-state test-info) " and process " test-pid " is still running on host " test-host ", cannot proceed")
-		  ;; (tests:test-force-state-status! run-id test-id "REMOTEHOSTSTART" "n/a")
-		  (rmt:test-set-state-status run-id test-id "REMOTEHOSTSTART" "n/a" #f)
-		  ))
+		  (exit)))
 	     ((not (member (db:test-get-state test-info) '("REMOVING" "REMOTEHOSTSTART" "RUNNING" "KILLREQ")))
 	      ;; (tests:test-force-state-status! run-id test-id "REMOTEHOSTSTART" "n/a")
 	      (rmt:test-set-state-status run-id test-id "REMOTEHOSTSTART" "n/a" #f)
 	      )
 	     (else ;; (member (db:test-get-state test-info) '("REMOVING" "REMOTEHOSTSTART" "RUNNING" "KILLREQ"))
@@ -566,16 +623,20 @@
 	  
 	  (debug:print 2 *default-log-port* "Exectuing " test-name " (id: " test-id ") on " (get-host-name))
 	  (set! keys       (rmt:get-keys))
 	  ;; (runs:set-megatest-env-vars run-id inkeys: keys inkeyvals: keyvals) ;; these may be needed by the launching process
 	  ;; one of these is defunct/redundant ...
-	  (if (not (launch:setup force: #t))
+	  (if (not (launch:setup force-reread: #t))
 	      (begin
 		(debug:print 0 *default-log-port* "Failed to setup, exiting") 
 		;; (sqlite3:finalize! db)
 		;; (sqlite3:finalize! tdb)
 		(exit 1)))
+          ;; validate that the test run area is available
+          (check-work-area)
+          
+          ;; still need to go back to run area home for next couple steps
 	  (change-directory *toppath*) 
 
 	  ;; NOTE: Current order is to process runconfigs *before* setting the MT_ vars. This 
 	  ;;       seems non-ideal but could well break stuff
 	  ;;    BUG? BUG? BUG?
@@ -583,31 +644,36 @@
 	  (let ((rconfig (full-runconfigs-read)) ;; (read-config (conc  *toppath* "/runconfigs.config") #f #t sections: (list "default" target))))
 		(wconfig (read-config "waivers.config" #f #t sections: `( "default" ,target )))) ;; read the waivers config if it exists
 	    ;; (setup-env-defaults (conc *toppath* "/runconfigs.config") run-id (make-hash-table) keyvals target)
 	    ;; (set-run-config-vars run-id keyvals target) ;; (db:get-target db run-id))
 	    ;; Now have runconfigs data loaded, set environment vars
-	    (for-each (lambda (section)
-			(for-each (lambda (varval)
-				    (let ((var (car varval))
-					  (val (cadr varval)))
-				      (if (and (string? var)(string? val))
-					  (begin
-					    (setenv var (config:eval-string-in-environment val))) ;; val)
-					  (debug:print-error 0 *default-log-port* "bad variable spec, " var "=" val))))
-				  (configf:get-section rconfig section)))
-		      (list "default" target)))
+	    (for-each
+	     (lambda (section)
+	       (for-each
+		(lambda (varval)
+		  (let ((var (car varval))
+			(val (cadr varval)))
+		    (if (and (string? var)(string? val))
+			(begin
+			  (safe-setenv var (config:eval-string-in-environment val))) ;; val)
+			(debug:print-error 0 *default-log-port* "bad variable spec, " var "=" val))))
+		(configf:get-section rconfig section)))
+	     (list "default" target)))
           ;;(bb-check-path msg: "launch:execute post block 1")
 
 	  ;; NFS might not have propagated the directory meta data to the run host - give it time if needed
 	  (let loop ((count 0))
-	    (if (or (file-exists? work-area)
+	    (if (or (common:file-exists? work-area)
 		    (> count 10))
 		(change-directory work-area)
 		(begin
 		  (debug:print 0 *default-log-port* "INFO: Not starting job yet - directory " work-area " not found")
 		  (thread-sleep! 10)
 		  (loop (+ count 1)))))
+
+          ;; now we can switch to the work-area?
+          (change-directory work-area)
           ;;(bb-check-path msg: "launch:execute post block 1.5")
 	  ;; (change-directory work-area) 
 	  (set! keyvals    (keys:target->keyval keys target))
 	  ;; apply pre-overrides before other variables. The pre-override vars must not
 	  ;; clobbers things from the official sources such as megatest.config and runconfigs.config
@@ -656,11 +722,14 @@
           ;;(bb-check-path msg: "launch:execute post block 41")
 	  (runs:set-megatest-env-vars run-id inkeys: keys inkeyvals: keyvals)
           ;;(bb-check-path msg: "launch:execute post block 42")
 	  (set-item-env-vars itemdat)
           ;;(bb-check-path msg: "launch:execute post block 43")
-	  (save-environment-as-files "megatest")
+          (let ((blacklist (configf:lookup *configdat* "setup" "blacklistvars")))
+            (if blacklist
+                (save-environment-as-files "megatest" ignorevars: (string-split blacklist))
+                (save-environment-as-files "megatest")))
           ;;(bb-check-path msg: "launch:execute post block 44")
 	  ;; open-run-close not needed for test-set-meta-info
 	  ;; (tests:set-full-meta-info #f test-id run-id 0 work-area)
 	  ;; (tests:set-full-meta-info test-id run-id 0 work-area)
 	  (tests:set-full-meta-info #f test-id run-id 0 work-area 10)
@@ -668,18 +737,24 @@
 	  ;; (thread-sleep! 0.3) ;; NFS slowness has caused grief here
 
 	  (if (args:get-arg "-xterm")
 	      (set! fullrunscript "xterm")
 	      (if (and fullrunscript 
-		       (file-exists? fullrunscript)
+		       (common:file-exists? fullrunscript)
 		       (not (file-execute-access? fullrunscript)))
 		  (system (conc "chmod ug+x " fullrunscript))))
 
 	  ;; We are about to actually kick off the test
 	  ;; so this is a good place to remove the records for 
 	  ;; any previous runs
 	  ;; (db:test-remove-steps db run-id testname itemdat)
+	  ;; now is also a good time to write the .testconfig file
+	  (let* ((tconfig-fname   (conc work-area "/.testconfig"))
+		 (tconfig-tmpfile (conc tconfig-fname ".tmp"))
+		 (tconfig         (tests:get-testconfig test-name item-path tconfigreg #t force-create: #t))) ;; 'return-procs)))
+	    (configf:write-alist tconfig tconfig-tmpfile)
+	    (file-move tconfig-tmpfile tconfig-fname #t))
 	  ;; 
 	  (let* ((m            (make-mutex))
 		 (kill-job?    #f)
 		 (exit-info    (make-launch:einf pid: #t exit-status: #t exit-code: #t rollup-status: 0)) ;; pid exit-status exit-code (i.e. process was successfully run) rollup-status
 		 (job-thread   #f)
@@ -686,11 +761,11 @@
 		 ;; (keep-going   #t)
 		 (misc-flags   (let ((ht (make-hash-table)))
 				 (hash-table-set! ht 'keep-going #t)
 				 ht))
 		 (runit        (lambda ()
-				 (launch:manage-steps run-id test-id item-path fullrunscript ezsteps test-name tconfigreg exit-info m)))
+				 (launch:manage-steps run-id test-id item-path fullrunscript ezsteps subrun test-name tconfigreg exit-info m)))
 		 (monitorjob   (lambda ()
 				 (launch:monitor-job  run-id test-id item-path fullrunscript ezsteps test-name tconfigreg exit-info m work-area runtlim misc-flags)))
 		 (th1          (make-thread monitorjob "monitor job"))
 		 (th2          (make-thread runit "run job")))
 	    (set! job-thread th2)
@@ -741,12 +816,15 @@
 	      (rmt:update-run-stats run-id (rmt:get-raw-run-stats run-id)))
 	    (mutex-unlock! m)
 	    (debug:print 2 *default-log-port* "Output from running " fullrunscript ", pid " (launch:einf-pid exit-info) " in work area " 
 			 work-area ":\n====\n exit code " (launch:einf-exit-code exit-info) "\n" "====\n")
 	    (if (not (launch:einf-exit-status exit-info))
-		(exit 4)))))))
+		(exit 4))))
+        )))
 
+;; DO NOT USE - caching of configs is handled in launch:setup now.
+;;
 (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")
@@ -758,22 +836,22 @@
 			   (args:get-arg ":runname")
 			   (getenv "MT_RUNNAME")))
 	     (fulldir  (conc linktree "/"
 			     target "/"
 			     runname)))
-	(if (and linktree (file-exists? linktree)) ;; can't proceed without linktree
+	(if (and linktree (common:file-exists? linktree)) ;; can't proceed without linktree
 	    (begin
 	      (debug:print-info 0 *default-log-port* "Have -run with target=" target ", runname=" runname ", fulldir=" fulldir ", testpatt=" (or (args:get-arg "-testpatt") "%"))
-	      (if (not (file-exists? fulldir))
+	      (if (not (common:file-exists? fulldir))
 		  (create-directory fulldir #t)) ;; need to protect with exception handler 
 	      (if (and target
 		       runname
-		       (file-exists? fulldir))
+		       (common:file-exists? fulldir))
 		  (let ((tmpfile  (conc fulldir "/.megatest.cfg." (current-seconds)))
 			(targfile (conc fulldir "/.megatest.cfg-"  megatest-version "-" megatest-fossil-hash))
 			(rconfig  (conc fulldir "/.runconfig." megatest-version "-" megatest-fossil-hash)))
-		    (if (file-exists? rconfig) ;; only cache megatest.config AFTER runconfigs has been cached
+		    (if (common:file-exists? rconfig) ;; only cache megatest.config AFTER runconfigs has been cached
 			(begin
 			  (debug:print-info 0 *default-log-port* "Caching megatest.config in " tmpfile)
                           (if (not (common:in-running-test?))
                               (configf:write-alist *configdat* tmpfile))
 			  (system (conc "ln -sf " tmpfile " " targfile))))
@@ -794,61 +872,92 @@
 ;;   side effects:
 ;;     sets; *configdat*    (megatest.config info)
 ;;           *runconfigdat* (runconfigs.config info)
 ;;           *configstatus* (status of the read data)
 ;;
-(define (launch:setup #!key (force #f) (areapath #f))
+(define (launch:setup #!key (force-reread #f) (areapath #f))
   (mutex-lock! *launch-setup-mutex*)
   (if (and *toppath*
-	   (eq? *configstatus* 'fulldata)) ;; got it all
+	   (eq? *configstatus* 'fulldata) (not force-reread)) ;; got it all
       (begin
-	(debug:print 0 *default-log-port* "NOTE: skipping launch:setup-body call since we have fulldata")
+	(debug:print 2 *default-log-port* "NOTE: skipping launch:setup-body call since we have fulldata")
 	(mutex-unlock! *launch-setup-mutex*)
 	*toppath*)
-      (let ((res (launch:setup-body force: force areapath: areapath)))
+      (let ((res (launch:setup-body force-reread: force-reread areapath: areapath)))
 	(mutex-unlock! *launch-setup-mutex*)
 	res)))
+
+;; return paths depending on what info is available.
+;;
+(define (launch:get-cache-file-paths areapath toppath target mtconfig)
+  (let* ((use-cache (common:use-cache?))
+         (runname  (common:args-get-runname))
+         (linktree (common:get-linktree))
+         (testname (common:get-full-test-name))
+         (rundir   (if (and runname target linktree)
+                       (common:directory-writable? (conc linktree "/" target "/" runname))
+                       #f))
+         (testdir  (if (and rundir testname)
+                       (common:directory-writable? (conc rundir "/" testname))
+                       #f))
+         (cachedir (or testdir rundir))
+         (mtcachef (and cachedir (conc cachedir "/" ".megatest.cfg-"  megatest-version "-" megatest-fossil-hash)))
+         (rccachef (and cachedir (conc cachedir "/" ".runconfigs.cfg-"  megatest-version "-" megatest-fossil-hash))))
+    (debug:print-info 6 *default-log-port* 
+                      "runname=" runname 
+                      "\n  linktree=" linktree
+                      "\n  testname=" testname
+                      "\n  rundir=" rundir 
+                      "\n  testdir=" testdir 
+                      "\n  cachedir=" cachedir
+                      "\n  mtcachef=" mtcachef
+                      "\n  rccachef=" rccachef)
+    (cons mtcachef rccachef)))
 
 (define (launch:setup-body #!key (force-reread #f) (areapath #f))
   (if (and (eq? *configstatus* 'fulldata)
 	   *toppath*
 	   (not force-reread)) ;; no need to reprocess
       *toppath*   ;; return toppath
-      (let* ((use-cache (common:use-cache?))
+      (let* ((use-cache (common:use-cache?)) ;; BB- use-cache checks *configdat* for use-cache setting.  We do not have *configdat*.  Bootstrapping problem here.
 	     (toppath  (or *toppath* areapath (getenv "MT_RUN_AREA_HOME"))) ;; preserve toppath
-	     
-	     (runname  (common:args-get-runname))
 	     (target   (common:args-get-target))
-	     (linktree (common:get-linktree))
-	     (contour  #f) ;; NOT READY FOR THIS (args:get-arg "-contour"))
 	     (sections (if target (list "default" target) #f)) ;; for runconfigs
 	     (mtconfig (or (args:get-arg "-config") "megatest.config")) ;; allow overriding megatest.config 
-	     (rundir   (if (and runname target linktree)
-			   (conc linktree (if contour (conc "/" contour) "") "/" target "/" runname)
-			   #f))
-             
-	     (mtcachef (and rundir (conc rundir "/" ".megatest.cfg-"  megatest-version "-" megatest-fossil-hash)))
-	     (rccachef (and rundir (conc rundir "/" ".runconfigs.cfg-"  megatest-version "-" megatest-fossil-hash)))
-	     (cancreate (and rundir (common:file-exists? rundir)(file-write-access? rundir) (not (common:in-running-test?)))))
-	;; (cxt       (hash-table-ref/default *contexts* toppath #f)))
-
-	;; create our cxt for this area if it doesn't already exist
-	;; (if (not cxt)(hash-table-set! *contexts* toppath (make-cxt)))
-	
-	;; (print "runname: " runname " target: " target " mtcachef: " mtcachef " rccachef: " rccachef)
+             (cachefiles (launch:get-cache-file-paths areapath toppath target mtconfig))
+	     ;; checking for null cachefiles should not be necessary, I was seeing error car of '(), might be a chicken bug or a red herring ...
+	     (mtcachef   (if (null? cachefiles)
+			     #f
+			     (car cachefiles))) ;; (and cachedir (conc cachedir "/" ".megatest.cfg-"  megatest-version "-" megatest-fossil-hash)))
+	     (rccachef   (if (null? cachefiles)
+			     #f
+			     (cdr cachefiles)))) ;; (and cachedir (conc cachedir "/" ".runconfigs.cfg-"  megatest-version "-" megatest-fossil-hash)))
+	      ;; (cancreate (and cachedir (common:file-exists? cachedir)(file-write-access? cachedir) (not (common:in-running-test?)))))
 	(set! *toppath* toppath) ;; This is needed when we are running as a test using CMDINFO as a datasource
+        ;;(BB> "launch:setup-body -- cachefiles="cachefiles)
 	(cond
 	 ;; if mtcachef exists just read it, however we need to assume toppath is available in $MT_RUN_AREA_HOME
-	 ((and mtcachef (common:file-exists? mtcachef) (get-environment-variable "MT_RUN_AREA_HOME") use-cache)
-	  (set! *configdat*    (configf:read-alist mtcachef))
+	 ((and (not force-reread)
+	       mtcachef  rccachef
+	       use-cache
+	       (get-environment-variable "MT_RUN_AREA_HOME")
+	       (common:file-exists? mtcachef)
+	       (common:file-exists? rccachef))
+          ;;(BB> "launch:setup-body -- cond branch 1 - use-cache")
+          (set! *configdat*    (configf:read-alist mtcachef))
+          ;;(BB> "launch:setup-body -- 1 set! *configdat*="*configdat*)
 	  (set! *runconfigdat* (configf:read-alist rccachef))
 	  (set! *configinfo*   (list *configdat*  (get-environment-variable "MT_RUN_AREA_HOME")))
 	  (set! *configstatus* 'fulldata)
 	  (set! *toppath*      (get-environment-variable "MT_RUN_AREA_HOME"))
 	  *toppath*)
+	 ;; there are no existing cached configs, do full reads of the configs and cache them
 	 ;; we have all the info needed to fully process runconfigs and megatest.config
-	 (mtcachef              
+	 ((and ;; (not force-reread) ;; force-reread is irrelevant in the AND, could however OR it?
+	       mtcachef
+	       rccachef) ;; BB- why are we doing this without asking if caching is desired?
+          ;;(BB> "launch:setup-body -- cond branch 2")
 	  (let* ((first-pass    (find-and-read-config        ;; NB// sets MT_RUN_AREA_HOME as side effect
 				 mtconfig
 				 environ-patt: "env-override"
 				 given-toppath: toppath
 				 pathenvvar: "MT_RUN_AREA_HOME"))
@@ -863,11 +972,13 @@
 				   *runconfigdat* #t 
 				   sections: sections))))
 	    (set! *runconfigdat* first-rundat)
 	    (if first-pass  ;; 
 		(begin
+                  ;;(BB> "launch:setup-body -- \"first-pass\"=first-pass")
 		  (set! *configdat*  (car first-pass))
+                  ;;(BB> "launch:setup-body -- 2 set! *configdat*="*configdat*)
 		  (set! *configinfo* first-pass)
 		  (set! *toppath*    (or toppath (cadr first-pass))) ;; use the gathered data unless already have it
 		  (set! toppath      *toppath*)
 		  (if (not *toppath*)
 		      (begin
@@ -889,26 +1000,45 @@
 			 (runconfigdat (begin     ;; this read of the runconfigs will see any adjustments made by re-reading megatest.config
 					 (for-each (lambda (kt)
 						     (setenv (car kt) (cadr kt)))
 						   key-vals)
 					 (read-config (conc toppath "/runconfigs.config") *runconfigdat* #t ;; consider using runconfig:read some day ...
-						      sections: sections))))
-		    (if cancreate (configf:write-alist runconfigdat rccachef))
+						      sections: sections)))
+                         (cachefiles   (launch:get-cache-file-paths areapath toppath target mtconfig))
+                         (mtcachef     (car cachefiles))
+                         (rccachef     (cdr cachefiles)))
+                    ;;  trap exception due to stale NFS handle -- Error: (open-output-file) cannot open file - Stale NFS file handle: "/p/fdk/gwa/lefkowit/mtTesting/qa/primbeqa/links/p1222/11/PDK_r1.1.1/prim/clean/pcell_testgen/.runconfigs.cfg-1.6427-7d1e789cb3f62f9cde719a4865bb51b3c17ea853" - ticket 220546342
+                    ;; TODO - consider 1) using simple-lock to bracket cache write
+                    ;;                 2) cache in hash on server, since need to do rmt: anyway to lock.
+
+		    (if rccachef
+                        (common:fail-safe
+                         (lambda ()
+                           (configf:write-alist runconfigdat rccachef))
+                         (conc "Could not write cache file - "rccachef)))
+                    (if mtcachef
+                        (common:fail-safe
+                         (lambda ()
+                           (configf:write-alist *configdat* mtcachef))
+                         (conc "Could not write cache file - "mtcachef)))
 		    (set! *runconfigdat* runconfigdat)
-		    (if cancreate (configf:write-alist *configdat* mtcachef))
-		    (if cancreate (set! *configstatus* 'fulldata))))
+		    (if (and rccachef mtcachef) (set! *configstatus* 'fulldata))))
 		;; no configs found? should not happen but let's try to recover gracefully, return an empty hash-table
 		(set! *configdat* (make-hash-table))
 		)))
+
 	 ;; else read what you can and set the flag accordingly
+	 ;; here we don't have either mtconfig or rccachef
 	 (else
+          ;;(BB> "launch:setup-body -- cond branch 3 - else")
 	  (let* ((cfgdat   (find-and-read-config 
 			    (or (args:get-arg "-config") "megatest.config")
 			    environ-patt: "env-override"
 			    given-toppath: (get-environment-variable "MT_RUN_AREA_HOME")
 			    pathenvvar: "MT_RUN_AREA_HOME")))
-	    (if cfgdat
+
+            (if (and cfgdat (list? cfgdat) (> (length cfgdat) 0) (hash-table? (car cfgdat)))
 		(let* ((toppath  (or (get-environment-variable "MT_RUN_AREA_HOME")(cadr cfgdat)))
 		       (rdat     (read-config (conc toppath  ;; convert this to use runconfig:read!
 						    "/runconfigs.config") *runconfigdat* #t sections: sections)))
 		  (set! *configinfo*   cfgdat)
 		  (set! *configdat*    (car cfgdat))
@@ -916,12 +1046,15 @@
 		  (set! *toppath*      toppath)
 		  (set! *configstatus* 'partial))
 		(begin
 		  (debug:print-error 0 *default-log-port* "No " mtconfig " file found. Giving up.")
 		  (exit 2))))))
+	;; COND ends here.
+	
 	;; additional house keeping
-	(let* ((linktree (common:get-linktree)))
+	(let* ((linktree (or (common:get-linktree)
+			     (conc *toppath* "/lt"))))
 	  (if linktree
 	      (begin
 		(if (not (common:file-exists? linktree))
 		    (begin
 		      (handle-exceptions
@@ -935,11 +1068,11 @@
 		    exn
 		    (begin
 		      (debug:print-error 0 *default-log-port* "Something went wrong when trying to create link to linktree at " *toppath*)
 		      (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn)))
 		  (let ((tlink (conc *toppath* "/lt")))
-		    (if (not (file-exists? tlink))
+		    (if (not (common:file-exists? tlink))
 			(create-symbolic-link linktree tlink)))))
 	      (begin
 		(debug:print-error 0 *default-log-port* "linktree not defined in [setup] section of megatest.config")
 		)))
 	(if (and *toppath*
@@ -947,14 +1080,36 @@
 	    (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
-	      ))
+	      #f))
+	
+        ;; one more attempt to cache the configs for future reading
+        (let* ((cachefiles   (launch:get-cache-file-paths areapath toppath target mtconfig))
+               (mtcachef     (car cachefiles))
+               (rccachef     (cdr cachefiles)))
+
+          ;; trap exception due to stale NFS handle -- Error: (open-output-file) cannot open file - Stale NFS file handle: "...somepath.../.runconfigs.cfg-1.6427-7d1e789cb3f62f9cde719a4865bb51b3c17ea853" - ticket 220546342
+          ;; TODO - consider 1) using simple-lock to bracket cache write
+          ;;                 2) cache in hash on server, since need to do rmt: anyway to lock.
+          (if (and rccachef *runconfigdat* (not (common:file-exists? rccachef)))
+              (common:fail-safe
+               (lambda ()
+                 (configf:write-alist *runconfigdat* rccachef))
+               (conc "Could not write cache file - "rccachef))
+              )
+          (if (and mtcachef *configdat*    (not (common:file-exists? mtcachef)))
+              (common:fail-safe
+               (lambda ()
+                 (configf:write-alist *configdat* mtcachef))
+               (conc "Could not write cache file - "mtcachef))
+              )
+          (if (and rccachef mtcachef *runconfigdat* *configdat*)
+              (set! *configstatus* 'fulldata)))
+
 	;; 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.
@@ -968,13 +1123,40 @@
     (if disks 
 	(let ((res (common:get-disk-with-most-free-space disks minspace))) ;; min size of 1000, seems tad dumb
 	  (if res
 	      (cdr res)
 	      (begin
-		(if (common:low-noise-print 20 "No valid disks or no disk with enough space")
-		    (debug:print-error 0 *default-log-port* "No valid disks found in megatest.config. Please add some to your [disks] section and ensure the directory exists and has enough space!\n    You can change minspace in the [setup] section of megatest.config. Current setting is: " minspace))
-		(exit 1))))))) ;; TODO - move the exit to the calling location and return #f
+;;		(if (common:low-noise-print 20 "No valid disks or no disk with enough space")
+;;		    (debug:print-error 0 *default-log-port* "No valid disks found in megatest.config. Please add some to your [disks] section and ensure the directory exists and has enough space!\n    You can change minspace in the [setup] section of megatest.config. Current setting is: " minspace))
+		;;(exit 1)
+                 (if (null? disks)
+                     (cons 1 (conc *toppath* "/runs"))
+                     (let ((paths (sort disks (lambda (x y) (> (string-length (cadr x)) (string-length (cadr y)))))))
+                       (let loop ((head (car paths)) (tail (cdr paths)))
+                         (let ((result (handle-exceptions exn #f (create-directory (cadr head) #t))))
+                           (if result
+                               result
+                               (if (null? tail)
+                                   (cons 1 (conc *toppath* "/runs"))
+                                   (loop (car tail) (cdr tail)))))))))))))) ;; the code creates the necessary directories if it does not exist and returns the path.
+
+
+(define (launch:test-copy test-src-path test-path)
+  (let* ((ovrcmd (let ((cmd (config-lookup *configdat* "setup" "testcopycmd")))
+		   (if cmd
+		       ;; substitute the TEST_SRC_PATH and TEST_TARG_PATH
+		       (string-substitute "TEST_TARG_PATH" test-path
+					  (string-substitute "TEST_SRC_PATH" test-src-path cmd #t) #t)
+		       #f)))
+	 (cmd    (if ovrcmd 
+		     ovrcmd
+		     (conc "rsync -av" (if (debug:debug-mode 1) "" "q") " " test-src-path "/ " test-path "/"
+			   " >> " test-path "/mt_launch.log 2>> " test-path "/mt_launch.log")))
+	 (status (system cmd)))
+    (if (not (eq? status 0))
+	(debug:print 2 *default-log-port* "ERROR: problem with running \"" cmd "\""))))
+
 
 ;; Desired directory structure:
 ;;
 ;;   -  -  -.
 ;;                                     |
@@ -1028,19 +1210,24 @@
     (debug:print 2 *default-log-port* "INFO:\n       lnkbase=" lnkbase "\n       lnkpath=" lnkpath "\n  toptest-path=" toptest-path "\n     test-path=" test-path)
     (if (not (common:file-exists? linktree))
 	(begin
 	  (debug:print 0 *default-log-port* "WARNING: linktree did not exist! Creating it now at " linktree)
 	  (create-directory linktree #t))) ;; (system (conc "mkdir -p " linktree))))
-    ;; create the directory for the tests dir links, this is needed no matter what...
-    (if (and (not (common:directory-exists? lnkbase))
-	     (not (common:file-exists? lnkbase)))
-	(handle-exceptions
-	 exn
-	 (begin
-	   (debug:print-error 0 *default-log-port* "Problem creating linktree base at " lnkbase)
-	   (print-error-message exn (current-error-port)))
-	 (create-directory lnkbase #t)))
+    ;; create the directory for the tests dir links, this is needed no matter what... try up to three times
+    (let loop ((done 3)) 
+      (let ((success (if (and (not (common:directory-exists? lnkbase))
+			      (not (common:file-exists? lnkbase)))
+			 (handle-exceptions
+			  exn
+			  (begin
+			    (debug:print-error 0 *default-log-port* "Problem creating linktree base at " lnkbase)
+			    (print-error-message exn (current-error-port))
+			    #t)
+			  (create-directory lnkbase #t)
+			  #f))))
+	(if (and (not success)(> done 0))
+	    (loop (- done 1)))))
     
     ;; update the toptest record with its location rundir, cache the path
     ;; This wass highly inefficient, one db write for every subtest, potentially
     ;; thousands of unnecessary updates, cache the fact it was set and don't set it 
     ;; again. 
@@ -1065,11 +1252,11 @@
 	 (begin
 	   (debug:print-error 0 *default-log-port* " Failed to remove symlink " lnkpath ((condition-property-accessor 'exn 'message) exn) ", exiting")
 	   (exit 1))
 	 (delete-file lnkpath)))
 
-    (if (not (or (file-exists? lnkpath)
+    (if (not (or (common:file-exists? lnkpath)
 		 (symbolic-link? lnkpath)))
 	(handle-exceptions
 	 exn
 	 (begin
 	   (debug:print-error 0 *default-log-port* " Failed to create symlink " lnkpath ((condition-property-accessor 'exn 'message) exn) ", exiting")
@@ -1090,11 +1277,11 @@
 				   (db:test-get-rundir testinfo) ;; ) ;; )
 				   #f)))
 	  (hash-table-set! *toptest-paths* testname curr-test-path)
 	  ;; NB// Was this for the test or for the parent in an iterated test?
 	  (rmt:general-call 'test-set-rundir-shortdir run-id lnkpath 
-			    (if (file-exists? lnkpath)
+			    (if (common:file-exists? lnkpath)
 				;; (resolve-pathname lnkpath)
 				(common:nice-path lnkpath)
 				lnkpath)
 			    testname "" run-id)
 	  ;; (rmt:general-call 'test-set-rundir run-id lnkpath testname "") ;; toptest-path)
@@ -1129,30 +1316,18 @@
 	   exn
 	   (begin
 	     (debug:print-error 0 *default-log-port* " Failed to re-create link " lnktarget ((condition-property-accessor 'exn 'message) exn) ", exiting")
 	     (exit))
 	   (if (symbolic-link? lnktarget)     (delete-file lnktarget))
-	   (if (not (file-exists? lnktarget)) (create-symbolic-link test-path lnktarget)))))
+	   (if (not (common:file-exists? lnktarget)) (create-symbolic-link test-path lnktarget)))))
 
     (if (not (directory? test-path))
 	(create-directory test-path #t)) ;; this is a hack, I don't know why out of the blue this path does not exist sometimes
 
     (if (and test-src-path (directory? test-path))
 	(begin
-	  (let* ((ovrcmd (let ((cmd (config-lookup *configdat* "setup" "testcopycmd")))
-			   (if cmd
-			       ;; substitute the TEST_SRC_PATH and TEST_TARG_PATH
-			       (string-substitute "TEST_TARG_PATH" test-path
-						  (string-substitute "TEST_SRC_PATH" test-src-path cmd #t) #t)
-			       #f)))
-		 (cmd    (if ovrcmd 
-			     ovrcmd
-			     (conc "rsync -av" (if (debug:debug-mode 1) "" "q") " " test-src-path "/ " test-path "/"
-				   " >> " test-path "/mt_launch.log 2>> " test-path "/mt_launch.log")))
-		 (status (system cmd)))
-	    (if (not (eq? status 0))
-		(debug:print 2 *default-log-port* "ERROR: problem with running \"" cmd "\"")))
+	  (launch:test-copy test-src-path test-path)
 	  (list lnkpathf lnkpath ))
 	(if (and test-src-path (> remtries 0))
 	    (begin
 	      (debug:print-error 0 *default-log-port* "Failed to create work area at " test-path " with link at " lnktarget ", remaining attempts " remtries)
 	      ;; 
@@ -1166,17 +1341,31 @@
 ;;    - could be ssh to host from hosts table (update regularly with load)
 ;;    - could be netbatch
 ;;      (launch-test db (cadr status) test-conf))
 (define (launch-test test-id run-id run-info keyvals runname test-conf test-name test-path itemdat params)
   (mutex-lock! *launch-setup-mutex*) ;; setting variables and processing the testconfig is NOT thread-safe, reuse the launch-setup mutex
-  (let* ((item-path       (item-list->path itemdat))
+  (let* ( ;; (lock-key        (conc "test-" test-id))
+	;; (got-lock        (let loop ((lock        (rmt:no-sync-get-lock lock-key))
+	;; 			     (expire-time (+ (current-seconds) 15))) ;; give up on getting the lock and steal it after 15 seconds
+	;; 		    (if (car lock)
+	;; 			#t
+	;; 			(if (> (current-seconds) expire-time)
+	;; 			    (begin
+	;; 			      (debug:print-info 0 *default-log-port* "Timed out waiting for a lock to launch test " keyvals " " runname " " test-name " " test-path)
+	;; 			      (rmt:no-sync-del! lock-key) ;; destroy the lock
+	;; 			      (loop (rmt:no-sync-get-lock lock-key) expire-time)) ;; 
+	;; 			    (begin
+	;; 			      (thread-sleep! 1)
+	;; 			      (loop (rmt:no-sync-get-lock lock-key) expire-time))))))
+	 (item-path       (item-list->path itemdat))
 	 (contour         #f)) ;; NOT READY FOR THIS (args:get-arg "-contour")))
     (let loop ((delta        (- (current-seconds) *last-launch*))
-	       (launch-delay (string->number (or (configf:lookup *configdat* "setup" "launch-delay") "5"))))
+	       (launch-delay (configf:lookup-number *configdat* "setup" "launch-delay" default: 1)))
       (if (> launch-delay delta)
 	  (begin
-	    (debug:print-info 0 *default-log-port* "Delaying launch of " test-name " for " (- launch-delay delta) " seconds")
+	    (if (common:low-noise-print 1200 "test launch delay") ;; every two hours or so remind the user about launch delay.
+		(debug:print-info 0 *default-log-port* "NOTE: test launches are delayed by " launch-delay " seconds. See megatest.config launch-delay setting to adjust.")) ;; launch of " test-name " for " (- launch-delay delta) " seconds"))
 	    (thread-sleep! (- launch-delay delta))
 	    (loop (- (current-seconds) *last-launch*) launch-delay))))
     (change-directory *toppath*)
     (alist->env-vars ;; consolidate this code with the code in megatest.scm for "-execute", *maybe* - the longer they are set the longer each launch takes (must be non-overlapping with the vars)
      (append
@@ -1199,11 +1388,12 @@
 				  (if (equal? ush "no") ;; must use "no" to NOT use shell
 				      #f
 				      ush)
 				  #t)))     ;; default is yes
 	   (runscript       (config-lookup tconfig   "setup"        "runscript"))
-	   (ezsteps         (> (length (hash-table-ref/default tconfig "ezsteps" '())) 0)) ;; don't send all the steps, could be big
+	   (ezsteps         (> (length (hash-table-ref/default tconfig "ezsteps" '())) 0)) ;; don't send all the steps, could be big, just send a flag
+	   (subrun          (> (length (hash-table-ref/default tconfig "subrun"  '())) 0)) ;; send a flag to process a subrun
 	   ;; (diskspace       (config-lookup tconfig   "requirements" "diskspace"))
 	   ;; (memory          (config-lookup tconfig   "requirements" "memory"))
 	   ;; (hosts           (config-lookup *configdat* "jobtools"     "workhosts")) ;; I'm pretty sure this was never completed
 	   (remote-megatest (config-lookup *configdat* "setup" "executable"))
 	   (run-time-limit  (or (configf:lookup  tconfig   "requirements" "runtimelim")
@@ -1283,11 +1473,12 @@
 					(list 'run-id    run-id   )
 					(list 'test-id   test-id  )
 					;; (list 'item-path item-path )
 					(list 'itemdat   itemdat  )
 					(list 'megatest  remote-megatest)
-					(list 'ezsteps   ezsteps) 
+					(list 'ezsteps   ezsteps)
+					(list 'subrun    subrun)
 					(list 'target    mt_target)
 					(list 'contour   contour)
 					(list 'runtlim   (if run-time-limit (common:hms-string->seconds run-time-limit) #f))
 					(list 'env-ovrd  (hash-table-ref/default *configdat* "env-override" '())) 
 					(list 'set-vars  (if params (hash-table-ref/default params "-setvars" #f)))
@@ -1295,11 +1486,11 @@
 					(list 'mt-bindir-path mt-bindir-path))))))))
       
       ;; clean out step records from previous run if they exist
       ;; (rmt:delete-test-step-records run-id test-id)
       ;; if the dir does not exist we may have a itempath where individual variables are a path, launch anyway
-      (if (file-exists? work-area)
+      (if (common:file-exists? work-area)
 	  (change-directory work-area)) ;; so that log files from the launch process don't clutter the test dir
       (cond
        ;; ((and launcher hosts) ;; must be using ssh hostname
        ;;    (set! fullcmd (append launcher (car hosts)(list remote-megatest "-m" test-sig "-execute" cmdparms) debug-param)))
        ;; (set! fullcmd (append launcher (car hosts)(list remote-megatest test-sig "-execute" cmdparms))))
@@ -1328,23 +1519,28 @@
 				      itemdat)))
 	     (testprevvals   (alist->env-vars
 			      (hash-table-ref/default tconfig "pre-launch-env-overrides" '())))
 	     ;; Launchwait defaults to true, must override it to turn off wait
 	     (launchwait     (if (equal? (configf:lookup *configdat* "setup" "launchwait") "no") #f #t))
-	     (launch-results (apply (if launchwait
-					process:cmd-run-with-stderr->list
+	     (launch-results-prev (apply (if launchwait ;; BB: TODO: refactor this to examine return code of launcher, if nonzero, set state to launch failed.
+					process:cmd-run-with-stderr-and-exitcode->list
 					process-run)
 				    (if useshell
 					(let ((cmdstr (string-intersperse fullcmd " ")))
 					  (if launchwait
 					      cmdstr
 					      (conc cmdstr " >> mt_launch.log 2>&1 &")))
 					(car fullcmd))
 				    (if useshell
 					'()
-					(cdr fullcmd)))))
+					(cdr fullcmd))))
+             (success        (if launchwait (equal? 0 (cadr launch-results-prev)) #t))
+             (launch-results (if launchwait (car launch-results-prev) launch-results-prev)))
+        (if (not success)
+            (tests:test-set-status! run-id test-id "COMPLETED" "DEAD" "launcher failed; exited non-zero; check mt_launch.log" #f)) ;; (if launch-results launch-results "FAILED"))
         (mutex-unlock! *launch-setup-mutex*) ;; yes, really should mutex all the way to here. Need to put this entire process into a fork.
+	;; (rmt:no-sync-del! lock-key)         ;; release the lock for starting this test
 	(if (not launchwait) ;; give the OS a little time to allow the process to start
 	    (thread-sleep! 0.01))
 	(with-output-to-file "mt_launch.log"
 	  (lambda ()
 	    (print "LAUNCHCMD: " (string-intersperse fullcmd " "))

DELETED loadwatch/Makefile
Index: loadwatch/Makefile
==================================================================
--- loadwatch/Makefile
+++ /dev/null
@@ -1,11 +0,0 @@
-
-all : launch-many queuefeeder queuefeeder-server
-
-launch-many : launch-many.scm
-	csc launch-many.scm
-
-queuefeeder : queuefeeder.scm
-	csc queuefeeder.scm
-
-queuefeeder-server : queuefeeder-server.scm
-	csc queuefeeder-server.scm

DELETED loadwatch/bjob-count.sh
Index: loadwatch/bjob-count.sh
==================================================================
--- loadwatch/bjob-count.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/bash
-
-bqueues | grep normal |awk '{print $8}'

DELETED loadwatch/launch-many.scm
Index: loadwatch/launch-many.scm
==================================================================
--- loadwatch/launch-many.scm
+++ /dev/null
@@ -1,9 +0,0 @@
-(use posix)
-
-(let loop ((count 0))
-  (if (> count 500000)
-      (print "DONE")
-      (let ((cmd (conc "./queuefeeder xena:22022 bsub ./testopenlava.sh " count " " (random 30))))
-	(print "Running: " cmd)
-	(system cmd)
-	(loop (+ count 1)))))

DELETED loadwatch/loadwatch.scm
Index: loadwatch/loadwatch.scm
==================================================================
--- loadwatch/loadwatch.scm
+++ /dev/null
@@ -1,86 +0,0 @@
-(use regex srfi-69)
-
-(define-record processdat
-  %cpu
-  virt
-  res
-  %mem
-  count
-  )
-
-(define (pp-processdat dat)
-  (print "(processdat"
-	 " %cpu="  (processdat-%cpu dat)
-	 " virt="  (processdat-virt dat)
-	 " res="   (processdat-res  dat)
-	 " %mem="  (processdat-%mem dat)
-	 " count=" (processdat-count dat)))
-
-
-(define nrex (regexp "^(\\d+[\\d\\.]*)([mkgMKG])$"))
-
-(define (get-number numstr)
-  (let ((n (string->number numstr)))
-    (if n 
-	n
-	(let ((nmatch (string-match nrex numstr)))
-	  (if nmatch
-	      (* (string->number (cadr nmatch))
-		 (case (string->symbol (caddr nmatch))
-		   ((k) 1024)
-		   ((m) 1048576)
-		   ((g) 1073741824)
-		   (else 
-		    (print "ERROR: Unrecognised unit: " (caddr nmatch) ", extracted for " numstr)
-		    1)))
-	      #f)))))
-
-
-(define (snagload)
-  (let ((dat (make-hash-table)) ;; user => hash-of-processdat
-	(hdr (regexp "^\\s+PID"))
-	(rx  (regexp "\\s+"))
-	(wht (regexp "^\\s+"))
-	)
-    (with-input-from-pipe 
-     "top -n 1 -b"
-     (lambda ()
-       (let loop ((inl   (read-line))
-		  (inbod #f))
-	 (if (eof-object? inl)
-	     dat
-	     (if (not inbod)
-		 (if (string-search hdr inl)
-		     (loop (read-line) #t)
-		     (loop (read-line) #f))
-		 (let* ((lparts (map (lambda (x)
-				       (let ((num (get-number x)))
-					 (if num num x)))
-				     (string-split-fields rx (string-substitute wht "" inl) #:infix))))
-		   (if (> (length lparts) 10)
-		       (let* ((user   (list-ref lparts 1))
-			      (virt   (list-ref lparts 4))
-			      (res    (list-ref lparts 5))
-			      (%cpu   (list-ref lparts 8))
-			      (%mem   (list-ref lparts 9))
-			      (time   (list-ref lparts 10))
-			      (pname  (list-ref lparts 11))
-			      (udat   (or (hash-table-ref/default dat user #f)
-					  (let ((u (make-hash-table)))
-					    (hash-table-set! dat user u)
-					    u)))
-			      (pdat   (or (hash-table-ref/default udat pname #f)
-					  (let ((p (make-processdat 0 0 0 0 0)))
-					    (hash-table-set! udat pname p)
-					    p))))
-			 (print "User: " user ", pname: " pname ", virt: " virt ", res: " res ", %cpu: " %cpu ", %mem: " %mem)
-			 (processdat-%cpu-set!  pdat (+ (processdat-%cpu pdat) %cpu))
-			 (processdat-%mem-set!  pdat (+ (processdat-%mem pdat) %mem))
-			 (processdat-virt-set!  pdat (+ (processdat-virt pdat) virt))
-			 (processdat-res-set!   pdat (+ (processdat-res pdat)  res))
-			 (processdat-count-set! pdat (+ (processdat-count pdat) 1))
-			 (loop (read-line) inbod))
-		       dat)))))))))
-    
-(define x (snagload))
-;; (processdat-%cpu (hash-table-ref (hash-table-ref x "matt") "evolution-calen"))

DELETED loadwatch/queuefeeder-server.scm
Index: loadwatch/queuefeeder-server.scm
==================================================================
--- loadwatch/queuefeeder-server.scm
+++ /dev/null
@@ -1,185 +0,0 @@
-;;======================================================================
-;; Copyright 2015-2015, Matthew Welland.
-;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
-;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
-;;======================================================================
-
-;; Queue Feeder. Use a crude droop curve to limit feeding jobs into a queue
-;;               to prevent slamming the queue
-
-;;======================================================================
-;; Methodology
-;;
-;;   Connect to the server, the server delays the appropriate time (if 
-;;   any) and then launch the task.
-;;
-
-(use nanomsg posix regex)
-
-;; (use trace)
-;; (trace nn-bind nn-socket nn-assert nn-recv nn-send thread-terminate! nn-close )
-
-(define port  22022)
-
-;; get needed stuff from commandline
-;;
-(define queuelen #f)
-(define cmd '()) ;; cmd is run to give a count of the queue length => returns number in queue
-
-(define usage "Usage: queuefeeder-server port target_queue_length command
-       where command is a script or program that gives an integer on stdout of current queue length")
-
-(let ((args (argv)))
-  (if (> (length args) 3)
-      (begin
-	(set! port     (cadr args))
-	(set! queuelen (string->number (caddr args)))
-	(set! cmd      (cadddr args))) ;; no params supported
-      (begin
-	(print usage)
-	(exit))))
-
-(if (not queuelen)
-    (begin
-      (print "queuelen must be a number")
-      (print usage)
-      (exit)))
-
-(print "Running queue feeder with port=" port ", command=" cmd)
-
-(define rep   (nn-socket 'rep))
-
-(print "connecting, got: " (nn-bind    rep  (conc "tcp://" "*" ":" port)))
-
-(define *current-delay* 0)
-(define (exp-droop-calc x targ)
-  (cond
-   ((> (- x targ) 1) 136) ;; top off at 136 seconds
-   (else 
-    (let ((res (* 50 (exp (- x targ)))))
-      (cond
-       ((and (> res 0)(< res 0.01)) 0.01)
-       ((> res 45)                  45) ;; cap at 45 seconds
-       (else res))))))
-
-;; x input value (current number in the queue)
-;; targ is the desired queue length
-;;
-(define (piecewise-droop-calc x targ)
-  (let ((top 50))
-    (cond
-     ((> (- x targ) 0)
-      top) ;; top off at top seconds
-     ((> x (- targ top))
-      (+ (* 1 (- x (- targ top)))
-	 (/ (- top targ) targ)))
-     (else (let ((res (/ x targ)))
-	     (if (< res 0.01)
-		 0.01
-		 res))))))
-
-(define (server soc)
-  (print "server starting")
-  (let loop ((msg-in (nn-recv soc))
-	     (count  0))
-    (if (eq? 0 (modulo count 1000))
-	(print "server received: " msg-in ", count=" count))
-    (cond
-     ((equal? msg-in "quit")
-      (nn-send soc "Ok, quitting"))
-     ((and (>= (string-length msg-in) 4)
-	   (equal? (substring msg-in 0 4) "ping"))
-      (nn-send soc (conc (current-process-id)))
-      (loop (nn-recv soc)(+ count 1)))
-     (else
-      (mutex-lock! *current-delay-mutex*)
-      (let ((current-delay *current-delay*))
-	(mutex-unlock! *current-delay-mutex*)
-	;; (thread-sleep! current-delay)
-	(nn-send soc (conc current-delay " hello " msg-in " you waited " current-delay " seconds"))
-	(loop (nn-recv soc)(if (> count 20000000)
-			       0
-			       (+ count 1))))))))
-
-(define (ping-self host port #!key (return-socket #t))
-  ;; send a random number along with pid and check that we get it back
-  (let* ((req     (nn-socket 'req))
-	 (key     "ping")
-	 (success #f)
-	 (keepwaiting #t)
-	 (ping    (make-thread
-		   (lambda ()
-		     (print "ping: sending string \"" key "\", expecting " (current-process-id))
-		     (nn-send req key)
-		     (let ((result  (nn-recv req)))
-		       (if (equal? (conc (current-process-id)) result)
-			   (begin
-			     (print "ping, success: received \"" result "\"")
-			     (set! success #t))
-			   (begin
-			     (print "ping, failed: received key \"" result "\"")
-			     (set! keepwaiting #f)
-			     (set! success #f)))))
-		   "ping"))
-	 (timeout (make-thread (lambda ()
-				 (let loop ((count 0))
-				   (thread-sleep! 1)
-				   (print "still waiting after " count " seconds...")
-				   (if (and keepwaiting (< count 10))
-				       (loop (+ count 1))))
-				 (if keepwaiting
-				     (begin
-				       (print "timeout waiting for ping")
-				       (thread-terminate! ping))))
-			       "timeout")))
-    (nn-connect req (conc "tcp://" host ":" port))
-    (handle-exceptions
-     exn
-     (begin
-       (print-call-chain)
-       (print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
-       (print "exn=" (condition->list exn))
-       (print "ping failed to connect to " host ":" port))
-     (thread-start! timeout)
-     (thread-start! ping)
-     (thread-join! ping)
-     (if success (thread-terminate! timeout)))
-    (if return-socket
-	(if success req #f)
-	(begin
-	  (nn-close req)
-	  success))))
-
-(define *current-delay-mutex* (make-mutex))
-
-;; update the *current-delay* value every minute or QUEUE_CHK_DELAY seconds
-(thread-start! (make-thread (lambda ()
-			      (let ((delay-time (string->number (or (get-environment-variable "QUEUE_CHK_DELAY") "30"))))
-				(let loop ()
-				  (with-input-from-pipe 
-				   cmd  ;;; my query to get queue length
-				   (lambda ()
-				     (let* ((val       (read))
-					    (droop-val (if (number? val)(piecewise-droop-calc val queuelen) #f)))
-				       ;; val is number of jobs in queue. Use a linear droop of val/40
-				       (mutex-lock! *current-delay-mutex*)
-				       (set! *current-delay* (or droop-val 30)) ;; (/ (or droop-val 100) 50))
-				       (mutex-unlock! *current-delay-mutex*)
-				       (print "droop-val=" droop-val)
-				       (thread-sleep! delay-time))))
-				  (loop))))))
-
-(let ((server-thread (make-thread (lambda ()(server rep)) "server")))
-  (thread-start! server-thread)
-  (if (ping-self (get-host-name) port)
-      (begin
-	(thread-join! server-thread)
-	(nn-close rep))
-      (print "ping failed")))
-
-(exit)

DELETED loadwatch/queuefeeder.scm
Index: loadwatch/queuefeeder.scm
==================================================================
--- loadwatch/queuefeeder.scm
+++ /dev/null
@@ -1,96 +0,0 @@
-;;======================================================================
-;; Copyright 2015-2015, Matthew Welland.
-;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
-;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
-;;======================================================================
-
-;; Queue Feeder. Use a crude droop curve to limit feeding jobs into a queue
-;;               to prevent slamming the queue
-
-;;======================================================================
-;; Methodology
-;;
-;;   Connect to the server, the server delays the appropriate time (if 
-;;   any) and then launch the task.
-;;
-(use nanomsg posix regex message-digest md5)
-
-(define req   (nn-socket 'req))
-
-;; get needed stuff from commandline
-;;
-(define hostport #f)
-(define cmd '())
-
-(let ((args (argv)))
-  (if (> (length args) 2)
-      (begin
-	(set! hostport (cadr args))
-	(set! cmd      (cddr args)))
-      (begin
-	(print "Usage: queuefeeder host:port command params ....")
-	(exit))))
-
-(nn-connect req  (conc "tcp://" hostport)) ;; xena:22022")
-
-(define (client-send-receive soc msg)
-  (nn-send soc msg)
-  (nn-recv soc))
-
-;; Generate a unique signature for this client location
-;;
-(define (make-signature)
-  (message-digest-string (md5-primitive) 
-                         (with-output-to-string
-                           (lambda ()
-                             (write (current-directory))))))
-
-;; (define ((talk-to-server soc))
-;;   (let loop ((cnt 200000))
-;;     (let ((name (list-ref '("Matt" "Tom" "Bob" "Jill" "James" "Jane")(random 6))))
-;;       ;; (print "Sending " name)
-;;       ;; (print
-;;       (client-send-receive req name) ;; )
-;;       (if (> cnt 0)(loop (- cnt 1)))))
-;;   (print (client-send-receive req "quit"))
-;;   (nn-close req)
-;;   (exit))
-;; 
-
-(define (get-delay signature)
-  (let* ((full-msg   (client-send-receive req (conc (current-user-name) "@" (get-host-name) ":" signature))))
-    (print "Got " full-msg)
-    (let* ((reply-msg  (string-match "^([\\d\\.]+)\\s+(.*)$" full-msg))
-	   (delay-time (if (> (length reply-msg) 2)
-			   (string->number (cadr reply-msg))
-			   1)) ;; fall back to one sec delay
-	   (msg        (if (> (length reply-msg) 2)
-			   (caddr reply-msg)
-			   full-msg)))
-      (values delay-time msg))))
-
-
-(let ((signature (make-signature)))
-  
-  (thread-start! (lambda ()
-		   (thread-sleep! 60)
-		   (print "Give up on waiting for the server")
-		   ;; (nn-close req)
-		   ;; (exit)
-		   ))
-  (thread-join! (thread-start! (lambda ()
-				 (let-values 
-				  (((delay-time msg)(get-delay signature)))
-				  (print "INFO: sleeping " delay-time " seconds per request of queuefeeder server")
-				  (thread-sleep! delay-time)
-				  (print "INFO: done waiting, now executing requested task.")))))
-  (nn-close req))
-
-(process-execute (car cmd) (cdr cmd))
-
-

DELETED loadwatch/testopenlava.sh
Index: loadwatch/testopenlava.sh
==================================================================
--- loadwatch/testopenlava.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-job_order=$1
-job_length=$2
-
-echo "START: $job_order" > $job_order.log
-sleep $job_length
-echo "END: $job_order" >> $job_order.log
-

Index: lock-queue.scm
==================================================================
--- lock-queue.scm
+++ lock-queue.scm
@@ -1,16 +1,24 @@
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
-(use sqlite3 srfi-18)
-(import (prefix sqlite3 sqlite3:))
+(use (prefix sqlite3 sqlite3:) srfi-18)
 
 (declare (unit lock-queue))
 (declare (uses common))
 (declare (uses tasks))
 
@@ -33,11 +41,11 @@
   (let ((fname (lock-queue:db-dat-get-path dbdat)))
     (system (conc "rm -f " fname "*"))))
 
 (define (lock-queue:open-db fname #!key (count 10))
   (let* ((actualfname (conc fname ".lockdb"))
-	 (dbexists (file-exists? actualfname))
+	 (dbexists (common:file-exists? actualfname))
 	 (db       (sqlite3:open-database actualfname))
 	 (handler  (make-busy-timeout 136000)))
     (if dbexists
 	(vector db actualfname)
 	(begin
@@ -164,12 +172,12 @@
 	     ;; If we've tried ten times and failed there is a serious problem
 	     ;; try to remove the lock db and allow it to be recreated
 	     (handle-exceptions
 	      exn
 	      #f
-	      (if (file-exists? journal)(delete-file journal))
-	      (if (file-exists? fname)  (delete-file fname))
+	      (if (common:file-exists? journal)(delete-file journal))
+	      (if (common:file-exists? fname)  (delete-file fname))
 	      #f))))
      (sqlite3:execute (lock-queue:db-dat-get-db dbdat) "DELETE FROM runlocks WHERE test_id=?;" test-id)
      (sqlite3:finalize! (lock-queue:db-dat-get-db dbdat)))))
 
 (define (lock-queue:steal-lock dbdat test-id #!key (count 10))

Index: margs.scm
==================================================================
--- margs.scm
+++ margs.scm
@@ -1,13 +1,22 @@
 ;; Copyright 2007-2010, Matthew Welland.
 ;;
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
-;;
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 
 (declare (unit margs))
 ;; (declare (uses common))
 
 (define args:arg-hash (make-hash-table))

Index: megatest-version.scm
==================================================================
--- megatest-version.scm
+++ megatest-version.scm
@@ -1,7 +1,23 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;; Always use two or four digit decimal
 ;; 1.01, 1.02...1.10,1.11,1.1101 ... 1.99,2.00..
 
 (declare (unit megatest-version))
 
-(define megatest-version 1.6404)
-
+(define megatest-version 1.6524)

Index: megatest.config
==================================================================
--- megatest.config
+++ megatest.config
@@ -1,22 +1,74 @@
-[fields]
-a text
-b text
-c text
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+## commented out due to a bug in v1.6501 in mtutil
+## [fields]
+## a text
+## b text
+## c text
+usercode    .mtutil.scm
+areafilter  area-to-run
+targtrans   generic-target-translator
+runtrans    generic-runname-translator
 
 [setup]
-pktsdirs /tmp/pkts /some/other/source
+pktsdirs /tmp/mt_pkts /some/other/source
 
 [areas]
 #         path-to-area   map-target-script(future, optional)
-fullrun   path=tests/fullrun
+# someqa     path=../megatestqa/someqa; targtrans=somefunc; areafilter=area-to-run
+fullrun   path=tests/fullrun; 
 # targtrans is name of scheme proc stored in .mtutil.scm, which lives in PWD where mtutil is run
+#           the target translator can return: a/target OR (list/of targets/to apply/run) OR #f i.e. run nothing
 # ext-tests path=ext-tests; targtrans=prefix-contour;
-ext-tests path=ext-tests
+ext       path=ext-tests
 
 [contours]
-#     mode-patt/tag-expr
-quick selector=QUICKPATT/quick
-full  areas=fullrun,ext-tests; selector=MAXPATT/
-all   areas=fullrun,ext-tests
-snazy areas=%; selector=QUICKPATT/
+#     selector=tag-expr/mode-patt
+quick areas=ext;    selector=/QUICKPATT
+quick2 areafn=check-area; selector=/QUICKPATT
+# quick areas=fullrun,ext-tests; selector=QUICKPATT/quick
+# full  areas=fullrun,ext-tests; selector=MAXPATT/
+# short areas=fullrun,ext-tests; selector=MAXPATT/
+# all   areas=fullrun,ext-tests
+# snazy selector=QUICKPATT/
+
+[nopurpose]
+
+[access]
+ext matt:admin mattw:owner
+
+[accesstypes]
+admin run rerun resume remove set-ss rerun-clean
+owner run rerun resume remove rerun-all
+badguy set-ss
+
+[setup]
+maxload 1.2
+
+[listeners]
+localhost:12345  contact=matt@kiatoa.com
+localhost:54321  contact=matt@kiatoa.com
+
+[listener]
+script nbfake echo
+
+
+[server]
+timeout 1
 
+[include local.config]

Index: megatest.scm
==================================================================
--- megatest.scm
+++ megatest.scm
@@ -1,30 +1,37 @@
 ;; Copyright 2006-2017, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 ;; (include "common.scm")
 ;; (include "megatest-version.scm")
 
 ;; fake out readline usage of toplevel-command
 (define (toplevel-command . a) #f)
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 base64 readline apropos json http-client directory-utils rpc typed-records;; (srfi 18) extras)
-     http-client srfi-18 extras format) ;;  zmq extras)
+(use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (prefix base64 base64:)
+     readline apropos json http-client directory-utils typed-records
+     http-client srfi-18 extras format)
 
 ;; Added for csv stuff - will be removed
 ;;
 (use sparse-vectors)
 
-(import (prefix sqlite3 sqlite3:))
-(import (prefix base64 base64:))
-(import (prefix rpc rpc:))
 (require-library mutils)
 
 ;; (use zmq)
 
 (declare (uses common))
@@ -34,52 +41,81 @@
 (declare (uses launch))
 (declare (uses server))
 (declare (uses client))
 (declare (uses tests))
 (declare (uses genexample))
-(declare (uses daemon))
+;; (declare (uses daemon))
 (declare (uses db))
 ;; (declare (uses dcommon))
 
 (declare (uses tdb))
 (declare (uses mt))
 (declare (uses api))
 (declare (uses tasks)) ;; only used for debugging.
 (declare (uses env))
 (declare (uses diff-report))
+(declare (uses ftail))
+(import ftail)
 
 (define *db* #f) ;; this is only for the repl, do not use in general!!!!
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "megatest-fossil-hash.scm")
 
+(define *usage-log-file* #f)    ;; put path to file for logging usage in this var in the ~/.megatestrc file
+(define *usage-use-seconds* #t) ;; for Epoc seconds in usage logging change this to #t in ~/.megatestrc file
+
+;; load the ~/.megatestrc file, put (use trace)(trace-call-sites #t)(trace function-you-want-to-trace) in this file
+;;
 (let ((debugcontrolf (conc (get-environment-variable "HOME") "/.megatestrc")))
-  (if (file-exists? debugcontrolf)
+  (if (common:file-exists? debugcontrolf)
       (load debugcontrolf)))
+
+;; usage logging, careful with this, it is not designed to deal with all real world challenges!
+;;
+(if (and *usage-log-file*
+         (file-write-access? *usage-log-file*))
+    (with-output-to-file
+        *usage-log-file*
+      (lambda ()
+        (print
+         (if *usage-use-seconds*
+             (current-seconds)
+             (time->string
+              (seconds->local-time (current-seconds))
+              "%Yww%V.%w %H:%M:%S"))
+         " "
+         (current-user-name) " "
+         (current-directory) " "
+         "\"" (string-intersperse (argv) " ") "\""))
+      #:append))
 
 ;; Disabled help items
 ;;  -rollup                 : (currently disabled) fill run (set by :runname)  with latest test(s)
 ;;                            from prior runs with same keys
 ;;  -daemonize              : fork into background and disconnect from stdin/out
 
 (define help (conc "
 Megatest, documentation at http://www.kiatoa.com/fossils/megatest
   version " megatest-version "
-  license GPL, Copyright Matt Welland 2006-2015
-
+  license GPL, Copyright Matt Welland 2006-2017
+ 
 Usage: megatest [options]
   -h                      : this help
   -manual                 : show the Megatest user manual
   -version                : print megatest version (currently " megatest-version ")
 
 Launching and managing runs
   -run                    : run all tests or as specified by -testpatt
   -remove-runs            : remove the data for a run, requires -runname and -testpatt
-                            Optionally use :state and :status
+                            Optionally use :state and :status, use -keep-records to remove only
+                            the run data.
+  -kill-runs               : kill existing run(s) (all incomplete tests killed)
+  -kill-rerun              : kill an existing run (all incomplete tests killed and run is rerun)
   -set-state-status X,Y   : set state to X and status to Y, requires controls per -remove-runs
   -rerun FAIL,WARN...     : force re-run for tests with specificed status(s)
   -rerun-clean            : set all tests not COMPLETED+PASS,WARN,WAIVED to NOT_STARTED,n/a
                             and then run the specified testpatt with -preclean
   -rerun-all              : set all tests to NOT_STARTED,n/a and run with -preclean
@@ -89,20 +125,27 @@
   -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
   -clean-cache            : remove the cached megatest.config and runconfigs.config files
   -no-cache               : do not use the cached config files. 
+  -one-pass               : launch as many tests as you can but do not wait for more to be ready
+  -remove-keep N          : remove all but N most recent runs per target; use '-actions, -age, -precmd'
+  -age               : 120d,3h,20m to apply only to runs older than the 
+                                 specified age. NB// M=month, m=minute
+  -actions        : print,remove-runs,archive to specify action to take
+  -precmd                 : insert a wrapper command in front of the commands run
 
 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  in runconfigs instead of default TESTPATT if -testpatt and -tagexpr are not specified
+  -modepatt key           : load testpatt from  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
@@ -133,21 +176,23 @@
   -list-disks             : list the disks available for storing runs
   -list-targets           : list the targets in runconfigs.config
   -list-db-targets        : list the target combinations used in the db
   -show-config            : dump the internal representation of the megatest.config file
   -show-runconfig         : dump the internal representation of the runconfigs.config file
-  -dumpmode MODE          : dump in MODE format instead of sexpr, MODE=json,ini,sexp etc.
+  -dumpmode MODE          : dump in MODE format instead of sexpr, MODE=json,ini,sexp etc. (add -debug 0,9 to see which file contributes each line)
   -show-cmdinfo           : dump the command info for a test (run in test environment)
   -section sectionName
   -var varName            : for config and runconfig lookup value for sectionName varName
   -since N                : get list of runs changed since time N (Unix seconds)
   -fields fieldspec       : fields to include in json dump; runs:id,runame+tests:testname+steps
   -sort fieldname         : in -list-runs sort tests by this field
+  -testdata-csv [categorypatt/]varpatt  : dump testdata for given category
 
 Misc 
   -start-dir path         : switch to this directory before running megatest
   -contour cname          : add a level of hierarcy to the linktree and run paths
+  -area-tag tagname       : add a tag to an area while syncking to pgdb
   -rebuild-db             : bring the database schema up to date
   -cleanup-db             : remove any orphan records, vacuum the db
   -import-megatest.db     : push data from megatest.db to cache db files in /tmp/$USER
   -sync-to-megatest.db    : pull data from cache files in /tmp/$USER to megatest.db
   -sync-to dest           : sync to new postgresql central style database
@@ -180,11 +225,19 @@
                             multiple sheets)
   -o                      : output file for refdb2dat (defaults to stdout)
   -archive cmd            : archive runs specified by selectors to one of disks specified
                             in the [archive-disks] section.
                             cmd: keep-html, restore, save, save-remove
-  -generate-html          : create a simple html tree for browsing your runs
+  -generate-html          : create a simple html dashboard for browsing your runs
+  -generate-html-structure  : create a top level html veiw to list targets/runs and a Run view within each run directory.  
+  -list-run-time          : list time requered to complete runs. It supports following switches
+                            -run-patt  -target-patt  -dumpmode 
+  -list-test-time	   : list time requered to complete each test in a run. It following following arguments
+                            -runname  -target  -dumpmode 
+
+  		
+
 
 Diff report
   -diff-rep               : generate diff report (must include -src-target, -src-runname, -target, -runname
                                                   and either -diff-email or -diff-html)
   -src-target 
@@ -228,20 +281,23 @@
 			":state"  
 			"-state"
 			":status"
 			"-status"
 			"-list-runs"
+                        "-testdata-csv"
 			"-testpatt"
                         "--modepatt"
+                        "-modepatt"
                         "-tagexpr"
 			"-itempatt"
 			"-setlog"
 			"-set-toplog"
 			"-runstep"
 			"-logpro"
 			"-m"
 			"-rerun"
+
 			"-days"
 			"-rename-run"
 			"-to"
 			;; values and messages
 			":category"
@@ -250,11 +306,15 @@
 			":expected"
 			":tol"
 			":units"
 			;; misc
 			"-start-dir"
+                        "-run-patt"
+                        "-target-patt"   
 			"-contour"
+                        "-area-tag"  
+                        "-area"  
 			"-server"
 			"-transport"
 			"-port"
 			"-extract-ods"
 			"-pathmod"
@@ -261,11 +321,19 @@
 			"-env2file"
 			"-envcap"
 			"-envdelta"
 			"-setvars"
 			"-set-state-status"
+
+                        ;; move runs stuff here
+                        "-remove-keep"           
 			"-set-run-status"
+			"-age"
+			"-archive"
+			"-actions"
+			"-precmd"
+			
 			"-debug" ;; for *verbosity* > 2
 			"-create-test"
 			"-override-timeout"
 			"-test-files"  ;; -test-paths is for listing all
 			"-load"        ;; load and exectute a scheme file
@@ -275,11 +343,11 @@
 			"-run-id"
 			"-ping"
 			"-refdb2dat"
 			"-o"
 			"-log"
-			"-archive"
+                        "-sync-log"
 			"-since"
 			"-fields"
 			"-recover-test" ;; run-id,test-id - used internally to recover a test stuck in RUNNING state
 			"-sort"
 			"-target-db"
@@ -319,13 +387,16 @@
 			"-lock"
 			"-unlock"
 			"-list-servers"
 			"-kill-servers"
                         "-run-wait"      ;; wait on a run to complete (i.e. no RUNNING)
+			"-one-pass"       ;;
 			"-local"         ;; run some commands using local db access
-                        "-generate-html"
-
+      "-generate-html"
+      "-generate-html-structure" 
+			"-list-run-time"
+                        "-list-test-time"
 			;; misc queries
 			"-list-disks"
 			"-list-targets"
 			"-list-db-targets"
 			"-show-runconfig"
@@ -337,10 +408,13 @@
 			"-test-paths" ;; get path(s) to a test, ordered by youngest first
 
 			"-runall"    ;; run all tests, respects -testpatt, defaults to %
 			"-run"       ;; alias for -runall
 			"-remove-runs"
+                        "-kill-runs"
+                        "-kill-rerun"
+                        "-keep-records" ;; use with -remove-runs to remove only the run data
 			"-rebuild-db"
 			"-cleanup-db"
 			"-rollup"
 			"-update-meta"
 			"-create-megatest-area"
@@ -348,11 +422,10 @@
 
 			"-convert-to-norm"
 			"-convert-to-old"
 			"-import-megatest.db"
 			"-sync-to-megatest.db"
-			
 			"-logging"
 			"-v" ;; verbose 2, more than normal (normal is 1)
 			"-q" ;; quiet 0, errors/warnings only
 
                         "-diff-rep"
@@ -372,11 +445,11 @@
     (debug:print-error 0 *default-log-port* "Unrecognised arguments: " (string-intersperse (if (list? remargs) remargs (argv))  " ")))
 
 ;; before doing anything else change to the start-dir if provided
 ;;
 (if (args:get-arg "-start-dir")
-    (if (file-exists? (args:get-arg "-start-dir"))
+    (if (common:file-exists? (args:get-arg "-start-dir"))
         (let ((fullpath (common:real-path (args:get-arg "-start-dir"))))
           (setenv "PWD" fullpath)
           (change-directory fullpath))
 	(begin
 	  (debug:print-error 0 *default-log-port* "non-existant start dir " (args:get-arg "-start-dir") " specified, exiting.")
@@ -389,25 +462,35 @@
 
 ;; The watchdog is to keep an eye on things like db sync etc.
 ;;
 
 ;; TODO: for multiple areas, we will have multiple watchdogs; and multiple threads to manage
-(define *watchdog* (make-thread common:watchdog "Watchdog thread"))
+(define *watchdog* (make-thread
+		    (lambda ()
+		      (handle-exceptions
+			  exn
+			  (begin
+			    (print-call-chain)
+			    (print " message: " ((condition-property-accessor 'exn 'message) exn)))
+			(common:watchdog)))
+		    "Watchdog thread"))
 
 ;;(if (not (args:get-arg "-server"))
 ;;    (thread-start! *watchdog*)) ;; if starting a server; wait till we get to running state before kicking off watchdog
 (let* ((no-watchdog-args
        '("-list-runs"
+         "-testdata-csv"
          "-list-servers"
          "-server"
          "-list-disks"
          "-list-targets"
          "-show-runconfig"
          ;;"-list-db-targets"
          "-show-runconfig"
          "-show-config"
-         "-show-cmdinfo"))
+         "-show-cmdinfo"
+	 "-cleanup-db"))
        (no-watchdog-args-vals (filter (lambda (x) x)
                                       (map args:get-arg no-watchdog-args)))
        (start-watchdog (null? no-watchdog-args-vals)))
   ;;(BB> "no-watchdog-args="no-watchdog-args "no-watchdog-args-vals="no-watchdog-args-vals) 
   (if start-watchdog
@@ -424,18 +507,21 @@
    (exn ()
         (debug:print-error 0 *default-log-port* "Could not open log file for write: "logpath)
         (define *didsomething* #t)  
         (exit 1))))
 
-    
+;; this segment will run launch:setup only if -log is not set. This is fairly safe as servers are not
+;; manually started and thus should never be started in a non-megatest area. Thus no need to handle situation
+;; where (launch:setup) returns #f?
+;;
 (if (or (args:get-arg "-log")(args:get-arg "-server")) ;; redirect the log always when a server
     (handle-exceptions
 	exn
 	(begin
-	  (print "ERROR: Failed to switch to log output. " ((conition-property-accessor 'exn 'message) exn))
+	  (print "ERROR: Failed to switch to log output. " ((condition-property-accessor 'exn 'message) exn))
 	  )
-      (let* ((tl   (or (args:get-arg "-log")(launch:setup)))   ;; run launch:setup if -server
+      (let* ((tl   (or (args:get-arg "-log")(launch:setup)))   ;; run launch:setup if -server, ensure we do NOT run launch:setup if -log specified
 	     (logf (or (args:get-arg "-log") ;; use -log unless we are a server, then craft a logfile name
 		       (conc tl "/logs/server-" (current-process-id) "-" (get-host-name) ".log")))
 	     (oup  (open-logfile logf)))
 	(if (not (args:get-arg "-log"))
 	    (hash-table-set! args:arg-hash "-log" logf)) ;; fake out future queries of -log
@@ -453,11 +539,11 @@
     (let* ((htmlviewercmd (or (configf:lookup *configdat* "setup" "htmlviewercmd")
 			      (common:which '("firefox" "arora"))))
 	   (install-home  (common:get-install-area))
 	   (manual-html   (conc install-home "/share/docs/megatest_manual.html")))
       (if (and install-home
-	       (file-exists? manual-html))
+	       (common:file-exists? manual-html))
 	  (system (conc "(" htmlviewercmd " " manual-html " ) &"))
 	  (system (conc "(" htmlviewercmd " http://www.kiatoa.com/cgi-bin/fossils/megatest/doc/tip/docs/manual/megatest_manual.html ) &")))
       (exit)))
 
 (if (args:get-arg "-version")
@@ -492,12 +578,26 @@
 		       (process:children #f))
 		      (original-exit exit-code)))))
 
 ;; for some switches always print the command to stderr
 ;;
-(if (args:any? "-run" "-runall" "-remove-runs" "-set-state-status")
+(if (args:any? "-run" "-runall" "-remove-runs" "-set-state-status" "-kill-runs" "-kill-rerun")
     (debug:print 0 *default-log-port* (string-intersperse (argv) " ")))
+
+;; some switches imply homehost. Exit here if not on homehost
+;;
+(let ((homehost-required  (list "-cleanup-db" "-server")))
+  (if (apply args:any? homehost-required)
+      (if (not (common:on-homehost?))
+	  (for-each
+	   (lambda (switch)
+	     (if (args:get-arg switch)
+		 (begin
+		   (debug:print 0 *default-log-port* "ERROR: you must be on the homehost to run with " switch
+				", you can move homehost by removing the .homehost file but this will disrupt any runs in progress.")
+		   (exit 1))))
+	   homehost-required))))
 
 ;;======================================================================
 ;; Misc setup stuff
 ;;======================================================================
 
@@ -534,11 +634,15 @@
 ;; handle a clean-cache request as early as possible
 ;;
 (if (args:get-arg "-clean-cache")
     (let ((toppath  (launch:setup)))
       (set! *didsomething* #t) ;; suppress the help output.
-      (runs:clean-cache (getenv "MT_TARGET")(args:get-arg "-runname") toppath)))
+      (runs:clean-cache (or (getenv "MT_TARGET")
+			    (args:get-arg "-target")
+			    (args:get-arg "-remtarg"))
+			(args:get-arg "-runname")
+			toppath)))
 	  
 (if (args:get-arg "-env2file")
     (begin
       (save-environment-as-files (args:get-arg "-env2file"))
       (set! *didsomething* #t)))
@@ -690,11 +794,11 @@
 				 (else
 				  (loop row (+ col 1) (append curr-row (list val)) result)))))))))
 		    (hash-table-keys results))))
 		((sqlite3)
 		 (let* ((db-file   (or out-file (pathname-file input-db)))
-			(db-exists (file-exists? db-file))
+			(db-exists (common:file-exists? db-file))
 			(db        (sqlite3:open-database db-file)))
 		   (if (not db-exists)(sqlite3:execute db "CREATE TABLE data (sheet,section,var,val);"))
 		   (configf:map-all-hier-alist
 		    data
 		    (lambda (sheetname sectionname varname val)
@@ -750,11 +854,11 @@
 		    (lambda ()
 		      (env:print added removed changed)))
 		  (env:print added removed changed))
 	      (env:close-database db)
 	      (set! *didsomething* #t))
-	    (debug:print-error 0 *default-log-port* "Parameter to -envdelta should be new=star-end")))))
+	    (debug:print-error 0 *default-log-port* "Parameter to -envdelta should be new=start-end")))))
 
 ;;======================================================================
 ;; 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
 ;;======================================================================
@@ -838,11 +942,11 @@
   (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)
+	     (common:file-exists? cfgf)
 	     (file-write-access? cfgf)
 	     (common:use-cache?))
 	(configf:read-alist cfgf)
 	(let* ((keys   (rmt:get-keys))
 	       (target (common:args-get-target))
@@ -861,12 +965,13 @@
 		   (file-write-access? rundir))
 	      (begin
                 (if (not (common:in-running-test?))
                     (configf:write-alist data cfgf))
 		;; force re-read of megatest.config - this resolves circular references between megatest.config
-		(launch:setup force: #t)
-		(launch:cache-config))) ;; we can safely cache megatest.config since we have a valid runconfig
+		(launch:setup force-reread: #t)
+		;; (launch:cache-config) ;; there are two independent config cache locations, turning this one off for now. MRW.
+		)) ;; we can safely cache megatest.config since we have a valid runconfig
 	  data))))
 
 (if (args:get-arg "-show-runconfig")
     (let ((tl (launch:setup)))
       (push-directory *toppath*)
@@ -901,15 +1006,16 @@
 	(let ((val (configf:lookup data (args:get-arg "-section")(args:get-arg "-var"))))
 	  (if val (print val))))
 
        ;; print just a section if only -section
 
-       ((not (args:get-arg "-dumpmode"))
+       ((equal? (args:get-arg "-dumpmode") "sexp")
 	(pp (hash-table->alist data)))
-       ((string=? (args:get-arg "-dumpmode") "json")
+       ((equal? (args:get-arg "-dumpmode") "json")
 	(json-write data))
-       ((string=? (args:get-arg "-dumpmode") "ini")
+       ((or (not (args:get-arg "-dumpmode"))
+	    (string=? (args:get-arg "-dumpmode") "ini"))
 	(configf:config->ini data))
        (else
 	(debug:print-error 0 *default-log-port* "-dumpmode of " (args:get-arg "-dumpmode") " not recognised")))
       (set! *didsomething* #t)
       (pop-directory)
@@ -928,11 +1034,11 @@
 ;; Remove old run(s)
 ;;======================================================================
 
 ;; since several actions can be specified on the command line the removal
 ;; is done first
-(define (operate-on action)
+(define (operate-on action #!key (mode #f)) ;; #f is "use default"
   (let* ((runrec (runs:runrec-make-record))
 	 (target (common:args-get-target)))
     (cond
      ((not target)
       (debug:print-error 0 *default-log-port* "Missing required parameter for " action ", you must specify -target or -reqtarg")
@@ -939,11 +1045,11 @@
       (exit 1))
      ((not (or (args:get-arg ":runname")
 	       (args:get-arg "-runname")))
       (debug:print-error 0 *default-log-port* "Missing required parameter for " action ", you must specify the run name pattern with -runname patt")
       (exit 2))
-     ((not (args:get-arg "-testpatt"))
+     ((not (or (args:get-arg "-testpatt") (eq? action 'kill-runs)))
       (debug:print-error 0 *default-log-port* "Missing required parameter for " action ", you must specify the test pattern with -testpatt")
       (exit 3))
      (else
       (if (not (car *configinfo*))
 	  (begin
@@ -957,19 +1063,72 @@
 			      target
 			      (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
 			      (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
 			      state: (common:args-get-state)
 			      status: (common:args-get-status)
-			      new-state-status: (args:get-arg "-set-state-status"))))
+			      new-state-status: (args:get-arg "-set-state-status")
+                              mode: mode)))
       (set! *didsomething* #t)))))
+
+(if (args:get-arg "-kill-runs")
+    (general-run-call 
+     "-kill-runs"
+     "kill runs"
+     (lambda (target runname keys keyvals)
+       (operate-on 'kill-runs mode: #f)
+       )))
+
+(if (args:get-arg "-kill-rerun")
+    (let* ((target-patt (args:get-arg "-target"))
+           (runname-patt (args:get-arg "-runname")))
+      (cond ((not target-patt)
+             (debug:print-error 0 *default-log-port* "Missing target, must specify target for -kill-rerun with -target ")
+             (exit 1))
+            ((not runname-patt)
+             (debug:print-error 0 *default-log-port* "Missing runname, must specify runname for -kill-rerun with -runname ")
+             (exit 1))
+            ((string-search "[ ,%]" target-patt)
+             (debug:print-error 0 *default-log-port* "Invalid target ["target-patt"], must specify exact target (no wildcards) for -kill-rerun with -target ")
+             (exit 1))
+            ((string-search "[ ,%]" runname-patt)
+             (debug:print-error 0 *default-log-port* "Invalid runname ["runname-patt"], must specify exact runname (no wildcards) for -kill-rerun with -runname ")
+             (exit 1))
+            (else
+             (general-run-call 
+              "-kill-runs"
+              "kill runs"
+              (lambda (target runname keys keyvals)
+                (operate-on 'kill-runs mode: #f)
+                ))
+      
+             (thread-sleep! 15))
+            ;; fall thru and let "-run" loop fire
+            )))
+
 
 (if (args:get-arg "-remove-runs")
     (general-run-call 
      "-remove-runs"
      "remove runs"
      (lambda (target runname keys keyvals)
-       (operate-on 'remove-runs))))
+       (operate-on 'remove-runs mode: (if (args:get-arg "-keep-records")
+                                          'remove-data-only
+                                          'remove-all)))))
+
+(if (args:get-arg "-remove-keep")
+    (general-run-call 
+     "-remove-keep"
+     "remove keep"
+     (lambda (target runname keys keyvals)
+       (let ((actions (map string->symbol
+                           (string-split
+			    (or (args:get-arg "-actions")
+				"print")
+			    ",")))) ;; default to printing the output
+         (runs:remove-all-but-last-n-runs-per-target target runname
+						     (string->number (args:get-arg "-remove-keep"))
+						     actions: actions)))))
 
 (if (args:get-arg "-set-state-status")
     (general-run-call 
      "-set-state-status"
      "set state and status"
@@ -1023,10 +1182,114 @@
     (if indx
 	(if (>= indx (vector-length datavec))
 	    #f ;; index too high, should raise an error I suppose
 	    (vector-ref datavec indx))
 	#f)))
+
+
+
+
+
+(when (args:get-arg "-testdata-csv")
+  (if (launch:setup)
+      (let* ((keys        (rmt:get-keys)) ;; (db:get-keys dbstruct))
+             (runpatt     (or (args:get-arg "-runname") "%"))
+             (testpatt    (common:args-get-testpatt #f))
+             (datapatt    (args:get-arg "-testdata-csv"))
+             (match-data  (string-match "^([^/]+)/(.*)" (args:get-arg "-testdata-csv")))
+             (categorypatt (if match-data (list-ref match-data 1) "%"))
+             (setvarpatt  (if match-data
+                              (list-ref match-data 2)
+                              (args:get-arg "-testdata-csv")))
+             (runsdat     (rmt:get-runs-by-patt keys (or runpatt "%") 
+                                                (common:args-get-target) #f #f '("id" "runname" "state" "status" "owner" "event_time" "comment") 0))
+             (header      (db:get-header runsdat))
+             (access-mode (db:get-access-mode))
+             (testpatt    (common:args-get-testpatt #f))
+             (fields-spec (if (args:get-arg "-fields")
+                              (extract-fields-constraints (args:get-arg "-fields"))
+                              (list (cons "runs" (append keys (list "id" "runname" "state" "status" "owner" "event_time" "comment" "fail_count" "pass_count")))
+                                    (cons "tests"  db:test-record-fields) ;; "id" "testname" "test_path")
+                                    (list "steps" "id" "stepname"))))
+             (tests-spec  (let ((t (alist-ref "tests" fields-spec equal?)))
+                            (if (and t (null? t)) ;; all fields
+                                db:test-record-fields
+                                t)))
+             (adj-tests-spec (delete-duplicates (if tests-spec (cons "id" tests-spec) db:test-record-fields))) 
+             (test-field-index (make-hash-table))
+             (runs (db:get-rows runsdat))
+             )
+        (if (and tests-spec (not (null? tests-spec))) ;; do some validation and processing of the test-spec
+            (let ((invalid-tests-spec (filter (lambda (x)(not (member x db:test-record-fields))) tests-spec)))
+              (if (null? invalid-tests-spec)
+                  ;; generate the lookup map test-field-name => index-number
+                  (let loop ((hed (car adj-tests-spec))
+                             (tal (cdr adj-tests-spec))
+                             (idx 0))
+                    (hash-table-set! test-field-index hed idx)
+                    (if (not (null? tal))(loop (car tal)(cdr tal)(+ idx 1))))
+                  (begin
+                    (debug:print-error 0 *default-log-port* "Invalid test fields specified: " (string-intersperse invalid-tests-spec ", "))
+                    (exit)))))
+        (let* ((table-header (string-split "target,run,test,itempath,category,var,value,comment" ","))
+               (table-rows
+                (apply append (map  
+                               (lambda (run)
+                                 (let* ((target (string-intersperse (map (lambda (x)
+							 (db:get-value-by-header run header x))
+						       keys) "/"))
+                                        (statuses (string-split (or (args:get-arg "-status") "") ","))
+                                        (run-id  (db:get-value-by-header run header "id"))
+                                        (runname (db:get-value-by-header run header "runname")) 
+                                        (states  (string-split (or (args:get-arg "-state") "") ","))
+                                        (tests   (if tests-spec
+                                                     (db:dispatch-query access-mode rmt:get-tests-for-run db:get-tests-for-run run-id testpatt states statuses #f #f #f 'testname 'asc ;; (db:get-tests-for-run dbstruct run-id testpatt '() '() #f #f #f 'testname 'asc 
+                                                                        ;; use qryvals if test-spec provided
+                                                                        (if tests-spec
+                                                                            (string-intersperse adj-tests-spec ",")
+                                                                            ;; db:test-record-fields
+                                                                            #f)
+                                                                        #f
+                                                                        'normal)
+                                                     '())))
+                                   (apply append
+                                          (map
+                                           (lambda (test)
+                                             (let* (
+                                                    (test-id      (if (member "id"           tests-spec)(get-value-by-fieldname test test-field-index "id"          ) #f)) ;; (db:test-get-id         test))
+                                                    (testname     (if (member "testname"     tests-spec)(get-value-by-fieldname test test-field-index "testname"    ) #f)) ;; (db:test-get-testname   test))
+                                                    (itempath     (if (member "item_path"    tests-spec)(get-value-by-fieldname test test-field-index "item_path"   ) #f)) ;; (db:test-get-item-path  test))
+                                                    (fullname     (conc testname
+                                                                        (if (equal? itempath "")
+                                                                            "" 
+                                                                            (conc "/" itempath ))))
+                                                    (testdat-raw (map vector->list (rmt:read-test-data* run-id test-id categorypatt setvarpatt)))
+                                                    (testdat (filter
+                                                              (lambda (x)
+                                                                (not (equal? "logpro"
+                                                                             (list-ref x 10))))
+                                                              testdat-raw)))
+                                               (map 
+                                                (lambda (item)
+                                                  (receive (id test_id category
+                                                               variable value expected
+                                                               tol units comment status type)
+                                                      (apply values item)
+                                                    (list target runname testname itempath category variable value comment)))
+                                                testdat)))
+                                           tests))))
+                               runs))))
+          (print (string-join table-header ","))
+          (for-each (lambda(table-row)
+                      (print (string-join (map ->string table-row) ",")))
+
+                    
+                            table-rows))))
+  (set! *didsomething* #t)
+  (set! *time-to-exit* #t))
+
+
 
 ;; NOTE: list-runs and list-db-targets operate on local db!!!
 ;;
 ;; IDEA: megatest list -runname blah% ...
 ;;
@@ -1160,11 +1423,11 @@
 		      (lambda (test)
 		      	(common:debug-handle-exceptions #f
 			 exn
 			 (begin
 			   (debug:print-error 0 *default-log-port* "Bad data in test record? " test)
-			   (print "exn=" (condition->list exn))
+			   (debug:print-error 5 *default-log-port* "exn=" (condition->list exn))
 			   (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
 			   (print-call-chain (current-error-port)))
 			 (let* ((test-id      (if (member "id"           tests-spec)(get-value-by-fieldname test test-field-index "id"          ) #f)) ;; (db:test-get-id         test))
 				(testname     (if (member "testname"     tests-spec)(get-value-by-fieldname test test-field-index "testname"    ) #f)) ;; (db:test-get-testname   test))
 				(itempath     (if (member "item_path"    tests-spec)(get-value-by-fieldname test test-field-index "item_path"   ) #f)) ;; (db:test-get-item-path  test))
@@ -1402,62 +1665,75 @@
 ;; run all tests are are Not COMPLETED and PASS or CHECK
 (if (or (args:get-arg "-runall")
 	(args:get-arg "-run")
 	(args:get-arg "-rerun-clean")
 	(args:get-arg "-rerun-all")
-	(args:get-arg "-runtests"))
-    (general-run-call 
-     "-runall"
-     "run all tests"
-     (lambda (target runname keys keyvals)
-       (if (args:get-arg "-rerun-clean") ;; first set states/statuses correct
-	   (let ((states   (or (configf:lookup *configdat* "validvalues" "cleanrerun-states")
-			       "KILLREQ,KILLED,UNKNOWN,INCOMPLETE,STUCK,NOT_STARTED"))
-		 (statuses (or (configf:lookup *configdat* "validvalues" "cleanrerun-statuses")
-			       "FAIL,INCOMPLETE,ABORT,CHECK")))
-	     (hash-table-set! args:arg-hash "-preclean" #t)
-	     (runs:operate-on 'set-state-status
-			      target
-			      (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
-			      "%" ;; (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
-			      state:  states
-			      ;; status: statuses
-			      new-state-status: "NOT_STARTED,n/a")
-	     (runs:clean-cache target runname *toppath*)
-	     (runs:operate-on 'set-state-status
-			      target
-			      (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
-			      "%" ;; (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
-			      ;; state:  states
-			      status: statuses
-			      new-state-status: "NOT_STARTED,n/a")))
-       ;; RERUN ALL
-       (if (args:get-arg "-rerun-all") ;; first set states/statuses correct
-	   (begin
-	     (hash-table-set! args:arg-hash "-preclean" #t)
-	     (runs:operate-on 'set-state-status
-			      target
-			      (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
-			      "%" ;; (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
-			      state:  #f
-			      ;; status: statuses
-			      new-state-status: "NOT_STARTED,n/a")
-	     (runs:clean-cache target runname *toppath*)
-	     (runs:operate-on 'set-state-status
-			      target
-			      (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
-			      "%" ;; (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
-			      ;; state:  states
-			      status: #f
-			      new-state-status: "NOT_STARTED,n/a")))
-       (runs:run-tests target
-		       runname
-		       #f ;; (common:args-get-testpatt #f)
-		       ;; (or (args:get-arg "-testpatt")
-		       ;;     "%")
-		       user
-		       args:arg-hash))))
+	(args:get-arg "-runtests")
+        (args:get-arg "-kill-rerun"))
+    (let ((need-clean (or (args:get-arg "-rerun-clean")
+                          (args:get-arg "-rerun-all"))))
+      (general-run-call 
+       "-runall"
+       "run all tests"
+       (lambda (target runname keys keyvals)
+         (if (or (args:get-arg "-kill-rerun") (args:get-arg "-rerun-clean")) ;; first set states/statuses correct
+	     ;; For rerun-clean do we or do we not support the testpatt?
+             (let ((states   (or (configf:lookup *configdat* "validvalues" "cleanrerun-states")
+                                 "KILLREQ,KILLED,UNKNOWN,INCOMPLETE,STUCK,NOT_STARTED"))
+                   (statuses (or (configf:lookup *configdat* "validvalues" "cleanrerun-statuses")
+                                 "FAIL,INCOMPLETE,ABORT,CHECK,DEAD,PREQ_FAIL,PREQ_DISCARDED")))
+               (hash-table-set! args:arg-hash "-preclean" #t)
+               (runs:operate-on 'set-state-status
+                                target
+                                (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
+                                ;; "%" ;; (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
+                                (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
+                                state:  states
+                                ;; status: statuses
+                                new-state-status: "NOT_STARTED,n/a")
+               (runs:clean-cache target runname *toppath*)
+               (runs:operate-on 'set-state-status
+                                target
+                                (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
+                                ;; "%" ;; (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
+                                (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
+                                ;; state:  states
+                                status: statuses
+                                new-state-status: "NOT_STARTED,n/a")))
+         ;; RERUN ALL
+         (if (args:get-arg "-rerun-all") ;; first set states/statuses correct
+             (begin
+               (hash-table-set! args:arg-hash "-preclean" #t)
+               (runs:operate-on 'set-state-status
+                                target
+                                (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
+                                "%" ;; (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
+                                state:  #f
+                                ;; status: statuses
+                                new-state-status: "NOT_STARTED,n/a")
+               (runs:clean-cache target runname *toppath*)
+               (runs:operate-on 'set-state-status
+                                target
+                                (common:args-get-runname)  ;; (or (args:get-arg "-runname")(args:get-arg ":runname"))
+                                "%" ;; (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")
+                                ;; state:  states
+                                status: #f
+                                new-state-status: "NOT_STARTED,n/a")))
+         (let* ((config-reruns      (let ((x (configf:lookup *configdat* "setup" "reruns")))
+			       				(if x (string->number x) #f)))
+               (rerun-cnt (if config-reruns
+                              config-reruns
+                              1)))
+
+         (runs:run-tests target
+                         runname
+                         #f ;; (common:args-get-testpatt #f)
+                         ;; (or (args:get-arg "-testpatt")
+                         ;;     "%")
+                         user
+                         args:arg-hash
+                         run-count: rerun-cnt))))))
 
 ;;======================================================================
 ;; run one test
 ;;======================================================================
 
@@ -1559,11 +1835,11 @@
 	  (let* ((keys     (rmt:get-keys))
 		 ;; db:test-get-paths must not be run remote
 		 (paths    (tests:test-get-paths-matching keys target (args:get-arg "-test-files"))))
 	    (set! *didsomething* #t)
 	    (for-each (lambda (path)
-			(if (file-exists? path)
+			(if (common:file-exists? path)
 			(print path)))	
 		      paths)))
 	;; else do a general-run-call
 	(general-run-call 
 	 "-test-files"
@@ -1849,20 +2125,22 @@
       (if (not (launch:setup))
 	  (begin
 	    (debug:print 0 *default-log-port* "Failed to setup, exiting") 
 	    (exit 1)))
       ;; keep this one local
-      (open-run-close patch-db #f)
+      ;; (open-run-close patch-db #f)
+      (let ((dbstruct (db:setup #f areapath: *toppath*)))
+        (common:cleanup-db dbstruct full: #t))
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-cleanup-db")
     (begin
       (if (not (launch:setup))
 	  (begin
 	    (debug:print 0 *default-log-port* "Failed to setup, exiting") 
 	    (exit 1)))
-      (let ((dbstruct (db:setup *toppath*)))
+      (let ((dbstruct (db:setup #f areapath: *toppath*)))
         (common:cleanup-db dbstruct))
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-mark-incompletes")
     (begin
@@ -1917,11 +2195,11 @@
 	(args:get-arg "-repl")
 	(args:get-arg "-load"))
     (let* ((toppath (launch:setup))
 	   (dbstruct (if (and toppath
                               (common:on-homehost?))
-                         (db:setup)
+                         (db:setup #t)
                          #f))) ;; make-dbr:dbstruct path: toppath local: (args:get-arg "-local")) #f)))
       (if *toppath*
 	  (cond
 	   ((getenv "MT_RUNSCRIPT")
 	    ;; How to run megatest scripts
@@ -2006,39 +2284,64 @@
 ;; ;; ;; redo me       (set! *didsomething* #t)))
 
 (if (args:get-arg "-import-megatest.db")
     (begin
       (db:multi-db-sync 
-       (db:setup)
+       (db:setup #f)
        'killservers
        'dejunk
        'adj-testids
        'old2new
        ;; 'new2old
        )
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-sync-to-megatest.db")
-    (begin
-      (db:multi-db-sync 
-       (db:setup)
-       'new2old
-       )
+    (let* ((dbstruct (db:setup #f))
+	   (tmpdbpth (cdr (dbr:dbstruct-tmpdb dbstruct)))
+	   (lockfile (conc tmpdbpth ".lock"))
+	   (locked   (common:simple-file-lock lockfile)) 
+	   (res      (if locked
+			 (db:multi-db-sync 
+			  dbstruct
+			  'new2old)
+			 #f)))
+      (if res
+	  (begin
+	    (common:simple-file-release-lock lockfile)
+	    (print "Synced " res " records to megatest.db"))
+	  (print "Skipping sync, there is a sync in progress."))
       (set! *didsomething* #t)))
 
 (if (args:get-arg "-sync-to")
     (let ((toppath (launch:setup)))
       (tasks:sync-to-postgres *configdat* (args:get-arg "-sync-to"))
       (set! *didsomething* #t)))
 
+(if (args:get-arg "-list-test-time")
+     (let* ((toppath (launch:setup))) 
+     (task:get-test-times)  
+     (set! *didsomething* #t)))
+
+(if (args:get-arg "-list-run-time")
+     (let* ((toppath (launch:setup))) 
+     (task:get-run-times)  
+     (set! *didsomething* #t)))
+     
 (if (args:get-arg "-generate-html")
     (let* ((toppath (launch:setup)))
       (if (tests:create-html-tree #f)
-          (debug:print-info 0 *default-log-port* "HTML output created in " toppath "/lt/page#.html")
+          (debug:print-info 0 *default-log-port* "HTML output created in " toppath "/lt/page0.html")
           (debug:print 0 *default-log-port* "Failed to create HTML output in " toppath "/lt/runs-index.html"))
       (set! *didsomething* #t)))
-
+(if (args:get-arg "-generate-html-structure")
+    (let* ((toppath (launch:setup)))
+      ;(if (tests:create-html-tree #f)
+ 				(if (tests:create-html-summary #f)
+          (debug:print-info 0 *default-log-port* "HTML output created in " toppath "/lt/targets.html")
+          (debug:print 0 *default-log-port* "Failed to create HTML output in " toppath "/lt/runs-index.html"))
+      (set! *didsomething* #t)))
 ;;======================================================================
 ;; Exit and clean up
 ;;======================================================================
 
 (if (not *didsomething*)

Index: minimal/manyservers.sh
==================================================================
--- minimal/manyservers.sh
+++ minimal/manyservers.sh
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 echo manyservers.sh pid $$
 
 logdir=$PWD/log-manysrv
 
 

Index: minimal/megatest.config
==================================================================
--- minimal/megatest.config
+++ minimal/megatest.config
@@ -1,5 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 [fields]
 RUNTYPE text
 
 [setup]
 linktree #{getenv PWD}/linktree

Index: minimal/runconfigs.config
==================================================================
--- minimal/runconfigs.config
+++ minimal/runconfigs.config
@@ -1,3 +1,19 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 [default]
 EXAMPLEVAR 1
 

Index: minimal/tests/tmpspace/testconfig
==================================================================
--- minimal/tests/tmpspace/testconfig
+++ minimal/tests/tmpspace/testconfig
@@ -1,5 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 [ezsteps]
 
 df [ `df -m /tmp | grep /tmp | awk '{print $3}'` -gt 200000 ]
 
 [items]

ADDED   minimt/Makefile
Index: minimt/Makefile
==================================================================
--- /dev/null
+++ minimt/Makefile
@@ -0,0 +1,29 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+minimt : minimt.scm db.scm setup.scm direct.scm
+	csc minimt.scm
+
+run    : minimt
+	export PATH="$(PWD)":$(PATH) ; minimt runrun foo/bar run1 
+
+runseq : clean run 
+	sleep 5;tail -F runtest/*log
+
+clean :
+	rm -rf runtest/*
+

ADDED   minimt/db.scm
Index: minimt/db.scm
==================================================================
--- /dev/null
+++ minimt/db.scm
@@ -0,0 +1,190 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
+;; pretend to be a simplified Megatest
+
+(use sql-de-lite defstruct)
+
+;; init the db - NOTE: takes a db NOT a dbconn
+;;
+(define (init-db db)
+  (with-transaction
+   db
+   (lambda ()
+     (for-each
+      (lambda (qrystr)
+	(exec (sql db qrystr)))
+      '("CREATE TABLE IF NOT EXISTS runs 
+           (id        INTEGER PRIMARY KEY,
+            target    TEXT NOT NULL,
+            run_name  TEXT NOT NULL,
+            state     TEXT NOT NULL,
+            status    TEXT NOT NULL,
+            CONSTRAINT runs_constraint UNIQUE (run_name));"
+	"CREATE TABLE IF NOT EXISTS tests
+           (id        INTEGER PRIMARY KEY,
+            run_id    INTEGER NOT NULL,
+            test_name TEXT NOT NULL,
+            state     TEXT NOT NULL,
+            status    TEXT NOT NULL,
+            start_time INTEGER DEFAULT (strftime('%s','now')),
+            end_time   INTEGER DEFAULT -1,
+            CONSTRAINT tests_constraint UNIQUE (run_id,test_name));"
+	"CREATE TABLE IF NOT EXISTS steps
+           (id        INTEGER PRIMARY KEY,
+            test_id   INTEGER NOT NULL,
+            step_name  TEXT NOT NULL,
+            state     TEXT NOT NULL,
+            status    TEXT NOT NULL,
+            CONSTRAINT step_constraint UNIQUE (test_id,step_name));")))))
+
+(defstruct dbconn-dat
+  dbh       ;; the database handle
+  writeable ;; do we have write access?
+  path      ;; where the db lives
+  name      ;; name of the db
+  )
+
+;; open the database, return a dbconn struct
+(define (open-create-db path fname init)
+  (let* ((fullname       (conc path "/" fname))
+	 (already-exists (file-exists? fullname))
+	 (write-access   (and (file-write-access? path)
+			      (or (not already-exists)
+				  (and already-exists
+				       (file-write-access? fullname)))))
+	 (db             (if (or already-exists write-access)
+			     (open-database fullname)
+			     (begin
+			       (print "FATAL: No existing db and no write access thus cannot create " fullname)  ;; no db and no write access cannot proceed.
+			       (exit 1))))
+	 (dbconn         (make-dbconn-dat)))
+    (set-busy-handler! db (busy-timeout 120000)) ;; set a busy timeout
+    (exec (sql db "PRAGMA synchronous=0;"))
+    (if (and init write-access (not already-exists))
+	(init db))
+    (dbconn-dat-dbh-set!       dbconn db)
+    (dbconn-dat-writeable-set! dbconn write-access)
+    (dbconn-dat-path-set!      dbconn path)
+    (dbconn-dat-name-set!      dbconn fname)
+    dbconn))
+
+(define-inline (get-db dbconn)
+  (dbconn-dat-dbh dbconn))
+
+;; RUNS
+
+;; create a run
+(define (create-run dbconn target run-name)
+  (exec (sql (get-db dbconn) "INSERT INTO runs (run_name,target,state,status) VALUES (?,?,'NEW','na');")
+	run-name target))
+
+;; get a run id
+(define (get-run-id dbconn target run-name)
+  (first-column (query fetch (sql (get-db dbconn) "SELECT id FROM runs WHERE target=? AND run_name=?;")
+		       target run-name)))
+
+;; TESTS
+
+(defstruct test-dat
+  id
+  run-id
+  test-name
+  state
+  status)
+
+;; create a test
+(define (create-test dbconn run-id test-name)
+  (exec (sql (get-db dbconn) "INSERT INTO tests (run_id,test_name,state,status) VALUES (?,?,'NOT_STARTED','na');")
+	run-id test-name))
+
+;; get a test id
+(define (get-test-id dbconn run-id test-name)
+  (first-column (query fetch (sql (get-db dbconn) "SELECT id FROM tests WHERE run_id=? AND test_name=?;")
+		       run-id test-name)))
+
+(define-inline (test-row->test-dat row)
+    (make-test-dat
+     id:        (list-ref row 0)
+     run-id:    (list-ref row 1)
+     test-name: (list-ref row 2)
+     state:     (list-ref row 3)
+     status:    (list-ref row 4)))
+  
+;; get the data for given test-id
+(define (test-get-record dbconn test-id)
+  (let* ((row (query fetch-row (sql (get-db dbconn) "SELECT id,run_id,test_name,state,status FROM tests WHERE test_id=?;")
+		     test-id)))
+    (test-row->test-dat row)))
+
+;; get a bunch of tests data
+(define (test-get-tests dbconn run-ids test-name-patt)
+  (let* ((rows (query fetch-rows
+		      (sql (get-db dbconn)
+			   (conc "SELECT id,run_id,test_name,state,status FROM tests WHERE test_name LIKE ? AND run_id IN ("
+				 (string-intersperse (map conc run-ids) ",") ");"))
+		      test-name-patt)))
+    (map test-row->test-dat rows)))
+   
+(define (test-set-state-status dbconn test-id new-state new-status)
+  (exec (sql (get-db dbconn) "UPDATE tests SET state=?,status=?,end_time=? WHERE id=?;")
+	new-state new-status (current-seconds) test-id))
+
+;; STEPS
+
+;; create a step
+(define (create-step dbconn test-id step-name)
+  (exec (sql (get-db dbconn) "INSERT INTO steps (test_id,step_name,state,status) VALUES (?,?,'NOT_STARTED','na');")
+	test-id step-name))
+
+;; get a step id
+(define (get-step-id dbconn test-id step-name)
+  (first-column (query fetch (sql (get-db dbconn) "SELECT id FROM steps WHERE test_id=? AND step_name=?;")
+		       test-id step-name)))
+
+(define (step-set-state-status dbconn step-id new-state new-status)
+  (exec (sql (get-db dbconn) "UPDATE steps SET state=?,status=? WHERE id=?;")
+	new-state new-status step-id))
+
+;;======================================================================
+;; Statistics gathering
+;;======================================================================
+
+(define *stats* (make-hash-table))
+
+(define (update-stats key duration)
+  (let ((rec (or (hash-table-ref/default *stats* key #f)
+		 (let ((new (vector 0 0 0)))
+		   (hash-table-set! *stats* key new)
+		   new))))
+    (vector-set! rec 0 (+ (vector-ref rec 0) 1))        ;; num calls
+    (vector-set! rec 1 (+ (vector-ref rec 1) duration)) ;; total duration
+    (if (> duration (vector-ref rec 2) )
+	(vector-set! rec 2 duration))))
+
+(define (statwrap name proc)
+  (lambda params
+    (let ((start-time (current-milliseconds))
+	  (res        (apply proc params)))
+      (update-stats name (- (current-milliseconds) start-time))
+      res)))
+
+(define (print-stats statdat)
+  (hash-table-for-each
+   statdat
+   (lambda (key val)
+     (print key " count: " (vector-ref val 0) " avg: " (/ (vector-ref val 1)(vector-ref val 0)) " max: " (vector-ref val 2)))))

ADDED   minimt/direct.scm
Index: minimt/direct.scm
==================================================================
--- /dev/null
+++ minimt/direct.scm
@@ -0,0 +1,28 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
+;; direct API, call the db calls directly
+(define rmt:create-run            (statwrap 'create-run  create-run))
+(define rmt:create-step           (statwrap 'create-step create-step))
+(define rmt:create-test           (statwrap 'create-test create-test))
+(define rmt:get-test-id           (statwrap 'get-test-id get-test-id))
+(define rmt:get-run-id            (statwrap 'get-run-id  get-run-id))
+(define rmt:open-create-db        (statwrap 'open        open-create-db))
+(define rmt:step-set-state-status (statwrap 'step-set-state-status step-set-state-status))
+(define rmt:test-set-state-status (statwrap 'test-set-state-status test-set-state-status))
+(define rmt:test-get-tests        (statwrap 'test-get-tests        test-get-tests))
+

ADDED   minimt/minimt.scm
Index: minimt/minimt.scm
==================================================================
--- /dev/null
+++ minimt/minimt.scm
@@ -0,0 +1,103 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
+(use posix)
+
+(include "db.scm")
+
+;; define following in setup.scm
+;;    *remotehost*  => host for "tests"
+;;    *homehost*    => host for servers
+;;    *homepath*    => directory from which to run
+;;    *numtests*    => how many tests to simulate for each run
+;;    *numruns*     => how many runs to simulate
+;;    
+(include "setup.scm")
+
+(include "direct.scm") ;; direct db calls
+
+;; RUN A TEST
+(define (run-test dbconn run-id test-name)
+  (rmt:create-test dbconn run-id test-name)
+  (let ((test-id (rmt:get-test-id dbconn run-id test-name)))
+    (rmt:test-set-state-status dbconn test-id "LAUNCHED" "na")
+    (thread-sleep! *launchdelay*)
+    (rmt:test-set-state-status dbconn test-id "RUNNING" "na")
+    (let loop ((step-num 0))
+      (let ((step-name (conc "step" step-num)))
+       (rmt:create-step dbconn test-id step-name)
+       (let ((step-id (get-step-id dbconn test-id step-name)))
+	 (rmt:step-set-state-status dbconn step-id "START" -1)
+	 (thread-sleep! *stepdelay*)
+	 (rmt:step-set-state-status dbconn step-id "END" 0)
+	 (print"   STEP: " step-name " done.")))
+      (if (< step-num *numsteps*)
+	  (loop (+ step-num 1))))
+    ;; we will do a large but bogus read to simulate the logic in Megatest
+    (rmt:test-get-tests dbconn `(,run-id) "%")
+    (rmt:test-set-state-status dbconn test-id "COMPLETED" (if (> (random 10) 2) "PASS" "FAIL"))
+    (print "TEST: " test-name " done.")
+    (print "Stats:")
+    (print-stats *stats*)
+    test-id))
+
+;; RUN A RUN
+(define (run-run dbconn target run-name num-tests)
+  (rmt:create-run dbconn target run-name)
+  (let ((run-id (rmt:get-run-id dbconn target run-name)))
+    (let loop ((test-num 0))
+      (system (conc "NBFAKE_LOG=test-" test-num "-run-id-" run-id ".log NBFAKE_HOST=" *remotehost* " nbfake minimt runtest " run-id " test-" test-num))
+      (if (< test-num num-tests)
+	  (loop (+ test-num 1))))))
+
+;; Do what is asked
+(let ((args (cdr (argv))))
+  (if (< (length args) 1)
+      (print
+       "Usage: minimt [options]" "
+  runtest run-id testname
+  runrun  target runname")
+      (let ((cmd    (car args))
+	    (dbconn (rmt:open-create-db *homepath* "mt.db" init-db)))
+	(thread-sleep! 0.5) ;; be sure the db is written out to disk? Should really not be needed.
+	(change-directory *homepath*)
+	(case (string->symbol cmd)
+	  ((runtest)
+	   (let ((run-id    (string->number (cadr args)))
+		 (test-name (caddr args)))
+	     (print "Launching test " test-name " for run-id " run-id)
+	     (run-test dbconn run-id test-name)))
+	  ((runrun)
+	   (let ((target   (cadr args))
+		 (run-name (caddr args)))
+	     (run-run dbconn target run-name *numtests*)
+	     (print "Use: sqlite3 runtest/mt.db 'select max(end_time)-min(start_time) from tests;' to see the total run time")
+	     ))
+	  ((runall)
+	   (for-each
+	    (lambda (target)
+	      (let loop ((run-num 0))
+		(thread-sleep! *rundelay*)
+		(system (conc "NBFAKE_LOG=run-" target "-" run-num ".log nbfake minimt runrun " target " run-" run-num))
+		(if (< run-num *numruns*)
+		    (loop (+ run-num 1)))))
+	    *targets*))
+	  ((server)
+	   (start-server dbconn))
+	  (else
+	   (print "Command: " cmd " not recognised. Run without params to see help.")))
+	(close-database (dbconn-dat-dbh dbconn)))))

ADDED   minimt/queued.scm
Index: minimt/queued.scm
==================================================================
--- /dev/null
+++ minimt/queued.scm
@@ -0,0 +1,225 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
+(use nanomsg defstruct srfi-18)
+
+;;======================================================================
+;; Commands
+;;======================================================================
+
+(define *commands* (make-hash-table))
+
+(defstruct cmd
+  key
+  proc
+  ctype ;; command type; 'r (read), 'w (write) or 't (transaction)
+  )
+
+(define (register-command key ctype proc)
+  (hash-table-set! *commands*
+		   key
+		   (make-cmd key: key ctype: ctype proc: proc)))
+
+(define (get-proc key)
+  (cmd-proc (hash-table-ref key *commands*)))
+
+(for-each
+ (lambda (dat)
+   (apply register-command dat))
+ `( (create-run    w ,create-run)
+    (create-step   w ,create-step)
+    (create-test   w ,create-test)
+    (get-test-id   r ,get-test-id)
+    (get-run-id    r ,get-run-id)
+    ;; (open-db       w ,open-create-db)
+    (step-set-ss   w ,step-set-state-status)
+    (test-set-ss   w ,test-set-state-status)
+    (test-get-tests r ,test-get-tests) ))
+
+;;======================================================================
+;; Server/client stuff
+;;======================================================================
+
+(define-inline (encode data)
+  (with-output-to-string
+    (lambda ()
+      (write data))))
+
+(define-inline (decode data)
+  (with-input-from-string
+      data
+    (lambda ()
+      (read))))
+  
+;;======================================================================
+;; Command queue
+;;======================================================================
+
+(defstruct qitem
+  command
+  params
+  host-port)
+
+(define *cmd-queue* '())
+(define *queue-mutex* (make-mutex))
+
+(define (queue-push cmddat)
+  (mutex-lock! *queue-mutex*)
+  (set! *cmd-queue* (cons cmddat *cmd-queue*))
+  (mutex-unlock! *queue-mutex*))
+
+;; get all the cmds of type ctype and return them, also remove them from the queue
+(define (queue-take ctype)
+  (mutex-lock! *queue-mutex*)
+  (let ((res (filter (lambda (x)(eq? (cmd-ctype x) ctype))       *cmd-queue*))
+	(rem (filter (lambda (x)(not (eq? (cmd-ctype x) ctype))) *cmd-queue*)))
+    (set! *queue* rem)
+    (mutex-unlock! *queue-mutex*)
+    res))
+
+(define (queue-process-commands dbconn commands)
+  (for-each
+   (lambda (qitem)
+     (let ((soc (request-connect (qitem-host-port qitem))) ;; we will be sending the data back to host-port via soc
+	   (cmd (hash-table-ref/default *commands* (qitem-command qitem) #f)))
+       (if cmd
+	   (let* ((res (apply (get-proc cmd) dbconn (qitem-params qitem)))
+		  (pkg (encode `((r . ,res)))))
+	     (nn-send soc pkg)
+	     (if (not (eq? (nn-recv soc)) "ok")
+		 (print "Client failed to receive properly the data from " cmd " request"))))))
+   commands))
+
+;; the continuously running queue processor
+;;
+(define ((queue-processor dbconn))
+  (let loop ()
+    (queue-process-commands dbconn (queue-take 'r))  ;; reads first, probably largest numbers of them
+    (queue-process-commands dbconn (queue-take 'w))  ;; writes next
+    (queue-process-commands dbconn (queue-take 't))  ;; lastly process transactions
+    (thread-sleep! 0.2)                              ;; open up the db for any other processes to access
+    (loop)))
+
+;;======================================================================
+;; Client stuff
+;;======================================================================
+
+;; client struct
+(defstruct client
+  host-port
+  socket
+  last-access)
+
+(define *clients* (make-hash-table)) ;; host:port -> client struct
+(define *client-mutex* (make-mutex))
+
+;; add a channel or return existing channel, this is a normal req
+;; 
+(define (request-connect host-port)
+  (mutex-lock! *client-mutex*)
+  (let* ((curr (hash-table-ref/default *clients* host-port #f)))
+    (if curr
+	(begin
+	  (mutex-unlock! *client-mutex*)
+	  curr)
+	(let ((req (nn-socket 'req)))
+	  (nn-connect req host-port) ;; "inproc://test")
+	  (hash-table-set! *clients* host-port req)
+	  (mutex-unlock! *client-mutex*)
+	  req))))
+
+;; open up a channel to the server and send a package of info for the server to act on
+;; host-port needs to be found and provided
+;;
+(define (generic-db-access host-port)
+  (let* ((soc (request-connect host-port))
+	 ;; NEED *MY* host/port also to let the server know where to send the results
+	 )))
+    
+
+(define (client-send-receive soc msg)
+  (nn-send soc msg)
+  (nn-recv soc))
+  
+;;======================================================================
+;; Server
+;;======================================================================
+
+(defstruct srvdat
+  host
+  port
+  soc)
+
+;; remember, everyone starts a server, both client and the actual server alike.
+;; clients start a server for the server to return results to.
+;;
+(define (start-raw-server #!key (given-host-name #f))
+  (let ((srvdat    (let loop ((portnum 10000))
+		     (handle-exceptions
+			 exn
+			 (if (< portnum 64000)
+			     (loop (+ portnum 1))
+			     #f)
+		       (let* ((rep (nn-socket 'rep)))
+			 (nn-bind rep (conc "tcp://*:" portnum)) ;; "inproc://test")
+			 (make-srvdat port: portnum soc: rep)))))
+	(host-name (or give-host-name (get-host-name)))
+	(soc       (srvdat-soc srvdat)))
+    (srvdat-host-set! srvdat host-name)
+    srvdat))
+
+;; The actual *server* side server
+;;
+(define (start-server dbconn #!key (given-host-name #f))
+  (let* ((srvdat    (start-raw-server given-host-name: given-host-name))
+	 (host-name (srvdat-host srvdat))
+	 (soc       (srvdat-soc srvdat)))
+    
+    ;; start the queue processor
+    (thread-start! (queue-processory dbconn) "Queue processor")
+    ;; msg is an alist
+    ;;  'r host:port  <== where to return the data
+    ;;  'p params     <== data to apply the command to
+    ;;  'e j|s|l      <== encoding of the params. default is s (sexp), if not specified is assumed to be default
+    ;;  'c command    <== look up the function to call using this key
+    ;;
+    (let loop ((msg-in (nn-recv soc)))
+      (if (not (equal? msg-in "quit"))
+	  (let* ((dat        (decode msg-in))
+		 (host-port  (alist-ref 'r dat)) ;; this is for the reverse req rep where the server is a client of the original client
+		 (params     (alist-ref 'p dat))
+		 (command    (let ((c (alist-ref 'c dat)))(if c (string->symbol c) #f)))
+		 (all-good   (and host-port params command (hash-table-exists? *commands* command))))
+	    (if all-good
+		(let ((cmddat (make-qitem
+			       command:   command
+			       host-port: host-port
+			       params:    params)))
+		  (queue-push cmddat) 		;; put request into the queue
+		  (nn-send soc "queued"))         ;; reply with "queued"
+		(print "ERROR: BAD request " dat))
+	    (loop (nn-recv soc)))))
+    (nn-close soc)))
+  
+;;======================================================================
+;; Gasket layer
+;;======================================================================
+
+(define rmt:open-create-db open-create-db)
+(define (rmt:create-run . params)
+  
+  

ADDED   minimt/setup.scm
Index: minimt/setup.scm
==================================================================
--- /dev/null
+++ minimt/setup.scm
@@ -0,0 +1,34 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
+(define *remotehost* "orion")
+(define *homehost*   "zeus")
+(define *homepath*   "/nfs/phoebe/disk1/home/mfs_matt/data/megatest/minimt/runtest")
+(define *numsteps*   20)
+(define *numtests*   20)
+(define *numruns*    5)
+(define *targets*    '("targ1"))
+(define *testdelay*  0)
+(define *rundelay*   0)
+(define *launchdelay* 0)
+(define *stepdelay*   0)
+
+(use trace)
+(trace-call-sites #t)
+(trace
+;;  open-create-db
+ )

Index: mkdeploy/megatest.config
==================================================================
--- mkdeploy/megatest.config
+++ mkdeploy/megatest.config
@@ -1,5 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 [fields]
 PLATFORM TEXT
 OS       TEXT
 OSVER    TEXT
 

Index: mkdeploy/runconfigs.config
==================================================================
--- mkdeploy/runconfigs.config
+++ mkdeploy/runconfigs.config
@@ -1,5 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 [default]
 TARGDIR_tmp /tmp
 TARGDIR_opt /opt
 TARGDIR_runs #{getenv MT_RUN_AREA_HOME}/runs
 BUILDDIR    #{getenv MT_RUN_AREA_HOME}/..

Index: mkdeploy/tests/checkspace/checkspace.logpro
==================================================================
--- mkdeploy/tests/checkspace/checkspace.logpro
+++ mkdeploy/tests/checkspace/checkspace.logpro
@@ -1,3 +1,20 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 (expect:error in    "LogFileBody" = 0 "Any error"         #/err/i)
 (expect:required in "LogFileBody" = 1 "Sucess signature" #/adequate space/)
 

Index: mkdeploy/tests/checkspace/checkspace.sh
==================================================================
--- mkdeploy/tests/checkspace/checkspace.sh
+++ mkdeploy/tests/checkspace/checkspace.sh
@@ -1,6 +1,22 @@
 #!/bin/bash -e
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 freespace=`df -k /$DIRECTORY | grep $DIRECTORY | awk '{print $4}'`
 if [[ $freespace -lt $REQUIRED ]];then
   echo "ERROR: insufficient space on /$DIRECTORY"
   exit 1
 else

Index: mkdeploy/tests/checkspace/testconfig
==================================================================
--- mkdeploy/tests/checkspace/testconfig
+++ mkdeploy/tests/checkspace/testconfig
@@ -1,5 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 # Add steps here. Format is "stepname script"
 [ezsteps]
 checkspace checkspace.sh
 
 # Iteration for your tests are controlled by the items section

Index: mkdeploy/tests/eggs/install.logpro
==================================================================
--- mkdeploy/tests/eggs/install.logpro
+++ mkdeploy/tests/eggs/install.logpro
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 (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/)
 

Index: mkdeploy/tests/eggs/install.sh
==================================================================
--- mkdeploy/tests/eggs/install.sh
+++ mkdeploy/tests/eggs/install.sh
@@ -1,4 +1,20 @@
 #!/bin/bash -e
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 targpath=`megatest -test-paths -target $MT_TARGET :runname $MT_RUNNAME -testpatt executables/megatest`
 chicken-install -prefix $targpath/megatest -deploy $EGGNAME
 echo DONE

Index: mkdeploy/tests/eggs/testconfig
==================================================================
--- mkdeploy/tests/eggs/testconfig
+++ mkdeploy/tests/eggs/testconfig
@@ -1,5 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 # Add steps here. Format is "stepname script"
 [ezsteps]
 install install.sh
 
 [requirements]

Index: mkdeploy/tests/executables/addlibs.logpro
==================================================================
--- mkdeploy/tests/executables/addlibs.logpro
+++ mkdeploy/tests/executables/addlibs.logpro
@@ -1,3 +1,20 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 (expect:error in    "LogFileBody" = 0 "Any error"         #/err/i)
 (expect:required in "LogFileBody" = 1 "Sucess signature" #/libchicken.so.6/)
 

Index: mkdeploy/tests/executables/addlibs.sh
==================================================================
--- mkdeploy/tests/executables/addlibs.sh
+++ mkdeploy/tests/executables/addlibs.sh
@@ -1,7 +1,24 @@
 #!/bin/bash -e
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 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/

Index: mkdeploy/tests/executables/install.logpro
==================================================================
--- mkdeploy/tests/executables/install.logpro
+++ mkdeploy/tests/executables/install.logpro
@@ -1,3 +1,20 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 (expect:error in    "LogFileBody" = 0 "Any error"         #/err/i)
 (expect:required in "LogFileBody" = 1 "Sucess signature" #/libchicken.so.6/)
 

Index: mkdeploy/tests/executables/install.sh
==================================================================
--- mkdeploy/tests/executables/install.sh
+++ mkdeploy/tests/executables/install.sh
@@ -1,7 +1,23 @@
 #!/bin/bash -e
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 unset LD_LIBRARY_PATH
 rm -rf $EXECUTABLE
 mkdir $EXECUTABLE
 csc -deploy $EXECUTABLE
 ls $EXECUTABLE

Index: mkdeploy/tests/executables/linksrc.logpro
==================================================================
--- mkdeploy/tests/executables/linksrc.logpro
+++ mkdeploy/tests/executables/linksrc.logpro
@@ -1,3 +1,20 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 (expect:error in    "LogFileBody" = 0 "Any error"         #/err/i)
 (expect:required in "LogFileBody" = 1 "Sucess signature" #/Makefile/)
 

Index: mkdeploy/tests/executables/linksrc.sh
==================================================================
--- mkdeploy/tests/executables/linksrc.sh
+++ mkdeploy/tests/executables/linksrc.sh
@@ -1,6 +1,22 @@
 #!/bin/bash -e
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 
 rm -f *.scm *.o Makefile
 ln -s $BUILDDIR/*.scm .
 ln -s $BUILDDIR/Makefile .
 ls Makefile *.scm 

Index: mkdeploy/tests/executables/make_mt.logpro
==================================================================
--- mkdeploy/tests/executables/make_mt.logpro
+++ mkdeploy/tests/executables/make_mt.logpro
@@ -1,3 +1,20 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 (expect:error in    "LogFileBody" = 0 "Any error"         #/err/i)
 (expect:required in "LogFileBody" = 1 "Sucess signature" #/mtest/)
 

Index: mkdeploy/tests/executables/testconfig
==================================================================
--- mkdeploy/tests/executables/testconfig
+++ mkdeploy/tests/executables/testconfig
@@ -1,5 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 # Add steps here. Format is "stepname script"
 [ezsteps]
 linksrc linksrc.sh
 make_mt make
 install install.sh

Index: mkdeploy/tests/helpers/install.logpro
==================================================================
--- mkdeploy/tests/helpers/install.logpro
+++ mkdeploy/tests/helpers/install.logpro
@@ -1,3 +1,20 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 (expect:error in    "LogFileBody" = 0 "Any error"         #/err/i)
 (expect:required in "LogFileBody" = 1 "Sucess signature" #/adequate space/)
 

Index: mkdeploy/tests/helpers/install.sh
==================================================================
--- mkdeploy/tests/helpers/install.sh
+++ mkdeploy/tests/helpers/install.sh
@@ -1,6 +1,22 @@
 #!/bin/bash -e
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 freespace=`df -k /$DIRECTORY | grep $DIRECTORY | awk '{print $4}'`
 if [[ $freespace -lt $REQUIRED ]];then
   echo "ERROR: insufficient space on /$DIRECTORY"
   exit 1
 else

Index: mkdeploy/tests/helpers/testconfig
==================================================================
--- mkdeploy/tests/helpers/testconfig
+++ mkdeploy/tests/helpers/testconfig
@@ -1,5 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 # Add steps here. Format is "stepname script"
 [ezsteps]
 install install.sh
 
 # Iteration for your tests are controlled by the items section

Index: mlaunch.scm
==================================================================
--- mlaunch.scm
+++ mlaunch.scm
@@ -1,13 +1,21 @@
 ;; Copyright 2006-2014, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
 ;;======================================================================
 ;; MLAUNCH
@@ -15,12 +23,11 @@
 ;;   take jobs from the given queue and keep launching them keeping
 ;;   the cpu load at the targeted level
 ;;
 ;;======================================================================
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking format)
-(import (prefix sqlite3 sqlite3:))
+(use sqlite3 srfi-1 posix regex regex-case srfi-69 format)
 
 (declare (unit mlaunch))
 (declare (uses db))
 (declare (uses common))
 

Index: mockup-cached-writes.scm
==================================================================
--- mockup-cached-writes.scm
+++ mockup-cached-writes.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 
 (define (make-cached-writer the-db)
   (let ((db    the-db)
 	(queue '()))

Index: monitor.scm
==================================================================
--- monitor.scm
+++ monitor.scm
@@ -1,13 +1,21 @@
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking)
 (import (prefix sqlite3 sqlite3:))

Index: mt-pg.sql
==================================================================
--- mt-pg.sql
+++ mt-pg.sql
@@ -1,11 +1,28 @@
+--  Copyright 2006-2017, Matthew Welland.
+-- 
+-- This file is part of Megatest.
+-- 
+--     Megatest is free software: you can redistribute it and/or modify
+--     it under the terms of the GNU General Public License as published by
+--     the Free Software Foundation, either version 3 of the License, or
+--     (at your option) any later version.
+-- 
+--     Megatest is distributed in the hope that it will be useful,
+--     but WITHOUT ANY WARRANTY; without even the implied warranty of
+--     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--     GNU General Public License for more details.
+-- 
+--     You should have received a copy of the GNU General Public License
+--     along with Megatest.  If not, see .
+
 -- CREATE TABLE IF NOT EXISTS keys (
 --        id SERIAL PRIMARY KEY,
 --        fieldname TEXT,
 --        fieldtype TEXT,
 --        CONSTRAINT keyconstraint UNIQUE (fieldname));
-
+DROP VIEW IF EXISTS area_tag_view;
 DROP TABLE IF EXISTS areas;
 DROP TABLE IF EXISTS ttype;
 DROP TABLE IF EXISTS runs;
 DROP TABLE IF EXISTS run_stats;
 DROP TABLE IF EXISTS test_meta;
@@ -21,10 +38,22 @@
 DROP TABLE IF EXISTS test_data;
 DROP TABLE IF EXISTS test_rundat;
 DROP TABLE IF EXISTS archives;
 DROP TABLE IF EXISTS session_vars;
 DROP TABLE IF EXISTS sessions;
+DROP TABLE IF EXISTS tags;
+DROP TABLE IF EXISTS users; 
+DROP TABLE IF EXISTS webviews;
+DROP TABLE IF EXISTS area_tags;
+DROP TABLE IF EXISTS users_webviews;
+DROP TABLE IF EXISTS base_paths;
+DROP TABLE IF EXISTS area_owners;
+DROP TABLE IF EXISTS shared_user_views;
+DROP TABLE IF EXISTS cctrl_info;
+DROP TABLE IF EXISTS cctrl_config;
+DROP TABLE IF EXISTS platforms;
+
 
 CREATE TABLE IF NOT EXISTS session_vars (
        id SERIAL PRIMARY KEY,
        session_id INTEGER,
        page TEXT,
@@ -41,10 +70,25 @@
        area_name TEXT NOT NULL,
        area_path TEXT NOT NULL,
        last_sync INTEGER DEFAULT 0,
        CONSTRAINT areaconstraint UNIQUE (area_name));
 
+CREATE TABLE IF NOT EXISTS tags (
+       id SERIAL PRIMARY KEY,
+       tag_name TEXT NOT NULL,
+       CONSTRAINT tagconstraint UNIQUE (tag_name));
+
+CREATE TABLE IF NOT EXISTS area_tags (
+       id SERIAL PRIMARY KEY,
+       tag_id   INTEGER DEFAULT 0,
+       area_id  INTEGER DEFAULT 0,
+       CONSTRAINT areatagconstraint UNIQUE (tag_id, area_id));
+
+CREATE VIEW area_tag_view as 
+select a.id as aid, t.id as tid,area_name,tag_name from areas as a inner join area_tags as at on at.area_id = a.id
+inner join tags as t on t.id = at.tag_id  ;
+
 INSERT INTO areas (id,area_name,area_path) VALUES (0,'local','.');
 
 CREATE TABLE IF NOT EXISTS ttype (
        id SERIAL PRIMARY KEY,
        target_spec TEXT DEFAULT '');
@@ -61,11 +105,19 @@
        comment    TEXT DEFAULT '',
        fail_count INTEGER DEFAULT 0,
        pass_count INTEGER DEFAULT 0,
        last_update INTEGER DEFAULT extract(epoch from now()),
        area_id     INTEGER DEFAULT 0,
-       CONSTRAINT runsconstraint UNIQUE (target,ttype_id,run_name));
+       CONSTRAINT runsconstraint UNIQUE (target,ttype_id,run_name, area_id));
+
+create Table if not exists change_triggers (
+       id SERIAL           PRIMARY KEY,
+       target              TEXT NOT NULL,
+       area                TEXT NOT NULL,
+       iteration           INTEGER NOT NULL,
+       iteration_timestamp TIMESTAMP WITHOUT TIME ZONE DEFAULT now(),  
+       reason              TEXT Not null);
 
 CREATE TABLE IF NOT EXISTS run_stats (
        id     SERIAL PRIMARY KEY,
        run_id INTEGER,
        state  TEXT,
@@ -208,9 +260,86 @@
        status       TEXT DEFAULT 'n/a',
        archive_type TEXT DEFAULT 'bup',
        du           INTEGER,
        archive_path TEXT);
  
+CREATE TABLE IF NOT EXISTS users(
+   id SERIAL  PRIMARY KEY   ,
+   username           TEXT    NOT NULL,
+   fullname          TEXT    NOT NULL, 
+   email             TEXT    NOT NULL, 
+   default_view      TEXT    default '',
+   is_admin          boolean default 'f',
+   deleted           INTEGER     default 0
+);
+
+CREATE TABLE IF NOT EXISTS base_paths(
+   id SERIAL  PRIMARY KEY   ,
+   path           TEXT    NOT NULL,
+   deleted           INTEGER     default 0
+);
+
+
+CREATE TABLE IF NOT EXISTS area_owners(
+   id SERIAL  PRIMARY KEY   ,
+   user_id INTEGER,
+   base_path_id INTEGER,
+	 deleted           INTEGER     default 0
+);
+
+CREATE TABLE IF NOT EXISTS shared_user_views(
+   id SERIAL  PRIMARY KEY   ,
+   user_id INTEGER,
+   view_id INTEGER,
+	 deleted           INTEGER     default 0
+);
+
+ 
+CREATE TABLE IF NOT EXISTS webviews(
+   id SERIAL  PRIMARY KEY   ,
+   owner_id          INTEGER NOT NULL,
+   name              TEXT    NOT NULL, 
+   ttype_id          INTEGER DEFAULT 0,
+   view_specifics    TEXT   ,
+   col               TEXT    NOT NULL,
+   row               TEXT    NOT NULL,
+   public            INTEGER DEFAULT 0,
+   search_patt      TEXT    default '.*',
+   deleted           INTEGER     default 0
+);
+
+
+
+CREATE TABLE IF NOT EXISTS users_webviews(
+ id      SERIAL  PRIMARY KEY   ,
+ user_id   INTEGER NOT NULL,
+ webview_id  INTEGER NOT NULL,
+ deleted     INTEGER default 0,
+ searchpattern TEXT Default '',
+ web_page TEXT Default '',
+ other_search_data TEXT Default ''
+);
+
+CREATE TABLE IF NOT EXISTS cctrl_info(
+ id      SERIAL  PRIMARY KEY   ,
+ user_id   INTEGER NOT NULL,
+ input TEXT Default '',
+ result_file TEXT Default NULL,
+ chksum TEXT
+);
+
+CREATE TABLE IF NOT EXISTS cctrl_config(
+	id      SERIAL  PRIMARY KEY   ,
+  area_type Text,
+  metadata text default '',
+  cmd TEXT 
+);
+
+CREATE TABLE IF NOT EXISTS platforms(
+	id      SERIAL  PRIMARY KEY   ,
+  name Text
+);
+
 
 -- TRUNCATE archive_blocks, archive_allocations, extradat, metadat,
 -- access_log, tests, test_steps, test_data, test_rundat, archives, runs,
 -- run_stats, test_meta, tasks_queue, archive_disks;

Index: mt-sqlite3.sql
==================================================================
--- mt-sqlite3.sql
+++ mt-sqlite3.sql
@@ -1,5 +1,22 @@
+--  Copyright 2006-2017, Matthew Welland.
+-- 
+-- This file is part of Megatest.
+-- 
+--     Megatest is free software: you can redistribute it and/or modify
+--     it under the terms of the GNU General Public License as published by
+--     the Free Software Foundation, either version 3 of the License, or
+--     (at your option) any later version.
+-- 
+--     Megatest is distributed in the hope that it will be useful,
+--     but WITHOUT ANY WARRANTY; without even the implied warranty of
+--     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--     GNU General Public License for more details.
+-- 
+--     You should have received a copy of the GNU General Public License
+--     along with Megatest.  If not, see .
+
 -- CREATE TABLE IF NOT EXISTS keys (
 --        id SERIAL PRIMARY KEY,
 --        fieldname TEXT,
 --        fieldtype TEXT,
 --        CONSTRAINT keyconstraint UNIQUE (fieldname));

Index: mt.scm
==================================================================
--- mt.scm
+++ mt.scm
@@ -1,13 +1,22 @@
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking (srfi 18) posix-extras directory-utils call-with-environment-variables)
 (import (prefix sqlite3 sqlite3:))
 
@@ -127,47 +136,103 @@
 			  (cons testn res)))))))))
 
 ;;======================================================================
 ;;  T R I G G E R S
 ;;======================================================================
+
+(define (mt:run-trigger cmd test-id test-rundir trigger logname test-name item-path event-time actual-state actual-status)
+  ;; Putting the commandline into ( )'s means no control over the shell. 
+  ;; stdout and stderr will be caught in the NBFAKE or mt_launch.log files
+  ;; or equivalent. No need to do this. Just run it?
+  (let* ((fullcmd (conc "nbfake "
+			cmd           " "
+			test-id       " "
+			test-rundir   " "
+			trigger       " "
+			test-name     " "
+			item-path     " " ;; has / prepended to deal with toplevel tests
+			actual-state  " "
+			actual-status " "
+			event-time
+			))
+	 (prev-nbfake-log (get-environment-variable "NBFAKE_LOG")))
+    (setenv "NBFAKE_LOG" (conc (cond
+				((and (directory-exists? test-rundir)
+				      (file-write-access? test-rundir))
+				 test-rundir)
+				((and (directory-exists? *toppath*)
+				      (file-write-access? *toppath*))
+				 *toppath*)
+				(else (conc "/tmp/" (current-user-name))))
+			       "/" logname))
+    (debug:print-info 0 *default-log-port* "TRIGGERED on " trigger ", running command " fullcmd " output at " (get-environment-variable "NBFAKE_LOG"))
+    ;; (call-with-environment-variables
+    ;;  `(("NBFAKE_LOG" . ,(conc test-rundir "/" logname)))
+    ;;  (lambda ()
+    (process-run fullcmd)
+    (if prev-nbfake-log
+	(setenv "NBFAKE_LOG" prev-nbfake-log)
+	(unsetenv "NBFAKE_LOG"))
+    )) ;; ))
 
 (define (mt:process-triggers dbstruct run-id test-id newstate newstatus)
-  (let* ((test-dat      (db:get-test-info-by-id dbstruct run-id test-id)))
-    (if test-dat
-	(let* ((test-rundir   ;; (rmt:sdb-qry 'getstr ;; (filedb:get-path *fdb*
-		(db:test-get-rundir test-dat)) ;; ) ;; )
-	       (test-name     (db:test-get-testname test-dat))
-	       (tconfig       #f)
-	       (state         (if newstate  newstate  (db:test-get-state  test-dat)))
-	       (status        (if newstatus newstatus (db:test-get-status test-dat))))
-	  (if (and test-name
-		   test-rundir   ;; #f means no dir set yet
-		   (file-exists? test-rundir)
-		   (directory? test-rundir))
-	      (call-with-environment-variables
-	       (list (cons "MT_TEST_NAME" test-name)
-		     (cons "MT_TEST_RUN_DIR" test-rundir)
-		     (cons "MT_ITEMPATH"     (db:test-get-item-path test-dat)))
-	       (lambda ()
-		 (push-directory test-rundir)
-		 (set! tconfig (mt:lazy-read-test-config test-name))
-		 (for-each (lambda (trigger)
-			     (let ((cmd  (configf:lookup tconfig "triggers" trigger))
-				   (logf (conc  test-rundir "/last-trigger.log")))
-			       (if cmd
-				   ;; Putting the commandline into ( )'s means no control over the shell. 
-				   ;; stdout and stderr will be caught in the NBFAKE or mt_launch.log files
-				   ;; or equivalent. No need to do this. Just run it?
-				   (let ((fullcmd (conc cmd " " test-id " " test-rundir " " trigger "&")))
-				     (debug:print-info 0 *default-log-port* "TRIGGERED on " trigger ", running command " fullcmd)
-				     (process-run fullcmd)))))
-			   (list
-			    (conc state "/" status)
-			    (conc state "/")
-			    (conc "/" status)))
-		 (pop-directory))
-	       ))))))
+  (if test-id 
+      (let* ((test-dat      (db:get-test-info-by-id dbstruct run-id test-id)))
+	(if test-dat
+	    (let* ((test-rundir   (db:test-get-rundir       test-dat)) ;; ) ;; )
+		   (test-name     (db:test-get-testname     test-dat))
+		   (item-path     (db:test-get-item-path    test-dat))
+		   (duration      (db:test-get-run_duration test-dat))
+		   (comment       (db:test-get-comment      test-dat))
+		   (event-time    (db:test-get-event_time   test-dat))
+		   (tconfig       #f)
+		   (state         (if newstate  newstate  (db:test-get-state  test-dat)))
+		   (status        (if newstatus newstatus (db:test-get-status test-dat))))
+	      ;; (mutex-lock! *triggers-mutex*)
+              (handle-exceptions
+               exn
+               (begin
+                 (debug:print-error 0 *default-log-port* " Exception in mt:process-triggers for run-id="run-id" test-id="test-id" newstate="newstate" newstatus="newstatus
+                                    "\n   error: " ((condition-property-accessor 'exn 'message) exn)
+                                    "\n   test-rundir="test-rundir
+                                    "\n   test-name="test-name
+                                    "\n   item-path="item-path
+                                    "\n   state="state
+                                    "\n   status="status
+                                    "\n")
+                 (print-call-chain (current-error-port))
+                 #f)
+               (if (and test-name
+                        test-rundir)   ;; #f means no dir set yet
+                   ;; (common:file-exists? test-rundir)
+                   ;; (directory? test-rundir))
+                   (call-with-environment-variables
+                    (list (cons "MT_TEST_NAME"    (or test-name "no such test"))
+                          (cons "MT_TEST_RUN_DIR" (or test-rundir "no test directory yet"))
+                          (cons "MT_ITEMPATH"     (or item-path "")))
+                    (lambda ()
+                      (if (directory-exists? test-rundir)
+                          (push-directory test-rundir)
+                          (push-directory *toppath*))
+                      (set! tconfig (mt:lazy-read-test-config test-name))
+                      (for-each (lambda (trigger)
+                                  (let* ((munged-trigger (string-translate trigger "/ " "--"))
+					(logname        (conc "last-trigger-" munged-trigger ".log")))
+                                    ;; first any triggers from the testconfig
+                                    (let ((cmd  (configf:lookup tconfig "triggers" trigger)))
+                                      (if cmd (mt:run-trigger cmd test-id test-rundir trigger (conc "tconfig-" logname) test-name item-path event-time state status)))
+                                    ;; next any triggers from megatest.config
+                                    (let ((cmd  (configf:lookup *configdat* "triggers" trigger)))
+                                      (if cmd (mt:run-trigger cmd test-id test-rundir trigger (conc "mtconfig-" logname) test-name item-path event-time state status)))))
+                                (list
+                                 (conc state "/" status)
+                                 (conc state "/")
+                                 (conc "/" status)))
+		     (pop-directory))
+                    )))
+	      ;; (mutex-unlock! *triggers-mutex*)
+	      )))))
 
 ;;======================================================================
 ;;  S T A T E   A N D   S T A T U S   F O R   T E S T S 
 ;;======================================================================
 
@@ -206,11 +271,11 @@
 	(let ((test-dirs (tests:get-tests-search-path *configdat*)))
 	  (let loop ((hed (car test-dirs))
 		     (tal (cdr test-dirs)))
 	    ;; Setting MT_LINKTREE here is almost certainly unnecessary. 
 	    (let ((tconfig-file (conc hed "/" test-name "/testconfig")))
-	      (if (and (file-exists? tconfig-file)
+	      (if (and (common:file-exists? tconfig-file)
 		       (file-read-access? tconfig-file))
 		  (let ((link-tree-path (common:get-linktree)) ;; (configf:lookup *configdat* "setup" "linktree"))
 			(old-link-tree  (get-environment-variable "MT_LINKTREE")))
 		    (if link-tree-path (setenv "MT_LINKTREE" link-tree-path))
 		    (let ((newtcfg (read-config tconfig-file #f #f))) ;; NOTE: Does NOT run [system ...]

Index: mtut.scm
==================================================================
--- mtut.scm
+++ mtut.scm
@@ -1,50 +1,125 @@
-;; Copyright 2006-2017, Matthew Welland.
-;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
-;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+; Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 ;; (include "common.scm")
 ;; (include "megatest-version.scm")
 
 ;; fake out readline usage of toplevel-command
 (define (toplevel-command . a) #f)
 
 (use srfi-1 posix srfi-69 readline ;;  regex regex-case srfi-69 apropos json http-client directory-utils rpc typed-records;; (srfi 18) extras)
-     srfi-18 extras format pkts pkts regex regex-case
-     (prefix dbi dbi:)) ;;  zmq extras)
+   srfi-19  srfi-18 extras format pkts regex regex-case
+     (prefix dbi dbi:)
+     nanomsg)
 
 (declare (uses common))
 (declare (uses megatest-version))
 (declare (uses margs))
 (declare (uses configf))
 ;; (declare (uses rmt))
+
+(use ducttape-lib)
 
 (include "megatest-fossil-hash.scm")
 
 (require-library stml)
 
-(define *target-mappers*  (make-hash-table)) ;; '())
-(define *runname-mappers* (make-hash-table)) ;; '())
+;; stuff for the mapper and checker functions
+;;
+(define *target-mappers*  (make-hash-table)) 
+(define *runname-mappers* (make-hash-table)) 
+(define *area-checkers*   (make-hash-table)) 
 
+(define (mtut:stml->string in-stml)
+  (with-output-to-string
+    (lambda ()
+      (s:output-new
+       (current-output-port)
+       in-stml))))
+
+;; helpers for mappers/checkers
+(define (add-target-mapper name proc)
+  (hash-table-set! *target-mappers* name proc))
+(define (add-runname-mapper name proc)
+  (hash-table-set! *runname-mappers* name proc))
+(define (add-area-checker name proc)
+  (hash-table-set! *area-checkers* name proc))
+
+;; given a runkey, xlatr-key and other info return one of the following:
+;;   list of targets, null list to skip processing
+;;   
+(define (map-targets mtconf aval-alist runkey area contour #!key (xlatr-key-in #f))
+  (pp aval-alist)
+  (print "In Map-targets")
+  (let* ((xlatr-key (or xlatr-key-in
+                        (conf-get/default mtconf aval-alist 'targtrans)))
+         (proc      (hash-table-ref/default *target-mappers* xlatr-key #f)))
+    (if proc
+        (begin
+          (print "Using target mapper: " xlatr-key)
+          (handle-exceptions
+           exn
+           (begin
+             (print "FAILED TO RUN TARGET MAPPER FOR " area ", called " xlatr-key)
+             (print "   function is: " (hash-table-ref/default *target-mappers* xlatr-key #f ) )
+             (print " message: " ((condition-property-accessor 'exn 'message) exn))
+             runkey)
+           (proc runkey area contour)))
+        (begin
+          (if xlatr-key 
+              (print "ERROR: Failed to find named target translator " xlatr-key ", using original target."))
+          `(,runkey))))) ;; no proc then use runkey
+
+;; given mtconf and areaconf extract a translator/filter, first look at areaconf
+;; then if not found look at default
+;;
+(define (conf-get/default mtconf areaconf keyname #!key (default #f))
+  (let ((res (or (alist-ref keyname areaconf)
+                 (configf:lookup mtconf "default" (conc keyname))
+                 default)))
+    (if res
+        (string->symbol res)
+        res)))
+  
 ;; this needs some thought regarding security implications.
 ;;
 ;;   i. Check that owner of the file and calling user are same?
 ;;  ii. Check that we are in a legal megatest area?
 ;; iii. Have some form of authentication or record of the md5sum or similar of the file?
 ;;  iv. Use compiled version in preference to .scm version. Thus there is a manual "blessing"
 ;;      required to use .mtutil.scm.
 ;;
-(if (file-exists? "megatest.config")
-    (if (file-exists? ".mtutil.so")
+(if (common:file-exists? "megatest.config")
+    (if (common:file-exists? ".mtutil.so")
 	(load ".mtutil.so")
-	(if (file-exists? ".mtutil.scm")
-	(load ".mtutil.scm"))))
+	(if (common:file-exists? ".mtutil.scm")
+            (load ".mtutil.scm"))))
+
+;; main three types of run
+;;  "-run"         => initiate a run
+;;  "-rerun-clean" => set failed, aborted, killed, etc. (not pass/fail) to NOT_STARTED and kick off run
+;;  "-rerun-all"   => set all tests NOT_STARTED and kick off run again
+
+;; deprecated/do not use
+;;  "-runall"      => synonym for run, do not use
+;;  "-runtests"    => synonym for run, do not use
 
 ;; Disabled help items
 ;;  -rollup                 : (currently disabled) fill run (set by :runname)  with latest test(s)
 ;;                            from prior runs with same keys
 ;; Contour actions
@@ -56,55 +131,71 @@
 mtutil, part of the Megatest tool suite, documentation at http://www.kiatoa.com/fossils/megatest
   version " megatest-version "
   license GPL, Copyright Matt Welland 2006-2017
 
 Usage: mtutil action [options]
-  -h                       : this help
-  -manual                  : show the Megatest user manual
-  -version                 : print megatest version (currently " megatest-version ")
-
-Actions:
-   run                     : initiate runs
-   remove                  : remove runs
-   rerun                   : register action for processing
-   set-ss                  : set state/status
-   archive                 : compress and move test data to archive disk
-   kill                    : stop tests or entire runs
-   db                      : database utilities
+  -h                         : this help
+  -manual                    : show the Megatest user manual
+  -version                   : print megatest version (currently " megatest-version ")
+			     
+Run management:		     
+   run                       : initiate or resume a run, already completed and in-progress
+                               tests are not affected.
+   rerun-clean               : clean and rerun all not completed pass/fail tests
+   rerun-all                 : clean and rerun entire run
+   kill-run                  : kill all tests in run
+   kill-rerun                : kill all tests in run and restart non-completed tests
+   remove                    : remove runs
+   set-ss                    : set state/status
+   archive                   : compress and move test data to archive disk
+   kill                      : stop tests or entire runs
+   db                        : database utilities
+
+Queries:
+   show [areas|contours... ] : show areas, contours or other section from megatest.config
+   gendot                    : generate a graphviz dot file from pkts.
 
 Contour actions:
-   process                 : runs import, rungen and dispatch 
-
-Selectors 
-  -immediate               : apply this action immediately, default is to queue up actions
-  -area areapatt1,area2... : apply this action only to the specified areas
-  -target key1/key2/...    : run for key1, key2, etc.
-  -test-patt p1/p2,p3/...  : % is wildcard
-  -run-name                : required, name for this particular test run
-  -contour contourname     : run all targets for contourname, requires -run-name, -target
-  -state-status c/p,c/f    : Specify a list of state and status patterns
-  -tag-expr tag1,tag2%,..  : select tests with tags matching expression
-  -mode-patt key           : load testpatt from  in runconfigs instead of default TESTPATT
-                             if -testpatt and -tagexpr are not specified
-  -new state/status        : specify new state/status for set-ss
-
-Misc 
-  -start-dir path          : switch to this directory before running mtutil
-  -set-vars V1=1,V2=2      : Add environment variables to a run NB// these are
-                                 overwritten by values set in config files.
-  -log logfile             : send stdout and stderr to logfile
-  -repl                    : start a repl (useful for extending megatest)
-  -load file.scm           : load and run file.scm
-  -debug N|N,M,O...        : enable debug messages 0-N or N and M and O ...
-
-Utility
- db pgschema               : emit postgresql schema; do \"mtutil db pgschema | psql -d mydb\"
+   process                   : runs import, rungen and dispatch 
+			     
+Trigger propagation actions:
+   tsend a=b,c=d...          : send trigger info to all recpients in the [listeners] section
+   tlisten -port N           : listen for trigger info on port N
+			     
+Selectors 		     
+  -immediate                 : apply this action immediately, default is to queue up actions
+  -area areapatt1,area2...   : apply this action only to the specified areas
+  -target key1/key2/...      : run for key1, key2, etc.
+  -test-patt p1/p2,p3/...    : % is wildcard
+  -run-name                  : required, name for this particular test run
+  -contour contourname       : run all targets for contourname, requires -run-name, -target
+  -state-status c/p,c/f      : Specify a list of state and status patterns
+  -tag-expr tag1,tag2%,..    : select tests with tags matching expression
+  -mode-patt key             : load testpatt from  in runconfigs instead of default TESTPATT
+                               if -testpatt and -tagexpr are not specified
+  -new state/status          : specify new state/status for set-ss
+			     
+Misc 			     
+  -start-dir path            : switch to this directory before running mtutil
+  -set-vars V1=1,V2=2        : Add environment variables to a run NB// these are
+                                   overwritten by values set in config files.
+  -log logfile               : send stdout and stderr to logfile
+  -repl                      : start a repl (useful for extending megatest)
+  -load file.scm             : load and run file.scm
+  -debug N|N,M,O...          : enable debug messages 0-N or N and M and O ...
+  -list-pkt-keys             : list all pkt keys
+			     
+Utility			     
+ db pgschema                 : emit postgresql schema; do \"mtutil db pgschema | psql -d mydb\"
+ gatherdb [propagate]        : gather dbs from all areas into /tmp/$USER_megatest/alldbs,
+                               optionally propagate the data to megatest2.0 format
+ 
 
 Examples:
 
 # Start a megatest run in the area \"mytests\"
-mtutil -area mytests -action run -target v1.63/aa3e -mode-patt MYPATT -tag-expr quick
+mtutil run -area mytests -target v1.63/aa3e -mode-patt MYPATT -tag-expr quick
 
 # Start a contour
 mtutil run -contour quick -target v1.63/aa3e 
 
 Called as " (string-intersperse (argv) " ") "
@@ -111,17 +202,20 @@
 Version " megatest-version ", built from " megatest-fossil-hash ))
 
 ;; args and pkt key specs
 ;;
 (define *arg-keys*
+  ;; used keys
+  ;;    a  - action
   '(
     ("-area"            . G) ;; maps to group
     ("-contour"         . c)
     ("-append-config"   . d)
     ("-state"           . e)
     ("-item-patt"       . i)
     ("-sync-to"         . k)
+    ("-new"             . l) ;; l (see below) is new-ss
     ("-run-name"        . n)
     ("-mode-patt"       . o)
     ("-test-patt"       . p)  ;; idea, enhance margs ("-test-patt" "-testpatt") => yields one value in "-test-patt"
     ("-status"          . s)
     ("-target"          . t)
@@ -128,13 +222,16 @@
     ("-tag-expr"        . x)
     ;; misc
     ("-debug"           . #f)  ;; for *verbosity* > 2
     ("-load"            . #f)  ;; load and exectute a scheme file
     ("-log"             . #f)
+    ("-override-user"   . #f)
     ("-msg"             . M)
     ("-start-dir"       . S)
     ("-set-vars"        . v)
+    ("-config"          . h)
+    ("-time-out"        . u)
     ))
 (define *switch-keys*
   '(
     ("-h"               . #f)
     ("-help"            . #f)
@@ -143,20 +240,62 @@
     ("-version"         . #f)
     ;; misc	        
     ("-repl"            . #f)
     ("-immediate"       . I)
     ("-preclean"        . r)
-    ("-rerun-all"       . u)
     ("-prepend-contour" . w)
+    ("-list-pkt-keys"   . #f)
     ))
 
 ;; alist to map actions to old megatest commands
 (define *action-keys*
   '((run         . "-run")
+    (rerun-clean . "-rerun-clean")
+    (rerun-all   . "-rerun-all")
+    (kill-run    . "-kill-runs")
+    (kill-rerun  . "-kill-rerun")
     (sync        . "")
     (archive     . "-archive")
-    (set-ss      . "-set-state-status")))
+    (set-ss      . "-set-state-status")
+    (remove      . "-remove-runs")))
+
+;; manually keep this list updated from the keys to
+;; the case *action* near the end of this file.
+(define *other-actions*
+  '(run remove rerun set-ss archive kill list
+	dispatch import rungen process
+	show gendot db tsend tlisten))
+
+;; Card types:
+;;
+;; A action
+;; U username (Unix)
+;; D timestamp
+;; T card type
+
+;; a summary list of used card types for helping to not accidentally re-use them
+;;
+;; ADGIMSTUZabcdefghiklnoprstuvwx
+
+;; utilitarian alist for standard cards
+;;
+(define *additional-cards*
+  '(
+    ;; Standard Cards
+    (A  . action    )
+    (D  . timestamp )
+    (T  . cardtype  )
+    (U  . user      ) ;; username
+    (Z  . shar1sum  )
+
+    ;; Extras
+    (a  . runkey    ) ;; needed for matching up pkts with target derived from runkey
+    ;; (l  . new-ss    ) ;; new state/status
+    (b  . branch    ) ;; repository branch or tag (fossil or git)
+    (f  . url       ) ;; repository URL (e.g. fossil or git)
+    (g  . clone     ) ;; existing clone area (cached in /tmp)
+    ))
 
 ;; inlst is an alternative input
 ;;
 (define (lookup-param-by-key key #!key (inlst #f))
   (fold (lambda (a res)
@@ -167,37 +306,25 @@
 	(or inlst *arg-keys*)))
 
 (define (lookup-action-by-key key)
   (alist-ref (string->symbol key) *action-keys*))
 
+(define (swizzle-alist lst)
+  (map (lambda (x)(cons (cdr x)(car x))) lst))
+
 ;;======================================================================
 ;;  U T I L S
 ;;======================================================================
 
 ;; given a mtutil param, return the old megatest equivalent
 ;;
-(define (param-translate param)
-  (or (alist-ref (string->symbol param)
-		 '((-tag-expr  . "-tagexpr")
-		   (-mode-patt . "--modepatt")
-		   (-run-name  . "-runname")
-		   (-test-patt . "-testpatt")
-		   (-msg       . "-m")))
-      param))
-
-(define (val->alist val)
-  (let ((val-list (string-split-fields ";\\s*" val #:infix)))
-    (if val-list
-	(map (lambda (x)
-	       (let ((f (string-split-fields "\\s*=\\s*" x #:infix)))
-		 (case (length f)
-		   ((0) `(,#f))  ;; null string case
-		   ((1) `(,(string->symbol (car f))))
-		   ((2) `(,(string->symbol (car f)) . ,(cadr f)))
-		   (else f))))
-	     val-list)
-	'())))
+(define (megatest-param->mtutil-param param)
+  (let* ((mapping-alist (common:get-param-mapping flavor: 'switch-symbol)))
+    (alist-ref (string->symbol param) mapping-alist eq? param)
+    param))
+
+(define val->alist common:val->alist)
 
 (define (push-run-spec torun contour runkey spec)
   (configf:section-var-set! torun contour runkey
 			    (cons spec
 				  (or (configf:lookup torun contour runkey)
@@ -210,11 +337,11 @@
 	(print "ERROR: failed to create directory " dest-dir " message: " ((condition-property-accessor 'exn 'message) exn))
       (create-directory dest-dir #t))
     (handle-exceptions
 	exn
 	(print "ERROR: failed to clone or sync 1ossil " url " message: " ((condition-property-accessor 'exn 'message) exn))
-      (if (file-exists? targ-file)
+      (if (common:file-exists? targ-file)
 	  (system (conc "fossil pull --once " url " -R " targ-file))
 	  (system (conc "fossil clone " url " " targ-file))
 	  ))))
 
 (define (fossil:last-change-node-and-time fossils-dir fossil-name branch)
@@ -259,40 +386,83 @@
 	   (loop (get-line) date node time))))
        (else ;; no more datat and last node on branch not found
 	(close-input-port timeline-port)
 	(values  (common:date-time->seconds (conc date " " time)) node))))))
 
-
 ;;======================================================================
 ;; GLOBALS
 ;;======================================================================
 
-;; Card types:
-;;
-;; a action
-;; u username (Unix)
-;; D timestamp
-;; T card type
-
-;; process args
-(define *action* (if (> (length (argv)) 1)
+;; first token is our action, but only if no leading dash
+(define *action* (if (and (> (length (argv)) 1)
+                          (not (string-match "^\\-.*" (cadr (argv)))))
 		     (cadr (argv))
 		     #f))
+
+;; process arguments, extract switches and parameters first
 (define remargs (args:get-args 
 		 (if *action* (cdr (argv)) (argv)) ;; args:get-args dumps first in argv list (the program name)
 		 (map car *arg-keys*)
 		 (map car *switch-keys*)
 		 args:arg-hash
 		 0))
 
+;; handle requests for help
+;;
 (if (or (member *action* '("-h" "-help" "help" "--help"))
 	(args:any-defined? "-h" "-help" "--help"))
     (begin
       (print help)
       (exit 1)))
 
+(define (print-pkt-keys inlst)
+  (for-each
+   (lambda (p)
+     (let ((sw (car p))
+           (c  (cdr p)))
+       (print (or c "n/a") "\t" sw)))
+   inlst))
+
+(define (print-duplicate-keys . all)
+  (let ((card-hash (make-hash-table)))
+    (for-each
+     (lambda (lst)
+       (for-each
+        (lambda (card-spec)
+          (let ((k (cdr card-spec)))
+            ;; (print "card-spec: " card-spec ", k: " k)
+            (if k (hash-table-set! card-hash k (+ (hash-table-ref/default card-hash k 0) 1)))))
+        lst))
+     all)
+    (for-each
+     (lambda (k)
+       (if (> (hash-table-ref card-hash k) 1)
+           (print k "\t" (hash-table-ref card-hash k))))
+     (sort (hash-table-keys card-hash) (lambda (a b)(>= (hash-table-ref card-hash a)(hash-table-ref card-hash b)))))
+    ))
+
+(define (print-pkt-key-info)
+  (print "Argument keys")
+  (print-pkt-keys *arg-keys*)
+  (print "\nSwitch keys")
+  (print-pkt-keys *switch-keys*)
+  (print "\nAction keys")
+  (print-pkt-keys *action-keys*)
+  (print "\nAdditional cards")
+  (print-pkt-keys (swizzle-alist *additional-cards*))
+  (print "\nDuplicate keys")
+  (print-duplicate-keys *arg-keys* *switch-keys* *action-keys* (swizzle-alist *additional-cards*))
+  (print "\nEnd of report.")
+  )
+
+;; list packet keys
+;;
+(if (args:get-arg "-list-pkt-keys")
+    (begin (print-pkt-key-info)(exit 0)))
+
 ;; (print "*action*: " *action*)
+
 ;; (let-values (((uuid pkt)
 ;; 	      (command-line->pkt #f args:arg-hash)))
 ;;   (print pkt))
 
 ;; Add args that use remargs here
@@ -300,11 +470,12 @@
 (if (and (not (null? remargs))
 	 (not (or
 	       (args:get-arg "-runstep")
 	       (args:get-arg "-envcap")
 	       (args:get-arg "-envdelta")
-	       (member *action* '("db"))   ;; very loose checks on db.
+	       (member *action* '("db" "tsend" "tlisten"))   ;; very loose checks on db and tsend/listen
+	       (equal? *action* "show")    ;; just keep going if list
 	       )))
     (debug:print-error 0 *default-log-port* "Unrecognised arguments: " (string-intersperse (if (list? remargs) remargs (argv))  " ")))
 
 (if (or (args:any? "-h" "help" "-help" "--help")
 	(member *action* '("-h" "-help" "--help" "help")))
@@ -311,69 +482,145 @@
     (begin
       (print help)
       (exit 1)))
 
 ;;======================================================================
-;; pkts
+;; Nanomsg transport
 ;;======================================================================
 
-(define (with-queue-db mtconf proc)
-  (let* ((pktsdirs (configf:lookup mtconf "setup"  "pktsdirs"))
-	 (pktsdir  (if pktsdirs (car (string-split pktsdirs " ")) #f))
-	 (toppath  (configf:lookup mtconf "dyndat" "toppath"))
-	 (pdbpath  (or (configf:lookup mtconf "setup"  "pdbpath") pktsdir)))
-    (if (not (and  pktsdir toppath pdbpath))
-	(begin
-	  (print "ERROR: settings are missing in your megatest.config for area management.")
-	  (print "  you need to have pktsdir in the [setup] section."))
-	(let* ((pdb  (open-queue-db pdbpath "pkts.db"
-				    schema: '("CREATE TABLE groups (id INTEGER PRIMARY KEY,groupname TEXT, CONSTRAINT group_constraint UNIQUE (groupname));"))))
-	  (proc pktsdirs pktsdir pdb)
-	  (dbi:close pdb)))))
-
-(define (load-pkts-to-db mtconf)
-  (with-queue-db
-   mtconf
-   (lambda (pktsdirs pktsdir pdb)
-     (for-each
-      (lambda (pktsdir) ;; look at all
-	(if (and (file-exists? pktsdir)
-		 (directory? pktsdir)
-		 (file-read-access? pktsdir))
-	    (let ((pkts (glob (conc pktsdir "/*.pkt"))))
-	      (for-each
-	       (lambda (pkt)
-		 (let* ((uuid    (cadr (string-match ".*/([0-9a-f]+).pkt" pkt)))
-			(exists  (lookup-by-uuid pdb uuid #f)))
-		   (if (not exists)
-		       (let* ((pktdat (string-intersperse
-				       (with-input-from-file pkt read-lines)
-				       "\n"))
-			      (apkt   (pkt->alist pktdat))
-			      (ptype  (alist-ref 'T apkt)))
-			 (add-to-queue pdb pktdat uuid (or ptype 'cmd) #f 0)
-			 (debug:print 4 *default-log-port* "Added " uuid " of type " ptype " to queue"))
-		       (debug:print 4 *default-log-port* "pkt: " uuid " exists, skipping...")
-		       )))
-	       pkts))))
-      (string-split pktsdirs)))))
-
-(define (get-pkt-alists pkts)
-  (map (lambda (x)
-	 (alist-ref 'apkt x)) ;; 'pkta pulls out the alist from the read pkt
-       pkts))
-
-;; given list of pkts (alist mode) return list of D cards as Unix epoch, sorted descending
-;; also delete duplicates by target i.e. (car pkt)
-(define (get-pkt-times pkts)
-  (delete-duplicates
-   (sort 
-    (map (lambda (x)
-	   `(,(alist-ref 't x) . ,(string->number (alist-ref 'D x))))
-	 pkts)
-    (lambda (a b)(> (cdr a)(cdr b))))      ;; sort descending
-   (lambda (a b)(equal? (car a)(car b))))) ;; remove duplicates by target
+(define-inline (encode data)
+  (with-output-to-string
+    (lambda ()
+      (write data))))
+
+(define-inline (decode data)
+  (with-input-from-string
+      data
+    (lambda ()
+      (read))))
+
+(define (is-port-in-use port-num)
+ (let* ((ret #f))
+     (let-values (((inp oup pid)
+                (process "netstat" (list  "-tulpn" ))))
+      (let loop ((inl (read-line inp)))
+        (if (not (eof-object? inl))
+            (begin 
+                (if (string-search (regexp (conc ":" port-num)) inl)
+                 (begin
+                 ;(print "Output: "  inl)
+                  (set! ret  #t))
+                 (loop (read-line inp)))))))
+ret))
+
+;;start a server, returns the connection
+;;
+(define (start-nn-server portnum )
+  (let ((rep (nn-socket 'rep)))
+    (handle-exceptions
+     exn
+     (let ((emsg ((condition-property-accessor 'exn 'message) exn)))
+       (print "ERROR: Failed to start server \"" emsg "\"")
+       (exit 1))
+      
+     (nn-bind rep (conc "tcp://*:" portnum)))
+    rep))
+
+(define (can-user-kill-listner user-info attrib)
+  (let* ((contacts (alist-ref 'contact attrib))
+         (user-id (cadddr (cdr user-info)))
+         (ret #f)  
+         (contact-list (string-split contacts ","))) 
+    (for-each
+      (lambda (admin)
+        (if (string-contains  user-id (car (string-split admin "@")))
+         (set! ret #t)))  
+    contact-list)
+   ret))
+
+;; open connection to server, send message, close connection
+;;
+(define (open-send-close-nn host-port msg attrib #!key (timeout 3) ) ;; default timeout is 3 seconds
+  (let ((req  (nn-socket 'req))
+        (uri  (conc "tcp://" host-port))
+        (res  #f)
+        (contacts (alist-ref 'contact attrib))
+        (mode (alist-ref 'mode attrib))) 
+    (handle-exceptions
+     exn
+     (let ((emsg ((condition-property-accessor 'exn 'message) exn)))
+       ;; Send notification       
+       (print "ERROR: Failed to connect / send to " uri " message was \"" emsg "\"" )
+         (if (equal? mode "production")
+             (begin 
+             (print " Sending email to contacts : " contacts )
+             (let ((email-body (mtut:stml->string (s:body
+										(s:p (conc "We could not send messages to the server on " uri "."  "Please check if the listner is running. It is possible that the host is overloaded due to which it may take too long to respond. \n Contact your system adminstrator if server load is high." (s:br)" Thank You ") )))))
+             (sendmail (string-join (string-split contacts ";" )) (conc "[Listner Error] Filed to connect to listner on " uri) email-body  use_html: #t)))
+             (print " mode : " mode " Not sending any emails" ))
+       #f)
+     (nn-connect req uri)
+     (print "Connected to the server " )
+     (nn-send req msg)
+     (print "Request Sent")  
+     (let* ((th1  (make-thread (lambda ()
+                                 (let ((resp (nn-recv req)))
+                                   (nn-close req)
+                                   (set! res (if (equal? resp "ok")
+                                                 #t
+                                                 #f))))
+                               "recv thread"))
+            (th2 (make-thread (lambda ()
+                                (thread-sleep! timeout)
+                                (thread-terminate! th1))
+                             "timer thread")))
+       (thread-start! th1)
+       (thread-start! th2)
+       (thread-join! th1)
+       res))))
+
+(define (open-send-receive-nn host-port msg attrib #!key (timeout 3) ) ;; default timeout is 3 seconds
+  (let ((req  (nn-socket 'req))
+        (uri  (conc "tcp://" host-port))
+        (res  #f)
+        (contacts (alist-ref 'contact attrib))
+        (mode (alist-ref 'mode attrib))) 
+    (handle-exceptions
+     exn
+     (let ((emsg ((condition-property-accessor 'exn 'message) exn)))
+       ;; Send notification      
+       (print "ERROR: Failed to connect / send to " uri " message was \"" emsg "\"" )
+         (if (equal? mode "production")
+             (begin 
+             (print " Sending email to contacts : " contacts )
+             (let ((email-body (mtut:stml->string (s:body
+										(s:p (conc "We could not send messages to the server on " uri "."  "Please check if the listner is running. It is possible that the host is overloaded due to which it may take too long to respond. \n Contact your system adminstrator if server load is high." (s:br)" Thank You ") )))))
+             (sendmail (string-join (string-split contacts ";" )) (conc "[Listner Error] Filed to connect to listner on " uri) email-body  use_html: #t)))
+             (print " mode : " mode " Not sending any emails" ))
+       #f)
+     (nn-connect req uri)
+     (print "Connected to the server " )
+     (nn-send req msg)
+     (print "Request Sent")  
+     ;; receive code here
+     ;;(print (nn-recv req))
+     (let* ((th1  (make-thread (lambda ()
+                                 (let ((resp (nn-recv req)))
+                                   (nn-close req)
+                                   (print resp)
+                                   (set! res (if (equal? resp "ok")
+                                                 #t
+                                                 #f))))
+                               "recv thread"))
+            (th2 (make-thread (lambda ()
+                                (thread-sleep! timeout)
+                                (thread-terminate! th1))
+                             "timer thread")))
+       (thread-start! th1)
+       (thread-start! th2)
+       (thread-join! th1)
+       res))))
 
 ;;======================================================================
 ;; Runs
 ;;======================================================================
 
@@ -386,38 +633,53 @@
 ;; collect, translate, collate and assemble a pkt from the command-line
 ;;
 ;; sched => force the run start time to be recorded as sched Unix
 ;; epoch. This aligns times properly for triggers in some cases.
 ;;
-(define (command-line->pkt action args-alist sched-in)
-  (let* ((sched     (cond
+;;  extra-dat format is ( 'x xval 'y yval .... )
+;;
+(define (command-line->pkt action args-alist sched-in #!key (extra-dat '())(area-path #f)(new-ss #f))
+   (let* ((sched     (cond
 		     ((vector? sched-in)(local-time->seconds sched-in)) ;; we recieved a time
 		     ((number? sched-in) sched-in)
 		     (else     (current-seconds))))
+   (user  (if (and args-alist (hash-table? args-alist))
+              (hash-table-ref/default args-alist "-override-user" (current-user-name))
+						  (current-user-name)))
+                    
 	 (args-data (if args-alist
 			(if (hash-table? args-alist) ;; seriously?
 			    (hash-table->alist args-alist)
 			    args-alist)
 			(hash-table->alist args:arg-hash))) ;; if no args-alist then we assume this is a call driven directly by commandline
-	 (alldat    (apply append (list 'T "cmd"
-					'a action
-					'U (current-user-name)
-					'D sched)
+	 (alldat    (apply append
+			   (list 'A action
+				 'U user
+				 'D sched)
+			   (if area-path
+			       (list 'S area-path) ;; the area-path is mapped to the start-dir
+			       '())
+                           (if (list? extra-dat)
+			       extra-dat
+			       (begin
+				 (debug:print 0 *default-log-port* "ERROR: command-line->pkt received bad extra-dat " extra-dat)
+				 '()))
 			   (map (lambda (x)
 				  (let* ((param (car x))
 					 (value (cdr x))
 					 (pmeta (assoc param *arg-keys*))    ;; translate the card key to a megatest switch or parameter
 					 (smeta (assoc param *switch-keys*)) ;; first lookup the key in arg-keys or switch-keys
 					 (meta  (if (or pmeta smeta)
 						    (cdr (or pmeta smeta))   ;; found it?
 						    #f)))
-				    (if (or pmeta smeta)                     ;; construct the switch/param pair.
+           (if meta                     ;; construct the switch/param pair.
 					(list meta value)
 					'())))
+          
 				(filter cdr args-data)))))
-;; (print  "Alldat: " alldat
-;;         " args-data: " args-data)
+    (print  "Alldat: " alldat  ) ;;Do not remove. This is uesed by other applications to calculate z card 
+    ;(exit)
     (add-z-card
      (apply construct-sdat alldat))))
 
 (define (simple-setup start-dir-in)
   (let* ((start-dir (or start-dir-in "."))
@@ -427,17 +689,53 @@
 		     ;; environ-patt: "env-override"
 		     given-toppath: start-dir
 		     ;; pathenvvar: "MT_RUN_AREA_HOME"
 		     ))
 	 (mtconf    (if mtconfdat (car mtconfdat) #f)))
-    ;; we set some dynamic data in a section called "dyndata"
+    ;; we set some dynamic data in a section called "scratchdata"
     (if mtconf
 	(begin
-	  (configf:section-var-set! mtconf "dyndat" "toppath" start-dir)))
-    ;; (print "TOPPATH: " (configf:lookup mtconf "dyndat" "toppath"))
+	  (configf:section-var-set! mtconf "scratchdat" "toppath" start-dir)))
+    ;; (print "TOPPATH: " (configf:lookup mtconf "scratchdat" "toppath"))
     mtconfdat))
 
+;;======================================================================
+;; Areas
+;;======================================================================
+
+;; look for areas=a1,a2,a3 OR areafn=somefuncname
+;;
+(define (val-alist->areas val-alist)
+  (let ((areas-string   (alist-ref 'areas  val-alist))
+	(areas-procname (alist-ref 'areafn val-alist)))
+    (if areas-procname ;; areas-procname take precedence
+	areas-procname
+	(string-split (or areas-string "") ","))))
+
+;; area   - the current area under consideration
+;; areas  - the list of allowed areas from the contour spec -OR-
+;;          if it is a string then it is the function to use to
+;;          lookup in *area-checkers*
+;;
+(define (area-allowed? area areas runkey contour mode-patt)
+  ;;(print "Areas: " areas)
+  (cond
+   ((not areas) #t) ;; no spec
+   ((string? areas) ;; 
+    (let ((check-fn (hash-table-ref/default *area-checkers* (string->symbol areas) #f)))
+      (if check-fn
+	  (check-fn area runkey contour mode-patt)
+	  #f)))
+   ((list? areas)(member area areas))
+   (else #f))) ;; shouldn't get here 
+
+(define (get-area-names mtconf)
+  (map car (configf:get-section mtconf "areas")))
+
+;;======================================================================
+;; Pkts for remote control
+;;======================================================================
 
 ;; NEED TIMESTAMP ON PKTS for efficient loading of packets into db.
 
 
 ;; make a run request pkt from basic data, this seriously needs to be refactored
@@ -446,16 +744,19 @@
 ;;  ii. Pass the pkt keys and values to this proc and go from there.
 ;; iii. Maybe have an abstraction alist with meaningful names for the pkt keys
 ;;
 ;; Override the run start time record with sched. Usually #f is fine.
 ;; 
-(define (create-run-pkt mtconf action area runkey runname mode-patt tag-expr pktsdir reason contour sched dbdest append-conf runtrans)
+(define (create-run-pkt mtconf action area runkey target runname mode-patt 
+                        tag-expr pktsdir reason contour sched dbdest append-conf
+                        runtrans)
   (let* ((good-val   (lambda (inval)(and inval (string? inval)(not (string-null? inval)))))
-	 (area-dat   (val->alist (or (configf:lookup mtconf "areas" area) "")))
+	 (area-dat   (common:val->alist (or (configf:lookup mtconf "areas" area) "")))
 	 (area-path  (alist-ref 'path      area-dat))
-	 (area-xlatr (alist-ref 'targtrans area-dat))
-	 (new-runname (let* ((callname (if (string? runtrans)(string->symbol runtrans) #f))
+	 ;; (area-xlatr (alist-ref 'targtrans area-dat))
+         ;; (xlatr-key  (if area-xlatr (string->symbol area-xlatr) #f))
+         (new-runname (let* ((callname (if (string? runtrans)(string->symbol runtrans) #f))
 			     (mapper   (if callname (hash-table-ref/default *runname-mappers* callname #f) #f)))
 			;; (print "callname=" callname " runtrans=" runtrans " mapper=" mapper)
 			(if (and callname
 				 (not (equal? callname "auto"))
 				 (not mapper))
@@ -469,30 +770,13 @@
 				  (print " message: " ((condition-property-accessor 'exn 'message) exn))
 				  runname)
 			      (print "(mapper " (string-intersperse (list runkey runname area area-path reason contour mode-patt) ", ") ")")
 			      (mapper runkey runname area area-path reason contour mode-patt))
 			    (case callname
-			      ((auto) runname)
+			      ((auto #f) runname)
 			      (else   runtrans)))))
-	 (new-target (if area-xlatr 
-			 (let ((xlatr-key (string->symbol area-xlatr)))
-			   (if (hash-table-exists? *target-mappers* xlatr-key)
-			       (begin
-				 (print "Using target mapper: " area-xlatr)
-				 (handle-exceptions
-				     exn
-				     (begin
-				       (print "FAILED TO RUN TARGET MAPPER FOR " area ", called " area-xlatr)
-				       (print "   function is: " (hash-table-ref/default *target-mappers* xlatr-key #f ) )
-				       (print " message: " ((condition-property-accessor 'exn 'message) exn))
-				       runkey)
-				   ((hash-table-ref *target-mappers* xlatr-key)
-				    runkey new-runname area area-path reason contour mode-patt)))
-			       (begin
-				 (print "ERROR: Failed to find named target translator " xlatr-key ", using original target.")
-				 runkey)))
-			 runkey))
+	 (new-target     target) ;; I believe we will want target manipulation here .. (map-targets xlatr-key runkey area contour))
 	 (actual-action  (if action
 			     (if (equal? action "sync-prepend")
 				 "sync"
 				 action)
 			     "run"))) ;; this has gotten a bit ugly. Need a function to handle actions processing.
@@ -499,20 +783,22 @@
     ;; some hacks to remove switches not needed in certain cases
     (case (string->symbol (or action "run"))
       ((sync sync-prepend)
        (set! new-target #f)
        (set! runame     #f)))
-    (print "area-path: " area-path " area-xlatr: " area-xlatr " orig-target: " runkey " new-target: " new-target)
+    ;; (print "area-path: " area-path " orig-target: " runkey " new-target: " new-target)
     (let-values (((uuid pkt)
 		  (command-line->pkt
 		   actual-action
 		   (append 
 		    `(("-start-dir"  . ,area-path)
-		      ("-msg"        . ,reason)
+		      ;;("-msg"        . ,reason)
+                      ("-msg"        . ,"Script-triggered")
 		      ("-contour"    . ,contour))
 		    (if (good-val new-runname) `(("-run-name"      . ,new-runname)) '())
 		    (if (good-val new-target)  `(("-target"        . ,new-target))  '())
+		    (if (good-val area)        `(("-area"          . ,area))        '())
 		    (if (good-val mode-patt)   `(("-mode-patt"     . ,mode-patt))   '())
 		    (if (good-val tag-expr)    `(("-tag-expr"      . ,tag-expr))    '())
 		    (if (good-val dbdest)      `(("-sync-to"       . ,dbdest))      '())
 		    (if (good-val append-conf) `(("-append-config" . ,append-conf)) '())
 		    (if (equal? action "sync-prepend") '(("-prepend-contour" . " "))   '())
@@ -523,33 +809,36 @@
 			    (equal? action "run"))
 			`(("-preclean"  . " ")
 			  ("-rerun-all" . " "))      ;; if run we *always* want preclean set, use single space as placeholder
 			'())
 		    )
-		   sched)))
+		   sched
+                   extra-dat: `(a ,runkey)  ;; we need the run key for marking the run as launched
+                   )))
       (with-output-to-file
 	  (conc pktsdir "/" uuid ".pkt")
 	(lambda ()
 	  (print pkt))))))
 
 ;; (use trace)(trace create-run-pkt)
+(define (contains list x) (cond ((null? list) #f) ((eq? (car list) x) #t) (else (contains (cdr list) x))))
 
 ;; collect all needed data and create run pkts for contours with changed inputs
 ;;
 (define (generate-run-pkts mtconf toppath)
   (let ((std-runname (conc "sched"  (time->string (seconds->local-time (current-seconds)) "%M%H%d"))))
-    (with-queue-db
+    (common:with-queue-db
      mtconf
      (lambda (pktsdirs pktsdir pdb)
        (let* ((rgconfdat (find-and-read-config (conc toppath "/runconfigs.config")))
 	      (rgconf    (car rgconfdat))
 	      (all-areas (map car (configf:get-section mtconf "areas")))
 	      (contours  (configf:get-section mtconf "contours"))
 	      (torun     (make-hash-table)) ;; target => ( ... info ... )
 	      (rgentargs (hash-table-keys rgconf))) ;; these are the targets registered for automatically triggering
 
-	 (print "rgentargs: " rgentargs)
+	 ;;(print "rgentargs: " rgentargs)
 	 
 	 (for-each
 	  (lambda (runkey)
 	    (let* ((keydats   (configf:get-section rgconf runkey)))
 	      (for-each
@@ -561,36 +850,51 @@
 			(len-key    (length keyparts))
 			(ruletype   (if (> len-key 1)(cadr keyparts) #f))
 			(action     (if (> len-key 2)(caddr keyparts) #f))
 			(optional   (if (> len-key 3)(cadddr keyparts) #f))
 			;; (val-list   (string-split-fields ";\\s*" val #:infix)) ;; (string-split val)) ;; runname-rule params
-			(val-alist  (val->alist val))
+			(val-alist  (common:val->alist val))
 			(runname    (make-runname "" ""))
 			(runtrans   (alist-ref 'runtrans val-alist))
+
+			;; these may or may not be defined and not all are used in each handler type in the case below
+			(run-name   (alist-ref 'run-name val-alist))
+			(target     (alist-ref 'target   val-alist))
+			(crontab    (alist-ref 'cron     val-alist))
+			(areas      (val-alist->areas    val-alist)) ;; areas can be a single string (a reference to call an areas function), or a list of area names.
+			(dbdest     (alist-ref 'dbdest   val-alist))
+			(appendconf (alist-ref 'appendconf val-alist))
+			(file-globs (alist-ref 'glob val-alist))
 			
-			(runstarts  (find-pkts pdb '(runstart) `((o . ,contour)
+			(runstarts  (find-pkts pdb '(runstart) `((c . ,contour)
 								 (t . ,runkey))))
-			(rspkts     (get-pkt-alists runstarts))
+			(rspkts     (common:get-pkt-alists runstarts))
 			;; starttimes is for run start times and is used to know when the last run was launched
-			(starttimes (get-pkt-times rspkts)) ;; sort by age (youngest first) and delete duplicates by target
-			(last-run (if (null? starttimes) ;; if '() then it has never been run, else get the max
-				      0
-				      (apply max (map cdr starttimes))))
+			(starttimes (common:get-pkt-times rspkts)) ;; sort by age (youngest first) and delete duplicates by target
+			(last-run   (if (null? starttimes) ;; if '() then it has never been run, else get the max
+					0
+					(apply max (map cdr starttimes))))
 			;; synctimes is for figuring out the last time a sync was done
-			(syncstarts   (find-pkts pdb '(syncstart) '())) ;; no qualifiers, a sync does all tarets etc.
-			(sspkts       (get-pkt-alists syncstarts))
-			(synctimes    (get-pkt-times  sspkts))
-			(last-sync (if (null? synctimes) ;; if '() then it has never been run, else get the max
-				      0
-				      (apply max (map cdr synctimes))))
+			(syncstarts (find-pkts pdb '(syncstart) '())) ;; no qualifiers, a sync does all tarets etc.
+			(sspkts       (common:get-pkt-alists syncstarts))
+			(synctimes    (common:get-pkt-times  sspkts))
+			(last-sync  (if (null? synctimes) ;; if '() then it has never been run, else get the max
+					0
+					(apply max (map cdr synctimes))))
 			)
 
 		   (let ((delta (lambda (x)
 				  (round (/ (- (current-seconds) x) 60)))))
-		     (print "runkey: " runkey ", ruletype: " ruletype ", action: " action ", last-run: " last-run " time since; last-run: " (delta last-run) ", last-sync: " (delta last-sync)))
+             (if (args:get-arg "-target")
+               (if (string= (args:get-arg "-target") runkey)
+		       (begin (print "runkey: " runkey ", ruletype: " ruletype ", action: " action ", last-run: " last-run " time since; last-run: " (delta last-run) ", last-sync: " (delta last-sync))
+		              (print "val-alist=" val-alist " runtrans=" runtrans))
+               (if #f (print "skipping: " runkey)))
+		       (begin (print "runkey: " runkey ", ruletype: " ruletype ", action: " action ", last-run: " last-run " time since; last-run: " (delta last-run) ", last-sync: " (delta last-sync))
+		              (print "val-alist=" val-alist " runtrans=" runtrans))
+           ))
 
-		   (print "val-alist=" val-alist " runtrans=" runtrans)
 		   
 		   ;; look in runstarts for matching runs by target and contour
 		   ;; get the timestamp for when that run started and pass it
 		   ;; to the rule logic here where "ruletype" will be applied
 		   ;; if it comes back "changed" then proceed to register the runs
@@ -597,41 +901,54 @@
 		   
 		   (case (string->symbol (or ruletype "no-such-rule"))
 
 		     ((no-such-rule) (print "ERROR: no such rule for " sense))
 
+		     ;; Handle crontab like rules
+		     ;;
 		     ((scheduled)
 		      (if (not (alist-ref 'cron val-alist)) ;; gotta have cron spec
 			  (print "ERROR: bad sense spec \"" (string-intersperse sense " ") "\" params: " val-alist)
-			  (let* ((run-name (alist-ref 'run-name val-alist))
-				 (target   (alist-ref 'target   val-alist))
-				 (crontab  (alist-ref 'cron     val-alist))
+			  (let* (
 				 ;; (action   (alist-ref 'action   val-alist))
-				 (cron-safe-string (string-translate (string-intersperse (string-split (alist-ref 'cron val-alist)) "-") "*" "X"))
+				 (cron-safe-string (string-translate (string-intersperse (string-split crontab) "-") "*" "X"))
 				 (runname  std-runname)) ;; (conc "sched" (time->string (seconds->local-time (current-seconds)) "%M%H%d")))))
 			    ;; (print "last-run: " last-run " need-run: " need-run)
 			    ;; (if need-run
 			    (case (string->symbol action)
 			      ((sync sync-prepend)
 			       (if (common:extended-cron crontab #f last-sync)
 				   (push-run-spec torun contour runkey
 						  `((message . ,(conc ruletype ":sync-" cron-safe-string))
 						    (action  . ,action)
-						    (dbdest  . ,(alist-ref 'dbdest val-alist))
-						    (append  . ,(alist-ref 'appendconf val-alist))))))
+						    (dbdest  . ,dbdest)
+						    (append  . ,appendconf)
+						    (areas   . ,areas)))))
 			      ((run)
 			       (if (common:extended-cron crontab #f last-run)
 				   (push-run-spec torun contour runkey
-						  `((message . ,(conc ruletype ":" cron-safe-string))
-						    (runname . ,runname)
+						  `((message  . ,(conc ruletype ":" cron-safe-string))
+						    (runname  . ,runname)
+						    (runtrans . ,runtrans)
+						    (action   . ,action)
+						    (areas    . ,areas)
+						    (target   . ,target)))))
+                              ((remove)
+                               (push-run-spec torun contour runkey
+						  `((message  . ,(conc ruletype ":" cron-safe-string))
+						    (runname  . ,runname)
 						    (runtrans . ,runtrans)
-						    (action  . ,action)
-						    (target  . ,target)))))
+						    (action   . ,action)
+						    (areas    . ,areas)
+						    (target   . ,target))))
 			      (else
 			       (print "ERROR: action \"" action "\" has no scheduled handler")
 			       )))))
 
+
+		     ;; script based sensors
+		     ;;
 		     ((script)
 		      ;; syntax is a little different here. It is a list of commands to run, "scriptname = extra_parameters;scriptname = ..."
 		      ;; where scriptname may be repeated multiple times. The script must return unix-epoch of last change, new-target-name and new-run-name
 		      ;; the script is called like this:  scriptname contour runkey std-runname action extra_param1 extra_param2 ...
 		      (for-each
@@ -661,22 +978,142 @@
 						       (string-intersperse rem-lines "-")))
 				      (need-run    (> last-change last-run)))
 				 (print "last-run: " last-run " need-run: " need-run)
 				 (if need-run
 				     (let* ((key-msg    `((message  . ,(conc ruletype ":" message))
-							  (runname  . ,runname)
+							  (runname  . ,new-runname)
 							  (runtrans . ,runtrans)
 							  (action   . ,action)
-							  (target   . ,new-target))))
+							  (areas    . ,areas)
+							  ;;(target   . ,(list new-target)) ;; overriding with result from runing the script
+                                                          )))
 				       (print "key-msg: " key-msg)
 				       (push-run-spec torun contour
 						      (if optional  ;; we need to be able to differentiate same contour, different behavior. 
 							  (conc runkey ":" optional)  ;; NOTE: NOT COMPLETELY IMPLEMENTED. DO NOT USE
 							  runkey)
 						      key-msg)))))))
 		       val-alist)) ;; iterate over the param split by ;\s*
 
+		     ;; script based sensors
+		     ;;
+		     ((area-script)
+		      ;; syntax is a little different here. It is a list of commands to run, "scriptname = extra_parameters;scriptname = ..."
+		      ;; where scriptname may be repeated multiple times. The script must return unix-epoch of last change, new-target-name and new-run-name
+		      ;; the script is called like this:  scriptname contour runkey std-runname action extra_param1 extra_param2 ...
+		      (for-each
+		       (lambda (cmd)
+			 ;;(print "cmd: " cmd)
+                         ;;(print "Areas: " all-areas)
+                         (for-each 
+                           (lambda (area) 
+;Add code to check whether area is valid
+			     (if 
+                   (if (args:get-arg "-target") 
+                     (if (string= (args:get-arg "-target") runkey) (area-allowed? area "area-needs-to-be-run" runkey contour #f) #f) 
+                     (area-allowed? area "area-needs-to-be-run" runkey contour #f))
+       
+			     (let* ((script (car cmd))
+				(params (cdr cmd))
+				(cmd    (conc script " " contour " " area " " runkey " " std-runname " " action " " params))
+				(res    (handle-exceptions
+					    exn
+					    #f
+					  (print "Running " cmd)
+					  (with-input-from-pipe cmd read-lines)))
+                                (cval       (or (configf:lookup mtconf "contours" contour) ""))
+                                (cval-alist (common:val->alist cval))                     ;; BEWARE ... NOT the same val-alist as above!
+                                ;;(areas      (val-alist->areas cval-alist))
+                                (selector   (alist-ref 'selector cval-alist))
+                                (mode-tag   (and selector (string-split-fields "/" selector #:infix)))
+                                (mode-patt  (and mode-tag (if (eq? (length mode-tag) 2)(cadr mode-tag) #f)))
+                                (tag-expr   (and mode-tag (if (null? mode-tag) #f (car mode-tag))))
+                              )
+			     (if (and res (not (null? res)))
+			       (let* ((parts       (string-split (car res))) ;;
+				      (rem-lines   (cdr res))
+				      (num-parts   (length parts))
+				      (last-change (string->number (if (> num-parts 0)(car parts) "abc")))  ;; force no run if not a number returned
+				      (new-target  (if (> num-parts 1)
+						       (cadr parts)
+						       runkey))
+				      (new-runname (if (> num-parts 2)
+						       (caddr parts)
+						       std-runname))
+                        	      (area-pkts  (find-pkts pdb '(runstart) `((c . ,contour)
+                                                                               (t . ,runkey)
+                                                                               (G . ,area ))))
+                                      (runstarts (filter (lambda (my-pkt)
+                                           ;;(print my-pkt)
+                                           (not (contains (map
+                                               (lambda (c)
+                                                ;;(print "C: " c "PKT: " my-pkt) 
+                                                (let* ((ctype (car c))
+                                                       (rx (cdr c))
+                                                       ;;(foo2 (print "Ctype: " ctype " RX: " rx))
+                                                       (pkt (alist-ref 'pkt my-pkt))
+                                                       (apkt (pkt->alist pkt))
+                                                       (cdat (alist-ref ctype apkt)))
+                                                 (if rx
+                                                 (if (string-match "t" (symbol->string ctype) )
+                                                 (begin (if #f (print "RX: " rx " CDAT: " (string-join (take (string-split cdat "/") 3) "/"))) (if cdat (string-match rx (string-join (take (string-split cdat "/") 3) "/")) #f))
+                                                 (begin (if #f (print "RX: " rx " CDAT: " cdat)) (if cdat (string-match rx cdat) #f))) #f)
+
+                                               ))
+                                          `((c . ,contour) (t . ,runkey) (G . ,area))) #f)))
+                                        area-pkts))
+
+                                      ;;(test (pp runstarts))
+                        	      (rspkts     (common:get-pkt-alists runstarts))
+                        	      ;; starttimes is for run start times and is used to know when the last run was launched
+                        	      (starttimes (common:get-pkt-times rspkts)) ;; sort by age (youngest first) and delete duplicates by target
+                        	      (last-run   (if (null? starttimes) ;; if '() then it has never been run, else get the max
+                                          0
+                                        (apply max (map cdr starttimes))))
+
+                                     ;; (last-run  9) ;; I think we can do a more valid calculation for this based on the run started packets for this particular area and target
+                                      (reason "Area-script-triggered")
+                                      ;;(mode-patt #f)
+                                      ;;(tag-expr #f)
+				      (sched #f)
+				      (message     (if (null? rem-lines)
+						       cmd
+						       (string-intersperse rem-lines "-")))
+				      (need-run    (> last-change last-run)))
+				 (print "last-change: " last-change " last-run: " last-run " need-run: " need-run)
+				 (if need-run
+				     (let* ((key-msg    `((message  . ,(conc ruletype ":" message))
+							  (runname  . ,new-runname)
+							  (runtrans . ,runtrans)
+							  (action   . ,action)
+							  (areas    . ,area)
+							  ;;(target   . ,(list new-target)) ;; overriding with result from runing the script
+                                                          ))
+							(aval       (or (configf:lookup mtconf "areas" area) ""))
+                                    			(aval-alist (common:val->alist aval))
+
+							(targets (map-targets mtconf aval-alist runkey area contour)))
+                                        (pp targets)
+				        (for-each (lambda (target) (create-run-pkt mtconf action area runkey target new-runname mode-patt
+                                                      tag-expr pktsdir reason contour sched dbdest append
+                                                      runtrans)) targets)
+					;; Add filter for targets
+
+                                       ;;(create-run-pkt mtconf action area runkey target runname
+                                       ;;               pktsdir reason contour dbdest append
+                                       ;;               runtrans)
+				       (print "key-msg: " key-msg)
+				       ;;(push-run-spec torun contour
+				;;		      (if optional  ;; we need to be able to differentiate same contour, different behavior. 
+				;;			  (conc runkey ":" optional)  ;; NOTE: NOT COMPLETELY IMPLEMENTED. DO NOT USE
+				;;			  runkey)
+				;;		      key-msg)
+                                       ))))))) (filter (lambda (x) (if (not (args:get-arg "-area")) #t (if (string= x (args:get-arg "-area")) #t #f))) all-areas))
+		       ) val-alist)) ;; iterate over the param split by ;\s*
+
+		     ;; fossil scm based triggers
+		     ;;
 		     ((fossil)
 		      (for-each
 		       (lambda (fspec)
 			 (print "fspec: " fspec)
 			 (let* ((url         (symbol->string (car fspec))) ;; THIS COULD BE TROUBLE. Add option to reading line to return as string.
@@ -688,65 +1125,78 @@
 			   (fossil:clone-or-sync url fname fdir) ;; )
 			   (let-values (((datetime node)
 					 (fossil:last-change-node-and-time fdir fname branch)))
 			     (if (null? starttimes)
 				 (push-run-spec torun contour runkey
-						`((message . ,(conc "fossil:" branch "-neverrun"))
-						  (runname . ,(conc runname "-" node))
+						`((message  . ,(conc "fossil:" branch "-neverrun"))
+						  (runname  . ,(conc runname "-" node))
 						  (runtrans . ,runtrans)
-						  (target  . ,runkey)))
+						  (areas    . ,areas)
+						  ;; (target   . ,runkey)
+						  (action   . ,action)
+                                                  ))
 				 (if (> datetime last-run) ;; change time is greater than last-run time
 				     (push-run-spec torun contour runkey
-						    `((message . ,(conc "fossil:" branch "-" node))
-						      (runname . ,(conc runname "-" node))
+						    `((message  . ,(conc "fossil:" branch "-" node))
+						      (runname  . ,(conc runname "-" node))
 						      (runtrans . ,runtrans)
-						      (target  . ,runkey)))))
+						      (areas    . ,areas)
+						      ;; (target   . ,runkey)
+						      (action   . ,action)
+						      (branch   . ,branch)
+						      (url      . ,url)
+						      (clone    . ,(conc fdir "/" fname))
+                                                      ))))
 			     (print "Got datetime=" datetime " node=" node))))
 		       val-alist))
-		     
+
+		     ;; sensor looking for one or more files newer than reference
+		     ;;
 		     ((file file-or) ;; one or more files must be newer than the reference
-		      (let* ((file-globs  (alist-ref 'glob val-alist))
-			     (youngestdat (common:get-youngest (common:bash-glob file-globs)))
+		      (let* ((youngestdat (common:get-youngest (common:bash-glob file-globs)))
 			     (youngestmod (car youngestdat)))
 			;; (print "youngestmod: " youngestmod " starttimes: " starttimes)
 			(if (null? starttimes) ;; this target has never been run
 			    (push-run-spec torun contour runkey
-					   `((message . "file:neverrun")
-					     (action  . ,action)
+					   `((message  . "file:neverrun")
+					     (action   . ,action)
 					     (runtrans . ,runtrans)
-					     (target  . ,runkey)
-					     (runname . ,runname)))
+					     ;; (target   . ,runkey)
+					     (areas    . ,areas)
+					     (runname  . ,runname)))
 			;; (for-each
 			;;  (lambda (starttime) ;; look at the time the last run was kicked off for this contour
 			;;    (if (> youngestmod (cdr starttime))
 			;; 	   (begin
 			;; 	     (print "starttime younger than youngestmod: " starttime " Youngestmod: " youngestmod)
 			    (if (> youngestmod last-run)
 				(push-run-spec torun contour runkey
-					       `((message . ,(conc ruletype ":" (cadr youngestdat)))
-						 (action  . ,action)
-						 (target  . ,runkey)
+					       `((message  . ,(conc ruletype ":" (cadr youngestdat)))
+						 (action   . ,action)
+						 ;; (target   . ,runkey)
 						 (runtrans . ,runtrans)
-						 (runname . ,runname)
+						 (areas    . ,areas)
+						 (runname  . ,runname)
 						 ))))))
-		      ;; starttimes))
 
+		     ;; all globbed files must be newer than the reference
+		     ;;
 		     ((file-and) ;; all files must be newer than the reference
-		      (let* ((file-globs  (alist-ref 'glob val-alist))
-			     (youngestdat (common:get-youngest file-globs))
+		      (let* ((youngestdat (common:get-youngest file-globs))
 			     (youngestmod (car youngestdat))
 			     (success     #t)) ;; any cases of not true, set flag to #f for AND
 			;; (print "youngestmod: " youngestmod " starttimes: " starttimes)
 			(if (null? starttimes) ;; this target has never been run
 			    (push-run-spec torun contour runkey
-					   `((message . "file:neverrun")
-					     (runname . ,runname)
+					   `((message  . "file:neverrun")
+					     (runname  . ,runname)
 					     (runtrans . ,runtrans)
-					     (target  . ,runkey)
-					     (action  . ,action)))
+					     (areas    . ,areas)
+					     ;; (target   . ,runkey)
+					     (action   . ,action)))
 			    ;; NB// I think this is wrong. It should be looking at last-run only.
-			    (if (> youngestmod last-run)
+			    (if (> youngestmod last-run) ;; WAIT!! Shouldn't file-and be looking at the *oldest* file (thus all are younger than ...)
 				
 				;; 			    (for-each
 				;; 			     (lambda (starttime) ;; look at the time the last run was kicked off for this contour
 				;; 			       (if (< youngestmod (cdr starttime))
 				;; 				   (set! success #f)))
@@ -753,82 +1203,105 @@
 				;; 			     starttimes))
 				;; 			(if success
 				;; 			    (begin
 				;; 			      (print "starttime younger than youngestmod: " starttime " Youngestmod: " youngestmod)
 				(push-run-spec torun contour runkey
-					       `((message . ,(conc ruletype ":" (cadr youngestdat)))
-						 (runname . ,runname)
+					       `((message  . ,(conc ruletype ":" (cadr youngestdat)))
+						 (runname  . ,runname)
 						 (runtrans . ,runtrans)
-						 (target  . ,runkey)
-						 (action  . ,action)
+						 ;; (target   . ,runkey)
+						 (areas    . ,areas)
+						 (action   . ,action)
 						 ))))))
 		     (else (print "ERROR: unrecognised rule \"" ruletype)))))
 	       keydats))) ;; sense rules
 	  (hash-table-keys rgconf))
 	 
 	 ;; now have to run populated
 	 (for-each
 	  (lambda (contour)
-	    (print "contour: " contour)
-	    (let* ((val       (or (configf:lookup mtconf "contours" contour) ""))
-		   (val-alist (val->alist val))
-		   (areas     (string-split (or (alist-ref 'areas val-alist) "") ","))
-		   (selector  (alist-ref 'selector val-alist))
-		   (mode-tag  (and selector (string-split-fields "/" selector #:infix)))
-		   (mode-patt (and mode-tag (if (eq? (length mode-tag) 2)(cadr mode-tag) #f)))
-		   (tag-expr  (and mode-tag (if (null? mode-tag) #f (car mode-tag)))))
+	    (let* ((cval       (or (configf:lookup mtconf "contours" contour) ""))
+		   (cval-alist (common:val->alist cval))                     ;; BEWARE ... NOT the same val-alist as above!
+		   (areas      (val-alist->areas cval-alist))
+		   (selector   (alist-ref 'selector cval-alist))
+		   (mode-tag   (and selector (string-split-fields "/" selector #:infix)))
+		   (mode-patt  (and mode-tag (if (eq? (length mode-tag) 2)(cadr mode-tag) #f)))
+		   (tag-expr   (and mode-tag (if (null? mode-tag) #f (car mode-tag)))))
+	      (print "contour: " contour " areas=" areas " cval=" cval)
 	      (for-each
-	       (lambda (runkeydatset)
+	       (lambda (runkeydatset) 
 		 ;; (print "runkeydatset: ")(pp runkeydatset)
 		 (let ((runkey     (car runkeydatset))
-		       (runkeydats (cadr runkeydatset)))
+		       (runkeydats (cadr runkeydatset))
+                       )
 		   (for-each
 		    (lambda (runkeydat)
 		      (for-each
 		       (lambda (area)
-			 (let ((runname (alist-ref 'runname runkeydat))
-			       (runtrans (alist-ref 'runtrans runkeydat))
-			       (reason  (alist-ref 'message runkeydat))
-			       (sched   (alist-ref 'sched   runkeydat))
-			       (action  (alist-ref 'action  runkeydat))
-			       (dbdest  (alist-ref 'dbdest  runkeydat))
-			       (append  (alist-ref 'append  runkeydat))
-			       (target  (or (alist-ref 'target  runkeydat) runkey))) ;; override with target if forced
-			   (print "Have: runkey=" runkey " contour=" contour " area=" area " action=" action " tag-expr=" tag-expr " mode-patt=" mode-patt " target=" target)
-			   (if (case (or (and action (string->symbol action)) 'noaction)  ;; ensure we have the needed data to run this action
-				 ((noaction) #f)
-				 ((run)      (and runname reason))
-				 ((sync sync-prepend)     (and reason dbdest))
-				 (else       #f))
-			       ;; instead of unwrapping the runkeydat alist, pass it directly to create-run-pkt
-			       (create-run-pkt mtconf action area runkey runname mode-patt tag-expr pktsdir reason contour sched dbdest append runtrans) 
-			       (print "ERROR: Missing info to make a " action " call: runkey=" runkey " contour=" contour " area=" area  " tag-expr=" tag-expr " mode-patt=" mode-patt " dbdest=" dbdest)
-			       )))
-		       all-areas))
+			 (if (area-allowed? area areas runkey contour mode-patt) ;; is this area to be handled (from areas=a,b,c OR using areafn=abcfn and *area-checks* ...)
+                             (let* ((aval       (or (configf:lookup mtconf "areas" area) ""))
+                                    (aval-alist (common:val->alist aval))
+                                    (runname    (alist-ref 'runname runkeydat))
+                                    (runtrans   (alist-ref 'runtrans runkeydat))
+                                    
+                                    (reason     (alist-ref 'message runkeydat))
+                                    (sched      (alist-ref 'sched   runkeydat))
+                                    (action     (alist-ref 'action  runkeydat))
+                                    (dbdest     (alist-ref 'dbdest  runkeydat))
+                                    (append     (alist-ref 'append  runkeydat))
+                                    (targets    ;;(or (alist-ref 'target  runkeydat)
+                                                    (map-targets mtconf aval-alist runkey area contour))) ;; override with target if forced
+                                    ;;(targets    (or (alist-ref 'target  runkeydat)
+                                    ;;                (map-targets mtconf aval-alist runkey area contour)))) ;; override with target if forced
+                               ;; NEED TO EXPAND RUNKEY => ALL TARGETS MAPPED AND THEN FOREACH .... 
+                               ;;(print "Targets: " targets)
+                               ;;(print "alist: " (alist-ref 'target runkeydat))
+                               (for-each
+                                (lambda (target)
+                                  (print "Creating pkt for runkey=" runkey " target=" target " contour=" contour " area=" area " action=" action " tag-expr=" tag-expr " mode-patt=" mode-patt)
+                                  (if (case (or (and action (string->symbol action)) 'noaction)  ;; ensure we have the needed data to run this action
+                                        ((noaction)           #f)
+                                        ((run)                (and runname reason))
+                                        ((sync sync-prepend)  (and reason dbdest))
+                                        (else                 #f))
+                                      ;; instead of unwrapping the runkeydat alist, pass it directly to create-run-pkt
+                                      (create-run-pkt mtconf action area runkey target runname mode-patt
+                                                      tag-expr pktsdir reason contour sched dbdest append 
+                                                      runtrans) 
+                                      (print "ERROR: Missing info to make a " action " call: runkey=" runkey " contour=" contour " area=" area  " tag-expr=" tag-expr " mode-patt=" mode-patt " dbdest=" dbdest)
+                                      ))
+                                targets))
+                             (print "NOTE: skipping " runkeydat " for area \"" area "\", not in " areas)))
+                       all-areas))
 		    runkeydats)))
 	       (let ((res (configf:get-section torun contour))) ;; each contour / target
 		 ;; (print "res=" res)
 		 res))))
 	  (hash-table-keys torun)))))))
 
 (define (pkt->cmdline pkta)
-  (let ((action (or (lookup-action-by-key (alist-ref 'a pkta)) "noaction")))
+  (let* ((param-mapping-alist (common:get-param-mapping flavor: 'switch-symbol))
+         (action        (or (lookup-action-by-key (alist-ref 'A pkta)) "noaction"))
+	 (action-param  (case (string->symbol action)
+                          ((-set-state-status) (conc (alist-ref 'l pkta) " "))
+                          (else ""))))
     (fold (lambda (a res)
 	    (let* ((key (car a)) ;; get the key name
 		   (val (cdr a))
 		   (par (or (lookup-param-by-key key)  ;; need to check also if it is a switch
 			    (lookup-param-by-key key inlst: *switch-keys*))))
-	      ;; (print "key: " key " val: " val " par: " par)
-	      (if par
-		  (conc res " " (param-translate par) " " val)
-		  (if (member key '(a Z U D T)) ;; a is the action
+	      (print "key: " key " val: " val " par: " par)
+	      ;;(if (and par  (not (string= (symbol->string key) "G")))
+	      (if (and par)
+		  (conc res " " (alist-ref (string->symbol par) param-mapping-alist eq? par) " " val)
+		  (if (alist-ref key *additional-cards*) ;; these cards do not translate to parameters or switches
 		      res
 		      (begin
 			(print "ERROR: Unknown key in packet \"" key "\" with value \"" val "\"")
 			res)))))
 	  (conc "megatest " (if (not (member action '("sync")))
-				(conc action " ")
+				(conc action " " action-param)
 				""))
 	  pkta)))
 
 ;; (use trace)(trace pkt->cmdline)
 
@@ -851,12 +1324,16 @@
 		     #f
 		   (create-directory "logs")
 		   #t)
 		 #t)
 	     "logs"
-	     "/tmp")))
-    (with-queue-db
+	     "/tmp"))
+	(cpuload (alist-ref 'adj-proc-load (common:get-normalized-cpu-load #f)))
+	(maxload (string->number (or (configf:lookup mtconf "setup" "maxload")
+				     (configf:lookup mtconf "jobtools" "maxload") ;; respect value used by Megatest calls
+				     "1.1"))))
+    (common:with-queue-db
      mtconf
      (lambda (pktsdirs pktsdir pdb)
        (let* ((rgconfdat (find-and-read-config (conc toppath "/runconfigs.config")))
 	      (rgconf    (car rgconfdat))
 	      (areas     (configf:get-section mtconf "areas"))
@@ -865,85 +1342,432 @@
 	      (torun     (make-hash-table)) ;; target => ( ... info ... )
 	      (rgentargs (hash-table-keys rgconf))) ;; these are the targets registered for automatically triggering
 	 (for-each
 	  (lambda (pktdat)
 	    (let* ((pkta    (alist-ref 'apkt pktdat))
-		   (action  (alist-ref 'a pkta))
+		   (action  (alist-ref 'A pkta))
 		   (cmdline (pkt->cmdline pkta))
 		   (uuid    (alist-ref 'Z pkta))
+		   (user    (alist-ref 'U pkta))
+		   (area    (alist-ref 'G pkta))
 		   (logf    (conc logdir "/" uuid "-run.log"))
 		   (fullcmd (conc "NBFAKE_LOG=" logf " nbfake " cmdline)))
-	      (print "RUNNING: " fullcmd)
-	      (system fullcmd)
-	      (mark-processed pdb (list (alist-ref 'id pktdat)))
-	      (let-values (((ack-uuid ack-pkt)
-			    (add-z-card
-			     (construct-sdat 'P uuid
-					     'T (case (string->symbol action)
-						  ((run) "runstart")
-						  ((sync) "syncstart")    ;; example of translating run -> runstart
-						  (else   action))
-					     'c (alist-ref 'o pkta) ;; THIS IS WRONG! SHOULD BE 'c
-					     't (alist-ref 't pkta)))))
-		(write-pkt pktsdir ack-uuid ack-pkt))))
+	      (if (check-access user mtconf action area)
+		  (if (and (> cpuload maxload)
+			   (member action '("run" "archive"))) ;; do not run archive or run if load is over the specified limit
+		      (print "WARNING: cpuload too high, skipping processing of " uuid)
+		      (begin
+			(print "RUNNING: " fullcmd)
+			(system fullcmd) ;; replace with process ...
+			(mark-processed pdb (list (alist-ref 'id pktdat)))
+			(let-values (((ack-uuid ack-pkt)
+				      (add-z-card
+				       (construct-sdat 'P uuid
+						       'T (case (string->symbol action)
+							    ((run) "runstart")
+							    ((sync) "syncstart")    ;; example of translating run -> runstart
+							    (else   action))
+                                                       'G (alist-ref 'G pkta)
+						       'c (alist-ref 'c pkta) ;; THIS IS WRONG! SHOULD BE 'c
+						       't (alist-ref 't pkta)))))
+			  (write-pkt pktsdir ack-uuid ack-pkt))))
+		  (begin ;; access denied! Mark as such
+		    (mark-processed pdb (list (alist-ref 'id pktdat)))
+		    (let-values (((ack-uuid ack-pkt)
+				  (add-z-card
+				   (construct-sdat 'P uuid
+						   'T "access-denied"
+						   'c (alist-ref 'o pkta) ;; THIS IS WRONG! SHOULD BE 'c
+						   't (alist-ref 't pkta)))))
+		      (write-pkt pktsdir ack-uuid ack-pkt))))))
 	  pkts))))))
-  
+
+
+(define (check-access user mtconf action area)
+  ;; NOTE: Need control over defaults. E.g. default might be no access
+  (let* ((access-ctrl (hash-table-exists? mtconf "access"))  ;; if there is an access section the default is to REQUIRE enablement/access
+	 (access-list (map (lambda (x)
+			     (string-split x ":"))
+			   (string-split (or (configf:lookup mtconf "access" area) ;; userid:rightstype userid2:rightstype2 ...
+					     (if access-ctrl
+						 "*:none"  ;; nobody has access by default
+						 "*:all")))))
+	 (access-types-dat (configf:get-section mtconf "accesstypes")))
+    (debug:print 2 *default-log-port* "Checking access in " access-list " with access-ctrl " access-ctrl " for area " area)
+    (if access-ctrl
+	(let* ((user-access     (or (assoc user access-list)
+				    (assoc "*"  access-list)))
+	       (access-type   (if user-access
+												  (cadr user-access)
+                           #f))
+	       (access-types    (let ((res (alist-ref access-type access-types-dat equal?)))
+				  (if res (car res) res)))
+	       (allowed-actions (string-split (or access-types ""))))
+	  (debug:print 2 *default-log-port* "Got " allowed-actions " for user " user " where access-types=" access-types " access-type=" access-type)
+	  (cond
+	   ((and access-types (member action allowed-actions))
+	    ;; (print "Access granted for " user " for " action)
+	    #t)
+	   (else
+	    ;; (print "Access denied for " user " for " action)
+	    #f))))))
+
+(define (open-logfile logpath)
+  (condition-case
+   (let* ((log-dir (or (pathname-directory logpath) ".")))
+     (if (not (directory-exists? log-dir))
+         (system (conc "mkdir -p " log-dir)))
+     (open-output-file logpath))
+   (exn ()
+        (debug:print-error 0 *default-log-port* "Could not open log file for write: "logpath)
+        (define *didsomething* #t)  
+        (exit 1))))
+
+
 (define (get-pkts-dir mtconf)
   (let ((pktsdirs  (configf:lookup mtconf "setup" "pktsdirs"))
 	(pktsdir   (if pktsdirs (car (string-split pktsdirs " ")) #f)))
     pktsdir))
 
 (let ((debugcontrolf (conc (get-environment-variable "HOME") "/.mtutilrc")))
-  (if (file-exists? debugcontrolf)
+  (if (common:file-exists? debugcontrolf)
       (load debugcontrolf)))
+
+(if (args:get-arg "-log") ;; redirect the log always when a server
+    (handle-exceptions
+	exn
+	(begin
+	  (print "ERROR: Failed to switch to log output. " ((condition-property-accessor 'exn 'message) exn))
+	  )
+      (let* ((tl   (args:get-arg "-log"))   ;; run launch:setup if -server, ensure we do NOT run launch:setup if -log specified
+	     (logf (args:get-arg "-log")) ;; use -log unless we are a server, then craft a logfile name
+	     (oup  (open-logfile logf)))
+	;(if (not (args:get-arg "-log"))
+	;    (hash-table-set! args:arg-hash "-log" logf)) ;; fake out future queries of -log
+	(print *default-log-port* "Sending log output to " logf)
+	(set! *default-log-port* oup)
+)))
 
 (if *action*
     (case (string->symbol *action*)
-      ((run remove rerun set-ss archive kill)
+      ((run remove rerun rerun-clean rerun-all set-ss archive kill list kill-run kill-rerun)
        (let* ((mtconfdat (simple-setup (args:get-arg "-start-dir")))
 	      (mtconf    (car mtconfdat))
+	      (area      (args:get-arg "-area")) ;; look up the area to dispatch to from [areas] section
+	      (areasec   (if area (configf:lookup mtconf "areas" area) #f))
+	      (areadat   (if areasec (common:val->alist areasec) #f))
+	      (area-path (if areadat (alist-ref 'path areadat) #f))
 	      (pktsdirs  (configf:lookup mtconf "setup" "pktsdirs"))
 	      (pktsdir   (if pktsdirs (car (string-split pktsdirs " ")) #f))
-	      (adjargs   (hash-table-copy args:arg-hash)))
+	      (adjargs   (hash-table-copy args:arg-hash))
+	      (new-ss    (args:get-arg "-new")))
+	 ;; check a few things
+	 (cond
+	  ((and area (not area-path))
+	   (print "ERROR: the specified area was not found in the [areas] table. Area name=" area)
+	   (exit 1))
+	  ((not area)
+	   (print "ERROR: no area specified. Use -area ")
+	   (exit 1))
+	  (else
+	   (let* ((usr-admin (check-access (current-user-name) mtconf "override" area))
+					(user (if (and usr-admin (args:get-arg "-override-user"))
+                    (args:get-arg "-override-user")
+									  (current-user-name))))
+       ; (print "user 123 " usr-admin )
+        ;(exit 1)
+     (if (and (not usr-admin) (args:get-arg "-override-user"))
+         (begin
+            (print  user " does not have access to override user")
+          (exit 1)))
+	   (if (check-access user mtconf *action* area);; check rights
+		 (print "Access granted for " *action* " action by " user)
+		 (begin
+		   (print "Access denied for " *action* " action by " user)
+		   (exit 1))))))
+	 
 	 ;; (for-each
 	 ;;  (lambda (key)
 	 ;;    (if (not (member key *legal-params*))
 	 ;; 	(hash-table-delete! adjargs key))) ;; we need to delete any params intended for mtutil
 	 ;;  (hash-table-keys adjargs))
 	 (let-values (((uuid pkt)
-		       (command-line->pkt *action* adjargs #f)))
+		       (command-line->pkt *action* adjargs #f area-path: area-path new-ss: new-ss)))
 	   (write-pkt pktsdir uuid pkt))))
       ((dispatch import rungen process)
        (let* ((mtconfdat (simple-setup (args:get-arg "-start-dir")))
 	      (mtconf    (car mtconfdat))
-	      (toppath   (configf:lookup mtconf "dyndat" "toppath")))
+	      (toppath   (configf:lookup mtconf "scratchdat" "toppath")))
 	 (case (string->symbol *action*)
 	   ((process)  (begin
-			 (load-pkts-to-db mtconf)
+			 (common:load-pkts-to-db mtconf)
 			 (generate-run-pkts mtconf toppath)
-			 (load-pkts-to-db mtconf)
+			 (common:load-pkts-to-db mtconf)
 			 (dispatch-commands mtconf toppath)))
-	   ((import)   (load-pkts-to-db mtconf)) ;; import pkts
+	   ((import)   (common:load-pkts-to-db mtconf)) ;; import pkts
 	   ((rungen)   (generate-run-pkts mtconf toppath))
 	   ((dispatch) (dispatch-commands mtconf toppath)))))
+      ;; misc
+      ((show)
+       (if (> (length remargs) 0)
+	   (let* ((mtconfdat (simple-setup (args:get-arg "-start-dir")))
+		  (mtconf    (car mtconfdat))
+		  (sect-dat (configf:get-section mtconf (car remargs))))
+	     (if sect-dat
+		 (for-each
+		  (lambda (entry)
+		    (if (> (length entry) 1)
+			(print (car entry) "   " (cadr entry))
+			(print (car entry))))
+		  sect-dat)
+		 (print "No section \"" (car remargs) "\" found")))
+	   (print "ERROR: list requires section parameter; areas, setup or contours")))
+      ((gendot)
+       (let* ((mtconfdat (simple-setup (args:get-arg "-start-dir")))
+	      (mtconf    (car mtconfdat)))
+	 (common:load-pkts-to-db mtconf use-lt: #t) ;; need to NOT do this by default ...
+	 (common:with-queue-db
+	  mtconf
+	  (lambda (pktsdirs pktsdir conn)
+	    ;;                       pktspec display-fields 
+	    (make-report "out.dot" conn
+			 '((cmd      . ((parent . P)
+					(user   . M)
+					(target . t)))
+			   (runstart . ((parent . P)
+					(target . t)))
+			   (runtype . ((parent . P)))) ;; pktspec
+			 '(P U t)                                                     ;; 
+			 )))))  ;; no ptypes listed (ptypes are strings of pkt types to read from db
       ((db)
        (if (null? remargs)
 	   (print "ERROR: missing sub command for db command")
 	   (let ((subcmd (car remargs)))
 	     (case (string->symbol subcmd)
 	       ((pgschema)
 		(let* ((install-home (common:get-install-area))
 		       (schema-file  (conc install-home "/share/db/mt-pg.sql")))
-		  (if (file-exists? schema-file)
+		  (if (common:file-exists? schema-file)
 		      (system (conc "/bin/cat " schema-file)))))
 	       ((sqlite3schema)
 		(let* ((install-home (common:get-install-area))
 		       (schema-file  (conc install-home "/share/db/mt-sqlite3.sql")))
-		  (if (file-exists? schema-file)
+		  (if (common:file-exists? schema-file)
 		      (system (conc "/bin/cat " schema-file)))))
 	       ((junk)
-		(rmt:get-keys))))))))
+		(rmt:get-keys))))))
+    ((tsend)
+       (if (null? remargs)
+	      (print "ERROR: missing data to send to trigger listeners")
+	      (let* ((msg       (car remargs))
+                  (mtconfdat (simple-setup (args:get-arg "-start-dir")))
+                  (mtconf    (car mtconfdat))
+                  (time-out  (if (args:get-arg "-time-out")
+                                 (string->number (args:get-arg "-time-out")) 
+                               5))
+                  (listeners (configf:get-section mtconf "listeners"))
+                  (user-info  (user-information (current-user-id)))
+                  (prev-seen (make-hash-table))) ;; catch duplicates
+             (if user-info
+              (begin
+               (for-each
+              (lambda (listener)
+                (let ((host-port (car listener))
+                      (attrib (val->alist (cadr listener))))
+                  (if (and (equal? msg "time-to-die") (not (can-user-kill-listner user-info attrib)))
+                   (begin
+                      (debug:print-error 0 *default-log-port* "User " (car user-info) " is not allowed to send message '" msg"'")
+                      (exit 1)))
+                  (print "sending " msg " to " host-port )
+                  (open-send-close-nn host-port msg attrib timeout: time-out )))
+              listeners))
+              (begin
+               (debug:print-error 0 *default-log-port* "Could not Identify executing user. Will not send any message")
+               (exit 1))))))
+     ((tquery)
+       (if (null? remargs)
+	      (print "ERROR: missing data to send to trigger listeners")
+	      (let* ((msg       (car remargs))
+                  (mtconfdat (simple-setup (args:get-arg "-start-dir")))
+                  (mtconf    (car mtconfdat))
+                  (time-out  (if (args:get-arg "-time-out")
+                                 (string->number (args:get-arg "-time-out")) 
+                               5))
+                  (listeners (configf:get-section mtconf "listeners"))
+                  (user-info  (user-information (current-user-id)))
+                  (prev-seen (make-hash-table))) ;; catch duplicates
+             (if user-info
+              (begin
+               (for-each
+              (lambda (listener)
+                (let ((host-port (car listener))
+                      (attrib (val->alist (cadr listener))))
+                  (if (and (equal? msg "time-to-die") (not (can-user-kill-listner user-info attrib)))
+                   (begin
+                      (debug:print-error 0 *default-log-port* "User " (car user-info) " is not allowed to send message '" msg"'")
+                      (exit 1)))
+                  (print "sending " msg " to " host-port )
+                  (open-send-receive-nn host-port msg attrib timeout: time-out )))
+              listeners))
+              (begin
+               (debug:print-error 0 *default-log-port* "Could not Identify executing user. Will not send any message")
+               (exit 1))))))
+
+    ((tquerylisten)
+       (if (null? remargs)
+           (print "ERROR: useage for tlisten is \"mtutil tlisten portnum\"")
+           (let ((portnum (string->number (car remargs))))
+              
+             (if (not portnum)
+                 (print "ERROR: the portnumber parameter must be a number, you gave: " (car remargs))
+                 (begin
+                   (if (not (is-port-in-use portnum))  
+                       (let* ((rep       (start-nn-server portnum))
+                              (mtconfdat (simple-setup (args:get-arg "-start-dir")))
+                              (mtconf    (car mtconfdat))
+                              (contact   (configf:lookup mtconf "listener" "owner"))
+                              (script    (configf:lookup mtconf "listener" "script")))
+                         (print "Listening on port " portnum " for messages.")
+                         (set-signal-handler! signal/int  (lambda (signum) 
+															(set! *time-to-exit* #t)
+  														(debug:print-error 0 *default-log-port* "Received signal " signum " sending email befor exiting !!")
+  														(let ((email-body (mtut:stml->string (s:body
+																						(s:p (conc "Received signal " signum ". Lister has been terminated on host " (get-environment-variable "HOST") ". "))))))
+             					        (sendmail contact "Listner has been terminated." email-body  use_html: #t))
+                              (exit)))
+															(set-signal-handler! signal/term  (lambda (signum) 
+															(set! *time-to-exit* #t)
+  														(debug:print-error 0 *default-log-port* "Received signal " signum " sending email befor exiting !!")
+  														(let ((email-body (mtut:stml->string (s:body
+																						(s:p (conc "Received signal " signum ". Lister has been terminated on host " (get-environment-variable "HOST") ". "))))))
+             					        (sendmail contact "Listner has been terminated." email-body  use_html: #t))
+                              (exit)))
+
+                         ;(set-signal-handler! signal/term special-signal-handler)
+                         
+                         (let loop ((instr (nn-recv rep)))
+                             ;;(nn-send rep "3.9")
+                             (with-input-from-pipe (conc "/usr/bin/uptime | cut -d':' -f4 | awk '{print $1}' | cut -d',' -f1")
+                             	(lambda()
+                             		(let loop ((inl (read-line)))
+                          				(if (not (eof-object? inl))
+                              				(begin
+                                			;;(print "fdk73: " inl ":")
+                                			;;(set! current-list-ciaf (append! current-list-ciaf (list (string-substitute "\\s+$" "" inl))))
+                                			(nn-send rep inl)
+                                			(loop(read-line)))
+                          				))
+
+                             	)
+                             )
+                             ;;(print (isys "/usr/bin/uptime" foreach-stdout-thunk: foreach-stdout))
+                             (let ((ctime (date->string (current-date)))) 
+                             (if  (equal? instr "time-to-die")
+                              (begin 
+                              (debug:print 0 *default-log-port* ctime " received '" instr "'. Time to sucide." )
+                               (let ((pid  (current-process-id)))
+                              (debug:print 0 *default-log-port* "Killing current process (pid=" pid ")")
+                               (system (conc "kill " pid))))  
+                             (begin
+								(debug:print 0 *default-log-port* ctime " received " instr )
+								;(nn-send rep "ok")
+                                (if (not (equal? instr "ping"))
+                                  (begin
+                                   (debug:print 0 *default-log-port* ctime " running \"" script " " instr "\"")
+                                    ;(system (conc script " '" instr "'"))
+                                      (process-run script (list  instr ))  
+                                     (debug:print 0 *default-log-port* ctime " done" ))
+                                   (begin
+                                   	 (if (not (equal? instr "load"))
+                                   	 	(print "Checking load")
+
+                                   	 ) 
+                                   )
+
+                                  )
+
+                                )))
+                           (loop (nn-recv rep))))
+		       (print "ERROR: Port " portnum " already in use. Try another port")))))))
+      
+
+
+
+      ((tlisten)
+       (if (null? remargs)
+           (print "ERROR: useage for tlisten is \"mtutil tlisten portnum\"")
+           (let ((portnum (string->number (car remargs))))
+              
+             (if (not portnum)
+                 (print "ERROR: the portnumber parameter must be a number, you gave: " (car remargs))
+                 (begin
+                   (if (not (is-port-in-use portnum))  
+                       (let* ((rep       (start-nn-server portnum))
+                              (mtconfdat (simple-setup (args:get-arg "-start-dir")))
+                              (mtconf    (car mtconfdat))
+                              (contact   (configf:lookup mtconf "listener" "owner"))
+                              (script    (configf:lookup mtconf "listener" "script")))
+                         (print "Listening on port " portnum " for messages.")
+                         (set-signal-handler! signal/int  (lambda (signum) 
+															(set! *time-to-exit* #t)
+  														(debug:print-error 0 *default-log-port* "Received signal " signum " sending email befor exiting !!")
+  														(let ((email-body (mtut:stml->string (s:body
+																						(s:p (conc "Received signal " signum ". Lister has been terminated on host " (get-environment-variable "HOST") ". "))))))
+             					        (sendmail contact "Listner has been terminated." email-body  use_html: #t))
+                              (exit)))
+															(set-signal-handler! signal/term  (lambda (signum) 
+															(set! *time-to-exit* #t)
+  														(debug:print-error 0 *default-log-port* "Received signal " signum " sending email befor exiting !!")
+  														(let ((email-body (mtut:stml->string (s:body
+																						(s:p (conc "Received signal " signum ". Lister has been terminated on host " (get-environment-variable "HOST") ". "))))))
+             					        (sendmail contact "Listner has been terminated." email-body  use_html: #t))
+                              (exit)))
+
+                         ;(set-signal-handler! signal/term special-signal-handler)
+                         
+                         (let loop ((instr (nn-recv rep)))
+                             (nn-send rep "ok")
+                             (let ((ctime (date->string (current-date)))) 
+                             (if  (equal? instr "time-to-die")
+                              (begin 
+                              (debug:print 0 *default-log-port* ctime " received '" instr "'. Time to sucide." )
+                               (let ((pid  (current-process-id)))
+                              (debug:print 0 *default-log-port* "Killing current process (pid=" pid ")")
+                               (system (conc "kill " pid))))  
+                             (begin
+								(debug:print 0 *default-log-port* ctime " received " instr )
+								;(nn-send rep "ok")
+                                (if (not (equal? instr "ping"))
+                                  (begin
+                                   (debug:print 0 *default-log-port* ctime " running \"" script " " instr "\"")
+                                      (system (conc script " '" instr "' &"))
+                                      ;(process-run script (list  instr ))  
+                                     (debug:print 0 *default-log-port* ctime " done" ))
+                                   (begin
+                                   	 (if (not (equal? instr "load"))
+                                   	 	(print "Checking load")
+
+                                   	 ) 
+                                   )
+
+                                  )
+
+                                )))
+                           (loop (nn-recv rep))))
+		       (print "ERROR: Port " portnum " already in use. Try another port")))))))
+      ((gather) ;; gather all area db's into /tmp/$USER_megatest/alldbs
+       (let* ((mtconfdat (simple-setup (args:get-arg "-start-dir")))
+              (mtconf    (car mtconfdat))
+              (areas     (get-area-names mtconf)))
+         (print "areas: " areas)))
+      
+      (else
+       (let ((all-actions (sort (map conc (delete-duplicates (append *other-actions* (map car *action-keys*)))) string<=?)))
+	 (print "unrecognised action: \"" *action* "\", try one of; \"" (string-intersperse all-actions "\", \"") "\"")))
+      
+      )) ;; the end
+             
 
 ;; If HTTP_HOST is defined then we must be in the cgi environment
 ;; so run stml and exit
 ;;
 (if (get-environment-variable "HTTP_HOST")
@@ -963,5 +1787,11 @@
       (install-history-file (get-environment-variable "HOME") ".mtutil_history") ;;  [homedir] [filename] [nlines])
       (current-input-port (make-readline-port "mtutil> "))
       (if (args:get-arg "-repl")
 	  (repl)
 	  (load (args:get-arg "-load")))))
+
+#|
+(define mtconf (car (simple-setup #f)))
+(define dat (common:with-queue-db mtconf (lambda (conn)(get-pkts conn '()))))
+(pp (pkts#flatten-all dat '((cmd . ((parent . P)(url . M)))(runtype . ((parent . P)))) 'id 'group-id 'uuid 'parent 'pkt-type 'pkt 'processed))
+|#

Index: newdashboard.scm
==================================================================
--- newdashboard.scm
+++ newdashboard.scm
@@ -1,25 +1,23 @@
-;;======================================================================
-;; Copyright 2006-2013, Matthew Welland.
-;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
-;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
-;;======================================================================
-
 ;;======================================================================
 ;; Copyright 2006-2016, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;;======================================================================
 
 (use format)
 
 (use (prefix iup iup:))
@@ -84,11 +82,11 @@
       (print help)
       (exit)))
 
 ;; ease debugging by loading ~/.dashboardrc
 (let ((debugcontrolf (conc (get-environment-variable "HOME") "/.dashboardrc")))
-  (if (file-exists? debugcontrolf)
+  (if (common:file-exists? debugcontrolf)
       (load debugcontrolf)))
 
 (debug:setup)
 
 (define *tim* (iup:timer))
@@ -375,11 +373,11 @@
       #f))
 
 (define (test-panel window-id)
   (let* ((curr-row-num 0)
 	 (viewlog    (lambda (x)
-		       (if (file-exists? logfile)
+		       (if (common:file-exists? logfile)
 					;(system (conc "firefox " logfile "&"))
 			   (iup:send-url logfile)
 			   (message-window (conc "File " logfile " not found")))))
 	 (xterm      (lambda (x)
 		       (if (directory-exists? rundir)
@@ -730,14 +728,15 @@
 		       (lambda (x)
 			 ;; Want to dedicate no more than 50% of the time to this so skip if
 			 ;; 2x delta time has not passed since last query
 			 (if (< nextmintime (current-milliseconds))
 			     (let* ((starttime (current-milliseconds))
-				    (changes   (dcommon:run-update keys data runname keypatts testpatt states statuses 'full my-window-id))
+				    ;; (changes   (dcommon:run-update keys data runname keypatts testpatt states statuses 'full my-window-id))
 				    (endtime   (current-milliseconds)))
 			       (set! nextmintime (+ endtime (* 2 (- endtime starttime))))
-			       (debug:print 11 *default-log-port* "CHANGE(S): " (car changes) "..."))
+			       ;; (debug:print 11 *default-log-port* "CHANGE(S): " (car changes) "..."))
+                               )
 			     (debug:print-info 11 *default-log-port* "Server overloaded"))))))
 
 ;; (dboard:data-updaters-set! *data* (make-hash-table))
 (newdashboard #f) ;; *dbstruct-local*)    
 (iup:main-loop)

ADDED   nexttag.rb
Index: nexttag.rb
==================================================================
--- /dev/null
+++ nexttag.rb
@@ -0,0 +1,62 @@
+#!/usr/bin/env ruby
+
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+def get_next_tag(branch)
+
+
+
+  abort "Not on a version branch like v1.64 (got: >#{branch}<)" unless branch.match(/^v\d\.\d\d$/)
+  
+  #puts "this branch: #{branch}"
+
+  tag_pat = /#{branch}(\d\d)/
+  remote=`fsl remote`.chomp.sub(/^file:\/\//,'') # get tagset from origin
+  cmd="fossil tag -R '#{remote}' list"
+  tags = `#{cmd}`.split /\n/
+  abort "fossil command failed [#{cmd}]" if $? != 0
+  branch_tags = tags.find_all{|x| x.match(tag_pat) }.sort
+  if branch_tags.length == 0
+    return branch + "01"
+  else
+    latest_tag = branch_tags.last
+    m1 = latest_tag.match(tag_pat)
+    minor_digits = m1[1].to_i + 1
+    if (minor_digits % 10) == 0
+      minor_digits += 1
+    end
+    new_tag=sprintf("%s%02d", branch, minor_digits)
+    return new_tag
+  end
+end
+
+branch = `fossil branch`.sub(/\A.*\* /m,'').sub(/\n.*\z/m,'')
+tag= get_next_tag(branch)
+
+puts "TODO: Write to megatest-version.scm:"
+puts ";; Always use two or four digit decimal
+;; 1.01, 1.02...1.10,1.11,1.1101 ... 1.99,2.00..
+
+(declare (unit megatest-version))
+
+(define megatest-version #{tag.sub(/^v/,'')})
+
+"
+
+puts "TODO: fossil tag add #{tag} #{branch}"
+puts ""

Index: ods.scm
==================================================================
--- ods.scm
+++ ods.scm
@@ -1,13 +1,22 @@
 ;; Copyright 2011, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 (use csv-xml regex)
 (declare (unit ods))
 (declare (uses common))
 
@@ -197,11 +206,11 @@
 ;;   '( (sheet1 (r1c1 r1c2 r1c3 ...)
 ;;              (r2c1 r2c3 r2c3 ...) )
 ;;      (sheet2 ( ... )
 ;;              ( ... ) ) )
 (define (ods:list->ods path fname data)
-  (if (not (file-exists? path))
+  (if (not (common:file-exists? path))
       (print "ERROR: path to create ods data must pre-exist")
       (begin
 	(with-output-to-file (conc path "/content.xml")
 	  (lambda ()
 	    (ods:construct-dir path)

Index: oldsrc/debugger.scm
==================================================================
--- oldsrc/debugger.scm
+++ oldsrc/debugger.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 (use iup)
 
 (define *debugger-control* #f)
 (define *debugger-rownum*  0)
 (define *debugger-matrix*  #f)

Index: oldsrc/fs-transport.scm
==================================================================
--- oldsrc/fs-transport.scm
+++ oldsrc/fs-transport.scm
@@ -1,14 +1,23 @@
 
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 (require-extension (srfi 18) extras tcp s11n)
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest)
 (import (prefix sqlite3 sqlite3:))

ADDED   oldsrc/multi-dboard.scm
Index: oldsrc/multi-dboard.scm
==================================================================
--- /dev/null
+++ oldsrc/multi-dboard.scm
@@ -0,0 +1,809 @@
+;;======================================================================
+;; Copyright 2006-2013, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;======================================================================
+
+(use format numbers sql-de-lite srfi-1 posix regex regex-case srfi-69 srfi-18 call-with-environment-variables)
+(require-library iup)
+(import (prefix iup iup:))
+(use canvas-draw)
+
+(declare (uses margs))
+(declare (uses megatest-version))
+(declare (uses gutils))
+(declare (uses tree))
+(declare (uses configf))
+(declare (uses portlogger))
+(declare (uses keys))
+(declare (uses common))
+
+(include "common_records.scm")
+;; (include "db_records.scm")
+;; (include "key_records.scm")
+
+(define help (conc 
+	      "Megatest Dashboard, documentation at http://www.kiatoa.com/fossils/megatest
+  version " megatest-version "
+  license GPL, Copyright (C) Matt Welland 2011
+
+Usage: dashboard [options]
+  -h                : this help
+  -group groupname  : display this group of areas
+  -test testid      : control test identified by testid
+  -guimonitor       : control panel for runs
+
+Misc
+  -rows N         : set number of rows
+"))
+
+;; process args
+(define remargs (args:get-args 
+		 (argv)
+		 (list  "-group" ;; display this group of areas
+			"-debug"
+			) 
+		 (list  "-h"
+			"-v"
+			"-q"
+			)
+		 args:arg-hash
+		 0))
+
+(if (args:get-arg "-h")
+    (begin
+      (print help)
+      (exit)))
+
+;; (if (args:get-arg "-host")
+;;     (begin
+;;       (set! (common:get-remote remote) (string-split (args:get-arg "-host" ":")))
+;;       (client:launch))
+;;     (client:launch))
+
+(define *runremote* #f)
+(define *windows* (make-hash-table))
+(define *changed-main* (make-hash-table)) ;; set path/... => #t
+(define *changed-mutex* (make-mutex))     ;; use for all incoming change requests
+(define *searchpatts*   (make-hash-table))
+
+(debug:setup)
+
+(define *tim* (iup:timer))
+(define *ord* #f)
+
+(iup:attribute-set! *tim* "TIME" 300)
+(iup:attribute-set! *tim* "RUN" "YES")
+
+(define (message-window msg)
+  (iup:show
+   (iup:dialog
+    (iup:vbox 
+     (iup:label msg #:margin "40x40")))))
+
+(define (iuplistbox-fill-list lb items . default)
+  (let ((i 1)
+	(selected-item (if (null? default) #f (car default))))
+    (iup:attribute-set! lb "VALUE" (if selected-item selected-item ""))
+    (for-each (lambda (item)
+		(iup:attribute-set! lb (number->string i) item)
+		(if selected-item
+		    (if (equal? selected-item item)
+			(iup:attribute-set! lb "VALUE" item))) ;; (number->string i))))
+		(set! i (+ i 1)))
+	      items)
+    i))
+
+(define (pad-list l n)(append l (make-list (- n (length l)))))
+
+
+(define (mkstr . x)
+  (string-intersperse (map conc x) ","))
+
+(define (update-search x val)
+  (hash-table-set! *searchpatts* x val))
+
+
+;;======================================================================
+;; R E C O R D S
+;;======================================================================
+
+;; NOTE: Consider switching to defstruct.
+
+;; data for an area (regression or testsuite)
+;;
+(define-record areadat
+  name               ;; area name
+  path               ;; mt run area home
+  configdat          ;; megatest config
+  denoise            ;; focal point for not putting out same messages over and over
+  client-signature   ;; key for client-server conversation
+  remote             ;; hash of all the client side connnections
+  run-keys           ;; target keys for this area
+  runs               ;; used in dashboard, hash of run-ids -> rundat
+  read-only          ;; can I write to this area?
+  monitordb          ;; db handle for monitor.db
+  maindb             ;; db handle for main.db
+  )
+
+;; rundat, basic run data
+;;
+(define-record rundat
+  id                 ;; the run-id
+  target             ;; val1/val2 ... corrosponding to run-keys in areadat
+  runname
+  state              ;; state of the run, symbol 
+  status             ;; status of the run, symbol
+  event-time         ;; when the run was initiated
+  tests              ;; hash of test-id -> testdat, QUESTION: separate by run-id?
+  db                 ;; db handle
+  )
+
+;; testdat, basic test data
+(define-record testdat
+  run-id             ;; what run is this from
+  id                 ;; test id
+  testname           ;; test name
+  itempath           ;; item path
+  state              ;; test state, symbol
+  status             ;; test status, symbol
+  event-time         ;; when the test started
+  duration           ;; how long the test took
+  )
+
+;; general data for the dboard application
+;;
+(define-record data
+  cfgdat             ;; data from ~/.megatest/.dat
+  areas              ;; hash of areaname -> area-rec
+  current-window-id  ;; 
+  current-tab-id     ;; 
+  update-needed      ;; flag to indicate that the tab pointed to by current tab id needs refreshing immediately
+  tabs               ;; hash of tab-id -> areaname (??) should be of type "tab"
+  )
+
+;; all the components of an area display, all fits into a tab but
+;; parts may be swapped in/out as needed
+;;
+(define-record tab
+  tree
+  matrix    ;; the spreadsheet 
+  areadat   ;; the one-structure (one day dbstruct will be put in here)
+  view-path ;; //...
+  view-type ;; standard, etc.
+  controls  ;; the controls
+  data      ;; all the data kept in sync with db
+  filters   ;; user filters, alist name -> filter record, eventually store these in ~/.megatest/.dat?
+  run-id    ;; the current run-id
+  test-ids  ;; the current test id hash, run-id => test-id
+  command   ;; the command from the entry field
+  headers   ;; hash of header  -> colnum
+  rows      ;; hash of rowname -> rownum
+  )
+
+(define-record filter
+  target    ;; hash of widgets for the target
+  runname   ;; the runname widget
+  testpatt  ;; the testpatt widget
+  )
+
+;;======================================================================
+;; D B
+;;======================================================================
+
+;; These are all using sql-de-lite and independent of area so cannot use stuff 
+;; from db.scm
+
+;; NB// run-id=#f => return dbdir only
+;;
+(define (areadb:dbfile-path areadat run-id)
+  (let* ((cfgdat  (areadat-configdat areadat))
+	 (dbdir   (or (configf:lookup cfgdat "setup" "dbdir")
+		      (conc (configf:lookup cfgdat "setup" "linktree") "/.db")))
+	 (fname   (if run-id
+		      (case run-id
+			((-1) "monitor.db")
+			((0) "main.db")
+			(else (conc run-id ".db")))
+		      #f)))
+    (handle-exceptions
+     exn
+     (begin
+       (debug:print-error 0 *default-log-port* "Couldn't create path to " dbdir)
+       (exit 1))
+     (if (not (directory? dbdir))(create-directory dbdir #t)))
+    (if fname
+	(conc dbdir "/" fname)
+	dbdir)))
+
+;; -1 => monitor.db
+;;  0 => main.db
+;; >1 => .db
+;;
+(define (areadb:open areadat run-id)
+  (let* ((runs   (areadat-runs areadat))
+	 (rundat (if (> run-id 0) ;; it is a run
+		     (hash-table-ref/default runs run-id #f)
+		     #f))
+	 (db     (case run-id ;; if already opened, get the db and return it
+		   ((-1) (areadat-monitordb areadat))
+		   ((0)  (areadat-maindb    areadat))
+		   (else (if rundat
+			     (rundat-db rundat)
+			     #f)))))
+    (if db
+	db ;; merely return the already opened db
+	(let* ((dbfile (areadb:dbfile-path areadat run-id)) ;; not already opened, so open it
+	       (db     (if (file-exists? dbfile)
+			   (open-database dbfile)
+			   (begin
+			     (debug:print-error 0 *default-log-port* "I was asked to open " dbfile ", but file does not exist or is not readable.")
+			     #f))))
+	  (case run-id
+	    ((-1)(areadat-monitordb-set! areadat db))
+	    ((0) (areadat-maindb-set!    areadat db))
+	    (else (rundat-db-set!        rundat  db)))
+	  db))))
+
+;; populate the areadat tests info, does NOT fill the tests data itself unless asked
+;;
+(define (areadb:populate-run-info areadat)
+  (let* ((runs   (or (areadat-runs areadat) (make-hash-table)))
+	 (keys   (areadat-run-keys areadat))
+	 (maindb (areadb:open areadat 0)))
+    (if maindb
+	(query (for-each-row (lambda (row)
+			       (let ((id  (list-ref row 0))
+				     (dat (apply make-rundat (append row (list #f #f))))) ;; add placeholders for tests and db
+				 (print row)
+				 (hash-table-set! runs id dat))))
+	       (sql maindb (conc "SELECT id,"
+				 (string-intersperse keys "||'/'||")
+				 ",runname,state,status,event_time FROM runs WHERE state != 'deleted';")))
+	(debug:print-error 0 *default-log-port* "no main.db found at "  (areadb:dbfile-path areadat 0)))
+    areadat))
+
+;; given an areadat and target/runname patt fill up runs data
+;;
+;; ?????/
+
+;; given a list of run-ids refresh/retrieve runs data into areadat
+;;
+(define (areadb:fill-tests areadat #!key (run-ids #f))
+  (let* ((runs   (or (areadat-runs areadat) (make-hash-table))))
+    (for-each
+     (lambda (run-id)
+       (let* ((rundat (hash-table-ref/default runs run-id #f))
+	      (tests  (if (and rundat
+			       (rundat-tests rundat)) ;; re-use existing hash table?
+			  (rundat-tests rundat)
+			  (let ((ht (make-hash-table)))
+			    (rundat-tests-set! rundat ht)
+			    ht)))
+	      (rundb  (areadb:open areadat run-id)))
+	 (query (for-each-row (lambda (row)
+				(let* ((id         (list-ref row 0))
+				       (testname   (list-ref row 1))
+				       (itempath   (list-ref row 2))
+				       (state      (list-ref row 3))
+				       (status     (list-ref row 4))
+				       (eventtim   (list-ref row 5))
+				       (duration   (list-ref row 6)))
+				  (hash-table-set! tests id
+						   (make-testdat run-id id testname itempath state status eventtim duration)))))
+		(sql rundb "SELECT id,testname,item_path,state,status,event_time,run_duration FROM tests WHERE state != 'DELETED';"))))
+     (or run-ids (hash-table-keys runs)))
+    areadat))
+    
+
+;; initialize and refresh data
+;;		
+(define (dboard:general-updater con port)
+  (for-each
+   (lambda (window-id)
+     ;; (print "Processing for window-id " window-id)
+     (let* ((window-dat     (hash-table-ref *windows* window-id))
+	    (areas          (data-areas     window-dat))
+	    ;; (keys           (areadat-run-keys area-dat))
+	    (tabs           (data-tabs      window-dat))
+	    (tab-ids        (hash-table-keys tabs))
+	    (current-tab    (if (null? tab-ids)
+				#f
+				(hash-table-ref tabs (car tab-ids))))
+	    (current-tree   (if (null? tab-ids) #f (tab-tree   current-tab)))
+	    (current-node   (if (null? tab-ids) 0  (string->number (iup:attribute current-tree "VALUE"))))
+	    (current-path   (if (eq? current-node 0)
+				"Areas"
+				(string-intersperse (tree:node->path current-tree current-node) "/")))
+	    (current-matrix (if (null? tab-ids) #f (tab-matrix current-tab)))
+	    (seen-nodes     (make-hash-table))
+	    (path-changed   (if current-tab
+				(equal? current-path (tab-view-path current-tab))
+				#t)))
+       ;; (debug:print-info 0 *default-log-port* "Current path: " current-path)
+       ;; now for each area in the window gather the data
+       (if path-changed
+	   (begin
+	     (debug:print-info 0 *default-log-port* "clearing matrix - path changed")
+	     (dboard:clear-matrix current-tab)))
+       (for-each
+	(lambda (area-name)
+	  ;; (print "Processing for area-name " area-name)
+	  (let* ((area-dat  (hash-table-ref areas area-name))
+		 (area-path (areadat-path   area-dat))
+		 (runs      (areadat-runs   area-dat)))
+	    (if (hash-table-ref/default *changed-main* area-path 'processed)
+		(begin
+		  (print "Processing " area-dat " for area-name " area-name)
+		  (hash-table-set! *changed-main* area-path #f)
+		  (areadb:populate-run-info area-dat)
+		  (for-each 
+		   (lambda (run-id)
+		     (let* ((run     (hash-table-ref runs run-id))
+			    (target  (rundat-target run))
+			    (runname (rundat-runname run)))
+		       (if current-tree
+			   (let* ((partial-path (append (string-split target "/")(list runname)))
+				  (full-path    (cons area-name partial-path)))
+			     (if (not (hash-table-exists? seen-nodes full-path))
+				 (begin
+				   (print "INFO: Adding node " partial-path " to section " area-name)
+				   (tree:add-node current-tree "Areas" full-path)
+				   (areadb:fill-tests area-dat run-ids: (list run-id))))
+				   (hash-table-set! seen-nodes full-path #t)))))
+		   (hash-table-keys runs))))
+	    (if (or (equal? "Areas" current-path)
+		    (string-match (conc "^Areas/" area-name "(|\\/.*)$") current-path))
+		(dboard:redraw-area area-name area-dat current-tab current-matrix current-path))))
+	(hash-table-keys areas))))
+   (hash-table-keys *windows*)))
+
+;;======================================================================
+;; D A S H B O A R D   D B 
+;;======================================================================
+
+;; All moved to common.scm		
+
+;;======================================================================
+;; T R E E 
+;;======================================================================
+
+;;  -  -  -  - 
+
+(define (dashboard:tree-browser data adat window-id)
+  ;; (iup:split
+  (let* ((tb      (iup:treebox
+		   #:value 0
+		   #:title "Areas"
+		   #:expand "YES"
+		   #:addexpanded "NO"
+		   #:selection-cb
+		   (lambda (obj id state)
+		     ;; (print "obj: " obj ", id: " id ", state: " state)
+		     (let* ((tree-path (tree:node->path obj id))
+			    (area      (car tree-path))
+			    (areadat-path (cdr tree-path)))
+		       #f
+		       ;; (test-id  (tree-path->test-id (cdr run-path))))
+		       ;; (if test-id
+		       ;;    (hash-table-set! (dboard:data-curr-test-ids *data*)
+		       ;;		     window-id test-id))
+		       ;; (print "path: " (tree:node->path obj id) " test-id: " test-id))))))
+		       )))))
+    ;; (iup:attribute-set! tb "VALUE" "0")
+    ;; (iup:attribute-set! tb "NAME" "Runs")
+    ;; (iup:attribute-set! tb "ADDEXPANDED" "NO")
+    ;; (dboard:data-tests-tree-set! *data* tb)
+    tb))
+
+;;======================================================================
+;; M A I N   M A T R I X
+;;======================================================================
+
+;; General displayer
+;;
+(define (dashboard:main-matrix data adat window-id)
+  (let* (;; (tab-dat         (areadat-
+	 (view-matrix     (iup:matrix
+			   ;; (runs-for-targ (db:get-runs-by-patt *dbstruct-local* *keys* "%" target #f #f #f))
+			   #:expand "YES"
+			   ;; #:fittosize "YES"
+			   #:resizematrix "YES"
+			   #:scrollbar "YES"
+			   #:numcol 100
+			   #:numlin 100
+			   #:numcol-visible 3
+			   #:numlin-visible 20
+			   #:click-cb (lambda (obj lin col status)
+					(print "obj: " obj " lin: " lin " col: " col " status: " status " value: " (iup:attribute obj "VALUE"))))))
+    
+    ;; (iup:attribute-set! view-matrix "RESIZEMATRIX" "YES")
+    (iup:attribute-set! view-matrix "WIDTH0" "100")
+    ;; (dboard:data-runs-matrix-set! *data* runs-matrix)
+    ;; (iup:hbox
+    ;;  (iup:frame 
+    ;;   #:title "Runs browser"
+    ;;   (iup:vbox
+    view-matrix))
+
+;;======================================================================
+;; A R E A S
+;;======================================================================
+
+(define (dashboard:init-area data area-name apath)
+  (let* ((mtconf      (dboard:read-mtconf apath))
+	 (area-dat    (let ((ad (make-areadat
+				 area-name ;; area name
+				 apath     ;; path to area
+				 ;; 'http     ;; transport
+				 mtconf    ;; megatest.config
+				 (make-hash-table) ;; denoise hash
+				 #f        ;; client-signature
+				 #f        ;; remote connections
+				 (keys:config-get-fields mtconf) ;; run keys
+				 (make-hash-table) ;; run-id -> (hash of test-ids => dat)
+				 (and (file-exists? apath)(file-write-access? apath)) ;; read-only
+				 #f
+				 #f
+				 )))
+			(hash-table-set! (data-areas data) area-name ad)
+			ad)))
+    area-dat))
+
+;; given the keys for an area and a path from the tree browser
+;; return the level: areas area runs run tests test
+;;
+(define (dboard:get-view-type keys current-path)
+  (let* ((path-parts (string-split current-path "/"))
+	 (path-len   (length path-parts)))
+    (cond
+     ((equal? current-path "Areas")     'areas)
+     ((eq? path-len 2)                  'area)
+     ((<= (+ (length keys) 2) path-len) 'runs)
+     (else                              'run))))
+
+(define (dboard:clear-matrix tab)
+  (if tab
+      (begin
+	(iup:attribute-set! (tab-matrix tab) "CLEARVALUE" "ALL")
+	(tab-headers-set! tab (make-hash-table))
+	(tab-rows-set!    tab (make-hash-table)))))
+
+;; full redraw of a given area
+;;
+(define (dboard:redraw-area area-name area-dat tab-dat current-matrix current-path)
+  (let* ((keys      (areadat-run-keys area-dat))
+	 (runs      (areadat-runs     area-dat))
+	 (headers   (tab-headers   tab-dat))
+	 (rows      (tab-rows      tab-dat))
+	 (used-cols (hash-table-values headers))
+	 (used-rows (hash-table-values rows))
+	 (touched   (make-hash-table)) ;; (vector row col) ==> true, touched cell
+	 (view-type (dboard:get-view-type keys current-path))
+	 (changed   #f)
+	 (state-statuses  (list "PASS" "FAIL" "WARN" "CHECK" "SKIP" "RUNNING" "LAUNCHED")))
+    ;; (debug:print 0 *default-log-port* "current-matrix=" current-matrix)
+    (case view-type
+      ((areas) ;; find row for this area, if not found, create new entry
+       (let* ((curr-rownum (hash-table-ref/default rows area-name #f))
+	      (next-rownum (+ (apply max (cons 0 used-rows)) 1))
+	      (rownum      (or curr-rownum next-rownum))
+	      (coord       (conc rownum ":0")))
+	 (if (not curr-rownum)(hash-table-set! rows area-name rownum))
+	 (if (not (equal? (iup:attribute current-matrix coord) area-name))
+	     (begin
+	       (let loop ((hed  (car state-statuses))
+			  (tal  (cdr state-statuses))
+			  (count 1))
+		 (if (not (equal? (iup:attribute current-matrix (conc "0:" count)) hed))
+		     (iup:attribute-set! current-matrix (conc "0:" count) hed))
+		 (iup:attribute-set! current-matrix (conc rownum ":" count) "0")
+		 (if (not (null? tal))
+		     (loop (car tal)(cdr tal)(+ count 1))))
+	       (debug:print-info 0 *default-log-port* "view-type=" view-type ", rownum=" rownum ", curr-rownum=" curr-rownum ", next-rownum=" next-rownum ", coord=" coord ", area-name=" area-name)
+	       (iup:attribute-set! current-matrix coord area-name)
+	       (set! changed #t))))))
+    (if changed (iup:attribute-set! current-matrix "REDRAW" "ALL"))))
+	     
+
+       
+   ;; (dboard:clear-matrix current-matrix used-cols used-rows touched) ;; clear all
+    
+	
+  
+;;======================================================================
+;; D A S H B O A R D
+;;======================================================================
+
+(define (dashboard:area-panel aname data window-id)
+  (let* ((apath      (configf:lookup (data-cfgdat data) aname "path")) ;;  (hash-table-ref (dboard:data-cfgdat data) area-name))
+	 ;;          (hash-table-ref (dboard:data-cfgdat data) aname))
+	 (area-dat   (dashboard:init-area data aname apath))
+	 (tb         (dashboard:tree-browser data area-dat window-id)) ;; (dboard:areas-tree-browser data)
+	 (ad         (dashboard:main-matrix  data area-dat window-id))
+	 (areas      (data-areas data))
+	 (dboard-dat (make-tab
+		      #f           ;; tree
+		      #f           ;; matrix
+		      area-dat     ;;
+		      #f           ;; view path
+		      'default     ;; view type
+		      #f           ;; controls
+		      (make-hash-table) ;; cached data? not sure how to use this yet :)
+		      #f           ;; filters
+		      #f           ;; the run-id
+		      (make-hash-table) ;; run-id -> test-id, for current test id
+		      ""
+		      (make-hash-table) ;; headername -> colnum
+		      (make-hash-table) ;; rowname    -> rownum
+		      )))
+    (hash-table-set! (data-areas data) aname area-dat) ;; dboard-dat)
+    (hash-table-set! (data-tabs data) window-id dboard-dat)
+    (tab-tree-set!   dboard-dat tb)
+    (tab-matrix-set! dboard-dat ad)
+    (iup:split
+     #:value 200
+     tb ad)))
+
+
+;; Main Panel
+;;
+(define (dashboard:main-panel data window-id)
+  (iup:dialog
+   #:title "Megatest Control Panel"
+;;   #:menu (dcommon:main-menu data)
+   #:shrink "YES"
+   (iup:vbox
+    (let* ((area-names  (hash-table-keys (data-cfgdat data)))
+	   (area-panels (map (lambda (aname)
+			       (dashboard:area-panel aname data window-id))
+			     area-names))
+	   (tabtop      (apply iup:tabs  
+			       #:tabchangepos-cb (lambda (obj curr prev)
+						   (data-current-tab-id-set! data curr)
+						   (data-update-needed-set!  data #t)
+						   (print "Tab is: " curr ", prev was " prev))
+			       area-panels))
+	   (tabs     (data-tabs data)))
+      (if (not (null? area-names))
+	  (let loop ((index 0)
+		     (hed   (car area-names))
+		     (tal   (cdr area-names)))
+	    ;; (hash-table-set! tabs index hed)
+	    (debug:print 0 *default-log-port* "Adding area " hed " with index " index " to dashboard")
+	    (iup:attribute-set! tabtop (conc "TABTITLE" index) hed)
+	    (if (not (null? tal))
+		(loop (+ index 1)(car tal)(cdr tal)))))
+      tabtop))))
+
+
+;;======================================================================
+;; N A N O M S G   S E R V E R
+;;======================================================================
+
+(define (dboard:server-service soc port)
+  (print "server starting")
+  (let loop ((msg-in (nn-recv soc))
+	     (count  0))
+    (if (eq? 0 (modulo count 1000))
+	(print "server received: " msg-in ", count=" count))
+    (cond
+     ;;
+     ;; quit
+     ;;
+     ((equal? msg-in "quit")
+      (nn-send soc "Ok, quitting"))
+     ;;
+     ;; ping
+     ;;
+     ((and (>= (string-length msg-in) 4)
+	   (equal? (substring msg-in 0 4) "ping"))
+      (nn-send soc (conc (current-process-id)))
+      (loop (nn-recv soc)(+ count 1)))
+     ;;
+     ;; main changed
+     ;;
+     ((and (>= (string-length msg-in) 4)
+	   (equal? (substring msg-in 0 4) "main"))
+      (let ((parts (string-split msg-in " ")))
+	(hash-table-set! *changed-main* (cadr parts) #t)
+	(nn-send soc "got it!")))
+     ;;
+     ;; ??
+     ;;
+     (else
+      (nn-send soc "hello " msg-in " you got to the else clause!")))
+    (loop (nn-recv soc)(if (> count 20000000)
+			   0
+			   (+ count 1)))))
+
+(define (dboard:one-time-ping-receive soc port)
+  (let ((msg-in (nn-recv soc)))
+    (if (and (>= (string-length msg-in) 4)
+	     (equal? (substring msg-in 0 4) "ping"))
+	(nn-send soc (conc (current-process-id))))))
+
+(define (dboard:server-start given-port #!key (num-tries 200))
+  (let* ((rep (nn-socket 'rep))
+	 (port (or given-port  (portlogger:main "find")))
+	 (con (conc "tcp://*:" port)))
+    ;; register this connect here ....
+    (nn-bind rep con)
+    (thread-start! 
+     (make-thread (lambda ()
+		    (dboard:one-time-ping-receive rep port))
+		  "one time receive thread"))
+    (if (dboard:ping-self "localhost" port)
+	(begin
+	  (print "INFO: dashboard nanomsg server started on " port)
+	  (values rep port))
+	(begin
+	  (print "WARNING: couldn't create server on port " port)
+	  (portlogger:main "set" "failed")
+	  (if (> num-tries 0)
+	      (dboard:server-start #f (- num-tries 1))
+	      (begin
+		(print "ERROR: failed to start nanomsg server")
+		(values #f #f)))))))
+
+(define (dboard:server-close con port)
+  (nn-close con)
+  (portlogger:main "set" port "released"))
+
+(define (dboard:ping-self host port #!key (return-socket #t))
+  ;; send a random number along with pid and check that we get it back
+  (let* ((req     (nn-socket 'req))
+	 (key     "ping")
+	 (success #f)
+	 (keepwaiting #t)
+	 (ping    (make-thread
+		   (lambda ()
+		     (print "ping: sending string \"" key "\", expecting " (current-process-id))
+		     (nn-send req key)
+		     (let ((result  (nn-recv req)))
+		       (if (equal? (conc (current-process-id)) result)
+			   (begin
+			     (print "ping, success: received \"" result "\"")
+			     (set! success #t))
+			   (begin
+			     (print "ping, failed: received key \"" result "\"")
+			     (set! keepwaiting #f)
+			     (set! success #f)))))
+		   "ping"))
+	 (timeout (make-thread (lambda ()
+				 (let loop ((count 0))
+				   (thread-sleep! 1)
+				   (print "still waiting after " count " seconds...")
+				   (if (and keepwaiting (< count 10))
+				       (loop (+ count 1))))
+				 (if keepwaiting
+				     (begin
+				       (print "timeout waiting for ping")
+				       (thread-terminate! ping))))
+			       "timeout")))
+    (nn-connect req (conc "tcp://" host ":" port))
+    (handle-exceptions
+     exn
+     (begin
+       (print-call-chain)
+       (print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
+       (print "exn=" (condition->list exn))
+       (print "ping failed to connect to " host ":" port))
+     (thread-start! timeout)
+     (thread-start! ping)
+     (thread-join! ping)
+     (if success (thread-terminate! timeout)))
+    (if return-socket
+	(if success req #f)
+	(begin
+	  (nn-close req)
+	  success))))
+
+;;======================================================================
+;; C O N F I G U R A T I O N 
+;;======================================================================
+
+;; Get the configuration file for a group name, if the group name is "default" and it doesn't 
+;; exist, create it and add the current path if it contains megatest.config
+;;
+(define (dboard:get-config group-name)
+  (let* ((fname (conc (getenv "HOME") "/.megatest/" group-name ".dat")))
+    (if (file-exists? fname)
+	(read-config fname (make-hash-table) #t)
+	(if (dboard:create-config fname)
+	    (dboard:get-config group-name)
+	    (make-hash-table)))))
+
+(define (dboard:create-config fname)
+  ;; (handle-exceptions
+  ;;  exn
+  ;;  
+  ;;  #f ;; failed to create - just give up
+   (let* ((dirname       (pathname-directory fname))
+	  (file-name     (pathname-strip-directory fname))
+	  (curr-mtcfgdat (find-config "megatest.config"
+				      toppath: (or (get-environment-variable "MT_RUN_AREA_HOME")(current-directory))))
+	  (curr-mtcfg    (if (and curr-mtcfgdat (not (null? curr-mtcfgdat)))(cadr curr-mtcfgdat) #f))
+	  (curr-mtpath   (if curr-mtcfg (car curr-mtcfgdat) #f)))
+     (if curr-mtpath
+	 (begin
+	   (debug:print-info 0 *default-log-port* "Creating config file " fname)
+	   (if (not (file-exists? dirname))
+	       (create-directory dirname #t))
+	   (with-output-to-file fname
+	     (lambda ()
+	       (let ((aname (pathname-strip-directory curr-mtpath)))
+		 (print "[" aname "]")
+		 (print  "path " curr-mtpath))))
+	   #t)
+	 (begin
+	   (debug:print-info 0 *default-log-port* "Need to create a config but no megatest.config found: " curr-mtcfgdat)
+	   #f))))
+;; )
+
+(define (dboard:read-mtconf apath)
+  (let* ((mtconffile  (conc apath "/megatest.config")))
+    (call-with-environment-variables
+     (list (cons "MT_RUN_AREA_HOME" apath))
+     (lambda ()
+       (read-config mtconffile (make-hash-table) #f)) ;; megatest.config
+     )))
+	 
+
+;;======================================================================
+;; G U I   S T U F F 
+;;======================================================================
+
+;;; main. Theoretically could have multiple windows (each with a group of tags, thus window-id
+;;;
+(define (dboard:make-window window-id)
+  (let* (;; (window-id 0)
+	 (groupn    (or (args:get-arg "-group") "default"))
+	 (cfgdat    (dboard:get-config groupn))
+	 ;; (cfgdat    (if (file-exists? cfname)(read-config cfname (make-hash-table) #t)(make-hash-table)))
+	 (data      (make-data
+		     cfgdat ;; this is the data from ~/.megatest for the selected group
+		     (make-hash-table) ;; areaname -> area-rec
+		     0                 ;; current window id
+		     0                 ;; current tab id
+		     #f                ;; redraw needed for current tab id
+		     (make-hash-table) ;; tab-id -> areaname
+		     )))
+    (hash-table-set! *windows* window-id data)
+    (iup:show (dashboard:main-panel data window-id))
+    (iup:main-loop)))
+
+;; ease debugging by loading ~/.dashboardrc
+(let ((debugcontrolf (conc (get-environment-variable "HOME") "/.dashboardrc")))
+  (if (file-exists? debugcontrolf)
+      (load debugcontrolf)))
+
+(define (main)
+  (let-values 
+      (((con port)(dboard:server-start #f)))
+    (let ((portnum   (if (string? port)(string->number port) port)))
+      ;; got here, monitor/dashboard was started
+      (mddb:register-dashboard portnum)
+      (thread-start! (make-thread (lambda ()(dboard:server-service con portnum)) "server service"))
+      (thread-start! (make-thread (lambda ()
+				    (let loop ()
+				      (dboard:general-updater con portnum)
+				      (thread-sleep! 1)
+				      (loop))) "general updater"))
+      (dboard:make-window 0)
+      (mddb:unregister-dashboard (get-host-name) portnum)
+      (dboard:server-close con port))))
+

Index: oldsrc/newdashboard.scm
==================================================================
--- oldsrc/newdashboard.scm
+++ oldsrc/newdashboard.scm
@@ -1,14 +1,23 @@
 ;;======================================================================
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 ;;======================================================================
 
 (use format numbers)
 (require-library iup)
 (import (prefix iup iup:))

ADDED   oldsrc/nmsg-transport.scm
Index: oldsrc/nmsg-transport.scm
==================================================================
--- /dev/null
+++ oldsrc/nmsg-transport.scm
@@ -0,0 +1,367 @@
+
+;; Copyright 2006-2012, Matthew Welland.
+
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
+
+(require-extension (srfi 18) extras tcp s11n)
+
+(use sqlite3 srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest)
+(import (prefix sqlite3 sqlite3:))
+
+;; (use nanomsg)
+
+(declare (unit nmsg-transport))
+
+(declare (uses common))
+(declare (uses db))
+(declare (uses tests))
+(declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
+(declare (uses server))
+
+(include "common_records.scm")
+(include "db_records.scm")
+
+;; Transition to pub --> sub with pull <-- push
+;;
+;;   1. client sends request to server via push to the pull port
+;;   2. server puts request in queue or processes immediately as appropriate
+;;   3. server puts responses from completed requests into pub port 
+;;
+;; TODO
+;;
+;; Done Tested
+;; [x]  [ ]    1. Add columns pullport pubport to servers table
+;; [x]  [ ]    2. Add rm of monitor.db if older than 11/12/2012 
+;; [x]  [ ]    3. Add create of pullport and pubport with finding of available ports
+;; [x]  [ ]    4. Add client compose of request
+;; [x]  [ ]        - name of client: testname/itempath-test_id-hostname 
+;; [x]  [ ]        - name of request: callname, params
+;; [x]  [ ]        - request key: f(clientname, callname, params)
+;; [x]  [ ]    5. Add processing of subscription hits
+;; [x]  [ ]        - done when get key 
+;; [x]  [ ]        - return results
+;; [x]  [ ]    6. Add timeout processing
+;; [x]  [ ]        - after 60 seconds
+;; [ ]  [ ]            i. check server alive, connect to new if necessary
+;; [ ]  [ ]           ii. resend request
+;; [ ]  [ ]    7. Turn self ping back on
+
+(define (nmsg-transport:make-server-url hostport #!key (bindall #f))
+  (if (not hostport)
+      #f
+      (conc "tcp://" (if bindall "*" (car hostport)) ":" (cadr hostport))))
+
+(define *server-loop-heart-beat* (current-seconds))
+(define *heartbeat-mutex* (make-mutex))
+
+;;======================================================================
+;; S E R V E R
+;;======================================================================
+
+(define (nmsg-transport:run dbstruct hostn run-id server-id #!key (retrynum 1000))
+  (debug:print 2 *default-log-port* "Attempting to start the server ...")
+  (let* ((start-port      (portlogger:open-run-close portlogger:find-port))
+	 (server-thread   (make-thread (lambda ()
+					 (nmsg-transport:try-start-server dbstruct run-id start-port server-id))
+				       "server thread"))
+	 (tdbdat          (tasks:open-db)))
+    (thread-start! server-thread)
+    (thread-sleep! 0.1)
+    (if (nmsg-transport:ping hostn start-port timeout: 2 expected-key: (current-process-id))
+	(let ((interface (if (equal? hostn "-")(get-host-name) hostn)))
+	  (tasks:server-set-interface-port (db:delay-if-busy tdbdat) server-id interface start-port)
+	  (tasks:server-set-state! (db:delay-if-busy tdbdat) server-id "dbprep")
+	  (set! *server-info* (list hostn start-port)) ;; probably not needed anymore? currently used by keep-running
+	  (thread-sleep! 3) ;; give some margin for queries to complete before switching from file based access to server based access
+	  ;; (set! *inmemdb*  dbstruct)
+	  (tasks:server-set-state! (db:delay-if-busy tdbdat) server-id "running")
+	  (thread-start! (make-thread
+			  (lambda ()(nmsg-transport:keep-running server-id run-id))
+			  "keep running"))
+	  (thread-join! server-thread))
+	(if (> retrynum 0)
+	    (begin
+	      (debug:print 0 *default-log-port* "WARNING: Failed to connect to server (self) on host " hostn ":" start-port ", trying again.")
+	      (tasks:server-delete-record (db:delay-if-busy tdbdat) server-id "failed to start, never received server alive signature")
+	      (portlogger:open-run-close portlogger:set-failed start-port)
+	      (nmsg-transport:run dbstruct hostn run-id server-id))
+	    (begin
+	      (debug:print-error 0 *default-log-port* "could not find an open port to start server on. Giving up")
+	      (exit 1))))))
+
+(define (nmsg-transport:try-start-server dbstruct run-id portnum server-id)
+  (let ((repsoc (nn-socket 'rep)))
+    (nn-bind repsoc (conc "tcp://*:" portnum))
+    (let loop ((msg-in (nn-recv repsoc)))
+      (let* ((dat    (db:string->obj msg-in transport: 'nmsg)))
+	(debug:print 0 *default-log-port* "server, received: " dat)
+	(let ((result (api:execute-requests dbstruct dat)))
+	  (debug:print 0 *default-log-port* "server, sending: " result)
+	  (nn-send repsoc (db:obj->string result  transport: 'nmsg)))
+	(loop (nn-recv repsoc))))))
+
+;; all routes though here end in exit ...
+;;
+(define (nmsg-transport:launch run-id)
+  (let* ((tdbdat   (tasks:open-db))
+	 (dbstruct (db:setup run-id))
+	 (hostn    (or (args:get-arg "-server") "-")))
+    (set! *run-id*   run-id)
+    (set! *inmemdb* dbstruct)
+    ;; with nbfake daemonize isn't really needed
+    ;;
+    ;; (if (args:get-arg "-daemonize")
+    ;;     (begin
+    ;;       (daemon:ize)
+    ;;       (if *alt-log-file* ;; we should re-connect to this port, I think daemon:ize disrupts it
+    ;;           (begin
+    ;;     	(current-error-port *alt-log-file*)
+    ;;     	(current-output-port *alt-log-file*)))))
+    (if (server:check-if-running run-id)
+	(begin
+	  (debug:print-info 0 *default-log-port* "Server for run-id " run-id " already running")
+	  (exit 0)))
+    (let loop ((server-id (tasks:server-lock-slot (db:delay-if-busy tdbdat) run-id))
+	       (remtries  4))
+      (if (not server-id)
+	  (if (> remtries 0)
+	      (begin
+		(thread-sleep! 2)
+		(if (not (server:check-if-running run-id))
+		    (loop (tasks:server-lock-slot (db:delay-if-busy tdbdat) run-id)
+			  (- remtries 1))
+		    (begin
+		      (debug:print-info 0 *default-log-port* "Another server took the slot, exiting")
+		      (exit 0))))
+	      (begin
+		;; since we didn't get the server lock we are going to clean up and bail out
+		(debug:print-info 2 *default-log-port* "INFO: server pid=" (current-process-id) ", hostname=" (get-host-name) " not starting due to other candidates ahead in start queue")
+		(tasks:server-delete-records-for-this-pid (db:delay-if-busy tdbdat) " http-transport:launch")
+		))
+	  ;; locked in a server id, try to start up
+	  (nmsg-transport:run dbstruct hostn run-id server-id))
+      (set! *didsomething* #t)
+      (exit))))
+
+;;======================================================================
+;; S E R V E R   U T I L I T I E S 
+;;======================================================================
+
+(define (nmsg-transport:mk-signature)
+  (message-digest-string (md5-primitive) 
+			 (with-output-to-string
+			   (lambda ()
+			     (write (list (current-directory)
+					  (argv)))))))
+
+;;======================================================================
+;; C L I E N T S
+;;======================================================================
+
+;; ping the server at host:port
+;;   return the open socket if successful (return-socket == #t)
+;;   expect the key expected-key returned in payload
+;;   send our-key or #f as payload
+;;
+(define (nmsg-transport:ping hostn port #!key (timeout 3)(return-socket #t)(expected-key #f)(our-key #f)(socket #f))
+  ;; send a random number along with pid and check that we get it back
+  (let* ((host    (if (or (not hostn)
+			  (equal? hostn "-")) ;; use localhost
+		      (get-host-name)
+		      hostn))
+	 (req     (or socket
+		      (let ((soc (nn-socket 'req)))
+			(nn-connect soc (conc "tcp://" host ":" port))
+			soc)))
+	 (success #t)
+	 (dat     (vector "ping" our-key))
+	 (result  (condition-case 
+		   (nmsg-transport:client-api-send-receive-raw req dat timeout: timeout)
+		   ((timeout)(set! success #f) #f)))
+	 (key     (if success 
+		      (vector-ref result 1)
+		      #f)))
+    (debug:print 0 *default-log-port* "success=" success ", key=" key ", expected-key=" expected-key ", equal? " (equal? key expected-key))
+    (if (and success
+	     (or (not expected-key) ;; just getting a reply is good enough then
+		 (equal? key expected-key)))
+	(if return-socket
+	    req
+	    (begin
+	      (if (not socket)(nn-close req)) ;; don't want a side effect of closing socket if handed it
+	      #t))
+	(begin
+	  (if (not socket)(nn-close req)) ;; failed to ping, close socket as side effect
+	  #f))))
+
+;; send data to server, wait max of timeout seconds for a response.
+;; return #( success/fail result )
+;;
+;; for effiency it is easier to do the obj->string and string->obj here.
+;;
+(define (nmsg-transport:client-api-send-receive-raw socreq indat #!key (enable-send #t)(timeout 25))
+  (let* ((success     #f)
+	 (result      #f)
+	 (keepwaiting #t)
+	 (dat         (db:obj->string indat transport: 'nmsg))
+	 (send-recv   (make-thread
+		       (lambda ()
+			 (nn-send socreq dat)
+			 (let* ((res (nn-recv socreq)))
+			   (set! success #t)
+			   (set! result (db:string->obj res transport: 'nmsg))))
+		       "send-recv"))
+	 (timeout     (make-thread
+		       (lambda ()
+			 (let loop ((count 0))
+			   (thread-sleep! 1)
+			   (debug:print-info 1 *default-log-port* "send-receive-raw, still waiting after " count " seconds...")
+			   (if (and keepwaiting (< count timeout)) ;; yes, this is very aproximate
+			       (loop (+ count 1))))
+			 (if keepwaiting
+			     (begin
+			       (print "timeout waiting for ping")
+			       (thread-terminate! send-recv))))
+		       "timeout")))
+    ;; replace with condition-case?
+    (handle-exceptions
+     exn
+     (set! result "timeout")
+     (thread-start! timeout)
+     (thread-start! send-recv)
+     (thread-join! send-recv)
+     (if success (thread-terminate! timeout)))
+    ;; raise timeout error if timed out
+    (if success
+	(if (and (vector? result)
+		 (vector-ref result 0)) ;; did it fail at the server?
+	    result                ;; nope, all good
+	    (begin
+	      (debug:print-error 0 *default-log-port* "error occured at server, info=" (vector-ref result 2))
+	      (debug:print 0 *default-log-port* " client call chain:")
+	      (print-call-chain (current-error-port))
+	      (debug:print 0 *default-log-port* " server call chain:")
+	      (pp (vector-ref result 1) (current-error-port))
+	      (signal (vector-ref result 0))))
+	(signal (make-composite-condition
+		 (make-property-condition 'timeout 'message "nmsg-transport:client-api-send-receive-raw timed out talking to server"))))))
+
+;; run nmsg-transport:keep-running in a parallel thread to monitor that the db is being 
+;; used and to shutdown after sometime if it is not.
+;;
+(define (nmsg-transport:keep-running server-id run-id)
+  ;; if none running or if > 20 seconds since 
+  ;; server last used then start shutdown
+  ;; This thread waits for the server to come alive
+  (let* ((server-info (let loop ()
+                        (let ((sdat #f))
+                          (mutex-lock! *heartbeat-mutex*)
+                          (set! sdat *server-info*)
+                          (mutex-unlock! *heartbeat-mutex*)
+                          (if sdat 
+			      (begin
+				(debug:print-info 0 *default-log-port* "keep-running got sdat=" sdat)
+				sdat)
+                              (begin
+                                (thread-sleep! 0.5)
+                                (loop))))))
+         (iface       (car server-info))
+         (port        (cadr server-info))
+         (last-access 0)
+	 (tdbdat      (tasks:open-db))
+	 (server-timeout (let ((tmo (configf:lookup  *configdat* "server" "timeout")))
+			   (if (and (string? tmo)
+				    (string->number tmo))
+			       (* 60 60 (string->number tmo))
+			       ;; (* 3 24 60 60) ;; default to three days
+			       (* 60 1)         ;; default to one minute
+			       ;; (* 60 60 25)      ;; default to 25 hours
+			       ))))
+    (print "Keep-running got server pid " server-id ", using iface " iface " and port " port)
+    (let loop ((count 0))
+      (thread-sleep! 4) ;; no need to do this very often
+      ;; NB// sync currently does NOT return queue-length
+      (let () ;; (queue-len (cdb:client-call server-info 'sync #t 1)))
+      ;; (print "Server running, count is " count)
+        (if (< count 1) ;; 3x3 = 9 secs aprox
+            (loop (+ count 1)))
+        
+        (mutex-lock! *heartbeat-mutex*)
+        (set! last-access *last-db-access*)
+        (mutex-unlock! *heartbeat-mutex*)
+	(db:sync-touched *inmemdb* run-id force-sync: #t)
+        (if (and *server-run*
+	       (> (+ last-access server-timeout)
+		  (current-seconds)))
+            (begin
+              (debug:print-info 0 *default-log-port* "Server continuing, seconds since last db access: " (- (current-seconds) last-access))
+              (loop 0))
+            (begin
+              (debug:print-info 0 *default-log-port* "Starting to shutdown the server.")
+              (set! *time-to-exit* #t)
+	      (db:sync-touched *inmemdb* run-id force-sync: #t)
+              (tasks:server-delete-record (db:delay-if-busy tdbdat) server-id " http-transport:keep-running")
+              (debug:print-info 0 *default-log-port* "Server shutdown complete. Exiting")
+              (exit)
+	      ))))))
+
+;;======================================================================
+;; C L I E N T S
+;;======================================================================
+
+(define (nmsg-transport:client-connect iface portnum)
+  (let* ((reqsoc      (nmsg-transport:ping iface portnum return-socket: #t)))
+    (vector iface portnum #f #f #f (current-seconds) reqsoc)))
+
+;; returns result, there is no sucess/fail flag - handled via excpections
+;;
+(define (nmsg-transport:client-api-send-receive run-id connection-info cmd param #!key (remtries 5))
+  ;; NB// In the html version of this routine there is a call to 
+  ;;      tasks:kill-server-run-id when there is an exception
+  (mutex-lock! *http-mutex*)
+  (let* ((packet  (vector cmd param))
+	 (reqsoc  (http-transport:server-dat-get-socket connection-info))
+	 (res     (nmsg-transport:client-api-send-receive-raw reqsoc packet)))
+;;	 (status  (vector-ref rawres 0))
+;;	 (result  (vector-ref rawres 1)))
+    (mutex-unlock! *http-mutex*)
+    res)) ;; (vector status (if status (db:string->obj result transport: 'nmsg) result))))
+	
+;;======================================================================
+;; J U N K 
+;;======================================================================
+
+;; DO NOT USE
+;;
+(define (nmsg-transport:client-signal-handler signum)
+  (handle-exceptions
+   exn
+   (debug:print 0 *default-log-port* " ... exiting ...")
+   (let ((th1 (make-thread (lambda ()
+			     (if (not *received-response*)
+				 (receive-message* *runremote*))) ;; flush out last call if applicable
+			   "eat response"))
+	 (th2 (make-thread (lambda ()
+			     (debug:print-error 0 *default-log-port* "Received ^C, attempting clean exit. Please be patient and wait a few seconds before hitting ^C again.")
+			     (thread-sleep! 3) ;; give the flush three seconds to do it's stuff
+			     (debug:print 0 *default-log-port* "       Done.")
+			     (exit 4))
+			   "exit on ^C timer")))
+     (thread-start! th2)
+     (thread-start! th1)
+     (thread-join! th2))))
+

Index: oldsrc/zmq-transport.scm
==================================================================
--- oldsrc/zmq-transport.scm
+++ oldsrc/zmq-transport.scm
@@ -1,14 +1,23 @@
 ;;======================================================================
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 ;;======================================================================
 
 (require-extension (srfi 18) extras tcp s11n)
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest)

Index: portlogger-example.scm
==================================================================
--- portlogger-example.scm
+++ portlogger-example.scm
@@ -1,4 +1,21 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 
 (declare (uses portlogger))
 
 (print (apply portlogger:main (cdr (argv))))

Index: portlogger.scm
==================================================================
--- portlogger.scm
+++ portlogger.scm
@@ -1,14 +1,23 @@
 
 ;; Copyright 2006-2014, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 (require-extension (srfi 18) extras tcp s11n)
 
 (use sqlite3 srfi-1 posix srfi-69 hostinfo dot-locking z3)
 (import (prefix sqlite3 sqlite3:))
@@ -19,11 +28,11 @@
 ;; lsof -i
 
 
 (define (portlogger:open-db fname)
   (let* ((avail    (tasks:wait-on-journal fname 5 remove: #t)) ;; wait up to about 10 seconds for the journal to go away
-	 (exists   (file-exists? fname))
+	 (exists   (common:file-exists? fname))
 	 (db       (if avail 
 		       (sqlite3:open-database fname)
 		       (begin
 			 (system (conc "rm -f " fname))
 			 (sqlite3:open-database fname))))
@@ -56,12 +65,12 @@
      exn
      (begin
        ;; (release-dot-lock fname)
        (debug:print-error 0 *default-log-port* "portlogger:open-run-close failed. " proc " " params)
        (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-       (debug:print 0 *default-log-port* "exn=" (condition->list exn))
-       (if (file-exists? fname)(delete-file fname)) ;; brutally get rid of it
+       (debug:print 5 *default-log-port* "exn=" (condition->list exn))
+       (if (common:file-exists? fname)(delete-file fname)) ;; brutally get rid of it
        (print-call-chain (current-error-port)))
      (let* (;; (lock   (obtain-dot-lock fname 2 9 10))
 	    (db     (portlogger:open-db fname))
 	    (res    (apply proc db params)))
        (sqlite3:finalize! db)
@@ -103,11 +112,11 @@
   (handle-exceptions
       exn
       (begin
 	(debug:print 0 *default-log-port* "EXCEPTION: portlogger database probably overloaded or unreadable. If you see this message again remove /tmp/.$USER-portlogger.db")
 	(debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-	(debug:print 0 *default-log-port* "exn=" (condition->list exn))
+	(debug:print 5 *default-log-port* "exn=" (condition->list exn))
 	(print-call-chain (current-error-port))
 	(debug:print 0 *default-log-port* "Continuing anyway.")
 	#f)
     (sqlite3:fold-row
      (lambda (var curr)
@@ -128,11 +137,11 @@
     (handle-exceptions
      exn
      (begin
        (debug:print 0 *default-log-port* "EXCEPTION: portlogger database probably overloaded or unreadable. If you see this message again remove /tmp/.$USER-portlogger.db")
        (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-       (debug:print 0 *default-log-port* "exn=" (condition->list exn))
+       (debug:print 5 *default-log-port* "exn=" (condition->list exn))
        (print-call-chain (current-error-port))
        (debug:print 0 *default-log-port* "Continuing anyway."))
      (portlogger:take-port db portnum))
     portnum))
 
@@ -158,11 +167,11 @@
 	  (handle-exceptions
 	   exn
 	   (begin
 	     (debug:print 0 *default-log-port* "EXCEPTION: portlogger database at " dbfname " probably overloaded or unreadable. Try removing it.")
 	     (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-	     (print "exn=" (condition->list exn))
+	     (debug:print 5 *default-log-port* "exn=" (condition->list exn))
 	     (debug:print 0 *default-log-port* " status:  " ((condition-property-accessor 'sqlite3 'status) exn))
 	     (print-call-chain (current-error-port))
 	     #f)
 	   (case (string->symbol (car args)) ;; commands with two or more params
 	     ((take)(portlogger:take-port db (string->number (cadr args))))

Index: process.scm
==================================================================
--- process.scm
+++ process.scm
@@ -1,23 +1,31 @@
 ;;======================================================================
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;;======================================================================
 
 ;;======================================================================
 ;; Process convience utils
 ;;======================================================================
 
-(use regex)
+(use regex directory-utils)
 (declare (unit process))
-;;(declare (uses common))
 
 (define (process:conservative-read port)
   (let loop ((res ""))
     (if (not (eof-object? (peek-char port)))
 	(loop (conc res (read-char port)))
@@ -46,18 +54,44 @@
 	     (close-input-port fh)
 	     (close-input-port fhe)
 	     (close-output-port fho)
 	     result))))) ;; )
 
+(define (process:cmd-run-with-stderr-and-exitcode->list cmd . params)
+  ;; (print "Called with cmd=" cmd ", proc=" proc ", params=" params)
+;;  (handle-exceptions
+;;   exn
+;;   (begin
+;;     (print "ERROR:  Failed to run command: " cmd " " (string-intersperse params " "))
+;;     (print "       " ((condition-property-accessor 'exn 'message) exn))
+;;     #f)
+   (let-values (((fh fho pid fhe) (if (null? params)
+				      (process* cmd)
+				      (process* cmd params))))
+       (let loop ((curr (read-line fh))
+		  (result  '()))
+	 (let ((errstr (process:conservative-read fhe)))
+	   (if (not (string=? errstr ""))
+	       (set! result (append result (list errstr)))))
+       (if (not (eof-object? curr))
+	   (loop (read-line fh)
+		 (append result (list curr)))
+	   (begin
+             (let-values (((anotherpid normalexit? exitstatus)  (process-wait pid)))
+	     (close-input-port fh)
+	     (close-input-port fhe)
+	     (close-output-port fho)
+               (list result (if normalexit? exitstatus -1))))))))
+
 (define (process:cmd-run-proc-each-line cmd proc . params)
   ;; (print "Called with cmd=" cmd ", proc=" proc ", params=" params)
   (handle-exceptions
    exn
    (begin
      (print "ERROR:  Failed to run command: " cmd " " (string-intersperse params " "))
      (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-     (print "exn=" (condition->list exn))
+     (debug:print 5 *default-log-port* "exn=" (condition->list exn))
      #f)
    (let-values (((fh fho pid) (if (null? params)
 				  (process cmd)
 				  (process cmd params))))
        (let loop ((curr (read-line fh))
@@ -75,16 +109,19 @@
   (let* ((fh (open-input-pipe cmd))
          (res (port-proc->list fh proc))
          (status (close-input-pipe fh)))
     (if (eq? status 0) res #f)))
 
-(define (process:cmd-run->list cmd)
-  (let* ((fh (open-input-pipe cmd))
-         (res (port->list fh))
-         (status (close-input-pipe fh)))
-    (list res status)))
-
+(define (process:cmd-run->list cmd #!key (delta-env-alist-or-hash-table '()))
+  (common:with-env-vars
+   delta-env-alist-or-hash-table
+   (lambda ()
+     (let* ((fh (open-input-pipe cmd))
+            (res (port->list fh))
+            (status (close-input-pipe fh)))
+       (list res status)))))
+   
 (define (port->list fh)
   (if (eof-object? fh) #f
       (let loop ((curr (read-line fh))
                  (result '()))
         (if (not (eof-object? curr))
@@ -102,30 +139,38 @@
                   (append result (list curr)))
             result))))
 
 ;; here is an example line where the shell is sh or bash
 ;; "find / -print 2&>1 > findall.log"
-(define (run-n-wait cmdline #!key (params #f)(print-cmd #f))
+(define (run-n-wait cmdline #!key (params #f)(print-cmd #f)(run-dir #f))
   (if print-cmd 
       (debug:print 0 *default-log-port* 
 		   (if (string? print-cmd)
 		       print-cmd
 		       "")
+		   (if run-dir (conc "Run in " run-dir ";") "")
 		   cmdline
 		   (if params
-		       (string-intersperse params " ")
+		       (conc " " (string-intersperse params " "))
 		       "")))
+  (if (and run-dir
+	   (directory-exists? run-dir))
+      (push-directory run-dir))
   (let ((pid (if params
 		 (process-run cmdline params)
 		 (process-run cmdline))))
     (let loop ((i 0))
       (let-values (((pid-val exit-status exit-code) (process-wait pid #t)))
          (if (eq? pid-val 0)
 	     (begin
 	       (thread-sleep! 2)
 	       (loop (+ i 1)))
-	     (values pid-val exit-status exit-code))))))
+	     (begin
+	       (if (and run-dir
+			(directory-exists? run-dir))
+		   (pop-directory))
+	       (values pid-val exit-status exit-code)))))))
   
 ;;======================================================================
 ;; MISC PROCESS RELATED STUFF
 ;;======================================================================
 
@@ -143,11 +188,11 @@
 
 (define (process:alive? pid)
   (handle-exceptions
    exn
    ;; possibly pid is a process not a child, look in /proc to see if it is running still
-   (file-exists? (conc "/proc/" pid))
+   (common:file-exists? (conc "/proc/" pid))
    (let-values (((rpid exit-type exit-signal)(process-wait pid #t)))
        (and (number? rpid)
 	    (equal? rpid pid)))))
 
 (define (process:alive-on-host? host pid)

Index: records-vs-vectors-vs-coops.scm
==================================================================
--- records-vs-vectors-vs-coops.scm
+++ records-vs-vectors-vs-coops.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;; (include "vg.scm")
 
 ;; (declare (uses vg))
 
 (use foof-loop defstruct coops)

Index: records.sh
==================================================================
--- records.sh
+++ records.sh
@@ -1,16 +1,54 @@
 #! /bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # extents caches extents calculated on draw
 # proc is called on draw and takes the obj itself as a parameter
 # attrib is an alist of parameters
 # libs: hash of name->lib, insts: hash of instname->inst
 #
 # Add -safe when doing development
 #
 export MODE='-safe'
 (echo ";; Created by records.sh. DO NOT EDIT THIS FILE. Edit records.sh instead"
+
+ echo <.
+;;
+EOF
+ 
 make-vector-record $MODE vg lib     comps
 make-vector-record $MODE vg comp    objs name file
 make-vector-record $MODE vg obj     type pts fill-color text line-color call-back angle font attrib extents proc
 make-vector-record $MODE vg inst    libname compname theta xoff yoff scalex scaley mirrx mirry call-back cache
 make-vector-record $MODE vg drawing libs insts scalex scaley xoff yoff cnv cache

DELETED remotediff-nmsg.scm
Index: remotediff-nmsg.scm
==================================================================
--- remotediff-nmsg.scm
+++ /dev/null
@@ -1,187 +0,0 @@
-(use posix)
-(use regex)
-(use directory-utils)
-(use srfi-18 srfi-69 nanomsg)
-
-(define (client-send-receive soc msg)
-  (nn-send soc msg)
-  (nn-recv soc))
-
-;;do as calling user
-(define (do-as-calling-user proc)
-  (let ((eid (current-effective-user-id))
-        (cid (current-user-id)))
-    (if (not (eq? eid cid)) ;; running suid
-        (set! (current-effective-user-id) cid))
-    (proc)
-    (if (not (eq? eid cid))
-        (set! (current-effective-user-id) eid))))
-
-;; use mutex to not open/close files at same time
-;;
-(define (checksum mtx file #!key (cmd "shasum"))
-  (mutex-lock! mtx)
-  (let-values (((inp oup pid)
-                (process cmd (list file))))
-    (mutex-unlock! mtx)
-    (let ((result (read-line inp)))
-      ;; now flush out remaining output
-      (let loop ((inl (read-line inp)))
-        (if (eof-object? inl)
-            (if (string? result)
-                (begin
-                  (mutex-lock! mtx)
-                  (close-input-port inp)
-                  (close-output-port oup)
-                  (mutex-unlock! mtx)
-                  (car (string-split result)))
-                #f)
-            (loop (read-line inp)))))))
-
-(define *max-running* 40)
-
-(define my-mutex-lock! conc)
-(define my-mutex-unlock! conc)
-;; (define my-mutex-lock! mutex-lock!)
-;; (define my-mutex-unlock! mutex-unlock!)
-
-(define (gather-dir-info path)
-  (let ((mtx1     (make-mutex))
-        (threads  (make-hash-table))
-        (last-num 0)
-        (req      (nn-socket 'req)))
-    (print "starting client with pid " (current-process-id))
-    (nn-connect req
-                ;; "tcp://localhost:5559")
-                "ipc:///tmp/test-ipc")
-    (find-files 
-     path 
-     ;; test: #t
-     action: (lambda (p res)
-               (let ((info (cond
-                            ((not (file-read-access? p)) '(cant-read))
-                            ((directory? p)              '(dir))
-                            ((symbolic-link? p)          (list 'symlink (read-symbolic-link p)))
-                            (else                        '(data)))))
-                 (if (eq? (car info) 'data)
-                     (let loop ((start-time (current-seconds)))
-                       (my-mutex-lock! mtx1)
-                       (let* ((num-threads (hash-table-size threads))
-                              (ok-to-run   (> *max-running* num-threads)))
-                         ;; (if (> (abs (- num-threads last-num)) 2)
-                         ;;     (begin
-                         ;;       ;; (print "num-threads:" num-threads)
-                         ;;       (set! last-num num-threads)))
-                         (my-mutex-unlock! mtx1)
-                         (if ok-to-run
-                             (let ((run-time-start (current-seconds)))
-                               ;; (print "num threads: " num-threads)
-                               (let ((th1  (make-thread
-                                            (lambda ()
-                                              (let ((cksum (checksum mtx1 p cmd: "md5sum"))
-                                                    (run-time (- (current-seconds) run-time-start)))
-                                                (my-mutex-lock! mtx1)
-                                                (client-send-receive req (conc p " " cksum))
-                                                (my-mutex-unlock! mtx1))
-                                              (let loop2 ()
-                                                (my-mutex-lock! mtx1)
-                                                (let ((registered (hash-table-exists? threads p)))
-                                                  (if registered
-                                                      (begin
-                                                        ;; (print "deleting thread reference for " p)
-                                                        (hash-table-delete! threads p))) ;; delete myself
-                                                  (my-mutex-unlock! mtx1)
-                                                  (if (not registered)
-                                                      (begin
-                                                        (thread-sleep! 0.5)
-                                                        (loop2))))))
-                                            p)))
-                                 (thread-start! th1)
-                                 ;; (thread-sleep! 0.05) ;; give things a little time to get going
-                                 ;; (thread-join! th1) ;; 
-                                 (my-mutex-lock! mtx1)
-                                 (hash-table-set! threads p th1)
-                                 (my-mutex-unlock! mtx1)
-                                 )) ;; thread is launched
-                             (let ((run-time (- (current-seconds) start-time))) ;; couldn't launch yet
-                               (cond
-                                ((< run-time 5)) ;; blast on through
-                                ((< run-time 30)(thread-sleep! 0.1))
-                                ((< run-time 60)(thread-sleep! 2))
-                                ((< run-time 120)(thread-sleep! 3))
-                                (else (thread-sleep! 3)))
-                               (loop start-time)))))))))
-    (map thread-join! (hash-table-values threads))
-    (client-send-receive req "quit")
-    (nn-close req)
-    (exit)))
-
-;; recieve and store the file data, note: this is effectively a *server*, not a client.
-;;
-(define (compare-directories path1 path2)
-  (let ((p1dat       (make-hash-table))
-        (p2dat       (make-hash-table))
-        (numdone     0) ;; increment when recieved a quit. exit when > 2
-        (rep         (nn-socket 'rep))
-        (p1len       (string-length path1))
-        (p2len       (string-length path2))
-        (both-seen   (make-hash-table)))
-    (nn-bind    rep  
-                ;; "tcp://*:5559")
-                "ipc:///tmp/test-ipc")
-    ;; start clients
-    (thread-sleep! 0.1)
-    (system (conc "./remotediff-nmsg " path1 " &"))
-    (system (conc "./remotediff-nmsg " path2 " &"))
-    (let loop ((msg-in (nn-recv rep))
-               (last-print 0))
-      (if (equal? msg-in "quit")
-          (set! numdone (+ numdone 1)))
-      (if (and (not (equal? msg-in "quit"))
-               (< numdone 2))
-          (let* ((parts (string-split msg-in))
-                 (filen (car parts))
-                 (finfo (cadr parts))
-                 (isp1  (substring-index path1 filen 0)) ;; is this a path1?
-                 (isp2  (substring-index path2 filen 0)) ;; is this a path2?
-                 (tpth  (substring filen (if isp1 p1len p2len) (string-length filen))))
-            (hash-table-set! (if isp1 p1dat p2dat)
-                             tpth
-                             finfo)
-            (if (and (hash-table-exists? p1dat tpth)
-                     (hash-table-exists? p2dat tpth))
-                (begin
-                  (if (not (equal? (hash-table-ref p1dat tpth)
-                                   (hash-table-ref p2dat tpth)))
-                      (print "DIFF: " tpth))
-                  (hash-table-set! both-seen tpth finfo)))
-            (nn-send rep "done")
-            (loop (nn-recv rep)
-                  (if (> (- (current-seconds) last-print) 15)
-                      (begin
-                        (print "Processed " (hash-table-size p1dat) ", " (hash-table-size p2dat))
-                        (current-seconds))
-                      last-print)))))
-    (print "p1: " (hash-table-size p1dat) " p2: " (hash-table-size p2dat))
-    (hash-table-for-each
-     p1dat
-     (lambda (k v)
-       (if (not (hash-table-exists? p2dat k))
-           (print "REMOVED: " k))))
-    (hash-table-for-each
-     p2dat
-     (lambda (k v)
-       (if (not (hash-table-exists? p1dat k))
-           (print "ADDED: " k))))
-    (list p1dat p2dat)))
-
-(if (< (length (argv)) 2)
-    (begin
-      (print "Usage: remotediff-nmsg file1 file2")
-      (exit)))
-
-(if (eq? (length (argv)) 2) ;; given a single path
-    (gather-dir-info (cadr (argv)))
-    (compare-directories (cadr (argv))(caddr (argv))))
-
-(print "Done")

Index: rmt.scm
==================================================================
--- rmt.scm
+++ rmt.scm
@@ -1,23 +1,30 @@
 ;;======================================================================
 ;; Copyright 2006-2017, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 ;;======================================================================
 
 (use format typed-records) ;; RADT => purpose of json format??
 
 (declare (unit rmt))
 (declare (uses api))
-(declare (uses tdb))
 (declare (uses http-transport))
-;;(declare (uses nmsg-transport))
 (include "common_records.scm")
 
 ;;
 ;; THESE ARE ALL CALLED ON THE CLIENT SIDE!!!
 ;;
@@ -48,13 +55,19 @@
 
 ;; RA => e.g. usage (rmt:send-receive 'get-var #f (list varname))
 ;;
 (define (rmt:send-receive cmd rid params #!key (attemptnum 1)(area-dat #f)) ;; start attemptnum at 1 so the modulo below works as expected
 
+  ;;DOT digraph megatest_state_status {
+  ;;DOT   ranksep=0;
+  ;;DOT   // rankdir=LR;
+  ;;DOT   node [shape="box"];
+  ;;DOT "rmt:send-receive" -> MUTEXLOCK;
+  ;;DOT { edge [style=invis];"case 1" -> "case 2" -> "case 3" -> "case 4" -> "case 5" -> "case 6" -> "case 7" -> "case 8" -> "case 9" -> "case 10" -> "case 11"; }
   ;; do all the prep locked under the rmt-mutex
   (mutex-lock! *rmt-mutex*)
-
+  
   ;; 1. check if server is started IFF cmd is a write OR if we are not on the homehost, store in runremote
   ;; 2. check the age of the connections. refresh the connection if it is older than timeout-20 seconds.
   ;; 3. do the query, if on homehost use local access
   ;;
   (let* ((start-time    (current-seconds)) ;; snapshot time so all use cases get same value
@@ -71,119 +84,167 @@
 				    (remote-ro-mode-set! runremote ro-mode)
 				    (remote-ro-mode-checked-set! runremote #t)
 				    ro-mode)
 				  ro-mode)))))
 
-     ;; ensure we have a record for our connection for given area
-     (if (not runremote)                   ;; can remove this one. should never get here.         
-	 (begin
-	   (set! *runremote* (make-remote))
-	   (set! runremote   *runremote*))) ;; new runremote will come from this on next iteration
-     ;; ensure we have a homehost record
-     (if (not (pair? (remote-hh-dat runremote)))  ;; not on homehost
-	 (thread-sleep! 0.1) ;; since we shouldn't get here, delay a little
-	 (remote-hh-dat-set! runremote (common:get-homehost)))
-
-     ;;(print "BB> readonly-mode is "readonly-mode" dbfile is "dbfile)
+    ;; DOT INIT_RUNREMOTE; // leaving off - doesn't really add to the clarity
+    ;; DOT MUTEXLOCK -> INIT_RUNREMOTE [label="no remote?"];
+    ;; DOT INIT_RUNREMOTE -> MUTEXLOCK;
+    ;; ensure we have a record for our connection for given area
+    (if (not runremote)                   ;; can remove this one. should never get here.         
+	(begin
+	  (set! *runremote* (make-remote))
+	  (set! runremote   *runremote*))) ;; new runremote will come from this on next iteration
+    
+    ;; DOT SET_HOMEHOST; // leaving off - doesn't really add to the clarity
+    ;; DOT MUTEXLOCK -> SET_HOMEHOST [label="no homehost?"];
+    ;; DOT SET_HOMEHOST -> MUTEXLOCK;
+    ;; ensure we have a homehost record
+    (if (not (pair? (remote-hh-dat runremote)))  ;; not on homehost
+	(thread-sleep! 0.1) ;; since we shouldn't get here, delay a little
+	(remote-hh-dat-set! runremote (common:get-homehost)))
+    
+    ;;(print "BB> readonly-mode is "readonly-mode" dbfile is "dbfile)
     (cond
+     ;;DOT EXIT;
+     ;;DOT MUTEXLOCK -> EXIT [label="> 15 attempts"]; {rank=same "case 1" "EXIT" }
      ;; give up if more than 15 attempts
      ((> attemptnum 15)
       (debug:print 0 *default-log-port* "ERROR: 15 tries to start/connect to server. Giving up.")
       (exit 1))
 
-     ;; readonly mode, read request-  handle it - case 20
+     ;;DOT CASE2 [label="local\nreadonly\nquery"];
+     ;;DOT MUTEXLOCK -> CASE2; {rank=same "case 2" CASE2}
+     ;;DOT CASE2 -> "rmt:open-qry-close-locally";
+     ;; readonly mode, read request-  handle it - case 2
      ((and readonly-mode
            (member cmd api:read-only-queries)) 
       (mutex-unlock! *rmt-mutex*)
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case 20")
+      (debug:print-info 12 *default-log-port* "rmt:send-receive, case 2")
       (rmt:open-qry-close-locally cmd 0 params)
       )
 
+     ;;DOT CASE3 [label="write in\nread-only mode"];
+     ;;DOT MUTEXLOCK -> CASE3 [label="readonly\nmode?"]; {rank=same "case 3" CASE3}
+     ;;DOT CASE3 -> "#f";
      ;; readonly mode, write request.  Do nothing, return #f
      (readonly-mode
       (mutex-unlock! *rmt-mutex*)
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case 21")
+      (debug:print-info 12 *default-log-port* "rmt:send-receive, case 3")
       (debug:print 0 *default-log-port* "WARNING: write transaction requested on a readonly area.  cmd="cmd" params="params)
-      #f
-      )
+      #f)
 
+     ;; This block was for pre-emptively resetting the connection if there had been no communication for some time.
+     ;; I don't think it adds any value. If the server is not there, just fail and start a new connection.
+     ;; also, the expire-time calculation might not be correct. We want, time-since-last-server-access > (server:get-timeout)
+     ;;
+     ;;DOT CASE4 [label="reset\nconnection"];
+     ;;DOT MUTEXLOCK -> CASE4 [label="have connection,\nlast_access > expire_time"]; {rank=same "case 4" CASE4}
+     ;;DOT CASE4 -> "rmt:send-receive";
      ;; reset the connection if it has been unused too long
      ((and runremote
            (remote-conndat runremote)
-	   (let ((expire-time (+ (- start-time (remote-server-timeout runremote))(random 10)))) ;; Subtract or add the random value? Seems like it should be substract but Neither fixes the "WARNING: failure in with-input-from-request to #.\n message: Server closed connection before sending response"
-	     (< (http-transport:server-dat-get-last-access (remote-conndat runremote)) expire-time)))
+	   (> (current-seconds) ;; if it has been more than server-timeout seconds since last contact, close this connection and start a new on
+	      (+ (http-transport:server-dat-get-last-access (remote-conndat runremote))
+		 (remote-server-timeout runremote))))
       (debug:print-info 0 *default-log-port* "Connection to " (remote-server-url runremote) " expired due to no accesses, forcing new connection.")
+      (http-transport:close-connections area-dat: runremote)
       (remote-conndat-set! runremote #f) ;; invalidate the connection, thus forcing a new connection.
       (mutex-unlock! *rmt-mutex*)
       (rmt:send-receive cmd rid params attemptnum: attemptnum))
+     
+     ;;DOT CASE5 [label="local\nread"];
+     ;;DOT MUTEXLOCK -> CASE5 [label="server not required,\non homehost,\nread-only query"]; {rank=same "case 5" CASE5};
+     ;;DOT CASE5 -> "rmt:open-qry-close-locally";
+
      ;; on homehost and this is a read
-     ((and (not (remote-force-server runremote))      ;; honor forced use of server
-	   (cdr (remote-hh-dat runremote))     ;; on homehost
-           (member cmd api:read-only-queries)) ;; this is a read
+     ((and (not (remote-force-server runremote)) ;; honor forced use of server, i.e. server NOT required
+	   (cdr (remote-hh-dat runremote))       ;; on homehost
+           (member cmd api:read-only-queries))   ;; this is a read
       (mutex-unlock! *rmt-mutex*)
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  3")
+      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  5")
       (rmt:open-qry-close-locally cmd 0 params))
 
+     ;;DOT CASE6 [label="init\nremote"];
+     ;;DOT MUTEXLOCK -> CASE6 [label="on homehost,\nwrite query,\nhave server,\ncan't reach it"]; {rank=same "case 6" CASE6};
+     ;;DOT CASE6 -> "rmt:send-receive";
      ;; on homehost and this is a write, we already have a server, but server has died
      ((and (cdr (remote-hh-dat runremote))           ;; on homehost
            (not (member cmd api:read-only-queries))  ;; this is a write
            (remote-server-url runremote)             ;; have a server
            (not (server:ping (remote-server-url runremote))))  ;; server has died. NOTE: this is not a cheap call! Need better approach.
       (set! *runremote* (make-remote))
+      (remote-force-server-set! runremote (common:force-server?))
       (mutex-unlock! *rmt-mutex*)
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  4.1")
+      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  6")
       (rmt:send-receive cmd rid params attemptnum: attemptnum))
 
+     ;;DOT CASE7 [label="homehost\nwrite"];
+     ;;DOT MUTEXLOCK -> CASE7 [label="server not required,\non homehost,\na write,\nhave a server"]; {rank=same "case 7" CASE7};
+     ;;DOT CASE7 -> "rmt:open-qry-close-locally";
      ;; on homehost and this is a write, we already have a server
-     ((and (not (remote-force-server runremote))     ;; honor forced use of server
+     ((and (not (remote-force-server runremote))     ;; honor forced use of server, i.e. server NOT required
 	   (cdr (remote-hh-dat runremote))           ;; on homehost
            (not (member cmd api:read-only-queries))  ;; this is a write
            (remote-server-url runremote))            ;; have a server
       (mutex-unlock! *rmt-mutex*)
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  4")
+      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  4.1")
       (rmt:open-qry-close-locally cmd 0 params))
 
+     ;;DOT CASE8 [label="force\nserver"];
+     ;;DOT MUTEXLOCK -> CASE8 [label="server not required,\nhave homehost info,\nno connection yet,\nnot a read-only query"]; {rank=same "case 8" CASE8};
+     ;;DOT CASE8 -> "rmt:open-qry-close-locally";
      ;;  on homehost, no server contact made and this is a write, passively start a server 
-     ((and (not (remote-force-server runremote)) ;; honor forced use of server
-	   (cdr (remote-hh-dat runremote))       ;; new
-           (not (remote-server-url runremote))
-	   (not (member cmd api:read-only-queries)))
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  5")
+     ((and (not (remote-force-server runremote))     ;; honor forced use of server, i.e. server NOT required
+	   (cdr (remote-hh-dat runremote))           ;; have homehost
+           (not (remote-server-url runremote))       ;; no connection yet
+	   (not (member cmd api:read-only-queries))) ;; not a read-only query
+      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  8")
       (let ((server-url  (server:check-if-running *toppath*))) ;; (server:read-dotserver->url *toppath*))) ;; (server:check-if-running *toppath*))) ;; Do NOT want to run server:check-if-running - very expensive to do for every write call
 	(if server-url
 	    (remote-server-url-set! runremote server-url) ;; the string can be consumed by the client setup if needed
 	    (if (common:force-server?)
 		(server:start-and-wait *toppath*)
 		(server:kind-run *toppath*))))
       (remote-force-server-set! runremote (common:force-server?))
       (mutex-unlock! *rmt-mutex*)
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  5.1")
+      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  8.1")
       (rmt:open-qry-close-locally cmd 0 params))
 
+     ;;DOT CASE9 [label="force server\nnot on homehost"];
+     ;;DOT MUTEXLOCK -> CASE9 [label="no connection\nand either require server\nor not on homehost"]; {rank=same "case 9" CASE9};
+     ;;DOT CASE9 -> "start\nserver" -> "rmt:send-receive";
      ((or (and (remote-force-server runremote)              ;; we are forcing a server and don't yet have a connection to one
 	       (not (remote-conndat runremote)))
 	  (and (not (cdr (remote-hh-dat runremote)))        ;; not on a homehost 
 	       (not (remote-conndat runremote))))           ;; and no connection
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  6  hh-dat: " (remote-hh-dat runremote) " conndat: " (remote-conndat runremote))
+      (debug:print-info 12 *default-log-port* "rmt:send-receive, case 9, hh-dat: " (remote-hh-dat runremote) " conndat: " (remote-conndat runremote))
       (mutex-unlock! *rmt-mutex*)
       (if (not (server:check-if-running *toppath*)) ;; who knows, maybe one has started up?
 	  (server:start-and-wait *toppath*))
-      (remote-force-server-set! runremote (common:force-server?))
       (remote-conndat-set! runremote (rmt:get-connection-info *toppath*)) ;; calls client:setup which calls client:setup-http
       (rmt:send-receive cmd rid params attemptnum: attemptnum)) ;; TODO: add back-off timeout as
+
+     ;;DOT CASE10 [label="on homehost"];
+     ;;DOT MUTEXLOCK -> CASE10 [label="server not required,\non homehost"]; {rank=same "case 10" CASE10};
+     ;;DOT CASE10 -> "rmt:open-qry-close-locally";
      ;; all set up if get this far, dispatch the query
      ((and (not (remote-force-server runremote))
 	   (cdr (remote-hh-dat runremote))) ;; we are on homehost
       (mutex-unlock! *rmt-mutex*)
-      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  7")
+      (debug:print-info 12 *default-log-port* "rmt:send-receive, case 10")
       (rmt:open-qry-close-locally cmd (if rid rid 0) params))
 
+     ;;DOT CASE11 [label="send_receive"];
+     ;;DOT MUTEXLOCK -> CASE11 [label="else"]; {rank=same "case 11" CASE11};
+     ;;DOT CASE11 -> "rmt:send-receive" [label="call failed"];
+     ;;DOT CASE11 -> "RESULT" [label="call succeeded"];
      ;; not on homehost, do server query
      (else
-      (mutex-unlock! *rmt-mutex*)
+      ;; (mutex-unlock! *rmt-mutex*)
       (debug:print-info 12 *default-log-port* "rmt:send-receive, case  9")
-      (mutex-lock! *rmt-mutex*)
+      ;; (mutex-lock! *rmt-mutex*)
       (let* ((conninfo (remote-conndat runremote))
 	     (dat      (case (remote-transport runremote)
 			 ((http) (condition-case ;; handling here has caused a lot of problems. However it is needed to deal with attemtped communication to servers that have gone away
                                   (http-transport:client-api-send-receive 0 conninfo cmd params)
                                   ((commfail)(vector #f "communications fail"))
@@ -191,35 +252,49 @@
 			 (else
 			  (debug:print 0 *default-log-port* "ERROR: transport " (remote-transport runremote) " not supported")
 			  (exit))))
 	     (success  (if (vector? dat) (vector-ref dat 0) #f))
 	     (res      (if (vector? dat) (vector-ref dat 1) #f)))
-	(if (vector? conninfo)(http-transport:server-dat-update-last-access conninfo)) ;; refresh access time
+	(if (and (vector? conninfo) (< 5 (vector-length conninfo)))
+            (http-transport:server-dat-update-last-access conninfo) ;; refresh access time
+	    (begin
+              (debug:print 0 *default-log-port* "INFO: Should not get here! conninfo=" conninfo)
+              (set! conninfo #f)
+              (remote-conndat-set! *runremote* #f)
+              (http-transport:close-connections  area-dat: runremote)))
 	;; (mutex-unlock! *rmt-mutex*)
         (debug:print-info 13 *default-log-port* "rmt:send-receive, case  9. conninfo=" conninfo " dat=" dat " runremote = " runremote)
 	(mutex-unlock! *rmt-mutex*)
 	(if success ;; success only tells us that the transport was successful, have to examine the data to see if there was a detected issue at the other end
 	    (if (and (vector? res)
 		     (eq? (vector-length res) 2)
 		     (eq? (vector-ref res 1) 'overloaded)) ;; since we are looking at the data to carry the error we'll use a fairly obtuse combo to minimise the chances of some sort of collision.
+                ;; this is the case where the returned data is bad or the server is overloaded and we want
+                ;; to ease off the queries
 		(let ((wait-delay (+ attemptnum (* attemptnum 10))))
 		  (debug:print 0 *default-log-port* "WARNING: server is overloaded. Delaying " wait-delay " seconds and trying call again.")
 		  (mutex-lock! *rmt-mutex*)
+		  (http-transport:close-connections area-dat: runremote)
 		  (set! *runremote* #f) ;; force starting over
 		  (mutex-unlock! *rmt-mutex*)
 		  (thread-sleep! wait-delay)
 		  (rmt:send-receive cmd rid params attemptnum: (+ attemptnum 1)))
 		res) ;; All good, return res
 	    (begin
 	      (debug:print 0 *default-log-port* "WARNING: communication failed. Trying again, try num: " attemptnum)
-	      (remote-conndat-set!    runremote #f)
+	      (mutex-lock! *rmt-mutex*)
+              (remote-conndat-set!    runremote #f)
+	      (http-transport:close-connections area-dat: runremote)
 	      (remote-server-url-set! runremote #f)
-	      (debug:print-info 12 *default-log-port* "rmt:send-receive, case  9.1")
-	      (if (not (server:check-if-running *toppath*))
-		  (server:start-and-wait *toppath*))
+	      (mutex-unlock! *rmt-mutex*)
+              (debug:print-info 12 *default-log-port* "rmt:send-receive, case  9.1")
+	      ;; (if (not (server:check-if-running *toppath*))
+	      ;; 	  (server:start-and-wait *toppath*))
 	      (rmt:send-receive cmd rid params attemptnum: (+ attemptnum 1)))))))))
 
+    ;;DOT }
+    
 ;; (define (rmt:update-db-stats run-id rawcmd params duration)
 ;;   (mutex-lock! *db-stats-mutex*)
 ;;   (handle-exceptions
 ;;    exn
 ;;    (begin
@@ -275,11 +350,11 @@
     res))
 
 (define (rmt:open-qry-close-locally cmd run-id params #!key (remretries 5))
   (let* ((qry-is-write   (not (member cmd api:read-only-queries)))
 	 (db-file-path   (db:dbfile-path)) ;;  0))
-	 (dbstruct-local (db:setup))  ;; make-dbr:dbstruct path:  dbdir local: #t)))
+	 (dbstruct-local (db:setup #t))  ;; make-dbr:dbstruct path:  dbdir local: #t)))
 	 (read-only      (not (file-write-access? db-file-path)))
 	 (start          (current-milliseconds))
 	 (resdat         (if (not (and read-only qry-is-write))
 			     (let ((v (api:execute-requests dbstruct-local (vector (symbol->string cmd) params))))
 			       (handle-exceptions ;; there has been a long history of receiving strange errors from values returned by the client when things go wrong..
@@ -390,10 +465,13 @@
 
 ;; NOT COMPLETED
 (define (rmt:runtests user run-id testpatt params)
   (rmt:send-receive 'runtests run-id testpatt))
 
+(define (rmt:get-run-record-ids  target run keynames test-patt)
+  (rmt:send-receive 'get-run-record-ids #f (list target run keynames test-patt)))
+
 (define (rmt:get-changed-record-ids since-time)
   (rmt:send-receive 'get-changed-record-ids #f (list since-time)) )
 
 ;;======================================================================
 ;;  T E S T   M E T A 
@@ -434,10 +512,14 @@
 (define (rmt:get-targets)
   (rmt:send-receive 'get-targets #f '()))
 
 (define (rmt:get-target run-id)
   (rmt:send-receive 'get-target run-id (list run-id)))
+
+(define (rmt:get-run-times runpatt targetpatt)
+  (rmt:send-receive 'get-run-times #f (list runpatt targetpatt ))) 
+
 
 ;;======================================================================
 ;;  T E S T S
 ;;======================================================================
 
@@ -474,21 +556,24 @@
 
 (define (rmt:set-tests-state-status run-id                      testnames currstate currstatus newstate newstatus)
   (rmt:send-receive 'set-tests-state-status run-id (list run-id testnames currstate currstatus newstate newstatus)))
 
 (define (rmt:get-tests-for-run run-id testpatt states statuses offset limit not-in sort-by sort-order qryvals last-update mode)
-  (if (number? run-id)
-      (rmt:send-receive 'get-tests-for-run run-id (list run-id testpatt states statuses offset limit not-in sort-by sort-order qryvals last-update mode))
-      (begin
-	(debug:print-error 0 *default-log-port* "rmt:get-tests-for-run called with bad run-id=" run-id)
-	(print-call-chain (current-error-port))
-	'())))
+  ;; (if (number? run-id)
+  (rmt:send-receive 'get-tests-for-run run-id (list run-id testpatt states statuses offset limit not-in sort-by sort-order qryvals last-update mode)))
+  ;;    (begin
+  ;;	(debug:print-error 0 *default-log-port* "rmt:get-tests-for-run called with bad run-id=" run-id)
+  ;;	(print-call-chain (current-error-port))
+  ;;	'())))
 
 ;; get stuff via synchash 
 (define (rmt:synchash-get run-id proc synckey keynum params)
   (rmt:send-receive 'synchash-get run-id (list run-id proc synckey keynum params)))
 
+(define (rmt:get-tests-for-run-mindata run-id testpatt states status not-in)
+  (rmt:send-receive 'get-tests-for-run-mindata run-id (list run-id testpatt states status not-in)))
+  
 ;; IDEA: Threadify these - they spend a lot of time waiting ...
 ;;
 (define (rmt:get-tests-for-runs-mindata run-ids testpatt states status not-in)
   (let ((multi-run-mutex (make-mutex))
 	(run-id-list (if run-ids
@@ -612,10 +697,13 @@
   (rmt:send-receive 'top-test-set-per-pf-counts run-id (list run-id test-name)))
 
 (define (rmt:get-raw-run-stats run-id)
   (rmt:send-receive 'get-raw-run-stats run-id (list run-id)))
 
+(define (rmt:get-test-times runname target)
+  (rmt:send-receive 'get-test-times #f (list runname target ))) 
+
 ;;======================================================================
 ;;  R U N S
 ;;======================================================================
 
 (define (rmt:get-run-info run-id)
@@ -622,10 +710,13 @@
   (rmt:send-receive 'get-run-info run-id (list run-id)))
 
 (define (rmt:get-num-runs runpatt)
   (rmt:send-receive 'get-num-runs #f (list runpatt)))
 
+(define (rmt:get-runs-cnt-by-patt runpatt targetpatt keys)
+  (rmt:send-receive 'get-runs-cnt-by-patt #f (list runpatt  targetpatt keys)))
+
 ;; Use the special run-id == #f scenario here since there is no run yet
 (define (rmt:register-run keyvals runname state status user contour)
   (rmt:send-receive 'register-run #f (list keyvals runname state status user contour)))
     
 (define (rmt:get-run-name-from-id run-id)
@@ -641,10 +732,13 @@
   (rmt:send-receive 'delete-old-deleted-test-records #f '()))
 
 (define (rmt:get-runs runpatt count offset keypatts)
   (rmt:send-receive 'get-runs #f (list runpatt count offset keypatts)))
 
+(define (rmt:simple-get-runs runpatt count offset target)
+  (rmt:send-receive 'simple-get-runs #f (list runpatt count offset target)))
+
 (define (rmt:get-all-run-ids)
   (rmt:send-receive 'get-all-run-ids #f '()))
 
 (define (rmt:get-prev-run-ids run-id)
   (rmt:send-receive 'get-prev-run-ids #f (list run-id)))
@@ -660,12 +754,12 @@
   (rmt:send-receive 'set-run-status #f (list run-id run-status msg)))
 
 (define (rmt:update-run-event_time run-id)
   (rmt:send-receive 'update-run-event_time #f (list run-id)))
 
-(define (rmt:get-runs-by-patt  keys runnamepatt targpatt offset limit fields last-runs-update) ;; fields of #f uses default
-  (rmt:send-receive 'get-runs-by-patt #f (list keys runnamepatt targpatt offset limit fields last-runs-update)))
+(define (rmt:get-runs-by-patt  keys runnamepatt targpatt offset limit fields last-runs-update  #!key  (sort-order "asc")) ;; fields of #f uses default
+  (rmt:send-receive 'get-runs-by-patt #f (list keys runnamepatt targpatt offset limit fields last-runs-update sort-order)))
 
 (define (rmt:find-and-mark-incomplete run-id ovr-deadtime)
   ;; (if (rmt:send-receive 'have-incompletes? run-id (list run-id ovr-deadtime))
   (rmt:send-receive 'mark-incomplete run-id (list run-id ovr-deadtime))) ;; )
 
@@ -749,20 +843,24 @@
     (rmt:send-receive 'teststep-set-status! run-id (list run-id test-id teststep-name state-in status-in comment logfile))))
 
 (define (rmt:get-steps-for-test run-id test-id)
   (rmt:send-receive 'get-steps-for-test run-id (list run-id test-id)))
 
+(define (rmt:get-steps-info-by-id test-step-id)
+  (rmt:send-receive 'get-steps-info-by-id #f (list test-step-id)))
+
 ;;======================================================================
 ;;  T E S T   D A T A 
 ;;======================================================================
 
 (define (rmt:read-test-data run-id test-id categorypatt #!key (work-area #f)) 
   (rmt:send-receive 'read-test-data run-id (list run-id test-id categorypatt)))
-;;   (let ((tdb  (rmt:open-test-db-by-test-id run-id test-id work-area: work-area)))
-;;     (if tdb
-;; 	(tdb:read-test-data tdb test-id categorypatt)
-;; 	'())))
+(define (rmt:read-test-data* run-id test-id categorypatt varpatt #!key (work-area #f)) 
+  (rmt:send-receive 'read-test-data* run-id (list run-id test-id categorypatt varpatt)))
+
+(define (rmt:get-data-info-by-id test-data-id)
+   (rmt:send-receive 'get-data-info-by-id #f (list test-data-id)))
 
 (define (rmt:testmeta-add-record testname)
   (rmt:send-receive 'testmeta-add-record #f (list testname)))
 
 (define (rmt:testmeta-get-record testname)
@@ -790,10 +888,26 @@
 (define (rmt:tasks-set-state-given-param-key param-key new-state)
   (rmt:send-receive 'tasks-set-state-given-param-key #f (list  param-key new-state)))
 
 (define (rmt:tasks-get-last target runname)
   (rmt:send-receive 'tasks-get-last #f (list target runname)))
+
+;;======================================================================
+;; N O   S Y N C   D B 
+;;======================================================================
+
+(define (rmt:no-sync-set var val)
+  (rmt:send-receive 'no-sync-set #f `(,var ,val)))
+
+(define (rmt:no-sync-get/default var default)
+  (rmt:send-receive 'no-sync-get/default #f `(,var ,default)))
+
+(define (rmt:no-sync-del! var)
+  (rmt:send-receive 'no-sync-del! #f `(,var)))
+
+(define (rmt:no-sync-get-lock keyname)
+  (rmt:send-receive 'no-sync-get-lock #f `(,keyname)))
 
 ;;======================================================================
 ;; A R C H I V E S
 ;;======================================================================
 

Index: rmtdb.scm
==================================================================
--- rmtdb.scm
+++ rmtdb.scm
@@ -1,11 +1,20 @@
 ;;======================================================================
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;;======================================================================
 

Index: rpc-transport.scm
==================================================================
--- rpc-transport.scm
+++ rpc-transport.scm
@@ -1,14 +1,23 @@
 
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 (require-extension (srfi 18) extras tcp s11n rpc)
 (import (prefix rpc rpc:))
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest)

DELETED rpctest/rpctest-continuous-client.scm
Index: rpctest/rpctest-continuous-client.scm
==================================================================
--- rpctest/rpctest-continuous-client.scm
+++ /dev/null
@@ -1,138 +0,0 @@
-;;;; rpc-demo.scm
-;;;; Simple database server / client
-
-;;; start server thusly: ./rpctest server test.db
-;;; you will need to init test.db:
-;;; sqlite3 test.db "CREATE TABLE foo (id INTEGER PRIMARY KEY, var TEXT, val TEXT);"
-
-(require-extension (srfi 18) extras tcp rpc sql-de-lite)
-
-;;; Common things
-
-(define total-queries 0)
-(define start-time (current-seconds))
-
-(define operation (string->symbol (car (command-line-arguments))))
-(define param (cadr (command-line-arguments)))
-(print "Operation: " operation ", param: " param)
-
-;; have a pool of db's to pick from
-(define *dbpool* '())
-(define *pool-mutex* (make-mutex))
-1
-(define (get-db)
-  (mutex-lock! *pool-mutex*)
-  (if (null? *dbpool*)
-      (begin
-	(mutex-unlock! *pool-mutex*)
-	(let ((db (open-database param)))
-	  (set-busy-handler! db (busy-timeout 10000))
-	  (exec (sql db "PRAGMA synchronous=0;"))
-	  db))
-      (let ((res (car *dbpool*)))
-	(set! *dbpool* (cdr *dbpool*))
-	(mutex-unlock! *pool-mutex*)
-	res)))
-
-(define (return-db db)
-  (mutex-lock! *pool-mutex*)
-  (set! *dbpool* (cons db *dbpool* ))
-  (let ((res (length *dbpool*)))
-    (mutex-unlock! *pool-mutex*)
-    res))
-
-(define rpc:listener
-  (if (eq? operation 'server)
-      (tcp-listen (rpc:default-server-port))
-      (tcp-listen 0)))
-
-;; Start server thread
-(define rpc:server
-  (make-thread
-   (cute (rpc:make-server rpc:listener) "rpc:server") ;; NOTE: see equivalent code below
-   'rpc:server))
-
-;; This is what the code would look like without cute
-;; (define rpc:server
-;;   (make-thread
-;;    (lambda ()
-;;      ((rpc:make-server rpc:listener) "rpc:server"))
-;;    'rpc:server))
-
-(thread-start! rpc:server)
-
-;;; Server side
-
-(define (server)
-  (rpc:publish-procedure!
-   'change-response-port
-   (lambda (port)
-     (rpc:default-server-port port))
-   #f)
-  ;;(let ((db  (get-db))(open-database param)))
-  ;; (set-finalizer! db finalize!)
-  (rpc:publish-procedure!
-   'query
-   (lambda (sqlstmt callback)
-     (set! total-queries (+ total-queries 1))
-     (print "Executing query '" sqlstmt "' ...")
-     (let ((db (get-db)))
-       (query (for-each-row
-	       callback)
-	      (sql db sqlstmt))
-       (print "Query rate: " (/ total-queries (/ (- (current-seconds) start-time) 60)) " per minute")
-       (print "num dbs: " (return-db db))
-       )))
-  (thread-join! rpc:server))
-
-;;; Client side
-
-(define (callback1 . columns)
-  (let loop ((c columns) (i 0))
-    (unless (null? c)
-      (printf "~a=~s " i (car c))
-      (loop (cdr c) (+ i 1))))
-  (newline))
-
-(define callback2-results '())
-
-(define (callback2 . columns)
-  (set! callback2-results (cons columns callback2-results)))
-
-(define (client param)
-  ((rpc:procedure 'change-response-port "localhost")
-   (tcp-listener-port rpc:listener))
-  ((rpc:procedure 'query "localhost") param callback1)
-  (rpc:publish-procedure! 'callback2 callback2)
-  ((rpc:procedure 'query "localhost") param callback2)
-  (pp callback2-results)
-  (rpc:close-all-connections!)
-  ;; (rpc:close-connection! "localhost" (rpc:default-server-port))
-  )
-
-(define (run-query param)
-  ((rpc:procedure 'query "localhost") param callback1)
-  ((rpc:procedure 'query "localhost") param callback2)
-  callback2-results)
-
-(define (continuous-client #!key (duration 600)) ;; default - run for 10 minutes
-  ((rpc:procedure 'change-response-port "localhost")
-   (tcp-listener-port rpc:listener))
-  (rpc:publish-procedure! 'callback2 callback2)
-  (let loop ()
-    (if (< (- (current-seconds) start-time) duration)
-	(begin
-	  (run-query (conc "INSERT INTO foo (var,val) VALUES (" (random 1000) "," (random 1000) ");"))
-	  (let ((numrows (caaar (run-query "SELECT COUNT(id) FROM foo;"))))
-	    (if (and (number? numrows)
-		     (> numrows 300))
-		(print (run-query (conc "DELETE FROM foo WHERE var > " (random 1000) ";")))))
-	  (loop))))
-  (rpc:close-all-connections!))
-
-;;; Run it
-
-(if (eq? operation 'server)
-    (server)
-    (continuous-client))
-

DELETED rpctest/rpctest.scm
Index: rpctest/rpctest.scm
==================================================================
--- rpctest/rpctest.scm
+++ /dev/null
@@ -1,109 +0,0 @@
-;;;; rpc-demo.scm
-;;;; Simple database server / client
-
-;;; start server thusly: ./rpctest server test.db
-;;; you will need to init test.db:
-;;; sqlite3 test.db "CREATE TABLE foo (id INTEGER PRIMARY KEY, var TEXT, val TEXT);"
-
-(require-extension (srfi 18) extras tcp rpc sql-de-lite)
-
-;;; Common things
-
-(define total-queries 0)
-(define start-time (current-seconds))
-
-(define operation (string->symbol (car (command-line-arguments))))
-(define param (cadr (command-line-arguments)))
-(print "Operation: " operation ", param: " param)
-
-;; have a pool of db's to pick from
-(define *dbpool* '())
-(define *pool-mutex* (make-mutex))
-
-(define (get-db)
-  (mutex-lock! *pool-mutex*)
-  (if (null? *dbpool*)
-      (begin
-	(mutex-unlock! *pool-mutex*)
-	(let ((db (open-database param)))
-	  (set-busy-handler! db (busy-timeout 10000))
-	  (exec (sql db "PRAGMA synchronous=0;"))
-	  db))
-      (let ((res (car *dbpool*)))
-	(set! *dbpool* (cdr *dbpool*))
-	(mutex-unlock! *pool-mutex*)
-	res)))
-
-(define (return-db db)
-  (mutex-lock! *pool-mutex*)
-  (set! *dbpool* (cons db *dbpool* ))
-  (let ((res (length *dbpool*)))
-    (mutex-unlock! *pool-mutex*)
-    res))
-
-(define rpc:listener
-  (if (eq? operation 'server)
-      (tcp-listen (rpc:default-server-port))
-      (tcp-listen 0)))
-
-;; Start server thread
-(define rpc:server
-  (make-thread
-   (cute (rpc:make-server rpc:listener) "rpc:server")
-   'rpc:server))
-
-(thread-start! rpc:server)
-
-;;; Server side
-
-(define (server)
-  (rpc:publish-procedure!
-   'change-response-port
-   (lambda (port)
-     (rpc:default-server-port port))
-   #f)
-  ;;(let ((db  (get-db))(open-database param)))
-  ;; (set-finalizer! db finalize!)
-  (rpc:publish-procedure!
-   'query
-   (lambda (sqlstmt callback)
-     (set! total-queries (+ total-queries 1))
-     (print "Executing query '" sqlstmt "' ...")
-     (let ((db (get-db)))
-       (query (for-each-row
-	       callback)
-	      (sql db sqlstmt))
-       (print "Query rate: " (/ total-queries (/ (- (current-seconds) start-time) 60)) " per minute")
-       (print "num dbs: " (return-db db))
-       )))
-  (thread-join! rpc:server))
-
-;;; Client side
-
-(define (callback1 . columns)
-  (let loop ((c columns) (i 0))
-    (unless (null? c)
-      (printf "~a=~s " i (car c))
-      (loop (cdr c) (+ i 1))))
-  (newline))
-
-(define callback2-results '())
-
-(define (callback2 . columns)
-  (set! callback2-results (cons columns callback2-results)))
-
-(define (client)
-  ((rpc:procedure 'change-response-port "localhost")
-   (tcp-listener-port rpc:listener))
-  ((rpc:procedure 'query "localhost") param callback1)
-  (rpc:publish-procedure! 'callback2 callback2)
-  ((rpc:procedure 'query "localhost") param callback2)
-  (pp callback2-results)
-  (rpc:close-connection! "localhost" (rpc:default-server-port)))
-
-;;; Run it
-
-(if (eq? operation 'server)
-    (server)
-    (client))
-

DELETED rpctest/run-client.sh
Index: rpctest/run-client.sh
==================================================================
--- rpctest/run-client.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/bin/bash
-
-
-while ./rpctest client "insert into foo (var,val) values ($RANDOM,$RANDOM);";do
-    numrows=$(./rpctest client "select count(id) from foo;") # |wc -l)
-    deletefrom=$RANDOM
-    echo "numrows=$numrows, deletefrom=$deletefrom"
-    if [[ $numrows -gt 300 ]];then
-	echo "numrows=$numrows, deletefrom=$deletefrom"
-	./rpctest client "delete from foo where var > $deletefrom;"
-    fi
-done

Index: run-eff.sql
==================================================================
--- run-eff.sql
+++ run-eff.sql
@@ -1,5 +1,21 @@
+--  Copyright 2006-2017, Matthew Welland.
+-- 
+-- This file is part of Megatest.
+-- 
+--     Megatest is free software: you can redistribute it and/or modify
+--     it under the terms of the GNU General Public License as published by
+--     the Free Software Foundation, either version 3 of the License, or
+--     (at your option) any later version.
+-- 
+--     Megatest is distributed in the hope that it will be useful,
+--     but WITHOUT ANY WARRANTY; without even the implied warranty of
+--     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+--     GNU General Public License for more details.
+-- 
+--     You should have received a copy of the GNU General Public License
+--     along with Megatest.  If not, see .
 .mode col
 .head on
 select runs.runname,num_items,printf("%.2f",wall_runtime) AS runtime,printf("%.2f",max_duration) AS duration,ratio,testname from
    (select run_id,
           count(id) AS num_items,

DELETED run-tests-queue-new.scm
Index: run-tests-queue-new.scm
==================================================================
--- run-tests-queue-new.scm
+++ /dev/null

Index: run_records.scm
==================================================================
--- run_records.scm
+++ run_records.scm
@@ -1,14 +1,23 @@
 ;;======================================================================
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 ;;======================================================================
 
 (define-inline (runs:runrec-make-record) (make-vector 13))
 (define-inline (runs:runrec-get-target  vec)(vector-ref vec 0))  ;; a/b/c
 (define-inline (runs:runrec-get-runname vec)(vector-ref vec 1))  ;; string

Index: runconfig.scm
==================================================================
--- runconfig.scm
+++ runconfig.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;;======================================================================
 ;; read a config file, loading only the section pertinent
 ;; to this run field1val/field2val/field3val ...
 ;;======================================================================
 
@@ -73,11 +90,11 @@
   (let ((runconfigf (conc  *toppath* "/runconfigs.config"))
 	(targ       (or (common:args-get-target)
 			targ-from-db
 			(get-environment-variable "MT_TARGET"))))
     (pop-directory)
-    (if (file-exists? runconfigf)
+    (if (common:file-exists? runconfigf)
 	(setup-env-defaults runconfigf run-id #t keyvals
 			    environ-patt: (conc "(default"
 						(if targ
 						    (conc "|" targ ")")
 						    ")")))

Index: runconfigs.config
==================================================================
--- runconfigs.config
+++ runconfigs.config
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # To get emacs font highlighing in the various megatest configs do this:
 #
 # Install emacs-goodies-el:
 #    sudo apt install emacs-goodies-el
 # Add to your ~/.emacs file:
@@ -7,13 +24,13 @@
 #
 
 # example of a cron entry to run sync using db spec pgdb, with pgdb setting in file local.config
 #
 [a/b/c]
-all:scheduled:sync          cron=  0/5 * * * *;dbdest=pgdb;appendconf=/mfs/matt/.sysmaint/local.config
-quick:scheduled:sync        cron=  0/5 * * * *;dbdest=pgdb;appendconf=/mfs/matt/.sysmaint/local.config
-fast:scheduled:sync-prepend cron=  0/1 * * * *;dbdest=pgdb;appendconf=/mfs/matt/.sysmaint/local.config
+all:scheduled:sync     cron=  0/5 * * * *;dbdest=pgdb;appendconf=/nfs/phoebe/disk1/home/mfs/matt/.sysmaint/local.config
+# quick:scheduled:sync   cron=  0/5 * * * *;dbdest=pgdb;appendconf=/nfs/phoebe/disk1/home/mfs/matt/.sysmaint/local.config
+# fast:scheduled:sync-prepend cron=  0/1 * * * *;dbdest=pgdb;appendconf=/mfs/matt/.sysmaint/local.config
 
 [scriptinc ./gentargets.sh #{getenv USER}]
 # [v1.23/45/67]
 
 # tip will be replaced with hashkey?
@@ -25,24 +42,25 @@
 # [v1.63/tip/dev]
 # file:   files changes since last run trigger new run
 # script: script is called with unix seconds as last parameter (other parameters are preserved)
 #
 # contour:sensetype:action params            data
-quick:file:run             runtrans=auto;         glob=/home/matt/data/megatest/*.scm
-snazy:file:run             runtrans=corporate-ww; glob=/home/matt/data/megatest/*.scm
-short:file:run             runtrans=short;        glob=/home/matt/data/megatest/*.scm
+# commented out for debug
+quick:file:run             runtrans=auto;         glob=/home/matt/data/megatest/*.scm foo.touchme
+# snazy:file:run             runtrans=corporate-ww; glob=/home/matt/data/megatest/*.scm
+# short:file:run       runtrans=short;        glob=/home/matt/data/megatest/*.scm
 
 # script returns change-time (unix epoch), new-target-name, run-name
 #
 # quick:script:run           checkfossil = http://www.kiatoa.com/fossils/megatest v1.63;\
 #                            checkfossil = http://www.kiatoa.com/fossils/megatest_qa trunk
 
-# fossil based trigger
-#
-quick:fossil:run           http://www.kiatoa.com/fossils/megatest=v1.63;\
-                           http://www.kiatoa.com/fossils/megatest_qa=trunk;\
-		           http://www.kiatoa.com/fossils/megatest=v1.64
+# # fossil based trigger
+# #
+# quick:fossil:run           http://www.kiatoa.com/fossils/megatest=v1.63;\
+#                            http://www.kiatoa.com/fossils/megatest_qa=trunk;\
+# 		           http://www.kiatoa.com/fossils/megatest=v1.64
 
 # field          allowed values
 # -----          --------------
 # minute         0-59
 # hour           0-23

Index: runs-launch-loop-test.scm
==================================================================
--- runs-launch-loop-test.scm
+++ runs-launch-loop-test.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 (use srfi-69)
 
 (define (runs:queue-next-hed tal reg n regful)
   (if regful
       (car reg)

Index: runs.scm
==================================================================
--- runs.scm
+++ runs.scm
@@ -1,20 +1,27 @@
 
 ;; Copyright 2006-2016, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking (srfi 18) 
+(use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (srfi 18) 
      posix-extras directory-utils pathname-expand typed-records format)
-(import (prefix sqlite3 sqlite3:))
 
 (declare (unit runs))
 (declare (uses db))
 (declare (uses common))
 (declare (uses items))
@@ -21,11 +28,10 @@
 (declare (uses runconfig))
 (declare (uses tests))
 (declare (uses server))
 (declare (uses mt))
 (declare (uses archive))
-(declare (uses keys))
 ;; (declare (uses filedb))
 
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
@@ -48,10 +54,50 @@
 (defstruct runs:testdat
   hed tal reg reruns  test-record
   test-name item-path jobgroup
   waitons testmode  newtal itemmaps prereqs-not-met)
 
+
+(define (runs:get-mt-env-alist run-id runname target testname itempath)
+  ;;(bb-check-path msg: "runs:set-megatest-env-vars entry")
+  `(("MT_TEST_NAME"     . ,testname)
+    
+    ("MT_ITEMPATH"      . ,itempath)
+
+    ("MT_TARGET"        . ,target)
+    
+    ("MT_RUNNAME"       . ,runname)
+    
+    ("MT_RUN_AREA_HOME" . ,*toppath*)
+    
+    ,@(let* ((link-tree (common:get-linktree))) ;; (configf:lookup *configdat* "setup" "linktree")))
+        (if link-tree
+            (list (cons "MT_LINKTREE" link-tree)
+                  
+                  (cons "MT_TEST_RUN_DIR"
+                        (conc link-tree  "/" target "/" runname "/" testname
+                              (if (and (string? itempath) (not (equal? itempath "")))
+                                  (conc "/" itempath)
+                                  "")))
+                  )
+            '()))
+    
+    ,@(map
+       (lambda (key)
+         (cons  (car key) (cadr key)))
+       (keys:target->keyval (rmt:get-keys) target))
+    
+    ,@(map (lambda (var)
+             (let ((val (configf:lookup *configdat* "env-override" var)))
+               (cons var val)))
+           (configf:section-vars *configdat* "env-override"))))
+
+
+    
+
+    
+    
 ;; set up needed environment variables given a run-id and optionally a target, itempath etc.
 ;;
 (define (runs:set-megatest-env-vars run-id #!key (inkeys #f)(inrunname #f)(inkeyvals #f)(intarget #f)(testname #f)(itempath #f))
   ;;(bb-check-path msg: "runs:set-megatest-env-vars entry")
   (let* ((target    (or intarget 
@@ -96,18 +142,28 @@
 		(msg        ((condition-property-accessor 'exn 'message) exn)))
 	    (if (< count 5)
 		(begin ;; this call is colliding, do some crude stuff to fix it.
 		  (debug:print 0 *default-log-port* "ERROR: *configdat* was inaccessible! This should never happen. Retry #" count)
 		  (launch:setup force-reread: #t)
-		  (fatal-loop (+ count 1)))
+		  (fatal-loop (+ count 1))) 
 		(begin
 		  (debug:print 0 *default-log-port* "FATAL: *configdat* was inaccessible! This should never happen. Retried " count " times. Message: " msg)
 		  (debug:print 0 *default-log-port* "Call chain:")
 		  (with-output-to-port *default-log-port*
-		    (lambda ()(pp call-chain)))
+
+                    (lambda ()
+                      (print "*configdat* is >>"*configdat*"<<")
+                      (pp *configdat*)
+                      (pp call-chain)))
+                  
 		  (exit 1))))
           ;;(bb-check-path msg: "runs:set-megatest-env-vars block 1.5")
+          (when (or (not *configdat*) (not (hash-table? *configdat*)))
+              (debug:print 0 *default-log-port* "WARNING: *configdat* was inaccessible! This should never happen.  Brute force reread.")
+              ;;(BB> "ERROR: *configdat* was inaccessible! This should never happen.  Brute force reread.")
+              (thread-sleep! 2) ;; assuming nfs lag.
+              (launch:setup force-reread: #t))
           (alist->env-vars (hash-table-ref/default *configdat* "env-override" '())))) ;;;; environment is tainted HERE in this let block.
     ;;(bb-check-path msg: "runs:set-megatest-env-vars block 2")
     ;; Lets use this as an opportunity to put MT_RUNNAME in the environment
     (let ((runname  (if inrunname inrunname (rmt:get-run-name-from-id run-id))))
       (if runname
@@ -176,19 +232,23 @@
 	  (hash-table-set! *runs:denoise* key currtime)
 	  #t)
 	#f)))
 
 (define (runs:can-run-more-tests runsdat run-id jobgroup max-concurrent-jobs)
+
   ;; Take advantage of a good place to exit if running the one-pass methodology
   (if (and (> (runs:dat-can-run-more-tests-count runsdat) 20)
 	   (args:get-arg "-one-pass"))
       (exit 0))
-  (thread-sleep! (cond
+
+  (thread-sleep! (cond ;; BB: check with Matt.  Should this sleep move to cond clauses below where we determine we have too many jobs running rather than each time the and condition above is true (which seems like always)?
         	  ((> (runs:dat-can-run-more-tests-count runsdat) 20)
 		   (if (runs:lownoise "waiting on tasks" 60)(debug:print-info 2 *default-log-port* "waiting for tasks to complete, sleeping briefly ..."))
-		   2);; obviously haven't had any work to do for a while
+                   (configf:lookup-number *configdat* "setup" "inter-test-delay" default: 0.1) ;; was 2
+		   );; obviously haven't had any work to do for a while
         	  (else 0)))
+  
   (let* ((num-running             (rmt:get-count-tests-running run-id))
 	 (num-running-in-jobgroup (rmt:get-count-tests-running-in-jobgroup run-id jobgroup))
 	 (job-group-limit         (let ((jobg-count (config-lookup *configdat* "jobgroups" jobgroup)))
 				    (if (string? jobg-count)
 					(string->number jobg-count)
@@ -199,11 +259,11 @@
 	(begin
 	  (debug:print 2 *default-log-port* "max-concurrent-jobs: " max-concurrent-jobs ", num-running: " num-running)
 	  (set! *last-num-running-tests* num-running)))
     (if (not (eq? 0 *globalexitstatus*))
 	(list #f num-running num-running-in-jobgroup max-concurrent-jobs job-group-limit)
-	(let ((can-not-run-more (cond
+	(let* ((can-not-run-more (cond
 				 ;; if max-concurrent-jobs is set and the number running is greater 
 				 ;; than it then cannot run more jobs
 				 ((and max-concurrent-jobs (>= num-running max-concurrent-jobs))
 				  (if (runs:lownoise "mcj msg" 60)
 				      (debug:print 0 *default-log-port* "WARNING: Max running jobs exceeded, current number running: " num-running 
@@ -218,10 +278,91 @@
 						   " in jobgroup \"" jobgroup "\" exceeds limit of " job-group-limit))
 				  #t)
 				 (else #f))))
 	  (list (not can-not-run-more) num-running num-running-in-jobgroup max-concurrent-jobs job-group-limit)))))
 
+(define (runs:run-pre-hook run-id)
+    (let* ((run-pre-hook   (configf:lookup *configdat* "runs" "pre-hook"))
+           (existing-tests (if run-pre-hook
+                               (rmt:get-tests-for-run run-id "%" '() '() ;; run-id testpatt states statuses
+                                                      #f #f ;; offset limit
+                                                      #f ;; not-in
+                                                      #f ;; sort-by
+                                                      #f ;; sort-order
+                                                      #f ;; get full data (not 'shortlist)
+                                                      0 ;; (runs:gendat-inc-results-last-update *runs:general-data*) ;; last update time
+                                                      'dashboard)
+                               '()))
+           (log-dir         (conc *toppath* "/logs"))
+           (log-file        (conc "pre-hook-" (string-translate (getenv "MT_TARGET") "/" "-") "-" (getenv "MT_RUNNAME") ".log"))
+           (full-log-fname  (conc log-dir "/" log-file)))
+      (if run-pre-hook
+          (if (null? existing-tests)
+              (let* ((use-log-dir (if (not (directory-exists? log-dir))
+                                      (handle-exceptions
+                                       exn
+                                       (begin
+                                         (debug:print 0 *default-log-port* "WARNING: Failed to create " log-dir)
+                                         #f)
+                                       (create-directory log-dir #t)
+                                       #t)
+                                      #t))
+                     (start-time   (current-seconds))
+                     (actual-logf  (if use-log-dir full-log-fname log-file)))
+                (handle-exceptions
+                 exn
+                 (begin
+                   (print-call-chain *default-log-port*)
+                   (debug:print 0 *default-log-port* "Message: " ((condition-property-accessor 'exn 'message) exn))
+                   (debug:print 0 *default-log-port* "ERROR: failed to run pre-hook " run-pre-hook ", check the log " log-file))
+                 (debug:print-info 0 *default-log-port* "running run-pre-hook: \"" run-pre-hook "\", log is " actual-logf)
+                 (system (conc run-pre-hook " >> " actual-logf " 2>&1"))
+                 (debug:print-info 0 *default-log-port* "pre-hook \"" run-pre-hook "\" took " (- (current-seconds) start-time) " seconds to run.")))
+              (debug:print 0 *default-log-port* "Skipping pre-hook call \"" run-pre-hook "\" as there are existing tests for this run.")))))
+    
+(define (runs:run-post-hook run-id)
+    (let* ((run-post-hook   (configf:lookup *configdat* "runs" "post-hook"))
+           (existing-tests (if run-post-hook
+                               (rmt:get-tests-for-run run-id "%" '() '() ;; run-id testpatt states statuses
+                                                      #f #f ;; offset limit
+                                                      #f ;; not-in
+                                                      #f ;; sort-by
+                                                      #f ;; sort-order
+                                                      #f ;; get full data (not 'shortlist)
+                                                      0 ;; (runs:gendat-inc-results-last-update *runs:general-data*) ;; last update time
+                                                      'dashboard)
+                               '()))
+           (log-dir         (conc *toppath* "/logs"))
+           (log-file        (conc "post-hook-" (string-translate (getenv "MT_TARGET") "/" "-") "-" (getenv "MT_RUNNAME") ".log"))
+           (full-log-fname  (conc log-dir "/" log-file)))
+      (if run-post-hook
+          ;; (if (null? existing-tests)
+          ;;    (debug:print 0 *default-log-port* "Skipping post-hook call \"" run-post-hook "\" as there are existing tests for this run.")))))
+	  (let* ((use-log-dir (if (not (directory-exists? log-dir))
+				  (handle-exceptions
+				      exn
+				      (begin
+					(debug:print 0 *default-log-port* "WARNING: Failed to create " log-dir)
+					#f)
+				    (create-directory log-dir #t)
+				    #t)
+				  #t))
+		 (start-time   (current-seconds))
+		 (actual-logf  (if use-log-dir full-log-fname log-file)))
+	    (handle-exceptions
+		exn
+		(begin
+		  (print-call-chain *default-log-port*)
+		  (debug:print 0 *default-log-port* "Message: " ((condition-property-accessor 'exn 'message) exn))
+		  (debug:print 0 *default-log-port* "ERROR: failed to run post-hook " run-post-hook ", check the log " log-file))
+	      (debug:print-info 0 *default-log-port* "running run-post-hook: \"" run-post-hook "\", log is " actual-logf)
+	      (system (conc run-post-hook " >> " actual-logf " 2>&1"))
+	      (debug:print-info 0 *default-log-port* "post-hook \"" run-post-hook "\" took " (- (current-seconds) start-time) " seconds to run."))))))
+
+;; return #t when all items in waitors-upon list are represented in test-patt, #f otherwise.
+(define (runs:testpatts-mention-waitors-upon? test-patt waitors-upon)
+  (null? (tests:filter-test-names-not-matched waitors-upon test-patt)))
 
 ;;  test-names: Comma separated patterns same as test-patts but used in selection 
 ;;              of tests to run. The item portions are not respected.
 ;;              FIXME: error out if /patt specified
 ;;            
@@ -237,10 +378,11 @@
 	 ;; need to process runconfigs before generating these lists
 	 (all-tests-registry #f)  ;; (tests:get-all)) ;; (tests:get-valid-tests (make-hash-table) test-search-path)) ;; all valid tests to check waiton names
 	 (all-test-names     #f)  ;; (hash-table-keys all-tests-registry))
 	 (test-names         #f)  ;; Generated by a call to (tests:filter-test-names all-test-names test-patts))
 	 (required-tests     #f)  ;; Put fully qualified test/testpath names in this list to be done
+         (waitors-upon       (make-hash-table)) ;; given a test, return list of tests waiting upon this test.
 	 (task-key           (conc (hash-table->alist flags) " " (get-host-name) " " (current-process-id)))
 	 ;; (tdbdat             (tasks:open-db))
 	 (config-reruns      (let ((x (configf:lookup *configdat* "setup" "reruns")))
 			       (if x (string->number x) #f)))
 	 (allowed-tests      #f))
@@ -253,14 +395,15 @@
     ;; per user request. If less than 100Meg space on dbdir partition, bail out with error
     ;; this will reduce issues in database corruption
     (common:check-db-dir-and-exit-if-insufficient)
 
     ;; override the number of reruns from the configs
-    (if (and config-reruns
-	     (> run-count config-reruns))
-	(set! run-count config-reruns))
-    
+    ;; this needs to be done at the place where is first runs:run-tests called 
+    ;(if (and config-reruns
+	  ;   (> run-count config-reruns))
+ 	  ;(set! run-count config-reruns))
+
     ;; (if (tasks:need-server run-id)(tasks:start-and-wait-for-server tdbdat run-id 10))
 
     (let ((sighand (lambda (signum)
 		     ;; (signal-mask! signum) ;; to mask or not? seems to cause issues in exiting
 		     (set! *time-to-exit* #t)
@@ -279,23 +422,29 @@
 		       (thread-start! th1)
 		       (thread-join! th2)))))
       (set-signal-handler! signal/int sighand)
       (set-signal-handler! signal/term sighand))
 
-    ;; force the starting of a server
-    (debug:print 0 *default-log-port* "waiting on server...")
-    (server:start-and-wait *toppath*)
+    ;; force the starting of a server -- removed BB 17ww28 - no longer needed.
+    ;;(debug:print 0 *default-log-port* "waiting on server...")
+    ;;(server:start-and-wait *toppath*)
     
     (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)
+    (set! runconf (if (common:file-exists? runconfigf)
 		      (setup-env-defaults runconfigf run-id *already-seen-runconfig-info* keyvals target)
 		      (begin
 			(debug:print 0 *default-log-port* "WARNING: You do not have a run config file: " runconfigf)
 			#f)))
 
     (if (not test-patts) ;; first time in - adjust testpatt
 	(set! test-patts (common:args-get-testpatt runconf)))
+    ;; if test-patts is #f at this point there is something wrong and we need to bail out
+    (if (not test-patts)
+	(begin
+	  (debug:print 0 *default-log-port* "WARNING: there is no test pattern for this run. Exiting now.")
+	  (exit 0)))
+    
     (if (args:get-arg "-tagexpr")
 	(begin
 	  (set! allowed-tests (string-join (runs:get-tests-matching-tags (args:get-arg "-tagexpr")) ","))
 	  	  (debug:print-info 0 *default-log-port* "filtering initial test list with tagexpr: " (args:get-arg "-tagexpr") " => " allowed-tests)
 		  ));; tests will be ANDed with this list
@@ -320,12 +469,13 @@
     ;; 1. fill required tests with test-patts
     ;; 2. scan testconfigs and if waitons, itemwait, itempatt calc prior test test-patt
     ;; 3. repeat until all deps propagated
     
     ;; any tests with direct mention in test-patts can be added to required
+    ;;(set! required-tests     (lset-intersection equal? (string-split test-patts ",") all-test-names))
+    (set! required-tests     (tests:filter-test-names all-test-names test-patts))
     ;;
-    (set! required-tests     (lset-intersection equal? (string-split test-patts ",") all-test-names))
     ;; (set! required-tests     (lset-intersection equal? test-names all-test-names))
     
     ;; look up all tests matching the comma separated list of globs in
     ;; test-patts (using % as wildcard)
 
@@ -361,24 +511,35 @@
 	   (string-split (or (configf:lookup *configdat* "setup" "allow-auto-rerun") "")))))
 
     ;; Ensure all tests are registered in the test_meta table
     (runs:update-all-test_meta #f)
 
+    ;; run the run prehook if there are no tests yet run for this run:
+    ;;
+    (runs:run-pre-hook run-id)
+    
     ;; now add non-directly referenced dependencies (i.e. waiton)
     ;;======================================================================
     ;; refactoring this block into tests:get-full-data
     ;;
     ;; What happended, this code is now duplicated in tests!?
     ;;
     ;;======================================================================
     
-    (if (not (null? test-names))
+    (if (not (null? test-names)) ;; BEGIN test-names loop
 	(let loop ((hed (car test-names))   ;; NOTE: This is the main loop that iterates over the test-names
 		   (tal (cdr test-names)))         ;; 'return-procs tells the config reader to prep running system but return a proc
+          (debug:print-info 4 *default-log-port* "\n\ntestpatt elaboration loop => hed="hed " tal="tal" test-patts="test-patts" test-names="test-names)
 	  (change-directory *toppath*) ;; PLEASE OPTIMIZE ME!!! I think this should be a no-op but there are several places where change-directories could be happening.
 	  (setenv "MT_TEST_NAME" hed) ;; 
-	  (let*-values (((waitons waitors config)(tests:get-waitons hed all-tests-registry)))
+	  (let*-values (((waitons waitors config) (tests:get-waitons hed all-tests-registry))
+                        ((hed-mode)
+                         (let ((m (config-lookup config "requirements" "mode")))
+                           (if m (map string->symbol (string-split m)) '(normal))))
+                        ((hed-itemized-waiton) ;; are items in hed waiting on items of waiton?
+                         (not (null? (lset-intersection eq? hed-mode '(itemmatch itemwait)))))
+                        )
 	    (debug:print-info 8 *default-log-port* "waitons: " waitons)
 	    ;; check for hed in waitons => this would be circular, remove it and issue an
 	    ;; error
 	    (if (or (member hed waitons)
 		    (member hed waitors))
@@ -386,71 +547,82 @@
 		  (debug:print-error 0 *default-log-port* "test " hed " has listed itself as a waiton or waitor, please correct this!")
 		  (set! waitons (filter (lambda (x)(not (equal? x hed))) waitons))
 		  (set! waitors (filter (lambda (x)(not (equal? x hed))) waitors))))
 	    
 	    ;; (items   (items:get-items-from-config config)))
-	    (if (not (hash-table-ref/default test-records hed #f))
-		(hash-table-set! test-records
-				 hed (vector hed     ;; 0
-					     config  ;; 1
-					     waitons ;; 2
+	    (if (not (hash-table-ref/default test-records hed #f)) ;; waiton-tconfig below will be #f until that test is visted here at least once
+		(hash-table-set! test-records ;; BB: we are doing a manual make-tests:testqueue
+				 hed (vector hed     ;; 0 ;; testname
+					     config  ;; 1 
+					     waitons ;; 2 
 					     (config-lookup config "requirements" "priority")     ;; priority 3
-					     (tests:get-items config) ;; expand the [items] and or [itemstable] into explict items
+					     (tests:get-items config) ;; 4 ;; expand the [items] and or [itemstable] into explict items
 					     #f      ;; itemsdat 5
 					     #f      ;; spare - used for item-path
 					     waitors ;; 
 					     )))
-	    (for-each 
+            ;; update waitors-upon here
+            (for-each
+             (lambda (waiton)
+               (let* ((current-waitors-upon (hash-table-ref/default waitors-upon waiton '())))
+                 (debug:print-info 8 *default-log-port* " current-waiters-upon["waiton"] is "current-waitors-upon )
+                 (when (not (member hed current-waitors-upon))
+                   (debug:print-info 8 *default-log-port* " current-waiters-upon["waiton"] << "hed  )
+                   (hash-table-set! waitors-upon waiton (cons hed current-waitors-upon)))))
+             (if (list? waitons) waitons '()))
+            (debug:print-info 8 *default-log-port* " process waitons&waitors of "hed": "(delete-duplicates (append waitons waitors)))
+            (for-each 
 	     (lambda (waiton)
 	       (if (and waiton (not (member waiton test-names)))
-		   (let* ((waiton-record   (hash-table-ref/default test-records waiton #f))
+		   (let* ((waitors-in-testpatt (runs:testpatts-mention-waitors-upon? test-patts (hash-table-ref/default waitors-upon waiton '())))
+                          (waiton-record   (hash-table-ref/default test-records waiton #f))
 			  (waiton-tconfig  (if waiton-record (vector-ref waiton-record 1) #f))
 			  (waiton-itemized (and waiton-tconfig
 						(or (hash-table-ref/default waiton-tconfig "items" #f)
 						    (hash-table-ref/default waiton-tconfig "itemstable" #f))))
 			  (itemmaps        (tests:get-itemmaps config))  ;; (configf:lookup config "requirements" "itemmap"))
-			  (new-test-patts  (tests:extend-test-patts test-patts hed waiton itemmaps)))
+			  (new-test-patts  (tests:extend-test-patts test-patts hed waiton itemmaps hed-itemized-waiton))) 
 		     (debug:print-info 0 *default-log-port* "Test " waiton " has " (if waiton-record "a" "no") " waiton-record and" (if waiton-itemized " " " no ") "items")
 		     ;; need to account for test-patt here, if I am test "a", selected with a test-patt of "hed/b%"
 		     ;; and we are waiting on "waiton" we need to add "waiton/,waiton/b%" to test-patt
 		     ;; is this satisfied by merely appending "/" to the waiton name added to the list?
 		     ;;
 		     ;; This approach causes all of the items in an upstream test to be run 
-
 		     ;; if we have this waiton already processed once we can analzye it for extending
 		     ;; tests to be run, since we can't properly process waitons unless they have been
 		     ;; initially added we add them again to be processed on second round AND add the hed
 		     ;; back in to also be processed on second round
-		     ;;
-		     (if waiton-tconfig
-			 (begin
-			   (set! test-names (cons waiton test-names)) ;; need to process this one, only add once the waiton tconfig read
-			   (if waiton-itemized
-			       (begin
-				 (debug:print-info 0 *default-log-port* "New test patts: " new-test-patts ", prev test patts: " test-patts)
-				 (set! required-tests (cons (conc waiton "/") required-tests))
-				 (set! test-patts new-test-patts))
-			       (begin
-				 (debug:print-info 0 *default-log-port* "Adding non-itemized test " waiton " to required-tests")
-				 (set! required-tests (cons waiton required-tests))
-				 (set! test-patts new-test-patts))))
+		     (if waiton-tconfig ;; BB: waiter should be in test-patts as well as the waiton have a tconfig.
+                         (if waiton-itemized
+                             (if waitors-in-testpatt
+                                 (begin
+                                   (debug:print-info 0 *default-log-port* "New test patts: " new-test-patts ", prev test patts: " test-patts)
+                                   (set! test-names (cons waiton test-names)) ;; need to process this one, only add once the waiton tconfig read
+                                   (set! required-tests (cons (conc waiton "/") required-tests))
+                                   (set! test-patts new-test-patts))
+                                 (begin
+                                   (debug:print-info 0 *default-log-port* "Waitor(s) not yet on testpatt for " waiton ", setting up to re-process it")
+                                   (set! tal (append (cons waiton tal)(list hed)))))
+                             (begin
+                               (debug:print-info 0 *default-log-port* "Adding non-itemized test " waiton " to required-tests")
+                               (set! required-tests (cons waiton required-tests))
+                               (set! test-patts new-test-patts)))
 			 (begin
 			   (debug:print-info 0 *default-log-port* "No testconfig info yet for " waiton ", setting up to re-process it")
 			   (set! tal (append (cons waiton tal)(list hed))))) ;; (cons (conc waiton "/") required-tests))
-			 
 		     ;; NOPE: didn't work. required needs to be plain test names. Try tacking on to test-patts
 		     ;;  - doesn't work
 		     ;; (set! test-patts (conc test-patts "," waiton "/"))
-		     
 		     ;; (set! test-names (cons waiton test-names))))) ;; was an append, now a cons
 		     )))
 	     (delete-duplicates (append waitons waitors)))
 	    (let ((remtests (delete-duplicates (append waitons tal))))
+              (debug:print-info 8 *default-log-port* " remtests are "remtests)
 	      (if (not (null? remtests))
 		  (begin
 		    ;; (debug:print-info 0 *default-log-port* "Preprocessing continues for " (string-intersperse remtests ", "))
-		    (loop (car remtests)(cdr remtests))))))))
+		    (loop (car remtests)(cdr remtests)))))))) ;; END test-names loop
 
     (if (not (null? required-tests))
 	(debug:print-info 1 *default-log-port* "Adding \"" (string-intersperse required-tests " ") "\" to the run queue"))
     ;; NOTE: these are all parent tests, items are not expanded yet.
     (debug:print-info 4 *default-log-port* "test-records=" (hash-table->alist test-records))
@@ -457,31 +629,27 @@
     (let ((reglen (configf:lookup *configdat* "setup" "runqueue")))
       (if (> (length (hash-table-keys test-records)) 0)
 	  (let* ((keep-going        #t)
 		 (run-queue-retries 5)
 		 (th1        (make-thread (lambda ()
-					    (runs:run-tests-queue run-id runname test-records keyvals flags test-patts required-tests (any->number reglen) all-tests-registry))
-					    ;; (handle-exceptions
-					    ;;  exn
-					    ;;  (begin
-					    ;;    (print-call-chain (current-error-port))
-					    ;;    (debug:print-error 0 *default-log-port* "failure in runs:run-tests-queue thread, error: " ((condition-property-accessor 'exn 'message) exn))
-					    ;;    (if (> run-queue-retries 0)
-					    ;; 	   (begin
-					    ;; 	     (set! run-queue-retries (- run-queue-retries 1))
-					    ;; 	     (runs:run-tests-queue run-id runname test-records keyvals flags test-patts required-tests (any->number reglen) all-tests-registry))))
-					    ;;  (runs:run-tests-queue run-id runname test-records keyvals flags test-patts required-tests (any->number reglen) all-tests-registry)))
+					    (handle-exceptions
+						exn
+						(begin
+						  (print-call-chain)
+						  (print " message: " ((condition-property-accessor 'exn 'message) exn)))
+					      (runs:run-tests-queue run-id runname test-records keyvals flags test-patts required-tests
+								    (any->number reglen) all-tests-registry)))
 					  "runs:run-tests-queue"))
-		 (th2        (make-thread (lambda ()				    
+		 (th2        (make-thread (lambda ()			 ;; BBQ: why are we visiting ALL runs here?	    
 					    ;; (rmt:find-and-mark-incomplete-all-runs))))) CAN'T INTERRUPT IT ...
 					    (let ((run-ids (rmt:get-all-run-ids)))
 					      (for-each (lambda (run-id)
 							  (if keep-going
 							      (handle-exceptions
 							       exn
 							       (debug:print 0 *default-log-port* "error in calling find-and-mark-incomplete for run-id " run-id)
-							       (rmt:find-and-mark-incomplete run-id #f)))) ;; ovr-deadtime)))
+							       (rmt:find-and-mark-incomplete run-id #f)))) ;; ovr-deadtime))) ;; could be root of https://hsdes.intel.com/appstore/article/#/220546828/main -- Title: Megatest jobs show DEAD even though they are still running (1.64/27)
 							run-ids)))
 					  "runs: mark-incompletes")))
 	    (thread-start! th1)
 	    (thread-start! th2)
 	    (thread-join! th1)
@@ -493,13 +661,20 @@
 		  (if (not (hash-table-ref/default flags "-preclean" #f))
 		      (hash-table-set! flags "-preclean" #t))
 		  (if (not (hash-table-ref/default flags "-rerun" #f))
 		      (hash-table-set! flags "-rerun" "STUCK/DEAD,n/a,ZERO_ITEMS"))
 		  ;; recursive call to self
-		  (runs:run-tests target runname test-patts user flags run-count: (- run-count 1)))))
+      (runs:run-tests target runname test-patts user flags run-count: (- run-count 1)))))
 	  (debug:print-info 0 *default-log-port* "No tests to run")))
     (debug:print-info 4 *default-log-port* "All done by here")
+    ;; TODO: try putting post hook call here
+    (if (eq? run-count 0)
+     (begin  
+      (debug:print-info 0 *default-log-port* "Calling Post Hook")  
+      (debug:print-info 2 *default-log-port* " run-count " run-count)
+      (runs:run-post-hook run-id))
+      (debug:print-info 2 *default-log-port* "Not calling post hook runcount = " run-count ))   
     (rmt:tasks-set-state-given-param-key task-key "done")
     ;; (sqlite3:finalize! tasks-db)
     ))
 
 
@@ -512,31 +687,52 @@
 ;;   but have items in reg; loop with (car reg)(cdr reg) '() reruns
 ;;   If reg is empty => all done
 
 (define (runs:queue-next-hed tal reg n regfull)
   (if regfull
-      (car reg)
+      (if (null? reg) #f (car reg))
       (if (null? tal) ;; tal is used up, pop from reg
-	  (car reg)
+	  (if (null? reg) #f (car reg))
 	  (car tal))))
 
 (define (runs:queue-next-tal tal reg n regfull)
   (if regfull
       tal
       (if (null? tal) ;; must transfer from reg
-	  (cdr reg)
+	  (if (null? reg) '() (cdr reg))
 	  (cdr tal))))
 
 (define (runs:queue-next-reg tal reg n regfull)
   (if regfull
-      (cdr reg)
+      (if (null? reg) '() (cdr reg)) ;; EXPLORE: reorder (cdr reg) such that looping is more efficient
       (if (null? tal) ;; if tal is null and reg not full then '() as reg contents moved to tal
 	  '()
 	  reg)))
 
+;; this is the list of parameters to the named loop "loop" near the top of runs:run-tests-queue, look around line 1216
+;;
+(define (runs:loop-values tal reg reglen regfull reruns)
+  (list (runs:queue-next-hed tal reg reglen regfull)      ;; hed
+        (runs:queue-next-tal tal reg reglen regfull)      ;; tal
+        (runs:queue-next-reg tal reg reglen regfull)      ;; reg
+        reruns))                                          ;; reruns
+
+;; objective - iterate thru tests
+;;    => want to prioritize tests we haven't seen before
+;;    => sometimes need to squeeze things in (added to reg)
+;;    => review of a previously seen test is higher priority of never visited test
+;; reg - list of previously visited tests
+;; tal - list of never visited tests
+;;   prefer next hed to be from reg than tal.
+
 (define runs:nothing-left-in-queue-count 0)
 
+;; return value of runs:expand-items is passed back to runs-tests-queue and is fed to named loop with this signature:
+;;    (let loop ((hed         (car sorted-test-names))
+;;	         (tal         (cdr sorted-test-names))
+;;	         (reg         '()) ;; registered, put these at the head of tal 
+;;	         (reruns      '()))
 (define (runs:expand-items hed tal reg reruns regfull newtal jobgroup max-concurrent-jobs run-id waitons item-path testmode test-record can-run-more items runname tconfig reglen test-registry test-records itemmaps)
   (let* ((loop-list       (list hed tal reg reruns))
 	 (prereqs-not-met (let ((res (rmt:get-prereqs-not-met run-id waitons hed item-path mode: testmode itemmaps: itemmaps)))
 			    (if (list? res)
 				res
@@ -543,15 +739,26 @@
 				(begin
 				  (debug:print 0 *default-log-port*
 					       "ERROR: rmt:get-prereqs-not-met returned non-list!\n"
 					       "  res=" res " run-id=" run-id " waitons=" waitons " hed=" hed " item-path=" item-path " testmode=" testmode " itemmaps=" itemmaps)
 				  '()))))
+         (have-itemized (not (null? (lset-intersection eq? testmode '(itemmatch itemwait)))))
 	 ;; (prereqs-not-met (mt:lazy-get-prereqs-not-met run-id waitons item-path mode: testmode itemmap: itemmap))
 	 (fails           (runs:calc-fails prereqs-not-met))
 	 (prereq-fails    (runs:calc-prereq-fail prereqs-not-met))
 	 (non-completed   (runs:calc-not-completed prereqs-not-met))
-	 (runnables       (runs:calc-runnable prereqs-not-met)))
+	 (runnables       (runs:calc-runnable prereqs-not-met))
+         (unexpanded-prereqs
+          (filter (lambda (testname)
+                    (let* ((test-rec (hash-table-ref test-records testname))
+                           (items       (tests:testqueue-get-items  test-rec)))
+                      ;;(BB> "HEY " testname "=>"items)
+                      (or (procedure? items)(eq? items 'have-procedure))))
+                  waitons))
+
+
+         )
     (debug:print-info 4 *default-log-port* "START OF INNER COND #2 "
 		      "\n can-run-more:    " can-run-more
 		      "\n testname:        " hed
 		      "\n prereqs-not-met: " (runs:pretty-string prereqs-not-met)
 		      "\n non-completed:   " (runs:pretty-string non-completed) 
@@ -566,20 +773,18 @@
 
    (cond
      ;; all prereqs met, fire off the test
      ;; or, if it is a 'toplevel test and all prereqs not met are COMPLETED then launch
 
-     ((and (not (member 'toplevel testmode))
+    ((and (not (member 'toplevel testmode))
 	   (member (hash-table-ref/default test-registry (db:test-make-full-name hed item-path) 'n/a)
 		   '(DONOTRUN removed CANNOTRUN))) ;; *common:cant-run-states-sym*) ;; '(COMPLETED KILLED WAIVED UNKNOWN INCOMPLETE)) ;; try to catch repeat processing of COMPLETED tests here
+      (debug:print-info 4 *default-log-port* "cond branch - "  "ei-1")
       (debug:print-info 1 *default-log-port* "Test " hed " set to \"" (hash-table-ref test-registry (db:test-make-full-name hed item-path)) "\". Removing it from the queue")
       (if (or (not (null? tal))
 	      (not (null? reg)))
-	  (list (runs:queue-next-hed tal reg reglen regfull)
-		(runs:queue-next-tal tal reg reglen regfull)
-		(runs:queue-next-reg tal reg reglen regfull)
-		reruns)
+          (runs:loop-values tal reg reglen regfull reruns)
 	  (begin
 	    (debug:print-info 0 *default-log-port* "Nothing left in the queue!")
 	    ;; If get here twice then we know we've tried to expand all items
 	    ;; since there must be a logic issue with the handling of loops in the 
 	    ;; items expand phase we will brute force an exit here.
@@ -588,14 +793,24 @@
 		  (debug:print 0 *default-log-port* "WARNING: this condition is triggered when there were no items to expand and nothing to run. Please check your run for completeness")
 		  (exit 0))
 		(set! runs:nothing-left-in-queue-count (+ runs:nothing-left-in-queue-count 1)))
 	    #f)))
 
-     ;; 
-     ((or (null? prereqs-not-met)
+     ;; desired result of below cond branch:
+     ;;   we want to expand items in our test of interest (hed) in the following cases:
+     ;;    case 1 - mode is itemmatch or itemwait: 
+     ;;       - all prereq tests have been expanded
+     ;;       - at least one prereq's items have completed
+     ;;    case 2 - mode is toplevel   
+     ;;       - prereqs are completed.
+     ;;       - or no prereqs can complete 
+     ;;    case 3 - mode not specified 
+     ;;       - prereqs are completed and passed (we could consider removing "and passed" -- it would change behavior from current)          
+    ((or (null? prereqs-not-met)
 	  (and (member 'toplevel testmode)
 	       (null? non-completed)))
+      (debug:print-info 4 *default-log-port* "cond branch - "  "ei-2")
       (debug:print-info 4 *default-log-port* "runs:expand-items: (or (null? prereqs-not-met) (and (member 'toplevel testmode)(null? non-completed)))")
       (let ((test-name (tests:testqueue-get-testname test-record)))
 	(setenv "MT_TEST_NAME" test-name) ;; 
 	(setenv "MT_RUNNAME"   runname)
 	(runs:set-megatest-env-vars run-id inrunname: runname) ;; these may be needed by the launching process
@@ -612,13 +827,14 @@
 		(list hed tal reg reruns))
 	      (begin
 		(debug:print-error 0 *default-log-port* "The proc from reading the items table did not yield a list - please report this")
 		(exit 1))))))
 
-     ((and (null? fails)
+    ((and (null? fails)
 	   (null? prereq-fails)
 	   (not (null? non-completed)))
+      (debug:print-info 4 *default-log-port* "cond branch - "  "ei-3")
       (let* ((allinqueue (map (lambda (x)(if (string? x) x (db:test-get-testname x)))
         		      (append newtal reruns)))
 	     ;; prereqstrs is a list of test names as strings that are prereqs for hed
              (prereqstrs (delete-duplicates (map (lambda (x)(if (string? x) x (db:test-get-testname x)))
 						 prereqs-not-met)))
@@ -643,74 +859,72 @@
 	    (let ((trimmed-tal (mt:discard-blocked-tests run-id hed tal test-records))
 		  (trimmed-reg (mt:discard-blocked-tests run-id hed reg test-records)))
 	      (debug:print 1 *default-log-port* "WARNING: test " hed " has discarded prerequisites, removing it from the queue")
 
 	      (let ((test-id (rmt:get-test-id run-id hed "")))
-		(if test-id (mt:test-set-state-status-by-id run-id test-id "NOT_STARTED" "PREQ_DISCARDED" "Failed to run due to discarded prerequisites")))
+		(if test-id (mt:test-set-state-status-by-id run-id test-id "COMPLETED" "PREQ_DISCARDED" "Failed to run due to discarded prerequisites")))
 	      
 	      (if (and (null? trimmed-tal)
 		       (null? trimmed-reg))
 		  #f
-		  (list (runs:queue-next-hed trimmed-tal trimmed-reg reglen regfull)
-			(runs:queue-next-tal trimmed-tal trimmed-reg reglen regfull)
-			(runs:queue-next-reg trimmed-tal trimmed-reg reglen regfull)
-			reruns)))
+                  (runs:loop-values trimmed-tal trimmed-reg reglen regfull reruns)
+                  ))
 	      (list (car newtal)(append (cdr newtal) reg) '() reruns))))
 
-     ((and (null? fails)
+    ((and (null? fails) ;; have not-started tests, but unable to run them.  everything looks completed with no prospect of unsticking something that is stuck.  we should mark hed as moribund and exit or continue if there are more tests to consider
 	   (null? prereq-fails)
 	   (null? non-completed))
+     (debug:print-info 4 *default-log-port* "cond branch - "  "ei-4")
       (if  (runs:can-keep-running? hed 20)
 	  (begin
 	    (runs:inc-cant-run-tests hed)
-	    (debug:print-info 1 *default-log-port* "no fails in prerequisites for " hed " but also none running, keeping " hed " for now. Try count: " (hash-table-ref/default *seen-cant-run-tests* hed 0))
+	    (debug:print-info 0 *default-log-port* "no fails in prerequisites for " hed " but also none running, keeping " hed " for now. Try count: " (hash-table-ref/default *seen-cant-run-tests* hed 0)) ;; 
 	    ;; getting here likely means the system is way overloaded, kill a full minute before continuing
-	    (thread-sleep! 60)
+	    (thread-sleep! 60) ;; TODO: gate by normalized server load > 1.0 (maxload config thing)
 	    ;; num-retries code was here
 	    ;; we use this opportunity to move contents of reg to tal
 	    (list (car newtal)(append (cdr newtal) reg) '() reruns)) ;; an issue with prereqs not yet met?
 	  (begin
 	    (debug:print-info 1 *default-log-port* "no fails in prerequisites for " hed " but nothing seen running in a while, dropping test " hed " from the run queue")
 	    (let ((test-id (rmt:get-test-id run-id hed "")))
 	      (if test-id (mt:test-set-state-status-by-id run-id test-id "NOT_STARTED" "TIMED_OUT" "Nothing seen running in a while.")))
-	    (list (runs:queue-next-hed tal reg reglen regfull)
-		  (runs:queue-next-tal tal reg reglen regfull)
-		  (runs:queue-next-reg tal reg reglen regfull)
-		  reruns))))
+            (runs:loop-values tal reg reglen regfull reruns)
+            )))
 
-     ((and 
+    ((and 
        (or (not (null? fails))
 	   (not (null? prereq-fails)))
        (member 'normal testmode))
+      (debug:print-info 4 *default-log-port* "cond branch - "  "ei-5")
       (debug:print-info 1 *default-log-port* "test "  hed " (mode=" testmode ") has failed prerequisite(s); "
 			(string-intersperse (map (lambda (t)(conc (db:test-get-testname t) ":" (db:test-get-state t)"/"(db:test-get-status t))) fails) ", ")
 			", removing it from to-do list")
       (let ((test-id (rmt:get-test-id run-id hed "")))
 	(if test-id
 	    (if (not (null? prereq-fails))
-		(mt:test-set-state-status-by-id run-id test-id "NOT_STARTED" "PREQ_DISCARDED" "Failed to run due to prior failed prerequisites")
-		(mt:test-set-state-status-by-id run-id test-id "NOT_STARTED" "PREQ_FAIL"      "Failed to run due to failed prerequisites"))))
+		(mt:test-set-state-status-by-id run-id test-id "COMPLETED" "PREQ_DISCARDED" "Failed to run due to prior failed prerequisites")
+		(mt:test-set-state-status-by-id run-id test-id "COMPLETED" "PREQ_FAIL"      "Failed to run due to failed prerequisites"))))
+      ;; (debug:print 4 *default-log-port*"BB> set PREQ_FAIL on "hed)
+      ;; (mt:test-set-state-status-by-id run-id test-id "NOT_STARTED" "PREQ_FAIL"      "Failed to run due to failed prerequisites")))) ;; BB: this works, btu equivalent for itemwait mode does not work.
       (if (or (not (null? reg))(not (null? tal)))
 	  (begin
 	    (hash-table-set! test-registry hed 'CANNOTRUN)
-	    (list (runs:queue-next-hed tal reg reglen regfull)
-		  (runs:queue-next-tal tal reg reglen regfull)
-		  (runs:queue-next-reg tal reg reglen regfull)
-		  (cons hed reruns)))
+            (runs:loop-values tal reg reglen regfull (cons hed reruns))
+            )
 	  #f)) ;; #f flags do not loop
-
+      
      ((and (not (null? fails))(member 'toplevel testmode))
+      (debug:print-info 4 *default-log-port* "cond branch - "  "ei-6")
       (if (or (not (null? reg))(not (null? tal)))
 	   (list (car newtal)(append (cdr newtal) reg) '() reruns)
 	  #f)) 
-     ((null? runnables) #f) ;; if we get here and non-completed is null then it is all over.
+     ((null? runnables)
+      (debug:print-info 4 *default-log-port* "cond branch - "  "ei-7")
+      #f) ;; if we get here and non-completed is null then it is all over.
      (else
+      (debug:print-info 4 *default-log-port* "cond branch - "  "ei-8")
       (debug:print 0 *default-log-port* "WARNING: FAILS or incomplete tests maybe preventing completion of this run. Watch for issues with test " hed ", continuing for now")
-      ;; (list (runs:queue-next-hed tal reg reglen regfull)
-      ;;   	(runs:queue-next-tal tal reg reglen regfull)
-      ;;   	(runs:queue-next-reg tal reg reglen regfull)
-      ;;   	reruns)
       (list (car newtal)(cdr newtal) reg reruns)))))
 
 (define (runs:mixed-list-testname-and-testrec->list-of-strings inlst)
   (if (null? inlst)
       '()
@@ -730,10 +944,13 @@
 
 
 ;;  hed tal reg reruns reglen regfull test-record runname test-name item-path jobgroup max-concurrent-jobs run-id waitons item-path testmode test-patts required-tests test-registry registry-mutex flags keyvals run-info newtal all-tests-registry itemmaps)
 (define (runs:process-expanded-tests runsdat testdat)
   ;; unroll the contents of runsdat and testdat (due to ongoing refactoring).
+  (debug:print 2 *default-log-port* "runs:process-expanded-tests; testdat:" )
+  (debug:print 2 *default-log-port* (with-output-to-string
+                                            (lambda () (pp (runs:testdat->alist testdat) ))))
   (let* ((hed                    (runs:testdat-hed testdat))
 	 (tal                    (runs:testdat-tal testdat))
 	 (reg                    (runs:testdat-reg testdat))
 	 (reruns                 (runs:testdat-reruns testdat))
 	 (test-name              (runs:testdat-test-name testdat))
@@ -767,11 +984,11 @@
 	 (num-running-in-jobgroup(list-ref run-limits-info 2)) 
 	 (max-concurrent-jobs    (list-ref run-limits-info 3))
 	 (job-group-limit        (list-ref run-limits-info 4))
 	 ;; (prereqs-not-met        (rmt:get-prereqs-not-met run-id waitons hed item-path mode: testmode itemmaps: itemmaps))
 	 ;; (prereqs-not-met         (mt:lazy-get-prereqs-not-met run-id waitons item-path mode: testmode itemmap: itemmap))
-	 (fails                  (if (list? prereqs-not-met)
+	 (fails                  (if (list? prereqs-not-met) ;; TODO: rename fails to failed-prereqs
 				      (runs:calc-fails prereqs-not-met)
 				      (begin
 					(debug:print-error 0 *default-log-port* "prereqs-not-met is not a list! " prereqs-not-met)
 					'())))
 	 (non-completed           (filter (lambda (x)             ;; remove hed from not completed list, duh, of course it is not completed!
@@ -778,12 +995,13 @@
 					    (not (equal? x hed)))
 					  (runs:calc-not-completed prereqs-not-met)))
 	 (loop-list               (list hed tal reg reruns))
 	 ;; configure the load runner
 	 (numcpus                 (common:get-num-cpus #f))
-	 (maxload                 (string->number (or (configf:lookup *configdat* "jobtools" "maxload") "3")))
-	 (waitdelay               (string->number (or (configf:lookup *configdat* "jobtools" "waitdelay") "60"))))
+	 (maxload                 (string->number (or (configf:lookup *configdat* "jobtools" "maxload") "3.0")))         ;; use a non-number string to disable
+         (maxhomehostload         (string->number (or (configf:lookup *configdat* "jobtools" "maxhomehostload") "2.0"))) ;; use a non-number string to disable
+         (waitdelay               (string->number (or (configf:lookup *configdat* "jobtools" "waitdelay") "60"))))
     (debug:print-info 4 *default-log-port* "have-resources: " have-resources " prereqs-not-met: (" 
 		      (string-intersperse 
 		       (map (lambda (t)
 			      (if (vector? t)
 				  (conc (db:test-get-state t) "/" (db:test-get-status t))
@@ -800,23 +1018,20 @@
 
     ;; Don't know at this time if the test have been launched at some time in the past
     ;; i.e. is this a re-launch?
     (debug:print-info 4 *default-log-port* "run-limits-info = " run-limits-info)
     
-    (cond
+    (cond ; cond 894- 1067
      
      ;; Check item path against item-patts, 
      ;;
      ((not (tests:match test-patts (tests:testqueue-get-testname test-record) item-path required: required-tests)) ;; This test/itempath is not to be run
       ;; else the run is stuck, temporarily or permanently
       ;; but should check if it is due to lack of resources vs. prerequisites
       (debug:print-info 1 *default-log-port* "Skipping " (tests:testqueue-get-testname test-record) " " item-path " as it doesn't match " test-patts)
       (if (or (not (null? tal))(not (null? reg)))
-	  (list (runs:queue-next-hed tal reg reglen regfull)
-		(runs:queue-next-tal tal reg reglen regfull)
-		(runs:queue-next-reg tal reg reglen regfull)
-		reruns)
+	  (runs:loop-values tal reg reglen regfull reruns)
 	  #f))
      
      ;; Register tests 
      ;;
      ((not (hash-table-ref/default test-registry (db:test-make-full-name test-name item-path) #f))
@@ -837,11 +1052,11 @@
 	    (if (rmt:get-test-id run-id test-name "")
 		(hash-table-set! test-registry (db:test-make-full-name test-name "") 'done))))
       (runs:shrink-can-run-more-tests-count runsdat)   ;; DELAY TWEAKER (still needed?)
       (if (and (null? tal)(null? reg))
 	  (list hed tal (append reg (list hed)) reruns)
-	  (list (runs:queue-next-hed tal reg reglen regfull)
+	  (list (runs:queue-next-hed tal reg reglen regfull) ;; cannot replace with a call to runs:loop-values as the logic is different for reg
 		(runs:queue-next-tal tal reg reglen regfull)
 		;; NB// Here we are building reg as we register tests
 		;; if regfull we must pop the front item off reg
 		(if regfull
 		    (append (cdr reg) (list hed))
@@ -883,22 +1098,22 @@
       ;; we are going to reset all the counters for test retries by setting a new hash table
       ;; this means they will increment only when nothing can be run
       (set! *max-tries-hash* (make-hash-table))
       ;; well, first lets see if cpu load throttling is enabled. If so wait around until the
       ;; average cpu load is under the threshold before continuing
-      (if (configf:lookup *configdat* "jobtools" "maxload") ;; only gate if maxload is specified
-	  (common:wait-for-cpuload maxload numcpus waitdelay))
+      (if maxload ;; only gate if maxload is specified
+          (common:wait-for-cpuload maxload numcpus waitdelay))
+      (if maxhomehostload
+          (common:wait-for-homehost-load maxhomehostload (conc "Waiting for homehost load to drop below normalized value of " maxhomehostload)))
+      
       (run:test run-id run-info keyvals runname test-record flags #f test-registry all-tests-registry)
       (runs:incremental-print-results run-id)
       (hash-table-set! test-registry (db:test-make-full-name test-name item-path) 'running)
       (runs:shrink-can-run-more-tests-count runsdat)  ;; DELAY TWEAKER (still needed?)
       ;; (thread-sleep! *global-delta*)
       (if (or (not (null? tal))(not (null? reg)))
-	  (list (runs:queue-next-hed tal reg reglen regfull)
-		(runs:queue-next-tal tal reg reglen regfull)
-		(runs:queue-next-reg tal reg reglen regfull)
-		reruns)
+	  (runs:loop-values tal reg reglen regfull reruns)
 	  #f))
      
      ;; must be we have unmet prerequisites
      ;;
      (else
@@ -918,68 +1133,67 @@
 	    (if  (runs:lownoise "Waiting for more work to do..." 60)
 		 (debug:print-info 0 *default-log-port* "Waiting for more work to do..."))
 	    (thread-sleep! 1)
 	    (list (car newtal)(cdr newtal) reg reruns))
 	  ;; the waiton is FAIL so no point in trying to run hed ever again
-	  (if (or (not (null? reg))(not (null? tal)))
-	      (if (vector? hed)
+	  (begin
+            (let ((my-test-id (rmt:get-test-id run-id test-name item-path)))
+              (mt:test-set-state-status-by-id run-id my-test-id "COMPLETED" "PREQ_FAIL" "Failed to run due to failed prerequisites2"))
+
+
+            
+            (if (or (not (null? reg))(not (null? tal)))
+                (if (vector? hed)
 		  (begin
 		    (debug:print 1 *default-log-port* "WARNING: Dropping test " test-name "/" item-path
 				 " from the launch list as it has prerequistes that are FAIL")
 		    (let ((test-id (rmt:get-test-id run-id hed "")))
-		      (if test-id (mt:test-set-state-status-by-id run-id test-id "NOT_STARTED" "PREQ_FAIL" "Failed to run due to failed prerequisites")))
+		      (if test-id (mt:test-set-state-status-by-id run-id test-id "COMPLETED" "PREQ_FAIL" "Failed to run due to failed prerequisites")))
 		    (runs:shrink-can-run-more-tests-count runsdat) ;; DELAY TWEAKER (still needed?)
 		    ;; (thread-sleep! *global-delta*)
 		    ;; This next is for the items
-		    (mt:test-set-state-status-by-testname run-id test-name item-path "NOT_STARTED" "BLOCKED" #f)
+
+                    (if (not (null? fails))
+                        ;;(mt:test-set-state-status-by-testname run-id test-name item-path "NOT_STARTED" "PREQ_FAIL" #f)
+                        (rmt:set-state-status-and-roll-up-items run-id test-name item-path "NOT_STARTED" "PREQ_FAIL" #f) 
+                        ;;(mt:test-set-state-status-by-testname run-id test-name item-path "NOT_STARTED" "BLOCKED" #f)
+                        (rmt:set-state-status-and-roll-up-items run-id test-name item-path "NOT_STARTED" "BLOCKED" #f) )
 		    (hash-table-set! test-registry (db:test-make-full-name test-name item-path) 'removed)
-		    (list (runs:queue-next-hed tal reg reglen regfull)
-			  (runs:queue-next-tal tal reg reglen regfull)
-			  (runs:queue-next-reg tal reg reglen regfull)
-			  reruns ;; WAS: (cons hed reruns) ;; but that makes no sense?
-			  ))
-		  (let ((nth-try (hash-table-ref/default test-registry hed 0)))
+		    (runs:loop-values tal reg reglen regfull reruns))
+		  (let ((nth-try (hash-table-ref/default test-registry hed 0))) ;; hed not a vector...
+                    (debug:print 2 *default-log-port* "nth-try("hed")="nth-try)
 		    (cond
 		     ((member "RUNNING" (map db:test-get-state prereqs-not-met))
 		      (if (runs:lownoise (conc "possible RUNNING prerequistes " hed) 60)
 			  (debug:print 0 *default-log-port* "WARNING: test " hed " has possible RUNNING prerequisites, don't give up on it yet."))
-		      (thread-sleep! 4)
-		      (list (runs:queue-next-hed newtal reg reglen regfull)
-			    (runs:queue-next-tal newtal reg reglen regfull)
-			    (runs:queue-next-reg newtal reg reglen regfull)
-			    reruns))
-		     ((or (not nth-try)
+		      (thread-sleep! 0.1)
+		      (runs:loop-values tal reg reglen regfull reruns))
+		     ((or (not nth-try) ;; BB: condition on subsequent tries, condition below fires on first try 
 			  (and (number? nth-try)
-			       (< nth-try 10)))
+			       (< nth-try 2)))
 		      (hash-table-set! test-registry hed (if (number? nth-try)
 							     (+ nth-try 1)
 							     0))
 		      (if (runs:lownoise (conc "not removing test " hed) 60)
 			  (debug:print 1 *default-log-port* "WARNING: not removing test " hed " from queue although it may not be runnable due to FAILED prerequisites"))
 		      ;; may not have processed correctly. Could be a race condition in your test implementation? Dropping test " hed) ;;  " as it has prerequistes that are FAIL. (NOTE: hed is not a vector)")
 		      (runs:shrink-can-run-more-tests-count runsdat) ;; DELAY TWEAKER (still needed?)
-		      ;; (list hed tal reg reruns)
-		      ;; (list (car newtal)(cdr newtal) reg reruns)
-		      ;; (hash-table-set! test-registry hed 'removed)
-		      (list (runs:queue-next-hed newtal reg reglen regfull)
-			    (runs:queue-next-tal newtal reg reglen regfull)
-			    (runs:queue-next-reg newtal reg reglen regfull)
-			    reruns))
-		     ((symbol? nth-try)
+		      (runs:loop-values newtal reg reglen regfull reruns))
+		     ((symbol? nth-try) ;; BB: 'done matches here in one case where prereq itemwait failed.  This is first "try"
 		      (if (eq? nth-try 'removed) ;; removed is removed - drop it NOW
 			  (if (null? tal)
 			      #f ;; yes, really
 			      (list (car tal)(cdr tal) reg reruns))
 			  (begin
 			    (if (runs:lownoise (conc "FAILED prerequisites or other issue" hed) 60)
-				(debug:print 0 *default-log-port* "WARNING: test " hed " has FAILED prerequisites or other issue. Internal state " nth-try " will be overridden and we'll retry."))
-			    (mt:test-set-state-status-by-testname run-id test-name item-path "NOT_STARTED" "KEEP_TRYING" #f)
-			    (hash-table-set! test-registry hed 0)
-			    (list (runs:queue-next-hed newtal reg reglen regfull)
-				  (runs:queue-next-tal newtal reg reglen regfull)
-				  (runs:queue-next-reg newtal reg reglen regfull)
-				  reruns))))
+				(debug:print 0 *default-log-port* "WARNING: test " hed " has FAILED prerequisites or other issue. Internal state >" nth-try "< will be overridden and we'll retry."))
+			    ;; was: (mt:test-set-state-status-by-testname run-id test-name item-path "NOT_STARTED" "KEEP_TRYING" #f)
+                            (mt:test-set-state-status-by-testname run-id test-name item-path "COMPLETED" "PREQ_FAIL" #f)
+			    (hash-table-set! test-registry hed 'removed) ;; was 0
+                            (if (not (and (null? reg) (null? tal)))
+                                (runs:loop-values tal reg reglen regfull reruns)
+                                #f))))
 		     (else
 		      (if (runs:lownoise (conc "FAILED prerequitests and we tried" hed) 60)
 			  (debug:print 0 *default-log-port* "WARNING: test " hed " has FAILED prerequitests and we've tried at least 10 times to run it. Giving up now."))
 		      ;; (debug:print 0 *default-log-port* "         prereqs: " prereqs-not-met)
 		      (hash-table-set! test-registry hed 'removed)
@@ -988,18 +1202,20 @@
 		      (rmt:set-state-status-and-roll-up-items run-id test-name item-path #f "FAIL" #f) ;; treat as FAIL
 		      (list (if (null? tal)(car newtal)(car tal))
 			    tal
 			    reg
 			    reruns)))))
-	      ;; can't drop this - maybe running? Just keep trying
-	      (let ((runable-tests (runs:runable-tests prereqs-not-met)))
-		(if (null? runable-tests)
-		    #f   ;; I think we are truly done here
-		    (list (runs:queue-next-hed newtal reg reglen regfull)
-			    (runs:queue-next-tal newtal reg reglen regfull)
-			    (runs:queue-next-reg newtal reg reglen regfull)
-			    reruns)))))))))
+                ;; ELSE: can't drop this - maybe running? Just keep trying
+
+                ;;(if (not (or (not (null? reg))(not (null? tal)))) ;; old experiment
+                (let ((runable-tests (runs:runable-tests prereqs-not-met))) ;; SUSPICIOUS: Should look at more than just prereqs-not-met?
+                  (if (null? runable-tests)
+                      #f   ;; I think we are truly done here
+                      (runs:loop-values newtal reg reglen regfull reruns)))
+                ;;) ;;from old experiment
+                ) ;; end if (or (not (null? reg))(not (null? tal)))
+            ))))))
 
 ;; scan a list of tests looking to see if any are potentially runnable
 ;;
 (define (runs:runable-tests tests)
   (filter (lambda (t)
@@ -1028,11 +1244,11 @@
    inc-results-fmt: "~12a~12a~20a~12a~40a\n" ;; state status time duration test-name item-path
    run-info: #f
    runname: #f
    target: #f
    )
-)
+  )
 
 (define (runs:incremental-print-results run-id)
   (let ((curr-sec (current-seconds)))
     (if (> (- curr-sec (runs:gendat-inc-results-last-update *runs:general-data*)) 5) ;; at least five seconds since last update
 	(let* ((run-dat  (or (runs:gendat-run-info *runs:general-data*)(rmt:get-run-info run-id)))
@@ -1098,54 +1314,51 @@
 
   ;; Do mark-and-find clean up of db before starting runing of quue
   ;;
   ;; (rmt:find-and-mark-incomplete)
 
-  (let* ((run-info             (rmt:get-run-info run-id))
-	(tests-info            (mt:get-tests-for-run run-id #f '() '())) ;;  qryvals: "id,testname,item_path"))
-	(sorted-test-names     (tests:sort-by-priority-and-waiton test-records))
-	(test-registry         (make-hash-table))
-	(registry-mutex        (make-mutex))
-	(num-retries           0)
-	(max-retries           (config-lookup *configdat* "setup" "maxretries"))
-	(max-concurrent-jobs   (let ((mcj (config-lookup *configdat* "setup"     "max_concurrent_jobs")))
-				 (if (and mcj (string->number mcj))
-				     (string->number mcj)
-				     1))) ;; length of the register queue ahead
-	(reglen                (if (number? reglen-in) reglen-in 1))
-	(last-time-incomplete  (- (current-seconds) 900)) ;; force at least one clean up cycle
-	(last-time-some-running (current-seconds))
-	;; (tdbdat                (tasks:open-db))
-	(runsdat (make-runs:dat
-		  ;; hed: hed
-		  ;; tal: tal
-		  ;; reg: reg
-		  ;; reruns: reruns
-		  reglen: reglen
-		  regfull: #f ;; regfull
-		  ;; test-record: test-record
-		  runname: runname
-		  ;; test-name: test-name
-		  ;; item-path: item-path
-		  ;; jobgroup: jobgroup
-		  max-concurrent-jobs: max-concurrent-jobs
-		  run-id: run-id
-		  ;; waitons: waitons
-		  ;; testmode: testmode
-		  test-patts: test-patts
-		  required-tests: required-tests
-		  test-registry: test-registry
-		  registry-mutex: registry-mutex
-		  flags: flags
-		  keyvals: keyvals
-		  run-info: run-info
-		  ;; newtal: newtal
-		  all-tests-registry: all-tests-registry
-		  ;; itemmaps: itemmaps
-		  ;; prereqs-not-met: (rmt:get-prereqs-not-met run-id waitons hed item-path mode: testmode itemmaps: itemmaps)
-		  ;; can-run-more-tests: (runs:can-run-more-tests run-id jobgroup max-concurrent-jobs) ;; look at the test jobgroup and tot jobs running
-		  )))
+  (let* ((run-info              (rmt:get-run-info run-id))
+         (tests-info            (mt:get-tests-for-run run-id #f '() '())) ;;  qryvals: "id,testname,item_path"))
+         (sorted-test-names     (tests:sort-by-priority-and-waiton test-records))
+         (test-registry         (make-hash-table))
+         (registry-mutex        (make-mutex))
+         (num-retries           0)
+         (max-retries           (config-lookup *configdat* "setup" "maxretries"))
+         (max-concurrent-jobs   (configf:lookup-number *configdat* "setup" "max_concurrent_jobs" default: 50))
+         (reglen                (if (number? reglen-in) reglen-in 1))
+         (last-time-incomplete  (- (current-seconds) 900)) ;; force at least one clean up cycle
+         (last-time-some-running (current-seconds))
+         ;; (tdbdat                (tasks:open-db))
+         (runsdat (make-runs:dat
+                   ;; hed: hed
+                   ;; tal: tal
+                   ;; reg: reg
+                   ;; reruns: reruns
+                   reglen: reglen
+                   regfull: #f ;; regfull
+                   ;; test-record: test-record
+                   runname: runname
+                   ;; test-name: test-name
+                   ;; item-path: item-path
+                   ;; jobgroup: jobgroup
+                   max-concurrent-jobs: max-concurrent-jobs
+                   run-id: run-id
+                   ;; waitons: waitons
+                   ;; testmode: testmode
+                   test-patts: test-patts
+                   required-tests: required-tests
+                   test-registry: test-registry
+                   registry-mutex: registry-mutex
+                   flags: flags
+                   keyvals: keyvals
+                   run-info: run-info
+                   ;; newtal: newtal
+                   all-tests-registry: all-tests-registry
+                   ;; itemmaps: itemmaps
+                   ;; prereqs-not-met: (rmt:get-prereqs-not-met run-id waitons hed item-path mode: testmode itemmaps: itemmaps)
+                   ;; can-run-more-tests: (runs:can-run-more-tests run-id jobgroup max-concurrent-jobs) ;; look at the test jobgroup and tot jobs running
+                   )))
 
     ;; Initialize the test-registery hash with tests that already have a record
     ;; convert state to symbol and use that as the hash value
     (for-each (lambda (trec)
 		(let ((id (db:test-get-id        trec))
@@ -1156,14 +1369,16 @@
 		      (hash-table-set! test-registry (db:test-make-full-name tn ip) (string->symbol st)))))
 	      tests-info)
     (set! max-retries (if (and max-retries (string->number max-retries))(string->number max-retries) 100))
 
     (let loop ((hed         (car sorted-test-names))
-	       (tal         (cdr sorted-test-names))
+               (tal         (cdr sorted-test-names))
 	       (reg         '()) ;; registered, put these at the head of tal 
 	       (reruns      '()))
 
+      
+      
       (runs:incremental-print-results run-id)
 
       (if (not (null? reruns))(debug:print-info 4 *default-log-port* "reruns=" reruns))
 
       ;; Here we mark any old defunct tests as incomplete. Do this every fifteen minutes
@@ -1206,21 +1421,25 @@
 			   newtal:      newtal
 			   itemmaps:    itemmaps
 			   ;; prereqs-not-met: prereqs-not-met
 			   )))
 	(runs:dat-regfull-set! runsdat regfull)
-
+    
+        ;; -- removed BB 17ww28 - no longer needed.
 	;; every 15 minutes verify the server is there for this run
-	(if (and (common:low-noise-print 240 "try start server"  run-id)
-		 (not (server:check-if-running *toppath*)))
-	    (server:kind-run *toppath*))
+	;; (if (and (common:low-noise-print 240 "try start server"  run-id)
+	;; 	 (not (or (and *runremote*
+	;; 		       (remote-server-url *runremote*)
+	;; 		       (server:ping (remote-server-url *runremote*)))
+	;; 		  (server:check-if-running *toppath*))))
+	;;     (server:kind-run *toppath*))
 	
 	(if (> num-running 0)
-	  (set! last-time-some-running (current-seconds)))
+            (set! last-time-some-running (current-seconds)))
 
-      (if (> (current-seconds)(+ last-time-some-running (or (configf:lookup *configdat* "setup" "give-up-waiting") 36000)))
-	  (hash-table-set! *max-tries-hash* tfullname (+ (hash-table-ref/default *max-tries-hash* tfullname 0) 1)))
+        (if (> (current-seconds)(+ last-time-some-running (or (configf:lookup *configdat* "setup" "give-up-waiting") 36000)))
+            (hash-table-set! *max-tries-hash* tfullname (+ (hash-table-ref/default *max-tries-hash* tfullname 0) 1)))
 	;; (debug:print 0 *default-log-port* "max-tries-hash: " (hash-table->alist *max-tries-hash*))
 
 	;; Ensure all top level tests get registered. This way they show up as "NOT_STARTED" on the dashboard
 	;; and it is clear they *should* have run but did not.
 	(if (not (hash-table-ref/default test-registry (db:test-make-full-name test-name "") #f))
@@ -1238,28 +1457,29 @@
 	      (if (or (not (null? tal))(not (null? reg)))
 		  (loop (runs:queue-next-hed tal reg reglen regfull)
 			(runs:queue-next-tal tal reg reglen regfull)
 			(runs:queue-next-reg tal reg reglen regfull)
 			reruns))))
-		  ;; (loop (car tal)(cdr tal) reg reruns))))
+        ;; (loop (car tal)(cdr tal) reg reruns))))
 
 	(runs:incremental-print-results run-id)
 	(debug:print 4 *default-log-port* "TOP OF LOOP => "
 		     "test-name: " test-name
-		     "\n  test-record  " test-record
 		     "\n  hed:         " hed
-		     "\n  itemdat:     " itemdat
+		     "\n  tal:         " tal
+		     "\n  reg:         " reg
+                     "\n  test-record  " test-record
+                     "\n  itemdat:     " itemdat
 		     "\n  items:       " items
 		     "\n  item-path:   " item-path
 		     "\n  waitons:     " waitons
 		     "\n  num-retries: " num-retries
-		     "\n  tal:         " tal
-		     "\n  reruns:      " reruns
+                     "\n  reruns:      " reruns
 		     "\n  regfull:     " regfull
 		     "\n  reglen:      " reglen
 		     "\n  length reg:  " (length reg)
-		     "\n  reg:         " reg)
+                     )
 
 	;; check for hed in waitons => this would be circular, remove it and issue an
 	;; error
 	(if (member test-name waitons)
 	    (begin
@@ -1279,88 +1499,109 @@
 				   (if (and (not (member waiton tal))            ;; this waiton is not in the list to be tried to run
 					    (not (member waiton reruns)))
 				       1
 				       #f))
 				 waitons))))) ;; could do this more elegantly with a marker....
+          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-1")
 	  (debug:print 0 *default-log-port* "WARNING: Marking test " tfullname " as not runnable. It is waiting on tests that cannot be run. Giving up now.")
 	  (hash-table-set! test-registry tfullname 'removed))
 
 	 ;; items is #f then the test is ok to be handed off to launch (but not before)
 	 ;; 
 	 ((not items)
+          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-2")
 	  (debug:print-info 4 *default-log-port* "OUTER COND: (not items)")
 	  (if (and (not (tests:match test-patts (tests:testqueue-get-testname test-record) item-path required: required-tests))
 		   (not (null? tal)))
 	      (loop (car tal)(cdr tal) reg reruns))
 	  (runs:testdat-prereqs-not-met-set! testdat (rmt:get-prereqs-not-met run-id waitons hed item-path mode: testmode itemmaps: itemmaps))
 	  (runs:dat-can-run-more-tests-set! runsdat (runs:can-run-more-tests runsdat run-id jobgroup max-concurrent-jobs)) ;; look at the test jobgroup and tot jobs running
 	  (let ((loop-list (runs:process-expanded-tests runsdat testdat)))
-	      (if loop-list (apply loop loop-list))))
+            (if loop-list (apply loop loop-list))))
 
 	 ;; items processed into a list but not came in as a list been processed
 	 ;;
 	 ((and (list? items)     ;; thus we know our items are already calculated
 	       (not   itemdat))  ;; and not yet expanded into the list of things to be done
+          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-3")
 	  (debug:print-info 4 *default-log-port* "OUTER COND: (and (list? items)(not itemdat))")
 	  ;; Must determine if the items list is valid. Discard the test if it is not.
 	  (if (and (list? items)
 		   (> (length items) 0)
 		   (and (list? (car items))
 			(> (length (car items)) 0))
 		   (debug:debug-mode 1))
 	      (debug:print 2 *default-log-port* (map (lambda (row)
-				    (conc (string-intersperse
-					   (map (lambda (varval)
-						  (string-intersperse varval "="))
-						row)
-					   " ")
-					  "\n"))
-				  items)))
-	  (for-each
-	   (lambda (my-itemdat)
-	     (let* ((new-test-record (let ((newrec (make-tests:testqueue)))
-				       (vector-copy! test-record newrec)
-				       newrec))
-		    (my-item-path (item-list->path my-itemdat)))
-	       (if (tests:match test-patts hed my-item-path required: required-tests) ;; (patt-list-match my-item-path item-patts)           ;; yes, we want to process this item, NOTE: Should not need this check here!
-		   (let ((newtestname (db:test-make-full-name hed my-item-path)))    ;; test names are unique on testname/item-path
-		     (tests:testqueue-set-items!     new-test-record #f)
-		     (tests:testqueue-set-itemdat!   new-test-record my-itemdat)
-		     (tests:testqueue-set-item_path! new-test-record my-item-path)
-		     (hash-table-set! test-records newtestname new-test-record)
-		     (set! tal (append tal (list newtestname))))))) ;; since these are itemized create new test names testname/itempath
-	   items)
-
-	  ;; (debug:print-info 0 *default-log-port* "Test " (tests:testqueue-get-testname test-record) " is itemized but has no items")
+                                                       (conc (string-intersperse
+                                                              (map (lambda (varval)
+                                                                     (string-intersperse varval "="))
+                                                                   row)
+                                                              " ")
+                                                             "\n"))
+                                                     items)))
+
+          (let* ((items-in-testpatt
+                  (filter
+                   (lambda (my-itemdat)
+                     (tests:match test-patts hed (item-list->path my-itemdat) ))
+                   ;; was: (tests:match test-patts hed (item-list->path my-itemdat) required: required-tests))
+                   items) ))
+            (if (null? items-in-testpatt)
+                (let ((test-id   (rmt:get-test-id run-id test-name "")))
+                  (debug:print-info 0 *default-log-port* "Test " (tests:testqueue-get-testname test-record) " is itemized but has no items matching test pattern -- marking status ZERO_ITEMS")
+                  (if test-id
+                      (mt:test-set-state-status-by-id run-id test-id "NOT_STARTED" "ZERO_ITEMS" "This test has no items which match test pattern.")))
+                
+                (for-each (lambda (my-itemdat)
+                            (let* ((new-test-record (let ((newrec (make-tests:testqueue)))
+                                                      (vector-copy! test-record newrec)
+                                                      newrec))
+                                   (my-item-path (item-list->path my-itemdat))
+
+                                   (newtestname (db:test-make-full-name hed my-item-path)))    ;; test names are unique on testname/item-path
+                              (tests:testqueue-set-items!     new-test-record #f)
+                              (tests:testqueue-set-itemdat!   new-test-record my-itemdat)
+                              (tests:testqueue-set-item_path! new-test-record my-item-path)
+                              (hash-table-set! test-records newtestname new-test-record)
+                              (set! tal (append tal (list newtestname)))))  ;; since these are itemized create new test names testname/itempath
+                          items-in-testpatt)))
+          
+          
 
 	  ;; At this point we have possibly added items to tal but all must be handed off to 
 	  ;; INNER COND logic. I think loop without rotating the queue 
 	  ;; (loop hed tal reg reruns))
 	  ;; (let ((newtal (append tal (list hed))))  ;; We should discard hed as it has been expanded into it's items? Yes, but only if this *is* an itemized test
 	  ;; (loop (car newtal)(cdr newtal) reg reruns)
 	  (if (null? tal)
 	      #f
 	      (loop (car tal)(cdr tal) reg reruns)))
-	    
+         
 	 ;; if items is a proc then need to run items:get-items-from-config, get the list and loop 
 	 ;;    - but only do that if resources exist to kick off the job
 	 ;; EXPAND ITEMS
 	 ((or (procedure? items)(eq? items 'have-procedure))
+          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-4")
 	  (let ((can-run-more    (runs:can-run-more-tests runsdat run-id jobgroup max-concurrent-jobs)))
 	    (if (and (list? can-run-more)
 		     (car can-run-more))
-		(let ((loop-list (runs:expand-items hed tal reg reruns regfull newtal jobgroup max-concurrent-jobs run-id waitons item-path testmode test-record can-run-more items runname tconfig reglen test-registry test-records itemmaps)))
+		(let ((loop-list (runs:expand-items hed tal reg reruns regfull newtal jobgroup max-concurrent-jobs run-id waitons item-path testmode test-record can-run-more items runname tconfig reglen test-registry test-records itemmaps))) ;; itemized test expanded here
 		  (if loop-list
-		      (apply loop loop-list)))
+		      (apply loop loop-list)
+                      (debug:print-info 4 *default-log-port* " -- Can't expand hed="hed)
+                      )
+                  )
 		;; if can't run more just loop with next possible test
 		(loop (car newtal)(cdr newtal) reg reruns))))
-	    
+         
 	 ;; this case should not happen, added to help catch any bugs
 	 ((and (list? items) itemdat)
+          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-5")
 	  (debug:print-error 0 *default-log-port* "Should not have a list of items in a test and the itemspath set - please report this")
 	  (exit 1))
 	 ((not (null? reruns))
+          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-6")
 	  (let* ((newlst (tests:filter-non-runnable run-id tal test-records)) ;; i.e. not FAIL, WAIVED, INCOMPLETE, PASS, KILLED,
 		 (junked (lset-difference equal? tal newlst)))
 	    (debug:print-info 4 *default-log-port* "full drop through, if reruns is less than 100 we will force retry them, reruns=" reruns ", tal=" tal)
 	    (if (< num-retries max-retries)
 		(set! newlst (append reruns newlst)))
@@ -1368,20 +1609,24 @@
 	    ;; (thread-sleep! (+ 1 *global-delta*))
 	    (if (not (null? newlst))
 		;; since reruns have been tacked on to newlst create new reruns from junked
 		(loop (car newlst)(cdr newlst) reg (delete-duplicates junked)))))
 	 ((not (null? tal))
+          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-7")
 	  (debug:print-info 4 *default-log-port* "I'm pretty sure I shouldn't get here."))
 	 ((not (null? reg)) ;; could we get here with leftovers?
+          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-8")
 	  (debug:print-info 0 *default-log-port* "Have leftovers!")
 	  (loop (car reg)(cdr reg) '() reruns))
 	 (else
+          (debug:print-info 4 *default-log-port* "cond branch - "  "rtq-9")
 	  (debug:print-info 4 *default-log-port* "Exiting loop with...\n  hed=" hed "\n  tal=" tal "\n  reruns=" reruns))
-	 )))
+	 ))) ;; end loop on sorted test names
+    
     ;; now *if* -run-wait we wait for all tests to be done
     ;; Now wait for any RUNNING tests to complete (if in run-wait mode)
-    (thread-sleep! 5) ;; I think there is a race condition here. Let states/statuses settle
+    (thread-sleep! 10) ;; I think there is a race condition here. Let states/statuses settle
     (let wait-loop ((num-running      (rmt:get-count-tests-running-for-run-id run-id))
 		    (prev-num-running 0))
       ;; (debug:print-info 13 *default-log-port* "num-running=" num-running ", prev-num-running=" prev-num-running)
       (if (and (or (args:get-arg "-run-wait")
 		   (equal? (configf:lookup *configdat* "setup" "run-wait") "yes"))
@@ -1399,21 +1644,24 @@
 	    (thread-sleep! 5)
 	    ;; (wait-loop (rmt:get-count-tests-running-for-run-id run-id) num-running))))
 	    (wait-loop (rmt:get-count-tests-running-for-run-id run-id) num-running))))
     ;; LET* ((test-record
     ;; we get here on "drop through". All done!
+    ;; this is moved to runs:run-testes since this function is getting called twice to ensure everthing is completed. 
+    ;; (debug:print-info 0 *default-log-port* "Calling Post Hook")    
+    ;; (runs:run-post-hook run-id)
     (debug:print-info 1 *default-log-port* "All tests launched")))
 
 (define (runs:calc-fails prereqs-not-met)
   (filter (lambda (test)
 	    (and (vector? test) ;; not (string? test))
-		 (member (db:test-get-state test) '("INCOMPLETE" "COMPLETED"))
+		 (member (db:test-get-state test) '("INCOMPLETE" "COMPLETED")) ;; TODO: pull from *common:stuff...*
 		 (not (member (db:test-get-status test)
 			      '("PASS" "WARN" "CHECK" "WAIVED" "SKIP")))))
 	  prereqs-not-met))
 
-(define (runs:calc-prereq-fail prereqs-not-met)
+(define (runs:calc-prereq-fail prereqs-not-met) ;; REMOVEME since NOT_STARTED/PREQ_FAIL is now COMPLETED/PREQ_FAIL
   (filter (lambda (test)
 	    (and (vector? test) ;; not (string? test))
 		 (equal? (db:test-get-state test) "NOT_STARTED")
 		 (not (member (db:test-get-status test)
 			      '("n/a" "KEEP_TRYING")))))
@@ -1490,12 +1738,12 @@
     ;; per-test call is not needed. Given the delicacy of the move to 
     ;; v1.55 this code is being left in place for the time being.
     ;;
     (if (not (hash-table-ref/default *test-meta-updated* test-name #f))
         (begin
-	   (hash-table-set! *test-meta-updated* test-name #t)
-           (runs:update-test_meta test-name test-conf)))
+          (hash-table-set! *test-meta-updated* test-name #t)
+          (runs:update-test_meta test-name test-conf)))
     
     ;; itemdat => ((ripeness "overripe") (temperature "cool") (season "summer"))
     (let* ((new-test-path (string-intersperse (cons test-path (map cadr itemdat)) "/"))
 	   (test-id       (rmt:get-test-id run-id test-name item-path))
 	   (testdat       (if test-id (rmt:get-test-info-by-id run-id test-id) #f)))
@@ -1523,11 +1771,11 @@
 		  (thread-sleep! 1)
 		  (loop)))))
       (if (not testdat) ;; should NOT happen
 	  (debug:print-error 0 *default-log-port* "failed to get test record for test-id " test-id))
       (set! test-id (db:test-get-id testdat))
-      (if (file-exists? test-path)
+      (if (common:file-exists? test-path)
 	  (change-directory test-path)
 	  (begin
 	    (debug:print-error 0 *default-log-port* "test run path not created before attempting to run the test. Perhaps you are running -remove-runs at the same time?")
 	    (change-directory *toppath*)))
       (case (if force ;; (args:get-arg "-force")
@@ -1674,19 +1922,97 @@
      (+ 1 x))
    0 real-dir)
   ;; then the entire directory
   (runs:recursive-delete-with-error-msg real-dir))
 
+;; cleanup often needs to remove all but the last N runs per target
+;;
+;; target-patts a1/b1/c1,a2/b2/c2 ...
+;;
+;; This will fail if called with empty target or a bad target (i.e. missing or extra fields)
+;;
+(define (runs:get-hash-by-target target-patts runpatt)
+  (let* ((targets (string-split target-patts ","))
+	 (keys    (rmt:get-keys))
+	 (res-ht  (make-hash-table))) ;; target -> ( runrecord1 runrecord2 ... )
+    (for-each
+     (lambda (target-patt)
+       (let ((runs     (rmt:simple-get-runs runpatt #f #f target-patt)))
+	 (for-each
+	  (lambda (run)
+	    (let ((target (simple-run-target run)))
+	      (hash-table-set! res-ht target (cons run (hash-table-ref/default res-ht target '())))))
+	  runs)))
+     targets)
+    res-ht))
+
+;; delete runs older than X (weeks, days, months years etc.)
+;; delete redundant runs within a target - N is the input
+;; delete redundant runs within a target IFF older than given date/time AND keep at least N
+;; 
+(define (runs:remove-all-but-last-n-runs-per-target target-patts runpatt num-to-keep #!key (actions '(print)))
+  (let* ((runs-ht  (runs:get-hash-by-target target-patts runpatt))
+	 (age      (if (args:get-arg "-age")(common:hms-string->seconds (args:get-arg "-age")) #f))
+	 (age-mark (if age (- (current-seconds) age) (+ (current-seconds) 86400)))
+	 (precmd   (or (args:get-arg "-precmd") "")))
+    (print "Actions: " actions)
+    (for-each
+     (lambda (target)
+       (let* ((runs      (hash-table-ref runs-ht target))
+	      (sorted    (sort runs (lambda (a b)(< (simple-run-event_time a)(simple-run-event_time b)))))
+	      (to-remove (let* ((len      (length sorted))
+                                (trim-amt (- len num-to-keep)))
+                           (if (> trim-amt 0)
+                               (take sorted trim-amt)
+                               '()))))
+	 (hash-table-set! runs-ht target to-remove)
+         (print target ":")
+         (for-each
+          (lambda (run)
+            (let ((remove (member run to-remove (lambda (a b)
+                                                  (eq? (simple-run-id a)
+                                                       (simple-run-id b))))))
+	      (if (and age (> (simple-run-event_time run) age-mark))
+		  (print "Skipping handling of " target "/" (simple-run-runname run) " as it is younger than " (args:get-arg "-age"))
+		  (for-each
+		   (lambda (action)
+		     (case action
+		       ((print)
+			(print " " (simple-run-runname run)
+			       " " (time->string (seconds->local-time (simple-run-event_time run)) "WW%V.%u %H:%M:%S")
+			       " " (if remove "REMOVE" "")))
+		       ((remove-runs)
+			(if remove (system (conc precmd " megatest -remove-runs -target " target " -runname " (simple-run-runname run) " -testpatt %"))))
+		       ((archive)
+			(if remove (system (conc precmd " megatest -archive save-remove -target " target " -runname " (simple-run-runname run) " -testpatt %"))))))
+		   actions))))
+          sorted)))
+     ;; (print "Sorted: " (map simple-run-event_time sorted))
+     ;; (print "Remove: " (map simple-run-event_time to-remove))))
+     (hash-table-keys runs-ht))
+    runs-ht))
+
+;; (define (runs:remove-all-but-last-n-runs-per-target target-patts runpatt num-to-keep)
+;;   (let ((data (runs:get-all-but-most-recent-n-per-target target-patts runpatt num-to-keep)))
+;;     (for-each
+;;      (lambda (target)
+;;        (let ((runs-to-remove (hash-table-ref data target )))
+;;          (for-each
+;;           (lambda (run)
+;;             (print "megatest -remove-runs -target " target " -runname " (simple-run-runname run) " -testpatt %"))
+;;           runs-to-remove)))
+;;      (hash-table-keys data))))
+
 ;; Remove runs
 ;; fields are passing in through 
 ;; action:
 ;;    'remove-runs
 ;;    'set-state-status
 ;;
 ;; NB// should pass in keys?
 ;;
-(define (runs:operate-on action target runnamepatt testpatt #!key (state #f)(status #f)(new-state-status #f)(mode 'remove-all)(options '()))
+(define (runs:operate-on action target runnamepatt testpatt #!key (state #f)(status #f)(new-state-status #f)(mode #f)(options '()))
   (common:clear-caches) ;; clear all caches
   (let* ((db           #f)
 	 ;; (tdbdat       (tasks:open-db))
 	 (keys         (rmt:get-keys))
 	 (rundat       (mt:get-runs-by-patt keys runnamepatt target))
@@ -1694,20 +2020,20 @@
 	 (runs         (vector-ref rundat 1))
 	 (states       (if state  (string-split state  ",") '()))
 	 (statuses     (if status (string-split status ",") '()))
 	 (state-status (if (string? new-state-status) (string-split new-state-status ",") '(#f #f)))
 	 (rp-mutex     (make-mutex))
-	 (bup-mutex    (make-mutex)))
+	 (bup-mutex    (make-mutex))
+         (keep-records (args:get-arg "-keep-records"))) ;; used in conjunction with -remove-runs to keep the records, TODO: consolidate this with "mode".
 
-    (let* ((write-access-actions '(remove-runs set-state-status archive run-wait))
+    (let* ((write-access-actions '(remove-runs set-state-status archive run-wait kill-runs))
            (dbfile             (conc  *toppath* "/megatest.db"))
            (readonly-mode      (not (file-write-access? dbfile))))
       (when (and readonly-mode
                  (member action write-access-actions))
         (debug:print-error 0 *default-log-port* "megatest.db is readonly.  Cannot proceed with action ["action"] in which write-access isrequired .")
         (exit 1)))
-
     
     (debug:print-info 4 *default-log-port* "runs:operate-on => Header: " header " action: " action " new-state-status: " new-state-status)
     (if (> 2 (length state-status))
 	(begin
 	  (debug:print-error 0 *default-log-port* "the parameter to -set-state-status is a comma delimited string. E.g. COMPLETED,FAIL")
@@ -1716,16 +2042,16 @@
      (lambda (run)
        (let ((runkey (string-intersperse (map (lambda (k)
 						(db:get-value-by-header run header k)) keys) "/"))
 	     (dirs-to-remove (make-hash-table))
 	     (proc-get-tests (lambda (run-id)
-			      (mt:get-tests-for-run run-id
-						    testpatt states statuses
-						    not-in:  #f
-						    sort-by: (case action
-							       ((remove-runs) 'rundir)
-							       (else          'event_time))))))
+                               (mt:get-tests-for-run run-id
+                                                     testpatt states statuses
+                                                     not-in:  #f
+                                                     sort-by: (case action
+                                                                ((remove-runs) 'rundir)
+                                                                (else          'event_time))))))
 	 (let* ((run-id    (db:get-value-by-header run header "id"))
 		(run-state (db:get-value-by-header run header "state"))
 		(run-name  (db:get-value-by-header run header "runname"))
 		(tests     (if (not (equal? run-state "locked"))
 			       (proc-get-tests run-id)
@@ -1734,16 +2060,19 @@
 		(worker-thread #f))
 	   (debug:print-info 4 *default-log-port* "runs:operate-on run=" run ", header=" header)
 	   (if (not (null? tests))
 	       (begin
 		 (case action
+                   ((kill-runs)
+                    (tasks:kill-runner target run-name "%")
+                    (debug:print 1 *default-log-port* "Killing tests for run: " runkey " " (db:get-value-by-header run header "runname"))
+                    )
 		   ((remove-runs)
 		    ;; (if (tasks:need-server run-id)(tasks:start-and-wait-for-server tdbdat run-id 10))
 		    ;; seek and kill in flight -runtests with % as testpatt here
 		    ;; (if (equal? testpatt "%")
 		    (tasks:kill-runner target run-name testpatt)
-		    
 		    ;; (debug:print 0 *default-log-port* "not attempting to kill any run launcher processes as testpatt is " testpatt))
 		    (debug:print 1 *default-log-port* "Removing tests for run: " runkey " " (db:get-value-by-header run header "runname")))
 		   ((set-state-status)
 		    ;; (if (tasks:need-server run-id)(tasks:start-and-wait-for-server tdbdat run-id 10))
 		    (debug:print 1 *default-log-port* "Modifying state and staus for tests for run: " runkey " " (db:get-value-by-header run header "runname")))
@@ -1752,18 +2081,22 @@
 		    action)
 		   ((run-wait)
 		    (debug:print 1 *default-log-port* "Waiting for run " runkey ", run=" runnamepatt " to complete"))
 		   ((archive)
 		    (debug:print 1 *default-log-port* "Archiving/restoring (" (args:get-arg "-archive") ") data for run: " runkey " " (db:get-value-by-header run header "runname"))
-		    (set! worker-thread (make-thread (lambda ()
-						       (case (string->symbol (args:get-arg "-archive"))
-							 ((save save-remove keep-html)(archive:run-bup (args:get-arg "-archive") run-id run-name tests rp-mutex bup-mutex))
-							 ((restore)(archive:bup-restore (args:get-arg "-archive") run-id run-name tests rp-mutex bup-mutex))
-							 (else 
-							  (debug:print-error 0 *default-log-port* "unrecognised sub command to -archive. Run \"megatest\" to see help")
-							  (exit))))
-						     "archive-bup-thread"))
+		    (set! worker-thread
+			  (make-thread
+			   (lambda ()
+			     (case (string->symbol (args:get-arg "-archive"))
+			       ((save save-remove keep-html)
+				(archive:run-bup (args:get-arg "-archive") run-id run-name tests rp-mutex bup-mutex))
+			       ((restore)
+				(archive:bup-restore (args:get-arg "-archive") run-id run-name tests rp-mutex bup-mutex))
+			       (else 
+				(debug:print-error 0 *default-log-port* "unrecognised sub command to -archive. Run \"megatest\" to see help")
+				(exit))))
+			   "archive-bup-thread"))
 		    (thread-start! worker-thread))
 		   (else
 		    (debug:print-info 0 *default-log-port* "action not recognised " action)))
 		 
 		 ;; actions that operate on one test at a time can be handled below
@@ -1777,10 +2110,13 @@
 								     (if (and (string? dira)(string? dirb))
 									 (> (string-length dira)(string-length dirb))
 									 #f))))))
 		       (toplevel-retries (make-hash-table)) ;; try three times to loop through and remove top level tests
 		       (test-retry-time  (make-hash-table))
+                       (backgrounded-remove-status     (make-hash-table))
+                       (backgrounded-remove-last-visit (make-hash-table))
+                       (backgrounded-remove-result     (make-hash-table))
 		       (allow-run-time   10)) ;; seconds to allow for killing tests before just brutally killing 'em
 		   (let loop ((test (car sorted-tests))
 			      (tal  (cdr sorted-tests)))
 		     (let* ((test-id       (db:test-get-id test))
 			    (new-test-dat  (rmt:get-test-info-by-id run-id test-id)))
@@ -1792,91 +2128,192 @@
 			   (let* ((item-path     (db:test-get-item-path new-test-dat))
 				  (test-name     (db:test-get-testname new-test-dat))
 				  (run-dir       ;;(filedb:get-path *fdb*
 				   ;; (rmt:sdb-qry 'getid 
 				   (db:test-get-rundir new-test-dat)) ;; )    ;; run dir is from the link tree
+                                  (has-subrun    (and (subrun:subrun-test-initialized? run-dir)
+                                                      (not (subrun:subrun-removed? run-dir))))
 				  (test-state    (db:test-get-state new-test-dat))
 				  (test-fulln    (db:test-get-fullname new-test-dat))
 				  (uname         (db:test-get-uname    new-test-dat))
 				  (toplevel-with-children (and (db:test-get-is-toplevel test)
 							       (> (rmt:test-toplevel-num-items run-id test-name) 0))))
 			     (case action
 			       ((remove-runs)
 				;; if the test is a toplevel-with-children issue an error and do not remove
-				(if toplevel-with-children
-				    (begin
-				      (debug:print 0 *default-log-port* "WARNING: skipping removal of " test-fulln " with run-id " run-id " as it has sub tests")
-				      (hash-table-set! toplevel-retries test-fulln (+ (hash-table-ref/default toplevel-retries test-fulln 0) 1))
-				      (if (> (hash-table-ref toplevel-retries test-fulln) 3)
-					  (if (not (null? tal))
-					      (loop (car tal)(cdr tal))) ;; no else clause - drop it if no more in queue and > 3 tries
-					  (let ((newtal (append tal (list test))))
-					    (loop (car newtal)(cdr newtal))))) ;; loop with test still in queue
-				    (begin
-				      (debug:print-info 0 *default-log-port* "test: " test-name " itest-state: " test-state)
-				      (if (member test-state (list "RUNNING" "LAUNCHED" "REMOTEHOSTSTART" "KILLREQ"))
-					  (begin
-					    (if (not (hash-table-ref/default test-retry-time test-fulln #f))
-						(begin
-						  ;; want to set to REMOVING BUT CANNOT do it here?
-						  (hash-table-set! test-retry-time test-fulln (current-seconds))))
-					    (if (> (- (current-seconds)(hash-table-ref test-retry-time test-fulln)) allow-run-time)
-						;; This test is not in a correct state for cleaning up. Let's try some graceful shutdown steps first
-						;; Set the test to "KILLREQ" and wait five seconds then try again. Repeat up to five times then give
-						;; up and blow it away.
-						(begin
-						  (debug:print 0 *default-log-port* "WARNING: could not gracefully remove test " test-fulln ", tried to kill it to no avail. Forcing state to FAILEDKILL and continuing")
-					    (mt:test-set-state-status-by-id run-id (db:test-get-id test) "FAILEDKILL" "n/a" #f)
-						  (thread-sleep! 1))
-						(begin
-					    (mt:test-set-state-status-by-id run-id (db:test-get-id test) "KILLREQ" "n/a" #f)
-						  (thread-sleep! 1)))
-					    ;; NOTE: This is suboptimal as the testdata will be used later and the state/status may have changed ...
-					    (if (null? tal)
-						(loop new-test-dat tal)
-						(loop (car tal)(append tal (list new-test-dat)))))
-					  (begin
-					    (runs:remove-test-directory new-test-dat mode) ;; 'remove-all)
-					    (if (not (null? tal))
-						(loop (car tal)(cdr tal)))))))
-				(rmt:update-run-stats run-id (rmt:get-raw-run-stats run-id)))
-			       ((set-state-status)
-				(debug:print-info 2 *default-log-port* "new state " (car state-status) ", new status " (cadr state-status))
-				(mt:test-set-state-status-by-id run-id (db:test-get-id test) (car state-status)(cadr state-status) #f)
+				(cond
+                                 (toplevel-with-children
+                                  (debug:print 0 *default-log-port* "WARNING: skipping removal of " test-fulln " with run-id " run-id " as it has sub tests")
+                                  (hash-table-set! toplevel-retries test-fulln (+ (hash-table-ref/default toplevel-retries test-fulln 0) 1))
+                                  (if (> (hash-table-ref toplevel-retries test-fulln) 3)
+                                      (if (not (null? tal))
+                                          (loop (car tal)(cdr tal))) ;; no else clause - drop it if no more in queue and > 3 tries
+                                      (let ((newtal (append tal (list test))))
+                                        (loop (car newtal)(cdr newtal))))) ;; loop with test still in queue
+                                 (has-subrun
+                                  ;; 
+                                  (let ((last-visit (hash-table-ref/default backgrounded-remove-last-visit test-fulln 0))
+                                        (now        (current-seconds))
+                                        (rem-status (hash-table-ref/default backgrounded-remove-status test-fulln 'not-started)))
+                                    (case rem-status
+                                      ((not-started)
+                                       (debug:print 0 *default-log-port* "WARNING: postponing removal of " test-fulln " with run-id " run-id " as it has a subrun")
+                                       (hash-table-set! backgrounded-remove-status test-fulln 'started)
+                                       (hash-table-set! backgrounded-remove-last-visit test-fulln (current-seconds))
+                                       (common:send-thunk-to-background-thread
+                                        (lambda ()
+                                          (let* ((subrun-remove-succeeded
+                                                  (subrun:remove-subrun run-dir keep-records)))
+                                            (hash-table-set! backgrounded-remove-result test-fulln subrun-remove-succeeded)
+                                            (hash-table-set! backgrounded-remove-status test-fulln 'done)))
+                                        name: (conc "remove-subrun:"test-fulln))
+                                       
+                                       ;; send to back of line, loop
+                                       (let ((newtal (append tal (list test))))
+                                        (loop (car newtal)(cdr newtal)))
+                                       )
+                                      ((started)
+                                       ;; if last visit was within last second, sleep 1 second
+                                       (if (< (- now last-visit) 1.0)
+                                           (thread-sleep! 1.0))
+                                       (hash-table-set! backgrounded-remove-last-visit test-fulln (current-seconds))
+                                       ;; send to back of line, loop
+                                       (let ((newtal (append tal (list test))))
+                                         (loop (car newtal)(cdr newtal)))
+                                       )
+                                      ((done)
+                                       ;; drop this one; if remaining, loop, else finish
+                                       (hash-table-set! backgrounded-remove-last-visit test-fulln (current-seconds))
+                                       (let ((subrun-remove-succeeded (hash-table-ref/default backgrounded-remove-result test-fulln 'exception)))
+                                         (cond
+                                          ((eq? subrun-remove-succeeded 'exception)
+                                           (let* ((logfile (subrun:get-log-path run-dir "remove")))
+                                             (debug:print 0 *default-log-port* "ERROR: removing subrun of of " test-fulln " with run-id " run-id " ; see logfile @ "logfile))
+					   (if (not (null? tal))
+					       (loop (car tal)(cdr tal))))
+					  (subrun-remove-succeeded
+					   (debug:print 0 *default-log-port* "Now removing of " test-fulln " with run-id " run-id " since subrun was removed.")
+					   ;;(runs:remove-test-directory new-test-dat mode) ;; let normal case handle this. it will go thru loop again as non-subrun
+					   (let ((newtal (append tal (list test))))
+					     (loop (car newtal)(cdr newtal))))
+					  (else
+					   (let* ((logfile (subrun:get-log-path run-dir "remove")))
+					     (debug:print 0 *default-log-port* "WARNING: removal of subrun failed.  Please check "logfile" for details."))
+					   ;; send to back of line, loop (will not match has-subrun next time through)
+					    (if (not (null? tal))
+						(loop (car tal)(cdr tal))))))
+				       )
+				      ) ; end case rem-status
+                                    ) ; end let
+                                  ); end cond has-subrun
+
+                                 (else
+                                  ;; BB - TODO - consider backgrounding to threads to delete tests (work below) 
+                                  (debug:print-info 0 *default-log-port* "test: " test-name " itest-state: " test-state)
+                                  (if (member test-state (list "RUNNING" "LAUNCHED" "REMOTEHOSTSTART" "KILLREQ"))
+                                      (begin
+                                        (if (not (hash-table-ref/default test-retry-time test-fulln #f))
+                                            (begin
+                                              ;; want to set to REMOVING BUT CANNOT do it here?
+                                              (hash-table-set! test-retry-time test-fulln (current-seconds))))
+                                        (if (> (- (current-seconds)(hash-table-ref test-retry-time test-fulln)) allow-run-time)
+                                            ;; This test is not in a correct state for cleaning up. Let's try some graceful shutdown steps first
+                                            ;; Set the test to "KILLREQ" and wait five seconds then try again. Repeat up to five times then give
+                                            ;; up and blow it away.
+                                            (begin
+                                              (debug:print 0 *default-log-port* "WARNING: could not gracefully remove test " test-fulln ", tried to kill it to no avail. Forcing state to FAILEDKILL and continuing")
+                                              (mt:test-set-state-status-by-id run-id (db:test-get-id test) "FAILEDKILL" "n/a" #f)
+                                              (thread-sleep! 1))
+                                            (begin
+                                              (mt:test-set-state-status-by-id run-id (db:test-get-id test) "KILLREQ" "n/a" #f)
+                                              (thread-sleep! 1)))
+                                        ;; NOTE: This is suboptimal as the testdata will be used later and the state/status may have changed ...
+                                        (if (null? tal)
+                                            (loop new-test-dat tal)
+                                            (loop (car tal)(append tal (list new-test-dat)))))
+                                      (begin
+                                        (runs:remove-test-directory new-test-dat mode) ;; 'remove-all)
+                                        (if (not (null? tal))
+                                            (loop (car tal)(cdr tal)))))))
+				(rmt:update-run-stats run-id (rmt:get-raw-run-stats run-id)))
+                               ((kill-runs)
+                                ;; RUNNING -> KILLREQ
+                                ;; LAUNCHED,RUNNING,REMOTEHOSTSTART -> NOT STARTED
+                                (cond
+                                 ((and has-subrun (member test-state (list "RUNNING" "LAUNCHED" "REMOTEHOSTSTART" "KILLREQ")))
+                                  (common:send-thunk-to-background-thread
+                                   (lambda ()
+                                     (let* ((subrun-remove-succeeded
+                                             (subrun:kill-subrun run-dir keep-records)))
+                                       #t)))
+                                  (if (not (null? tal))
+				    (loop (car tal)(cdr tal)))
+                                  )
+                                 ((member test-state (list "RUNNING" "LAUNCHED" "REMOTEHOSTSTART" "KILLREQ"))
+                                  (debug:print 1 *default-log-port* "INFO: issuing killreq to test "test-fulln)
+                                  (mt:test-set-state-status-by-id run-id (db:test-get-id test) "KILLREQ" "n/a" #f)
+                                  (if (not (null? tal))
+				      (loop (car tal)(cdr tal))))
+                                 (else
+                                  (if (not (null? tal))
+				      (loop (car tal)(cdr tal)))
+                                  )))
+			       ((set-state-status)
+                                (let* ((new-state (car state-status))
+                                       (new-status (cadr state-status))
+                                       (test-id (db:test-get-id test))
+                                       (test-run-dir (db:test-get-rundir new-test-dat))
+                                       (has-subrun (and (subrun:subrun-test-initialized? test-run-dir)
+                                                      (not (subrun:subrun-removed? test-run-dir)))))
+                                  (when has-subrun
+                                     (common:send-thunk-to-background-thread
+                                        (lambda ()
+                                          (subrun:set-state-status test-run-dir state status new-state-status)
+                                          )
+                                        )
+                                    )
+                                  (debug:print-info 2 *default-log-port* "new state " new-state ", new status " new-status )
+                                  (mt:test-set-state-status-by-id run-id test-id new-state new-status #f))
 				(if (not (null? tal))
 				    (loop (car tal)(cdr tal))))
 			       ((run-wait)
+                                ;; BB TODO - manage has-subrun case
 				(debug:print-info 2 *default-log-port* "still waiting, " (length tests) " tests still running")
 				(thread-sleep! 10)
 				(let ((new-tests (proc-get-tests run-id)))
 				  (if (null? new-tests)
 				      (debug:print-info 1 *default-log-port* "Run completed according to zero tests matching provided criteria.")
 				      (loop (car new-tests)(cdr new-tests)))))
 			       ((archive)
+                                ;; BB TODO - manage has-subrun case
 				(if (and run-dir (not toplevel-with-children))
 				    (let ((ddir (conc run-dir "/")))
 				      (case (string->symbol (args:get-arg "-archive"))
 					((save save-remove keep-html)
-					 (if (file-exists? ddir)
+					 (if (common:file-exists? ddir)
 					     (debug:print-info 0 *default-log-port* "Estimating disk space usage for " test-fulln ": " (common:get-disk-space-used ddir)))))))
 				(if (not (null? tal))
 				    (loop (car tal)(cdr tal))))
 			       )))
 		       )
-		     (if worker-thread (thread-join! worker-thread))))))
+		     (if worker-thread (thread-join! worker-thread)))
+                   (common:join-backgrounded-threads))))
 	   ;; remove the run if zero tests remain
 	   (if (eq? action 'remove-runs)
-	       (let ((remtests (mt:get-tests-for-run (db:get-value-by-header run header "id") #f '("DELETED") '("n/a") not-in: #t)))
+	       (let* ((run-id   (db:get-value-by-header run header "id")) ;; NB// masks run-id from above?
+                      (remtests (mt:get-tests-for-run run-id #f '("DELETED") '("n/a") not-in: #t)))
 		 (if (null? remtests) ;; no more tests remaining
 		     (let* ((dparts  (string-split lasttpath "/"))
 			    (runpath (conc "/" (string-intersperse 
 						(take dparts (- (length dparts) 1))
 						"/"))))
 		       (debug:print 1 *default-log-port* "Removing run: " runkey " " (db:get-value-by-header run header "runname") " and related record")
-		       (rmt:delete-run run-id)
-		       (rmt:delete-old-deleted-test-records)
-		       ;; (rmt:set-var "DELETED_TESTS" (current-seconds))
+                       (if (not keep-records)
+                           (begin
+                             (rmt:delete-run run-id)
+                             (rmt:delete-old-deleted-test-records)))
+                           ;; (rmt:set-var "DELETED_TESTS" (current-seconds))
 		       ;; need to figure out the path to the run dir and remove it if empty
 		       ;;    (if (null? (glob (conc runpath "/*")))
 		       ;;        (begin
 		       ;; 	 (debug:print 1 *default-log-port* "Removing run dir " runpath)
 		       ;; 	 (system (conc "rmdir -p " runpath))))
@@ -1887,25 +2324,41 @@
     )
   #t)
 
 (define (runs:remove-test-directory test mode) ;; remove-data-only)
   (let* ((run-dir       (db:test-get-rundir test))    ;; run dir is from the link tree
-	 (real-dir      (if (file-exists? run-dir)
+	 (real-dir      (if (common:file-exists? run-dir)
 			    ;; (resolve-pathname run-dir)
 			    (common:nice-path run-dir)
-			    #f)))
-    (case mode
+			    #f))
+         (clean-mode    (or mode 'remove-all))
+         (test-id       (db:test-get-id test))
+        ;; (lock-key      (conc "test-" test-id))
+        ;; (got-lock      (let loop ((lock        (rmt:no-sync-get-lock lock-key))
+	;; 			     (expire-time (+ (current-seconds) 30))) ;; give up on getting the lock and steal it after 15 seconds
+	;; 		    (if (car lock)
+	;; 			#t
+	;; 			(if (> (current-seconds) expire-time)
+	;; 			    (begin
+	;; 			      (debug:print-info 0 *default-log-port* "Timed out waiting for a lock to clean test with id " test-id)
+	;; 			      (rmt:no-sync-del! lock-key) ;; destroy the lock
+	;; 			      (loop (rmt:no-sync-get-lock lock-key) expire-time)) ;; 
+	;; 			    (begin
+	;; 			      (thread-sleep! 1)
+	 ;; 			      (loop (rmt:no-sync-get-lock lock-key) expire-time)))))))
+	 )
+    (case clean-mode
       ((remove-data-only)(mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) "CLEANING" "LOCKED" #f))
       ((remove-all)      (mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) "REMOVING" "LOCKED" #f))
       ((archive-remove)  (mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) "ARCHIVE_REMOVING" #f #f)))
     (debug:print-info 1 *default-log-port* "Attempting to remove " (if real-dir (conc " dir " real-dir " and ") "") " link " run-dir)
     (if (and real-dir 
 	     (> (string-length real-dir) 5)
-	     (file-exists? real-dir)) ;; bad heuristic but should prevent /tmp /home etc.
+	     (common:file-exists? real-dir)) ;; bad heuristic but should prevent /tmp /home etc.
 	(begin ;; let* ((realpath (resolve-pathname run-dir)))
 	  (debug:print-info 1 *default-log-port* "Recursively removing " real-dir)
-	  (if (file-exists? real-dir)
+	  (if (common:file-exists? real-dir)
 	      (runs:safe-delete-test-dir real-dir)
 	      (debug:print 0 *default-log-port* "WARNING: test dir " real-dir " appears to not exist or is not readable")))
 	(if real-dir 
 	    (debug:print 0 *default-log-port* "WARNING: directory " real-dir " does not exist")
 	    (debug:print 0 *default-log-port* "WARNING: no real directory corrosponding to link " run-dir ", nothing done")))
@@ -1927,14 +2380,16 @@
 		     (not (member run-dir (list "n/a" "/tmp/badname"))))
 		(debug:print 0 *default-log-port* "WARNING: not removing " run-dir " as it either doesn't exist or is not a symlink")
 		(debug:print 0 *default-log-port* "NOTE: the run dir for this test is undefined. Test may have already been deleted."))
 	    ))
     ;; Only delete the records *after* removing the directory. If things fail we have a record 
-    (case mode
-      ((remove-data-only)(mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) "NOT_STARTED" "n/a" #f))
+    (case clean-mode
+      ((remove-data-only)(mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) (db:test-get-state test)(db:test-get-status test) #f))
       ((archive-remove)  (mt:test-set-state-status-by-id (db:test-get-run_id test)(db:test-get-id test) "ARCHIVED" #f #f))
-      (else (rmt:delete-test-records (db:test-get-run_id test) (db:test-get-id test))))))
+      (else (rmt:delete-test-records (db:test-get-run_id test) (db:test-get-id test))))
+    ;; (rmt:no-sync-del! lock-key)
+    ))
 
 ;;======================================================================
 ;; Routines for manipulating runs
 ;;======================================================================
 
@@ -1954,11 +2409,12 @@
       (let (;; (db   #f)
 	    (keys #f))
 	(if (launch:setup)
 	    (begin
 	      (full-runconfigs-read) ;; cache the run config
-	      (launch:cache-config)) ;; do not cache here - need to be sure runconfigs is processed
+	      ;; (launch:cache-config) ;; there are two independent config cache locations, turning this one off for now. MRW.
+	      ) ;; do not cache here - need to be sure runconfigs is processed
 	    (begin 
 	      (debug:print 0 *default-log-port* "Failed to setup, exiting")
 	      (exit 1)))
 
         
@@ -2034,14 +2490,16 @@
 ;;
 (define (runs:get-tests-matching-tags tagpatt)
   (let* ((tagdata (rmt:get-tests-tags))
          (res     '())) ;; list of tests that match one or more tags
     (for-each
-     (lambda (tag)
+     (lambda (row)
+       (let* ((tag (car row))
+              (tests (cdr row)))
        (if (patt-list-match tag tagpatt)
-           (set! res (append (hash-table-ref tagdata tag) res))))
-     (hash-table-keys tagdata))
+           (set! res (append tests res)))))
+     tagdata)
     res))
     
 
 ;; Update test_meta for all tests
 (define (runs:update-all-test_meta db)
@@ -2115,11 +2573,11 @@
 (define (runs:clean-cache target runname toppath)
   (if target
       (if runname
 	  (let* ((linktree (common:get-linktree)) ;; (if toppath (configf:lookup *configdat* "setup" "linktree")))
 		 (runtop   (conc linktree "/" target "/" runname))
-		 (files    (if (file-exists? runtop)
+		 (files    (if (common:file-exists? runtop)
 			       (append (glob (conc runtop "/.megatest*"))
 				       (glob (conc runtop "/.runconfig*")))
 			       '())))
 	    (if (null? files)
 		(debug:print-info 0 *default-log-port* "No cached megatest or runconfigs files found. None removed.")

ADDED   sample-sauth-paths.scm
Index: sample-sauth-paths.scm
==================================================================
--- /dev/null
+++ sample-sauth-paths.scm
@@ -0,0 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
+(define *db-path* "/path/to/db") 
+(define *exe-path* "/path/to/store/suids")  
+(define *exe-src* "/path/to/spublish/and/sretrieve/executables")
+(define *sauth-path* "/path/to/production/sauthorize/exe")
+(define *super-users* '("user1" "user2"))

ADDED   sauth-common.scm
Index: sauth-common.scm
==================================================================
--- /dev/null
+++ sauth-common.scm
@@ -0,0 +1,319 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
+
+;; Create the sqlite db
+(define (sauthorize:db-do proc) 
+      (if (or (not *db-path*)
+              (not (file-exists? *db-path*))) 
+	(begin
+	  (print 0 "[database]\nlocation " *db-path* " \n\n Is missing from the config file!")
+	  (exit 1)))
+    (if (and *db-path*
+	     (directory? *db-path*)
+	     (file-read-access? *db-path*))
+	(let* ((dbpath    (conc *db-path* "/sauthorize.db"))
+	       (writeable (file-write-access? dbpath))
+	       (dbexists  (file-exists? dbpath)))
+	  (handle-exceptions
+	   exn
+	   (begin
+	     (print 2 "ERROR: problem accessing db " dbpath
+			  ((condition-property-accessor 'exn 'message) exn))
+	     (exit 1))
+            ;(print  "calling proc " proc "db path " dbpath )
+	   (call-with-database
+            dbpath
+	    (lambda (db)
+	       ;(print 0 "calling proc " proc " on db " db)
+	      (set-busy-handler! db (busy-timeout 10000)) ;; 10 sec timeout
+	      (if (not dbexists)(sauthorize:initialize-db db))
+	      (proc db)))))
+	(print 0 "ERROR: invalid path for storing database: " *db-path*)))
+
+;;execute a query
+(define (sauthorize:db-qry db qry)
+  ;(print qry)
+  (exec (sql db  qry)))
+
+
+(define (sauthorize:do-as-calling-user proc)
+  (let ((eid (current-effective-user-id))
+        (cid (current-user-id)))
+    (if (not (eq? eid cid)) ;; running suid
+            (set! (current-effective-user-id) cid))
+     ;(print 0 "cid " cid " eid:" eid)
+    (proc)
+    (if (not (eq? eid cid))
+        (set! (current-effective-user-id) eid))))
+
+
+(define (run-cmd cmd arg-list)
+  ; (print (current-effective-user-id))
+   ;(handle-exceptions
+;	     exn
+;	     (print 0 "ERROR: failed to run script " cmd " with params " arg-list " " (exn assert))
+	     (let ((pid (process-run cmd arg-list)))
+	       (process-wait pid))
+)
+;)
+
+
+(define (regster-log inl usr-id  area-id  cmd)
+  (sauth-common:shell-do-as-adm
+        (lambda ()
+         (sauthorize:db-do   (lambda (db)
+             (sauthorize:db-qry db (conc "INSERT INTO actions (cmd,user_id,area_id,action_type ) VALUES ('sretrieve " inl "'," usr-id ","  area-id ", 'cat' )")))))))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Check user types
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+
+
+;;check if a user is an admin
+(define (is-admin username)
+   (let* ((admin #f))
+    (sauthorize:db-do  (lambda (db)
+        (let* ((data-row (query fetch (sql db (conc "SELECT users.is_admin FROM  users where users.username = '" username "'")))))
+        (if (not (null? data-row))
+             (let ((col  (car data-row)))
+             (if (equal? col "yes")
+                   (set! admin #t)))))))  	        
+admin))
+
+
+;;check if a user is an read-admin
+(define (is-read-admin username)
+   (let* ((admin #f))
+    (sauthorize:db-do  (lambda (db)
+        (let* ((data-row (query fetch (sql db (conc "SELECT users.is_admin FROM  users where users.username = '" username "'")))))
+        (if (not (null? data-row))
+             (let ((col  (car data-row)))
+             (if (equal? col "read-admin")
+                   (set! admin #t)))))))  	        
+admin))
+
+
+;;check if user has specifc role for a area
+(define (is-user role username area)
+  (let* ((has-access #f))
+    (sauthorize:db-do  (lambda (db)
+        (let* ((data-row (query fetch (sql db (conc "SELECT  permissions.access_type, permissions.expiration FROM  users ,  areas, permissions where permissions.user_id = users.id and permissions.area_id = areas.id and users.username = '" username "' and areas.code = '" area "'")))))
+        (if (not (null? data-row))
+           (begin
+               (let* ((access-type  (car data-row))
+                    (exdate (cadr data-row)))
+               (if (not (null? exdate)) 
+               (begin 
+                  (let ((valid (is-access-valid  exdate)))
+                   ;(print valid) 
+                  (if (and (equal? access-type role)
+                        (equal? valid #t))
+                   (set! has-access #t))))
+                (print "Access expired"))))))))
+ ;(print has-access)
+has-access))
+
+(define (is-access-valid exp-str)
+    (let* ((ret-val #f )
+           (date-parts  (string-split exp-str "/"))
+           (yr (string->number (car date-parts)))
+           (month (string->number(car (cdr date-parts)))) 
+           (day (string->number(caddr date-parts)))
+           (exp-date (make-date 0 0 0 0 day month yr )))
+             ;(print  exp-date)
+             ;(print (current-date))   
+            (if (> (date-compare exp-date  (current-date)) 0)
+             (set! ret-val #t))
+   ;(print ret-val)
+   ret-val))
+
+
+;check if area exists
+(define (area-exists area)
+   (let* ((area-defined #f))
+    (sauthorize:db-do  (lambda (db)
+        (let* ((data-row (query fetch (sql db (conc "SELECT  id FROM  areas where areas.code = '" area "'")))))
+           (if (not (null? data-row))
+                 (set! area-defined #t)))))
+area-defined))
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+; Get Record from database
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+
+;gets area id by code 
+(define (get-area area)
+   (let* ((area-defined '()))
+    (sauthorize:db-do  (lambda (db)
+        (let* ((data-row (query fetch (sql db (conc "SELECT  id FROM  areas where areas.code = '" area "'")))))
+          (set!  area-defined data-row))))
+area-defined))
+
+;get id of users table by user name 
+(define (get-user user)
+  (let* ((user-defined '()))
+    (sauthorize:db-do  (lambda (db)
+        (let* ((data-row (query fetch (sql db (conc "SELECT  id FROM  users where users.username = '" user "'")))))
+          (set!  user-defined data-row))))
+user-defined))
+
+;get permissions id by userid and area id 
+(define (get-perm userid areaid)
+  (let* ((user-defined '()))
+    (sauthorize:db-do  (lambda (db)
+          (let* ((data-row (query fetch (sql db (conc "SELECT  id FROM  permissions where user_id = " userid " and area_id = " areaid)))))
+         (set!  user-defined data-row))))
+
+user-defined))
+
+(define (get-restrictions base-path usr)
+(let* ((user-defined '()))
+    (sauthorize:db-do  (lambda (db)
+          (let* ((data-row (query fetch (sql db (conc "SELECT  restriction FROM areas, users, permissions where  areas.id = permissions.area_id and users.id =  permissions.user_id and  users.username = '" usr "' and areas.basepath = '" base-path "'")))))
+         ;(print data-row) 
+         (set!  user-defined data-row))))
+    ;   (print user-defined)
+  (if (null? user-defined)
+      ""
+      (car user-defined))))
+
+
+(define (get-obj-by-path path)
+   (let* ((obj '()))
+    (sauthorize:db-do  (lambda (db)
+        (let* ((data-row (query fetch (sql db (conc "SELECT  code,exe_name, id, basepath FROM  areas where areas.basepath = '" path "'")))))
+         (set!  obj data-row))))
+obj))
+
+(define (get-obj-by-code code )
+  (let* ((obj '()))
+    (sauthorize:db-do  (lambda (db)
+        ;(print (conc "SELECT  code, exe_name,  id, basepath, required_grps  FROM  areas where areas.code = '" code "'"))
+        (let* ((data-row (query fetch (sql db (conc "SELECT  code, exe_name,  id, basepath, required_grps  FROM  areas where areas.code = '" code "'")))))
+         ;(print data-row)
+         (set!  obj data-row)
+         ;(print obj) 
+        )))
+    (if (not (null? obj))
+          (begin
+          (let* ((req-grp (caddr (cddr obj))))
+            (sauthorize:do-as-calling-user
+             (lambda ()
+ (sauth-common:check-user-groups req-grp))))))
+obj))
+
+(define (sauth-common:check-user-groups req-grp)
+(let* ((current-groups  (get-groups) )
+        (req-grp-list (string-split req-grp ",")))
+        ;(print req-grp-list)
+        (for-each (lambda (grp)
+	  (let ((grp-info (group-information grp)))
+               ;(print grp-info " " grp)
+               (if (not (equal? grp-info #f))
+               (begin
+                 (if (not (member  (caddr grp-info) current-groups))
+                  (begin 
+                    (sauth:print-error (conc "Please wash " grp " group in your xterm!! " ))
+                     (exit 1)))))))
+	     req-grp-list)))
+
+(define (get-obj-by-code-no-grp-validation code )
+  (let* ((obj '()))
+    (sauthorize:db-do  (lambda (db)
+        (let* ((data-row (query fetch (sql db (conc "SELECT  code, exe_name,  id, basepath  FROM  areas where areas.code = '" code "'")))))
+         (set!  obj data-row))))
+;(print obj)
+obj))
+
+
+
+
+;; function to validate the users input for target path and resolve the path
+;; TODO: Check for restriction in subpath 
+(define (sauth-common:resolve-path  new current allowed-sheets)
+   (let* ((target-path (append  current (string-split new "/")))
+          (target-path-string (string-join target-path "/"))
+          (normal-path (normalize-pathname target-path-string))
+          (normal-list (string-split normal-path "/"))
+           (ret '()))
+   (if (string-contains   normal-path "..")
+    (begin
+      (print "ERROR: Path  " new " resolved outside target area ")
+      #f)
+    (if(equal? normal-path ".")
+      ret  
+    (if (not (member  (car normal-list) allowed-sheets))
+      (begin
+      (print "ERROR: Permision denied to  " new )
+       #f)
+    normal-list)))))
+
+(define (sauth-common:get-target-path base-path-list ext-path top-areas base-path)
+  (let* ((resolved-path (sauth-common:resolve-path ext-path base-path-list top-areas ))
+          (usr (current-user-name) ) )
+          (if (not (equal? resolved-path #f))
+           (if (null? resolved-path) 
+             #f
+           (let* ((sheet (car resolved-path))
+                   (restricted-areas (get-restrictions base-path usr))
+                   (restrictions (conc ".*" (string-join (string-split restricted-areas ",") ".*|.*") ".*"))
+           	   (target-path (if (null? (cdr resolved-path)) 
+                                     base-path 
+                                     (conc base-path "/" (string-join (cdr resolved-path) "/")))))
+                    
+	              
+                           (if (and (not (equal? restricted-areas "" ))
+                             (string-match (regexp  restrictions) target-path)) 
+                           (begin
+                              (sauth:print-error "Access denied to " (string-join resolved-path "/"))
+                              ;(exit 1)   
+                            #f)
+                             target-path)
+                            
+))
+             #f)))
+
+(define (sauth-common:shell-ls-cmd base-path-list ext-path top-areas base-path tail-cmd-list)
+    (if (and (null? base-path-list) (equal? ext-path "") )
+      (print (string-intersperse top-areas " "))
+  (let* ((resolved-path (sauth-common:resolve-path ext-path base-path-list top-areas )))
+           ;(print resolved-path)
+           (if (not (equal? resolved-path #f))
+           (if (null? resolved-path) 
+             (print (string-intersperse top-areas " "))
+           (let* ((target-path (sauth-common:get-target-path  base-path-list  ext-path top-areas base-path)))
+                (print target-path)
+                (if (not (equal? target-path #f))
+                (begin 
+                (cond
+		  ((null? tail-cmd-list)
+		     (run (pipe
+      	      	      (ls "-lrt" ,target-path))))
+		  ((not (equal? (car tail-cmd-list) "|"))
+                         (print "ls cmd cannot accept " (string-join tail-cmd-list) " as an argument!!"))
+                  (else  
+                    (run (pipe
+      	      	      (ls "-lrt" ,target-path)
+                      (begin (system (string-join (cdr tail-cmd-list))))))))))))))))
+
+(define (sauth:print-error msg)
+  (with-output-to-port (current-error-port)
+	(lambda ()
+	       (print (conc "ERROR: " msg)))))
+

ADDED   sauthorize.scm
Index: sauthorize.scm
==================================================================
--- /dev/null
+++ sauthorize.scm
@@ -0,0 +1,651 @@
+
+;; Copyright 2006-2013, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
+
+(use defstruct)
+(use scsh-process)
+
+(use srfi-18)
+(use srfi-19)
+(use refdb)
+
+(use sql-de-lite srfi-1 posix regex regex-case srfi-69)
+;(declare (uses common))
+;(declare (uses configf))
+(declare (uses margs))
+(declare (uses megatest-version))
+
+(include "megatest-fossil-hash.scm")
+;;; please create this file before using sautherise. For sample file is avaliable sample-sauth-paths.scm. 
+(include "sauth-paths.scm")
+(include "sauth-common.scm")
+
+;;
+;; GLOBALS
+;;
+(define *verbosity* 1)
+(define *logging* #f)
+(define *exe-name* (pathname-file (car (argv))))
+(define *sretrieve:current-tab-number* 0)
+(define *args-hash* (make-hash-table))
+(define sauthorize:help (conc "Usage: " *exe-name* " [action [params ...]]
+
+  list                   		 			: list areas $USER's can access
+  log                    		 			: get listing of recent activity.
+  sauth  list-area-user  			: list the users that can access the area.
+  sauth open  --group                       : Open up an area. User needs to be the owner of the area to open it. 
+              --code  
+              --retrieve|--publish [--additional-grps ]
+  sauth update   --retrieve|--publish             : update the binaries with the lates changes
+  sauth grant  --area           : Grant permission to read or write to a area that is alrady opend up.    
+             --expiration yyyy/mm/dd --retrieve|--publish 
+             [--restrict  ]  
+  sauth read-shell                        :  Open sretrieve shell for reading.  
+  sauth write-shell                       :  Open spublish shell for writing.
+   
+Part of the Megatest tool suite.
+Learn more at http://www.kiatoa.com/fossils/megatest
+
+Version: " megatest-fossil-hash)) ;; "
+
+;;======================================================================
+;; RECORDS
+;;======================================================================
+
+;;======================================================================
+;; DB
+;;======================================================================
+
+;; replace (strftime('%s','now')), with datetime('now'))
+(define (sauthorize:initialize-db db)
+  (for-each
+   (lambda (qry)
+     (exec (sql db qry)))
+   (list 
+    "CREATE TABLE IF NOT EXISTS actions
+         (id           INTEGER PRIMARY KEY,
+          cmd       TEXT NOT NULL,
+          user_id      INTEGER NOT NULL,
+          datetime     TIMESTAMP DEFAULT (datetime('now','localtime')),
+          area_id      INTEGER NOT NULL,
+          comment      TEXT DEFAULT '' NOT NULL,
+          action_type  TEXT NOT NULL);"
+        "CREATE TABLE IF NOT EXISTS users
+         (id           INTEGER PRIMARY KEY,
+          username     TEXT NOT NULL,
+          is_admin     TEXT NOT NULL,
+          datetime     TIMESTAMP DEFAULT (datetime('now','localtime'))
+          );" 
+          "CREATE TABLE IF NOT EXISTS areas
+         (id           INTEGER PRIMARY KEY,
+          basepath     TEXT NOT NULL,
+          code         TEXT NOT NULL,
+          exe_name     TEXT NOT NULL,
+          required_grps TEXT DEFAULT '' NOT NULL,
+          datetime     TIMESTAMP DEFAULT (datetime('now','localtime'))
+          );" 
+         "CREATE TABLE IF NOT EXISTS permissions
+         (id              INTEGER PRIMARY KEY,
+          access_type     TEXT NOT NULL,
+          user_id         INTEGER NOT NULL,
+          datetime        TIMESTAMP DEFAULT (datetime('now','localtime')),
+          area_id         INTEGER NOT NULL,
+          restriction     TEXT DEFAULT '' NOT NULL,
+          expiration       TIMESTAMP DEFAULT NULL);"
+    )))
+
+
+
+
+(define (get-access-type args)
+   (let loop ((hed (car args))
+		 (tal (cdr args)))
+                   (cond
+                   ((equal? hed "--retrieve")
+                      "retrieve") 
+                   ((equal? hed "--publish")
+                      "publish") 
+                   ((equal? hed "--area-admin")
+                      "area-admin")
+                   ((equal? hed "--writer-admin")
+                      "writer-admin")
+                   ((equal? hed "--read-admin")
+                      "read-admin")
+
+                   ((null? tal)
+                      #f) 
+                   (else 
+		  	(loop (car tal)(cdr tal))))))
+
+
+
+;; check if user can gran access to an area
+(define (can-grant-perm username access-type area)
+   (let* ((isadmin (is-admin username))
+          (is-area-admin (is-user "area-admin" username area ))
+          (is-read-admin (is-user "read-admin" username area) )
+          (is-writer-admin (is-user "writer-admin" username area) ) )
+   (cond
+   ((equal? isadmin  #t)
+     #t)
+   ((equal? is-area-admin #t ) 
+     #t)
+   ((and (equal? is-writer-admin #t ) (equal? access-type "retrieve"))
+     #t)
+   ((and (equal? is-read-admin #t ) (equal? access-type "retrieve"))
+     #t)
+
+   (else  
+    #f))))
+
+(define (sauthorize:list-areausers  area )
+  (sauthorize:db-do  (lambda (db)
+				     (print "Users having access to " area ":")
+				     (query (for-each-row
+					     (lambda (row)
+                                               (let* ((exp-date (cadr row)))
+                                                (if  (is-access-valid  exp-date)   
+					        (apply print (intersperse row " | "))))))
+					    (sql db (conc "SELECT users.username, permissions.expiration, permissions.access_type  FROM users, areas, permissions where permissions.user_id = users.id and permissions.area_id = areas.id and areas.code = '" area "'"))))))
+
+
+
+
+; check if executable exists
+(define (exe-exist exe access-type)
+    (let* ((filepath (conc *exe-path* "/" access-type "/" exe)))
+    ; (print filepath)
+     (if (file-exists? filepath)
+       #t
+       #f)))
+
+(define (copy-exe access-type exe-name group)
+  (run-cmd "/bin/chmod" (list "g+w" (conc *exe-path* "/" access-type)))
+  (let* ((spath (conc *exe-src*  "/s" access-type))
+         (dpath (conc *exe-path* "/" access-type "/" exe-name)))
+         (sauthorize:do-as-calling-user
+        (lambda ()
+            (run-cmd "/bin/cp" (list spath dpath )) 
+            (if (equal? access-type "publish")
+              (run-cmd "/bin/chmod" (list "u+s,o+rx" dpath))
+              (begin
+               (if (equal? group "none")
+                 (run-cmd "/bin/chmod" (list "u+s,o+rx" dpath))
+                 (begin   
+                     (run-cmd "/bin/chgrp" (list group dpath))
+                       (run-cmd "/bin/chmod" (list "g+s,o+rx" dpath))))))))
+	(run-cmd "chmod" (list "g-w" (conc *exe-path* "/" access-type)))))
+
+(define (get-exe-name path group)
+   (let ((name ""))
+   (sauthorize:do-as-calling-user
+        (lambda ()
+        (if (equal? (current-effective-user-id) (file-owner path)) 
+          (set! name (conc (current-user-name) "_" group))
+          (begin
+            (print "You cannot open areas that you dont own!!")  
+             (exit 1)))))
+name))
+
+(define (sauthorize:valid-unix-user username)
+    (let* ((ret-val #f))
+    (let-values (((inp oup pid)
+              (process "/usr/bin/id" (list username))))
+        (let loop ((inl (read-line inp)))
+          (if (string? inl) 
+          (if (string-contains inl  "No such user") 
+            (set! ret-val #f)
+             (set! ret-val #t)))   
+          (if (eof-object? inl)
+              (begin
+                   (close-input-port inp)
+                  (close-output-port oup))
+            (loop (read-line inp)))))
+            ret-val))
+
+
+;check if a paths/codes are vaid and if area is alrady open  
+(define (open-area group path code access-type other-grps)
+   (let* ((exe-name (get-exe-name path group))
+           (path-obj (get-obj-by-path path))
+           (code-obj (get-obj-by-code-no-grp-validation code)))
+           ;(print path-obj)   
+          (cond
+            ((not (null? path-obj))
+                (if (equal? code (car path-obj))
+                  (begin
+                     (if (equal? exe-name (cadr path-obj))
+                        (begin
+                            (if (not (exe-exist exe-name  access-type))
+                                 (copy-exe access-type exe-name group)
+                                 (begin 
+                                  (print "Area already open!!")
+                                  (exit 1))))   
+			(begin
+                           (if (not (exe-exist exe-name  access-type))
+                                 (copy-exe access-type exe-name group))
+                           ;; update exe-name  in db 
+                      (sauthorize:db-do   (lambda (db)
+                         (sauthorize:db-qry db (conc "update areas set exe_name = '" exe-name "' where id = " (caddr path-obj)))))
+                        )))
+                   (begin
+                       (print "Path " path " is registered with --code " (car path-obj) ". To open this area please execute following cmd: \n  sauthorize open " path " --group " group " --code " (car path-obj) " --" access-type )
+                       (exit 1))))
+                      
+            ((not (null? code-obj))
+                   (print "Code " code " is used for diffrent path. Please try diffrent value of --code" ) 
+                   (exit 1))
+            (else
+               ; (print (exe-exist exe-name  access-type))
+                (if (not (exe-exist exe-name  access-type))
+                        (copy-exe access-type exe-name group))
+                (sauthorize:db-do   (lambda (db)
+               (print conc "insert into areas (code, basepath, exe_name, required_grps) values ('" code "', '" path "', '" exe-name "', '" other-grps "') ") 
+             (sauthorize:db-qry db (conc "insert into areas (code, basepath, exe_name, required_grps) values ('" code "', '" path "', '" exe-name "', '" other-grps "') "))))))))
+
+(define (user-has-open-perm user path access)
+  (let* ((has-access #f)
+         (eid (current-user-id)))
+    (cond
+     ((is-admin  user)
+       (set! has-access #t ))
+     ((and (is-read-admin  user) (equal? access "retrieve"))
+       (set! has-access #t ))
+     (else
+        (print "User " user " does not have permission to open areas")))
+        has-access))
+
+
+;;check if user has group access
+(define (is-group-washed req_grpid current-grp-list)
+  (let loop ((hed (car current-grp-list))
+		 (tal (cdr current-grp-list)))
+                   (cond
+                   ((equal? hed req_grpid)
+                    #t)    
+                   ((null? tal)
+                      #f)
+                   (else 
+		  	(loop (car tal)(cdr tal))))))
+
+;create executables with appropriate suids
+(define (sauthorize:open user path group code access-type other-groups)
+   (let* ((gpid (group-information group))
+         (req_grpid (if (equal? group "none")
+                      group 
+                      (if (equal? gpid #f)
+                           #f      
+                     (caddr gpid))))
+         (current-grp-list (get-groups))
+         (valid-grp (if (equal? group "none")
+                     group
+                    (is-group-washed req_grpid current-grp-list))))
+   (if (and (not (equal? group "none")) (equal? valid-grp #f ))
+       (begin
+       (print "Group " group " is not washed in the current xterm!!") 
+       (exit 1)))) 
+   (if (not (file-write-access? path))
+     (begin
+       (print "You can open areas owned by yourself. You do not have permissions to open path." path)
+        (exit 1)))
+   (if (user-has-open-perm user path access-type)
+      (begin 
+       ;(print "here")   
+       (open-area group path code access-type other-groups)
+       (sauthorize:grant user user code "2017/12/25"  "read-admin" "") 
+       (sauthorize:db-do   (lambda (db)
+             (sauthorize:db-qry db (conc "INSERT INTO actions (cmd,user_id,area_id,action_type ) VALUES ('sauthorize open " path " --code " code " --group " group " --" access-type "'," (car (get-user user)) "," (car (get-area code)) ", 'open' )"))))
+         (print "Area has " path "  been opened for " access-type ))))
+
+(define (sauthorize:update username exe area access-type)
+  (let* ((parts (string-split exe "_"))
+         (owner (car parts))
+         (group (cadr parts))
+         (gpid (group-information group))
+         (req_grpid (if (equal? group "none")
+                      group 
+                      (if (equal? gpid #f)
+                           #f      
+                     (caddr gpid))))
+ 
+         (current-grp-list (get-groups))
+         (valid-grp (if (equal? group "none")
+                     group
+                    (is-group-washed req_grpid current-grp-list))))
+         (if (not (equal? username owner))
+            (begin
+              (print "You cannot update " area ". Only " owner " can update this area!!") 
+               (exit 1)))
+          (copy-exe access-type exe group)
+           (print "recording action..")    
+          (sauthorize:db-do   (lambda (db)
+             
+             (sauthorize:db-qry db (conc "INSERT INTO actions (cmd,user_id,area_id,action_type ) VALUES ('sauthorize update " area " --" access-type "'," (car (get-user username)) "," (car (get-area area)) ", 'update' )"))))
+         (print "Area has " area "  been update!!" )))
+
+(define (sauthorize:grant auser guser area exp-date access-type restrict)
+    ; check if user exist in db
+    (let* ((area-obj (get-area area))
+           (auser-obj (get-user auser)) 
+           (user-obj (get-user guser)))
+          
+        (if (null? user-obj)
+           (begin
+            ;; is guser a valid unix user
+            (if (not (sauthorize:valid-unix-user guser))
+               (begin  
+                (print "User " guser " is Invalid unix user!!")
+                 (exit 1)))
+            (sauthorize:db-do   (lambda (db)
+             (sauthorize:db-qry db (conc "insert into users (username, is_admin) values ('" guser "', 'no') "))))
+             (set! user-obj (get-user guser))))
+        (let* ((perm-obj (get-perm (car user-obj) (car area-obj))))
+          (if(null? perm-obj)
+          (begin   
+            ;; insert permissions
+            (sauthorize:db-do   (lambda (db)
+            (sauthorize:db-qry db (conc "insert into permissions (access_type, user_id, area_id, restriction, expiration ) values ('" access-type "', " (car user-obj) ", " (car area-obj) ", '" restrict "', '" exp-date "')")))))
+          (begin 
+             ;update permissions
+             (sauthorize:db-do   (lambda (db)
+             (sauthorize:db-qry db (conc "update permissions set access_type = '" access-type "' , restriction = '" restrict "', expiration =  '" exp-date "' where user_id = " (car user-obj) " and area_id = " (car area-obj)))))))
+             (sauthorize:db-do   (lambda (db)
+             (sauthorize:db-qry db (conc "INSERT INTO actions (cmd,user_id,area_id,action_type ) VALUES ('sauthorize grant " guser " --area " area " --expiration " exp-date " --" access-type " --restrict " restrict "'," (car auser-obj) "," (car area-obj) ", 'grant' )"))))  
+             (print "Permission has been sucessfully granted to user " guser))))
+
+(define (sauthorize:process-action  username action . args)
+   (case (string->symbol action)
+   ((grant)
+      (if (< (length args) 6)
+         (begin 
+	     (print  "ERROR: Missing arguments; " (string-intersperse args ", "))
+	     (exit 1)))
+       (let* ((remargs     (args:get-args args '("--area" "--expiration" "--restrict") '() args:arg-hash 0))
+              (guser     (car args))
+	      (restrict         (or (args:get-arg "--restrict") ""))
+              (area         (or (args:get-arg "--area") ""))  
+              (exp-date        (or (args:get-arg "--expiration") ""))
+              (access-type (get-access-type remargs)))
+	; (print  "version " guser " restrict " restrict )
+        ; (print "area " area " exp-date " exp-date " access-type " access-type)
+        (cond
+           ((equal? guser "")
+              (print "Username not found!! Try \"sauthorize help\" for useage ")
+               (exit 1))   
+           ((equal? area "")
+              (print "Area not found!! Try \"sauthorize help\" for useage ")
+              (exit 1)) 
+           ((equal? access-type #f)
+              (print "Access type not found!! Try \"sauthorize help\" for useage ")
+               (exit 1)) 
+           ((equal? exp-date "")
+              (print "Date of expiration not found!! Try \"sauthorize help\" for useage ")
+              (exit 1)))
+           (if (not (area-exists area))
+              (begin
+              (print "Area does not exisit!!")
+              (exit 1)))   
+           (if (can-grant-perm username access-type area)
+	   (begin
+             (print "calling sauthorize:grant ") 
+              (sauthorize:grant username guser area exp-date access-type restrict))   
+           (begin
+              (print "User " username " does not have permission to grant permissions to area " area "!!")
+              (exit 1)))))
+       ((list-area-user)
+          (if (not (equal? (length args) 1))
+              (begin
+              (print "Missing argument area code to list-area-user ") 
+              (exit 1)))
+           (let* ((area (car args)))
+           (if (not (area-exists area))
+              (begin
+              (print "Area does not exisit!!")
+              (exit 1))) 
+                                
+                (sauthorize:list-areausers  area )
+              ))
+      ((read-shell)
+          (if (not (equal? (length args) 1))
+              (begin
+              (print "Missing argument area code to read-shell ") 
+              (exit 1)))
+           (let* ((area (car args))
+                  (code-obj (get-obj-by-code area)))
+           (if (or (null? code-obj)
+                   (not (exe-exist (cadr code-obj)  "retrieve")))
+              (begin
+              (print "Area " area " is not open for reading!!")
+              (exit 1))) 
+              (sauthorize:do-as-calling-user
+             (lambda ()
+                (run-cmd (conc *exe-path* "/retrieve/" (cadr code-obj) ) (list "shell" area ))))))
+      ((write-shell)
+          (if (not (equal? (length args) 1))
+              (begin
+              (print "Missing argument area code to read-shell ") 
+              (exit 1)))
+           (let* ((area (car args))
+                  (code-obj (get-obj-by-code area)))
+           (if (or (null? code-obj)
+                   (not (exe-exist (cadr code-obj)  "publish")))
+              (begin
+              (print "Area " area " is not open for Writing!!")
+              (exit 1))) 
+              (sauthorize:do-as-calling-user
+             (lambda ()
+                (run-cmd (conc *exe-path* "/publish/" (cadr code-obj) ) (list "shell" area))))))
+      ((publish)
+          (if (< (length args) 2)
+              (begin
+              (print "Missing argument to publish. \n publish   [opts] ") 
+              (exit 1)))
+            
+           (let* ((action (car args))
+                  (area (cadr args))
+                  (cmd-args (cddr args)) 
+                  (code-obj (get-obj-by-code area)))
+           ;(print "area " area)
+           ;(print "code: " code-obj)  
+           ;(print (exe-exist (cadr code-obj)  "publish")) 
+           (if (or (null? code-obj)
+                   (not (exe-exist (cadr code-obj)  "publish")))
+              (begin
+              (print "Area " area " is not open for writing!!")
+              (exit 1)))
+              ;(print "hear") 
+              (sauthorize:do-as-calling-user
+             (lambda ()
+               ; (print  *exe-path* "/publish/" (cadr code-obj) action area cmd-args  )
+                (run-cmd (conc *exe-path* "/publish/" (cadr code-obj) ) (append (list action area ) cmd-args))))))
+      
+     ((retrieve)
+          (if (< (length args) 2)
+              (begin
+              (print "Missing argument to publish. \n publish   [opts] ") 
+              (exit 1)))
+           (let* ((action (car args))
+                  (area (cadr args))
+                  (cmd-args (cddr args)) 
+                  (code-obj (get-obj-by-code area)))
+           (if (or (null? code-obj)
+                   (not (exe-exist (cadr code-obj)  "retrieve")))
+              (begin
+              (print "Area " area " is not open for reading!!")
+              (exit 1))) 
+               ;(print (conc *exe-path* "/retrieve/" (cadr code-obj) " " action " " area " " (string-join cmd-args)))
+              (sauthorize:do-as-calling-user
+             (lambda ()
+                (run-cmd (conc *exe-path* "/retrieve/" (cadr code-obj) ) (append (list action area ) cmd-args))))))
+
+ 
+ 
+      ((open)
+         (if (< (length args) 6)
+              (begin
+              (print "sauthorize open cmd takes 6 arguments!! \n Useage: sauthorize open  --group  --code  --retrieve|--publish") 
+              (exit 1)))
+         (let* ((remargs     (args:get-args args '("--group" "--code" "--additional-grps") '() args:arg-hash 0))
+              (path     (car args))
+	      (group         (or (args:get-arg "--group") ""))
+              (area         (or (args:get-arg "--code") ""))
+              (other-grps          (or (args:get-arg "--additional-grps") ""))     
+              (access-type (get-access-type remargs)))
+                
+              (cond
+                ((equal? path "")
+                  (print "path not found!! Try \"sauthorize help\" for useage ")
+                  (exit 1))   
+                ((equal? area "")
+                  (print "--code not found!! Try \"sauthorize help\" for useage ")
+                  (exit 1)) 
+                ((equal? access-type #f)
+                  (print "Access type not found!! Try \"sauthorize help\" for useage ")
+                  (exit 1)) 
+                ((and (not (equal? access-type "publish")) 
+                  (not (equal? access-type "retrieve")))
+                  (print "Access type can be eiter --retrieve or --publish !! Try \"sauthorize help\" for useage ")
+                  (exit 1)))
+                ; (print other-grps) 
+                (sauthorize:open username path group area access-type other-grps)))
+         ((update)
+            (if (< (length args) 2)
+              (begin
+              (print "sauthorize update cmd takes 2 arguments!! \n Useage: sauthorize update  --retrieve|--publish") 
+              (exit 1)))
+              (let* ((area (car args))
+                     (code-obj (get-obj-by-code area))
+                    (access-type (get-access-type (cdr args))))
+               (if  (and (not (equal? access-type "publish")) (not (equal? access-type "retrieve")))
+                  (begin 
+                  (print "Access type can be --retrieve|--publish ")
+                  (exit 1)))
+              (if (or (null? code-obj)
+                   (not (exe-exist (cadr code-obj)  access-type)))
+              (begin
+              (print "Area " area " is not open for reading!!")
+              (exit 1))) 
+              (sauthorize:update username (cadr code-obj) area access-type ))) 
+         ((area-admin)
+           (let* ((usr (car args))
+                  (usr-obj (get-user usr))
+                  (user-id (car (get-user username))))
+           
+                (if (is-admin  username)
+                (begin
+                  ; (print usr-obj) 
+                  (if (null? usr-obj)
+                    (begin
+                        (sauthorize:db-do   (lambda (db)
+              ;(print (conc "INSERT INTO users (username,is_admin) VALUES ( '" usr "', 'read-admin' )"))
+             (sauthorize:db-qry db (conc "INSERT INTO users (username,is_admin) VALUES ( '" usr "', 'read-admin' )")))))
+               (begin
+                ; (print (conc "update users set is_admin = 'no' where id = " (car usr-obj) ))
+                 (sauthorize:db-do   (lambda (db)
+                (sauthorize:db-qry db (conc "update users set is_admin = 'read-admin' where id = " (car usr-obj)))))))
+                (print "User " usr " is updated with area-admin access!"))
+                (print "Admin only function"))
+                (sauthorize:db-do   (lambda (db)
+             (sauthorize:db-qry db (conc "INSERT INTO actions (cmd,user_id,area_id,action_type ) VALUES ('area-admin " usr " ', " user-id ",0, 'area-admin ')" )))))) 
+          ((mk-admin)
+           (let* ((usr (car args))
+                  (usr-obj (get-user usr))
+                  (user-id (car (get-user username))))
+                (if (not (sauthorize:valid-unix-user usr))
+               (begin  
+                (print "User " usr " is Invalid unix user!!")
+                 (exit 1)))
+
+                (if (member  username  *super-users*)
+                (begin
+                  (if (null? usr-obj)
+                    (begin
+                        (sauthorize:db-do   (lambda (db)
+                           (sauthorize:db-qry db (conc "INSERT INTO users (username,is_admin) VALUES ( '" usr "', 'yes' )")))))
+               (begin
+                 (sauthorize:db-do   (lambda (db)
+                (sauthorize:db-qry db (conc "update users set is_admin = 'yes' where id = " (car usr-obj)))))))
+                (print "User " usr " is updated with admin access!"))
+                (print "Super-Admin only function"))
+                (sauthorize:db-do   (lambda (db)
+             (sauthorize:db-qry db (conc "INSERT INTO actions (cmd,user_id,area_id,action_type ) VALUES ('mk-admin " usr " ', " user-id ",0, 'mk-admin ')" )))))) 
+
+         ((register-log)
+            (if (< (length args) 4)
+                (print "Invalid arguments"))
+             ;(print args)
+             (let* ((cmd-line (car args))
+                     (user-id (cadr args))
+                     (area-id (caddr args))
+                     (user-obj (get-user username))
+                      (cmd (cadddr args)))
+                
+               (if (and (not (null? user-obj)) (equal? user-id (number->string(car user-obj))))
+                (begin 
+                (sauthorize:db-do   (lambda (db)
+             (sauthorize:db-qry db (conc "INSERT INTO actions (cmd,user_id,area_id,action_type ) VALUES ('" cmd-line"', " user-id "," area-id ", '" cmd "')" )))))
+                (print "You ar not authorised to run this cmd")
+
+)))     
+
+       
+      (else (print 0 "Unrecognised command " action))))
+  
+(define (main)
+  (let* ((args      (argv))
+	 (prog      (car args))
+	 (rema      (cdr args))
+         (username     (current-user-name)))
+    ;; preserve the exe data in the config file
+    (cond
+     ;; one-word commands
+     ((eq? (length rema) 1)
+      (case (string->symbol (car rema))
+	((help -h -help --h --help)
+	 (print sauthorize:help))
+	((list)
+            
+          (sauthorize:db-do  (lambda (db)
+				     (print "My Area accesses: ")
+				     (query (for-each-row
+					     (lambda (row)
+                                               (let* ((exp-date (car row)))
+                                                (if  (is-access-valid  exp-date)     
+					           (apply print (intersperse (cdr row) " | "))))))
+					    (sql db (conc "SELECT permissions.expiration, areas.basepath, areas.code, permissions.access_type  FROM users, areas, permissions where permissions.user_id = users.id and permissions.area_id = areas.id and users.username = '" username "'"))))))
+         
+	((log)
+	 (sauthorize:db-do  (lambda (db)
+				     (print "Logs : ")
+				     (query (for-each-row
+					     (lambda (row)
+                                                   
+					       (apply print (intersperse row " | "))))
+					    (sql db "SELECT actions.cmd, users.username, actions.action_type, actions.datetime, areas.code  FROM actions, users, areas where actions.user_id = users.id and actions.area_id = areas.id ")))))
+	(else
+	 (print "ERROR: Unrecognised command. Try \"sauthorize help\""))))
+     ;; multi-word commands
+     ((null? rema)(print sauthorize:help))
+     ((>= (length rema) 2)
+      (apply sauthorize:process-action username (car rema)(cdr rema)))
+     (else (debug:print 0 "ERROR: Unrecognised command. Try \"sauthorize help\"")))))
+
+(main)
+
+
+      

Index: sdb.scm
==================================================================
--- sdb.scm
+++ sdb.scm
@@ -1,14 +1,23 @@
 ;;======================================================================
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;;======================================================================
 
 ;;======================================================================
 ;; Simple persistant strings lookup table. Keep out of the main db
 ;; so writes/reads don't slow down central access.
@@ -22,11 +31,11 @@
 (declare (unit sdb))
 
 ;; 
 (define (sdb:open fname)
   (let* ((dbpath    (pathname-directory fname))
-	 (dbexists  (let ((fe (file-exists? fname)))
+	 (dbexists  (let ((fe (common:file-exists? fname)))
 		      (if fe 
 			  fe
 			  (begin
 			    (create-directory dbpath #t)
 			    #f))))

ADDED   serialize-env.scm
Index: serialize-env.scm
==================================================================
--- /dev/null
+++ serialize-env.scm
@@ -0,0 +1,9 @@
+(use z3)
+(use base64)
+
+(let* ((env-str        (with-output-to-string (lambda () (pp (get-environment-variables)))))
+       (zipped-env-str (z3:encode-buffer env-str))
+       (b64-env-str    (base64-encode zipped-env-str)))
+  (print b64-env-str))
+
+

Index: server.scm
==================================================================
--- server.scm
+++ server.scm
@@ -1,33 +1,41 @@
 
-;; Copyright 2006-2012, Matthew Welland.
-;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
-;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;; Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 (require-extension (srfi 18) extras tcp s11n)
 
-(use srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest directory-utils posix-extras matchable)
-;; (use zmq)
+(use srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest
+     directory-utils posix-extras matchable)
 
 (use spiffy uri-common intarweb http-client spiffy-request-vars)
 
 (declare (unit server))
 
 (declare (uses common))
 (declare (uses db))
 (declare (uses tasks)) ;; tasks are where stuff is maintained about what is running.
-(declare (uses synchash))
+;; (declare (uses synchash))
 (declare (uses http-transport))
-(declare (uses rpc-transport))
-;;(declare (uses nmsg-transport))
+;;(declare (uses rpc-transport))
 (declare (uses launch))
-(declare (uses daemon))
+;; (declare (uses daemon))
 
 (include "common_records.scm")
 (include "db_records.scm")
 
 (define (server:make-server-url hostport)
@@ -34,10 +42,22 @@
   (if (not hostport)
       #f
       (conc "http://" (car hostport) ":" (cadr hostport))))
 
 (define  *server-loop-heart-beat* (current-seconds))
+
+;;======================================================================
+;; P K T S   S T U F F 
+;;======================================================================
+
+;; ???
+
+;;======================================================================
+;; P K T S   S T U F F 
+;;======================================================================
+
+;; ???
 
 ;;======================================================================
 ;; S E R V E R
 ;;======================================================================
 
@@ -50,11 +70,11 @@
 ;;
 (define (server:launch run-id transport-type)
   (case transport-type
     ((http)(http-transport:launch))
     ;;((nmsg)(nmsg-transport:launch run-id))
-    ((rpc)  (rpc-transport:launch run-id))
+    ;;((rpc)  (rpc-transport:launch run-id))
     (else (debug:print-error 0 *default-log-port* "unknown server type " transport-type))))
 
 ;;======================================================================
 ;; S E R V E R   U T I L I T I E S 
 ;;======================================================================
@@ -112,11 +132,12 @@
 		      " -server " (or target-host "-") (if (equal? (configf:lookup *configdat* "server" "daemonize") "yes")
 							   " -daemonize "
 							   "")
 		      ;; " -log " logfile
 		      " -m testsuite:" testsuite)) ;; (conc " >> " logfile " 2>&1 &")))))
-	 (log-rotate  (make-thread common:rotate-logs  "server run, rotate logs thread")))
+	 (log-rotate  (make-thread common:rotate-logs  "server run, rotate logs thread"))
+         (load-limit  (configf:lookup-number *configdat* "jobtools" "max-server-start-load" default: 3.0)))
     ;; we want the remote server to start in *toppath* so push there
     (push-directory areapath)
     (debug:print 0 *default-log-port* "INFO: Trying to start server (" cmdln ") ...")
     (thread-start! log-rotate)
     
@@ -129,11 +150,12 @@
 	(begin
 	  (debug:print-info 0 *default-log-port* "Starting server on " target-host ", logfile is " logfile)
 	  (setenv "TARGETHOST" target-host)))
       
     (setenv "TARGETHOST_LOGF" logfile)
-    (common:wait-for-normalized-load 4 " delaying server start due to load" remote-host: (get-environment-variable "TARGETHOST")) ;; do not try starting servers on an already overloaded machine, just wait forever
+    (thread-sleep! (/ (random 5000) 1000)) ;; add about a random (up to 5 seconds) initial delay. It seems pretty common that many running tests request a server at the same time
+    (common:wait-for-normalized-load load-limit " delaying server start due to load" target-host) ;; do not try starting servers on an already overloaded machine, just wait forever
     (system (conc "nbfake " cmdln))
     (unsetenv "TARGETHOST_LOGF")
     (if (get-environment-variable "TARGETHOST")(unsetenv "TARGETHOST"))
     (thread-join! log-rotate)
     (pop-directory)))
@@ -206,11 +228,25 @@
 		(if (null? tal)
 		    (if (and limit
 			     (> (length new-res) limit))
 			new-res ;; (take new-res limit)  <= need intelligent sorting before this will work
 			new-res)
-		      (loop (car tal)(cdr tal) new-res)))))))))
+		    (loop (car tal)(cdr tal) new-res)))))))))
+
+(define (server:get-num-alive srvlst)
+  (let ((num-alive 0))
+    (for-each
+     (lambda (server)
+       (match-let (((mod-time host port start-time pid)
+		    server))
+	 (let* ((uptime  (- (current-seconds) mod-time))
+		(runtime (if start-time
+			     (- mod-time start-time)
+			     0)))
+	   (if (< uptime 5)(set! num-alive (+ num-alive 1))))))
+     srvlst)
+    num-alive))
 
 ;; given a list of servers get a list of valid servers, i.e. at least
 ;; 10 seconds old, has started and is less than 1 hour old and is
 ;; active (i.e. mod-time < 10 seconds
 ;;
@@ -230,11 +266,11 @@
 				    (mod-time   (list-ref rec 0)))
 				;; (print "start-time: " start-time " mod-time: " mod-time)
 				(and start-time mod-time
 				     (> (- now start-time) 0)    ;; been running at least 0 seconds
 				     (< (- now mod-time)   16)   ;; still alive - file touched in last 16 seconds
-				     (< (- now start-time) 
+				     (< (- now start-time)       
 					(+ (- (string->number (or (configf:lookup *configdat* "server" "runtime") "3600"))
 					      180)
 					   (random 360))) ;; under one hour running time +/- 180
 				     ))
 			      #f))
@@ -424,16 +460,245 @@
     (set! *db-last-access* (current-seconds)) ;; might not be needed.
     (if (equal? *toppath* toppath)
 	#t
 	#f)))
 
-;; timeout is in hours
-(define (server:get-timeout)
-  (let ((tmo (configf:lookup  *configdat* "server" "timeout")))
+;; timeout is hms string: 1h 5m 3s, default is 1 minute
+;;
+(define (server:expiration-timeout)
+  (let ((tmo (configf:lookup *configdat* "server" "timeout")))
     (if (and (string? tmo)
-	     (string->number tmo))
-	(* 60 60 (string->number tmo))
-	;; (* 3 24 60 60) ;; default to three days
-	;;(* 60 60 1)     ;; default to one hour
-	(* 60 5)          ;; default to five minutes
-	)))
+	     (common:hms-string->seconds tmo)) ;; BUG: hms-string->seconds is broken, if given "10" returns 0. Also, it doesn't belong in this logic unless the string->number is changed below
+        (* 3600 (string->number tmo))
+	60)))
+
+(define (server:get-best-guess-address hostname)
+  (let ((res #f))
+    (for-each 
+     (lambda (adr)
+       (if (not (eq? (u8vector-ref adr 0) 127))
+	   (set! res adr)))
+     ;; NOTE: This can fail when there is no mention of the host in /etc/hosts. FIXME
+     (vector->list (hostinfo-addresses (hostname->hostinfo hostname))))
+    (string-intersperse 
+     (map number->string
+	  (u8vector->list
+	   (if res res (hostname->ip hostname)))) ".")))
+
+;; (define server:sync-lock-token "SERVER_SYNC_LOCK")
+;; (define (server:release-sync-lock)
+;;   (db:no-sync-del! *no-sync-db* server:sync-lock-token))
+;; (define (server:have-sync-lock?)
+;;   (let* ((have-lock-pair (db:no-sync-get-lock *no-sync-db* server:sync-lock-token))
+;;          (have-lock?     (car have-lock-pair))
+;;          (lock-time      (cdr have-lock-pair))
+;;          (lock-age       (- (current-seconds) lock-time)))
+;;     (cond
+;;      (have-lock? #t)
+;;      ((>lock-age
+;;        (* 3 (configf:lookup-number *configdat* "server" "minimum-intersync-delay" default: 180)))
+;;       (server:release-sync-lock)
+;;       (server:have-sync-lock?))
+;;      (else #f))))
+
+;; moving this here as it needs access to db and cannot be in common.
+;;
+(define (server:writable-watchdog dbstruct)
+  (thread-sleep! 10) ;; delay for startup
+  (let* ((legacy-sync  (common:run-sync?))
+         (sqlite-exe   (or (get-environment-variable "MT_SQLITE3_EXE"))) ;; defined in cfg.sh
+         (sync-log     (or (args:get-arg "-sync-log") (conc *toppath* "/logs/sync-" (current-process-id) "-" (get-host-name) ".log")))
+	 (tmp-area     (common:get-db-tmp-area))
+	 (tmp-db       (conc tmp-area "/megatest.db"))
+	 (staging-file (conc *toppath* "/.megatest.db"))
+	 (mtdbfile     (conc *toppath* "/megatest.db"))
+	 (lockfile     (conc tmp-db ".lock"))
+         (sync-cmd     (conc sqlite-exe" " tmp-db " .dump | "sqlite-exe" " staging-file "&>"sync-log))
+	 (min-intersync-delay (configf:lookup-number *configdat* "server" "minimum-intersync-delay" default: 30)))
+    (if (and (not (args:get-arg "-sync-to-megatest.db")) ;; conditions under which we do not run the sync
+	     (args:get-arg "-server"))
+	(let loop ()
+          (debug:print 0 *default-log-port* "INFO: syncer thread sleeping for server.minimum-intersync-delay seconds ["min-intersync-delay"]")
+	  (thread-sleep! min-intersync-delay)
+	  (if (common:simple-file-lock lockfile)
+	      (begin
+                
+                (if (not (configf:lookup *configdat* "server" "disable-db-snapshot"))
+                    (common:snapshot-file mtdbfile subdir: ".db-snapshot"))
+		(delete-file* staging-file)
+		(let* ((start-time (current-milliseconds))
+                       (res (system sync-cmd)))
+                  (cond
+                   ((eq? 0 res)
+		    (delete-file* (conc mtdbfile ".backup"))
+		    (system (conc "/bin/mv " staging-file " " mtdbfile))
+                    (debug:print 1 *default-log-port* "INFO: ["(common:human-time)"] pid="(current-process-id)" SYNC took "(/ (- (current-milliseconds) start-time) 1000)" sec")
+                    #t)
+                   (else
+                    (system (conc "/bin/cp "sync-log" "sync-log".fail"))
+                    (debug:print 0 *default-log-port* "ERROR: ["(common:human-time)"] Sync failed. See log at "sync-log".fail")
+                    (if (file-exists? (conc mtdbfile ".backup"))
+                        (system (conc "/bin/cp "mtdbfile ".backup " mtdbfile)))))
+                  (common:simple-file-release-lock lockfile)))
+              ;; else
+              (debug:print 1 *default-log-port* "INFO: ["(common:human-time)"] pid="(current-process-id)" other SYNC in progress; not syncing.")
+              ) ;; end if got lockfile
+	  
+	  ;; keep going unless time to exit
+	  ;;
+	  (if (not *time-to-exit*)
+	      (let delay-loop ((count 0))
+		;;(debug:print-info 13 *default-log-port* "delay-loop top; count="count" pid="(current-process-id)" this-wd-num="this-wd-num" *time-to-exit*="*time-to-exit*)
+		
+		(if (and (not *time-to-exit*)
+			 (< count 6)) ;; was 11, changing to 4. 
+		    (begin
+		      (thread-sleep! 1)
+		      (delay-loop (+ count 1))))
+		(if (not *time-to-exit*) (loop))))
+	  ;; time to exit, close the no-sync db here
+	  ;; (db:no-sync-close-db no-sync-db)
+	  (if (common:low-noise-print 30)
+	      (debug:print-info 0 *default-log-port* "Exiting watchdog timer, *time-to-exit* = " *time-to-exit*" pid="(current-process-id)
+				))))))
+
+;;   (let ((legacy-sync  (common:run-sync?)))
+;;         (sync-stale-seconds (configf:lookup-number *configdat* "server" "sync-stale-seconds" default: 300))
+;; 	(debug-mode   (debug:debug-mode 1))
+;; 	(last-time    (current-seconds))
+;; 	(no-sync-db   (db:open-no-sync-db))
+;;         (sync-duration 0) ;; run time of the sync in milliseconds
+;;         ;;(this-wd-num  (begin (mutex-lock! *wdnum*mutex) (let ((x *wdnum*)) (set! *wdnum* (add1 *wdnum*)) (mutex-unlock! *wdnum*mutex) x)))
+;;         )
+;;     (set! *no-sync-db* no-sync-db) ;; make the no sync db available to api calls
+;;     (debug:print-info 2 *default-log-port* "Periodic sync thread started.")
+;;     (debug:print-info 3 *default-log-port* "watchdog starting. legacy-sync is " legacy-sync" pid="(current-process-id)  );;  " this-wd-num="this-wd-num)
+;;     (if (and legacy-sync (not *time-to-exit*))
+;; 	(let* (;;(dbstruct (db:setup))
+;; 	       (mtdb       (dbr:dbstruct-mtdb dbstruct))
+;; 	       (mtpath     (db:dbdat-get-path mtdb))
+;; 	       (tmp-area   (common:get-db-tmp-area))
+;; 	       (lockfile   (conc tmp-area "/megatest.db.lock"))
+;; 	       (start-file (conc tmp-area "/.start-sync"))
+;; 	       (end-file   (conc tmp-area "/.end-sync")))
+;; 	  (debug:print-info 0 *default-log-port* "Server running, periodic sync started.")
+;; 	  (let loop ()
+;; 	    ;; sync for filesystem local db writes
+;; 	    ;;
+;; 	    
+;; 	    (mutex-lock! *db-multi-sync-mutex*)
+;; 		  (let* ((need-sync        (>= *db-last-access* *db-last-sync*)) ;; no sync since last write
+;; 			 (sync-in-progress *db-sync-in-progress*)
+;; 			 
+;; 			 (min-intersync-delay (configf:lookup-number *configdat* "server" "minimum-intersync-delay" default: 5))
+;; 			 (should-sync      (and (not *time-to-exit*)
+;; 						(> (- (current-seconds) *db-last-sync*) min-intersync-delay))) ;; sync every five seconds minimum, deprecated logic, can probably be removed
+;; 			 (start-time       (current-seconds))
+;; 			 (cpu-load-adj     (alist-ref 'adj-proc-load (common:get-normalized-cpu-load #f)))
+;; 			 (mt-mod-time      (file-modification-time mtpath))
+;; 			 (last-sync-start  (if (common:file-exists? start-file)
+;; 					       (file-modification-time start-file)
+;; 					       0))
+;; 			 (last-sync-end    (if (common:file-exists? end-file)
+;; 					       (file-modification-time end-file)
+;; 					       10))
+;; 			 (sync-period      (+ 3 (* cpu-load-adj 30))) ;; as adjusted load increases increase the sync period
+;; 			 (recently-synced  (and (< (- start-time mt-mod-time) sync-period) ;; not useful if sync didn't modify megatest.db!
+;; 						(< mt-mod-time last-sync-start)))
+;; 			 (sync-done        (<= last-sync-start last-sync-end))
+;; 			 (sync-stale       (> start-time (+ last-sync-start sync-stale-seconds)))
+;; 			 (will-sync-pre        (and (not *time-to-exit*)       ;; do not start a sync if we are in the process of exiting
+;; 						    have-lock?
+;; 						    (or need-sync should-sync)
+;; 						    (or sync-done sync-stale)
+;; 						    (not sync-in-progress)
+;; 						    (not recently-synced)))
+;; 			 (will-sync        (if will-sync-pre
+;; 					       ;; delay get lock until we decide to sync
+;; 					       #t ;; (server:have-sync-lock?) 
+;; 					       #f)))
+;; 		    ;; if another server is syncing, postpone sync
+;; 		    (if (and will-sync-pre (not will-sync))
+;; 			(set! *db-last-sync* start-time))
+;; 		    (debug:print-info 13 *default-log-port* "WD writable-watchdog top of loop.  need-sync="need-sync" sync-in-progress=" sync-in-progress
+;; 				      " should-sync="should-sync" start-time="start-time" mt-mod-time="mt-mod-time" recently-synced="recently-synced" will-sync="will-sync
+;; 				      " sync-done=" sync-done " sync-period=" sync-period)
+;; 		    (if (and (> sync-period 5)
+;; 			     (common:low-noise-print 30 "sync-period"))
+;; 			(debug:print-info 0 *default-log-port* "Increased sync period due to long sync times, sync took: " sync-period " seconds."))
+;; 		    ;; (if recently-synced (debug:print-info 0 *default-log-port* "Skipping sync due to recently-synced flag=" recently-synced))
+;; 		    ;; (debug:print-info 0 *default-log-port* "need-sync: " need-sync " sync-in-progress: " sync-in-progress " should-sync: " should-sync " will-sync: " will-sync)
+;; 		    (if will-sync (set! *db-sync-in-progress* #t))
+;; 		    (mutex-unlock! *db-multi-sync-mutex*)
+;; 		    (if will-sync
+;; 			(let (;; (max-sync-duration  (configf:lookup-number *configdat* "server" "max-sync-duration")) ;; KEEPING THIS AVAILABLE BUT SHOULD NOT USE, I'M PRETTY SURE IT DOES NOT WORK!
+;; 			      (sync-start         (current-milliseconds)))
+;; 			  (with-output-to-file start-file (lambda ()(print (current-process-id))))
+;; 			  
+;; 			  ;; put lock here
+;; 			  
+;; 			  ;; (if (or (not max-sync-duration)
+;; 			  ;;        (< sync-duration max-sync-duration)) ;; NOTE: db:sync-to-megatest.db keeps track of time of last sync and syncs incrementally
+;; 			  (let ((res        (db:sync-to-megatest.db dbstruct no-sync-db: no-sync-db))) ;; did we sync any data? If so need to set the db touched flag to keep the server alive
+;; 			    (set! sync-duration (- (current-milliseconds) sync-start))
+;; 			    (if (> res 0) ;; some records were transferred, keep the db alive
+;; 				(begin
+;; 				  (mutex-lock! *heartbeat-mutex*)
+;; 				  (set! *db-last-access* (current-seconds))
+;; 				  (mutex-unlock! *heartbeat-mutex*)
+;; 				  (debug:print-info 0 *default-log-port* "sync called, " res " records transferred."))
+;; 				(debug:print-info 2 *default-log-port* "sync called but zero records transferred")))))
+;; 		    ;;                         ;; TODO: factor this next routine out into a function
+;; 		    ;;                         (with-input-from-pipe ;; this should not block other threads but need to verify this
+;; 		    ;;                          (conc "megatest -sync-to-megatest.db -m testsuite:" (common:get-area-name) ":" *toppath*)
+;; 		    ;;                          (lambda ()
+;; 		    ;;                            (let loop ((inl (read-line))
+;; 		    ;;                                       (res #f))
+;; 		    ;;                              (if (eof-object? inl)
+;; 		    ;;                                  (begin
+;; 		    ;;                                    (set! sync-duration (- (current-milliseconds) sync-start))
+;; 		    ;;                                    (cond
+;; 		    ;;                                     ((not res)
+;; 		    ;;                                      (debug:print 0 *default-log-port* "ERROR: sync from /tmp db to megatest.db appears to have failed. Recommended that you stop your runs and run \"megatest -cleanup-db\""))
+;; 		    ;;                                     ((> res 0)
+;; 		    ;;                                      (mutex-lock! *heartbeat-mutex*)
+;; 		    ;;                                      (set! *db-last-access* (current-seconds))
+;; 		    ;;                                      (mutex-unlock! *heartbeat-mutex*))))
+;; 		    ;;                                  (let ((num-synced (let ((matches (string-match "^Synced (\\d+).*$" inl)))
+;; 		    ;;                                                      (if matches
+;; 		    ;;                                                          (string->number (cadr matches))
+;; 		    ;;                                                          #f))))
+;; 		    ;;                                    (loop (read-line)
+;; 		    ;;                                          (or num-synced res))))))))))
+;; 		    (if will-sync
+;; 			(begin
+;; 			  (mutex-lock! *db-multi-sync-mutex*)
+;; 			  (set! *db-sync-in-progress* #f)
+;; 			  (set! *db-last-sync* start-time)
+;; 			  (with-output-to-file end-file (lambda ()(print (current-process-id))))
+;; 
+;; 			  ;; release lock here
+;; 			  ;; (server:release-sync-lock)
+;; 			  (mutex-unlock! *db-multi-sync-mutex*)))
+;; 		    (if (and debug-mode
+;; 			     (> (- start-time last-time) 60))
+;; 			(begin
+;; 			  (set! last-time start-time)
+;; 			  (debug:print-info 4 *default-log-port* "timestamp -> " (seconds->time-string (current-seconds)) ", time since start -> " (seconds->hr-min-sec (- (current-seconds) *time-zero*))))))
+;; 		  
+;; 		  ;; keep going unless time to exit
+;; 		  ;;
+;; 		  (if (not *time-to-exit*)
+;; 		      (let delay-loop ((count 0))
+;; 			;;(debug:print-info 13 *default-log-port* "delay-loop top; count="count" pid="(current-process-id)" this-wd-num="this-wd-num" *time-to-exit*="*time-to-exit*)
+;; 			
+;; 			(if (and (not *time-to-exit*)
+;; 				 (< count 6)) ;; was 11, changing to 4. 
+;; 			    (begin
+;; 			      (thread-sleep! 1)
+;; 			      (delay-loop (+ count 1))))
+;; 			(if (not *time-to-exit*) (loop))))
+;; 		  ;; time to exit, close the no-sync db here
+;; 		  (db:no-sync-close-db no-sync-db)
+;; 		  (if (common:low-noise-print 30)
+;; 		      (debug:print-info 0 *default-log-port* "Exiting watchdog timer, *time-to-exit* = " *time-to-exit*" pid="(current-process-id) ))))))) ;;" this-wd-num="this-wd-num)))))))
 

Index: sharedat.scm
==================================================================
--- sharedat.scm
+++ sharedat.scm
@@ -1,14 +1,23 @@
 
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 
 (use defstruct)
 
 ;; (use ssax)
 ;; (use sxml-serializer)

ADDED   show-uncalled-procedures.scm
Index: show-uncalled-procedures.scm
==================================================================
--- /dev/null
+++ show-uncalled-procedures.scm
@@ -0,0 +1,30 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
+(include "codescanlib.scm")
+
+(define (show-danglers)
+  (let* ((all-scm-files (glob "*.scm"))
+         (xref (get-xref all-scm-files))
+         (dangling-procs
+          (map car (filter (lambda (x) (equal? 1 (length x))) xref))))
+    (for-each print dangling-procs) ;; our product.
+    ))
+
+(show-danglers)
+
+    

DELETED spreadsheet/basic/Configurations2/accelerator/current.xml
Index: spreadsheet/basic/Configurations2/accelerator/current.xml
==================================================================
--- spreadsheet/basic/Configurations2/accelerator/current.xml
+++ /dev/null

DELETED spreadsheet/basic/META-INF/manifest.xml
Index: spreadsheet/basic/META-INF/manifest.xml
==================================================================
--- spreadsheet/basic/META-INF/manifest.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-
-
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
- 
-

DELETED spreadsheet/basic/Thumbnails/thumbnail.png
Index: spreadsheet/basic/Thumbnails/thumbnail.png
==================================================================
--- spreadsheet/basic/Thumbnails/thumbnail.png
+++ /dev/null
cannot compute difference between binary files

DELETED spreadsheet/basic/content.xml
Index: spreadsheet/basic/content.xml
==================================================================
--- spreadsheet/basic/content.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-Row 1,A
-
-
-Row 1,B
-
-
-
-
-Row 2,A
-
-
-Row 2,B
-
-
-
-
-
-
-
-this is sheet one
-
-
-
-
-
-
-
-
-Row 1,A
-
-
-Row 1,B
-
-
-
-
-Row 2,A
-
-
-Row 2,B
-
-
-
-
-
-
-
-this is sheet two
-
-
-
-
-
-
-
-
-1
-
-
-2
-
-
-
-
-2
-
-
-4
-
-
-
-
-3
-
-
-6
-
-
-
-
-4
-
-
-8
-
-
-
-
-5
-
-
-10
-
-
-
-
-6
-
-
-12
-
-
-
-
-
-

DELETED spreadsheet/basic/content.xml~
Index: spreadsheet/basic/content.xml~
==================================================================
--- spreadsheet/basic/content.xml~
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Row 1,ARow 1,BRow 2,ARow 2,Bthis is sheet oneRow 1,ARow 1,BRow 2,ARow 2,Bthis is sheet two12243648510612

DELETED spreadsheet/basic/meta.xml
Index: spreadsheet/basic/meta.xml
==================================================================
--- spreadsheet/basic/meta.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-Matt Welland2011-09-06T20:46:232011-09-06T22:05:47Matt WellandPT1H19M25S2LibreOffice/3.3$Linux LibreOffice_project/330m19$Build-301

DELETED spreadsheet/basic/mimetype
Index: spreadsheet/basic/mimetype
==================================================================
--- spreadsheet/basic/mimetype
+++ /dev/null
@@ -1,1 +0,0 @@
-application/vnd.oasis.opendocument.spreadsheet

DELETED spreadsheet/basic/settings.xml
Index: spreadsheet/basic/settings.xml
==================================================================
--- spreadsheet/basic/settings.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-0045161799view100000020000010060true04000020000010060true15000020000010060trueSheet3270010060falsetruetruetrue12632256truetruetruetruefalsefalse1270127011truefalsetrue3falsetruetruetrue12701270false1truetrue1true12632256falsefalsetrue0truetruetruefalsetrue

DELETED spreadsheet/basic/styles.xml
Index: spreadsheet/basic/styles.xml
==================================================================
--- spreadsheet/basic/styles.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-
-$-$???Page 1??? (???)09/06/2011, 22:05:47Page 1 / 99

Index: spublish.scm
==================================================================
--- spublish.scm
+++ spublish.scm
@@ -1,67 +1,62 @@
 
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 (use defstruct)
-
-;; (use ssax)
-;; (use sxml-serializer)
-;; (use sxml-modifications)
-;; (use regex)
-;; (use srfi-69)
-;; (use regex-case)
-;; (use posix)
-;; (use json)
-;; (use csv)
+(use scsh-process)
+(use refdb)
 (use srfi-18)
+(use srfi-19)
 (use format)
-
-;; (require-library ini-file)
-;; (import (prefix ini-file ini:))
-
 (use sql-de-lite srfi-1 posix regex regex-case srfi-69)
-;; (import (prefix sqlite3 sqlite3:))
-;; 
-(declare (uses configf))
+
+;(declare (uses configf))
 ;; (declare (uses tree))
 (declare (uses margs))
-;; (declare (uses dcommon))
-;; (declare (uses launch))
-;; (declare (uses gutils))
-;; (declare (uses db))
-;; (declare (uses synchash))
-;; (declare (uses server))
+
 (declare (uses megatest-version))
 ;; (declare (uses tbd))
 
 (include "megatest-fossil-hash.scm")
+;;; please create this file before using sautherise. For sample file is avaliable sample-sauth-paths.scm. 
+(include "sauth-paths.scm")
+(include "sauth-common.scm")
+(define (toplevel-command . args) #f)
+(use readline)
 
 ;;
 ;; GLOBALS
 ;;
 (define *spublish:current-tab-number* 0)
 (define *args-hash* (make-hash-table))
-(define spublish:help (conc "Usage: spublish [action [params ...]]
-
-  ls                     : list contents of target area
-  cp|publish        : copy file to target area
-  mkdir        : maks directory in target area  
-  rm               : remove file  from target area
-  ln   : creates a symlink
-  log                    :
-
+(define spublish:help (conc "Usage: spublish  [action [params ...]]
+
+  ls                     : list contents of target area
+  cp|publish         : copy file to target area
+  mkdir         : maks directory in target area  
+  rm                : remove file  from target area
+  ln    : creates a symlink
+ 
   options:
 
     -m \"message\"        : describe what was done
-
+Note: All the target locations relative to base path 
 Part of the Megatest tool suite.
 Learn more at http://www.kiatoa.com/fossils/megatest
 
 Version: " megatest-fossil-hash)) ;; "
 
@@ -71,237 +66,240 @@
 
 ;;======================================================================
 ;; DB
 ;;======================================================================
 
-(define (spublish:initialize-db db)
-  (for-each
-   (lambda (qry)
-     (exec (sql db qry)))
-   (list 
-    "CREATE TABLE IF NOT EXISTS actions
-         (id           INTEGER PRIMARY KEY,
-          action       TEXT NOT NULL,
-          submitter    TEXT NOT NULL,
-          datetime     TIMESTAMP DEFAULT (strftime('%s','now')),
-          srcpath      TEXT NOT NULL,
-          comment      TEXT DEFAULT '' NOT NULL,
-          state        TEXT DEFAULT 'new');"
-    )))
-
-(define (spublish:register-action db action submitter source-path comment)
-  (exec (sql db "INSERT INTO actions (action,submitter,srcpath,comment)
-                 VALUES(?,?,?,?)")
-	action
-	submitter
-	source-path
-	comment))
+(define *default-log-port* (current-error-port))
+(define *verbosity*         1)
+
+;(define (spublish:initialize-db db)
+;  (for-each
+;   (lambda (qry)
+;     (exec (sql db qry)))
+;   (list 
+;    "CREATE TABLE IF NOT EXISTS actions
+;         (id           INTEGER PRIMARY KEY,
+;          action       TEXT NOT NULL,
+;          submitter    TEXT NOT NULL,
+;          datetime     TIMESTAMP DEFAULT (strftime('%s','now')),
+;          srcpath      TEXT NOT NULL,
+;          comment      TEXT DEFAULT '' NOT NULL,
+;          state        TEXT DEFAULT 'new');"
+;    )))
+
+;(define (spublish:register-action db action submitter source-path comment)
+;  (exec (sql db "INSERT INTO actions (action,submitter,srcpath,comment)
+;                 VALUES(?,?,?,?)")
+;	action
+;	submitter
+;	source-path
+;	comment))
 
 ;; (call-with-database
 ;;  (lambda (db)
 ;;   (set-busy-handler! db (busy-timeout 10000)) ; 10 second timeout
 ;;   ...))
 
 ;; Create the sqlite db
-(define (spublish:db-do configdat proc) 
-  (let ((path (configf:lookup configdat "database" "location")))
-    (if (not path)
-	(begin
-	  (print "[database]\nlocation /some/path\n\n Is missing from the config file!")
-	  (exit 1)))
-    (if (and path
-	     (directory? path)
-	     (file-read-access? path))
-	(let* ((dbpath    (conc path "/spublish.db"))
-	       (writeable (file-write-access? dbpath))
-	       (dbexists  (file-exists? dbpath)))
-	  (handle-exceptions
-	   exn
-	   (begin
-	     (debug:print 2 *default-log-port* "ERROR: problem accessing db " dbpath
-			  ((condition-property-accessor 'exn 'message) exn))
-	     (exit 1))
-	   (call-with-database
-            dbpath
-	    (lambda (db)
-	      ;; (print "calling proc " proc " on db " db)
-	      (set-busy-handler! db (busy-timeout 10000)) ;; 10 sec timeout
-	      (if (not dbexists)(spublish:initialize-db db))
-	      (proc db)))))
-	(print "ERROR: invalid path for storing database: " path))))
-
-;; copy in file to dest, validation is done BEFORE calling this
-;;
-(define (spublish:cp configdat submitter source-path target-dir targ-file dest-dir comment)
-  (let ((dest-dir-path (conc target-dir "/" dest-dir))
-        (targ-path (conc target-dir "/" dest-dir "/" targ-file)))
-    (if (file-exists? targ-path)
-	(begin
-	  (print "ERROR: target file already exists, remove it before re-publishing")
-	  (exit 1)))
-       (if (not(file-exists? dest-dir-path))
-	(begin
-	  (print "ERROR: target directory " dest-dir-path " does not exists." )
-	  (exit 1)))
-
-    (spublish:db-do
-     configdat
-     (lambda (db)
-       (spublish:register-action db "cp" submitter source-path comment)))
-    (let* (;; (target-path (configf:lookup "settings" "target-path"))
-	   (th1         (make-thread
-			 (lambda ()
-			   (file-copy source-path targ-path #t))
-                            (print " ... file " targ-path " copied to" targ-path)
-			 ;; (let ((pid (process-run "cp" (list source-path target-dir))))
-			 ;;   (process-wait pid)))
-			 "copy thread"))
-	   (th2         (make-thread
-			 (lambda ()
-			   (let loop ()
-			     (thread-sleep! 15)
-			     (display ".")
-			     (flush-output)
-			     (loop)))
-			 "action is happening thread")))
-      (thread-start! th1)
-      (thread-start! th2)
-      (thread-join! th1))
-    (cons #t "Successfully saved data")))
-
-;; copy directory to dest, validation is done BEFORE calling this
-;;
-
-(define (spublish:tar configdat submitter target-dir dest-dir comment)
-  (let ((dest-dir-path (conc target-dir "/" dest-dir)))
-       (if (not(file-exists? dest-dir-path))
-	(begin
-	  (print "ERROR: target directory " dest-dir-path " does not exists." )
-	  (exit 1)))
-    ;;(print dest-dir-path )
-    (spublish:db-do
-     configdat
-     (lambda (db)
-       (spublish:register-action db "tar" submitter dest-dir-path comment)))
-       (change-directory dest-dir-path)
-       (process-wait (process-run "/bin/tar" (list "xf" "-")))
-       (print "Data copied to " dest-dir-path) 
-
-        (cons #t "Successfully saved data")))
-
-
-(define (spublish:validate target-dir targ-mk)
-  (let* ((normal-path (normalize-pathname targ-mk))
-        (targ-path (conc target-dir "/" normal-path)))
-    (if (string-contains   normal-path "..")
-    (begin
-      (print "ERROR: Path  " targ-mk " resolved outside target area "  target-dir )
-      (exit 1)))
-
-    (if (not (string-contains targ-path target-dir))
-    (begin
-      (print "ERROR: You cannot update data outside " target-dir ".")
-      (exit 1)))
-    (print "Path " targ-mk " is valid.")   
- ))
+;(define (spublish:db-do configdat proc) 
+;  (let ((path (configf:lookup configdat "database" "location")))
+;    (if (not path)
+;	(begin
+;	  (print "[database]\nlocation /some/path\n\n Is missing from the config file!")
+;	  (exit 1)))
+;    (if (and path
+;	     (directory? path)
+;	     (file-read-access? path))
+;	(let* ((dbpath    (conc path "/spublish.db"))
+;	       (writeable (file-write-access? dbpath))
+;	       (dbexists  (file-exists? dbpath)))
+;	  (handle-exceptions
+;	   exn
+;	   (begin
+;	     (debug:print 2 *default-log-port* "ERROR: problem accessing db " dbpath
+;			  ((condition-property-accessor 'exn 'message) exn))
+;	     (exit 1))
+;	   (call-with-database
+;            dbpath
+;	    (lambda (db)
+;	      ;; (print "calling proc " proc " on db " db)
+;	      (set-busy-handler! db (busy-timeout 10000)) ;; 10 sec timeout
+;	      (if (not dbexists)(spublish:initialize-db db))
+;	      (proc db)))))
+;	(print "ERROR: invalid path for storing database: " path))))
+;
+;;; copy in file to dest, validation is done BEFORE calling this
+;;;
+;(define (spublish:cp configdat submitter source-path target-dir targ-file dest-dir comment)
+;  (let ((dest-dir-path (conc target-dir "/" dest-dir))
+;        (targ-path (conc target-dir "/" dest-dir "/" targ-file)))
+;    (if (file-exists? targ-path)
+;	(begin
+;	  (print "ERROR: target file already exists, remove it before re-publishing")
+;	  (exit 1)))
+;       (if (not(file-exists? dest-dir-path))
+;	(begin
+;	  (print "ERROR: target directory " dest-dir-path " does not exists." )
+;	  (exit 1)))
+;
+;    (spublish:db-do
+;     configdat
+;     (lambda (db)
+;       (spublish:register-action db "cp" submitter source-path comment)))
+;    (let* (;; (target-path (configf:lookup "settings" "target-path"))
+;	   (th1         (make-thread
+;			 (lambda ()
+;			   (file-copy source-path targ-path #t))
+;                            (print " ... file " targ-path " copied to " targ-path)
+;			 ;; (let ((pid (process-run "cp" (list source-path target-dir))))
+;			 ;;   (process-wait pid)))
+;			 "copy thread"))
+;	   (th2         (make-thread
+;			 (lambda ()
+;			   (let loop ()
+;			     (thread-sleep! 15)
+;			     (display ".")
+;			     (flush-output)
+;			     (loop)))
+;			 "action is happening thread")))
+;      (thread-start! th1)
+;      (thread-start! th2)
+;      (thread-join! th1))
+;    (cons #t "Successfully saved data")))
+;
+;;; copy directory to dest, validation is done BEFORE calling this
+;;;
+;
+;(define (spublish:tar configdat submitter target-dir dest-dir comment)
+;  (let ((dest-dir-path (conc target-dir "/" dest-dir)))
+;       (if (not(file-exists? dest-dir-path))
+;	(begin
+;	  (print "ERROR: target directory " dest-dir-path " does not exists." )
+;	  (exit 1)))
+;    ;;(print dest-dir-path )
+;    (spublish:db-do
+;     configdat
+;     (lambda (db)
+;       (spublish:register-action db "tar" submitter dest-dir-path comment)))
+;       (change-directory dest-dir-path)
+;       (process-wait (process-run "/bin/tar" (list "xf" "-")))
+;       (print "Data copied to " dest-dir-path) 
+;
+;        (cons #t "Successfully saved data")))
+
+
+;(define (spublish:validate target-dir targ-mk)
+;  (let* ((normal-path (normalize-pathname targ-mk))
+;        (targ-path (conc target-dir "/" normal-path)))
+;    (if (string-contains   normal-path "..")
+;    (begin
+;      (print "ERROR: Path  " targ-mk " resolved outside target area "  target-dir )
+;      (exit 1)))
+;
+;    (if (not (string-contains targ-path target-dir))
+;    (begin
+;      (print "ERROR: You cannot update data outside " target-dir ".")
+;      (exit 1)))
+;    (print "Path " targ-mk " is valid.")   
+; ))
 ;; make directory in dest
 ;;
 
-(define (spublish:mkdir configdat submitter target-dir targ-mk comment)
-  (let ((targ-path (conc target-dir "/" targ-mk)))
-    
-    (if (file-exists? targ-path)
-	(begin
-	  (print "ERROR: target Directory " targ-path " already exist!!")
-	  (exit 1)))
-    (spublish:db-do
-     configdat
-     (lambda (db)
-       (spublish:register-action db "mkdir" submitter targ-mk comment)))
-    (let* ((th1         (make-thread
-			 (lambda ()
-			   (create-directory targ-path #t)
-			   (print " ... dir " targ-path " created"))
-			 "mkdir thread"))
-	   (th2         (make-thread
-			 (lambda ()
-			   (let loop ()
-			     (thread-sleep! 15)
-			     (display ".")
-			     (flush-output)
-			     (loop)))
-			 "action is happening thread")))
-      (thread-start! th1)
-      (thread-start! th2)
-      (thread-join! th1))
-    (cons #t "Successfully saved data")))
+;(define (spublish:mkdir configdat submitter target-dir targ-mk comment)
+;  (let ((targ-path (conc target-dir "/" targ-mk)))
+;    
+;    (if (file-exists? targ-path)
+;	(begin
+;	  (print "ERROR: target Directory " targ-path " already exist!!")
+;	  (exit 1)))
+;    (spublish:db-do
+;     configdat
+;     (lambda (db)
+;       (spublish:register-action db "mkdir" submitter targ-mk comment)))
+;    (let* ((th1         (make-thread
+;			 (lambda ()
+;			   (create-directory targ-path #t)
+;			   (print " ... dir " targ-path " created"))
+;			 "mkdir thread"))
+;	   (th2         (make-thread
+;			 (lambda ()
+;			   (let loop ()
+;			     (thread-sleep! 15)
+;			     (display ".")
+;			     (flush-output)
+;			     (loop)))
+;			 "action is happening thread")))
+;      (thread-start! th1)
+;      (thread-start! th2)
+;      (thread-join! th1))
+;    (cons #t "Successfully saved data")))
 
 ;; create a symlink in dest
 ;;
-(define (spublish:ln configdat submitter target-dir targ-link link-name comment)
-  (let ((targ-path (conc target-dir "/" link-name)))
-    (if (file-exists? targ-path)
-	(begin
-	  (print "ERROR: target file " targ-path " already exist!!")
-	  (exit 1)))
-     (if (not (file-exists? targ-link ))
-	(begin
-	  (print "ERROR: target file " targ-link " does not exist!!")
-	  (exit 1)))
- 
-    (spublish:db-do
-     configdat
-     (lambda (db)
-       (spublish:register-action db "ln" submitter link-name comment)))
-    (let* ((th1         (make-thread
-			 (lambda ()
-			   (create-symbolic-link targ-link targ-path  )
-			   (print " ... link " targ-path " created"))
-			 "symlink thread"))
-	   (th2         (make-thread
-			 (lambda ()
-			   (let loop ()
-			     (thread-sleep! 15)
-			     (display ".")
-			     (flush-output)
-			     (loop)))
-			 "action is happening thread")))
-      (thread-start! th1)
-      (thread-start! th2)
-      (thread-join! th1))
-    (cons #t "Successfully saved data")))
+;(define (spublish:ln configdat submitter target-dir targ-link link-name comment)
+;  (let ((targ-path (conc target-dir "/" link-name)))
+;    (if (file-exists? targ-path)
+;	(begin
+;	  (print "ERROR: target file " targ-path " already exist!!")
+;	  (exit 1)))
+;     (if (not (file-exists? targ-link ))
+;	(begin
+;	  (print "ERROR: target file " targ-link " does not exist!!")
+;	  (exit 1)))
+; 
+;    (spublish:db-do
+;     configdat
+;     (lambda (db)
+;       (spublish:register-action db "ln" submitter link-name comment)))
+;    (let* ((th1         (make-thread
+;			 (lambda ()
+;			   (create-symbolic-link targ-link targ-path  )
+;			   (print " ... link " targ-path " created"))
+;			 "symlink thread"))
+;	   (th2         (make-thread
+;			 (lambda ()
+;			   (let loop ()
+;			     (thread-sleep! 15)
+;			     (display ".")
+;			     (flush-output)
+;			     (loop)))
+;			 "action is happening thread")))
+;      (thread-start! th1)
+;      (thread-start! th2)
+;      (thread-join! th1))
+;    (cons #t "Successfully saved data")))
 
 
 ;; remove copy of file in dest
 ;;
-(define (spublish:rm configdat submitter target-dir targ-file comment)
-  (let ((targ-path (conc target-dir "/" targ-file)))
-    (if (not (file-exists? targ-path))
-	(begin
-	  (print "ERROR: target file " targ-path " not found, nothing to remove.")
-	  (exit 1)))
-    (spublish:db-do
-     configdat
-     (lambda (db)
-       (spublish:register-action db "rm" submitter targ-file comment)))
-    (let* ((th1         (make-thread
-			 (lambda ()
-			   (delete-file targ-path)
-			   (print " ... file " targ-path " removed"))
-			 "rm thread"))
-	   (th2         (make-thread
-			 (lambda ()
-			   (let loop ()
-			     (thread-sleep! 15)
-			     (display ".")
-			     (flush-output)
-			     (loop)))
-			 "action is happening thread")))
-      (thread-start! th1)
-      (thread-start! th2)
-      (thread-join! th1))
-    (cons #t "Successfully saved data")))
+;(define (spublish:rm configdat submitter target-dir targ-file comment)
+;  (let ((targ-path (conc target-dir "/" targ-file)))
+;    (if (not (file-exists? targ-path))
+;	(begin
+;	  (print "ERROR: target file " targ-path " not found, nothing to remove.")
+;	  (exit 1)))
+;    (spublish:db-do
+;     configdat
+;     (lambda (db)
+;       (spublish:register-action db "rm" submitter targ-file comment)))
+;    (let* ((th1         (make-thread
+;			 (lambda ()
+;			   (delete-file targ-path)
+;			   (print " ... file " targ-path " removed"))
+;			 "rm thread"))
+;	   (th2         (make-thread
+;			 (lambda ()
+;			   (let loop ()
+;			     (thread-sleep! 15)
+;			     (display ".")
+;			     (flush-output)
+;			     (loop)))
+;			 "action is happening thread")))
+;      (thread-start! th1)
+;      (thread-start! th2)
+;      (thread-join! th1))
+;    (cons #t "Successfully saved data")))
 
 (define (spublish:backup-move path)
   (let* ((trashdir  (conc (pathname-directory path) "/.trash"))
 	 (trashfile (conc trashdir "/" (current-seconds) "-" (pathname-file path))))
     (create-directory trashdir #t)
@@ -323,182 +321,476 @@
 
 ;;======================================================================
 ;; MISC
 ;;======================================================================
 
-(define (spublish:do-as-calling-user proc)
-  (let ((eid (current-effective-user-id))
-        (cid (current-user-id)))
-    (if (not (eq? eid cid)) ;; running suid
-            (set! (current-effective-user-id) cid))
-    ;; (print "running as " (current-effective-user-id))
-    (proc)
-    (if (not (eq? eid cid))
-        (set! (current-effective-user-id) eid))))
-
-(define (spublish:find name paths)
-  (if (null? paths)
-      #f
-      (let loop ((hed (car paths))
-		 (tal (cdr paths)))
-	(if (file-exists? (conc hed "/" name))
-	    hed
-	    (if (null? tal)
-		#f
-		(loop (car tal)(cdr tal)))))))
+;(define (spublish:do-as-calling-user proc)
+;  (let ((eid (current-effective-user-id))
+;        (cid (current-user-id)))
+;    (if (not (eq? eid cid)) ;; running suid
+;            (set! (current-effective-user-id) cid))
+;    ;; (print "running as " (current-effective-user-id))
+;    (proc)
+;    (if (not (eq? eid cid))
+;        (set! (current-effective-user-id) eid))))
+
+;(define (spublish:find name paths)
+;  (if (null? paths)
+;      #f
+;      (let loop ((hed (car paths))
+;		 (tal (cdr paths)))
+;	(if (file-exists? (conc hed "/" name))
+;	    hed
+;	    (if (null? tal)
+;		#f
+;		(loop (car tal)(cdr tal)))))))
+
+;;========================================================================
+;;Shell 
+;;========================================================================
+(define (spublish:get-accessable-projects  area)
+   (let* ((projects `()))
+            (if (spublish:has-permission area)
+               (set! projects (cons area projects))
+               (begin
+                 (print "User cannot access area " area "!!")  
+                (exit 1))) 
+    projects))
+
+;; function to find sheets to which use has access 
+(define (spublish:has-permission  area)
+  ;(print "in spublish:has-permission")
+  (let* ((username     (current-user-name))
+        (ret-val #f))
+  (cond
+   ((equal? (is-admin username) #t)
+     (set! ret-val #t))
+    ((equal? (is-user "publish" username area) #t)
+     (set! ret-val #t))
+   ((equal? (is-user "writer-admin" username area) #t) 
+     (set! ret-val #t))
+
+   ((equal? (is-user "area-admin" username area) #t) 
+     (set! ret-val #t))
+   (else  
+    (set! ret-val #f)))
+       ret-val))
+
+(define (is_directory target-path) 
+  (let* ((retval #f))
+  (sauthorize:do-as-calling-user
+    	(lambda ()
+          ;(print (current-effective-user-id) ) 
+          (if (directory? target-path)
+               (set! retval  #t))))
+             ;(print (current-effective-user-id))
+     retval)) 
+
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+;; shell functions
+;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
+(define (spublish:shell-cp src-path target-path)  
+  (cond
+   ((not (file-exists? target-path))
+	(sauth:print-error (conc " target Directory " target-path " does not exist!!")))
+   ((not (file-exists? src-path))
+    (sauth:print-error (conc "Source path " src-path " does not exist!!" )))
+   (else
+     (if (is_directory src-path) 
+        (begin
+            (let* ((parent-dir src-path)
+                   (start-dir target-path))
+                 (run (pipe
+                   (begin (system (conc "cd " parent-dir " ;tar chf - ." )))
+                   (begin (change-directory start-dir)
+                          ;(print "123")
+                          (run-cmd "tar" (list "xf" "-")))))
+                          (print "Copied data to " start-dir))) 
+        (begin
+           (let*((parent-dir (pathname-directory src-path))
+                  (start-dir target-path)
+                (filename (if  (pathname-extension src-path)  
+                                      (conc(pathname-file src-path) "." (pathname-extension src-path))
+                                      (pathname-file src-path))))
+                ;(print "parent-dir " parent-dir " start-dir " start-dir)   
+                 (run (pipe
+                   (begin (system (conc "cd " parent-dir ";tar chf - " filename )))
+                   (begin (change-directory start-dir)
+                          (run-cmd "tar" (list "xf" "-")))))
+                          (print "Copied data to " start-dir)))))))
+
+
+(define (spublish:shell-mkdir targ-path)
+    (if (file-exists? targ-path)
+	(begin
+	  (print "Info: Target Directory " targ-path " already exist!!"))
+        (let* ((th1         (make-thread
+			 (lambda ()
+			   (create-directory targ-path #t)
+			   (print " ... dir " targ-path " created"))
+			 "mkdir thread"))
+	   (th2         (make-thread
+			 (lambda ()
+			   (let loop ()
+			     (thread-sleep! 15)
+			     (display ".")
+			     (flush-output)
+			     (loop)))
+			 "action is happening thread")))
+      (thread-start! th1)
+      (thread-start! th2)
+      (thread-join! th1)
+    (cons #t "Successfully saved data"))))
+ 
+
+(define (spublish:shell-rm targ-path iport)
+    (if (not (file-exists? targ-path))
+	(begin
+	  (sauth:print-error (conc "target path " targ-path " does not exist!!")))
+        (begin 
+           (print "Are you sure you want to delete " targ-path "?[y/n]") 
+            (let* ((inl (read-line iport)))
+                (if (equal? inl "y")
+	             (let* ((th1         (make-thread
+			     (lambda ()
+                                (if (symbolic-link? targ-path)
+                                  (delete-file  targ-path )  
+                                  (if (directory? targ-path)
+                                    (delete-directory targ-path #t)     
+			            (delete-file  targ-path )))
+			        (print " ... path " targ-path " deleted"))
+			        "rm thread"))
+	   		    (th2         (make-thread
+			      (lambda ()
+			         (let loop ()
+			            (thread-sleep! 15)
+			            (display ".")
+			            (flush-output)
+			            (loop)))
+			 "action is happening thread")))
+      			(thread-start! th1)
+      			(thread-start! th2)
+      			(thread-join! th1)
+    			(cons #t "Successfully saved data")))))))
+
+(define (spublish:shell-ln src-path target-path sub-path)
+   (if (not (file-exists? sub-path))
+	 (sauth:print-error (conc "Path " sub-path " does not exist!! cannot proceed with link creation!!"))
+        (begin  
+          (if (not (file-exists? src-path))
+  	    (sauth:print-error (conc "Path " src-path " does not exist!! cannot proceed with link creation!!"))
+            (begin
+                (if (file-exists? target-path)
+                   (sauth:print-error (conc "Path " target-path "already exist!! cannot proceed with link creation!!"))
+                   (begin 
+                      (create-symbolic-link src-path target-path  )
+			   (print " ... link " target-path " created"))))))))
+ 
+(define (spublish:shell-help)
+(conc "Usage: [action [params ...]]
+
+  ls    [target path]               	  : list contents of target area.
+  cd     	     	          : To change the current directory within the sretrive shell. 
+  pwd				     	  : Prints the full pathname of the current directory within the sretrive shell.
+  mkdir                             : creates directory. Note it does not create's a path recursive manner.
+  rm                         : removes files and emoty directories   
+  cp                    : copy a file/dir to target path. if src is a dir it automatically makes a recursive copy.
+  ln TARGET LINK_NAME                     : creates a symlink      
+Part of the Megatest tool suite.
+Learn more at http://www.kiatoa.com/fossils/megatest
+
+Version: " megatest-fossil-hash)
+)	
+
+(define (toplevel-command . args) #f)
+
+(define (spublish:shell area)
+ ; (print area)
+  (use readline)
+
+  (let* ((path      '())
+	 (prompt    "spublish> ")
+	 (args      (argv))
+         (usr (current-user-name) )   
+         (top-areas (spublish:get-accessable-projects area))
+         (close-port     #f)
+         (area-obj  (get-obj-by-code area))
+         (user-obj (get-user usr)) 
+         (base-path (if (null? area-obj) 
+                         "" 
+                        (caddr (cdr area-obj))))      
+	 (iport     (make-readline-port prompt)))
+        ;(print base-path) 
+        (if (null? area-obj)
+          (begin 
+             (print "Area " area " does not exist")
+          (exit 1)))
+        ; (print "here")    
+	(let loop ((inl (read-line iport)))
+	  (if (not (or (or (eof-object? inl)
+		       (equal? inl "exit")) (port-closed? iport)))
+	      (let* ((parts (string-split inl))
+		     (cmd   (if (null? parts) #f (car parts))))
+		(if (and (not cmd) (not (port-closed? iport)))
+		    (loop (read-line))
+		    (case (string->symbol cmd)
+		      ((cd)
+		       (if (> (length parts) 1) ;; have a parameter
+                           (begin
+                             (let*((arg (cadr parts))
+                                   (resolved-path (sauth-common:resolve-path  arg path top-areas))
+                                   (target-path (sauth-common:get-target-path path  arg top-areas base-path)))
+                                 (if (not (equal? target-path #f))
+                                 (if (or (equal? resolved-path #f) (not (file-exists? target-path)))    
+                                 (print "Invalid argument " arg ".. ")
+                                  (begin      
+			            (set! path resolved-path)
+                                     (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "cd"))))
+                                  )))))  
+   			   (set! path '())))
+                      ((pwd)
+                         (if (null? path)
+                           (print "/")  
+                           (print "/" (string-join path "/")))) 
+		      ((ls)
+		       (let* ((thepath (if (> (length parts) 1) ;; have a parameter
+					   (cdr parts)
+					   `()))
+			      (plen    (length thepath)))
+                         (cond
+			  ((null? thepath)
+                           (sauth-common:shell-ls-cmd path "" top-areas base-path  '())
+                            (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "ls"))))   )
+			  ((< plen 2)
+                            (sauth-common:shell-ls-cmd path  (car thepath) top-areas base-path '())
+                              (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "ls")))))
+                          (else 
+                            (if (equal? (car thepath) "|")
+                              (sauth-common:shell-ls-cmd path "" top-areas base-path thepath)
+                              (sauth-common:shell-ls-cmd path  (car thepath) top-areas base-path (cdr thepath)))
+                           (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "ls"))))))))
+                       ((mkdir)
+                         (let* ((thepath (if (> (length parts) 1) ;; have a parameter
+				   (cdr parts)
+				   `()))
+			      (plen    (length thepath)))
+                         (cond
+                          ((null? thepath)
+                            (print "mkdir takes one argument"))
+                          ((< plen 2) 
+                            (let*((mk-path (cadr parts))
+                                  (resolved-path (sauth-common:resolve-path  mk-path path top-areas))
+                                  (target-path (sauth-common:get-target-path path  mk-path top-areas base-path)))
+                              (if (not (equal? target-path #f))
+                                 (if (equal? resolved-path #f)     
+                                 (print "Invalid argument " mk-path ".. ")
+                                  (begin 
+                                       (print "here")
+                                      (spublish:shell-mkdir target-path)   
+                                      (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "mkdir")))))))
+		       )))))
+                       ((rm)
+                          (let* ((thepath (if (> (length parts) 1) ;; have a parameter
+				   (cdr parts)
+				   `()))
+			      (plen    (length thepath)))
+                         (cond
+                          ((null? thepath)
+                            (print "rm takes one argument"))
+                          ((< plen 2) 
+                            (let*((rm-path (cadr parts))
+                                  (resolved-path (sauth-common:resolve-path  rm-path path top-areas))
+                                  (target-path (sauth-common:get-target-path path  rm-path top-areas base-path)))
+                              (if (not (equal? target-path #f))
+                                 (if (equal? resolved-path #f)     
+                                 (print "Invalid argument " rm-path ".. ")
+                                  (begin 
+                                      (spublish:shell-rm target-path iport)   
+                                      (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "rm")))))))
+		       )))))
+
+                      ((cp publish)
+                          (let* ((thepath (if (> (length parts) 1) ;; have a parameter
+				   (cdr parts)
+				   `()))
+			      (plen    (length thepath)))
+                         (cond
+                          ((or (null? thepath) (< plen 2)) 
+                            (print "cp takes two argument"))
+                          ((< plen 3) 
+                            (let*((src-path (car thepath))
+                                  (dest-path (cadr thepath))   
+                                  (resolved-path (sauth-common:resolve-path  dest-path path top-areas))
+                                  (target-path (sauth-common:get-target-path path  dest-path top-areas base-path)))
+                              (if (not (equal? target-path #f))
+                                 (if (equal? resolved-path #f)     
+                                 (print "Invalid argument " dest-path ".. ")
+                                  (begin 
+                                      (spublish:shell-cp src-path target-path)   
+                                      (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "cp")))))))
+		       )))))
+                      ((ln)
+                           (let* ((thepath (if (> (length parts) 1) ;; have a parameter
+				   (cdr parts)
+				   `()))
+			      (plen    (length thepath)))
+                         (cond
+                          ((or (null? thepath) (< plen 2)) 
+                            (print "ln takes two argument"))
+                          ((< plen 3) 
+                            (let*((src-path (car thepath))
+                                  (dest-path (cadr thepath))   
+                                  (resolved-path (sauth-common:resolve-path  dest-path path top-areas))
+                                  (target-path (sauth-common:get-target-path path  dest-path top-areas base-path))
+                                  (sub-path (conc "/" (string-reverse (string-join (cdr (string-split (string-reverse  target-path) "/")) "/")))))
+                              (if (not (equal? target-path #f))
+                                 (if (equal? resolved-path #f)     
+                                 (print "Invalid argument " dest-path ".. ")
+                                  (begin 
+                                      (spublish:shell-ln src-path target-path sub-path)   
+                                      (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "ln")))))))
+		       )))))  
+                      ((exit)
+                          (print "got exit"))  
+                      ((help)
+                          (print (spublish:shell-help)))
+		      (else 
+		       (print "Got command: " inl))))
+                 (loop (read-line iport)))))))
+
 
 ;;======================================================================
 ;; MAIN
 ;;======================================================================
 
-(define (spublish:load-config exe-dir exe-name)
-  (let* ((fname   (conc exe-dir "/." exe-name ".config")))
+;(define (spublish:load-config exe-dir exe-name)
+;  (let* ((fname   (conc exe-dir "/." exe-name ".config")))
     ;; (ini:property-separator-patt " *  *")
     ;; (ini:property-separator #\space)
-    (if (file-exists? fname)
-	;; (ini:read-ini fname)
-	(read-config fname #f #t)
-	(make-hash-table))))
-
-(define (spublish:process-action configdat action . args)
-  (let* ((target-dir    (configf:lookup configdat "settings" "target-dir"))
-	 (user          (current-user-name))
-	 (allowed-users (string-split
-			 (or (configf:lookup configdat "settings" "allowed-users")
-			     ""))))
-    (if (not target-dir)
-	(begin
-	  (print "[settings]\ntarget-dir /some/path\n\n Is MISSING from the config file!")
-	  (exit)))
-    (if (null? allowed-users)
-	(begin
-	  (print "[setings]\nallowed-users user1 user2 ...\n\n Is MISSING from the config file!")
-	  (exit)))
-    (if (not (member user allowed-users))
-	(begin
-	  (print "User \"" (current-user-name) "\" does not have access. Exiting")
-	  (exit 1)))
+;    (if (file-exists? fname)
+;	;; (ini:read-ini fname)
+;	(read-config fname #f #t)
+;	(make-hash-table))))
+
+(define (spublish:process-action action . args)
+  ;(print args)
+  (let* ((usr          (current-user-name))
+         (user-obj (get-user usr)) 
+         (area   (car args))
+         (area-obj  (get-obj-by-code area))
+         (top-areas (spublish:get-accessable-projects area))  
+         (base-path (if (null? area-obj) 
+                         "" 
+                        (caddr (cdr area-obj))))   
+         (remargs (cdr args)))
+     (if (null? area-obj)
+          (begin 
+             (print "Area " area " does not exist")
+          (exit 1)))
     (case (string->symbol action)
       ((cp publish)
-       (if (< (length args) 2)
+       (if (< (length remargs) 2)
 	   (begin 
-	     (print "ERROR: Missing arguments; " (string-intersperse args ", "))
+	     (print "ERROR: Missing arguments; spublish   " )
 	     (exit 1)))
-       (let* ((remargs     (args:get-args args '("-m") '() args:arg-hash 0))
-              (dest-dir (cadr args))
-              (src-path-in (car args))
+       (let* ((filter-args     (args:get-args args '("-m") '() args:arg-hash 0))
+              (src-path-in (car filter-args))
+              (dest-path (cadr filter-args))
 	      (src-path    (with-input-from-pipe
 			    (conc "readlink -f " src-path-in)
 			    (lambda ()
 			      (read-line))))
 	      (msg         (or (args:get-arg "-m") ""))
-	      (targ-file   (pathname-strip-directory src-path)))
-	 (if (not (file-read-access? src-path))
-	     (begin
-	       (print "ERROR: source file not readable: " src-path)
-	       (exit 1)))
-	 (if (directory? src-path)
-	     (begin
-              (print "ERROR: source file is a directory, this is not supported yet.")
-	       (exit 1)))
-	     (print "publishing " src-path-in " to " target-dir)
-             (spublish:validate     target-dir dest-dir)
-	     (spublish:cp configdat user src-path target-dir targ-file dest-dir msg)))
-      ((tar)
-        (if (< (length args) 1)
-          (begin 
-	     (print "ERROR: Missing arguments; " (string-intersperse args ", "))
-	     (exit 1)))
-        (let* ((dst-dir (car args))
-               (msg         (or (args:get-arg "-m") "")))
-               (spublish:validate     target-dir  dst-dir)
-               (spublish:tar configdat user target-dir dst-dir msg)))
- 
-      ((mkdir)
-        (if (< (length args) 1)
-          (begin 
-	     (print "ERROR: Missing arguments; " (string-intersperse args ", "))
-	     (exit 1)))
-        (let* ((targ-mk (car args))
-               (msg         (or (args:get-arg "-m") ""))) 
-               (print "attempting to create directory " targ-mk " in " target-dir)
-               (spublish:validate     target-dir targ-mk)
-               (spublish:mkdir configdat user target-dir targ-mk msg)))
-
-      ((ln) 
-        (if (< (length args) 2)
-          (begin 
-	     (print "ERROR: Missing arguments; " (string-intersperse args ", "))
-	     (exit 1)))
-        (let* ((targ-link (car args))
-               (link-name (cadr args))  
-               (sub-path (string-reverse (string-join (cdr (string-split (string-reverse link-name) "/")) "/"))) 
-               (msg         (or (args:get-arg "-m") "")))
-               (if (> (string-length(string-trim sub-path)) 0)
-                (begin 
-                  (print "attempting to create directory " sub-path " in " target-dir)
-                  (spublish:validate     target-dir sub-path)
-                  (print (conc target-dir "/" sub-path ) )
-                  (print (directory-exists?(conc target-dir "/" sub-path )))
-                  (if (directory-exists?(conc target-dir "/" sub-path ))
-                   (print "Target Directory " (conc target-dir sub-path ) " exist!!")
-                  (spublish:mkdir configdat user target-dir sub-path msg))))
-
-               (print "attempting to create link " link-name " in " target-dir)
-               (spublish:ln configdat user target-dir targ-link link-name msg)))
-
+              (resolved-path (sauth-common:resolve-path  (conc area "/" dest-path) `() top-areas))
+              (target-path (sauth-common:get-target-path `()  (conc area "/" dest-path) top-areas base-path)))
+ 	     (if (not (equal? target-path #f))
+                 (if (equal? resolved-path #f)     
+                    (print "Invalid argument " dest-path ".. ")
+                    (begin 
+                      (spublish:shell-cp src-path target-path)   
+                      (sauthorize:do-as-calling-user
+                      (lambda ()
+		        (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\" cp " src-path-in " " dest-path  "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "cp")))))))))   
+      ((mkdir)
+        (if (< (length remargs) 1)
+          (begin 
+	     (print "ERROR: Missing arguments;  ")
+	     (exit 1)))
+        (let* ((filter-args     (args:get-args args '("-m") '() args:arg-hash 0))
+               (mk-path (car filter-args))
+               (msg         (or (args:get-arg "-m") ""))
+               (resolved-path (sauth-common:resolve-path  mk-path (list area) top-areas))
+               (target-path (sauth-common:get-target-path (list area)  mk-path top-areas base-path))) 
+               (print "attempting to create directory " mk-path  )
+               (if (not (equal? target-path #f))
+                 (if (equal? resolved-path #f)     
+                   (print "Invalid argument " mk-path ".. ")
+                   (begin 
+                     (spublish:shell-mkdir target-path)   
+                     (sauthorize:do-as-calling-user
+                       (lambda ()
+		        (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\" mkdir " mk-path  "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "mkdir")))))))))  
+      ((ln) 
+        (if (< (length remargs) 2)
+          (begin 
+	     (print "ERROR: Missing arguments;    " )
+	     (exit 1)))
+        (let* ((filter-args     (args:get-args args '("-m") '() args:arg-hash 0))
+              (src-path (car filter-args))
+              (dest-path (cadr filter-args))   
+              (resolved-path (sauth-common:resolve-path  dest-path (list area) top-areas))
+              (target-path (sauth-common:get-target-path  (list area)  dest-path top-areas base-path))
+              (sub-path (conc "/" (string-reverse (string-join (cdr (string-split (string-reverse  target-path) "/")) "/")))))
+               (if (not (equal? target-path #f))
+                  (if (equal? resolved-path #f)     
+                    (print "Invalid argument " dest-path ".. ")
+                    (begin 
+                   (spublish:shell-ln src-path target-path sub-path)   
+                  (sauthorize:do-as-calling-user
+                 (lambda ()
+		   (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\" ln " src-path " " dest-path  "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "ln")))))))))
       ((rm)
-       (if (< (length args) 1)
+       (if (< (length remargs) 1)
 	   (begin 
-	     (print "ERROR: Missing arguments; " (string-intersperse args ", "))
+	     (print "ERROR: Missing arguments;   ")
 	     (exit 1)))
-       (let* ((targ-file (car args))
-	      (msg         (or (args:get-arg "-m") "")))
-	 (print "attempting to remove " targ-file " from " target-dir)
-           (spublish:validate     target-dir targ-file)
-
-	 (spublish:rm configdat user target-dir targ-file msg)))
-      ((publish)
-       (if (< (length args) 3)
-	   (begin 
-	     (print "ERROR: Missing arguments; " (string-intersperse args ", "))
+       (let* ((filter-args  (args:get-args args '("-m") '() args:arg-hash 0))
+              (rm-path (car filter-args))
+              (resolved-path (sauth-common:resolve-path  rm-path (list area) top-areas))
+               (prompt    ">")
+              (iport     (make-readline-port prompt))
+              (target-path (sauth-common:get-target-path (list area)  rm-path top-areas base-path)))
+	       (if (not (equal? target-path #f))
+                                 (if (equal? resolved-path #f)     
+                                 (print "Invalid argument " rm-path ".. ")
+                                  (begin 
+                                      (spublish:shell-rm target-path iport)   
+                                      (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\" rm " rm-path "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "rm")))))))))
+      ((shell)
+          (if (< (length args) 1)
+             (begin 
+	     (print  "ERROR: Missing arguments area!!" )
 	     (exit 1))
-	   (let* ((srcpath  (list-ref args 0))
-		  (areaname (list-ref args 1))
-		  (version  (list-ref args 2))
-		  (remargs  (args:get-args (drop args 2)
-					   '("-type" ;; link or copy (default is copy)
-					     "-m")
-					   '()
-					   args:arg-hash
-					   0))
-		  (publish-type (if (equal? (args:get-arg "-type") "link") 'link 'copy))
-		  (comment      (or (args:get-arg "-m") ""))
-		  (submitter    (current-user-name))
-		  (quality      (args:get-arg "-quality"))
-		  (publish-res  (spublish:publish configdat publish-type areaname version comment srcpath submitter quality)))
-	     (if (not (car publish-res))
-		 (begin
-		   (print "ERROR: " (cdr publish-res))
-		   (exit 1))))))
-      ((list-versions)
-       (let ((area-name (car args)) ;;      version patt   full print
-	     (remargs   (args:get-args args '("-vpatt") '("-full") args:arg-hash 0))
-	     (db        (spublish:open-db configdat))
-	     (versions  (spublish:get-versions-for-area db (car args) version-patt: (args:get-arg "-vpatt"))))
-	 ;; (print "area-name=" area-name " args=" args " *args-hash*=" (hash-table->alist *args-hash*))
-	 (map (lambda (x)
-		(if (args:get-arg "-full")
-		    (format #t 
-			    "~10a~10a~4a~27a~30a\n"
-			    (vector-ref x 0)
-			    (vector-ref x 1) 
-			    (vector-ref x 2) 
-			    (conc "\"" (time->string (seconds->local-time (vector-ref x 3))) "\"")
-			    (conc "\"" (vector-ref x 4) "\""))
-		    (print (vector-ref x 0))))
-	      versions)))
+             (spublish:shell area))) 
       (else (print "Unrecognised command " action)))))
   
 ;; ease debugging by loading ~/.dashboardrc - REMOVE FROM PRODUCTION!
 ;; (let ((debugcontrolf (conc (get-environment-variable "HOME") "/.spublishrc")))
 ;;   (if (file-exists? debugcontrolf)
@@ -506,37 +798,21 @@
 
 (define (main)
   (let* ((args      (argv))
 	 (prog      (car args))
 	 (rema      (cdr args))
-	 (exe-name  (pathname-file (car (argv))))
-	 (exe-dir   (or (pathname-directory prog)
-			(spublish:find exe-name (string-split (get-environment-variable "PATH") ":"))))
-	 (configdat (spublish:load-config exe-dir exe-name)))
+	 (exe-name  (pathname-file (car (argv)))))
     (cond
      ;; one-word commands
      ((eq? (length rema) 1)
       (case (string->symbol (car rema))
 	((help -h -help --h --help)
 	 (print spublish:help))
-	((list-vars) ;; print out the ini file
-	 (map print (spublish:get-areas configdat)))
-	((ls)
-	 (let ((target-dir (configf:lookup configdat "settings" "target-dir")))
-	   (print "Files in " target-dir)
-	   (system (conc "ls " target-dir))))
-	((log)
-	 (spublish:db-do configdat (lambda (db)
-				     (print "Listing actions")
-				     (query (for-each-row
-					     (lambda (row)
-					       (apply print (intersperse row " | "))))
-					    (sql db "SELECT * FROM actions")))))
 	(else
 	 (print "ERROR: Unrecognised command. Try \"spublish help\""))))
      ;; multi-word commands
      ((null? rema)(print spublish:help))
      ((>= (length rema) 2)
-      (apply spublish:process-action configdat (car rema)(cdr rema)))
+      (apply spublish:process-action (car rema)(cdr rema)))
      (else (print "ERROR: Unrecognised command2. Try \"spublish help\"")))))
 
 (main)

Index: sretrieve.scm
==================================================================
--- sretrieve.scm
+++ sretrieve.scm
@@ -1,49 +1,46 @@
 
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 (use defstruct)
-
-;; (use ssax)
-;; (use sxml-serializer)
-;; (use sxml-modifications)
-;; (use regex)
-;; (use srfi-69)
-;; (use regex-case)
-;; (use posix)
-;; (use json)
-;; (use csv)
-;; (use directory-utils)
+(use scsh-process)
 (use srfi-18)
-(use format)
-
-;; (require-library ini-file)
-;; (import (prefix ini-file ini:))
-
+(use srfi-19)
+(use refdb)
 (use sql-de-lite srfi-1 posix regex regex-case srfi-69)
-;; (import (prefix sqlite3 sqlite3:))
-;; 
-(declare (uses configf))
-;; (declare (uses tree))
+;(declare (uses common))
+;(declare (uses configf))
 (declare (uses margs))
-;; (declare (uses dcommon))
-;; (declare (uses launch))
-;; (declare (uses gutils))
-;; (declare (uses db))
-;; (declare (uses synchash))
-;; (declare (uses server))
 (declare (uses megatest-version))
-;; (declare (uses tbd))
+ 
 
 (include "megatest-fossil-hash.scm")
+;;; please create this file before using sautherise. For sample file is avaliable sample-sauth-paths.scm. 
+(include "sauth-paths.scm")
+(include "sauth-common.scm")
+
+(define (toplevel-command . args) #f)
+(use readline)
+
+
+
 
 ;;
 ;; GLOBALS
 ;;
 (define *verbosity* 1)
@@ -51,16 +48,14 @@
 (define *exe-name* (pathname-file (car (argv))))
 (define *sretrieve:current-tab-number* 0)
 (define *args-hash* (make-hash-table))
 (define sretrieve:help (conc "Usage: " *exe-name* " [action [params ...]]
 
-  ls                     : list contents of target area
-  get        : retrieve data for release 
-    -m \"message\"       : why retrieved?
-  cp      : copy file to current directory 
-  log                    : get listing of recent downloads
-  shell                  : start a shell-like interface
+  ls                           : list contents of target area
+  get           : retrieve path to the data within 
+     -m \"message\"       : why retrieved?
+  shell                     : start a shell-like interface
 
 Part of the Megatest tool suite.
 Learn more at http://www.kiatoa.com/fossils/megatest
 
 Version: " megatest-fossil-hash)) ;; "
@@ -72,320 +67,214 @@
 ;;======================================================================
 ;; DB
 ;;======================================================================
 
 ;; replace (strftime('%s','now')), with datetime('now'))
-(define (sretrieve:initialize-db db)
-  (for-each
-   (lambda (qry)
-     (exec (sql db qry)))
-   (list 
-    "CREATE TABLE IF NOT EXISTS actions
-         (id           INTEGER PRIMARY KEY,
-          action       TEXT NOT NULL,
-          retriever    TEXT NOT NULL,
-          datetime     TIMESTAMP DEFAULT (datetime('now','localtime')),
-          srcpath      TEXT NOT NULL,
-          comment      TEXT DEFAULT '' NOT NULL,
-          state        TEXT DEFAULT 'new');"
-    "CREATE TABLE IF NOT EXISTS bundles
-         (id           INTEGER PRIMARY KEY,
-          bundle       TEXT NOT NULL,
-          release      TEXT NOT NULL,
-          status       TEXT NOT NULL,
-          event_date   TEXT NOT NULL);"
-    )))
-
-(define (sretrieve:register-action db action submitter source-path comment)
-  (print "(sretrieve:register-action db " db " action " action " submitter " submitter " source-path " source-path " comment " comment)
-  (exec (sql db "INSERT INTO actions (action,retriever,srcpath,comment)
-                 VALUES(?,?,?,?)")
-	action
-	submitter
-	source-path
-	(or comment "")))
+;(define (sretrieve:initialize-db db)
+;  (for-each
+;   (lambda (qry)
+;     (exec (sql db qry)))
+;   (list 
+;    "CREATE TABLE IF NOT EXISTS actions
+;         (id           INTEGER PRIMARY KEY,
+;          action       TEXT NOT NULL,
+;          retriever    TEXT NOT NULL,
+;          datetime     TIMESTAMP DEFAULT (datetime('now','localtime')),
+;          srcpath      TEXT NOT NULL,
+;          comment      TEXT DEFAULT '' NOT NULL,
+;          state        TEXT DEFAULT 'new');"
+;    "CREATE TABLE IF NOT EXISTS bundles
+;         (id           INTEGER PRIMARY KEY,
+;          bundle       TEXT NOT NULL,
+;          release      TEXT NOT NULL,
+;          status       TEXT NOT NULL,
+;          event_date   TEXT NOT NULL);"
+;    )))
+;
+;(define (sretrieve:register-action db action submitter source-path comment)
+; ; (print "(sretrieve:register-action db " db " action " action " submitter " submitter " source-path " source-path " comment " comment)
+;  (exec (sql db "INSERT INTO actions (action,retriever,srcpath,comment)
+;                 VALUES(?,?,?,?)")
+;	action
+;	submitter
+;	source-path
+;	(or comment "")))
 
 ;; (call-with-database
 ;;  (lambda (db)
 ;;   (set-busy-handler! db (busy-timeout 10000)) ; 10 second timeout
 ;;   ...))
 
 ;; Create the sqlite db
-(define (sretrieve:db-do configdat proc) 
-
-  (let ((path (configf:lookup configdat "database" "location")))
-    (if (not path)
-	(begin
-	  (debug:print 0 *default-log-port* "[database]\nlocation /some/path\n\n Is missing from the config file!")
-	  (exit 1)))
-    (if (and path
-	     (directory? path)
-	     (file-read-access? path))
-	(let* ((dbpath    (conc path "/" *exe-name* ".db"))
-	       (writeable (file-write-access? dbpath))
-	       (dbexists  (file-exists? dbpath)))
-	  (handle-exceptions
-	   exn
-	   (begin
-	     (debug:print 2 *default-log-port* "ERROR: problem accessing db " dbpath
-			  ((condition-property-accessor 'exn 'message) exn))
-	     (exit 1))
-            ;;(debug:print 0 *default-log-port* "calling proc " proc "db path " dbpath )
-	   (call-with-database
-            dbpath
-	    (lambda (db)
-	       ;;(debug:print 0 *default-log-port* "calling proc " proc " on db " db)
-	      (set-busy-handler! db (busy-timeout 10000)) ;; 10 sec timeout
-	      (if (not dbexists)(sretrieve:initialize-db db))
-	      (proc db)))))
-	(debug:print-error 0 *default-log-port* "invalid path for storing database: " path))))
+;(define (sretrieve:db-do configdat proc) 
+;  (let ((path (configf:lookup configdat "database" "location")))
+;    (if (not path)
+;	(begin
+;	  (debug:print 0 "[database]\nlocation /some/path\n\n Is missing from the config file!")
+;	  (exit 1)))
+;    (if (and path
+;	     (directory? path)
+;	     (file-read-access? path))
+;	(let* ((dbpath    (conc path "/" *exe-name* ".db"))
+;	       (writeable (file-write-access? dbpath))
+;	       (dbexists  (file-exists? dbpath)))
+;	  (handle-exceptions
+;	   exn
+;	   (begin
+;	     (debug:print 2 "ERROR: problem accessing db " dbpath
+;			  ((condition-property-accessor 'exn 'message) exn))
+;	     (exit 1))
+;            ;;(debug:print 0 "calling proc " proc "db path " dbpath )
+;	   (call-with-database
+;            dbpath
+;	    (lambda (db)
+;	       ;;(debug:print 0 "calling proc " proc " on db " db)
+;	      (set-busy-handler! db (busy-timeout 10000)) ;; 10 sec timeout
+;	      (if (not dbexists)(sretrieve:initialize-db db))
+;	      (proc db)))))
+;	(debug:print 0 "ERROR: invalid path for storing database: " path))))
 
 ;; copy in directory to dest, validation is done BEFORE calling this
 ;;
-(define (sretrieve:get configdat retriever version comment)
-  (let* ((base-dir  (configf:lookup configdat "settings" "base-dir"))
-	 (datadir   (conc base-dir "/" version)))
-    (if (or (not base-dir)
-	    (not (file-exists? base-dir)))
-	(begin
-	  (debug:print-error 0 *default-log-port* "Bad configuration! base-dir " base-dir " not found")
-	  (exit 1)))
-    (print datadir)
-    (if (not (file-exists? datadir))
-	(begin
-	  (debug:print-error 0 *default-log-port* "Bad version (" version "), no data found at " datadir "." )
-	  (exit 1)))
-    
-    (sretrieve:db-do
-     configdat
-     (lambda (db)
-       (sretrieve:register-action db "get" retriever datadir comment)))
-      (sretrieve:do-as-calling-user
-       (lambda ()
-         (if (directory? datadir)
-	   (begin
-  	    (change-directory datadir)
-	    (let ((files (filter (lambda (x)
-				(not (member x '("." ".."))))
-			      (glob "*" ".*"))))
-	     (print "files: " files)
-	     (process-execute "/bin/tar" (append (append (list  "chfv" "-") files) (list "--ignore-failed-read")))))
-             (begin
-               (let* ((parent-dir (pathname-directory datadir) )
-                      (filename  (conc(pathname-file datadir) "." (pathname-extension datadir))))
-                  (change-directory parent-dir)  
-                  (process-execute "/bin/tar" (list "chfv" "-" filename))
-             )))
-))
-))
-
-
-;; copy in file to dest, validation is done BEFORE calling this
-;;
-(define (sretrieve:cp configdat retriever file comment)
-  (let* ((base-dir  (configf:lookup configdat "settings" "base-dir"))
-         (allowed-sub-paths (configf:lookup configdat "settings" "allowed-sub-paths"))    
-	 (datadir   (conc base-dir "/" file))
-         (filename  (conc(pathname-file datadir) "." (pathname-extension datadir))))
-    (if (or (not base-dir)
-	    (not (file-exists? base-dir)))
-	(begin
-	  (debug:print-error 0 *default-log-port* "Bad configuration! base-dir " base-dir " not found")
-	  (exit 1)))
-    (print datadir)
-    (if (not (file-exists? datadir))
-	(begin
-	  (debug:print-error 0 *default-log-port* "File  (" file "), not found at " base-dir "." )
-	  (exit 1)))
-    (if (directory? datadir)
-	(begin
-	  (debug:print-error 0 *default-log-port* "(" file ") is a dirctory!! cp cmd works only on files ." )
-	  (exit 1)))
-    (if(not (string-match (regexp  allowed-sub-paths) file))
-        (begin
-	  (debug:print-error 0 *default-log-port* "Access denied to file (" file ")!! " )
-	  (exit 1)))
-     
-     (sretrieve:db-do
-     configdat
-     (lambda (db)
-       (sretrieve:register-action db "cp" retriever datadir comment)))
-      (sretrieve:do-as-calling-user
-      ;;  (debug:print 0 *default-log-port* "ph:  "(pathname-directory datadir)  "!! " )
-       (change-directory (pathname-directory datadir))  
-       ;;(debug:print 0 *default-log-port* "ph: /bin/tar" (list "chfv" "-" filename) )
-      (process-execute "/bin/tar" (list "chfv" "-" filename)))
-      ))
-
-;; ls in file to dest, validation is done BEFORE calling this
-;;
-(define (sretrieve:ls configdat retriever file comment)
-  (let* ((base-dir  (configf:lookup configdat "settings" "base-dir"))
-         (allowed-sub-paths (configf:lookup configdat "settings" "allowed-sub-paths"))    
-	 (datadir   (conc base-dir "/" file))
-         (filename  (conc(pathname-file datadir) "." (pathname-extension datadir))))
-    (if (or (not base-dir)
-	    (not (file-exists? base-dir)))
-	(begin
-	  (debug:print-error 0 *default-log-port* "Bad configuration! base-dir " base-dir " not found")
-	  (exit 1)))
-    (print datadir)
-    (if (not (file-exists? datadir))
-	(begin
-	  (debug:print-error 0 *default-log-port* "File  (" file "), not found at " base-dir "." )
-	  (exit 1)))
-      (if(not (string-match (regexp  allowed-sub-paths) file))
-        (begin
-	  (debug:print-error 0 *default-log-port* "Access denied to file (" file ")!! " )
-	  (exit 1)))
-   
-        (sretrieve:do-as-calling-user
-        (lambda ()
-	 ;;(change-directory datadir)
-         ;; (debug:print 0 *default-log-port*  "/usr/bin/find" (list datadir "-ls" "|" "grep" "-E" "'"allowed-file-patt"'"))
-         ;; (status (with-input-from-pipe "find " datadir " -ls | grep -E '" allowed-file-patt "'" (lambda () (read-line))))
-         ;; (debug:print 0 *default-log-port* status) 
-	  (process-execute "/bin/ls" (list "-ls"  "-lrt" datadir ))
- ))))
-
-
-
-;;(filter (lambda (x)
-;;							     (not (member x '("." ".."))))
-;;							   (glob "*" ".*"))))))))
+;(define (sretrieve:get configdat retriever version comment)
+;  (let* ((base-dir  (configf:lookup configdat "settings" "base-dir"))
+;	 (datadir   (conc base-dir "/" version)))
+;    (if (or (not base-dir)
+;	    (not (file-exists? base-dir)))
+;	(begin
+;	  (debug:print 0 "ERROR: Bad configuration! base-dir " base-dir " not found")
+;	  (exit 1)))
+;    (print datadir)
+;    (if (not (file-exists? datadir))
+;	(begin
+;	  (debug:print 0 "ERROR: Bad version (" version "), no data found at " datadir "." )
+;	  (exit 1)))
+;    
+;    (sretrieve:db-do
+;     configdat
+;     (lambda (db)
+;       (sretrieve:register-action db "get" retriever datadir comment)))
+;      (sretrieve:do-as-calling-user
+;       (lambda ()
+;         (if (directory? datadir)
+;	   (begin
+;  	    (change-directory datadir)
+;	    (let ((files (filter (lambda (x)
+;				(not (member x '("." ".."))))
+;			      (glob "*" ".*"))))
+;	     (print "files: " files)
+;	     (process-execute "/bin/tar" (append (append (list  "chfv" "-") files) (list "--ignore-failed-read")))))
+;             (begin
+;               (let* ((parent-dir (pathname-directory datadir) )
+;                      (filename  (conc(pathname-file datadir) "." (pathname-extension datadir))))
+;                  (change-directory parent-dir)  
+;                  (process-execute "/bin/tar" (list "chfv" "-" filename))
+;             )))
+;))))
+;
+;
+;;; copy in file to dest, validation is done BEFORE calling this
+;;;
+;(define (sretrieve:cp configdat retriever file comment)
+;  (let* ((base-dir  (configf:lookup configdat "settings" "base-dir"))
+;         (allowed-sub-paths (configf:lookup configdat "settings" "allowed-sub-paths"))    
+;	 (datadir   (conc base-dir "/" file))
+;         (filename  (conc(pathname-file datadir) "." (pathname-extension datadir))))
+;    (if (or (not base-dir)
+;	    (not (file-exists? base-dir)))
+;	(begin
+;	  (debug:print 0 "ERROR: Bad configuration! base-dir " base-dir " not found")
+;	  (exit 1)))
+;    (print datadir)
+;    (if (not (file-exists? datadir))
+;	(begin
+;	  (debug:print 0 "ERROR: File  (" file "), not found at " base-dir "." )
+;	  (exit 1)))
+;    (if (directory? datadir)
+;	(begin
+;	  (debug:print 0 "ERROR: (" file ") is a dirctory!! cp cmd works only on files ." )
+;	  (exit 1)))
+;    (if(not (string-match (regexp  allowed-sub-paths) file))
+;        (begin
+;	  (debug:print 0 "ERROR: Access denied to file (" file ")!! " )
+;	  (exit 1)))
+;     
+;     (sretrieve:db-do
+;     configdat
+;     (lambda (db)
+;       (sretrieve:register-action db "cp" retriever datadir comment)))
+;      (sretrieve:do-as-calling-user
+;      ;;  (debug:print 0 "ph:  "(pathname-directory datadir)  "!! " )
+;       (change-directory (pathname-directory datadir))  
+;       ;;(debug:print 0 "ph: /bin/tar" (list "chfv" "-" filename) )
+;      (process-execute "/bin/tar" (list "chfv" "-" filename)))
+;      ))
+;
+;;; ls in file to dest, validation is done BEFORE calling this
+;;;
+;(define (sretrieve:ls configdat retriever file comment)
+;  (let* ((base-dir  (configf:lookup configdat "settings" "base-dir"))
+;         (allowed-sub-paths (configf:lookup configdat "settings" "allowed-sub-paths"))    
+;	 (datadir   (conc base-dir "/" file))
+;         (filename  (conc(pathname-file datadir) "." (pathname-extension datadir))))
+;    (if (or (not base-dir)
+;	    (not (file-exists? base-dir)))
+;	(begin
+;	  (debug:print 0 "ERROR: Bad configuration! base-dir " base-dir " not found")
+;	  (exit 1)))
+;    (print datadir)
+;    (if (not (file-exists? datadir))
+;	(begin
+;	  (debug:print 0 "ERROR: File  (" file "), not found at " base-dir "." )
+;	  (exit 1)))
+;      (if(not (string-match (regexp  allowed-sub-paths) file))
+;        (begin
+;	  (debug:print 0 "ERROR: Access denied to file (" file ")!! " )
+;	  (exit 1)))
+;   
+;        (sretrieve:do-as-calling-user
+;        (lambda ()
+;	  (process-execute "/bin/ls" (list "-ls"  "-lrt" datadir ))
+; ))))
+
+
 
 (define (sretrieve:validate target-dir targ-mk)
   (let* ((normal-path (normalize-pathname targ-mk))
         (targ-path (conc target-dir "/" normal-path)))
     (if (string-contains   normal-path "..")
     (begin
-      (debug:print-error 0 *default-log-port* "Path  " targ-mk " resolved outside target area "  target-dir )
+      (debug:print 0 "ERROR: Path  " targ-mk " resolved outside target area "  target-dir )
       (exit 1)))
 
     (if (not (string-contains targ-path target-dir))
     (begin
-      (debug:print-error 0 *default-log-port* "You cannot update data outside " target-dir ".")
+      (debug:print 0 "ERROR: You cannot update data outside " target-dir ".")
       (exit 1)))
-    (debug:print 0 *default-log-port* "Path " targ-mk " is valid.")   
+    (debug:print 0 "Path " targ-mk " is valid.")   
  ))
-;; make directory in dest
-;;
-
-(define (sretrieve:mkdir configdat submitter target-dir targ-mk comment)
-  (let ((targ-path (conc target-dir "/" targ-mk)))
-    
-    (if (file-exists? targ-path)
-	(begin
-	  (debug:print-error 0 *default-log-port* "target Directory " targ-path " already exist!!")
-	  (exit 1)))
-    (sretrieve:db-do
-     configdat
-     (lambda (db)
-       (sretrieve:register-action db "mkdir" submitter targ-mk comment)))
-    (let* ((th1         (make-thread
-			 (lambda ()
-			   (create-directory targ-path #t)
-			   (debug:print 0 *default-log-port* " ... dir " targ-path " created"))
-			 "mkdir thread"))
-	   (th2         (make-thread
-			 (lambda ()
-			   (let loop ()
-			     (thread-sleep! 15)
-			     (display ".")
-			     (flush-output)
-			     (loop)))
-			 "action is happening thread")))
-      (thread-start! th1)
-      (thread-start! th2)
-      (thread-join! th1))
-    (cons #t "Successfully saved data")))
-
-;; create a symlink in dest
-;;
-(define (sretrieve:ln configdat submitter target-dir targ-link link-name comment)
-  (let ((targ-path (conc target-dir "/" link-name)))
-    (if (file-exists? targ-path)
-	(begin
-	  (debug:print-error 0 *default-log-port* "target file " targ-path " already exist!!")
-	  (exit 1)))
-     (if (not (file-exists? targ-link ))
-	(begin
-	  (debug:print-error 0 *default-log-port* "target file " targ-link " does not exist!!")
-	  (exit 1)))
- 
-    (sretrieve:db-do
-     configdat
-     (lambda (db)
-       (sretrieve:register-action db "ln" submitter link-name comment)))
-    (let* ((th1         (make-thread
-			 (lambda ()
-			   (create-symbolic-link targ-link targ-path  )
-			   (debug:print 0 *default-log-port* " ... link " targ-path " created"))
-			 "symlink thread"))
-	   (th2         (make-thread
-			 (lambda ()
-			   (let loop ()
-			     (thread-sleep! 15)
-			     (display ".")
-			     (flush-output)
-			     (loop)))
-			 "action is happening thread")))
-      (thread-start! th1)
-      (thread-start! th2)
-      (thread-join! th1))
-    (cons #t "Successfully saved data")))
-
-
-;; remove copy of file in dest
-;;
-(define (sretrieve:rm configdat submitter target-dir targ-file comment)
-  (let ((targ-path (conc target-dir "/" targ-file)))
-    (if (not (file-exists? targ-path))
-	(begin
-	  (debug:print-error 0 *default-log-port* "target file " targ-path " not found, nothing to remove.")
-	  (exit 1)))
-    (sretrieve:db-do
-     configdat
-     (lambda (db)
-       (sretrieve:register-action db "rm" submitter targ-file comment)))
-    (let* ((th1         (make-thread
-			 (lambda ()
-			   (delete-file targ-path)
-			   (debug:print 0 *default-log-port* " ... file " targ-path " removed"))
-			 "rm thread"))
-	   (th2         (make-thread
-			 (lambda ()
-			   (let loop ()
-			     (thread-sleep! 15)
-			     (display ".")
-			     (flush-output)
-			     (loop)))
-			 "action is happening thread")))
-      (thread-start! th1)
-      (thread-start! th2)
-      (thread-join! th1))
-    (cons #t "Successfully saved data")))
-
-(define (sretrieve:backup-move path)
-  (let* ((trashdir  (conc (pathname-directory path) "/.trash"))
-	 (trashfile (conc trashdir "/" (current-seconds) "-" (pathname-file path))))
-    (create-directory trashdir #t)
-    (if (directory? path)
-	(system (conc "mv " path " " trashfile))
-	(file-move path trash-file))))
-
-
-(define (sretrieve:lst->path pathlst)
-  (conc "/" (string-intersperse (map conc pathlst) "/")))
-
-(define (sretrieve:path->lst path)
-  (string-split path "/"))
-
-(define (sretrieve:pathdat-apply-heuristics configdat path)
-  (cond
-   ((file-exists? path) "found")
-   (else (conc path " not installed"))))
+
+
+;(define (sretrieve:backup-move path)
+;  (let* ((trashdir  (conc (pathname-directory path) "/.trash"))
+;	 (trashfile (conc trashdir "/" (current-seconds) "-" (pathname-file path))))
+;    (create-directory trashdir #t)
+;    (if (directory? path)
+;	(system (conc "mv " path " " trashfile))
+;	(file-move path trash-file))))
+;
+;
+;(define (sretrieve:lst->path pathlst)
+;  (conc "/" (string-intersperse (map conc pathlst) "/")))
+;
+;(define (sretrieve:path->lst path)
+;  (string-split path "/"))
+;
+;(define (sretrieve:pathdat-apply-heuristics configdat path)
+;  (cond
+;   ((file-exists? path) "found")
+;   (else (conc path " not installed"))))
 
 ;;======================================================================
 ;; MISC
 ;;======================================================================
 
@@ -392,11 +281,11 @@
 (define (sretrieve:do-as-calling-user proc)
   (let ((eid (current-effective-user-id))
         (cid (current-user-id)))
     (if (not (eq? eid cid)) ;; running suid
             (set! (current-effective-user-id) cid))
-    ;; (debug:print 0 *default-log-port* "running as " (current-effective-user-id))
+    ;; (debug:print 0 "running as " (current-effective-user-id))
     (proc)
     (if (not (eq? eid cid))
         (set! (current-effective-user-id) eid))))
 
 (define (sretrieve:find name paths)
@@ -417,203 +306,807 @@
 
 ;;======================================================================
 ;; SHELL
 ;;======================================================================
 
-(define (toplevel-command . args) #f)
-(define (sretrieve:shell)
+;; Create the sqlite db for shell
+;(define (sretrieve:shell-db-do path proc) 
+;    (if (not path)
+;	(begin
+;	  (debug:print 0 "[database]\nlocation /some/path\n\n Is missing from the config file!")
+;	  (exit 1)))
+;    (if (and path
+;	     (directory? path)
+;	     (file-read-access? path))
+;	(let* ((dbpath    (conc path "/" *exe-name* ".db"))
+;	       (writeable (file-write-access? dbpath))
+;	       (dbexists  (file-exists? dbpath)))
+;	  (handle-exceptions
+;	   exn
+;	   (begin
+;	     (debug:print 2 "ERROR: problem accessing db " dbpath
+;			  ((condition-property-accessor 'exn 'message) exn))
+;	     (exit 1))
+;            ;;(debug:print 0 "calling proc " proc "db path " dbpath )
+;	   (call-with-database
+;            dbpath
+;	    (lambda (db)
+;	       ;;(debug:print 0 "calling proc " proc " on db " db)
+;	      (set-busy-handler! db (busy-timeout 10000)) ;; 10 sec timeout
+;	      (if (not dbexists)(sretrieve:initialize-db db))
+;	      (proc db)))))
+;	(debug:print 0 "ERROR: invalid path for storing database: " path)))
+
+
+
+;; function to find sheets to which use has access 
+(define (sretrieve:has-permission  area)
+  (let ((username     (current-user-name)))
+  (cond
+   ((is-admin username)
+     #t)
+   ((is-user "retrieve" username area) 
+     #t)
+    ((is-user "publish" username area) 
+     #t)
+   ((is-user "writer-admin" username area) 
+     #t)
+   ((is-user "read-admin" username area) 
+     #t)
+   ((is-user "area-admin" username area) 
+     #t)
+   (else  
+    #f))))
+ 
+
+(define (sretrieve:get-accessable-projects  area)
+   (let* ((projects `()))
+         
+        (if (sretrieve:has-permission area)
+               (set! projects (cons area projects))
+               (begin
+                 (sauth:print-error (conc "User cannot access area " area "!!"))  
+                (exit 1))) 
+   ; (print projects)
+    projects))
+		 
+(define (sauth-common:shell-ls-cmd base-path-list ext-path top-areas base-path tail-cmd-list)
+    (if (and (null? base-path-list) (equal? ext-path "") )
+      (print (string-intersperse top-areas " "))
+  (let* ((resolved-path (sauth-common:resolve-path ext-path base-path-list top-areas )))
+           ;(print resolved-path)
+           (if (not (equal? resolved-path #f))
+           (if (null? resolved-path) 
+             (print (string-intersperse top-areas " "))
+           (let* ((target-path (sauth-common:get-target-path  base-path-list  ext-path top-areas base-path)))
+                ;(print "Resolved path: " target-path)
+                (if (not (equal? target-path #f))
+                  (begin   
+                (if (symbolic-link? target-path)
+                   (set! target-path (conc target-path "/"))) 
+                (if (not (equal? target-path #f))
+                (begin 
+                (cond
+		  ((null? tail-cmd-list)
+		     (run (pipe
+      	      	      (ls "-lrt" ,target-path))))
+		  ((not (equal? (car tail-cmd-list) "|"))
+                         (print "ls cmd cannot accept "(string-join tail-cmd-list) " as an argument!!"))
+                  (else  
+                    (run (pipe
+      	      	      (ls "-lrt" ,target-path)
+                      (begin (system (string-join (cdr tail-cmd-list))))))
+      ))))))))))))
+
+(define (sretrieve:shell-cat-cmd base-pathlist ext-path top-areas base-path tail-cmd-list)
+  (let* ((resolved-path (sauth-common:resolve-path ext-path base-pathlist top-areas ))
+          (data "") )
+         (if (not (equal? resolved-path #f))
+           (if (null? resolved-path) 
+             (print "Path could not be resolved!!")
+           (let* ((target-path (sauth-common:get-target-path  base-pathlist  ext-path top-areas base-path)))
+             (if (not (equal? target-path #f))
+               (if (or (not (file-exists? target-path)) (directory? target-path))
+               (print "Target path does not exist or is a directory!") 
+               (begin 
+                 (cond
+		  ((null? tail-cmd-list)
+		     (run (pipe
+      	      	      (cat  ,target-path))))
+		  ((not (equal? (car tail-cmd-list) "|"))
+                         (print "cat cmd cannot accept "(string-join tail-cmd-list) " as an argument!!"))
+                  (else  
+                    (run (pipe
+      	      	      (cat ,target-path)
+                      (begin (system (string-join (cdr tail-cmd-list))))))))))
+)))
+             (print "Path could not be resolved!!"))))
+
+(define (get-options cmd-list split-str)
+    (if (null? cmd-list)
+              (list '() '())
+    (let loop ((hed (car cmd-list))
+		 (tal (cdr cmd-list))
+                  (res '()))
+                   (cond
+                   ((equal? hed split-str)
+                      (list res tal))
+                   ((null? tal)
+                      (list (cons hed res) tal)) 
+                   (else 
+		  	(loop (car tal)(cdr tal)(cons hed res)))))))
+
+  
+(define (sretrieve:shell-grep-cmd base-pathlist ext-path top-areas base-path tail-cmd-list)
+  (let* ((resolved-path (sauth-common:resolve-path ext-path base-pathlist top-areas ))
+          (pattern (car tail-cmd-list))
+          (pipe-cmd-list (get-options (cdr tail-cmd-list) "|"))
+          (options (string-join (car pipe-cmd-list)))
+          (pipe-cmd (cadr  pipe-cmd-list))
+          (redirect-split (string-split (string-join  tail-cmd-list) ">"))   )
+         (if(and ( > (length redirect-split) 2 ))
+            (print "sgrep  cmd cannot accept > " (string-join redirect-split) " as an argument!!" )  
+         (if (not (equal? resolved-path #f))
+           (if (null? resolved-path) 
+             (print "Path could not be resolved!!")
+           (let* ((target-path (sauth-common:get-target-path  base-pathlist  ext-path top-areas base-path))
+                  (restrictions (if (equal? target-path #f)
+                                                 ""
+                                               (sretrieve:shell-lookup base-path)))
+                 (rest-str  (string-split (conc " --exclude-dir=" (string-join (string-split restrictions ",") " --exclude-dir=") ))))
+             (if (not (file-exists? target-path))
+               (print "Target path does not exist!") 
+               (begin 
+                 (cond
+	 	  ((and (null? pipe-cmd) (string-null? options))
+	 	     (run (pipe
+      	      	      (grep ,pattern ,target-path ))))
+		  ((and (null? pipe-cmd) (not (string-null? options)))
+		     (run (pipe
+      	      	      (begin (process-execute "/usr/bin/grep" (append (list options pattern target-path) rest-str))))))
+                  ((and (not (null? pipe-cmd)) (string-null? options))
+                        (run (pipe
+      	      	      (grep ,exclude-dir ,pattern ,target-path)
+                      (begin (system (string-join pipe-cmd))))))
+                  (else   
+                      (run (pipe
+      	      	      ;(grep  ,options ,exclude-dir ,pattern ,target-path)
+                       (begin (process-execute "/usr/bin/grep" (append (list options pattern target-path) rest-str)))
+
+                      (begin (system (string-join  pipe-cmd)))))))
+))))
+             (print "Path could not be resolved!!")))))
+
+
+(define (sretrieve:shell-less-cmd base-pathlist ext-path top-areas base-path)
+  (let* ((resolved-path (sauth-common:resolve-path ext-path base-pathlist top-areas )))
+         (if (not (equal? resolved-path #f))
+           (if (null? resolved-path) 
+             (print "Path could not be resolved!!")
+           (let* ((target-path (sauth-common:get-target-path  base-pathlist  ext-path top-areas base-path)))
+               (if (not (equal? target-path #f))
+           	 (if (or (not (file-exists? target-path)) (directory? target-path))
+                   (print "Target path does not exist or is a directory!") 
+                   (begin 
+                     ;(sretrieve:shell-db-do
+         	     ;     db-location
+     		     ;	  (lambda (db)
+       		;		(sretrieve:register-action db "less" (current-user-name) target-path (conc "Executing cmd: less "  target-path))))   
+ 
+                     (setenv "LESSSECURE" "1")
+                     (run (pipe
+      	      	     (less ,target-path))))))))
+             (print "Path could not be resolved!!"))))
+
+
+
+(define (sretrieve:shell-lookup base-path)
+  (let* ((usr (current-user-name))
+          (value (get-restrictions base-path usr)))
+                              value))
+             
+
+(define (sretrieve:load-shell-config fname)
+          (if (file-exists? fname)
+	(read-config fname #f #f)
+	))
+
+
+(define (is_directory target-path) 
+  (let* ((retval #f))
+  (sretrieve:do-as-calling-user
+    	(lambda ()
+          ;(print (current-effective-user-id) ) 
+          (if (directory? target-path)
+               (set! retval  #t))))
+             ;(print (current-effective-user-id))
+     retval)) 
+
+(define (make-exclude-pattern  restriction-list  )
+  (if (null? restriction-list)
+     ""
+   (let loop ((hed (car restriction-list))
+		 (tal (cdr restriction-list))
+                  (ret-str ""))
+                   (cond
+                   ((null? tal)
+                      (conc ret-str ".+" hed ".*")) 
+                   (else 
+		  	(loop (car tal)(cdr tal)(conc ret-str ".+" hed ".*|"))))))    )
+
+(define (sretrieve:get-shell-cmd target-path base-path restrictions iport)
+     (if (not (file-exists? target-path))
+        (sauth:print-error "Target path does not exist!")
+    (begin
+    (if (not (equal? target-path #f))
+    (begin     
+        (if (is_directory target-path) 
+        (begin
+           (let* ((tmpfile (conc "/tmp/" (current-user-name) "/my-pipe"))
+                  (parent-dir target-path)
+                  (last-dir-name (if  (pathname-extension target-path)  
+                                      (conc(pathname-file target-path) "." (pathname-extension target-path))
+                                      (pathname-file target-path)))
+                  (curr-dir (current-directory))   
+                  (start-dir (conc (current-directory) "/" last-dir-name))
+                  (execlude (make-exclude-pattern (string-split restrictions ","))))
+                  ; (print tmpfile)
+                    (if  (file-exists? start-dir)
+                    (begin
+                         (print last-dir-name " already exist in your work dir. Do you want to over write it? [y|n]")
+                        (let* ((inl (read-line iport)))
+                            (if (equal? inl "y")
+                              (begin
+                                 (change-directory parent-dir)
+                                  (create-fifo  tmpfile)
+                                  (process-fork 
+    				   (lambda()
+                                       (sleep 1) 
+       					(with-output-to-file tmpfile
+         				(lambda ()
+            				(sretrieve:make_file parent-dir execlude parent-dir)))))
+ 
+                                  (run (pipe
+                   		   (tar "chfv" "-" "-T" ,tmpfile )
+                   		   (begin (system (conc "cd " start-dir ";tar  xUf - "   )))))
+                                   (change-directory curr-dir)
+                                    (system (conc "rm " tmpfile)) )
+			      (begin	
+                               (print  "Nothing has been retrieved!!  ")))))
+                     (begin
+                       (sretrieve:do-as-calling-user
+                    (lambda ()
+		      (create-directory start-dir #t)))
+                          (change-directory parent-dir)
+                          ; (print execlude)
+                           (create-fifo tmpfile)
+                            (process-fork 
+    				   (lambda()
+                                       (sleep 1) 
+       					(with-output-to-file tmpfile
+         				(lambda ()
+            				(sretrieve:make_file parent-dir execlude parent-dir)))))
+
+                                  (run (pipe
+                   		   (tar "chfv" "-"  "-T" ,tmpfile)
+                   		   (begin (system (conc "cd " start-dir ";tar  xUf - "    )))))
+                           (change-directory curr-dir)
+                            (system (conc "rm " tmpfile)))))) 
+        (begin
+           (let*((parent-dir (pathname-directory target-path))
+                 (start-dir (current-directory))
+                 (filename (if  (pathname-extension target-path)  
+                                      (conc(pathname-file target-path) "." (pathname-extension target-path))
+                                      (pathname-file target-path)))
+                 (work-dir-file (conc (current-directory) "/" filename)))
+                 (if  (file-exists? work-dir-file)
+                    (begin
+                       (print filename " already exist in your work dir. Do you want to over write it? [y|n]")
+                        (let* ((inl (read-line iport)))
+                            (if (equal? inl "y")
+                              (begin
+                                 (change-directory parent-dir)
+                                  (run (pipe
+                   		   (tar "chfv" "-" ,filename)
+                   		   (begin (system (conc "cd " start-dir ";tar  xUf - "   )))))
+                                     (change-directory start-dir))
+			      (begin	
+                               (print  "Nothing has been retrieved!!  ")))))
+                    (begin
+               (change-directory parent-dir)  
+                 (run (pipe
+                   (tar "chfv" "-" ,filename)
+                   (begin (system (conc "cd " start-dir ";tar xUf -")))))
+                    (change-directory start-dir)))))))))))
+
+(define (sretrieve:get-shell-cmd-line target-path base-path restrictions iport)
+   (handle-exceptions
+	   exn 
+	   (begin
+	     (sauth:print-error (conc "Problem fetching the data. Sauth provieds sudo access to only one unix group. Please ensure you have washed all the remaining groups. System Error: " 
+			  ((condition-property-accessor 'exn 'message) exn)))
+	     (exit 1))
+  
+    (if (not (file-exists? target-path))
+        (sauth:print-error "Error:Target path does not exist!")
+    (begin
+    (if (not (equal? target-path #f))
+    (begin     
+        (if (is_directory target-path) 
+        (begin
+           (let* ((parent-dir target-path)
+                  (last-dir-name (if  (pathname-extension target-path)  
+                                      (conc(pathname-file target-path) "." (pathname-extension target-path))
+                                      (pathname-file target-path)))
+                  (curr-dir (current-directory))   
+                  (start-dir (conc (current-directory) "/" last-dir-name))
+                  (execlude (make-exclude-pattern (string-split restrictions ",")))
+                   (tmpfile (conc "/tmp/" (current-user-name) "/my-pipe-" (current-process-id))))
+                    (if  (file-exists? start-dir)
+                    (begin
+                         (sauth:print-error (conclast-dir-name " already exist in your work dir."))
+                         (sauth:print-error  "Nothing has been retrieved!!  "))
+                     (begin
+                   ;    (sretrieve:do-as-calling-user
+                   ; (lambda ()
+                    
+                  (if (not (file-exists?  (conc "/tmp/" (current-user-name)))) 
+		      (create-directory (conc "/tmp/" (current-user-name)) #t))
+                          (change-directory parent-dir)
+                            (create-fifo  tmpfile)
+                                  (process-fork 
+    				   (lambda()
+                                       (sleep 1) 
+       					(with-output-to-file tmpfile
+         				(lambda ()
+            				(sretrieve:make_file parent-dir execlude parent-dir)))))
+
+                           (process-execute "/bin/tar" (append (list  "chfv" "-"  "-T" tmpfile)  (list "--ignore-failed-read")))    
+                                  ;(run (pipe
+                   		   ;(tar "chfv" "-" "." )
+                   		   ;(begin (system (conc "cd " start-dir ";tar  xUf - "   execlude )))))
+                            (system (conc "rm " tmpfile))    
+                           (change-directory curr-dir))))) 
+        (begin
+           (let*((parent-dir (pathname-directory target-path))
+                 (start-dir (current-directory))
+                 (filename (if  (pathname-extension target-path)  
+                                      (conc(pathname-file target-path) "." (pathname-extension target-path))
+                                      (pathname-file target-path)))
+                 (work-dir-file (conc (current-directory) "/" filename)))
+                 (if  (file-exists? work-dir-file)
+                    (begin
+                       (print filename " already exist in your work dir.")
+                               (print  "Nothing has been retrieved!!  "))
+                    (begin
+               (change-directory parent-dir)
+                (process-execute "/bin/tar" (append (append (list  "chfv" "-") (list filename)) (list "--ignore-failed-read"))) 
+                 ;(run (pipe
+                  ; (tar "chfv" "-" ,filename)
+                  ; (begin (system (conc "cd " start-dir ";tar xUf -")))))
+                    (change-directory start-dir))))))))))))
+
+(define (sretrieve:make_file path exclude base_path)
+   (find-files 
+     path
+     action: (lambda (p res)
+           (cond
+                ((symbolic-link? p)   
+                 (if (directory?(read-symbolic-link p)) 
+                      (sretrieve:make_file p exclude base_path)
+                      (print (string-substitute (conc base_path "/") "" p "-"))))
+                 ((directory? p)              
+                 ;;do nothing for dirs)
+                 ) 
+                (else 
+                                        
+                     (if (not (string-match (regexp exclude)  p ))
+                        (print (string-substitute (conc base_path "/") "" p "-"))))))))
+
+(define (sretrieve:shell-help)
+(conc "Usage: " *exe-name* " [action [params ...]]
+
+  ls    [target path]               	  : list contents of target area. The output of the cmd can be piped into other system cmd. eg ls  | grep txt
+  cd    	     	  : To change the current directory within the sretrive shell. 
+  pwd				     	  : Prints the full pathname of the current directory within the sretrive shell.
+  get        	  : download directory/files into the directory where sretrieve shell cmd was invoked   
+  less  		     	  : Read input file to allows backward movement in the file as well as forward movement 
+  cat                     	  : show the contents of a file. The output of the cmd can be piped into other system cmd.
+
+  sgrep   [options] : Similar to unix grep cmd But with diffrent parameter ordering. The output of the cmd can be piped into other system cmd. 
+Part of the Megatest tool suite.
+Learn more at http://www.kiatoa.com/fossils/megatest
+
+Version: " megatest-fossil-hash)
+)	
+;(define (toplevel-command . args) #f)
+(define (sretrieve:shell area)
+ ; (print area)
   (use readline)
   (let* ((path      '())
-	 (prompt    "> ")
-	 (top-areas '("mrwellan" "pjhatwal" "bjbarcla" "ritikaag" "jmoon18"))
+	 (prompt    "sretrieve> ")
+	 (args      (argv))
+         (usr (current-user-name) )   
+         (top-areas (sretrieve:get-accessable-projects area))
+         (close-port     #f)
+         (area-obj  (get-obj-by-code area))
+         (user-obj (get-user usr)) 
+         (base-path (if (null? area-obj) 
+                         "" 
+                        (caddr (cdr area-obj))))      
 	 (iport     (make-readline-port prompt)))
-    (install-history-file) ;;  [homedir] [filename] [nlines])
-    (with-input-from-port iport
-      (lambda ()
-	(let loop ((inl (read-line)))
-	  (if (not (or (eof-object? inl)
-		       (equal? inl "exit")))
+        (if (null? area-obj)
+          (begin 
+             (print "Area " area " does not exist")
+          (exit 1)))
+	(let loop ((inl (read-line iport)))
+          ;(print 1) 
+	  (if (not (or (or (eof-object? inl)
+		       (equal? inl "exit")) (port-closed? iport)))
 	      (let* ((parts (string-split inl))
 		     (cmd   (if (null? parts) #f (car parts))))
-		(if (not cmd)
+              ;  (print "2")
+		(if (and (not cmd) (not (port-closed? iport)))
 		    (loop (read-line))
 		    (case (string->symbol cmd)
 		      ((cd)
 		       (if (> (length parts) 1) ;; have a parameter
-			   (set! path (append path (string-split (cadr parts)))) ;; not correct for relative paths
-			   (set! path '())))
+                           (begin
+                             (let*((arg (cadr parts))
+                                   (resolved-path (sauth-common:resolve-path  arg path top-areas))
+                                   (target-path (sauth-common:get-target-path path  arg top-areas base-path)))
+                                 (if (not (equal? target-path #f))
+                                 (if (or (equal? resolved-path #f) (not (file-exists? target-path)))    
+                                 (print "Invalid argument " arg ".. ")
+                                  (begin      
+			            (set! path resolved-path)
+                                     (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "cd"))))
+                                  )))))  
+   			   (set! path '())))
+                      ((pwd)
+                         (if (null? path)
+                           (print "/")  
+                           (print "/" (string-join path "/")))) 
 		      ((ls)
 		       (let* ((thepath (if (> (length parts) 1) ;; have a parameter
 					   (cdr parts)
-					   path))
+					   `()))
+			      (plen    (length thepath)))
+                         (cond
+			  ((null? thepath)
+                           (sauth-common:shell-ls-cmd path "" top-areas base-path  '())
+                            (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "ls"))))   )
+			  ((< plen 2)
+                  
+                            (sauth-common:shell-ls-cmd path  (car thepath) top-areas base-path '())
+                              (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "ls")))))
+                          (else 
+                            (if (equal? (car thepath) "|")
+                              (sauth-common:shell-ls-cmd path "" top-areas base-path thepath)
+                              (sauth-common:shell-ls-cmd path  (car thepath) top-areas base-path (cdr thepath)))
+                           (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "ls"))))))))
+                       ((cat)
+		       (let* ((thepath (if (> (length parts) 1) ;; have a parameter
+					   (cdr parts)
+					   `()))
+			      (plen    (length thepath)))
+			 (cond
+			  ((null? thepath)
+                          (print "Error: Missing argument to cat"))
+			  ((< plen 2)
+                            (sretrieve:shell-cat-cmd path  (car thepath) top-areas base-path '())
+                              (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "cat")))))
+
+			  (else
+                             (sretrieve:shell-cat-cmd path  (car thepath) top-areas base-path (cdr thepath))
+                             (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "cat"))))
+))))
+                       ((sgrep)
+		       (let* ((thepath (if (> (length parts) 1) ;; have a parameter
+					   (cdr parts)
+					   `()))
+			      (plen    (length thepath)))
+			 (cond
+			  ((null? thepath) 
+                            (print "Error: Missing arguments to grep!! Useage: grep   [options] "))
+                          ((< plen  2)
+                          (print "Error: Missing arguments to grep!! Useage: grep   [options] "))
+			  (else
+                             (sretrieve:shell-grep-cmd path  (car thepath) top-areas base-path  (cdr thepath))
+				(sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "grep"))))))))
+
+                      ((less)
+		       (let* ((thepath (if (> (length parts) 1) ;; have a parameter
+					   (cdr parts)
+					   `()))
+			      (plen    (length thepath)))
+			 (cond
+			  ((null? thepath)
+                          (print "Error: Missing argument to less"))
+			  ((< plen 2)
+                            (sretrieve:shell-less-cmd path  (car thepath) top-areas base-path)
+                             (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "less")))))
+			  (else
+                             (print "less cmd takes only one () argument!!")))))
+                      ((get)
+                         (let* ((thepath (if (> (length parts) 1) ;; have a parameter
+					   (cdr parts)
+					   `()))
 			      (plen    (length thepath)))
 			 (cond
 			  ((null? thepath)
-			   (print (string-intersperse top-areas " ")))
-			  ((and (< plen 2)
-				(member (car thepath) top-areas))
-			   (system (conc "ls /p/fdk/gwa/" (car thepath))))
-			  (else ;; have a long path
-			   ;; check for access rights here
-			   (system (conc "ls /p/fdk/gwa/" (string-intersperse thepath "/")))))))
+                          (print "Error: Missing argument  to get"))
+			  ((< plen 2)
+                           (let* ((target-path (sauth-common:get-target-path path  (car thepath) top-areas base-path))
+				 (restrictions (if (equal? target-path #f)
+                                                 ""
+                                               (sretrieve:shell-lookup base-path))))
+                               (if (not (equal? target-path #f))
+                             (begin  
+                                 (sretrieve:get-shell-cmd target-path base-path restrictions iport)
+                                  (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "\"" inl "\"") (number->string (car user-obj))  (number->string (caddr area-obj))  "get"))))))))
+			  (else
+                            (print "Error: get cmd takes only one argument ")))))
+                      ((exit)
+                          (print "got exit"))  
+                      ((help)
+                          (print (sretrieve:shell-help)))
 		      (else 
 		       (print "Got command: " inl))))
-		(loop (read-line)))))))))
+                 (loop (read-line iport)))))))
+;;))
     
 
 ;;======================================================================
 ;; MAIN
 ;;======================================================================
-
-(define (sretrieve:load-config exe-dir exe-name)
-  (let* ((fname   (conc exe-dir "/." exe-name ".config")))
-    ;; (ini:property-separator-patt " *  *")
-    ;; (ini:property-separator #\space)
-    (if (file-exists? fname)
-	;; (ini:read-ini fname)
-	(read-config fname #f #t)
-	(make-hash-table))))
+;;(define *default-log-port* (current-error-port))
+
+;(define (sretrieve:load-config exe-dir exe-name)
+;  (let* ((fname   (conc exe-dir "/." exe-name ".config")))
+;    ;; (ini:property-separator-patt " *  *")
+;    ;; (ini:property-separator #\space)
+;    (if (file-exists? fname)
+;	;; (ini:read-ini fname)
+;	(read-config fname #f #f)
+;	(make-hash-table))))
 
 ;; package-type is "megatest", "builds", "kits" etc.
 ;;
-(define (sretrieve:load-packages configdat exe-dir package-type)
-  (push-directory exe-dir)
-  (let* ((packages-metadir  (configf:lookup configdat "settings" "packages-metadir"))
-	 (conversion-script (configf:lookup configdat "settings" "conversion-script"))
-	 (upstream-file     (configf:lookup configdat "settings" "upstream-file"))
-	 (package-config    (conc packages-metadir "/" package-type ".config")))
-    ;; this section here does a timestamp based rebuild of the
-    ;;   /.config file using
-    ;;    as an input
-    (if (file-exists? upstream-file)
-	(if (or (not (file-exists? package-config)) ;; if not created call the updater, otherwise call only if upstream newer
-		(> (file-modification-time upstream-file)(file-modification-time package-config)))
-	    (handle-exceptions
-	     exn
-	     (debug:print-error 0 *default-log-port* "failed to run script " conversion-script " with params " upstream-file " " package-config)
-	     (let ((pid (process-run conversion-script (list upstream-file package-config))))
-	       (process-wait pid)))
-	    (debug:print 0 *default-log-port* "Skipping update of " package-config " from " upstream-file))
-	(debug:print 0 *default-log-port* "Skipping update of " package-config " as " upstream-file " not found"))
-    ;; (ini:property-separator-patt " *  *")
-    ;; (ini:property-separator #\space)
-    (let ((res (if (file-exists? package-config)
-		   (begin
-		     (debug:print 0 *default-log-port* "Reading package config " package-config)
-		     (read-config package-config #f #t))
-		   (make-hash-table))))
-      (pop-directory)
-      res)))
-
-(define (sretrieve:process-action configdat action . args)
-  (let* ((base-dir      (configf:lookup configdat "settings" "base-dir"))
-	 (user          (current-user-name))
-         (allowed-sub-paths (configf:lookup configdat "settings" "allowed-sub-paths")) 
-	 (allowed-users (string-split
-			 (or (configf:lookup configdat "settings" "allowed-users")
-			     "")))
-	 (default-area  (configf:lookup configdat "settings" "default-area"))) ;; otherwise known as the package
-    
-    (if (not base-dir)
-	(begin
-	  (debug:print 0 *default-log-port* "[settings]\nbase-dir /some/path\n\n Is MISSING from the config file!")
-	  (exit)))
-    (if (null? allowed-users)
-	(begin
-	  (debug:print 0 *default-log-port* "[setings]\nallowed-users user1 user2 ...\n\n Is MISSING from the config file!")
-	  (exit)))
-    (if (not (member user allowed-users))
-	(begin
-	  (debug:print 0 *default-log-port* "User \"" (current-user-name) "\" does not have access. Exiting")
-	  (exit 1)))
+
+;(define (sretrieve:load-packages configdat exe-dir package-type)
+;  (push-directory exe-dir)
+;  (let* ((packages-metadir  (configf:lookup configdat "settings" "packages-metadir"))
+;	 (conversion-script (configf:lookup configdat "settings" "conversion-script"))
+;	 (upstream-file     (configf:lookup configdat "settings" "upstream-file"))
+;	 (package-config    (conc packages-metadir "/" package-type ".config")))
+;       (if (file-exists? upstream-file)
+;	(if (or (not (file-exists? package-config)) ;; if not created call the updater, otherwise call only if upstream newer
+;		(> (file-modification-time upstream-file)(file-modification-time package-config)))
+;	    (handle-exceptions
+;	     exn
+;	     (debug:print 0 "ERROR: failed to run script " conversion-script " with params " upstream-file " " package-config)
+;	     (let ((pid (process-run conversion-script (list upstream-file package-config))))
+;	       (process-wait pid)))
+;	    (debug:print 0 "Skipping update of " package-config " from " upstream-file))
+;	(debug:print 0 "Skipping update of " package-config " as " upstream-file " not found"))
+;       (let ((res (if (file-exists? package-config)
+;		   (begin
+;		     (debug:print 0 "Reading package config " package-config)
+;		     (read-config package-config #f #t))
+;		   (make-hash-table))))
+;      (pop-directory)
+;      res)))
+
+(define (toplevel-command . args) #f)
+(define (sretrieve:process-action  action . args)
+    ; (print action)
+ ;  (use readline)
     (case (string->symbol action)
       ((get)
-       (if (< (length args) 1)
+       (if (< (length args) 2)
 	   (begin 
-	     (debug:print-error 0 *default-log-port* "Missing arguments; " (string-intersperse args ", "))
+	     (sauth:print-error  "Missing arguments;  " )
 	     (exit 1)))
-       (let* ((remargs     (args:get-args args '("-m" "-i" "-package") '() args:arg-hash 0))
-              (version     (car args))
-	      (msg         (or (args:get-arg "-m") ""))
-	      (package-type (or (args:get-arg "-package")
-				default-area))
-	      (exe-dir     (configf:lookup configdat "exe-info" "exe-dir")))
-;;	      (relconfig   (sretrieve:load-packages configdat exe-dir package-type)))
-
-	 (debug:print 0 *default-log-port* "retrieving " version " of " package-type " as tar data on stdout")
-	 (sretrieve:get configdat user version msg)))
+       (let* ((remargs     (args:get-args args '("-m" ) '() args:arg-hash 0))
+              (iport (make-readline-port ">"))
+              (area     (car args))
+              (usr (current-user-name))
+              (area-obj  (get-obj-by-code area))
+              (user-obj (get-user usr))
+              (top-areas (sretrieve:get-accessable-projects area)) 
+              (base-path (if (null? area-obj) 
+                                      "" 
+                                     (caddr (cdr area-obj))))
+	      (sub-path       (if (null? remargs) 
+                                       "" 
+                                       (car remargs))))
+
+          (if (null? area-obj)
+          	    (begin 
+             		(sauth:print-error (conc "Area " area " does not exist"))
+          	         (exit 1)))
+              (let* ((target-path (sauth-common:get-target-path '()  (conc area "/" sub-path) top-areas base-path))
+		     (restrictions (if (equal? target-path #f)
+                                        ""
+                                       (sretrieve:shell-lookup base-path))))
+             (if (not (equal? target-path #f))
+                 (begin  
+                   (sauthorize:do-as-calling-user
+                      (lambda ()
+   		        (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "get " area " " sub-path) (number->string (car user-obj))  (number->string (caddr area-obj))  "get"))))
+                        (sretrieve:get-shell-cmd-line target-path base-path restrictions  iport))))))
          ((cp)
-            (if (< (length args) 1)
-             (begin 
-	     (debug:print-error 0 *default-log-port* "Missing arguments; " (string-intersperse args ", "))
-	     (exit 1)))
-          (let* ((remargs     (args:get-args args '("-m" "-i" "-package") '() args:arg-hash 0))
-              (file     (car args))
-	      (msg         (or (args:get-arg "-m") "")) )
-
-	 (debug:print 0 *default-log-port* "copinging " file " to current directory " )
-	 (sretrieve:cp configdat user file msg)))
-      ((ls)
-            (if (< (length args) 1)
-             (begin 
-	     (debug:print-error 0 *default-log-port* "Missing arguments; " (string-intersperse args ", "))
-	     (exit 1)))
-          (let* ((remargs     (args:get-args args '("-m" "-i" "-package") '() args:arg-hash 0))
-              (dir     (car args))
-	      (msg         (or (args:get-arg "-m") "")) )
-
-	 (debug:print 0 *default-log-port* "Listing files in " )
-	 (sretrieve:ls configdat user dir msg)))
- 
-      (else (debug:print 0 *default-log-port* "Unrecognised command " action)))))
-  
-;; ease debugging by loading ~/.dashboardrc - REMOVE FROM PRODUCTION!
-;; (let ((debugcontrolf (conc (get-environment-variable "HOME") "/.sretrieverc")))
-;;   (if (file-exists? debugcontrolf)
-;;       (load debugcontrolf)))
+             (if (< (length args) 2)
+	   (begin 
+	     (sauth:print-error  "Missing arguments;  " )
+	     (exit 1)))
+       (let* ((remargs     (args:get-args args '("-m" ) '() args:arg-hash 0))
+              (iport (make-readline-port ">"))
+              (area     (car args))
+              (usr (current-user-name))
+              (area-obj  (get-obj-by-code area))
+              (user-obj (get-user usr))
+              (top-areas (sretrieve:get-accessable-projects area)) 
+              (base-path (if (null? area-obj) 
+                                      "" 
+                                     (caddr (cdr area-obj))))
+	      (sub-path       (if (null? remargs) 
+                                       "" 
+                                       (car remargs))))
+         ;  (print args)
+          (if (null? area-obj)
+          	    (begin 
+             		(sauth:print-error (conc "Area " area " does not exist"))
+          	         (exit 1)))
+              (let* ((target-path (sauth-common:get-target-path '()  (conc area "/" sub-path) top-areas base-path))
+				 (restrictions (if (equal? target-path #f)
+                                                 ""
+                                              (sretrieve:shell-lookup base-path))))
+                          ;(print target-path) 
+                          (if (not (equal? target-path #f))
+                             (begin  
+                              (sauthorize:do-as-calling-user
+                              (lambda ()
+			    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "get " area " " sub-path) (number->string (car user-obj))  (number->string (caddr area-obj))  "get"))))
+                            (sretrieve:get-shell-cmd-line target-path base-path restrictions  iport))))))
+      ((cat)
+      (if (< (length args) 2)
+	   (begin 
+	     (sauth:print-error  "Missing arguments;  " )
+	     (exit 1)))
+       (let* ((remargs     (args:get-args args '("-m" ) '() args:arg-hash 0))
+              (area     (car args))
+              (usr (current-user-name))
+              (area-obj  (get-obj-by-code area))
+              (user-obj (get-user usr))
+              (top-areas (sretrieve:get-accessable-projects area)) 
+              (base-path (if (null? area-obj) 
+                                      "" 
+                                     (caddr (cdr area-obj))))
+	            (sub-path       (if (null? remargs) 
+                                       "" 
+                                       (car remargs))))
+
+          (if (null? area-obj)
+          	    (begin 
+             		(sauth:print-error (conc "Area " area " does not exist"))
+          	         (exit 1)))
+              (let* ((target-path (sauth-common:get-target-path '()  (conc area "/" sub-path) top-areas base-path))
+		     (restrictions (if (equal? target-path #f)
+                                        ""
+                                       (sretrieve:shell-lookup base-path))))
+;(sauth-common:shell-ls-cmd base-path-list ext-path top-areas base-path tail-cmd-list)
+
+             (if (not (equal? target-path #f))
+                 (begin  
+                   (sauthorize:do-as-calling-user
+                      (lambda ()
+   		        (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "get " area " " sub-path) (number->string (car user-obj))  (number->string (caddr area-obj))  "get"))))
+               (sretrieve:shell-cat-cmd (list area) sub-path  top-areas base-path '())))))) 
+      ((ls)
+          (cond
+            ((< (length args) 1)
+              (begin 
+	      (print  "ERROR: Missing arguments;  ")
+	      (exit 1)))
+              ((equal? (length args) 1)
+                 (let*  ((area     (car args))
+                         (usr (current-user-name))
+                         (area-obj  (get-obj-by-code area))
+                         (user-obj (get-user usr))
+                         (top-areas (sretrieve:get-accessable-projects area)) 
+                         (base-path (if (null? area-obj) 
+                                      "" 
+                                     (caddr (cdr area-obj)))))
+                  (if (null? area-obj)
+          	    (begin 
+             		(print "Area " area " does not exist")
+          	         (exit 1)))
+             
+            ; (sretrieve:shell-cat-cmd base-pathlist ext-path top-areas base-path tail-cmd-list)
+   
+           	 (sauth-common:shell-ls-cmd '() area top-areas base-path  '())
+                 (sauthorize:do-as-calling-user
+                   (lambda ()
+		    (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" "ls" (number->string (car user-obj)) (number->string (caddr area-obj)) "ls"))))))
+             ((> (length args) 1)
+               (let*  ((remargs     (args:get-args args '("-m" ) '() args:arg-hash 0))
+                        (usr (current-user-name))
+                        (user-obj (get-user usr))
+                         (area     (car args)))
+                         (let* ((area-obj  (get-obj-by-code area))
+                               (top-areas (sretrieve:get-accessable-projects area)) 
+                               (base-path (if (null? area-obj) 
+                                      "" 
+                                     (caddr (cdr area-obj))))
+                                 
+                               (sub-path (if (null? remargs) 
+                                       area 
+                                      (conc area "/" (car remargs)))))
+                             ;(print "sub path "  sub-path)
+                            (if (null? area-obj)
+          	              (begin 
+             		        (print "Area " area " does not exist")
+          	                 (exit 1)))
+                              (sauth-common:shell-ls-cmd `()  sub-path top-areas base-path '())
+                            (sauthorize:do-as-calling-user
+				(lambda ()
+                       	       (run-cmd (conc *sauth-path* "/sauthorize") (list "register-log" (conc "ls " sub-path) (number->string (car user-obj)) (number->string (caddr area-obj)) "ls")))))))))
+
+       ((shell)
+          (if (< (length args) 1)
+             (begin 
+	     (print  "ERROR: Missing arguments !!" )
+	     (exit 1))
+             (sretrieve:shell (car args)))) 
+      (else (print 0 "Unrecognised command " action))))
 
 (define (main)
   (let* ((args      (argv))
 	 (prog      (car args))
 	 (rema      (cdr args))
 	 (exe-name  (pathname-file (car (argv))))
 	 (exe-dir   (or (pathname-directory prog)
 			(sretrieve:find exe-name (string-split (get-environment-variable "PATH") ":"))))
-	 (configdat (sretrieve:load-config exe-dir exe-name)))
+	 ;(configdat (sretrieve:load-config exe-dir exe-name))
+)
     ;; preserve the exe data in the config file
-    (hash-table-set! configdat "exe-info" (list (list "exe-name" exe-name)
-						(list "exe-dir"  exe-dir)))
+    ;(hash-table-set! configdat "exe-info" (list (list "exe-name" exe-name)
+					;	(list "exe-dir"  exe-dir)))
     (cond
      ;; one-word commands
      ((eq? (length rema) 1)
       (case (string->symbol (car rema))
 	((help -h -help --h --help)
 	 (print sretrieve:help))
-	((list-vars) ;; print out the ini file
-	 (map print (sretrieve:get-areas configdat)))
-	((ls)
-	 (let* ((base-dir (configf:lookup configdat "settings" "base-dir")))
-	   (if base-dir
-	       (begin
-		 (print "Files in " base-dir)
-                 (sretrieve:do-as-calling-user
-                    (lambda ()
-		 (process-execute "/bin/ls" (list "-lrt" base-dir)))))
-	       (print "ERROR: No base dir specified!"))))
-	((log)
-	 (sretrieve:db-do configdat (lambda (db)
-				     (print "Logs : ")
-				     (query (for-each-row
-					     (lambda (row)
-					       (apply print (intersperse row " | "))))
-					    (sql db "SELECT * FROM actions")))))
-	((shell)
-	 (sretrieve:shell))
 	(else
 	 (print "ERROR: Unrecognised command. Try \"sretrieve help\""))))
      ;; multi-word commands
      ((null? rema)(print sretrieve:help))
      ((>= (length rema) 2)
-      (apply sretrieve:process-action configdat (car rema)(cdr rema)))
-     (else (debug:print-error 0 *default-log-port* "Unrecognised command. Try \"sretrieve help\"")))))
+      
+      (apply sretrieve:process-action  (car rema) (cdr rema)))
+     (else (debug:print 0 "ERROR: Unrecognised command. Try \"sretrieve help\"")))))
 
 (main)
+
+
+      

ADDED   subrun.scm
Index: subrun.scm
==================================================================
--- /dev/null
+++ subrun.scm
@@ -0,0 +1,265 @@
+
+;; Copyright 2006-2016, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
+;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
+
+(use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (srfi 18) 
+     posix-extras directory-utils pathname-expand typed-records format
+     call-with-environment-variables)
+(declare (unit subrun))
+;;(declare (uses runs))
+(declare (uses db))
+(declare (uses common))
+;;(declare (uses items))
+;;(declare (uses runconfig))
+;;(declare (uses tests))
+;;(declare (uses server))
+(declare (uses mt))
+;;(declare (uses archive))
+;; (declare (uses filedb))
+
+;(include "common_records.scm")
+;;(include "key_records.scm")
+(include "db_records.scm") ;; provides db:test-get-id
+;;(include "run_records.scm")
+;;(include "test_records.scm")
+
+(define (subrun:subrun-test-initialized? test-run-dir)
+  (if (and (common:file-exists? (conc test-run-dir "/subrun-area") )
+           (common:file-exists? (conc test-run-dir "/testconfig.subrun") ))
+      #t
+      #f))
+
+(define (subrun:launch-dashboard test-run-dir)
+  (if (subrun:subrun-test-initialized? test-run-dir)
+      (let* ((subarea (subrun:get-runarea test-run-dir)))
+        (if (and subarea (common:file-exists? subarea))
+            (system (conc "cd " subarea ";env -i PATH=$PATH DISPLAY=$DISPLAY HOME=$HOME USER=$USER dashboard &"))))))
+
+(define (subrun:subrun-removed? test-run-dir)
+  (if (subrun:subrun-test-initialized? test-run-dir)
+      (let ((flagfile (conc test-run-dir "/subrun.removed")))
+        (if (common:file-exists? flagfile)
+            #t
+            #f))
+      #t))
+
+(define (subrun:set-subrun-removed test-run-dir)
+  (let ((flagfile (conc test-run-dir "/subrun.removed")))
+    (if (and (subrun:subrun-test-initialized? test-run-dir) (not (common:file-exists? flagfile)))
+        (with-output-to-file flagfile
+          (lambda () (print (current-seconds)))))))
+
+(define (subrun:unset-subrun-removed test-run-dir)
+  (let ((flagfile (conc test-run-dir "/subrun.removed")))
+    (if (and (subrun:subrun-test-initialized? test-run-dir) (common:file-exists? flagfile))
+        (delete-file flagfile))))
+
+
+(define (subrun:testconfig-defines-subrun? testconfig)
+  (configf:lookup testconfig "subrun" "runwait")) ;; we use runwait as the flag that a subrun is requested
+
+(define (subrun:initialize-toprun-test  testconfig test-run-dir)
+  (let ((ra (configf:lookup testconfig "subrun" "run-area"))
+        (logpro (configf:lookup testconfig "subrun" "logpro"))
+        (symlink-target (conc test-run-dir "/subrun-area"))
+        )
+    (if (not ra)      ;; when runarea is not set we default to *toppath*. However 
+	(let ((fallback-run-area (or *toppath* (conc test-run-dir "/subrun"))))
+	  ;; we need to force the setting in the testconfig so it will
+          ;; be preserved in the testconfig.subrun file
+	  (configf:set-section-var testconfig "subrun" "run-area" fallback-run-area)
+	  (set! ra fallback-run-area)))
+    (configf:set-section-var testconfig "logpro" "subrun" logpro) ;; append the logpro rules to the logpro section as stepname subrun
+    (if (common:file-exists? symlink-target)
+        (delete-file symlink-target))
+    (create-symbolic-link ra symlink-target)
+    (configf:write-alist testconfig "testconfig.subrun")))
+
+(define (subrun:set-state-status test-run-dir state status new-state-status)
+  (if (and (not (subrun:subrun-removed? test-run-dir)) (subrun:subrun-test-initialized? test-run-dir))
+      (let* ((action-switches-str
+              (conc "-set-state-status "new-state-status
+                    (if state (conc " -state "state) "")
+                    (if status (conc " -status "status) "")))
+             (log-prefix
+              (subrun:sanitize-path
+               (conc "set-state-status="new-state-status
+                     (if state (conc ":state="state) "")
+                     (if status (conc "+status="status) ""))))
+             (submt-result 
+              (subrun:exec-sub-megatest test-run-dir action-switches-str log-prefix)))
+        submt-result)))
+
+(define (subrun:remove-subrun test-run-dir keep-records )
+  (if (and (not (subrun:subrun-removed? test-run-dir)) (subrun:subrun-test-initialized? test-run-dir))
+      (let* ((action-switches-str
+              (conc "-remove-runs"
+                    (if keep-records "-keep-records " "")
+                    ))
+             (remove-result
+              (subrun:exec-sub-megatest test-run-dir action-switches-str "remove")))
+        (if remove-result
+            (begin
+              (subrun:set-subrun-removed test-run-dir)
+              #t)
+            #f))
+      #t))
+
+(define (subrun:kill-subrun test-run-dir )
+  (if (and (not (subrun:subrun-removed? test-run-dir)) (subrun:subrun-test-initialized? test-run-dir))
+      (let* ((action-switches-str
+              (conc "-kill-runs" ))
+             (kill-result
+              (subrun:exec-sub-megatest test-run-dir action-switches-str "kill")))
+        kill-result)
+      #t))
+
+(define (subrun:launch-cmd test-run-dir)
+  (if (subrun:subrun-removed? test-run-dir)
+      (subrun:unset-subrun-removed test-run-dir))      
+
+  (let* ((log-prefix "run")
+         (switches (subrun:selector+log-switches test-run-dir log-prefix))
+         (run-wait #t)
+         (cmd      (conc "megatest -run "switches" "
+                         (if run-wait "-run-wait " ""))))
+    cmd))
+
+
+(define (subrun:sanitize-path inpath)
+  (let* ((insane-pattern (irregex "[^[a-zA-Z0-9_\\-]")))
+    (regex#string-substitute insane-pattern "_" inpath #t)))
+
+(define (subrun:get-runarea test-run-dir)
+  (if (subrun:subrun-test-initialized? test-run-dir)
+      (let* ((info-alist (subrun:selector+log-alist
+                          test-run-dir
+                          "foo"))
+             (run-area   (if (list? info-alist)
+                             (alist-ref "-start-dir" info-alist equal? #f)
+                             #f)))
+        run-area)
+      #f))
+
+(define (subrun:selector+log-alist test-run-dir log-prefix)
+  (let* ((switch-def-alist (common:get-param-mapping flavor: 'config))
+         (subrunfile   (conc test-run-dir "/testconfig.subrun" ))
+         (subrundata   (with-input-from-file subrunfile read))
+         (subrunconfig (configf:alist->config subrundata))
+         (run-area     (configf:lookup subrunconfig "subrun" "run-area"))
+         (defvals      `(("start-dir" . ,(or run-area  ;; default values if not specified in subrun section of tconf
+                                             (get-environment-variable "MT_RUN_AREA_HOME")
+                                             "/no/rundir/found")) 
+                         ("run-name"  . ,(or (get-environment-variable "MT_RUNNAME") "NO-RUNNAME"))
+                         ("target"    . ,(or (get-environment-variable "MT_TARGET")  "NO-TARGET"))))
+         (switch-alist-pre  (filter-map (lambda (item)
+                                          (let* ((config-key (car item))
+                                                 (switch     (cdr item))
+                                                 (defval     (alist-ref config-key defvals equal? #f))
+                                                 (val        (or (configf:lookup subrunconfig "subrun" config-key)
+                                                                 defval)))
+                                            (if val
+                                                (cons switch val)
+                                                #f)))
+                                        switch-def-alist))
+
+         ;; testpatt may be modified if all three of mode-patt, tag-expr, and testpatt are null
+         (mode-patt     (alist-ref "-modepatt" switch-alist-pre equal? #f))
+         (tag-expr      (alist-ref "-tagexpr" switch-alist-pre equal? #f))
+         (testpatt      (alist-ref "-testpatt" switch-alist-pre equal?
+                                   (if (not (or mode-patt tag-expr)) "%" #f))) ;; testpatt is % if not
+                                                                               ;; otherwise specified
+
+         ;; define compact-stem for logfile
+         (target        (alist-ref "-target" switch-alist-pre equal? #f)) ;; want data-structures alist-ref, not alist-lib alist-ref
+         (runname       (alist-ref "-runname" switch-alist-pre equal? #f))
+
+
+         (compact-stem  (subrun:sanitize-path
+                         (conc
+                          target
+                          "-"
+                          runname
+                          "-" (or testpatt mode-patt tag-expr "NO-TESTPATT"))))
+         (logfile       (conc
+                         test-run-dir "/"
+                         (if log-prefix
+                             (conc (subrun:sanitize-path log-prefix) "-")
+                             "")
+                         compact-stem
+                         ".log"))
+         ;; swap out testpatt with modified test-patt and add -log
+         (switch-alist  (cons
+                         (cons "-log" logfile)
+                         (map (lambda (item)
+                                (if (equal? (car item) "-testpatt")
+                                    (cons "-testpatt" testpatt)
+                                    item))
+                                switch-alist-pre))))
+    switch-alist))
+    ;; note - get precmd from subrun section
+    ;;   apply to submegatest commands
+
+(define (subrun:get-log-path test-run-dir log-prefix)
+  (let* ((alist (subrun:selector+log-alist test-run-dir log-prefix))
+         (res   (alist-ref "-log" alist equal? #f)))
+    res))
+
+(define (subrun:selector+log-switches test-run-dir log-prefix)
+  (let* ((switch-alist (subrun:selector+log-alist test-run-dir log-prefix))
+         (res
+          (string-intersperse
+           (apply
+            append
+            (map
+             (lambda (x)
+               (list (car x) (cdr x)))
+             switch-alist))
+           " ")))
+    res))
+
+(define (subrun:exec-sub-megatest test-run-dir action-switches-str log-prefix)
+  (let* ((selector-switches  (subrun:selector+log-switches test-run-dir log-prefix))
+         (cmd (conc "megatest " selector-switches " " action-switches-str ))
+         (pid #f)
+         (proc (lambda ()
+                 (debug:print-info 0 *default-log-port* "Running sub megatest command: "cmd)
+                 ;;(set! pid (process-run "/usr/bin/xterm" (list ))))))
+                 (set! pid (process-run "/bin/bash" (list "-c" cmd))))))
+    (call-with-environment-variables 
+     (list (cons "PATH" (conc (get-environment-variable "PATH") ":.")))
+     (lambda  ()
+       (common:without-vars proc "^MT_.*")))
+    (let processloop ((i 0))
+      (let-values (((pid-val exit-status exit-code)(process-wait pid #t)))
+        (if (eq? pid-val 0)
+            (begin
+              (thread-sleep! 2)
+              (processloop (+ i 1)))
+            (begin
+              (debug:print-info 0 *default-log-port* "sub megatest " action-switches-str " completed with exit code " exit-code)
+              (if (eq? 0 exit-code)
+                  (begin
+                    #t)
+                  (begin
+                    #f))))))))
+
+
+
+;; (subrun:exec-sub-megatest "/nfs/pdx/disks/icf_env_disk001/bjbarcla/gwa/issues/mtdev/165/megatest/ext-tests/tests/subrun-usecases/toparea/links/SYSTEM_val/RELEASE_val/go/toptest" "-foo" "foo")

Index: supplemental.megatest.config
==================================================================
--- supplemental.megatest.config
+++ supplemental.megatest.config
@@ -1,3 +1,19 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 [tests-paths]
 nada #{getenv MT_RUN_AREA_HOME}/moretests
 

Index: synchash.scm
==================================================================
--- synchash.scm
+++ synchash.scm
@@ -1,14 +1,23 @@
 ;;======================================================================
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 ;;======================================================================
 
 ;;======================================================================
 ;; A hash of hashes that can be kept in sync by sending minial deltas
 ;;======================================================================

Index: task_records.scm
==================================================================
--- task_records.scm
+++ task_records.scm
@@ -1,14 +1,22 @@
 ;;======================================================================
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 ;;======================================================================
 
 ;; make-vector-record tasks task id action owner state target name test item params creation_time execution_time 
 (define (make-tasks:task)(make-vector 11))
 (define-inline (tasks:task-get-id               vec)    (vector-ref  vec 0))

Index: tasks.scm
==================================================================
--- tasks.scm
+++ tasks.scm
@@ -1,13 +1,22 @@
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
 (use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking format)
 (import (prefix sqlite3 sqlite3:))
@@ -36,24 +45,24 @@
 	(handle-exceptions
 	 exn
 	 (begin
 	   (print-call-chain (current-error-port))
 	   (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-	   (debug:print 0 *default-log-port* " exn=" (condition->list exn))
+	   (debug:print 5 *default-log-port* " exn=" (condition->list exn))
 	   (debug:print 0 *default-log-port* "tasks:wait-on-journal failed. Continuing on, you can ignore this call-chain")
 	   #t) ;; if stuff goes wrong just allow it to move on
-	 (let loop ((journal-exists (file-exists? fullpath))
+	 (let loop ((journal-exists (common:file-exists? fullpath))
 		    (count          n)) ;; wait ten times ...
 	   (if journal-exists
 	       (begin
 		 (if (and waiting-msg
 			  (eq? (modulo n 30) 0))
 		     (debug:print 0 *default-log-port* waiting-msg))
 		 (if (> count 0)
 		     (begin
 		       (thread-sleep! 1)
-		       (loop (file-exists? fullpath)
+		       (loop (common:file-exists? fullpath)
 			     (- count 1)))
 		     (begin
 		       (debug:print 0 *default-log-port* "ERROR: removing the journal file " fullpath ", this is not good. Look for disk full, write access and other issues.")
 		       (if remove (system (conc "rm -rf " fullpath)))
 		       #f)))
@@ -87,21 +96,21 @@
        exn
        (if (> numretries 0)
 	   (begin
 	     (print-call-chain (current-error-port))
 	     (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-	     (debug:print 0 *default-log-port* " exn=" (condition->list exn))
+	     (debug:print 5 *default-log-port* " exn=" (condition->list exn))
 	     (thread-sleep! 1)
 	     (tasks:open-db numretries (- numretries 1)))
 	   (begin
 	     (print-call-chain (current-error-port))
 	     (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-	     (debug:print 0 *default-log-port* " exn=" (condition->list exn))))
+	     (debug:print 5 *default-log-port* " exn=" (condition->list exn))))
        (let* ((dbpath        (db:dbfile-path )) ;; (tasks:get-task-db-path))
 	      (dbfile       (conc dbpath "/monitor.db"))
 	      (avail        (tasks:wait-on-journal dbpath 10)) ;; wait up to about 10 seconds for the journal to go away
-	      (exists       (file-exists? dbpath))
+	      (exists       (common:file-exists? dbpath))
 	      (write-access (file-write-access? dbpath))
 	      (mdb          (cond ;; what the hek is *toppath* doing here?
 			     ((and (string? *toppath*)(file-write-access? *toppath*))
 			      (sqlite3:open-database dbfile))
 			     ((file-read-access? dbpath)    (sqlite3:open-database dbfile))
@@ -183,15 +192,27 @@
 ;; no elegance here ...
 ;;
 (define (tasks:kill-server hostname pid #!key (kill-switch ""))
   (debug:print-info 0 *default-log-port* "Attempting to kill server process " pid " on host " hostname)
   (setenv "TARGETHOST" hostname)
-  (setenv "TARGETHOST_LOGF" "server-kills.log")
-  (system (conc "nbfake kill "kill-switch" "pid))
+  (let* ((logdir (if (directory-exists? "logs")
+                    "logs/"
+                    ""))
+         (logfile (if logdir (conc "logs/server-"pid"-"hostname".log") #f))
+         (gzfile  (if logfile (conc logfile ".gz"))))
+    (setenv "TARGETHOST_LOGF" (conc logdir "server-kills.log"))
+
+    (system (conc "nbfake kill "kill-switch" "pid))
 
-  (unsetenv "TARGETHOST_LOGF")
-  (unsetenv "TARGETHOST"))
+    (when logfile
+      (thread-sleep! 0.5)
+      (if (common:file-exists? gzfile) (delete-file gzfile))
+      (system (conc "gzip " logfile))
+      
+      (unsetenv "TARGETHOST_LOGF")
+      (unsetenv "TARGETHOST"))))
+    
  
 ;;======================================================================
 ;; M O N I T O R S
 ;;======================================================================
 
@@ -606,63 +627,295 @@
 	  (case modifier
 	    ((none)(loop (conc (current-user-name) "_" area-name) 'user))
 	    ((user)(loop (conc (substring (common:get-area-path-signature) 0 4)
 			       area-name) 'areasig))
 	    (else #f)))))) ;; give up
+
+(define (task:print-runtime run-times saperator)
+(for-each
+    (lambda (run-time-info)
+     (let* ((run-name  (vector-ref run-time-info 0))
+            (run-time  (vector-ref run-time-info 1))
+            (target  (vector-ref run-time-info 2)))
+        (print target saperator run-name saperator run-time )))
+   run-times))
+
+(define (task:print-runtime-as-json run-times)
+ (let loop ((run-time-info (car run-times))
+            (rema (cdr run-times)) 
+            (str ""))
+     (let* ((run-name  (vector-ref run-time-info 0))
+            (run-time  (vector-ref run-time-info 1))
+            (target  (vector-ref run-time-info 2)))
+        ;(print (not (equal? str "")))
+        (if (not (equal? str "")) 
+            (set! str (conc str ",")))
+        (if (null? rema)
+		(print "[" str "{target:" target ",run-name:" run-name ", run-time:" run-time "}]")
+            (loop (car rema) (cdr rema) (conc str "{target:" target ", run-name:" run-name ", run-time:" run-time "}"))))))
+
+(define (task:get-run-times)
+   (let* ( 
+           (run-patt (if (args:get-arg "-run-patt")
+                        (args:get-arg "-run-patt")
+                        "%"))
+           (target-patt (if (args:get-arg "-target-patt")
+                        (args:get-arg "-target-patt")
+                        "%"))
+ 
+           (run-times  (rmt:get-run-times  run-patt target-patt )))
+   (if (eq? (length run-times) 0)
+     (begin
+       (print "Data not found!!")
+       (exit)))
+   (if (equal? (args:get-arg "-dumpmode") "json")
+       (task:print-runtime-as-json run-times)
+         (if (equal? (args:get-arg "-dumpmode") "csv")
+	     (task:print-runtime run-times ",")
+	     (task:print-runtime run-times "  ")))))
+
+
+(define (task:print-testtime test-times saperator)
+(for-each
+    (lambda (test-time-info)
+     (let* ((test-name  (vector-ref test-time-info 0))
+            (test-time  (vector-ref test-time-info 2))
+            (test-item  (if (eq? (string-length (vector-ref test-time-info 1)) 0)
+                               "N/A"
+				(vector-ref test-time-info 1))))
+        (print  test-name saperator test-item saperator test-time )))
+   test-times))
+
+(define (task:print-testtime-as-json test-times)
+ (let loop ((test-time-info (car test-times))
+            (rema (cdr test-times)) 
+            (str ""))
+     (let* ((test-name  (vector-ref test-time-info 0))
+            (test-time  (vector-ref test-time-info 2))
+            (item  (vector-ref test-time-info 1)))
+        ;(print (not (equal? str "")))
+        (if (not (equal? str "")) 
+            (set! str (conc str ",")))
+        (if (null? rema)
+		(print "[" str "{test-name:" test-name ", item-path:" item ", test-time:" test-time "}]")
+            (loop (car rema) (cdr rema) (conc str "{test-name:" test-name ", item-path:" item ", test-time:" test-time "}"))))))
+
+
+ (define (task:get-test-times)
+   (let* ((runname (if (args:get-arg "-runname")
+                        (args:get-arg "-runname")
+                        #f))
+           (target (if (args:get-arg "-target")
+                        (args:get-arg "-target")
+                        #f))
+ 
+           (test-times  (rmt:get-test-times  runname target )))
+   (if (not runname)
+      (begin
+      (print "Error: Missing argument -runname")
+      (exit))) 
+    (if (string-contains runname "%")
+      (begin
+      (print "Error: Invalid runname, '%' not allowed  (" runname ") ")
+      (exit)))
+    (if (not target)
+      (begin
+      (print "Error: Missing argument -target")
+      (exit)))
+     (if  (string-contains target "%")
+      (begin
+      (print "Error: Invalid target, '%' not allowed  (" target ") ")
+      (exit)))
+ 
+   (if (eq? (length test-times) 0)
+     (begin
+       (print "Data not found!!")
+       (exit)))
+   (if (equal? (args:get-arg "-dumpmode") "json")
+       (task:print-testtime-as-json test-times)
+         (if (equal? (args:get-arg "-dumpmode") "csv")
+	     (task:print-testtime test-times ",")
+	     (task:print-testtime test-times "  ")))))
+
+
 
 ;; gets mtpg-run-id and syncs the record if different
 ;;
-(define (tasks:run-id->mtpg-run-id dbh cached-info run-id)
+(define (tasks:run-id->mtpg-run-id dbh cached-info run-id area-info smallest-last-update-time)
   (let* ((runs-ht (hash-table-ref cached-info 'runs))
-	 (runinf  (hash-table-ref/default runs-ht run-id #f)))
-    (if runinf
+	 (runinf  (hash-table-ref/default runs-ht run-id #f))
+         (area-id (vector-ref area-info 0)))
+       (if runinf
 	runinf ;; already cached
 	(let* ((run-dat    (rmt:get-run-info run-id))               ;; NOTE: get-run-info returns a vector < row header >
 	       (run-name   (rmt:get-run-name-from-id run-id))
 	       (row        (db:get-rows run-dat))                   ;; yes, this returns a single row
 	       (header     (db:get-header run-dat))
-	       (state      (db:get-value-by-header row header "state "))
+	       (state      (db:get-value-by-header row header "state"))
 	       (status     (db:get-value-by-header row header "status"))
 	       (owner      (db:get-value-by-header row header "owner"))
 	       (event-time (db:get-value-by-header row header "event_time"))
 	       (comment    (db:get-value-by-header row header "comment"))
 	       (fail-count (db:get-value-by-header row header "fail_count"))
 	       (pass-count (db:get-value-by-header row header "pass_count"))
-	       (contour    (if (args:get-arg "-prepend-contour") (db:get-value-by-header row header "contour")))
+         (db-contour (db:get-value-by-header row header "contour"))
+	       (contour    (if (args:get-arg "-prepend-contour") 
+                                 (if (and db-contour (not (equal? db-contour ""))  (string? db-contour )) 
+                                           (begin 
+                                            (debug:print-info 1 *default-log-port*  "db-contour") 
+ 						db-contour)
+					    (args:get-arg "-contour"))))
+         (last-update (db:get-value-by-header row header "last_update"))
 	       (keytarg    (if (or (args:get-arg "-prepend-contour") (args:get-arg "-prefix-target"))
 	       			(conc "MT_CONTOUR/MT_AREA/" (string-intersperse (rmt:get-keys) "/")) (string-intersperse (rmt:get-keys) "/"))) ;; e.g. version/iteration/platform
 	       (target     (if (or (args:get-arg "-prepend-contour") (args:get-arg "-prefix-target")) 
 	       			(conc (or (args:get-arg "-prefix-target") (conc contour "/" (common:get-area-name) "/")) (rmt:get-target run-id)) (rmt:get-target run-id)))                 ;; e.g. v1.63/a3e1/ubuntu
 	       (spec-id    (pgdb:get-ttype dbh keytarg))
-	       (new-run-id (pgdb:get-run-id dbh spec-id target run-name))
-
-
-
-	       ;; (area-id    (db:get-value-by-header row header "area_id)"))
-	       )
-	  (if new-run-id
-	      (begin ;; let ((run-record (pgdb:get-run-info dbh new-run-id))
-		(hash-table-set! runs-ht run-id new-run-id)
+	       (new-run-id (pgdb:get-run-id dbh spec-id target run-name area-id)))
+         (if new-run-id
+	         (begin ;; let ((run-record (pgdb:get-run-info dbh new-run-id))
+		        (hash-table-set! runs-ht run-id new-run-id)
 		;; ensure key fields are up to date
+     ;; if last_update == pgdb_last_update do not update smallest-last-update-time  
+    (let* ((pgdb-last-update (pgdb:get-run-last-update dbh new-run-id))
+           (smallest-time (hash-table-ref/default smallest-last-update-time "smallest-time" #f)))
+     (if (and  (> last-update pgdb-last-update) (or (not smallest-time) (< last-update smallest-time)))
+        (hash-table-set! smallest-last-update-time "smallest-time" last-update)))
 		(pgdb:refresh-run-info
 		 dbh
 		 new-run-id
-		 state status owner event-time comment fail-count pass-count)
-		new-run-id)
-	      (if (handle-exceptions
-		      exn
-		      (begin (print-call-chain) #f)
-		    (pgdb:insert-run
+		 state status owner event-time comment fail-count pass-count area-id last-update)
+     (debug:print-info 1 *default-log-port* "Working on run-id " run-id " pgdb-id "  new-run-id )
+		new-run-id) 
+      
+	      (if (equal? state "deleted")
+          (begin 
+          (debug:print-info 1 *default-log-port*  "Warning: Run with id " run-id " was created after previous sync and deleted before the sync") #f)
+          (if (handle-exceptions
+		        exn
+		        (begin (print-call-chain)
+              (print ((condition-property-accessor 'exn 'message) exn))     
+			      #f)
+            ;(print "inserting") 
+            (pgdb:insert-run
 		     dbh
-		     spec-id target run-name state status owner event-time comment fail-count pass-count)) ;; area-id))
-		  (tasks:run-id->mtpg-run-id dbh cached-info run-id)
-		  #f))))))
+		     spec-id target run-name state status owner event-time comment fail-count pass-count  area-id last-update))
+		       (let* ((smallest-time (hash-table-ref/default smallest-last-update-time "smallest-time" #f)))
+             (if (or (not smallest-time) (< last-update smallest-time))
+        				(hash-table-set! smallest-last-update-time "smallest-time" last-update))
+             (tasks:run-id->mtpg-run-id dbh cached-info run-id area-info smallest-last-update-time))
+		  #f)))))))
+
+
+(define (tasks:sync-test-steps dbh cached-info test-step-ids smallest-last-update-time)
+ ; (print "Sync Steps " test-step-ids )
+  (let ((test-ht (hash-table-ref cached-info 'tests))
+        (step-ht (hash-table-ref cached-info 'steps)))
+    (for-each
+     (lambda (test-step-id)
+        (let* ((test-step-info  (rmt:get-steps-info-by-id test-step-id))
+               (step-id (tdb:step-get-id test-step-info))
+               (test-id  (tdb:step-get-test_id    test-step-info))   
+	       (stepname (tdb:step-get-stepname  test-step-info))
+	       (state (tdb:step-get-state test-step-info))	
+	       (status (tdb:step-get-status test-step-info))	
+	       (event_time (tdb:step-get-event_time  test-step-info))	
+	       (comment  (tdb:step-get-comment test-step-info))	
+	       (logfile (tdb:step-get-logfile test-step-info))	
+         (last-update (tdb:step-get-last_update test-step-info))
+	       (pgdb-test-id  (hash-table-ref/default test-ht test-id #f))
+				 (smallest-time (hash-table-ref/default smallest-last-update-time "smallest-time" #f))
+         (pgdb-step-id (if pgdb-test-id 
+                         (pgdb:get-test-step-id dbh pgdb-test-id stepname state)
+                          #f)))
+    (if step-id
+      (begin  
+        (if pgdb-test-id
+           (begin 
+                (if  pgdb-step-id
+                   (begin
+                    (debug:print-info 1 *default-log-port*  "Updating existing test-step with test-id: " test-id " and step-id " step-id " pgdb test id: " pgdb-test-id " pgdb step id " pgdb-step-id )
+										(let* ((pgdb-last-update (pgdb:get-test-step-last-update dbh pgdb-step-id)))
+         (if (and  (> last-update pgdb-last-update) (or (not smallest-time) (< last-update smallest-time)))
+        (hash-table-set! smallest-last-update-time "smallest-time" last-update))) 
+                    (pgdb:update-test-step dbh pgdb-step-id pgdb-test-id stepname state status event_time comment logfile last-update))
+                    (begin
+ 		      (debug:print-info 1 *default-log-port*  "Inserting test-step with test-id: " test-id " and step-id " step-id  " pgdb test id: " pgdb-test-id)
+                     (if (or (not smallest-time) (< last-update smallest-time))
+        				      (hash-table-set! smallest-last-update-time "smallest-time" last-update))
+                      (pgdb:insert-test-step dbh pgdb-test-id stepname state status event_time comment logfile last-update )
+                      (set! pgdb-step-id  (pgdb:get-test-step-id dbh pgdb-test-id stepname state))))
+                (hash-table-set! step-ht step-id pgdb-step-id ))
+           (debug:print-info 1 *default-log-port*  "Error: Test not cashed")))
+      (debug:print-info 1 *default-log-port*  "Error: Could not get test step info for step id " test-step-id ))))	;; this is a wierd senario need to debug      	
+   test-step-ids)))
+
+(define (tasks:sync-test-gen-data dbh cached-info test-data-ids smallest-last-update-time)
+  (let ((test-ht (hash-table-ref cached-info 'tests))
+        (data-ht (hash-table-ref cached-info 'data)))
+    (for-each
+     (lambda (test-data-id)
+        (let* ((test-data-info  (rmt:get-data-info-by-id test-data-id))
+               (data-id (db:test-data-get-id  test-data-info))
+               (test-id  (db:test-data-get-test_id   test-data-info))   
+	       (category  (db:test-data-get-category  test-data-info))
+	       (variable  (db:test-data-get-variable test-data-info))	
+	       (value (db:test-data-get-value  test-data-info))	
+               (expected (db:test-data-get-expected  test-data-info))
+               (tol (db:test-data-get-tol  test-data-info))
+               (units (db:test-data-get-units  test-data-info))     
+	       (comment  (db:test-data-get-comment test-data-info))	
+               (status (db:test-data-get-status test-data-info))	
+	       (type (db:test-data-get-type test-data-info))
+				 (last-update (db:test-data-get-last_update test-data-info))
+				 (smallest-time (hash-table-ref/default smallest-last-update-time "smallest-time" #f))
+   	
+	       (pgdb-test-id  (hash-table-ref/default test-ht test-id #f))
+               (pgdb-data-id (if pgdb-test-id 
+                                 (pgdb:get-test-data-id dbh pgdb-test-id category variable)
+                                  #f)))
+    (if data-id
+      (begin
+        (if pgdb-test-id
+           (begin 
+                (if  pgdb-data-id
+                   (begin
+                    (debug:print-info 1 *default-log-port*  "Updating existing test-data with test-id: " test-id " and  data-id " data-id " pgdb test id: " pgdb-test-id " pgdb data id " pgdb-data-id)
+                    (let* ((pgdb-last-update (pgdb:get-test-data-last-update dbh pgdb-data-id)))
+         (if (and  (>  last-update pgdb-last-update) (or (not smallest-time) (< last-update smallest-time)))
+        (hash-table-set! smallest-last-update-time "smallest-time" last-update))) 
+                    (pgdb:update-test-data dbh pgdb-data-id pgdb-test-id  category variable value expected tol units comment status type last-update))
+                    (begin
+ 		      (debug:print-info 1 *default-log-port*  "Inserting test-data with test-id: " test-id " and data-id " data-id " pgdb test id: " pgdb-test-id)
+                       (if (handle-exceptions
+		      exn
+		      (begin (print-call-chain)
+                              (print ((condition-property-accessor 'exn 'message) exn))     
+			#f)
+                     
+                    (pgdb:insert-test-data dbh pgdb-test-id category variable value expected tol units comment status type last-update))
+		       ;(tasks:run-id->mtpg-run-id dbh cached-info run-id area-info)
+                      (begin
+                      ;(pgdb:insert-test-data dbh pgdb-test-id category variable value expected tol units comment status type )
+											(if (or (not smallest-time) (< last-update smallest-time))
+        								(hash-table-set! smallest-last-update-time "smallest-time" last-update))
+                      (set! pgdb-data-id  (pgdb:get-test-data-id dbh pgdb-test-id  category variable)))
+		   #f)))
+                (hash-table-set! data-ht data-id pgdb-data-id ))
+             (begin
+                 (debug:print-info 1 *default-log-port*  "Error: Test not in pgdb"))))
+
+      (debug:print-info 1 *default-log-port*  "Error: Could not get test data info for data id " test-data-id ))))	;; this is a wierd senario need to debug      	
+   test-data-ids)))
+
+
 
-(define (tasks:sync-tests-data dbh cached-info test-ids)
+(define (tasks:sync-tests-data dbh cached-info test-ids area-info smallest-last-update-time)
   (let ((test-ht (hash-table-ref cached-info 'tests)))
     (for-each
      (lambda (test-id)
+      ; (print test-id)
        (let* ((test-info    (rmt:get-test-info-by-id #f test-id))
 	      (run-id       (db:test-get-run_id    test-info)) ;; look these up in db_records.scm
 	      (test-id      (db:test-get-id        test-info))
 	      (test-name    (db:test-get-testname  test-info))
 	      (item-path    (db:test-get-item-path test-info))
@@ -676,52 +929,137 @@
 	      (log-file     (db:test-get-final_logf test-info))
 	      (run-duration (db:test-get-run_duration test-info))
 	      (comment      (db:test-get-comment   test-info))
 	      (event-time   (db:test-get-event_time test-info))
 	      (archived     (db:test-get-archived  test-info))
-	      (pgdb-run-id  (tasks:run-id->mtpg-run-id dbh cached-info run-id))
-	      (pgdb-test-id (pgdb:get-test-id dbh pgdb-run-id test-name item-path)))
+        (last-update  (db:test-get-last_update  test-info))
+	      (pgdb-run-id  (tasks:run-id->mtpg-run-id dbh cached-info run-id area-info smallest-last-update-time))
+        (smallest-time (hash-table-ref/default smallest-last-update-time "smallest-time" #f))       
+	      (pgdb-test-id (if pgdb-run-id 
+				(begin
+                                  ;(print pgdb-run-id)    
+                                 (pgdb:get-test-id dbh pgdb-run-id test-name item-path))
+                                 #f)))
 	 ;; "id"           "run_id"        "testname"  "state"      "status"      "event_time"
 	 ;; "host"         "cpuload"       "diskfree"  "uname"      "rundir"      "item_path"
 	 ;; "run_duration" "final_logf"    "comment"   "shortdir"   "attemptnum"  "archived"
-	 (if pgdb-test-id ;; have a record
+         (if pgdb-run-id
+           (begin
+	   (if pgdb-test-id ;; have a record
 	     (begin ;; let ((key-name (conc run-id "/" test-name "/" item-path)))
-	       (hash-table-set! test-ht test-id pgdb-test-id)
-	       (print "Updating existing test with run-id: " run-id " and test-id: " test-id)
-	       (pgdb:update-test dbh pgdb-test-id pgdb-run-id test-name item-path state status host cpuload diskfree uname run-dir log-file run-duration comment event-time archived))
-	     (pgdb:insert-test dbh pgdb-run-id test-name item-path state status host cpuload diskfree uname run-dir log-file run-duration comment event-time archived))
-	 ))
+	       (debug:print-info 0 *default-log-port*  "Updating existing test with run-id: " run-id " and test-id: " test-id " pgdb run id: " pgdb-run-id "  pgdb-test-id "  pgdb-test-id)
+         (let* ((pgdb-last-update (pgdb:get-test-last-update dbh pgdb-test-id)))
+         (if (and  (>  last-update pgdb-last-update) (or (not smallest-time) (< last-update smallest-time))) ;;if last-update is same as pgdb-last-update then it is safe to assume the records are identical and we can use a larger last update time.
+        (hash-table-set! smallest-last-update-time "smallest-time" last-update))) 
+	       (pgdb:update-test dbh pgdb-test-id pgdb-run-id test-name item-path state status host cpuload diskfree uname run-dir log-file run-duration comment event-time archived last-update))
+	     (begin 
+           (debug:print-info 0 *default-log-port*  "Inserting test with run-id: " run-id " and test-id: " test-id  " pgdb run id: " pgdb-run-id)
+           (pgdb:insert-test dbh pgdb-run-id test-name item-path state status host cpuload diskfree uname run-dir log-file run-duration comment event-time archived last-update)
+            (if (or (not smallest-time) (< last-update smallest-time))
+        				(hash-table-set! smallest-last-update-time "smallest-time" last-update))
+           (set! pgdb-test-id (pgdb:get-test-id dbh pgdb-run-id test-name item-path))))
+           (hash-table-set! test-ht test-id pgdb-test-id))
+           (debug:print-info 1 *default-log-port*  "WARNING: Skipping run with run-id:" run-id ". This run was created after privious sync and removed before this sync."))))
      test-ids)))
+
+(define (task:add-area-tag dbh area-info tag) 
+  (let* ((tag-info (pgdb:get-tag-info-by-name dbh tag)))
+   (if (not tag-info)
+     (begin   
+     (if (handle-exceptions
+	   exn
+	   (begin 
+               (debug:print-info 1 *default-log-port*  ((condition-property-accessor 'exn 'message) exn))     
+	   #f)
+	   (pgdb:insert-tag  dbh   tag))
+                       (set! tag-info (pgdb:get-tag-info-by-name dbh tag))
+		  #f)))
+     ;;add to area_tags
+     (handle-exceptions
+	   exn
+	   (begin 
+               (debug:print-info 1 *default-log-port*  ((condition-property-accessor 'exn 'message) exn))     
+	   #f)
+           (if (not (pgdb:is-area-taged-with-a-tag dbh (vector-ref tag-info 0)  (vector-ref area-info 0)))  
+	   (pgdb:insert-area-tag  dbh   (vector-ref tag-info 0)  (vector-ref area-info 0))))))
+
+(define (tasks:sync-run-data dbh cached-info run-ids area-info smallest-last-update-time) 
+  (for-each
+     (lambda (run-id)
+      (debug:print-info 1 *default-log-port*   "Check if run with " run-id " needs to be synced" )
+       (tasks:run-id->mtpg-run-id dbh cached-info run-id area-info smallest-last-update-time))
+run-ids))
+
 
 ;; get runs changed since last sync
 ;; (define (tasks:sync-test-data dbh cached-info area-info)
 ;;   (let* ((
 
 (define (tasks:sync-to-postgres configdat dest)
   (let* ((dbh         (pgdb:open configdat dbname: dest))
 	 (area-info   (pgdb:get-area-by-path dbh *toppath*))
 	 (cached-info (make-hash-table))
-	 (start       (current-seconds)))
+	 (start       (current-seconds))
+   (test-patt   (if (args:get-arg "-testpatt")
+											(args:get-arg "-testpatt")
+                      "%"))
+   (target         (if (args:get-arg "-target")
+														 (args:get-arg "-target")
+													#f))
+    (run-name         (if (args:get-arg "-runname")
+														 (args:get-arg "-runname")
+													#f)))
+     (if (and target  (not run-name))
+       (begin
+					(print "Error: Provide runname")
+          (exit 1)))
+     (if (and (not target)  run-name)
+       (begin
+					(print "Error: Provide target")
+          (exit 1)))
+
     (for-each (lambda (dtype)
 		(hash-table-set! cached-info dtype (make-hash-table)))
-	      '(runs targets tests))
+	      '(runs targets tests steps data))
     (hash-table-set! cached-info 'start start) ;; when done we'll set sync times to this
     (if area-info
 	(let* ((last-sync-time (vector-ref area-info 3))
-	       (changed        (rmt:get-changed-record-ids last-sync-time))
+	       (smallest-last-update-time  (make-hash-table))
+         (changed      (if (and target run-name)
+                            (rmt:get-run-record-ids target run-name (rmt:get-keys) test-patt)
+                            (rmt:get-changed-record-ids last-sync-time)))
 	       (run-ids        (alist-ref 'runs       changed))
 	       (test-ids       (alist-ref 'tests      changed))
 	       (test-step-ids  (alist-ref 'test_steps changed))
 	       (test-data-ids  (alist-ref 'test_data  changed))
-	       (run-stat-ids   (alist-ref 'run_stats  changed)))
-	  (print "area-info: " area-info)
-	  (if (not (null? test-ids))
+	       (run-stat-ids   (alist-ref 'run_stats  changed))
+         (area-tag    (if (args:get-arg "-area-tag") 
+                                 (args:get-arg "-area-tag")
+                                 (if (args:get-arg "-area") 
+                                   (args:get-arg "-area") 
+                                   ""))))
+           (if (and (equal? area-tag "") (not (pgdb:is-area-taged dbh (vector-ref area-info 0))))
+            (set! area-tag *default-area-tag*)) 
+           (if (not (equal? area-tag "")) 
+             (task:add-area-tag dbh area-info area-tag)) 
+	  (if (or (not (null? test-ids)) (not (null? run-ids)))
 	      (begin
-		(print "Syncing " (length test-ids) " changed tests")
-		(tasks:sync-tests-data dbh cached-info test-ids)))
-	  (pgdb:write-sync-time dbh area-info start))
+                (debug:print-info 0 *default-log-port*  "syncing runs")   
+	              (tasks:sync-run-data dbh cached-info run-ids area-info smallest-last-update-time) 
+                (debug:print-info 0 *default-log-port*  "syncing tests")
+		            (tasks:sync-tests-data dbh cached-info test-ids area-info smallest-last-update-time)
+                (debug:print-info 0 *default-log-port*  "syncing test steps")
+                (tasks:sync-test-steps dbh cached-info test-step-ids smallest-last-update-time)
+								(debug:print-info 0 *default-log-port*  "syncing test data")
+                (tasks:sync-test-gen-data dbh cached-info test-data-ids smallest-last-update-time)
+                (print "----------done---------------")))
+     (let*  ((smallest-time (hash-table-ref/default smallest-last-update-time "smallest-time" #f)))
+     (print "smallest-time :" smallest-time  " last-sync-time " last-sync-time)
+    (if (not (and target run-name)) 
+	  (if (or (and smallest-time (> smallest-time last-sync-time)) (and smallest-time (eq? last-sync-time 0)))
+				(pgdb:write-sync-time dbh area-info smallest-time))))) ;;this needs to be changed
 	(if (tasks:set-area dbh configdat)
 	    (tasks:sync-to-postgres configdat dest)
 	    (begin
 	      (debug:print 0 *default-log-port* "ERROR: unable to create an area record")
 	      #f)))))
 

ADDED   tcmt.scm
Index: tcmt.scm
==================================================================
--- /dev/null
+++ tcmt.scm
@@ -0,0 +1,383 @@
+;; Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
+;;======================================================================
+;;
+;; Wrapper to enable running Megatest flows under teamcity
+;;
+;;  1. Run the megatest process and pass it all the needed parameters
+;;  2. Every five seconds check for state/status changes and print the info
+;;
+
+(use srfi-1 posix srfi-69 srfi-18 regex defstruct)
+
+(use trace)
+;; (trace-call-sites #t)
+
+(declare (uses margs))
+(declare (uses rmt))
+(declare (uses common))
+(declare (uses megatest-version))
+
+(include "megatest-fossil-hash.scm")
+(include "db_records.scm")
+
+(define origargs (cdr (argv)))
+(define remargs (args:get-args
+		 (argv)
+		 `( "-target"
+		    "-reqtarg"
+		    "-runname"
+		    "-delay"   ;; how long to wait for unexpected changes to 
+		    )
+		 `("-tc-repl"
+		   )
+		 args:arg-hash
+		 0))
+
+(defstruct testdat
+  (tc-type #f)
+  (state   #f)
+  (status  #f)
+  (overall #f)
+  (flowid  #f)
+  tctname
+  tname
+  (event-time #f)
+  details
+  comment
+  duration
+  (start-printed #f)
+  (end-printed   #f))
+
+;;======================================================================
+;; GLOBALS
+;;======================================================================
+
+;; Gotta have a global? Stash it in the *global* hash table.
+;;
+(define *global* (make-hash-table))
+
+(define (tcmt:print tdat flush-mode)
+  (let* ((comment  (if (testdat-comment tdat)
+		       (conc " message='" (testdat-comment tdat) "'")
+		       ""))
+	 (details  (if (testdat-details tdat)
+		       (conc " details='" (testdat-details tdat) "'")
+		       ""))
+	 (flowid   (conc " flowId='" (testdat-flowid   tdat) "'"))
+	 (duration (conc " duration='" (* 1e3 (testdat-duration tdat)) "'"))
+	 (tcname   (conc " name='" (testdat-tctname  tdat) "'"))
+	 (state    (string->symbol (testdat-state tdat)))
+	 (status   (string->symbol (testdat-status tdat)))
+	 (startp   (testdat-start-printed tdat))
+	 (endp     (testdat-end-printed   tdat))
+	 (etime    (testdat-event-time    tdat))
+	 (overall  (case state
+		     ((RUNNING)   state)
+		     ((COMPLETED) state)
+		     (else 'UNK)))
+	 (tstmp    (conc " timestamp='" (time->string (seconds->local-time etime) "%FT%T.000") "'")))
+    (case overall
+      ((RUNNING)
+       (if (not startp)
+	   (begin
+	     (print "##teamcity[testStarted "  tcname flowid tstmp "]")
+	     (testdat-start-printed-set! tdat #t))))
+      ((COMPLETED)
+       (if (not startp) ;; start stanza never printed
+	   (begin
+	     (print "##teamcity[testStarted " tcname flowid tstmp "]")
+	     (testdat-start-printed-set! tdat #t)))
+       (if (not endp)
+	   (begin
+	     (if (not (member status '(PASS WARN SKIP WAIVED)))
+		 (print "##teamcity[testFailed  " tcname flowid comment details "]"))
+             (print "##teamcity[testFinished" tcname flowid comment details duration "]")
+	     (testdat-end-printed-set! tdat #t))))
+      (else
+       (if flush-mode
+	   (begin
+	     (if (not startp)
+		 (begin
+		   (print "##teamcity[testStarted " tcname flowid tstmp "]")
+		   (testdat-start-printed-set! tdat #t)))
+	     (if (not endp)
+		 (begin
+		   (print "##teamcity[testFailed  " tcname flowid comment details "]")
+                   (print "##teamcity[testFinished" tcname flowid comment details duration "]")
+		   (testdat-end-printed-set! tdat #t)))))))
+    ;; (print "ERROR: tc-type \"" (testdat-tc-type tdat) "\" not recognised for " tcname)))
+    (flush-output)))
+
+;; ;; returns values: flag newlst
+;; (define (remove-duplicate-completed  tdats)
+;;   (let* ((flag       #f)
+;;          (state      (testdat-state      tdat))
+;;          (status     (testdat-status     tdat))
+;;          (event-time (testdat-event-time tdat))
+;;          (tname      (testdat-tname      tdat)))
+;;     (let loop ((hed (car tdats))
+;;                (tal (cdr tdats))
+;;                (new '()))
+;;       (if (and (equal? state "COMPLETED")
+;;                (equal? tname (testdat-tname hed))
+;;                (equal? state (testdat-state hed))) ;; we have a duplicate COMPLETED call
+;;           (begin
+;;             (set! flag #t) ;; A changed completed
+            
+;; process the queue of tests gathered so far. List includes one entry for every test so far seen
+;; the last record for a test is preserved. Items are only removed from the list if over 15 seconds
+;; have passed since it happened. This allows for compression of COMPLETED/FAIL followed by some other
+;; state/status
+;;
+(define (process-queue data age flush-mode)
+  ;; here we process tqueue and gather those over 15 seconds (configurable?) old
+  (let* ((print-time (- (current-seconds) age)) ;; print stuff over 15 seconds old
+         (tqueue-raw (hash-table-ref/default data 'tqueue '()))
+         (tqueue     (reverse (delete-duplicates tqueue-raw     ;; REMOVE duplicates by testname and state
+                                                 (lambda (a b)
+                                                   (and (equal? (testdat-tname a)(testdat-tname b))        ;; need oldest to newest
+                                                        (equal? (testdat-state a) (testdat-state b)))))))) ;; "COMPLETED")
+    ;; (equal? (testdat-state b) "COMPLETED")))))))
+    (if (not (null? tqueue))
+        (hash-table-set!
+         data
+         'tqueue
+         (let loop ((hed (car tqueue)) ;; by this point all duplicates by state COMPLETED are removed
+                    (tal (cdr tqueue))
+                    (rem '()))
+           (if (> print-time (testdat-event-time hed)) ;; event happened over 15 seconds ago
+               (begin
+                 (tcmt:print hed flush-mode)
+                 (if (null? tal)
+                     rem ;; return rem to be processed in the future
+                     (loop (car tal)(cdr tal) rem)))
+               (if (null? tal)
+                   (cons hed rem) ;; return rem + hed for future processing
+                   (loop (car tal)(cdr tal)(cons hed rem)))))))))
+
+;; ##teamcity[testStarted name='suite.testName']
+;; ##teamcity[testStdOut name='suite.testName' out='text']
+;; ##teamcity[testStdErr name='suite.testName' out='error text']
+;; ##teamcity[testFailed name='suite.testName' message='failure message' details='message and stack trace']
+;; ##teamcity[testFinished name='suite.testName' duration='50']
+;; 
+;; flush; #f, normal call. #t, last call, print out something for NOT_STARTED, etc.
+;;
+
+;;;;;;;   (begin
+;;;;;;;     (case (string->symbol newstat)
+;;;;;;;       ((UNK)       ) ;; do nothing
+;;;;;;;       ((RUNNING)   (print "##teamcity[testStarted name='" tctname "' flowId='" flowid "']"))
+;;;;;;;       ((PASS SKIP WARN WAIVED) (print "##teamcity[testFinished name='" tctname "' duration='" (* 1e3 duration) "'" cmtstr details " flowId='" flowid "']"))
+;;;;;;;       (else
+;;;;;;; 	(print "##teamcity[testFailed name='" tctname "' " cmtstr details " flowId='" flowid "']")))
+;;;;;;;     (flush-output)
+
+;; (trace rmt:get-tests-for-run)
+
+(define (update-queue-since data run-ids last-update tsname target runname flowid flush #!key (delay-flag #t)) ;; 
+  (let ((now           (current-seconds))
+	(still-running #f))
+;; (handle-exceptions
+;; 	exn
+;; 	(begin (print-call-chain) (print "Error message: " ((condition-property-accessor 'exn 'message) exn)))
+      (for-each
+       (lambda (run-id)
+	 (let* ((tests (rmt:get-tests-for-run run-id "%" '() '() #f #f #f #f #f #f last-update #f)))
+	   ;; (print "DEBUG: got tests=" tests)
+	   (for-each
+	    (lambda (test-rec)
+	      (let* ((tqueue   (hash-table-ref/default data 'tqueue '())) ;; NOTE: the key is a symbol! This allows keeping disparate info in the one hash, lazy but a quick solution for right now.
+		     (is-top   (db:test-get-is-toplevel  test-rec))
+		     (tname    (db:test-get-fullname     test-rec))
+		     (testname (db:test-get-testname     test-rec))
+		     (itempath (db:test-get-item-path    test-rec))
+		     (tctname  (if (string=? itempath "") testname (conc testname "." (string-translate itempath "/" "."))))
+		     (state    (db:test-get-state        test-rec))
+		     (status   (db:test-get-status       test-rec))
+		     (etime    (db:test-get-event_time   test-rec))
+		     (duration (or (any->number (db:test-get-run_duration test-rec)) 0))
+		     (comment  (db:test-get-comment      test-rec))
+		     (logfile  (db:test-get-final_logf   test-rec))
+                     (hostn    (db:test-get-host         test-rec))
+                     (pid      (db:test-get-process_id   test-rec))
+		     (test-cont (> (+ etime duration 40) (current-seconds))) ;; test has not been over for more than 20 seconds
+		     (adj-state (if delay-flag
+				    (if test-cont
+					(begin
+					  (set! still-running #t)
+					  "RUNNING")
+					state)
+				    state))
+		     (newstat  (cond
+                                ;; ((or (not delay-flag)
+				;;      (< (+ etime duration)
+				;; 	(- (current-seconds) 10)))
+				;; 	(print "Skipping as delay hasn't hit") "RUNNING") 
+				((equal? adj-state "RUNNING")
+				 (set! still-running #t)
+				 "RUNNING")
+				((equal? adj-state "COMPLETED")
+				 status)
+				(flush   (conc state "/" status))
+				(else "UNK")))
+		     (cmtstr   (if (and (not flush) comment)
+				   comment
+				   (if flush
+				       (conc "Test ended in state/status="
+					     state "/" status
+					     (if  (string-match "^\\s*$" comment)
+						  ", no Megatest comment found."
+						  (conc ", Megatest comment=\"" comment "\""))) ;; special case, we are handling stragglers
+				       #f)))
+		     (details  (if (string-match ".*html$" logfile)
+				   (conc *toppath* "/lt/" target "/" runname "/" testname
+					 (if (equal? itempath "") "/" (conc "/" itempath "/"))
+					 logfile)
+				   #f))
+		     (prev-tdat (hash-table-ref/default data tname #f)) 
+		     (tdat      (if is-top
+				    #f
+				    (let ((new (or prev-tdat (make-testdat)))) ;; recycle the record so we keep track of already printed items
+				      (testdat-flowid-set!     new (or (testdat-flowid new)
+                                                                       (if (eq? pid 0)
+                                                                           tctname
+                                                                           (conc hostn "-" pid))))
+				      (testdat-tctname-set!    new tctname)
+				      (testdat-tname-set!      new tname)
+				      (testdat-state-set!      new adj-state)
+				      (testdat-status-set!     new status)
+				      (testdat-comment-set!    new cmtstr)
+				      (testdat-details-set!    new details)
+				      (testdat-duration-set!   new duration)
+				      (testdat-event-time-set! new etime) ;; (current-seconds))
+				      (testdat-overall-set!    new newstat)
+				      (hash-table-set! data tname new)
+				      new))))
+		(if (not is-top)
+		    (hash-table-set! data 'tqueue (cons tdat tqueue))) 
+                (hash-table-set! data tname tdat)
+                ))
+            tests)))
+       run-ids)
+      (list now still-running)))
+
+(define (monitor pid)
+  (let* ((run-ids '())
+	 (testdats (make-hash-table))  ;; each entry is a list of testdat structs
+	 (keys    #f)
+	 (last-update 0)
+	 (target  (or (args:get-arg "-target")
+		      (args:get-arg "-reqtarg")))
+	 (runname (args:get-arg "-runname"))
+	 (tsname  #f)
+	 (flowid  (conc target "/" runname))
+	 (tdelay  (string->number (or (args:get-arg "-delay") "15"))))
+    (if (and target runname)
+	(begin
+	  (launch:setup)
+	  (set! keys (rmt:get-keys))))
+    (set! tsname  (common:get-testsuite-name))
+    (print "TCMT: for testsuite=" tsname " found runname=" runname ", target=" target ", keys=" keys " and successfully ran launch:setup. Using " flowid " as the flowId.")
+    (let loop ()
+      ;;;;;; (handle-exceptions
+      ;;;;;;  exn
+      ;;;;;;  ;; (print "Process done.")
+      ;;;;;;  (begin (print-call-chain) (print "Error message: " ((condition-property-accessor 'exn 'message) exn)))
+       (let-values (((pidres exittype exitstatus)
+		     (process-wait pid #t)))
+	 (if (and keys
+		  (or (not run-ids)
+		      (null? run-ids)))
+	     (let* ((runs (rmt:get-runs-by-patt keys
+						runname 
+						target
+						#f ;; offset
+						#f ;; limit
+						#f ;; fields
+						0  ;; last-update
+						))
+		    (header (db:get-header runs))
+		    (rows   (db:get-rows   runs))
+		    (run-ids-in (map (lambda (row)
+				       (db:get-value-by-header row header "id"))
+				     rows)))
+	       (set! run-ids run-ids-in)))
+	 ;; (print "TCMT: pidres=" pidres " exittype=" exittype " exitstatus=" exitstatus " run-ids=" run-ids)
+	 (if (eq? pidres 0)
+	     (begin
+	       (if keys
+                   (begin
+                     (set! last-update (- (car (update-queue-since testdats run-ids last-update tsname target runname flowid #f delay-flag: #t)) 5))
+                     (process-queue testdats tdelay #f)))
+               (thread-sleep! 3)
+	       (loop)))))
+    ;; the megatest runner is done - now wait for all processes to be COMPLETED or NO Processes to be RUNNING > 1 minute
+    (let loop ()
+      (let* ((new-last-update-info (update-queue-since testdats run-ids last-update tsname target runname flowid #f delay-flag: #t))
+	     (still-running        (cadr new-last-update-info))
+	     (new-last-update      (- (car new-last-update-info) 5)))
+	(process-queue testdats tdelay #f)
+	(if still-running
+	    (begin
+	      (print "TCMT: Tests still running, keep watching...")
+	      (thread-sleep! 3)
+	      (loop)))))
+    
+    ;; (print "TCMT: pidres=" pidres " exittype=" exittype " exitstatus=" exitstatus " run-ids=" run-ids)
+    (print "TCMT: processing any tests that did not formally complete.")
+    (update-queue-since testdats run-ids 0 tsname target runname flowid #t #f delay-flag: #f) ;; call in flush mode
+    (process-queue testdats 0 #t)
+    (print "TCMT: All done.")
+    ))
+
+;;;;; )
+
+;; (trace print-changes-since)
+
+;; (if (not (eq? pidres 0))	  ;; (not exitstatus))
+;; 	  (begin
+;; 	    (thread-sleep! 3)
+;; 	    (loop))
+;; 	  (print "Process: megatest " (string-intersperse origargs " ") " is done.")))))
+
+(if (file-exists? ".tcmtrc")
+    (load ".tcmtrc"))
+
+(define (main)
+  (let* ((mt-done #f)
+	 (pid     #f)
+	 (th1     (make-thread (lambda ()
+				 (print "Running megatest " (string-intersperse origargs " "))
+				 (set! pid (process-run "megatest" origargs)))
+			       "Megatest job"))
+	 (th2     (make-thread (lambda ()
+				 (monitor pid))
+			       "Monitor job")))
+    (thread-start! th1)
+    (thread-sleep! 1) ;; give the process time to get going
+    (thread-start! th2)
+    (thread-join! th2)))
+
+(if (args:get-arg "-tc-repl")
+    (repl)
+    (main))
+
+;; (process-wait)
+

Index: tdb.scm
==================================================================
--- tdb.scm
+++ tdb.scm
@@ -1,14 +1,23 @@
 ;;======================================================================
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 ;;======================================================================
 
 ;;======================================================================
 ;; Database access
 ;;======================================================================
@@ -50,11 +59,11 @@
   (debug:print-info 11 *default-log-port* "open-test-db " work-area)
   (if (and work-area 
 	   (directory? work-area)
 	   (file-read-access? work-area))
       (let* ((dbpath              (conc work-area "/testdat.db"))
-	     (dbexists            (file-exists? dbpath))
+	     (dbexists            (common:file-exists? dbpath))
 	     (work-area-writeable (file-write-access? work-area))
 	     (db                  (handle-exceptions  ;; open the db if area writeable or db pre-existing. open in-mem otherwise. if exception, open in-mem
 				   exn
 				   (begin
 				     (print-call-chain (current-error-port))

Index: test_records.scm
==================================================================
--- test_records.scm
+++ test_records.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;; make-vector-record tests testqueue testname testconfig waitons priority items
 (define (make-tests:testqueue)(make-vector 7 #f))
 (define-inline (tests:testqueue-get-testname     vec)    (vector-ref  vec 0))
 (define-inline (tests:testqueue-get-testconfig   vec)    (vector-ref  vec 1))
 (define-inline (tests:testqueue-get-waitons      vec)    (vector-ref  vec 2))

DELETED testhttp/example-client.scm
Index: testhttp/example-client.scm
==================================================================
--- testhttp/example-client.scm
+++ /dev/null
@@ -1,6 +0,0 @@
-(use regex http-client)
-
-(print (with-input-from-request "http://localhost:8083/?foo=1" #f 
-    (lambda ()
-      (let ((match (string-search (regexp "(.*)<.body>") (caddr (string-split (read-string) "\n")))))
-	(cadr match)))))

DELETED testhttp/example-server.scm
Index: testhttp/example-server.scm
==================================================================
--- testhttp/example-server.scm
+++ /dev/null
@@ -1,26 +0,0 @@
-(use spiffy awful)
-
-(tcp-buffer-size 2048)
-(enable-sxml #t)
-
-(define (hello-world)
-  (define-page (main-page-path)
-    (lambda ()
-      (with-request-variables (foo)
-        foo))))
-
-(define (start-server #!key (portnum 8080))
-  (handle-exceptions
-   exn
-   (begin
-     (print-error-message exn)
-     (if (< portnum 9000)
-	 (begin 
-	   (print "WARNING: failed to start on portnum: " portnum ", trying next port")
-	   (sleep 1)
-	   (start-server portnum: (+ portnum 1)))
-	 (print "ERROR: Tried and tried but could not start the server")))
-   (print "INFO: Trying to start server on portnum: " portnum)
-   (awful-start hello-world port: portnum)))
-
-(start-server)

DELETED testhttp/mockupclient.scm
Index: testhttp/mockupclient.scm
==================================================================
--- testhttp/mockupclient.scm
+++ /dev/null
@@ -1,35 +0,0 @@
-(use posix)
-
-(define cname "Bob")
-(define runtime 10)
-(let ((args (argv)))
-  (if (< (length args) 3)
-      (begin
-	(print "Usage: mockupclient clientname runtime")
-	(exit))
-      (begin
-	(set! cname (cadr args))
-	(set! runtime (string->number (caddr args))))))
-      
-;; (define start-delay (/ (random 100) 9))
-;; (define runtime     (+ 1 (/ (random 200) 2)))
-
-(print "Starting client " cname " with runtime " runtime)
-
-(include "mockupclientlib.scm")
-
-(set! endtime (+ (current-seconds) runtime))
-
-(let loop ()
-  (let ((x (random 15))
-	(varname (list-ref (list "hello" "goodbye" "saluton" "kiaorana")(random 4))))
-    (case x
-      ;; ((1)(dbaccess cname 'sync "nodat"    #f))
-      ((2 3 4 5)(dbaccess cname 'set varname (random 999)))
-      ((6 7 8 9 10)(print cname ": Get \"" varname "\" " (dbaccess cname 'get varname #f)))
-      (else
-       (thread-sleep! 0.011)))
-    (if (< (current-seconds) endtime)
-	(loop))))
-
-(print "Client " cname " all done!!")

DELETED testhttp/mockupclientlib.scm
Index: testhttp/mockupclientlib.scm
==================================================================
--- testhttp/mockupclientlib.scm
+++ /dev/null
@@ -1,33 +0,0 @@
-(define sub  (make-socket 'sub))
-(define push (make-socket 'push))
-(socket-option-set! sub 'subscribe cname)
-(connect-socket sub "tcp://localhost:5563")
-(connect-socket push "tcp://localhost:5564")
-
-(define (dbaccess cname cmd var val #!key (numtries 1))
-  (let* ((msg (conc cname ":" cmd ":" (if val (conc var " " val) var)))
-	 (res #f)
-	 (do-access (lambda ()
-		      (print "Sending msg: " msg)
-		      (send-message push msg)
-		      (print "Message " msg " sent")
-		      (print "Client " cname " waiting for response to " msg)
-		      (print "Client " cname " received address " (receive-message* sub))
-		      (set! res (receive-message* sub)))))
-    (let ((th1 (make-thread do-access "do access"))
-	  (th2 (make-thread (lambda ()
-			      (thread-sleep! 5)
-			      (if (not res)
-				  (if (> numtries 0)
-				      (begin
-					(print "WARNING: access timed out for " cname ", trying again. Trys remaining=" numtries)
-					(dbaccess cname cmd var val numtries: (- numtries 1)))
-				      (begin
-					(print "ERROR: dbaccess timed out. Exiting")
-					(exit)))))
-			    "timeout thread")))
-      (thread-start! th1)
-      (thread-start! th2)
-      (thread-join! th1)
-      res)))
-

DELETED testhttp/mockupserver.scm
Index: testhttp/mockupserver.scm
==================================================================
--- testhttp/mockupserver.scm
+++ /dev/null
@@ -1,140 +0,0 @@
-;; pub/sub with envelope address
-;; Note that if you don't insert a sleep, the server will crash with SIGPIPE as soon
-;; as a client disconnects.  Also a remaining client may receive tons of
-;; messages afterward.
-
-(use srfi-18 sqlite3 spiffy)
-
-(define cname "server")
-(define total-db-accesses 0)
-(define start-time (current-seconds))
-
-;; setup the server here
-(tcp-buffer-size 2048)
-(server-port 5563)
-
-(define (open-db)
-  (let* ((dbpath    "mockup.db")
-	 (dbexists  (file-exists? dbpath))
-	 (db        (open-database dbpath)) ;; (never-give-up-open-db dbpath))
-	 (handler   (make-busy-timeout 10)))
-    (set-busy-handler! db handler)
-    (if (not dbexists)
-	(for-each
-	 (lambda (stmt)
-	   (execute db stmt))
-	 (list
-	  "PRAGMA SYNCHRONOUS=0;"
-	  "CREATE TABLE clients (id INTEGER PRIMARY KEY,name TEXT,num_accesses INTEGER DEFAULT 0);"
-	  "CREATE TABLE vars    (var TEXT,val TEXT,CONSTRAINT vars_constraint UNIQUE (var));")))
-    db))
-
-(define cid-cache (make-hash-table))
-
-(define (get-client-id db cname)
-  (let ((cid (hash-table-ref/default cid-cache cname #f)))
-    (if cid 
-	cid
-	(begin
-	  (execute db "INSERT OR REPLACE INTO clients (name) VALUES(?);" cname)
-	  (for-each-row 
-	   (lambda (id)
-	     (set! cid id))
-	   db
-	   "SELECT id FROM clients WHERE name=?;" cname)
-	  (hash-table-set! cid-cache cname cid)
-	  (set! total-db-accesses (+ total-db-accesses 2))
-	  cid))))
-
-(define (count-client db cname)
-  (let ((cid (get-client-id db cname)))
-    (execute db "UPDATE clients SET num_accesses=num_accesses+1 WHERE id=?;" cid)
-    (set! total-db-accesses (+ total-db-accesses 1))
-    ))
-
-(define db (open-db))
-;; (define queuelst '())
-;; (define mx1 (make-mutex))
-
-(define max-queue-len 0)
-
-(define (process-queue queuelst)
-  (let ((queuelen (length queuelst)))
-    (if (> queuelen max-queue-len)
-	(set! max-queue-len queuelen))
-    (for-each
-     (lambda (item)
-       (let ((cname (vector-ref item 1))
-	     (clcmd (vector-ref item 2))
-	     (cdata (vector-ref item 3)))
-	 (send-message pub cname send-more: #t)
-	 (send-message pub (case clcmd
-			     ((sync)
-			      (conc queuelen))
-			     ((set)
-			      (set! total-db-accesses (+ total-db-accesses 1))
-			      (apply execute db "INSERT OR REPLACE INTO vars (var,val) VALUES (?,?);" (string-split cdata))
-			      "ok")
-			     ((get)
-			      (set! total-db-accesses (+ total-db-accesses 1))
-			      (let ((res "noval"))
-				(for-each-row
-				 (lambda (val)
-				   (set! res val))
-				 db 
-				 "SELECT val FROM vars WHERE var=?;" cdata)
-				res))
-			     (else (conc "unk cmd: " clcmd))))))
-     queuelst)))
-
-(define th1 (make-thread 
-	     (lambda ()
-	       (let ((last-run 0)) ;; current-seconds when run last
-		 (let loop ((queuelst '()))
-		   (let* ((indat (receive-message* pull))
-			  (parts (string-split indat ":"))
-			  (cname (car parts))                   ;; client name
-			  (clcmd (string->symbol (cadr parts))) ;; client cmd
-			  (cdata (caddr parts))                 ;; client data
-			  (svect (vector (current-seconds) cname clcmd cdata))) ;; record for the queue
-		     (count-client db cname)
-		     (case clcmd
-		       ((sync) ;; just process the queue
-			(print "Got sync from " cname)
-			(process-queue (cons svect queuelst))
-			(loop '()))
-		       ((get)
-			(process-queue (cons svect queuelst))
-			(loop '()))
-		       (else
-			(loop (cons svect queuelst))))))))
-	     "server thread"))
-
-(include "mockupclientlib.scm")
-
-;; ;; send a sync to the pull port
-;; (define th2 (make-thread
-;; 	     (lambda ()
-;; 	       (let ((last-action-time (current-seconds)))
-;; 		 (let loop ()
-;; 		   (thread-sleep! 5)
-;; 		   (let ((queuelen (string->number (dbaccess "server" 'sync "nada" #f)))
-;; 			 (last-action-delta #f))
-;; 		     (if (> queuelen 1)(set! last-action-time (current-seconds)))
-;; 		     (set! last-action-delta (- (current-seconds) last-action-time))
-;; 		     (print "Server: Got queuelen=" queuelen ", last-action-delta=" last-action-delta)
-;; 		     (if (< last-action-delta 60)
-;; 			 (loop)
-;; 			 (print "Server exiting, 25 seconds since last access"))))))
-;; 	     "sync thread"))
-
-(handle-not-found 
- 
-
-(thread-start! th1)
-(thread-start! th2)
-(thread-join! th2)
-
-(let* ((run-time       (- (current-seconds) start-time))
-       (queries/second (/  total-db-accesses run-time)))
-  (print "Server exited! Total db accesses=" total-db-accesses " in " run-time " seconds for " queries/second " queries/second with max queue length of: " max-queue-len))

DELETED testhttp/testclient.scm
Index: testhttp/testclient.scm
==================================================================
--- testhttp/testclient.scm
+++ /dev/null
@@ -1,8 +0,0 @@
-(use http-client)
-
-(with-input-from-request "http://localhost:12345/hey"
-                                           ;; #f
-                                           ;; msg 
-                                           (list (cons 'dat "Testing eh"))
-                                           read-string)
-

DELETED testhttp/testserver.scm
Index: testhttp/testserver.scm
==================================================================
--- testhttp/testserver.scm
+++ /dev/null
@@ -1,16 +0,0 @@
-(use spiffy uri-common intarweb spiffy-request-vars)
-
-(root-path "/var/www")
-
-(vhost-map `(((* any) . ,(lambda (continue)
-                           (let (($ (request-vars source: 'both)))
-			     (print ($ 'dat))
-			     (if (equal? (uri-path (request-uri (current-request))) 
-					 '(/ "hey"))
-				 (send-response body: "hey there!\n"
-						headers: '((content-type text/plain)))
-				 (continue)))))))
-
-(start-server port: 12345)
-
-

DELETED testnanomsg/basic-req-rep.scm
Index: testnanomsg/basic-req-rep.scm
==================================================================
--- testnanomsg/basic-req-rep.scm
+++ /dev/null
@@ -1,3 +0,0 @@
-(use nanomsg srfi-18 sqlite3 numbers)
-
-(define resp (nn-socket 'rep))

DELETED testnanomsg/mockupclient.scm
Index: testnanomsg/mockupclient.scm
==================================================================
--- testnanomsg/mockupclient.scm
+++ /dev/null
@@ -1,42 +0,0 @@
-(use zmq posix numbers)
-
-(define cname "Bob")
-(define runtime 10)
-(let ((args (argv)))
-  (if (< (length args) 3)
-      (begin
-	(print "Usage: mockupclient clientname runtime")
-	(exit))
-      (begin
-	(set! cname (cadr args))
-	(set! runtime (string->number (caddr args))))))
-      
-;; (define start-delay (/ (random 100) 9))
-;; (define runtime     (+ 1 (/ (random 200) 2)))
-
-(print "Starting client " cname " with runtime " runtime)
-
-(include "mockupclientlib.scm")
-
-(set! endtime (+ (current-seconds) runtime))
-
-;; first ping the server to ensure we have a connection
-(if (server-ping cname 5)
-    (print "SUCCESS: Client " cname " connected to server")
-    (begin
-      (print "ERROR: Client " cname " failed ping of server, exiting")
-      (exit)))
-
-(let loop ()
-  (let ((x (random 15))
-	(varname (list-ref (list "hello" "goodbye" "saluton" "kiaorana")(random 4))))
-    (case x
-      ;; ((1)(dbaccess cname 'sync "nodat"    #f))
-      ((2 3 4 5)(dbaccess cname 'set varname (random 999)))
-      ((6 7 8 9 10)(print cname ": Get \"" varname "\" " (dbaccess cname 'get varname #f)))
-      (else
-       (thread-sleep! 0.011)))
-    (if (< (current-seconds) endtime)
-	(loop))))
-
-(print "Client " cname " all done!!")

DELETED testnanomsg/mockupclientlib.scm
Index: testnanomsg/mockupclientlib.scm
==================================================================
--- testnanomsg/mockupclientlib.scm
+++ /dev/null
@@ -1,58 +0,0 @@
-(define reqs (nn-socket 'req))
-
-(connect-socket reqs "tcp://localhost:6563")
-
-(thread-sleep! 0.2)
-
-(define (server-ping cname timeout)
-  (let ((msg     (conc cname ":ping:" timeout))
-	(maxtime (+ (current-seconds) timeout)))
-    (print "pinging server from " cname " with timeout " timeout)
-    (let loop ((res   #f))
-      (if (< maxtime (current-seconds))
-	  #f ;; failed to ping
-	  (if (equal? res "Got ping")
-	      #t
-	      (begin
-		(print "Ping received from server " res)
-		(send-message push msg)
-		(thread-sleep! 0.1)
-		(loop (receive-message sub non-blocking: #t))))))))
-  
-(define (dbaccess cname cmd var val #!key (numtries 20))
-  (let* ((msg (conc cname ":" cmd ":" (if val (conc var " " val) var)))
-	 (res #f)
-	 (mtx1 (make-mutex))
-	 (do-access (lambda ()
-		      (let ((tmpres #f))
-			(print "Sending msg: " msg)
-			(send-message push msg)
-			(print "Message " msg " sent")
-			(print "Client " cname " waiting for response to " msg)
-			(print "Client " cname " received address " (receive-message* sub))
-			(set! tmpres (receive-message* sub))
-			(mutex-lock! mtx1)
-			(set! res tmpres)
-			(mutex-unlock! mtx1))))
-	 (th1 (make-thread do-access "do access"))
-	 (th2 (make-thread (lambda ()
-			     (let ((result #f))
-			       (mutex-lock! mtx1)
-			       (set! result res)
-			       (mutex-unlock! mtx1)
-			       (thread-sleep! 5)
-			       (if (not result)
-				   (if (> numtries 0)
-				       (begin
-					 (print "WARNING: access timed out for " cname ", trying again. Trys remaining=" numtries)
-					 (dbaccess cname cmd var val numtries: (- numtries 1)))
-				       (begin
-					 (print "ERROR: dbaccess timed out. Exiting")
-					 (exit)))))
-			     "timeout thread"))))
-    (thread-start! th1)
-    (thread-start! th2)
-    (thread-join! th1)
-    (if res (print "SUCCESS: received " res " with " numtries " remaining possible attempts"))
-    res))
-

DELETED testnanomsg/mockupserver.scm
Index: testnanomsg/mockupserver.scm
==================================================================
--- testnanomsg/mockupserver.scm
+++ /dev/null
@@ -1,146 +0,0 @@
-;; pub/sub with envelope address
-;; Note that if you don't insert a sleep, the server will crash with SIGPIPE as soon
-;; as a client disconnects.  Also a remaining client may receive tons of
-;; messages afterward.
-
-(use nanomsg srfi-18 sqlite3 numbers)
-
-(define resp (nn-socket 'rep))
-(define cname "server")
-(define total-db-accesses 0)
-(define start-time (current-seconds))
-
-(nn-bind resp  "tcp://*:6563")
-
-(thread-sleep! 0.2)
-
-(define (open-db)
-  (let* ((dbpath    "mockup.db")
-	 (dbexists  (file-exists? dbpath))
-	 (db        (open-database dbpath)) ;; (never-give-up-open-db dbpath))
-	 (handler   (make-busy-timeout 10)))
-    (set-busy-handler! db handler)
-    (if (not dbexists)
-	(for-each
-	 (lambda (stmt)
-	   (execute db stmt))
-	 (list
-	  "PRAGMA SYNCHRONOUS=0;"
-	  "CREATE TABLE clients (id INTEGER PRIMARY KEY,name TEXT,num_accesses INTEGER DEFAULT 0);"
-	  "CREATE TABLE vars    (var TEXT,val TEXT,CONSTRAINT vars_constraint UNIQUE (var));")))
-    db))
-
-(define cid-cache (make-hash-table))
-
-(define (get-client-id db cname)
-  (let ((cid (hash-table-ref/default cid-cache cname #f)))
-    (if cid 
-	cid
-	(begin
-	  (execute db "INSERT OR REPLACE INTO clients (name) VALUES(?);" cname)
-	  (for-each-row 
-	   (lambda (id)
-	     (set! cid id))
-	   db
-	   "SELECT id FROM clients WHERE name=?;" cname)
-	  (hash-table-set! cid-cache cname cid)
-	  (set! total-db-accesses (+ total-db-accesses 2))
-	  cid))))
-
-(define (count-client db cname)
-  (let ((cid (get-client-id db cname)))
-    (execute db "UPDATE clients SET num_accesses=num_accesses+1 WHERE id=?;" cid)
-    (set! total-db-accesses (+ total-db-accesses 1))
-    ))
-
-(define db (open-db))
-;; (define queuelst '())
-;; (define mx1 (make-mutex))
-
-(define max-queue-len 0)
-
-(define (process-queue queuelst)
-  (let ((queuelen (length queuelst)))
-    (if (> queuelen max-queue-len)
-	(set! max-queue-len queuelen))
-    (for-each
-     (lambda (item)
-       (let ((cname (vector-ref item 1))
-	     (clcmd (vector-ref item 2))
-	     (cdata (vector-ref item 3)))
-	 (send-message pub cname send-more: #t)
-	 (send-message pub (case clcmd
-			     ((sync)
-			      (conc queuelen))
-			     ((set)
-			      (set! total-db-accesses (+ total-db-accesses 1))
-			      (apply execute db "INSERT OR REPLACE INTO vars (var,val) VALUES (?,?);" (string-split cdata))
-			      "ok")
-			     ((get)
-			      (set! total-db-accesses (+ total-db-accesses 1))
-			      (let ((res "noval"))
-				(for-each-row
-				 (lambda (val)
-				   (set! res val))
-				 db 
-				 "SELECT val FROM vars WHERE var=?;" cdata)
-				res))
-			     (else (conc "unk cmd: " clcmd))))))
-     queuelst)))
-
-;; SERVER THREAD
-(define th1 (make-thread 
-	     (lambda ()
-	       (let ((last-run 0)) ;; current-seconds when run last
-		 (let loop ((queuelst '()))
-		   (let* ((indat (receive-message* pull))
-			  (parts (string-split indat ":"))
-			  (cname (car parts))                   ;; client name
-			  (clcmd (string->symbol (cadr parts))) ;; client cmd
-			  (cdata (caddr parts))                 ;; client data
-			  (svect (vector (current-seconds) cname clcmd cdata))) ;; record for the queue
-		     ;; (print "Server received message: " indat)
-		     (count-client db cname)
-		     (case clcmd
-		       ((ping)
-			(print "Got ping from " cname)
-			(send-message pub cname send-more: #t)
-			(send-message pub "Got ping")
-			(loop queuelst))
-		       ((sync) ;; just process the queue
-			(print "Got sync from " cname)
-			(process-queue (cons svect queuelst))
-			(loop '()))
-		       ((get)
-			(process-queue (cons svect queuelst))
-			(loop '()))
-		       (else
-			(loop (cons svect queuelst))))))))
-	     "server thread"))
-
-(include "mockupclientlib.scm")
-
-;; SYNC THREAD
-;; send a sync to the pull port
-(define th2 (make-thread
-	     (lambda ()
-	       (let ((last-action-time (current-seconds)))
-		 (let loop ()
-		   (thread-sleep! 5)
-		   (let ((queuelen (string->number (dbaccess "server" 'sync "nada" #f)))
-			 (last-action-delta #f))
-		     (if (> queuelen 1)(set! last-action-time (current-seconds)))
-		     (set! last-action-delta (- (current-seconds) last-action-time))
-		     (print "Server: Got queuelen=" queuelen ", last-action-delta=" last-action-delta)
-		     (if (< last-action-delta 60)
-			 (loop)
-			 (print "Server exiting, 25 seconds since last access"))))))
-	     "sync thread"))
-
-(thread-start! th1)
-(thread-start! th2)
-(thread-join! th2)
-
-(let* ((run-time       (- (current-seconds) start-time))
-       (queries/second (/  total-db-accesses run-time)))
-  (print "Server exited! Total db accesses=" total-db-accesses " in " run-time " seconds for " queries/second " queries/second with max queue length of: " max-queue-len))

DELETED testnanomsg/pipeline.scm
Index: testnanomsg/pipeline.scm
==================================================================
--- testnanomsg/pipeline.scm
+++ /dev/null
@@ -1,25 +0,0 @@
-;; watch nanomsg's pipeline load-balancer in action.
-(use nanomsg)
-
-(define push (nn-socket 'push))
-(define pull1 (nn-socket 'pull))
-(define pull2 (nn-socket 'pull))
-
-(nn-bind    push  "inproc://test")
-(nn-connect pull1 "inproc://test")
-(nn-connect pull2 "inproc://test")
-
-(nn-send push "a")
-(nn-send push "b")
-(nn-send push "c")
-(nn-send push "d")
-
-(define ((th sock))
-  (print (current-thread) ": " (nn-recv sock))
-  (print (current-thread) ": " (nn-recv sock))
-  (print (current-thread) " is done"))
-
-(thread-start! (th pull1))
-(thread-start! (th pull2))
-
-(thread-sleep! 1)

DELETED testnanomsg/req-rep-client.scm
Index: testnanomsg/req-rep-client.scm
==================================================================
--- testnanomsg/req-rep-client.scm
+++ /dev/null
@@ -1,31 +0,0 @@
-;; watch nanomsg's pipeline load-balancer in action.
-(use nanomsg posix regex)
-
-(define req   (nn-socket 'req))
-
-(nn-connect req  "tcp://localhost:22022")
-
-;; (with-output-to-string (lambda ()(serialize obj)))
-(define (client-send-receive soc msg)
-  (nn-send soc msg)
-  (nn-recv soc))
-
-(define ((talk-to-server soc))
-  (let loop ((cnt 200000))
-    (let ((name (list-ref '("Matt" "Tom" "Bob" "Jill" "James" "Jane")(random 6))))
-      ;; (print "Sending " name)
-      ;; (print
-      (client-send-receive req name) ;; )
-      (if (> cnt 0)(loop (- cnt 1)))))
-  (print (client-send-receive req "quit"))
-  (nn-close req)
-  (exit))
-
-;; (thread-start! (lambda ()
-;; 		 (thread-sleep! 20)
-;; 		 (print "Give up on waiting for the server")
-;; 		 (nn-close req)
-;; 		 (exit)))
-
-(thread-join! (thread-start! (talk-to-server req)))
-

DELETED testnanomsg/req-rep-server.scm
Index: testnanomsg/req-rep-server.scm
==================================================================
--- testnanomsg/req-rep-server.scm
+++ /dev/null
@@ -1,94 +0,0 @@
-;; watch nanomsg's pipeline load-balancer in action.
-(use nanomsg posix regex)
-
-;; (use trace)
-;; (trace nn-bind nn-socket nn-assert nn-recv nn-send thread-terminate! nn-close )
-
-(define port  22022)
-(define host  "127.0.0.1")
-
-(define rep   (nn-socket 'rep))
-
-(print "connecting, got: " (nn-bind    rep  (conc "tcp://" "*" ":" port)))
-
-(define (server soc)
-  (print "server starting")
-  (let loop ((msg-in (nn-recv soc))
-	     (count  0))
-    (if (eq? 0 (modulo count 1000))
-	(print "server received: " msg-in ", count=" count))
-    (cond
-     ((equal? msg-in "quit")
-      (nn-send soc "Ok, quitting"))
-     ((and (>= (string-length msg-in) 4)
-	   (equal? (substring msg-in 0 4) "ping"))
-      (nn-send soc (conc (current-process-id)))
-      (loop (nn-recv soc)(+ count 1)))
-     ;;((and (>= (string-length msg-in)
-     (else
-      (let ((this-task  (/ (random 10) 200.0))
-	    (start-time (current-milliseconds)))
-	;; (thread-sleep! this-task)
-	(nn-send soc (conc "hello " msg-in " this task took " this-task " seconds to complete"))
-	;; (print "Actual send-receive time: " (- (current-milliseconds) start-time));
-	(loop (nn-recv soc)(+ count 1)))))))
-
-(define (ping-self host port #!key (return-socket #t))
-  ;; send a random number along with pid and check that we get it back
-  (let* ((req     (nn-socket 'req))
-	 (key     "ping")
-	 (success #f)
-	 (keepwaiting #t)
-	 (ping    (make-thread
-		   (lambda ()
-		     (print "ping: sending string \"" key "\", expecting " (current-process-id))
-		     (nn-send req key)
-		     (let ((result  (nn-recv req)))
-		       (if (equal? (conc (current-process-id)) result)
-			   (begin
-			     (print "ping, success: received \"" result "\"")
-			     (set! success #t))
-			   (begin
-			     (print "ping, failed: received key \"" result "\"")
-			     (set! keepwaiting #f)
-			     (set! success #f)))))
-		   "ping"))
-	 (timeout (make-thread (lambda ()
-				 (let loop ((count 0))
-				   (thread-sleep! 1)
-				   (print "still waiting after count seconds...")
-				   (if (and keepwaiting (< count 10))
-				       (loop (+ count 1))))
-				 (if keepwaiting
-				     (begin
-				       (print "timeout waiting for ping")
-				       (thread-terminate! ping))))
-			       "timeout")))
-    (nn-connect req (conc "tcp://" host ":" port))
-    (handle-exceptions
-     exn
-     (begin
-       (print-call-chain)
-       (print 0 " message: " ((condition-property-accessor 'exn 'message) exn))
-       (print "exn=" (condition->list exn))
-       (print "ping failed to connect to " host ":" port))
-     (thread-start! timeout)
-     (thread-start! ping)
-     (thread-join! ping)
-     (if success (thread-terminate! timeout)))
-    (if return-socket
-	(if success req #f)
-	(begin
-	  (nn-close req)
-	  success))))
-
-(let ((server-thread (make-thread (lambda ()(server rep)) "server")))
-  (thread-start! server-thread)
-  ;; (thread-sleep! 1)
-  (if (ping-self host port)
-      (begin
-	(thread-join! server-thread)
-	(nn-close rep))
-      (print "ping failed")))
-
-(exit)

DELETED testnanomsg/req-rep.scm
Index: testnanomsg/req-rep.scm
==================================================================
--- testnanomsg/req-rep.scm
+++ /dev/null
@@ -1,30 +0,0 @@
-;; watch nanomsg's pipeline load-balancer in action.
-(use nanomsg)
-
-(define req   (nn-socket 'req))
-(define rep   (nn-socket 'rep))
-
-(nn-bind    rep  "inproc://test")
-(nn-connect req  "inproc://test")
-
-(define (client-send-receive soc msg)
-  (nn-send soc msg)
-  (nn-recv soc))
-
-(define ((server soc))
-  (let loop ((msg-in (nn-recv soc)))
-    (if (not (equal? msg-in "quit"))
-	(begin
-	  (nn-send soc (conc "hello " msg-in))
-	  (loop (nn-recv soc))))))
-
-(thread-start! (server rep))
-
-(print (client-send-receive req "Matt"))
-(print (client-send-receive req "Tom"))
-
-;; (client-send-receive req "quit")
-
-(nn-close req)
-(nn-close rep)
-(exit)

DELETED testrpc/client.scm
Index: testrpc/client.scm
==================================================================
--- testrpc/client.scm
+++ /dev/null
@@ -1,8 +0,0 @@
-;;;; client.scm
-(use rpc posix)
-
-(define call (rpc:procedure 'foo "localhost"))
-
-(do ((i 10 (sub1 i)))
-    ((zero? i))
-  (print "-> " (call (random 100))))

DELETED testrpc/server.scm
Index: testrpc/server.scm
==================================================================
--- testrpc/server.scm
+++ /dev/null
@@ -1,15 +0,0 @@
-;;;; server.scm
-(use rpc)
-
-(rpc:publish-procedure!
- 'foo
- (lambda (x)
-   (print "foo: " x)
-   #f))
-
-(rpc:publish-procedure!
- 'fini
- (lambda () (print "fini") (thread-start! (lambda () (thread-sleep! 3) (print "terminate") (exit))) #f))
-
-((rpc:make-server (tcp-listen (rpc:default-server-port))) #t)
-

Index: tests.scm
==================================================================
--- tests.scm
+++ tests.scm
@@ -1,14 +1,23 @@
 ;;======================================================================
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 ;;======================================================================
 
 ;;======================================================================
 ;; Tests
 ;;======================================================================
@@ -31,10 +40,12 @@
 (include "common_records.scm")
 (include "key_records.scm")
 (include "db_records.scm")
 (include "run_records.scm")
 (include "test_records.scm")
+(include "js-path.scm")
+
 
 ;; Call this one to do all the work and get a standardized list of tests
 ;;   gets paths from configs and finds valid tests 
 ;;   returns hash of testname --> fullpath
 ;;
@@ -61,21 +72,28 @@
 (define (tests:get-valid-tests test-registry tests-paths)
   (if (null? tests-paths) 
       test-registry
       (let loop ((hed (car tests-paths))
 		 (tal (cdr tests-paths)))
-	(if (file-exists? hed)
+	(if (common:file-exists? hed)
 	    (for-each (lambda (test-path)
 			(let* ((tname   (last (string-split test-path "/")))
 			       (tconfig (conc test-path "/testconfig")))
 			  (if (and (not (hash-table-ref/default test-registry tname #f))
-				   (file-exists? tconfig))
+				   (common:file-exists? tconfig))
 			      (hash-table-set! test-registry tname test-path))))
 		      (glob (conc hed "/*"))))
 	(if (null? tal)
 	    test-registry
 	    (loop (car tal)(cdr tal))))))
+
+(define (tests:filter-test-names-not-matched test-names test-patts)
+  (delete-duplicates
+   (filter (lambda (testname)
+	     (not (tests:match test-patts testname #f)))
+	   test-names)))
+
 
 (define (tests:filter-test-names test-names test-patts)
   (delete-duplicates
    (filter (lambda (testname)
 	     (tests:match test-patts testname #f))
@@ -146,11 +164,11 @@
 
 
 ;; returns waitons waitors tconfigdat
 ;;
 (define (tests:get-waitons test-name all-tests-registry)
-   (let* ((config  (tests:get-testconfig test-name #f all-tests-registry 'return-procs)))
+   (let* ((config  (tests:get-testconfig test-name #f all-tests-registry 'return-procs))) ;; assuming no problems with immediate evaluation, this could be simplified ('return-procs -> #t)
      (let ((instr (if config 
 		      (config-lookup config "requirements" "waiton")
 		      (begin ;; No config means this is a non-existant test
 			(debug:print-error 0 *default-log-port* "non-existent required test \"" test-name "\"")
 			(exit 1))))
@@ -205,27 +223,54 @@
 ;;                                  mode itemwait
 ;;                                  # trim off the cell to determine what to run for genlib
 ;;                                  itemmap /.*
 ;;
 ;;                                  waiting-test is waiting on waiton-test so we need to create a pattern for waiton-test given waiting-test and itemmap
-(define (tests:extend-test-patts test-patt waiting-test waiton-test itemmaps)
-  (let* ((itemmap          (tests:lookup-itemmap itemmaps waiton-test))
-	 (patts            (string-split test-patt ","))
-	 (waiting-test-len (+ (string-length waiting-test) 1))
-	 (patts-waiton     (map (lambda (x)  ;; for each incoming patt that matches the waiting test
-				  (let* ((modpatt (if itemmap (db:convert-test-itempath x itemmap) x)) 
-					 (newpatt (conc waiton-test "/" (substring modpatt waiting-test-len (string-length modpatt)))))
-				    ;; (conc waiting-test "/," waiting-test "/" (substring modpatt waiton-test-len (string-length modpatt)))))
-				    ;; (print "in map, x=" x ", newpatt=" newpatt)
-				    newpatt))
-				(filter (lambda (x)
-					  (eq? (substring-index (conc waiting-test "/") x) 0)) ;; is this patt pertinent to the waiting test
-					patts))))
-    (string-intersperse (delete-duplicates (append patts (if (null? patts-waiton)
-							     (list (conc waiton-test "/%")) ;; really shouldn't add the waiton forcefully like this
-							     patts-waiton)))
-			",")))
+;; BB> (tests:extend-test-patts "normal-second/2" "normal-second" "normal-first" '())
+;; observed -> "normal-first/2,normal-first/,normal-second/2,normal-second/"
+;; expected -> "normal-first,normal-second/2,normal-second/"
+;; testpatt = normal-second/2
+;; waiting-test = normal-second
+;; waiton-test = normal-first
+;; itemmaps = ()
+
+(define (tests:extend-test-patts test-patt waiting-test waiton-test itemmaps itemized-waiton)
+  (cond
+   (itemized-waiton
+    (let* ((itemmap          (tests:lookup-itemmap itemmaps waiton-test))
+           (patts            (string-split test-patt ","))
+           (waiting-test-len (+ (string-length waiting-test) 1))
+           (patts-waiton     (map (lambda (x)  ;; for each incoming patt that matches the waiting test
+                                    (let* ((modpatt (if itemmap (db:convert-test-itempath x itemmap) x)) 
+                                           (newpatt (conc waiton-test "/" (substring modpatt waiting-test-len (string-length modpatt)))))
+                                      ;; (conc waiting-test "/," waiting-test "/" (substring modpatt waiton-test-len (string-length modpatt)))))
+                                      ;; (print "in map, x=" x ", newpatt=" newpatt)
+                                      newpatt))
+                                  (filter (lambda (x)
+                                            (eq? (substring-index (conc waiting-test "/") x) 0)) ;; is this patt pertinent to the waiting test
+                                          patts)))
+           (extended-test-patt   (append patts (if (null? patts-waiton)
+                                                   (list (conc waiton-test "/%")) ;; really shouldn't add the waiton forcefully like this
+                                                   patts-waiton)))
+           (extended-test-patt-with-toplevels
+            (fold (lambda (testpatt-item accum )
+                    (let ((my-match (string-match "^([^%\\/]+)\\/.+$" testpatt-item)))
+                      (cons testpatt-item
+                            (if my-match
+                                (cons
+                                 (conc (cadr my-match) "/")
+                                 accum)
+                                accum))))
+                  '()
+                  extended-test-patt)))
+      (string-intersperse (delete-duplicates extended-test-patt-with-toplevels) ",")))
+   (else ;; not waiting on items, waiting on entire waiton test.
+    (let* ((patts (string-split test-patt ","))
+           (new-patts (if (member waiton-test patts)
+                          patts
+                          (cons waiton-test patts))))
+      (string-intersperse (delete-duplicates new-patts) ",")))))
 
 
   
 ;; tests:glob-like-match 
 (define (tests:glob-like-match patt str) 
@@ -305,11 +350,11 @@
 	  (db:test-get-rundir prev-testdat)) ;; )
 	 (waivers     (if testconfig (configf:section-vars testconfig "waivers") '()))
 	 (waiver-rx   (regexp "^(\\S+)\\s+(.*)$"))
 	 (diff-rule   "diff %file1% %file2%")
 	 (logpro-rule "diff %file1% %file2% | logpro %waivername%.logpro %waivername%.html"))
-    (if (not (file-exists? test-rundir))
+    (if (not (common:file-exists? test-rundir))
 	(begin
 	  (debug:print-error 0 *default-log-port* "test run directory is gone, cannot propagate waiver")
 	  #f)
 	(begin
 	  (push-directory test-rundir)
@@ -322,11 +367,11 @@
 				     (wparts      (if waiver (string-match waiver-rx waiver) #f))
 				     (waiver-rule (if wparts (cadr wparts)  #f))
 				     (waiver-glob (if wparts (caddr wparts) #f))
 				     (logpro-file (if waiver
 						      (let ((fname (conc hed ".logpro")))
-							(if (file-exists? fname)
+							(if (common:file-exists? fname)
 							    fname 
 							    (begin
 							      (debug:print 0 *default-log-port* "INFO: No logpro file " fname " falling back to diff")
 							      #f)))
 						      #f))
@@ -420,19 +465,19 @@
     ;;       (sqlite3:execute db "UPDATE tests SET first_warn=? WHERE run_id=? AND testname=? AND item_path=?;" val run-id test-name item-path)))
 
     (let ((category (hash-table-ref/default otherdat ":category" ""))
 	  (variable (hash-table-ref/default otherdat ":variable" ""))
 	  (value    (hash-table-ref/default otherdat ":value"    #f))
-	  (expected (hash-table-ref/default otherdat ":expected" #f))
-	  (tol      (hash-table-ref/default otherdat ":tol"      #f))
+	  (expected (hash-table-ref/default otherdat ":expected" "n/a"))
+	  (tol      (hash-table-ref/default otherdat ":tol"      "n/a"))
 	  (units    (hash-table-ref/default otherdat ":units"    ""))
 	  (type     (hash-table-ref/default otherdat ":type"     ""))
 	  (dcomment (hash-table-ref/default otherdat ":comment"  "")))
       (debug:print 4 *default-log-port* 
 		   "category: " category ", variable: " variable ", value: " value
 		   ", expected: " expected ", tol: " tol ", units: " units)
-      (if (and value expected tol) ;; all three required
+      (if (and value) ;; require only value; BB was- all three required
 	  (let ((dat (conc category ","
 			   variable ","
 			   value    ","
 			   expected ","
 			   tol      ","
@@ -439,11 +484,13 @@
 			   units    ","
 			   dcomment ",," ;; extra comma for status
 			   type     )))
 	    ;; This was run remote, don't think that makes sense. Perhaps not, but that is the easiest path for the moment.
 	    (rmt:csv->test-data run-id test-id
-				dat))))
+				dat)
+            (thread-sleep! 10) ;; add 10 second delay before quit incase rmt needs time to start a server.
+            )))
       
     ;; need to update the top test record if PASS or FAIL and this is a subtest
     ;;;;;; (if (not (equal? item-path ""))
     ;;;;;;     (rmt:set-state-status-and-roll-up-items run-id test-name item-path state status #f) ;;;;;)
 
@@ -581,13 +628,18 @@
 .HandCursorStyle { cursor: pointer; cursor: hand; }  /* For IE */
 th {background-color: #8c8c8c;}
 td.test {background-color: #d9dbdd;}
 td.PASS {background-color: #347533;}
 td.FAIL {background-color: #cc2812;}
+td.SKIP{background-color: #FFD733;}
+td.WARN {background-color: #EA8724;}
+td.WAIVED {background-color: #838A12;}
+td.ABORT{background-color: #EA24B7;}
+.PASS .link, .SKIP .link, .WARN .link,.WAIVED .link,.ABORT .link, .FAIL .link{color: #FFFFFF;}
 
-  
-  
+
+
 
 
   
 EOF
 )
 
+(define tests:css-jscript-block-dynamic 
+#< 
+EOF
+)
+
+(define  (test:js-block javascript-lib)
+   (conc  "" ))
+
+
+(define tests:css-jscript-block-static (test:js-block *java-script-lib*))
+
+(define (tests:css-jscript-block-cond dynamic) 
+      (if (equal? dynamic  #t)
+       tests:css-jscript-block-dynamic
+       tests:css-jscript-block-static))
+
+       
 (define (tests:run-record->test-path run numkeys)
    (append (take (vector->list run) numkeys)
 	   (list (vector-ref run (+ 1 numkeys)))))
 
 
@@ -709,57 +779,37 @@
                (hash-table-set!  (hash-table-ref/default (hash-table-ref/default resh test-name  #f) test-item #f) run-id (list test-status test-html-path)))) 
         test-data)))
       runs)
    resh))
 
-;; (tests:create-html-tree "test-index.html")
+
+;; tests:genrate dashboard body 
 ;;
-(define (tests:create-html-tree outf)
-   (let* ((lockfile  (conc outf ".lock"))
-	 (runs-to-process '())
-         (linktree  (common:get-linktree))
-          (area-name (common:get-testsuite-name))
-	  (keys      (rmt:get-keys))
-	  (numkeys   (length keys))
-         (total-runs  (rmt:get-num-runs "%"))
-         (pg-size 10)   )
-    (if (common:simple-file-lock lockfile)
-        (begin
-         (print total-runs)    
-        (let loop ((page 0))
-	(let* ((oup       (open-output-file (or outf (conc linktree "/page" page ".html"))))
-               (start (* page pg-size)) 
-	       (runsdat   (rmt:get-runs "%" pg-size start (map (lambda (x)(list x "%")) keys)))
+
+(define (tests:dashboard-body page pg-size keys numkeys  total-runs linktree area-name get-prev-links get-next-links flag run-patt target-patt)
+  (let* ((start (* page pg-size)) 
+	       ;(runsdat   (rmt:get-runs "%" pg-size start (map (lambda (x)(list x "%")) keys)))
+         (runsdat   (rmt:get-runs-by-patt  keys run-patt target-patt start pg-size #f 0 sort-order: "desc"))
+                    ; db:get-runs-by-patt   keys runnamepatt targpatt offset limit fields last-update   
 	       (header    (vector-ref runsdat 0))
 	       (runs      (vector-ref runsdat 1))
-               (ctr 0)
-               (test-runs-hash (tests:get-rest-data runs header numkeys))
-               (test-list (hash-table-keys test-runs-hash))
-               (get-prev-links (lambda (page linktree )   
-                            (let* ((link  (if (not (eq? page 0))
-                                            (s:a "<<prev" 'href (conc  linktree "/page" (- page 1) ".html"))
-                                            (s:a "" 'href (conc  linktree "/page"  page ".html")))))
-                               link)))
-                (get-next-links (lambda (page linktree total-runs)   
-                            (let* ((link  (if (> total-runs (+ 1 (* page pg-size)))
-                                            (s:a "next>>" 'href (conc  linktree "/page"  (+ page 1) ".html"))
-                                             (s:a "" 'href (conc  linktree "/page" page  ".html")))))
-                               link))))
-	  (s:output-new
-	   oup
-	   (s:html tests:css-jscript-block
+         (ctr 0)
+         (test-runs-hash (tests:get-rest-data runs header numkeys))
+         (test-list (hash-table-keys test-runs-hash))) 
+  
+  (s:html tests:css-jscript-block (tests:css-jscript-block-cond flag)
 		   (s:title "Summary for " area-name)
 		   (s:body 'onload "addEvents();"
                           (get-prev-links page linktree)
                           (get-next-links page linktree total-runs)
                            
 			   (s:h1 "Summary for " area-name)
                            (s:h3 "Filter" )
                            (s:input 'type "text"  'name "testname" 'id "testname" 'length "30" 'onkeyup "filtersome()")
-  
 			   ;; top list
-			   (s:table 'id "LinkedList1" 'border "1"
+         
+			   (s:table 'id "LinkedList1" 'border "1" 'cellspacing 0
                             (map (lambda (key)
 				 (let* ((res (s:tr 'class "something" 
 				  (s:th key )
                                    (map (lambda (run)
                                    (s:th  (vector-ref run ctr)))
@@ -768,11 +818,11 @@
                                res))
                                keys)
                                (s:tr
 				 (s:th "Run Name")
                                   (map (lambda (run)
-                                   (s:th  (vector-ref run 3)))
+                                   (s:th (db:get-value-by-header run header "runname")))
                                   runs))
                               
                                (map (lambda (test-name)
                                  (let* ((item-hash (hash-table-ref/default test-runs-hash test-name  #f))
                                          (item-keys (sort (hash-table-keys item-hash) string<=?))) 
@@ -781,33 +831,342 @@
 				                         (s:td  item-name 'class "test" )
                                                            (map (lambda (run)
                                                                (let* ((run-test (hash-table-ref/default item-hash item-name  #f))
                                                                       (run-id (db:get-value-by-header run header "id"))
                                                                       (result (hash-table-ref/default run-test run-id "n/a"))
+                                                                      ;(relative-path (get-relative-path)) 
                                                                       (status (if (string? result)
-                                                                                 (begin 
-                                                                                  ; (print "string" result)
-                                                                                     result)
-                                                                                 (begin 
-                                                                                   ;  (print "not string" result )
-                                                                                 (car result)))))
-                                                                       (s:td  status 'class status)))
+									                                                            	result
+										                                                            (car result)))
+                                                                        (link (if (string? result)
+										                                                            result
+                                                                                (if (equal? flag #t) 
+                                                                                (s:a (car result) 'href (conc "./test_log?runid=" run-id "&testname="  item-name ))
+  																																						  (s:a (car result) 'href (string-substitute  (conc linktree "/")  "" (cadr result)  "-"))))))
+                                                                       (s:td  link 'class status)))
                                                                 runs))))
                                                         res))
                                                    item-keys)))
-                               test-list)))))
+                               test-list)))))) 
+
+;; (tests:create-html-tree "test-index.html")
+;;
+(define (tests:create-html-tree outf)
+   (let* ((lockfile  (conc outf ".lock"))
+	 			 (runs-to-process '())
+         (linktree  (common:get-linktree))
+         (area-name (common:get-testsuite-name))
+	  		 (keys      (rmt:get-keys))
+	  		 (numkeys   (length keys))
+         (run-patt (or (args:get-arg "-run-patt")
+                        (args:get-arg "-runname")
+                        "%"))
+         (target (or  (args:get-arg "-target-patt") 
+											(args:get-arg "-target")
+                      "%"))
+         (targlist (string-split target "/"))
+         (numtarg  (length targlist))  
+         (targtweaked (if (> numkeys numtarg)
+			   								(append targlist (make-list (- numkeys numtarg) "%"))
+			  								targlist))
+         (target-patt (string-join targtweaked "/"))
+         ;(total-runs  (rmt:get-num-runs "%")) ;;this needs to be changed to filter by target
+          (total-runs (rmt:get-runs-cnt-by-patt run-patt target-patt keys )) 
+         (pg-size 10))
+    (if (common:simple-file-lock lockfile)
+        (begin
+         ;(print total-runs)    
+        (let loop ((page 0))
+	(let* ((oup       (open-output-file (or outf (conc linktree "/page" page ".html"))))
+               (get-prev-links (lambda (page linktree )   
+                            (let* ((link  (if (not (eq? page 0))
+                                   (s:a "<<prev" 'href (conc  "page" (- page 1) ".html"))
+                                   (s:a "" 'href (conc   "page"  page ".html")))))
+                               link)))
+               (get-next-links (lambda (page linktree total-runs)   
+                            (let* ((link  (if (> total-runs (+ 10 (* page pg-size)))
+                                   (s:a "next>>" 'href (conc  "page"  (+ page 1) ".html"))
+                                   (s:a "" 'href (conc   "page" page  ".html")))))
+                               link))) )
+          (print "total runs: " total-runs) 
+          (s:output-new
+	   			 oup
+	   					(tests:dashboard-body page pg-size keys numkeys total-runs linktree area-name get-prev-links get-next-links #f run-patt target-patt)) ;; update this function
           (close-output-port oup)
          ; (set! page (+ 1 page))
           (if (> total-runs (* (+ 1 page) pg-size))
            (loop (+ 1  page)))))
 	  (common:simple-file-release-lock lockfile))
 	            
 	#f)))
 
 
+(define (tests:readlines filename)
+  (call-with-input-file filename
+    (lambda (p)
+      (let loop ((line (read-line p))
+                 (result '()))
+        (if (eof-object? line)
+            (reverse result)
+            (loop (read-line p) (cons line result)))))))
+
+(define (tests:get-test-log run-id test-name item-name)
+  (let* ((test-data    (rmt:get-tests-for-run
+				   (string->number run-id)
+                                    test-name      ;; testnamepatt
+				   '()        ;; states
+				   '()        ;; statuses
+				   #f         ;; offset
+				   #f         ;; num-to-get
+				   #f         ;; hide/not-hide
+				   #f         ;; sort-by
+				   #f         ;; sort-order
+				   #f         ;; 'shortlist                           ;; qrytype
+                                   0         ;; last update
+				   #f))
+         (path "")
+         (found 0))
+    (debug:print-info 0 *default-log-port* "found: " found )
+
+   (let loop ((hed (car test-data))
+		 (tal (cdr test-data)))
+          (debug:print-info 0 *default-log-port* "item: " (vector-ref hed 11) (vector-ref hed 10) "/" (vector-ref hed 13))
+
+	(if (equal? (vector-ref hed 11) item-name)
+            (begin
+              (set! found 1) 
+	      (set! path (conc (vector-ref hed 10) "/" (vector-ref hed 13)))))
+	    (if (and (not (null? tal)) (equal? found 0))
+		(loop (car tal)(cdr tal))))
+   (if (equal? path "")
+     "
      Data not found
      "
+     (string-join (tests:readlines path) "\n"))))
+
+
+(define (tests:dynamic-dboard page)
+;(define (tests:create-html-tree o)
+ (let* (
+;(page "1")
+          (linktree  (common:get-linktree))
+         (area-name (common:get-testsuite-name))
+	       (keys      (rmt:get-keys))
+	       (numkeys   (length keys))
+         (targtweaked (make-list numkeys "%"))
+         (target-patt (string-join targtweaked "/"))
+         (total-runs  (rmt:get-num-runs "%"))
+         (pg-size 10)
+         (pg (if (equal? page #f)
+                 0
+                 (- (string->number page) 1)))
+          (get-prev-links  (lambda (pg linktree)
+                           (debug:print-info 0 *default-log-port* "val: " (- 1 pg))
+                          (let* ((link  (if (not (eq? pg 0))
+                               (s:a  "<<prev " 'href (conc  "dashboard?page="  pg  ))
+                               (s:a "" 'href (conc  "dashboard?page=" pg)))))
+                               link)))
+          (get-next-links   (lambda (pg linktree total-runs)  
+                            (debug:print-info 0 *default-log-port* "val: " pg)
+                             (debug:print-info 0 *default-log-port* "val: " total-runs " size" pg-size)
+ 
+                            (let* ((link  (if (> total-runs (+ 10 (* pg pg-size)))
+                              (s:a  "next>> "  'href (conc  "dashboard?page="  (+ pg 2)  ))
+                             (s:a "" 'href (conc  "dashboard?page=" pg  )))))
+                             link)))
+         (html-body (tests:dashboard-body pg pg-size keys numkeys total-runs linktree area-name get-prev-links get-next-links #t "%" target-patt))) ;; update tis function
+        html-body))
+
+(define (tests:create-html-summary outf)
+ (let* ((lockfile  (conc outf ".lock"))
+        (linktree  (common:get-linktree))
+				(keys      (rmt:get-keys))
+        (area-name (common:get-testsuite-name))
+        (run-patt (or (args:get-arg "-run-patt")
+                        (args:get-arg "-runname")
+                        "%"))
+        (target (or (args:get-arg "-target-patt")
+                        (args:get-arg "-target")
+                        "%"))
+         (targlist (string-split target "/"))
+         (numkeys  (length keys))
+	       (numtarg  (length targlist))  
+         (targtweaked (if (> numkeys numtarg)
+			   								(append targlist (make-list (- numkeys numtarg) "%"))
+			  								targlist))
+        (target-patt (string-join targtweaked "/")))
+    (if (common:simple-file-lock lockfile)
+        (begin
+          (let* (;(runsdat1   (rmt:get-runs run-patt #f #f (map (lambda (x)(list x "%")) keys)))
+                 (runsdat   (rmt:get-runs-by-patt  keys run-patt target-patt #f #f #f 0))
+					       (runs      (vector-ref runsdat 1))
+                 (header      (vector-ref runsdat 0))
+        	       (oup       (open-output-file (or outf (conc linktree "/targets.html"))))
+                 (target-hash (test:create-target-hash runs header (length keys))))
+           (test:create-target-html target-hash oup area-name linktree)
+          (test:create-run-html  runs area-name linktree (length keys) header))
+	  (common:simple-file-release-lock lockfile))
+	#f)))
+
+(define (test:get-test-hash test-data)
+	(let ((resh (make-hash-table)))
+    	(map (lambda (test)
+        (let* ((test-name (vector-ref test 2))
+               (test-html-path (if (file-exists? (conc (vector-ref test 10) "/test-summary.html"))
+																 (conc (vector-ref test 10) "/test-summary.html" )
+							 									 (conc (vector-ref test 10) "/" (vector-ref test 13))))
+               (test-item  (vector-ref test 11))
+               (test-status (vector-ref test 4)))
+               (if (not (hash-table-ref/default resh test-item  #f))
+                   (hash-table-set! resh test-item   (make-hash-table)))
+               (hash-table-set! (hash-table-ref/default resh test-item  #f) test-name (list test-status test-html-path)))) 
+        test-data)
+resh))
+
+(define (test:get-data->b-keys ordered-data a-keys)
+  (delete-duplicates
+   (sort (apply
+	  append
+	  (map (lambda (sub-key)
+		 (let ((subdat (hash-table-ref ordered-data sub-key)))
+		   (hash-table-keys subdat)))
+	       a-keys))
+	 string>=?)))
+
+
+(define (test:create-run-html runs area-name linktree numkeys header)
+  (map (lambda (run)
+		 (let* ((target (string-join (take (vector->list run) numkeys) "/"))
+						(run-name (db:get-value-by-header run header "runname"))
+            (run-time (seconds->work-week/day-time (db:get-value-by-header run header "event_time")))
+						(oup (if (file-exists? (conc linktree "/" target "/" run-name))
+                        (open-output-file (conc linktree "/" target "/" run-name "/run.html"))
+                         #f))
+            (run-id (db:get-value-by-header run header "id"))
+            (test-data    (rmt:get-tests-for-run
+				  								 run-id
+                           "%"       ;; testnamepatt
+				  								 '()        ;; states
+				   								 '()        ;; statuses
+				  								 	#f         ;; offset
+				  						 			#f         ;; num-to-get
+				   									#f         ;; hide/not-hide
+				  								  #f         ;; sort-by
+				   									#f         ;; sort-order
+				   									#f         ;; 'shortlist                           ;; qrytype
+                            0         ;; last update
+				  									#f))
+            (item-test-hash (test:get-test-hash test-data))
+            (items  (hash-table-keys item-test-hash))
+ 						(test-names (test:get-data->b-keys item-test-hash items)))
+    (if oup
+      (begin 
+     (s:output-new
+	   oup
+	   (s:html tests:css-jscript-block (tests:css-jscript-block-cond #f)
+		   (s:title "Runs View " run-name)
+		   (s:body
+		     (s:h1 "Runs View " )
+         (s:h3 "Target" target)
+				 (s:p 
+					(s:b "Run name" ) run-name)
+         (s:p 
+					(s:b "Run Date" ) run-time)
+         (s:table 'border 1 'cellspacing 0
+           (s:tr
+           (s:th "Items")
+           (map (lambda (test)
+            (s:th test))
+           test-names))  
+           (map (lambda (item) 
+					  (let* ((test-hash (hash-table-ref/default item-test-hash item  #f)))
+								 (if test-hash
+                  (begin
+									(s:tr
+					  			(s:td 'class "test" item)
+            			(map (lambda (test)
+						  		(let* ((test-details (hash-table-ref/default test-hash test  #f))
+												(status (if test-details
+																(car test-details)))
+                        (link (if test-details 
+														(string-substitute  (conc linktree "/" target "/" run-name "/")  "" (cadr test-details) "-"))))
+                   (if test-details
+											(s:td 'class status
+												(s:a 'class "link" 'href link status ))
+                      (s:td "")))) 			
+									test-names))))))
+				  (sort items string<=?))))))
+		(close-output-port oup))
+    (debug:print-info 0 "Skip: Dirctory structure " linktree "/" target "/" run-name " does not exist. Megatest will not create run.html"))))
+runs))
+
+(define (test:create-target-hash runs header numkeys)
+  (let ((resh (make-hash-table)))
+   (for-each
+     (lambda (run)
+        (let* ((run-name (db:get-value-by-header run header "runname"))
+               (target   (string-join (take (vector->list run) numkeys) "/"))
+               (run-list (hash-table-ref/default resh target  #f)))
+               
+               (if (not run-list)
+                   (hash-table-set! resh target   (list run-name))
+                   (hash-table-set! resh target   (cons run-name run-list)))))
+      runs)
+   resh))
+
+(define (test:get-max-run-cnt target-hash targets)
+   (let* ((cnt 0 ))
+   (map (lambda (target)
+        (let* ((runs  (hash-table-ref/default target-hash target  #f))
+               (run-length (if runs
+																(length runs)
+                                 0)))
+  
+              (if (< cnt run-length)
+               (set! cnt  run-length)))) 
+		targets) 
+cnt))
+ 
+(define (test:pad-runs target-hash targets max-row-length)
+ (map (lambda (target)
+        (let loop ((run-list  (hash-table-ref/default target-hash target  #f)))
+               (if (< (length run-list) max-row-length)
+                 (begin  
+               		 (hash-table-set! target-hash target   (cons "" run-list))
+               		 (loop (hash-table-ref/default target-hash target  #f) ))))) 
+		targets)
+   target-hash)
 
+(define (test:create-target-html target-hash oup area-name linktree)
+  (let* ((targets (hash-table-keys target-hash))
+         (max-row-length (test:get-max-run-cnt target-hash targets))
+         (pad-runs-hash (test:pad-runs target-hash targets max-row-length)))
+   (s:output-new
+	   oup
+	   (s:html tests:css-jscript-block (tests:css-jscript-block-cond #f)
 
+		   (s:title "Target View " area-name)
+		   (s:body
+		   (s:h1 "Target View " area-name)
+					(s:table 'id "LinkedList1" 'border "1" 'cellspacing 0
+             (s:tr 'class "something" 
+               (s:th "Target")
+								(s:th 'colspan max-row-length "Runs"))                                              
+                (let* ((tbl (map (lambda (target)
+                      (s:tr
+                      (s:td 'class "test" target)
+										  (let* ((runs  (hash-table-ref/default target-hash target  #f))
+														 (rest-row (map (lambda (run)
+																				(if (equal? run "")
+																						(s:td run)
+                                            (if (file-exists?(conc linktree "/" target "/" run ))
+																						(begin 
+																							(s:td 
+																							(s:a 'href (conc  target "/" run "/run.html") run))))))
+																				(reverse runs))))
+                              rest-row)))
+                                   targets)))
+                           tbl)))))
+          (close-output-port oup)))
 
 
 (define (tests:create-html-tree-old outf)
    (let* ((lockfile  (conc outf ".lock"))
 	 (runs-to-process '()))
@@ -839,11 +1198,11 @@
 						      '()
 						      (lambda (x p)
 							(let* ((targ-path (string-intersperse p "/"))
                                                                (full-path (conc linktree "/" targ-path))
                                                                (run-name  (car (reverse p))))
-                                                          (if (and (file-exists? full-path)
+                                                          (if (and (common:file-exists? full-path)
                                                                    (directory?   full-path)
                                                                    (file-write-access? full-path))
                                                               (s:a run-name 'href (conc targ-path "/run-summary.html"))
                                                               (begin
                                                                 (debug:print 0 *default-log-port* "INFO: Can't create " targ-path "/run-summary.html")
@@ -878,11 +1237,11 @@
                                            path-parts))
                                        test-dats))
                     (tests-htree (common:list->htree tests-tree-dat))
                     (html-dir    (conc linktree "/" (string-intersperse run-dir "/")))
                     (html-path   (conc html-dir "/run-summary.html"))
-                    (oup         (if (and (file-exists? html-dir)
+                    (oup         (if (and (common:file-exists? html-dir)
                                           (directory?   html-dir)
                                           (file-write-access? html-dir))
                                      (open-output-file  html-path)
                                      #f)))
                ;; (print "run-dir: " run-dir ", tests-tree-dat: " tests-tree-dat)
@@ -906,21 +1265,21 @@
                                                                           (item-path ;; (if (> (length p) 2) ;; test-name + run-name
                                                                            (string-intersperse p "/"))
                                                                           (full-targ (conc html-dir "/" targ-path))
                                                                           (std-file  (conc full-targ "/test-summary.html"))
                                                                           (alt-file  (conc full-targ "/megatest-rollup-" test-name ".html"))
-                                                                          (html-file (if (file-exists? alt-file)
+                                                                          (html-file (if (common:file-exists? alt-file)
                                                                                          alt-file
                                                                                          std-file))
                                                                           (run-name  (car (reverse p))))
-                                                                     (if (and (not (file-exists? full-targ))
+                                                                     (if (and (not (common:file-exists? full-targ))
                                                                               (directory? full-targ)
                                                                               (file-write-access? full-targ))
                                                                          (tests:summarize-test 
                                                                           run-id 
                                                                           (rmt:get-test-id run-id test-name item-path)))
-                                                                     (if (file-exists? full-targ)
+                                                                     (if (common:file-exists? full-targ)
                                                                          (s:a run-name 'href html-file)
                                                                          (begin
                                                                            (debug:print 0 *default-log-port* "ERROR: can't access " full-targ)
                                                                            (conc "No summary for " run-name)))))
                                                                  ))))))
@@ -1075,11 +1434,11 @@
 			    (s:td "status")   (s:td (s:a 'href logf (s:font 'color color status))))
 		      (s:tr (s:td "TestDate") (s:td (seconds->work-week/day-time 
 						     (db:test-get-event_time test-dat)))
 			    (s:td "Duration") (s:td (seconds->hr-min-sec (db:test-get-run_duration test-dat)))))
 	     (s:h3 "Log files")
-	     (s:table
+	     (s:table 
 	      'cellspacing "0" 'border "1"
 	      (s:tr (s:td "Final log")(s:td (s:a 'href logf logf))))
 	     (s:table
 	      'cellspacing "0" 'border "1"
 	      (s:tr (s:td "Step Name")(s:td "Start")(s:td "End")(s:td "Status")(s:td "Duration")(s:td "Log File"))
@@ -1129,11 +1488,11 @@
 ;; Gather data from test/task specifications
 ;;======================================================================
 
 ;; (define (tests:get-valid-tests testsdir test-patts) ;;  #!key (test-names '()))
 ;;   (let ((tests (glob (conc testsdir "/tests/*")))) ;; " (string-translate patt "%" "*")))))
-;;     (set! tests (filter (lambda (test)(file-exists? (conc test "/testconfig"))) tests))
+;;     (set! tests (filter (lambda (test)(common:file-exists? (conc test "/testconfig"))) tests))
 ;;     (delete-duplicates
 ;;      (filter (lambda (testname)
 ;; 	       (tests:match test-patts testname #f))
 ;; 	     (map (lambda (testp)
 ;; 		    (last (string-split testp "/")))
@@ -1146,28 +1505,29 @@
 	   (getenv "MT_TEST_NAME")
 	   (getenv "MT_ITEMPATH"))
       (conc (getenv "MT_LINKTREE")  "/"
 	    (getenv "MT_TARGET")    "/"
 	    (getenv "MT_RUNNAME")   "/"
-	    (getenv "MT_TEST_NAME") "/"
-	    (if (or (getenv "MT_ITEMPATH")
-		    (not (string=? "" (getenv "MT_ITEMPATH"))))
-		(conc "/" (getenv "MT_ITEMPATH"))))
+	    (getenv "MT_TEST_NAME")
+	    (if (and (getenv "MT_ITEMPATH")
+                     (not (string=? "" (getenv "MT_ITEMPATH"))))
+		(conc "/" (getenv "MT_ITEMPATH"))
+                ""))
       #f))
 
 ;; 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))
+(define (tests:get-testconfig test-name item-path test-registry system-allowed #!key (force-create #f)(allow-write-cache #t))
   (let* ((use-cache    (common:use-cache?))
 	 (cache-path   (tests:get-test-path-from-environment))
 	 (cache-file   (and cache-path (conc cache-path "/.testconfig")))
 	 (cache-exists (and cache-file
 			    (not force-create)  ;; if force-create then pretend there is no cache to read
-			    (file-exists? cache-file)))
+			    (common:file-exists? cache-file)))
 	 (cached-dat   (if (and (not force-create)
 				cache-exists
 				use-cache)
 			   (handle-exceptions
 			    exn
@@ -1187,11 +1547,11 @@
 	      (let* ((treg         (or test-registry
 				       (tests:get-all)))
 		     (test-path    (or (hash-table-ref/default treg test-name #f)
 				       (conc *toppath* "/tests/" test-name)))
 		     (test-configf (conc test-path "/testconfig"))
-		     (testexists   (and (file-exists? test-configf)(file-read-access? test-configf)))
+		     (testexists   (and (common:file-exists? test-configf)(file-read-access? test-configf)))
 		     (tcfg         (if testexists
 				       (read-config test-configf #f system-allowed
 						    environ-patt: (if system-allowed
 								      "pre-launch-env-vars"
 								      #f))
@@ -1198,11 +1558,12 @@
 				       #f)))
 		(if (and tcfg cache-file) (hash-table-set! tcfg "have fulldata" #t)) ;; mark this as fully read data
 		(if tcfg (hash-table-set! *testconfigs* test-full-name tcfg))
 		(if (and testexists
 			 cache-file
-			 (file-write-access? cache-path))
+			 (file-write-access? cache-path)
+			 allow-write-cache)
 		    (let ((tpath (conc cache-path "/.testconfig")))
 		      (debug:print-info 1 *default-log-port* "Caching testconfig for " test-name " in " tpath)
                       (if (not (common:in-running-test?))
                           (configf:write-alist tcfg tpath))))
 		tcfg))))))
@@ -1356,11 +1717,11 @@
 ;;
 (define (tests:lazy-dot testrecords  outtype sizex sizey)
   (let ((dfile (conc "/tmp/." (current-user-name) "-" (server:mk-signature) ".dot"))
 	(fname (conc "/tmp/." (current-user-name) "-" (server:mk-signature) ".dotdat")))
     (tests:write-dot-file testrecords dfile sizex sizey)
-    (if (file-exists? fname)
+    (if (common:file-exists? fname)
 	(let ((res (with-input-from-file fname
 		     (lambda ()
 		       (read-lines)))))
 	  (system (conc "env -i PATH=$PATH dot -T " outtype " < " dfile " > " fname "&"))
 	  res)
@@ -1559,11 +1920,11 @@
 	   (tests:set-full-meta-info db test-id run-id minutes work-area (- remtries 1)))
 	 (let ((err-status ((condition-property-accessor 'sqlite3 'status #f) exn)))
 	   (debug:print-error 0 *default-log-port* "tried for over a minute to update meta info and failed. Giving up")
 	   (debug:print 0 *default-log-port* "EXCEPTION: database probably overloaded or unreadable.")
 	   (debug:print 0 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
-	   (print "exn=" (condition->list exn))
+	   (debug:print 5 *default-log-port* "exn=" (condition->list exn))
 	   (debug:print 0 *default-log-port* " status:  " ((condition-property-accessor 'sqlite3 'status) exn))
 	   (print-call-chain (current-error-port))))
      (tests:update-testdat-meta-info db test-id work-area cpuload diskfree minutes)
   )))
 	 

Index: tests/Makefile
==================================================================
--- tests/Makefile
+++ tests/Makefile
@@ -1,5 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 #
 # run some tests
 
 BINPATH   = $(shell readlink -m $(PWD)/../bin)
 MEGATEST  = $(BINPATH)/megatest
@@ -173,11 +189,11 @@
 	cd mintest;$(MEGATEST) -server - -debug $(DEBUG) > server.log 2> server.log & 
 	sleep 3
 	cd mintest;$(DASHBOARD) -rows 18 &
 
 cleanprep : ../*.scm Makefile */*.config build
-	mkdir -p fullrun/tmp/mt_runs fullrun/tmp/mt_links /tmp/$(USER)/adisk1
+	mkdir -p fullrun/tmp/mt_runs fullrun/tmp/mt_links /tmp/$(USER)/adisk1 fullrun/logs
 	rm -f */logging.db
 	touch cleanprep
 
 fullprep : cleanprep
 	cd fullrun;$(MEGATEST) -remove-runs :runname $(RUNNAME)% -target %/%/% -testpatt %/%

Index: tests/dep-tests/common.testconfig
==================================================================
--- tests/dep-tests/common.testconfig
+++ tests/dep-tests/common.testconfig
@@ -1,5 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 [ezsteps]
 delay    sleep $SPEED;echo "Delayed $SPEED seconds"
 
 # lookup table for waitons
 #

Index: tests/dep-tests/common_itemstable.testconfig
==================================================================
--- tests/dep-tests/common_itemstable.testconfig
+++ tests/dep-tests/common_itemstable.testconfig
@@ -1,4 +1,20 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 [itemstable]
 VIEW   layout layout layout schematic schematic schematic
 CELL   ntran  ptran  diode  ntran     ptran     diode
 

Index: tests/dep-tests/megatest.config
==================================================================
--- tests/dep-tests/megatest.config
+++ tests/dep-tests/megatest.config
@@ -1,5 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 [fields]
 # this field changes the dep tree 
 DEPS  TEXT
 
 # this field changes the test run time; 0 .. N or random

Index: tests/dep-tests/runconfigs.config
==================================================================
--- tests/dep-tests/runconfigs.config
+++ tests/dep-tests/runconfigs.config
@@ -1,5 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 [default]
 
 # [DEPS/SPEED]
 
 [simple/0]

Index: tests/dep-tests/tests/aggregate/testconfig
==================================================================
--- tests/dep-tests/tests/aggregate/testconfig
+++ tests/dep-tests/tests/aggregate/testconfig
@@ -1,4 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [include #{getenv MT_RUN_AREA_HOME}/common.testconfig]
 
 [requirements]
 waiton #{get #{getenv DEPS} aggregate}

Index: tests/dep-tests/tests/genlib/testconfig
==================================================================
--- tests/dep-tests/tests/genlib/testconfig
+++ tests/dep-tests/tests/genlib/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [include #{getenv MT_RUN_AREA_HOME}/common.testconfig]
 
 [itemstable]
 VIEWTYPE layout schematic
 

Index: tests/dep-tests/tests/results/testconfig
==================================================================
--- tests/dep-tests/tests/results/testconfig
+++ tests/dep-tests/tests/results/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [include #{getenv MT_RUN_AREA_HOME}/common.testconfig]
 
 [requirements]
 waiton #{get #{getenv DEPS} results}
 

Index: tests/dep-tests/tests/setup/testconfig
==================================================================
--- tests/dep-tests/tests/setup/testconfig
+++ tests/dep-tests/tests/setup/testconfig
@@ -1,2 +1,19 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [include #{getenv MT_RUN_AREA_HOME}/common.testconfig]
 

Index: tests/dep-tests/tests/test1/testconfig
==================================================================
--- tests/dep-tests/tests/test1/testconfig
+++ tests/dep-tests/tests/test1/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [include #{getenv MT_RUN_AREA_HOME}/common.testconfig]
 
 [include #{getenv MT_RUN_AREA_HOME}/common_itemstable.testconfig]
 
 [requirements]

Index: tests/dep-tests/tests/test2/testconfig
==================================================================
--- tests/dep-tests/tests/test2/testconfig
+++ tests/dep-tests/tests/test2/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [include #{getenv MT_RUN_AREA_HOME}/common.testconfig]
 
 [include #{getenv MT_RUN_AREA_HOME}/common_itemstable.testconfig]
 
 [requirements]

Index: tests/dynamic-waiton-example/common.testconfig
==================================================================
--- tests/dynamic-waiton-example/common.testconfig
+++ tests/dynamic-waiton-example/common.testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [ezsteps]
 delay    sleep $SPEED;echo "Delayed $SPEED seconds"
 
 [requirements]
 #{getenv WAITON_#{getenv MT_TEST_NAME}}

Index: tests/dynamic-waiton-example/common_itemstable.testconfig
==================================================================
--- tests/dynamic-waiton-example/common_itemstable.testconfig
+++ tests/dynamic-waiton-example/common_itemstable.testconfig
@@ -1,4 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [itemstable]
 VIEW   layout layout layout schematic schematic schematic
 CELL   ntran  ptran  diode  ntran     ptran     diode
 

Index: tests/dynamic-waiton-example/megatest.config
==================================================================
--- tests/dynamic-waiton-example/megatest.config
+++ tests/dynamic-waiton-example/megatest.config
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [fields]
 # this field changes the dep tree 
 DEPS  TEXT
 
 # this field changes the test run time; 0 .. N or random

Index: tests/dynamic-waiton-example/runconfigs.config
==================================================================
--- tests/dynamic-waiton-example/runconfigs.config
+++ tests/dynamic-waiton-example/runconfigs.config
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [default]
 WAITON_setup
 WAITON_genlib    waiton setup
 WAITON_test1     waiton genlib
 WAITON_aggregate waiton test1

Index: tests/dynamic-waiton-example/tests/aggregate/testconfig
==================================================================
--- tests/dynamic-waiton-example/tests/aggregate/testconfig
+++ tests/dynamic-waiton-example/tests/aggregate/testconfig
@@ -1,2 +1,19 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [include #{getenv MT_RUN_AREA_HOME}/common.testconfig]
 

Index: tests/dynamic-waiton-example/tests/genlib/testconfig
==================================================================
--- tests/dynamic-waiton-example/tests/genlib/testconfig
+++ tests/dynamic-waiton-example/tests/genlib/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [include #{getenv MT_RUN_AREA_HOME}/common.testconfig]
 
 [itemstable]
 VIEWTYPE layout schematic
 

Index: tests/dynamic-waiton-example/tests/results/testconfig
==================================================================
--- tests/dynamic-waiton-example/tests/results/testconfig
+++ tests/dynamic-waiton-example/tests/results/testconfig
@@ -1,2 +1,19 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [include #{getenv MT_RUN_AREA_HOME}/common.testconfig]
 

Index: tests/dynamic-waiton-example/tests/setup/testconfig
==================================================================
--- tests/dynamic-waiton-example/tests/setup/testconfig
+++ tests/dynamic-waiton-example/tests/setup/testconfig
@@ -1,2 +1,19 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [include #{getenv MT_RUN_AREA_HOME}/common.testconfig]
 

Index: tests/dynamic-waiton-example/tests/test1/testconfig
==================================================================
--- tests/dynamic-waiton-example/tests/test1/testconfig
+++ tests/dynamic-waiton-example/tests/test1/testconfig
@@ -1,3 +1,20 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [include #{getenv MT_RUN_AREA_HOME}/common.testconfig]
 
 [include #{getenv MT_RUN_AREA_HOME}/common_itemstable.testconfig]

Index: tests/dynamic-waiton-example/tests/test2/testconfig
==================================================================
--- tests/dynamic-waiton-example/tests/test2/testconfig
+++ tests/dynamic-waiton-example/tests/test2/testconfig
@@ -1,3 +1,20 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [include #{getenv MT_RUN_AREA_HOME}/common.testconfig]
 
 [include #{getenv MT_RUN_AREA_HOME}/common_itemstable.testconfig]

Index: tests/fdktestqa/fdk.config
==================================================================
--- tests/fdktestqa/fdk.config
+++ tests/fdktestqa/fdk.config
@@ -1,36 +1,45 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [fields]
 SYSTEM TEXT
 RELEASE TEXT
 
 [setup]
 # Adjust max_concurrent_jobs to limit how much you load your machines
 # max_concurrent_jobs 150
-max_concurrent_jobs 1000
+max_concurrent_jobs 3000
 
 # This is your link path, you can move it but it is generally better to keep it stable
 linktree #{shell readlink -f #{getenv MT_RUN_AREA_HOME}/../simplelinks}
 
 [include testqa/configs/megatest.abc.config]
 
-# timeout 0.025
-
 [jobtools]
 maxload 4
-launcher nbfake
+# launcher smartlauncher --cores 1 --memory 1
+launcher nbjob run --target pdx_soft --class 'SLES11&&1C&&1G' --qslot /icf/fdk/soft 
+# launcher bsub -q priority -o $MT_TEST_RUN_DIR/openlava.log 
 
 [server]
 # timeout 0.01
 # homehost xena
 # homehost 143.182.225.38
-
 # force server
-server-query-threshold 0
-
-
-[jobtools]
-# launcher nbq -P ch_vp -C SLES11_EM64T_4G -Q /ciaf/fdk
-launcher nbfake
-maxload 4
-
-# launcher bsub -q priority -o $MT_TEST_RUN_DIR/openlava.log 
+# server-query-threshold 0
+
 

Index: tests/fdktestqa/testqa/Makefile
==================================================================
--- tests/fdktestqa/testqa/Makefile
+++ tests/fdktestqa/testqa/Makefile
@@ -1,24 +1,42 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 BINDIR    = $(PWD)/../../../bin
 PATH     := $(BINDIR):$(PATH)
 MEGATEST  = $(BINDIR)/megatest
 DASHBOARD = $(BINDIR)/dashboard
 NEWDASHBOARD = $(BINDIR)/newdashboard
 RUNNAME   = a
 NUMTESTS  = 20
+SUBTARG = b
 
 all :
 	$(MEGATEST) -remove-runs -target a/b -runname c -testpatt %/%
 	$(MEGATEST) -run -testpatt % -target a/b -runname c
 
 bigbig :
 	for tn in a b c d;do \
-	   ($(MEGATEST) -run -testpatt % -target a/b -runname $tn & ) ; \
+	   (NUMTESTS=1000 $(MEGATEST) -run -testpatt % -target a/$(SUBTARG) -runname $$tn & ) ; \
 	done
 
 waitonpatt :
-	megatest -remove-runs -runname waitonpatt -target a/b -testpatt %
+	megatest -remove-runs -runname waitonpatt -target a/$(SUBTARG) -testpatt %
 	NUMTESTS=15 megatest -run -target a/b -runname waitonpatt -testpatt bigrun3/%8
 
 waitonall :
 	megatest -remove-runs -runname waitonall -target a/b -testpatt %
 	NUMTESTS=20 megatest -run -target a/b -runname waitonall -testpatt alltop

Index: tests/fdktestqa/testqa/README
==================================================================
--- tests/fdktestqa/testqa/README
+++ tests/fdktestqa/testqa/README
@@ -1,1 +1,18 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 set NUMTESTS to set the number of tests that will be run. A small number (say 20) illustrates itemwait well.

Index: tests/fdktestqa/testqa/configs/megatest.abc.config
==================================================================
--- tests/fdktestqa/testqa/configs/megatest.abc.config
+++ tests/fdktestqa/testqa/configs/megatest.abc.config
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Valid values for state and status for steps, NB// It is not recommended you use this
 [validvalues]
 state start end completed
 
 # Job tools are more advanced ways to control how your jobs are launched

Index: tests/fdktestqa/testqa/configs/megatest.def.config
==================================================================
--- tests/fdktestqa/testqa/configs/megatest.def.config
+++ tests/fdktestqa/testqa/configs/megatest.def.config
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # 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

Index: tests/fdktestqa/testqa/local.config.example
==================================================================
--- tests/fdktestqa/testqa/local.config.example
+++ tests/fdktestqa/testqa/local.config.example
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [host-types]
 general #MTLOWESTLOAD xena zeus
 
 [jobtools]
 launcher nbfake

Index: tests/fdktestqa/testqa/megatest.config
==================================================================
--- tests/fdktestqa/testqa/megatest.config
+++ tests/fdktestqa/testqa/megatest.config
@@ -1,12 +1,35 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [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.1
 launch-delay 0
 
+[jobtools]
+maxhomehostload 4
+
 [server]
-runtime 180
+# runtime 180
+# timeout is in hours, this is how long the server will stay alive when not being used.
+# timeout 0.1
 
 # All these are overridden in ../fdk.config
 # [jobtools]
 # launcher nbfake
 # launcher bsub -q priority -o $MT_TEST_RUN_DIR/openlava.log 

Index: tests/fdktestqa/testqa/runconfigs.config
==================================================================
--- tests/fdktestqa/testqa/runconfigs.config
+++ tests/fdktestqa/testqa/runconfigs.config
@@ -1,5 +1,24 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+[include local.runconfigs]
+
 [default]
 ALLTESTS see this variable
 
 # Your variables here are grouped by targets [SYSTEM/RELEASE]
 [SYSTEM_val/RELEASE_val]

Index: tests/fdktestqa/testqa/runsuite.sh
==================================================================
--- tests/fdktestqa/testqa/runsuite.sh
+++ tests/fdktestqa/testqa/runsuite.sh
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # (cd ../../..;make && make install) || exit 1
 # export PATH=$PWD/../../../bin:$PATH
 
 for i in a b c d e f;do
   # g h i j k l m n o p q r s t u v w x y z;do

Index: tests/fdktestqa/testqa/tests/alltop/testconfig
==================================================================
--- tests/fdktestqa/testqa/tests/alltop/testconfig
+++ tests/fdktestqa/testqa/tests/alltop/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add additional steps here. Format is "stepname script"
 [vars]
 step1var step1.sh
 
 [ezsteps]

Index: tests/fdktestqa/testqa/tests/bigrun/step1.sh
==================================================================
--- tests/fdktestqa/testqa/tests/bigrun/step1.sh
+++ tests/fdktestqa/testqa/tests/bigrun/step1.sh
@@ -1,9 +1,26 @@
 #!/bin/bash
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 if [ $NUMBER -lt 10 ];then 
    sleep 20
-   sleep `echo 4 * $NUMBER | bc`
+   sleep `echo 4 \* $NUMBER | bc`
 else
    sleep 130
 fi
 
 if [[ $RANDOM -lt 10000 ]];then

Index: tests/fdktestqa/testqa/tests/bigrun/testconfig
==================================================================
--- tests/fdktestqa/testqa/tests/bigrun/testconfig
+++ tests/fdktestqa/testqa/tests/bigrun/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add additional steps here. Format is "stepname script"
 [vars]
 step1var step1.sh
 
 [ezsteps]

Index: tests/fdktestqa/testqa/tests/bigrun2/step1.sh
==================================================================
--- tests/fdktestqa/testqa/tests/bigrun2/step1.sh
+++ tests/fdktestqa/testqa/tests/bigrun2/step1.sh
@@ -3,7 +3,24 @@
 # if [ -e $prev_test/testconfig ]; then
 #   exit 0
 # else
 #   exit 1
 # fi
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 
 exit 0

Index: tests/fdktestqa/testqa/tests/bigrun2/testconfig
==================================================================
--- tests/fdktestqa/testqa/tests/bigrun2/testconfig
+++ tests/fdktestqa/testqa/tests/bigrun2/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add additional steps here. Format is "stepname script"
 [ezsteps]
 step1 step1.sh
 
 # Test requirements are specified here
@@ -9,11 +26,11 @@
 mode itemwait
 itemmap .*/
 
 # Iteration for your tests are controlled by the items section
 [items]
-NUMBER #{scheme (string-intersperse (map (lambda (x)(conc "blah/" x)) \
+NUMBER #{scheme (string-intersperse (map (lambda (x)(conc (if (getenv "USEBLAH") "blah/" "") x)) \
                                          (map number->string (sort (let loop ((a 0)(res '())) \
                                                                         (if (<= a (or (any->number (get-environment-variable "NUMTESTS")) 2500)) \
                                                                             (loop (+ a 1)(cons a res)) res)) <))) " ")}
 
 

Index: tests/fdktestqa/testqa/tests/bigrun3/step1.sh
==================================================================
--- tests/fdktestqa/testqa/tests/bigrun3/step1.sh
+++ tests/fdktestqa/testqa/tests/bigrun3/step1.sh
@@ -3,7 +3,24 @@
 # if [ -e $prev_test/testconfig ]; then
 #   exit 0
 # else
 #   exit 1
 # fi
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 
 exit 0

Index: tests/fdktestqa/testqa/tests/bigrun3/testconfig
==================================================================
--- tests/fdktestqa/testqa/tests/bigrun3/testconfig
+++ tests/fdktestqa/testqa/tests/bigrun3/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add additional steps here. Format is "stepname script"
 [ezsteps]
 step1 step1.sh
 
 # Test requirements are specified here

Index: tests/fixpath.csh
==================================================================
--- tests/fixpath.csh
+++ tests/fixpath.csh
@@ -1,1 +1,17 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 setenv PATH `readlink -f ../bin`:$PATH

Index: tests/fixpath.sh
==================================================================
--- tests/fixpath.sh
+++ tests/fixpath.sh
@@ -1,1 +1,18 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 export PATH=$(readlink -f ../bin):$PATH

DELETED tests/fslsync/megatest.config
Index: tests/fslsync/megatest.config
==================================================================
--- tests/fslsync/megatest.config
+++ /dev/null
@@ -1,20 +0,0 @@
-[fields]
-YEAR    TEXT
-WEEKNUM TEXT
-DAY     TEXT
-
-[setup]
-# Adjust max_concurrent_jobs to limit how much you load your machines
-max_concurrent_jobs 50
-
-# This is your link path, you can move it but it is generally better to keep it stable
-linktree #{shell readlink -f #{getenv MT_RUN_AREA_HOME}/fslsynclinks}
-
-# Job tools are more advanced ways to 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 #{shell readlink -f #{getenv MT_RUN_AREA_HOME}/fslsyncruns}

DELETED tests/fslsync/runconfigs.config
Index: tests/fslsync/runconfigs.config
==================================================================
--- tests/fslsync/runconfigs.config
+++ /dev/null
@@ -1,5 +0,0 @@
-[default]
-WORKAREA /tmp/#{getenv USER}/fslsync
-FSLSAREA /tmp/#{getenv USER}/fsls
-AREANAMES code data
-SITENAMES #{shell cat $MT_RUN_AREA_HOME/sites.dat}

DELETED tests/fslsync/sites.dat.template
Index: tests/fslsync/sites.dat.template
==================================================================
--- tests/fslsync/sites.dat.template
+++ /dev/null
@@ -1,1 +0,0 @@
-site1

DELETED tests/fslsync/tests/setup/mkdirs.logpro
Index: tests/fslsync/tests/setup/mkdirs.logpro
==================================================================
--- tests/fslsync/tests/setup/mkdirs.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "done" #/done/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/)) ;; but disallow any other errors

DELETED tests/fslsync/tests/setup/mkdirs.sh
Index: tests/fslsync/tests/setup/mkdirs.sh
==================================================================
--- tests/fslsync/tests/setup/mkdirs.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Create needed directories both local and remote
-
-# Remote
-ssh $SITENAME mkdir -vp $WORKAREA/$SITENAME/$AREANAME
-
-# Local
-mkdir -vp $WORKAREA/$SITENAME/$AREANAME
-
-echo done

DELETED tests/fslsync/tests/setup/seedcache.logpro
Index: tests/fslsync/tests/setup/seedcache.logpro
==================================================================
--- tests/fslsync/tests/setup/seedcache.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "done" #/done/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/)) ;; but disallow any other errors

DELETED tests/fslsync/tests/setup/seedcache.sh
Index: tests/fslsync/tests/setup/seedcache.sh
==================================================================
--- tests/fslsync/tests/setup/seedcache.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Copy any non-existant files to the cache before doing the rsync 
-# in the hopes of saving some time.
-
-echo done

DELETED tests/fslsync/tests/setup/testconfig
Index: tests/fslsync/tests/setup/testconfig
==================================================================
--- tests/fslsync/tests/setup/testconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-mkdirs     mkdirs.sh
-seedcache  seedcache.sh
-
-# Test requirements are specified here
-[requirements]
-priority 0
-
-# Iteration for your tests are controlled by the items section
-[items]
-AREANAME #{getenv AREANAMES}
-SITENAME #{getenv SITENAMES}
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Setup needed directories and seed the caches
-tags tagone,tagtwo
-reviewed never

DELETED tests/fslsync/tests/sync/fsync.logpro
Index: tests/fslsync/tests/sync/fsync.logpro
==================================================================
--- tests/fslsync/tests/sync/fsync.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "done" #/done/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/)) ;; but disallow any other errors

DELETED tests/fslsync/tests/sync/fsync.sh
Index: tests/fslsync/tests/sync/fsync.sh
==================================================================
--- tests/fslsync/tests/sync/fsync.sh
+++ /dev/null
@@ -1,33 +0,0 @@
-#!/usr/bin/env bash
-
-# Get the list of fossils from the cache
-
-FILES=$(ls $FSLSAREA/$AREANAME|grep fossil)
-
-# Do the remote sync from CACHE to FOSSILS
-ssh $SITENAME /bin/bash < 0 "done" #/done/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/)) ;; but disallow any other errors

DELETED tests/fslsync/tests/sync/rsync.sh
Index: tests/fslsync/tests/sync/rsync.sh
==================================================================
--- tests/fslsync/tests/sync/rsync.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Sync to remote cache
-rsync -avz $FSLSAREA/$AREANAME/ $SITENAME:$WORKAREA/$SITENAME/$AREANAME/ &
-# Sync to local cache
-rsync -avz $SITENAME:$FSLSAREA/$AREANAME/ $WORKAREA/$SITENAME/$AREANAME/ &
-
-# Wait until rsyncs complete
-wait
-
-echo done

DELETED tests/fslsync/tests/sync/testconfig
Index: tests/fslsync/tests/sync/testconfig
==================================================================
--- tests/fslsync/tests/sync/testconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-rsync rsync.sh
-fsync fsync.sh
-
-# Test requirements are specified here
-[requirements]
-waiton setup
-priority 0
-
-# Iteration for your tests are controlled by the items section
-[items]
-AREANAME #{getenv AREANAMES}
-SITENAME #{getenv SITENAMES}
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Sync fossils to remote
-tags tagone,tagtwo
-reviewed never

DELETED tests/fullrun/afs.config
Index: tests/fullrun/afs.config
==================================================================
--- tests/fullrun/afs.config
+++ /dev/null
@@ -1,1 +0,0 @@
-TESTSTORUN priority_6 sqlitespeed/ag

DELETED tests/fullrun/common_runconfigs.config
Index: tests/fullrun/common_runconfigs.config
==================================================================
--- tests/fullrun/common_runconfigs.config
+++ /dev/null
@@ -1,17 +0,0 @@
-[default]
-FOOBARBAZZZZ not a useful value
-BIGBOB $FOOBARBAZZZZ/bobby
-FREDDY $sysname/$fsname
-TOMMY  [system pwd]
-
-[/tmp/mrwellan/env/ubuntu/afs]
-BOGOUS Bob
-
-[default/ubuntu/nfs]
-CURRENT     /blah
-ALT_VAR we should not see this one
-
-[ubuntu/nfs/none]
-CURRENT     /tmp/nada
-UNIQUEVAR   this one should be set
-

DELETED tests/fullrun/configs/mt_include_1.config
Index: tests/fullrun/configs/mt_include_1.config
==================================================================
--- tests/fullrun/configs/mt_include_1.config
+++ /dev/null
@@ -1,23 +0,0 @@
-[setup]
-# exectutable /path/to/megatest
-max_concurrent_jobs 250
-
-linktree #{getenv MT_RUN_AREA_HOME}/tmp/mt_links
-
-[jobtools]
-useshell yes
-# ## launcher launches jobs, the job is managed on the target host
-## by megatest, comment out launcher to run local
-# workhosts localhost hermes
-# launcher exec nbfake
-
-launcher nbfake
-# launcher echo
-
-# launcher nbfind
-# launcher nodanggood
-
-## use "xterm -e csi -- " as a launcher to examine the launch environment.
-## exit with (exit)
-## get a shell with (system "bash")
-# launcher xterm -e csi --

DELETED tests/fullrun/configs/mt_include_2.config
Index: tests/fullrun/configs/mt_include_2.config
==================================================================
--- tests/fullrun/configs/mt_include_2.config
+++ /dev/null
@@ -1,2 +0,0 @@
-[disks]
-disk0 #{scheme (create-directory "#{getenv MT_RUN_AREA_HOME}/tmp/mt_runs" #t)}

DELETED tests/fullrun/ez_pass_linked/testconfig
Index: tests/fullrun/ez_pass_linked/testconfig
==================================================================
--- tests/fullrun/ez_pass_linked/testconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-[setup]
-
-[ezsteps]
-lookittmp   ls /tmp
-lookithome  ls /home
-
-[test_meta]
-author matt
-owner  bob
-description This test runs a single ezstep which is expected to pass, no logpro file.
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/megatest.config
Index: tests/fullrun/megatest.config
==================================================================
--- tests/fullrun/megatest.config
+++ /dev/null
@@ -1,307 +0,0 @@
-[fields]
-sysname TEXT
-fsname TEXT
-datapath TEXT
-
-[graph]
-g1 sqlite3:../../example.db alldat event_time var val stuff
-
-# refareas can be searched to find previous runs
-# the path points to where megatest.db exists
-[refareas]
-area1 /tmp/oldarea/megatest
-
-[include ./configs/mt_include_1.config]
-
-[dashboard]
-# pre-command  xterm -geometry 180x20 -e "
-# post-command |& tee results.log ;echo Press any key to continue;bash -c 'read -n 1 -s'" &
-testsort -event_time
-
-[misc]
-home #{shell readlink -f $MT_RUN_AREA_HOME}
-parent #{shell readlink -f $MT_RUN_AREA_HOME/..}
-testsuite #{shell basename $MT_RUN_AREA_HOME}
-
-[tests-paths]
-1 #{get misc parent}/simplerun/tests
-
-[setup]
-
-# turn off faststart, put monitor.db in MT_RUN_AREA_HOME/db
-# and set the dbdir to /var/tmp/$USER/mt_db to enable keeping
-# the raw db in /var/tmp/$USER
-#
-faststart  no
-monitordir #{getenv MT_RUN_AREA_HOME}/db
-dbdirdefn  /tmp/#{getenv USER}/#{getenv MT_TESTSUITE_NAME}/db
-dbdirmkdir #{scheme (create-directory "#{get setup dbdirdefn}" #t)}
-dbdir      #{get setup dbdirdefn}
-
-# sync more aggressively to megatest-db
-megatest-db yes
-
-# Set launchwait to no to use the more agressive code that does not wait for the launch to complete before proceeding
-# this may save a few milliseconds on launching tests
-# launchwait no
-waivercommentpatt ^WW\d+ [a-z].*
-incomplete-timeout 1
-
-# wait 0.5 seconds between launching every process
-#
-launch-delay 0.5
-
-# wait for runs to completely complete. yes, anything else is no
-run-wait yes
-
-# If set to "default" the old code is used. Otherwise defaults to 200 or uses
-# numeric value given.
-#
-runqueue 20
-
-# Default runtimelim 1d 1h 1m 10s
-#
-runtimelim 20m
-
-# Deadtime - when to consider tests dead (i.e. haven't heard from them in too long)
-# Number in seconds, set to 20 seconds here to trigger a little trouble. Default is
-# 1800
-#
-deadtime 600
-
-# 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/. >> TEST_TARG_PATH/mt_launch.log 2>> TEST_TARG_PATH/mt_launch.log
-
-# 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 0
-# 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
-
-# Setup continued.
-[setup]
-
-# override the logview command
-#
-logviewer (%MTCMD%) 2> /dev/null > /dev/null
-
-# override the html viewer launch command
-#
-# htmlviewercmd firefox -new-window 
-htmlviewercmd arora
-
-# -runtests automatically deletes the records for tests with the listed states on starting up a run allowing them to re-run
-#     (nb// this is in addition to NOT_STARTED which is automatically re-run)
-# format is STATE/STATUS
-allow-auto-rerun /INCOMPLETE /ZERO_ITEMS
-# could add: STUCK STUCK/DEAD UNKNOWN KILLED KILLREQ PREQ_DISCARD
-
-[validvalues]
-state start end 0 1 - 2
-status pass fail n/a 0 1 running - 2
-
-# These are set before all tests, override them 
-# in the testconfig [pre-launch-env-overrides] section
-[env-override]
-
-
-ALL_TOPLEVEL_TESTS          exit_0 exit_1  ez_exit2_fail  ez_fail        ez_pass              ezlog_fail \
-       ezlog_fail_then_pass ezlog_pass     ezlog_warn     lineitem_fail  lineitem_pass        logpro_required_fail \
-       manual_example       neverrun       priority_1     priority_10    priority_10_waiton_1 \
-       priority_3           priority_4     priority_5     priority_6     priority_7           priority_8 \
-       priority_9           runfirst       singletest     singletest2    sqlitespeed          test_mt_vars \
-       ez_fail_quick        test1          test2
-
-# This variable is honored by the loadrunner script. The value is in percent
-MAX_ALLOWED_LOAD 200
-
-# MT_XTERM_CMD overrides the terminal command
-# MT_XTERM_CMD xterm -bg lightgreen -fg black
-
-SPECIAL_ENV_VARS overide them here - should be seen at launch and in the runs
-TESTVAR [system readlink -f .]
-DEADVAR [system ls]
-VARWITHDOLLAR $HOME/.zshrc
-WACKYVAR  #{system ls > /dev/null}
-WACKYVAR2 #{get validvalues state}
-WACKYVAR3 #{getenv USER}
-WACKYVAR4 #{scheme (+ 5 6 7)}
-WACKYVAR5 #{getenv sysname}/#{getenv fsname}/#{getenv datapath}
-WACKYVAR6 #{scheme (args:get-arg "-target")}
-PREDICTABLE the_ans
-MRAH MT_RUN_AREA_HOME=#{getenv MT_RUN_AREA_HOME}
-# The empty var should have a definition with null string
-EMPTY_VAR
-
-WRAPPEDVAR This var should have the work blah thrice: \
-blah \
-blah
-
-MYRUNNAME1 /this/is/#{getenv MT_RUNNAME}/my/runname
-MYRUNNAME2 /this/is/[system echo $MT_RUNNAME]/my/runname
-
-
-# XTERM   [system xterm]
-# RUNDEAD [system exit 56]
-
-[server]
-
-# force use of server always
-# required yes
-
-# Use http instead of direct filesystem access
-transport http
-# transport fs
-# transport nmsg
-
-synchronous 0
-
-# If the server can't be started on this port it will try the next port until
-# it succeeds
-port 9080
-
-# This server will keep running this number of hours after last access. 
-# Three minutes is 0.05 hours
-# timeout 0.025
-timeout 0.01
-
-# faststart; unless no, start server but proceed with writes until server started
-# faststart no
-faststart yes
-
-# Start server when average query takes longer than this
-# server-query-threshold 55500
-server-query-threshold 1000
-
-# daemonize yes
-# hostname #{scheme (get-host-name)}
-
-## disks are:
-## name host:/path/to/area
-## -or-
-## name /path/to/area
-[disks]
-disk0 /foobarbazz
-disk1 not-a-disk
-
-[include ./configs/mt_include_2.config]
-
-[include #{getenv USER}_testing.config]
-
-[jobgroups]
-
-# NOTE: job groups will falsely count the toplevel test as a job. If possible add N
-#       to your jobgroups where N is the number of parallel runs you are likely to see
-#      
-sqlite3 6
-blockz  10
-#       to your jobgroups where N is the number of parallel runs you are likely to see
-#       
-
-#======================================================================
-# Machine flavors
-#
-#   These specify lists of hosts or scripts to use or call for various
-#   flavors of task.
-#
-#======================================================================
-
-[flavors]
-
-plain hosts: xena, phoebe
-strong command: NBFAKE_HOST=zeus nbfake
-arm hosts: cubian
-
-[archive]
-
-# where to get bup executable
-# bup /path/to/bup
-
-# use machines of these flavor
-useflavors plain
-targsize 2G
-
-# minimum space required on an archive disk before allowing archiving to start (MB)
-minspace 10
-
-[archive-disks]
-
-# Archives will be organised under these paths like this:
-#  /
-# Within the archive the data is structured like this:
-#  ///
-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") \
-                         (else "nbfake"))}
-
-# launcher bsub -q priority -o $MT_TEST_RUN_DIR/openlava.log 
-
-# launcher #{ shell if which bsub > /dev/null;then echo bsub -q priority -o openlava.log;else echo sleeprunner;fi}
-# launcher nbfake
-
-[configf:settings trim-trailing-spaces yes]
-
-# Override the rollup for specific tests
-[testrollup]
-runfirst ls
-
-[test]
-# VAL1 has trailing spaces
-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 -o $MT_LINKTREE/$MT_TARGET/$MT_RUNNAME.$MT_TESTNAME-$MT_ITEM_PATH.log") \
-                        (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
-alt     #{get jobtools launcher}
-local   nbfake
-remote  #{get jobtools launcher}
-
-[launchers]
-runfirst/sum% remote
-%             general

DELETED tests/fullrun/multi-dboard-load-all.scm
Index: tests/fullrun/multi-dboard-load-all.scm
==================================================================
--- tests/fullrun/multi-dboard-load-all.scm
+++ /dev/null
@@ -1,13 +0,0 @@
-
-(require-library margs)
-(load "../../common.scm")
-(load "../../common_records.scm")
-(load "../../margs.scm")
-(load "../../megatest-version.scm")
-(load "../../portlogger.scm")
-(load "../../tasks.scm")
-(load "../../db.scm")
-(load "../../configf.scm")
-(load "../../keys.scm")
-(load "../../tree.scm")
-(load "../../multi-dboard.scm")

DELETED tests/fullrun/multi-dboard.sh
Index: tests/fullrun/multi-dboard.sh
==================================================================
--- tests/fullrun/multi-dboard.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-#!/bin/bash
-
-if [[ ! -e "$HOME/.megatest" ]];then
-   mkdir -p "$HOME/.megatest"
-fi
-# if [[ ! -e "$HOME/.megatest/areas.dat" ]];then
-#    echo "Creating some placeholder files in ~/.megatest"
-#    cat > "$HOME/.megatest/areas.dat" << EOF
-# [default]
-# mfstest /mfs/matt/data/megatest/tests/fullrun
-# mfsbig /mfs/matt/data/megatest/tests/fdktestqa/testqa
-# [local]
-# localtest /home/matt/data/megatest/tests/fullrun
-# EOF
-# fi
-if [[ ! -e "$HOME/.megatest/default.dat" ]];then
-   cat > "$HOME/.megatest/default.dat" << EOF
-[fullrun]
-path /mfs/matt/data/megatest/tests/fullrun
-order 1
-# [bigrun]
-# path /mfs/matt/data/megatest/tests/fdktestqa/testqa
-# order 2
-# [local_fullrun]
-# path /home/matt/data/megatest/tests/fullrun
-# order 3
-EOF
-fi
-
-csi -I ../.. multi-dboard-load-all.scm

DELETED tests/fullrun/nfs.config
Index: tests/fullrun/nfs.config
==================================================================
--- tests/fullrun/nfs.config
+++ /dev/null
@@ -1,1 +0,0 @@
-TESTSTORUN priority_4 test_mt_vars

DELETED tests/fullrun/run-each-proc.sh
Index: tests/fullrun/run-each-proc.sh
==================================================================
--- tests/fullrun/run-each-proc.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-for x in `cat all-db-procs.txt`;do
-  cat > ~/.megatestrc <' '-_g'`
-  megatest -runtests sqlitespeed,test2,ez% -target ubuntu/nfs/none :runname $fname > $fname.log
-done 
-
-

DELETED tests/fullrun/runconfigs.config
Index: tests/fullrun/runconfigs.config
==================================================================
--- tests/fullrun/runconfigs.config
+++ /dev/null
@@ -1,59 +0,0 @@
-[default]
-SOMEVAR This should show up in SOMEVAR3
-VARNOVAL
-VARNOVAL_WITHSPACE
-QUICK %
-
-# target based getting of config file, look at afs.config and nfs.config
-[include #{getenv fsname}.config]
-
-[include #{getenv MT_RUN_AREA_HOME}/common_runconfigs.config]
-
-# #{system echo 'VACKYVAR #{shell pwd}' > $MT_RUN_AREA_HOME/configs/$USER.config}
-[include ./configs/#{getenv USER}.config]
-
-
-WACKYVAR0 #{get ubuntu/nfs/none CURRENT}
-WACKYVAR1 #{scheme (args:get-arg "-target")}
-
-[default/ubuntu/nfs]
-WACKYVAR2 #{runconfigs-get CURRENT}
-
-[ubuntu/nfs/none]
-WACKYVAR2 #{runconfigs-get CURRENT}
-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
-
-[ubuntu/nfs/sleep10]
-SLEEPRUNNER 10
-
-[ubuntu/nfs/sleep60]
-SLEEPRUNNER 60
-
-[ubuntu/nfs/sleep240]
-SLEEPRUNNER 240
-
-[v1.63/tip/dev]
-QUICKPATT %/desert,%/ae
-# OTHER_PATT foo%/desert,%/ae
-
-# [v1.63/%/%]
-# QUICKPATT %/desert,%/ae
-
-[nada/foo/bar]
-junk foo
-

DELETED tests/fullrun/tests/all_toplevel/calcresults.logpro
Index: tests/fullrun/tests/all_toplevel/calcresults.logpro
==================================================================
--- tests/fullrun/tests/all_toplevel/calcresults.logpro
+++ /dev/null
@@ -1,140 +0,0 @@
-;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
-;;  
-;;   License GPL.
-
-(define logbody "LogFileBody")
-
-(define pass-specs '( ;; testname num-expected max-runtime
-		     ("exit_0"		        1  20)
-		     ("ezlog_fail_then_pass"    1  20)
-		     ("ezlog_pass"	        1  20)
-		     ("ez_pass"		        1  20)
-		     ("lineitem_pass"	        1  20)
-		     ("priority_1"	        1  20)
-		     ("priority_10"	        1  20)
-		     ("priority_10_waiton_1"    1  20)
-		     ("priority_3"	        1  20)
-		     ("priority_4"	        1  20)
-		     ;; ("priority_5"	        1  20)
-		     ("priority_6"	        1  20)
-;;		     ("priority_7"	        1  20)
-		     ("priority_8"	        1  20)
-		     ("priority_9"	        1  20)
-		     ("runfirst"	        7  20)
-		     ("singletest"	        1  20)
-		     ("singletest2"	        1  20)
-		     ("special"		        1  20)
-		     ("sqlitespeed"	       10  20)
-		     ("test1"		        1  20)
-		     ("test2"		        6  20)
-		     ("test_mt_vars"	        6  20)
-		     ))
-
-(define fail-specs '( ;; testname num-expected max-runtime
-		     ("exit_1"		        1  20)
-		     ("ez_exit2_fail"           1  20)
-		     ("ez_fail"		        1  20)
-		     ("ez_fail_quick"	        1  20)
-		     ("ezlog_fail"	        1  20)
-		     ("lineitem_fail"	        1  20)
-		     ("logpro_required_fail"    1  20)
-		     ("manual_example"	        1  20)
-		     ("neverrun"	        1  20)))
-		     
-(define warn-specs   '(("ezlog_warn"	        1  20)))
-
-(define nost-specs   '(("wait_no_items1"        1  20)
-		       ("wait_no_items2"        1  20)
-		       ("wait_no_items3"        1  20)
-		       ("wait_no_items4"        1  20)
-		       ;; ("no_items"              1  20)
-		       ))
-
-(define (check-one-test estate estatus testname count runtime)
-   (let* ((rxe      (regexp (conc "^\\s+Test: " testname "(\\(.*|\\s+)\\s+State: " estate "\\s+Status: " estatus "\\s+Runtime:\\s+(\\d+)s")))
-	  (msg1     (conc testname " expecting count of " count))
-	  (msg2     (conc testname " expecting runtime less than " runtime)))
-     (expect:required in logbody = count msg1 rxe)
-     ;;(expect:value    in logbody count < msg2 rxe)
-     ))
-
-;; Special cases
-;;
-(expect:ignore   in logbody >= 0  "db_sync test might not have run"  #/Test: db_sync/)
-(expect:ignore   in logbody >= 0  "all_toplevel may not yet be done" #/Test: all_toplevel/)
-(expect:error    in logbody =  0  "tests left in RUNNING state"      #/State: RUNNING/)
-(expect:required in logbody =  1  "priority_2 is KILLED"             #/Test: priority_2\s+State: KILLED\s+Status: KILLED/)
-(expect:required in logbody =  1  "priority_5 is either PASS or SKIP" #/Test: priority_5\s+State: COMPLETED\s+Status: (SKIP|PASS)/)
-(expect:required in logbody =  1  "priority_7 is either PASS or SKIP" #/Test: priority_7\s+State: COMPLETED\s+Status: (SKIP|PASS)/)
-(expect:required in logbody =  1  "testxz has 1 NOT_STARTED test"    #/Test: testxz\s+State: NOT_STARTED/)
-(expect:required in logbody =  1  "no items"                         #/Test: no_items\s+State: NOT_STARTED\s+Status: ZERO_ITEMS/)
-(expect:warning  in logbody =  1  "dynamic waiton"                   #/Test: dynamic_waiton/)
-(expect:required in logbody = 29  "blocktestxz has 29 tests"         #/Test: blocktestxz/)
-
-;; General cases
-;;
-(for-each 
- (lambda (testdat)
-   (apply check-one-test "COMPLETED" "PASS" testdat))
- pass-specs)
-
-(for-each 
- (lambda (testdat)
-   (apply check-one-test "COMPLETED" "FAIL" testdat))
- fail-specs)
-
-(for-each 
- (lambda (testdat)
-   (apply check-one-test "COMPLETED" "WARN" testdat))
- warn-specs)
-
-(for-each 
- (lambda (testdat)
-   (apply check-one-test "NOT_STARTED" "PREQ_DISCARDED" testdat))
- nost-specs)
-
-;; Catch all.
-;;
-(expect:error    in logbody = 0   "Tests not accounted for"     #/Test: /)
-
-
-;; ;; define your hooks
-;; (hook:first-error   "echo \"Error hook activated: #{escaped errmsg}\"")
-;; (hook:first-warning "echo \"Got warning: #{escaped warnmsg}\"")
-;; (hook:value "echo \"Value hook activated: expected=#{expected}, measured=#{measured}, tolerance=#{tolerance}, message=#{message}\"")
-;; 
-;; ;; first ensure your run at least started
-;; ;;
-;; (trigger "Init"     #/This is a header/)
-;; (trigger "InitEnd"  #/^\s*$/)
-;; (section "Init" "Init" "InitEnd")
-;; 
-;; (trigger "Body"     #/^.*$/) ;; anything starts the body
-;; ;; (trigger "EndBody"  #/This had better never match/)
-;; 
-;; (section "Body"     "Body" "EndBody")
-;; 
-;; (trigger "Blah2"    #/^begin Blah2/)
-;; (trigger "Blah2End" #/^end Blah2/)
-;; (section "Blah2"    "Blah2" "Blah2End")
-;; 
-;; (expect:required in "Init"  = 1 "Header"      #/This is a header/)
-;; (expect:required in "LogFileBody" > 0 "Something required but not found" #/This is required but not found/)
-;; (expect:value    in "LogFileBody" 1.9 0.1 "Output voltage" #/Measured voltage output:\s*([\d\.\+\-e]+)v/)
-;; (expect:value    in "LogFileBody" 0.5 0.1 "Output current" #/Measured output current:\s*([\d\.\+\-e]+)mA/)
-;; (expect:value    in "LogFileBody" 110e9 2e9 "A big number (first)" #/Freq:\s*([\d\.\+\-e]+)\s+Hz/)
-;; (expect:value    in "LogFileBody" 110e9 1e9 "A big number (second), hook not called" #/Freq:\s*([\d\.\+\-e]+)Hz/)
-;; (expect:value    in "LogFileBody" 110e9 1e9 "A big number (never activated)" #/Freq:\s*([\d\.\+\-e]+)zH/)
-;; 
-;; ;; Using match number
-;; (expect:value    in "LogFileBody" 1.9 0.1 "Time Voltage" #/out: (\d+)\s+(\d+)/ match: 2)
-;; 
-;; ;; Comparison instead of tolerance
-;; (expect:value    in "LogFileBody" 1.9 >   "Time voltage" #/out: (\d+)\s+(\d+)/ match: 2)
-;; 
-;; (expect:ignore   in "Blah2" < 99 "FALSE ERROR" #/ERROR/)
-;; (expect:ignore   in "Body"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-;; (expect:warning  in "Body"  = 0 "Any warning" #/WARNING/)
-;; (expect:error    in "Body"  = 0 "ERROR BLAH"  (list #/ERROR/ #/error/)) ;; but disallow any other errors
-;; 
-;; ;(expect in "Init"  < 1 "Junk"        #/This is bogus/)

DELETED tests/fullrun/tests/all_toplevel/testconfig
Index: tests/fullrun/tests/all_toplevel/testconfig
==================================================================
--- tests/fullrun/tests/all_toplevel/testconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-[ezsteps]
-calcresults megatest -list-runs $MT_RUNNAME -target $MT_TARGET
-check_triggers  cat $MT_RUN_AREA_HOME/triggers_$MT_RUNNAME.dat
-
-[logpro]
-check_triggers ;;
-  (expect:error in "LogFileBody" = 0 "No errors" #/error/i)
-
-[requirements]
-waiton  #{getenv ALL_TOPLEVEL_TESTS}
-
-# This is a "toplevel" test, it does not require waitons to be non-FAIL to run
-mode toplevel

DELETED tests/fullrun/tests/blocktestxz/main.sh
Index: tests/fullrun/tests/blocktestxz/main.sh
==================================================================
--- tests/fullrun/tests/blocktestxz/main.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/bash
-
-$MT_MEGATEST -test-status :state $THESTATE :status $THESTATUS -setlog "nada.html"
-
-# By exiting with non-zero we tell Megatest to preseve the state and status
-exit 1

DELETED tests/fullrun/tests/blocktestxz/testconfig
Index: tests/fullrun/tests/blocktestxz/testconfig
==================================================================
--- tests/fullrun/tests/blocktestxz/testconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-[setup]
-runscript main.sh
-
-[items]
-THESTATE UNKNOWN INCOMPLETE KILLED KILLREQ STUCK BOZZLEBLONKED STUCK/DEAD
-THESTATUS PASS FAIL STUCK/DEAD SKIP
-
-[requirements]
-waiton sqlitespeed
-
-[test_meta]
-author matt
-owner  bob
-description This test will fail causing the dependent test "testxz"\
- to never run. This triggers the code that must determine\
- that a test will never be run and thus remove it from\
- the queue of tests to be run.
-
-tags first,single
-reviewed 1/1/1965
-
-jobgroup blockz

DELETED tests/fullrun/tests/db_sync/calcresults.logpro
Index: tests/fullrun/tests/db_sync/calcresults.logpro
==================================================================
--- tests/fullrun/tests/db_sync/calcresults.logpro
+++ /dev/null
@@ -1,44 +0,0 @@
-;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
-;;  
-;;   License GPL.
-
-;; ;; define your hooks
-;; (hook:first-error   "echo \"Error hook activated: #{escaped errmsg}\"")
-;; (hook:first-warning "echo \"Got warning: #{escaped warnmsg}\"")
-;; (hook:value "echo \"Value hook activated: expected=#{expected}, measured=#{measured}, tolerance=#{tolerance}, message=#{message}\"")
-;; 
-;; ;; first ensure your run at least started
-;; ;;
-;; (trigger "Init"     #/This is a header/)
-;; (trigger "InitEnd"  #/^\s*$/)
-;; (section "Init" "Init" "InitEnd")
-;; 
-;; (trigger "Body"     #/^.*$/) ;; anything starts the body
-;; ;; (trigger "EndBody"  #/This had better never match/)
-;; 
-;; (section "Body"     "Body" "EndBody")
-;; 
-;; (trigger "Blah2"    #/^begin Blah2/)
-;; (trigger "Blah2End" #/^end Blah2/)
-;; (section "Blah2"    "Blah2" "Blah2End")
-;; 
-;; (expect:required in "Init"  = 1 "Header"      #/This is a header/)
-;; (expect:required in "LogFileBody" > 0 "Something required but not found" #/This is required but not found/)
-;; (expect:value    in "LogFileBody" 1.9 0.1 "Output voltage" #/Measured voltage output:\s*([\d\.\+\-e]+)v/)
-;; (expect:value    in "LogFileBody" 0.5 0.1 "Output current" #/Measured output current:\s*([\d\.\+\-e]+)mA/)
-;; (expect:value    in "LogFileBody" 110e9 2e9 "A big number (first)" #/Freq:\s*([\d\.\+\-e]+)\s+Hz/)
-;; (expect:value    in "LogFileBody" 110e9 1e9 "A big number (second), hook not called" #/Freq:\s*([\d\.\+\-e]+)Hz/)
-;; (expect:value    in "LogFileBody" 110e9 1e9 "A big number (never activated)" #/Freq:\s*([\d\.\+\-e]+)zH/)
-;; 
-;; ;; Using match number
-;; (expect:value    in "LogFileBody" 1.9 0.1 "Time Voltage" #/out: (\d+)\s+(\d+)/ match: 2)
-;; 
-;; ;; Comparison instead of tolerance
-;; (expect:value    in "LogFileBody" 1.9 >   "Time voltage" #/out: (\d+)\s+(\d+)/ match: 2)
-;; 
-;; (expect:ignore   in "Blah2" < 99 "FALSE ERROR" #/ERROR/)
-;; (expect:ignore   in "Body"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-;; (expect:warning  in "Body"  = 0 "Any warning" #/WARNING/)
-;; (expect:error    in "Body"  = 0 "ERROR BLAH"  (list #/ERROR/ #/error/)) ;; but disallow any other errors
-;; 
-;; ;(expect in "Init"  < 1 "Junk"        #/This is bogus/)

DELETED tests/fullrun/tests/db_sync/dbdelta.scm
Index: tests/fullrun/tests/db_sync/dbdelta.scm
==================================================================
--- tests/fullrun/tests/db_sync/dbdelta.scm
+++ /dev/null
@@ -1,44 +0,0 @@
-
-(use sql-de-lite)
-
-(define megatest.db (conc (get-environment-variable "MT_RUN_AREA_HOME") "/megatest.db"))
-
-(define runsquery "sysname||'/'||fsname||'/'||datapath||'/'||runname||'/'||runs.state||'-'||runs.status") 
-(define bigquery
-  (conc 
-   "SELECT " runsquery "||testname||'/'||item_path||'-'||'-'||tests.state||'-'||tests.status||'-'||runs.id AS outdat FROM runs INNER JOIN tests ON runs.id=tests.run_id WHERE runs.state NOT LIKE 'deleted' AND tests.state NOT LIKE 'deleted' AND testname NOT LIKE 'db_sync' ORDER BY outdat ASC ;"))
-
-(print "Creating file for legacy db")
-(with-output-to-file "legacy-db-dump"
-  (lambda ()
-    (let ((db (open-database megatest.db)))
-      (query (for-each-row
-	      (lambda (res)
-		(print res)))
-	     (sql db bigquery))
-      (close-database db))))
-
-(define main.db (conc (get-environment-variable "MT_DBDIR") "/main.db"))
-
-(print "Creating file for current db")
-(with-output-to-file "current-db-dump"
-  (lambda ()
-    (let* ((mdb      (open-database main.db))
-	   (run-ids  (query fetch-column (sql mdb (conc "select id," runsquery " AS rq from runs ORDER BY rq ASC;"))))
-	   (dbdir    (get-environment-variable "MT_DBDIR")))
-      (for-each
-       (lambda (rid)
-	 (let ((dbfile (conc dbdir "/" rid ".db")))
-	   (if (file-exists? dbfile)
-	       (begin
-		 (exec (sql mdb (conc "ATTACH DATABASE '" dbfile "' AS testsdb;")))
-		 (query (for-each-row
-			 (lambda (res)
-			   (print res)))
-			(sql mdb bigquery))
-		 (exec (sql mdb "DETACH DATABASE testsdb;")))
-	       (print "ERROR: No file " dbfile " found"))))
-       run-ids)
-      (close-database mdb))))
-	 
-      

DELETED tests/fullrun/tests/db_sync/getdbdir.scm
Index: tests/fullrun/tests/db_sync/getdbdir.scm
==================================================================
--- tests/fullrun/tests/db_sync/getdbdir.scm
+++ /dev/null
@@ -1,1 +0,0 @@
-(db:dbfile-path #f)

DELETED tests/fullrun/tests/db_sync/showdiff.logpro
Index: tests/fullrun/tests/db_sync/showdiff.logpro
==================================================================
--- tests/fullrun/tests/db_sync/showdiff.logpro
+++ /dev/null
@@ -1,46 +0,0 @@
-;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
-;;  
-;;   License GPL.
-
-;; ;; define your hooks
-;; (hook:first-error   "echo \"Error hook activated: #{escaped errmsg}\"")
-;; (hook:first-warning "echo \"Got warning: #{escaped warnmsg}\"")
-;; (hook:value "echo \"Value hook activated: expected=#{expected}, measured=#{measured}, tolerance=#{tolerance}, message=#{message}\"")
-;; 
-;; ;; first ensure your run at least started
-;; ;;
-;; (trigger "Init"     #/This is a header/)
-;; (trigger "InitEnd"  #/^\s*$/)
-;; (section "Init" "Init" "InitEnd")
-;; 
-;; (trigger "Body"     #/^.*$/) ;; anything starts the body
-;; ;; (trigger "EndBody"  #/This had better never match/)
-;; 
-;; (section "Body"     "Body" "EndBody")
-;; 
-;; (trigger "Blah2"    #/^begin Blah2/)
-;; (trigger "Blah2End" #/^end Blah2/)
-;; (section "Blah2"    "Blah2" "Blah2End")
-;; 
-;; (expect:required in "Init"  = 1 "Header"      #/This is a header/)
-;; (expect:required in "LogFileBody" > 0 "Something required but not found" #/This is required but not found/)
-;; (expect:value    in "LogFileBody" 1.9 0.1 "Output voltage" #/Measured voltage output:\s*([\d\.\+\-e]+)v/)
-;; (expect:value    in "LogFileBody" 0.5 0.1 "Output current" #/Measured output current:\s*([\d\.\+\-e]+)mA/)
-;; (expect:value    in "LogFileBody" 110e9 2e9 "A big number (first)" #/Freq:\s*([\d\.\+\-e]+)\s+Hz/)
-;; (expect:value    in "LogFileBody" 110e9 1e9 "A big number (second), hook not called" #/Freq:\s*([\d\.\+\-e]+)Hz/)
-;; (expect:value    in "LogFileBody" 110e9 1e9 "A big number (never activated)" #/Freq:\s*([\d\.\+\-e]+)zH/)
-;; 
-;; ;; Using match number
-;; (expect:value    in "LogFileBody" 1.9 0.1 "Time Voltage" #/out: (\d+)\s+(\d+)/ match: 2)
-;; 
-;; ;; Comparison instead of tolerance
-;; (expect:value    in "LogFileBody" 1.9 >   "Time voltage" #/out: (\d+)\s+(\d+)/ match: 2)
-;; 
-;; (expect:ignore   in "Blah2" < 99 "FALSE ERROR" #/ERROR/)
-;; (expect:ignore   in "Body"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-;; (expect:warning  in "Body"  = 0 "Any warning" #/WARNING/)
-;; (expect:error    in "Body"  = 0 "ERROR BLAH"  (list #/ERROR/ #/error/)) ;; but disallow any other errors
-;; 
-;; ;(expect in "Init"  < 1 "Junk"        #/This is bogus/)
-
-(expect:error    in "LogFileBody" = 0 "Any diff is failure" #/.+/)

DELETED tests/fullrun/tests/db_sync/testconfig
Index: tests/fullrun/tests/db_sync/testconfig
==================================================================
--- tests/fullrun/tests/db_sync/testconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-[pre-launch-env-vars]
-
-MT_DBDIR #{scheme (db:dbfile-path #f)}
-
-[ezsteps]
-calcresults csi -b dbdelta.scm
-showdiff    diff  current-db-dump legacy-db-dump
-
-[requirements]
-waiton  #{getenv ALL_TOPLEVEL_TESTS}
-
-# This is a "toplevel" test, it does not require waitons to be non-FAIL to run
-mode toplevel

DELETED tests/fullrun/tests/dynamic_waiton/testconfig
Index: tests/fullrun/tests/dynamic_waiton/testconfig
==================================================================
--- tests/fullrun/tests/dynamic_waiton/testconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-[ezsteps]
-listfiles ls
-
-[requirements]
-waiton #{scheme (string-intersperse \
-                  (tests:filter-test-names \
-                      (hash-table-keys (tests:get-all)) \
-                      (or (args:get-arg "-runtests") \
-                          (args:get-arg "-testpatt") "")) " ")}
-
-[items]
-
-[test_meta]
-author matt
-owner  bob
-description This test runs a single ezstep which is expected to pass \
-but there is an items definition with no items. This should evoke an \
-error.
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/exit_0/main.sh
Index: tests/fullrun/tests/exit_0/main.sh
==================================================================
--- tests/fullrun/tests/exit_0/main.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 2
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-
-exit 0

DELETED tests/fullrun/tests/exit_0/testconfig
Index: tests/fullrun/tests/exit_0/testconfig
==================================================================
--- tests/fullrun/tests/exit_0/testconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-[setup]
-runscript main.sh
-
-[test_meta]
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt
-
-[triggers]
-# NOT_STARTED/ xterm -e bash -s -- 
-NOT_STARTED/   echo "trigger: exit_0, NOT_STARTED/" > $MT_RUN_AREA_HOME/triggers_$MT_RUN_NAME.dat
-RUNNING/       echo "trigger: exit_0, RUNNING/" >> $MT_RUN_AREA_HOME/triggers_$MT_RUN_NAME.dat
-
-

DELETED tests/fullrun/tests/exit_1/main.sh
Index: tests/fullrun/tests/exit_1/main.sh
==================================================================
--- tests/fullrun/tests/exit_1/main.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 2
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-
-exit 1

DELETED tests/fullrun/tests/exit_1/testconfig
Index: tests/fullrun/tests/exit_1/testconfig
==================================================================
--- tests/fullrun/tests/exit_1/testconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-[setup]
-runscript main.sh
-
-[requirements]
-priority 9
-
-[test_meta]
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/ez_exit2_fail/testconfig
Index: tests/fullrun/tests/ez_exit2_fail/testconfig
==================================================================
--- tests/fullrun/tests/ez_exit2_fail/testconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[setup]
-
-[ezsteps]
-exit2       exit 2
-lookithome  ls /home
-
-[test_meta]
-author matt
-owner  bob
-description This test runs two steps; the first exits with\
- code 2 (a fail because not using logpro) and the second\
- is a pass
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/ez_fail/testconfig
Index: tests/fullrun/tests/ez_fail/testconfig
==================================================================
--- tests/fullrun/tests/ez_fail/testconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-[setup]
-
-[requirements]
-priority 10
-
-[ezsteps]
-lookittmp   sleep 5s;ls /tmp
-lookithome  sleep 2;ls /home
-# should fail on next step
-lookitnada  sleep 3;ls /nada
-lookitusr   sleep 2;ls /usr
-
-[test_meta]
-author matt
-owner  bob
-description This test runs a single ezstep which is expected to pass, no logpro file.
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/ez_fail_quick/testconfig
Index: tests/fullrun/tests/ez_fail_quick/testconfig
==================================================================
--- tests/fullrun/tests/ez_fail_quick/testconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-[requirements]
-priority 10
-
-[ezsteps]
-# should fail on next step
-lookitnada  ls /nada
-
-[triggers]
-# run like this: cmd test-id test-rundir trigger
-COMPLETED/FAIL   echo "trigger: ez_fail_quick, COMPLETED/FAIL" >> $MT_RUN_AREA_HOME/triggers_$MT_RUN_NAME.dat
-
-[test_meta]
-author matt
-owner  bob
-description This test runs a single ezstep which fails immediately.
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/ez_pass/testconfig
Index: tests/fullrun/tests/ez_pass/testconfig
==================================================================
--- tests/fullrun/tests/ez_pass/testconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[setup]
-
-[ezsteps]
-lookittmp   sleep 1;ls /tmp
-lookithome  sleep 1;ls /home
-isrunname1  sleep 1;echo $MYRUNNAME1 | grep -v '#f' 
-isrunname2  sleep 1;echo $MYRUNNAME2 | grep -v '#f' 
-
-[test_meta]
-author matt
-owner  bob
-description This test runs a single ezstep which is expected to pass, no logpro file.
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/ez_pass_linked
Index: tests/fullrun/tests/ez_pass_linked
==================================================================
--- tests/fullrun/tests/ez_pass_linked
+++ /dev/null
@@ -1,1 +0,0 @@
-../ez_pass_linked/

DELETED tests/fullrun/tests/ezlog_fail/example.logpro
Index: tests/fullrun/tests/ezlog_fail/example.logpro
==================================================================
--- tests/fullrun/tests/ezlog_fail/example.logpro
+++ /dev/null
@@ -1,44 +0,0 @@
-;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
-;;  
-;;   License GPL.
-
-;; define your hooks
-(hook:first-error   "echo \"Error hook activated: #{escaped errmsg}\"")
-(hook:first-warning "echo \"Got warning: #{escaped warnmsg}\"")
-(hook:value "echo \"Value hook activated: expected=#{expected}, measured=#{measured}, tolerance=#{tolerance}, message=#{message}\"")
-
-;; first ensure your run at least started
-;;
-(trigger "Init"     #/This is a header/)
-(trigger "InitEnd"  #/^\s*$/)
-(section "Init" "Init" "InitEnd")
-
-(trigger "Body"     #/^.*$/) ;; anything starts the body
-;; (trigger "EndBody"  #/This had better never match/)
-
-(section "Body"     "Body" "EndBody")
-
-(trigger "Blah2"    #/^begin Blah2/)
-(trigger "Blah2End" #/^end Blah2/)
-(section "Blah2"    "Blah2" "Blah2End")
-
-(expect:required in "Init"  = 1 "Header"      #/This is a header/)
-(expect:required in "LogFileBody" > 0 "Something required but not found" #/This is required but not found/)
-(expect:value    in "LogFileBody" 1.9 0.1 "Output voltage" #/Measured voltage output:\s*([\d\.\+\-e]+)v/)
-(expect:value    in "LogFileBody" 0.5 0.1 "Output current" #/Measured output current:\s*([\d\.\+\-e]+)mA/)
-(expect:value    in "LogFileBody" 110e9 2e9 "A big number (first)" #/Freq:\s*([\d\.\+\-e]+)\s+Hz/)
-(expect:value    in "LogFileBody" 110e9 1e9 "A big number (second), hook not called" #/Freq:\s*([\d\.\+\-e]+)Hz/)
-(expect:value    in "LogFileBody" 110e9 1e9 "A big number (never activated)" #/Freq:\s*([\d\.\+\-e]+)zH/)
-
-;; Using match number
-(expect:value    in "LogFileBody" 1.9 0.1 "Time Voltage" #/out: (\d+)\s+(\d+)/ match: 2)
-
-;; Comparison instead of tolerance
-(expect:value    in "LogFileBody" 1.9 >   "Time voltage" #/out: (\d+)\s+(\d+)/ match: 2)
-
-(expect:ignore   in "Blah2" < 99 "FALSE ERROR" #/ERROR/)
-(expect:ignore   in "Body"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "Body"  = 0 "Any warning" #/WARNING/)
-(expect:error    in "Body"  = 0 "ERROR BLAH"  (list #/ERROR/ #/error/)) ;; but disallow any other errors
-
-;(expect in "Init"  < 1 "Junk"        #/This is bogus/)

DELETED tests/fullrun/tests/ezlog_fail/lookithome.logpro
Index: tests/fullrun/tests/ezlog_fail/lookithome.logpro
==================================================================
--- tests/fullrun/tests/ezlog_fail/lookithome.logpro
+++ /dev/null
@@ -1,10 +0,0 @@
-;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
-;;  
-;;   License GPL.
-
-
-(expect:required in "LogFileBody" > 0 "Must be some files in the dir" #/.*/)
-
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/WARNING/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/)) ;; but disallow any other errors

DELETED tests/fullrun/tests/ezlog_fail/lookittmp.logpro
Index: tests/fullrun/tests/ezlog_fail/lookittmp.logpro
==================================================================
--- tests/fullrun/tests/ezlog_fail/lookittmp.logpro
+++ /dev/null
@@ -1,6 +0,0 @@
-;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
-;;  
-;;   License GPL.
-
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/WARNING/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/.*/)) ;; force an error

DELETED tests/fullrun/tests/ezlog_fail/testconfig
Index: tests/fullrun/tests/ezlog_fail/testconfig
==================================================================
--- tests/fullrun/tests/ezlog_fail/testconfig
+++ /dev/null
@@ -1,28 +0,0 @@
-[setup]
-
-[ezsteps]
-lookittmp   ls /tmp
-lookithome  ls /home
-
-# logpro_file  input_glob
-# matching file(s) will be diff'd with previous run and logpro applied
-# if PASS or WARN result from logpro then WAIVER state is set
-#
-[waivers]
-waiver_1 logpro lookittmp.log
-
-[waiver_rules]
-
-# This builtin rule is the default if there is no .logpro file
-# diff   diff %file1% %file2%
-
-# This builtin rule is applied if a .logpro file exists
-# logpro diff %file1% %file2% | logpro %waivername%.logpro %waivername%.html
-
-[test_meta]
-author matt
-owner  bob
-description This test runs two ezstep, the first of which is expected to fail using a simple logpro file.
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/ezlog_fail/waiver_1.logpro
Index: tests/fullrun/tests/ezlog_fail/waiver_1.logpro
==================================================================
--- tests/fullrun/tests/ezlog_fail/waiver_1.logpro
+++ /dev/null
@@ -1,1 +0,0 @@
-(expect:warning  in "Body"  = 0 "Any warning" #/WARNING/)

DELETED tests/fullrun/tests/ezlog_fail_then_pass/firststep.logpro
Index: tests/fullrun/tests/ezlog_fail_then_pass/firststep.logpro
==================================================================
--- tests/fullrun/tests/ezlog_fail_then_pass/firststep.logpro
+++ /dev/null
@@ -1,10 +0,0 @@
-;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
-;;  
-;;   License GPL.
-
-
-(expect:required in "LogFileBody" > 0 "Must be some files in the dir" #/.*/)
-
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/WARNING/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/)) ;; but disallow any other errors

DELETED tests/fullrun/tests/ezlog_fail_then_pass/main.sh
Index: tests/fullrun/tests/ezlog_fail_then_pass/main.sh
==================================================================
--- tests/fullrun/tests/ezlog_fail_then_pass/main.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/bash
-
-megatest -step yepstep :state start :status n/a
-ls /tmp
-megatest -step yepstep :state end :status $?
-
-megatest -load-test-data << EOF
-OPER,du,   1.2,  1.2, <   , GBytes  ,System didn't use too much space
-EOF
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 2
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-
-megatest -test-status :state COMPLETED :status AUTO

DELETED tests/fullrun/tests/ezlog_fail_then_pass/testconfig
Index: tests/fullrun/tests/ezlog_fail_then_pass/testconfig
==================================================================
--- tests/fullrun/tests/ezlog_fail_then_pass/testconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-[setup]
-
-[ezsteps]
-firststep main.sh
-
-[test_meta]
-author matt
-owner  bob
-description This test runs a single ezstep which is logpro clean\
- but fails based on -test-data loaded.
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/ezlog_pass/example.logpro
Index: tests/fullrun/tests/ezlog_pass/example.logpro
==================================================================
--- tests/fullrun/tests/ezlog_pass/example.logpro
+++ /dev/null
@@ -1,44 +0,0 @@
-;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
-;;  
-;;   License GPL.
-
-;; define your hooks
-(hook:first-error   "echo \"Error hook activated: #{escaped errmsg}\"")
-(hook:first-warning "echo \"Got warning: #{escaped warnmsg}\"")
-(hook:value "echo \"Value hook activated: expected=#{expected}, measured=#{measured}, tolerance=#{tolerance}, message=#{message}\"")
-
-;; first ensure your run at least started
-;;
-(trigger "Init"     #/This is a header/)
-(trigger "InitEnd"  #/^\s*$/)
-(section "Init" "Init" "InitEnd")
-
-(trigger "Body"     #/^.*$/) ;; anything starts the body
-;; (trigger "EndBody"  #/This had better never match/)
-
-(section "Body"     "Body" "EndBody")
-
-(trigger "Blah2"    #/^begin Blah2/)
-(trigger "Blah2End" #/^end Blah2/)
-(section "Blah2"    "Blah2" "Blah2End")
-
-(expect:required in "Init"  = 1 "Header"      #/This is a header/)
-(expect:required in "LogFileBody" > 0 "Something required but not found" #/This is required but not found/)
-(expect:value    in "LogFileBody" 1.9 0.1 "Output voltage" #/Measured voltage output:\s*([\d\.\+\-e]+)v/)
-(expect:value    in "LogFileBody" 0.5 0.1 "Output current" #/Measured output current:\s*([\d\.\+\-e]+)mA/)
-(expect:value    in "LogFileBody" 110e9 2e9 "A big number (first)" #/Freq:\s*([\d\.\+\-e]+)\s+Hz/)
-(expect:value    in "LogFileBody" 110e9 1e9 "A big number (second), hook not called" #/Freq:\s*([\d\.\+\-e]+)Hz/)
-(expect:value    in "LogFileBody" 110e9 1e9 "A big number (never activated)" #/Freq:\s*([\d\.\+\-e]+)zH/)
-
-;; Using match number
-(expect:value    in "LogFileBody" 1.9 0.1 "Time Voltage" #/out: (\d+)\s+(\d+)/ match: 2)
-
-;; Comparison instead of tolerance
-(expect:value    in "LogFileBody" 1.9 >   "Time voltage" #/out: (\d+)\s+(\d+)/ match: 2)
-
-(expect:ignore   in "Blah2" < 99 "FALSE ERROR" #/ERROR/)
-(expect:ignore   in "Body"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "Body"  = 0 "Any warning" #/WARNING/)
-(expect:error    in "Body"  = 0 "ERROR BLAH"  (list #/ERROR/ #/error/)) ;; but disallow any other errors
-
-;(expect in "Init"  < 1 "Junk"        #/This is bogus/)

DELETED tests/fullrun/tests/ezlog_pass/lookittmp.logpro
Index: tests/fullrun/tests/ezlog_pass/lookittmp.logpro
==================================================================
--- tests/fullrun/tests/ezlog_pass/lookittmp.logpro
+++ /dev/null
@@ -1,10 +0,0 @@
-;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
-;;  
-;;   License GPL.
-
-
-(expect:required in "LogFileBody" > 0 "Must be some files in the dir" #/.*/)
-
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/WARNING/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/)) ;; but disallow any other errors

DELETED tests/fullrun/tests/ezlog_pass/testconfig
Index: tests/fullrun/tests/ezlog_pass/testconfig
==================================================================
--- tests/fullrun/tests/ezlog_pass/testconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-[setup]
-
-[ezsteps]
-lookittmp   ls /tmp
-lookithome  ls /home
-
-[test_meta]
-author matt
-owner  bob
-description This test runs a single ezstep which is expected to pass using a simple logpro file.
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/ezlog_warn/lookithome.logpro
Index: tests/fullrun/tests/ezlog_warn/lookithome.logpro
==================================================================
--- tests/fullrun/tests/ezlog_warn/lookithome.logpro
+++ /dev/null
@@ -1,11 +0,0 @@
-;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
-;;  
-;;   License GPL.
-
-
-;; Force a warn for this test
-(expect:required in "LogFileBody" > 0 "Must be some files in the dir" #/.*/)
-
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/)) ;; but disallow any other errors

DELETED tests/fullrun/tests/ezlog_warn/lookittmp.logpro
Index: tests/fullrun/tests/ezlog_warn/lookittmp.logpro
==================================================================
--- tests/fullrun/tests/ezlog_warn/lookittmp.logpro
+++ /dev/null
@@ -1,12 +0,0 @@
-;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
-;;  
-;;   License GPL.
-
-
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/.*/)
-;; Can't have a required since it will mask the warns! Could make the warn non-overlapping with the
-;; required I suppose...
-;; (expect:required in "LogFileBody" > 0 "Must be some files in the dir" #/.*/)
-
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/)) ;; but disallow any other errors

DELETED tests/fullrun/tests/ezlog_warn/testconfig
Index: tests/fullrun/tests/ezlog_warn/testconfig
==================================================================
--- tests/fullrun/tests/ezlog_warn/testconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-[setup]
-
-[ezsteps]
-lookittmp   ls /tmp
-lookithome  ls $HOME
-
-[test_meta]
-author matt
-owner  bob
-description This test runs two ezsteps the first of which is expected to fail using a simple logpro file.
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/lineitem_fail/main.sh
Index: tests/fullrun/tests/lineitem_fail/main.sh
==================================================================
--- tests/fullrun/tests/lineitem_fail/main.sh
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/bin/bash
-
-$MT_MEGATEST -load-test-data << EOF
-foo,bar,   1.2,  1.9, >
-foo,rab, 1.0e9, 10e9, 1e9
-foo,bla,   1.2,  1.9, <
-foo,bal,   1.2,  1.2, <   ,     ,Check for overload
-foo,alb,   1.2,  1.2, <=  , Amps,This is the high power circuit test
-foo,abl,   1.2,  1.3, 0.1
-foo,bra,   1.2, pass, silly stuff
-faz,bar,    10,  8mA,     ,     ,"this is a comment"
-EOF
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 2
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-
-# Needed to force rolling up the results and set the test to COMPLETED
-$MT_MEGATEST -test-status :state COMPLETED :status AUTO
-

DELETED tests/fullrun/tests/lineitem_fail/testconfig
Index: tests/fullrun/tests/lineitem_fail/testconfig
==================================================================
--- tests/fullrun/tests/lineitem_fail/testconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-[setup]
-runscript main.sh
-
-[test_meta]
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/lineitem_pass/main.sh
Index: tests/fullrun/tests/lineitem_pass/main.sh
==================================================================
--- tests/fullrun/tests/lineitem_pass/main.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/bin/bash
-
-# category variable value expected  tol/comp units comment
-$MT_MEGATEST -load-test-data << EOF
-foo,       bar,     1.9,  1.8,      >
-foo,       rab,   1.0e9,  2e9,      1e9
-foo,       bla,     1.2,  1.9,      <
-foo,       bal,    -1.1,    0,      <   ,         , Check for overload
-foo,       alb,     1.2,  1.2,      <=  ,     Amps, This is the high power circuit test
-foo,       abl,     1.2,  1.3,      0.1
-foo,       bra,     1.2, pass,      silly stuff
-faz,       bar,      10,  8mA,          ,         ,"this is a comment"
-EOF
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 2
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-# Needed to force rolling up the results and set the test to COMPLETED
-$MT_MEGATEST -test-status :state COMPLETED :status AUTO

DELETED tests/fullrun/tests/lineitem_pass/testconfig
Index: tests/fullrun/tests/lineitem_pass/testconfig
==================================================================
--- tests/fullrun/tests/lineitem_pass/testconfig
+++ /dev/null
@@ -1,10 +0,0 @@
-[setup]
-runscript main.sh
-
-[test_meta]
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/logpro_required_fail/testconfig
Index: tests/fullrun/tests/logpro_required_fail/testconfig
==================================================================
--- tests/fullrun/tests/logpro_required_fail/testconfig
+++ /dev/null
@@ -1,23 +0,0 @@
-[setup]
-
-[ezsteps]
-lookittmp   ls /tmp
-
-[test_meta]
-author matt
-owner  bob
-description This test runs two ezstep, the first of which is expected to fail using a simple logpro file.
-
-[logpro]
-lookittmp ;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
-  ;;  
-  ;;   License GPL.
-  ;;
-  (expect:required in "LogFileBody" > 0 "A file name that should never exist!" #/This is a awfully stupid file name that should never be found in the temp dir/)
-  ;;
-  ;; (expect:warning  in "LogFileBody"  = 0 "Any warning" #/WARNING/)
-  ;; (expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/.*/)) ;; force an error
-
-
-tags logpro
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/manual_example/results/results.csv
Index: tests/fullrun/tests/manual_example/results/results.csv
==================================================================
--- tests/fullrun/tests/manual_example/results/results.csv
+++ /dev/null
@@ -1,1 +0,0 @@
-category, variable, expected,   value,  tol,   units,  comment

DELETED tests/fullrun/tests/manual_example/runsetupxterm.sh
Index: tests/fullrun/tests/manual_example/runsetupxterm.sh
==================================================================
--- tests/fullrun/tests/manual_example/runsetupxterm.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/bin/bash
-
-if [[ $TARGETDISPLAY = "" || $TARGETHOST = "" || $TARGETDIR = "" || $TARGETUSER = "" ]]; then
-    msg="You must set the TARGETDISPLAY, TARGETHOST, TARGETDIR and TARGETUSER variables for manual tests"
-    echo $msg
-    megatest -test-status :state COMPLETED :status FAIL -m $msg
-    exit 1
-else
-    megatest -step setup :state start :status n/a
-    xterm -display $TARGETDISPLAY -e ./setupremote.sh
-    megatest -step setup :state end :status $?
-fi
-

DELETED tests/fullrun/tests/manual_example/setupremote.sh
Index: tests/fullrun/tests/manual_example/setupremote.sh
==================================================================
--- tests/fullrun/tests/manual_example/setupremote.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-megatest -step rsyncto :state start :status n/a
-echo "First, lets populate your area with necessary files, you may be prompted for your Unix password several times"
-rsync -avz $MT_TEST_RUN_DIR/  $TARGETUSER@$TARGETHOST:$TARGETDIR
-megatest -step rsyncto :state end :status n/a
-
-megatest -step runtest :state start :status n/a
-remotecmd="cd $TARGETDIR;xterm -display $TARGETDISPLAY"
-echo Launching $remotecmd on $TARGETHOST as $TARGETUSER
-ssh $TARGETUSER@$TARGETHOST $remotecmd
-megatest -step runtest :state end :status $?
-
-megatest -step gatherdata :state start :status n/a
-rsync -avz $TARGETUSER@$TARGETHOST:$TARGETDIR/results/ $MT_TEST_RUN_DIR/results/
-if [[ -e $MT_TEST_RUN_DIR/results/results.csv ]]; then
-    megatest -load-test-data < $MT_TEST_RUN_DIR/results/results.csv
-fi
-
-if [[ -e $MT_TEST_RUN_DIR/results/final_results.log && $MT_TEST_RUN_DIR/final_results.logpro ]]; then
-    logpro $MT_TEST_RUN_DIR/final_results.logpro $MT_TEST_RUN_DIR/final_results.html < $MT_TEST_RUN_DIR/results/final_results.log
-    if [[ $? = 0 ]]; then
-	finalstatus=PASS
-    else
-	finalstatus=FAIL
-    fi
-    megatest -test-status :state COMPLETED :status $finalstatus -setlog final_results.html
-fi

DELETED tests/fullrun/tests/manual_example/testconfig
Index: tests/fullrun/tests/manual_example/testconfig
==================================================================
--- tests/fullrun/tests/manual_example/testconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-[setup]
-
-[ezsteps]
-setup ./runsetupxterm.sh
-# launch launchxterm
-
-[test_meta]
-author matt
-owner  bob
-description This test runs a single ezstep which is expected to pass\
- using a simple logpro file.
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/neverrun/testconfig
Index: tests/fullrun/tests/neverrun/testconfig
==================================================================
--- tests/fullrun/tests/neverrun/testconfig
+++ /dev/null
@@ -1,4 +0,0 @@
-[setup]
-runscript idontexist
-
-

DELETED tests/fullrun/tests/no_items/testconfig
Index: tests/fullrun/tests/no_items/testconfig
==================================================================
--- tests/fullrun/tests/no_items/testconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[ezsteps]
-listfiles ls
-
-[items]
-FOO
-
-[test_meta]
-author matt
-owner  bob
-description This test runs a single ezstep which is expected to pass \
-but there is an items definition with no items. This should evoke an \
-error.
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/priority_1/main.sh
Index: tests/fullrun/tests/priority_1/main.sh
==================================================================
--- tests/fullrun/tests/priority_1/main.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 2
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-
-exit 0

DELETED tests/fullrun/tests/priority_1/testconfig
Index: tests/fullrun/tests/priority_1/testconfig
==================================================================
--- tests/fullrun/tests/priority_1/testconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-[setup]
-runscript main.sh
-
-[requirements]
-priority 1
-
-[test_meta]
-jobgroup sqlite3
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt
-
-[triggers]
-COMPLETED/   echo "trigger: priority_1, COMPLETED/" >> $MT_RUN_AREA_HOME/triggers_$MT_RUN_NAME.dat

DELETED tests/fullrun/tests/priority_10/main.sh
Index: tests/fullrun/tests/priority_10/main.sh
==================================================================
--- tests/fullrun/tests/priority_10/main.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 2
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-
-exit 0

DELETED tests/fullrun/tests/priority_10/testconfig
Index: tests/fullrun/tests/priority_10/testconfig
==================================================================
--- tests/fullrun/tests/priority_10/testconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-[setup]
-runscript main.sh
-
-[requirements]
-priority 10
-
-[test_meta]
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/priority_10_waiton_1/main.sh
Index: tests/fullrun/tests/priority_10_waiton_1/main.sh
==================================================================
--- tests/fullrun/tests/priority_10_waiton_1/main.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 2
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-
-exit 0

DELETED tests/fullrun/tests/priority_10_waiton_1/testconfig
Index: tests/fullrun/tests/priority_10_waiton_1/testconfig
==================================================================
--- tests/fullrun/tests/priority_10_waiton_1/testconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-[setup]
-runscript main.sh
-
-[requirements]
-priority 10
-waiton priority_1
-
-[test_meta]
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/priority_2/main.sh
Index: tests/fullrun/tests/priority_2/main.sh
==================================================================
--- tests/fullrun/tests/priority_2/main.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 5
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-
-exit 0

DELETED tests/fullrun/tests/priority_2/testconfig
Index: tests/fullrun/tests/priority_2/testconfig
==================================================================
--- tests/fullrun/tests/priority_2/testconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-[setup]
-runscript main.sh
-
-[requirements]
-priority 2
-# runtimelim 1d 1h 1m 10s
-runtimelim 20s
-
-[test_meta]
-jobgroup sqlite3
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/priority_3/README
Index: tests/fullrun/tests/priority_3/README
==================================================================
--- tests/fullrun/tests/priority_3/README
+++ /dev/null
@@ -1,3 +0,0 @@
-This test used to look for envfile.txt but that file should NOT have been there.
-
-By changing to lookithome.log it is possible that an error is masked.

DELETED tests/fullrun/tests/priority_3/main.sh
Index: tests/fullrun/tests/priority_3/main.sh
==================================================================
--- tests/fullrun/tests/priority_3/main.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/bash
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 2
-  echo "
      Results$i
      Nothing but faux results here!" > results$i.html
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-
-# get a previous test
-export EZFAILPATH=`$MT_MEGATEST -test-files lookithome.log -target $MT_TARGET :runname $MT_RUNNAME -testpatt ez_fail`
-if [[ -e $EZFAILPATH ]];then
-  echo All good!
-else
-  echo NOT good!
-  exit 1
-fi
-
-exit 0

DELETED tests/fullrun/tests/priority_3/testconfig
Index: tests/fullrun/tests/priority_3/testconfig
==================================================================
--- tests/fullrun/tests/priority_3/testconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[setup]
-runscript main.sh
-
-[requirements]
-priority 3
-
-
-[test_meta]
-jobgroup sqlite3
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/priority_4/main.sh
Index: tests/fullrun/tests/priority_4/main.sh
==================================================================
--- tests/fullrun/tests/priority_4/main.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 2
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-
-exit 0

DELETED tests/fullrun/tests/priority_4/testconfig
Index: tests/fullrun/tests/priority_4/testconfig
==================================================================
--- tests/fullrun/tests/priority_4/testconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-[setup]
-runscript main.sh
-
-[requirements]
-priority 4
-
-[test_meta]
-jobgroup sqlite3
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/priority_5/main.sh
Index: tests/fullrun/tests/priority_5/main.sh
==================================================================
--- tests/fullrun/tests/priority_5/main.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 2
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-
-exit 0

DELETED tests/fullrun/tests/priority_5/testconfig
Index: tests/fullrun/tests/priority_5/testconfig
==================================================================
--- tests/fullrun/tests/priority_5/testconfig
+++ /dev/null
@@ -1,16 +0,0 @@
-[setup]
-runscript main.sh
-
-[requirements]
-priority 5
-
-[skip]
-prevrunning #t
-
-[test_meta]
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/priority_6/main.sh
Index: tests/fullrun/tests/priority_6/main.sh
==================================================================
--- tests/fullrun/tests/priority_6/main.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 2
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-
-exit 0

DELETED tests/fullrun/tests/priority_6/testconfig
Index: tests/fullrun/tests/priority_6/testconfig
==================================================================
--- tests/fullrun/tests/priority_6/testconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-[setup]
-runscript main.sh
-
-[requirements]
-priority 6
-
-[test_meta]
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/priority_7/main.sh
Index: tests/fullrun/tests/priority_7/main.sh
==================================================================
--- tests/fullrun/tests/priority_7/main.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 2
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-
-exit 0

DELETED tests/fullrun/tests/priority_7/testconfig
Index: tests/fullrun/tests/priority_7/testconfig
==================================================================
--- tests/fullrun/tests/priority_7/testconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-[setup]
-runscript main.sh
-
-[requirements]
-priority 7
-
-[skip]
-# Run only if this much time since last run of this test
-rundelay 10m 5s
-
-[test_meta]
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/priority_8/main.sh
Index: tests/fullrun/tests/priority_8/main.sh
==================================================================
--- tests/fullrun/tests/priority_8/main.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  echo "start step before $i: `date`"
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  echo "start step after $i: `date`"
-  sleep 2
-  echo "end step before $i: `date`"
-  $MT_MEGATEST -step step$i :state end :status 0
-  echo "end step after $i: `date`"
-done
-
-exit 0

DELETED tests/fullrun/tests/priority_8/testconfig
Index: tests/fullrun/tests/priority_8/testconfig
==================================================================
--- tests/fullrun/tests/priority_8/testconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-[setup]
-runscript main.sh
-
-[requirements]
-priority 8
-
-[test_meta]
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/priority_9/main.sh
Index: tests/fullrun/tests/priority_9/main.sh
==================================================================
--- tests/fullrun/tests/priority_9/main.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/bin/bash
-
-# a bunch of steps in 2 second increments
-for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
-  $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
-  sleep 2
-  $MT_MEGATEST -step step$i :state end :status 0
-done
-
-exit 0

DELETED tests/fullrun/tests/priority_9/testconfig
Index: tests/fullrun/tests/priority_9/testconfig
==================================================================
--- tests/fullrun/tests/priority_9/testconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-[setup]
-runscript main.sh
-
-[requirements]
-priority 9
-
-[test_meta]
-author matt
-owner  bob
-description This test checks that a multi-lineitem test with mix of pass and non-fail rolls up a PASS
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/runfirst/main.sh
Index: tests/fullrun/tests/runfirst/main.sh
==================================================================
--- tests/fullrun/tests/runfirst/main.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-# (export DISPLAY=:0;xterm) 
-
-# megatest -step wasting_time :state start :status n/a -m "This is a test step comment"
-# sleep 20
-# megatest -step wasting_time :state end :status $?
-
-touch ../I_was_here
-mkdir -p $MT_RUN_AREA_HOME/tmp/$USER/$sysname/$fsname/$datapath/$MT_RUNNAME
-echo 1 2 3 4 5 > $MT_RUN_AREA_HOME/tmp/$USER/$sysname/$fsname/$datapath/$MT_RUNNAME/the_ans
-
-$MT_MEGATEST -runstep wasting_time -logpro wasting_time.logpro "sleep 8;echo all done eh?" -m "This is a test step comment"
-
-$MT_MEGATEST -load-test-data << EOF
-foo,bar,1.2,1.9,>
-foo,rab,1.0e9,10e9,1e9
-foo,bla,1.2,1.9,<
-foo,bal,1.2,1.2,<,,Check for overload
-foo,alb,1.2,1.2,<=,Amps,This is the high power circuit test
-foo,abl,1.2,1.3,0.1
-foo,bra,1.2,pass,silly stuff
-faz,bar,10,8mA,,,"this is a comment"
-EOF
-
-$MT_MEGATEST -load-test-data << EOF
-cat,  var, val, exp, comp, units, comment, status, type
-ameas,iout,1.2,1.9,>,Amps,Comment,,meas
-EOF
-loadstatus=$?
-
-if [[ `basename $PWD` == "mustfail" ]];then
-  $MT_MEGATEST -test-status :state COMPLETED :status FAIL
-else
-  $MT_MEGATEST -test-status :state COMPLETED :status $loadstatus -m "This is a test level comment" :value 10e6 :expected_value 1.1e6 :tol 100e3 :category nada :variable sillyvar :units mFarks :comment "This is the value/expected comment"
-fi
-
-env > envfile.txt
-
-# $MT_MEGATEST -test-status :state COMPLETED :status FAIL

DELETED tests/fullrun/tests/runfirst/testconfig
Index: tests/fullrun/tests/runfirst/testconfig
==================================================================
--- tests/fullrun/tests/runfirst/testconfig
+++ /dev/null
@@ -1,24 +0,0 @@
-[setup]
-runscript main.sh
-
-[pre-launch-env-vars]
-# These are set before the test is launched on the originating
-# host. This can be used to control remote launch tools, e.g. to
-# to choose the target host, select the launch tool etc.
-SPECIAL_ENV_VAR override with everything after the first space.
-
-[items]
-SEASON summer winter fall spring 
-
-[itemstable]
-BLOCK a  b
-TOCK  1  2
-
-[test_meta]
-author matt
-owner  bob
-description This test must\
- be run before the other tests
-
-tags first,single
-reviewed 1/1/1965

DELETED tests/fullrun/tests/runfirst/wasting_time.logpro
Index: tests/fullrun/tests/runfirst/wasting_time.logpro
==================================================================
--- tests/fullrun/tests/runfirst/wasting_time.logpro
+++ /dev/null
@@ -1,15 +0,0 @@
-;; put stuff here
-
-;; NOTE: This is not legit logpro code!!! 
-
-;; Test for 0=PASS, 1=WARN, >2 = FAIL
-
-;; (define season (get-environment-variable "SEASON"))
-;; 
-;; (exit 
-;;  (case (string->symbol season)
-;;    ((summer) 0)
-;;    ((winter) 1)
-;;    ((fall)   2)
-;;    (else     0)))
-

DELETED tests/fullrun/tests/singletest/main.sh
Index: tests/fullrun/tests/singletest/main.sh
==================================================================
--- tests/fullrun/tests/singletest/main.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# megatest -step wasting_time :state start :status n/a -m "This is a test step comment"
-# sleep 20
-# megatest -step wasting_time :state end :status $?
-
-$MT_MEGATEST -runstep wasting_time -logpro wasting_time.logpro "sleep 5;echo alldone" -m "This is a test step comment"
-
-$MT_MEGATEST -test-status :state COMPLETED :status $? -m "This is a test level comment" -set-toplog the_top_log.html :first_err "This is the first error"

DELETED tests/fullrun/tests/singletest/testconfig
Index: tests/fullrun/tests/singletest/testconfig
==================================================================
--- tests/fullrun/tests/singletest/testconfig
+++ /dev/null
@@ -1,13 +0,0 @@
-[setup]
-runscript main.sh
-
-[requirements]
-diskspace 1M
-memory    1G
-
-[pre-launch-env-vars]
-# These are set before the test is launched on the originating
-# host. This can be used to control remote launch tools, e.g. to
-# to choose the target host, select the launch tool etc.
-SPECIAL_ENV_VAR override with everything after the first space.
-

DELETED tests/fullrun/tests/singletest/wasting_time.logpro
Index: tests/fullrun/tests/singletest/wasting_time.logpro
==================================================================
--- tests/fullrun/tests/singletest/wasting_time.logpro
+++ /dev/null
@@ -1,15 +0,0 @@
-;; put stuff here
-
-;; NOTE: This is not legit logpro code!!! 
-
-;; Test for 0=PASS, 1=WARN, >2 = FAIL
-
-;; (define season (get-environment-variable "SEASON"))
-;; 
-;; (exit 
-;;  (case (string->symbol season)
-;;    ((summer) 0)
-;;    ((winter) 1)
-;;    ((fall)   2)
-;;    (else     0)))
-

DELETED tests/fullrun/tests/singletest2/main.sh
Index: tests/fullrun/tests/singletest2/main.sh
==================================================================
--- tests/fullrun/tests/singletest2/main.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/bash
-
-# megatest -step wasting_time :state start :status n/a -m "This is a test step comment"
-# sleep 20
-# megatest -step wasting_time :state end :status $?
-
-$MT_MEGATEST -runstep wasting_time -logpro wasting_time.logpro "sleep 5;echo all done eh?" -m "This is a test step comment"
-
-$MT_MEGATEST -test-status :state COMPLETED :status $? -m "This is a test level comment" -set-toplog the_top_log.html :first_warn "This is the first warning"

DELETED tests/fullrun/tests/singletest2/testconfig
Index: tests/fullrun/tests/singletest2/testconfig
==================================================================
--- tests/fullrun/tests/singletest2/testconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-[setup]
-runscript main.sh
-
-[requirements]
-diskspace 1M
-memory    1G
-waiton singletest
-
-[pre-launch-env-vars]
-# These are set before the test is launched on the originating
-# host. This can be used to control remote launch tools, e.g. to
-# to choose the target host, select the launch tool etc.
-SPECIAL_ENV_VAR override with everything after the first space.
-

DELETED tests/fullrun/tests/singletest2/wasting_time.logpro
Index: tests/fullrun/tests/singletest2/wasting_time.logpro
==================================================================
--- tests/fullrun/tests/singletest2/wasting_time.logpro
+++ /dev/null
@@ -1,15 +0,0 @@
-;; put stuff here
-
-;; NOTE: This is not legit logpro code!!! 
-
-;; Test for 0=PASS, 1=WARN, >2 = FAIL
-
-;; (define season (get-environment-variable "SEASON"))
-;; 
-;; (exit 
-;;  (case (string->symbol season)
-;;    ((summer) 0)
-;;    ((winter) 1)
-;;    ((fall)   2)
-;;    (else     0)))
-

DELETED tests/fullrun/tests/special/testconfig
Index: tests/fullrun/tests/special/testconfig
==================================================================
--- tests/fullrun/tests/special/testconfig
+++ /dev/null
@@ -1,8 +0,0 @@
-[ezsteps]
-# calcresults megatest -list-runs $MT_RUNNAME -target $MT_TARGET
-
-[requirements]
-waiton #{rget TESTSTORUN}
-
-# This is a "toplevel" test, it does not require waitons to be non-FAIL to run
-mode toplevel

DELETED tests/fullrun/tests/sqlitespeed/runscript.rb
Index: tests/fullrun/tests/sqlitespeed/runscript.rb
==================================================================
--- tests/fullrun/tests/sqlitespeed/runscript.rb
+++ /dev/null
@@ -1,38 +0,0 @@
-#! /usr/bin/env ruby
-
-require "#{ENV['MT_RUN_AREA_HOME']}/../resources/ruby/librunscript.rb"
-
-# run_record(stepname, cmd) - will record in db if exit code of script was zero or not
-run_and_record('create db',"sqlite3 testing.db << EOF\ncreate table if not exists blah(id INTEGER PRIMARY KEY,name TEXT);\n.q\nEOF","")
-
-if (! File.exists?("../../runfirst/I_was_here"))
-    puts "ERROR: This test was started before the prerequisites ran!"
-    system "megatest -test-status :state INCOMPLETE :status FAIL"
-    exit 1
-end
-
-# file_size_checker(stepname, filename, minsize, maxsize) - negative means ignore
-# file_size_checker('create db','testing.db',100,-1)
-
-num_records=rand(5) # 0000
-record_step("add #{num_records}","start","n/a")
-status=false
-(0..num_records).each do |i|
-  randstring="abc";
-  # "a;lskdfja;sdfj;alsdfj;aslfdj;alsfja;lsfdj;alsfja;lsjfd;lasfjl;asdfja;slfj;alsjf;asljf;alsjf;lasdjf;lasjf;lasjf;alsjf;lashflkashflkerhflkdsvnlasldhlfaldf"
-  # status=system "sqlite3 testing.db \"insert into blah (name) values ('#{randstring}');\""
-  system "megatest -step testing :state wrote_junk :status #{num_records}"
-  sleep(5)
-  puts "i=#{i}"
-end
-if status==0
-  status='pass'
-else
-  status='fail'
-end
-
-record_step("add #{num_records}","end",status)
-
-
-
-

DELETED tests/fullrun/tests/sqlitespeed/testconfig
Index: tests/fullrun/tests/sqlitespeed/testconfig
==================================================================
--- tests/fullrun/tests/sqlitespeed/testconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-[setup]
-runscript runscript.rb
-tags non important,dumb junk
-
-[requirements]
-waiton    runfirst
-
-[items]
-MANYITEMS [system (env > envfile.txt;echo aa ab ac ad ae af ag ah ai)]
-# BORKED  
-
-[test_meta]
-jobgroup sqlite3
-tags quick
-

DELETED tests/fullrun/tests/test_mt_vars/altvarnotset.logpro
Index: tests/fullrun/tests/test_mt_vars/altvarnotset.logpro
==================================================================
--- tests/fullrun/tests/test_mt_vars/altvarnotset.logpro
+++ /dev/null
@@ -1,1 +0,0 @@
-(expect:error in "LogFileBody" = 0 "a file that should never exist" #/what a dumb filename this is/)

DELETED tests/fullrun/tests/test_mt_vars/altvarnotset.sh
Index: tests/fullrun/tests/test_mt_vars/altvarnotset.sh
==================================================================
--- tests/fullrun/tests/test_mt_vars/altvarnotset.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-! grep ALT_VAR megatest.sh

DELETED tests/fullrun/tests/test_mt_vars/bogousnotset.logpro
Index: tests/fullrun/tests/test_mt_vars/bogousnotset.logpro
==================================================================
--- tests/fullrun/tests/test_mt_vars/bogousnotset.logpro
+++ /dev/null
@@ -1,1 +0,0 @@
-(expect:error in "LogFileBody" = 0 "a file that should never exist" #/what a dumb filename this is/)

DELETED tests/fullrun/tests/test_mt_vars/bogousnotset.sh
Index: tests/fullrun/tests/test_mt_vars/bogousnotset.sh
==================================================================
--- tests/fullrun/tests/test_mt_vars/bogousnotset.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-! grep BOGOUS megatest.sh

DELETED tests/fullrun/tests/test_mt_vars/currentisblah.logpro
Index: tests/fullrun/tests/test_mt_vars/currentisblah.logpro
==================================================================
--- tests/fullrun/tests/test_mt_vars/currentisblah.logpro
+++ /dev/null
@@ -1,1 +0,0 @@
-(expect:error in "LogFileBody" = 0 "a file that should never exist" #/what a dumb filename this is/)

DELETED tests/fullrun/tests/test_mt_vars/currentisblah.sh
Index: tests/fullrun/tests/test_mt_vars/currentisblah.sh
==================================================================
--- tests/fullrun/tests/test_mt_vars/currentisblah.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-grep -e '^export CURRENT' megatest.sh | grep /tmp/nada

DELETED tests/fullrun/tests/test_mt_vars/empty_var.logpro
Index: tests/fullrun/tests/test_mt_vars/empty_var.logpro
==================================================================
--- tests/fullrun/tests/test_mt_vars/empty_var.logpro
+++ /dev/null
@@ -1,1 +0,0 @@
-(expect:error in "LogFileBody" = 0 "a file that should never exist" #/what a dumb filename this is/)

DELETED tests/fullrun/tests/test_mt_vars/empty_var.sh
Index: tests/fullrun/tests/test_mt_vars/empty_var.sh
==================================================================
--- tests/fullrun/tests/test_mt_vars/empty_var.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-if [ x$EMPTY_VAR != "x" ];then
-  echo BAD EMPTY VAR!
-  exit 1
-fi

DELETED tests/fullrun/tests/test_mt_vars/eval_vars.sh
Index: tests/fullrun/tests/test_mt_vars/eval_vars.sh
==================================================================
--- tests/fullrun/tests/test_mt_vars/eval_vars.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/bin/bash
-
-if env | grep VARWITHDOLLARSIGNS | grep USER;then
-    exit 1 # fails!
-else
-    exit 0 # good!
-fi

DELETED tests/fullrun/tests/test_mt_vars/lookithome.logpro
Index: tests/fullrun/tests/test_mt_vars/lookithome.logpro
==================================================================
--- tests/fullrun/tests/test_mt_vars/lookithome.logpro
+++ /dev/null
@@ -1,1 +0,0 @@
-(expect:error in "LogFileBody" = 0 "a file that should never exist" #/what a dumb filename this is/)

DELETED tests/fullrun/tests/test_mt_vars/lookittmp.logpro
Index: tests/fullrun/tests/test_mt_vars/lookittmp.logpro
==================================================================
--- tests/fullrun/tests/test_mt_vars/lookittmp.logpro
+++ /dev/null
@@ -1,1 +0,0 @@
-(expect:error in "LogFileBody" = 0 "a file that should never exist" #/what a dumb filename this is/)

DELETED tests/fullrun/tests/test_mt_vars/test-path-file.sh
Index: tests/fullrun/tests/test_mt_vars/test-path-file.sh
==================================================================
--- tests/fullrun/tests/test_mt_vars/test-path-file.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/bin/bash
-
-
-# get a previous test
-export EZFAILPATH=`$MT_MEGATEST -test-files envfile.txt -target $MT_TARGET :runname $MT_RUNNAME -testpatt runfirst/a%`
-
-echo "Found |$EZFAILPATH|"
-
-if [ -e $EZFAILPATH ];then
-  echo All good!
-else
-  echo NOT good!
-  exit 1
-fi
-
-export EZFAILPATH2=`$MT_MEGATEST -test-paths -target $MT_TARGET :runname $MT_RUNNAME -testpatt runfirst/a%`
-
-echo "Found |$EZFAILPATH2|"
-
-if [ -e $EZFAILPATH2 ];then
-  echo All good!
-else
-  echo NOT good!
-  exit 1
-fi
-
-
-exit 0

DELETED tests/fullrun/tests/test_mt_vars/test-path.logpro
Index: tests/fullrun/tests/test_mt_vars/test-path.logpro
==================================================================
--- tests/fullrun/tests/test_mt_vars/test-path.logpro
+++ /dev/null
@@ -1,1 +0,0 @@
-(expect:error in "LogFileBody" = 0 "a file that should never exist" #/what a dumb filename this is/)

DELETED tests/fullrun/tests/test_mt_vars/testconfig
Index: tests/fullrun/tests/test_mt_vars/testconfig
==================================================================
--- tests/fullrun/tests/test_mt_vars/testconfig
+++ /dev/null
@@ -1,58 +0,0 @@
-[setup]
-
-[ezsteps]
-lookittmp   ls /tmp
-lookithome  ls /home
-# $CURRENT should be /tmp/nada
-currentisblah currentisblah.sh
-
-# $BOGOUS should NOT be set
-bogousnotset bogousnotset.sh
-
-# ALT_VAR should NOT be set
-altvarnotset altvarnotset.sh
-
-# EMPTY_VAR should be an empty string
-empty_var empty_var.sh
-
-# VACKYVAR should be set to a path
-vackyvar vackyvar.sh
-
-# test-path and test-file
-test-path test-path-file.sh
-
-# verify that vars with $ signs get expanded
-varwithdollar eval_vars.sh
-
-emptyvars bash -c 'if [[ $VARNOVAL == "" ]];then echo HAVE_VARNOVAL;else echo "ERROR: VARNOVAL not found";fi'
-emptyvar_withspace bash -c 'if [[ $VARNOVAL_WITHSPACE == "" ]];then echo HAVE_VARNOVAL_WITHSPACE;else echo "ERROR: VARNOVAL_WITHSPACE not found";fi'
-emptyvar_megatest.sh egrep VARNO megatest.sh
-
-[requirements]
-waiton runfirst
-priority 0
-
-[items]
-NUMNUM [system cat $MT_RUN_AREA_HOME/tmp/$USER/$sysname/$fsname/$datapath/$MT_RUNNAME/$PREDICTABLE]
-
-[logpro]
-emptyvars ;;
-  (expect:error in "LogFileBody" = 0 "VARNOVAL not found" #/ERROR: VARNOVAL not found/)
-  (expect:required in "LogFileBody" = 1 "HAVE_VARNOVAL"   #/HAVE_VARNOVAL/)
-
-emptyvar_withspace ;;
-  (expect:error in "LogFileBody" = 0 "VARNOVAL_WITHSPACE not found" #/ERROR: VARNOVAL_WITHSPACE not found/)
-  (expect:required in "LogFileBody" = 1 "HAVE_VARNOVAL_WITHSPACE"   #/HAVE_VARNOVAL_WITHSPACE/)
-
-emptyvar_megatest.sh ;;
-  (expect:error in "LogFileBody" = 0 "No errors expected" #/ERR/i)
-  (expect:required in "LogFileBody" = 1 "VARNOVAL_WITHSPACE"  #/VARNOVAL_WITHSPACE/)
-  (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.
-
-tags quick,first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/test_mt_vars/vackyvar.logpro
Index: tests/fullrun/tests/test_mt_vars/vackyvar.logpro
==================================================================
--- tests/fullrun/tests/test_mt_vars/vackyvar.logpro
+++ /dev/null
@@ -1,1 +0,0 @@
-(expect:error in "LogFileBody" = 0 "a file that should never exist" #/what a dumb filename this is/)

DELETED tests/fullrun/tests/test_mt_vars/vackyvar.sh
Index: tests/fullrun/tests/test_mt_vars/vackyvar.sh
==================================================================
--- tests/fullrun/tests/test_mt_vars/vackyvar.sh
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/env bash
-
-grep VACKYVAR megatest.sh | grep fullrun

DELETED tests/fullrun/tests/test_mt_vars/varwithdollar.logpro
Index: tests/fullrun/tests/test_mt_vars/varwithdollar.logpro
==================================================================
--- tests/fullrun/tests/test_mt_vars/varwithdollar.logpro
+++ /dev/null
@@ -1,1 +0,0 @@
-(expect:error in "LogFileBody" = 0 "a file that should never exist" #/what a dumb filename this is/)

DELETED tests/fullrun/tests/testxz/testconfig
Index: tests/fullrun/tests/testxz/testconfig
==================================================================
--- tests/fullrun/tests/testxz/testconfig
+++ /dev/null
@@ -1,15 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-listfiles ls
-
-# Test requirements are specified here
-[requirements]
-waiton blocktestxz
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author mrwellan
-owner  mrwellan
-description This test should never get run due to blocktestxz failing
-tags tagone,tagtwo
-reviewed never

DELETED tests/fullrun/tests/wait_no_items1/testconfig
Index: tests/fullrun/tests/wait_no_items1/testconfig
==================================================================
--- tests/fullrun/tests/wait_no_items1/testconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-[ezsteps]
-listfiles ls
-
-[requirements]
-waiton no_items
-
-[items]
-
-[test_meta]
-author matt
-owner  bob
-description This test runs a single ezstep which is expected to pass \
-but there is an items definition with no items. This should evoke an \
-error.
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/wait_no_items2/testconfig
Index: tests/fullrun/tests/wait_no_items2/testconfig
==================================================================
--- tests/fullrun/tests/wait_no_items2/testconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-[ezsteps]
-listfiles ls
-
-[requirements]
-waiton wait_no_items1
-
-[items]
-
-[test_meta]
-author matt
-owner  bob
-description This test runs a single ezstep which is expected to pass \
-but there is an items definition with no items. This should evoke an \
-error.
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/wait_no_items3/testconfig
Index: tests/fullrun/tests/wait_no_items3/testconfig
==================================================================
--- tests/fullrun/tests/wait_no_items3/testconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-[ezsteps]
-listfiles ls
-
-[requirements]
-waiton wait_no_items2
-
-[items]
-
-[test_meta]
-author matt
-owner  bob
-description This test runs a single ezstep which is expected to pass \
-but there is an items definition with no items. This should evoke an \
-error.
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/fullrun/tests/wait_no_items4/testconfig
Index: tests/fullrun/tests/wait_no_items4/testconfig
==================================================================
--- tests/fullrun/tests/wait_no_items4/testconfig
+++ /dev/null
@@ -1,17 +0,0 @@
-[ezsteps]
-listfiles ls
-
-[requirements]
-waiton wait_no_items3
-
-[items]
-
-[test_meta]
-author matt
-owner  bob
-description This test runs a single ezstep which is expected to pass \
-but there is an items definition with no items. This should evoke an \
-error.
-
-tags first,single
-reviewed 09/10/2011, by Matt

DELETED tests/installall/config/megatest.config.dat
Index: tests/installall/config/megatest.config.dat
==================================================================
--- tests/installall/config/megatest.config.dat
+++ /dev/null
@@ -1,1 +0,0 @@
-../megatest.config

DELETED tests/installall/config/runconfigs.config.dat
Index: tests/installall/config/runconfigs.config.dat
==================================================================
--- tests/installall/config/runconfigs.config.dat
+++ /dev/null
@@ -1,1 +0,0 @@
-../runconfigs.config

DELETED tests/installall/config/sheet-names.cfg
Index: tests/installall/config/sheet-names.cfg
==================================================================
--- tests/installall/config/sheet-names.cfg
+++ /dev/null
@@ -1,2 +0,0 @@
-megatest.config
-runconfigs.config

DELETED tests/installall/config/sxml/_sheets.sxml
Index: tests/installall/config/sxml/_sheets.sxml
==================================================================
--- tests/installall/config/sxml/_sheets.sxml
+++ /dev/null
@@ -1,51 +0,0 @@
-((@ (http://www.w3.org/2001/XMLSchema-instance:schemaLocation
-      "http://www.gnumeric.org/v9.xsd"))
- (http://www.gnumeric.org/v10.dtd:Version
-   (@ (Minor "17") (Major "10") (Full "1.10.17") (Epoch "1")))
- (http://www.gnumeric.org/v10.dtd:Attributes
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name
-       "WorkbookView::show_horizontal_scrollbar")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name
-       "WorkbookView::show_vertical_scrollbar")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name "WorkbookView::show_notebook_tabs")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name "WorkbookView::do_auto_completion")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name "WorkbookView::is_protected")
-     (http://www.gnumeric.org/v10.dtd:value "FALSE")))
- (urn:oasis:names:tc:opendocument:xmlns:office:1.0:document-meta
-   (@ (urn:oasis:names:tc:opendocument:xmlns:office:1.0:version "1.2"))
-   (urn:oasis:names:tc:opendocument:xmlns:office:1.0:meta
-     (http://purl.org/dc/elements/1.1/:date "2013-07-21T23:45:07Z")
-     (urn:oasis:names:tc:opendocument:xmlns:meta:1.0:creation-date
-       "2013-07-21T23:42:35Z")))
- (http://www.gnumeric.org/v10.dtd:Calculation
-   (@ (MaxIterations "100")
-      (ManualRecalc "0")
-      (IterationTolerance "0.001")
-      (FloatRadix "2")
-      (FloatDigits "53")
-      (EnableIteration "1")))
- (http://www.gnumeric.org/v10.dtd:SheetNameIndex
-   (http://www.gnumeric.org/v10.dtd:SheetName
-     (@ (http://www.gnumeric.org/v10.dtd:Rows "65536")
-        (http://www.gnumeric.org/v10.dtd:Cols "256"))
-     "megatest.config")
-   (http://www.gnumeric.org/v10.dtd:SheetName
-     (@ (http://www.gnumeric.org/v10.dtd:Rows "65536")
-        (http://www.gnumeric.org/v10.dtd:Cols "256"))
-     "runconfigs.config"))
- (http://www.gnumeric.org/v10.dtd:Geometry (@ (Width "1440") (Height "647")))
- (http://www.gnumeric.org/v10.dtd:UIData (@ (SelectedTab "0"))))

DELETED tests/installall/config/sxml/_workbook.sxml
Index: tests/installall/config/sxml/_workbook.sxml
==================================================================
--- tests/installall/config/sxml/_workbook.sxml
+++ /dev/null
@@ -1,1 +0,0 @@
-(*TOP* (*PI* xml "version=\"1.0\" encoding=\"UTF-8\""))

DELETED tests/installall/config/sxml/megatest.config.sxml
Index: tests/installall/config/sxml/megatest.config.sxml
==================================================================
--- tests/installall/config/sxml/megatest.config.sxml
+++ /dev/null
@@ -1,108 +0,0 @@
-(http://www.gnumeric.org/v10.dtd:Sheet
-  (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
-     (OutlineSymbolsRight "1")
-     (OutlineSymbolsBelow "1")
-     (HideZero "0")
-     (HideRowHeader "0")
-     (HideGrid "0")
-     (HideColHeader "0")
-     (GridColor "0:0:0")
-     (DisplayOutlines "1")
-     (DisplayFormulas "0"))
-  (http://www.gnumeric.org/v10.dtd:MaxCol "5")
-  (http://www.gnumeric.org/v10.dtd:MaxRow "7")
-  (http://www.gnumeric.org/v10.dtd:Zoom "1")
-  (http://www.gnumeric.org/v10.dtd:Names
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Print_Area")
-      (http://www.gnumeric.org/v10.dtd:value "#REF!")
-      (http://www.gnumeric.org/v10.dtd:position "A1"))
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Sheet_Title")
-      (http://www.gnumeric.org/v10.dtd:value "\"megatest.config\"")
-      (http://www.gnumeric.org/v10.dtd:position "A1")))
-  (http://www.gnumeric.org/v10.dtd:PrintInformation
-    (http://www.gnumeric.org/v10.dtd:Margins
-      (http://www.gnumeric.org/v10.dtd:top (@ (PrefUnit "mm") (Points "120")))
-      (http://www.gnumeric.org/v10.dtd:bottom
-        (@ (PrefUnit "mm") (Points "120")))
-      (http://www.gnumeric.org/v10.dtd:left (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:right (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:header
-        (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:footer
-        (@ (PrefUnit "mm") (Points "72"))))
-    (http://www.gnumeric.org/v10.dtd:Scale
-      (@ (type "percentage") (percentage "100")))
-    (http://www.gnumeric.org/v10.dtd:vcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:hcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:grid (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:even_if_only_styles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:monochrome (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:draft (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:titles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:do_not_print (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:print_range (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:order "d_then_r")
-    (http://www.gnumeric.org/v10.dtd:orientation "portrait")
-    (http://www.gnumeric.org/v10.dtd:Header
-      (@ (Right "") (Middle "&[TAB]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:Footer
-      (@ (Right "") (Middle "Page &[PAGE]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:paper "na_letter")
-    (http://www.gnumeric.org/v10.dtd:comments "in_place")
-    (http://www.gnumeric.org/v10.dtd:errors "as_displayed"))
-  (http://www.gnumeric.org/v10.dtd:Styles
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "0") (endRow "65535") (endCol "255"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans"))))
-  (http://www.gnumeric.org/v10.dtd:Cols
-    (@ (DefaultSizePts "48"))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "112.5") (No "0") (HardSize "1")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "48") (No "1")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "63.75") (No "2") (HardSize "1")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "48") (No "3")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "86.25") (No "4") (HardSize "1")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "48") (No "5"))))
-  (http://www.gnumeric.org/v10.dtd:Rows
-    (@ (DefaultSizePts "12.75"))
-    (http://www.gnumeric.org/v10.dtd:RowInfo
-      (@ (Unit "12.75") (No "0") (Count "8"))))
-  (http://www.gnumeric.org/v10.dtd:Selections
-    (@ (CursorRow "0") (CursorCol "0"))
-    (http://www.gnumeric.org/v10.dtd:Selection
-      (@ (startRow "0") (startCol "0") (endRow "0") (endCol "0"))))
-  (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A1")))
-  (http://www.gnumeric.org/v10.dtd:Solver
-    (@ (ProgramR "0")
-       (ProblemType "0")
-       (NonNeg "1")
-       (ModelType "0")
-       (MaxTime "60")
-       (MaxIter "1000")
-       (Discr "0")
-       (AutoScale "0"))))

DELETED tests/installall/config/sxml/runconfigs.config.sxml
Index: tests/installall/config/sxml/runconfigs.config.sxml
==================================================================
--- tests/installall/config/sxml/runconfigs.config.sxml
+++ /dev/null
@@ -1,111 +0,0 @@
-(http://www.gnumeric.org/v10.dtd:Sheet
-  (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
-     (OutlineSymbolsRight "1")
-     (OutlineSymbolsBelow "1")
-     (HideZero "0")
-     (HideRowHeader "0")
-     (HideGrid "0")
-     (HideColHeader "0")
-     (GridColor "0:0:0")
-     (DisplayOutlines "1")
-     (DisplayFormulas "0"))
-  (http://www.gnumeric.org/v10.dtd:MaxCol "3")
-  (http://www.gnumeric.org/v10.dtd:MaxRow "7")
-  (http://www.gnumeric.org/v10.dtd:Zoom "1")
-  (http://www.gnumeric.org/v10.dtd:Names
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Print_Area")
-      (http://www.gnumeric.org/v10.dtd:value "#REF!")
-      (http://www.gnumeric.org/v10.dtd:position "A1"))
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Sheet_Title")
-      (http://www.gnumeric.org/v10.dtd:value "\"runconfigs.config\"")
-      (http://www.gnumeric.org/v10.dtd:position "A1")))
-  (http://www.gnumeric.org/v10.dtd:PrintInformation
-    (http://www.gnumeric.org/v10.dtd:Margins
-      (http://www.gnumeric.org/v10.dtd:top (@ (PrefUnit "mm") (Points "120")))
-      (http://www.gnumeric.org/v10.dtd:bottom
-        (@ (PrefUnit "mm") (Points "120")))
-      (http://www.gnumeric.org/v10.dtd:left (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:right (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:header
-        (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:footer
-        (@ (PrefUnit "mm") (Points "72"))))
-    (http://www.gnumeric.org/v10.dtd:Scale
-      (@ (type "percentage") (percentage "100")))
-    (http://www.gnumeric.org/v10.dtd:vcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:hcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:grid (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:even_if_only_styles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:monochrome (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:draft (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:titles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:do_not_print (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:print_range (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:order "d_then_r")
-    (http://www.gnumeric.org/v10.dtd:orientation "portrait")
-    (http://www.gnumeric.org/v10.dtd:Header
-      (@ (Right "") (Middle "&[TAB]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:Footer
-      (@ (Right "") (Middle "Page &[PAGE]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:paper "na_letter")
-    (http://www.gnumeric.org/v10.dtd:comments "in_place")
-    (http://www.gnumeric.org/v10.dtd:errors "as_displayed"))
-  (http://www.gnumeric.org/v10.dtd:Styles
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "0") (endRow "65535") (endCol "255"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans"))))
-  (http://www.gnumeric.org/v10.dtd:Cols
-    (@ (DefaultSizePts "48"))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "108.8") (No "0") (HardSize "1")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "97.5") (No "1") (HardSize "1")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "100.5") (No "2") (HardSize "1") (Count "2"))))
-  (http://www.gnumeric.org/v10.dtd:Rows
-    (@ (DefaultSizePts "12.75"))
-    (http://www.gnumeric.org/v10.dtd:RowInfo
-      (@ (Unit "13.5") (No "0") (Count "2")))
-    (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "12.75") (No "2")))
-    (http://www.gnumeric.org/v10.dtd:RowInfo
-      (@ (Unit "13.5") (No "3") (Count "2")))
-    (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "12.75") (No "5")))
-    (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "13.5") (No "6")))
-    (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "12.75") (No "7"))))
-  (http://www.gnumeric.org/v10.dtd:Selections
-    (@ (CursorRow "7") (CursorCol "3"))
-    (http://www.gnumeric.org/v10.dtd:Selection
-      (@ (startRow "7") (startCol "3") (endRow "7") (endCol "3"))))
-  (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A1")))
-  (http://www.gnumeric.org/v10.dtd:Solver
-    (@ (ProgramR "0")
-       (ProblemType "0")
-       (NonNeg "1")
-       (ModelType "0")
-       (MaxTime "60")
-       (MaxIter "1000")
-       (Discr "0")
-       (AutoScale "0"))))

DELETED tests/installall/configs/chicken-4.8.0.4.config
Index: tests/installall/configs/chicken-4.8.0.4.config
==================================================================
--- tests/installall/configs/chicken-4.8.0.4.config
+++ /dev/null
@@ -1,1 +0,0 @@
-CHICKEN_URL http://code.call-cc.org/releases/4.8.0/chicken-4.8.0.4.tar.gz

DELETED tests/installall/configs/chicken-4.8.1.config
Index: tests/installall/configs/chicken-4.8.1.config
==================================================================
--- tests/installall/configs/chicken-4.8.1.config
+++ /dev/null
@@ -1,1 +0,0 @@
-CHICKEN_URL http://code.call-cc.org/dev-snapshots/2013/01/04/chicken-4.8.1.tar.gz

DELETED tests/installall/megatest.config
Index: tests/installall/megatest.config
==================================================================
--- tests/installall/megatest.config
+++ /dev/null
@@ -1,24 +0,0 @@
-[fields]
-CHICKEN_VERSION TEXT
-MEGATEST_VERSION TEXT
-IUPMODE TEXT
-BUILD_TAG TEXT
-
-[setup]
-max_concurrent_jobs 6
-linktree #{getenv MT_RUN_AREA_HOME}/links
-testcopycmd cp --remove-destination -rsv TEST_SRC_PATH/. TEST_TARG_PATH/. >> TEST_TARG_PATH/mt_launch.log 2>> TEST_TARG_PATH/mt_launch.log
-
-[jobtools]
-useshell yes
-launcher nbfind
-
-[env-override]
-EXAMPLE_VAR example value
-
-[server]
-port 9080
-
-[disks]
-disk0 #{getenv MT_RUN_AREA_HOME}/runs
-

DELETED tests/installall/runconfigs.config
Index: tests/installall/runconfigs.config
==================================================================
--- tests/installall/runconfigs.config
+++ /dev/null
@@ -1,38 +0,0 @@
-[.............]
-#
-# [CHICKEN_VERSION/MEGATEST_VERSION/IUPMODE/PLATFORM/BUILD_TAG]
-#
-
-[default]
-ALLTESTS see this variable
-PREFIX #{getenv MT_RUN_AREA_HOME}/#{getenv BUILD_TAG}/#{getenv MT_RUNNAME}
-DOWNLOADS #{getenv MT_RUN_AREA_HOME}/downloads
-IUPLIB 26g4
-PLATFORM linux
-LOGPRO_VERSION v1.05
-BUILDSQLITE yes
-SQLITE3_VERSION 3071401
-ZEROMQ_VERSION  2.2.0
-logpro_VERSION v1.08
-stml_VERSION v0.901
-megatest_VERSION v1.5511
-
-[include configs/hicken-#{getenv CHICKEN_VERSION}.config]
-
-# Currently must have at least one variable in a section
-[4.8.0/trunk/bin/std]
-IUP_VERSION na
-
-[4.8.0.4/trunk/src/std]
-CHICKEN_URL http://code.call-cc.org/releases/4.8.0/chicken-4.8.0.4.tar.gz
-IUP_VERSION na
-
-[4.8.1/trunk/src/std]
-IUP_VERSION na
-
-[4.8.0/v1.5508/opt]
-IUP_VERSION na
-PREFIX /opt/chicken/4.8.0
-
-[4.8.0/trunk/centos5.7vm]
-BUILDSQLITE no

DELETED tests/installall/tests/canvas-draw/install.logpro
Index: tests/installall/tests/canvas-draw/install.logpro
==================================================================
--- tests/installall/tests/canvas-draw/install.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/canvas-draw/install.sh
Index: tests/installall/tests/canvas-draw/install.sh
==================================================================
--- tests/installall/tests/canvas-draw/install.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh

DELETED tests/installall/tests/canvas-draw/testconfig
Index: tests/installall/tests/canvas-draw/testconfig
==================================================================
--- tests/installall/tests/canvas-draw/testconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-install install.sh
-
-# Test requirements are specified here
-[requirements]
-waiton iuplib setup
-
-# Iteration for your tests are controlled by the items section
-[items]
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Install the canvas-draw egg
-tags tagone,tagtwo
-reviewed never

DELETED tests/installall/tests/chicken/compile.logpro
Index: tests/installall/tests/chicken/compile.logpro
==================================================================
--- tests/installall/tests/chicken/compile.logpro
+++ /dev/null
@@ -1,10 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Leaving directory ..." #/Leaving directory/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:ignore   in "LogFileBody"  >= 0 "Ignore HAVE_STRERROR" #/HAVE_STRERROR/)
-
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/chicken/compile.sh
Index: tests/installall/tests/chicken/compile.sh
==================================================================
--- tests/installall/tests/chicken/compile.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh
-
-cd chicken-${CHICKEN_VERSION}
-make PLATFORM=${PLATFORM} PREFIX=${PREFIX}

DELETED tests/installall/tests/chicken/download.logpro
Index: tests/installall/tests/chicken/download.logpro
==================================================================
--- tests/installall/tests/chicken/download.logpro
+++ /dev/null
@@ -1,11 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "README file must be seen" #/README$/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-
-(expect:ignore   in "LogFileBody"  >= 0 "Ignore error flagged by finalizer-error-test" #/\w+-error/)
-
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/chicken/download.sh
Index: tests/installall/tests/chicken/download.sh
==================================================================
--- tests/installall/tests/chicken/download.sh
+++ /dev/null
@@ -1,19 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh
-
-if [ ! -e ${DOWNLOADS}/chicken-${CHICKEN_VERSION}.tar.gz ]; then 
-  if [ "${CHICKEN_URL}" == "" ]; then
-     CHICKEN_URL=http://code.call-cc.org/releases/${CHICKEN_VERSION}/chicken-${CHICKEN_VERSION}.tar.gz
-  fi
-  echo "Downloading $CHICKEN_URL"
-  (cd ${DOWNLOADS};wget ${CHICKEN_URL})
-fi 
-
-ls -l ${DOWNLOADS}/chicken-${CHICKEN_VERSION}.tar.gz
-
-tar xfvz ${DOWNLOADS}/chicken-${CHICKEN_VERSION}.tar.gz
-
-ls -l chicken-${CHICKEN_VERSION}

DELETED tests/installall/tests/chicken/install.logpro
Index: tests/installall/tests/chicken/install.logpro
==================================================================
--- tests/installall/tests/chicken/install.logpro
+++ /dev/null
@@ -1,11 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Leaving directory" #/Leaving directory/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-
-(expect:ignore   in "LogFileBody" >= 0 "Ignore error in some filenames" #/\w+-errors/)
-
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/chicken/install.sh
Index: tests/installall/tests/chicken/install.sh
==================================================================
--- tests/installall/tests/chicken/install.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh
-# source $PREFIX
-
-cd chicken-${CHICKEN_VERSION}
-make PLATFORM=${PLATFORM} PREFIX=${PREFIX} install
-
-ls -l ${PREFIX}/bin

DELETED tests/installall/tests/chicken/testconfig
Index: tests/installall/tests/chicken/testconfig
==================================================================
--- tests/installall/tests/chicken/testconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-download download.sh
-compile compile.sh
-install install.sh
-
-# Test requirements are specified here
-[requirements]
-waiton setup
-# priority 10
-
-# Iteration for your tests are controlled by the items section
-[items]
-# CHICKEN_VERSION 4.8.0
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Download and install chicken scheme
-tags tagone,tagtwo
-reviewed never

DELETED tests/installall/tests/eggs/install.logpro
Index: tests/installall/tests/eggs/install.logpro
==================================================================
--- tests/installall/tests/eggs/install.logpro
+++ /dev/null
@@ -1,9 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Last thing done is chmod ..." #/chmod /)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody" >= 0 "Ignore someword-errors"        #/\w+-error/)
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/eggs/install.sh
Index: tests/installall/tests/eggs/install.sh
==================================================================
--- tests/installall/tests/eggs/install.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh
-
-$PREFIX/bin/chicken-install $PROX $EGG_NAME
-

DELETED tests/installall/tests/eggs/testconfig
Index: tests/installall/tests/eggs/testconfig
==================================================================
--- tests/installall/tests/eggs/testconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-install install.sh
-
-# Test requirements are specified here
-[requirements]
-waiton chicken setup
-priority 9
-
-# Iteration for your tests are controlled by the items section
-[items]
-EGG_NAME matchable readline apropos base64 regex-literals format regex-case test coops trace csv dot-locking posix-utils posix-extras directory-utils hostinfo tcp-server rpc csv-xml fmt json md5 ssax sxml-serializer sxml-modifications salmonella sql-de-lite postgresql
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Download and install eggs with no significant prerequisites
-tags tagone,tagtwo
-reviewed never

DELETED tests/installall/tests/ffcall/compile.logpro
Index: tests/installall/tests/ffcall/compile.logpro
==================================================================
--- tests/installall/tests/ffcall/compile.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Leaving directory" #/Leaving directory/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/ffcall/compile.sh
Index: tests/installall/tests/ffcall/compile.sh
==================================================================
--- tests/installall/tests/ffcall/compile.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh
-
-cd ffcall
-./configure --prefix=${PREFIX} --enable-shared
-make

DELETED tests/installall/tests/ffcall/download.logpro
Index: tests/installall/tests/ffcall/download.logpro
==================================================================
--- tests/installall/tests/ffcall/download.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "VERSION" #/ VERSION/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/ffcall/download.sh
Index: tests/installall/tests/ffcall/download.sh
==================================================================
--- tests/installall/tests/ffcall/download.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh
-
-if ! [[ -e ${DOWNLOADS}/ffcall.tar.gz ]] ; then
-    (cd ${DOWNLOADS};wget http://www.kiatoa.com/matt/iup/ffcall.tar.gz )
-fi
-
-tar xfvz ${DOWNLOADS}/ffcall.tar.gz
-
-ls -l ffcall

DELETED tests/installall/tests/ffcall/install.logpro
Index: tests/installall/tests/ffcall/install.logpro
==================================================================
--- tests/installall/tests/ffcall/install.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Leaving directory" #/Leaving directory/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/ffcall/install.sh
Index: tests/installall/tests/ffcall/install.sh
==================================================================
--- tests/installall/tests/ffcall/install.sh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh
-
-cd ffcall
-make install

DELETED tests/installall/tests/ffcall/testconfig
Index: tests/installall/tests/ffcall/testconfig
==================================================================
--- tests/installall/tests/ffcall/testconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-download download.sh
-compile compile.sh
-install install.sh
-
-# Test requirements are specified here
-[requirements]
-waiton setup
-
-# Iteration for your tests are controlled by the items section
-[items]
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Install the ffcall library
-tags tagone,tagtwo
-reviewed never

DELETED tests/installall/tests/iup/install.logpro
Index: tests/installall/tests/iup/install.logpro
==================================================================
--- tests/installall/tests/iup/install.logpro
+++ /dev/null
@@ -1,9 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "chmod is roughly last thing that happens" #/chmod /)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  >= 0 "Ignore setup-error-handling" #/\w+-error/)
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/iup/install.sh
Index: tests/installall/tests/iup/install.sh
==================================================================
--- tests/installall/tests/iup/install.sh
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh
-# source $PREFIX/setup-chicken4x.sh
-
-export CSCLIBS=`echo $LD_LIBRARY_PATH | sed 's/:/ -L/g'`
-CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $PREFIX/bin/chicken-install $PROX -D no-library-checks -feature disable-iup-web iup
-# CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $CHICKEN_INSTALL $PROX -D no-library-checks -feature disable-iup-web -deploy -prefix $DEPLOYTARG iup
-# iup:1.0.2 
-CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $PREFIX/bin/chicken-install $PROX -D no-library-checks canvas-draw
-# CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $CHICKEN_INSTALL $PROX -D no-library-checks -deploy -prefix $DEPLOYTARG canvas-draw

DELETED tests/installall/tests/iup/testconfig
Index: tests/installall/tests/iup/testconfig
==================================================================
--- tests/installall/tests/iup/testconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-install install.sh
-
-# Test requirements are specified here
-[requirements]
-waiton iup#{getenv IUPMODE}lib tougheggs
-
-# Iteration for your tests are controlled by the items section
-[items]
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Install iup egg
-tags tagone,tagtwo
-reviewed never

DELETED tests/installall/tests/iupbinlib/compile.logpro
Index: tests/installall/tests/iupbinlib/compile.logpro
==================================================================
--- tests/installall/tests/iupbinlib/compile.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/iupbinlib/compile.sh
Index: tests/installall/tests/iupbinlib/compile.sh
==================================================================
--- tests/installall/tests/iupbinlib/compile.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh

DELETED tests/installall/tests/iupbinlib/download.logpro
Index: tests/installall/tests/iupbinlib/download.logpro
==================================================================
--- tests/installall/tests/iupbinlib/download.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "README file should show up" #/README/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/iupbinlib/download.sh
Index: tests/installall/tests/iupbinlib/download.sh
==================================================================
--- tests/installall/tests/iupbinlib/download.sh
+++ /dev/null
@@ -1,28 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh
-# source $PREFIX/setup-chicken4x.sh
-
-if [[ `uname -a | grep x86_64` == "" ]]; then 
-    export ARCHSIZE=''
-else
-    export ARCHSIZE=64_
-fi
-    # export files="cd-5.4.1_Linux${IUPLIB}_lib.tar.gz im-3.6.3_Linux${IUPLIB}_lib.tar.gz iup-3.5_Linux${IUPLIB}_lib.tar.gz"
-if [[ x$USEOLDIUP == "x" ]];then
-   export files="cd-5.5.1_Linux${IUPLIB}_${ARCHSIZE}lib.tar.gz im-3.8_Linux${IUPLIB}_${ARCHSIZE}lib.tar.gz iup-3.6_Linux${IUPLIB}_${ARCHSIZE}lib.tar.gz"
-else
-   echo WARNING: Using old IUP libraries
-   export files="cd-5.4.1_Linux${IUPLIB}_${ARCHSIZE}lib.tar.gz im-3.6.3_Linux${IUPLIB}_${ARCHSIZE}lib.tar.gz iup-3.5_Linux${IUPLIB}_${ARCHSIZE}lib.tar.gz"
-fi
-
-mkdir -p $PREFIX/iuplib
-for a in `echo $files` ; do
-    if ! [[ -e ${DOWNLOADS}/$a ]] ; then
-	(cd ${DOWNLOADS};wget http://www.kiatoa.com/matt/iup/$a)
-    fi
-    echo Untarring $a into $PREFIX/lib
-    (cd $PREFIX/lib;tar xfvz ${DOWNLOADS}/$a;mv include/* ../include)
-done
-

DELETED tests/installall/tests/iupbinlib/install.logpro
Index: tests/installall/tests/iupbinlib/install.logpro
==================================================================
--- tests/installall/tests/iupbinlib/install.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/iupbinlib/install.sh
Index: tests/installall/tests/iupbinlib/install.sh
==================================================================
--- tests/installall/tests/iupbinlib/install.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh

DELETED tests/installall/tests/iupbinlib/testconfig
Index: tests/installall/tests/iupbinlib/testconfig
==================================================================
--- tests/installall/tests/iupbinlib/testconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-download download.sh
-
-# Test requirements are specified here
-[requirements]
-waiton ffcall setup
-
-# Iteration for your tests are controlled by the items section
-[items]
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Install the iup library if it is not already installed
-tags tagone,tagtwo
-reviewed never

DELETED tests/installall/tests/iupbinlib/untar.logpro
Index: tests/installall/tests/iupbinlib/untar.logpro
==================================================================
--- tests/installall/tests/iupbinlib/untar.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/iupbinlib/untar.sh
Index: tests/installall/tests/iupbinlib/untar.sh
==================================================================
--- tests/installall/tests/iupbinlib/untar.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh

DELETED tests/installall/tests/iupsrclib/cd.logpro
Index: tests/installall/tests/iupsrclib/cd.logpro
==================================================================
--- tests/installall/tests/iupsrclib/cd.logpro
+++ /dev/null
@@ -1,3 +0,0 @@
-(expect:ignore in "LogFileBody" >= 0 "Ignore these binary operator errors for now" #/error: missing binary operator/)
-
-(load "compile.logpro")

DELETED tests/installall/tests/iupsrclib/compile.logpro
Index: tests/installall/tests/iupsrclib/compile.logpro
==================================================================
--- tests/installall/tests/iupsrclib/compile.logpro
+++ /dev/null
@@ -1,12 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Completed signature" #/(Dynamic Library.*Done|Leaving directory|Nothing to be done)/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody" >= 0 "Ignore files with error in name" #/error.[ch]/)
-(expect:ignore   in "LogFileBody" >= 0 "Ignore files with errors in name" #/errors.[ch]/)
-(expect:ignore   in "LogFileBody" >= 0 "Ignore files with warn in name"  #/warning.[ch]/)
-
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/iupsrclib/compile.sh
Index: tests/installall/tests/iupsrclib/compile.sh
==================================================================
--- tests/installall/tests/iupsrclib/compile.sh
+++ /dev/null
@@ -1,17 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-pkg=$1
-
-source $PREFIX/buildsetup.sh
-
-export LUA_SUFFIX=
-export LUA_INC=$MT_TEST_RUN_DIR/lua52/include
-
-if [[ $pkg == "lua52" ]]; then
-    (cd $pkg/src;make $PLATFORM)
-else
-    (cd $pkg/src;make)
-fi
-

DELETED tests/installall/tests/iupsrclib/download.logpro
Index: tests/installall/tests/iupsrclib/download.logpro
==================================================================
--- tests/installall/tests/iupsrclib/download.logpro
+++ /dev/null
@@ -1,13 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "README file should show up" #/README/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-
-(expect:ignore   in "LogFileBody" >= 0 "Ignore files with error in name" #/error.[ch]/)
-(expect:ignore   in "LogFileBody" >= 0 "Ignore files with errors in name" #/errors.[ch]/)
-(expect:ignore   in "LogFileBody" >= 0 "Ignore files with warn in name"  #/warning.[ch]/)
-
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/iupsrclib/download.sh
Index: tests/installall/tests/iupsrclib/download.sh
==================================================================
--- tests/installall/tests/iupsrclib/download.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh
-
-mkdir -p $PREFIX/iuplib
-for a in cd-5.6.1_Sources.tar.gz  im-3.8.1_Sources.tar.gz  iup-3.8_Sources.tar.gz lua-5.2.1_Sources.tar.gz; do
-    if ! [[ -e ${DOWNLOADS}/$a ]] ; then
-	(cd ${DOWNLOADS};wget http://www.kiatoa.com/matt/iup/$a)
-    fi
-    tar xfvz ${DOWNLOADS}/$a
-done
-
-find . -type d -exec chmod ug+x {} \;

DELETED tests/installall/tests/iupsrclib/im.logpro
Index: tests/installall/tests/iupsrclib/im.logpro
==================================================================
--- tests/installall/tests/iupsrclib/im.logpro
+++ /dev/null
@@ -1,1 +0,0 @@
-(load "compile.logpro")

DELETED tests/installall/tests/iupsrclib/install.logpro
Index: tests/installall/tests/iupsrclib/install.logpro
==================================================================
--- tests/installall/tests/iupsrclib/install.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/iupsrclib/install.sh
Index: tests/installall/tests/iupsrclib/install.sh
==================================================================
--- tests/installall/tests/iupsrclib/install.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh
-
-# The so files
-cp -f im/lib/Linux26g4/*.so $PREFIX/lib
-cp -f cd/lib/Linux26g4/*.so $PREFIX/lib
-cp -f iup/lib/Linux26g4/*.so $PREFIX/lib
-
-# The development files
-mkdir -p $PREFIX/include/im
-cp -fR im/include/*.h $PREFIX/include/im
-cp -f im/lib/Linux26g4/*.a $PREFIX/lib
-
-mkdir -p $PREFIX/include/cd
-cp -f cd/include/*.h $PREFIX/include/cd
-cp -f cd/lib/Linux26g4/*.a $PREFIX/lib
-
-mkdir -p /usr/include/iup
-cp -f iup/include/*.h $PREFIX/include/iup             
-cp -f iup/lib/Linux26g4/*.a $PREFIX/lib     

DELETED tests/installall/tests/iupsrclib/iup.logpro
Index: tests/installall/tests/iupsrclib/iup.logpro
==================================================================
--- tests/installall/tests/iupsrclib/iup.logpro
+++ /dev/null
@@ -1,3 +0,0 @@
-(expect:ignore in "LogFileBody" >= 0 "Ignore these binary operator errors for now" #/error: missing binary operator/ expires: "10/10/2013")
-
-(load "compile.logpro")

DELETED tests/installall/tests/iupsrclib/lua.logpro
Index: tests/installall/tests/iupsrclib/lua.logpro
==================================================================
--- tests/installall/tests/iupsrclib/lua.logpro
+++ /dev/null
@@ -1,1 +0,0 @@
-(load "compile.logpro")

DELETED tests/installall/tests/iupsrclib/testconfig
Index: tests/installall/tests/iupsrclib/testconfig
==================================================================
--- tests/installall/tests/iupsrclib/testconfig
+++ /dev/null
@@ -1,22 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-download download.sh
-lua compile.sh lua52
-im compile.sh im
-cd compile.sh cd
-iup compile.sh iup
-
-# Test requirements are specified here
-[requirements]
-waiton ffcall setup
-
-# Iteration for your tests are controlled by the items section
-[items]
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Install the iup library if it is not already installed
-tags tagone,tagtwo
-reviewed never

DELETED tests/installall/tests/iupsrclib/untar.logpro
Index: tests/installall/tests/iupsrclib/untar.logpro
==================================================================
--- tests/installall/tests/iupsrclib/untar.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/iupsrclib/untar.sh
Index: tests/installall/tests/iupsrclib/untar.sh
==================================================================
--- tests/installall/tests/iupsrclib/untar.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh

DELETED tests/installall/tests/mmisc/clone.logpro
Index: tests/installall/tests/mmisc/clone.logpro
==================================================================
--- tests/installall/tests/mmisc/clone.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Output from fossil" #/^repository:\s+/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/i)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/mmisc/clone.sh
Index: tests/installall/tests/mmisc/clone.sh
==================================================================
--- tests/installall/tests/mmisc/clone.sh
+++ /dev/null
@@ -1,11 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh
-
-fossil clone http://www.kiatoa.com/fossils/$FSLPKG $FSLPKG.fossil
-
-mkdir src
-cd src 
-fossil open ../$FSLPKG.fossil --nested
-fossil co ${$FSLPKG}_VERSION}

DELETED tests/installall/tests/mmisc/install.logpro
Index: tests/installall/tests/mmisc/install.logpro
==================================================================
--- tests/installall/tests/mmisc/install.logpro
+++ /dev/null
@@ -1,9 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Always get a chmod at the end of install" #/chmod.*logpro.setup-info/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in setup-error-handling" #/setup-error-handling/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/i)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/mmisc/install.sh
Index: tests/installall/tests/mmisc/install.sh
==================================================================
--- tests/installall/tests/mmisc/install.sh
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh
-cd src
-if [ $FSLPKG == "logpro" ];then
-  chicken-install
-elif [ $FSLPKG == "stml" ];then
-  cp install.cfg.template install.cfg
-  cp requirements.scm.template requirements.scm
-  make 
-  make install
-else
-  make
-  make install PREFIX=$PREFIX
-fi

DELETED tests/installall/tests/mmisc/testconfig
Index: tests/installall/tests/mmisc/testconfig
==================================================================
--- tests/installall/tests/mmisc/testconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-clone clone.sh
-install install.sh
-
-# Test requirements are specified here
-[requirements]
-waiton eggs setup
-
-# Iteration for your tests are controlled by the items section
-[items]
-FSLPKG logpro stml megatest
-
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Install the logpro tool
-tags tagone,tagtwo
-reviewed never

DELETED tests/installall/tests/opensrc/clone.logpro
Index: tests/installall/tests/opensrc/clone.logpro
==================================================================
--- tests/installall/tests/opensrc/clone.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Output from fossil" (list #/^repository:\s+/ #/comment:/))
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/i)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/opensrc/clone.sh
Index: tests/installall/tests/opensrc/clone.sh
==================================================================
--- tests/installall/tests/opensrc/clone.sh
+++ /dev/null
@@ -1,22 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh
-
-parentdir=$MT_LINKTREE/$MT_TARGET/$MT_RUNNAME
-
-lockfile $parentdir/clone.lock
-if [ ! -e $parentdir/opensrc.fossil ];then
-  fossil clone http://www.kiatoa.com/fossils/opensrc $parentdir/opensrc.fossil
-fi
-
-if [ ! -e $parentdir/src/dbi ];then
-  mkdir -p $parentdir/src
-  (cd $parentdir/src;fossil open $parentdir/opensrc.fossil --nested)
-else
-  (cd $parentdir/src;fossil sync;fossil co trunk;fossil status)
-fi
-rm -f $parentdir/clone.lock
-
-ln -sf $parentdir/src $MT_TEST_RUN_DIR/src
-

DELETED tests/installall/tests/opensrc/install.logpro
Index: tests/installall/tests/opensrc/install.logpro
==================================================================
--- tests/installall/tests/opensrc/install.logpro
+++ /dev/null
@@ -1,9 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Always get a chmod at the end of install" #/chmod.*.setup-info/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in setup-error-handling" #/setup-error-handling/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/i)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/opensrc/install.sh
Index: tests/installall/tests/opensrc/install.sh
==================================================================
--- tests/installall/tests/opensrc/install.sh
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh
-cd src/$MODULE_NAME
-chicken-install

DELETED tests/installall/tests/opensrc/testconfig
Index: tests/installall/tests/opensrc/testconfig
==================================================================
--- tests/installall/tests/opensrc/testconfig
+++ /dev/null
@@ -1,20 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-clone clone.sh
-install install.sh
-
-# Test requirements are specified here
-[requirements]
-waiton eggs setup sqlite3
-
-# Iteration for your tests are controlled by the items section
-[items]
-MODULE_NAME dbi margs qtree vcd xfig mutils
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Install the eggs from the opensrc fossil
-tags tagone,tagtwo
-reviewed never

DELETED tests/installall/tests/setup/setup.logpro
Index: tests/installall/tests/setup/setup.logpro
==================================================================
--- tests/installall/tests/setup/setup.logpro
+++ /dev/null
@@ -1,10 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "ALL DONE" #/ALL DONE$/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-
-
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/setup/setup.sh
Index: tests/installall/tests/setup/setup.sh
==================================================================
--- tests/installall/tests/setup/setup.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-cksetupsh=$PREFIX/setup-chicken4x.sh
-cksetupcsh=$PREFIX/setup-chicken4x.csh
-setupsh=$PREFIX/buildsetup.sh
-
-# make a cache dir
-mkdir -p $DOWNLOADS
-mkdir -p $PREFIX
-
-# File for users to source to run chicken
-echo "# Source me to setup to to run chicken" > $cksetupsh
-echo "export PATH=$PREFIX/bin:\$PATH" > $cksetupsh
-echo "export LD_LIBRARY_PATH=$PREFIX/lib" >> $cksetupsh
-
-# tcsh version
-echo "setenv PATH $PREFIX/bin:\$PATH" > $cksetupcsh
-echo "setenv LD_LIBRARY_PATH $PREFIX/lib" >> $cksetupcsh
-
-# File to source for build process
-echo "export PATH=$PREFIX/bin:\$PATH" > $setupsh
-echo "export LD_LIBRARY_PATH=$PREFIX/lib" >> $setupsh
-
-if [[ $proxy == "" ]]; then 
-  echo 'Please set the environment variable "proxy" to host.com:port (e.g. foo.com:1234) to use a proxy'
-else
-  echo "export http_proxy=http://$proxy" >> $setupsh
-  echo "export PROX=\"-proxy $proxy\""   >> $setupsh
-fi
-
-echo "export PREFIX=$PREFIX" >> $setupsh
-
-echo ALL DONE

DELETED tests/installall/tests/setup/testconfig
Index: tests/installall/tests/setup/testconfig
==================================================================
--- tests/installall/tests/setup/testconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-setup setup.sh
-
-# Test requirements are specified here
-[requirements]
-# priority 10
-
-# Iteration for your tests are controlled by the items section
-[items]
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Download and install chicken scheme
-tags tagone,tagtwo
-reviewed never

DELETED tests/installall/tests/sqlite3/compile.logpro
Index: tests/installall/tests/sqlite3/compile.logpro
==================================================================
--- tests/installall/tests/sqlite3/compile.logpro
+++ /dev/null
@@ -1,9 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Leaving directory" #/(Leaving directory|Nothing to be done for|creating sqlite3)/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  >= 0 "Ignore strerror_r" #/strerror_r/i)
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/sqlite3/compile.sh
Index: tests/installall/tests/sqlite3/compile.sh
==================================================================
--- tests/installall/tests/sqlite3/compile.sh
+++ /dev/null
@@ -1,10 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh
-
-cd sqlite-autoconf-$SQLITE3_VERSION
-./configure --prefix=$PREFIX
-
-make

DELETED tests/installall/tests/sqlite3/download.logpro
Index: tests/installall/tests/sqlite3/download.logpro
==================================================================
--- tests/installall/tests/sqlite3/download.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "sqlite-autoconf" #/sqlite-autoconf/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/sqlite3/download.sh
Index: tests/installall/tests/sqlite3/download.sh
==================================================================
--- tests/installall/tests/sqlite3/download.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh
-
-echo Install sqlite3
-if ! [[ -e ${DOWNLOADS}/sqlite-autoconf-${SQLITE3_VERSION}.tar.gz ]]; then
-    (cd ${DOWNLOADS};wget http://www.sqlite.org/sqlite-autoconf-${SQLITE3_VERSION}.tar.gz)
-fi
-
-tar xfz ${DOWNLOADS}/sqlite-autoconf-${SQLITE3_VERSION}.tar.gz 
-
-ls -l sqlite-autoconf-${SQLITE3_VERSION}.tar.gz

DELETED tests/installall/tests/sqlite3/install.logpro
Index: tests/installall/tests/sqlite3/install.logpro
==================================================================
--- tests/installall/tests/sqlite3/install.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Leaving directory" #/Leaving directory/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/sqlite3/install.sh
Index: tests/installall/tests/sqlite3/install.sh
==================================================================
--- tests/installall/tests/sqlite3/install.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh
-
-cd sqlite-autoconf-$SQLITE3_VERSION
-make install
-

DELETED tests/installall/tests/sqlite3/installegg.logpro
Index: tests/installall/tests/sqlite3/installegg.logpro
==================================================================
--- tests/installall/tests/sqlite3/installegg.logpro
+++ /dev/null
@@ -1,9 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "chmod sqlite3" #/chmod.*sqlite3/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  >= 0 "Ignore setup-error-handling" #/setup-error-handling/)
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/sqlite3/installegg.sh
Index: tests/installall/tests/sqlite3/installegg.sh
==================================================================
--- tests/installall/tests/sqlite3/installegg.sh
+++ /dev/null
@@ -1,7 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh
-
-CSC_OPTIONS="-I$PREFIX/include -L$PREFIX/lib" $PREFIX/bin/chicken-install $PROX sqlite3

DELETED tests/installall/tests/sqlite3/testconfig
Index: tests/installall/tests/sqlite3/testconfig
==================================================================
--- tests/installall/tests/sqlite3/testconfig
+++ /dev/null
@@ -1,24 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-download download.sh
-compile compile.sh
-install install.sh
-installegg installegg.sh
-
-# Test requirements are specified here
-[requirements]
-# We waiton chicken because this one installs the egg. It would behove us to split this
-# into two tests ...
-waiton tougheggs
-priority 2
-
-# Iteration for your tests are controlled by the items section
-[items]
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Install sqlite3 library for systems where it is not installed
-tags tagone,tagtwo
-reviewed never

DELETED tests/installall/tests/tougheggs/install.logpro
Index: tests/installall/tests/tougheggs/install.logpro
==================================================================
--- tests/installall/tests/tougheggs/install.logpro
+++ /dev/null
@@ -1,9 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Last thing done is chmod ..." #/chmod /)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody" >= 0 "Ignore someword-errors"        #/\w+-error/)
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/tougheggs/install.sh
Index: tests/installall/tests/tougheggs/install.sh
==================================================================
--- tests/installall/tests/tougheggs/install.sh
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh
-
-lockfile $PREFIX/eggs.lock
-$PREFIX/bin/chicken-install $PROX $EGG_NAME
-rm -f $PREFIX/eggs.lock

DELETED tests/installall/tests/tougheggs/testconfig
Index: tests/installall/tests/tougheggs/testconfig
==================================================================
--- tests/installall/tests/tougheggs/testconfig
+++ /dev/null
@@ -1,19 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-install install.sh
-
-# Test requirements are specified here
-[requirements]
-waiton eggs
-
-# Iteration for your tests are controlled by the items section
-[items]
-EGG_NAME intarweb http-client awful uri-common spiffy-request-vars spiffy apropos spiffy-directory-listing
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Download and install eggs with no significant prerequisites
-tags tagone,tagtwo
-reviewed never

DELETED tests/installall/tests/zmq/install.logpro
Index: tests/installall/tests/zmq/install.logpro
==================================================================
--- tests/installall/tests/zmq/install.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/zmq/install.sh
Index: tests/installall/tests/zmq/install.sh
==================================================================
--- tests/installall/tests/zmq/install.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh

DELETED tests/installall/tests/zmq/testconfig
Index: tests/installall/tests/zmq/testconfig
==================================================================
--- tests/installall/tests/zmq/testconfig
+++ /dev/null
@@ -1,18 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-install install.sh
-
-# Test requirements are specified here
-[requirements]
-waiton zmqlib chicken setup
-
-# Iteration for your tests are controlled by the items section
-[items]
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Install the zmq egg
-tags tagone,tagtwo
-reviewed never

DELETED tests/installall/tests/zmqlib/compile.logpro
Index: tests/installall/tests/zmqlib/compile.logpro
==================================================================
--- tests/installall/tests/zmqlib/compile.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/zmqlib/compile.sh
Index: tests/installall/tests/zmqlib/compile.sh
==================================================================
--- tests/installall/tests/zmqlib/compile.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh

DELETED tests/installall/tests/zmqlib/download.logpro
Index: tests/installall/tests/zmqlib/download.logpro
==================================================================
--- tests/installall/tests/zmqlib/download.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/zmqlib/download.sh
Index: tests/installall/tests/zmqlib/download.sh
==================================================================
--- tests/installall/tests/zmqlib/download.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh

DELETED tests/installall/tests/zmqlib/install.logpro
Index: tests/installall/tests/zmqlib/install.logpro
==================================================================
--- tests/installall/tests/zmqlib/install.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/zmqlib/install.sh
Index: tests/installall/tests/zmqlib/install.sh
==================================================================
--- tests/installall/tests/zmqlib/install.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-
-source $PREFIX/buildsetup.sh

DELETED tests/installall/tests/zmqlib/testconfig
Index: tests/installall/tests/zmqlib/testconfig
==================================================================
--- tests/installall/tests/zmqlib/testconfig
+++ /dev/null
@@ -1,21 +0,0 @@
-# Add additional steps here. Format is "stepname script"
-[ezsteps]
-download download.sh
-untar untar.sh
-compile compile.sh
-install install.sh
-
-# Test requirements are specified here
-[requirements]
-waiton setup
-
-# Iteration for your tests are controlled by the items section
-[items]
-
-# test_meta is a section for storing additional data on your test
-[test_meta]
-author matt
-owner  matt
-description Install the zmq library if it doesn't already exist
-tags tagone,tagtwo
-reviewed never

DELETED tests/installall/tests/zmqlib/untar.logpro
Index: tests/installall/tests/zmqlib/untar.logpro
==================================================================
--- tests/installall/tests/zmqlib/untar.logpro
+++ /dev/null
@@ -1,8 +0,0 @@
-;; You should have at least one expect:required. This ensures that your process ran
-(expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
-
-;; You may need ignores to suppress false error or warning hits from the later expects
-;; NOTE: Order is important here!
-(expect:ignore   in "LogFileBody"  < 99 "Ignore the word error in comments" #/^\/\/.*error/)
-(expect:warning  in "LogFileBody"  = 0 "Any warning" #/warn/)
-(expect:error    in "LogFileBody"  = 0 "Any error"  (list #/ERROR/ #/error/i)) ;; but disallow any other errors

DELETED tests/installall/tests/zmqlib/untar.sh
Index: tests/installall/tests/zmqlib/untar.sh
==================================================================
--- tests/installall/tests/zmqlib/untar.sh
+++ /dev/null
@@ -1,4 +0,0 @@
-#!/usr/bin/env bash
-
-# Run your step here
-source $PREFIX/buildsetup.sh

Index: tests/manual.sh
==================================================================
--- tests/manual.sh
+++ tests/manual.sh
@@ -1,1 +1,18 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 (cd ..;make install) && `realpath ../bin/megatest` -runtests manual_example :sysname ubuntu :fsname afs :datapath none :runname testing -setvars TARGETDISPLAY=:0,TARGETHOST=localhost,TARGETDIR=/tmp/blah,TARGETUSER=matt 

Index: tests/mintest/megatest.config
==================================================================
--- tests/mintest/megatest.config
+++ tests/mintest/megatest.config
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [fields]
 X TEXT
 
 [setup]
 max_concurrent_jobs 50

Index: tests/mintest/runconfigs.config
==================================================================
--- tests/mintest/runconfigs.config
+++ tests/mintest/runconfigs.config
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [default]
 ALLTESTS see this variable
 
 # Your variables here are grouped by targets [SYSTEM/RELEASE]
 [a]

Index: tests/mintest/tests/a/testconfig
==================================================================
--- tests/mintest/tests/a/testconfig
+++ tests/mintest/tests/a/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 
 [requirements]

Index: tests/mintest/tests/a1/testconfig
==================================================================
--- tests/mintest/tests/a1/testconfig
+++ tests/mintest/tests/a1/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 
 [requirements]

Index: tests/mintest/tests/b/testconfig
==================================================================
--- tests/mintest/tests/b/testconfig
+++ tests/mintest/tests/b/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 
 [requirements]

Index: tests/mintest/tests/b1/testconfig
==================================================================
--- tests/mintest/tests/b1/testconfig
+++ tests/mintest/tests/b1/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 
 [requirements]

Index: tests/mintest/tests/c/testconfig
==================================================================
--- tests/mintest/tests/c/testconfig
+++ tests/mintest/tests/c/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 
 [requirements]

Index: tests/mintest/tests/c1/testconfig
==================================================================
--- tests/mintest/tests/c1/testconfig
+++ tests/mintest/tests/c1/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 
 [requirements]

Index: tests/mintest/tests/d/testconfig
==================================================================
--- tests/mintest/tests/d/testconfig
+++ tests/mintest/tests/d/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 
 [requirements]

Index: tests/mintest/tests/d1fail/testconfig
==================================================================
--- tests/mintest/tests/d1fail/testconfig
+++ tests/mintest/tests/d1fail/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 step2 exit 123
 

Index: tests/mintest/tests/e/testconfig
==================================================================
--- tests/mintest/tests/e/testconfig
+++ tests/mintest/tests/e/testconfig
@@ -1,4 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 

Index: tests/mintest/tests/e1/testconfig
==================================================================
--- tests/mintest/tests/e1/testconfig
+++ tests/mintest/tests/e1/testconfig
@@ -1,4 +1,21 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 

Index: tests/mintest/tests/f/testconfig
==================================================================
--- tests/mintest/tests/f/testconfig
+++ tests/mintest/tests/f/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 
 [requirements]

Index: tests/mintest/tests/g/testconfig
==================================================================
--- tests/mintest/tests/g/testconfig
+++ tests/mintest/tests/g/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 
 [requirements]

Index: tests/mintest/tests/h/testconfig
==================================================================
--- tests/mintest/tests/h/testconfig
+++ tests/mintest/tests/h/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 
 [requirements]

Index: tests/mintest/tests/i/testconfig
==================================================================
--- tests/mintest/tests/i/testconfig
+++ tests/mintest/tests/i/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 
 [requirements]

Index: tests/mintest/tests/j/testconfig
==================================================================
--- tests/mintest/tests/j/testconfig
+++ tests/mintest/tests/j/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 
 [requirements]

Index: tests/mintest/tests/k/testconfig
==================================================================
--- tests/mintest/tests/k/testconfig
+++ tests/mintest/tests/k/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 
 [requirements]

Index: tests/mintest/tests/l/testconfig
==================================================================
--- tests/mintest/tests/l/testconfig
+++ tests/mintest/tests/l/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add steps here. Format is "stepname script"
 [ezsteps]
 step1 echo SUCCESS
 
 [requirements]

Index: tests/ods-test.scm
==================================================================
--- tests/ods-test.scm
+++ tests/ods-test.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 (load "ods.scm")
 
 (ods:list->ods 
  "testing"
  "testing.ods"

Index: tests/release/Makefile
==================================================================
--- tests/release/Makefile
+++ tests/release/Makefile
@@ -1,6 +1,21 @@
-
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 
 dashboard : compile
 	dashboard -rows 24 &
 
 compile : runs

Index: tests/release/megatest.config
==================================================================
--- tests/release/megatest.config
+++ tests/release/megatest.config
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [fields]
 release TEXT
 iteration TEXT
 
 [setup]

Index: tests/release/runconfigs.config
==================================================================
--- tests/release/runconfigs.config
+++ tests/release/runconfigs.config
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [default]
 MTRUNNER   #{shell readlink -f #{getenv MT_RUN_AREA_HOME}/../../utils/mtrunner}
 MTTESTDIR  #{shell readlink -f #{getenv MT_RUN_AREA_HOME}/..}
 MTPATH     #{shell readlink -f #{getenv MT_RUN_AREA_HOME}/../../bin}
 

Index: tests/release/tests/dependencies/simpleresults.logpro
==================================================================
--- tests/release/tests/dependencies/simpleresults.logpro
+++ tests/release/tests/dependencies/simpleresults.logpro
@@ -1,8 +1,24 @@
 ;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
 ;;  
-;;   License GPL.
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 
 (define logbody "LogFileBody")
 
 (define pass-specs '( ;; testname num-expected max-runtime
 		     ("setup"		        1  20)

Index: tests/release/tests/dependencies/testconfig
==================================================================
--- tests/release/tests/dependencies/testconfig
+++ tests/release/tests/dependencies/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # test2 from the tests/Makefile
 
 [var]
 tname itemwait
 

Index: tests/release/tests/fullrun/results.logpro
==================================================================
--- tests/release/tests/fullrun/results.logpro
+++ tests/release/tests/fullrun/results.logpro
@@ -1,8 +1,24 @@
 ;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
 ;;  
-;;   License GPL.
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 
 (define logbody "LogFileBody")
 
 (define pass-specs '( ;; testname num-expected max-runtime
 		     ("exit_0"		        1  20)

Index: tests/release/tests/fullrun/testconfig
==================================================================
--- tests/release/tests/fullrun/testconfig
+++ tests/release/tests/fullrun/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [ezsteps]
 cleantop $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -remove-runs -target ubuntu/nfs/none -runname release_toplevel -testpatt %
 runall   $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -run -testpatt %            -target ubuntu/nfs/none -runname release_toplevel -runwait
 runtop   $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -run -testpatt all_toplevel -target ubuntu/nfs/none -runname release_toplevel -rerun FAIL -preclean -runwait
 results  $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -list-runs release_toplevel -target ubuntu/nfs/none -runname release_toplevel 

Index: tests/release/tests/itemwait/testconfig
==================================================================
--- tests/release/tests/itemwait/testconfig
+++ tests/release/tests/itemwait/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # test2 from the tests/Makefile
 
 [var]
 tname itemwait
 

Index: tests/release/tests/itemwait/watchrun.sh
==================================================================
--- tests/release/tests/itemwait/watchrun.sh
+++ tests/release/tests/itemwait/watchrun.sh
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 runname=$1
 
 pass=no
 alldone=no
 while [[ $alldone == no ]];do

Index: tests/release/tests/rollup/firstres.logpro
==================================================================
--- tests/release/tests/rollup/firstres.logpro
+++ tests/release/tests/rollup/firstres.logpro
@@ -1,8 +1,23 @@
 ;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
 ;;  
-;;   License GPL.
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 (define logbody "LogFileBody")
 
 (define pass-specs '( ;; testname num-expected max-runtime
 		     ;; ("exit_0"		        1  20)

Index: tests/release/tests/rollup/results.logpro
==================================================================
--- tests/release/tests/rollup/results.logpro
+++ tests/release/tests/rollup/results.logpro
@@ -1,8 +1,23 @@
 ;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
 ;;  
-;;   License GPL.
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 (define logbody "LogFileBody")
 
 (define pass-specs '( ;; testname num-expected max-runtime
 		     ;; ("exit_0"		        1  20)

Index: tests/release/tests/rollup/testconfig
==================================================================
--- tests/release/tests/rollup/testconfig
+++ tests/release/tests/rollup/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # test2 from the tests/Makefile
 
 [var]
 tname rollup
 

Index: tests/release/tests/test2/results.logpro
==================================================================
--- tests/release/tests/test2/results.logpro
+++ tests/release/tests/test2/results.logpro
@@ -1,8 +1,23 @@
 ;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
 ;;  
-;;   License GPL.
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 (define logbody "LogFileBody")
 
 (define pass-specs '( ;; testname num-expected max-runtime
 		     ;; ("exit_0"		        1  20)

Index: tests/release/tests/test2/results_a.logpro
==================================================================
--- tests/release/tests/test2/results_a.logpro
+++ tests/release/tests/test2/results_a.logpro
@@ -1,8 +1,24 @@
 ;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
 ;;  
-;;   License GPL.
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 
 (define logbody "LogFileBody")
 
 (define pass-specs '( ;; testname num-expected max-runtime
 		     ;; ("exit_0"		        1  20)

Index: tests/release/tests/test2/results_b.logpro
==================================================================
--- tests/release/tests/test2/results_b.logpro
+++ tests/release/tests/test2/results_b.logpro
@@ -1,8 +1,23 @@
 ;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
 ;;  
-;;   License GPL.
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 (define logbody "LogFileBody")
 
 (define pass-specs '( ;; testname num-expected max-runtime
 		     ;; ("exit_0"		        1  20)

Index: tests/release/tests/test2/testconfig
==================================================================
--- tests/release/tests/test2/testconfig
+++ tests/release/tests/test2/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # test2 from the tests/Makefile
 
 [var]
 tname test2
 mtpath #{shell readlink -f ../../bin}

Index: tests/release/tests/testpatt/cleanres.logpro
==================================================================
--- tests/release/tests/testpatt/cleanres.logpro
+++ tests/release/tests/testpatt/cleanres.logpro
@@ -1,8 +1,23 @@
 ;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
 ;;  
-;;   License GPL.
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 (define logbody "LogFileBody")
 
 (define pass-specs '( ;; testname num-expected max-runtime
 		     ;; ("exit_0"		        1  20)

Index: tests/release/tests/testpatt/results.logpro
==================================================================
--- tests/release/tests/testpatt/results.logpro
+++ tests/release/tests/testpatt/results.logpro
@@ -1,8 +1,24 @@
 ;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
 ;;  
-;;   License GPL.
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 
 (define logbody "LogFileBody")
 
 (define pass-specs '( ;; testname num-expected max-runtime
 		     ;; ("exit_0"		        1  20)

Index: tests/release/tests/testpatt/testconfig
==================================================================
--- tests/release/tests/testpatt/testconfig
+++ tests/release/tests/testpatt/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [ezsteps]
 clean    $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -remove-runs -testpatt % -target ubuntu/nfs/none -runname release_testpatt
 cleanres $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -list-runs release_testpatt -target ubuntu/nfs/none
 
 runitems $MTRUNNER $MTTESTDIR/fullrun $MTPATH megatest -run -testpatt runfirst/%2 -target ubuntu/nfs/none -runname release_testpatt

Index: tests/release/tests/testpatt_envvar/results.logpro
==================================================================
--- tests/release/tests/testpatt_envvar/results.logpro
+++ tests/release/tests/testpatt_envvar/results.logpro
@@ -1,8 +1,24 @@
 ;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
 ;;  
-;;   License GPL.
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 
 (define logbody "LogFileBody")
 
 (define pass-specs '( ;; testname num-expected max-runtime
 		     ("exit_0"		        1  20)

Index: tests/release/tests/testpatt_envvar/testconfig
==================================================================
--- tests/release/tests/testpatt_envvar/testconfig
+++ tests/release/tests/testpatt_envvar/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [var]
 targ -target ubuntu/nfs/all_toplevel
 tp   -testpatt %
 
 [ezsteps]

Index: tests/release/tests/toprun/results.logpro
==================================================================
--- tests/release/tests/toprun/results.logpro
+++ tests/release/tests/toprun/results.logpro
@@ -1,8 +1,24 @@
 ;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
 ;;  
-;;   License GPL.
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 
 (define logbody "LogFileBody")
 
 (define pass-specs '( ;; testname num-expected max-runtime
 		     ("exit_0"		        1  20)

Index: tests/release/tests/toprun/testconfig
==================================================================
--- tests/release/tests/toprun/testconfig
+++ tests/release/tests/toprun/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [misc]
 rname release_toprun
 rdir  $MTTESTDIR/fullrun
 
 [ezsteps]

Index: tests/resources/ruby/librunscript.rb
==================================================================
--- tests/resources/ruby/librunscript.rb
+++ tests/resources/ruby/librunscript.rb
@@ -1,7 +1,24 @@
 # This is the library of stuff for megatest
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 def run_and_record(stepname, cmd, checks)
   system "megatest -step #{stepname} :state start :status n/a"
   system cmd
   exitcode=$?
   if exitcode==0

Index: tests/rununittest.sh
==================================================================
--- tests/rununittest.sh
+++ tests/rununittest.sh
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Usage: rununittest.sh testname debuglevel
 #
 banner $1
 
 # put megatest on path from correct location

Index: tests/simplerun/megatest.config
==================================================================
--- tests/simplerun/megatest.config
+++ tests/simplerun/megatest.config
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [fields]
 SYSTEM TEXT
 RELEASE TEXT
 
 [setup]

Index: tests/simplerun/runconfigs.config
==================================================================
--- tests/simplerun/runconfigs.config
+++ tests/simplerun/runconfigs.config
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [default]
 ALLTESTS see this variable
 
 # Your variables here are grouped by targets [SYSTEM/RELEASE]
 [SYSTEM_val/RELEASE_val]

Index: tests/simplerun/test.config
==================================================================
--- tests/simplerun/test.config
+++ tests/simplerun/test.config
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [section1]
 1 ./blah
 
 [section2]
 

Index: tests/simplerun/tests/test1/step1.logpro
==================================================================
--- tests/simplerun/tests/test1/step1.logpro
+++ tests/simplerun/tests/test1/step1.logpro
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;; You should have at least one expect:required. This ensures that your process ran
 ;; (expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
 
 ;; You may need ignores to suppress false error or warning hits from the later expects
 ;; NOTE: Order is important here!

Index: tests/simplerun/tests/test1/step1.sh
==================================================================
--- tests/simplerun/tests/test1/step1.sh
+++ tests/simplerun/tests/test1/step1.sh
@@ -1,5 +1,22 @@
 #!/usr/bin/env bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Run your step here
 echo Got here!
 

Index: tests/simplerun/tests/test1/step2.logpro
==================================================================
--- tests/simplerun/tests/test1/step2.logpro
+++ tests/simplerun/tests/test1/step2.logpro
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;; You should have at least one expect:required. This ensures that your process ran
 ;; (expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
 
 ;; You may need ignores to suppress false error or warning hits from the later expects
 ;; NOTE: Order is important here!

Index: tests/simplerun/tests/test1/step2.sh
==================================================================
--- tests/simplerun/tests/test1/step2.sh
+++ tests/simplerun/tests/test1/step2.sh
@@ -1,6 +1,23 @@
 #!/usr/bin/env bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Run your step here
 echo Got here eh!
 
 

Index: tests/simplerun/tests/test1/testconfig
==================================================================
--- tests/simplerun/tests/test1/testconfig
+++ tests/simplerun/tests/test1/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add additional steps here. Format is "stepname script"
 [ezsteps]
 step1 step1.sh
 step2 step2.sh
 

Index: tests/simplerun/tests/test2/step1.logpro
==================================================================
--- tests/simplerun/tests/test2/step1.logpro
+++ tests/simplerun/tests/test2/step1.logpro
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;; You should have at least one expect:required. This ensures that your process ran
 ;; (expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
 
 ;; You may need ignores to suppress false error or warning hits from the later expects
 ;; NOTE: Order is important here!

Index: tests/simplerun/tests/test2/step1.sh
==================================================================
--- tests/simplerun/tests/test2/step1.sh
+++ tests/simplerun/tests/test2/step1.sh
@@ -1,3 +1,20 @@
 #!/usr/bin/env bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Run your step here

Index: tests/simplerun/tests/test2/step2.logpro
==================================================================
--- tests/simplerun/tests/test2/step2.logpro
+++ tests/simplerun/tests/test2/step2.logpro
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;; You should have at least one expect:required. This ensures that your process ran
 ;; (expect:required in "LogFileBody" > 0 "Put description here" #/put pattern here/)
 
 ;; You may need ignores to suppress false error or warning hits from the later expects
 ;; NOTE: Order is important here!

Index: tests/simplerun/tests/test2/step2.sh
==================================================================
--- tests/simplerun/tests/test2/step2.sh
+++ tests/simplerun/tests/test2/step2.sh
@@ -1,3 +1,20 @@
 #!/usr/bin/env bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Run your step here

Index: tests/simplerun/tests/test2/testconfig
==================================================================
--- tests/simplerun/tests/test2/testconfig
+++ tests/simplerun/tests/test2/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Add additional steps here. Format is "stepname script"
 [ezsteps]
 step1 step1.sh
 step2 step2.sh
 

Index: tests/speedtest/megatest.config
==================================================================
--- tests/speedtest/megatest.config
+++ tests/speedtest/megatest.config
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [fields]
 sysname TEXT
 fsname TEXT
 datapath TEXT
 

Index: tests/speedtest/runconfigs.config
==================================================================
--- tests/speedtest/runconfigs.config
+++ tests/speedtest/runconfigs.config
@@ -1,3 +1,20 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [default]
 SOMEVAR This should show up in SOMEVAR3
 

Index: tests/speedtest/tests/speedtest/main.sh
==================================================================
--- tests/speedtest/tests/speedtest/main.sh
+++ tests/speedtest/tests/speedtest/main.sh
@@ -1,6 +1,22 @@
 #!/bin/bash
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 
 # a bunch of steps in 2 second increments
 for i in 1 2 3 4 5 6 7 8 9 10 11 12 13 14 15 16 17;do
   $MT_MEGATEST -step step$i :state start :status running -setlog results$i.html
   sleep $TEST_DELAY

Index: tests/speedtest/tests/speedtest/testconfig
==================================================================
--- tests/speedtest/tests/speedtest/testconfig
+++ tests/speedtest/tests/speedtest/testconfig
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 [setup]
 runscript main.sh
 
 [requirements]
 priority 1

DELETED tests/stats.txt
Index: tests/stats.txt
==================================================================
--- tests/stats.txt
+++ /dev/null
@@ -1,77 +0,0 @@
-DB Stats:  a1236d6bf92ec5cb8955f490761b21b0d3eea9d3
-========
-Cmd                                     Count   TotTime   Avg       
-get-count-tests-running-for-run-id         1035    237.0                0.23
-get-count-tests-running-in-jobgroup         884    119.0                0.13
-get-count-tests-running                     884    169.0                0.19
-get-prereqs-not-met                         884    732.0                0.83
-get-test-info-by-id                         673    122.0                0.18
-get-keys                                    476      1.0                0.00
-get-test-id                                 356     42.0                0.12
-testmeta-get-record                         203     24.0                0.12
-roll-up-pass-fail-counts                    159     39.0                0.25
-register-test                               140     30.0                0.21
-test-set-rundir-shortdir                    128     98.0                0.77
-test-set-status-state                        94     45.0                0.48
-find-and-mark-incomplete                     32      0.0                0.00
-state-status-msg                             25      4.0                0.16
-delete-tests-in-state                        12      4.0                0.33
-get-tests-for-run-mindata                     8      0.0                0.00
-get-all-run-ids                               5      2.0                0.40
-get-run-info                                  4      0.0                0.00
-register-run                                  4      5.0                1.25
-set-tests-state-status                        4     15.0                3.75
-get-tests-for-run                             4     15.0                3.75
-
-# After converting first three functions above to sqlite3:first-result
-DB Stats
-========
-Cmd                                     Count   TotTime   Avg       
-get-count-tests-running-for-run-id         1138    179.0                0.16
-get-count-tests-running-in-jobgroup         987     91.0                0.09
-get-count-tests-running                     987    171.0                0.17
-get-prereqs-not-met                         987    892.0                0.90
-get-test-info-by-id                         672     95.0                0.14
-get-keys                                    476      0.0                0.00
-get-test-id                                 355     41.0                0.12
-testmeta-get-record                         203     15.0                0.07
-roll-up-pass-fail-counts                    159     30.0                0.19
-register-test                               140     22.0                0.16
-test-set-rundir-shortdir                    128    855.0                6.68
-test-set-status-state                        94     20.0                0.21
-find-and-mark-incomplete                     36      1.0                0.03
-state-status-msg                             24      5.0                0.21
-delete-tests-in-state                        12      2.0                0.17
-get-tests-for-run-mindata                     9      0.0                0.00
-get-all-run-ids                               5      1.0                0.20
-register-run                                  4      1.0                0.25
-get-tests-for-run                             4     11.0                2.75
-get-run-info                                  4      0.0                0.00
-set-tests-state-status                        4     17.0                4.25
-
-DB Stats another run, converted one or two non-relevant functions to sqlite3:first-result
-========
-Cmd                                     Count   TotTime   Avg       
-get-count-tests-running-for-run-id          987    157.0                0.16
-get-count-tests-running-in-jobgroup         836     79.0                0.09
-get-count-tests-running                     836    121.0                0.14
-get-prereqs-not-met                         836    513.0                0.61
-get-test-info-by-id                         673     85.0                0.13
-get-keys                                    476      0.0                0.00
-get-test-id                                 356     32.0                0.09
-testmeta-get-record                         203     19.0                0.09
-roll-up-pass-fail-counts                    159     27.0                0.17
-register-test                               140     23.0                0.16
-test-set-rundir-shortdir                    128     35.0                0.27
-test-set-status-state                        94     20.0                0.21
-find-and-mark-incomplete                     40      0.0                0.00
-state-status-msg                             25      5.0                0.20
-delete-tests-in-state                        12      1.0                0.08
-get-tests-for-run-mindata                    10      0.0                0.00
-get-all-run-ids                               5      0.0                0.00
-set-tests-state-status                        4     15.0                3.75
-register-run                                  4      2.0                0.50
-get-run-info                                  4      1.0                0.25
-get-tests-for-run                             4     12.0                3.00
-
-

Index: tests/supportfiles/ruby/librunscript.rb
==================================================================
--- tests/supportfiles/ruby/librunscript.rb
+++ tests/supportfiles/ruby/librunscript.rb
@@ -1,5 +1,22 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # This is the library of stuff for megatest
 
 def run_and_record(stepname, cmd, checks)
   system "megatest -step #{stepname} :state start :status n/a"
   system cmd

Index: tests/test7.logpro
==================================================================
--- tests/test7.logpro
+++ tests/test7.logpro
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;; You should have at least one expect:required. This ensures that your process ran
 (expect:required in "LogFileBody" > 0 "All tests launched" #/INFO:.*All tests launched/)
 
 ;; You may need ignores to suppress false error or warning hits from the later expects
 ;; NOTE: Order is important here!

Index: tests/tests.scm
==================================================================
--- tests/tests.scm
+++ tests/tests.scm
@@ -1,14 +1,22 @@
 ;; Copyright 2006-2012, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
-
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
 (require-extension test)
 (require-extension regex)
 (require-extension srfi-18)
@@ -17,10 +25,26 @@
 (import srfi-18)
 ;; (require-extension zmq)
 ;; (import zmq)
 
 (define test-work-dir (current-directory))
+
+;; given list of lists
+;;  ( ( msg expected param1 param2 ...)
+;;    ( ... ) )
+;; apply test to all
+;;
+(define (test-batch proc pname inlst #!key (post-proc #f))
+  (for-each
+   (lambda (spec)
+     (let ((msg    (conc pname " " (car spec)))
+           (result (cadr spec))
+           (params (cddr spec)))
+       (if post-proc
+           (test msg result (post-proc (apply proc params)))
+           (test msg result (apply proc params)))))
+   inlst))
 
 ;; read in all the _record files
 (let ((files (glob "*_records.scm")))
   (for-each
    (lambda (file)

Index: tests/unit.logpro
==================================================================
--- tests/unit.logpro
+++ tests/unit.logpro
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;; Ignore initial errors
 (trigger "ScriptStart" #/^Script started/)
 (trigger "TestStart"   #/^megatest> \(/)
 (section "startup"     "ScriptStart" "TestStart")
 

Index: tests/unittests/all-rmt.scm
==================================================================
--- tests/unittests/all-rmt.scm
+++ tests/unittests/all-rmt.scm
@@ -1,9 +1,27 @@
 
 ;;======================================================================
 ;;  A L L - R M T 
 ;;======================================================================
+
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 
 ;; Run like this:
 ;;
 ;;  ./rununittest.sh all-rmt 1
 
@@ -28,13 +46,25 @@
 ;; DEF (rmt:kill-server run-id)
 ;; DEF (rmt:start-server run-id)
 (test #f '(#t "successful login")(rmt:login #f))
 ;; DEF (rmt:login-no-auto-client-setup connection-info)
 (test #f #t (pair? (rmt:get-latest-host-load (get-host-name))))
+
+;; get-latest-host-load does a lookup in the db, it won't return a useful value unless
+;; a test ran recently on host
+(test-batch rmt:get-latest-host-load
+            "rmt:get-latest-host-load"
+            (list (list "localhost"  #t (get-host-name))
+                  (list "not-a-host" #t "not-a-host"  ))
+            post-proc: pair?)
+                                           
 (test #f #t (list? (rmt:get-changed-record-ids 0)))
+
 (test #f #f (begin (runs:update-all-test_meta #f) #f))
+
 (test #f '("test1" "test2")(sort (alist-ref "tagtwo" (hash-table->alist (rmt:get-tests-tags)) equal?) string<=))
+
 (test #f '() (rmt:get-key-val-pairs 0))
 (test #f '("SYSTEM" "RELEASE") (rmt:get-keys))
 (test #f '("SYSTEM" "RELEASE") (rmt:get-keys-write)) ;; dummy query to force server start
 (test #f '() (rmt:get-key-vals 1))
 (test #f (vector '("SYSTEM" "RELEASE") '()) (rmt:get-targets))
@@ -82,11 +112,27 @@
 (test #f '()(rmt:get-prev-run-ids 1))
 (test #f #t (begin (rmt:lock/unlock-run 1 #t #f "mikey") #t))
 (test #f "JUSTFINE" (rmt:get-run-status 1))
 (test #f #t (begin (rmt:set-run-status 1 "NOTFINE" msg: "A message") #t))
 (test #f #t (begin (rmt:update-run-event_time 1) #t))
+
 ;; (rmt:get-runs-by-patt  keys runnamepatt targpatt offset limit fields last-runs-update) ;; fields of #f uses default
+;;
+(let ((keys (rmt:get-keys))
+      (rnp  "%")    ;; run name patt
+      (tpt  "%/%")) ;; target patt
+  (test-batch rmt:get-runs-by-patt
+              "rmt:get-runs-by-patt"
+              (list (list "t=0" #t keys rnp tpt #f #f #f 0)
+                    (list "t=current" #f keys rnp tpt #f #f #f (+ 100 (current-seconds))) ;; should be no records from the future
+                    )
+              post-proc: (lambda (res)
+                           ;; (print "rmt:get-runs-by-patt returned: " res)
+                           (and (vector? res)
+                                (let ((rows (vector-ref res 1)))
+                                  (> (length rows) 0))))))
+
 ;; (rmt:find-and-mark-incomplete run-id ovr-deadtime)
 ;; (rmt:get-main-run-stats run-id)
 ;; (rmt:get-var varname)
 ;; (rmt:set-var varname value)
 ;; (rmt:find-and-mark-incomplete-all-runs #!key (ovr-deadtime #f))

Index: tests/unittests/basicserver.scm
==================================================================
--- tests/unittests/basicserver.scm
+++ tests/unittests/basicserver.scm
@@ -1,8 +1,24 @@
 ;;======================================================================
 ;; S E R V E R
 ;;======================================================================
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 ;; Run like this:
 ;;
 ;;  ./rununittest.sh server 1;(cd simplerun;megatest -stop-server 0)
 

Index: tests/unittests/configfiles.scm
==================================================================
--- tests/unittests/configfiles.scm
+++ tests/unittests/configfiles.scm
@@ -1,8 +1,24 @@
 ;;======================================================================
 ;; C O N F I G   F I L E S 
 ;;======================================================================
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 (define conffile #f)
 (test "Read a config" #t (hash-table? (read-config "test.config" #f #f)))
 (test "Read a config that doesn't exist" #t (hash-table? (read-config "nada.config" #f #f)))
 

Index: tests/unittests/cron.scm
==================================================================
--- tests/unittests/cron.scm
+++ tests/unittests/cron.scm
@@ -1,5 +1,21 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 (use test)
 
 ;;                       S  M  H  MD MTH  YR WD 
 (define ref-time (vector 58 39 21 18 1   117 6  48 #f 25200))

Index: tests/unittests/dbrdbstruct.scm
==================================================================
--- tests/unittests/dbrdbstruct.scm
+++ tests/unittests/dbrdbstruct.scm
@@ -1,8 +1,25 @@
 ;;======================================================================
 ;; S E R V E R
 ;;======================================================================
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 
 ;; Run like this:
 ;;
 ;;  (cd ..;make && make install) && ./rununittest.sh server 1;(cd simplerun;megatest -stop-server 0)
 

Index: tests/unittests/inmemdb.scm
==================================================================
--- tests/unittests/inmemdb.scm
+++ tests/unittests/inmemdb.scm
@@ -1,8 +1,24 @@
 ;;======================================================================
 ;; S E R V E R
 ;;======================================================================
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 ;; Run like this:
 ;;
 ;;  (cd ..;make && make install) && ./rununittest.sh server 1;(cd simplerun;megatest -stop-server 0)
 

Index: tests/unittests/misc.scm
==================================================================
--- tests/unittests/misc.scm
+++ tests/unittests/misc.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 (use sqlite3)
 
 ;;======================================================================
 ;; P R O C E S S E S
 ;;======================================================================

Index: tests/unittests/runs.scm
==================================================================
--- tests/unittests/runs.scm
+++ tests/unittests/runs.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 (define keys (rmt:get-keys))
 
 (test #f #t (and (server:kind-run *toppath*) #t))
 
 (test "get all legal tests" (list "test1" "test2") (sort (hash-table-keys (tests:get-all)) string<=?))

Index: tests/unittests/server.scm
==================================================================
--- tests/unittests/server.scm
+++ tests/unittests/server.scm
@@ -1,8 +1,25 @@
 ;;======================================================================
 ;; S E R V E R
 ;;======================================================================
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 
 ;; Run like this:
 ;;
 ;;  (cd ..;make && make install) && ./rununittest.sh server 1;(cd simplerun;megatest -stop-server 0)
 

Index: tests/unittests/tests.scm
==================================================================
--- tests/unittests/tests.scm
+++ tests/unittests/tests.scm
@@ -1,6 +1,23 @@
 ;; ;;======================================================================
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 ;; ;; itemwait, itemmatch
 ;; 
 ;; (db:compare-itempaths ref-item-path item-path itemmap)
 ;; 
 ;; ;; prereqs-not-met
@@ -12,69 +29,72 @@
 ;; 	 (non-completed   (runs:calc-not-completed prereqs-not-met))
 ;; 	 (runnables       (runs:calc-runnable prereqs-not-met)))
 ;; 
 ;; 
 ;; 
-
 (define user    (current-user-name))
 (define runname "mytestrun")
 (define keys    (rmt:get-keys))
 (define runinfo #f)
 (define keyvals '(("SYSTEM" "abc")("RELEASE" "def")))
 (define header  (list "SYSTEM" "RELEASE" "id" "runname" "state" "status" "owner" "event_time"))
+(define contour #f)
 (define run-id  1)
-
+(define new-comment #f)
 ;; Create a run
-(test #f 1 (rmt:register-run keyvals runname "new" "n/a" user))
+(test #f 1  (rmt:register-run keyvals runname "new" "n/a" user contour))
 (test #f #t (rmt:general-call 'register-test run-id run-id "test-one"   ""))
 (test #f #t (rmt:general-call 'register-test run-id run-id "test-two"   ""))
 (test #f #t (rmt:general-call 'register-test run-id run-id "test-three" ""))
 (test #f #t (rmt:general-call 'register-test run-id run-id "test-four"  ""))
 
-(rmt:test-set-state-status-by-id run-id (rmt:get-test-id run-id "test-one"   "") "COMPLETED" "FAIL" "")
-(rmt:test-set-state-status-by-id run-id (rmt:get-test-id run-id "test-two"   "") "COMPLETED" "PASS" "")
-(rmt:test-set-state-status-by-id run-id (rmt:get-test-id run-id "test-three" "") "RUNNING"   "n/a"  "")
-(rmt:test-set-state-status-by-id run-id (rmt:get-test-id run-id "test-four"  "") "COMPLETED" "WARN" "")
+
+;; (define (rmt:test-set-state-status-by-id run-id test-id newstate newstatus newcomment)
+(rmt:test-set-state-status-by-id run-id (rmt:get-test-id run-id "test-one"   "") "COMPLETED" "FAIL" new-comment)
+(rmt:test-set-state-status-by-id run-id (rmt:get-test-id run-id "test-two"   "") "COMPLETED" "PASS" new-comment)
+(rmt:test-set-state-status-by-id run-id (rmt:get-test-id run-id "test-three" "") "RUNNING"   "n/a"  new-comment)
+(rmt:test-set-state-status-by-id run-id (rmt:get-test-id run-id "test-four"  "") "COMPLETED" "WARN" new-comment)
 
-(print "MODE=not in")
-(test #f '()
+(test "MODE=not in"
+      '()
       (filter
        (lambda (y)
 	 (equal? y "FAIL")) ;; any FAIL in the output list?
        (map 
 	(lambda (x)(vector-ref x 4))
 	(rmt:get-tests-for-run run-id "%/%" '() '("FAIL") #f #f #t 'event_time "DESC" 'shortlist 0 'dashboard))))
 
-(print "MODE=in")
-(test #f '("FAIL")
+(test "MODE=in"
+      '("FAIL")
       (map 
        (lambda (x)(vector-ref x 4))
        (rmt:get-tests-for-run run-id "%/%" '() '("FAIL") #f #f #f 'event_time "DESC" 'shortlist 0 'dashboard)))
 (set! *verbosity* 1)
 
-(print "MODE=in, state in RUNNING")
 ;; (set! *verbosity* 8)
-(test #f '("RUNNING")
+(test "MODE=in, state in RUNNING" '("RUNNING")
       (map 
        (lambda (x)(vector-ref x 3))
        (rmt:get-tests-for-run run-id "%/%" '("RUNNING") '() #f #f #f 'event_time "DESC" 'shortlist 0 'dashboard)))
 (set! *verbosity* 1)
 
-(print "MODE=in, state in RUNNING and status IN WARN")
 ;; (set! *verbosity* 8)
-(test #f '(("RUNNING" . "n/a") ("COMPLETED" . "WARN"))
-      (map 
-       (lambda (x)
-	 (cons (vector-ref x 3)(vector-ref x 4)))
-       (rmt:get-tests-for-run run-id "%/%" '("RUNNING") '("WARN") #f #f #f 'event_time "DESC" 'shortlist 0 'dashboard)))
+;;(define (rmt:get-tests-for-run run-id testpatt states statuses offset limit not-in sort-by sort-order qryvals last-update mode)
+(test
+ "MODE=in, state in RUNNING and status IN WARN"
+ '(("COMPLETED" . "WARN") ("RUNNING" . "n/a") )
+ (map 
+  (lambda (x)
+    (cons (vector-ref x 3)(vector-ref x 4)))
+  (rmt:get-tests-for-run run-id "%/%" '("RUNNING") '("WARN") #f #f #f 'event_time "DESC" 'shortlist 0 'dashboard)))
 (set! *verbosity* 1)
 
-(print "MODE=not in, state in RUNNING and status IN WARN")
 (set! *verbosity* 8)
-(test #f '(("DELETED" . "n/a") ("COMPLETED" . "PASS") ("COMPLETED" . "FAIL"))
+(test "MODE=not in, state in RUNNING and status IN WARN"
+      '(("COMPLETED" . "PASS") ("COMPLETED" . "FAIL"))
       (map 
        (lambda (x)
 	 (cons (vector-ref x 3)(vector-ref x 4)))
        (rmt:get-tests-for-run run-id "%/%" '("RUNNING") '("WARN") #f #f #t 'event_time "DESC" 'shortlist 0 'dashboard)))
 (set! *verbosity* 1)
 
 (exit)

Index: tests/vectors-vs-records.scm
==================================================================
--- tests/vectors-vs-records.scm
+++ tests/vectors-vs-records.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 (use srfi-9)
 
 (define numtodo (string->number (caddr (argv))))
 
 ;; using vectors

Index: tests/watch-monitor.sh
==================================================================
--- tests/watch-monitor.sh
+++ tests/watch-monitor.sh
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 if [ -e fullrun/db/monitor.db ];then
 sqlite3 fullrun/db/monitor.db << EOF
 .header on
 .mode column
 select * from servers order by start_time desc;

DELETED testzmq/hwclient.scm
Index: testzmq/hwclient.scm
==================================================================
--- testzmq/hwclient.scm
+++ /dev/null
@@ -1,16 +0,0 @@
-(use zmq posix srfi-18)
-
-(define s (make-socket 'req))
-(connect-socket s "tcp://*:5563")
-
-(define myname (cadr (argv)))
-
-(print "Start client...")
-
-(do ((i 0 (+ i 1)))
-    ((>= i 1000))
-  (print "sending message #" i)
-  (send-message s (conc "Hello from " myname))
-  (print "sent \"Hello\", looking for a reply")
-  (printf "Received reply ~a [~a]\n"
-          i (receive-message s)))

DELETED testzmq/hwserver.scm
Index: testzmq/hwserver.scm
==================================================================
--- testzmq/hwserver.scm
+++ /dev/null
@@ -1,28 +0,0 @@
-(use zmq srfi-18 posix)
-
-(define th1 (make-thread 
-	     (lambda ()
-	       (let ((s (make-socket 'rep)))
-		 (bind-socket s "tcp://*:5563")
-		 (print "Start server...")
-		 (let loop ()
-		   (let* ((msg  (receive-message s))
-			  (name (caddr (string-split msg " ")))
-			  (resp (conc "World " name)))
-		     (print "Received request: [" msg "]")
-		     (thread-sleep! 0.0001)
-		     (print "Sending response \"" resp "\"")
-		     (send-message s resp)
-		     (loop)))))))
-(define th2 (make-thread
-	     (lambda ()
-	       (let loop ((count 0))
-		 (print "count is " count)
-		 (thread-sleep! 0.1)
-		 (if (< count 10000)
-		     (loop (+ count 1)))))))
-
-(thread-start! th1)
-(thread-start! th2)
-
-(thread-join! th1)

DELETED testzmq/hwtest.sh
Index: testzmq/hwtest.sh
==================================================================
--- testzmq/hwtest.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-echo Compiling hwclient and hwserver
-csc hwclient.scm
-csc hwserver.scm
-
-./hwserver > hwserver.log &
-
-sleep 1
-for x in a b c d e f g h i j k l m n o p q r s t u v w x y z;do
-./hwclient $x &
-done
-
-# killall -v hwserver hwclient

DELETED testzmq/mockupclient.scm
Index: testzmq/mockupclient.scm
==================================================================
--- testzmq/mockupclient.scm
+++ /dev/null
@@ -1,42 +0,0 @@
-(use zmq posix numbers)
-
-(define cname "Bob")
-(define runtime 10)
-(let ((args (argv)))
-  (if (< (length args) 3)
-      (begin
-	(print "Usage: mockupclient clientname runtime")
-	(exit))
-      (begin
-	(set! cname (cadr args))
-	(set! runtime (string->number (caddr args))))))
-      
-;; (define start-delay (/ (random 100) 9))
-;; (define runtime     (+ 1 (/ (random 200) 2)))
-
-(print "Starting client " cname " with runtime " runtime)
-
-(include "mockupclientlib.scm")
-
-(set! endtime (+ (current-seconds) runtime))
-
-;; first ping the server to ensure we have a connection
-(if (server-ping cname 5)
-    (print "SUCCESS: Client " cname " connected to server")
-    (begin
-      (print "ERROR: Client " cname " failed ping of server, exiting")
-      (exit)))
-
-(let loop ()
-  (let ((x (random 15))
-	(varname (list-ref (list "hello" "goodbye" "saluton" "kiaorana")(random 4))))
-    (case x
-      ;; ((1)(dbaccess cname 'sync "nodat"    #f))
-      ((2 3 4 5)(dbaccess cname 'set varname (random 999)))
-      ((6 7 8 9 10)(print cname ": Get \"" varname "\" " (dbaccess cname 'get varname #f)))
-      (else
-       (thread-sleep! 0.011)))
-    (if (< (current-seconds) endtime)
-	(loop))))
-
-(print "Client " cname " all done!!")

DELETED testzmq/mockupclientlib.scm
Index: testzmq/mockupclientlib.scm
==================================================================
--- testzmq/mockupclientlib.scm
+++ /dev/null
@@ -1,63 +0,0 @@
-(define sub  (make-socket 'sub))
-(define push (make-socket 'push))
-(socket-option-set! sub 'subscribe cname)
-(socket-option-set! sub 'hwm 1000)
-(socket-option-set! push 'hwm 1000)
-
-(connect-socket sub "tcp://localhost:6563")
-(connect-socket push "tcp://localhost:6564")
-
-(thread-sleep! 0.2)
-
-(define (server-ping cname timeout)
-  (let ((msg     (conc cname ":ping:" timeout))
-	(maxtime (+ (current-seconds) timeout)))
-    (print "pinging server from " cname " with timeout " timeout)
-    (let loop ((res   #f))
-      (if (< maxtime (current-seconds))
-	  #f ;; failed to ping
-	  (if (equal? res "Got ping")
-	      #t
-	      (begin
-		(print "Ping received from server " res)
-		(send-message push msg)
-		(thread-sleep! 0.1)
-		(loop (receive-message sub non-blocking: #t))))))))
-  
-(define (dbaccess cname cmd var val #!key (numtries 20))
-  (let* ((msg (conc cname ":" cmd ":" (if val (conc var " " val) var)))
-	 (res #f)
-	 (mtx1 (make-mutex))
-	 (do-access (lambda ()
-		      (let ((tmpres #f))
-			(print "Sending msg: " msg)
-			(send-message push msg)
-			(print "Message " msg " sent")
-			(print "Client " cname " waiting for response to " msg)
-			(print "Client " cname " received address " (receive-message* sub))
-			(set! tmpres (receive-message* sub))
-			(mutex-lock! mtx1)
-			(set! res tmpres)
-			(mutex-unlock! mtx1))))
-	 (th1 (make-thread do-access "do access"))
-	 (th2 (make-thread (lambda ()
-			     (let ((result #f))
-			       (mutex-lock! mtx1)
-			       (set! result res)
-			       (mutex-unlock! mtx1)
-			       (thread-sleep! 5)
-			       (if (not result)
-				   (if (> numtries 0)
-				       (begin
-					 (print "WARNING: access timed out for " cname ", trying again. Trys remaining=" numtries)
-					 (dbaccess cname cmd var val numtries: (- numtries 1)))
-				       (begin
-					 (print "ERROR: dbaccess timed out. Exiting")
-					 (exit)))))
-			     "timeout thread"))))
-    (thread-start! th1)
-    (thread-start! th2)
-    (thread-join! th1)
-    (if res (print "SUCCESS: received " res " with " numtries " remaining possible attempts"))
-    res))
-

DELETED testzmq/mockupserver.scm
Index: testzmq/mockupserver.scm
==================================================================
--- testzmq/mockupserver.scm
+++ /dev/null
@@ -1,151 +0,0 @@
-;; pub/sub with envelope address
-;; Note that if you don't insert a sleep, the server will crash with SIGPIPE as soon
-;; as a client disconnects.  Also a remaining client may receive tons of
-;; messages afterward.
-
-(use zmq srfi-18 sqlite3 numbers)
-
-(define pub (make-socket 'pub))
-(define pull (make-socket 'pull))
-(define cname "server")
-(define total-db-accesses 0)
-(define start-time (current-seconds))
-
-(socket-option-set! pub 'hwm 1000)
-(socket-option-set! pull 'hwm 1000)
-
-(bind-socket pub "tcp://*:6563")
-(bind-socket pull "tcp://*:6564")
-
-(thread-sleep! 0.2)
-
-(define (open-db)
-  (let* ((dbpath    "mockup.db")
-	 (dbexists  (file-exists? dbpath))
-	 (db        (open-database dbpath)) ;; (never-give-up-open-db dbpath))
-	 (handler   (make-busy-timeout 10)))
-    (set-busy-handler! db handler)
-    (if (not dbexists)
-	(for-each
-	 (lambda (stmt)
-	   (execute db stmt))
-	 (list
-	  "PRAGMA SYNCHRONOUS=0;"
-	  "CREATE TABLE clients (id INTEGER PRIMARY KEY,name TEXT,num_accesses INTEGER DEFAULT 0);"
-	  "CREATE TABLE vars    (var TEXT,val TEXT,CONSTRAINT vars_constraint UNIQUE (var));")))
-    db))
-
-(define cid-cache (make-hash-table))
-
-(define (get-client-id db cname)
-  (let ((cid (hash-table-ref/default cid-cache cname #f)))
-    (if cid 
-	cid
-	(begin
-	  (execute db "INSERT OR REPLACE INTO clients (name) VALUES(?);" cname)
-	  (for-each-row 
-	   (lambda (id)
-	     (set! cid id))
-	   db
-	   "SELECT id FROM clients WHERE name=?;" cname)
-	  (hash-table-set! cid-cache cname cid)
-	  (set! total-db-accesses (+ total-db-accesses 2))
-	  cid))))
-
-(define (count-client db cname)
-  (let ((cid (get-client-id db cname)))
-    (execute db "UPDATE clients SET num_accesses=num_accesses+1 WHERE id=?;" cid)
-    (set! total-db-accesses (+ total-db-accesses 1))
-    ))
-
-(define db (open-db))
-;; (define queuelst '())
-;; (define mx1 (make-mutex))
-
-(define max-queue-len 0)
-
-(define (process-queue queuelst)
-  (let ((queuelen (length queuelst)))
-    (if (> queuelen max-queue-len)
-	(set! max-queue-len queuelen))
-    (for-each
-     (lambda (item)
-       (let ((cname (vector-ref item 1))
-	     (clcmd (vector-ref item 2))
-	     (cdata (vector-ref item 3)))
-	 (send-message pub cname send-more: #t)
-	 (send-message pub (case clcmd
-			     ((sync)
-			      (conc queuelen))
-			     ((set)
-			      (set! total-db-accesses (+ total-db-accesses 1))
-			      (apply execute db "INSERT OR REPLACE INTO vars (var,val) VALUES (?,?);" (string-split cdata))
-			      "ok")
-			     ((get)
-			      (set! total-db-accesses (+ total-db-accesses 1))
-			      (let ((res "noval"))
-				(for-each-row
-				 (lambda (val)
-				   (set! res val))
-				 db 
-				 "SELECT val FROM vars WHERE var=?;" cdata)
-				res))
-			     (else (conc "unk cmd: " clcmd))))))
-     queuelst)))
-
-;; SERVER THREAD
-(define th1 (make-thread 
-	     (lambda ()
-	       (let ((last-run 0)) ;; current-seconds when run last
-		 (let loop ((queuelst '()))
-		   (let* ((indat (receive-message* pull))
-			  (parts (string-split indat ":"))
-			  (cname (car parts))                   ;; client name
-			  (clcmd (string->symbol (cadr parts))) ;; client cmd
-			  (cdata (caddr parts))                 ;; client data
-			  (svect (vector (current-seconds) cname clcmd cdata))) ;; record for the queue
-		     ;; (print "Server received message: " indat)
-		     (count-client db cname)
-		     (case clcmd
-		       ((ping)
-			(print "Got ping from " cname)
-			(send-message pub cname send-more: #t)
-			(send-message pub "Got ping")
-			(loop queuelst))
-		       ((sync) ;; just process the queue
-			(print "Got sync from " cname)
-			(process-queue (cons svect queuelst))
-			(loop '()))
-		       ((get)
-			(process-queue (cons svect queuelst))
-			(loop '()))
-		       (else
-			(loop (cons svect queuelst))))))))
-	     "server thread"))
-
-(include "mockupclientlib.scm")
-
-;; SYNC THREAD
-;; send a sync to the pull port
-(define th2 (make-thread
-	     (lambda ()
-	       (let ((last-action-time (current-seconds)))
-		 (let loop ()
-		   (thread-sleep! 5)
-		   (let ((queuelen (string->number (dbaccess "server" 'sync "nada" #f)))
-			 (last-action-delta #f))
-		     (if (> queuelen 1)(set! last-action-time (current-seconds)))
-		     (set! last-action-delta (- (current-seconds) last-action-time))
-		     (print "Server: Got queuelen=" queuelen ", last-action-delta=" last-action-delta)
-		     (if (< last-action-delta 60)
-			 (loop)
-			 (print "Server exiting, 25 seconds since last access"))))))
-	     "sync thread"))
-
-(thread-start! th1)
-(thread-start! th2)
-(thread-join! th2)
-
-(let* ((run-time       (- (current-seconds) start-time))
-       (queries/second (/  total-db-accesses run-time)))
-  (print "Server exited! Total db accesses=" total-db-accesses " in " run-time " seconds for " queries/second " queries/second with max queue length of: " max-queue-len))

DELETED testzmq/random.scm
Index: testzmq/random.scm
==================================================================
--- testzmq/random.scm
+++ /dev/null
@@ -1,8 +0,0 @@
-(use posix numbers)
-(randomize (inexact->exact (current-seconds)))
-
-(define low (string->number (cadr (argv))))
-(define hi  (string->number (caddr (argv))))
-
-(print (+ low (random (- hi low))))
-

DELETED testzmq/testmockup.sh
Index: testzmq/testmockup.sh
==================================================================
--- testzmq/testmockup.sh
+++ /dev/null
@@ -1,41 +0,0 @@
-#!/bin/bash
-
-rm -f mockup.db
-
-echo Compiling mockupserver.scm and mockupclient.scm
-
-# Clean up first
-killall mockupserver mockupclient -v
-
-csc random.scm
-csc mockupserver.scm
-csc mockupclient.scm
-
-echo Starting server
-./mockupserver &
-
-sleep 1
-
-rm -f mockupclients.log
-
-echo Starting clients
-for i in a b c d e f g h i j k l m n o p q s t u v w x y z; 
-  do
-  for k in a b;
-    do
-    for j in 0 1 2 3 4 5 6 7 8 9;
-      do
-      waittime=`./random 0 60`
-      runtime=`./random 5 120`
-      echo "Starting client $i$k$j with waittime $waittime and runtime $runtime" 
-      (sleep $waittime;./mockupclient $i$k$j $runtime) &
-      # >> mockupclients.log &
-    done
-  done
-done
-
-wait
-echo testmockup.sh script done
-# echo "Waiting for 5 seconds then killing all mockupserver and mockupclient processes"
-# sleep 30
-# killall -v mockupserver mockupclient

ADDED   trackback.scm
Index: trackback.scm
==================================================================
--- /dev/null
+++ trackback.scm
@@ -0,0 +1,53 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
+(include "codescanlib.scm")
+
+;; show call paths for named procedure
+(define (traceback-proc in-procname)
+  (letrec* ((all-scm-files (glob "*.scm"))
+            (xref (get-xref all-scm-files))
+            (have (alist-ref (string->symbol in-procname) xref eq? #f))
+            (lookup (lambda (path procname depth)
+                      (let* ((upcone-temp (filter (lambda (x)
+                                                    (eq? procname (car x)))
+                                                  xref))
+                             (upcone-temp2 (cond
+                                            ((null? upcone-temp) '())
+                                            (else (cdar upcone-temp))))
+                             (upcone (filter
+                                      (lambda (x) (not (eq? x procname)))
+                                      upcone-temp2))
+                             (uppath (cons procname path))
+                             (updepth (add1 depth)))
+                        (if (null? upcone)
+                            (print  uppath)
+                            (for-each (lambda (x)
+                                        (if (not (member procname path))
+                                            (lookup uppath x updepth) ))
+                                      upcone))))))
+           (if have
+               (lookup '() (string->symbol in-procname) 0)
+               (print "no such func - "in-procname))))
+
+
+(if (eq? 1 (length (command-line-arguments)))
+    (traceback-proc (car (command-line-arguments)))
+    (print "Usage: trackback "))
+
+(exit 0)
+    

Index: tree.scm
==================================================================
--- tree.scm
+++ tree.scm
@@ -1,14 +1,23 @@
 ;;======================================================================
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 ;;======================================================================
 
 (use format)
 (require-library iup)
 (import (prefix iup iup:))
@@ -22,11 +31,11 @@
 (declare (uses launch))
 (declare (uses megatest-version))
 (declare (uses gutils))
 (declare (uses db))
 (declare (uses server))
-(declare (uses synchash))
+;; (declare (uses synchash))
 (declare (uses dcommon))
 
 (include "common_records.scm")
 (include "db_records.scm")
 (include "key_records.scm")
@@ -69,11 +78,14 @@
 (define (tree:add-node obj top nodelst #!key (userdata #f))
   (let ((curr-top (iup:attribute obj "TITLE0")))
     (if (or (not (string? curr-top))
 	    (string-null? curr-top)
 	    (string-match "^\\s*$" curr-top))
-	(iup:attribute-set! obj "ADDBRANCH0" top))
+          (iup:attribute-set! obj "ADDBRANCH0" top))
+
+
+    
     (cond
      ((not (equal? top (iup:attribute obj "TITLE0")))
       (print "ERROR: top name " top " doesn't match " (iup:attribute obj "TITLE0")))
      ((null? nodelst))
      (else

DELETED txtdb/metadat.scm
Index: txtdb/metadat.scm
==================================================================
--- txtdb/metadat.scm
+++ /dev/null
@@ -1,553 +0,0 @@
-(define minimal-sxml
-  '(*TOP* (*PI* xml "version=\"1.0\" encoding=\"UTF-8\"")
-       (http://www.gnumeric.org/v10.dtd:Workbook
-         (@ (http://www.w3.org/2001/XMLSchema-instance:schemaLocation
-              "http://www.gnumeric.org/v9.xsd"))
-         (http://www.gnumeric.org/v10.dtd:Version
-           (@ (Minor "17") (Major "10") (Full "1.10.17") (Epoch "1")))
-         (http://www.gnumeric.org/v10.dtd:Attributes
-           (http://www.gnumeric.org/v10.dtd:Attribute
-             (http://www.gnumeric.org/v10.dtd:type "4")
-             (http://www.gnumeric.org/v10.dtd:name
-               "WorkbookView::show_horizontal_scrollbar")
-             (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-           (http://www.gnumeric.org/v10.dtd:Attribute
-             (http://www.gnumeric.org/v10.dtd:type "4")
-             (http://www.gnumeric.org/v10.dtd:name
-               "WorkbookView::show_vertical_scrollbar")
-             (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-           (http://www.gnumeric.org/v10.dtd:Attribute
-             (http://www.gnumeric.org/v10.dtd:type "4")
-             (http://www.gnumeric.org/v10.dtd:name
-               "WorkbookView::show_notebook_tabs")
-             (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-           (http://www.gnumeric.org/v10.dtd:Attribute
-             (http://www.gnumeric.org/v10.dtd:type "4")
-             (http://www.gnumeric.org/v10.dtd:name
-               "WorkbookView::do_auto_completion")
-             (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-           (http://www.gnumeric.org/v10.dtd:Attribute
-             (http://www.gnumeric.org/v10.dtd:type "4")
-             (http://www.gnumeric.org/v10.dtd:name
-               "WorkbookView::is_protected")
-             (http://www.gnumeric.org/v10.dtd:value "FALSE")))
-         (urn:oasis:names:tc:opendocument:xmlns:office:1.0:document-meta
-           (@ (urn:oasis:names:tc:opendocument:xmlns:office:1.0:version "1.2"))
-           (urn:oasis:names:tc:opendocument:xmlns:office:1.0:meta
-             (http://purl.org/dc/elements/1.1/:date "2013-07-26T05:41:51Z")
-             (urn:oasis:names:tc:opendocument:xmlns:meta:1.0:creation-date
-               "2013-07-26T05:41:10Z")))
-         (http://www.gnumeric.org/v10.dtd:Calculation
-           (@ (MaxIterations "100")
-              (ManualRecalc "0")
-              (IterationTolerance "0.001")
-              (FloatRadix "2")
-              (FloatDigits "53")
-              (EnableIteration "1")))
-         (http://www.gnumeric.org/v10.dtd:SheetNameIndex
-           (http://www.gnumeric.org/v10.dtd:SheetName
-             (@ (http://www.gnumeric.org/v10.dtd:Rows "65536")
-                (http://www.gnumeric.org/v10.dtd:Cols "256"))
-             "Sheet1"))
-         (http://www.gnumeric.org/v10.dtd:Geometry
-           (@ (Width "1440") (Height "647")))
-         (http://www.gnumeric.org/v10.dtd:Sheets
-           (http://www.gnumeric.org/v10.dtd:Sheet
-             (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
-                (OutlineSymbolsRight "1")
-                (OutlineSymbolsBelow "1")
-                (HideZero "0")
-                (HideRowHeader "0")
-                (HideGrid "0")
-                (HideColHeader "0")
-                (GridColor "0:0:0")
-                (DisplayOutlines "1")
-                (DisplayFormulas "0"))
-             (http://www.gnumeric.org/v10.dtd:Name "Sheet1")
-             (http://www.gnumeric.org/v10.dtd:MaxCol "-1")
-             (http://www.gnumeric.org/v10.dtd:MaxRow "-1")
-             (http://www.gnumeric.org/v10.dtd:Zoom "1")
-             (http://www.gnumeric.org/v10.dtd:Names
-               (http://www.gnumeric.org/v10.dtd:Name
-                 (http://www.gnumeric.org/v10.dtd:name "Print_Area")
-                 (http://www.gnumeric.org/v10.dtd:value "#REF!")
-                 (http://www.gnumeric.org/v10.dtd:position "A1"))
-               (http://www.gnumeric.org/v10.dtd:Name
-                 (http://www.gnumeric.org/v10.dtd:name "Sheet_Title")
-                 (http://www.gnumeric.org/v10.dtd:value "\"Sheet1\"")
-                 (http://www.gnumeric.org/v10.dtd:position "A1")))
-             (http://www.gnumeric.org/v10.dtd:PrintInformation
-               (http://www.gnumeric.org/v10.dtd:Margins
-                 (http://www.gnumeric.org/v10.dtd:top
-                   (@ (PrefUnit "mm") (Points "120")))
-                 (http://www.gnumeric.org/v10.dtd:bottom
-                   (@ (PrefUnit "mm") (Points "120")))
-                 (http://www.gnumeric.org/v10.dtd:left
-                   (@ (PrefUnit "mm") (Points "72")))
-                 (http://www.gnumeric.org/v10.dtd:right
-                   (@ (PrefUnit "mm") (Points "72")))
-                 (http://www.gnumeric.org/v10.dtd:header
-                   (@ (PrefUnit "mm") (Points "72")))
-                 (http://www.gnumeric.org/v10.dtd:footer
-                   (@ (PrefUnit "mm") (Points "72"))))
-               (http://www.gnumeric.org/v10.dtd:Scale
-                 (@ (type "percentage") (percentage "100")))
-               (http://www.gnumeric.org/v10.dtd:vcenter (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:hcenter (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:grid (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:even_if_only_styles
-                 (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:monochrome (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:draft (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:titles (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:do_not_print (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:print_range (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:order "d_then_r")
-               (http://www.gnumeric.org/v10.dtd:orientation "portrait")
-               (http://www.gnumeric.org/v10.dtd:Header
-                 (@ (Right "") (Middle "&[TAB]") (Left "")))
-               (http://www.gnumeric.org/v10.dtd:Footer
-                 (@ (Right "") (Middle "Page &[PAGE]") (Left "")))
-               (http://www.gnumeric.org/v10.dtd:paper "na_letter")
-               (http://www.gnumeric.org/v10.dtd:comments "in_place")
-               (http://www.gnumeric.org/v10.dtd:errors "as_displayed"))
-             (http://www.gnumeric.org/v10.dtd:Styles
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "0")
-                    (startCol "0")
-                    (endRow "65535")
-                    (endCol "255"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "General")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans"))))
-             (http://www.gnumeric.org/v10.dtd:Cols (@ (DefaultSizePts "48")))
-             (http://www.gnumeric.org/v10.dtd:Rows
-               (@ (DefaultSizePts "12.75")))
-             (http://www.gnumeric.org/v10.dtd:Selections
-               (@ (CursorRow "0") (CursorCol "0"))
-               (http://www.gnumeric.org/v10.dtd:Selection
-                 (@ (startRow "0") (startCol "0") (endRow "0") (endCol "0"))))
-             (http://www.gnumeric.org/v10.dtd:Cells)
-             (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A1")))
-             (http://www.gnumeric.org/v10.dtd:Solver
-               (@ (ProgramR "0")
-                  (ProblemType "0")
-                  (NonNeg "1")
-                  (ModelType "0")
-                  (MaxTime "60")
-                  (MaxIter "1000")
-                  (Discr "0")
-                  (AutoScale "0")))))
-         (http://www.gnumeric.org/v10.dtd:UIData (@ (SelectedTab "0"))))))
-
-(define sheet-meta
-  '(http://www.gnumeric.org/v10.dtd:Sheet
-  (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
-     (OutlineSymbolsRight "1")
-     (OutlineSymbolsBelow "1")
-     (HideZero "0")
-     (HideRowHeader "0")
-     (HideGrid "0")
-     (HideColHeader "0")
-     (GridColor "0:0:0")
-     (DisplayOutlines "1")
-     (DisplayFormulas "0"))
-  (http://www.gnumeric.org/v10.dtd:MaxCol "8")
-  (http://www.gnumeric.org/v10.dtd:MaxRow "18")
-  (http://www.gnumeric.org/v10.dtd:Zoom "1")
-  (http://www.gnumeric.org/v10.dtd:Names
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Print_Area")
-      (http://www.gnumeric.org/v10.dtd:value "#REF!")
-      (http://www.gnumeric.org/v10.dtd:position "A1"))
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Sheet_Title")
-      (http://www.gnumeric.org/v10.dtd:value "\"First_Sheet\"")
-      (http://www.gnumeric.org/v10.dtd:position "A1")))
-  (http://www.gnumeric.org/v10.dtd:PrintInformation
-    (http://www.gnumeric.org/v10.dtd:Margins
-      (http://www.gnumeric.org/v10.dtd:top
-        (@ (PrefUnit "mm") (Points "93.26")))
-      (http://www.gnumeric.org/v10.dtd:bottom
-        (@ (PrefUnit "mm") (Points "93.26")))
-      (http://www.gnumeric.org/v10.dtd:left (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:right (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:header
-        (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:footer
-        (@ (PrefUnit "mm") (Points "72"))))
-    (http://www.gnumeric.org/v10.dtd:Scale
-      (@ (type "percentage") (percentage "100")))
-    (http://www.gnumeric.org/v10.dtd:vcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:hcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:grid (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:even_if_only_styles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:monochrome (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:draft (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:titles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:do_not_print (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:print_range (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:order "d_then_r")
-    (http://www.gnumeric.org/v10.dtd:orientation "portrait")
-    (http://www.gnumeric.org/v10.dtd:Header
-      (@ (Right "") (Middle "&[tab]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:Footer
-      (@ (Right "") (Middle "&[page]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:paper "na_letter")
-    (http://www.gnumeric.org/v10.dtd:comments "in_place")
-    (http://www.gnumeric.org/v10.dtd:errors "as_displayed"))
-  (http://www.gnumeric.org/v10.dtd:Styles
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "0") (endRow "0") (endCol "1"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "1") (startCol "0") (endRow "17") (endCol "1"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "hh\":\"mm\":\"ss AM/PM")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "18") (startCol "0") (endRow "31") (endCol "2"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "32") (startCol "0") (endRow "255") (endCol "7"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "256") (startCol "0") (endRow "65535") (endCol "63"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "2") (endRow "1") (endCol "2"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "2") (startCol "2") (endRow "17") (endCol "2"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "0")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "3") (endRow "31") (endCol "7"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "8") (endRow "255") (endCol "63"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "64") (endRow "65535") (endCol "255"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans"))))
-  (http://www.gnumeric.org/v10.dtd:Cols
-    (@ (DefaultSizePts "48"))
-    (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "48") (No "0")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "99") (No "1") (HardSize "1")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "64.01") (No "2") (Count "7"))))
-  (http://www.gnumeric.org/v10.dtd:Rows
-    (@ (DefaultSizePts "12.1"))
-    (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "12.64") (No "0")))
-    (http://www.gnumeric.org/v10.dtd:RowInfo
-      (@ (Unit "13.5") (No "1") (Count "17")))
-    (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "12.1") (No "18"))))
-  (http://www.gnumeric.org/v10.dtd:Selections
-    (@ (CursorRow "3") (CursorCol "1"))
-    (http://www.gnumeric.org/v10.dtd:Selection
-      (@ (startRow "3") (startCol "1") (endRow "3") (endCol "1"))))
-  (http://www.gnumeric.org/v10.dtd:SheetLayout
-    (@ (TopLeft "A2"))
-    (http://www.gnumeric.org/v10.dtd:FreezePanes
-      (@ (UnfrozenTopLeft "A2") (FrozenTopLeft "A1"))))
-  (http://www.gnumeric.org/v10.dtd:Solver
-    (@ (ProgramR "0")
-       (ProblemType "0")
-       (NonNeg "1")
-       (ModelType "0")
-       (MaxTime "60")
-       (MaxIter "1000")
-       (Discr "0")
-       (AutoScale "0")))))
-
-(define sheets-meta
-  '((@ (http://www.w3.org/2001/XMLSchema-instance:schemaLocation
-      "http://www.gnumeric.org/v9.xsd"))
- (http://www.gnumeric.org/v10.dtd:Version
-   (@ (Minor "17") (Major "10") (Full "1.10.17") (Epoch "1")))
- (http://www.gnumeric.org/v10.dtd:Attributes
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name
-       "WorkbookView::show_horizontal_scrollbar")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name
-       "WorkbookView::show_vertical_scrollbar")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name "WorkbookView::show_notebook_tabs")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name "WorkbookView::do_auto_completion")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name "WorkbookView::is_protected")
-     (http://www.gnumeric.org/v10.dtd:value "FALSE")))
- (urn:oasis:names:tc:opendocument:xmlns:office:1.0:document-meta
-   (@ (urn:oasis:names:tc:opendocument:xmlns:office:1.0:version "1.2"))
-   (urn:oasis:names:tc:opendocument:xmlns:office:1.0:meta
-     (http://purl.org/dc/elements/1.1/:date "2013-07-26T04:47:02Z")
-     (urn:oasis:names:tc:opendocument:xmlns:meta:1.0:creation-date
-       "2013-07-26T04:46:14Z")))
- (http://www.gnumeric.org/v10.dtd:Calculation
-   (@ (MaxIterations "100")
-      (ManualRecalc "0")
-      (IterationTolerance "0.001")
-      (FloatRadix "2")
-      (FloatDigits "53")
-      (EnableIteration "1")))
- (http://www.gnumeric.org/v10.dtd:SheetNameIndex
-   (http://www.gnumeric.org/v10.dtd:SheetName
-     (@ (http://www.gnumeric.org/v10.dtd:Rows "65536")
-        (http://www.gnumeric.org/v10.dtd:Cols "256"))
-     "First_Sheet")
-   (http://www.gnumeric.org/v10.dtd:SheetName
-     (@ (http://www.gnumeric.org/v10.dtd:Rows "65536")
-        (http://www.gnumeric.org/v10.dtd:Cols "256"))
-     "Second-sheet")
-   (http://www.gnumeric.org/v10.dtd:SheetName
-     (@ (http://www.gnumeric.org/v10.dtd:Rows "65536")
-        (http://www.gnumeric.org/v10.dtd:Cols "256"))
-     "RunsToDo")
-   (http://www.gnumeric.org/v10.dtd:SheetName
-     (@ (http://www.gnumeric.org/v10.dtd:Rows "65536")
-        (http://www.gnumeric.org/v10.dtd:Cols "256"))
-     "RunsToLock"))
- (http://www.gnumeric.org/v10.dtd:Geometry (@ (Width "1440") (Height "647")))
- (http://www.gnumeric.org/v10.dtd:UIData (@ (SelectedTab "1")))))
-
-(define workbook-meta
-  '(*TOP* (*PI* xml "version=\"1.0\" encoding=\"UTF-8\"")))
-

DELETED txtdb/nada3/First_Sheet.dat
Index: txtdb/nada3/First_Sheet.dat
==================================================================
--- txtdb/nada3/First_Sheet.dat
+++ /dev/null
@@ -1,153 +0,0 @@
-[Time]
-BLANKVAL 
-A 0.324305555555556
-B 0.33125
-C 0.334722222222222
-D 0.336805555555556
-E 0.338888888888889
-F 0.340972222222222
-G 0.343055555555556
-H 0.345833333333333
-I 0.347916666666667
-J 0.351388888888889
-K 0.366666666666667
-L 0.379166666666667
-M 0.395833333333333
-N 0.422222222222222
-O 0.452083333333333
-P 0.491666666666667
-Q 0.570833333333333
-
-[DeltaTime]
-A 0
-B =days(B3,$B$2)*24*60
-C 
-D 
-E 
-F 
-G 
-H 
-I 
-J 
-K 
-L 
-M 
-N 
-O 
-P 
-Q 
-
-[Ambient]
-A 35.4
-B 35.4
-C 35
-D 35
-E 35
-F 35
-G 35
-H 36
-I 36
-J 37
-K 37
-L 38
-M 39
-N 40
-O 41
-P 41
-Q 41.5
-
-[Firebox]
-A 34.3
-B 72
-C 100
-D 130
-E 145
-F 150
-G 150
-H 158
-I 156
-J 152
-K 134
-L 117
-M 100
-N 91
-O 79
-P 68
-Q 51
-
-[2nd_row]
-A 34.3
-B 60
-C 90
-D 116
-E 121
-F 125
-G 128
-H 129
-I 128
-J 126
-K 117
-L 108
-M 100
-N 90
-O 78
-P 63
-Q 51
-
-[3rd_row]
-A 34.1
-B 42
-C 57
-D 69
-E 73
-F 78
-G 82
-H 86
-I 87
-J 89
-K 94
-L 96
-M 93
-N 88
-O 77
-P 64
-Q 51
-
-[4th_row]
-A 34
-B 39
-C 46
-D 52
-E 54
-F 56
-G 60
-H 62
-I 65
-J 67
-K 77
-L 82
-M 82
-N 81
-O 72
-P 62
-Q 51
-
-[Exit]
-A 34
-B 68
-C 68
-D 68
-E 68
-F 68
-G 69
-H 70
-I 72
-J 75
-K 107
-L 106
-M 106
-N 100
-O 79
-P 68
-Q 51
-

DELETED txtdb/nada3/RunsToDo.dat
Index: txtdb/nada3/RunsToDo.dat
==================================================================
--- txtdb/nada3/RunsToDo.dat
+++ /dev/null
@@ -1,15 +0,0 @@
-[a/b/c]
-123 a
-456 b
-789 c
-
-[d/e/f]
-123 e
-456 f
-789 g
-
-[g/h/i]
-123 h
-456 i
-789 j
-

DELETED txtdb/nada3/RunsToLock.dat
Index: txtdb/nada3/RunsToLock.dat
==================================================================
--- txtdb/nada3/RunsToLock.dat
+++ /dev/null
@@ -1,12 +0,0 @@
-[def]
-def def
-ghi jkl
-qrst 
-uvwx 
-yz12 
-
-[mno]
-abc 
-def xyz
-jkl 
-mnop 

DELETED txtdb/nada3/Second-sheet.dat
Index: txtdb/nada3/Second-sheet.dat
==================================================================
--- txtdb/nada3/Second-sheet.dat
+++ /dev/null
@@ -1,34 +0,0 @@
-[2]
-V2 X
-V6 Y
-V8 Z
-V12 E
-V15 B
-V17 +
-
-[A1]
-V8 Z
-V17 =
-
-# Just a test really
-#
-V1 X
-V3 X
-V5 Y
-V7 Y
-V10 Z
-V11 E
-V13 E
-V14 B
-V16 B
-[3]
-V2 John,
-V6 Tom
-V8 Fred
-V17 ~
-
-# a deeply held belief is a danger to sanity
-#
-V4 X
-row-11 Z
-row-18 B

DELETED txtdb/nada3/Sheet3.dat
Index: txtdb/nada3/Sheet3.dat
==================================================================
--- txtdb/nada3/Sheet3.dat
+++ /dev/null
@@ -1,8 +0,0 @@
-[zeroth title]
-row1name
-row2name
-
-[col1title]
-row1name row1value
-row2nameNoValue
-row3name row3value

DELETED txtdb/nada3/sheet-names.cfg
Index: txtdb/nada3/sheet-names.cfg
==================================================================
--- txtdb/nada3/sheet-names.cfg
+++ /dev/null
@@ -1,4 +0,0 @@
-First_Sheet
-Second-sheet
-RunsToDo
-RunsToLock

DELETED txtdb/nada3/sxml/First_Sheet.sxml
Index: txtdb/nada3/sxml/First_Sheet.sxml
==================================================================
--- txtdb/nada3/sxml/First_Sheet.sxml
+++ /dev/null
@@ -1,460 +0,0 @@
-(http://www.gnumeric.org/v10.dtd:Sheet
-  (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
-     (OutlineSymbolsRight "1")
-     (OutlineSymbolsBelow "1")
-     (HideZero "0")
-     (HideRowHeader "0")
-     (HideGrid "0")
-     (HideColHeader "0")
-     (DisplayOutlines "1")
-     (DisplayFormulas "0"))
-  (http://www.gnumeric.org/v10.dtd:MaxCol "8")
-  (http://www.gnumeric.org/v10.dtd:MaxRow "19")
-  (http://www.gnumeric.org/v10.dtd:Zoom "1")
-  (http://www.gnumeric.org/v10.dtd:Names
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Sheet_Title")
-      (http://www.gnumeric.org/v10.dtd:value "\"First_Sheet\"")
-      (http://www.gnumeric.org/v10.dtd:position "A1"))
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Print_Area")
-      (http://www.gnumeric.org/v10.dtd:value "#REF!")
-      (http://www.gnumeric.org/v10.dtd:position "A1")))
-  (http://www.gnumeric.org/v10.dtd:PrintInformation
-    (http://www.gnumeric.org/v10.dtd:Margins
-      (http://www.gnumeric.org/v10.dtd:top
-        (@ (PrefUnit "mm") (Points "93.26")))
-      (http://www.gnumeric.org/v10.dtd:bottom
-        (@ (PrefUnit "mm") (Points "93.26")))
-      (http://www.gnumeric.org/v10.dtd:left (@ (PrefUnit "Pt") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:right (@ (PrefUnit "Pt") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:header
-        (@ (PrefUnit "Pt") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:footer
-        (@ (PrefUnit "Pt") (Points "72"))))
-    (http://www.gnumeric.org/v10.dtd:Scale
-      (@ (type "percentage") (percentage "100")))
-    (http://www.gnumeric.org/v10.dtd:vcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:hcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:grid (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:even_if_only_styles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:monochrome (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:draft (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:titles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:order "d_then_r")
-    (http://www.gnumeric.org/v10.dtd:orientation "portrait")
-    (http://www.gnumeric.org/v10.dtd:Header
-      (@ (Right "") (Middle "&[tab]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:Footer
-      (@ (Right "") (Middle "&[page]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:paper "na_letter"))
-  (http://www.gnumeric.org/v10.dtd:Styles
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "4096") (startCol "0") (endRow "65535") (endCol "63"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "4") (endRow "255") (endCol "15"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "32") (startCol "0") (endRow "255") (endCol "3"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "2") (startCol "2") (endRow "17") (endCol "2"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "0")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "3") (endRow "31") (endCol "3"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "1") (startCol "0") (endRow "17") (endCol "1"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "hh\":\"mm\":\"ss AM/PM")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "18") (startCol "0") (endRow "31") (endCol "2"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "16") (endRow "4095") (endCol "63"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "2") (endRow "1") (endCol "2"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "64") (endRow "65535") (endCol "255"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "256") (startCol "0") (endRow "4095") (endCol "15"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "0") (endRow "0") (endCol "1"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0")))))))
-  (http://www.gnumeric.org/v10.dtd:Cols
-    (@ (DefaultSizePts "48"))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "48") (No "0") (MarginB "2") (MarginA "2")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "99") (No "1") (MarginB "2") (MarginA "2") (HardSize "1")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "64.01") (No "2") (MarginB "2") (MarginA "2") (Count "7"))))
-  (http://www.gnumeric.org/v10.dtd:Rows
-    (@ (DefaultSizePts "12.1"))
-    (http://www.gnumeric.org/v10.dtd:RowInfo
-      (@ (Unit "12.64") (No "0") (MarginB "0") (MarginA "0")))
-    (http://www.gnumeric.org/v10.dtd:RowInfo
-      (@ (Unit "13.5") (No "1") (MarginB "0") (MarginA "0") (Count "17")))
-    (http://www.gnumeric.org/v10.dtd:RowInfo
-      (@ (Unit "12.1") (No "18") (MarginB "0") (MarginA "0") (Count "2"))))
-  (http://www.gnumeric.org/v10.dtd:Selections
-    (@ (CursorRow "3") (CursorCol "1"))
-    (http://www.gnumeric.org/v10.dtd:Selection
-      (@ (startRow "3") (startCol "1") (endRow "3") (endCol "1"))))
-  (http://www.gnumeric.org/v10.dtd:SheetLayout
-    (@ (TopLeft "A2"))
-    (http://www.gnumeric.org/v10.dtd:FreezePanes
-      (@ (UnfrozenTopLeft "A2") (FrozenTopLeft "A1"))))
-  (http://www.gnumeric.org/v10.dtd:Solver
-    (@ (ShowIter "0")
-       (SensitivityR "0")
-       (ProgramR "0")
-       (ProblemType "0")
-       (PerformR "0")
-       (NonNeg "1")
-       (MaxTime "60")
-       (MaxIter "1000")
-       (LimitsR "0")
-       (Discr "0")
-       (AutoScale "0")
-       (AnswerR "0"))))

DELETED txtdb/nada3/sxml/RunsToDo.sxml
Index: txtdb/nada3/sxml/RunsToDo.sxml
==================================================================
--- txtdb/nada3/sxml/RunsToDo.sxml
+++ /dev/null
@@ -1,109 +0,0 @@
-(http://www.gnumeric.org/v10.dtd:Sheet
-  (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
-     (OutlineSymbolsRight "1")
-     (OutlineSymbolsBelow "1")
-     (HideZero "0")
-     (HideRowHeader "0")
-     (HideGrid "0")
-     (HideColHeader "0")
-     (DisplayOutlines "1")
-     (DisplayFormulas "0"))
-  (http://www.gnumeric.org/v10.dtd:MaxCol "3")
-  (http://www.gnumeric.org/v10.dtd:MaxRow "4")
-  (http://www.gnumeric.org/v10.dtd:Zoom "1")
-  (http://www.gnumeric.org/v10.dtd:Names
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Sheet_Title")
-      (http://www.gnumeric.org/v10.dtd:value "\"RunsToDo\"")
-      (http://www.gnumeric.org/v10.dtd:position "A1"))
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Print_Area")
-      (http://www.gnumeric.org/v10.dtd:value "#REF!")
-      (http://www.gnumeric.org/v10.dtd:position "A1")))
-  (http://www.gnumeric.org/v10.dtd:PrintInformation
-    (http://www.gnumeric.org/v10.dtd:Margins
-      (http://www.gnumeric.org/v10.dtd:top (@ (PrefUnit "mm") (Points "120")))
-      (http://www.gnumeric.org/v10.dtd:bottom
-        (@ (PrefUnit "mm") (Points "120")))
-      (http://www.gnumeric.org/v10.dtd:left (@ (PrefUnit "Pt") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:right (@ (PrefUnit "Pt") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:header
-        (@ (PrefUnit "Pt") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:footer
-        (@ (PrefUnit "Pt") (Points "72"))))
-    (http://www.gnumeric.org/v10.dtd:Scale
-      (@ (type "percentage") (percentage "100")))
-    (http://www.gnumeric.org/v10.dtd:vcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:hcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:grid (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:even_if_only_styles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:monochrome (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:draft (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:titles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:order "d_then_r")
-    (http://www.gnumeric.org/v10.dtd:orientation "portrait")
-    (http://www.gnumeric.org/v10.dtd:Header
-      (@ (Right "") (Middle "&[TAB]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:Footer
-      (@ (Right "") (Middle "Page &[PAGE]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:paper "na_letter"))
-  (http://www.gnumeric.org/v10.dtd:Styles
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "0") (endRow "65535") (endCol "255"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0")))))))
-  (http://www.gnumeric.org/v10.dtd:Cols
-    (@ (DefaultSizePts "48"))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "48") (No "0") (MarginB "2") (MarginA "2") (Count "4"))))
-  (http://www.gnumeric.org/v10.dtd:Rows
-    (@ (DefaultSizePts "12.75"))
-    (http://www.gnumeric.org/v10.dtd:RowInfo
-      (@ (Unit "13.5") (No "0") (MarginB "0") (MarginA "0") (Count "4")))
-    (http://www.gnumeric.org/v10.dtd:RowInfo
-      (@ (Unit "12.75") (No "4") (MarginB "0") (MarginA "0"))))
-  (http://www.gnumeric.org/v10.dtd:Selections
-    (@ (CursorRow "3") (CursorCol "2"))
-    (http://www.gnumeric.org/v10.dtd:Selection
-      (@ (startRow "3") (startCol "2") (endRow "3") (endCol "2"))))
-  (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A1")))
-  (http://www.gnumeric.org/v10.dtd:Solver
-    (@ (ShowIter "0")
-       (SensitivityR "0")
-       (ProgramR "0")
-       (ProblemType "0")
-       (PerformR "0")
-       (NonNeg "1")
-       (MaxTime "60")
-       (MaxIter "1000")
-       (LimitsR "0")
-       (Discr "0")
-       (AutoScale "0")
-       (AnswerR "0"))))

DELETED txtdb/nada3/sxml/RunsToLock.sxml
Index: txtdb/nada3/sxml/RunsToLock.sxml
==================================================================
--- txtdb/nada3/sxml/RunsToLock.sxml
+++ /dev/null
@@ -1,92 +0,0 @@
-(http://www.gnumeric.org/v10.dtd:Sheet
-  (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
-     (OutlineSymbolsRight "1")
-     (OutlineSymbolsBelow "1")
-     (HideZero "0")
-     (HideRowHeader "0")
-     (HideGrid "0")
-     (HideColHeader "0")
-     (DisplayOutlines "1")
-     (DisplayFormulas "0"))
-  (http://www.gnumeric.org/v10.dtd:MaxCol "1")
-  (http://www.gnumeric.org/v10.dtd:MaxRow "1")
-  (http://www.gnumeric.org/v10.dtd:Zoom "1")
-  (http://www.gnumeric.org/v10.dtd:PrintInformation
-    (http://www.gnumeric.org/v10.dtd:Margins
-      (http://www.gnumeric.org/v10.dtd:top (@ (PrefUnit "cm") (Points "120")))
-      (http://www.gnumeric.org/v10.dtd:bottom
-        (@ (PrefUnit "cm") (Points "120"))))
-    (http://www.gnumeric.org/v10.dtd:Scale
-      (@ (type "percentage") (percentage "100")))
-    (http://www.gnumeric.org/v10.dtd:vcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:hcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:grid (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:even_if_only_styles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:monochrome (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:draft (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:titles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:order "d_then_r")
-    (http://www.gnumeric.org/v10.dtd:orientation "portrait")
-    (http://www.gnumeric.org/v10.dtd:Header
-      (@ (Right "") (Middle "&[TAB]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:Footer
-      (@ (Right "") (Middle "Page &[PAGE]") (Left ""))))
-  (http://www.gnumeric.org/v10.dtd:Styles
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "0") (endRow "65535") (endCol "255"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0")))))))
-  (http://www.gnumeric.org/v10.dtd:Cols
-    (@ (DefaultSizePts "48"))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "48") (No "0") (MarginB "2") (MarginA "2") (Count "2"))))
-  (http://www.gnumeric.org/v10.dtd:Rows
-    (@ (DefaultSizePts "12.75"))
-    (http://www.gnumeric.org/v10.dtd:RowInfo
-      (@ (Unit "12.75") (No "0") (MarginB "0") (MarginA "0") (Count "2"))))
-  (http://www.gnumeric.org/v10.dtd:Selections
-    (@ (CursorRow "0") (CursorCol "0"))
-    (http://www.gnumeric.org/v10.dtd:Selection
-      (@ (startRow "0") (startCol "0") (endRow "0") (endCol "0"))))
-  (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A1")))
-  (http://www.gnumeric.org/v10.dtd:Solver
-    (@ (ShowIter "0")
-       (SensitivityR "0")
-       (ProgramR "0")
-       (ProblemType "1")
-       (PerformR "0")
-       (NonNeg "1")
-       (MaxTime "0")
-       (MaxIter "0")
-       (LimitsR "0")
-       (Inputs "")
-       (Discr "0")
-       (AutoScale "0")
-       (AnswerR "0"))))

DELETED txtdb/nada3/sxml/Second-sheet.sxml
Index: txtdb/nada3/sxml/Second-sheet.sxml
==================================================================
--- txtdb/nada3/sxml/Second-sheet.sxml
+++ /dev/null
@@ -1,428 +0,0 @@
-(http://www.gnumeric.org/v10.dtd:Sheet
-  (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
-     (OutlineSymbolsRight "1")
-     (OutlineSymbolsBelow "1")
-     (HideZero "0")
-     (HideRowHeader "0")
-     (HideGrid "0")
-     (HideColHeader "0")
-     (DisplayOutlines "1")
-     (DisplayFormulas "0"))
-  (http://www.gnumeric.org/v10.dtd:MaxCol "3")
-  (http://www.gnumeric.org/v10.dtd:MaxRow "21")
-  (http://www.gnumeric.org/v10.dtd:Zoom "1")
-  (http://www.gnumeric.org/v10.dtd:Names
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Sheet_Title")
-      (http://www.gnumeric.org/v10.dtd:value "\"Second-sheet\"")
-      (http://www.gnumeric.org/v10.dtd:position "A1"))
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Print_Area")
-      (http://www.gnumeric.org/v10.dtd:value "#REF!")
-      (http://www.gnumeric.org/v10.dtd:position "A1")))
-  (http://www.gnumeric.org/v10.dtd:PrintInformation
-    (http://www.gnumeric.org/v10.dtd:Margins
-      (http://www.gnumeric.org/v10.dtd:top
-        (@ (PrefUnit "mm") (Points "93.26")))
-      (http://www.gnumeric.org/v10.dtd:bottom
-        (@ (PrefUnit "mm") (Points "93.26")))
-      (http://www.gnumeric.org/v10.dtd:left (@ (PrefUnit "Pt") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:right (@ (PrefUnit "Pt") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:header
-        (@ (PrefUnit "Pt") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:footer
-        (@ (PrefUnit "Pt") (Points "72"))))
-    (http://www.gnumeric.org/v10.dtd:Scale
-      (@ (type "percentage") (percentage "100")))
-    (http://www.gnumeric.org/v10.dtd:vcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:hcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:grid (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:even_if_only_styles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:monochrome (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:draft (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:titles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:order "d_then_r")
-    (http://www.gnumeric.org/v10.dtd:orientation "portrait")
-    (http://www.gnumeric.org/v10.dtd:Header
-      (@ (Right "") (Middle "&[tab]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:Footer
-      (@ (Right "") (Middle "&[page]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:paper "na_letter"))
-  (http://www.gnumeric.org/v10.dtd:Styles
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "4096") (startCol "0") (endRow "65535") (endCol "63"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "4") (endRow "255") (endCol "15"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "32") (startCol "0") (endRow "255") (endCol "3"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "17") (startCol "3") (endRow "31") (endCol "3"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "0") (endRow "31") (endCol "2"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "16") (startCol "3") (endRow "16") (endCol "3"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "1")
-           (Rotation "0")
-           (PatternColor "FFFF:FFFF:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:CCCC:0"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "16") (endRow "4095") (endCol "63"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "64") (endRow "65535") (endCol "255"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "1") (startCol "3") (endRow "15") (endCol "3"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "3") (endRow "0") (endCol "3"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "28")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0"))))))
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "256") (startCol "0") (endRow "4095") (endCol "15"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans")
-        (http://www.gnumeric.org/v10.dtd:StyleBorder
-          (http://www.gnumeric.org/v10.dtd:Top (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Bottom (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Left (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Right (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Diagonal (@ (Style "0")))
-          (http://www.gnumeric.org/v10.dtd:Rev-Diagonal (@ (Style "0")))))))
-  (http://www.gnumeric.org/v10.dtd:Cols
-    (@ (DefaultSizePts "48"))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "64.01") (No "0") (MarginB "2") (MarginA "2")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "48") (No "1") (MarginB "2") (MarginA "2")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "99") (No "2") (MarginB "2") (MarginA "2") (HardSize "1")))
-    (http://www.gnumeric.org/v10.dtd:ColInfo
-      (@ (Unit "227.2") (No "3") (MarginB "2") (MarginA "2") (HardSize "1"))))
-  (http://www.gnumeric.org/v10.dtd:Rows
-    (@ (DefaultSizePts "12.1"))
-    (http://www.gnumeric.org/v10.dtd:RowInfo
-      (@ (Unit "60") (No "0") (MarginB "0") (MarginA "0") (HardSize "1")))
-    (http://www.gnumeric.org/v10.dtd:RowInfo
-      (@ (Unit "13.5") (No "1") (MarginB "0") (MarginA "0") (Count "17")))
-    (http://www.gnumeric.org/v10.dtd:RowInfo
-      (@ (Unit "12.1") (No "18") (MarginB "0") (MarginA "0") (Count "4"))))
-  (http://www.gnumeric.org/v10.dtd:Selections
-    (@ (CursorRow "0") (CursorCol "3"))
-    (http://www.gnumeric.org/v10.dtd:Selection
-      (@ (startRow "0") (startCol "3") (endRow "0") (endCol "3"))))
-  (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A1")))
-  (http://www.gnumeric.org/v10.dtd:Solver
-    (@ (ShowIter "0")
-       (SensitivityR "0")
-       (ProgramR "0")
-       (ProblemType "0")
-       (PerformR "0")
-       (NonNeg "1")
-       (MaxTime "60")
-       (MaxIter "1000")
-       (LimitsR "0")
-       (Discr "0")
-       (AutoScale "0")
-       (AnswerR "0"))))

DELETED txtdb/nada3/sxml/Sheet3.sxml
Index: txtdb/nada3/sxml/Sheet3.sxml
==================================================================
--- txtdb/nada3/sxml/Sheet3.sxml
+++ /dev/null
@@ -1,100 +0,0 @@
-(http://www.gnumeric.org/v10.dtd:Sheet
-  (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
-     (OutlineSymbolsRight "1")
-     (OutlineSymbolsBelow "1")
-     (HideZero "0")
-     (HideRowHeader "0")
-     (HideGrid "0")
-     (HideColHeader "0")
-     (GridColor "0:0:0")
-     (DisplayOutlines "1")
-     (DisplayFormulas "0"))
-  (http://www.gnumeric.org/v10.dtd:MaxCol "0")
-  (http://www.gnumeric.org/v10.dtd:MaxRow "0")
-  (http://www.gnumeric.org/v10.dtd:Zoom "1")
-  (http://www.gnumeric.org/v10.dtd:Names
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Print_Area")
-      (http://www.gnumeric.org/v10.dtd:value "#REF!")
-      (http://www.gnumeric.org/v10.dtd:position "A1"))
-    (http://www.gnumeric.org/v10.dtd:Name
-      (http://www.gnumeric.org/v10.dtd:name "Sheet_Title")
-      (http://www.gnumeric.org/v10.dtd:value "\"Sheet3\"")
-      (http://www.gnumeric.org/v10.dtd:position "A1")))
-  (http://www.gnumeric.org/v10.dtd:PrintInformation
-    (http://www.gnumeric.org/v10.dtd:Margins
-      (http://www.gnumeric.org/v10.dtd:top
-        (@ (PrefUnit "mm") (Points "93.26")))
-      (http://www.gnumeric.org/v10.dtd:bottom
-        (@ (PrefUnit "mm") (Points "93.26")))
-      (http://www.gnumeric.org/v10.dtd:left (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:right (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:header
-        (@ (PrefUnit "mm") (Points "72")))
-      (http://www.gnumeric.org/v10.dtd:footer
-        (@ (PrefUnit "mm") (Points "72"))))
-    (http://www.gnumeric.org/v10.dtd:Scale
-      (@ (type "percentage") (percentage "100")))
-    (http://www.gnumeric.org/v10.dtd:vcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:hcenter (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:grid (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:even_if_only_styles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:monochrome (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:draft (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:titles (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:do_not_print (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:print_range (@ (value "0")))
-    (http://www.gnumeric.org/v10.dtd:order "d_then_r")
-    (http://www.gnumeric.org/v10.dtd:orientation "portrait")
-    (http://www.gnumeric.org/v10.dtd:Header
-      (@ (Right "") (Middle "&[tab]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:Footer
-      (@ (Right "") (Middle "&[page]") (Left "")))
-    (http://www.gnumeric.org/v10.dtd:paper "na_letter")
-    (http://www.gnumeric.org/v10.dtd:comments "in_place")
-    (http://www.gnumeric.org/v10.dtd:errors "as_displayed"))
-  (http://www.gnumeric.org/v10.dtd:Styles
-    (http://www.gnumeric.org/v10.dtd:StyleRegion
-      (@ (startRow "0") (startCol "0") (endRow "65535") (endCol "255"))
-      (http://www.gnumeric.org/v10.dtd:Style
-        (@ (WrapText "0")
-           (VAlign "2")
-           (ShrinkToFit "0")
-           (Shade "0")
-           (Rotation "0")
-           (PatternColor "0:0:0")
-           (Locked "1")
-           (Indent "0")
-           (Hidden "0")
-           (HAlign "1")
-           (Format "General")
-           (Fore "0:0:0")
-           (Back "FFFF:FFFF:FFFF"))
-        (http://www.gnumeric.org/v10.dtd:Font
-          (@ (Unit "10")
-             (Underline "0")
-             (StrikeThrough "0")
-             (Script "0")
-             (Italic "0")
-             (Bold "0"))
-          "Sans"))))
-  (http://www.gnumeric.org/v10.dtd:Cols
-    (@ (DefaultSizePts "48"))
-    (http://www.gnumeric.org/v10.dtd:ColInfo (@ (Unit "64.01") (No "0"))))
-  (http://www.gnumeric.org/v10.dtd:Rows
-    (@ (DefaultSizePts "12.1"))
-    (http://www.gnumeric.org/v10.dtd:RowInfo (@ (Unit "12.82") (No "0"))))
-  (http://www.gnumeric.org/v10.dtd:Selections
-    (@ (CursorRow "0") (CursorCol "0"))
-    (http://www.gnumeric.org/v10.dtd:Selection
-      (@ (startRow "0") (startCol "0") (endRow "0") (endCol "0"))))
-  (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A1")))
-  (http://www.gnumeric.org/v10.dtd:Solver
-    (@ (ProgramR "0")
-       (ProblemType "0")
-       (NonNeg "1")
-       (ModelType "0")
-       (MaxTime "60")
-       (MaxIter "1000")
-       (Discr "0")
-       (AutoScale "0"))))

DELETED txtdb/nada3/sxml/_sheets.sxml
Index: txtdb/nada3/sxml/_sheets.sxml
==================================================================
--- txtdb/nada3/sxml/_sheets.sxml
+++ /dev/null
@@ -1,46 +0,0 @@
-((@ (http://www.w3.org/2001/XMLSchema-instance:schemaLocation
-      "http://www.gnumeric.org/v8.xsd"))
- (http://www.gnumeric.org/v10.dtd:Version
-   (@ (Minor "3") (Major "6") (Full "1.6.3") (Epoch "1")))
- (http://www.gnumeric.org/v10.dtd:Attributes
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name
-       "WorkbookView::show_horizontal_scrollbar")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name
-       "WorkbookView::show_vertical_scrollbar")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name "WorkbookView::show_notebook_tabs")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name "WorkbookView::do_auto_completion")
-     (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-   (http://www.gnumeric.org/v10.dtd:Attribute
-     (http://www.gnumeric.org/v10.dtd:type "4")
-     (http://www.gnumeric.org/v10.dtd:name "WorkbookView::is_protected")
-     (http://www.gnumeric.org/v10.dtd:value "FALSE")))
- (http://www.gnumeric.org/v10.dtd:Summary
-   (http://www.gnumeric.org/v10.dtd:Item
-     (http://www.gnumeric.org/v10.dtd:name "application")
-     (http://www.gnumeric.org/v10.dtd:val-string "gnumeric"))
-   (http://www.gnumeric.org/v10.dtd:Item
-     (http://www.gnumeric.org/v10.dtd:name "author")
-     (http://www.gnumeric.org/v10.dtd:val-string "matthew.r.welland")))
- (http://www.gnumeric.org/v10.dtd:SheetNameIndex
-   (http://www.gnumeric.org/v10.dtd:SheetName "First_Sheet")
-   (http://www.gnumeric.org/v10.dtd:SheetName "Second-sheet")
-   (http://www.gnumeric.org/v10.dtd:SheetName "RunsToDo")
-   (http://www.gnumeric.org/v10.dtd:SheetName "RunsToLock"))
- (http://www.gnumeric.org/v10.dtd:Geometry (@ (Width "1440") (Height "647")))
- (http://www.gnumeric.org/v10.dtd:UIData (@ (SelectedTab "3")))
- (http://www.gnumeric.org/v10.dtd:Calculation
-   (@ (MaxIterations "100")
-      (ManualRecalc "0")
-      (IterationTolerance "0.001")
-      (EnableIteration "1"))))

DELETED txtdb/nada3/sxml/_workbook.sxml
Index: txtdb/nada3/sxml/_workbook.sxml
==================================================================
--- txtdb/nada3/sxml/_workbook.sxml
+++ /dev/null
@@ -1,1 +0,0 @@
-(*TOP* (*PI* xml "version=\"1.0\" encoding=\"UTF-8\""))

DELETED txtdb/testdata.sxml
Index: txtdb/testdata.sxml
==================================================================
--- txtdb/testdata.sxml
+++ /dev/null
@@ -1,1273 +0,0 @@
-(*TOP* (*PI* xml "version=\"1.0\" encoding=\"UTF-8\"")
-       (http://www.gnumeric.org/v10.dtd:Workbook
-         (@ (http://www.w3.org/2001/XMLSchema-instance:schemaLocation
-              "http://www.gnumeric.org/v9.xsd"))
-         (http://www.gnumeric.org/v10.dtd:Version
-           (@ (Minor "17") (Major "10") (Full "1.10.17") (Epoch "1")))
-         (http://www.gnumeric.org/v10.dtd:Attributes
-           (http://www.gnumeric.org/v10.dtd:Attribute
-             (http://www.gnumeric.org/v10.dtd:type "4")
-             (http://www.gnumeric.org/v10.dtd:name
-               "WorkbookView::show_horizontal_scrollbar")
-             (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-           (http://www.gnumeric.org/v10.dtd:Attribute
-             (http://www.gnumeric.org/v10.dtd:type "4")
-             (http://www.gnumeric.org/v10.dtd:name
-               "WorkbookView::show_vertical_scrollbar")
-             (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-           (http://www.gnumeric.org/v10.dtd:Attribute
-             (http://www.gnumeric.org/v10.dtd:type "4")
-             (http://www.gnumeric.org/v10.dtd:name
-               "WorkbookView::show_notebook_tabs")
-             (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-           (http://www.gnumeric.org/v10.dtd:Attribute
-             (http://www.gnumeric.org/v10.dtd:type "4")
-             (http://www.gnumeric.org/v10.dtd:name
-               "WorkbookView::do_auto_completion")
-             (http://www.gnumeric.org/v10.dtd:value "TRUE"))
-           (http://www.gnumeric.org/v10.dtd:Attribute
-             (http://www.gnumeric.org/v10.dtd:type "4")
-             (http://www.gnumeric.org/v10.dtd:name
-               "WorkbookView::is_protected")
-             (http://www.gnumeric.org/v10.dtd:value "FALSE")))
-         (urn:oasis:names:tc:opendocument:xmlns:office:1.0:document-meta
-           (@ (urn:oasis:names:tc:opendocument:xmlns:office:1.0:version "1.2"))
-           (urn:oasis:names:tc:opendocument:xmlns:office:1.0:meta
-             (http://purl.org/dc/elements/1.1/:date "2013-07-14T22:32:27Z")
-             (urn:oasis:names:tc:opendocument:xmlns:meta:1.0:creation-date
-               "2013-07-13T04:38:00Z")))
-         (http://www.gnumeric.org/v10.dtd:Calculation
-           (@ (MaxIterations "100")
-              (ManualRecalc "0")
-              (IterationTolerance "0.001")
-              (FloatRadix "2")
-              (FloatDigits "53")
-              (EnableIteration "1")))
-         (http://www.gnumeric.org/v10.dtd:SheetNameIndex
-           (http://www.gnumeric.org/v10.dtd:SheetName
-             (@ (http://www.gnumeric.org/v10.dtd:Rows "65536")
-                (http://www.gnumeric.org/v10.dtd:Cols "256"))
-             "First_Sheet")
-           (http://www.gnumeric.org/v10.dtd:SheetName
-             (@ (http://www.gnumeric.org/v10.dtd:Rows "65536")
-                (http://www.gnumeric.org/v10.dtd:Cols "256"))
-             "Second-sheet")
-           (http://www.gnumeric.org/v10.dtd:SheetName
-             (@ (http://www.gnumeric.org/v10.dtd:Rows "65536")
-                (http://www.gnumeric.org/v10.dtd:Cols "256"))
-             "Sheet3"))
-         (http://www.gnumeric.org/v10.dtd:Geometry
-           (@ (Width "1440") (Height "647")))
-         (http://www.gnumeric.org/v10.dtd:Sheets
-           (http://www.gnumeric.org/v10.dtd:Sheet
-             (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
-                (OutlineSymbolsRight "1")
-                (OutlineSymbolsBelow "1")
-                (HideZero "0")
-                (HideRowHeader "0")
-                (HideGrid "0")
-                (HideColHeader "0")
-                (GridColor "0:0:0")
-                (DisplayOutlines "1")
-                (DisplayFormulas "0"))
-             (http://www.gnumeric.org/v10.dtd:Name "First_Sheet")
-             (http://www.gnumeric.org/v10.dtd:MaxCol "8")
-             (http://www.gnumeric.org/v10.dtd:MaxRow "17")
-             (http://www.gnumeric.org/v10.dtd:Zoom "1")
-             (http://www.gnumeric.org/v10.dtd:Names
-               (http://www.gnumeric.org/v10.dtd:Name
-                 (http://www.gnumeric.org/v10.dtd:name "Print_Area")
-                 (http://www.gnumeric.org/v10.dtd:value "#REF!")
-                 (http://www.gnumeric.org/v10.dtd:position "A1"))
-               (http://www.gnumeric.org/v10.dtd:Name
-                 (http://www.gnumeric.org/v10.dtd:name "Sheet_Title")
-                 (http://www.gnumeric.org/v10.dtd:value "\"First_Sheet\"")
-                 (http://www.gnumeric.org/v10.dtd:position "A1")))
-             (http://www.gnumeric.org/v10.dtd:PrintInformation
-               (http://www.gnumeric.org/v10.dtd:Margins
-                 (http://www.gnumeric.org/v10.dtd:top
-                   (@ (PrefUnit "mm") (Points "93.26")))
-                 (http://www.gnumeric.org/v10.dtd:bottom
-                   (@ (PrefUnit "mm") (Points "93.26")))
-                 (http://www.gnumeric.org/v10.dtd:left
-                   (@ (PrefUnit "mm") (Points "72")))
-                 (http://www.gnumeric.org/v10.dtd:right
-                   (@ (PrefUnit "mm") (Points "72")))
-                 (http://www.gnumeric.org/v10.dtd:header
-                   (@ (PrefUnit "mm") (Points "72")))
-                 (http://www.gnumeric.org/v10.dtd:footer
-                   (@ (PrefUnit "mm") (Points "72"))))
-               (http://www.gnumeric.org/v10.dtd:Scale
-                 (@ (type "percentage") (percentage "100")))
-               (http://www.gnumeric.org/v10.dtd:vcenter (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:hcenter (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:grid (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:even_if_only_styles
-                 (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:monochrome (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:draft (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:titles (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:do_not_print (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:print_range (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:order "d_then_r")
-               (http://www.gnumeric.org/v10.dtd:orientation "portrait")
-               (http://www.gnumeric.org/v10.dtd:Header
-                 (@ (Right "") (Middle "&[tab]") (Left "")))
-               (http://www.gnumeric.org/v10.dtd:Footer
-                 (@ (Right "") (Middle "&[page]") (Left "")))
-               (http://www.gnumeric.org/v10.dtd:paper "na_letter")
-               (http://www.gnumeric.org/v10.dtd:comments "in_place")
-               (http://www.gnumeric.org/v10.dtd:errors "as_displayed"))
-             (http://www.gnumeric.org/v10.dtd:Styles
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "0") (startCol "0") (endRow "0") (endCol "1"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "General")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans")))
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "1") (startCol "0") (endRow "17") (endCol "1"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "hh\":\"mm\":\"ss AM/PM")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans")))
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "18") (startCol "0") (endRow "31") (endCol "2"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "General")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans")))
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "32") (startCol "0") (endRow "255") (endCol "7"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "General")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans")))
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "256")
-                    (startCol "0")
-                    (endRow "65535")
-                    (endCol "63"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "General")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans")))
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "0") (startCol "2") (endRow "1") (endCol "2"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "General")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans")))
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "2") (startCol "2") (endRow "17") (endCol "2"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "0")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans")))
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "0") (startCol "3") (endRow "31") (endCol "7"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "General")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans")))
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "0") (startCol "8") (endRow "255") (endCol "63"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "General")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans")))
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "0")
-                    (startCol "64")
-                    (endRow "65535")
-                    (endCol "255"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "General")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans"))))
-             (http://www.gnumeric.org/v10.dtd:Cols
-               (@ (DefaultSizePts "48"))
-               (http://www.gnumeric.org/v10.dtd:ColInfo
-                 (@ (Unit "48") (No "0")))
-               (http://www.gnumeric.org/v10.dtd:ColInfo
-                 (@ (Unit "99") (No "1") (HardSize "1")))
-               (http://www.gnumeric.org/v10.dtd:ColInfo
-                 (@ (Unit "64.01") (No "2") (Count "7"))))
-             (http://www.gnumeric.org/v10.dtd:Rows
-               (@ (DefaultSizePts "12.1"))
-               (http://www.gnumeric.org/v10.dtd:RowInfo
-                 (@ (Unit "12.64") (No "0")))
-               (http://www.gnumeric.org/v10.dtd:RowInfo
-                 (@ (Unit "13.5") (No "1") (Count "17"))))
-             (http://www.gnumeric.org/v10.dtd:Selections
-               (@ (CursorRow "29") (CursorCol "1"))
-               (http://www.gnumeric.org/v10.dtd:Selection
-                 (@ (startRow "29")
-                    (startCol "1")
-                    (endRow "29")
-                    (endCol "1"))))
-             (http://www.gnumeric.org/v10.dtd:Cells
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "0") (Col "1"))
-                 "Time")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "0") (Col "2"))
-                 "DeltaTime")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "0") (Col "3"))
-                 "Ambient")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "0") (Col "4"))
-                 "Firebox")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "0") (Col "5"))
-                 "2nd row")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "0") (Col "6"))
-                 "3rd row")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "0") (Col "7"))
-                 "4th row")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "0") (Col "8"))
-                 "Exit ")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "1") (Col "0"))
-                 "A")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "1") (Col "1"))
-                 "0.32430555555555557")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "1") (Col "2"))
-                 "0")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "1") (Col "3"))
-                 "35.399999999999999")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "1") (Col "4"))
-                 "34.299999999999997")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "1") (Col "5"))
-                 "34.299999999999997")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "1") (Col "6"))
-                 "34.100000000000001")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "1") (Col "7"))
-                 "34")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "1") (Col "8"))
-                 "34")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "2") (Col "0"))
-                 "B")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "2") (Col "1"))
-                 "0.33124999999999999")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "2") (ExprID "1") (Col "2"))
-                 "=days(B3,$B$2)*24*60")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "2") (Col "3"))
-                 "35.399999999999999")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "2") (Col "4"))
-                 "72")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "2") (Col "5"))
-                 "60")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "2") (Col "6"))
-                 "42")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "2") (Col "7"))
-                 "39")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "2") (Col "8"))
-                 "68")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "3") (Col "0"))
-                 "C")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "3") (Col "1"))
-                 "0.3347222222222222")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "3") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "3") (Col "3"))
-                 "35")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "3") (Col "4"))
-                 "100")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "3") (Col "5"))
-                 "90")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "3") (Col "6"))
-                 "57")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "3") (Col "7"))
-                 "46")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "3") (Col "8"))
-                 "68")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "4") (Col "0"))
-                 "D")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "4") (Col "1"))
-                 "0.33680555555555558")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "4") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "4") (Col "3"))
-                 "35")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "4") (Col "4"))
-                 "130")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "4") (Col "5"))
-                 "116")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "4") (Col "6"))
-                 "69")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "4") (Col "7"))
-                 "52")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "4") (Col "8"))
-                 "68")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "5") (Col "0"))
-                 "E")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "5") (Col "1"))
-                 "0.33888888888888891")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "5") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "5") (Col "3"))
-                 "35")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "5") (Col "4"))
-                 "145")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "5") (Col "5"))
-                 "121")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "5") (Col "6"))
-                 "73")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "5") (Col "7"))
-                 "54")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "5") (Col "8"))
-                 "68")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "6") (Col "0"))
-                 "F")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "6") (Col "1"))
-                 "0.34097222222222223")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "6") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "6") (Col "3"))
-                 "35")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "6") (Col "4"))
-                 "150")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "6") (Col "5"))
-                 "125")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "6") (Col "6"))
-                 "78")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "6") (Col "7"))
-                 "56")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "6") (Col "8"))
-                 "68")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "7") (Col "0"))
-                 "G")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "7") (Col "1"))
-                 "0.34305555555555556")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "7") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "7") (Col "3"))
-                 "35")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "7") (Col "4"))
-                 "150")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "7") (Col "5"))
-                 "128")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "7") (Col "6"))
-                 "82")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "7") (Col "7"))
-                 "60")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "7") (Col "8"))
-                 "69")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "8") (Col "0"))
-                 "H")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "8") (Col "1"))
-                 "0.34583333333333333")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "8") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "8") (Col "3"))
-                 "36")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "8") (Col "4"))
-                 "158")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "8") (Col "5"))
-                 "129")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "8") (Col "6"))
-                 "86")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "8") (Col "7"))
-                 "62")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "8") (Col "8"))
-                 "70")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "9") (Col "0"))
-                 "I")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "9") (Col "1"))
-                 "0.34791666666666665")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "9") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "9") (Col "3"))
-                 "36")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "9") (Col "4"))
-                 "156")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "9") (Col "5"))
-                 "128")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "9") (Col "6"))
-                 "87")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "9") (Col "7"))
-                 "65")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "9") (Col "8"))
-                 "72")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "10") (Col "0"))
-                 "J")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "10") (Col "1"))
-                 "0.35138888888888886")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "10") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "10") (Col "3"))
-                 "37")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "10") (Col "4"))
-                 "152")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "10") (Col "5"))
-                 "126")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "10") (Col "6"))
-                 "89")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "10") (Col "7"))
-                 "67")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "10") (Col "8"))
-                 "75")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "11") (Col "0"))
-                 "K")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "11") (Col "1"))
-                 "0.36666666666666664")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "11") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "11") (Col "3"))
-                 "37")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "11") (Col "4"))
-                 "134")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "11") (Col "5"))
-                 "117")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "11") (Col "6"))
-                 "94")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "11") (Col "7"))
-                 "77")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "11") (Col "8"))
-                 "107")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "12") (Col "0"))
-                 "L")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "12") (Col "1"))
-                 "0.37916666666666665")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "12") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "12") (Col "3"))
-                 "38")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "12") (Col "4"))
-                 "117")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "12") (Col "5"))
-                 "108")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "12") (Col "6"))
-                 "96")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "12") (Col "7"))
-                 "82")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "12") (Col "8"))
-                 "106")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "13") (Col "0"))
-                 "M")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "13") (Col "1"))
-                 "0.39583333333333331")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "13") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "13") (Col "3"))
-                 "39")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "13") (Col "4"))
-                 "100")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "13") (Col "5"))
-                 "100")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "13") (Col "6"))
-                 "93")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "13") (Col "7"))
-                 "82")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "13") (Col "8"))
-                 "106")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "14") (Col "0"))
-                 "N")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "14") (Col "1"))
-                 "0.42222222222222222")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "14") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "14") (Col "3"))
-                 "40")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "14") (Col "4"))
-                 "91")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "14") (Col "5"))
-                 "90")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "14") (Col "6"))
-                 "88")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "14") (Col "7"))
-                 "81")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "14") (Col "8"))
-                 "100")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "15") (Col "0"))
-                 "O")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "15") (Col "1"))
-                 "0.45208333333333334")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "15") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "15") (Col "3"))
-                 "41")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "15") (Col "4"))
-                 "79")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "15") (Col "5"))
-                 "78")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "15") (Col "6"))
-                 "77")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "15") (Col "7"))
-                 "72")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "15") (Col "8"))
-                 "79")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "16") (Col "0"))
-                 "P")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "16") (Col "1"))
-                 "0.49166666666666664")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "16") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "16") (Col "3"))
-                 "41")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "16") (Col "4"))
-                 "68")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "16") (Col "5"))
-                 "63")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "16") (Col "6"))
-                 "64")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "16") (Col "7"))
-                 "62")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "16") (Col "8"))
-                 "68")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "17") (Col "0"))
-                 "Q")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "17") (Col "1"))
-                 "0.5708333333333333")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (Row "17") (ExprID "1") (Col "2")))
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "17") (Col "3"))
-                 "41.5")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "17") (Col "4"))
-                 "51")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "17") (Col "5"))
-                 "51")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "17") (Col "6"))
-                 "51")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "17") (Col "7"))
-                 "51")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "17") (Col "8"))
-                 "51"))
-             (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A1")))
-             (http://www.gnumeric.org/v10.dtd:Solver
-               (@ (ProgramR "0")
-                  (ProblemType "0")
-                  (NonNeg "1")
-                  (ModelType "0")
-                  (MaxTime "60")
-                  (MaxIter "1000")
-                  (Discr "0")
-                  (AutoScale "0"))))
-           (http://www.gnumeric.org/v10.dtd:Sheet
-             (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
-                (OutlineSymbolsRight "1")
-                (OutlineSymbolsBelow "1")
-                (HideZero "0")
-                (HideRowHeader "0")
-                (HideGrid "0")
-                (HideColHeader "0")
-                (GridColor "0:0:0")
-                (DisplayOutlines "1")
-                (DisplayFormulas "0"))
-             (http://www.gnumeric.org/v10.dtd:Name "Second-sheet")
-             (http://www.gnumeric.org/v10.dtd:MaxCol "4")
-             (http://www.gnumeric.org/v10.dtd:MaxRow "20")
-             (http://www.gnumeric.org/v10.dtd:Zoom "1")
-             (http://www.gnumeric.org/v10.dtd:Names
-               (http://www.gnumeric.org/v10.dtd:Name
-                 (http://www.gnumeric.org/v10.dtd:name "Print_Area")
-                 (http://www.gnumeric.org/v10.dtd:value "#REF!")
-                 (http://www.gnumeric.org/v10.dtd:position "A1"))
-               (http://www.gnumeric.org/v10.dtd:Name
-                 (http://www.gnumeric.org/v10.dtd:name "Sheet_Title")
-                 (http://www.gnumeric.org/v10.dtd:value "\"Second-sheet\"")
-                 (http://www.gnumeric.org/v10.dtd:position "A1")))
-             (http://www.gnumeric.org/v10.dtd:PrintInformation
-               (http://www.gnumeric.org/v10.dtd:Margins
-                 (http://www.gnumeric.org/v10.dtd:top
-                   (@ (PrefUnit "mm") (Points "93.26")))
-                 (http://www.gnumeric.org/v10.dtd:bottom
-                   (@ (PrefUnit "mm") (Points "93.26")))
-                 (http://www.gnumeric.org/v10.dtd:left
-                   (@ (PrefUnit "mm") (Points "72")))
-                 (http://www.gnumeric.org/v10.dtd:right
-                   (@ (PrefUnit "mm") (Points "72")))
-                 (http://www.gnumeric.org/v10.dtd:header
-                   (@ (PrefUnit "mm") (Points "72")))
-                 (http://www.gnumeric.org/v10.dtd:footer
-                   (@ (PrefUnit "mm") (Points "72"))))
-               (http://www.gnumeric.org/v10.dtd:Scale
-                 (@ (type "percentage") (percentage "100")))
-               (http://www.gnumeric.org/v10.dtd:vcenter (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:hcenter (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:grid (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:even_if_only_styles
-                 (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:monochrome (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:draft (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:titles (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:do_not_print (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:print_range (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:order "d_then_r")
-               (http://www.gnumeric.org/v10.dtd:orientation "portrait")
-               (http://www.gnumeric.org/v10.dtd:Header
-                 (@ (Right "") (Middle "&[tab]") (Left "")))
-               (http://www.gnumeric.org/v10.dtd:Footer
-                 (@ (Right "") (Middle "&[page]") (Left "")))
-               (http://www.gnumeric.org/v10.dtd:paper "na_letter")
-               (http://www.gnumeric.org/v10.dtd:comments "in_place")
-               (http://www.gnumeric.org/v10.dtd:errors "as_displayed"))
-             (http://www.gnumeric.org/v10.dtd:Styles
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "0")
-                    (startCol "0")
-                    (endRow "65279")
-                    (endCol "255"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "General")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans")))
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "65280")
-                    (startCol "0")
-                    (endRow "65534")
-                    (endCol "255"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "General")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans")))
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "65535")
-                    (startCol "0")
-                    (endRow "65535")
-                    (endCol "255"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "General")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans"))))
-             (http://www.gnumeric.org/v10.dtd:Cols
-               (@ (DefaultSizePts "48"))
-               (http://www.gnumeric.org/v10.dtd:ColInfo
-                 (@ (Unit "64.01") (No "0")))
-               (http://www.gnumeric.org/v10.dtd:ColInfo
-                 (@ (Unit "48") (No "1") (Count "4"))))
-             (http://www.gnumeric.org/v10.dtd:Rows
-               (@ (DefaultSizePts "12.1"))
-               (http://www.gnumeric.org/v10.dtd:RowInfo
-                 (@ (Unit "13.5") (No "0") (Count "20"))))
-             (http://www.gnumeric.org/v10.dtd:Selections
-               (@ (CursorRow "4") (CursorCol "4"))
-               (http://www.gnumeric.org/v10.dtd:Selection
-                 (@ (startRow "4") (startCol "4") (endRow "4") (endCol "4"))))
-             (http://www.gnumeric.org/v10.dtd:Cells
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "0") (Col "1"))
-                 "A1")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "0") (Col "2"))
-                 "2")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "0") (Col "3"))
-                 "A1")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "40") (Row "0") (Col "4"))
-                 "3")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "1") (Col "0"))
-                 "V1")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "1") (Col "1"))
-                 "X")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "2") (Col "0"))
-                 "V2")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "2") (Col "2"))
-                 "X")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "3") (Col "0"))
-                 "V3")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "3") (Col "3"))
-                 "X")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "4") (Col "0"))
-                 "V4")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "4") (Col "4"))
-                 "X")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "5") (Col "0"))
-                 "V5")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "5") (Col "3"))
-                 "Y")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "6") (Col "0"))
-                 "V6")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "6") (Col "2"))
-                 "Y")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "7") (Col "0"))
-                 "V7")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "7") (Col "1"))
-                 "Y")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "8") (Col "0"))
-                 "V8")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "8") (Col "1"))
-                 "Z")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "9") (Col "0"))
-                 "V8")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "9") (Col "2"))
-                 "Z")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "10") (Col "0"))
-                 "V10")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "10") (Col "3"))
-                 "Z")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "11") (Col "4"))
-                 "Z")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "12") (Col "0"))
-                 "V11")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "12") (Col "3"))
-                 "E")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "13") (Col "0"))
-                 "V12")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "13") (Col "2"))
-                 "E")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "14") (Col "0"))
-                 "V13")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "14") (Col "1"))
-                 "E")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "15") (Col "0"))
-                 "V14")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "15") (Col "1"))
-                 "B")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "16") (Col "0"))
-                 "V15")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "16") (Col "2"))
-                 "B")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "17") (Col "0"))
-                 "V16")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "17") (Col "3"))
-                 "B")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "18") (Col "4"))
-                 "B")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "19") (Col "0"))
-                 "V17")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "19") (Col "1"))
-                 "-")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "19") (Col "2"))
-                 "+")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "19") (Col "3"))
-                 "=")
-               (http://www.gnumeric.org/v10.dtd:Cell
-                 (@ (ValueType "60") (Row "19") (Col "4"))
-                 "~"))
-             (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A1")))
-             (http://www.gnumeric.org/v10.dtd:Solver
-               (@ (ProgramR "0")
-                  (ProblemType "0")
-                  (NonNeg "1")
-                  (ModelType "0")
-                  (MaxTime "60")
-                  (MaxIter "1000")
-                  (Discr "0")
-                  (AutoScale "0"))))
-           (http://www.gnumeric.org/v10.dtd:Sheet
-             (@ (Visibility "GNM_SHEET_VISIBILITY_VISIBLE")
-                (OutlineSymbolsRight "1")
-                (OutlineSymbolsBelow "1")
-                (HideZero "0")
-                (HideRowHeader "0")
-                (HideGrid "0")
-                (HideColHeader "0")
-                (GridColor "0:0:0")
-                (DisplayOutlines "1")
-                (DisplayFormulas "0"))
-             (http://www.gnumeric.org/v10.dtd:Name "Sheet3")
-             (http://www.gnumeric.org/v10.dtd:MaxCol "0")
-             (http://www.gnumeric.org/v10.dtd:MaxRow "0")
-             (http://www.gnumeric.org/v10.dtd:Zoom "1")
-             (http://www.gnumeric.org/v10.dtd:Names
-               (http://www.gnumeric.org/v10.dtd:Name
-                 (http://www.gnumeric.org/v10.dtd:name "Print_Area")
-                 (http://www.gnumeric.org/v10.dtd:value "#REF!")
-                 (http://www.gnumeric.org/v10.dtd:position "A1"))
-               (http://www.gnumeric.org/v10.dtd:Name
-                 (http://www.gnumeric.org/v10.dtd:name "Sheet_Title")
-                 (http://www.gnumeric.org/v10.dtd:value "\"Sheet3\"")
-                 (http://www.gnumeric.org/v10.dtd:position "A1")))
-             (http://www.gnumeric.org/v10.dtd:PrintInformation
-               (http://www.gnumeric.org/v10.dtd:Margins
-                 (http://www.gnumeric.org/v10.dtd:top
-                   (@ (PrefUnit "mm") (Points "93.26")))
-                 (http://www.gnumeric.org/v10.dtd:bottom
-                   (@ (PrefUnit "mm") (Points "93.26")))
-                 (http://www.gnumeric.org/v10.dtd:left
-                   (@ (PrefUnit "mm") (Points "72")))
-                 (http://www.gnumeric.org/v10.dtd:right
-                   (@ (PrefUnit "mm") (Points "72")))
-                 (http://www.gnumeric.org/v10.dtd:header
-                   (@ (PrefUnit "mm") (Points "72")))
-                 (http://www.gnumeric.org/v10.dtd:footer
-                   (@ (PrefUnit "mm") (Points "72"))))
-               (http://www.gnumeric.org/v10.dtd:Scale
-                 (@ (type "percentage") (percentage "100")))
-               (http://www.gnumeric.org/v10.dtd:vcenter (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:hcenter (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:grid (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:even_if_only_styles
-                 (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:monochrome (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:draft (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:titles (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:do_not_print (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:print_range (@ (value "0")))
-               (http://www.gnumeric.org/v10.dtd:order "d_then_r")
-               (http://www.gnumeric.org/v10.dtd:orientation "portrait")
-               (http://www.gnumeric.org/v10.dtd:Header
-                 (@ (Right "") (Middle "&[tab]") (Left "")))
-               (http://www.gnumeric.org/v10.dtd:Footer
-                 (@ (Right "") (Middle "&[page]") (Left "")))
-               (http://www.gnumeric.org/v10.dtd:paper "na_letter")
-               (http://www.gnumeric.org/v10.dtd:comments "in_place")
-               (http://www.gnumeric.org/v10.dtd:errors "as_displayed"))
-             (http://www.gnumeric.org/v10.dtd:Styles
-               (http://www.gnumeric.org/v10.dtd:StyleRegion
-                 (@ (startRow "0")
-                    (startCol "0")
-                    (endRow "65535")
-                    (endCol "255"))
-                 (http://www.gnumeric.org/v10.dtd:Style
-                   (@ (WrapText "0")
-                      (VAlign "2")
-                      (ShrinkToFit "0")
-                      (Shade "0")
-                      (Rotation "0")
-                      (PatternColor "0:0:0")
-                      (Locked "1")
-                      (Indent "0")
-                      (Hidden "0")
-                      (HAlign "1")
-                      (Format "General")
-                      (Fore "0:0:0")
-                      (Back "FFFF:FFFF:FFFF"))
-                   (http://www.gnumeric.org/v10.dtd:Font
-                     (@ (Unit "10")
-                        (Underline "0")
-                        (StrikeThrough "0")
-                        (Script "0")
-                        (Italic "0")
-                        (Bold "0"))
-                     "Sans"))))
-             (http://www.gnumeric.org/v10.dtd:Cols
-               (@ (DefaultSizePts "48"))
-               (http://www.gnumeric.org/v10.dtd:ColInfo
-                 (@ (Unit "64.01") (No "0"))))
-             (http://www.gnumeric.org/v10.dtd:Rows
-               (@ (DefaultSizePts "12.1"))
-               (http://www.gnumeric.org/v10.dtd:RowInfo
-                 (@ (Unit "12.82") (No "0"))))
-             (http://www.gnumeric.org/v10.dtd:Selections
-               (@ (CursorRow "0") (CursorCol "0"))
-               (http://www.gnumeric.org/v10.dtd:Selection
-                 (@ (startRow "0") (startCol "0") (endRow "0") (endCol "0"))))
-             (http://www.gnumeric.org/v10.dtd:Cells)
-             (http://www.gnumeric.org/v10.dtd:SheetLayout (@ (TopLeft "A1")))
-             (http://www.gnumeric.org/v10.dtd:Solver
-               (@ (ProgramR "0")
-                  (ProblemType "0")
-                  (NonNeg "1")
-                  (ModelType "0")
-                  (MaxTime "60")
-                  (MaxIter "1000")
-                  (Discr "0")
-                  (AutoScale "0")))))
-         (http://www.gnumeric.org/v10.dtd:UIData (@ (SelectedTab "0")))))

Index: utils/Makefile.git.installall
==================================================================
--- utils/Makefile.git.installall
+++ utils/Makefile.git.installall
@@ -1,14 +1,22 @@
 
 # Copyright 2013-2015 Matthew Welland.
+#
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
 # 
-#  This program is made available under the GNU GPL version 2.0 or
-#  greater. See the accompanying file COPYING for details.
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
 # 
-#  This program is distributed WITHOUT ANY WARRANTY; without even the
-#  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#  PURPOSE.
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 
 help :
 	@echo You may need to do the following setup first:
 	@echo
 	@echo sudo apt-get install libreadline-dev
@@ -47,11 +55,11 @@
 PROXY=
 
 # http://code.call-cc.org/dev-snapshots/2015/06/07/chicken-4.10.0rc1.tar.gz
 # http://code.call-cc.org/releases/4.10.0/chicken-4.10.0.tar.gz
 # Select version of chicken, sqlite3 etc
-CHICKEN_VERSION=4.10.1
+CHICKEN_VERSION=4.12.0rc2
 SQLITE3_VERSION=3090200
 # http://www.sqlite.org/2014/sqlite-autoconf-3080500.tar.gz
 # http://www.sqlite.org/2015/sqlite-autoconf-3081101.tar.gz
 # Override IUPBRANCH to use other than trunk
 IUPBRANCH=trunk
@@ -174,10 +182,13 @@
 	cd chicken-core; pwd
 	cd chicken-core; fossil open ../chicken-scheme.fossil
 	cd chicken-core; fossil up 337f5be
 #	wget http://code.call-cc.org/dev-snapshots/2015/08/29/chicken-4.10.1.tar.gz
 
+chicken-4.12.0rc2.tar.gz :
+	wget https://code.call-cc.org/dev-snapshots/2017/02/06/chicken-4.12.0rc2.tar.gz	
+
 # git clone git://code.call-cc.org/chicken-core
 # git clone http://code.call-cc.org/git/chicken-core.git
 
 $(PRODCHICKEN)/bin/chicken :
 	wget http://code.call-cc.org/dev-snapshots/2015/08/29/chicken-4.10.1.tar.gz

Index: utils/Makefile.installall
==================================================================
--- utils/Makefile.installall
+++ utils/Makefile.installall
@@ -1,14 +1,22 @@
 
 # Copyright 2013-2015 Matthew Welland.
 # 
-#  This program is made available under the GNU GPL version 2.0 or
-#  greater. See the accompanying file COPYING for details.
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
 # 
-#  This program is distributed WITHOUT ANY WARRANTY; without even the
-#  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#  PURPOSE.
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 
 help :
 	@echo You may need to do the following setup first:
 	@echo
 	@echo sudo apt-get install libreadline-dev
@@ -45,11 +53,11 @@
 
 # http://code.call-cc.org/dev-snapshots/2015/06/07/chicken-4.10.0rc1.tar.gz
 # http://code.call-cc.org/releases/4.10.0/chicken-4.10.0.tar.gz
 # Select version of chicken, sqlite3 etc
 # CHICKEN_VERSION=4.10.0
-CHICKEN_VERSION=4.11.0rc2
+CHICKEN_VERSION=4.11.0
 SQLITE3_VERSION=3090200
 # http://www.sqlite.org/2014/sqlite-autoconf-3080500.tar.gz
 # http://www.sqlite.org/2015/sqlite-autoconf-3081101.tar.gz
 # Override IUPBRANCH to use other than trunk
 IUPBRANCH=trunk
@@ -56,11 +64,11 @@
 IUPCONFIG=ubuntu-15.04.inc
 # iup-3.15
 
 # Eggs to install (straightforward ones)
 EGGS=matchable readline apropos base64 regex-literals format regex-case test coops trace csv \
-     dot-locking posix-utils posix-extras directory-utils hostinfo tcp-server rpc csv-xml fmt \
+     dot-locking posix-utils posix-extras hostinfo tcp-server rpc csv-xml fmt \
      json md5 awful http-client spiffy uri-common intarweb spiffy-request-vars pathname-expand \
      spiffy-directory-listing ssax sxml-serializer sxml-modifications sql-de-lite \
      srfi-19 refdb ini-file sparse-vectors z3 call-with-environment-variables hahn linenoise \
      crypt parley
 
@@ -97,11 +105,11 @@
 else
 ARCHSIZE=64_
 endif
 
 CSCLIBS=$(shell echo $(LD_LIBRARY_PATH) | sed 's/:/ -L/g')
-CSC_OPTIONS="-I$(PREFIX)/include -L$(CSCLIBS) -C \"-fPIC\""
+CSC_OPTIONS="-I$(PREFIX)/include -L$(CSCLIBS) -C -fPIC"
 # CSC_OPTIONS=-I $(PREFIX)/include -L $(CSCLIBS)
 
 nogui : base mutils
 
 #all : nogui libiup $(PREFIX)/lib/sqlite3.so
@@ -137,11 +145,12 @@
 	mkdir -p eggflags
 	touch $(EGGFLAGS)
 
 # some setup stuff
 #
-$(PREFIX)/setup-chicken4x.sh : $(EGGFLAGS)
+#$(PREFIX)/setup-chicken4x.sh : $(EGGFLAGS)
+$(PREFIX)/setup-chicken4x.sh : 
 	mkdir -p $(PREFIX)
 	(echo 'export PATH=$(PREFIX)/bin:$$PATH' > $(PREFIX)/setup-chicken4x.sh)
 	(echo "export LD_LIBRARY_PATH=$(LD_LIBRARY_PATH)" >> $(PREFIX)/setup-chicken4x.sh)
 
 $(PREFIX)/setup-chicken4x.csh : $(EGGFLAGS)
@@ -149,35 +158,26 @@
 	(echo "setenv PATH $(PREFIX):'$$'PATH" > $(PREFIX)/setup-chicken4x.csh)
 	(echo "setenv LD_LIBRARY_PATH $(LD_LIBRARY_PATH)" >> $(PREFIX)/setup-chicken4x.csh)
 
 # NOTE: the touch chicken-core/chicken.scm compensates for the time stamp from the tar file
 chicken-core/chicken.scm : chicken-$(CHICKEN_VERSION).tar.gz
-	tar xf chicken-$(CHICKEN_VERSION).tar.gz
+	tar xzf chicken-$(CHICKEN_VERSION).tar.gz
 	ln -sf chicken-$(CHICKEN_VERSION) chicken-core
 	if [[ -e chicken-core/chicken.scm ]];then touch chicken-core/chicken.scm;fi
 
-chicken-4.9.0rc1.tar.gz : 
-	wget http://code.call-cc.org/dev-snapshots/2014/04/17/chicken-4.9.0rc1.tar.gz
-
-chicken-4.9.0.1.tar.gz :
-	wget http://code.call-cc.org/releases/4.9.0/chicken-4.9.0.1.tar.gz
-
-chicken-4.10.0rc1.tar.gz :
-	wget http://code.call-cc.org/dev-snapshots/2015/06/07/chicken-4.10.0rc1.tar.gz
-
-chicken-4.10.0.tar.gz :
-	wget http://code.call-cc.org/releases/4.10.0/chicken-4.10.0.tar.gz
-
-chicken-4.11.0rc2.tar.gz : 
-	wget http://code.call-cc.org/dev-snapshots/2016/04/28/chicken-4.11.0rc2.tar.gz
+chicken-4.11.0.tar.gz :
+	wget http://code.call-cc.org/releases/4.11.0/chicken-4.11.0.tar.gz
 
 # git clone git://code.call-cc.org/chicken-core
 # git clone http://code.call-cc.org/git/chicken-core.git
 
 $(CHICKEN_INSTALL) : chicken-core/chicken.scm $(PREFIX)/setup-chicken4x.sh $(PREFIX)/setup-chicken4x.csh
-	cd chicken-core;make PLATFORM=linux PREFIX=$(PREFIX)
-	cd chicken-core;make PLATFORM=linux PREFIX=$(PREFIX) install
+	pwd; env; which make
+	cd chicken-core; make PLATFORM=linux PREFIX=$(PREFIX)
+	cd chicken-core; make PLATFORM=linux PREFIX=$(PREFIX) install
+	#cd chicken-core;env -i PATH=${PATH} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} make PLATFORM=linux PREFIX=$(PREFIX)
+	#cd chicken-core;env -i PATH=${PATH} LD_LIBRARY_PATH=${LD_LIBRARY_PATH} make PLATFORM=linux PREFIX=$(PREFIX) install
 
 #======================================================================
 # S Q L I T E 3
 #======================================================================
 # https://www.sqlite.org/2015/sqlite-autoconf-3090200.tar.gz
@@ -235,11 +235,12 @@
 
 $(PREFIX)/lib/chicken/8/margs.so : opensrc/margs/margs.scm
 	cd opensrc/margs;chicken-install
 
 opensrc/histstore/hs : opensrc/histstore/histstore.scm chkn eggs $(CHICKEN_EGG_DIR)/sqlite3.so 
-	cd opensrc/histstore;$(PREFIX)/bin/csc histstore.scm -o hs
+	env | grep CSC
+	cd opensrc/histstore; $(PREFIX)/bin/csc histstore.scm -o hs
 
 $(PREFIX)/bin/hs : opensrc/histstore/hs 
 	cp -f opensrc/histstore/hs $(PREFIX)/bin/hs
 
 # stml
@@ -254,11 +255,11 @@
 stml/requirements.scm : stml/requirements.scm.template
 	cp stml/install.cfg.template      stml/install.cfg
 	cp stml/requirements.scm.template stml/requirements.scm
 
 $(PREFIX)/lib/chicken/8/stml.so : stml/requirements.scm
-	cd stml;make
+	cd stml; make
 
 #======================================================================
 # F F C A L L (Used by IUP)
 #======================================================================
 
@@ -280,34 +281,47 @@
 
 iuplib.fossil :
 	fossil clone http://www.kiatoa.com/fossils/iuplib iuplib.fossil
 
 cd-5.9_Linux26g4_64_lib.tar.gz :
-	wget -c http://sourceforge.net/projects/canvasdraw/files/5.9/Linux%20Libraries/cd-5.9_Linux26g4_64_lib.tar.gz/download
+	wget --no-check-certificate -c http://sourceforge.net/projects/canvasdraw/files/5.9/Linux%20Libraries/cd-5.9_Linux26g4_64_lib.tar.gz/download
 	mv download cd-5.9_Linux26g4_64_lib.tar.gz
 
+cd-5.10_Linux26g4_64_lib.tar.gz :
+	cp /p/fdk/gwa/jmoon18/cd-5.10_Linux26g4_64_lib.tar.gz cd-5.10_Linux26g4_64_lib.tar.gz
+
 iup-3.17_Linux26g4_64_lib.tar.gz :
-	wget -c http://sourceforge.net/projects/iup/files/3.17/Linux%20Libraries/iup-3.17_Linux26g4_64_lib.tar.gz/download
-	mv download iup-3.17_Linux26g4_64_lib.tar.gz
+	cp /p/fdk/gwa/jmoon18/iup-3.17_Linux26g4_64_lib.tar.gz  iup-3.17_Linux26g4_64_lib.tar.gz
+#	wget --no-check-certificate -c http://sourceforge.net/projects/iup/files/3.17/Linux%20Libraries/iup-3.17_Linux26g4_64_lib.tar.gz/download
+#	mv download iup-3.17_Linux26g4_64_lib.tar.gz
+
+iup-3.19.1_Linux26g4_64_lib.tar.gz :
+	cp /p/fdk/gwa/jmoon18/iup-3.19.1_Linux26g4_64_lib.tar.gz iup-3.19.1_Linux26g4_64_lib.tar.gz
 
 im-3.10_Linux26g4_64_lib.tar.gz :
-	wget -c http://sourceforge.net/projects/imtoolkit/files/3.10/Linux%20Libraries/im-3.10_Linux26g4_64_lib.tar.gz/download
+	wget --no-check-certificate -c http://sourceforge.net/projects/imtoolkit/files/3.10/Linux%20Libraries/im-3.10_Linux26g4_64_lib.tar.gz/download
 	mv download im-3.10_Linux26g4_64_lib.tar.gz
 
+im-3.11_Linux26g4_64_lib.tar.gz :
+	cp /p/fdk/gwa/jmoon18/im-3.11_Linux26g4_64_lib.tar.gz im-3.11_Linux26g4_64_lib.tar.gz
+
 lua-5.3.2_Linux26g4_64_lib.tar.gz :
-	wget -c http://sourceforge.net/projects/luabinaries/files/5.3.2/Linux%20Libraries/lua-5.3.2_Linux26g4_64_lib.tar.gz/download
+	wget --no-check-certificate -c http://sourceforge.net/projects/luabinaries/files/5.3.2/Linux%20Libraries/lua-5.3.2_Linux26g4_64_lib.tar.gz/download
 	mv download lua-5.3.2_Linux26g4_64_lib.tar.gz
 
+lua-5.3.3_Linux26g4_64_lib.tar.gz :
+	cp /p/fdk/gwa/jmoon18/lua-5.3.3_Linux26g4_64_lib.tar.gz lua-5.3.3_Linux26g4_64_lib.tar.gz
+
 iup/installall.sh : $(PREFIX)/lib/libiup.so \
-                       cd-5.9_Linux26g4_64_lib.tar.gz \
+                       cd-5.10_Linux26g4_64_lib.tar.gz \
                        iup-3.17_Linux26g4_64_lib.tar.gz \
-                       im-3.10_Linux26g4_64_lib.tar.gz \
-		       lua-5.3.2_Linux26g4_64_lib.tar.gz	# iuplib.fossil
+                       im-3.11_Linux26g4_64_lib.tar.gz \
+		       lua-5.3.3_Linux26g4_64_lib.tar.gz	# iuplib.fossil
 	mkdir -p iup
 	pwd
-	tar -xzvf cd-5.9_Linux26g4_64_lib.tar.gz -C iup/
-	tar -xzvf im-3.10_Linux26g4_64_lib.tar.gz -C iup/
+	tar -xzvf cd-5.10_Linux26g4_64_lib.tar.gz -C iup/
+	tar -xzvf im-3.11_Linux26g4_64_lib.tar.gz -C iup/
 	tar -xzvf iup-3.17_Linux26g4_64_lib.tar.gz -C iup/
 	mkdir -p $(PREFIX)/include/ $(PREFIX)/lib/
 	cp iup/include/* $(PREFIX)/include/
 	cp iup/*.so $(PREFIX)/lib/
 	cp iup/*.a $(PREFIX)/lib/
@@ -331,6 +345,6 @@
 $(CHICKEN_EGG_DIR)/canvas-draw.so :  $(PREFIX)/lib/libiup.so  $(PREFIX)/lib/libavcall.a 
 	CSC_OPTIONS=$(CSC_OPTIONS) $(CHICKEN_INSTALL) $(PROX) -D no-library-checks canvas-draw
 
 
 clean :
-	rm -rf chicken-4.8.0 eggflags ffcall sqlite-autoconf-$(SQLITE3_VERSION)
+	rm -rf chicken-4.11.0 eggflags ffcall sqlite-autoconf-$(SQLITE3_VERSION)

Index: utils/Makefile.latest.installall
==================================================================
--- utils/Makefile.latest.installall
+++ utils/Makefile.latest.installall
@@ -1,14 +1,23 @@
 
 # Copyright 2013-2015 Matthew Welland.
 # 
-#  This program is made available under the GNU GPL version 2.0 or
-#  greater. See the accompanying file COPYING for details.
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
 # 
-#  This program is distributed WITHOUT ANY WARRANTY; without even the
-#  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#  PURPOSE.
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 
 help :
 	@echo You may need to do the following setup first:
 	@echo
 	@echo sudo apt-get install libreadline-dev

ADDED   utils/checkPreReqs
Index: utils/checkPreReqs
==================================================================
--- /dev/null
+++ utils/checkPreReqs
@@ -0,0 +1,48 @@
+#!/bin/bash
+
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+SYSTEM_TYPE=$(lsb_release -irs |tr ' ' '_' |tr '\n' '-')$(uname -i)
+file=`/bin/mktemp`
+case $SYSTEM_TYPE in
+Ubuntu-17.04-x86_64-std)
+	apt list --installed | cut -d/ -f 1 > $file
+        ;;
+Ubuntu-16.04-x86_64)
+	apt list --installed | cut -d/ -f 1 > $file
+        ;;
+Ubuntu-16.04-i686)
+	apt list --installed | cut -d/ -f 1 > $file
+        ;;
+SUSE_LINUX_11-x86_64)
+	rpm -qa > $file 
+  ;;
+CentOS_5.11-x86_64-std)
+	rpm -qa > $file 
+  ;;
+esac
+
+
+
+for package in libmysqlclient-dev libsqlite3-dev sqlite3 postgresql libreadline-dev libwebkitgtk-dev libpangox-1.0-0 zlib1g-dev libfreetype6 cmake libssl-dev uuid-dev libmotif3 mysql-client; do
+  grep --silent $package $file
+  if [ "$?" != "0" ]; then
+    echo "sudo apt install $package"
+  fi 
+done
+rm $file

Index: utils/cleanup-links-dir.sh
==================================================================
--- utils/cleanup-links-dir.sh
+++ utils/cleanup-links-dir.sh
@@ -1,7 +1,24 @@
 #!/usr/bin/env bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 export LINKSDIR=$1
 export RUNSDIR=$2
 
 if [ "x$LINKSDIR" == "x" ];then
    echo Usage: cleanup-links-dir /links/dir/path /runs/dir/path

ADDED   utils/cleanup-pkts.sh
Index: utils/cleanup-pkts.sh
==================================================================
--- /dev/null
+++ utils/cleanup-pkts.sh
@@ -0,0 +1,29 @@
+#!/bin/bash
+
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+pushd $1
+
+for x in *.pkt;do
+    if grep 'T configf' $x > /dev/null;then
+        rm $x
+    else
+        echo skip $x
+    fi
+done
+

Index: utils/deploy.sh
==================================================================
--- utils/deploy.sh
+++ utils/deploy.sh
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 set -x
 
 if [[ $DEPLOYTARG == "" ]] ; then
     echo Installing into deploytarg
     export DEPLOYTARG=$PWD/deploytarg

ADDED   utils/editwiki
Index: utils/editwiki
==================================================================
--- /dev/null
+++ utils/editwiki
@@ -0,0 +1,73 @@
+#!/bin/bash
+
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+wikiname=$1
+FOSSILBIN=fossil
+
+if [ x"$wikiname" == "x" ];then
+  echo "Usage: viwiki wikipagename"
+  exit
+fi
+
+$FOSSILBIN sync
+
+# wikitmpfile=`mktemp /tmp/${USER}_wikiedit.XXXXXXX`
+wikitmpfile=${wikiname}.in
+
+if ! $FOSSILBIN wiki export "$wikiname" 2> /dev/null  1> $wikitmpfile ;then
+    cat /dev/null > $wikitmpfile
+    wikipagestate='new'
+else
+    wikipagestate='existing'
+fi
+
+# make a backup copy of the extracted file to diff detect if changed
+cp $wikitmpfile ${wikitmpfile}.orig
+
+if [[ x"$EDITOR" == "x" ]];then #  || [[ x"$VISUAL" == "x" ]];then
+    EDITOR="gvim -f"
+fi
+
+echo $EDITOR | grep -q -e gvim
+isGvim=$?
+
+echo $EDITOR | grep -q -e 'gvim.*-f'
+hasF=$?
+
+if [[ $isGvim == 0 && $hasF != 0 ]]; then
+	EDITOR="$EDITOR -f"
+fi
+
+$EDITOR $wikitmpfile
+
+if ! diff -q $wikitmpfile ${wikitmpfile}.orig;then
+    echo "Saving changes to $wikitmpfile to wiki"
+    if [ $wikipagestate == 'new' ];then
+        $FOSSILBIN wiki create "$wikiname" $wikitmpfile
+    else
+        $FOSSILBIN wiki commit "$wikiname" $wikitmpfile
+    fi
+else
+    echo "Not saving, no changes to $wikitmpfile."
+fi
+
+$FOSSILBIN sync
+
+# NOTE// We *keep* the wikitmpfile but remove the orig copy
+rm -f ${wikitmpfile}.orig

Index: utils/example-launch-dispatcher.scm
==================================================================
--- utils/example-launch-dispatcher.scm
+++ utils/example-launch-dispatcher.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 (let ((target (assoc 
 	       ;; Put the variable name here, note: only *one* '
 	       ;; 'TARGET_OS
 	       'MANYITEMS

Index: utils/find-unused-globals.sh
==================================================================
--- utils/find-unused-globals.sh
+++ utils/find-unused-globals.sh
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 echo "Finding unused globals:"
 
 for var in $(egrep '^\s*\(define\s+\*' *.scm|awk '{print $2}'|sort -u);do
     if ! $(egrep -v '^\s*\(define' *scm| grep "$var" > /dev/null);then
 	echo "$var not used";

Index: utils/fslrept.scm
==================================================================
--- utils/fslrept.scm
+++ utils/fslrept.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 (use json fmt posix)
 
 ;; abstract out the alist-ref a bit and re-order the params
 ;;

Index: utils/homehost_check.sh
==================================================================
--- utils/homehost_check.sh
+++ utils/homehost_check.sh
@@ -1,7 +1,24 @@
 #! /bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 #exits 1 when current host is not homehost.
 
 if [[ ! -e .homehost ]]; then
     exit 0
 fi

Index: utils/installall.logpro
==================================================================
--- utils/installall.logpro
+++ utils/installall.logpro
@@ -1,8 +1,23 @@
 ;; (c) 2006,2007,2008,2009 Matthew Welland matt@kiatoa.com
 ;;  
-;;   License GPL.
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 ;; first ensure your run at least started
 ;;
 
 (trigger "Body"     #/^.*$/) ;; anything starts the body

Index: utils/installall.sh
==================================================================
--- utils/installall.sh
+++ utils/installall.sh
@@ -5,27 +5,43 @@
 # to chicken install target area.  /opt/chicken is a typical value
 # set -x
 
 # Copyright 2007-2014, Matthew Welland.
 # 
-#  This program is made available under the GNU GPL version 2.0 or
-#  greater. See the accompanying file COPYING for details.
-# 
-#  This program is distributed WITHOUT ANY WARRANTY; without even the
-#  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#  PURPOSE.
-
-if [[ $OPTION=="" ]]; then
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+# echo OPTION=$OPTION
+
+# BKM for ubuntu 17.04:
+#  sudo dpkg -i libpng12-0_1.2.54-1ubuntu1_amd64.deb
+#  sudo dpkg -i libpng12-0_1.2.54-1ubuntu1_amd64.deb
+
+
+if [[ $OPTION == "" ]]; then
     export OPTION=std
 fi
 
 echo You may need to do the following first:
-echo sudo apt-get install libreadline-dev
-echo sudo apt-get install libwebkitgtk-dev 
-echo sudo apt-get install libpangox-1.0-0 zlib1g-dev libfreetype6-dev cmake
-echo sudo apt-get install libssl-dev  uuid-dev
-echo sudo apt-get install libmotif3 -OR- set KTYPE=26g4
+echo sudo apt install libreadline-dev
+echo sudo apt install libwebkitgtk-dev 
+echo sudo apt install libpangox-1.0-0 zlib1g-dev libfreetype6-dev cmake
+echo sudo apt install libssl-dev  uuid-dev
+echo sudo apt install libmotif3 -OR- set KTYPE=26g4
+echo sudo apt install cmake curl ruby wget
 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
@@ -35,48 +51,79 @@
 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
+
+CHICKEN_VERSION=4.10.0
+CHICKEN_BASEVER=4.10.0
 
 # Set up variables
 #
 case $SYSTEM_TYPE in
+Ubuntu-17.10-x86_64-std)
+	KTYPE=32
+	CDVER=5.11.1
+	IUPVER=3.22
+	IMVER=3.12
+#	CHICKEN_VERSION=4.12.0
+#	CHICKEN_BASEVER=4.12.0
+        ;;
+Ubuntu-17.04-x86_64-std)
+	KTYPE=32
+	CDVER=5.11.1
+	IUPVER=3.22
+	IMVER=3.12
+#	CHICKEN_VERSION=4.12.0
+#	CHICKEN_BASEVER=4.12.0
+	;;
 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
+	CDVER=5.11.1
+	IUPVER=3.22
+	IMVER=3.12
+#	CHICKEN_VERSION=4.12.0
+#	CHICKEN_BASEVER=4.12.0
+	;;
+Ubuntu-16.04-x86_64-new)
+	KTYPE=32
+	CDVER=5.11.1
+	IUPVER=3.22
+	IMVER=3.12
+	CHICKEN_VERSION=4.13.0
+	CHICKEN_BASEVER=4.13.0
 	;;
 Ubuntu-16.04-i686-std)
 	KTYPE=32
-	CDVER=5.10
-	IUPVER=3.17
-	IMVER=3.11
+	CDVER=5.11.1
+	IUPVER=3.22
+	IMVER=3.12
+#        CHICKEN_VERSION=4.12.0
+#        CHICKEN_BASEVER=4.12.0
 	;;
 SUSE_LINUX_11-x86_64-std)
   KTYPE=26g4 
-	CDVER=5.10
-	IUPVER=3.17
-	IMVER=3.11
+	CDVER=5.11.1
+	IUPVER=3.22
+	IMVER=3.12
   ;;
 CentOS_5.11-x86_64-std)
   KTYPE=24g3 
   CDVER=5.4.1
   IUPVER=3.5
   IMVER=3.6.3
   ;; 
 esac
 
+echo SYSTEM_TYPE=$SYSTEM_TYPE
 echo KTYPE=$KTYPE			  
 echo CDVER=$CDVER
 echo IUPVER=$IUPVER
 echo IMVER=$IMVER	
+echo CHICKEN_VERSION=$CHICKEN_VERSION
+echo CHICKEN_BASEVER=$CHICKEN_BASEVER
+
 # NOTES:
 #
 # Centos with security setup may need to do commands such as following as root:
 #
 # NB// fix the paths first
@@ -101,10 +148,11 @@
 if [[ $proxy == "" ]]; then 
   echo 'Please set the environment variable "proxy" to host.com:port (e.g. foo.com:1234) to use a proxy'
   echo PROX=""
 else
   export http_proxy=http://$proxy
+  export https_proxy=http://$proxy
   export PROX="-proxy $proxy"
 fi
 
 if [[ $KTYPE == "" ]]; then
   echo 'Using KTYPE=26'
@@ -153,22 +201,25 @@
     make PLATFORM=linux PREFIX=$PREFIX
     make PLATFORM=linux PREFIX=$PREFIX install
     cd $BUILDHOME
 fi
 cd $BUILDHOME
-#wget --no-check-certificate https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz 
-#mv 1.0.0 1.0.0.tar.gz
-# if ! [[ -e $PREFIX/lib64/libnanomsg.so.1.0.0 ]]; then
-#         wget --no-check-certificate https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz 
-#         mv 1.0.0 1.0.0.tar.gz
-# 	tar xf 1.0.0.tar.gz 
-# 	cd nanomsg-1.0.0
-# 	./configure --prefix=$PREFIX
-# 	make
-# 	make install
-# fi
-# cd $BUILDHOME
+#if [[ ! -e 1.0.0.tar.gz ]];then
+#  wget --no-check-certificate https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz 
+#  mv 1.0.0 1.0.0.tar.gz
+#fi
+if ! [[ -e $PREFIX/lib/libnanomsg.so ]]; then
+        wget --no-check-certificate https://github.com/nanomsg/nanomsg/archive/1.0.0.tar.gz 
+        mv 1.0.0 1.0.0.tar.gz
+	tar xf 1.0.0.tar.gz 
+	cd nanomsg-1.0.0
+	./configure --prefix=$PREFIX
+	make
+	make install
+	CSC_OPTIONS="-I$PREFIX/include -L$PREFIX/lib" $CHICKEN_INSTALL $PROX nanomsg
+fi
+cd $BUILDHOME
 
 export SQLITE3_VERSION=3090200
 if ! [[ -e $PREFIX/bin/sqlite3 ]]; then
 	echo Install sqlite3
 	sqlite3_tgz=sqlite-autoconf-$SQLITE3_VERSION.tar.gz
@@ -182,15 +233,28 @@
 		tar xfz tgz/sqlite-autoconf-$SQLITE3_VERSION.tar.gz 
 		(cd sqlite-autoconf-$SQLITE3_VERSION;./configure --prefix=$PREFIX;make;make install)
 	    fi
 	fi
 fi
-
+if ! [[ -e $PREFIX/bin/pg_config ]]; then
+	echo Install Postgresql
+	pgsql_tgz=postgresql-9.6.4.tar.gz
+	if ! [[ -e tgz/$pgsql_tgz ]]; then
+	  wget -c https://ftp.postgresql.org/pub/source/v9.6.4/$pgsql_tgz
+	  mv $pgsql_tgz tgz
+	fi
+	if ! [[ -e $PREFIX/bin/pg_config ]]; then
+	  if [[ -e tgz/$pgsql_tgz ]]; then
+	    tar xfz tgz/$pgsql_tgz
+	    (cd postgresql-9.6.4; ./configure --prefix=$PREFIX --with-openssl; make; make install)
+	  fi
+	fi
+fi
 
 
 cd $BUILDHOME
-for egg in "sqlite3" sql-de-lite # nanomsg
+for egg in "sqlite3" sql-de-lite nanomsg
 do
 	echo "Installing $egg"
 	CSC_OPTIONS="-I$PREFIX/include -L$PREFIX/lib -L$PREFIX/lib64"  $CHICKEN_INSTALL $PROX -keep-installed $egg
 	#CSC_OPTIONS="-I$PREFIX/include -L$PREFIX/lib -L$PREFIX/lib64"  $CHICKEN_INSTALL $PROX $egg
 	if [ $? -ne 0 ]; then
@@ -202,22 +266,24 @@
 # Some eggs are quoted since they are reserved to Bash
 # for f in matchable readline apropos base64 regex-literals format "regex-case" "test" coops trace csv dot-locking posix-utils posix-extras directory-utils hostinfo tcp rpc csv-xml fmt json md5; do
 # $CHICKEN_INSTALL $PROX -keep-installed matchable readline apropos base64 regex-literals format "regex-case" "test" coops trace csv dot-locking posix-utils posix-extras directory-utils hostinfo tcp rpc csv-xml fmt json md5 awful http-client spiffy uri-common intarweb http-client spiffy-request-vars md5 message-digest http-client spiffy-directory-listing
 for egg in matchable readline apropos base64 regex-literals format "regex-case" "test" \
 	coops trace csv dot-locking posix-utils posix-extras directory-utils hostinfo \
-	tcp rpc csv-xml fmt json md5 awful http-client spiffy uri-common intarweb http-client \
+	tcp rpc csv-xml fmt json md5 awful http-client:0.7.1 spiffy uri-common intarweb http-client \
 	spiffy-request-vars s md5 message-digest spiffy-directory-listing ssax sxml-serializer \
-	sxml-modifications logpro z3 call-with-environment-variables \
-	pathname-expand typed-records simple-exceptions numbers crypt parley srfi-42 \
+	sxml-modifications            z3 call-with-environment-variables \
+	pathname-expand typed-records \
+        logpro \
+        simple-exceptions numbers crypt parley srfi-42 \
 	alist-lib ansi-escape-sequences args basic-sequences bindings chicken-doc chicken-doc-cmd \
 	cock condition-utils debug define-record-and-printer easyffi easyffi-base \
 	expand-full ezxdisp filepath foof-loop ini-file irc lalr lazy-seq \
 	locale locale-builtin locale-categories locale-components locale-current locale-posix \
 	locale-timezone loops low-level-macros procedural-macros refdb rfc3339 scsh-process \
 	sexp-diff sha1 shell slice srfi-101 srfi-19 srfi-19-core srfi-19-date srfi-19-io \
 	srfi-19-period srfi-19-support srfi-19-time srfi-19-timezone srfi-29 srfi-37 srfi-78 syslog \
-	udp uuid uuid-lib zlib
+	udp uuid uuid-lib zlib postgresql
 
 do
 	echo "Installing $egg"
 	$CHICKEN_INSTALL $PROX -keep-installed $egg
 	#$CHICKEN_INSTALL $PROX $egg
@@ -225,38 +291,23 @@
 		echo "$egg failed to install"
 		exit 1
 	fi
 done
 
-if [[ -e `which mysql_config` ]]; then
-  $CHICKEN_INSTALL $PROX -keep-installed mysql-client
+if [[ ! -e $PREFIX/lib/chicken/7/mysql-client.so ]];then
+    if [[ -e `which mysql_config` ]]; then
+	$CHICKEN_INSTALL $PROX mysql-client
+    fi
 fi
 
 cd $BUILDHOME
 cd `$PREFIX/bin/csi -p '(chicken-home)'`
 curl http://3e8.org/pub/chicken-doc/chicken-doc-repo.tgz | tar zx
 cd $BUILDHOME
 
-
-
 # $CHICKEN_INSTALL $PROX sqlite3
 cd $BUILDHOME
-# # IUP versions
-# if [[ x$USEOLDIUP == "x" ]];then
-#   CDVER=5.10
-#   IUPVER=3.17
-#   IMVER=3.11
-# else
-#   CDVER=5.10
-#   IUPVER=3.17
-#   IMVER=3.11
-# fi
-# if [[ x$KTYPE == "x24g3" ]];then
-#   CDVER=5.4.1
-#   IUPVER=3.5
-#   IMVER=3.6.3
-# fi
 
 if [[ `uname -a | grep x86_64` == "" ]]; then 
     export ARCHSIZE=''
 else
     export ARCHSIZE=64_
@@ -270,21 +321,25 @@
 fi
 echo $files
 
 mkdir -p $PREFIX/iuplib
 mkdir -p iup/
-for a in `echo $files` ; do
+for a in $files ; do
+    targfile=$(echo $a | cut -d'/' -f2)
     if ! [[ -e tgz/$a ]] ; then
         echo wget -c -O tgz/$a http://www.kiatoa.com/matt/chicken-build/$a
 	wget -c http://www.kiatoa.com/matt/chicken-build/$a
-        mv `echo $a | cut -d'/' -f2` tgz/
+	mv $targfile tgz/
+    fi
+    if ! [[ -e tgz/$targfile ]] ; then
+	echo "ERROR: Failed to get http://www.kiatoa.com/matt/chicken-build/$a, please report this to matt@kiatoa.com"
+	exit 1
     fi
-    echo Untarring tgz/$a into $BUILDHOME/lib
-    tar -xzf tgz/`echo $a | cut -d'/' -f2` -C iup/
-    #(cd $PREFIX/lib;tar xfvz $BUILDHOME/tgz/$a;mv include/* ../include)
-    # (cd $DEPLOYTARG;tar xfvz $BUILDHOME/$a)
+    echo Untarring tgz/$targfile into $BUILDHOME/lib
+    tar -xzf tgz/$targfile -C iup/
 done
+
 cp iup/include/* $PREFIX/include/
 cp iup/*.so $PREFIX/lib/
 cp iup/*.a $PREFIX/lib/
 cp iup/ftgl/lib/*/* $PREFIX/lib/
 cd $BUILDHOME
@@ -319,14 +374,16 @@
 	$PREFIX/bin/chicken-install
 	cd ../dbi 
 	$PREFIX/bin/chicken-install
 	cd ../margs
 	$PREFIX/bin/chicken-install
+	cd ../pkts
+	$PREFIX/bin/chicken-install
 fi
 cd $BUILDHOME
 
-if ! [[ -e $PREFIX/bin/stmlrun ]] ; then
+if [[ ! -e $PREFIX/bin/stmlrun ]] ; then
 	#fossil clone http://www.kiatoa.com/fossils/stml stml.fossil
 	wget -c -O stml.tar.gz 'http://www.kiatoa.com/fossils/stml/tarball?name=stml&uuid=trunk'
 	tar -xzf stml.tar.gz
 	cd stml
 	#fossil open ../stml.fossil
@@ -346,22 +403,26 @@
 if [[ $IUPVER == "3.5" ]]; then
   IUPEGGVER='iup:1.2.1'
 fi
 
 #CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $CHICKEN_INSTALL $PROX -D no-library-checks -feature disable-iup-web iup
-CSC_OPTIONS="-I$PREFIX/include -L$PREFIX/lib" $CHICKEN_INSTALL $PROX -D no-library-checks -feature disable-iup-web $IUPEGGVER
+CSC_OPTIONS="-I$PREFIX/include -L$PREFIX/lib" $CHICKEN_INSTALL $PROX -D no-library-checks -feature disable-iup-web -feature disable-iup-pplot $IUPEGGVER
 
 # CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $CHICKEN_INSTALL $PROX -D no-library-checks -feature disable-iup-web -deploy -prefix $DEPLOYTARG iup
 # iup:1.0.2 
 CSC_OPTIONS="-I$PREFIX/include -L$PREFIX/lib" $CHICKEN_INSTALL $PROX -D no-library-checks canvas-draw
 # CSC_OPTIONS="-I$PREFIX/include -L$CSCLIBS" $CHICKEN_INSTALL $PROX -D no-library-checks -deploy -prefix $DEPLOYTARG canvas-draw
 
 cd $BUILDHOME  
 
 # install ducttape
-cd ../ducttape
-$CHICKEN_INSTALL
+if [[ -e ../ducttape ]];then
+  cd ../ducttape
+  $CHICKEN_INSTALL
+else
+  echo "ducttape egg not found at ../ducttape. You will need to cd into the ducttape directory in the megatest distribution and run \"chicken-install\""
+fi
 
 cd $BUILDHOME
 echo You may need to add $LD_LIBRARY_PATH to your LD_LIBRARY_PATH variable, a setup-chicken4x.sh 
 echo file can be found in the current directory which should work for setting up to run chicken4x
 

Index: utils/installck.sh
==================================================================
--- utils/installck.sh
+++ utils/installck.sh
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 myhome=$(dirname $0)
 
 if [[ $proxy == "" ]]; then 
   echo 'Please set the environment variable "proxy" to host.com:port (e.g. foo.com:1234) to use a proxy'
   echo PROX=""

Index: utils/loadrunner
==================================================================
--- utils/loadrunner
+++ utils/loadrunner
@@ -1,7 +1,24 @@
 #!/bin/bash 
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 LOADRUNNER=$0
 
 # load=`uptime|awk '{print $10}'|cut -d, -f1`
 load=$(uptime|perl -pe 's/.*: (\d+.\d+),.*/$1/')
 load2=$(uptime|perl -pe 's/.*: (\d+.\d+), (\d+.\d+),.*/$2/')

Index: utils/loadrunner.scm.notfinished
==================================================================
--- utils/loadrunner.scm.notfinished
+++ utils/loadrunner.scm.notfinished
@@ -1,14 +1,22 @@
 
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 (use ssax)
 (use sxml-serializer)
 (use sxml-modifications)
 (use regex)

Index: utils/lock-stats.sh
==================================================================
--- utils/lock-stats.sh
+++ utils/lock-stats.sh
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 while IFS=': ' read x x x x p x x i x; do
     if ! [[ ${i}x == "x" ]];then
 	if ! $(echo $i|grep EOF >/dev/null);then
 	    fname=$(find -L "/proc/$p/fd" -maxdepth 1 -inum "$i" -exec readlink {} \; -quit)
 	    if $(echo $fname | grep megatest.db > /dev/null) || \

ADDED   utils/memproblem.scm
Index: utils/memproblem.scm
==================================================================
--- /dev/null
+++ utils/memproblem.scm
@@ -0,0 +1,65 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
+;; Run like this: ((adjust the "30" number to a value that fills memory on the machine you are using)
+;; script -c "free -g ; utils/memproblem 30 -:hm128G" memclean.log
+
+;; Fill the cache with something like this:
+;; find /path/to/lots/of/files/ -type f -exec cat {} > /dev/null \;
+
+
+(use posix numbers srfi-4)
+
+(define num-iter (or (if (> (length (argv)) 2)
+                        (string->number (cadr (argv)))
+                        #f)
+                    43)) ;; Gigs memory to try to allocate
+;; (print "Allocating up to " memsize "G memory. Note that due to the usage of the heap this will actually use up to " (* 2 memsize) "G")
+
+(define (get-free)
+  (let ((indat (with-input-from-pipe
+                "free"
+                read-lines)))
+    (map string->number
+         (cdr 
+          (string-split
+           (cadr indat))))))
+
+(define-inline (cached dat)(list-ref dat 5))
+(define-inline (used   dat)(list-ref dat 1))
+(define-inline (free   dat)(list-ref dat 2))
+
+(define-inline (k->G val)(/ val 1e6))
+(define-inline (G->k val)(* val 1e6))
+
+(define start-time (current-milliseconds))
+
+(let loop ((n      0)
+           (dat    (get-free))
+           (stuff  '()))
+  (let ((bigvec (make-u32vector 200000000))
+        (startt (current-milliseconds)))
+    (print "Value at 100: " (u32vector-ref bigvec 100) " ms to access: " (- (current-milliseconds) startt))
+    (u32vector-set! bigvec (random 190000000) 111)
+    (print n " Elapsed time: " (/ (- (current-milliseconds) start-time) 1000) " s "
+           "Cached: " (k->G (cached dat)) " G "
+           "Used:   " (k->G (used   dat)) " G ")
+    (if (< n num-iter)
+        (loop (+ n 1)(get-free) (cons bigvec stuff)))))
+
+(exit)
+

Index: utils/mk_wrapper
==================================================================
--- utils/mk_wrapper
+++ utils/mk_wrapper
@@ -1,32 +1,58 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 prefix=$1
 cmd=$2
 target=$3
+cfgfile="$prefix/bin/.$(lsb_release -sr)/cfg.sh"
+
+# we wish to create a var in cfg.sh for finding sqlite3 executable
+chicken_bin_dir=$(dirname $(which csi))
+if [[ -e $chicken_bin_dir/sqlite3 ]];then
+    sqlite3_exe=$chicken_bin_dir/sqlite3
+else
+    sqlite3_exe=$(which sqlite3)
+fi
 
 if [ "$LD_LIBRARY_PATH" != "" ];then
-  cfgfile="$prefix/bin/.$(lsb_release -sr)/cfg.sh"
   echo "INFO: Using LD_LIBRARY_PATH=$LD_LIBRARY_PATH" >&2
 ( cat << __EOF
+if [ -z \$MT_ORIG_ENV ]; then
+    export MT_ORIG_ENV=\$( $prefix/bin/serialize-env )
+fi
+
 if [ "\$LD_LIBRARY_PATH" != "" ];then
   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:\$LD_LIBRARY_PATH
 else
   export LD_LIBRARY_PATH=$LD_LIBRARY_PATH
 fi
+
+export MT_SQLITE3_EXE=$sqlite3_exe
 __EOF
 ) > $cfgfile
   echo 
 else
   echo "INFO: LD_LIBRARY_PATH not set" >&2
 fi
 
-# echo "#!/bin/bash" > $target
-# if [ "$LD_LIBRARY_PATH" != "" ];then
-#   echo "source $prefix/bin/.\$(lsb_release -sr)/cfg.sh" >> $target
-# fi
-# echo "exec $prefix/bin/.\$(lsb_release -sr)/$cmd \"\$@\"" >> $target
 echo "#!/bin/bash" > $target
 
 if [[ $cmd =~ dboard ]]; then
     cat >> $target <<'EOF'
 
@@ -57,8 +83,19 @@
 fi
 EOF
 
 fi
 
+cat >> $target << EOF 
+if [[ \$(ulimit -a | grep 'open files' | awk '{print \$4}') -gt 10000 ]];then ulimit -n 10000;fi
+EOF
+
+# echo "#!/bin/bash" > $target
+# echo "exec $prefix/bin/.\$(lsb_release -sr)/$cmd \"\$@\"" >> $target
+
 echo "lsbr=\$(lsb_release -sr)" >> $target
-echo "if [[ -e \$lsbr ]];then source \$lsbr;fi" >> $target
+if [ "$LD_LIBRARY_PATH" != "" ];then
+  echo "source $prefix/bin/.\$lsbr/cfg.sh" >> $target
+fi
+
+# echo "if [[ -e \$lsbr ]];then source \$lsbr;fi" >> $target
 echo "exec $prefix/bin/.\$lsbr/$cmd \"\$@\"" >> $target

Index: utils/mt_ezstep
==================================================================
--- utils/mt_ezstep
+++ utils/mt_ezstep
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 usage="mt_ezstep stepname prevstepname command [args ...]"
 
 if [[ "$MT_CMDINFO" == "" ]];then
   if [[ -e megatest.sh ]];then
     source megatest.sh

Index: utils/mt_laststep
==================================================================
--- utils/mt_laststep
+++ utils/mt_laststep
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 if [ $MT_CMDINFO == "" ];then
   echo "ERROR: $0 should be run within a megatest test environment"
   exit
 fi
 

Index: utils/mt_runstep
==================================================================
--- utils/mt_runstep
+++ utils/mt_runstep
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Purpose: run a step, record start and end with exit codes
 #
 # Call like this:
 # mt_runstep stepname command ....
 # 

Index: utils/mt_xterm
==================================================================
--- utils/mt_xterm
+++ utils/mt_xterm
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 MT_TMPDISPLAY=$DISPLAY
 if [ -e megatest.sh ];then
   source megatest.sh
 fi
 export DISPLAY=$MT_TMPDISPLAY

Index: utils/mtgetfile
==================================================================
--- utils/mtgetfile
+++ utils/mtgetfile
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 fullparams="$@"
 
 function findfile () {
 megatest $fullparams -repl <.
+
+# Rollup counts of calls to Megatest from a logging dat file
+#
+# Usage: mtrept.sh file [host]
+
+if [[ "$2"x != "x" ]];then
+  host_name_grep="grep $2 | "
+else
+  host_name_grep=""
+fi
+if [[ "$1"x == "x" ]];then
+  datfile=/p/fdk/gwa/$USER/.logger/all.dat
+else
+  datfile=$1
+fi
+datcopy=/tmp/$USER/all.$PID.dat
+
+if [[ -e $datfile ]];then
+   cp $datfile $datcopy
+   list_runs=$(grep list-runs $datcopy |$host_name_grep wc -l)
+   show_config=$(grep show-config $datcopy |$host_name_grep wc -l)
+   list_targets=$(grep list-targets $datcopy |$host_name_grep wc -l)
+   mt_run=$(grep ' -run ' $datcopy |$host_name_grep wc -l)
+   execute=$(grep ' -execute' $datcopy|$host_name_grep wc -l)
+   server=$(grep ' -server' $datcopy|$host_name_grep wc -l)
+   sync_to=$(grep ' -sync-to' $datcopy|$host_name_grep wc -l)
+   step=$(grep ' -step' $datcopy|$host_name_grep wc -l)
+   state_status=$(grep ' -set-state-status' $datcopy|$host_name_grep wc -l)
+   test_status=$(grep ' -test-status' $datcopy|$host_name_grep wc -l)
+   other=$(egrep -v ' -(list-runs|show-config|list-targets|run|execute|server|sync-to|step|set-state-status|test-status)' $datcopy |$host_name_grep wc -l)
+   start_time=$(head -1 $datcopy|awk '{print $1}')
+   end_time=$(tail -1 $datcopy | awk '{print $1}')
+   minutes=$(echo "($end_time-$start_time)/60.0" | bc)
+   hours=$(echo "($minutes/60)"|bc)
+   total_calls=$(cat $datcopy |$host_name_grep wc -l)
+   
+   if [[ $hours -gt 2 ]];then
+      echo "Over $hours hour period we have;"
+   else
+      echo "Over $minutes minutes we have;"
+   fi
+   echo "    list-runs:    $list_runs"
+   echo "    show-config:  $show_config"
+   echo "    list-targets: $list_targets"
+   echo "    execute:      $execute"
+   echo "    run:          $mt_run"
+   echo "    server:       $server"
+   echo "    step:         $step"
+   echo "    test-status:  $test_status"
+   echo "    sync-to:      $sync_to"
+   echo "    state-status: $state_status"
+   echo "    other:        $other"
+   echo "    total:        $total_calls"
+else
+   echo "Could not find input file $datfile"
+fi
+

Index: utils/mtrunner
==================================================================
--- utils/mtrunner
+++ utils/mtrunner
@@ -1,7 +1,24 @@
 #! /bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # Run megatest from within megatest
 # Usage: mtrunner testsuite_dir megatest_bin_dir command args ....
 
 for var in $(env | egrep "^MT_"|cut -d= -f1);do
   unset ${var}

Index: utils/mtrunscript
==================================================================
--- utils/mtrunscript
+++ utils/mtrunscript
@@ -1,17 +1,23 @@
 #!/usr/bin/env bash
 
 # Copyright 2012, Matthew Welland.
-#
-#  This program is made available under the GNU GPL version 2.0 or
-#  greater. See the accompanying file COPYING for details.
-#
-#  This program is distributed WITHOUT ANY WARRANTY; without even the
-#  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-#  PURPOSE.
-#
-# VERSION: 
+
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 
 # set -e
 # set -u
 # set -x
 

Index: utils/mtutils.csh
==================================================================
--- utils/mtutils.csh
+++ utils/mtutils.csh
@@ -1,8 +1,25 @@
 # Better to use the mt_* snippet scripts in utils 
 #   To use the snippets set PREFIX then install with "make installall"
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 alias mt_runstep 'set argv=(\!*); \
  set stepname = $1;shift; \
  megatest -runstep $stepname -logpro ${stepname}.logpro "$*" || exit $?'
 
 alias mt_laststep 'set argv=(\!*);set stepname = $1;shift; \

Index: utils/nbfake
==================================================================
--- utils/nbfake
+++ utils/nbfake
@@ -1,6 +1,24 @@
 #!/bin/bash
+
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 ###############################################################################
 #
 # nbfake - capture command output in a logfile
 #
 # nbfake behavior can be changed by setting the following env vars:

Index: utils/nbfind
==================================================================
--- utils/nbfind
+++ utils/nbfind
@@ -1,7 +1,24 @@
 #!/bin/bash 
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 # load=`uptime|awk '{print $10}'|cut -d, -f1`
 load=`uptime|perl -pe 's/.*: (\d+.\d+),.*/$1/'`
 if which cpucheck > /dev/null;then
     numcpu=`cpucheck|tail -1|awk '{print $6}'`
 else

Index: utils/plot-code.scm
==================================================================
--- utils/plot-code.scm
+++ utils/plot-code.scm
@@ -1,6 +1,24 @@
 #!/mfs/pkgs/chicken/4.8.0.5/bin/csi -nbq
+
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 ;; Coming soon (right?) Usage: plot-code file1.scm,file2.scm "fun1,fun2,x*" *.scm > plot.dot
 ;; Usage: plot-code file1.scm,file2.scm *.scm > plot.dot
 ;;        dot -Tpdf plot.dot > plot.pdf
 ;; first param is comma separated list of files to include in the map, use - to do all

Index: utils/remrun
==================================================================
--- utils/remrun
+++ utils/remrun
@@ -6,10 +6,27 @@
 #
 # remrun behavior can be changed by setting the following env var:
 #   NBFAKE_LOG        Logfile for nbfake output
 #
 ###############################################################################
+#
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
 
 if [[ -z "$@" ]]; then
   cat <<__EOF
 
 remrun usage:

Index: utils/revtagfsl.scm
==================================================================
--- utils/revtagfsl.scm
+++ utils/revtagfsl.scm
@@ -1,14 +1,23 @@
 
 ;; Copyright 2006-2013, Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 (use json regex posix)
 (use srfi-69)
 
 ;; Add tags with node nums: trunk(12) 

ADDED   utils/run2mock.scm
Index: utils/run2mock.scm
==================================================================
--- /dev/null
+++ utils/run2mock.scm
@@ -0,0 +1,186 @@
+#!/p/foundry/env/pkgs/chicken/4.10.1_v1.63/bin/csi -s
+; -*- Mode: Scheme; -*-
+
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
+
+(use ducttape-lib)
+(use posix-extras pathname-expand regex matchable)
+(use ini-file)
+;; plugs a hole in posix-extras in latter chicken versions
+(define ##sys#expand-home-path pathname-expand)
+(define (realpath x) (resolve-pathname  (pathname-expand (or x "/dev/null")) ))
+
+;; resolve fullpath to this script
+(define (get-this-script-fullpath #!key (argv (argv)))
+  (let* ((this-script
+          (cond
+           ((and (> (length argv) 2)
+                 (string-match "^(.*/csi|csi)$" (car argv))
+                 (string-match "^-(s|ss|sx|script)$" (cadr argv)))
+            (caddr argv))
+           (else (car argv))))
+         (fullpath (realpath this-script)))
+    fullpath))
+
+(define *this-script-fullpath* (get-this-script-fullpath))
+(define *this-script-dir* (pathname-directory *this-script-fullpath*))
+(define *this-script-name* (pathname-strip-directory *this-script-fullpath*))
+
+(define (false-on-exception thunk)
+  (handle-exceptions exn #f (thunk) ))
+
+(define (safe-file-exists? path-string)
+  (false-on-exception (lambda () (file-exists? path-string))))
+
+
+(define (crude-config-transformer infile outfile keep-sections-list append-text #!key (filter-patt #f))
+  (let* ((inlines (with-input-from-file infile read-lines))
+         (keep-lines (let loop ((lines-left inlines) (lines-out '()) (current-section #f) (section-lines-accumulator '()))
+                       (let* ((this-line (if (not (null? lines-left))
+                                             (car lines-left)
+                                             ""))
+                              (section-match (string-match "^\\s*\\[([^\\]]+)\\].*" this-line)))
+                         (cond
+                          ((null? lines-left)
+                           (if (member current-section keep-sections-list)
+                               (append lines-out (reverse section-lines-accumulator))
+                               lines-out))
+                          (section-match
+                           (let* ((next-lines-left      (cdr lines-left))
+                                  (next-lines-out       (if (member current-section keep-sections-list)
+                                                            (append lines-out (reverse section-lines-accumulator))
+                                                            lines-out))
+                                  (next-current-section (cadr section-match))
+                                  (next-section-lines-accumulator (list this-line)))
+                             (loop next-lines-left next-lines-out next-current-section next-section-lines-accumulator)))
+                          (else
+                           (let* ((next-lines-left       (cdr lines-left))
+                                  (next-lines-out        lines-out)
+                                  (next-current-section  current-section)
+                                  (next-section-lines-accumulator
+                                   (cond
+                                    ((and filter-patt (string-match (conc "^.*"filter-patt".*$") this-line))
+                                     section-lines-accumulator)
+                                    (else (cons this-line section-lines-accumulator)))))
+                             (loop next-lines-left next-lines-out next-current-section next-section-lines-accumulator))))))))
+    (with-output-to-file outfile (lambda ()
+                                   (print (string-join keep-lines "\n"))
+                                   (print)
+                                   (print append-text)
+                                   (print)))))
+                                        
+                           
+(define (testconfig-transformer infile outfile)
+  (crude-config-transformer
+   infile
+   outfile
+   '("meta" "items" "requirements" "test_meta")
+   
+   (conc "
+
+[ezsteps]
+alwayspass /bin/true
+
+")))
+
+
+
+
+
+(let* ((mtexe         "/p/foundry/env/pkgs/megatest/1.64/31/bin/megatest")
+       (faux-mtra     "/p/fdk/gwa/bjbarcla/issues/mtdev/ch/cap/faux")
+       (src-mtra      "/nfs/pdx/disks/icf_fdk_asic_gwa002/asicfdkqa/fossil/megatestqa/afdkqa")
+       (target        "p1275/5/ADF_r0.7_s/9p27t_tp0")
+       (run           "ww38.4")
+       (src-mtdb      (conc src-mtra "/megatest.db"))
+       (extra-src-testdirs   '("/p/fdk/gwa/asicfdkqa/fossil/ext/afdkqa_ext/trunk/tests"))
+       (mtconf        (with-input-from-pipe (conc "cd "src-mtra" && "mtexe" -show-config -target "target) read))
+       (runconf       (with-input-from-pipe (conc "cd "src-mtra" && "mtexe" -show-runconfig -dumpmode sexp -target "target) read))
+       (testdir-alist (alist-ref "tests-paths" mtconf equal?))
+       (testdirs      (filter safe-file-exists?
+                              (append extra-src-testdirs
+                                      (list (conc src-mtra "/tests"))
+                                      (if (and testdir-alist (not (null? testdir-alist)))
+                                          (map cadr testdir-alist)
+                                          '()))))
+       (tconfigfiles
+        (apply append (map (lambda (src-testdir)
+                             (with-input-from-pipe (conc "ls -1 "src-testdir"/*/testconfig") read-lines))
+                           testdirs)))
+       (tconf-alist   (filter identity
+                              (map (lambda (tcfile)
+                                     (let* ((m (string-match "^.*/([^/]+)/testconfig$" tcfile)))
+                                       (if (not (null? m))
+                                           (cons (cadr m) tcfile)
+                                           #f)))
+                                   tconfigfiles))))
+
+;  (pp mtconf)
+;  (pp (list 'FOO testdir-alist)) (exit 1)
+  ;; make megatest area
+  (when (not (file-exists? src-mtdb))
+    (ierr "Source does not exist.  Aborting.  [src-mtdb]")
+    (exit 1))
+  
+  (when (file-exists? faux-mtra)
+    (system (conc "cd "faux-mtra" && rm -rf $(/p/foundry/env/bin/mttmpdir)"))
+    (system (conc "rm -rf "faux-mtra)))
+  
+  (system (conc "mkdir -p "faux-mtra))
+  (system (conc "mkdir -p "faux-mtra"/links"))
+  (system (conc "mkdir -p "faux-mtra"/disk0"))
+
+  (system (conc "cd "src-mtra" && "mtexe" -show-config -target "target" -dumpmode ini > "faux-mtra"/megatest.config.in"))
+  (crude-config-transformer
+   (conc faux-mtra"/megatest.config.in")
+   (conc faux-mtra"/megatest.config")
+   '("fields" "server" "env-override" "dashboard" "validvalues")
+    (conc "[setup]
+linktree "faux-mtra"/links
+max_concurrent_jobs 1000
+launch-delay 5
+use-wal 1
+
+" ;; emacs has trouble if a string has [ at the beginning of line, so breaking it up.
+"[disks]
+disk0 "faux-mtra"/disk0")
+    filter-patt: "MT_LINKTREE"
+    )
+
+  
+  (system (conc "cd "src-mtra" && "mtexe" -show-runconfig -target "target" -dumpmode ini > "faux-mtra"/runconfigs.config"))
+
+
+  (system (conc "mkdir -p "faux-mtra"/tests"))
+
+  (for-each (lambda (tpair)
+              (pp tpair)
+              (let* ((testname (car tpair))
+                     (src-tconfigfile (cdr tpair))
+                     (destdir (conc faux-mtra"/tests/"testname)))
+                (do-or-die (conc "mkdir -p "destdir))
+                (do-or-die (conc "cp "src-tconfigfile" "destdir"/testconfig.in"))
+                (testconfig-transformer
+                 (conc destdir"/testconfig.in")
+                 (conc destdir"/testconfig"))
+                (print "processed test "testname)))
+            tconf-alist)
+  
+  
+  )

Index: utils/runner
==================================================================
--- utils/runner
+++ utils/runner
@@ -1,7 +1,24 @@
 #!/usr/bin/perl -w
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 $starthr=`date +%k`;
 $hrsper = 1;
 $nexthr=$starthr + $hrsper;
 
 $ltr='a';

DELETED utils/trace/trace.import.scm
Index: utils/trace/trace.import.scm
==================================================================
--- utils/trace/trace.import.scm
+++ /dev/null
@@ -1,32 +0,0 @@
-;;;; trace.import.scm - GENERATED BY CHICKEN 4.9.0.1 -*- Scheme -*-
-
-(eval '(import
-         scheme
-         chicken
-         csi
-         advice
-         extras
-         ports
-         data-structures
-         (except srfi-1 break)
-         miscmacros))
-(##sys#register-compiled-module
-  'trace
-  (list)
-  '((breakpoint . trace#breakpoint)
-    (trace . trace#trace)
-    (untrace . trace#untrace)
-    (break . trace#break)
-    (unbreak . trace#unbreak)
-    (trace-output-port . trace#trace-output-port)
-    (continue . trace#continue)
-    (c . trace#c)
-    (traced? . trace#traced?)
-    (trace-module . trace#trace-module)
-    (untrace-module . trace#untrace-module)
-    (trace-verbose . trace#trace-verbose)
-    (trace/untrace . trace#trace/untrace))
-  (list)
-  (list))
-
-;; END OF FILE

DELETED utils/trace/trace.meta
Index: utils/trace/trace.meta
==================================================================
--- utils/trace/trace.meta
+++ /dev/null
@@ -1,10 +0,0 @@
-;;;; trace.meta -*- Scheme -*-
-
-
-((category tools)
- (synopsis "tracing and breakpoints")
- (author "felix winkelmann")
- (license "public domain")
- (needs advice				; don't we all?
-	miscmacros)
- (files "tests/run.scm" "trace.meta" "trace.release-info" "trace.scm" "trace.setup") )

DELETED utils/trace/trace.scm
Index: utils/trace/trace.scm
==================================================================
--- utils/trace/trace.scm
+++ /dev/null
@@ -1,259 +0,0 @@
-;;;; trace.scm
-
-
-(module trace (breakpoint 
-	       trace untrace
-	       break unbreak
-	       trace-output-port
-	       continue c 
-	       traced?
-	       trace-module untrace-module
-	       trace-verbose
-	       trace/untrace)
-	       
-(import scheme chicken csi)
-
-(use advice extras ports data-structures)
-(require-library srfi-1)
-(import (except srfi-1 break) miscmacros)
-
-
-(define *last-breakpoint* #f)
-(define *traced-procedures* '())
-(define *broken-procedures* '())
-(define *trace-indent-level* 0)
-
-(define trace-output-port (make-parameter (current-output-port)))
-(define trace-verbose (make-parameter #t))
-
-(define (break-entry name args)
-  ;; Does _not_ unwind!
-  (##sys#call-with-current-continuation
-   (lambda (c)
-     (let ((exn (##sys#make-structure
-		 'condition
-		 '(exn breakpoint)
-		 (list '(exn . message) "*** breakpoint ***"
-		       '(exn . arguments) (list (cons name args))
-		       '(exn . location) name
-		       '(exn . continuation) c) ) ) )
-       (set! *last-breakpoint* exn)
-       (signal exn) ) ) ) )
-
-(define (break-resume exn)
-  (let ((a (member '(exn . continuation) (##sys#slot exn 2))))
-    (if a
-	((cadr a) (void))
-	(error "condition has no continuation" exn) ) ) )
-
-(define (breakpoint #!optional (name 'breakpoint))
-  (break-entry name '()) )
-
-(define (trace-indent)
-  (let ((port (trace-output-port)))
-    (do ((i (fxmin 3 *trace-indent-level*) (fx- i 1)))
-	((fx<= i 0))
-      (write-char #\space port) )
-    (fprintf port "[~a] " *trace-indent-level*) ) )
-
-(define (traced-procedure-entry name args)
-  (let ((port (trace-output-port)))
-    (trace-indent)
-    (set! *trace-indent-level* (fx+ 1 *trace-indent-level*))
-    (write (cons name args) port)
-    (write ", Called from: " port)
-    (write (conc (car (reverse (get-call-chain)))))
-    (write-char #\newline port)
-    (flush-output port) ) )
-
-(define (traced-procedure-exit name results)
-  (let ((port (trace-output-port)))
-    (set! *trace-indent-level* (fx- *trace-indent-level* 1))
-    (trace-indent)
-    (fprintf port "~a -> " name)
-    (if results
-	(for-each
-	 (lambda (x)
-	   (write x port)
-	   (write-char #\space port) )
-	 results)
-	(display "(escaping)" port))
-    (write-char #\newline port)
-    (flush-output port) ) )
-
-(define (procedure-name proc)
-  (cond ((procedure-information proc) =>
-	 (lambda (info)
-	   (if (pair? info) (car info) info) ) )
-	(else ')) )
-
-(define (do-trace procs)
-  (for-each
-   (lambda (s)
-     (ensure procedure? s)
-     (cond ((traced? s)
-	    (warning "procedure already traced" s) )
-	   (else
-	    (let ((name (procedure-name s)))
-	      (when (trace-verbose)
-		(fprintf (current-error-port) "; tracing ~a~%" name))
-	      (set! *traced-procedures* (cons (cons s name) *traced-procedures*))
-	      (advise 
-	       'around s
-	       (lambda (next args)
-		 (let ((results #f))
-		   (dynamic-wind
-		       (cut traced-procedure-entry name args)
-		       (lambda () 
-			 (call-with-values (cut apply next args)
-			   (lambda rs
-			     (set! results rs)
-			     (apply values rs))))
-		       (cut traced-procedure-exit name results))))
-	       '*trace*)))))
-   procs) )
-
-(define (do-untrace-all)
-  (define (unadvise* p)
-    (ignore-errors (unadvise p '*trace*)))
-  (for-each
-   (lambda (proc)
-     (let ((proc (car proc)))
-       (when (trace-verbose)
-	 (fprintf (current-error-port) "; untracing ~a~%" (procedure-name proc))
-	 (unadvise* proc))))
-   *traced-procedures*)
-  (set! *traced-procedures* '()))
-
-(define (do-untrace procs)
-  (for-each
-   (lambda (s)
-     (ensure procedure? s)
-     (let ((p (assq s *traced-procedures*)) 
-	   (name (procedure-name s)))
-       (cond ((not p) (warning "procedure not traced" name))
-	     (else
-	      (when (trace-verbose)
-		(fprintf (current-error-port) "; untracing ~a~%" name))
-	      (ignore-errors (unadvise s '*trace*))
-	      (set! *traced-procedures* 
-		(delete 
-		 p *traced-procedures* 
-		 eq?))))))
-   procs) )
-
-(define (do-break procs)
-  (for-each
-   (lambda (s)
-     (let ((name (procedure-name s)))
-       (ensure procedure? s)
-       (cond ((assq s *broken-procedures*)
-	      (warning "procedure already has break-point" name))
-	     (else
-	      (when (trace-verbose)
-		(fprintf (current-error-port) "; setting break-point in ~a~%" name))
-	      (set! *broken-procedures* (cons (cons s name) *broken-procedures*))
-	      (advise 
-	       'before s
-	       (lambda (args)
-		 (break-entry name args) )
-	       '*break*) ) )))
-   procs) )
-
-(define (do-unbreak procs)
-  (for-each
-   (lambda (s)
-     (ensure procedure? s)
-     (let ((p (assq s *broken-procedures*)) 
-	   (name (procedure-name s)))
-       (cond ((not p) (warning "procedure has no breakpoint" name))
-	     (else
-	      (when (trace-verbose)
-		(fprintf (current-error-port) "; removing break-point in ~a~%" name))
-	      (ignore-errors (unadvise s '*break*))
-	      (set! *broken-procedures* (delete p *broken-procedures* eq?) ) ) ) ) )
-   procs) )
-
-(define (do-unbreak-all)
-  (for-each
-   (lambda (bp)
-     (ignore-errors (unadvise (car bp) '*break*)))
-   *broken-procedures*)
-  (set! *broken-procedures* '())
-  (void))
-
-(define (trace . procs)
-  (cond ((null? procs)
-	 (when (pair? *traced-procedures*)
-	   (printf "Traced:~%~%")
-	   (for-each (lambda (p) (printf "  ~a~%" (cdr p))) *traced-procedures*)) )
-	(else
-	 (do-trace procs) ) ) )
-
-(define (untrace . procs)
-  (cond ((null? procs) (do-untrace-all))
-	(else (do-untrace procs)))
-  (void))
-
-(define (break . procs)
-  (cond ((null? procs)
-	 (when (pair? *broken-procedures*)
-	   (printf "Breakpoints:~%~%")
-	   (for-each (lambda (p) (printf "  ~a~%" (cdr p))) *broken-procedures*)) )
-	(else
-	 (do-break procs) ) ) )
-
-(define (unbreak . procs)
-  (cond ((null? procs) (do-unbreak-all))
-	(else (do-unbreak procs))))
-
-(define (continue #!optional (bp *last-breakpoint*))
-  (cond (*last-breakpoint*
-	 (let ((exn *last-breakpoint*))
-	   (set! *last-breakpoint* #f)
-	   (break-resume exn) ) )
-	(else (display "no breakpoint pending\n") ) ) )
-
-(define c continue)
-
-(define (traced? proc)
-  (assq proc *traced-procedures*))
-
-(define (trace/untrace . procs)
-  (for-each
-   (lambda (proc)
-     ((if (traced? proc) do-untrace do-trace) (list proc)))
-   procs))
-
-(define (walk-module mname proc)
-  (let* ((m (##sys#find-module mname))
-	 (exps (nth-value 1 (##sys#module-exports m))))
-    (for-each
-     (lambda (exp)
-       (let* ((realname (cdr exp))
-	      (prim (get realname '##core#primitive)))
-	 (if prim
-	     (warning "export is a core-library primitive - not traced" (car exp))
-	     (when (##sys#symbol-has-toplevel-binding? realname)
-	       (let ((val (##sys#slot realname 0)))
-		 (when (procedure? val)
-		   (proc val)))))))
-     exps)))
-
-(define (trace-module . mnames)
-  (for-each
-   (lambda (mname)
-     (walk-module mname trace))
-   mnames))
-
-(define (untrace-module . mnames)
-  (for-each
-   (lambda (mname)
-     (walk-module 
-      mname 
-      (lambda (proc)
-	(when (traced? proc)
-	  (do-untrace (list proc))))))
-   mnames))
-
-)

DELETED utils/trace/trace.setup
Index: utils/trace/trace.setup
==================================================================
--- utils/trace/trace.setup
+++ /dev/null
@@ -1,9 +0,0 @@
-;;;; trace.setup -*- Scheme -*-
-
-
-(compile -s trace.scm -O3 -d1 -j trace)
-(compile -s trace.import.scm -O3 -d0)
-
-(install-extension
- 'trace
- '("trace.so" "trace.import.so"))

Index: utils/triage.rb
==================================================================
--- utils/triage.rb
+++ utils/triage.rb
@@ -1,7 +1,24 @@
 #!/usr/bin/env ruby
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 #dir = "."
 #if ARGV.length == 1
 #  dir = ARGV[0]
 #end
 #puts dir

Index: utils/unlock_db.sh
==================================================================
--- utils/unlock_db.sh
+++ utils/unlock_db.sh
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 ## Enh :
 # 1. if /tmp/repo exists, delte it or name it something else
 # 2. compare the repo is successfully created
 
 ## Usage :

Index: utils/viewscreen
==================================================================
--- utils/viewscreen
+++ utils/viewscreen
@@ -1,7 +1,24 @@
 #!/bin/bash
 
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
 if ! type screen &> /dev/null;then
   xterm -geometry 180x20 -e "$*;echo Press any key to continue;bash -c 'read -n 1 -s'" &
   exit
 fi
 

ADDED   utils/watch-close-wait.sh
Index: utils/watch-close-wait.sh
==================================================================
--- /dev/null
+++ utils/watch-close-wait.sh
@@ -0,0 +1,25 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+psline=$(ps -F -u $USER | grep "mtest" |grep " -run " | egrep " -(target|reqtarg) "| head -1)
+id=$(echo $psline|awk '{print $2}')
+echo "Watching process for command line: $psline"
+echo "  with PID=$id"
+while true;do
+  echo "CLOSE_WAIT: $(lsof -n | grep CLOSE_WAIT | grep $id | wc -l) ALL OPEN: $(lsof -n |grep $id|wc -l) ALL CLOSE_WAIT: $(netstat -ap 2> /dev/null| grep -i close_wait| wc -l)"
+  sleep 1
+done

ADDED   utils/whodunit.scm
Index: utils/whodunit.scm
==================================================================
--- /dev/null
+++ utils/whodunit.scm
@@ -0,0 +1,65 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
+(use posix srfi-69)
+
+(define *numsamples* (or (and (> (length (argv)) 1)
+                              (string->number (cadr (argv))))
+                         3))
+
+(define (topdata)
+  (with-input-from-pipe
+   (conc "top -b -n " *numsamples* " -d 0.1")
+   read-lines))
+
+(define (cleanup-data topdat)list
+  (let loop ((hed (car topdat))
+              (tal (cdr topdat))
+              (res '()))
+    (let* ((line-list (string-split hed))
+           (nums      (map (lambda (indat)(or (string->number indat) indat)) line-list))
+           (not-data  (or (null? nums)
+                          (not (number? (car nums)))))
+           (new-res   (if not-data res (cons nums res))))
+      (if (null? tal)
+          new-res
+          (loop (car tal)(cdr tal) new-res)))))
+
+(print "Getting " *numsamples* " samples of cpu usage data.")
+(define data (cleanup-data (topdata)))
+(define pidhash  (make-hash-table))
+(define userhash (make-hash-table))
+
+;; sum up and normalize the 
+(for-each
+ (lambda (indat)
+   (let ((pid (car indat))
+         (usr (cadr indat))
+         (cpu (list-ref indat 8)))
+     (hash-table-set! userhash usr (+ cpu (hash-table-ref/default userhash usr 0)))))
+ data)
+
+(for-each
+ (lambda (usr)
+   (print usr
+          (if (< (string-length usr) 8) "\t\t" "\t")
+          (inexact->exact (round (/ (hash-table-ref userhash usr) *numsamples*)))))
+ (sort (hash-table-keys userhash)
+       (lambda (a b)
+         (> (hash-table-ref userhash a)
+            (hash-table-ref userhash b)))))
+

DELETED utils/wip/mtest-dbstop.scm
Index: utils/wip/mtest-dbstop.scm
==================================================================
--- utils/wip/mtest-dbstop.scm
+++ /dev/null
@@ -1,12 +0,0 @@
-#!/p/foundry/env/pkgs/chicken/4.10.0_ext/bin/csi -s
-
-(use chicken)
-(use data-structures)
-
-
-(include "/nfs/site/home/bjbarcla/bin2/mtest-repair-lib.scm")
-(glib-color-mode 1)
-
-(set! *this-cmd* "/nfs/site/home/bjbarcla/bin2/mtest-dbstop.scm")
-(kill-in-db)
-  

DELETED utils/wip/mtest-diag.scm
Index: utils/wip/mtest-diag.scm
==================================================================
--- utils/wip/mtest-diag.scm
+++ /dev/null
@@ -1,165 +0,0 @@
-#!/p/foundry/env/pkgs/chicken/4.10.0_ext/bin/csi -s
-
-(use chicken)
-(use data-structures)
-
-
-(include "/nfs/site/home/bjbarcla/bin2/mtest-repair-lib.scm")
-(glib-color-mode 1)
-
-;;; check mtver in xterm
-(let ((mt-ver (do-or-die "megatest -version")))
-  (when (member mt-ver '("1.6309-738c" "1.6029"))
-      (iwarn "This xterm has an older version of megatest.")
-      (ierr "Please load latest megatest version to proceed.")
-      (print "eg.: source ../scripts/newrel-setup.csh 1.63/11b")
-      (exit 3)))
-
-
-;;;; kill netbatch jobs from this megatest
-;; TODO!
-
-
-(define *diag* #t)
-;;(define *user* (get-environment-variable "USER"))
-(define *user* (do-or-die "ls -ld . | awk '{print $3}'"))
-(print "user="*user*)
-;;;; delete .homehost .homehost.config
-;;;; if not on homehost, ssh homehost, cd here, killall mtest dboard
-(if (not *diag*)
-    (when (file-exists? ".homehost.config")
-      (delete-db ".homehost.config")))
-    
-(when (file-exists? ".homehost")
-  (let* ((homehost (with-input-from-file ".homehost" (lambda () (read)))))
-    (let* ((homehostname (do-or-die "host `cat .homehost` | sed 's/.$//' | awk '{print $NF}' | awk -F. '{print $1}'"))
-           (thishostname (get-environment-variable "HOST")))
-      (when (not (equal? homehostname thishostname))
-        (let* ((this-exe-compiled (car (argv)))
-               (this-exe "/nfs/site/home/bjbarcla/bin2/mtest-diag.scm")
-               (cmd (conc "ssh "homehostname" 'cd "(get-environment-variable "PWD")" && "this-exe"'")))
-          (iwarn "Running on the homehost -- "homehostname)
-          ;;(iwarn "eg: % ssh "homehostname" 'cd "(get-environment-variable "PWD")" && "(car (argv))"'")
-          (print "cmd="cmd)
-          ;;(inote "sleeping for 5 seconds.  hit ctrl-c now to run on homehost or wait to proceed.")
-          (system cmd)
-          (exit 0))))))
-
-
-
-
-;;;; kill megatests and dashboards in this area
-(define (kill-mtest-dboard)
-  (if *diag*
-      #f
-      (let* ((this-toppath (pid->cwd (current-process-id)))
-             (tmppath      (toppath->tmppath this-toppath))
-             (config       (let ((res (conc this-toppath "/megatest.config")))
-                             (when (not (file-exists? res))
-                               (ierr "This is not a megatest run area; "res" does not exist.  Aborting.")
-                               (exit 2))
-                             res))
-             (mtest-procs (get-my-mtest-procs))
-             (dashboard-procs (get-my-dashboard-procs))
-             (all-pids (map proc-PID (append mtest-procs dashboard-procs)))
-             (our-pids (filter (lambda (pid)
-                                 (equal? (pid->cwd pid) this-toppath))
-                               all-pids)))
-
-        (if (null? our-pids)
-            (inote "No mtest or dboard processes on this host in in this runarea.")
-            (begin
-              (iwarn "Killing all megatest and dashboard processes on this host.")
-              (gracefully-kill-pids our-pids)))
-        )))
-
-(kill-mtest-dboard)
-
-
-;;;; delete /tmp/.$USER-portlogger.db
-(let ((plfile (conc "/tmp/."*user* "-portlogger.db")))
-
-  (if (safe-file-exists? plfile)
-    (if *diag*
-        (print "plfile exists - "plfile)
-        (begin
-          (inote "removing portlogger file")
-          (system (conc "rm "plfile))))))
-
-
-;;;; move logs dir aside
-(when (not *diag*)
-  (system (conc "mv logs logs-aside-`date +%s`"))
-  (system "mkdir logs"))
-  
-
-;;;; fixes for dependency diagram
-(when (not *diag*)
-  (inote "Removing dep graph tmp files if they exist")
-  (system (conc "rm /tmp/."*user*"-*.dot"))
-
-  ;;#ln -s /p/fdk/gwa/$USER/fossil/ext/_ext ext
-  (let* ((toppath (pid->cwd (current-process-id)))
-         (flow (car (string-split
-                     (car (reverse (string-split toppath "/")))
-                     ".")))
-         (extdir (conc "/p/fdk/gwa/"*user*
-                       "/fossil/ext/"flow"_ext")))
-    (when (and (safe-file-exists? extdir)
-               (not (safe-file-exists? "ext")))
-      (inote "Linking in ext dir")
-      (system (conc "ln -s "extdir" ext")))))
-  
-
-;;;; check for 0 byte megatest{,_ref}.db in tmp.  delete them
-;;;; check for wal-mode megatest{,_ref}.db in tmp.  delete them
-(define (repair-dbs)
-  (let* ((this-toppath (pid->cwd (current-process-id)))
-         (tmppath      (toppath->tmppath this-toppath))
-         (golden-mtest-file (conc this-toppath "/megatest.db"))
-         (golden-mtest-file-ok (check-db "megatest.db"))
-         (tmp-mtest-file    (conc tmppath "/megatest.db"))
-         (tmp-mtestref-file    (conc tmppath "/megatest_ref.db"))
-         (tmp-mtest-file-ok (check-db tmp-mtest-file))
-         (tmp-mtestref-file-ok (check-db tmp-mtestref-file))
-         )
-;;;; check for megatest{,_ref}.db in tmp that die on .schema.  delete them
-    (when (safe-file-exists? tmppath)
-        (if tmp-mtest-file-ok
-            (inote "tmp megatest db file ok")
-            (if *diag*
-                (print "diag: tmp megatest db broken - "tmp-mtest-file)
-                (delete-db tmp-mtest-file)))
-        (if tmp-mtestref-file-ok
-            (inote "tmp megatestref db file ok")
-            (if *diag*
-                (print "diag: tmpref megatest db broken - "tmp-mtestref-file)
-                (delete-db tmp-mtestref-file))))
-
-;;;; check for megatest.db
-    (if golden-mtest-file-ok
-        (inote "golden megatest db file ok")
-        (if (not (file-exists? golden-mtest-file))
-            (inote "megatest.db not present.  Continuing.")
-            (begin
-          ;;;; if golden megatest db is broken, stop now!
-              (ierr "Golden megatest.db is broken.  Please delete it or replace it from a backup version in .snapshot.  If critical, contact env team to assist.")
-              (sendmail "bjbarcla" "!!Bad golden megatest.db" this-toppath)
-              (inote "Backups in .snapshot:")
-              (system "ls -l .snapshot/*/megatest.db")
-              (ierr "Not proceeding with any more checks.")
-              (exit 3))))
-
-
-
-    ))
-
-(repair-dbs)
-    
-
-
-
-
-
-
-

DELETED utils/wip/mtest-nbstop.scm
Index: utils/wip/mtest-nbstop.scm
==================================================================
--- utils/wip/mtest-nbstop.scm
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/p/foundry/env/pkgs/chicken/4.10.0_ext/bin/csi -s
-
-(use chicken)
-(use data-structures)
-
-
-(include "/nfs/site/home/bjbarcla/bin2/mtest-repair-lib.scm")
-(glib-color-mode 1)
-
-(set! *this-cmd* "/nfs/site/home/bjbarcla/bin2/mtest-nbstop.scm")
-
-(inote "Killing local mtest/dboard in this run area.")
-(kill-mtest-dboard)
-
-;;;; move logs dir aside
-(inote "move logs")
-(system (conc "mv logs logs-aside-`date +%s`"))
-(system "mkdir logs")
-
-
-
-(inote "Killing netbatch mtest jobs launched from this run area.")
-(let ((jobcount (kill-mtest-jobs-in-netbatch)))
-  (when (> jobcount 0)
-    (inote "Marking in-flight tests killed in db")
-    (when (db-islocked? "megatest.db")
-      (iwarn "Unlocking megatest.db")
-      (db-unlock "megaetest.db"))
-    (kill-in-db)))
-
-(inote "Final reaping of mtest/dboard")
-(kill-mtest-dboard)
-
-

DELETED utils/wip/mtest-reaper.scm
Index: utils/wip/mtest-reaper.scm
==================================================================
--- utils/wip/mtest-reaper.scm
+++ /dev/null
@@ -1,142 +0,0 @@
-#!/p/foundry/env/pkgs/chicken/4.10.0_ext/bin/csi -s
-
-(use general-lib)
-(use typed-records)
-(use regex-literals)
-(use regex)
-(use sql-de-lite)
-
-(defstruct proc
-    (USER "")
-  (PID -1)
-  (%CPU -1.0)
-  (%MEM -1.0)
-  (VSZ -1)
-  (RSS -1)
-  (TTY "")
-  (STAT "")
-  (START "")
-  (TIME "")
-  (COMMAND ""))
-
-(define (linux-get-process-info-records)
-  (let* ((raw (do-or-die "/bin/ps auwx"))
-         (all-lines (string-split raw "\n"))
-         (lines (cdr all-lines)) ;; skip title lines
-         (re #/^(\S+)\s+(\d+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(.*)$/))
-    (filter
-     proc?
-     (map
-      (lambda (line)
-        (let ((match (string-match re line)))
-          (if match
-              (make-proc
-               USER:    (list-ref match 1)
-               PID:     (string->number (list-ref match 2))
-               %CPU:    (string->number (list-ref match 3))
-               %MEM:    (string->number (list-ref match 4))
-               VSZ:     (string->number (list-ref match 5))
-               RSS:     (string->number (list-ref match 6))
-               TTY:     (string->number (list-ref match 7))
-               STAT:    (list-ref match 8)
-               START:   (list-ref match 9)
-               TIME:    (list-ref match 10)
-               COMMAND: (list-ref match 11))
-              #f)))
-      lines))))
-        
-(define (get-my-mtest-server-procs)
-  (let* ((procs (linux-get-process-info-records))
-        (my-mtest-procs
-         (filter
-          (lambda (a-proc)
-            (and
-             (equal? (get-environment-variable "USER") (proc-USER a-proc))
-             (string-match #/^.*\/mtest\s+.*-server.*/ (proc-COMMAND a-proc))))
-          procs)))
-    my-mtest-procs))
-
-
-(define (pid->environ-hash pid)
-  (let* ((envfile (conc "/proc/"pid"/environ"))
-         (ht (make-hash-table))
-         (rawdata (with-input-from-file envfile read-string))
-         (lines (string-split rawdata  (make-string 1 #\nul ))))
-    (for-each
-     (lambda (line)
-       (let ((match (string-match #/(^[^=]+)=(.*)/ line)))
-         (if match
-             (hash-table-set! ht (list-ref match 1) (list-ref match 2)))))
-     lines)
-    ht))
-
-(define (pid->cwd pid)
-  (read-symbolic-link (conc "/proc/"pid"/cwd")))
-
-(define (pid->mtest-monitor-db-file pid)
-  (let* ((env   (pid->environ-hash pid))
-         (ltdir (hash-table-ref/default env "MT_LINKTREE" #f))
-         (radir (hash-table-ref/default env "MT_RUN_AREA_HOME" #f))
-         (cwd   (pid->cwd pid)))
-    (let ((res
-           (cond
-            (ltdir (conc ltdir "/.db/monitor.db"))
-            (radir (conc
-                    (do-or-die
-                     (conc "megatest -start-dir "radir" -show-config -section setup -var linktree"))
-                    "/.db/monitor.db"))
-            (cwd  (conc
-                   (do-or-die
-                    (conc "megatest -start-dir "cwd" -show-config -section setup -var linktree"))
-                   "/.db/monitor.db"))
-            
-            (else #f))))
-      res)))
-      
-
-
-
-
-(define (get-mdb-status mdb-file pid)
-    ;; select state from servers where pid='4465';
-  
-  (cond
-   ((not (string? mdb-file)) (conc "mdb-file could not be determined for pid " pid ">>"mdb-file ))
-   ((not (file-exists? mdb-file)) (conc "mdb-file does not exist for pid "pid" : "mdb-file))
-   (else
-    (let ((dbh (open-database mdb-file)))
-      
-      (set-busy-handler! dbh 10000)
-      (let* ((sql-str "select state from servers where pid=?;")
-             (stm (sql dbh sql-str))
-             (alists (query fetch-alists stm (->string pid))))
-        (if (null? alists)
-            "server pid not in monitor.db"
-            (cdr (car (car alists)))))))))
-
-    
-(define (mtest-server-pid->status pid)
-  (let* ((mdb-file (pid->mtest-monitor-db-file pid)))
-    (if mdb-file
-        (get-mdb-status mdb-file pid)
-        "no monitor.db file could be found"
-        )))
-
-
-(define (kill pid)
-  (print "KILL "pid)
-  (do-or-die (conc "kill -9 "pid)))
-
-(define (reap-defunct-mtest-server-pid pid)
-  (let ((status (mtest-server-pid->status pid)))
-    (print pid"->"(mtest-server-pid->status pid))
-    (if (member status (list "running" "dbprep" "available" "collision"))
-        (print "pid="pid" in status "status" -- not killing")
-        (kill pid))))
-        
-(let* ((procs (get-my-mtest-server-procs))
-       (pids (map proc-PID procs))
-       )
-  
-  (for-each reap-defunct-mtest-server-pid pids))
-

DELETED utils/wip/mtest-repair-lib.scm
Index: utils/wip/mtest-repair-lib.scm
==================================================================
--- utils/wip/mtest-repair-lib.scm
+++ /dev/null
@@ -1,508 +0,0 @@
-(use general-lib)
-(use typed-records)
-(use regex-literals)
-(use regex)
-(use sql-de-lite)
-(use posix)
-(use files)
-(use s11n)
-(use ports)
-(use z3)
-(use base64)
-(use matchable)
-
-
-
-
-(define (cli-arg arg #!key (default #f) (is-list #f))
-  (let* ((temp    (skim-cmdline-opts-withargs-by-regex arg)))
-      (if (> (length temp) 0)
-          (if is-list
-              temp
-              (car temp))
-          default)))
-
-(define (cli-switch arg)
-  (let ((temp (skim-cmdline-opts-noarg-by-regex arg)))
-    (if (> (length temp) 0)
-        (car temp)
-        #f)))
-
-
-         
-(defstruct nbjob
-    pool
-    jobid
-    owner
-    mtver
-    user
-    status
-    cmdline
-    execute)
-
-(define (cmdline->execute cmdline)
-  (let* ((match (string-match ".*-execute\\s+(\\S+)" cmdline)))
-    (if match
-        (with-input-from-string (z3:decode-buffer (base64-decode (cadr match))) read)
-        #f)))
-
-
-(define (nbjob-execute-ref nbjob key #!key (default #f))
-  (let ((execute (nbjob-execute nbjob)))
-    (if (list? execute)
-        (let* ((match (alist-ref key execute)))
-          (if match
-              (if (list? match) (car match) match)
-              default))
-        default)))
-
-(define (nbjob-process pool nbstatus-line)
-  (let ((toks (string-split nbstatus-line ",")))
-    (if (eq? 4 (length toks))
-        (if (equal? (list-ref toks 1) "Jobid")
-            #f
-            (begin
-              (let ((res
-                     (make-nbjob
-                      pool:    pool
-                      status:  (list-ref toks 0)
-                      jobid:   (list-ref toks 1)
-                      user:    (list-ref toks 2)
-                      cmdline: (list-ref toks 3)
-                      execute: (cmdline->execute (list-ref toks 3))
-                      )))
-                res)))
-        #f)))
-
-(define (get-mtest-nb-jobs user nbpools #!key (cmdline-filter "megatest"))
-  (let* ((res
-          (apply append
-                 (map (lambda (pool)
-                        (let* (;;(user-filter ".*")
-                               (user-filter user)
-                               (cmd
-                                (conc "nbstatus jobs --tar "pool" --fields status,jobid,user,cmdline --format csv "
-                                      "'USER=~\""user-filter
-                                      "\"&&cmdline=~\""cmdline-filter"\"'"))
-                               (res (do-or-die cmd)))
-                          (filter nbjob?
-                                  (map (lambda (line)
-                                         (nbjob-process pool line))
-                                       (string-split res "\n")))))
-                      nbpools))))
-    res))
-
-;;(define foo (get-mtest-nb-jobs "bjbarcla" '("pdx_normal" "pdx_critical")))
-
-(define (cmdline->execute cmdline)
-  (let* ((match (string-match ".*-execute\\s+(\\S+)" cmdline)))
-    (if match
-        (with-input-from-string (z3:decode-buffer (base64-decode (cadr match))) read)
-        #f)))
-
-;;;; kill jobs in netbatch for this area
-(define (kill-mtest-jobs-in-netbatch)
-  (let ((pwd (get-environment-variable "PWD"))
-        (jobs (get-mtest-nb-jobs (get-environment-variable "USER") '("pdx_normal" "pdx_critical") )))
-
-    (for-each
-     (lambda (job)
-       (let* ((jobid  (nbjob-jobid job))
-              (pool   (nbjob-pool job))
-              (status (nbjob-status job))
-              (cmd (conc "nbjob --target "pool" remove "jobid)))
-         ;;(print status)
-         (print  cmd)
-         (system cmd)))
-                                        ;(pp (nbjob->alist job))
-     (filter
-      (lambda (job)
-        (equal? (nbjob-execute-ref job 'toppath) pwd))
-      jobs))
-    (length jobs)
-
-    ))
-
-
-;;;; kill megatest jobs in running in netbatch
-(define (kill-in-db #!key (megatest_exe "megatest"))
-  (let* ((all-targ-patt (do-or-die "sqlite3 megatest.db \"select id from keys\" | tr \"\\n1234567890\" \"/%%%%%%%%%%\" | sed 's/\\/$//'"))
-         )
-    (for-each (lambda (state)
-                (let* ((cmd (conc megatest_exe " -state "state" -set-state-status KILLED,n/a -testpatt % -target "all-targ-patt" -runname %")))
-                  (print cmd)
-                  (system cmd)))
-              '("REMOTEHOSTSTART" "LAUNCHED" "RUNNING" "KEEP_TRYING" "PREQ_FAIL"))))
-
-
-
-;;;; kill megatests and dashboards in this area running on this host
-(define (kill-mtest-dboard)
-  
-  (let* ((this-toppath (pid->cwd (current-process-id)))
-         (tmppath      (toppath->tmppath this-toppath))
-         (config       (let ((res (conc this-toppath "/megatest.config")))
-                         (when (not (file-exists? res))
-                           (ierr "This is not a megatest run area; "res" does not exist.  Aborting.")
-                           (exit 2))
-                         res))
-         (mtest-procs (get-my-mtest-procs))
-         (dashboard-procs (get-my-dashboard-procs))
-         (all-pids (map proc-PID (append mtest-procs dashboard-procs)))
-         (our-pids (filter (lambda (pid)
-                             ;;(print (pid-COMMAND pid))
-                             (and
-                              (equal? (pid->cwd pid) this-toppath)
-                              
-                              ))
-                           all-pids)))
-
-    (if (null? our-pids)
-        (inote "No mtest or dboard processes on this host in in this runarea.")
-        (begin
-          (iwarn "Killing all megatest and dashboard processes on this host.")
-          (gracefully-kill-pids our-pids)))
-    ))
-
-
-
-(define (db-mt-version dbpath)
-  (let* ((cmd (conc "sqlite3 "dbpath" 'select val from metadat where var=\"MEGATEST_VERSION\"'"))
-         (res (do-or-die cmd)))
-    res))
-   
-;; TODO
-(define (db-islocked? dbpath)
-  (let-values (((ec so se) (isys (conc "sqlite3 "dbpath" vacuum"))))
-    (let* ((message se)
-           (is-locked (string-match "^.*database is locked.*$" message)))
-      (inote "dbfile - "dbpath "; message - "message)
-      is-locked)))
-
-(define (db-unlock dbpath)
-  (system (conc "/nfs/site/bjbarcla/bin/unlock_db.sh " dbpath))
-
-  ;; (let* ((temp-dbpath (conc "/tmp/"(get-environment-variable "USER")"-"(current-process-id)".db")))
-  ;;   (inote "Unlocking "dbpath)
-  ;;   (do-or-die (conc "cp "dbpath" "temp-dbpath))
-  ;;   (do-or-die (conc "rm -f "dbpath))
-  ;;   (let* ((cmd (conc "sqlite3 "temp-dbpath" .dump | sqlite3 "dbpath)))
-  ;;     (inote "Running: "cmd)
-  ;;     (system cmd))
-  ;;   ;;(do-or-die "sqlite3 "temp-dbpath" .dump | sqlite3 "dbpath)
-  ;;   (if (db-islocked? dbpath)
-  ;;       (begin
-  ;;         (ierr "Could not unlock "dbpath)
-  ;;         (exit 5))
-  ;;       (inote "Unlocked "dbpath))
-  ;;   #t)
-
-  )
-
-
-(define *user* (do-or-die "ls -ld . | awk '{print $3}'"))
-
-(define (false-on-exception thunk)
-  (handle-exceptions exn #f (thunk) ))
-
-(define (safe-file-exists? path-string)
-  (false-on-exception (lambda () (file-exists? path-string))))
-
-(defstruct proc
-    (USER "")
-  (PID -1)
-  (%CPU -1.0)
-  (%MEM -1.0)
-  (VSZ -1)
-  (RSS -1)
-  (TTY "")
-  (STAT "")
-  (START "")
-  (TIME "")
-  (COMMAND ""))
-
-(define (toppath->tmppath toppath)
-  (let* ((user *user*)
-         (area (car (string-split
-                     (car (reverse (string-split toppath "/")))
-                     ".")))
-         (dotified-path (string-substitute "/" "." toppath "all")))
-    (conc "/tmp/" user "/megatest_localdb/" area "/" dotified-path)))
-
-
-(define (delete-db dbfile)
-  (let* ((db-files (glob (conc dbfile "*"))))
-    (for-each
-     (lambda (file)
-       (inote "delete file " file)
-       (if (delete-file* file)
-           (inote "Removed file - " file)
-           (iwarn "Could Not Remove file - " file))
-       )
-     db-files)))
-
-(define (check-db dbfile)
-  (let* ((has-wal (safe-file-exists? (conc dbfile "-wal")))
-         (has-shm (safe-file-exists? (conc dbfile "-shm")))
-         (has-journal (safe-file-exists? (conc dbfile "-journal")))
-         (has-db (safe-file-exists? dbfile))
-         (ok-flag #t))
-    (when has-journal
-      (iwarn "Journal exists - "(conc dbfile "-journal"))
-      )
-    (when has-wal
-      (set! ok-flag #f)
-      (iwarn "Wal-mode db exists: "(conc dbfile "-wal")))
-    (if (not has-db)
-        (begin
-          (inote "db does not exists " dbfile)
-          (set! ok-flag #f))
-        (let* ((db-size (file-size dbfile)))
-          (inote "db size = " db-size " -- " dbfile)
-          (when (member db-size (list 0 1024))
-            (iwarn "db has bad size - "db-size" -- "dbfile)
-            (set! ok-flag #f))))
-    ok-flag))
-               
-
-(define (linux-get-process-info-records)
-  (let* ((raw (do-or-die "/bin/ps auwx"))
-         (all-lines (string-split raw "\n"))
-         (lines (cdr all-lines)) ;; skip title lines
-         (re (regexp "^(\\S+)\\s+(\\d+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(\\S+)\\s+(.*)$")))
-    (filter
-     proc?
-     (map
-      (lambda (line)
-        (let ((match (string-match re line)))
-          (if match
-              (make-proc
-               USER:    (list-ref match 1)
-               PID:     (string->number (list-ref match 2))
-               %CPU:    (string->number (list-ref match 3))
-               %MEM:    (string->number (list-ref match 4))
-               VSZ:     (string->number (list-ref match 5))
-               RSS:     (string->number (list-ref match 6))
-               TTY:     (string->number (list-ref match 7))
-               STAT:    (list-ref match 8)
-               START:   (list-ref match 9)
-               TIME:    (list-ref match 10)
-               COMMAND: (list-ref match 11))
-              #f)))
-      lines))))
-        
-(define (get-my-mtest-server-procs)
-  (let* ((procs (linux-get-process-info-records))
-        (my-mtest-procs
-         (filter
-          (lambda (a-proc)
-            (and
-             (equal? *user* (proc-USER a-proc))
-             (string-match "^.*/mtest\\s+.*-server.*" (proc-COMMAND a-proc))))
-          procs)))
-    my-mtest-procs))
-
-(define (get-my-mtest-procs)
-  (let* ((procs (linux-get-process-info-records))
-        (my-mtest-procs
-         (filter
-          (lambda (a-proc)
-            (and
-             (equal? *user* (proc-USER a-proc))
-             (string-match "^.*/m(ega)?test .*" (proc-COMMAND a-proc))
-             (not (string-match "^.*/mtest-repair.*" (proc-COMMAND a-proc)))))
-          procs)))
-    my-mtest-procs))
-
-(define (get-my-dashboard-procs)
-  (let* ((procs (linux-get-process-info-records))
-        (my-dboard-procs
-         (filter
-          (lambda (a-proc)
-            (and
-             (equal? *user* (proc-USER a-proc))
-             (string-match "^.*/dboard.*" (proc-COMMAND a-proc))))
-          procs)))
-    my-dboard-procs))
-
-
-(define (pid->environ-hash pid)
-  (let* ((envfile (conc "/proc/"pid"/environ"))
-         (ht (make-hash-table))
-         (rawdata (with-input-from-file envfile read-string))
-         (lines (string-split rawdata  (make-string 1 #\nul ))))
-    (for-each
-     (lambda (line)
-       (let ((match (string-match "(^[^=]+)=(.*)" line)))
-         (if match
-             (hash-table-set! ht (list-ref match 1) (list-ref match 2)))))
-     lines)
-    ht))
-
-(define (pid->cwd pid)
-  (read-symbolic-link (conc "/proc/"pid"/cwd")))
-
-(define (pid->mtest-monitor-db-file pid #!key (megatest_exe "megatest"))
-  (let* ((env   (pid->environ-hash pid))
-         (ltdir (hash-table-ref/default env "MT_LINKTREE" #f))
-         (radir (hash-table-ref/default env "MT_RUN_AREA_HOME" #f))
-         (cwd   (pid->cwd pid)))
-    (let ((res
-           (cond
-            (ltdir (conc ltdir "/.db/monitor.db"))
-            (radir (conc
-                    (do-or-die
-                     (conc megatest_exe " -start-dir "radir" -show-config -section setup -var linktree"))
-                    "/.db/monitor.db"))
-            (cwd  (conc
-                   (do-or-die
-                    (conc megatest_exe " -start-dir "cwd" -show-config -section setup -var linktree"))
-                   "/.db/monitor.db"))
-            
-            (else #f))))
-      res)))
-      
-
-
-
-
-(define (get-mdb-status mdb-file pid)
-    ;; select state from servers where pid='4465';
-  
-  (cond
-   ((not (string? mdb-file)) (conc "mdb-file could not be determined for pid " pid ">>"mdb-file ))
-   ((not (safe-file-exists? mdb-file)) (conc "mdb-file does not exist for pid "pid" : "mdb-file))
-   (else
-    (let ((dbh (open-database mdb-file)))
-      
-      (set-busy-handler! dbh 10000)
-      (let* ((sql-str "select state from servers where pid=?;")
-             (stm (sql dbh sql-str))
-             (alists (query fetch-alists stm (->string pid))))
-        (if (null? alists)
-            "server pid not in monitor.db"
-            (cdr (car (car alists)))))))))
-
-    
-(define (mtest-server-pid->status pid)
-  (let* ((mdb-file (pid->mtest-monitor-db-file pid)))
-    (if mdb-file
-        (get-mdb-status mdb-file pid)
-        "no monitor.db file could be found"
-        )))
-
-
-(define (gracefully-kill-pids pids)
-  (for-each (lambda (pid)
-              (print "kill "pid)
-              (system (conc "kill "pid)))
-            pids)
-  (sleep 5)
-  (let* ((procs-left (linux-get-process-info-records))
-         (pids-left (map proc-PID procs-left)))
-    (for-each (lambda (pid)
-                (when (member pid pids-left)
-                  (print "kill -9"pid)
-                  (system (conc "kill -9 "pid))))
-              pids)))
-  
-            
-              
-(define (kill pid)
-  (print "KILL "pid)
-  (do-or-die (conc "kill -9 "pid)))
-
-(define (reap-defunct-mtest-server-pid pid)
-  (let ((status (mtest-server-pid->status pid)))
-    (print pid"->"(mtest-server-pid->status pid))
-    (if (member status (list "running" "dbprep" "available" "collision"))
-        (print "pid="pid" in status "status" -- not killing")
-        (kill pid))))
-        
-;; (let* ((procs (get-my-mtest-server-procs))
-;;        (pids (map proc-PID procs))
-;;        )
-  
-;;   (for-each reap-defunct-mtest-server-pid pids))
-
-
-
-(define (mtdbver->mtrelver mtdbver)
-  (let* ((table-alist '(
-                        ("1.5402" . "1.54/02")
-                        ("1.5406" . "1.54/05")
-                        ("1.5408" . "1.54/07")
-                        ("1.5409" . "1.54/09")
-                        ("1.5412" . "1.54/12")
-                        ("1.5413" . "1.54/13")
-                        ("1.5414" . "1.54/14")
-                        ("1.5415" . "1.54/15")
-                        ("1.5416" . "1.54/16")
-                        ("1.5417" . "1.54/17")
-                        ("1.5418" . "1.54/18")
-                        ("1.5419" . "1.54/19")
-                        ("1.5421" . "1.54/21")
-                        ("1.5411" . "1.54/support-for-skip")
-                        ("1.5522" . "1.55/22")
-                        ("1.5523" . "1.55/23")
-                        ("1.5524" . "1.55/24")
-                        ("1.5525" . "1.55/25")
-                        ("1.6001" . "1.60/01")
-                        ("1.6002" . "1.60/02")
-                        ("1.6003" . "1.60/03")
-                        ("1.6004" . "1.60/04")
-                        ("1.6005" . "1.60/05")
-                        ("1.6006" . "1.60/06")
-                        ("1.6007" . "1.60/07")
-                        ("1.6008" . "1.60/08")
-                        ("1.6009" . "1.60/09")
-                        ("1.6009" . "1.60/11")
-                        ("1.6012" . "1.60/12")
-                        ("1.6013" . "1.60/13")
-                        ("1.6014" . "1.60/14")
-                        ("1.6015" . "1.60/15")
-                        ("1.6016" . "1.60/16")
-                        ("1.6017" . "1.60/17")
-                        ("1.6018" . "1.60/18")
-                        ("1.6019" . "1.60/19")
-                        ("1.6021" . "1.60/21")
-                        ("1.6022" . "1.60/22")
-                        ("1.6023" . "1.60/23")
-                        ("1.6024" . "1.60/24")
-                        ("1.6025" . "1.60/25")
-                        ("1.6026" . "1.60/26")
-                        ("1.6027" . "1.60/27")
-                        ("1.6028" . "1.60/28")
-                        ;;("1.6029" . "1.60/29")
-                        ("1.6029" . "1.60/29a")
-                        ("1.6031" . "1.60/31")
-                        ("1.6101" . "1.61/01")
-                        ("1.6101" . "1.61/01a")
-                        ("1.6102-c2ba" . "1.61/02")
-                        ("1.6103-3e88" . "1.61/03")
-                        ("1.6104-ee53" . "1.61/04")
-                        ("1.6105-232b" . "1.61/05")
-                        ("1.6201-e652" . "1.62/01")
-                        ("1.6204-c74d" . "1.62/04")
-                        ("1.6205-aff0" . "1.62/05")
-                        ("1.6207-6f59" . "1.62/07")
-                        ("1.6301-fbf0" . "1.63/01")
-                        ("1.6302-da4a" . "1.63/02")
-                        ("1.6303-aa5f" . "1.63/03")
-                        ("1.6304-fa49" . "1.63/04")
-                        ("1.6305-a03b" . "1.63/05")
-                        ("1.6306-7a12" . "1.63/06")
-                        ("1.6307-fb5d" . "1.63/07")
-                        ("1.6308-35e0" . "1.63/08")
-                        ("1.6309-738c" . "1.63/09")
-                        ("1.6309-880c" . "1.63/09a")
-                        ("1.6309-b566" . "1.63/09b")
-                        ("1.6311-fb43" . "1.63/11")
-                        ("1.6311-fb43" . "1.63/11b")
-                        ("1.6311-8a6c" . "1.63/11b")
-                        ("1.6402-03c5" . "1.64/02")
-                        )
-                      )
-         (res (alist-ref mtdbver table-alist equal?)))
-    res))
-

DELETED utils/wip/mtest-repair.scm
Index: utils/wip/mtest-repair.scm
==================================================================
--- utils/wip/mtest-repair.scm
+++ /dev/null
@@ -1,139 +0,0 @@
-#!/p/foundry/env/pkgs/chicken/4.10.0_ext/bin/csi -s
-
-(use chicken)
-(use data-structures)
-
-
-(include "/nfs/site/home/bjbarcla/bin2/mtest-repair-lib.scm")
-(glib-color-mode 1)
-
-;;(define this-cmd (car (argv)))
-(define this-cmd "/nfs/site/home/bjbarcla/bin2/mtest-repair.scm")
-
-;;; check mtver in xterm
-
-;; note - 11b is 1.6311-fb43
-(let ((mt-ver (do-or-die "megatest -version")))
-  (when (member mt-ver '("1.6309-738c" "1.6029" "1.6309-b566"))
-      (iwarn "This xterm has an older version of megatest.")
-      (ierr "Please load latest megatest version to proceed.")
-      (print "eg.: source ../scripts/newrel-setup.csh 1.63/11b")
-      (exit 3)))
-
-
-;;;; kill netbatch jobs from this megatest
-;;(kill-mtest-dboard)
-;;(system "/nfs/site/home/bjbarcla/bin2/mtest-nbstop.scm")
-
-
-;;;; delete .homehost .homehost.config
-;;;; if not on homehost, ssh homehost, cd here, killall mtest dboard
-(when (file-exists? ".homehost.config")
-  (delete-db ".homehost.config"))
-
-(when (file-exists? ".homehost")
-  (let* ((homehost (with-input-from-file ".homehost" (lambda () (read)))))
-    (let* ((homehostname (do-or-die "host `cat .homehost` | sed 's/.$//' | awk '{print $NF}' | awk -F. '{print $1}'"))
-           (thishostname (get-environment-variable "HOST")))
-      (when (not (equal? homehostname thishostname))
-          (iwarn "Please also run this on the homehost -- "homehostname)
-
-          (iwarn "eg: % ssh "homehostname" 'cd "(get-environment-variable "PWD")" && "this-cmd"'")
-          (print "")
-          (inote "sleeping for 5 seconds.  hit ctrl-c now to run on homehost or wait to proceed.")
-          (sleep 5)))))
-
-
-
-
-
-(kill-mtest-dboard)
-
-
-;;;; delete /tmp/.$USER-portlogger.db
-(let ((plfile (conc "/tmp/."(get-environment-variable "USER") "-portlogger.db")))
-  (when (safe-file-exists? plfile)
-    (inote "removing portlogger file")
-    (system (conc "rm "plfile))))
-
-
-;;;; move logs dir aside
-(system (conc "mv logs logs-aside-`date +%s`"))
-(system "mkdir logs")
-
-;;;; fixes for dependency diagram
-(inote "Removing dep graph tmp files if they exist")
-(system (conc "rm /tmp/."(get-environment-variable "USER")"-*.dot"))
-
-;;#ln -s /p/fdk/gwa/$USER/fossil/ext/_ext ext
-(let* ((toppath (pid->cwd (current-process-id)))
-       (flow (car (string-split
-                   (car (reverse (string-split toppath "/")))
-                   ".")))
-       (extdir (conc "/p/fdk/gwa/"(get-environment-variable "USER")
-                     "/fossil/ext/"flow"_ext")))
-  (when (and (safe-file-exists? extdir)
-           (not (safe-file-exists? "ext")))
-    (inote "Linking in ext dir")
-    (system (conc "ln -s "extdir" ext"))))
-
-
-;;;; check for 0 byte megatest{,_ref}.db in tmp.  delete them
-;;;; check for wal-mode megatest{,_ref}.db in tmp.  delete them
-(define (repair-dbs)
-  (let* ((this-toppath (pid->cwd (current-process-id)))
-         (tmppath      (toppath->tmppath this-toppath))
-         (golden-mtest-file (conc this-toppath "/megatest.db"))
-         (golden-mtest-file-ok (check-db "megatest.db"))
-         (tmp-mtest-file    (conc tmppath "/megatest.db"))
-         (tmp-mtestref-file    (conc tmppath "/megatest_ref.db"))
-         (tmp-mtest-file-ok (check-db tmp-mtest-file))
-         (tmp-mtestref-file-ok (check-db tmp-mtestref-file))
-         (alldbs (list tmp-mtest-file tmp-mtestref-file golden-mtest-file))
-         )
-;;;; check for megatest{,_ref}.db in tmp that die on .schema.  delete them
-    (when (safe-file-exists? tmppath)
-        (if tmp-mtest-file-ok
-            (inote "tmp megatest db file ok")
-            (delete-db tmp-mtest-file))
-        (if tmp-mtestref-file-ok
-            (inote "tmp megatestref db file ok")
-            (delete-db tmp-mtestref-file)))
-
-    ;;;;; check for locked dbs
-    (for-each (lambda (dbfile)
-                (let* ((locked (db-islocked? dbfile)))
-                  (if (db-islocked? dbfile)
-                      (begin
-                        (iwarn "db locked - "dbfile)
-                        (db-unlock dbfile))
-                      (inote "db not locked - "dbfile))))
-              alldbs)
-    
-;;;; check for megatest.db
-    (if golden-mtest-file-ok
-        (inote "golden megatest db file ok")
-        (if (not (file-exists? golden-mtest-file))
-            (inote "megatest.db not present.  Continuing.")
-            (begin
-          ;;;; if golden megatest db is broken, stop now!
-              (ierr "Golden megatest.db is broken.  Please delete it or replace it from a backup version in .snapshot.  If critical, contact env team to assist.")
-              (sendmail "bjbarcla" "!!Bad golden megatest.db" this-toppath)
-              (inote "Backups in .snapshot:")
-              (system "ls -l .snapshot/*/megatest.db")
-              (ierr "Not proceeding with any more checks.")
-              (exit 3))))
-    ))
-
-;; TODO: check for and fix locked megatest.db and locked monitor.db (ritika working on)
-
-
-(repair-dbs)
-    
-
-
-
-
-
-
-

Index: vg-test.scm
==================================================================
--- vg-test.scm
+++ vg-test.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 (use canvas-draw iup foof-loop)
 (import canvas-draw-iup)
 
 (load "vg.scm")
 

Index: vg.scm
==================================================================
--- vg.scm
+++ vg.scm
@@ -1,14 +1,22 @@
 ;;
 ;; Copyright 2016  Matthew Welland.
 ;; 
-;;  This program is made available under the GNU GPL version 2.0 or
-;;  greater. See the accompanying file COPYING for details.
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
 ;; 
-;;  This program is distributed WITHOUT ANY WARRANTY; without even the
-;;  implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR
-;;  PURPOSE.
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
 
 ;;  strftime('%m/%d/%Y %H:%M:%S','now','localtime')
 
 (use typed-records srfi-1)
 

Index: vg_records.scm
==================================================================
--- vg_records.scm
+++ vg_records.scm
@@ -1,7 +1,25 @@
 ;; Created by records.sh. DO NOT EDIT THIS FILE. Edit records.sh instead
 ;; Generated using make-vector-record -safe vg lib comps
+
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+;;
 
 (use simple-exceptions)
 (define vg:lib-exn (make-exception "wrong record type, expected vg:lib." 'assert))
 (define (pmake-vg:lib . params)(let ((v (if (null? params)(make-vector 2)(apply vector 'vg:lib params)))) v))
 (define (make-vg:lib #!key 

Index: widgets.scm
==================================================================
--- widgets.scm
+++ widgets.scm
@@ -1,5 +1,22 @@
+;;  Copyright 2006-2017, Matthew Welland.
+;; 
+;; This file is part of Megatest.
+;; 
+;;     Megatest is free software: you can redistribute it and/or modify
+;;     it under the terms of the GNU General Public License as published by
+;;     the Free Software Foundation, either version 3 of the License, or
+;;     (at your option) any later version.
+;; 
+;;     Megatest is distributed in the hope that it will be useful,
+;;     but WITHOUT ANY WARRANTY; without even the implied warranty of
+;;     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+;;     GNU General Public License for more details.
+;; 
+;;     You should have received a copy of the GNU General Public License
+;;     along with Megatest.  If not, see .
+
 (require-library srfi-4 iup)
 (import srfi-4 iup iup-pplot iup-glcanvas) ;; iup-web
 
 (define (popup dlg . args)
   (apply show dlg #:modal? 'yes args)

ADDED   wrappers/cfg.sh
Index: wrappers/cfg.sh
==================================================================
--- /dev/null
+++ wrappers/cfg.sh
@@ -0,0 +1,27 @@
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+if [ -z $MT_ORIG_ENV ]; then
+    export MT_ORIG_ENV=$( PREFIX/bin/serialize-env )
+fi
+
+if [ "$LD_LIBRARY_PATH" != "" ];then
+  export LD_LIBRARY_PATH=PREFIX:PREFIX/lib:PREFIX/lib64:$LD_LIBRARY_PATH
+else
+  export LD_LIBRARY_PATH=PREFIX:PREFIX/lib:PREFIX/lib64
+fi
+

ADDED   wrappers/dashboard
Index: wrappers/dashboard
==================================================================
--- /dev/null
+++ wrappers/dashboard
@@ -0,0 +1,49 @@
+#!/bin/bash
+
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+# # disable if not running on homehost
+# if [[ -e .homehost ]]; then
+#   homehostname=$( host `cat .homehost` | awk '{print $NF}' | sed 's/\.$//' )
+#   hostname=$( hostname -f )
+#
+#   if [[ ! ($homehostname == $hostname) ]]; then
+#     echo "ERROR: this host ($hostname) is not the homehost ($homehostname) for this megatest run area.  Cannot start dashboard."
+#     echo "       Please log into homehost before launching dashboard."
+#     exit 1
+#   fi
+# fi
+
+# check that $DISPLAY is set
+if [[ -z $DISPLAY ]]; then
+   echo 'ERROR: $DISPLAY environment variable is not set; megatest dashboard requires X display address to be set in $DISPLAY.'
+   exit 1
+fi
+
+# check that $DISPLAY is proper
+if [[ -x $(which xdpyinfo  2>/dev/null) ]]; then
+  if ! xdpyinfo -display "$DISPLAY" &>/dev/null; then
+    echo 'ERROR: megatest dashboard cannot open display "'$DISPLAY'".  Please check $DISPLAY environment variable.'
+    exit 1
+  fi
+fi
+if [[ $(ulimit -a | grep 'open files' | awk '{print $4}') -gt 10000 ]];then ulimit -n 10000;fi
+lsbr=$(lsb_release -sr)
+source PREFIX/ARCHSTR/cfg.sh
+exec PREFIX/dboard "$@"
+

ADDED   wrappers/megatest
Index: wrappers/megatest
==================================================================
--- /dev/null
+++ wrappers/megatest
@@ -0,0 +1,24 @@
+#!/bin/bash
+
+#  Copyright 2006-2017, Matthew Welland.
+# 
+# This file is part of Megatest.
+# 
+#     Megatest is free software: you can redistribute it and/or modify
+#     it under the terms of the GNU General Public License as published by
+#     the Free Software Foundation, either version 3 of the License, or
+#     (at your option) any later version.
+# 
+#     Megatest is distributed in the hope that it will be useful,
+#     but WITHOUT ANY WARRANTY; without even the implied warranty of
+#     MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+#     GNU General Public License for more details.
+# 
+#     You should have received a copy of the GNU General Public License
+#     along with Megatest.  If not, see .
+
+if [[ $(ulimit -a | grep 'open files' | awk '{print $4}') -gt 20000 ]];then ulimit -n 20000;fi
+lsbr=$(lsb_release -sr)
+source PREFIX/ARCHSTR/cfg.sh
+exec PREFIX/mtest "$@"
+


      Table 4. API Keys Related CallsTable 6. API Keys Related Calls