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 <http://www.gnu.org/licenses/>.
(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. <https://fsf.org/>
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.
<one line to give the program's name and a brief idea of what it does.>
Copyright (C) <year> <name of author>
- 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 <https://www.gnu.org/licenses/>.
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'.
+ <program> Copyright (C) <year> <name of author>
+ 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.
-
- <signature of Ty Coon>, 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
+<https://www.gnu.org/licenses/>.
+
+ 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
+<https://www.gnu.org/licenses/why-not-lgpl.html>.
Index: Makefile
==================================================================
--- Makefile
+++ Makefile
@@ -1,69 +1,146 @@
+# 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 <http://www.gnu.org/licenses/>.
+
# make install CSCOPTS='-accumulate-profile -profile-name $(PWD)/profile-ww$(shell date +%V.%u)'
# rm <files>.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 rmtmod.scm commonmod.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 tcmt
-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 mofiles/rmtmod.o mofiles/commonmod.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
- csc $(CSCOPTS) $(OFILES) mtut.scm -o mtut
+mtut: $(OFILES) $(MOFILES) megatest-fossil-hash.scm mtut.scm
+ csc $(CSCOPTS) $(OFILES) $(MOFILES) 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 \
+ mofiles/rmtmod.o \
+ mofiles/commonmod.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,32 +149,35 @@
#
# $(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
+# for the modularized stuff
+mofiles/rmtmod.o : mofiles/commonmod.o
+
megatest-fossil-hash.scm : $(SRCFILES) megatest.scm *_records.scm
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
@@ -107,18 +187,44 @@
$(INSTALL) ndboard $(PREFIX)/bin/.$(ARCHSTR)/ndboard
$(PREFIX)/bin/newdashboard : $(PREFIX)/bin/.$(ARCHSTR)/ndboard utils/mk_wrapper
utils/mk_wrapper $(PREFIX) ndboard $(PREFIX)/bin/newdashboard
chmod a+x $(PREFIX)/bin/newdashboard
+
+# mtutil
$(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
+# mtexec
+
+mtexec: $(OFILES) $(MOFILES) megatest-fossil-hash.scm mtexec.scm
+ csc $(CSCOPTS) $(OFILES) $(MOFILES) mtexec.scm -o mtexec
+
+$(PREFIX)/bin/.$(ARCHSTR)/mtexec : mtexec
+ $(INSTALL) mtexec $(PREFIX)/bin/.$(ARCHSTR)/mtexec
+
+$(PREFIX)/bin/mtexec : $(PREFIX)/bin/.$(ARCHSTR)/mtexec utils/mk_wrapper
+ utils/mk_wrapper $(PREFIX) mtexec $(PREFIX)/bin/mtexec
+ chmod a+x $(PREFIX)/bin/mtexec
+
+# tcmt
+
+$(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
# utils/mk_wrapper $(PREFIX) mdboard $(PREFIX)/bin/mdboard
@@ -133,10 +239,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 $@
@@ -158,11 +268,11 @@
$(PREFIX)/bin/nbfind : utils/nbfind
$(INSTALL) $< $@
chmod a+x $@
-$(PREFIX)/bin/loadrunner : utils/loadrunner
+$(PREFIX)/bin/mtrunner : utils/mtrunner
$(INSTALL) $< $@
chmod a+x $@
# $(PREFIX)/bin/refdb : refdb
# $(INSTALL) $< $@
@@ -191,13 +301,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/nbfind $(PREFIX)/bin/loadrunner $(PREFIX)/bin/viewscreen $(PREFIX)/bin/mt_xterm \
+ $(PREFIX)/bin/.$(ARCHSTR)/mtexec $(PREFIX)/bin/mtexec $(PREFIX)/bin/serialize-env \
+ $(PREFIX)/bin/nbfind $(PREFIX)/bin/mtrunner $(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 +326,12 @@
$(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 mtut tcmt ftail.import.scm readline-fix.scm serialize-env dboard dboard.o megatest.o dashboard.o megatest-fossil-hash.* altdb.scm mofiles/*.o vg.o
+ rm -rf share
#======================================================================
# Make the records files
#======================================================================
@@ -268,19 +385,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 +426,28 @@
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"'
+
+unit :
+ cd tests;make unit
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 <http://www.gnu.org/licenses/>.
+#
+
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 <http://www.gnu.org/licenses/>.
+
=====================================================================
NOTES from looking at branch v1.62-rpc
=====================================================================
*last-db-access* or *db-last-access* ==> which is it to be?
@@ -141,5 +158,9 @@
INFO: (0) Server shutdown complete. Exiting
Start: 0 at Sun Apr 28 22:18:25 MST 2013
Max: 52 at Sun Apr 28 23:06:59 MST 2013
End: 6 at Sun Apr 28 23:47:51 MST 2013
+
+========================================================================
+
+
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 <http://www.gnu.org/licenses/>.
+
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 <http://www.gnu.org/licenses/>.
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 <http://www.gnu.org/licenses/>.
+;;
;;======================================================================
(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
@@ -38,34 +49,43 @@
test-get-paths-matching-keynames-target-new
get-prereqs-not-met
get-count-tests-running-for-run-id
get-run-info
get-run-status
+ get-run-state
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
- ))
+ ;; synchash-get
+ get-changed-record-ids
+ get-run-record-ids
+ get-not-completed-cnt))
(define api:write-queries
'(
get-keys-write ;; dummy "write" query to force server start
@@ -78,10 +98,11 @@
delete-test-records
delete-old-deleted-test-records
test-set-state-status
test-set-top-process-pid
set-state-status-and-roll-up-items
+
update-pass-fail-counts
top-test-set-per-pf-counts ;; (db:top-test-set-per-pf-counts (db:get-db *db* 5) 5 "runfirst")
;; RUNS
register-run
@@ -88,14 +109,14 @@
set-tests-state-status
delete-run
lock/unlock-run
update-run-event_time
mark-incomplete
-
+ set-state-status-and-roll-up-run
;; STEPS
teststep-set-status!
-
+ delete-steps-for-test
;; TEST DATA
test-data-rollup
csv->test-data
;; MISC
@@ -126,10 +147,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
@@ -137,10 +159,15 @@
(params (vector-ref dat 1))
(start-t (current-milliseconds))
(readonly-mode (dbr:dbstruct-read-only dbstruct))
(readonly-command (member cmd api:read-only-queries))
(writecmd-in-readonly-mode (and readonly-mode (not readonly-command)))
+ (foo (begin
+ (common:telemetry-log (conc "api-in:"(->string cmd))
+ payload: `((params . ,params)))
+
+ #t))
(res
(if writecmd-in-readonly-mode
(conc "attempt to run write command "cmd" on a read-only database")
(case cmd
;;===============================================
@@ -152,16 +179,32 @@
;; 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))
+ ((set-state-status-and-roll-up-run) (apply db:set-state-status-and-roll-up-run dbstruct params))
((top-test-set-per-pf-counts) (apply db:top-test-set-per-pf-counts dbstruct params))
((test-set-archive-block-id) (apply db:test-set-archive-block-id dbstruct params))
;; RUNS
((register-run) (apply db:register-run dbstruct params))
@@ -169,15 +212,18 @@
((delete-run) (apply db:delete-run dbstruct params))
((lock/unlock-run) (apply db:lock/unlock-run dbstruct params))
((update-run-event_time) (apply db:update-run-event_time dbstruct params))
((update-run-stats) (apply db:update-run-stats dbstruct params))
((set-var) (apply db:set-var dbstruct params))
+ ((inc-var) (apply db:inc-var dbstruct params))
+ ((dec-var) (apply db:dec-var dbstruct params))
((del-var) (apply db:del-var dbstruct params))
;; STEPS
((teststep-set-status!) (apply db:teststep-set-status! dbstruct params))
-
+ ((delete-steps-for-test!) (apply db:delete-steps-for-test! dbstruct params))
+
;; TEST DATA
((test-data-rollup) (apply db:test-data-rollup dbstruct params))
((csv->test-data) (apply db:csv->test-data dbstruct params))
;; MISC
@@ -193,15 +239,21 @@
;; 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))
+ ;; ((archive-allocate-testsuite/area-to-block)(apply db:archive-allocate-testsuite/area-to-block dbstruct block-id testsuite-name areakey))
;;======================================================================
;; READ ONLY QUERIES
;;======================================================================
@@ -221,46 +273,57 @@
((test-get-rundir-from-test-id) (apply db:test-get-rundir-from-test-id dbstruct params))
((get-count-tests-running-for-testname) (apply db:get-count-tests-running-for-testname dbstruct params))
((get-count-tests-running) (apply db:get-count-tests-running dbstruct params))
((get-count-tests-running-in-jobgroup) (apply db:get-count-tests-running-in-jobgroup dbstruct params))
;; ((delete-test-step-records) (apply db:delete-test-step-records dbstruct params))
- ((get-previous-test-run-record) (apply db:get-previous-test-run-record dbstruct params))
+ ;; ((get-previous-test-run-record) (apply db:get-previous-test-run-record dbstruct params))
((get-matching-previous-test-run-records)(apply db:get-matching-previous-test-run-records dbstruct params))
((test-get-logfile-info) (apply db:test-get-logfile-info dbstruct params))
((test-get-records-for-index-file) (apply db:test-get-records-for-index-file dbstruct params))
((get-testinfo-state-status) (apply db:get-testinfo-state-status dbstruct params))
((test-get-top-process-pid) (apply db:test-get-top-process-pid dbstruct params))
((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-not-completed-cnt) (apply db:get-not-completed-cnt 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))
+ ((get-run-state) (apply db:get-run-state dbstruct params))
((set-run-status) (apply db:set-run-status dbstruct params))
+ ((set-run-state-status) (apply db:set-run-state-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))
@@ -269,28 +332,37 @@
(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-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))
(else
(debug:print 0 *default-log-port* "ERROR: bad api call " cmd)
(conc "ERROR: BAD api call " cmd))))))
+
;; save all stats
(let ((delta-t (- (current-milliseconds)
start-t)))
(hash-table-set! *db-api-call-time* cmd
(cons delta-t (hash-table-ref/default *db-api-call-time* cmd '()))))
(if writecmd-in-readonly-mode
- (vector #f res)
- (vector #t res)))))))
+ (begin
+ (common:telemetry-log (conc "api-out:"(->string cmd))
+ payload: `((params . ,params)
+ (ok-res . #t)))
+ (vector #f res))
+ (begin
+ (common:telemetry-log (conc "api-out:"(->string cmd))
+ payload: `((params . ,params)
+ (ok-res . #f)))
+ (vector #t res))))))))
;; http-server send-response
;; api:process-request
;; db:*
;;
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 <http://www.gnu.org/licenses/>.
+;;
;; 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,52 @@
(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 *default-log-port* "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)
+ (begin
+ (debug:print 0 *default-log-port* "WARNING: no disk found for " target ", " run-name ", " test-name ", archive-path=" archive-path)
+ #f)))
+ (begin
+ (debug:print 0 *default-log-port* "WARNING: no disk found for " target ", " run-name ", " test-name ", block-id=" block-id)
+ #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 +134,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 +171,155 @@
(> (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-in (hash-table-ref disk-groups test-base))
+ (test-paths (if (args:get-arg "-include")
+ (let ((subpaths (string-split (args:get-arg "-include") ",")))
+ (apply append
+ (map (lambda (p)
+ (map (lambda (subp)
+ (conc p "/" subp))
+ subpaths))
+ test-paths-in)))
+ test-paths-in)))
+ (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 (symbol->string archive-command) '("save-remove"))
+ (begin
+ (debug:print-info 0 *default-log-port* "remove testdat")
+ (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 +344,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))
@@ -244,17 +355,20 @@
(archive-block-id (db:test-get-archived test-dat))
(archive-block-info (rmt:test-get-archive-block-info archive-block-id))
(archive-path (if (vector? archive-block-info)
(vector-ref archive-block-info 2) ;; look in db.scm for test-get-archive-block-info for the vector record info
#f)) ;; no archive found?
- (archive-internal-path (conc (common:get-testsuite-name) "-" run-id "/latest/" test-partial-path)))
+ (archive-internal-path (conc (common:get-testsuite-name) "-" run-id "/latest/" test-partial-path))
+ (include-paths (args:get-arg "-include"))
+ (exclude-pattern (args:get-arg "-exclude-rx"))
+ (exclude-file (args:get-arg "-exclude-rx-from")))
;; 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)))
@@ -287,6 +401,90 @@
(run-n-wait bup-exe params: bup-restore-params print-cmd: #f)
;; (mutex-unlock! bup-mutex)
(mt:test-set-state-status-by-id run-id test-id "COMPLETED" #f #f)))
(debug:print-error 0 *default-log-port* "No archive path in the record for run-id=" run-id " test-id=" test-id))))
(filter vector? tests))))
-
+
+(define (common:get-youngest-test tests)
+ (if (null? tests)
+ #f
+ (let ((res #f))
+ (for-each
+ (lambda (test-dat)
+ (let ((event-time (db:test-get-event_time test-dat)))
+ (if (or (not res)
+ (> event-time (db:test-get-event_time res)))
+ (set! res test-dat))))
+ tests)
+ res)))
+
+;; from an archive get a specific path - works ONLY with bup for now
+;;
+(define (archive:bup-get-data archive-command run-id-in run-name-in tests rp-mutex bup-mutex)
+ (if (null? tests)
+ (debug:print-info 0 *default-log-port* "get-data called with no matching tests to operate on.")
+
+ (let* ((bup-exe (or (configf:lookup *configdat* "archive" "bup") "bup"))
+ (linktree (common:get-linktree)) ;; (configf:lookup *configdat* "setup" "linktree")))
+ ;; (test-dat (common:get-youngest-test tests))
+ (destpath (args:get-arg "-dest")))
+ (cond
+ ((null? tests)
+ (debug:print-error 0 *default-log-port*
+ "No test matching provided target, runname pattern and test pattern found."))
+ ((file-exists? destpath)
+ (debug:print-error 0 *default-log-port*
+ "Destination path alread exists! Please remove it before running get."))
+ (else
+ (let loop ((rem-tests tests))
+ (let* ((test-dat (common:get-youngest-test rem-tests))
+ (item-path (db:test-get-item-path test-dat))
+ (test-name (db:test-get-testname test-dat))
+ (test-id (db:test-get-id test-dat))
+ (run-id (db:test-get-run_id test-dat))
+ (run-name (rmt:get-run-name-from-id run-id))
+ (keyvals (rmt:get-key-val-pairs run-id))
+ (target (string-intersperse (map cadr keyvals) "/"))
+
+ (toplevel/children (and (db:test-get-is-toplevel test-dat)
+ (> (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))
+ (archive-block-id (db:test-get-archived test-dat))
+ (archive-block-info (rmt:test-get-archive-block-info archive-block-id))
+ (archive-path (if (vector? archive-block-info)
+ (vector-ref archive-block-info 2)
+ #f))
+ (archive-internal-path (conc (common:get-testsuite-name) "-" run-id
+ "/latest/" test-partial-path))
+ (include-paths (args:get-arg "-include"))
+ (exclude-pattern (args:get-arg "-exclude-rx"))
+ (exclude-file (args:get-arg "-exclude-rx-from")))
+
+ (if (and archive-path ;; no point in proceeding if there is no actual archive
+ (not toplevel/children))
+ (begin
+ (let* ((bup-restore-params (append (list "-d" archive-path "restore" "-C" (or destpath "data"))
+ ;; " " ;; What is the empty string for?
+ (if include-paths
+ (map (lambda (p)
+ (conc archive-internal-path "/" p))
+ (string-split include-paths ","))
+ (list archive-internal-path)))))
+ (debug:print-info 0 *default-log-port* "Restoring archived data to " (or destpath "data")
+ " from archive in " archive-path " ... " archive-internal-path)
+ (run-n-wait bup-exe params: bup-restore-params print-cmd: #t)))
+ (let ((new-rem-tests (filter (lambda (tdat)
+ (or (not (eq? (db:test-get-id tdat) test-id))
+ (not (eq? (db:test-get-run_id tdat) run-id))))
+ rem-tests) ))
+ (debug:print-info 0 *default-log-port*
+ "No archive path in the record for run-id=" run-id
+ " test-id=" test-id ", skipping.")
+ (if (null? new-rem-tests)
+ (begin
+ (debug:print-info 0 *default-log-port* "No archives found for " target "/" run-name "...")
+ #f)
+ (loop new-rem-tests)))))))))))
+
ADDED autostuff/.mtutil.scm
Index: autostuff/.mtutil.scm
==================================================================
--- /dev/null
+++ autostuff/.mtutil.scm
@@ -0,0 +1,88 @@
+;; 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 <http://www.gnu.org/licenses/>.
+
+(use json)
+(use ducttape-lib)
+
+(define (get-last-runname area-path target)
+ (let* ((run-data (with-input-from-pipe (conc "megatest -list-runs % -target " target " -fields runs:runname,event_time -dumpmode sexpr -start-dir " area-path)
+ read)))
+ (if (or (not run-data)
+ (null? run-data))
+ #f
+ (let* ((name-time (let ((dat (map cdadr (alist-ref target run-data equal?)))) ;; (("runname" . "2017w07.0-0047") ("event_time" . "1487490424"))
+ ;; (print "dat=" dat)
+ (map (lambda (item)
+ (cons (alist-ref "runname" item equal?)
+ (string->number (alist-ref "event_time" item equal?))))
+ dat)))
+ (sorted (sort name-time (lambda (a b)(> (cdr a)(cdr b)))))
+ (last-name (if (null? sorted)
+ #f
+ (caar sorted))))
+ last-name))))
+
+(define (str-first-char->number str)
+ (char->integer (string-ref str 0)))
+
+;; example of how to set up and write target mappers
+;; NOTE: maps a *list* of targets!
+;;
+;; (? target run-name area area-path reason contour mode-patt)
+;;
+(add-target-mapper 'prefix-contour
+ (lambda (runkey area contour)
+ (print "target: " runkey)
+ (list (conc contour "/" runkey))))
+#;(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)))
+
+
ADDED autostuff/megatest.config
Index: autostuff/megatest.config
==================================================================
--- /dev/null
+++ autostuff/megatest.config
@@ -0,0 +1,85 @@
+# 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 <http://www.gnu.org/licenses/>.
+
+## commented out due to a bug in v1.6501 in mtutil
+[fields]
+a text
+b text
+c text
+
+[default]
+# usercode .mtutil.scm
+# areafilter area-to-run
+# targtrans generic-target-translator
+# runtrans generic-runname-translator
+usercode .mtutil.scm
+# areafilter area-to-run
+targtrans prefix-contour-broken
+# runtrans generic-runname-translator
+
+[setup]
+pktsdirs /mfs/home/matt/orion_automation/pkts
+
+[areas]
+
+# path-to-area map-target-script(future, optional)
+# someqa path=../megatestqa/someqa; targtrans=somefunc; areafilter=area-to-run
+# 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 path=/mfs/home/matt/automation_areas/megatest/ext-tests; targtrans=prefix-contour
+
+[contours]
+# selector=tag-expr/mode-patt
+quick areas=ext; selector=/QUICKPATT
+# quick2 areafn=check-area; selector=/QUICKPATT
+full areas=ext
+# 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]
ADDED autostuff/runconfigs.config
Index: autostuff/runconfigs.config
==================================================================
--- /dev/null
+++ autostuff/runconfigs.config
@@ -0,0 +1,112 @@
+# 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 <http://www.gnu.org/licenses/>.
+
+# 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:
+# (add-to-list 'auto-mode-alist '("config\\'" . conf-space-mode))
+#
+
+# 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=/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?
+
+# [%/%/%] doesn't work
+
+[/.*/]
+
+[v1.65/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
+# commented out for debug
+
+quick:file:run runtrans=auto; glob=/nfs/orion/disk1/mfs_home/home/matt/automation_areas/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.65;\
+ http://www.kiatoa.com/fossils/megatest_qa=trunk
+
+# field allowed values
+# ----- --------------
+# minute 0-59
+# hour 0-23
+# day of month 1-31
+# month 1-12 (or names, future development)
+# day of week 0-7 (0 or 7 is Sun, or, future development, use names)
+
+# actions:
+# run - run a testsuite
+# clean - clear out runs
+# archive - archive runs
+
+# quick:scheduled:run cron=47 * * * * ;run-name=auto
+# quick:scheduled:archive cron=15 20 * * * ;run-name=%;target=%/%/%
+
+# [%]
+# # every friday at midnight clean "all" tests over 7d
+# all:scheduled:clean cron= 0 0 0 0 5;run-name=%;age=7d
+
+[v1.65/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 run-name=auto;glob=*.scm
+# quick:file:clean run-name=auto;
+# quick:script:run run-name=auto;script=checkfossil.sh v1.63
+#
+# # field allowed values
+# # ----- --------------
+# # minute 0-59
+# # hour 0-23
+# # day of month 1-31
+# # month 1-12 (or names, future development)
+# # day of week 0-7 (0 or 7 is Sun, or, future development, use names)
+#
+# # actions:
+# # run - run a testsuite
+# # clean - clear out runs
+# # archive - archive runs
+#
+quick:scheduled:run cron=47 * * * * ;run-name=auto
+# quick:scheduled:archive cron=15 20 * * * ;run-name=% ;
+#
+
+[%/%/%]
+# # every friday at midnight clean "all" tests over 7d
+all:scheduled:clean cron= 0 0 0 0 5;run-name=%;age=7d
+#
ADDED autostuff/setup.sh
Index: autostuff/setup.sh
==================================================================
--- /dev/null
+++ autostuff/setup.sh
@@ -0,0 +1,2 @@
+source /opt/chicken/4.13.0_18.04_WW45/setup-chicken4x.sh
+export PATH=/mfs/home/matt/orion_automation/bin:$PATH
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 <http://www.gnu.org/licenses/>.
+
;;======================================================================
(declare (unit pgdb))
(declare (uses configf))
@@ -90,48 +99,171 @@
(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:insert-run-tag dbh tag-id run-id )
+ (dbi:exec dbh "INSERT INTO run_tags (tag_id, run_id) VALUES (?,?)" tag-id run-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)))
+
+(define (pgdb:is-run-taged-with-a-tag dbh tag-id run-id)
+ (let ((run-tag-id (dbi:get-one dbh "SELECT id FROM run_tags WHERE run_id=? and tag_id=?;" run-id tag-id)))
+ (if run-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 publish-time) ;; 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=?,publish_time=?
+ WHERE id=? and area_id=?;"
+ state status owner event-time comment fail-count pass-count last_update publish-time 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 publish-time)
+ (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,publish_time)
+ VALUES (?,?,?,?,?,?,?,?,?,?,?,?, ?);"
+ ttype-id target run-name state status owner event-time comment fail-count pass-count area-id last-update publish-time))
+
+;;======================================================================
+;; 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 +272,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 pid)
(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,attemptnum)
+ 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 pid))
;; 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 pid)
(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=?,attemptnum=?
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 pid 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 <pagename>-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 <pagename>-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
-<meta charset="UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-<meta name="description" content="" />
-
-<link rel="stylesheet" type="text/css" href="/css/kickstart.css" media="all" /> <!-- KICKSTART -->
-<link rel="stylesheet" type="text/css" href="/style.css" media="all" /> <!-- CUSTOM STYLES -->
-<link rel="stylesheet" type="text/css" href="/css/pjhatwal-modal.css" media="all" /> <!-- Modal -->
-
-<link rel="icon" type="image/x-icon" href="/favicon.ico" />
-<style type="text/css">
- .column {
- /* border:1px solid red; */
- padding:0px;
- }
- a.white{
- color:white;
- }
- th.heading{
- text-align:-webkit-center;
- background:rgba(0, 0, 0, 0.21);
- }
-
-</style>
-EOF
-)
-
-(define index:jquery
- (if #t
-
-#<<EOF
-<script type="text/javascript" src="https://code.jquery.com/jquery-1.11.3.js"></script>
-<script src="http://code.jquery.com/jquery-migrate-1.2.1.js"></script>
-EOF
-
-#<<EOF
-<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.6.4/jquery.min.js"></script>
-<!--[if lt IE 9]><script src="http://html5shiv.googlecode.com/svn/trunk/html5.js"></script><![endif]-->
-EOF
-))
-
-(define index:javascript
-#<<EOF
-<!-- <script type="text/javascript" src="/js/prettify.js"></script> PRETTIFY -->
-<script type="text/javascript" src="/js/kickstart.js"></script> <!-- KICKSTART -->
-<script type="text/javascript" src="/js/pjhatwal-modal.js "></script> <!-- Modal -->
-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
- "<!DOCTYPE html PUBLIC \"-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd\">"
- (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 <pagename>-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 <pagename>-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 @@
-<!DOCTYPE html>
-<html>
-<head>
- <!-- META -->
- <title>HTML KickStart Elements</title>
- <meta charset="UTF-8">
- <meta name="viewport" content="width=device-width, initial-scale=1.0"/>
- <meta name="description" content="" />
-
- <!-- CSS -->
- <link rel="stylesheet" type="text/css" href="css/kickstart.css" media="all" />
- <link rel="stylesheet" type="text/css" href="style.css" media="all" />
-
- <!-- Javascript -->
- <script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
- <script type="text/javascript" src="js/kickstart.js"></script>
-</head>
-<body>
-<div class="grid">
- <div class="col_12" style="margin-top:100px;">
- <h1 class="center">
- <p><i class="fa fa-fire"></i></p>
- This example is blank</h1>
- <h4 style="color:#999;margin-bottom:40px;" class="center">Add some HTML KickStart Elements to see the magic happen</h4>
- </div>
-</div> <!-- End Grid -->
-</body>
-</html>
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 @@
-<?xml version="1.0" standalone="no"?>
-<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 1.1//EN" "http://www.w3.org/Graphics/SVG/1.1/DTD/svg11.dtd" >
-<svg xmlns="http://www.w3.org/2000/svg">
-<metadata></metadata>
-<defs>
-<font id="fontawesomeregular" horiz-adv-x="1536" >
-<font-face units-per-em="1792" ascent="1536" descent="-256" />
-<missing-glyph horiz-adv-x="448" />
-<glyph unicode=" " horiz-adv-x="448" />
-<glyph unicode="	" horiz-adv-x="448" />
-<glyph unicode=" " horiz-adv-x="448" />
-<glyph unicode="¨" horiz-adv-x="1792" />
-<glyph unicode="©" horiz-adv-x="1792" />
-<glyph unicode="®" horiz-adv-x="1792" />
-<glyph unicode="´" horiz-adv-x="1792" />
-<glyph unicode="Æ" horiz-adv-x="1792" />
-<glyph unicode="Ø" horiz-adv-x="1792" />
-<glyph unicode=" " horiz-adv-x="768" />
-<glyph unicode=" " horiz-adv-x="1537" />
-<glyph unicode=" " horiz-adv-x="768" />
-<glyph unicode=" " horiz-adv-x="1537" />
-<glyph unicode=" " horiz-adv-x="512" />
-<glyph unicode=" " horiz-adv-x="384" />
-<glyph unicode=" " horiz-adv-x="256" />
-<glyph unicode=" " horiz-adv-x="256" />
-<glyph unicode=" " horiz-adv-x="192" />
-<glyph unicode=" " horiz-adv-x="307" />
-<glyph unicode=" " horiz-adv-x="85" />
-<glyph unicode=" " horiz-adv-x="307" />
-<glyph unicode=" " horiz-adv-x="384" />
-<glyph unicode="™" horiz-adv-x="1792" />
-<glyph unicode="∞" horiz-adv-x="1792" />
-<glyph unicode="≠" horiz-adv-x="1792" />
-<glyph unicode="◼" horiz-adv-x="500" d="M0 0z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1699 1350q0 -35 -43 -78l-632 -632v-768h320q26 0 45 -19t19 -45t-19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45t45 19h320v768l-632 632q-43 43 -43 78q0 23 18 36.5t38 17.5t43 4h1408q23 0 43 -4t38 -17.5t18 -36.5z" />
-<glyph unicode="" d="M1536 1312v-1120q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v537l-768 -237v-709q0 -50 -34 -89t-86 -60.5t-103.5 -32t-96.5 -10.5t-96.5 10.5t-103.5 32t-86 60.5t-34 89 t34 89t86 60.5t103.5 32t96.5 10.5q105 0 192 -39v967q0 31 19 56.5t49 35.5l832 256q12 4 28 4q40 0 68 -28t28 -68z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -52 -38 -90t-90 -38q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5 t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1664 32v768q-32 -36 -69 -66q-268 -206 -426 -338q-51 -43 -83 -67t-86.5 -48.5t-102.5 -24.5h-1h-1q-48 0 -102.5 24.5t-86.5 48.5t-83 67q-158 132 -426 338q-37 30 -69 66v-768q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1664 1083v11v13.5t-0.5 13 t-3 12.5t-5.5 9t-9 7.5t-14 2.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5q0 -168 147 -284q193 -152 401 -317q6 -5 35 -29.5t46 -37.5t44.5 -31.5t50.5 -27.5t43 -9h1h1q20 0 43 9t50.5 27.5t44.5 31.5t46 37.5t35 29.5q208 165 401 317q54 43 100.5 115.5t46.5 131.5z M1792 1120v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47t47 -113z" />
-<glyph unicode="" horiz-adv-x="1792" d="M896 -128q-26 0 -44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5q224 0 351 -124t127 -344q0 -221 -229 -450l-623 -600 q-18 -18 -44 -18z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -21 -10.5 -35.5t-30.5 -14.5q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455 l502 -73q56 -9 56 -46z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1137 532l306 297l-422 62l-189 382l-189 -382l-422 -62l306 -297l-73 -421l378 199l377 -199zM1664 889q0 -22 -26 -48l-363 -354l86 -500q1 -7 1 -20q0 -50 -41 -50q-19 0 -40 12l-449 236l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500 l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41t49 -41l225 -455l502 -73q56 -9 56 -46z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1408 131q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5t43 97.5t62 81t85.5 53.5t111.5 20q9 0 42 -21.5t74.5 -48t108 -48t133.5 -21.5t133.5 21.5t108 48t74.5 48t42 21.5q61 0 111.5 -20t85.5 -53.5t62 -81 t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="" horiz-adv-x="1920" d="M384 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 320v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM384 704v128q0 26 -19 45t-45 19h-128 q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 -64v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM384 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45 t45 -19h128q26 0 45 19t19 45zM1792 -64v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1408 704v512q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-512q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1792 320v128 q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 704v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1792 1088v128q0 26 -19 45t-45 19h-128q-26 0 -45 -19 t-19 -45v-128q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1920 1248v-1344q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1344q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="" horiz-adv-x="1664" d="M768 512v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM768 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 512v-384q0 -52 -38 -90t-90 -38 h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90zM1664 1280v-384q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-<glyph unicode="" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 288v-192q0 -40 -28 -68t-68 -28h-320 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1152 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68z" />
-<glyph unicode="" horiz-adv-x="1792" d="M512 288v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM512 800v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 288v-192q0 -40 -28 -68t-68 -28h-960 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68zM512 1312v-192q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h320q40 0 68 -28t28 -68zM1792 800v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28 h960q40 0 68 -28t28 -68zM1792 1312v-192q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h960q40 0 68 -28t28 -68z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1671 970q0 -40 -28 -68l-724 -724l-136 -136q-28 -28 -68 -28t-68 28l-136 136l-362 362q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -295l656 657q28 28 68 28t68 -28l136 -136q28 -28 28 -68z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1298 214q0 -40 -28 -68l-136 -136q-28 -28 -68 -28t-68 28l-294 294l-294 -294q-28 -28 -68 -28t-68 28l-136 136q-28 28 -28 68t28 68l294 294l-294 294q-28 28 -28 68t28 68l136 136q28 28 68 28t68 -28l294 -294l294 294q28 28 68 28t68 -28l136 -136q28 -28 28 -68 t-28 -68l-294 -294l294 -294q28 -28 28 -68z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-224q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v224h-224q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h224v224q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5v-224h224 q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5zM1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5 t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1024 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-576q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h576q13 0 22.5 -9.5t9.5 -22.5zM1152 704q0 185 -131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5t316.5 131.5t131.5 316.5z M1664 -128q0 -53 -37.5 -90.5t-90.5 -37.5q-54 0 -90 38l-343 342q-179 -124 -399 -124q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5t273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -220 -124 -399l343 -343q37 -37 37 -90z " />
-<glyph unicode="" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61t-298 61t-245 164t-164 245t-61 298q0 182 80.5 343t226.5 270q43 32 95.5 25t83.5 -50q32 -42 24.5 -94.5t-49.5 -84.5q-98 -74 -151.5 -181t-53.5 -228q0 -104 40.5 -198.5t109.5 -163.5t163.5 -109.5 t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5q0 121 -53.5 228t-151.5 181q-42 32 -49.5 84.5t24.5 94.5q31 43 84 50t95 -25q146 -109 226.5 -270t80.5 -343zM896 1408v-640q0 -52 -38 -90t-90 -38t-90 38t-38 90v640q0 52 38 90t90 38t90 -38t38 -90z" />
-<glyph unicode="" horiz-adv-x="1792" d="M256 96v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 224v-320q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 480v-576q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v576q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1408 864v-960q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1376v-1472q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1472q0 14 9 23t23 9h192q14 0 23 -9t9 -23z" />
-<glyph unicode="" d="M1024 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1536 749v-222q0 -12 -8 -23t-20 -13l-185 -28q-19 -54 -39 -91q35 -50 107 -138q10 -12 10 -25t-9 -23q-27 -37 -99 -108t-94 -71q-12 0 -26 9l-138 108q-44 -23 -91 -38 q-16 -136 -29 -186q-7 -28 -36 -28h-222q-14 0 -24.5 8.5t-11.5 21.5l-28 184q-49 16 -90 37l-141 -107q-10 -9 -25 -9q-14 0 -25 11q-126 114 -165 168q-7 10 -7 23q0 12 8 23q15 21 51 66.5t54 70.5q-27 50 -41 99l-183 27q-13 2 -21 12.5t-8 23.5v222q0 12 8 23t19 13 l186 28q14 46 39 92q-40 57 -107 138q-10 12 -10 24q0 10 9 23q26 36 98.5 107.5t94.5 71.5q13 0 26 -10l138 -107q44 23 91 38q16 136 29 186q7 28 36 28h222q14 0 24.5 -8.5t11.5 -21.5l28 -184q49 -16 90 -37l142 107q9 9 24 9q13 0 25 -10q129 -119 165 -170q7 -8 7 -22 q0 -12 -8 -23q-15 -21 -51 -66.5t-54 -70.5q26 -50 41 -98l183 -28q13 -2 21 -12.5t8 -23.5z" />
-<glyph unicode="" horiz-adv-x="1408" d="M512 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM768 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1024 800v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1152 76v948h-896v-948q0 -22 7 -40.5t14.5 -27t10.5 -8.5h832q3 0 10.5 8.5t14.5 27t7 40.5zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832 q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1408 544v-480q0 -26 -19 -45t-45 -19h-384v384h-256v-384h-384q-26 0 -45 19t-19 45v480q0 1 0.5 3t0.5 3l575 474l575 -474q1 -2 1 -6zM1631 613l-62 -74q-8 -9 -21 -11h-3q-13 0 -21 7l-692 577l-692 -577q-12 -8 -24 -7q-13 2 -21 11l-62 74q-8 10 -7 23.5t11 21.5 l719 599q32 26 76 26t76 -26l244 -204v195q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-408l219 -182q10 -8 11 -21.5t-7 -23.5z" />
-<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z " />
-<glyph unicode="" d="M896 992v-448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" horiz-adv-x="1920" d="M1111 540v4l-24 320q-1 13 -11 22.5t-23 9.5h-186q-13 0 -23 -9.5t-11 -22.5l-24 -320v-4q-1 -12 8 -20t21 -8h244q12 0 21 8t8 20zM1870 73q0 -73 -46 -73h-704q13 0 22 9.5t8 22.5l-20 256q-1 13 -11 22.5t-23 9.5h-272q-13 0 -23 -9.5t-11 -22.5l-20 -256 q-1 -13 8 -22.5t22 -9.5h-704q-46 0 -46 73q0 54 26 116l417 1044q8 19 26 33t38 14h339q-13 0 -23 -9.5t-11 -22.5l-15 -192q-1 -14 8 -23t22 -9h166q13 0 22 9t8 23l-15 192q-1 13 -11 22.5t-23 9.5h339q20 0 38 -14t26 -33l417 -1044q26 -62 26 -116z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1280 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 416v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h465l135 -136 q58 -56 136 -56t136 56l136 136h464q40 0 68 -28t28 -68zM1339 985q17 -41 -14 -70l-448 -448q-18 -19 -45 -19t-45 19l-448 448q-31 29 -14 70q17 39 59 39h256v448q0 26 19 45t45 19h256q26 0 45 -19t19 -45v-448h256q42 0 59 -39z" />
-<glyph unicode="" d="M1120 608q0 -12 -10 -24l-319 -319q-11 -9 -23 -9t-23 9l-320 320q-15 16 -7 35q8 20 30 20h192v352q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-352h192q14 0 23 -9t9 -23zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273 t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1118 660q-8 -20 -30 -20h-192v-352q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v352h-192q-14 0 -23 9t-9 23q0 12 10 24l319 319q11 9 23 9t23 -9l320 -320q15 -16 7 -35zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198 t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1023 576h316q-1 3 -2.5 8t-2.5 8l-212 496h-708l-212 -496q-1 -2 -2.5 -8t-2.5 -8h316l95 -192h320zM1536 546v-482q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v482q0 62 25 123l238 552q10 25 36.5 42t52.5 17h832q26 0 52.5 -17t36.5 -42l238 -552 q25 -61 25 -123z" />
-<glyph unicode="" d="M1184 640q0 -37 -32 -55l-544 -320q-15 -9 -32 -9q-16 0 -32 8q-32 19 -32 56v640q0 37 32 56q33 18 64 -1l544 -320q32 -18 32 -55zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l138 138q-148 137 -349 137q-104 0 -198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5q119 0 225 52t179 147q7 10 23 12q14 0 25 -9 l137 -138q9 -8 9.5 -20.5t-7.5 -22.5q-109 -132 -264 -204.5t-327 -72.5q-156 0 -298 61t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q147 0 284.5 -55.5t244.5 -156.5l130 129q29 31 70 14q39 -17 39 -59z" />
-<glyph unicode="" d="M1511 480q0 -5 -1 -7q-64 -268 -268 -434.5t-478 -166.5q-146 0 -282.5 55t-243.5 157l-129 -129q-19 -19 -45 -19t-45 19t-19 45v448q0 26 19 45t45 19h448q26 0 45 -19t19 -45t-19 -45l-137 -137q71 -66 161 -102t187 -36q134 0 250 65t186 179q11 17 53 117 q8 23 30 23h192q13 0 22.5 -9.5t9.5 -22.5zM1536 1280v-448q0 -26 -19 -45t-45 -19h-448q-26 0 -45 19t-19 45t19 45l138 138q-148 137 -349 137q-134 0 -250 -65t-186 -179q-11 -17 -53 -117q-8 -23 -30 -23h-199q-13 0 -22.5 9.5t-9.5 22.5v7q65 268 270 434.5t480 166.5 q146 0 284 -55.5t245 -156.5l130 129q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1792" d="M384 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M384 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1536 352v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5z M1536 608v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5t9.5 -22.5zM1536 864v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h960q13 0 22.5 -9.5 t9.5 -22.5zM1664 160v832q0 13 -9.5 22.5t-22.5 9.5h-1472q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1472q13 0 22.5 9.5t9.5 22.5zM1792 1248v-1088q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1472q66 0 113 -47 t47 -113z" />
-<glyph unicode="" horiz-adv-x="1152" d="M320 768h512v192q0 106 -75 181t-181 75t-181 -75t-75 -181v-192zM1152 672v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v192q0 184 132 316t316 132t316 -132t132 -316v-192h32q40 0 68 -28t28 -68z" />
-<glyph unicode="" horiz-adv-x="1792" d="M320 1280q0 -72 -64 -110v-1266q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v1266q-64 38 -64 110q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -25 -12.5 -38.5t-39.5 -27.5q-215 -116 -369 -116q-61 0 -123.5 22t-108.5 48 t-115.5 48t-142.5 22q-192 0 -464 -146q-17 -9 -33 -9q-26 0 -45 19t-19 45v742q0 32 31 55q21 14 79 43q236 120 421 120q107 0 200 -29t219 -88q38 -19 88 -19q54 0 117.5 21t110 47t88 47t54.5 21q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1664 650q0 -166 -60 -314l-20 -49l-185 -33q-22 -83 -90.5 -136.5t-156.5 -53.5v-32q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v576q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-32q71 0 130 -35.5t93 -95.5l68 12q29 95 29 193q0 148 -88 279t-236.5 209t-315.5 78 t-315.5 -78t-236.5 -209t-88 -279q0 -98 29 -193l68 -12q34 60 93 95.5t130 35.5v32q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-576q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v32q-88 0 -156.5 53.5t-90.5 136.5l-185 33l-20 49q-60 148 -60 314q0 151 67 291t179 242.5 t266 163.5t320 61t320 -61t266 -163.5t179 -242.5t67 -291z" />
-<glyph unicode="" horiz-adv-x="768" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1152" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142z" />
-<glyph unicode="" horiz-adv-x="1664" d="M768 1184v-1088q0 -26 -19 -45t-45 -19t-45 19l-333 333h-262q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h262l333 333q19 19 45 19t45 -19t19 -45zM1152 640q0 -76 -42.5 -141.5t-112.5 -93.5q-10 -5 -25 -5q-26 0 -45 18.5t-19 45.5q0 21 12 35.5t29 25t34 23t29 35.5 t12 57t-12 57t-29 35.5t-34 23t-29 25t-12 35.5q0 27 19 45.5t45 18.5q15 0 25 -5q70 -27 112.5 -93t42.5 -142zM1408 640q0 -153 -85 -282.5t-225 -188.5q-13 -5 -25 -5q-27 0 -46 19t-19 45q0 39 39 59q56 29 76 44q74 54 115.5 135.5t41.5 173.5t-41.5 173.5 t-115.5 135.5q-20 15 -76 44q-39 20 -39 59q0 26 19 45t45 19q13 0 26 -5q140 -59 225 -188.5t85 -282.5zM1664 640q0 -230 -127 -422.5t-338 -283.5q-13 -5 -26 -5q-26 0 -45 19t-19 45q0 36 39 59q7 4 22.5 10.5t22.5 10.5q46 25 82 51q123 91 192 227t69 289t-69 289 t-192 227q-36 26 -82 51q-7 4 -22.5 10.5t-22.5 10.5q-39 23 -39 59q0 26 19 45t45 19q13 0 26 -5q211 -91 338 -283.5t127 -422.5z" />
-<glyph unicode="" horiz-adv-x="1408" d="M384 384v-128h-128v128h128zM384 1152v-128h-128v128h128zM1152 1152v-128h-128v128h128zM128 129h384v383h-384v-383zM128 896h384v384h-384v-384zM896 896h384v384h-384v-384zM640 640v-640h-640v640h640zM1152 128v-128h-128v128h128zM1408 128v-128h-128v128h128z M1408 640v-384h-384v128h-128v-384h-128v640h384v-128h128v128h128zM640 1408v-640h-640v640h640zM1408 1408v-640h-640v640h640z" />
-<glyph unicode="" horiz-adv-x="1792" d="M63 0h-63v1408h63v-1408zM126 1h-32v1407h32v-1407zM220 1h-31v1407h31v-1407zM377 1h-31v1407h31v-1407zM534 1h-62v1407h62v-1407zM660 1h-31v1407h31v-1407zM723 1h-31v1407h31v-1407zM786 1h-31v1407h31v-1407zM943 1h-63v1407h63v-1407zM1100 1h-63v1407h63v-1407z M1226 1h-63v1407h63v-1407zM1352 1h-63v1407h63v-1407zM1446 1h-63v1407h63v-1407zM1635 1h-94v1407h94v-1407zM1698 1h-32v1407h32v-1407zM1792 0h-63v1408h63v-1408z" />
-<glyph unicode="" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91z" />
-<glyph unicode="" horiz-adv-x="1920" d="M448 1088q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1515 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-53 0 -90 37l-715 716q-38 37 -64.5 101t-26.5 117v416q0 52 38 90t90 38h416q53 0 117 -26.5t102 -64.5 l715 -714q37 -39 37 -91zM1899 512q0 -53 -37 -90l-491 -492q-39 -37 -91 -37q-36 0 -59 14t-53 45l470 470q37 37 37 90q0 52 -37 91l-715 714q-38 38 -102 64.5t-117 26.5h224q53 0 117 -26.5t102 -64.5l715 -714q37 -39 37 -91z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1639 1058q40 -57 18 -129l-275 -906q-19 -64 -76.5 -107.5t-122.5 -43.5h-923q-77 0 -148.5 53.5t-99.5 131.5q-24 67 -2 127q0 4 3 27t4 37q1 8 -3 21.5t-3 19.5q2 11 8 21t16.5 23.5t16.5 23.5q23 38 45 91.5t30 91.5q3 10 0.5 30t-0.5 28q3 11 17 28t17 23 q21 36 42 92t25 90q1 9 -2.5 32t0.5 28q4 13 22 30.5t22 22.5q19 26 42.5 84.5t27.5 96.5q1 8 -3 25.5t-2 26.5q2 8 9 18t18 23t17 21q8 12 16.5 30.5t15 35t16 36t19.5 32t26.5 23.5t36 11.5t47.5 -5.5l-1 -3q38 9 51 9h761q74 0 114 -56t18 -130l-274 -906 q-36 -119 -71.5 -153.5t-128.5 -34.5h-869q-27 0 -38 -15q-11 -16 -1 -43q24 -70 144 -70h923q29 0 56 15.5t35 41.5l300 987q7 22 5 57q38 -15 59 -43zM575 1056q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5 t-16.5 -22.5zM492 800q-4 -13 2 -22.5t20 -9.5h608q13 0 25.5 9.5t16.5 22.5l21 64q4 13 -2 22.5t-20 9.5h-608q-13 0 -25.5 -9.5t-16.5 -22.5z" />
-<glyph unicode="" horiz-adv-x="1280" d="M1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-<glyph unicode="" horiz-adv-x="1664" d="M384 0h896v256h-896v-256zM384 640h896v384h-160q-40 0 -68 28t-28 68v160h-640v-640zM1536 576q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 576v-416q0 -13 -9.5 -22.5t-22.5 -9.5h-224v-160q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68 v160h-224q-13 0 -22.5 9.5t-9.5 22.5v416q0 79 56.5 135.5t135.5 56.5h64v544q0 40 28 68t68 28h672q40 0 88 -20t76 -48l152 -152q28 -28 48 -76t20 -88v-256h64q79 0 135.5 -56.5t56.5 -135.5z" />
-<glyph unicode="" horiz-adv-x="1920" d="M960 864q119 0 203.5 -84.5t84.5 -203.5t-84.5 -203.5t-203.5 -84.5t-203.5 84.5t-84.5 203.5t84.5 203.5t203.5 84.5zM1664 1280q106 0 181 -75t75 -181v-896q0 -106 -75 -181t-181 -75h-1408q-106 0 -181 75t-75 181v896q0 106 75 181t181 75h224l51 136 q19 49 69.5 84.5t103.5 35.5h512q53 0 103.5 -35.5t69.5 -84.5l51 -136h224zM960 128q185 0 316.5 131.5t131.5 316.5t-131.5 316.5t-316.5 131.5t-316.5 -131.5t-131.5 -316.5t131.5 -316.5t316.5 -131.5z" />
-<glyph unicode="" horiz-adv-x="1664" d="M725 977l-170 -450q33 0 136.5 -2t160.5 -2q19 0 57 2q-87 253 -184 452zM0 -128l2 79q23 7 56 12.5t57 10.5t49.5 14.5t44.5 29t31 50.5l237 616l280 724h75h53q8 -14 11 -21l205 -480q33 -78 106 -257.5t114 -274.5q15 -34 58 -144.5t72 -168.5q20 -45 35 -57 q19 -15 88 -29.5t84 -20.5q6 -38 6 -57q0 -4 -0.5 -13t-0.5 -13q-63 0 -190 8t-191 8q-76 0 -215 -7t-178 -8q0 43 4 78l131 28q1 0 12.5 2.5t15.5 3.5t14.5 4.5t15 6.5t11 8t9 11t2.5 14q0 16 -31 96.5t-72 177.5t-42 100l-450 2q-26 -58 -76.5 -195.5t-50.5 -162.5 q0 -22 14 -37.5t43.5 -24.5t48.5 -13.5t57 -8.5t41 -4q1 -19 1 -58q0 -9 -2 -27q-58 0 -174.5 10t-174.5 10q-8 0 -26.5 -4t-21.5 -4q-80 -14 -188 -14z" />
-<glyph unicode="" horiz-adv-x="1408" d="M555 15q74 -32 140 -32q376 0 376 335q0 114 -41 180q-27 44 -61.5 74t-67.5 46.5t-80.5 25t-84 10.5t-94.5 2q-73 0 -101 -10q0 -53 -0.5 -159t-0.5 -158q0 -8 -1 -67.5t-0.5 -96.5t4.5 -83.5t12 -66.5zM541 761q42 -7 109 -7q82 0 143 13t110 44.5t74.5 89.5t25.5 142 q0 70 -29 122.5t-79 82t-108 43.5t-124 14q-50 0 -130 -13q0 -50 4 -151t4 -152q0 -27 -0.5 -80t-0.5 -79q0 -46 1 -69zM0 -128l2 94q15 4 85 16t106 27q7 12 12.5 27t8.5 33.5t5.5 32.5t3 37.5t0.5 34v35.5v30q0 982 -22 1025q-4 8 -22 14.5t-44.5 11t-49.5 7t-48.5 4.5 t-30.5 3l-4 83q98 2 340 11.5t373 9.5q23 0 68.5 -0.5t67.5 -0.5q70 0 136.5 -13t128.5 -42t108 -71t74 -104.5t28 -137.5q0 -52 -16.5 -95.5t-39 -72t-64.5 -57.5t-73 -45t-84 -40q154 -35 256.5 -134t102.5 -248q0 -100 -35 -179.5t-93.5 -130.5t-138 -85.5t-163.5 -48.5 t-176 -14q-44 0 -132 3t-132 3q-106 0 -307 -11t-231 -12z" />
-<glyph unicode="" horiz-adv-x="1024" d="M0 -126l17 85q6 2 81.5 21.5t111.5 37.5q28 35 41 101q1 7 62 289t114 543.5t52 296.5v25q-24 13 -54.5 18.5t-69.5 8t-58 5.5l19 103q33 -2 120 -6.5t149.5 -7t120.5 -2.5q48 0 98.5 2.5t121 7t98.5 6.5q-5 -39 -19 -89q-30 -10 -101.5 -28.5t-108.5 -33.5 q-8 -19 -14 -42.5t-9 -40t-7.5 -45.5t-6.5 -42q-27 -148 -87.5 -419.5t-77.5 -355.5q-2 -9 -13 -58t-20 -90t-16 -83.5t-6 -57.5l1 -18q17 -4 185 -31q-3 -44 -16 -99q-11 0 -32.5 -1.5t-32.5 -1.5q-29 0 -87 10t-86 10q-138 2 -206 2q-51 0 -143 -9t-121 -11z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1744 128q33 0 42 -18.5t-11 -44.5l-126 -162q-20 -26 -49 -26t-49 26l-126 162q-20 26 -11 44.5t42 18.5h80v1024h-80q-33 0 -42 18.5t11 44.5l126 162q20 26 49 26t49 -26l126 -162q20 -26 11 -44.5t-42 -18.5h-80v-1024h80zM81 1407l54 -27q12 -5 211 -5q44 0 132 2 t132 2q36 0 107.5 -0.5t107.5 -0.5h293q6 0 21 -0.5t20.5 0t16 3t17.5 9t15 17.5l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 48t-14.5 73.5t-7.5 35.5q-6 8 -12 12.5t-15.5 6t-13 2.5t-18 0.5t-16.5 -0.5 q-17 0 -66.5 0.5t-74.5 0.5t-64 -2t-71 -6q-9 -81 -8 -136q0 -94 2 -388t2 -455q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27 q19 42 19 383q0 101 -3 303t-3 303v117q0 2 0.5 15.5t0.5 25t-1 25.5t-3 24t-5 14q-11 12 -162 12q-33 0 -93 -12t-80 -26q-19 -13 -34 -72.5t-31.5 -111t-42.5 -53.5q-42 26 -56 44v383z" />
-<glyph unicode="" d="M81 1407l54 -27q12 -5 211 -5q44 0 132 2t132 2q70 0 246.5 1t304.5 0.5t247 -4.5q33 -1 56 31l42 1q4 0 14 -0.5t14 -0.5q2 -112 2 -336q0 -80 -5 -109q-39 -14 -68 -18q-25 44 -54 128q-3 9 -11 47.5t-15 73.5t-7 36q-10 13 -27 19q-5 2 -66 2q-30 0 -93 1t-103 1 t-94 -2t-96 -7q-9 -81 -8 -136l1 -152v52q0 -55 1 -154t1.5 -180t0.5 -153q0 -16 -2.5 -71.5t0 -91.5t12.5 -69q40 -21 124 -42.5t120 -37.5q5 -40 5 -50q0 -14 -3 -29l-34 -1q-76 -2 -218 8t-207 10q-50 0 -151 -9t-152 -9q-3 51 -3 52v9q17 27 61.5 43t98.5 29t78 27 q7 16 11.5 74t6 145.5t1.5 155t-0.5 153.5t-0.5 89q0 7 -2.5 21.5t-2.5 22.5q0 7 0.5 44t1 73t0 76.5t-3 67.5t-6.5 32q-11 12 -162 12q-41 0 -163 -13.5t-138 -24.5q-19 -12 -34 -71.5t-31.5 -111.5t-42.5 -54q-42 26 -56 44v383zM1310 125q12 0 42 -19.5t57.5 -41.5 t59.5 -49t36 -30q26 -21 26 -49t-26 -49q-4 -3 -36 -30t-59.5 -49t-57.5 -41.5t-42 -19.5q-13 0 -20.5 10.5t-10 28.5t-2.5 33.5t1.5 33t1.5 19.5h-1024q0 -2 1.5 -19.5t1.5 -33t-2.5 -33.5t-10 -28.5t-20.5 -10.5q-12 0 -42 19.5t-57.5 41.5t-59.5 49t-36 30q-26 21 -26 49 t26 49q4 3 36 30t59.5 49t57.5 41.5t42 19.5q13 0 20.5 -10.5t10 -28.5t2.5 -33.5t-1.5 -33t-1.5 -19.5h1024q0 2 -1.5 19.5t-1.5 33t2.5 33.5t10 28.5t20.5 10.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1408 576v-128q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h896q26 0 45 -19t19 -45zM1664 960v-128q0 -26 -19 -45t-45 -19 h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1280 1344v-128q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h640q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1280q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1536q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1536q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1152q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 192v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 576v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 960v-128q0 -26 -19 -45 t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-128q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1792" d="M256 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM256 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5 t9.5 -22.5zM256 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344 q13 0 22.5 -9.5t9.5 -22.5zM256 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-192q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h192q13 0 22.5 -9.5t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v192 q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M384 992v-576q0 -13 -9.5 -22.5t-22.5 -9.5q-14 0 -23 9l-288 288q-9 9 -9 23t9 23l288 288q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M352 704q0 -14 -9 -23l-288 -288q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v576q0 13 9.5 22.5t22.5 9.5q14 0 23 -9l288 -288q9 -9 9 -23zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5 t9.5 -22.5zM1792 608v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088q13 0 22.5 -9.5t9.5 -22.5zM1792 992v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1088q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1088 q13 0 22.5 -9.5t9.5 -22.5zM1792 1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1728q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1728q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 1184v-1088q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-403 403v-166q0 -119 -84.5 -203.5t-203.5 -84.5h-704q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h704q119 0 203.5 -84.5t84.5 -203.5v-165l403 402q18 19 45 19q12 0 25 -5 q39 -17 39 -59z" />
-<glyph unicode="" horiz-adv-x="1920" d="M640 960q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1664 576v-448h-1408v192l320 320l160 -160l512 512zM1760 1280h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-1216q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5v1216 q0 13 -9.5 22.5t-22.5 9.5zM1920 1248v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="" d="M363 0l91 91l-235 235l-91 -91v-107h128v-128h107zM886 928q0 22 -22 22q-10 0 -17 -7l-542 -542q-7 -7 -7 -17q0 -22 22 -22q10 0 17 7l542 542q7 7 7 17zM832 1120l416 -416l-832 -832h-416v416zM1515 1024q0 -53 -37 -90l-166 -166l-416 416l166 165q36 38 90 38 q53 0 91 -38l235 -234q37 -39 37 -91z" />
-<glyph unicode="" horiz-adv-x="1024" d="M768 896q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1024 896q0 -109 -33 -179l-364 -774q-16 -33 -47.5 -52t-67.5 -19t-67.5 19t-46.5 52l-365 774q-33 70 -33 179q0 212 150 362t362 150t362 -150t150 -362z" />
-<glyph unicode="" d="M768 96v1088q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" horiz-adv-x="1024" d="M512 384q0 36 -20 69q-1 1 -15.5 22.5t-25.5 38t-25 44t-21 50.5q-4 16 -21 16t-21 -16q-7 -23 -21 -50.5t-25 -44t-25.5 -38t-15.5 -22.5q-20 -33 -20 -69q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 512q0 -212 -150 -362t-362 -150t-362 150t-150 362 q0 145 81 275q6 9 62.5 90.5t101 151t99.5 178t83 201.5q9 30 34 47t51 17t51.5 -17t33.5 -47q28 -93 83 -201.5t99.5 -178t101 -151t62.5 -90.5q81 -127 81 -275z" />
-<glyph unicode="" horiz-adv-x="1792" d="M888 352l116 116l-152 152l-116 -116v-56h96v-96h56zM1328 1072q-16 16 -33 -1l-350 -350q-17 -17 -1 -33t33 1l350 350q17 17 1 33zM1408 478v-190q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-14 -14 -32 -8q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v126q0 13 9 22l64 64q15 15 35 7t20 -29zM1312 1216l288 -288l-672 -672h-288v288zM1756 1084l-92 -92 l-288 288l92 92q28 28 68 28t68 -28l152 -152q28 -28 28 -68t-28 -68z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1408 547v-259q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h255v0q13 0 22.5 -9.5t9.5 -22.5q0 -27 -26 -32q-77 -26 -133 -60q-10 -4 -16 -4h-112q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832 q66 0 113 47t47 113v214q0 19 18 29q28 13 54 37q16 16 35 8q21 -9 21 -29zM1645 1043l-384 -384q-18 -19 -45 -19q-12 0 -25 5q-39 17 -39 59v192h-160q-323 0 -438 -131q-119 -137 -74 -473q3 -23 -20 -34q-8 -2 -12 -2q-16 0 -26 13q-10 14 -21 31t-39.5 68.5t-49.5 99.5 t-38.5 114t-17.5 122q0 49 3.5 91t14 90t28 88t47 81.5t68.5 74t94.5 61.5t124.5 48.5t159.5 30.5t196.5 11h160v192q0 42 39 59q13 5 25 5q26 0 45 -19l384 -384q19 -19 19 -45t-19 -45z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1408 606v-318q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q63 0 117 -25q15 -7 18 -23q3 -17 -9 -29l-49 -49q-10 -10 -23 -10q-3 0 -9 2q-23 6 -45 6h-832q-66 0 -113 -47t-47 -113v-832 q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v254q0 13 9 22l64 64q10 10 23 10q6 0 12 -3q20 -8 20 -29zM1639 1095l-814 -814q-24 -24 -57 -24t-57 24l-430 430q-24 24 -24 57t24 57l110 110q24 24 57 24t57 -24l263 -263l647 647q24 24 57 24t57 -24l110 -110 q24 -24 24 -57t-24 -57z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-384v-384h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v384h-384v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45 t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h384v384h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45t-19 -45t-45 -19h-128v-384h384v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="" horiz-adv-x="1024" d="M979 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1747 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-9 9 -13 19v-678q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-678q4 11 13 19l710 710 q19 19 32 13t13 -32v-710q4 11 13 19z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1619 1395q19 19 32 13t13 -32v-1472q0 -26 -13 -32t-32 13l-710 710q-8 9 -13 19v-710q0 -26 -13 -32t-32 13l-710 710q-19 19 -19 45t19 45l710 710q19 19 32 13t13 -32v-710q5 11 13 19z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1384 609l-1328 -738q-23 -13 -39.5 -3t-16.5 36v1472q0 26 16.5 36t39.5 -3l1328 -738q23 -13 23 -31t-23 -31z" />
-<glyph unicode="" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45zM640 1344v-1408q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h512q26 0 45 -19t19 -45z" />
-<glyph unicode="" d="M1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1664" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q19 -19 19 -45t-19 -45l-710 -710q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
-<glyph unicode="" horiz-adv-x="1792" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v710q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19l-710 -710 q-19 -19 -32 -13t-13 32v710q-5 -10 -13 -19z" />
-<glyph unicode="" horiz-adv-x="1024" d="M45 -115q-19 -19 -32 -13t-13 32v1472q0 26 13 32t32 -13l710 -710q8 -8 13 -19v678q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-1408q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v678q-5 -10 -13 -19z" />
-<glyph unicode="" horiz-adv-x="1538" d="M14 557l710 710q19 19 45 19t45 -19l710 -710q19 -19 13 -32t-32 -13h-1472q-26 0 -32 13t13 32zM1473 0h-1408q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1408q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19z" />
-<glyph unicode="" horiz-adv-x="1280" d="M1171 1235l-531 -531l531 -531q19 -19 19 -45t-19 -45l-166 -166q-19 -19 -45 -19t-45 19l-742 742q-19 19 -19 45t19 45l742 742q19 19 45 19t45 -19l166 -166q19 -19 19 -45t-19 -45z" />
-<glyph unicode="" horiz-adv-x="1280" d="M1107 659l-742 -742q-19 -19 -45 -19t-45 19l-166 166q-19 19 -19 45t19 45l531 531l-531 531q-19 19 -19 45t19 45l166 166q19 19 45 19t45 -19l742 -742q19 -19 19 -45t-19 -45z" />
-<glyph unicode="" d="M1216 576v128q0 26 -19 45t-45 19h-256v256q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-256h-256q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h256v-256q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v256h256q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5 t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1216 576v128q0 26 -19 45t-45 19h-768q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h768q26 0 45 19t19 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5 t103 -385.5z" />
-<glyph unicode="" d="M1149 414q0 26 -19 45l-181 181l181 181q19 19 19 45q0 27 -19 46l-90 90q-19 19 -46 19q-26 0 -45 -19l-181 -181l-181 181q-19 19 -45 19q-27 0 -46 -19l-90 -90q-19 -19 -19 -46q0 -26 19 -45l181 -181l-181 -181q-19 -19 -19 -45q0 -27 19 -46l90 -90q19 -19 46 -19 q26 0 45 19l181 181l181 -181q19 -19 45 -19q27 0 46 19l90 90q19 19 19 46zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1284 802q0 28 -18 46l-91 90q-19 19 -45 19t-45 -19l-408 -407l-226 226q-19 19 -45 19t-45 -19l-91 -90q-18 -18 -18 -46q0 -27 18 -45l362 -362q19 -19 45 -19q27 0 46 19l543 543q18 18 18 45zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M896 160v192q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h192q14 0 23 9t9 23zM1152 832q0 88 -55.5 163t-138.5 116t-170 41q-243 0 -371 -213q-15 -24 8 -42l132 -100q7 -6 19 -6q16 0 25 12q53 68 86 92q34 24 86 24q48 0 85.5 -26t37.5 -59 q0 -38 -20 -61t-68 -45q-63 -28 -115.5 -86.5t-52.5 -125.5v-36q0 -14 9 -23t23 -9h192q14 0 23 9t9 23q0 19 21.5 49.5t54.5 49.5q32 18 49 28.5t46 35t44.5 48t28 60.5t12.5 81zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1024 160v160q0 14 -9 23t-23 9h-96v512q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h96v-320h-96q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23t23 -9h448q14 0 23 9t9 23zM896 1056v160q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-160q0 -14 9 -23 t23 -9h192q14 0 23 9t9 23zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1197 512h-109q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h109q-32 108 -112.5 188.5t-188.5 112.5v-109q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v109q-108 -32 -188.5 -112.5t-112.5 -188.5h109q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-109 q32 -108 112.5 -188.5t188.5 -112.5v109q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-109q108 32 188.5 112.5t112.5 188.5zM1536 704v-128q0 -26 -19 -45t-45 -19h-143q-37 -161 -154.5 -278.5t-278.5 -154.5v-143q0 -26 -19 -45t-45 -19h-128q-26 0 -45 19t-19 45v143 q-161 37 -278.5 154.5t-154.5 278.5h-143q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h143q37 161 154.5 278.5t278.5 154.5v143q0 26 19 45t45 19h128q26 0 45 -19t19 -45v-143q161 -37 278.5 -154.5t154.5 -278.5h143q26 0 45 -19t19 -45z" />
-<glyph unicode="" d="M1097 457l-146 -146q-10 -10 -23 -10t-23 10l-137 137l-137 -137q-10 -10 -23 -10t-23 10l-146 146q-10 10 -10 23t10 23l137 137l-137 137q-10 10 -10 23t10 23l146 146q10 10 23 10t23 -10l137 -137l137 137q10 10 23 10t23 -10l146 -146q10 -10 10 -23t-10 -23 l-137 -137l137 -137q10 -10 10 -23t-10 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5 t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1171 723l-422 -422q-19 -19 -45 -19t-45 19l-294 294q-19 19 -19 45t19 45l102 102q19 19 45 19t45 -19l147 -147l275 275q19 19 45 19t45 -19l102 -102q19 -19 19 -45t-19 -45zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198 t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1312 643q0 161 -87 295l-754 -753q137 -89 297 -89q111 0 211.5 43.5t173.5 116.5t116 174.5t43 212.5zM313 344l755 754q-135 91 -300 91q-148 0 -273 -73t-198 -199t-73 -274q0 -162 89 -299zM1536 643q0 -157 -61 -300t-163.5 -246t-245 -164t-298.5 -61t-298.5 61 t-245 164t-163.5 246t-61 300t61 299.5t163.5 245.5t245 164t298.5 61t298.5 -61t245 -164t163.5 -245.5t61 -299.5z" />
-<glyph unicode="" d="M1536 640v-128q0 -53 -32.5 -90.5t-84.5 -37.5h-704l293 -294q38 -36 38 -90t-38 -90l-75 -76q-37 -37 -90 -37q-52 0 -91 37l-651 652q-37 37 -37 90q0 52 37 91l651 650q38 38 91 38q52 0 90 -38l75 -74q38 -38 38 -91t-38 -91l-293 -293h704q52 0 84.5 -37.5 t32.5 -90.5z" />
-<glyph unicode="" d="M1472 576q0 -54 -37 -91l-651 -651q-39 -37 -91 -37q-51 0 -90 37l-75 75q-38 38 -38 91t38 91l293 293h-704q-52 0 -84.5 37.5t-32.5 90.5v128q0 53 32.5 90.5t84.5 37.5h704l-293 294q-38 36 -38 90t38 90l75 75q38 38 90 38q53 0 91 -38l651 -651q37 -35 37 -90z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1611 565q0 -51 -37 -90l-75 -75q-38 -38 -91 -38q-54 0 -90 38l-294 293v-704q0 -52 -37.5 -84.5t-90.5 -32.5h-128q-53 0 -90.5 32.5t-37.5 84.5v704l-294 -293q-36 -38 -90 -38t-90 38l-75 75q-38 38 -38 90q0 53 38 91l651 651q35 37 90 37q54 0 91 -37l651 -651 q37 -39 37 -91z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1611 704q0 -53 -37 -90l-651 -652q-39 -37 -91 -37q-53 0 -90 37l-651 652q-38 36 -38 90q0 53 38 91l74 75q39 37 91 37q53 0 90 -37l294 -294v704q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-704l294 294q37 37 90 37q52 0 91 -37l75 -75q37 -39 37 -91z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 896q0 -26 -19 -45l-512 -512q-19 -19 -45 -19t-45 19t-19 45v256h-224q-98 0 -175.5 -6t-154 -21.5t-133 -42.5t-105.5 -69.5t-80 -101t-48.5 -138.5t-17.5 -181q0 -55 5 -123q0 -6 2.5 -23.5t2.5 -26.5q0 -15 -8.5 -25t-23.5 -10q-16 0 -28 17q-7 9 -13 22 t-13.5 30t-10.5 24q-127 285 -127 451q0 199 53 333q162 403 875 403h224v256q0 26 19 45t45 19t45 -19l512 -512q19 -19 19 -45z" />
-<glyph unicode="" d="M755 480q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23zM1536 1344v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332 q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45z" />
-<glyph unicode="" d="M768 576v-448q0 -26 -19 -45t-45 -19t-45 19l-144 144l-332 -332q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l332 332l-144 144q-19 19 -19 45t19 45t45 19h448q26 0 45 -19t19 -45zM1523 1248q0 -13 -10 -23l-332 -332l144 -144q19 -19 19 -45t-19 -45 t-45 -19h-448q-26 0 -45 19t-19 45v448q0 26 19 45t45 19t45 -19l144 -144l332 332q10 10 23 10t23 -10l114 -114q10 -10 10 -23z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-416v-416q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v416h-416q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h416v416q0 40 28 68t68 28h192q40 0 68 -28t28 -68v-416h416q40 0 68 -28t28 -68z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1408 800v-192q0 -40 -28 -68t-68 -28h-1216q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h1216q40 0 68 -28t28 -68z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1482 486q46 -26 59.5 -77.5t-12.5 -97.5l-64 -110q-26 -46 -77.5 -59.5t-97.5 12.5l-266 153v-307q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v307l-266 -153q-46 -26 -97.5 -12.5t-77.5 59.5l-64 110q-26 46 -12.5 97.5t59.5 77.5l266 154l-266 154 q-46 26 -59.5 77.5t12.5 97.5l64 110q26 46 77.5 59.5t97.5 -12.5l266 -153v307q0 52 38 90t90 38h128q52 0 90 -38t38 -90v-307l266 153q46 26 97.5 12.5t77.5 -59.5l64 -110q26 -46 12.5 -97.5t-59.5 -77.5l-266 -154z" />
-<glyph unicode="" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM896 161v190q0 14 -9 23.5t-22 9.5h-192q-13 0 -23 -10t-10 -23v-190q0 -13 10 -23t23 -10h192 q13 0 22 9.5t9 23.5zM894 505l18 621q0 12 -10 18q-10 8 -24 8h-220q-14 0 -24 -8q-10 -6 -10 -18l17 -621q0 -10 10 -17.5t24 -7.5h185q14 0 23.5 7.5t10.5 17.5z" />
-<glyph unicode="" d="M928 180v56v468v192h-320v-192v-468v-56q0 -25 18 -38.5t46 -13.5h192q28 0 46 13.5t18 38.5zM472 1024h195l-126 161q-26 31 -69 31q-40 0 -68 -28t-28 -68t28 -68t68 -28zM1160 1120q0 40 -28 68t-68 28q-43 0 -69 -31l-125 -161h194q40 0 68 28t28 68zM1536 864v-320 q0 -14 -9 -23t-23 -9h-96v-416q0 -40 -28 -68t-68 -28h-1088q-40 0 -68 28t-28 68v416h-96q-14 0 -23 9t-9 23v320q0 14 9 23t23 9h440q-93 0 -158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5q107 0 168 -77l128 -165l128 165q61 77 168 77q93 0 158.5 -65.5t65.5 -158.5 t-65.5 -158.5t-158.5 -65.5h440q14 0 23 -9t9 -23z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1280 832q0 26 -19 45t-45 19q-172 0 -318 -49.5t-259.5 -134t-235.5 -219.5q-19 -21 -19 -45q0 -26 19 -45t45 -19q24 0 45 19q27 24 74 71t67 66q137 124 268.5 176t313.5 52q26 0 45 19t19 45zM1792 1030q0 -95 -20 -193q-46 -224 -184.5 -383t-357.5 -268 q-214 -108 -438 -108q-148 0 -286 47q-15 5 -88 42t-96 37q-16 0 -39.5 -32t-45 -70t-52.5 -70t-60 -32q-30 0 -51 11t-31 24t-27 42q-2 4 -6 11t-5.5 10t-3 9.5t-1.5 13.5q0 35 31 73.5t68 65.5t68 56t31 48q0 4 -14 38t-16 44q-9 51 -9 104q0 115 43.5 220t119 184.5 t170.5 139t204 95.5q55 18 145 25.5t179.5 9t178.5 6t163.5 24t113.5 56.5l29.5 29.5t29.5 28t27 20t36.5 16t43.5 4.5q39 0 70.5 -46t47.5 -112t24 -124t8 -96z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1408 -160v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-1344q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h1344q13 0 22.5 -9.5t9.5 -22.5zM1152 896q0 -78 -24.5 -144t-64 -112.5t-87.5 -88t-96 -77.5t-87.5 -72t-64 -81.5t-24.5 -96.5q0 -96 67 -224l-4 1l1 -1 q-90 41 -160 83t-138.5 100t-113.5 122.5t-72.5 150.5t-27.5 184q0 78 24.5 144t64 112.5t87.5 88t96 77.5t87.5 72t64 81.5t24.5 96.5q0 94 -66 224l3 -1l-1 1q90 -41 160 -83t138.5 -100t113.5 -122.5t72.5 -150.5t27.5 -184z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1664 576q-152 236 -381 353q61 -104 61 -225q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 121 61 225q-229 -117 -381 -353q133 -205 333.5 -326.5t434.5 -121.5t434.5 121.5t333.5 326.5zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5 t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1792 576q0 -34 -20 -69q-140 -230 -376.5 -368.5t-499.5 -138.5t-499.5 139t-376.5 368q-20 35 -20 69t20 69q140 229 376.5 368t499.5 139t499.5 -139t376.5 -368q20 -35 20 -69z" />
-<glyph unicode="" horiz-adv-x="1792" d="M555 201l78 141q-87 63 -136 159t-49 203q0 121 61 225q-229 -117 -381 -353q167 -258 427 -375zM944 960q0 20 -14 34t-34 14q-125 0 -214.5 -89.5t-89.5 -214.5q0 -20 14 -34t34 -14t34 14t14 34q0 86 61 147t147 61q20 0 34 14t14 34zM1307 1151q0 -7 -1 -9 q-105 -188 -315 -566t-316 -567l-49 -89q-10 -16 -28 -16q-12 0 -134 70q-16 10 -16 28q0 12 44 87q-143 65 -263.5 173t-208.5 245q-20 31 -20 69t20 69q153 235 380 371t496 136q89 0 180 -17l54 97q10 16 28 16q5 0 18 -6t31 -15.5t33 -18.5t31.5 -18.5t19.5 -11.5 q16 -10 16 -27zM1344 704q0 -139 -79 -253.5t-209 -164.5l280 502q8 -45 8 -84zM1792 576q0 -35 -20 -69q-39 -64 -109 -145q-150 -172 -347.5 -267t-419.5 -95l74 132q212 18 392.5 137t301.5 307q-115 179 -282 294l63 112q95 -64 182.5 -153t144.5 -184q20 -34 20 -69z " />
-<glyph unicode="" horiz-adv-x="1792" d="M1024 161v190q0 14 -9.5 23.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -23.5v-190q0 -14 9.5 -23.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 23.5zM1022 535l18 459q0 12 -10 19q-13 11 -24 11h-220q-11 0 -24 -11q-10 -7 -10 -21l17 -457q0 -10 10 -16.5t24 -6.5h185 q14 0 23.5 6.5t10.5 16.5zM1008 1469l768 -1408q35 -63 -2 -126q-17 -29 -46.5 -46t-63.5 -17h-1536q-34 0 -63.5 17t-46.5 46q-37 63 -2 126l768 1408q17 31 47 49t65 18t65 -18t47 -49z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1376 1376q44 -52 12 -148t-108 -172l-161 -161l160 -696q5 -19 -12 -33l-128 -96q-7 -6 -19 -6q-4 0 -7 1q-15 3 -21 16l-279 508l-259 -259l53 -194q5 -17 -8 -31l-96 -96q-9 -9 -23 -9h-2q-15 2 -24 13l-189 252l-252 189q-11 7 -13 23q-1 13 9 25l96 97q9 9 23 9 q6 0 8 -1l194 -53l259 259l-508 279q-14 8 -17 24q-2 16 9 27l128 128q14 13 30 8l665 -159l160 160q76 76 172 108t148 -12z" />
-<glyph unicode="" horiz-adv-x="1664" d="M128 -128h288v288h-288v-288zM480 -128h320v288h-320v-288zM128 224h288v320h-288v-320zM480 224h320v320h-320v-320zM128 608h288v288h-288v-288zM864 -128h320v288h-320v-288zM480 608h320v288h-320v-288zM1248 -128h288v288h-288v-288zM864 224h320v320h-320v-320z M512 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1248 224h288v320h-288v-320zM864 608h320v288h-320v-288zM1248 608h288v288h-288v-288zM1280 1088v288q0 13 -9.5 22.5t-22.5 9.5h-64 q-13 0 -22.5 -9.5t-9.5 -22.5v-288q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1664 1152v-1280q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47 h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-<glyph unicode="" horiz-adv-x="1792" d="M666 1055q-60 -92 -137 -273q-22 45 -37 72.5t-40.5 63.5t-51 56.5t-63 35t-81.5 14.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q250 0 410 -225zM1792 256q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192q-32 0 -85 -0.5t-81 -1t-73 1 t-71 5t-64 10.5t-63 18.5t-58 28.5t-59 40t-55 53.5t-56 69.5q59 93 136 273q22 -45 37 -72.5t40.5 -63.5t51 -56.5t63 -35t81.5 -14.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1792 1152q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5 v192h-256q-48 0 -87 -15t-69 -45t-51 -61.5t-45 -77.5q-32 -62 -78 -171q-29 -66 -49.5 -111t-54 -105t-64 -100t-74 -83t-90 -68.5t-106.5 -42t-128 -16.5h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224q48 0 87 15t69 45t51 61.5t45 77.5q32 62 78 171q29 66 49.5 111 t54 105t64 100t74 83t90 68.5t106.5 42t128 16.5h256v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22q-17 -2 -30.5 9t-17.5 29v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281 q0 130 71 248.5t191 204.5t286 136.5t348 50.5q244 0 450 -85.5t326 -233t120 -321.5z" />
-<glyph unicode="" d="M1536 704v-128q0 -201 -98.5 -362t-274 -251.5t-395.5 -90.5t-395.5 90.5t-274 251.5t-98.5 362v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-128q0 -52 23.5 -90t53.5 -57t71 -30t64 -13t44 -2t44 2t64 13t71 30t53.5 57t23.5 90v128q0 26 19 45t45 19h384 q26 0 45 -19t19 -45zM512 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45zM1536 1344v-384q0 -26 -19 -45t-45 -19h-384q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h384q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1683 205l-166 -165q-19 -19 -45 -19t-45 19l-531 531l-531 -531q-19 -19 -45 -19t-45 19l-166 165q-19 19 -19 45.5t19 45.5l742 741q19 19 45 19t45 -19l742 -741q19 -19 19 -45.5t-19 -45.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1683 728l-742 -741q-19 -19 -45 -19t-45 19l-742 741q-19 19 -19 45.5t19 45.5l166 165q19 19 45 19t45 -19l531 -531l531 531q19 19 45 19t45 -19l166 -165q19 -19 19 -45.5t-19 -45.5z" />
-<glyph unicode="" horiz-adv-x="1920" d="M1280 32q0 -13 -9.5 -22.5t-22.5 -9.5h-960q-8 0 -13.5 2t-9 7t-5.5 8t-3 11.5t-1 11.5v13v11v160v416h-192q-26 0 -45 19t-19 45q0 24 15 41l320 384q19 22 49 22t49 -22l320 -384q15 -17 15 -41q0 -26 -19 -45t-45 -19h-192v-384h576q16 0 25 -11l160 -192q7 -11 7 -21 zM1920 448q0 -24 -15 -41l-320 -384q-20 -23 -49 -23t-49 23l-320 384q-15 17 -15 41q0 26 19 45t45 19h192v384h-576q-16 0 -25 12l-160 192q-7 9 -7 20q0 13 9.5 22.5t22.5 9.5h960q8 0 13.5 -2t9 -7t5.5 -8t3 -11.5t1 -11.5v-13v-11v-160v-416h192q26 0 45 -19t19 -45z " />
-<glyph unicode="" horiz-adv-x="1664" d="M640 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1536 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1664 1088v-512q0 -24 -16 -42.5t-41 -21.5 l-1044 -122q1 -7 4.5 -21.5t6 -26.5t2.5 -22q0 -16 -24 -64h920q26 0 45 -19t19 -45t-19 -45t-45 -19h-1024q-26 0 -45 19t-19 45q0 14 11 39.5t29.5 59.5t20.5 38l-177 823h-204q-26 0 -45 19t-19 45t19 45t45 19h256q16 0 28.5 -6.5t20 -15.5t13 -24.5t7.5 -26.5 t5.5 -29.5t4.5 -25.5h1201q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-<glyph unicode="" horiz-adv-x="1920" d="M1879 584q0 -31 -31 -66l-336 -396q-43 -51 -120.5 -86.5t-143.5 -35.5h-1088q-34 0 -60.5 13t-26.5 43q0 31 31 66l336 396q43 51 120.5 86.5t143.5 35.5h1088q34 0 60.5 -13t26.5 -43zM1536 928v-160h-832q-94 0 -197 -47.5t-164 -119.5l-337 -396l-5 -6q0 4 -0.5 12.5 t-0.5 12.5v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158z" />
-<glyph unicode="" horiz-adv-x="768" d="M704 1216q0 -26 -19 -45t-45 -19h-128v-1024h128q26 0 45 -19t19 -45t-19 -45l-256 -256q-19 -19 -45 -19t-45 19l-256 256q-19 19 -19 45t19 45t45 19h128v1024h-128q-26 0 -45 19t-19 45t19 45l256 256q19 19 45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -26 -19 -45l-256 -256q-19 -19 -45 -19t-45 19t-19 45v128h-1024v-128q0 -26 -19 -45t-45 -19t-45 19l-256 256q-19 19 -19 45t19 45l256 256q19 19 45 19t45 -19t19 -45v-128h1024v128q0 26 19 45t45 19t45 -19l256 -256q19 -19 19 -45z" />
-<glyph unicode="" horiz-adv-x="2048" d="M640 640v-512h-256v512h256zM1024 1152v-1024h-256v1024h256zM2048 0v-128h-2048v1536h128v-1408h1920zM1408 896v-768h-256v768h256zM1792 1280v-1152h-256v1152h256z" />
-<glyph unicode="" d="M1280 926q-56 -25 -121 -34q68 40 93 117q-65 -38 -134 -51q-61 66 -153 66q-87 0 -148.5 -61.5t-61.5 -148.5q0 -29 5 -48q-129 7 -242 65t-192 155q-29 -50 -29 -106q0 -114 91 -175q-47 1 -100 26v-2q0 -75 50 -133.5t123 -72.5q-29 -8 -51 -8q-13 0 -39 4 q21 -63 74.5 -104t121.5 -42q-116 -90 -261 -90q-26 0 -50 3q148 -94 322 -94q112 0 210 35.5t168 95t120.5 137t75 162t24.5 168.5q0 18 -1 27q63 45 105 109zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5 t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" d="M1536 160q0 -119 -84.5 -203.5t-203.5 -84.5h-192v608h203l30 224h-233v143q0 54 28 83t96 29l132 1v207q-96 9 -180 9q-136 0 -218 -80.5t-82 -225.5v-166h-224v-224h224v-608h-544q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960 q119 0 203.5 -84.5t84.5 -203.5v-960z" />
-<glyph unicode="" horiz-adv-x="1792" d="M928 704q0 14 -9 23t-23 9q-66 0 -113 -47t-47 -113q0 -14 9 -23t23 -9t23 9t9 23q0 40 28 68t68 28q14 0 23 9t9 23zM1152 574q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM128 0h1536v128h-1536v-128zM1280 574q0 159 -112.5 271.5 t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM256 1216h384v128h-384v-128zM128 1024h1536v118v138h-828l-64 -128h-644v-128zM1792 1280v-1280q0 -53 -37.5 -90.5t-90.5 -37.5h-1536q-53 0 -90.5 37.5t-37.5 90.5v1280 q0 53 37.5 90.5t90.5 37.5h1536q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M832 1024q0 80 -56 136t-136 56t-136 -56t-56 -136q0 -42 19 -83q-41 19 -83 19q-80 0 -136 -56t-56 -136t56 -136t136 -56t136 56t56 136q0 42 -19 83q41 -19 83 -19q80 0 136 56t56 136zM1683 320q0 -17 -49 -66t-66 -49q-9 0 -28.5 16t-36.5 33t-38.5 40t-24.5 26 l-96 -96l220 -220q28 -28 28 -68q0 -42 -39 -81t-81 -39q-40 0 -68 28l-671 671q-176 -131 -365 -131q-163 0 -265.5 102.5t-102.5 265.5q0 160 95 313t248 248t313 95q163 0 265.5 -102.5t102.5 -265.5q0 -189 -131 -365l355 -355l96 96q-3 3 -26 24.5t-40 38.5t-33 36.5 t-16 28.5q0 17 49 66t66 49q13 0 23 -10q6 -6 46 -44.5t82 -79.5t86.5 -86t73 -78t28.5 -41z" />
-<glyph unicode="" horiz-adv-x="1920" d="M896 640q0 106 -75 181t-181 75t-181 -75t-75 -181t75 -181t181 -75t181 75t75 181zM1664 128q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1152q0 52 -38 90t-90 38t-90 -38t-38 -90q0 -53 37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1280 731v-185q0 -10 -7 -19.5t-16 -10.5l-155 -24q-11 -35 -32 -76q34 -48 90 -115q7 -10 7 -20q0 -12 -7 -19q-23 -30 -82.5 -89.5t-78.5 -59.5q-11 0 -21 7l-115 90q-37 -19 -77 -31q-11 -108 -23 -155q-7 -24 -30 -24h-186q-11 0 -20 7.5t-10 17.5 l-23 153q-34 10 -75 31l-118 -89q-7 -7 -20 -7q-11 0 -21 8q-144 133 -144 160q0 9 7 19q10 14 41 53t47 61q-23 44 -35 82l-152 24q-10 1 -17 9.5t-7 19.5v185q0 10 7 19.5t16 10.5l155 24q11 35 32 76q-34 48 -90 115q-7 11 -7 20q0 12 7 20q22 30 82 89t79 59q11 0 21 -7 l115 -90q34 18 77 32q11 108 23 154q7 24 30 24h186q11 0 20 -7.5t10 -17.5l23 -153q34 -10 75 -31l118 89q8 7 20 7q11 0 21 -8q144 -133 144 -160q0 -9 -7 -19q-12 -16 -42 -54t-45 -60q23 -48 34 -82l152 -23q10 -2 17 -10.5t7 -19.5zM1920 198v-140q0 -16 -149 -31 q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20 t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31zM1920 1222v-140q0 -16 -149 -31q-12 -27 -30 -52q51 -113 51 -138q0 -4 -4 -7q-122 -71 -124 -71q-8 0 -46 47t-52 68 q-20 -2 -30 -2t-30 2q-14 -21 -52 -68t-46 -47q-2 0 -124 71q-4 3 -4 7q0 25 51 138q-18 25 -30 52q-149 15 -149 31v140q0 16 149 31q13 29 30 52q-51 113 -51 138q0 4 4 7q4 2 35 20t59 34t30 16q8 0 46 -46.5t52 -67.5q20 2 30 2t30 -2q51 71 92 112l6 2q4 0 124 -70 q4 -3 4 -7q0 -25 -51 -138q17 -23 30 -52q149 -15 149 -31z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1408 768q0 -139 -94 -257t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224 q0 139 94 257t256.5 186.5t353.5 68.5t353.5 -68.5t256.5 -186.5t94 -257zM1792 512q0 -120 -71 -224.5t-195 -176.5q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7 q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230z" />
-<glyph unicode="" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 768q0 51 -39 89.5t-89 38.5h-352q0 58 48 159.5t48 160.5q0 98 -32 145t-128 47q-26 -26 -38 -85t-30.5 -125.5t-59.5 -109.5q-22 -23 -77 -91q-4 -5 -23 -30t-31.5 -41t-34.5 -42.5 t-40 -44t-38.5 -35.5t-40 -27t-35.5 -9h-32v-640h32q13 0 31.5 -3t33 -6.5t38 -11t35 -11.5t35.5 -12.5t29 -10.5q211 -73 342 -73h121q192 0 192 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5q32 1 53.5 47t21.5 81zM1536 769 q0 -89 -49 -163q9 -33 9 -69q0 -77 -38 -144q3 -21 3 -43q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5h-36h-93q-96 0 -189.5 22.5t-216.5 65.5q-116 40 -138 40h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h274q36 24 137 155q58 75 107 128 q24 25 35.5 85.5t30.5 126.5t62 108q39 37 90 37q84 0 151 -32.5t102 -101.5t35 -186q0 -93 -48 -192h176q104 0 180 -76t76 -179z" />
-<glyph unicode="" d="M256 1088q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 512q0 35 -21.5 81t-53.5 47q15 17 25 47.5t10 55.5q0 69 -53 119q18 32 18 69t-17.5 73.5t-47.5 52.5q5 30 5 56q0 85 -49 126t-136 41h-128q-131 0 -342 -73q-5 -2 -29 -10.5 t-35.5 -12.5t-35 -11.5t-38 -11t-33 -6.5t-31.5 -3h-32v-640h32q16 0 35.5 -9t40 -27t38.5 -35.5t40 -44t34.5 -42.5t31.5 -41t23 -30q55 -68 77 -91q41 -43 59.5 -109.5t30.5 -125.5t38 -85q96 0 128 47t32 145q0 59 -48 160.5t-48 159.5h352q50 0 89 38.5t39 89.5z M1536 511q0 -103 -76 -179t-180 -76h-176q48 -99 48 -192q0 -118 -35 -186q-35 -69 -102 -101.5t-151 -32.5q-51 0 -90 37q-34 33 -54 82t-25.5 90.5t-17.5 84.5t-31 64q-48 50 -107 127q-101 131 -137 155h-274q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5 h288q22 0 138 40q128 44 223 66t200 22h112q140 0 226.5 -79t85.5 -216v-5q60 -77 60 -178q0 -22 -3 -43q38 -67 38 -144q0 -36 -9 -69q49 -74 49 -163z" />
-<glyph unicode="" horiz-adv-x="896" d="M832 1504v-1339l-449 -236q-22 -12 -40 -12q-21 0 -31.5 14.5t-10.5 35.5q0 6 2 20l86 500l-364 354q-25 27 -25 48q0 37 56 46l502 73l225 455q19 41 49 41z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1664 940q0 81 -21.5 143t-55 98.5t-81.5 59.5t-94 31t-98 8t-112 -25.5t-110.5 -64t-86.5 -72t-60 -61.5q-18 -22 -49 -22t-49 22q-24 28 -60 61.5t-86.5 72t-110.5 64t-112 25.5t-98 -8t-94 -31t-81.5 -59.5t-55 -98.5t-21.5 -143q0 -168 187 -355l581 -560l580 559 q188 188 188 356zM1792 940q0 -221 -229 -450l-623 -600q-18 -18 -44 -18t-44 18l-624 602q-10 8 -27.5 26t-55.5 65.5t-68 97.5t-53.5 121t-23.5 138q0 220 127 344t351 124q62 0 126.5 -21.5t120 -58t95.5 -68.5t76 -68q36 36 76 68t95.5 68.5t120 58t126.5 21.5 q224 0 351 -124t127 -344z" />
-<glyph unicode="" horiz-adv-x="1664" d="M640 96q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-119 0 -203.5 84.5t-84.5 203.5v704q0 119 84.5 203.5t203.5 84.5h320q13 0 22.5 -9.5t9.5 -22.5q0 -4 1 -20t0.5 -26.5t-3 -23.5t-10 -19.5t-20.5 -6.5h-320q-66 0 -113 -47t-47 -113v-704 q0 -66 47 -113t113 -47h288h11h13t11.5 -1t11.5 -3t8 -5.5t7 -9t2 -13.5zM1568 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45z" />
-<glyph unicode="" d="M237 122h231v694h-231v-694zM483 1030q-1 52 -36 86t-93 34t-94.5 -34t-36.5 -86q0 -51 35.5 -85.5t92.5 -34.5h1q59 0 95 34.5t36 85.5zM1068 122h231v398q0 154 -73 233t-193 79q-136 0 -209 -117h2v101h-231q3 -66 0 -694h231v388q0 38 7 56q15 35 45 59.5t74 24.5 q116 0 116 -157v-371zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1152" d="M480 672v448q0 14 -9 23t-23 9t-23 -9t-9 -23v-448q0 -14 9 -23t23 -9t23 9t9 23zM1152 320q0 -26 -19 -45t-45 -19h-429l-51 -483q-2 -12 -10.5 -20.5t-20.5 -8.5h-1q-27 0 -32 27l-76 485h-404q-26 0 -45 19t-19 45q0 123 78.5 221.5t177.5 98.5v512q-52 0 -90 38 t-38 90t38 90t90 38h640q52 0 90 -38t38 -90t-38 -90t-90 -38v-512q99 0 177.5 -98.5t78.5 -221.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1408 608v-320q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v320 q0 14 9 23t23 9h64q14 0 23 -9t9 -23zM1792 1472v-512q0 -26 -19 -45t-45 -19t-45 19l-176 176l-652 -652q-10 -10 -23 -10t-23 10l-114 114q-10 10 -10 23t10 23l652 652l-176 176q-19 19 -19 45t19 45t45 19h512q26 0 45 -19t19 -45z" />
-<glyph unicode="" d="M1184 640q0 -26 -19 -45l-544 -544q-19 -19 -45 -19t-45 19t-19 45v288h-448q-26 0 -45 19t-19 45v384q0 26 19 45t45 19h448v288q0 26 19 45t45 19t45 -19l544 -544q19 -19 19 -45zM1536 992v-704q0 -119 -84.5 -203.5t-203.5 -84.5h-320q-13 0 -22.5 9.5t-9.5 22.5 q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q66 0 113 47t47 113v704q0 66 -47 113t-113 47h-288h-11h-13t-11.5 1t-11.5 3t-8 5.5t-7 9t-2 13.5q0 4 -1 20t-0.5 26.5t3 23.5t10 19.5t20.5 6.5h320q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1664" d="M458 653q-74 162 -74 371h-256v-96q0 -78 94.5 -162t235.5 -113zM1536 928v96h-256q0 -209 -74 -371q141 29 235.5 113t94.5 162zM1664 1056v-128q0 -71 -41.5 -143t-112 -130t-173 -97.5t-215.5 -44.5q-42 -54 -95 -95q-38 -34 -52.5 -72.5t-14.5 -89.5q0 -54 30.5 -91 t97.5 -37q75 0 133.5 -45.5t58.5 -114.5v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 69 58.5 114.5t133.5 45.5q67 0 97.5 37t30.5 91q0 51 -14.5 89.5t-52.5 72.5q-53 41 -95 95q-113 5 -215.5 44.5t-173 97.5t-112 130t-41.5 143v128q0 40 28 68t68 28h288v96 q0 66 47 113t113 47h576q66 0 113 -47t47 -113v-96h288q40 0 68 -28t28 -68z" />
-<glyph unicode="" d="M394 184q-8 -9 -20 3q-13 11 -4 19q8 9 20 -3q12 -11 4 -19zM352 245q9 -12 0 -19q-8 -6 -17 7t0 18q9 7 17 -6zM291 305q-5 -7 -13 -2q-10 5 -7 12q3 5 13 2q10 -5 7 -12zM322 271q-6 -7 -16 3q-9 11 -2 16q6 6 16 -3q9 -11 2 -16zM451 159q-4 -12 -19 -6q-17 4 -13 15 t19 7q16 -5 13 -16zM514 154q0 -11 -16 -11q-17 -2 -17 11q0 11 16 11q17 2 17 -11zM572 164q2 -10 -14 -14t-18 8t14 15q16 2 18 -9zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-224q-16 0 -24.5 1t-19.5 5t-16 14.5t-5 27.5v239q0 97 -52 142q57 6 102.5 18t94 39 t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103 q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -103t0.5 -68q0 -22 -11 -33.5t-22 -13t-33 -1.5 h-224q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1280 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 288v-320q0 -40 -28 -68t-68 -28h-1472q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h427q21 -56 70.5 -92 t110.5 -36h256q61 0 110.5 36t70.5 92h427q40 0 68 -28t28 -68zM1339 936q-17 -40 -59 -40h-256v-448q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v448h-256q-42 0 -59 40q-17 39 14 69l448 448q18 19 45 19t45 -19l448 -448q31 -30 14 -69z" />
-<glyph unicode="" d="M1407 710q0 44 -7 113.5t-18 96.5q-12 30 -17 44t-9 36.5t-4 48.5q0 23 5 68.5t5 67.5q0 37 -10 55q-4 1 -13 1q-19 0 -58 -4.5t-59 -4.5q-60 0 -176 24t-175 24q-43 0 -94.5 -11.5t-85 -23.5t-89.5 -34q-137 -54 -202 -103q-96 -73 -159.5 -189.5t-88 -236t-24.5 -248.5 q0 -40 12.5 -120t12.5 -121q0 -23 -11 -66.5t-11 -65.5t12 -36.5t34 -14.5q24 0 72.5 11t73.5 11q57 0 169.5 -15.5t169.5 -15.5q181 0 284 36q129 45 235.5 152.5t166 245.5t59.5 275zM1535 712q0 -165 -70 -327.5t-196 -288t-281 -180.5q-124 -44 -326 -44 q-57 0 -170 14.5t-169 14.5q-24 0 -72.5 -14.5t-73.5 -14.5q-73 0 -123.5 55.5t-50.5 128.5q0 24 11 68t11 67q0 40 -12.5 120.5t-12.5 121.5q0 111 18 217.5t54.5 209.5t100.5 194t150 156q78 59 232 120q194 78 316 78q60 0 175.5 -24t173.5 -24q19 0 57 5t58 5 q81 0 118 -50.5t37 -134.5q0 -23 -5 -68t-5 -68q0 -10 1 -18.5t3 -17t4 -13.5t6.5 -16t6.5 -17q16 -40 25 -118.5t9 -136.5z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1408 296q0 -27 -10 -70.5t-21 -68.5q-21 -50 -122 -106q-94 -51 -186 -51q-27 0 -52.5 3.5t-57.5 12.5t-47.5 14.5t-55.5 20.5t-49 18q-98 35 -175 83q-128 79 -264.5 215.5t-215.5 264.5q-48 77 -83 175q-3 9 -18 49t-20.5 55.5t-14.5 47.5t-12.5 57.5t-3.5 52.5 q0 92 51 186q56 101 106 122q25 11 68.5 21t70.5 10q14 0 21 -3q18 -6 53 -76q11 -19 30 -54t35 -63.5t31 -53.5q3 -4 17.5 -25t21.5 -35.5t7 -28.5q0 -20 -28.5 -50t-62 -55t-62 -53t-28.5 -46q0 -9 5 -22.5t8.5 -20.5t14 -24t11.5 -19q76 -137 174 -235t235 -174 q2 -1 19 -11.5t24 -14t20.5 -8.5t22.5 -5q18 0 46 28.5t53 62t55 62t50 28.5q14 0 28.5 -7t35.5 -21.5t25 -17.5q25 -15 53.5 -31t63.5 -35t54 -30q70 -35 76 -53q3 -7 3 -21z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1120 1280h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113v832q0 66 -47 113t-113 47zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832 q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1280" d="M1152 1280h-1024v-1242l423 406l89 85l89 -85l423 -406v1242zM1164 1408q23 0 44 -9q33 -13 52.5 -41t19.5 -62v-1289q0 -34 -19.5 -62t-52.5 -41q-19 -8 -44 -8q-48 0 -83 32l-441 424l-441 -424q-36 -33 -83 -33q-23 0 -44 9q-33 13 -52.5 41t-19.5 62v1289 q0 34 19.5 62t52.5 41q21 9 44 9h1048z" />
-<glyph unicode="" d="M1280 343q0 11 -2 16q-3 8 -38.5 29.5t-88.5 49.5l-53 29q-5 3 -19 13t-25 15t-21 5q-18 0 -47 -32.5t-57 -65.5t-44 -33q-7 0 -16.5 3.5t-15.5 6.5t-17 9.5t-14 8.5q-99 55 -170.5 126.5t-126.5 170.5q-2 3 -8.5 14t-9.5 17t-6.5 15.5t-3.5 16.5q0 13 20.5 33.5t45 38.5 t45 39.5t20.5 36.5q0 10 -5 21t-15 25t-13 19q-3 6 -15 28.5t-25 45.5t-26.5 47.5t-25 40.5t-16.5 18t-16 2q-48 0 -101 -22q-46 -21 -80 -94.5t-34 -130.5q0 -16 2.5 -34t5 -30.5t9 -33t10 -29.5t12.5 -33t11 -30q60 -164 216.5 -320.5t320.5 -216.5q6 -2 30 -11t33 -12.5 t29.5 -10t33 -9t30.5 -5t34 -2.5q57 0 130.5 34t94.5 80q22 53 22 101zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1620 1128q-67 -98 -162 -167q1 -14 1 -42q0 -130 -38 -259.5t-115.5 -248.5t-184.5 -210.5t-258 -146t-323 -54.5q-271 0 -496 145q35 -4 78 -4q225 0 401 138q-105 2 -188 64.5t-114 159.5q33 -5 61 -5q43 0 85 11q-112 23 -185.5 111.5t-73.5 205.5v4q68 -38 146 -41 q-66 44 -105 115t-39 154q0 88 44 163q121 -149 294.5 -238.5t371.5 -99.5q-8 38 -8 74q0 134 94.5 228.5t228.5 94.5q140 0 236 -102q109 21 205 78q-37 -115 -142 -178q93 10 186 50z" />
-<glyph unicode="" horiz-adv-x="1024" d="M959 1524v-264h-157q-86 0 -116 -36t-30 -108v-189h293l-39 -296h-254v-759h-306v759h-255v296h255v218q0 186 104 288.5t277 102.5q147 0 228 -12z" />
-<glyph unicode="" d="M1536 640q0 -251 -146.5 -451.5t-378.5 -277.5q-27 -5 -39.5 7t-12.5 30v211q0 97 -52 142q57 6 102.5 18t94 39t81 66.5t53 105t20.5 150.5q0 121 -79 206q37 91 -8 204q-28 9 -81 -11t-92 -44l-38 -24q-93 26 -192 26t-192 -26q-16 11 -42.5 27t-83.5 38.5t-86 13.5 q-44 -113 -7 -204q-79 -85 -79 -206q0 -85 20.5 -150t52.5 -105t80.5 -67t94 -39t102.5 -18q-40 -36 -49 -103q-21 -10 -45 -15t-57 -5t-65.5 21.5t-55.5 62.5q-19 32 -48.5 52t-49.5 24l-20 3q-21 0 -29 -4.5t-5 -11.5t9 -14t13 -12l7 -5q22 -10 43.5 -38t31.5 -51l10 -23 q13 -38 44 -61.5t67 -30t69.5 -7t55.5 3.5l23 4q0 -38 0.5 -89t0.5 -54q0 -18 -13 -30t-40 -7q-232 77 -378.5 277.5t-146.5 451.5q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1664 960v-256q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45v256q0 106 -75 181t-181 75t-181 -75t-75 -181v-192h96q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h672v192q0 185 131.5 316.5t316.5 131.5 t316.5 -131.5t131.5 -316.5z" />
-<glyph unicode="" horiz-adv-x="1920" d="M1760 1408q66 0 113 -47t47 -113v-1216q0 -66 -47 -113t-113 -47h-1600q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1600zM160 1280q-13 0 -22.5 -9.5t-9.5 -22.5v-224h1664v224q0 13 -9.5 22.5t-22.5 9.5h-1600zM1760 0q13 0 22.5 9.5t9.5 22.5v608h-1664v-608 q0 -13 9.5 -22.5t22.5 -9.5h1600zM256 128v128h256v-128h-256zM640 128v128h384v-128h-384z" />
-<glyph unicode="" horiz-adv-x="1408" d="M384 192q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM896 69q2 -28 -17 -48q-18 -21 -47 -21h-135q-25 0 -43 16.5t-20 41.5q-22 229 -184.5 391.5t-391.5 184.5q-25 2 -41.5 20t-16.5 43v135q0 29 21 47q17 17 43 17h5q160 -13 306 -80.5 t259 -181.5q114 -113 181.5 -259t80.5 -306zM1408 67q2 -27 -18 -47q-18 -20 -46 -20h-143q-26 0 -44.5 17.5t-19.5 42.5q-12 215 -101 408.5t-231.5 336t-336 231.5t-408.5 102q-25 1 -42.5 19.5t-17.5 43.5v143q0 28 20 46q18 18 44 18h3q262 -13 501.5 -120t425.5 -294 q187 -186 294 -425.5t120 -501.5z" />
-<glyph unicode="" d="M1040 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1296 320q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5zM1408 160v320q0 13 -9.5 22.5t-22.5 9.5 h-1216q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h1216q13 0 22.5 9.5t9.5 22.5zM178 640h1180l-157 482q-4 13 -16 21.5t-26 8.5h-782q-14 0 -26 -8.5t-16 -21.5zM1536 480v-320q0 -66 -47 -113t-113 -47h-1216q-66 0 -113 47t-47 113v320q0 25 16 75 l197 606q17 53 63 86t101 33h782q55 0 101 -33t63 -86l197 -606q16 -50 16 -75z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1664 896q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5v-384q0 -52 -38 -90t-90 -38q-417 347 -812 380q-58 -19 -91 -66t-31 -100.5t40 -92.5q-20 -33 -23 -65.5t6 -58t33.5 -55t48 -50t61.5 -50.5q-29 -58 -111.5 -83t-168.5 -11.5t-132 55.5q-7 23 -29.5 87.5 t-32 94.5t-23 89t-15 101t3.5 98.5t22 110.5h-122q-66 0 -113 47t-47 113v192q0 66 47 113t113 47h480q435 0 896 384q52 0 90 -38t38 -90v-384zM1536 292v954q-394 -302 -768 -343v-270q377 -42 768 -341z" />
-<glyph unicode="" horiz-adv-x="1792" d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM246 128h1300q-266 300 -266 832q0 51 -24 105t-69 103t-121.5 80.5t-169.5 31.5t-169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -532 -266 -832z M1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5 t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
-<glyph unicode="" d="M1376 640l138 -135q30 -28 20 -70q-12 -41 -52 -51l-188 -48l53 -186q12 -41 -19 -70q-29 -31 -70 -19l-186 53l-48 -188q-10 -40 -51 -52q-12 -2 -19 -2q-31 0 -51 22l-135 138l-135 -138q-28 -30 -70 -20q-41 11 -51 52l-48 188l-186 -53q-41 -12 -70 19q-31 29 -19 70 l53 186l-188 48q-40 10 -52 51q-10 42 20 70l138 135l-138 135q-30 28 -20 70q12 41 52 51l188 48l-53 186q-12 41 19 70q29 31 70 19l186 -53l48 188q10 41 51 51q41 12 70 -19l135 -139l135 139q29 30 70 19q41 -10 51 -51l48 -188l186 53q41 12 70 -19q31 -29 19 -70 l-53 -186l188 -48q40 -10 52 -51q10 -42 -20 -70z" />
-<glyph unicode="" horiz-adv-x="1792" d="M256 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1664 768q0 51 -39 89.5t-89 38.5h-576q0 20 15 48.5t33 55t33 68t15 84.5q0 67 -44.5 97.5t-115.5 30.5q-24 0 -90 -139q-24 -44 -37 -65q-40 -64 -112 -145q-71 -81 -101 -106 q-69 -57 -140 -57h-32v-640h32q72 0 167 -32t193.5 -64t179.5 -32q189 0 189 167q0 26 -5 56q30 16 47.5 52.5t17.5 73.5t-18 69q53 50 53 119q0 25 -10 55.5t-25 47.5h331q52 0 90 38t38 90zM1792 769q0 -105 -75.5 -181t-180.5 -76h-169q-4 -62 -37 -119q3 -21 3 -43 q0 -101 -60 -178q1 -139 -85 -219.5t-227 -80.5q-133 0 -322 69q-164 59 -223 59h-288q-53 0 -90.5 37.5t-37.5 90.5v640q0 53 37.5 90.5t90.5 37.5h288q10 0 21.5 4.5t23.5 14t22.5 18t24 22.5t20.5 21.5t19 21.5t14 17q65 74 100 129q13 21 33 62t37 72t40.5 63t55 49.5 t69.5 17.5q125 0 206.5 -67t81.5 -189q0 -68 -22 -128h374q104 0 180 -76t76 -179z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1376 128h32v640h-32q-35 0 -67.5 12t-62.5 37t-50 46t-49 54q-2 3 -3.5 4.5t-4 4.5t-4.5 5q-72 81 -112 145q-14 22 -38 68q-1 3 -10.5 22.5t-18.5 36t-20 35.5t-21.5 30.5t-18.5 11.5q-71 0 -115.5 -30.5t-44.5 -97.5q0 -43 15 -84.5t33 -68t33 -55t15 -48.5h-576 q-50 0 -89 -38.5t-39 -89.5q0 -52 38 -90t90 -38h331q-15 -17 -25 -47.5t-10 -55.5q0 -69 53 -119q-18 -32 -18 -69t17.5 -73.5t47.5 -52.5q-4 -24 -4 -56q0 -85 48.5 -126t135.5 -41q84 0 183 32t194 64t167 32zM1664 192q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45 t45 -19t45 19t19 45zM1792 768v-640q0 -53 -37.5 -90.5t-90.5 -37.5h-288q-59 0 -223 -59q-190 -69 -317 -69q-142 0 -230 77.5t-87 217.5l1 5q-61 76 -61 178q0 22 3 43q-33 57 -37 119h-169q-105 0 -180.5 76t-75.5 181q0 103 76 179t180 76h374q-22 60 -22 128 q0 122 81.5 189t206.5 67q38 0 69.5 -17.5t55 -49.5t40.5 -63t37 -72t33 -62q35 -55 100 -129q2 -3 14 -17t19 -21.5t20.5 -21.5t24 -22.5t22.5 -18t23.5 -14t21.5 -4.5h288q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="" d="M1280 -64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 700q0 189 -167 189q-26 0 -56 -5q-16 30 -52.5 47.5t-73.5 17.5t-69 -18q-50 53 -119 53q-25 0 -55.5 -10t-47.5 -25v331q0 52 -38 90t-90 38q-51 0 -89.5 -39t-38.5 -89v-576 q-20 0 -48.5 15t-55 33t-68 33t-84.5 15q-67 0 -97.5 -44.5t-30.5 -115.5q0 -24 139 -90q44 -24 65 -37q64 -40 145 -112q81 -71 106 -101q57 -69 57 -140v-32h640v32q0 72 32 167t64 193.5t32 179.5zM1536 705q0 -133 -69 -322q-59 -164 -59 -223v-288q0 -53 -37.5 -90.5 t-90.5 -37.5h-640q-53 0 -90.5 37.5t-37.5 90.5v288q0 10 -4.5 21.5t-14 23.5t-18 22.5t-22.5 24t-21.5 20.5t-21.5 19t-17 14q-74 65 -129 100q-21 13 -62 33t-72 37t-63 40.5t-49.5 55t-17.5 69.5q0 125 67 206.5t189 81.5q68 0 128 -22v374q0 104 76 180t179 76 q105 0 181 -75.5t76 -180.5v-169q62 -4 119 -37q21 3 43 3q101 0 178 -60q139 1 219.5 -85t80.5 -227z" />
-<glyph unicode="" d="M1408 576q0 84 -32 183t-64 194t-32 167v32h-640v-32q0 -35 -12 -67.5t-37 -62.5t-46 -50t-54 -49q-9 -8 -14 -12q-81 -72 -145 -112q-22 -14 -68 -38q-3 -1 -22.5 -10.5t-36 -18.5t-35.5 -20t-30.5 -21.5t-11.5 -18.5q0 -71 30.5 -115.5t97.5 -44.5q43 0 84.5 15t68 33 t55 33t48.5 15v-576q0 -50 38.5 -89t89.5 -39q52 0 90 38t38 90v331q46 -35 103 -35q69 0 119 53q32 -18 69 -18t73.5 17.5t52.5 47.5q24 -4 56 -4q85 0 126 48.5t41 135.5zM1280 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1536 580 q0 -142 -77.5 -230t-217.5 -87l-5 1q-76 -61 -178 -61q-22 0 -43 3q-54 -30 -119 -37v-169q0 -105 -76 -180.5t-181 -75.5q-103 0 -179 76t-76 180v374q-54 -22 -128 -22q-121 0 -188.5 81.5t-67.5 206.5q0 38 17.5 69.5t49.5 55t63 40.5t72 37t62 33q55 35 129 100 q3 2 17 14t21.5 19t21.5 20.5t22.5 24t18 22.5t14 23.5t4.5 21.5v288q0 53 37.5 90.5t90.5 37.5h640q53 0 90.5 -37.5t37.5 -90.5v-288q0 -59 59 -223q69 -190 69 -317z" />
-<glyph unicode="" d="M1280 576v128q0 26 -19 45t-45 19h-502l189 189q19 19 19 45t-19 45l-91 91q-18 18 -45 18t-45 -18l-362 -362l-91 -91q-18 -18 -18 -45t18 -45l91 -91l362 -362q18 -18 45 -18t45 18l91 91q18 18 18 45t-18 45l-189 189h502q26 0 45 19t19 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1285 640q0 27 -18 45l-91 91l-362 362q-18 18 -45 18t-45 -18l-91 -91q-18 -18 -18 -45t18 -45l189 -189h-502q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h502l-189 -189q-19 -19 -19 -45t19 -45l91 -91q18 -18 45 -18t45 18l362 362l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1284 641q0 27 -18 45l-362 362l-91 91q-18 18 -45 18t-45 -18l-91 -91l-362 -362q-18 -18 -18 -45t18 -45l91 -91q18 -18 45 -18t45 18l189 189v-502q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v502l189 -189q19 -19 45 -19t45 19l91 91q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1284 639q0 27 -18 45l-91 91q-18 18 -45 18t-45 -18l-189 -189v502q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-502l-189 189q-19 19 -45 19t-45 -19l-91 -91q-18 -18 -18 -45t18 -45l362 -362l91 -91q18 -18 45 -18t45 18l91 91l362 362q18 18 18 45zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1042 887q-2 -1 -9.5 -9.5t-13.5 -9.5q2 0 4.5 5t5 11t3.5 7q6 7 22 15q14 6 52 12q34 8 51 -11 q-2 2 9.5 13t14.5 12q3 2 15 4.5t15 7.5l2 22q-12 -1 -17.5 7t-6.5 21q0 -2 -6 -8q0 7 -4.5 8t-11.5 -1t-9 -1q-10 3 -15 7.5t-8 16.5t-4 15q-2 5 -9.5 10.5t-9.5 10.5q-1 2 -2.5 5.5t-3 6.5t-4 5.5t-5.5 2.5t-7 -5t-7.5 -10t-4.5 -5q-3 2 -6 1.5t-4.5 -1t-4.5 -3t-5 -3.5 q-3 -2 -8.5 -3t-8.5 -2q15 5 -1 11q-10 4 -16 3q9 4 7.5 12t-8.5 14h5q-1 4 -8.5 8.5t-17.5 8.5t-13 6q-8 5 -34 9.5t-33 0.5q-5 -6 -4.5 -10.5t4 -14t3.5 -12.5q1 -6 -5.5 -13t-6.5 -12q0 -7 14 -15.5t10 -21.5q-3 -8 -16 -16t-16 -12q-5 -8 -1.5 -18.5t10.5 -16.5 q2 -2 1.5 -4t-3.5 -4.5t-5.5 -4t-6.5 -3.5l-3 -2q-11 -5 -20.5 6t-13.5 26q-7 25 -16 30q-23 8 -29 -1q-5 13 -41 26q-25 9 -58 4q6 1 0 15q-7 15 -19 12q3 6 4 17.5t1 13.5q3 13 12 23q1 1 7 8.5t9.5 13.5t0.5 6q35 -4 50 11q5 5 11.5 17t10.5 17q9 6 14 5.5t14.5 -5.5 t14.5 -5q14 -1 15.5 11t-7.5 20q12 -1 3 17q-5 7 -8 9q-12 4 -27 -5q-8 -4 2 -8q-1 1 -9.5 -10.5t-16.5 -17.5t-16 5q-1 1 -5.5 13.5t-9.5 13.5q-8 0 -16 -15q3 8 -11 15t-24 8q19 12 -8 27q-7 4 -20.5 5t-19.5 -4q-5 -7 -5.5 -11.5t5 -8t10.5 -5.5t11.5 -4t8.5 -3 q14 -10 8 -14q-2 -1 -8.5 -3.5t-11.5 -4.5t-6 -4q-3 -4 0 -14t-2 -14q-5 5 -9 17.5t-7 16.5q7 -9 -25 -6l-10 1q-4 0 -16 -2t-20.5 -1t-13.5 8q-4 8 0 20q1 4 4 2q-4 3 -11 9.5t-10 8.5q-46 -15 -94 -41q6 -1 12 1q5 2 13 6.5t10 5.5q34 14 42 7l5 5q14 -16 20 -25 q-7 4 -30 1q-20 -6 -22 -12q7 -12 5 -18q-4 3 -11.5 10t-14.5 11t-15 5q-16 0 -22 -1q-146 -80 -235 -222q7 -7 12 -8q4 -1 5 -9t2.5 -11t11.5 3q9 -8 3 -19q1 1 44 -27q19 -17 21 -21q3 -11 -10 -18q-1 2 -9 9t-9 4q-3 -5 0.5 -18.5t10.5 -12.5q-7 0 -9.5 -16t-2.5 -35.5 t-1 -23.5l2 -1q-3 -12 5.5 -34.5t21.5 -19.5q-13 -3 20 -43q6 -8 8 -9q3 -2 12 -7.5t15 -10t10 -10.5q4 -5 10 -22.5t14 -23.5q-2 -6 9.5 -20t10.5 -23q-1 0 -2.5 -1t-2.5 -1q3 -7 15.5 -14t15.5 -13q1 -3 2 -10t3 -11t8 -2q2 20 -24 62q-15 25 -17 29q-3 5 -5.5 15.5 t-4.5 14.5q2 0 6 -1.5t8.5 -3.5t7.5 -4t2 -3q-3 -7 2 -17.5t12 -18.5t17 -19t12 -13q6 -6 14 -19.5t0 -13.5q9 0 20 -10t17 -20q5 -8 8 -26t5 -24q2 -7 8.5 -13.5t12.5 -9.5l16 -8t13 -7q5 -2 18.5 -10.5t21.5 -11.5q10 -4 16 -4t14.5 2.5t13.5 3.5q15 2 29 -15t21 -21 q36 -19 55 -11q-2 -1 0.5 -7.5t8 -15.5t9 -14.5t5.5 -8.5q5 -6 18 -15t18 -15q6 4 7 9q-3 -8 7 -20t18 -10q14 3 14 32q-31 -15 -49 18q0 1 -2.5 5.5t-4 8.5t-2.5 8.5t0 7.5t5 3q9 0 10 3.5t-2 12.5t-4 13q-1 8 -11 20t-12 15q-5 -9 -16 -8t-16 9q0 -1 -1.5 -5.5t-1.5 -6.5 q-13 0 -15 1q1 3 2.5 17.5t3.5 22.5q1 4 5.5 12t7.5 14.5t4 12.5t-4.5 9.5t-17.5 2.5q-19 -1 -26 -20q-1 -3 -3 -10.5t-5 -11.5t-9 -7q-7 -3 -24 -2t-24 5q-13 8 -22.5 29t-9.5 37q0 10 2.5 26.5t3 25t-5.5 24.5q3 2 9 9.5t10 10.5q2 1 4.5 1.5t4.5 0t4 1.5t3 6q-1 1 -4 3 q-3 3 -4 3q7 -3 28.5 1.5t27.5 -1.5q15 -11 22 2q0 1 -2.5 9.5t-0.5 13.5q5 -27 29 -9q3 -3 15.5 -5t17.5 -5q3 -2 7 -5.5t5.5 -4.5t5 0.5t8.5 6.5q10 -14 12 -24q11 -40 19 -44q7 -3 11 -2t4.5 9.5t0 14t-1.5 12.5l-1 8v18l-1 8q-15 3 -18.5 12t1.5 18.5t15 18.5q1 1 8 3.5 t15.5 6.5t12.5 8q21 19 15 35q7 0 11 9q-1 0 -5 3t-7.5 5t-4.5 2q9 5 2 16q5 3 7.5 11t7.5 10q9 -12 21 -2q7 8 1 16q5 7 20.5 10.5t18.5 9.5q7 -2 8 2t1 12t3 12q4 5 15 9t13 5l17 11q3 4 0 4q18 -2 31 11q10 11 -6 20q3 6 -3 9.5t-15 5.5q3 1 11.5 0.5t10.5 1.5 q15 10 -7 16q-17 5 -43 -12zM879 10q206 36 351 189q-3 3 -12.5 4.5t-12.5 3.5q-18 7 -24 8q1 7 -2.5 13t-8 9t-12.5 8t-11 7q-2 2 -7 6t-7 5.5t-7.5 4.5t-8.5 2t-10 -1l-3 -1q-3 -1 -5.5 -2.5t-5.5 -3t-4 -3t0 -2.5q-21 17 -36 22q-5 1 -11 5.5t-10.5 7t-10 1.5t-11.5 -7 q-5 -5 -6 -15t-2 -13q-7 5 0 17.5t2 18.5q-3 6 -10.5 4.5t-12 -4.5t-11.5 -8.5t-9 -6.5t-8.5 -5.5t-8.5 -7.5q-3 -4 -6 -12t-5 -11q-2 4 -11.5 6.5t-9.5 5.5q2 -10 4 -35t5 -38q7 -31 -12 -48q-27 -25 -29 -40q-4 -22 12 -26q0 -7 -8 -20.5t-7 -21.5q0 -6 2 -16z" />
-<glyph unicode="" horiz-adv-x="1664" d="M384 64q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1028 484l-682 -682q-37 -37 -90 -37q-52 0 -91 37l-106 108q-38 36 -38 90q0 53 38 91l681 681q39 -98 114.5 -173.5t173.5 -114.5zM1662 919q0 -39 -23 -106q-47 -134 -164.5 -217.5 t-258.5 -83.5q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q58 0 121.5 -16.5t107.5 -46.5q16 -11 16 -28t-16 -28l-293 -169v-224l193 -107q5 3 79 48.5t135.5 81t70.5 35.5q15 0 23.5 -10t8.5 -25z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1024 128h640v128h-640v-128zM640 640h1024v128h-1024v-128zM1280 1152h384v128h-384v-128zM1792 320v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 832v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19 t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45zM1792 1344v-256q0 -26 -19 -45t-45 -19h-1664q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1664q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1403 1241q17 -41 -14 -70l-493 -493v-742q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-256 256q-19 19 -19 45v486l-493 493q-31 29 -14 70q17 39 59 39h1280q42 0 59 -39z" />
-<glyph unicode="" horiz-adv-x="1792" d="M640 1280h512v128h-512v-128zM1792 640v-480q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v480h672v-160q0 -26 19 -45t45 -19h320q26 0 45 19t19 45v160h672zM1024 640v-128h-256v128h256zM1792 1120v-384h-1792v384q0 66 47 113t113 47h352v160q0 40 28 68 t68 28h576q40 0 68 -28t28 -68v-160h352q66 0 113 -47t47 -113z" />
-<glyph unicode="" d="M1283 995l-355 -355l355 -355l144 144q29 31 70 14q39 -17 39 -59v-448q0 -26 -19 -45t-45 -19h-448q-42 0 -59 40q-17 39 14 69l144 144l-355 355l-355 -355l144 -144q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l144 -144 l355 355l-355 355l-144 -144q-19 -19 -45 -19q-12 0 -24 5q-40 17 -40 59v448q0 26 19 45t45 19h448q42 0 59 -40q17 -39 -14 -69l-144 -144l355 -355l355 355l-144 144q-31 30 -14 69q17 40 59 40h448q26 0 45 -19t19 -45v-448q0 -42 -39 -59q-13 -5 -25 -5q-26 0 -45 19z " />
-<glyph unicode="" horiz-adv-x="1920" d="M593 640q-162 -5 -265 -128h-134q-82 0 -138 40.5t-56 118.5q0 353 124 353q6 0 43.5 -21t97.5 -42.5t119 -21.5q67 0 133 23q-5 -37 -5 -66q0 -139 81 -256zM1664 3q0 -120 -73 -189.5t-194 -69.5h-874q-121 0 -194 69.5t-73 189.5q0 53 3.5 103.5t14 109t26.5 108.5 t43 97.5t62 81t85.5 53.5t111.5 20q10 0 43 -21.5t73 -48t107 -48t135 -21.5t135 21.5t107 48t73 48t43 21.5q61 0 111.5 -20t85.5 -53.5t62 -81t43 -97.5t26.5 -108.5t14 -109t3.5 -103.5zM640 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75 t75 -181zM1344 896q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5t271.5 -112.5t112.5 -271.5zM1920 671q0 -78 -56 -118.5t-138 -40.5h-134q-103 123 -265 128q81 117 81 256q0 29 -5 66q66 -23 133 -23q59 0 119 21.5t97.5 42.5 t43.5 21q124 0 124 -353zM1792 1280q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1456 320q0 40 -28 68l-208 208q-28 28 -68 28q-42 0 -72 -32q3 -3 19 -18.5t21.5 -21.5t15 -19t13 -25.5t3.5 -27.5q0 -40 -28 -68t-68 -28q-15 0 -27.5 3.5t-25.5 13t-19 15t-21.5 21.5t-18.5 19q-33 -31 -33 -73q0 -40 28 -68l206 -207q27 -27 68 -27q40 0 68 26 l147 146q28 28 28 67zM753 1025q0 40 -28 68l-206 207q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l208 -208q27 -27 68 -27q42 0 72 31q-3 3 -19 18.5t-21.5 21.5t-15 19t-13 25.5t-3.5 27.5q0 40 28 68t68 28q15 0 27.5 -3.5t25.5 -13t19 -15 t21.5 -21.5t18.5 -19q33 31 33 73zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-206 207q-83 83 -83 203q0 123 88 209l-88 88q-86 -88 -208 -88q-120 0 -204 84l-208 208q-84 84 -84 204t85 203l147 146q83 83 203 83q121 0 204 -85l206 -207 q83 -83 83 -203q0 -123 -88 -209l88 -88q86 88 208 88q120 0 204 -84l208 -208q84 -84 84 -204z" />
-<glyph unicode="" horiz-adv-x="1920" d="M1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088q-185 0 -316.5 131.5t-131.5 316.5q0 132 71 241.5t187 163.5q-2 28 -2 43q0 212 150 362t362 150q158 0 286.5 -88t187.5 -230q70 62 166 62q106 0 181 -75t75 -181q0 -75 -41 -138q129 -30 213 -134.5t84 -239.5z " />
-<glyph unicode="" horiz-adv-x="1664" d="M1527 88q56 -89 21.5 -152.5t-140.5 -63.5h-1152q-106 0 -140.5 63.5t21.5 152.5l503 793v399h-64q-26 0 -45 19t-19 45t19 45t45 19h512q26 0 45 -19t19 -45t-19 -45t-45 -19h-64v-399zM748 813l-272 -429h712l-272 429l-20 31v37v399h-128v-399v-37z" />
-<glyph unicode="" horiz-adv-x="1792" d="M960 640q26 0 45 -19t19 -45t-19 -45t-45 -19t-45 19t-19 45t19 45t45 19zM1260 576l507 -398q28 -20 25 -56q-5 -35 -35 -51l-128 -64q-13 -7 -29 -7q-17 0 -31 8l-690 387l-110 -66q-8 -4 -12 -5q14 -49 10 -97q-7 -77 -56 -147.5t-132 -123.5q-132 -84 -277 -84 q-136 0 -222 78q-90 84 -79 207q7 76 56 147t131 124q132 84 278 84q83 0 151 -31q9 13 22 22l122 73l-122 73q-13 9 -22 22q-68 -31 -151 -31q-146 0 -278 84q-82 53 -131 124t-56 147q-5 59 15.5 113t63.5 93q85 79 222 79q145 0 277 -84q83 -52 132 -123t56 -148 q4 -48 -10 -97q4 -1 12 -5l110 -66l690 387q14 8 31 8q16 0 29 -7l128 -64q30 -16 35 -51q3 -36 -25 -56zM579 836q46 42 21 108t-106 117q-92 59 -192 59q-74 0 -113 -36q-46 -42 -21 -108t106 -117q92 -59 192 -59q74 0 113 36zM494 91q81 51 106 117t-21 108 q-39 36 -113 36q-100 0 -192 -59q-81 -51 -106 -117t21 -108q39 -36 113 -36q100 0 192 59zM672 704l96 -58v11q0 36 33 56l14 8l-79 47l-26 -26q-3 -3 -10 -11t-12 -12q-2 -2 -4 -3.5t-3 -2.5zM896 480l96 -32l736 576l-128 64l-768 -431v-113l-160 -96l9 -8q2 -2 7 -6 q4 -4 11 -12t11 -12l26 -26zM1600 64l128 64l-520 408l-177 -138q-2 -3 -13 -7z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1696 1152q40 0 68 -28t28 -68v-1216q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v288h-544q-40 0 -68 28t-28 68v672q0 40 20 88t48 76l408 408q28 28 76 48t88 20h416q40 0 68 -28t28 -68v-328q68 40 128 40h416zM1152 939l-299 -299h299v299zM512 1323l-299 -299 h299v299zM708 676l316 316v416h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h512v256q0 40 20 88t48 76zM1664 -128v1152h-384v-416q0 -40 -28 -68t-68 -28h-416v-640h896z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1404 151q0 -117 -79 -196t-196 -79q-135 0 -235 100l-777 776q-113 115 -113 271q0 159 110 270t269 111q158 0 273 -113l605 -606q10 -10 10 -22q0 -16 -30.5 -46.5t-46.5 -30.5q-13 0 -23 10l-606 607q-79 77 -181 77q-106 0 -179 -75t-73 -181q0 -105 76 -181 l776 -777q63 -63 145 -63q64 0 106 42t42 106q0 82 -63 145l-581 581q-26 24 -60 24q-29 0 -48 -19t-19 -48q0 -32 25 -59l410 -410q10 -10 10 -22q0 -16 -31 -47t-47 -31q-12 0 -22 10l-410 410q-63 61 -63 149q0 82 57 139t139 57q88 0 149 -63l581 -581q100 -98 100 -235 z" />
-<glyph unicode="" d="M384 0h768v384h-768v-384zM1280 0h128v896q0 14 -10 38.5t-20 34.5l-281 281q-10 10 -34 20t-39 10v-416q0 -40 -28 -68t-68 -28h-576q-40 0 -68 28t-28 68v416h-128v-1280h128v416q0 40 28 68t68 28h832q40 0 68 -28t28 -68v-416zM896 928v320q0 13 -9.5 22.5t-22.5 9.5 h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5zM1536 896v-928q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h928q40 0 88 -20t76 -48l280 -280q28 -28 48 -76t20 -88z" />
-<glyph unicode="" d="M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" d="M1536 192v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 704v-128q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1536 1216v-128q0 -26 -19 -45 t-45 -19h-1408q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1792" d="M384 128q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM384 640q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 224v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5 t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1152q0 -80 -56 -136t-136 -56t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z M1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M381 -84q0 -80 -54.5 -126t-135.5 -46q-106 0 -172 66l57 88q49 -45 106 -45q29 0 50.5 14.5t21.5 42.5q0 64 -105 56l-26 56q8 10 32.5 43.5t42.5 54t37 38.5v1q-16 0 -48.5 -1t-48.5 -1v-53h-106v152h333v-88l-95 -115q51 -12 81 -49t30 -88zM383 543v-159h-362 q-6 36 -6 54q0 51 23.5 93t56.5 68t66 47.5t56.5 43.5t23.5 45q0 25 -14.5 38.5t-39.5 13.5q-46 0 -81 -58l-85 59q24 51 71.5 79.5t105.5 28.5q73 0 123 -41.5t50 -112.5q0 -50 -34 -91.5t-75 -64.5t-75.5 -50.5t-35.5 -52.5h127v60h105zM1792 224v-192q0 -13 -9.5 -22.5 t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM384 1123v-99h-335v99h107q0 41 0.5 122t0.5 121v12h-2q-8 -17 -50 -54l-71 76l136 127h106v-404h108zM1792 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5 t-9.5 22.5v192q0 14 9 23t23 9h1216q13 0 22.5 -9.5t9.5 -22.5zM1792 1248v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1216q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1216q13 0 22.5 -9.5t9.5 -22.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1760 640q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-1728q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h1728zM483 704q-28 35 -51 80q-48 97 -48 188q0 181 134 309q133 127 393 127q50 0 167 -19q66 -12 177 -48q10 -38 21 -118q14 -123 14 -183q0 -18 -5 -45l-12 -3l-84 6 l-14 2q-50 149 -103 205q-88 91 -210 91q-114 0 -182 -59q-67 -58 -67 -146q0 -73 66 -140t279 -129q69 -20 173 -66q58 -28 95 -52h-743zM990 448h411q7 -39 7 -92q0 -111 -41 -212q-23 -55 -71 -104q-37 -35 -109 -81q-80 -48 -153 -66q-80 -21 -203 -21q-114 0 -195 23 l-140 40q-57 16 -72 28q-8 8 -8 22v13q0 108 -2 156q-1 30 0 68l2 37v44l102 2q15 -34 30 -71t22.5 -56t12.5 -27q35 -57 80 -94q43 -36 105 -57q59 -22 132 -22q64 0 139 27q77 26 122 86q47 61 47 129q0 84 -81 157q-34 29 -137 71z" />
-<glyph unicode="" d="M48 1313q-37 2 -45 4l-3 88q13 1 40 1q60 0 112 -4q132 -7 166 -7q86 0 168 3q116 4 146 5q56 0 86 2l-1 -14l2 -64v-9q-60 -9 -124 -9q-60 0 -79 -25q-13 -14 -13 -132q0 -13 0.5 -32.5t0.5 -25.5l1 -229l14 -280q6 -124 51 -202q35 -59 96 -92q88 -47 177 -47 q104 0 191 28q56 18 99 51q48 36 65 64q36 56 53 114q21 73 21 229q0 79 -3.5 128t-11 122.5t-13.5 159.5l-4 59q-5 67 -24 88q-34 35 -77 34l-100 -2l-14 3l2 86h84l205 -10q76 -3 196 10l18 -2q6 -38 6 -51q0 -7 -4 -31q-45 -12 -84 -13q-73 -11 -79 -17q-15 -15 -15 -41 q0 -7 1.5 -27t1.5 -31q8 -19 22 -396q6 -195 -15 -304q-15 -76 -41 -122q-38 -65 -112 -123q-75 -57 -182 -89q-109 -33 -255 -33q-167 0 -284 46q-119 47 -179 122q-61 76 -83 195q-16 80 -16 237v333q0 188 -17 213q-25 36 -147 39zM1536 -96v64q0 14 -9 23t-23 9h-1472 q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h1472q14 0 23 9t9 23z" />
-<glyph unicode="" horiz-adv-x="1664" d="M512 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 160v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23 v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM512 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 160v192 q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1024 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 544v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192 q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1536 928v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM1664 1248v-1088q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1344q66 0 113 -47t47 -113 z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1190 955l293 293l-107 107l-293 -293zM1637 1248q0 -27 -18 -45l-1286 -1286q-18 -18 -45 -18t-45 18l-198 198q-18 18 -18 45t18 45l1286 1286q18 18 45 18t45 -18l198 -198q18 -18 18 -45zM286 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM636 1276 l196 -60l-196 -60l-60 -196l-60 196l-196 60l196 60l60 196zM1566 798l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98zM926 1438l98 -30l-98 -30l-30 -98l-30 98l-98 30l98 30l30 98z" />
-<glyph unicode="" horiz-adv-x="1792" d="M640 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM256 640h384v256h-158q-13 0 -22 -9l-195 -195q-9 -9 -9 -22v-30zM1536 128q0 52 -38 90t-90 38t-90 -38t-38 -90t38 -90t90 -38t90 38t38 90zM1792 1216v-1024q0 -15 -4 -26.5t-13.5 -18.5 t-16.5 -11.5t-23.5 -6t-22.5 -2t-25.5 0t-22.5 0.5q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-64q-3 0 -22.5 -0.5t-25.5 0t-22.5 2t-23.5 6t-16.5 11.5t-13.5 18.5t-4 26.5q0 26 19 45t45 19v320q0 8 -0.5 35t0 38 t2.5 34.5t6.5 37t14 30.5t22.5 30l198 198q19 19 50.5 32t58.5 13h160v192q0 26 19 45t45 19h1024q26 0 45 -19t19 -45z" />
-<glyph unicode="" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103q-111 0 -218 32q59 93 78 164q9 34 54 211q20 -39 73 -67.5t114 -28.5q121 0 216 68.5t147 188.5t52 270q0 114 -59.5 214t-172.5 163t-255 63q-105 0 -196 -29t-154.5 -77t-109 -110.5t-67 -129.5t-21.5 -134 q0 -104 40 -183t117 -111q30 -12 38 20q2 7 8 31t8 30q6 23 -11 43q-51 61 -51 151q0 151 104.5 259.5t273.5 108.5q151 0 235.5 -82t84.5 -213q0 -170 -68.5 -289t-175.5 -119q-61 0 -98 43.5t-23 104.5q8 35 26.5 93.5t30 103t11.5 75.5q0 50 -27 83t-77 33 q-62 0 -105 -57t-43 -142q0 -73 25 -122l-99 -418q-17 -70 -13 -177q-206 91 -333 281t-127 423q0 209 103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-725q85 122 108 210q9 34 53 209q21 -39 73.5 -67t112.5 -28q181 0 295.5 147.5t114.5 373.5q0 84 -35 162.5t-96.5 139t-152.5 97t-197 36.5q-104 0 -194.5 -28.5t-153 -76.5 t-107.5 -109.5t-66.5 -128t-21.5 -132.5q0 -102 39.5 -180t116.5 -110q13 -5 23.5 0t14.5 19q10 44 15 61q6 23 -11 42q-50 62 -50 150q0 150 103.5 256.5t270.5 106.5q149 0 232.5 -81t83.5 -210q0 -168 -67.5 -286t-173.5 -118q-60 0 -97 43.5t-23 103.5q8 34 26.5 92.5 t29.5 102t11 74.5q0 49 -26.5 81.5t-75.5 32.5q-61 0 -103.5 -56.5t-42.5 -139.5q0 -72 24 -121l-98 -414q-24 -100 -7 -254h-183q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960z" />
-<glyph unicode="" d="M829 318q0 -76 -58.5 -112.5t-139.5 -36.5q-41 0 -80.5 9.5t-75.5 28.5t-58 53t-22 78q0 46 25 80t65.5 51.5t82 25t84.5 7.5q20 0 31 -2q2 -1 23 -16.5t26 -19t23 -18t24.5 -22t19 -22.5t17 -26t9 -26.5t4.5 -31.5zM755 863q0 -60 -33 -99.5t-92 -39.5q-53 0 -93 42.5 t-57.5 96.5t-17.5 106q0 61 32 104t92 43q53 0 93.5 -45t58 -101t17.5 -107zM861 1120l88 64h-265q-85 0 -161 -32t-127.5 -98t-51.5 -153q0 -93 64.5 -154.5t158.5 -61.5q22 0 43 3q-13 -29 -13 -54q0 -44 40 -94q-175 -12 -257 -63q-47 -29 -75.5 -73t-28.5 -95 q0 -43 18.5 -77.5t48.5 -56.5t69 -37t77.5 -21t76.5 -6q60 0 120.5 15.5t113.5 46t86 82.5t33 117q0 49 -20 89.5t-49 66.5t-58 47.5t-49 44t-20 44.5t15.5 42.5t37.5 39.5t44 42t37.5 59.5t15.5 82.5q0 60 -22.5 99.5t-72.5 90.5h83zM1152 672h128v64h-128v128h-64v-128 h-128v-64h128v-160h64v160zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1664" d="M735 740q0 -36 32 -70.5t77.5 -68t90.5 -73.5t77 -104t32 -142q0 -90 -48 -173q-72 -122 -211 -179.5t-298 -57.5q-132 0 -246.5 41.5t-171.5 137.5q-37 60 -37 131q0 81 44.5 150t118.5 115q131 82 404 100q-32 42 -47.5 74t-15.5 73q0 36 21 85q-46 -4 -68 -4 q-148 0 -249.5 96.5t-101.5 244.5q0 82 36 159t99 131q77 66 182.5 98t217.5 32h418l-138 -88h-131q74 -63 112 -133t38 -160q0 -72 -24.5 -129.5t-59 -93t-69.5 -65t-59.5 -61.5t-24.5 -66zM589 836q38 0 78 16.5t66 43.5q53 57 53 159q0 58 -17 125t-48.5 129.5 t-84.5 103.5t-117 41q-42 0 -82.5 -19.5t-65.5 -52.5q-47 -59 -47 -160q0 -46 10 -97.5t31.5 -103t52 -92.5t75 -67t96.5 -26zM591 -37q58 0 111.5 13t99 39t73 73t27.5 109q0 25 -7 49t-14.5 42t-27 41.5t-29.5 35t-38.5 34.5t-36.5 29t-41.5 30t-36.5 26q-16 2 -48 2 q-53 0 -105 -7t-107.5 -25t-97 -46t-68.5 -74.5t-27 -105.5q0 -70 35 -123.5t91.5 -83t119 -44t127.5 -14.5zM1401 839h213v-108h-213v-219h-105v219h-212v108h212v217h105v-217z" />
-<glyph unicode="" horiz-adv-x="1920" d="M768 384h384v96h-128v448h-114l-148 -137l77 -80q42 37 55 57h2v-288h-128v-96zM1280 640q0 -70 -21 -142t-59.5 -134t-101.5 -101t-138 -39t-138 39t-101.5 101t-59.5 134t-21 142t21 142t59.5 134t101.5 101t138 39t138 -39t101.5 -101t59.5 -134t21 -142zM1792 384 v512q-106 0 -181 75t-75 181h-1152q0 -106 -75 -181t-181 -75v-512q106 0 181 -75t75 -181h1152q0 106 75 181t181 75zM1920 1216v-1152q0 -26 -19 -45t-45 -19h-1792q-26 0 -45 19t-19 45v1152q0 26 19 45t45 19h1792q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1024" d="M1024 320q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="" horiz-adv-x="640" d="M640 1088v-896q0 -26 -19 -45t-45 -19t-45 19l-448 448q-19 19 -19 45t19 45l448 448q19 19 45 19t45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="640" d="M576 640q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19t-19 45v896q0 26 19 45t45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="" horiz-adv-x="1664" d="M160 0h608v1152h-640v-1120q0 -13 9.5 -22.5t22.5 -9.5zM1536 32v1120h-640v-1152h608q13 0 22.5 9.5t9.5 22.5zM1664 1248v-1216q0 -66 -47 -113t-113 -47h-1344q-66 0 -113 47t-47 113v1216q0 66 47 113t113 47h1344q66 0 113 -47t47 -113z" />
-<glyph unicode="" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45zM1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="" horiz-adv-x="1024" d="M1024 448q0 -26 -19 -45l-448 -448q-19 -19 -45 -19t-45 19l-448 448q-19 19 -19 45t19 45t45 19h896q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1024" d="M1024 832q0 -26 -19 -45t-45 -19h-896q-26 0 -45 19t-19 45t19 45l448 448q19 19 45 19t45 -19l448 -448q19 -19 19 -45z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 826v-794q0 -66 -47 -113t-113 -47h-1472q-66 0 -113 47t-47 113v794q44 -49 101 -87q362 -246 497 -345q57 -42 92.5 -65.5t94.5 -48t110 -24.5h1h1q51 0 110 24.5t94.5 48t92.5 65.5q170 123 498 345q57 39 100 87zM1792 1120q0 -79 -49 -151t-122 -123 q-376 -261 -468 -325q-10 -7 -42.5 -30.5t-54 -38t-52 -32.5t-57.5 -27t-50 -9h-1h-1q-23 0 -50 9t-57.5 27t-52 32.5t-54 38t-42.5 30.5q-91 64 -262 182.5t-205 142.5q-62 42 -117 115.5t-55 136.5q0 78 41.5 130t118.5 52h1472q65 0 112.5 -47t47.5 -113z" />
-<glyph unicode="" d="M349 911v-991h-330v991h330zM370 1217q1 -73 -50.5 -122t-135.5 -49h-2q-82 0 -132 49t-50 122q0 74 51.5 122.5t134.5 48.5t133 -48.5t51 -122.5zM1536 488v-568h-329v530q0 105 -40.5 164.5t-126.5 59.5q-63 0 -105.5 -34.5t-63.5 -85.5q-11 -30 -11 -81v-553h-329 q2 399 2 647t-1 296l-1 48h329v-144h-2q20 32 41 56t56.5 52t87 43.5t114.5 15.5q171 0 275 -113.5t104 -332.5z" />
-<glyph unicode="" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1771 0q0 -53 -37 -90l-107 -108q-39 -37 -91 -37q-53 0 -90 37l-363 364q-38 36 -38 90q0 53 43 96l-256 256l-126 -126q-14 -14 -34 -14t-34 14q2 -2 12.5 -12t12.5 -13t10 -11.5t10 -13.5t6 -13.5t5.5 -16.5t1.5 -18q0 -38 -28 -68q-3 -3 -16.5 -18t-19 -20.5 t-18.5 -16.5t-22 -15.5t-22 -9t-26 -4.5q-40 0 -68 28l-408 408q-28 28 -28 68q0 13 4.5 26t9 22t15.5 22t16.5 18.5t20.5 19t18 16.5q30 28 68 28q10 0 18 -1.5t16.5 -5.5t13.5 -6t13.5 -10t11.5 -10t13 -12.5t12 -12.5q-14 14 -14 34t14 34l348 348q14 14 34 14t34 -14 q-2 2 -12.5 12t-12.5 13t-10 11.5t-10 13.5t-6 13.5t-5.5 16.5t-1.5 18q0 38 28 68q3 3 16.5 18t19 20.5t18.5 16.5t22 15.5t22 9t26 4.5q40 0 68 -28l408 -408q28 -28 28 -68q0 -13 -4.5 -26t-9 -22t-15.5 -22t-16.5 -18.5t-20.5 -19t-18 -16.5q-30 -28 -68 -28 q-10 0 -18 1.5t-16.5 5.5t-13.5 6t-13.5 10t-11.5 10t-13 12.5t-12 12.5q14 -14 14 -34t-14 -34l-126 -126l256 -256q43 43 96 43q52 0 91 -37l363 -363q37 -39 37 -91z" />
-<glyph unicode="" horiz-adv-x="1792" d="M384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM576 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1004 351l101 382q6 26 -7.5 48.5t-38.5 29.5 t-48 -6.5t-30 -39.5l-101 -382q-60 -5 -107 -43.5t-63 -98.5q-20 -77 20 -146t117 -89t146 20t89 117q16 60 -6 117t-72 91zM1664 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1024 1024q0 53 -37.5 90.5 t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1472 832q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1792 384q0 -261 -141 -483q-19 -29 -54 -29h-1402q-35 0 -54 29 q-141 221 -141 483q0 182 71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-<glyph unicode="" horiz-adv-x="1792" d="M896 1152q-204 0 -381.5 -69.5t-282 -187.5t-104.5 -255q0 -112 71.5 -213.5t201.5 -175.5l87 -50l-27 -96q-24 -91 -70 -172q152 63 275 171l43 38l57 -6q69 -8 130 -8q204 0 381.5 69.5t282 187.5t104.5 255t-104.5 255t-282 187.5t-381.5 69.5zM1792 640 q0 -174 -120 -321.5t-326 -233t-450 -85.5q-70 0 -145 8q-198 -175 -460 -242q-49 -14 -114 -22h-5q-15 0 -27 10.5t-16 27.5v1q-3 4 -0.5 12t2 10t4.5 9.5l6 9t7 8.5t8 9q7 8 31 34.5t34.5 38t31 39.5t32.5 51t27 59t26 76q-157 89 -247.5 220t-90.5 281q0 174 120 321.5 t326 233t450 85.5t450 -85.5t326 -233t120 -321.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M704 1152q-153 0 -286 -52t-211.5 -141t-78.5 -191q0 -82 53 -158t149 -132l97 -56l-35 -84q34 20 62 39l44 31l53 -10q78 -14 153 -14q153 0 286 52t211.5 141t78.5 191t-78.5 191t-211.5 141t-286 52zM704 1280q191 0 353.5 -68.5t256.5 -186.5t94 -257t-94 -257 t-256.5 -186.5t-353.5 -68.5q-86 0 -176 16q-124 -88 -278 -128q-36 -9 -86 -16h-3q-11 0 -20.5 8t-11.5 21q-1 3 -1 6.5t0.5 6.5t2 6l2.5 5t3.5 5.5t4 5t4.5 5t4 4.5q5 6 23 25t26 29.5t22.5 29t25 38.5t20.5 44q-124 72 -195 177t-71 224q0 139 94 257t256.5 186.5 t353.5 68.5zM1526 111q10 -24 20.5 -44t25 -38.5t22.5 -29t26 -29.5t23 -25q1 -1 4 -4.5t4.5 -5t4 -5t3.5 -5.5l2.5 -5t2 -6t0.5 -6.5t-1 -6.5q-3 -14 -13 -22t-22 -7q-50 7 -86 16q-154 40 -278 128q-90 -16 -176 -16q-271 0 -472 132q58 -4 88 -4q161 0 309 45t264 129 q125 92 192 212t67 254q0 77 -23 152q129 -71 204 -178t75 -230q0 -120 -71 -224.5t-195 -176.5z" />
-<glyph unicode="" horiz-adv-x="896" d="M885 970q18 -20 7 -44l-540 -1157q-13 -25 -42 -25q-4 0 -14 2q-17 5 -25.5 19t-4.5 30l197 808l-406 -101q-4 -1 -12 -1q-18 0 -31 11q-18 15 -13 39l201 825q4 14 16 23t28 9h328q19 0 32 -12.5t13 -29.5q0 -8 -5 -18l-171 -463l396 98q8 2 12 2q19 0 34 -15z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 288v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192h-512v-192h96q40 0 68 -28t28 -68v-320 q0 -40 -28 -68t-68 -28h-320q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h96v192q0 52 38 90t90 38h512v192h-96q-40 0 -68 28t-28 68v320q0 40 28 68t68 28h320q40 0 68 -28t28 -68v-320q0 -40 -28 -68t-68 -28h-96v-192h512q52 0 90 -38t38 -90v-192h96q40 0 68 -28t28 -68 z" />
-<glyph unicode="" horiz-adv-x="1664" d="M896 708v-580q0 -104 -76 -180t-180 -76t-180 76t-76 180q0 26 19 45t45 19t45 -19t19 -45q0 -50 39 -89t89 -39t89 39t39 89v580q33 11 64 11t64 -11zM1664 681q0 -13 -9.5 -22.5t-22.5 -9.5q-11 0 -23 10q-49 46 -93 69t-102 23q-68 0 -128 -37t-103 -97 q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -28 -17q-18 0 -29 17q-4 6 -14.5 24t-17.5 28q-43 60 -102.5 97t-127.5 37t-127.5 -37t-102.5 -97q-7 -10 -17.5 -28t-14.5 -24q-11 -17 -29 -17q-17 0 -28 17q-4 6 -14.5 24t-17.5 28q-43 60 -103 97t-128 37q-58 0 -102 -23t-93 -69 q-12 -10 -23 -10q-13 0 -22.5 9.5t-9.5 22.5q0 5 1 7q45 183 172.5 319.5t298 204.5t360.5 68q140 0 274.5 -40t246.5 -113.5t194.5 -187t115.5 -251.5q1 -2 1 -7zM896 1408v-98q-42 2 -64 2t-64 -2v98q0 26 19 45t45 19t45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1792" d="M768 -128h896v640h-416q-40 0 -68 28t-28 68v416h-384v-1152zM1024 1312v64q0 13 -9.5 22.5t-22.5 9.5h-704q-13 0 -22.5 -9.5t-9.5 -22.5v-64q0 -13 9.5 -22.5t22.5 -9.5h704q13 0 22.5 9.5t9.5 22.5zM1280 640h299l-299 299v-299zM1792 512v-672q0 -40 -28 -68t-68 -28 h-960q-40 0 -68 28t-28 68v160h-544q-40 0 -68 28t-28 68v1344q0 40 28 68t68 28h1088q40 0 68 -28t28 -68v-328q21 -13 36 -28l408 -408q28 -28 48 -76t20 -88z" />
-<glyph unicode="" horiz-adv-x="1024" d="M736 960q0 -13 -9.5 -22.5t-22.5 -9.5t-22.5 9.5t-9.5 22.5q0 46 -54 71t-106 25q-13 0 -22.5 9.5t-9.5 22.5t9.5 22.5t22.5 9.5q50 0 99.5 -16t87 -54t37.5 -90zM896 960q0 72 -34.5 134t-90 101.5t-123 62t-136.5 22.5t-136.5 -22.5t-123 -62t-90 -101.5t-34.5 -134 q0 -101 68 -180q10 -11 30.5 -33t30.5 -33q128 -153 141 -298h228q13 145 141 298q10 11 30.5 33t30.5 33q68 79 68 180zM1024 960q0 -155 -103 -268q-45 -49 -74.5 -87t-59.5 -95.5t-34 -107.5q47 -28 47 -82q0 -37 -25 -64q25 -27 25 -64q0 -52 -45 -81q13 -23 13 -47 q0 -46 -31.5 -71t-77.5 -25q-20 -44 -60 -70t-87 -26t-87 26t-60 70q-46 0 -77.5 25t-31.5 71q0 24 13 47q-45 29 -45 81q0 37 25 64q-25 27 -25 64q0 54 47 82q-4 50 -34 107.5t-59.5 95.5t-74.5 87q-103 113 -103 268q0 99 44.5 184.5t117 142t164 89t186.5 32.5 t186.5 -32.5t164 -89t117 -142t44.5 -184.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 352v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-1376v-192q0 -13 -9.5 -22.5t-22.5 -9.5q-12 0 -24 10l-319 320q-9 9 -9 22q0 14 9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h1376q13 0 22.5 -9.5t9.5 -22.5zM1792 896q0 -14 -9 -23l-320 -320q-9 -9 -23 -9 q-13 0 -22.5 9.5t-9.5 22.5v192h-1376q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h1376v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23z" />
-<glyph unicode="" horiz-adv-x="1920" d="M1280 608q0 14 -9 23t-23 9h-224v352q0 13 -9.5 22.5t-22.5 9.5h-192q-13 0 -22.5 -9.5t-9.5 -22.5v-352h-224q-13 0 -22.5 -9.5t-9.5 -22.5q0 -14 9 -23l352 -352q9 -9 23 -9t23 9l351 351q10 12 10 24zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-<glyph unicode="" horiz-adv-x="1920" d="M1280 672q0 14 -9 23l-352 352q-9 9 -23 9t-23 -9l-351 -351q-10 -12 -10 -24q0 -14 9 -23t23 -9h224v-352q0 -13 9.5 -22.5t22.5 -9.5h192q13 0 22.5 9.5t9.5 22.5v352h224q13 0 22.5 9.5t9.5 22.5zM1920 384q0 -159 -112.5 -271.5t-271.5 -112.5h-1088 q-185 0 -316.5 131.5t-131.5 316.5q0 130 70 240t188 165q-2 30 -2 43q0 212 150 362t362 150q156 0 285.5 -87t188.5 -231q71 62 166 62q106 0 181 -75t75 -181q0 -76 -41 -138q130 -31 213.5 -135.5t83.5 -238.5z" />
-<glyph unicode="" horiz-adv-x="1408" d="M384 192q0 -26 -19 -45t-45 -19t-45 19t-19 45t19 45t45 19t45 -19t19 -45zM1408 131q0 -121 -73 -190t-194 -69h-874q-121 0 -194 69t-73 190q0 68 5.5 131t24 138t47.5 132.5t81 103t120 60.5q-22 -52 -22 -120v-203q-58 -20 -93 -70t-35 -111q0 -80 56 -136t136 -56 t136 56t56 136q0 61 -35.5 111t-92.5 70v203q0 62 25 93q132 -104 295 -104t295 104q25 -31 25 -93v-64q-106 0 -181 -75t-75 -181v-89q-32 -29 -32 -71q0 -40 28 -68t68 -28t68 28t28 68q0 42 -32 71v89q0 52 38 90t90 38t90 -38t38 -90v-89q-32 -29 -32 -71q0 -40 28 -68 t68 -28t68 28t28 68q0 42 -32 71v89q0 68 -34.5 127.5t-93.5 93.5q0 10 0.5 42.5t0 48t-2.5 41.5t-7 47t-13 40q68 -15 120 -60.5t81 -103t47.5 -132.5t24 -138t5.5 -131zM1088 1024q0 -159 -112.5 -271.5t-271.5 -112.5t-271.5 112.5t-112.5 271.5t112.5 271.5t271.5 112.5 t271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1280 832q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 832q0 -62 -35.5 -111t-92.5 -70v-395q0 -159 -131.5 -271.5t-316.5 -112.5t-316.5 112.5t-131.5 271.5v132q-164 20 -274 128t-110 252v512q0 26 19 45t45 19q6 0 16 -2q17 30 47 48 t65 18q53 0 90.5 -37.5t37.5 -90.5t-37.5 -90.5t-90.5 -37.5q-33 0 -64 18v-402q0 -106 94 -181t226 -75t226 75t94 181v402q-31 -18 -64 -18q-53 0 -90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5q35 0 65 -18t47 -48q10 2 16 2q26 0 45 -19t19 -45v-512q0 -144 -110 -252 t-274 -128v-132q0 -106 94 -181t226 -75t226 75t94 181v395q-57 21 -92.5 70t-35.5 111q0 80 56 136t136 56t136 -56t56 -136z" />
-<glyph unicode="" horiz-adv-x="1792" d="M640 1152h512v128h-512v-128zM288 1152v-1280h-64q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h64zM1408 1152v-1280h-1024v1280h128v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h128zM1792 928v-832q0 -92 -66 -158t-158 -66h-64v1280h64q92 0 158 -66 t66 -158z" />
-<glyph unicode="" horiz-adv-x="1792" d="M912 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM1728 128q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-181 75t-75 181h-448q-52 0 -90 38t-38 90q50 42 91 88t85 119.5t74.5 158.5 t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q190 -28 307 -158.5t117 -282.5q0 -139 19.5 -260t50 -206t74.5 -158.5t85 -119.5t91 -88z" />
-<glyph unicode="" horiz-adv-x="1920" d="M1664 896q0 80 -56 136t-136 56h-64v-384h64q80 0 136 56t56 136zM0 128h1792q0 -106 -75 -181t-181 -75h-1280q-106 0 -181 75t-75 181zM1856 896q0 -159 -112.5 -271.5t-271.5 -112.5h-64v-32q0 -92 -66 -158t-158 -66h-704q-92 0 -158 66t-66 158v736q0 26 19 45 t45 19h1152q159 0 271.5 -112.5t112.5 -271.5z" />
-<glyph unicode="" horiz-adv-x="1408" d="M640 1472v-640q0 -61 -35.5 -111t-92.5 -70v-779q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v779q-57 20 -92.5 70t-35.5 111v640q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45v-416q0 -26 19 -45 t45 -19t45 19t19 45v416q0 26 19 45t45 19t45 -19t19 -45zM1408 1472v-1600q0 -52 -38 -90t-90 -38h-128q-52 0 -90 38t-38 90v512h-224q-13 0 -22.5 9.5t-9.5 22.5v800q0 132 94 226t226 94h256q26 0 45 -19t19 -45z" />
-<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M384 736q0 14 9 23t23 9h704q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64zM1120 512q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704zM1120 256q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-704 q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h704z" />
-<glyph unicode="" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 992v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 1248v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1536h-1152v-1536h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM1408 1472v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1408" d="M384 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM384 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M1152 224v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM896 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M640 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 480v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5zM1152 736v-64q0 -13 -9.5 -22.5t-22.5 -9.5h-64q-13 0 -22.5 9.5t-9.5 22.5v64q0 13 9.5 22.5t22.5 9.5h64q13 0 22.5 -9.5t9.5 -22.5z M896 -128h384v1152h-256v-32q0 -40 -28 -68t-68 -28h-448q-40 0 -68 28t-28 68v32h-256v-1152h384v224q0 13 9.5 22.5t22.5 9.5h320q13 0 22.5 -9.5t9.5 -22.5v-224zM896 1056v320q0 13 -9.5 22.5t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-96h-128v96q0 13 -9.5 22.5 t-22.5 9.5h-64q-13 0 -22.5 -9.5t-9.5 -22.5v-320q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5v96h128v-96q0 -13 9.5 -22.5t22.5 -9.5h64q13 0 22.5 9.5t9.5 22.5zM1408 1088v-1280q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1280q0 26 19 45t45 19h320 v288q0 40 28 68t68 28h448q40 0 68 -28t28 -68v-288h320q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1920" d="M640 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM256 640h384v256h-158q-14 -2 -22 -9l-195 -195q-7 -12 -9 -22v-30zM1536 128q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5 t90.5 37.5t37.5 90.5zM1664 800v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM1920 1344v-1152 q0 -26 -19 -45t-45 -19h-192q0 -106 -75 -181t-181 -75t-181 75t-75 181h-384q0 -106 -75 -181t-181 -75t-181 75t-75 181h-128q-26 0 -45 19t-19 45t19 45t45 19v416q0 26 13 58t32 51l198 198q19 19 51 32t58 13h160v320q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1280 416v192q0 14 -9 23t-23 9h-224v224q0 14 -9 23t-23 9h-192q-14 0 -23 -9t-9 -23v-224h-224q-14 0 -23 -9t-9 -23v-192q0 -14 9 -23t23 -9h224v-224q0 -14 9 -23t23 -9h192q14 0 23 9t9 23v224h224q14 0 23 9t9 23zM640 1152h512v128h-512v-128zM256 1152v-1280h-32 q-92 0 -158 66t-66 158v832q0 92 66 158t158 66h32zM1440 1152v-1280h-1088v1280h160v160q0 40 28 68t68 28h576q40 0 68 -28t28 -68v-160h160zM1792 928v-832q0 -92 -66 -158t-158 -66h-32v1280h32q92 0 158 -66t66 -158z" />
-<glyph unicode="" horiz-adv-x="1920" d="M1920 576q-1 -32 -288 -96l-352 -32l-224 -64h-64l-293 -352h69q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-96h-160h-64v32h64v416h-160l-192 -224h-96l-32 32v192h32v32h128v8l-192 24v128l192 24v8h-128v32h-32v192l32 32h96l192 -224h160v416h-64v32h64h160h96 q26 0 45 -4.5t19 -11.5t-19 -11.5t-45 -4.5h-69l293 -352h64l224 -64l352 -32q261 -58 287 -93z" />
-<glyph unicode="" horiz-adv-x="1664" d="M640 640v384h-256v-256q0 -53 37.5 -90.5t90.5 -37.5h128zM1664 192v-192h-1152v192l128 192h-128q-159 0 -271.5 112.5t-112.5 271.5v320l-64 64l32 128h480l32 128h960l32 -192l-64 -32v-800z" />
-<glyph unicode="" d="M1280 192v896q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-512v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-896q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h512v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" d="M1280 576v128q0 26 -19 45t-45 19h-320v320q0 26 -19 45t-45 19h-128q-26 0 -45 -19t-19 -45v-320h-320q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h320v-320q0 -26 19 -45t45 -19h128q26 0 45 19t19 45v320h320q26 0 45 19t19 45zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1024" d="M627 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23zM1011 160q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23z" />
-<glyph unicode="" horiz-adv-x="1024" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM979 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23 l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="" horiz-adv-x="1152" d="M1075 224q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23zM1075 608q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393 q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="" horiz-adv-x="1152" d="M1075 672q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23zM1075 1056q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23 t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="" horiz-adv-x="640" d="M627 992q0 -13 -10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="" horiz-adv-x="640" d="M595 576q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="" horiz-adv-x="1152" d="M1075 352q0 -13 -10 -23l-50 -50q-10 -10 -23 -10t-23 10l-393 393l-393 -393q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l466 -466q10 -10 10 -23z" />
-<glyph unicode="" horiz-adv-x="1152" d="M1075 800q0 -13 -10 -23l-466 -466q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l393 -393l393 393q10 10 23 10t23 -10l50 -50q10 -10 10 -23z" />
-<glyph unicode="" horiz-adv-x="1920" d="M1792 544v832q0 13 -9.5 22.5t-22.5 9.5h-1600q-13 0 -22.5 -9.5t-9.5 -22.5v-832q0 -13 9.5 -22.5t22.5 -9.5h1600q13 0 22.5 9.5t9.5 22.5zM1920 1376v-1088q0 -66 -47 -113t-113 -47h-544q0 -37 16 -77.5t32 -71t16 -43.5q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19 t-19 45q0 14 16 44t32 70t16 78h-544q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h1600q66 0 113 -47t47 -113z" />
-<glyph unicode="" horiz-adv-x="1920" d="M416 256q-66 0 -113 47t-47 113v704q0 66 47 113t113 47h1088q66 0 113 -47t47 -113v-704q0 -66 -47 -113t-113 -47h-1088zM384 1120v-704q0 -13 9.5 -22.5t22.5 -9.5h1088q13 0 22.5 9.5t9.5 22.5v704q0 13 -9.5 22.5t-22.5 9.5h-1088q-13 0 -22.5 -9.5t-9.5 -22.5z M1760 192h160v-96q0 -40 -47 -68t-113 -28h-1600q-66 0 -113 28t-47 68v96h160h1600zM1040 96q16 0 16 16t-16 16h-160q-16 0 -16 -16t16 -16h160z" />
-<glyph unicode="" horiz-adv-x="1152" d="M640 128q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1024 288v960q0 13 -9.5 22.5t-22.5 9.5h-832q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h832q13 0 22.5 9.5t9.5 22.5zM1152 1248v-1088q0 -66 -47 -113t-113 -47h-832 q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h832q66 0 113 -47t47 -113z" />
-<glyph unicode="" horiz-adv-x="768" d="M464 128q0 33 -23.5 56.5t-56.5 23.5t-56.5 -23.5t-23.5 -56.5t23.5 -56.5t56.5 -23.5t56.5 23.5t23.5 56.5zM672 288v704q0 13 -9.5 22.5t-22.5 9.5h-512q-13 0 -22.5 -9.5t-9.5 -22.5v-704q0 -13 9.5 -22.5t22.5 -9.5h512q13 0 22.5 9.5t9.5 22.5zM480 1136 q0 16 -16 16h-160q-16 0 -16 -16t16 -16h160q16 0 16 16zM768 1152v-1024q0 -52 -38 -90t-90 -38h-512q-52 0 -90 38t-38 90v1024q0 52 38 90t90 38h512q52 0 90 -38t38 -90z" />
-<glyph unicode="" d="M768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103 t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" horiz-adv-x="1664" d="M768 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z M1664 576v-384q0 -80 -56 -136t-136 -56h-384q-80 0 -136 56t-56 136v704q0 104 40.5 198.5t109.5 163.5t163.5 109.5t198.5 40.5h64q26 0 45 -19t19 -45v-128q0 -26 -19 -45t-45 -19h-64q-106 0 -181 -75t-75 -181v-32q0 -40 28 -68t68 -28h224q80 0 136 -56t56 -136z" />
-<glyph unicode="" horiz-adv-x="1664" d="M768 1216v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136zM1664 1216 v-704q0 -104 -40.5 -198.5t-109.5 -163.5t-163.5 -109.5t-198.5 -40.5h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64q106 0 181 75t75 181v32q0 40 -28 68t-68 28h-224q-80 0 -136 56t-56 136v384q0 80 56 136t136 56h384q80 0 136 -56t56 -136z" />
-<glyph unicode="" horiz-adv-x="1568" d="M496 192q0 -60 -42.5 -102t-101.5 -42q-60 0 -102 42t-42 102t42 102t102 42q59 0 101.5 -42t42.5 -102zM928 0q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM320 640q0 -66 -47 -113t-113 -47t-113 47t-47 113 t47 113t113 47t113 -47t47 -113zM1360 192q0 -46 -33 -79t-79 -33t-79 33t-33 79t33 79t79 33t79 -33t33 -79zM528 1088q0 -73 -51.5 -124.5t-124.5 -51.5t-124.5 51.5t-51.5 124.5t51.5 124.5t124.5 51.5t124.5 -51.5t51.5 -124.5zM992 1280q0 -80 -56 -136t-136 -56 t-136 56t-56 136t56 136t136 56t136 -56t56 -136zM1536 640q0 -40 -28 -68t-68 -28t-68 28t-28 68t28 68t68 28t68 -28t28 -68zM1328 1088q0 -33 -23.5 -56.5t-56.5 -23.5t-56.5 23.5t-23.5 56.5t23.5 56.5t56.5 23.5t56.5 -23.5t23.5 -56.5z" />
-<glyph unicode="" d="M1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 416q0 -166 -127 -451q-3 -7 -10.5 -24t-13.5 -30t-13 -22q-12 -17 -28 -17q-15 0 -23.5 10t-8.5 25q0 9 2.5 26.5t2.5 23.5q5 68 5 123q0 101 -17.5 181t-48.5 138.5t-80 101t-105.5 69.5t-133 42.5t-154 21.5t-175.5 6h-224v-256q0 -26 -19 -45t-45 -19t-45 19 l-512 512q-19 19 -19 45t19 45l512 512q19 19 45 19t45 -19t19 -45v-256h224q713 0 875 -403q53 -134 53 -333z" />
-<glyph unicode="" horiz-adv-x="1664" d="M640 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1280 320q0 -40 -12.5 -82t-43 -76t-72.5 -34t-72.5 34t-43 76t-12.5 82t12.5 82t43 76t72.5 34t72.5 -34t43 -76t12.5 -82zM1440 320 q0 120 -69 204t-187 84q-41 0 -195 -21q-71 -11 -157 -11t-157 11q-152 21 -195 21q-118 0 -187 -84t-69 -204q0 -88 32 -153.5t81 -103t122 -60t140 -29.5t149 -7h168q82 0 149 7t140 29.5t122 60t81 103t32 153.5zM1664 496q0 -207 -61 -331q-38 -77 -105.5 -133t-141 -86 t-170 -47.5t-171.5 -22t-167 -4.5q-78 0 -142 3t-147.5 12.5t-152.5 30t-137 51.5t-121 81t-86 115q-62 123 -62 331q0 237 136 396q-27 82 -27 170q0 116 51 218q108 0 190 -39.5t189 -123.5q147 35 309 35q148 0 280 -32q105 82 187 121t189 39q51 -102 51 -218 q0 -87 -27 -168q136 -160 136 -398z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1536 224v704q0 40 -28 68t-68 28h-704q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68v-960q0 -40 28 -68t68 -28h1216q40 0 68 28t28 68zM1664 928v-704q0 -92 -66 -158t-158 -66h-1216q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320 q92 0 158 -66t66 -158v-32h672q92 0 158 -66t66 -158z" />
-<glyph unicode="" horiz-adv-x="1920" d="M1781 605q0 35 -53 35h-1088q-40 0 -85.5 -21.5t-71.5 -52.5l-294 -363q-18 -24 -18 -40q0 -35 53 -35h1088q40 0 86 22t71 53l294 363q18 22 18 39zM640 768h768v160q0 40 -28 68t-68 28h-576q-40 0 -68 28t-28 68v64q0 40 -28 68t-68 28h-320q-40 0 -68 -28t-28 -68 v-853l256 315q44 53 116 87.5t140 34.5zM1909 605q0 -62 -46 -120l-295 -363q-43 -53 -116 -87.5t-140 -34.5h-1088q-92 0 -158 66t-66 158v960q0 92 66 158t158 66h320q92 0 158 -66t66 -158v-32h544q92 0 158 -66t66 -158v-160h192q54 0 99 -24.5t67 -70.5q15 -32 15 -68z " />
-<glyph unicode="" horiz-adv-x="1792" />
-<glyph unicode="" horiz-adv-x="1792" />
-<glyph unicode="" d="M1134 461q-37 -121 -138 -195t-228 -74t-228 74t-138 195q-8 25 4 48.5t38 31.5q25 8 48.5 -4t31.5 -38q25 -80 92.5 -129.5t151.5 -49.5t151.5 49.5t92.5 129.5q8 26 32 38t49 4t37 -31.5t4 -48.5zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5 t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5 t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1134 307q8 -25 -4 -48.5t-37 -31.5t-49 4t-32 38q-25 80 -92.5 129.5t-151.5 49.5t-151.5 -49.5t-92.5 -129.5q-8 -26 -31.5 -38t-48.5 -4q-26 8 -38 31.5t-4 48.5q37 121 138 195t228 74t228 -74t138 -195zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204 t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1152 448q0 -26 -19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h640q26 0 45 -19t19 -45zM640 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1152 896q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5t37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" horiz-adv-x="1920" d="M832 448v128q0 14 -9 23t-23 9h-192v192q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-192h-192q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h192v-192q0 -14 9 -23t23 -9h128q14 0 23 9t9 23v192h192q14 0 23 9t9 23zM1408 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 640q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1920 512q0 -212 -150 -362t-362 -150q-192 0 -338 128h-220q-146 -128 -338 -128q-212 0 -362 150 t-150 362t150 362t362 150h896q212 0 362 -150t150 -362z" />
-<glyph unicode="" horiz-adv-x="1920" d="M384 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM512 624v-96q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h224q16 0 16 -16zM384 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 368v-96q0 -16 -16 -16 h-864q-16 0 -16 16v96q0 16 16 16h864q16 0 16 -16zM768 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM640 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1024 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16 h96q16 0 16 -16zM896 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1280 624v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 368v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1152 880v-96 q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1408 880v-96q0 -16 -16 -16h-96q-16 0 -16 16v96q0 16 16 16h96q16 0 16 -16zM1664 880v-352q0 -16 -16 -16h-224q-16 0 -16 16v96q0 16 16 16h112v240q0 16 16 16h96q16 0 16 -16zM1792 128v896h-1664v-896 h1664zM1920 1024v-896q0 -53 -37.5 -90.5t-90.5 -37.5h-1664q-53 0 -90.5 37.5t-37.5 90.5v896q0 53 37.5 90.5t90.5 37.5h1664q53 0 90.5 -37.5t37.5 -90.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1664 491v616q-169 -91 -306 -91q-82 0 -145 32q-100 49 -184 76.5t-178 27.5q-173 0 -403 -127v-599q245 113 433 113q55 0 103.5 -7.5t98 -26t77 -31t82.5 -39.5l28 -14q44 -22 101 -22q120 0 293 92zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9 h-64q-14 0 -23 9t-9 23v1266q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102 q-15 -9 -33 -9q-16 0 -32 8q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-<glyph unicode="" horiz-adv-x="1792" d="M832 536v192q-181 -16 -384 -117v-185q205 96 384 110zM832 954v197q-172 -8 -384 -126v-189q215 111 384 118zM1664 491v184q-235 -116 -384 -71v224q-20 6 -39 15q-5 3 -33 17t-34.5 17t-31.5 15t-34.5 15.5t-32.5 13t-36 12.5t-35 8.5t-39.5 7.5t-39.5 4t-44 2 q-23 0 -49 -3v-222h19q102 0 192.5 -29t197.5 -82q19 -9 39 -15v-188q42 -17 91 -17q120 0 293 92zM1664 918v189q-169 -91 -306 -91q-45 0 -78 8v-196q148 -42 384 90zM320 1280q0 -35 -17.5 -64t-46.5 -46v-1266q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v1266 q-29 17 -46.5 46t-17.5 64q0 53 37.5 90.5t90.5 37.5t90.5 -37.5t37.5 -90.5zM1792 1216v-763q0 -39 -35 -57q-10 -5 -17 -9q-218 -116 -369 -116q-88 0 -158 35l-28 14q-64 33 -99 48t-91 29t-114 14q-102 0 -235.5 -44t-228.5 -102q-15 -9 -33 -9q-16 0 -32 8 q-32 19 -32 56v742q0 35 31 55q35 21 78.5 42.5t114 52t152.5 49.5t155 19q112 0 209 -31t209 -86q38 -19 89 -19q122 0 310 112q22 12 31 17q31 16 62 -2q31 -20 31 -55z" />
-<glyph unicode="" horiz-adv-x="1664" d="M585 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23zM1664 96v-64q0 -14 -9 -23t-23 -9h-960q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h960q14 0 23 -9 t9 -23z" />
-<glyph unicode="" horiz-adv-x="1920" d="M617 137l-50 -50q-10 -10 -23 -10t-23 10l-466 466q-10 10 -10 23t10 23l466 466q10 10 23 10t23 -10l50 -50q10 -10 10 -23t-10 -23l-393 -393l393 -393q10 -10 10 -23t-10 -23zM1208 1204l-373 -1291q-4 -13 -15.5 -19.5t-23.5 -2.5l-62 17q-13 4 -19.5 15.5t-2.5 24.5 l373 1291q4 13 15.5 19.5t23.5 2.5l62 -17q13 -4 19.5 -15.5t2.5 -24.5zM1865 553l-466 -466q-10 -10 -23 -10t-23 10l-50 50q-10 10 -10 23t10 23l393 393l-393 393q-10 10 -10 23t10 23l50 50q10 10 23 10t23 -10l466 -466q10 -10 10 -23t-10 -23z" />
-<glyph unicode="" horiz-adv-x="1792" d="M640 454v-70q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-69l-397 -398q-19 -19 -19 -45t19 -45zM1792 416q0 -58 -17 -133.5t-38.5 -138t-48 -125t-40.5 -90.5l-20 -40q-8 -17 -28 -17q-6 0 -9 1 q-25 8 -23 34q43 400 -106 565q-64 71 -170.5 110.5t-267.5 52.5v-251q0 -42 -39 -59q-13 -5 -25 -5q-27 0 -45 19l-512 512q-19 19 -19 45t19 45l512 512q29 31 70 14q39 -17 39 -59v-262q411 -28 599 -221q169 -173 169 -509z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1186 579l257 250l-356 52l-66 10l-30 60l-159 322v-963l59 -31l318 -168l-60 355l-12 66zM1638 841l-363 -354l86 -500q5 -33 -6 -51.5t-34 -18.5q-17 0 -40 12l-449 236l-449 -236q-23 -12 -40 -12q-23 0 -34 18.5t-6 51.5l86 500l-364 354q-32 32 -23 59.5t54 34.5 l502 73l225 455q20 41 49 41q28 0 49 -41l225 -455l502 -73q45 -7 54 -34.5t-24 -59.5z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1401 1187l-640 -1280q-17 -35 -57 -35q-5 0 -15 2q-22 5 -35.5 22.5t-13.5 39.5v576h-576q-22 0 -39.5 13.5t-22.5 35.5t4 42t29 30l1280 640q13 7 29 7q27 0 45 -19q15 -14 18.5 -34.5t-6.5 -39.5z" />
-<glyph unicode="" horiz-adv-x="1664" d="M557 256h595v595zM512 301l595 595h-595v-595zM1664 224v-192q0 -14 -9 -23t-23 -9h-224v-224q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v224h-864q-14 0 -23 9t-9 23v864h-224q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h224v224q0 14 9 23t23 9h192q14 0 23 -9t9 -23 v-224h851l246 247q10 9 23 9t23 -9q9 -10 9 -23t-9 -23l-247 -246v-851h224q14 0 23 -9t9 -23z" />
-<glyph unicode="" horiz-adv-x="1024" d="M288 64q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM288 1216q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM928 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1024 1088q0 -52 -26 -96.5t-70 -69.5 q-2 -287 -226 -414q-68 -38 -203 -81q-128 -40 -169.5 -71t-41.5 -100v-26q44 -25 70 -69.5t26 -96.5q0 -80 -56 -136t-136 -56t-136 56t-56 136q0 52 26 96.5t70 69.5v820q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136q0 -52 -26 -96.5t-70 -69.5v-497 q54 26 154 57q55 17 87.5 29.5t70.5 31t59 39.5t40.5 51t28 69.5t8.5 91.5q-44 25 -70 69.5t-26 96.5q0 80 56 136t136 56t136 -56t56 -136z" />
-<glyph unicode="" horiz-adv-x="1664" d="M439 265l-256 -256q-10 -9 -23 -9q-12 0 -23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23zM608 224v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM384 448q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9t-9 23t9 23t23 9h320 q14 0 23 -9t9 -23zM1648 320q0 -120 -85 -203l-147 -146q-83 -83 -203 -83q-121 0 -204 85l-334 335q-21 21 -42 56l239 18l273 -274q27 -27 68 -27.5t68 26.5l147 146q28 28 28 67q0 40 -28 68l-274 275l18 239q35 -21 56 -42l336 -336q84 -86 84 -204zM1031 1044l-239 -18 l-273 274q-28 28 -68 28q-39 0 -68 -27l-147 -146q-28 -28 -28 -67q0 -40 28 -68l274 -274l-18 -240q-35 21 -56 42l-336 336q-84 86 -84 204q0 120 85 203l147 146q83 83 203 83q121 0 204 -85l334 -335q21 -21 42 -56zM1664 960q0 -14 -9 -23t-23 -9h-320q-14 0 -23 9 t-9 23t9 23t23 9h320q14 0 23 -9t9 -23zM1120 1504v-320q0 -14 -9 -23t-23 -9t-23 9t-9 23v320q0 14 9 23t23 9t23 -9t9 -23zM1527 1353l-256 -256q-11 -9 -23 -9t-23 9q-9 10 -9 23t9 23l256 256q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
-<glyph unicode="" horiz-adv-x="1024" d="M704 280v-240q0 -16 -12 -28t-28 -12h-240q-16 0 -28 12t-12 28v240q0 16 12 28t28 12h240q16 0 28 -12t12 -28zM1020 880q0 -54 -15.5 -101t-35 -76.5t-55 -59.5t-57.5 -43.5t-61 -35.5q-41 -23 -68.5 -65t-27.5 -67q0 -17 -12 -32.5t-28 -15.5h-240q-15 0 -25.5 18.5 t-10.5 37.5v45q0 83 65 156.5t143 108.5q59 27 84 56t25 76q0 42 -46.5 74t-107.5 32q-65 0 -108 -29q-35 -25 -107 -115q-13 -16 -31 -16q-12 0 -25 8l-164 125q-13 10 -15.5 25t5.5 28q160 266 464 266q80 0 161 -31t146 -83t106 -127.5t41 -158.5z" />
-<glyph unicode="" horiz-adv-x="640" d="M640 192v-128q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h64v384h-64q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h384q26 0 45 -19t19 -45v-576h64q26 0 45 -19t19 -45zM512 1344v-192q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v192 q0 26 19 45t45 19h256q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="640" d="M512 288v-224q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v224q0 26 19 45t45 19h256q26 0 45 -19t19 -45zM542 1344l-28 -768q-1 -26 -20.5 -45t-45.5 -19h-256q-26 0 -45.5 19t-20.5 45l-28 768q-1 26 17.5 45t44.5 19h320q26 0 44.5 -19t17.5 -45z" />
-<glyph unicode="" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1534 846v-206h-514l-3 27 q-4 28 -4 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q83 65 188 65q110 0 178 -59.5t68 -158.5q0 -56 -24.5 -103t-62 -76.5t-81.5 -58.5t-82 -50.5t-65.5 -51.5t-30.5 -63h232v80 h126z" />
-<glyph unicode="" d="M897 167v-167h-248l-159 252l-24 42q-8 9 -11 21h-3l-9 -21q-10 -20 -25 -44l-155 -250h-258v167h128l197 291l-185 272h-137v168h276l139 -228q2 -4 23 -42q8 -9 11 -21h3q3 9 11 21l25 42l140 228h257v-168h-125l-184 -267l204 -296h109zM1536 -50v-206h-514l-4 27 q-3 45 -3 46q0 64 26 117t65 86.5t84 65t84 54.5t65 54t26 64q0 38 -29.5 62.5t-70.5 24.5q-51 0 -97 -39q-14 -11 -36 -38l-105 92q26 37 63 66q80 65 188 65q110 0 178 -59.5t68 -158.5q0 -66 -34.5 -118.5t-84 -86t-99.5 -62.5t-87 -63t-41 -73h232v80h126z" />
-<glyph unicode="" horiz-adv-x="1920" d="M896 128l336 384h-768l-336 -384h768zM1909 1205q15 -34 9.5 -71.5t-30.5 -65.5l-896 -1024q-38 -44 -96 -44h-768q-38 0 -69.5 20.5t-47.5 54.5q-15 34 -9.5 71.5t30.5 65.5l896 1024q38 44 96 44h768q38 0 69.5 -20.5t47.5 -54.5z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1664 438q0 -81 -44.5 -135t-123.5 -54q-41 0 -77.5 17.5t-59 38t-56.5 38t-71 17.5q-110 0 -110 -124q0 -39 16 -115t15 -115v-5q-22 0 -33 -1q-34 -3 -97.5 -11.5t-115.5 -13.5t-98 -5q-61 0 -103 26.5t-42 83.5q0 37 17.5 71t38 56.5t38 59t17.5 77.5q0 79 -54 123.5 t-135 44.5q-84 0 -143 -45.5t-59 -127.5q0 -43 15 -83t33.5 -64.5t33.5 -53t15 -50.5q0 -45 -46 -89q-37 -35 -117 -35q-95 0 -245 24q-9 2 -27.5 4t-27.5 4l-13 2q-1 0 -3 1q-2 0 -2 1v1024q2 -1 17.5 -3.5t34 -5t21.5 -3.5q150 -24 245 -24q80 0 117 35q46 44 46 89 q0 22 -15 50.5t-33.5 53t-33.5 64.5t-15 83q0 82 59 127.5t144 45.5q80 0 134 -44.5t54 -123.5q0 -41 -17.5 -77.5t-38 -59t-38 -56.5t-17.5 -71q0 -57 42 -83.5t103 -26.5q64 0 180 15t163 17v-2q-1 -2 -3.5 -17.5t-5 -34t-3.5 -21.5q-24 -150 -24 -245q0 -80 35 -117 q44 -46 89 -46q22 0 50.5 15t53 33.5t64.5 33.5t83 15q82 0 127.5 -59t45.5 -143z" />
-<glyph unicode="" horiz-adv-x="1152" d="M1152 832v-128q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-217 24 -364.5 187.5t-147.5 384.5v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -185 131.5 -316.5t316.5 -131.5 t316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45zM896 1216v-512q0 -132 -94 -226t-226 -94t-226 94t-94 226v512q0 132 94 226t226 94t226 -94t94 -226z" />
-<glyph unicode="" horiz-adv-x="1408" d="M271 591l-101 -101q-42 103 -42 214v128q0 26 19 45t45 19t45 -19t19 -45v-128q0 -53 15 -113zM1385 1193l-361 -361v-128q0 -132 -94 -226t-226 -94q-55 0 -109 19l-96 -96q97 -51 205 -51q185 0 316.5 131.5t131.5 316.5v128q0 26 19 45t45 19t45 -19t19 -45v-128 q0 -221 -147.5 -384.5t-364.5 -187.5v-132h256q26 0 45 -19t19 -45t-19 -45t-45 -19h-640q-26 0 -45 19t-19 45t19 45t45 19h256v132q-125 13 -235 81l-254 -254q-10 -10 -23 -10t-23 10l-82 82q-10 10 -10 23t10 23l1234 1234q10 10 23 10t23 -10l82 -82q10 -10 10 -23 t-10 -23zM1005 1325l-621 -621v512q0 132 94 226t226 94q102 0 184.5 -59t116.5 -152z" />
-<glyph unicode="" horiz-adv-x="1280" d="M1088 576v640h-448v-1137q119 63 213 137q235 184 235 360zM1280 1344v-768q0 -86 -33.5 -170.5t-83 -150t-118 -127.5t-126.5 -103t-121 -77.5t-89.5 -49.5t-42.5 -20q-12 -6 -26 -6t-26 6q-16 7 -42.5 20t-89.5 49.5t-121 77.5t-126.5 103t-118 127.5t-83 150 t-33.5 170.5v768q0 26 19 45t45 19h1152q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1664" d="M128 -128h1408v1024h-1408v-1024zM512 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1280 1088v288q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-288q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1664 1152v-1280 q0 -52 -38 -90t-90 -38h-1408q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h128v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h384v96q0 66 47 113t113 47h64q66 0 113 -47t47 -113v-96h128q52 0 90 -38t38 -90z" />
-<glyph unicode="" horiz-adv-x="1408" d="M512 1344q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1408 1376v-320q0 -16 -12 -25q-8 -7 -20 -7q-4 0 -7 1l-448 96q-11 2 -18 11t-7 20h-256v-102q111 -23 183.5 -111t72.5 -203v-800q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v800 q0 106 62.5 190.5t161.5 114.5v111h-32q-59 0 -115 -23.5t-91.5 -53t-66 -66.5t-40.5 -53.5t-14 -24.5q-17 -35 -57 -35q-16 0 -29 7q-23 12 -31.5 37t3.5 49q5 10 14.5 26t37.5 53.5t60.5 70t85 67t108.5 52.5q-25 42 -25 86q0 66 47 113t113 47t113 -47t47 -113 q0 -33 -14 -64h302q0 11 7 20t18 11l448 96q3 1 7 1q12 0 20 -7q12 -9 12 -25z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1440 1088q0 40 -28 68t-68 28t-68 -28t-28 -68t28 -68t68 -28t68 28t28 68zM1664 1376q0 -249 -75.5 -430.5t-253.5 -360.5q-81 -80 -195 -176l-20 -379q-2 -16 -16 -26l-384 -224q-7 -4 -16 -4q-12 0 -23 9l-64 64q-13 14 -8 32l85 276l-281 281l-276 -85q-3 -1 -9 -1 q-14 0 -23 9l-64 64q-17 19 -5 39l224 384q10 14 26 16l379 20q96 114 176 195q188 187 358 258t431 71q14 0 24 -9.5t10 -22.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1745 763l-164 -763h-334l178 832q13 56 -15 88q-27 33 -83 33h-169l-204 -953h-334l204 953h-286l-204 -953h-334l204 953l-153 327h1276q101 0 189.5 -40.5t147.5 -113.5q60 -73 81 -168.5t0 -194.5z" />
-<glyph unicode="" d="M909 141l102 102q19 19 19 45t-19 45l-307 307l307 307q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M717 141l454 454q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l307 -307l-307 -307q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1165 397l102 102q19 19 19 45t-19 45l-454 454q-19 19 -45 19t-45 -19l-454 -454q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l307 307l307 -307q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M813 237l454 454q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-307 -307l-307 307q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l454 -454q19 -19 45 -19t45 19zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5 t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1130 939l16 175h-884l47 -534h612l-22 -228l-197 -53l-196 53l-13 140h-175l22 -278l362 -100h4v1l359 99l50 544h-644l-15 181h674zM0 1408h1408l-128 -1438l-578 -162l-574 162z" />
-<glyph unicode="" horiz-adv-x="1792" d="M275 1408h1505l-266 -1333l-804 -267l-698 267l71 356h297l-29 -147l422 -161l486 161l68 339h-1208l58 297h1209l38 191h-1208z" />
-<glyph unicode="" horiz-adv-x="1792" d="M960 1280q0 26 -19 45t-45 19t-45 -19t-19 -45t19 -45t45 -19t45 19t19 45zM1792 352v-352q0 -22 -20 -30q-8 -2 -12 -2q-13 0 -23 9l-93 93q-119 -143 -318.5 -226.5t-429.5 -83.5t-429.5 83.5t-318.5 226.5l-93 -93q-9 -9 -23 -9q-4 0 -12 2q-20 8 -20 30v352 q0 14 9 23t23 9h352q22 0 30 -20q8 -19 -7 -35l-100 -100q67 -91 189.5 -153.5t271.5 -82.5v647h-192q-26 0 -45 19t-19 45v128q0 26 19 45t45 19h192v163q-58 34 -93 92.5t-35 128.5q0 106 75 181t181 75t181 -75t75 -181q0 -70 -35 -128.5t-93 -92.5v-163h192q26 0 45 -19 t19 -45v-128q0 -26 -19 -45t-45 -19h-192v-647q149 20 271.5 82.5t189.5 153.5l-100 100q-15 16 -7 35q8 20 30 20h352q14 0 23 -9t9 -23z" />
-<glyph unicode="" horiz-adv-x="1152" d="M1056 768q40 0 68 -28t28 -68v-576q0 -40 -28 -68t-68 -28h-960q-40 0 -68 28t-28 68v576q0 40 28 68t68 28h32v320q0 185 131.5 316.5t316.5 131.5t316.5 -131.5t131.5 -316.5q0 -26 -19 -45t-45 -19h-64q-26 0 -45 19t-19 45q0 106 -75 181t-181 75t-181 -75t-75 -181 v-320h736z" />
-<glyph unicode="" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM1152 640q0 159 -112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5t271.5 -112.5t271.5 112.5t112.5 271.5zM1280 640q0 -212 -150 -362t-362 -150t-362 150 t-150 362t150 362t362 150t362 -150t150 -362zM1408 640q0 130 -51 248.5t-136.5 204t-204 136.5t-248.5 51t-248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5zM1536 640 q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" horiz-adv-x="1408" d="M384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM896 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM1408 800v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-<glyph unicode="" horiz-adv-x="384" d="M384 288v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 800v-192q0 -40 -28 -68t-68 -28h-192q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68zM384 1312v-192q0 -40 -28 -68t-68 -28h-192 q-40 0 -68 28t-28 68v192q0 40 28 68t68 28h192q40 0 68 -28t28 -68z" />
-<glyph unicode="" d="M512 256q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM863 162q-13 232 -177 396t-396 177q-14 1 -24 -9t-10 -23v-128q0 -13 8.5 -22t21.5 -10q154 -11 264 -121t121 -264q1 -13 10 -21.5t22 -8.5h128q13 0 23 10 t9 24zM1247 161q-5 154 -56 297.5t-139.5 260t-205 205t-260 139.5t-297.5 56q-14 1 -23 -9q-10 -10 -10 -23v-128q0 -13 9 -22t22 -10q204 -7 378 -111.5t278.5 -278.5t111.5 -378q1 -13 10 -22t22 -9h128q13 0 23 10q11 9 9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" d="M768 1408q209 0 385.5 -103t279.5 -279.5t103 -385.5t-103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103zM1152 585q32 18 32 55t-32 55l-544 320q-31 19 -64 1q-32 -19 -32 -56v-640q0 -37 32 -56 q16 -8 32 -8q17 0 32 9z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1024 1084l316 -316l-572 -572l-316 316zM813 105l618 618q19 19 19 45t-19 45l-362 362q-18 18 -45 18t-45 -18l-618 -618q-19 -19 -19 -45t19 -45l362 -362q18 -18 45 -18t45 18zM1702 742l-907 -908q-37 -37 -90.5 -37t-90.5 37l-126 126q56 56 56 136t-56 136 t-136 56t-136 -56l-125 126q-37 37 -37 90.5t37 90.5l907 906q37 37 90.5 37t90.5 -37l125 -125q-56 -56 -56 -136t56 -136t136 -56t136 56l126 -125q37 -37 37 -90.5t-37 -90.5z" />
-<glyph unicode="" d="M1280 576v128q0 26 -19 45t-45 19h-896q-26 0 -45 -19t-19 -45v-128q0 -26 19 -45t45 -19h896q26 0 45 19t19 45zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h832q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5 t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1024" d="M1018 933q-18 -37 -58 -37h-192v-864q0 -14 -9 -23t-23 -9h-704q-21 0 -29 18q-8 20 4 35l160 192q9 11 25 11h320v640h-192q-40 0 -58 37q-17 37 9 68l320 384q18 22 49 22t49 -22l320 -384q27 -32 9 -68z" />
-<glyph unicode="" horiz-adv-x="1024" d="M32 1280h704q13 0 22.5 -9.5t9.5 -23.5v-863h192q40 0 58 -37t-9 -69l-320 -384q-18 -22 -49 -22t-49 22l-320 384q-26 31 -9 69q18 37 58 37h192v640h-320q-14 0 -25 11l-160 192q-13 14 -4 34q9 19 29 19z" />
-<glyph unicode="" d="M685 237l614 614q19 19 19 45t-19 45l-102 102q-19 19 -45 19t-45 -19l-467 -467l-211 211q-19 19 -45 19t-45 -19l-102 -102q-19 -19 -19 -45t19 -45l358 -358q19 -19 45 -19t45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5 t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" d="M404 428l152 -152l-52 -52h-56v96h-96v56zM818 818q14 -13 -3 -30l-291 -291q-17 -17 -30 -3q-14 13 3 30l291 291q17 17 30 3zM544 128l544 544l-288 288l-544 -544v-288h288zM1152 736l92 92q28 28 28 68t-28 68l-152 152q-28 28 -68 28t-68 -28l-92 -92zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" d="M1280 608v480q0 26 -19 45t-45 19h-480q-42 0 -59 -39q-17 -41 14 -70l144 -144l-534 -534q-19 -19 -19 -45t19 -45l102 -102q19 -19 45 -19t45 19l534 534l144 -144q18 -19 45 -19q12 0 25 5q39 17 39 59zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" d="M1005 435l352 352q19 19 19 45t-19 45l-352 352q-30 31 -69 14q-40 -17 -40 -59v-160q-119 0 -216 -19.5t-162.5 -51t-114 -79t-76.5 -95.5t-44.5 -109t-21.5 -111.5t-5 -110.5q0 -181 167 -404q10 -12 25 -12q7 0 13 3q22 9 19 33q-44 354 62 473q46 52 130 75.5 t224 23.5v-160q0 -42 40 -59q12 -5 24 -5q26 0 45 19zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" d="M640 448l256 128l-256 128v-256zM1024 1039v-542l-512 -256v542zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1145 861q18 -35 -5 -66l-320 -448q-19 -27 -52 -27t-52 27l-320 448q-23 31 -5 66q17 35 57 35h640q40 0 57 -35zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" d="M1145 419q-17 -35 -57 -35h-640q-40 0 -57 35q-18 35 5 66l320 448q19 27 52 27t52 -27l320 -448q23 -31 5 -66zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" d="M1088 640q0 -33 -27 -52l-448 -320q-31 -23 -66 -5q-35 17 -35 57v640q0 40 35 57q35 18 66 -5l448 -320q27 -19 27 -52zM1280 160v960q0 14 -9 23t-23 9h-960q-14 0 -23 -9t-9 -23v-960q0 -14 9 -23t23 -9h960q14 0 23 9t9 23zM1536 1120v-960q0 -119 -84.5 -203.5 t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1024" d="M976 229l35 -159q3 -12 -3 -22.5t-17 -14.5l-5 -1q-4 -2 -10.5 -3.5t-16 -4.5t-21.5 -5.5t-25.5 -5t-30 -5t-33.5 -4.5t-36.5 -3t-38.5 -1q-234 0 -409 130.5t-238 351.5h-95q-13 0 -22.5 9.5t-9.5 22.5v113q0 13 9.5 22.5t22.5 9.5h66q-2 57 1 105h-67q-14 0 -23 9 t-9 23v114q0 14 9 23t23 9h98q67 210 243.5 338t400.5 128q102 0 194 -23q11 -3 20 -15q6 -11 3 -24l-43 -159q-3 -13 -14 -19.5t-24 -2.5l-4 1q-4 1 -11.5 2.5l-17.5 3.5t-22.5 3.5t-26 3t-29 2.5t-29.5 1q-126 0 -226 -64t-150 -176h468q16 0 25 -12q10 -12 7 -26 l-24 -114q-5 -26 -32 -26h-488q-3 -37 0 -105h459q15 0 25 -12q9 -12 6 -27l-24 -112q-2 -11 -11 -18.5t-20 -7.5h-387q48 -117 149.5 -185.5t228.5 -68.5q18 0 36 1.5t33.5 3.5t29.5 4.5t24.5 5t18.5 4.5l12 3l5 2q13 5 26 -2q12 -7 15 -21z" />
-<glyph unicode="" horiz-adv-x="1024" d="M1020 399v-367q0 -14 -9 -23t-23 -9h-956q-14 0 -23 9t-9 23v150q0 13 9.5 22.5t22.5 9.5h97v383h-95q-14 0 -23 9.5t-9 22.5v131q0 14 9 23t23 9h95v223q0 171 123.5 282t314.5 111q185 0 335 -125q9 -8 10 -20.5t-7 -22.5l-103 -127q-9 -11 -22 -12q-13 -2 -23 7 q-5 5 -26 19t-69 32t-93 18q-85 0 -137 -47t-52 -123v-215h305q13 0 22.5 -9t9.5 -23v-131q0 -13 -9.5 -22.5t-22.5 -9.5h-305v-379h414v181q0 13 9 22.5t23 9.5h162q14 0 23 -9.5t9 -22.5z" />
-<glyph unicode="" horiz-adv-x="1024" d="M978 351q0 -153 -99.5 -263.5t-258.5 -136.5v-175q0 -14 -9 -23t-23 -9h-135q-13 0 -22.5 9.5t-9.5 22.5v175q-66 9 -127.5 31t-101.5 44.5t-74 48t-46.5 37.5t-17.5 18q-17 21 -2 41l103 135q7 10 23 12q15 2 24 -9l2 -2q113 -99 243 -125q37 -8 74 -8q81 0 142.5 43 t61.5 122q0 28 -15 53t-33.5 42t-58.5 37.5t-66 32t-80 32.5q-39 16 -61.5 25t-61.5 26.5t-62.5 31t-56.5 35.5t-53.5 42.5t-43.5 49t-35.5 58t-21 66.5t-8.5 78q0 138 98 242t255 134v180q0 13 9.5 22.5t22.5 9.5h135q14 0 23 -9t9 -23v-176q57 -6 110.5 -23t87 -33.5 t63.5 -37.5t39 -29t15 -14q17 -18 5 -38l-81 -146q-8 -15 -23 -16q-14 -3 -27 7q-3 3 -14.5 12t-39 26.5t-58.5 32t-74.5 26t-85.5 11.5q-95 0 -155 -43t-60 -111q0 -26 8.5 -48t29.5 -41.5t39.5 -33t56 -31t60.5 -27t70 -27.5q53 -20 81 -31.5t76 -35t75.5 -42.5t62 -50 t53 -63.5t31.5 -76.5t13 -94z" />
-<glyph unicode="" horiz-adv-x="898" d="M898 1066v-102q0 -14 -9 -23t-23 -9h-168q-23 -144 -129 -234t-276 -110q167 -178 459 -536q14 -16 4 -34q-8 -18 -29 -18h-195q-16 0 -25 12q-306 367 -498 571q-9 9 -9 22v127q0 13 9.5 22.5t22.5 9.5h112q132 0 212.5 43t102.5 125h-427q-14 0 -23 9t-9 23v102 q0 14 9 23t23 9h413q-57 113 -268 113h-145q-13 0 -22.5 9.5t-9.5 22.5v133q0 14 9 23t23 9h832q14 0 23 -9t9 -23v-102q0 -14 -9 -23t-23 -9h-233q47 -61 64 -144h171q14 0 23 -9t9 -23z" />
-<glyph unicode="" horiz-adv-x="1027" d="M603 0h-172q-13 0 -22.5 9t-9.5 23v330h-288q-13 0 -22.5 9t-9.5 23v103q0 13 9.5 22.5t22.5 9.5h288v85h-288q-13 0 -22.5 9t-9.5 23v104q0 13 9.5 22.5t22.5 9.5h214l-321 578q-8 16 0 32q10 16 28 16h194q19 0 29 -18l215 -425q19 -38 56 -125q10 24 30.5 68t27.5 61 l191 420q8 19 29 19h191q17 0 27 -16q9 -14 1 -31l-313 -579h215q13 0 22.5 -9.5t9.5 -22.5v-104q0 -14 -9.5 -23t-22.5 -9h-290v-85h290q13 0 22.5 -9.5t9.5 -22.5v-103q0 -14 -9.5 -23t-22.5 -9h-290v-330q0 -13 -9.5 -22.5t-22.5 -9.5z" />
-<glyph unicode="" horiz-adv-x="1280" d="M1043 971q0 100 -65 162t-171 62h-320v-448h320q106 0 171 62t65 162zM1280 971q0 -193 -126.5 -315t-326.5 -122h-340v-118h505q14 0 23 -9t9 -23v-128q0 -14 -9 -23t-23 -9h-505v-192q0 -14 -9.5 -23t-22.5 -9h-167q-14 0 -23 9t-9 23v192h-224q-14 0 -23 9t-9 23v128 q0 14 9 23t23 9h224v118h-224q-14 0 -23 9t-9 23v149q0 13 9 22.5t23 9.5h224v629q0 14 9 23t23 9h539q200 0 326.5 -122t126.5 -315z" />
-<glyph unicode="" horiz-adv-x="1792" d="M514 341l81 299h-159l75 -300q1 -1 1 -3t1 -3q0 1 0.5 3.5t0.5 3.5zM630 768l35 128h-292l32 -128h225zM822 768h139l-35 128h-70zM1271 340l78 300h-162l81 -299q0 -1 0.5 -3.5t1.5 -3.5q0 1 0.5 3t0.5 3zM1382 768l33 128h-297l34 -128h230zM1792 736v-64q0 -14 -9 -23 t-23 -9h-213l-164 -616q-7 -24 -31 -24h-159q-24 0 -31 24l-166 616h-209l-167 -616q-7 -24 -31 -24h-159q-11 0 -19.5 7t-10.5 17l-160 616h-208q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h175l-33 128h-142q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h109l-89 344q-5 15 5 28 q10 12 26 12h137q26 0 31 -24l90 -360h359l97 360q7 24 31 24h126q24 0 31 -24l98 -360h365l93 360q5 24 31 24h137q16 0 26 -12q10 -13 5 -28l-91 -344h111q14 0 23 -9t9 -23v-64q0 -14 -9 -23t-23 -9h-145l-34 -128h179q14 0 23 -9t9 -23z" />
-<glyph unicode="" horiz-adv-x="1280" d="M1167 896q18 -182 -131 -258q117 -28 175 -103t45 -214q-7 -71 -32.5 -125t-64.5 -89t-97 -58.5t-121.5 -34.5t-145.5 -15v-255h-154v251q-80 0 -122 1v-252h-154v255q-18 0 -54 0.5t-55 0.5h-200l31 183h111q50 0 58 51v402h16q-6 1 -16 1v287q-13 68 -89 68h-111v164 l212 -1q64 0 97 1v252h154v-247q82 2 122 2v245h154v-252q79 -7 140 -22.5t113 -45t82.5 -78t36.5 -114.5zM952 351q0 36 -15 64t-37 46t-57.5 30.5t-65.5 18.5t-74 9t-69 3t-64.5 -1t-47.5 -1v-338q8 0 37 -0.5t48 -0.5t53 1.5t58.5 4t57 8.5t55.5 14t47.5 21t39.5 30 t24.5 40t9.5 51zM881 827q0 33 -12.5 58.5t-30.5 42t-48 28t-55 16.5t-61.5 8t-58 2.5t-54 -1t-39.5 -0.5v-307q5 0 34.5 -0.5t46.5 0t50 2t55 5.5t51.5 11t48.5 18.5t37 27t27 38.5t9 51z" />
-<glyph unicode="" d="M1024 1024v472q22 -14 36 -28l408 -408q14 -14 28 -36h-472zM896 992q0 -40 28 -68t68 -28h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544z" />
-<glyph unicode="" d="M1468 1060q14 -14 28 -36h-472v472q22 -14 36 -28zM992 896h544v-1056q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h800v-544q0 -40 28 -68t68 -28zM1152 160v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704 q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-704q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h704q14 0 23 9t9 23z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1191 1128h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1572 -23 v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -11v-2l14 2q9 2 30 2h248v119h121zM1661 874v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162 l230 -662h70z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1191 104h177l-72 218l-12 47q-2 16 -2 20h-4l-3 -20q0 -1 -3.5 -18t-7.5 -29zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1661 -150 v-106h-288v106h75l-47 144h-243l-47 -144h75v-106h-287v106h70l230 662h162l230 -662h70zM1572 1001v-233h-584v90l369 529q12 18 21 27l11 9v3q-2 0 -6.5 -0.5t-7.5 -0.5q-12 -3 -30 -3h-232v-115h-120v229h567v-89l-369 -530q-6 -8 -21 -26l-11 -10v-3l14 3q9 1 30 1h248 v119h121z" />
-<glyph unicode="" horiz-adv-x="1792" d="M736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23zM1792 -32v-192q0 -14 -9 -23t-23 -9h-832q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832 q14 0 23 -9t9 -23zM1600 480v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1408 992v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1216 1504v-192q0 -14 -9 -23t-23 -9h-256 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1216 -32v-192q0 -14 -9 -23t-23 -9h-256q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h256q14 0 23 -9t9 -23zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192 q14 0 23 -9t9 -23zM1408 480v-192q0 -14 -9 -23t-23 -9h-448q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h448q14 0 23 -9t9 -23zM1600 992v-192q0 -14 -9 -23t-23 -9h-640q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h640q14 0 23 -9t9 -23zM1792 1504v-192q0 -14 -9 -23t-23 -9h-832 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h832q14 0 23 -9t9 -23z" />
-<glyph unicode="" d="M1346 223q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9t9 -23 zM1486 165q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5 t82 -252.5zM1456 882v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165z" />
-<glyph unicode="" d="M1346 1247q0 63 -44 116t-103 53q-52 0 -83 -37t-31 -94t36.5 -95t104.5 -38q50 0 85 27t35 68zM736 96q0 -12 -10 -24l-319 -319q-10 -9 -23 -9q-12 0 -23 9l-320 320q-15 16 -7 35q8 20 30 20h192v1376q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1376h192q14 0 23 -9 t9 -23zM1456 -142v-114h-469v114h167v432q0 7 0.5 19t0.5 17v16h-2l-7 -12q-8 -13 -26 -31l-62 -58l-82 86l192 185h123v-654h165zM1486 1189q0 -62 -13 -121.5t-41 -114t-68 -95.5t-98.5 -65.5t-127.5 -24.5q-62 0 -108 16q-24 8 -42 15l39 113q15 -7 31 -11q37 -13 75 -13 q84 0 134.5 58.5t66.5 145.5h-2q-21 -23 -61.5 -37t-84.5 -14q-106 0 -173 71.5t-67 172.5q0 105 72 178t181 73q123 0 205 -94.5t82 -252.5z" />
-<glyph unicode="" horiz-adv-x="1664" d="M256 192q0 26 -19 45t-45 19q-27 0 -45.5 -19t-18.5 -45q0 -27 18.5 -45.5t45.5 -18.5q26 0 45 18.5t19 45.5zM416 704v-640q0 -26 -19 -45t-45 -19h-288q-26 0 -45 19t-19 45v640q0 26 19 45t45 19h288q26 0 45 -19t19 -45zM1600 704q0 -86 -55 -149q15 -44 15 -76 q3 -76 -43 -137q17 -56 0 -117q-15 -57 -54 -94q9 -112 -49 -181q-64 -76 -197 -78h-36h-76h-17q-66 0 -144 15.5t-121.5 29t-120.5 39.5q-123 43 -158 44q-26 1 -45 19.5t-19 44.5v641q0 25 18 43.5t43 20.5q24 2 76 59t101 121q68 87 101 120q18 18 31 48t17.5 48.5 t13.5 60.5q7 39 12.5 61t19.5 52t34 50q19 19 45 19q46 0 82.5 -10.5t60 -26t40 -40.5t24 -45t12 -50t5 -45t0.5 -39q0 -38 -9.5 -76t-19 -60t-27.5 -56q-3 -6 -10 -18t-11 -22t-8 -24h277q78 0 135 -57t57 -135z" />
-<glyph unicode="" horiz-adv-x="1664" d="M256 960q0 -26 -19 -45t-45 -19q-27 0 -45.5 19t-18.5 45q0 27 18.5 45.5t45.5 18.5q26 0 45 -18.5t19 -45.5zM416 448v640q0 26 -19 45t-45 19h-288q-26 0 -45 -19t-19 -45v-640q0 -26 19 -45t45 -19h288q26 0 45 19t19 45zM1545 597q55 -61 55 -149q-1 -78 -57.5 -135 t-134.5 -57h-277q4 -14 8 -24t11 -22t10 -18q18 -37 27 -57t19 -58.5t10 -76.5q0 -24 -0.5 -39t-5 -45t-12 -50t-24 -45t-40 -40.5t-60 -26t-82.5 -10.5q-26 0 -45 19q-20 20 -34 50t-19.5 52t-12.5 61q-9 42 -13.5 60.5t-17.5 48.5t-31 48q-33 33 -101 120q-49 64 -101 121 t-76 59q-25 2 -43 20.5t-18 43.5v641q0 26 19 44.5t45 19.5q35 1 158 44q77 26 120.5 39.5t121.5 29t144 15.5h17h76h36q133 -2 197 -78q58 -69 49 -181q39 -37 54 -94q17 -61 0 -117q46 -61 43 -137q0 -32 -15 -76z" />
-<glyph unicode="" d="M919 233v157q0 50 -29 50q-17 0 -33 -16v-224q16 -16 33 -16q29 0 29 49zM1103 355h66v34q0 51 -33 51t-33 -51v-34zM532 621v-70h-80v-423h-74v423h-78v70h232zM733 495v-367h-67v40q-39 -45 -76 -45q-33 0 -42 28q-6 16 -6 54v290h66v-270q0 -24 1 -26q1 -15 15 -15 q20 0 42 31v280h67zM985 384v-146q0 -52 -7 -73q-12 -42 -53 -42q-35 0 -68 41v-36h-67v493h67v-161q32 40 68 40q41 0 53 -42q7 -21 7 -74zM1236 255v-9q0 -29 -2 -43q-3 -22 -15 -40q-27 -40 -80 -40q-52 0 -81 38q-21 27 -21 86v129q0 59 20 86q29 38 80 38t78 -38 q21 -28 21 -86v-76h-133v-65q0 -51 34 -51q24 0 30 26q0 1 0.5 7t0.5 16.5v21.5h68zM785 1079v-156q0 -51 -32 -51t-32 51v156q0 52 32 52t32 -52zM1318 366q0 177 -19 260q-10 44 -43 73.5t-76 34.5q-136 15 -412 15q-275 0 -411 -15q-44 -5 -76.5 -34.5t-42.5 -73.5 q-20 -87 -20 -260q0 -176 20 -260q10 -43 42.5 -73t75.5 -35q137 -15 412 -15t412 15q43 5 75.5 35t42.5 73q20 84 20 260zM563 1017l90 296h-75l-51 -195l-53 195h-78l24 -69t23 -69q35 -103 46 -158v-201h74v201zM852 936v130q0 58 -21 87q-29 38 -78 38q-51 0 -78 -38 q-21 -29 -21 -87v-130q0 -58 21 -87q27 -38 78 -38q49 0 78 38q21 27 21 87zM1033 816h67v370h-67v-283q-22 -31 -42 -31q-15 0 -16 16q-1 2 -1 26v272h-67v-293q0 -37 6 -55q11 -27 43 -27q36 0 77 45v-40zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960 q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" d="M971 292v-211q0 -67 -39 -67q-23 0 -45 22v301q22 22 45 22q39 0 39 -67zM1309 291v-46h-90v46q0 68 45 68t45 -68zM343 509h107v94h-312v-94h105v-569h100v569zM631 -60h89v494h-89v-378q-30 -42 -57 -42q-18 0 -21 21q-1 3 -1 35v364h-89v-391q0 -49 8 -73 q12 -37 58 -37q48 0 102 61v-54zM1060 88v197q0 73 -9 99q-17 56 -71 56q-50 0 -93 -54v217h-89v-663h89v48q45 -55 93 -55q54 0 71 55q9 27 9 100zM1398 98v13h-91q0 -51 -2 -61q-7 -36 -40 -36q-46 0 -46 69v87h179v103q0 79 -27 116q-39 51 -106 51q-68 0 -107 -51 q-28 -37 -28 -116v-173q0 -79 29 -116q39 -51 108 -51q72 0 108 53q18 27 21 54q2 9 2 58zM790 1011v210q0 69 -43 69t-43 -69v-210q0 -70 43 -70t43 70zM1509 260q0 -234 -26 -350q-14 -59 -58 -99t-102 -46q-184 -21 -555 -21t-555 21q-58 6 -102.5 46t-57.5 99 q-26 112 -26 350q0 234 26 350q14 59 58 99t103 47q183 20 554 20t555 -20q58 -7 102.5 -47t57.5 -99q26 -112 26 -350zM511 1536h102l-121 -399v-271h-100v271q-14 74 -61 212q-37 103 -65 187h106l71 -263zM881 1203v-175q0 -81 -28 -118q-37 -51 -106 -51q-67 0 -105 51 q-28 38 -28 118v175q0 80 28 117q38 51 105 51q69 0 106 -51q28 -37 28 -117zM1216 1365v-499h-91v55q-53 -62 -103 -62q-46 0 -59 37q-8 24 -8 75v394h91v-367q0 -33 1 -35q3 -22 21 -22q27 0 57 43v381h91z" />
-<glyph unicode="" horiz-adv-x="1408" d="M597 869q-10 -18 -257 -456q-27 -46 -65 -46h-239q-21 0 -31 17t0 36l253 448q1 0 0 1l-161 279q-12 22 -1 37q9 15 32 15h239q40 0 66 -45zM1403 1511q11 -16 0 -37l-528 -934v-1l336 -615q11 -20 1 -37q-10 -15 -32 -15h-239q-42 0 -66 45l-339 622q18 32 531 942 q25 45 64 45h241q22 0 31 -15z" />
-<glyph unicode="" d="M685 771q0 1 -126 222q-21 34 -52 34h-184q-18 0 -26 -11q-7 -12 1 -29l125 -216v-1l-196 -346q-9 -14 0 -28q8 -13 24 -13h185q31 0 50 36zM1309 1268q-7 12 -24 12h-187q-30 0 -49 -35l-411 -729q1 -2 262 -481q20 -35 52 -35h184q18 0 25 12q8 13 -1 28l-260 476v1 l409 723q8 16 0 28zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1280 640q0 37 -30 54l-512 320q-31 20 -65 2q-33 -18 -33 -56v-640q0 -38 33 -56q16 -8 31 -8q20 0 34 10l512 320q30 17 30 54zM1792 640q0 -96 -1 -150t-8.5 -136.5t-22.5 -147.5q-16 -73 -69 -123t-124 -58q-222 -25 -671 -25t-671 25q-71 8 -124.5 58t-69.5 123 q-14 65 -21.5 147.5t-8.5 136.5t-1 150t1 150t8.5 136.5t22.5 147.5q16 73 69 123t124 58q222 25 671 25t671 -25q71 -8 124.5 -58t69.5 -123q14 -65 21.5 -147.5t8.5 -136.5t1 -150z" />
-<glyph unicode="" horiz-adv-x="1792" d="M402 829l494 -305l-342 -285l-490 319zM1388 274v-108l-490 -293v-1l-1 1l-1 -1v1l-489 293v108l147 -96l342 284v2l1 -1l1 1v-2l343 -284zM554 1418l342 -285l-494 -304l-338 270zM1390 829l338 -271l-489 -319l-343 285zM1239 1418l489 -319l-338 -270l-494 304z" />
-<glyph unicode="" horiz-adv-x="1408" d="M928 135v-151l-707 -1v151zM1169 481v-701l-1 -35v-1h-1132l-35 1h-1v736h121v-618h928v618h120zM241 393l704 -65l-13 -150l-705 65zM309 709l683 -183l-39 -146l-683 183zM472 1058l609 -360l-77 -130l-609 360zM832 1389l398 -585l-124 -85l-399 584zM1285 1536 l121 -697l-149 -26l-121 697z" />
-<glyph unicode="" d="M1362 110v648h-135q20 -63 20 -131q0 -126 -64 -232.5t-174 -168.5t-240 -62q-197 0 -337 135.5t-140 327.5q0 68 20 131h-141v-648q0 -26 17.5 -43.5t43.5 -17.5h1069q25 0 43 17.5t18 43.5zM1078 643q0 124 -90.5 211.5t-218.5 87.5q-127 0 -217.5 -87.5t-90.5 -211.5 t90.5 -211.5t217.5 -87.5q128 0 218.5 87.5t90.5 211.5zM1362 1003v165q0 28 -20 48.5t-49 20.5h-174q-29 0 -49 -20.5t-20 -48.5v-165q0 -29 20 -49t49 -20h174q29 0 49 20t20 49zM1536 1211v-1142q0 -81 -58 -139t-139 -58h-1142q-81 0 -139 58t-58 139v1142q0 81 58 139 t139 58h1142q81 0 139 -58t58 -139z" />
-<glyph unicode="" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM698 640q0 88 -62 150t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150zM1262 640q0 88 -62 150 t-150 62t-150 -62t-62 -150t62 -150t150 -62t150 62t62 150z" />
-<glyph unicode="" d="M768 914l201 -306h-402zM1133 384h94l-459 691l-459 -691h94l104 160h522zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" horiz-adv-x="1408" d="M815 677q8 -63 -50.5 -101t-111.5 -6q-39 17 -53.5 58t-0.5 82t52 58q36 18 72.5 12t64 -35.5t27.5 -67.5zM926 698q-14 107 -113 164t-197 13q-63 -28 -100.5 -88.5t-34.5 -129.5q4 -91 77.5 -155t165.5 -56q91 8 152 84t50 168zM1165 1240q-20 27 -56 44.5t-58 22 t-71 12.5q-291 47 -566 -2q-43 -7 -66 -12t-55 -22t-50 -43q30 -28 76 -45.5t73.5 -22t87.5 -11.5q228 -29 448 -1q63 8 89.5 12t72.5 21.5t75 46.5zM1222 205q-8 -26 -15.5 -76.5t-14 -84t-28.5 -70t-58 -56.5q-86 -48 -189.5 -71.5t-202 -22t-201.5 18.5q-46 8 -81.5 18 t-76.5 27t-73 43.5t-52 61.5q-25 96 -57 292l6 16l18 9q223 -148 506.5 -148t507.5 148q21 -6 24 -23t-5 -45t-8 -37zM1403 1166q-26 -167 -111 -655q-5 -30 -27 -56t-43.5 -40t-54.5 -31q-252 -126 -610 -88q-248 27 -394 139q-15 12 -25.5 26.5t-17 35t-9 34t-6 39.5 t-5.5 35q-9 50 -26.5 150t-28 161.5t-23.5 147.5t-22 158q3 26 17.5 48.5t31.5 37.5t45 30t46 22.5t48 18.5q125 46 313 64q379 37 676 -50q155 -46 215 -122q16 -20 16.5 -51t-5.5 -54z" />
-<glyph unicode="" d="M848 666q0 43 -41 66t-77 1q-43 -20 -42.5 -72.5t43.5 -70.5q39 -23 81 4t36 72zM928 682q8 -66 -36 -121t-110 -61t-119 40t-56 113q-2 49 25.5 93t72.5 64q70 31 141.5 -10t81.5 -118zM1100 1073q-20 -21 -53.5 -34t-53 -16t-63.5 -8q-155 -20 -324 0q-44 6 -63 9.5 t-52.5 16t-54.5 32.5q13 19 36 31t40 15.5t47 8.5q198 35 408 1q33 -5 51 -8.5t43 -16t39 -31.5zM1142 327q0 7 5.5 26.5t3 32t-17.5 16.5q-161 -106 -365 -106t-366 106l-12 -6l-5 -12q26 -154 41 -210q47 -81 204 -108q249 -46 428 53q34 19 49 51.5t22.5 85.5t12.5 71z M1272 1020q9 53 -8 75q-43 55 -155 88q-216 63 -487 36q-132 -12 -226 -46q-38 -15 -59.5 -25t-47 -34t-29.5 -54q8 -68 19 -138t29 -171t24 -137q1 -5 5 -31t7 -36t12 -27t22 -28q105 -80 284 -100q259 -28 440 63q24 13 39.5 23t31 29t19.5 40q48 267 80 473zM1536 1120 v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1024" d="M944 207l80 -237q-23 -35 -111 -66t-177 -32q-104 -2 -190.5 26t-142.5 74t-95 106t-55.5 120t-16.5 118v544h-168v215q72 26 129 69.5t91 90t58 102t34 99t15 88.5q1 5 4.5 8.5t7.5 3.5h244v-424h333v-252h-334v-518q0 -30 6.5 -56t22.5 -52.5t49.5 -41.5t81.5 -14 q78 2 134 29z" />
-<glyph unicode="" d="M1136 75l-62 183q-44 -22 -103 -22q-36 -1 -62 10.5t-38.5 31.5t-17.5 40.5t-5 43.5v398h257v194h-256v326h-188q-8 0 -9 -10q-5 -44 -17.5 -87t-39 -95t-77 -95t-118.5 -68v-165h130v-418q0 -57 21.5 -115t65 -111t121 -85.5t176.5 -30.5q69 1 136.5 25t85.5 50z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="768" d="M765 237q8 -19 -5 -35l-350 -384q-10 -10 -23 -10q-14 0 -24 10l-355 384q-13 16 -5 35q9 19 29 19h224v1248q0 14 9 23t23 9h192q14 0 23 -9t9 -23v-1248h224q21 0 29 -19z" />
-<glyph unicode="" horiz-adv-x="768" d="M765 1043q-9 -19 -29 -19h-224v-1248q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v1248h-224q-21 0 -29 19t5 35l350 384q10 10 23 10q14 0 24 -10l355 -384q13 -16 5 -35z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 736v-192q0 -14 -9 -23t-23 -9h-1248v-224q0 -21 -19 -29t-35 5l-384 350q-10 10 -10 23q0 14 10 24l384 354q16 14 35 6q19 -9 19 -29v-224h1248q14 0 23 -9t9 -23z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1728 643q0 -14 -10 -24l-384 -354q-16 -14 -35 -6q-19 9 -19 29v224h-1248q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h1248v224q0 21 19 29t35 -5l384 -350q10 -10 10 -23z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1393 321q-39 -125 -123 -250q-129 -196 -257 -196q-49 0 -140 32q-86 32 -151 32q-61 0 -142 -33q-81 -34 -132 -34q-152 0 -301 259q-147 261 -147 503q0 228 113 374q112 144 284 144q72 0 177 -30q104 -30 138 -30q45 0 143 34q102 34 173 34q119 0 213 -65 q52 -36 104 -100q-79 -67 -114 -118q-65 -94 -65 -207q0 -124 69 -223t158 -126zM1017 1494q0 -61 -29 -136q-30 -75 -93 -138q-54 -54 -108 -72q-37 -11 -104 -17q3 149 78 257q74 107 250 148q1 -3 2.5 -11t2.5 -11q0 -4 0.5 -10t0.5 -10z" />
-<glyph unicode="" horiz-adv-x="1664" d="M682 530v-651l-682 94v557h682zM682 1273v-659h-682v565zM1664 530v-786l-907 125v661h907zM1664 1408v-794h-907v669z" />
-<glyph unicode="" horiz-adv-x="1408" d="M493 1053q16 0 27.5 11.5t11.5 27.5t-11.5 27.5t-27.5 11.5t-27 -11.5t-11 -27.5t11 -27.5t27 -11.5zM915 1053q16 0 27 11.5t11 27.5t-11 27.5t-27 11.5t-27.5 -11.5t-11.5 -27.5t11.5 -27.5t27.5 -11.5zM103 869q42 0 72 -30t30 -72v-430q0 -43 -29.5 -73t-72.5 -30 t-73 30t-30 73v430q0 42 30 72t73 30zM1163 850v-666q0 -46 -32 -78t-77 -32h-75v-227q0 -43 -30 -73t-73 -30t-73 30t-30 73v227h-138v-227q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73l-1 227h-74q-46 0 -78 32t-32 78v666h918zM931 1255q107 -55 171 -153.5t64 -215.5 h-925q0 117 64 215.5t172 153.5l-71 131q-7 13 5 20q13 6 20 -6l72 -132q95 42 201 42t201 -42l72 132q7 12 20 6q12 -7 5 -20zM1408 767v-430q0 -43 -30 -73t-73 -30q-42 0 -72 30t-30 73v430q0 43 30 72.5t72 29.5q43 0 73 -29.5t30 -72.5z" />
-<glyph unicode="" d="M663 1125q-11 -1 -15.5 -10.5t-8.5 -9.5q-5 -1 -5 5q0 12 19 15h10zM750 1111q-4 -1 -11.5 6.5t-17.5 4.5q24 11 32 -2q3 -6 -3 -9zM399 684q-4 1 -6 -3t-4.5 -12.5t-5.5 -13.5t-10 -13q-7 -10 -1 -12q4 -1 12.5 7t12.5 18q1 3 2 7t2 6t1.5 4.5t0.5 4v3t-1 2.5t-3 2z M1254 325q0 18 -55 42q4 15 7.5 27.5t5 26t3 21.5t0.5 22.5t-1 19.5t-3.5 22t-4 20.5t-5 25t-5.5 26.5q-10 48 -47 103t-72 75q24 -20 57 -83q87 -162 54 -278q-11 -40 -50 -42q-31 -4 -38.5 18.5t-8 83.5t-11.5 107q-9 39 -19.5 69t-19.5 45.5t-15.5 24.5t-13 15t-7.5 7 q-14 62 -31 103t-29.5 56t-23.5 33t-15 40q-4 21 6 53.5t4.5 49.5t-44.5 25q-15 3 -44.5 18t-35.5 16q-8 1 -11 26t8 51t36 27q37 3 51 -30t4 -58q-11 -19 -2 -26.5t30 -0.5q13 4 13 36v37q-5 30 -13.5 50t-21 30.5t-23.5 15t-27 7.5q-107 -8 -89 -134q0 -15 -1 -15 q-9 9 -29.5 10.5t-33 -0.5t-15.5 5q1 57 -16 90t-45 34q-27 1 -41.5 -27.5t-16.5 -59.5q-1 -15 3.5 -37t13 -37.5t15.5 -13.5q10 3 16 14q4 9 -7 8q-7 0 -15.5 14.5t-9.5 33.5q-1 22 9 37t34 14q17 0 27 -21t9.5 -39t-1.5 -22q-22 -15 -31 -29q-8 -12 -27.5 -23.5 t-20.5 -12.5q-13 -14 -15.5 -27t7.5 -18q14 -8 25 -19.5t16 -19t18.5 -13t35.5 -6.5q47 -2 102 15q2 1 23 7t34.5 10.5t29.5 13t21 17.5q9 14 20 8q5 -3 6.5 -8.5t-3 -12t-16.5 -9.5q-20 -6 -56.5 -21.5t-45.5 -19.5q-44 -19 -70 -23q-25 -5 -79 2q-10 2 -9 -2t17 -19 q25 -23 67 -22q17 1 36 7t36 14t33.5 17.5t30 17t24.5 12t17.5 2.5t8.5 -11q0 -2 -1 -4.5t-4 -5t-6 -4.5t-8.5 -5t-9 -4.5t-10 -5t-9.5 -4.5q-28 -14 -67.5 -44t-66.5 -43t-49 -1q-21 11 -63 73q-22 31 -25 22q-1 -3 -1 -10q0 -25 -15 -56.5t-29.5 -55.5t-21 -58t11.5 -63 q-23 -6 -62.5 -90t-47.5 -141q-2 -18 -1.5 -69t-5.5 -59q-8 -24 -29 -3q-32 31 -36 94q-2 28 4 56q4 19 -1 18l-4 -5q-36 -65 10 -166q5 -12 25 -28t24 -20q20 -23 104 -90.5t93 -76.5q16 -15 17.5 -38t-14 -43t-45.5 -23q8 -15 29 -44.5t28 -54t7 -70.5q46 24 7 92 q-4 8 -10.5 16t-9.5 12t-2 6q3 5 13 9.5t20 -2.5q46 -52 166 -36q133 15 177 87q23 38 34 30q12 -6 10 -52q-1 -25 -23 -92q-9 -23 -6 -37.5t24 -15.5q3 19 14.5 77t13.5 90q2 21 -6.5 73.5t-7.5 97t23 70.5q15 18 51 18q1 37 34.5 53t72.5 10.5t60 -22.5zM626 1152 q3 17 -2.5 30t-11.5 15q-9 2 -9 -7q2 -5 5 -6q10 0 7 -15q-3 -20 8 -20q3 0 3 3zM1045 955q-2 8 -6.5 11.5t-13 5t-14.5 5.5q-5 3 -9.5 8t-7 8t-5.5 6.5t-4 4t-4 -1.5q-14 -16 7 -43.5t39 -31.5q9 -1 14.5 8t3.5 20zM867 1168q0 11 -5 19.5t-11 12.5t-9 3q-14 -1 -7 -7l4 -2 q14 -4 18 -31q0 -3 8 2zM921 1401q0 2 -2.5 5t-9 7t-9.5 6q-15 15 -24 15q-9 -1 -11.5 -7.5t-1 -13t-0.5 -12.5q-1 -4 -6 -10.5t-6 -9t3 -8.5q4 -3 8 0t11 9t15 9q1 1 9 1t15 2t9 7zM1486 60q20 -12 31 -24.5t12 -24t-2.5 -22.5t-15.5 -22t-23.5 -19.5t-30 -18.5 t-31.5 -16.5t-32 -15.5t-27 -13q-38 -19 -85.5 -56t-75.5 -64q-17 -16 -68 -19.5t-89 14.5q-18 9 -29.5 23.5t-16.5 25.5t-22 19.5t-47 9.5q-44 1 -130 1q-19 0 -57 -1.5t-58 -2.5q-44 -1 -79.5 -15t-53.5 -30t-43.5 -28.5t-53.5 -11.5q-29 1 -111 31t-146 43q-19 4 -51 9.5 t-50 9t-39.5 9.5t-33.5 14.5t-17 19.5q-10 23 7 66.5t18 54.5q1 16 -4 40t-10 42.5t-4.5 36.5t10.5 27q14 12 57 14t60 12q30 18 42 35t12 51q21 -73 -32 -106q-32 -20 -83 -15q-34 3 -43 -10q-13 -15 5 -57q2 -6 8 -18t8.5 -18t4.5 -17t1 -22q0 -15 -17 -49t-14 -48 q3 -17 37 -26q20 -6 84.5 -18.5t99.5 -20.5q24 -6 74 -22t82.5 -23t55.5 -4q43 6 64.5 28t23 48t-7.5 58.5t-19 52t-20 36.5q-121 190 -169 242q-68 74 -113 40q-11 -9 -15 15q-3 16 -2 38q1 29 10 52t24 47t22 42q8 21 26.5 72t29.5 78t30 61t39 54q110 143 124 195 q-12 112 -16 310q-2 90 24 151.5t106 104.5q39 21 104 21q53 1 106 -13.5t89 -41.5q57 -42 91.5 -121.5t29.5 -147.5q-5 -95 30 -214q34 -113 133 -218q55 -59 99.5 -163t59.5 -191q8 -49 5 -84.5t-12 -55.5t-20 -22q-10 -2 -23.5 -19t-27 -35.5t-40.5 -33.5t-61 -14 q-18 1 -31.5 5t-22.5 13.5t-13.5 15.5t-11.5 20.5t-9 19.5q-22 37 -41 30t-28 -49t7 -97q20 -70 1 -195q-10 -65 18 -100.5t73 -33t85 35.5q59 49 89.5 66.5t103.5 42.5q53 18 77 36.5t18.5 34.5t-25 28.5t-51.5 23.5q-33 11 -49.5 48t-15 72.5t15.5 47.5q1 -31 8 -56.5 t14.5 -40.5t20.5 -28.5t21 -19t21.5 -13t16.5 -9.5z" />
-<glyph unicode="" d="M1024 36q-42 241 -140 498h-2l-2 -1q-16 -6 -43 -16.5t-101 -49t-137 -82t-131 -114.5t-103 -148l-15 11q184 -150 418 -150q132 0 256 52zM839 643q-21 49 -53 111q-311 -93 -673 -93q-1 -7 -1 -21q0 -124 44 -236.5t124 -201.5q50 89 123.5 166.5t142.5 124.5t130.5 81 t99.5 48l37 13q4 1 13 3.5t13 4.5zM732 855q-120 213 -244 378q-138 -65 -234 -186t-128 -272q302 0 606 80zM1416 536q-210 60 -409 29q87 -239 128 -469q111 75 185 189.5t96 250.5zM611 1277q-1 0 -2 -1q1 1 2 1zM1201 1132q-185 164 -433 164q-76 0 -155 -19 q131 -170 246 -382q69 26 130 60.5t96.5 61.5t65.5 57t37.5 40.5zM1424 647q-3 232 -149 410l-1 -1q-9 -12 -19 -24.5t-43.5 -44.5t-71 -60.5t-100 -65t-131.5 -64.5q25 -53 44 -95q2 -6 6.5 -17.5t7.5 -16.5q36 5 74.5 7t73.5 2t69 -1.5t64 -4t56.5 -5.5t48 -6.5t36.5 -6 t25 -4.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1173 473q0 50 -19.5 91.5t-48.5 68.5t-73 49t-82.5 34t-87.5 23l-104 24q-30 7 -44 10.5t-35 11.5t-30 16t-16.5 21t-7.5 30q0 77 144 77q43 0 77 -12t54 -28.5t38 -33.5t40 -29t48 -12q47 0 75.5 32t28.5 77q0 55 -56 99.5t-142 67.5t-182 23q-68 0 -132 -15.5 t-119.5 -47t-89 -87t-33.5 -128.5q0 -61 19 -106.5t56 -75.5t80 -48.5t103 -32.5l146 -36q90 -22 112 -36q32 -20 32 -60q0 -39 -40 -64.5t-105 -25.5q-51 0 -91.5 16t-65 38.5t-45.5 45t-46 38.5t-54 16q-50 0 -75.5 -30t-25.5 -75q0 -92 122 -157.5t291 -65.5 q73 0 140 18.5t122.5 53.5t88.5 93.5t33 131.5zM1536 256q0 -159 -112.5 -271.5t-271.5 -112.5q-130 0 -234 80q-77 -16 -150 -16q-143 0 -273.5 55.5t-225 150t-150 225t-55.5 273.5q0 73 16 150q-80 104 -80 234q0 159 112.5 271.5t271.5 112.5q130 0 234 -80 q77 16 150 16q143 0 273.5 -55.5t225 -150t150 -225t55.5 -273.5q0 -73 -16 -150q80 -104 80 -234z" />
-<glyph unicode="" horiz-adv-x="1280" d="M1000 1102l37 194q5 23 -9 40t-35 17h-712q-23 0 -38.5 -17t-15.5 -37v-1101q0 -7 6 -1l291 352q23 26 38 33.5t48 7.5h239q22 0 37 14.5t18 29.5q24 130 37 191q4 21 -11.5 40t-36.5 19h-294q-29 0 -48 19t-19 48v42q0 29 19 47.5t48 18.5h346q18 0 35 13.5t20 29.5z M1227 1324q-15 -73 -53.5 -266.5t-69.5 -350t-35 -173.5q-6 -22 -9 -32.5t-14 -32.5t-24.5 -33t-38.5 -21t-58 -10h-271q-13 0 -22 -10q-8 -9 -426 -494q-22 -25 -58.5 -28.5t-48.5 5.5q-55 22 -55 98v1410q0 55 38 102.5t120 47.5h888q95 0 127 -53t10 -159zM1227 1324 l-158 -790q4 17 35 173.5t69.5 350t53.5 266.5z" />
-<glyph unicode="" d="M704 192v1024q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-1024q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1376 576v640q0 14 -9 23t-23 9h-480q-14 0 -23 -9t-9 -23v-640q0 -14 9 -23t23 -9h480q14 0 23 9t9 23zM1536 1344v-1408q0 -26 -19 -45t-45 -19h-1408 q-26 0 -45 19t-19 45v1408q0 26 19 45t45 19h1408q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1280" d="M1280 480q0 -40 -28 -68t-68 -28q-51 0 -80 43l-227 341h-45v-132l247 -411q9 -15 9 -33q0 -26 -19 -45t-45 -19h-192v-272q0 -46 -33 -79t-79 -33h-160q-46 0 -79 33t-33 79v272h-192q-26 0 -45 19t-19 45q0 18 9 33l247 411v132h-45l-227 -341q-29 -43 -80 -43 q-40 0 -68 28t-28 68q0 29 16 53l256 384q73 107 176 107h384q103 0 176 -107l256 -384q16 -24 16 -53zM864 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="" horiz-adv-x="1024" d="M1024 832v-416q0 -40 -28 -68t-68 -28t-68 28t-28 68v352h-64v-912q0 -46 -33 -79t-79 -33t-79 33t-33 79v464h-64v-464q0 -46 -33 -79t-79 -33t-79 33t-33 79v912h-64v-352q0 -40 -28 -68t-68 -28t-68 28t-28 68v416q0 80 56 136t136 56h640q80 0 136 -56t56 -136z M736 1280q0 -93 -65.5 -158.5t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="" d="M773 234l350 473q16 22 24.5 59t-6 85t-61.5 79q-40 26 -83 25.5t-73.5 -17.5t-54.5 -45q-36 -40 -96 -40q-59 0 -95 40q-24 28 -54.5 45t-73.5 17.5t-84 -25.5q-46 -31 -60.5 -79t-6 -85t24.5 -59zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1472 640q0 117 -45.5 223.5t-123 184t-184 123t-223.5 45.5t-223.5 -45.5t-184 -123t-123 -184t-45.5 -223.5t45.5 -223.5t123 -184t184 -123t223.5 -45.5t223.5 45.5t184 123t123 184t45.5 223.5zM1748 363q-4 -15 -20 -20l-292 -96v-306q0 -16 -13 -26q-15 -10 -29 -4 l-292 94l-180 -248q-10 -13 -26 -13t-26 13l-180 248l-292 -94q-14 -6 -29 4q-13 10 -13 26v306l-292 96q-16 5 -20 20q-5 17 4 29l180 248l-180 248q-9 13 -4 29q4 15 20 20l292 96v306q0 16 13 26q15 10 29 4l292 -94l180 248q9 12 26 12t26 -12l180 -248l292 94 q14 6 29 -4q13 -10 13 -26v-306l292 -96q16 -5 20 -20q5 -16 -4 -29l-180 -248l180 -248q9 -12 4 -29z" />
-<glyph unicode="" d="M1262 233q-54 -9 -110 -9q-182 0 -337 90t-245 245t-90 337q0 192 104 357q-201 -60 -328.5 -229t-127.5 -384q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51q144 0 273.5 61.5t220.5 171.5zM1465 318q-94 -203 -283.5 -324.5t-413.5 -121.5q-156 0 -298 61 t-245 164t-164 245t-61 298q0 153 57.5 292.5t156 241.5t235.5 164.5t290 68.5q44 2 61 -39q18 -41 -15 -72q-86 -78 -131.5 -181.5t-45.5 -218.5q0 -148 73 -273t198 -198t273 -73q118 0 228 51q41 18 72 -13q14 -14 17.5 -34t-4.5 -38z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1088 704q0 26 -19 45t-45 19h-256q-26 0 -45 -19t-19 -45t19 -45t45 -19h256q26 0 45 19t19 45zM1664 896v-960q0 -26 -19 -45t-45 -19h-1408q-26 0 -45 19t-19 45v960q0 26 19 45t45 19h1408q26 0 45 -19t19 -45zM1728 1344v-256q0 -26 -19 -45t-45 -19h-1536 q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h1536q26 0 45 -19t19 -45z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1632 576q0 -26 -19 -45t-45 -19h-224q0 -171 -67 -290l208 -209q19 -19 19 -45t-19 -45q-18 -19 -45 -19t-45 19l-198 197q-5 -5 -15 -13t-42 -28.5t-65 -36.5t-82 -29t-97 -13v896h-128v-896q-51 0 -101.5 13.5t-87 33t-66 39t-43.5 32.5l-15 14l-183 -207 q-20 -21 -48 -21q-24 0 -43 16q-19 18 -20.5 44.5t15.5 46.5l202 227q-58 114 -58 274h-224q-26 0 -45 19t-19 45t19 45t45 19h224v294l-173 173q-19 19 -19 45t19 45t45 19t45 -19l173 -173h844l173 173q19 19 45 19t45 -19t19 -45t-19 -45l-173 -173v-294h224q26 0 45 -19 t19 -45zM1152 1152h-640q0 133 93.5 226.5t226.5 93.5t226.5 -93.5t93.5 -226.5z" />
-<glyph unicode="" horiz-adv-x="1920" d="M1917 1016q23 -64 -150 -294q-24 -32 -65 -85q-78 -100 -90 -131q-17 -41 14 -81q17 -21 81 -82h1l1 -1l1 -1l2 -2q141 -131 191 -221q3 -5 6.5 -12.5t7 -26.5t-0.5 -34t-25 -27.5t-59 -12.5l-256 -4q-24 -5 -56 5t-52 22l-20 12q-30 21 -70 64t-68.5 77.5t-61 58 t-56.5 15.5q-3 -1 -8 -3.5t-17 -14.5t-21.5 -29.5t-17 -52t-6.5 -77.5q0 -15 -3.5 -27.5t-7.5 -18.5l-4 -5q-18 -19 -53 -22h-115q-71 -4 -146 16.5t-131.5 53t-103 66t-70.5 57.5l-25 24q-10 10 -27.5 30t-71.5 91t-106 151t-122.5 211t-130.5 272q-6 16 -6 27t3 16l4 6 q15 19 57 19l274 2q12 -2 23 -6.5t16 -8.5l5 -3q16 -11 24 -32q20 -50 46 -103.5t41 -81.5l16 -29q29 -60 56 -104t48.5 -68.5t41.5 -38.5t34 -14t27 5q2 1 5 5t12 22t13.5 47t9.5 81t0 125q-2 40 -9 73t-14 46l-6 12q-25 34 -85 43q-13 2 5 24q17 19 38 30q53 26 239 24 q82 -1 135 -13q20 -5 33.5 -13.5t20.5 -24t10.5 -32t3.5 -45.5t-1 -55t-2.5 -70.5t-1.5 -82.5q0 -11 -1 -42t-0.5 -48t3.5 -40.5t11.5 -39t22.5 -24.5q8 -2 17 -4t26 11t38 34.5t52 67t68 107.5q60 104 107 225q4 10 10 17.5t11 10.5l4 3l5 2.5t13 3t20 0.5l288 2 q39 5 64 -2.5t31 -16.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M675 252q21 34 11 69t-45 50q-34 14 -73 1t-60 -46q-22 -34 -13 -68.5t43 -50.5t74.5 -2.5t62.5 47.5zM769 373q8 13 3.5 26.5t-17.5 18.5q-14 5 -28.5 -0.5t-21.5 -18.5q-17 -31 13 -45q14 -5 29 0.5t22 18.5zM943 266q-45 -102 -158 -150t-224 -12 q-107 34 -147.5 126.5t6.5 187.5q47 93 151.5 139t210.5 19q111 -29 158.5 -119.5t2.5 -190.5zM1255 426q-9 96 -89 170t-208.5 109t-274.5 21q-223 -23 -369.5 -141.5t-132.5 -264.5q9 -96 89 -170t208.5 -109t274.5 -21q223 23 369.5 141.5t132.5 264.5zM1563 422 q0 -68 -37 -139.5t-109 -137t-168.5 -117.5t-226 -83t-270.5 -31t-275 33.5t-240.5 93t-171.5 151t-65 199.5q0 115 69.5 245t197.5 258q169 169 341.5 236t246.5 -7q65 -64 20 -209q-4 -14 -1 -20t10 -7t14.5 0.5t13.5 3.5l6 2q139 59 246 59t153 -61q45 -63 0 -178 q-2 -13 -4.5 -20t4.5 -12.5t12 -7.5t17 -6q57 -18 103 -47t80 -81.5t34 -116.5zM1489 1046q42 -47 54.5 -108.5t-6.5 -117.5q-8 -23 -29.5 -34t-44.5 -4q-23 8 -34 29.5t-4 44.5q20 63 -24 111t-107 35q-24 -5 -45 8t-25 37q-5 24 8 44.5t37 25.5q60 13 119 -5.5t101 -65.5z M1670 1209q87 -96 112.5 -222.5t-13.5 -241.5q-9 -27 -34 -40t-52 -4t-40 34t-5 52q28 82 10 172t-80 158q-62 69 -148 95.5t-173 8.5q-28 -6 -52 9.5t-30 43.5t9.5 51.5t43.5 29.5q123 26 244 -11.5t208 -134.5z" />
-<glyph unicode="" d="M1133 -34q-171 -94 -368 -94q-196 0 -367 94q138 87 235.5 211t131.5 268q35 -144 132.5 -268t235.5 -211zM638 1394v-485q0 -252 -126.5 -459.5t-330.5 -306.5q-181 215 -181 495q0 187 83.5 349.5t229.5 269.5t325 137zM1536 638q0 -280 -181 -495 q-204 99 -330.5 306.5t-126.5 459.5v485q179 -30 325 -137t229.5 -269.5t83.5 -349.5z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1402 433q-32 -80 -76 -138t-91 -88.5t-99 -46.5t-101.5 -14.5t-96.5 8.5t-86.5 22t-69.5 27.5t-46 22.5l-17 10q-113 -228 -289.5 -359.5t-384.5 -132.5q-19 0 -32 13t-13 32t13 31.5t32 12.5q173 1 322.5 107.5t251.5 294.5q-36 -14 -72 -23t-83 -13t-91 2.5t-93 28.5 t-92 59t-84.5 100t-74.5 146q114 47 214 57t167.5 -7.5t124.5 -56.5t88.5 -77t56.5 -82q53 131 79 291q-7 -1 -18 -2.5t-46.5 -2.5t-69.5 0.5t-81.5 10t-88.5 23t-84 42.5t-75 65t-54.5 94.5t-28.5 127.5q70 28 133.5 36.5t112.5 -1t92 -30t73.5 -50t56 -61t42 -63t27.5 -56 t16 -39.5l4 -16q12 122 12 195q-8 6 -21.5 16t-49 44.5t-63.5 71.5t-54 93t-33 112.5t12 127t70 138.5q73 -25 127.5 -61.5t84.5 -76.5t48 -85t20.5 -89t-0.5 -85.5t-13 -76.5t-19 -62t-17 -42l-7 -15q1 -5 1 -50.5t-1 -71.5q3 7 10 18.5t30.5 43t50.5 58t71 55.5t91.5 44.5 t112 14.5t132.5 -24q-2 -78 -21.5 -141.5t-50 -104.5t-69.5 -71.5t-81.5 -45.5t-84.5 -24t-80 -9.5t-67.5 1t-46.5 4.5l-17 3q-23 -147 -73 -283q6 7 18 18.5t49.5 41t77.5 52.5t99.5 42t117.5 20t129 -23.5t137 -77.5z" />
-<glyph unicode="" horiz-adv-x="1280" d="M1259 283v-66q0 -85 -57.5 -144.5t-138.5 -59.5h-57l-260 -269v269h-529q-81 0 -138.5 59.5t-57.5 144.5v66h1238zM1259 609v-255h-1238v255h1238zM1259 937v-255h-1238v255h1238zM1259 1077v-67h-1238v67q0 84 57.5 143.5t138.5 59.5h846q81 0 138.5 -59.5t57.5 -143.5z " />
-<glyph unicode="" d="M1152 640q0 -14 -9 -23l-320 -320q-9 -9 -23 -9q-13 0 -22.5 9.5t-9.5 22.5v192h-352q-13 0 -22.5 9.5t-9.5 22.5v192q0 13 9.5 22.5t22.5 9.5h352v192q0 14 9 23t23 9q12 0 24 -10l319 -319q9 -9 9 -23zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1152 736v-192q0 -13 -9.5 -22.5t-22.5 -9.5h-352v-192q0 -14 -9 -23t-23 -9q-12 0 -24 10l-319 319q-9 9 -9 23t9 23l320 320q9 9 23 9q13 0 22.5 -9.5t9.5 -22.5v-192h352q13 0 22.5 -9.5t9.5 -22.5zM1312 640q0 148 -73 273t-198 198t-273 73t-273 -73t-198 -198 t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1024 960v-640q0 -26 -19 -45t-45 -19q-20 0 -37 12l-448 320q-27 19 -27 52t27 52l448 320q17 12 37 12q26 0 45 -19t19 -45zM1280 160v960q0 13 -9.5 22.5t-22.5 9.5h-960q-13 0 -22.5 -9.5t-9.5 -22.5v-960q0 -13 9.5 -22.5t22.5 -9.5h960q13 0 22.5 9.5t9.5 22.5z M1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" d="M1024 640q0 -106 -75 -181t-181 -75t-181 75t-75 181t75 181t181 75t181 -75t75 -181zM768 1184q-148 0 -273 -73t-198 -198t-73 -273t73 -273t198 -198t273 -73t273 73t198 198t73 273t-73 273t-198 198t-273 73zM1536 640q0 -209 -103 -385.5t-279.5 -279.5 t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1023 349l102 -204q-58 -179 -210 -290t-339 -111q-156 0 -288.5 77.5t-210 210t-77.5 288.5q0 181 104.5 330t274.5 211l17 -131q-122 -54 -195 -165.5t-73 -244.5q0 -185 131.5 -316.5t316.5 -131.5q126 0 232.5 65t165 175.5t49.5 236.5zM1571 249l58 -114l-256 -128 q-13 -7 -29 -7q-40 0 -57 35l-239 477h-472q-24 0 -42.5 16.5t-21.5 40.5l-96 779q-2 16 6 42q14 51 57 82.5t97 31.5q66 0 113 -47t47 -113q0 -69 -52 -117.5t-120 -41.5l37 -289h423v-128h-407l16 -128h455q40 0 57 -35l228 -455z" />
-<glyph unicode="" d="M1254 899q16 85 -21 132q-52 65 -187 45q-17 -3 -41 -12.5t-57.5 -30.5t-64.5 -48.5t-59.5 -70t-44.5 -91.5q80 7 113.5 -16t26.5 -99q-5 -52 -52 -143q-43 -78 -71 -99q-44 -32 -87 14q-23 24 -37.5 64.5t-19 73t-10 84t-8.5 71.5q-23 129 -34 164q-12 37 -35.5 69 t-50.5 40q-57 16 -127 -25q-54 -32 -136.5 -106t-122.5 -102v-7q16 -8 25.5 -26t21.5 -20q21 -3 54.5 8.5t58 10.5t41.5 -30q11 -18 18.5 -38.5t15 -48t12.5 -40.5q17 -46 53 -187q36 -146 57 -197q42 -99 103 -125q43 -12 85 -1.5t76 31.5q131 77 250 237 q104 139 172.5 292.5t82.5 226.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1152" d="M1152 704q0 -191 -94.5 -353t-256.5 -256.5t-353 -94.5h-160q-14 0 -23 9t-9 23v611l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v93l-215 -66q-3 -1 -9 -1q-10 0 -19 6q-13 10 -13 26v128q0 23 23 31l233 71v250q0 14 9 23t23 9h160 q14 0 23 -9t9 -23v-181l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-93l375 116q15 5 28 -5t13 -26v-128q0 -23 -23 -31l-393 -121v-487q188 13 318 151t130 328q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
-<glyph unicode="" horiz-adv-x="1408" d="M1152 736v-64q0 -14 -9 -23t-23 -9h-352v-352q0 -14 -9 -23t-23 -9h-64q-14 0 -23 9t-9 23v352h-352q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h352v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23v-352h352q14 0 23 -9t9 -23zM1280 288v832q0 66 -47 113t-113 47h-832 q-66 0 -113 -47t-47 -113v-832q0 -66 47 -113t113 -47h832q66 0 113 47t47 113zM1408 1120v-832q0 -119 -84.5 -203.5t-203.5 -84.5h-832q-119 0 -203.5 84.5t-84.5 203.5v832q0 119 84.5 203.5t203.5 84.5h832q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="2176" d="M620 416q-110 -64 -268 -64h-128v64h-64q-13 0 -22.5 23.5t-9.5 56.5q0 24 7 49q-58 2 -96.5 10.5t-38.5 20.5t38.5 20.5t96.5 10.5q-7 25 -7 49q0 33 9.5 56.5t22.5 23.5h64v64h128q158 0 268 -64h1113q42 -7 106.5 -18t80.5 -14q89 -15 150 -40.5t83.5 -47.5t22.5 -40 t-22.5 -40t-83.5 -47.5t-150 -40.5q-16 -3 -80.5 -14t-106.5 -18h-1113zM1739 668q53 -36 53 -92t-53 -92l81 -30q68 48 68 122t-68 122zM625 400h1015q-217 -38 -456 -80q-57 0 -113 -24t-83 -48l-28 -24l-288 -288q-26 -26 -70.5 -45t-89.5 -19h-96l-93 464h29 q157 0 273 64zM352 816h-29l93 464h96q46 0 90 -19t70 -45l288 -288q4 -4 11 -10.5t30.5 -23t48.5 -29t61.5 -23t72.5 -10.5l456 -80h-1015q-116 64 -273 64z" />
-<glyph unicode="" horiz-adv-x="1664" d="M1519 760q62 0 103.5 -40.5t41.5 -101.5q0 -97 -93 -130l-172 -59l56 -167q7 -21 7 -47q0 -59 -42 -102t-101 -43q-47 0 -85.5 27t-53.5 72l-55 165l-310 -106l55 -164q8 -24 8 -47q0 -59 -42 -102t-102 -43q-47 0 -85 27t-53 72l-55 163l-153 -53q-29 -9 -50 -9 q-61 0 -101.5 40t-40.5 101q0 47 27.5 85t71.5 53l156 53l-105 313l-156 -54q-26 -8 -48 -8q-60 0 -101 40.5t-41 100.5q0 47 27.5 85t71.5 53l157 53l-53 159q-8 24 -8 47q0 60 42 102.5t102 42.5q47 0 85 -27t53 -72l54 -160l310 105l-54 160q-8 24 -8 47q0 59 42.5 102 t101.5 43q47 0 85.5 -27.5t53.5 -71.5l53 -161l162 55q21 6 43 6q60 0 102.5 -39.5t42.5 -98.5q0 -45 -30 -81.5t-74 -51.5l-157 -54l105 -316l164 56q24 8 46 8zM725 498l310 105l-105 315l-310 -107z" />
-<glyph unicode="" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM1280 352v436q-31 -35 -64 -55q-34 -22 -132.5 -85t-151.5 -99q-98 -69 -164 -69v0v0q-66 0 -164 69 q-46 32 -141.5 92.5t-142.5 92.5q-12 8 -33 27t-31 27v-436q0 -40 28 -68t68 -28h832q40 0 68 28t28 68zM1280 925q0 41 -27.5 70t-68.5 29h-832q-40 0 -68 -28t-28 -68q0 -37 30.5 -76.5t67.5 -64.5q47 -32 137.5 -89t129.5 -83q3 -2 17 -11.5t21 -14t21 -13t23.5 -13 t21.5 -9.5t22.5 -7.5t20.5 -2.5t20.5 2.5t22.5 7.5t21.5 9.5t23.5 13t21 13t21 14t17 11.5l267 174q35 23 66.5 62.5t31.5 73.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M127 640q0 163 67 313l367 -1005q-196 95 -315 281t-119 411zM1415 679q0 -19 -2.5 -38.5t-10 -49.5t-11.5 -44t-17.5 -59t-17.5 -58l-76 -256l-278 826q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-75 1 -202 10q-12 1 -20.5 -5t-11.5 -15t-1.5 -18.5t9 -16.5 t19.5 -8l80 -8l120 -328l-168 -504l-280 832q46 3 88 8q19 2 26 18.5t-2.5 31t-28.5 13.5l-205 -10q-7 0 -23 0.5t-26 0.5q105 160 274.5 253.5t367.5 93.5q147 0 280.5 -53t238.5 -149h-10q-55 0 -92 -40.5t-37 -95.5q0 -12 2 -24t4 -21.5t8 -23t9 -21t12 -22.5t12.5 -21 t14.5 -24t14 -23q63 -107 63 -212zM909 573l237 -647q1 -6 5 -11q-126 -44 -255 -44q-112 0 -217 32zM1570 1009q95 -174 95 -369q0 -209 -104 -385.5t-279 -278.5l235 678q59 169 59 276q0 42 -6 79zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286 t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 -215q173 0 331.5 68t273 182.5t182.5 273t68 331.5t-68 331.5t-182.5 273t-273 182.5t-331.5 68t-331.5 -68t-273 -182.5t-182.5 -273t-68 -331.5t68 -331.5t182.5 -273 t273 -182.5t331.5 -68z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1086 1536v-1536l-272 -128q-228 20 -414 102t-293 208.5t-107 272.5q0 140 100.5 263.5t275 205.5t391.5 108v-172q-217 -38 -356.5 -150t-139.5 -255q0 -152 154.5 -267t388.5 -145v1360zM1755 954l37 -390l-525 114l147 83q-119 70 -280 99v172q277 -33 481 -157z" />
-<glyph unicode="" horiz-adv-x="2048" d="M960 1536l960 -384v-128h-128q0 -26 -20.5 -45t-48.5 -19h-1526q-28 0 -48.5 19t-20.5 45h-128v128zM256 896h256v-768h128v768h256v-768h128v768h256v-768h128v768h256v-768h59q28 0 48.5 -19t20.5 -45v-64h-1664v64q0 26 20.5 45t48.5 19h59v768zM1851 -64 q28 0 48.5 -19t20.5 -45v-128h-1920v128q0 26 20.5 45t48.5 19h1782z" />
-<glyph unicode="" horiz-adv-x="2304" d="M1774 700l18 -316q4 -69 -82 -128t-235 -93.5t-323 -34.5t-323 34.5t-235 93.5t-82 128l18 316l574 -181q22 -7 48 -7t48 7zM2304 1024q0 -23 -22 -31l-1120 -352q-4 -1 -10 -1t-10 1l-652 206q-43 -34 -71 -111.5t-34 -178.5q63 -36 63 -109q0 -69 -58 -107l58 -433 q2 -14 -8 -25q-9 -11 -24 -11h-192q-15 0 -24 11q-10 11 -8 25l58 433q-58 38 -58 107q0 73 65 111q11 207 98 330l-333 104q-22 8 -22 31t22 31l1120 352q4 1 10 1t10 -1l1120 -352q22 -8 22 -31z" />
-<glyph unicode="" d="M859 579l13 -707q-62 11 -105 11q-41 0 -105 -11l13 707q-40 69 -168.5 295.5t-216.5 374.5t-181 287q58 -15 108 -15q43 0 111 15q63 -111 133.5 -229.5t167 -276.5t138.5 -227q37 61 109.5 177.5t117.5 190t105 176t107 189.5q54 -14 107 -14q56 0 114 14v0 q-28 -39 -60 -88.5t-49.5 -78.5t-56.5 -96t-49 -84q-146 -248 -353 -610z" />
-<glyph unicode="" horiz-adv-x="1280" d="M981 197q0 25 -7 49t-14.5 42t-27 41.5t-29.5 35t-38.5 34.5t-36.5 29t-41.5 30t-36.5 26q-16 2 -49 2q-53 0 -104.5 -7t-107 -25t-97 -46t-68.5 -74.5t-27 -105.5q0 -56 23.5 -102t61 -75.5t87 -50t100 -29t101.5 -8.5q58 0 111.5 13t99 39t73 73t27.5 109zM864 1055 q0 59 -17 125.5t-48 129t-84 103.5t-117 41q-42 0 -82.5 -19.5t-66.5 -52.5q-46 -59 -46 -160q0 -46 10 -97.5t31.5 -103t52 -92.5t75 -67t96.5 -26q37 0 77.5 16.5t65.5 43.5q53 56 53 159zM752 1536h417l-137 -88h-132q75 -63 113 -133t38 -160q0 -72 -24.5 -129.5 t-59.5 -93t-69.5 -65t-59 -61.5t-24.5 -66q0 -36 32 -70.5t77 -68t90.5 -73.5t77.5 -104t32 -142q0 -91 -49 -173q-71 -122 -209.5 -179.5t-298.5 -57.5q-132 0 -246.5 41.5t-172.5 137.5q-36 59 -36 131q0 81 44.5 150t118.5 115q131 82 404 100q-32 41 -47.5 73.5 t-15.5 73.5q0 40 21 85q-46 -4 -68 -4q-148 0 -249.5 96.5t-101.5 244.5q0 82 36 159t99 131q76 66 182 98t218 32z" />
-<glyph unicode="" horiz-adv-x="1984" d="M831 572q0 -56 -40.5 -96t-96.5 -40q-57 0 -98 40t-41 96q0 57 41.5 98t97.5 41t96.5 -41t40.5 -98zM1292 711q56 0 96.5 -41t40.5 -98q0 -56 -40.5 -96t-96.5 -40q-57 0 -98 40t-41 96q0 57 41.5 98t97.5 41zM1984 722q0 -62 -31 -114t-83 -82q5 -33 5 -61 q0 -121 -68.5 -230.5t-197.5 -193.5q-125 -82 -285.5 -125.5t-335.5 -43.5q-176 0 -336.5 43.5t-284.5 125.5q-129 84 -197.5 193t-68.5 231q0 29 5 66q-48 31 -77 81.5t-29 109.5q0 94 66 160t160 66q83 0 148 -55q248 158 592 164l134 423q4 14 17.5 21.5t28.5 4.5 l347 -82q22 50 68.5 81t102.5 31q77 0 131.5 -54.5t54.5 -131.5t-54.5 -132t-131.5 -55q-76 0 -130.5 54t-55.5 131l-315 74l-116 -366q327 -14 560 -166q64 58 151 58q94 0 160 -66t66 -160zM1664 1459q-45 0 -77 -32t-32 -77t32 -77t77 -32t77 32t32 77t-32 77t-77 32z M77 722q0 -67 51 -111q49 131 180 235q-36 25 -82 25q-62 0 -105.5 -43.5t-43.5 -105.5zM1567 105q112 73 171.5 166t59.5 194t-59.5 193.5t-171.5 165.5q-116 75 -265.5 115.5t-313.5 40.5t-313.5 -40.5t-265.5 -115.5q-112 -73 -171.5 -165.5t-59.5 -193.5t59.5 -194 t171.5 -166q116 -75 265.5 -115.5t313.5 -40.5t313.5 40.5t265.5 115.5zM1850 605q57 46 57 117q0 62 -43.5 105.5t-105.5 43.5q-49 0 -86 -28q131 -105 178 -238zM1258 237q11 11 27 11t27 -11t11 -27.5t-11 -27.5q-99 -99 -319 -99h-2q-220 0 -319 99q-11 11 -11 27.5 t11 27.5t27 11t27 -11q77 -77 265 -77h2q188 0 265 77z" />
-<glyph unicode="" d="M950 393q7 7 17.5 7t17.5 -7t7 -18t-7 -18q-65 -64 -208 -64h-1h-1q-143 0 -207 64q-8 7 -8 18t8 18q7 7 17.5 7t17.5 -7q49 -51 172 -51h1h1q122 0 173 51zM671 613q0 -37 -26 -64t-63 -27t-63 27t-26 64t26 63t63 26t63 -26t26 -63zM1214 1049q-29 0 -50 21t-21 50 q0 30 21 51t50 21q30 0 51 -21t21 -51q0 -29 -21 -50t-51 -21zM1216 1408q132 0 226 -94t94 -227v-894q0 -133 -94 -227t-226 -94h-896q-132 0 -226 94t-94 227v894q0 133 94 227t226 94h896zM1321 596q35 14 57 45.5t22 70.5q0 51 -36 87.5t-87 36.5q-60 0 -98 -48 q-151 107 -375 115l83 265l206 -49q1 -50 36.5 -85t84.5 -35q50 0 86 35.5t36 85.5t-36 86t-86 36q-36 0 -66 -20.5t-45 -53.5l-227 54q-9 2 -17.5 -2.5t-11.5 -14.5l-95 -302q-224 -4 -381 -113q-36 43 -93 43q-51 0 -87 -36.5t-36 -87.5q0 -37 19.5 -67.5t52.5 -45.5 q-7 -25 -7 -54q0 -98 74 -181.5t201.5 -132t278.5 -48.5q150 0 277.5 48.5t201.5 132t74 181.5q0 27 -6 54zM971 702q37 0 63 -26t26 -63t-26 -64t-63 -27t-63 27t-26 64t26 63t63 26z" />
-<glyph unicode="" d="M866 697l90 27v62q0 79 -58 135t-138 56t-138 -55.5t-58 -134.5v-283q0 -20 -14 -33.5t-33 -13.5t-32.5 13.5t-13.5 33.5v120h-151v-122q0 -82 57.5 -139t139.5 -57q81 0 138.5 56.5t57.5 136.5v280q0 19 13.5 33t33.5 14q19 0 32.5 -14t13.5 -33v-54zM1199 502v122h-150 v-126q0 -20 -13.5 -33.5t-33.5 -13.5q-19 0 -32.5 14t-13.5 33v123l-90 -26l-60 28v-123q0 -80 58 -137t139 -57t138.5 57t57.5 139zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103 t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" horiz-adv-x="1920" d="M1062 824v118q0 42 -30 72t-72 30t-72 -30t-30 -72v-612q0 -175 -126 -299t-303 -124q-178 0 -303.5 125.5t-125.5 303.5v266h328v-262q0 -43 30 -72.5t72 -29.5t72 29.5t30 72.5v620q0 171 126.5 292t301.5 121q176 0 302 -122t126 -294v-136l-195 -58zM1592 602h328 v-266q0 -178 -125.5 -303.5t-303.5 -125.5q-177 0 -303 124.5t-126 300.5v268l131 -61l195 58v-270q0 -42 30 -71.5t72 -29.5t72 29.5t30 71.5v275z" />
-<glyph unicode="" d="M1472 160v480h-704v704h-480q-93 0 -158.5 -65.5t-65.5 -158.5v-480h704v-704h480q93 0 158.5 65.5t65.5 158.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5 t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="2048" d="M328 1254h204v-983h-532v697h328v286zM328 435v369h-123v-369h123zM614 968v-697h205v697h-205zM614 1254v-204h205v204h-205zM901 968h533v-942h-533v163h328v82h-328v697zM1229 435v369h-123v-369h123zM1516 968h532v-942h-532v163h327v82h-327v697zM1843 435v369h-123 v-369h123z" />
-<glyph unicode="" d="M1046 516q0 -64 -38 -109t-91 -45q-43 0 -70 15v277q28 17 70 17q53 0 91 -45.5t38 -109.5zM703 944q0 -64 -38 -109.5t-91 -45.5q-43 0 -70 15v277q28 17 70 17q53 0 91 -45t38 -109zM1265 513q0 134 -88 229t-213 95q-20 0 -39 -3q-23 -78 -78 -136q-87 -95 -211 -101 v-636l211 41v206q51 -19 117 -19q125 0 213 95t88 229zM922 940q0 134 -88.5 229t-213.5 95q-74 0 -141 -36h-186v-840l211 41v206q55 -19 116 -19q125 0 213.5 95t88.5 229zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960 q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="2038" d="M1222 607q75 3 143.5 -20.5t118 -58.5t101 -94.5t84 -108t75.5 -120.5q33 -56 78.5 -109t75.5 -80.5t99 -88.5q-48 -30 -108.5 -57.5t-138.5 -59t-114 -47.5q-44 37 -74 115t-43.5 164.5t-33 180.5t-42.5 168.5t-72.5 123t-122.5 48.5l-10 -2l-6 -4q4 -5 13 -14 q6 -5 28 -23.5t25.5 -22t19 -18t18 -20.5t11.5 -21t10.5 -27.5t4.5 -31t4 -40.5l1 -33q1 -26 -2.5 -57.5t-7.5 -52t-12.5 -58.5t-11.5 -53q-35 1 -101 -9.5t-98 -10.5q-39 0 -72 10q-2 16 -2 47q0 74 3 96q2 13 31.5 41.5t57 59t26.5 51.5q-24 2 -43 -24 q-36 -53 -111.5 -99.5t-136.5 -46.5q-25 0 -75.5 63t-106.5 139.5t-84 96.5q-6 4 -27 30q-482 -112 -513 -112q-16 0 -28 11t-12 27q0 15 8.5 26.5t22.5 14.5l486 106q-8 14 -8 25t5.5 17.5t16 11.5t20 7t23 4.5t18.5 4.5q4 1 15.5 7.5t17.5 6.5q15 0 28 -16t20 -33 q163 37 172 37q17 0 29.5 -11t12.5 -28q0 -15 -8.5 -26t-23.5 -14l-182 -40l-1 -16q-1 -26 81.5 -117.5t104.5 -91.5q47 0 119 80t72 129q0 36 -23.5 53t-51 18.5t-51 11.5t-23.5 34q0 16 10 34l-68 19q43 44 43 117q0 26 -5 58q82 16 144 16q44 0 71.5 -1.5t48.5 -8.5 t31 -13.5t20.5 -24.5t15.5 -33.5t17 -47.5t24 -60l50 25q-3 -40 -23 -60t-42.5 -21t-40 -6.5t-16.5 -20.5zM1282 842q-5 5 -13.5 15.5t-12 14.5t-10.5 11.5t-10 10.5l-8 8t-8.5 7.5t-8 5t-8.5 4.5q-7 3 -14.5 5t-20.5 2.5t-22 0.5h-32.5h-37.5q-126 0 -217 -43 q16 30 36 46.5t54 29.5t65.5 36t46 36.5t50 55t43.5 50.5q12 -9 28 -31.5t32 -36.5t38 -13l12 1v-76l22 -1q247 95 371 190q28 21 50 39t42.5 37.5t33 31t29.5 34t24 31t24.5 37t23 38t27 47.5t29.5 53l7 9q-2 -53 -43 -139q-79 -165 -205 -264t-306 -142q-14 -3 -42 -7.5 t-50 -9.5t-39 -14q3 -19 24.5 -46t21.5 -34q0 -11 -26 -30zM1061 -79q39 26 131.5 47.5t146.5 21.5q9 0 22.5 -15.5t28 -42.5t26 -50t24 -51t14.5 -33q-121 -45 -244 -45q-61 0 -125 11zM822 568l48 12l109 -177l-73 -48zM1323 51q3 -15 3 -16q0 -7 -17.5 -14.5t-46 -13 t-54 -9.5t-53.5 -7.5t-32 -4.5l-7 43q21 2 60.5 8.5t72 10t60.5 3.5h14zM866 679l-96 -20l-6 17q10 1 32.5 7t34.5 6q19 0 35 -10zM1061 45h31l10 -83l-41 -12v95zM1950 1535v1v-1zM1950 1535l-1 -5l-2 -2l1 3zM1950 1535l1 1z" />
-<glyph unicode="" d="M1167 -50q-5 19 -24 5q-30 -22 -87 -39t-131 -17q-129 0 -193 49q-5 4 -13 4q-11 0 -26 -12q-7 -6 -7.5 -16t7.5 -20q34 -32 87.5 -46t102.5 -12.5t99 4.5q41 4 84.5 20.5t65 30t28.5 20.5q12 12 7 29zM1128 65q-19 47 -39 61q-23 15 -76 15q-47 0 -71 -10 q-29 -12 -78 -56q-26 -24 -12 -44q9 -8 17.5 -4.5t31.5 23.5q3 2 10.5 8.5t10.5 8.5t10 7t11.5 7t12.5 5t15 4.5t16.5 2.5t20.5 1q27 0 44.5 -7.5t23 -14.5t13.5 -22q10 -17 12.5 -20t12.5 1q23 12 14 34zM1483 346q0 22 -5 44.5t-16.5 45t-34 36.5t-52.5 14 q-33 0 -97 -41.5t-129 -83.5t-101 -42q-27 -1 -63.5 19t-76 49t-83.5 58t-100 49t-111 19q-115 -1 -197 -78.5t-84 -178.5q-2 -112 74 -164q29 -20 62.5 -28.5t103.5 -8.5q57 0 132 32.5t134 71t120 70.5t93 31q26 -1 65 -31.5t71.5 -67t68 -67.5t55.5 -32q35 -3 58.5 14 t55.5 63q28 41 42.5 101t14.5 106zM1536 506q0 -164 -62 -304.5t-166 -236t-242.5 -149.5t-290.5 -54t-293 57.5t-247.5 157t-170.5 241.5t-64 302q0 89 19.5 172.5t49 145.5t70.5 118.5t78.5 94t78.5 69.5t64.5 46.5t42.5 24.5q14 8 51 26.5t54.5 28.5t48 30t60.5 44 q36 28 58 72.5t30 125.5q129 -155 186 -193q44 -29 130 -68t129 -66q21 -13 39 -25t60.5 -46.5t76 -70.5t75 -95t69 -122t47 -148.5t19.5 -177.5z" />
-<glyph unicode="" d="M1070 463l-160 -160l-151 -152l-30 -30q-65 -64 -151.5 -87t-171.5 -2q-16 -70 -72 -115t-129 -45q-85 0 -145 60.5t-60 145.5q0 72 44.5 128t113.5 72q-22 86 1 173t88 152l12 12l151 -152l-11 -11q-37 -37 -37 -89t37 -90q37 -37 89 -37t89 37l30 30l151 152l161 160z M729 1145l12 -12l-152 -152l-12 12q-37 37 -89 37t-89 -37t-37 -89.5t37 -89.5l29 -29l152 -152l160 -160l-151 -152l-161 160l-151 152l-30 30q-68 67 -90 159.5t5 179.5q-70 15 -115 71t-45 129q0 85 60 145.5t145 60.5q76 0 133.5 -49t69.5 -123q84 20 169.5 -3.5 t149.5 -87.5zM1536 78q0 -85 -60 -145.5t-145 -60.5q-74 0 -131 47t-71 118q-86 -28 -179.5 -6t-161.5 90l-11 12l151 152l12 -12q37 -37 89 -37t89 37t37 89t-37 89l-30 30l-152 152l-160 160l152 152l160 -160l152 -152l29 -30q64 -64 87.5 -150.5t2.5 -171.5 q76 -11 126.5 -68.5t50.5 -134.5zM1534 1202q0 -77 -51 -135t-127 -69q26 -85 3 -176.5t-90 -158.5l-12 -12l-151 152l12 12q37 37 37 89t-37 89t-89 37t-89 -37l-30 -30l-152 -152l-160 -160l-152 152l161 160l152 152l29 30q67 67 159 89.5t178 -3.5q11 75 68.5 126 t135.5 51q85 0 145 -60.5t60 -145.5z" />
-<glyph unicode="" d="M654 458q-1 -3 -12.5 0.5t-31.5 11.5l-20 9q-44 20 -87 49q-7 5 -41 31.5t-38 28.5q-67 -103 -134 -181q-81 -95 -105 -110q-4 -2 -19.5 -4t-18.5 0q6 4 82 92q21 24 85.5 115t78.5 118q17 30 51 98.5t36 77.5q-8 1 -110 -33q-8 -2 -27.5 -7.5t-34.5 -9.5t-17 -5 q-2 -2 -2 -10.5t-1 -9.5q-5 -10 -31 -15q-23 -7 -47 0q-18 4 -28 21q-4 6 -5 23q6 2 24.5 5t29.5 6q58 16 105 32q100 35 102 35q10 2 43 19.5t44 21.5q9 3 21.5 8t14.5 5.5t6 -0.5q2 -12 -1 -33q0 -2 -12.5 -27t-26.5 -53.5t-17 -33.5q-25 -50 -77 -131l64 -28 q12 -6 74.5 -32t67.5 -28q4 -1 10.5 -25.5t4.5 -30.5zM449 944q3 -15 -4 -28q-12 -23 -50 -38q-30 -12 -60 -12q-26 3 -49 26q-14 15 -18 41l1 3q3 -3 19.5 -5t26.5 0t58 16q36 12 55 14q17 0 21 -17zM1147 815l63 -227l-139 42zM39 15l694 232v1032l-694 -233v-1031z M1280 332l102 -31l-181 657l-100 31l-216 -536l102 -31l45 110l211 -65zM777 1294l573 -184v380zM1088 -29l158 -13l-54 -160l-40 66q-130 -83 -276 -108q-58 -12 -91 -12h-84q-79 0 -199.5 39t-183.5 85q-8 7 -8 16q0 8 5 13.5t13 5.5q4 0 18 -7.5t30.5 -16.5t20.5 -11 q73 -37 159.5 -61.5t157.5 -24.5q95 0 167 14.5t157 50.5q15 7 30.5 15.5t34 19t28.5 16.5zM1536 1050v-1079l-774 246q-14 -6 -375 -127.5t-368 -121.5q-13 0 -18 13q0 1 -1 3v1078q3 9 4 10q5 6 20 11q106 35 149 50v384l558 -198q2 0 160.5 55t316 108.5t161.5 53.5 q20 0 20 -21v-418z" />
-<glyph unicode="" horiz-adv-x="1792" d="M288 1152q66 0 113 -47t47 -113v-1088q0 -66 -47 -113t-113 -47h-128q-66 0 -113 47t-47 113v1088q0 66 47 113t113 47h128zM1664 989q58 -34 93 -93t35 -128v-768q0 -106 -75 -181t-181 -75h-864q-66 0 -113 47t-47 113v1536q0 40 28 68t68 28h672q40 0 88 -20t76 -48 l152 -152q28 -28 48 -76t20 -88v-163zM928 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM928 512v128q0 14 -9 23 t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1184 256v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128 q14 0 23 9t9 23zM1184 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 0v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 256v128q0 14 -9 23t-23 9h-128 q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1440 512v128q0 14 -9 23t-23 9h-128q-14 0 -23 -9t-9 -23v-128q0 -14 9 -23t23 -9h128q14 0 23 9t9 23zM1536 896v256h-160q-40 0 -68 28t-28 68v160h-640v-512h896z" />
-<glyph unicode="" d="M1344 1536q26 0 45 -19t19 -45v-1664q0 -26 -19 -45t-45 -19h-1280q-26 0 -45 19t-19 45v1664q0 26 19 45t45 19h1280zM512 1248v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 992v-64q0 -14 9 -23t23 -9h64q14 0 23 9 t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 736v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM512 480v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23zM384 160v64 q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64 q14 0 23 9t9 23zM384 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM384 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 -96v192q0 14 -9 23t-23 9h-320q-14 0 -23 -9 t-9 -23v-192q0 -14 9 -23t23 -9h320q14 0 23 9t9 23zM896 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 928v64 q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM896 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 160v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64 q14 0 23 9t9 23zM1152 416v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 672v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 928v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9 t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1152 1184v64q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-64q0 -14 9 -23t23 -9h64q14 0 23 9t9 23z" />
-<glyph unicode="" horiz-adv-x="1280" d="M1188 988l-292 -292v-824q0 -46 -33 -79t-79 -33t-79 33t-33 79v384h-64v-384q0 -46 -33 -79t-79 -33t-79 33t-33 79v824l-292 292q-28 28 -28 68t28 68t68 28t68 -28l228 -228h368l228 228q28 28 68 28t68 -28t28 -68t-28 -68zM864 1152q0 -93 -65.5 -158.5 t-158.5 -65.5t-158.5 65.5t-65.5 158.5t65.5 158.5t158.5 65.5t158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="" horiz-adv-x="1664" d="M780 1064q0 -60 -19 -113.5t-63 -92.5t-105 -39q-76 0 -138 57.5t-92 135.5t-30 151q0 60 19 113.5t63 92.5t105 39q77 0 138.5 -57.5t91.5 -135t30 -151.5zM438 581q0 -80 -42 -139t-119 -59q-76 0 -141.5 55.5t-100.5 133.5t-35 152q0 80 42 139.5t119 59.5 q76 0 141.5 -55.5t100.5 -134t35 -152.5zM832 608q118 0 255 -97.5t229 -237t92 -254.5q0 -46 -17 -76.5t-48.5 -45t-64.5 -20t-76 -5.5q-68 0 -187.5 45t-182.5 45q-66 0 -192.5 -44.5t-200.5 -44.5q-183 0 -183 146q0 86 56 191.5t139.5 192.5t187.5 146t193 59zM1071 819 q-61 0 -105 39t-63 92.5t-19 113.5q0 74 30 151.5t91.5 135t138.5 57.5q61 0 105 -39t63 -92.5t19 -113.5q0 -73 -30 -151t-92 -135.5t-138 -57.5zM1503 923q77 0 119 -59.5t42 -139.5q0 -74 -35 -152t-100.5 -133.5t-141.5 -55.5q-77 0 -119 59t-42 139q0 74 35 152.5 t100.5 134t141.5 55.5z" />
-<glyph unicode="" horiz-adv-x="768" d="M704 1008q0 -145 -57 -243.5t-152 -135.5l45 -821q2 -26 -16 -45t-44 -19h-192q-26 0 -44 19t-16 45l45 821q-95 37 -152 135.5t-57 243.5q0 128 42.5 249.5t117.5 200t160 78.5t160 -78.5t117.5 -200t42.5 -249.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M896 -93l640 349v636l-640 -233v-752zM832 772l698 254l-698 254l-698 -254zM1664 1024v-768q0 -35 -18 -65t-49 -47l-704 -384q-28 -16 -61 -16t-61 16l-704 384q-31 17 -49 47t-18 65v768q0 40 23 73t61 47l704 256q22 8 44 8t44 -8l704 -256q38 -14 61 -47t23 -73z " />
-<glyph unicode="" horiz-adv-x="2304" d="M640 -96l384 192v314l-384 -164v-342zM576 358l404 173l-404 173l-404 -173zM1664 -96l384 192v314l-384 -164v-342zM1600 358l404 173l-404 173l-404 -173zM1152 651l384 165v266l-384 -164v-267zM1088 1030l441 189l-441 189l-441 -189zM2176 512v-416q0 -36 -19 -67 t-52 -47l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-5 2 -7 4q-2 -2 -7 -4l-448 -224q-25 -14 -57 -14t-57 14l-448 224q-33 16 -52 47t-19 67v416q0 38 21.5 70t56.5 48l434 186v400q0 38 21.5 70t56.5 48l448 192q23 10 50 10t50 -10l448 -192q35 -16 56.5 -48t21.5 -70 v-400l434 -186q36 -16 57 -48t21 -70z" />
-<glyph unicode="" horiz-adv-x="2048" d="M1848 1197h-511v-124h511v124zM1596 771q-90 0 -146 -52.5t-62 -142.5h408q-18 195 -200 195zM1612 186q63 0 122 32t76 87h221q-100 -307 -427 -307q-214 0 -340.5 132t-126.5 347q0 208 130.5 345.5t336.5 137.5q138 0 240.5 -68t153 -179t50.5 -248q0 -17 -2 -47h-658 q0 -111 57.5 -171.5t166.5 -60.5zM277 236h296q205 0 205 167q0 180 -199 180h-302v-347zM277 773h281q78 0 123.5 36.5t45.5 113.5q0 144 -190 144h-260v-294zM0 1282h594q87 0 155 -14t126.5 -47.5t90 -96.5t31.5 -154q0 -181 -172 -263q114 -32 172 -115t58 -204 q0 -75 -24.5 -136.5t-66 -103.5t-98.5 -71t-121 -42t-134 -13h-611v1260z" />
-<glyph unicode="" d="M1248 1408q119 0 203.5 -84.5t84.5 -203.5v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960zM499 1041h-371v-787h382q117 0 197 57.5t80 170.5q0 158 -143 200q107 52 107 164q0 57 -19.5 96.5 t-56.5 60.5t-79 29.5t-97 8.5zM477 723h-176v184h163q119 0 119 -90q0 -94 -106 -94zM486 388h-185v217h189q124 0 124 -113q0 -104 -128 -104zM1136 356q-68 0 -104 38t-36 107h411q1 10 1 30q0 132 -74.5 220.5t-203.5 88.5q-128 0 -210 -86t-82 -216q0 -135 79 -217 t213 -82q205 0 267 191h-138q-11 -34 -47.5 -54t-75.5 -20zM1126 722q113 0 124 -122h-254q4 56 39 89t91 33zM964 988h319v-77h-319v77z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1582 954q0 -101 -71.5 -172.5t-172.5 -71.5t-172.5 71.5t-71.5 172.5t71.5 172.5t172.5 71.5t172.5 -71.5t71.5 -172.5zM812 212q0 104 -73 177t-177 73q-27 0 -54 -6l104 -42q77 -31 109.5 -106.5t1.5 -151.5q-31 -77 -107 -109t-152 -1q-21 8 -62 24.5t-61 24.5 q32 -60 91 -96.5t130 -36.5q104 0 177 73t73 177zM1642 953q0 126 -89.5 215.5t-215.5 89.5q-127 0 -216.5 -89.5t-89.5 -215.5q0 -127 89.5 -216t216.5 -89q126 0 215.5 89t89.5 216zM1792 953q0 -189 -133.5 -322t-321.5 -133l-437 -319q-12 -129 -109 -218t-229 -89 q-121 0 -214 76t-118 192l-230 92v429l389 -157q79 48 173 48q13 0 35 -2l284 407q2 187 135.5 319t320.5 132q188 0 321.5 -133.5t133.5 -321.5z" />
-<glyph unicode="" d="M1242 889q0 80 -57 136.5t-137 56.5t-136.5 -57t-56.5 -136q0 -80 56.5 -136.5t136.5 -56.5t137 56.5t57 136.5zM632 301q0 -83 -58 -140.5t-140 -57.5q-56 0 -103 29t-72 77q52 -20 98 -40q60 -24 120 1.5t85 86.5q24 60 -1.5 120t-86.5 84l-82 33q22 5 42 5 q82 0 140 -57.5t58 -140.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v153l172 -69q20 -92 93.5 -152t168.5 -60q104 0 181 70t87 173l345 252q150 0 255.5 105.5t105.5 254.5q0 150 -105.5 255.5t-255.5 105.5 q-148 0 -253 -104.5t-107 -252.5l-225 -322q-9 1 -28 1q-75 0 -137 -37l-297 119v468q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5zM1289 887q0 -100 -71 -170.5t-171 -70.5t-170.5 70.5t-70.5 170.5t70.5 171t170.5 71q101 0 171.5 -70.5t70.5 -171.5z " />
-<glyph unicode="" horiz-adv-x="1792" d="M836 367l-15 -368l-2 -22l-420 29q-36 3 -67 31.5t-47 65.5q-11 27 -14.5 55t4 65t12 55t21.5 64t19 53q78 -12 509 -28zM449 953l180 -379l-147 92q-63 -72 -111.5 -144.5t-72.5 -125t-39.5 -94.5t-18.5 -63l-4 -21l-190 357q-17 26 -18 56t6 47l8 18q35 63 114 188 l-140 86zM1680 436l-188 -359q-12 -29 -36.5 -46.5t-43.5 -20.5l-18 -4q-71 -7 -219 -12l8 -164l-230 367l211 362l7 -173q170 -16 283 -5t170 33zM895 1360q-47 -63 -265 -435l-317 187l-19 12l225 356q20 31 60 45t80 10q24 -2 48.5 -12t42 -21t41.5 -33t36 -34.5 t36 -39.5t32 -35zM1550 1053l212 -363q18 -37 12.5 -76t-27.5 -74q-13 -20 -33 -37t-38 -28t-48.5 -22t-47 -16t-51.5 -14t-46 -12q-34 72 -265 436l313 195zM1407 1279l142 83l-220 -373l-419 20l151 86q-34 89 -75 166t-75.5 123.5t-64.5 80t-47 46.5l-17 13l405 -1 q31 3 58 -10.5t39 -28.5l11 -15q39 -61 112 -190z" />
-<glyph unicode="" horiz-adv-x="2048" d="M480 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM516 768h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5zM1888 448q0 66 -47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47t113 47t47 113zM2048 544v-384 q0 -14 -9 -23t-23 -9h-96v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-1024v-128q0 -80 -56 -136t-136 -56t-136 56t-56 136v128h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5t179 63.5h768q98 0 179 -63.5t104 -157.5 l105 -419h28q93 0 158.5 -65.5t65.5 -158.5z" />
-<glyph unicode="" horiz-adv-x="2048" d="M1824 640q93 0 158.5 -65.5t65.5 -158.5v-384q0 -14 -9 -23t-23 -9h-96v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-1024v-64q0 -80 -56 -136t-136 -56t-136 56t-56 136v64h-96q-14 0 -23 9t-9 23v384q0 93 65.5 158.5t158.5 65.5h28l105 419q23 94 104 157.5 t179 63.5h128v224q0 14 9 23t23 9h448q14 0 23 -9t9 -23v-224h128q98 0 179 -63.5t104 -157.5l105 -419h28zM320 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47zM516 640h1016l-89 357q-2 8 -14 17.5t-21 9.5h-768q-9 0 -21 -9.5t-14 -17.5z M1728 160q66 0 113 47t47 113t-47 113t-113 47t-113 -47t-47 -113t47 -113t113 -47z" />
-<glyph unicode="" d="M1504 64q0 -26 -19 -45t-45 -19h-462q1 -17 6 -87.5t5 -108.5q0 -25 -18 -42.5t-43 -17.5h-320q-25 0 -43 17.5t-18 42.5q0 38 5 108.5t6 87.5h-462q-26 0 -45 19t-19 45t19 45l402 403h-229q-26 0 -45 19t-19 45t19 45l402 403h-197q-26 0 -45 19t-19 45t19 45l384 384 q19 19 45 19t45 -19l384 -384q19 -19 19 -45t-19 -45t-45 -19h-197l402 -403q19 -19 19 -45t-19 -45t-45 -19h-229l402 -403q19 -19 19 -45z" />
-<glyph unicode="" d="M1127 326q0 32 -30 51q-193 115 -447 115q-133 0 -287 -34q-42 -9 -42 -52q0 -20 13.5 -34.5t35.5 -14.5q5 0 37 8q132 27 243 27q226 0 397 -103q19 -11 33 -11q19 0 33 13.5t14 34.5zM1223 541q0 40 -35 61q-237 141 -548 141q-153 0 -303 -42q-48 -13 -48 -64 q0 -25 17.5 -42.5t42.5 -17.5q7 0 37 8q122 33 251 33q279 0 488 -124q24 -13 38 -13q25 0 42.5 17.5t17.5 42.5zM1331 789q0 47 -40 70q-126 73 -293 110.5t-343 37.5q-204 0 -364 -47q-23 -7 -38.5 -25.5t-15.5 -48.5q0 -31 20.5 -52t51.5 -21q11 0 40 8q133 37 307 37 q159 0 309.5 -34t253.5 -95q21 -12 40 -12q29 0 50.5 20.5t21.5 51.5zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M1397 1408q58 0 98.5 -40.5t40.5 -98.5v-1258q0 -58 -40.5 -98.5t-98.5 -40.5h-1258q-58 0 -98.5 40.5t-40.5 98.5v1258q0 58 40.5 98.5t98.5 40.5h1258zM1465 11v1258q0 28 -20 48t-48 20h-1258q-28 0 -48 -20t-20 -48v-1258q0 -28 20 -48t48 -20h1258q28 0 48 20t20 48 zM694 749l188 -387l533 145v-496q0 -7 -5.5 -12.5t-12.5 -5.5h-1258q-7 0 -12.5 5.5t-5.5 12.5v141l711 195l-212 439q4 1 12 2.5t12 1.5q170 32 303.5 21.5t221 -46t143.5 -94.5q27 -28 -25 -42q-64 -16 -256 -62l-97 198q-111 7 -240 -16zM1397 1287q7 0 12.5 -5.5 t5.5 -12.5v-428q-85 30 -188 52q-294 64 -645 12l-18 -3l-65 134h-233l85 -190q-132 -51 -230 -137v560q0 7 5.5 12.5t12.5 5.5h1258zM286 387q-14 -3 -26 4.5t-14 21.5q-24 203 166 305l129 -270z" />
-<glyph unicode="" horiz-adv-x="2304" d="M784 164l16 241l-16 523q-1 10 -7.5 17t-16.5 7q-9 0 -16 -7t-7 -17l-14 -523l14 -241q1 -10 7.5 -16.5t15.5 -6.5q22 0 24 23zM1080 193l11 211l-12 586q0 16 -13 24q-8 5 -16 5t-16 -5q-13 -8 -13 -24l-1 -6l-10 -579q0 -1 11 -236v-1q0 -10 6 -17q9 -11 23 -11 q11 0 20 9q9 7 9 20zM35 533l20 -128l-20 -126q-2 -9 -9 -9t-9 9l-17 126l17 128q2 9 9 9t9 -9zM121 612l26 -207l-26 -203q-2 -9 -10 -9q-9 0 -9 10l-23 202l23 207q0 9 9 9q8 0 10 -9zM401 159zM213 650l25 -245l-25 -237q0 -11 -11 -11q-10 0 -12 11l-21 237l21 245 q2 12 12 12q11 0 11 -12zM307 657l23 -252l-23 -244q-2 -13 -14 -13q-13 0 -13 13l-21 244l21 252q0 13 13 13q12 0 14 -13zM401 639l21 -234l-21 -246q-2 -16 -16 -16q-6 0 -10.5 4.5t-4.5 11.5l-20 246l20 234q0 6 4.5 10.5t10.5 4.5q14 0 16 -15zM784 164zM495 785 l21 -380l-21 -246q0 -7 -5 -12.5t-12 -5.5q-16 0 -18 18l-18 246l18 380q2 18 18 18q7 0 12 -5.5t5 -12.5zM589 871l19 -468l-19 -244q0 -8 -5.5 -13.5t-13.5 -5.5q-18 0 -20 19l-16 244l16 468q2 19 20 19q8 0 13.5 -5.5t5.5 -13.5zM687 911l18 -506l-18 -242 q-2 -21 -22 -21q-19 0 -21 21l-16 242l16 506q0 9 6.5 15.5t14.5 6.5q9 0 15 -6.5t7 -15.5zM1079 169v0v0zM881 915l15 -510l-15 -239q0 -10 -7.5 -17.5t-17.5 -7.5t-17 7t-8 18l-14 239l14 510q0 11 7.5 18t17.5 7t17.5 -7t7.5 -18zM980 896l14 -492l-14 -236q0 -11 -8 -19 t-19 -8t-19 8t-9 19l-12 236l12 492q1 12 9 20t19 8t18.5 -8t8.5 -20zM1192 404l-14 -231v0q0 -13 -9 -22t-22 -9t-22 9t-10 22l-6 114l-6 117l12 636v3q2 15 12 24q9 7 20 7q8 0 15 -5q14 -8 16 -26zM2304 423q0 -117 -83 -199.5t-200 -82.5h-786q-13 2 -22 11t-9 22v899 q0 23 28 33q85 34 181 34q195 0 338 -131.5t160 -323.5q53 22 110 22q117 0 200 -83t83 -201z" />
-<glyph unicode="" d="M768 768q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 0q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127 t443 -43zM768 384q237 0 443 43t325 127v-170q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5t-103 128v170q119 -84 325 -127t443 -43zM768 1536q208 0 385 -34.5t280 -93.5t103 -128v-128q0 -69 -103 -128t-280 -93.5t-385 -34.5t-385 34.5t-280 93.5 t-103 128v128q0 69 103 128t280 93.5t385 34.5z" />
-<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M894 465q33 -26 84 -56q59 7 117 7q147 0 177 -49q16 -22 2 -52q0 -1 -1 -2l-2 -2v-1q-6 -38 -71 -38q-48 0 -115 20t-130 53q-221 -24 -392 -83q-153 -262 -242 -262q-15 0 -28 7l-24 12q-1 1 -6 5q-10 10 -6 36q9 40 56 91.5t132 96.5q14 9 23 -6q2 -2 2 -4q52 85 107 197 q68 136 104 262q-24 82 -30.5 159.5t6.5 127.5q11 40 42 40h21h1q23 0 35 -15q18 -21 9 -68q-2 -6 -4 -8q1 -3 1 -8v-30q-2 -123 -14 -192q55 -164 146 -238zM318 54q52 24 137 158q-51 -40 -87.5 -84t-49.5 -74zM716 974q-15 -42 -2 -132q1 7 7 44q0 3 7 43q1 4 4 8 q-1 1 -1 2t-0.5 1.5t-0.5 1.5q-1 22 -13 36q0 -1 -1 -2v-2zM592 313q135 54 284 81q-2 1 -13 9.5t-16 13.5q-76 67 -127 176q-27 -86 -83 -197q-30 -56 -45 -83zM1238 329q-24 24 -140 24q76 -28 124 -28q14 0 18 1q0 1 -2 3z" />
-<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M233 768v-107h70l164 -661h159l128 485q7 20 10 46q2 16 2 24h4l3 -24q1 -3 3.5 -20t5.5 -26l128 -485h159l164 661h70v107h-300v-107h90l-99 -438q-5 -20 -7 -46l-2 -21h-4l-3 21q-1 5 -4 21t-5 25l-144 545h-114l-144 -545q-2 -9 -4.5 -24.5t-3.5 -21.5l-4 -21h-4l-2 21 q-2 26 -7 46l-99 438h90v107h-300z" />
-<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M429 106v-106h281v106h-75l103 161q5 7 10 16.5t7.5 13.5t3.5 4h2q1 -4 5 -10q2 -4 4.5 -7.5t6 -8t6.5 -8.5l107 -161h-76v-106h291v106h-68l-192 273l195 282h67v107h-279v-107h74l-103 -159q-4 -7 -10 -16.5t-9 -13.5l-2 -3h-2q-1 4 -5 10q-6 11 -17 23l-106 159h76v107 h-290v-107h68l189 -272l-194 -283h-68z" />
-<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M416 106v-106h327v106h-93v167h137q76 0 118 15q67 23 106.5 87t39.5 146q0 81 -37 141t-100 87q-48 19 -130 19h-368v-107h92v-555h-92zM769 386h-119v268h120q52 0 83 -18q56 -33 56 -115q0 -89 -62 -120q-31 -15 -78 -15z" />
-<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M1280 320v-320h-1024v192l192 192l128 -128l384 384zM448 512q-80 0 -136 56t-56 136t56 136t136 56t136 -56t56 -136t-56 -136t-136 -56z" />
-<glyph unicode="" d="M640 1152v128h-128v-128h128zM768 1024v128h-128v-128h128zM640 896v128h-128v-128h128zM768 768v128h-128v-128h128zM1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400 v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-128v-128h-128v128h-512v-1536h1280zM781 593l107 -349q8 -27 8 -52q0 -83 -72.5 -137.5t-183.5 -54.5t-183.5 54.5t-72.5 137.5q0 25 8 52q21 63 120 396v128h128v-128h79 q22 0 39 -13t23 -34zM640 128q53 0 90.5 19t37.5 45t-37.5 45t-90.5 19t-90.5 -19t-37.5 -45t37.5 -45t90.5 -19z" />
-<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M620 686q20 -8 20 -30v-544q0 -22 -20 -30q-8 -2 -12 -2q-12 0 -23 9l-166 167h-131q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h131l166 167q16 15 35 7zM1037 -3q31 0 50 24q129 159 129 363t-129 363q-16 21 -43 24t-47 -14q-21 -17 -23.5 -43.5t14.5 -47.5 q100 -123 100 -282t-100 -282q-17 -21 -14.5 -47.5t23.5 -42.5q18 -15 40 -15zM826 145q27 0 47 20q87 93 87 219t-87 219q-18 19 -45 20t-46 -17t-20 -44.5t18 -46.5q52 -57 52 -131t-52 -131q-19 -20 -18 -46.5t20 -44.5q20 -17 44 -17z" />
-<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M768 768q52 0 90 -38t38 -90v-384q0 -52 -38 -90t-90 -38h-384q-52 0 -90 38t-38 90v384q0 52 38 90t90 38h384zM1260 766q20 -8 20 -30v-576q0 -22 -20 -30q-8 -2 -12 -2q-14 0 -23 9l-265 266v90l265 266q9 9 23 9q4 0 12 -2z" />
-<glyph unicode="" d="M1468 1156q28 -28 48 -76t20 -88v-1152q0 -40 -28 -68t-68 -28h-1344q-40 0 -68 28t-28 68v1600q0 40 28 68t68 28h896q40 0 88 -20t76 -48zM1024 1400v-376h376q-10 29 -22 41l-313 313q-12 12 -41 22zM1408 -128v1024h-416q-40 0 -68 28t-28 68v416h-768v-1536h1280z M480 768q8 11 21 12.5t24 -6.5l51 -38q11 -8 12.5 -21t-6.5 -24l-182 -243l182 -243q8 -11 6.5 -24t-12.5 -21l-51 -38q-11 -8 -24 -6.5t-21 12.5l-226 301q-14 19 0 38zM1282 467q14 -19 0 -38l-226 -301q-8 -11 -21 -12.5t-24 6.5l-51 38q-11 8 -12.5 21t6.5 24l182 243 l-182 243q-8 11 -6.5 24t12.5 21l51 38q11 8 24 6.5t21 -12.5zM662 6q-13 2 -20.5 13t-5.5 24l138 831q2 13 13 20.5t24 5.5l63 -10q13 -2 20.5 -13t5.5 -24l-138 -831q-2 -13 -13 -20.5t-24 -5.5z" />
-<glyph unicode="" d="M1497 709v-198q-101 -23 -198 -23q-65 -136 -165.5 -271t-181.5 -215.5t-128 -106.5q-80 -45 -162 3q-28 17 -60.5 43.5t-85 83.5t-102.5 128.5t-107.5 184t-105.5 244t-91.5 314.5t-70.5 390h283q26 -218 70 -398.5t104.5 -317t121.5 -235.5t140 -195q169 169 287 406 q-142 72 -223 220t-81 333q0 192 104 314.5t284 122.5q178 0 273 -105.5t95 -297.5q0 -159 -58 -286q-7 -1 -19.5 -3t-46 -2t-63 6t-62 25.5t-50.5 51.5q31 103 31 184q0 87 -29 132t-79 45q-53 0 -85 -49.5t-32 -140.5q0 -186 105 -293.5t267 -107.5q62 0 121 14z" />
-<glyph unicode="" horiz-adv-x="1792" d="M216 367l603 -402v359l-334 223zM154 511l193 129l-193 129v-258zM973 -35l603 402l-269 180l-334 -223v-359zM896 458l272 182l-272 182l-272 -182zM485 733l334 223v359l-603 -402zM1445 640l193 -129v258zM1307 733l269 180l-603 402v-359zM1792 913v-546 q0 -41 -34 -64l-819 -546q-21 -13 -43 -13t-43 13l-819 546q-34 23 -34 64v546q0 41 34 64l819 546q21 13 43 13t43 -13l819 -546q34 -23 34 -64z" />
-<glyph unicode="" horiz-adv-x="2048" d="M1800 764q111 -46 179.5 -145.5t68.5 -221.5q0 -164 -118 -280.5t-285 -116.5q-4 0 -11.5 0.5t-10.5 0.5h-1209h-1h-2h-5q-170 10 -288 125.5t-118 280.5q0 110 55 203t147 147q-12 39 -12 82q0 115 82 196t199 81q95 0 172 -58q75 154 222.5 248t326.5 94 q166 0 306 -80.5t221.5 -218.5t81.5 -301q0 -6 -0.5 -18t-0.5 -18zM468 498q0 -122 84 -193t208 -71q137 0 240 99q-16 20 -47.5 56.5t-43.5 50.5q-67 -65 -144 -65q-55 0 -93.5 33.5t-38.5 87.5q0 53 38.5 87t91.5 34q44 0 84.5 -21t73 -55t65 -75t69 -82t77 -75t97 -55 t121.5 -21q121 0 204.5 71.5t83.5 190.5q0 121 -84 192t-207 71q-143 0 -241 -97q14 -16 29.5 -34t34.5 -40t29 -34q66 64 142 64q52 0 92 -33t40 -84q0 -57 -37 -91.5t-94 -34.5q-43 0 -82.5 21t-72 55t-65.5 75t-69.5 82t-77.5 75t-96.5 55t-118.5 21q-122 0 -207 -70.5 t-85 -189.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM896 1408q-190 0 -361 -90l194 -194q82 28 167 28t167 -28l194 194q-171 90 -361 90zM218 279l194 194 q-28 82 -28 167t28 167l-194 194q-90 -171 -90 -361t90 -361zM896 -128q190 0 361 90l-194 194q-82 -28 -167 -28t-167 28l-194 -194q171 -90 361 -90zM896 256q159 0 271.5 112.5t112.5 271.5t-112.5 271.5t-271.5 112.5t-271.5 -112.5t-112.5 -271.5t112.5 -271.5 t271.5 -112.5zM1380 473l194 -194q90 171 90 361t-90 361l-194 -194q28 -82 28 -167t-28 -167z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348q0 222 101 414.5t276.5 317t390.5 155.5v-260q-221 -45 -366.5 -221t-145.5 -406q0 -130 51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5 q0 230 -145.5 406t-366.5 221v260q215 -31 390.5 -155.5t276.5 -317t101 -414.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M19 662q8 217 116 406t305 318h5q0 -1 -1 -3q-8 -8 -28 -33.5t-52 -76.5t-60 -110.5t-44.5 -135.5t-14 -150.5t39 -157.5t108.5 -154q50 -50 102 -69.5t90.5 -11.5t69.5 23.5t47 32.5l16 16q39 51 53 116.5t6.5 122.5t-21 107t-26.5 80l-14 29q-10 25 -30.5 49.5t-43 41 t-43.5 29.5t-35 19l-13 6l104 115q39 -17 78 -52t59 -61l19 -27q1 48 -18.5 103.5t-40.5 87.5l-20 31l161 183l160 -181q-33 -46 -52.5 -102.5t-22.5 -90.5l-4 -33q22 37 61.5 72.5t67.5 52.5l28 17l103 -115q-44 -14 -85 -50t-60 -65l-19 -29q-31 -56 -48 -133.5t-7 -170 t57 -156.5q33 -45 77.5 -60.5t85 -5.5t76 26.5t57.5 33.5l21 16q60 53 96.5 115t48.5 121.5t10 121.5t-18 118t-37 107.5t-45.5 93t-45 72t-34.5 47.5l-13 17q-14 13 -7 13l10 -3q40 -29 62.5 -46t62 -50t64 -58t58.5 -65t55.5 -77t45.5 -88t38 -103t23.5 -117t10.5 -136 q3 -259 -108 -465t-312 -321t-456 -115q-185 0 -351 74t-283.5 198t-184 293t-60.5 353z" />
-<glyph unicode="" horiz-adv-x="1792" d="M874 -102v-66q-208 6 -385 109.5t-283 275.5l58 34q29 -49 73 -99l65 57q148 -168 368 -212l-17 -86q65 -12 121 -13zM276 428l-83 -28q22 -60 49 -112l-57 -33q-98 180 -98 385t98 385l57 -33q-30 -56 -49 -112l82 -28q-35 -100 -35 -212q0 -109 36 -212zM1528 251 l58 -34q-106 -172 -283 -275.5t-385 -109.5v66q56 1 121 13l-17 86q220 44 368 212l65 -57q44 50 73 99zM1377 805l-233 -80q14 -42 14 -85t-14 -85l232 -80q-31 -92 -98 -169l-185 162q-57 -67 -147 -85l48 -241q-52 -10 -98 -10t-98 10l48 241q-90 18 -147 85l-185 -162 q-67 77 -98 169l232 80q-14 42 -14 85t14 85l-233 80q33 93 99 169l185 -162q59 68 147 86l-48 240q44 10 98 10t98 -10l-48 -240q88 -18 147 -86l185 162q66 -76 99 -169zM874 1448v-66q-65 -2 -121 -13l17 -86q-220 -42 -368 -211l-65 56q-38 -42 -73 -98l-57 33 q106 172 282 275.5t385 109.5zM1705 640q0 -205 -98 -385l-57 33q27 52 49 112l-83 28q36 103 36 212q0 112 -35 212l82 28q-19 56 -49 112l57 33q98 -180 98 -385zM1585 1063l-57 -33q-35 56 -73 98l-65 -56q-148 169 -368 211l17 86q-56 11 -121 13v66q209 -6 385 -109.5 t282 -275.5zM1748 640q0 173 -67.5 331t-181.5 272t-272 181.5t-331 67.5t-331 -67.5t-272 -181.5t-181.5 -272t-67.5 -331t67.5 -331t181.5 -272t272 -181.5t331 -67.5t331 67.5t272 181.5t181.5 272t67.5 331zM1792 640q0 -182 -71 -348t-191 -286t-286 -191t-348 -71 t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71t348 -71t286 -191t191 -286t71 -348z" />
-<glyph unicode="" d="M582 228q0 -66 -93 -66q-107 0 -107 63q0 64 98 64q102 0 102 -61zM546 694q0 -85 -74 -85q-77 0 -77 84q0 90 77 90q36 0 55 -25.5t19 -63.5zM712 769v125q-78 -29 -135 -29q-50 29 -110 29q-86 0 -145 -57t-59 -143q0 -50 29.5 -102t73.5 -67v-3q-38 -17 -38 -85 q0 -53 41 -77v-3q-113 -37 -113 -139q0 -45 20 -78.5t54 -51t72 -25.5t81 -8q224 0 224 188q0 67 -48 99t-126 46q-27 5 -51.5 20.5t-24.5 39.5q0 44 49 52q77 15 122 70t45 134q0 24 -10 52q37 9 49 13zM771 350h137q-2 27 -2 82v387q0 46 2 69h-137q3 -23 3 -71v-392 q0 -50 -3 -75zM1280 366v121q-30 -21 -68 -21q-53 0 -53 82v225h52q9 0 26.5 -1t26.5 -1v117h-105q0 82 3 102h-140q4 -24 4 -55v-47h-60v-117q36 3 37 3q3 0 11 -0.5t12 -0.5v-2h-2v-217q0 -37 2.5 -64t11.5 -56.5t24.5 -48.5t43.5 -31t66 -12q64 0 108 24zM924 1072 q0 36 -24 63.5t-60 27.5t-60.5 -27t-24.5 -64q0 -36 25 -62.5t60 -26.5t59.5 27t24.5 62zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M595 22q0 100 -165 100q-158 0 -158 -104q0 -101 172 -101q151 0 151 105zM536 777q0 61 -30 102t-89 41q-124 0 -124 -145q0 -135 124 -135q119 0 119 137zM805 1101v-202q-36 -12 -79 -22q16 -43 16 -84q0 -127 -73 -216.5t-197 -112.5q-40 -8 -59.5 -27t-19.5 -58 q0 -31 22.5 -51.5t58 -32t78.5 -22t86 -25.5t78.5 -37.5t58 -64t22.5 -98.5q0 -304 -363 -304q-69 0 -130 12.5t-116 41t-87.5 82t-32.5 127.5q0 165 182 225v4q-67 41 -67 126q0 109 63 137v4q-72 24 -119.5 108.5t-47.5 165.5q0 139 95 231.5t235 92.5q96 0 178 -47 q98 0 218 47zM1123 220h-222q4 45 4 134v609q0 94 -4 128h222q-4 -33 -4 -124v-613q0 -89 4 -134zM1724 442v-196q-71 -39 -174 -39q-62 0 -107 20t-70 50t-39.5 78t-18.5 92t-4 103v351h2v4q-7 0 -19 1t-18 1q-21 0 -59 -6v190h96v76q0 54 -6 89h227q-6 -41 -6 -165h171 v-190q-15 0 -43.5 2t-42.5 2h-85v-365q0 -131 87 -131q61 0 109 33zM1148 1389q0 -58 -39 -101.5t-96 -43.5q-58 0 -98 43.5t-40 101.5q0 59 39.5 103t98.5 44q58 0 96.5 -44.5t38.5 -102.5z" />
-<glyph unicode="" d="M825 547l343 588h-150q-21 -39 -63.5 -118.5t-68 -128.5t-59.5 -118.5t-60 -128.5h-3q-21 48 -44.5 97t-52 105.5t-46.5 92t-54 104.5t-49 95h-150l323 -589v-435h134v436zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960 q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1280" d="M842 964q0 -80 -57 -136.5t-136 -56.5q-60 0 -111 35q-62 -67 -115 -146q-247 -371 -202 -859q1 -22 -12.5 -38.5t-34.5 -18.5h-5q-20 0 -35 13.5t-17 33.5q-14 126 -3.5 247.5t29.5 217t54 186t69 155.5t74 125q61 90 132 165q-16 35 -16 77q0 80 56.5 136.5t136.5 56.5 t136.5 -56.5t56.5 -136.5zM1223 953q0 -158 -78 -292t-212.5 -212t-292.5 -78q-64 0 -131 14q-21 5 -32.5 23.5t-6.5 39.5q5 20 23 31.5t39 7.5q51 -13 108 -13q97 0 186 38t153 102t102 153t38 186t-38 186t-102 153t-153 102t-186 38t-186 -38t-153 -102t-102 -153 t-38 -186q0 -114 52 -218q10 -20 3.5 -40t-25.5 -30t-39.5 -3t-30.5 26q-64 123 -64 265q0 119 46.5 227t124.5 186t186 124t226 46q158 0 292.5 -78t212.5 -212.5t78 -292.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M270 730q-8 19 -8 52q0 20 11 49t24 45q-1 22 7.5 53t22.5 43q0 139 92.5 288.5t217.5 209.5q139 66 324 66q133 0 266 -55q49 -21 90 -48t71 -56t55 -68t42 -74t32.5 -84.5t25.5 -89.5t22 -98l1 -5q55 -83 55 -150q0 -14 -9 -40t-9 -38q0 -1 1.5 -3.5t3.5 -5t2 -3.5 q77 -114 120.5 -214.5t43.5 -208.5q0 -43 -19.5 -100t-55.5 -57q-9 0 -19.5 7.5t-19 17.5t-19 26t-16 26.5t-13.5 26t-9 17.5q-1 1 -3 1l-5 -4q-59 -154 -132 -223q20 -20 61.5 -38.5t69 -41.5t35.5 -65q-2 -4 -4 -16t-7 -18q-64 -97 -302 -97q-53 0 -110.5 9t-98 20 t-104.5 30q-15 5 -23 7q-14 4 -46 4.5t-40 1.5q-41 -45 -127.5 -65t-168.5 -20q-35 0 -69 1.5t-93 9t-101 20.5t-74.5 40t-32.5 64q0 40 10 59.5t41 48.5q11 2 40.5 13t49.5 12q4 0 14 2q2 2 2 4l-2 3q-48 11 -108 105.5t-73 156.5l-5 3q-4 0 -12 -20q-18 -41 -54.5 -74.5 t-77.5 -37.5h-1q-4 0 -6 4.5t-5 5.5q-23 54 -23 100q0 275 252 466z" />
-<glyph unicode="" horiz-adv-x="2048" d="M580 1075q0 41 -25 66t-66 25q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 66 24.5t25 65.5zM1323 568q0 28 -25.5 50t-65.5 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q40 0 65.5 22t25.5 51zM1087 1075q0 41 -24.5 66t-65.5 25 q-43 0 -76 -25.5t-33 -65.5q0 -39 33 -64.5t76 -25.5q41 0 65.5 24.5t24.5 65.5zM1722 568q0 28 -26 50t-65 22q-27 0 -49.5 -22.5t-22.5 -49.5q0 -28 22.5 -50.5t49.5 -22.5q39 0 65 22t26 51zM1456 965q-31 4 -70 4q-169 0 -311 -77t-223.5 -208.5t-81.5 -287.5 q0 -78 23 -152q-35 -3 -68 -3q-26 0 -50 1.5t-55 6.5t-44.5 7t-54.5 10.5t-50 10.5l-253 -127l72 218q-290 203 -290 490q0 169 97.5 311t264 223.5t363.5 81.5q176 0 332.5 -66t262 -182.5t136.5 -260.5zM2048 404q0 -117 -68.5 -223.5t-185.5 -193.5l55 -181l-199 109 q-150 -37 -218 -37q-169 0 -311 70.5t-223.5 191.5t-81.5 264t81.5 264t223.5 191.5t311 70.5q161 0 303 -70.5t227.5 -192t85.5 -263.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-453 185l-242 -295q-18 -23 -49 -23q-13 0 -22 4q-19 7 -30.5 23.5t-11.5 36.5v349l864 1059l-1069 -925l-395 162q-37 14 -40 55q-2 40 32 59l1664 960q15 9 32 9q20 0 36 -11z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1764 1525q33 -24 27 -64l-256 -1536q-5 -29 -32 -45q-14 -8 -31 -8q-11 0 -24 5l-527 215l-298 -327q-18 -21 -47 -21q-14 0 -23 4q-19 7 -30 23.5t-11 36.5v452l-472 193q-37 14 -40 55q-3 39 32 59l1664 960q35 21 68 -2zM1422 26l221 1323l-1434 -827l336 -137 l863 639l-478 -797z" />
-<glyph unicode="" d="M1536 640q0 -156 -61 -298t-164 -245t-245 -164t-298 -61q-172 0 -327 72.5t-264 204.5q-7 10 -6.5 22.5t8.5 20.5l137 138q10 9 25 9q16 -2 23 -12q73 -95 179 -147t225 -52q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5 t-163.5 109.5t-198.5 40.5q-98 0 -188 -35.5t-160 -101.5l137 -138q31 -30 14 -69q-17 -40 -59 -40h-448q-26 0 -45 19t-19 45v448q0 42 40 59q39 17 69 -14l130 -129q107 101 244.5 156.5t284.5 55.5q156 0 298 -61t245 -164t164 -245t61 -298zM896 928v-448q0 -14 -9 -23 t-23 -9h-320q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h224v352q0 14 9 23t23 9h64q14 0 23 -9t9 -23z" />
-<glyph unicode="" d="M768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103 t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1682 -128q-44 0 -132.5 3.5t-133.5 3.5q-44 0 -132 -3.5t-132 -3.5q-24 0 -37 20.5t-13 45.5q0 31 17 46t39 17t51 7t45 15q33 21 33 140l-1 391q0 21 -1 31q-13 4 -50 4h-675q-38 0 -51 -4q-1 -10 -1 -31l-1 -371q0 -142 37 -164q16 -10 48 -13t57 -3.5t45 -15 t20 -45.5q0 -26 -12.5 -48t-36.5 -22q-47 0 -139.5 3.5t-138.5 3.5q-43 0 -128 -3.5t-127 -3.5q-23 0 -35.5 21t-12.5 45q0 30 15.5 45t36 17.5t47.5 7.5t42 15q33 23 33 143l-1 57v813q0 3 0.5 26t0 36.5t-1.5 38.5t-3.5 42t-6.5 36.5t-11 31.5t-16 18q-15 10 -45 12t-53 2 t-41 14t-18 45q0 26 12 48t36 22q46 0 138.5 -3.5t138.5 -3.5q42 0 126.5 3.5t126.5 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17 -43.5t-38.5 -14.5t-49.5 -4t-43 -13q-35 -21 -35 -160l1 -320q0 -21 1 -32q13 -3 39 -3h699q25 0 38 3q1 11 1 32l1 320q0 139 -35 160 q-18 11 -58.5 12.5t-66 13t-25.5 49.5q0 26 12.5 48t37.5 22q44 0 132 -3.5t132 -3.5q43 0 129 3.5t129 3.5q25 0 37.5 -22t12.5 -48q0 -30 -17.5 -44t-40 -14.5t-51.5 -3t-44 -12.5q-35 -23 -35 -161l1 -943q0 -119 34 -140q16 -10 46 -13.5t53.5 -4.5t41.5 -15.5t18 -44.5 q0 -26 -12 -48t-36 -22z" />
-<glyph unicode="" horiz-adv-x="1280" d="M1278 1347v-73q0 -29 -18.5 -61t-42.5 -32q-50 0 -54 -1q-26 -6 -32 -31q-3 -11 -3 -64v-1152q0 -25 -18 -43t-43 -18h-108q-25 0 -43 18t-18 43v1218h-143v-1218q0 -25 -17.5 -43t-43.5 -18h-108q-26 0 -43.5 18t-17.5 43v496q-147 12 -245 59q-126 58 -192 179 q-64 117 -64 259q0 166 88 286q88 118 209 159q111 37 417 37h479q25 0 43 -18t18 -43z" />
-<glyph unicode="" d="M352 128v-128h-352v128h352zM704 256q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM864 640v-128h-864v128h864zM224 1152v-128h-224v128h224zM1536 128v-128h-736v128h736zM576 1280q26 0 45 -19t19 -45v-256 q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1216 768q26 0 45 -19t19 -45v-256q0 -26 -19 -45t-45 -19h-256q-26 0 -45 19t-19 45v256q0 26 19 45t45 19h256zM1536 640v-128h-224v128h224zM1536 1152v-128h-864v128h864z" />
-<glyph unicode="" d="M1216 512q133 0 226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5t-226.5 93.5t-93.5 226.5q0 12 2 34l-360 180q-92 -86 -218 -86q-133 0 -226.5 93.5t-93.5 226.5t93.5 226.5t226.5 93.5q126 0 218 -86l360 180q-2 22 -2 34q0 133 93.5 226.5t226.5 93.5 t226.5 -93.5t93.5 -226.5t-93.5 -226.5t-226.5 -93.5q-126 0 -218 86l-360 -180q2 -22 2 -34t-2 -34l360 -180q92 86 218 86z" />
-<glyph unicode="" d="M1280 341q0 88 -62.5 151t-150.5 63q-84 0 -145 -58l-241 120q2 16 2 23t-2 23l241 120q61 -58 145 -58q88 0 150.5 63t62.5 151t-62.5 150.5t-150.5 62.5t-151 -62.5t-63 -150.5q0 -7 2 -23l-241 -120q-62 57 -145 57q-88 0 -150.5 -62.5t-62.5 -150.5t62.5 -150.5 t150.5 -62.5q83 0 145 57l241 -120q-2 -16 -2 -23q0 -88 63 -150.5t151 -62.5t150.5 62.5t62.5 150.5zM1536 1120v-960q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M571 947q-10 25 -34 35t-49 0q-108 -44 -191 -127t-127 -191q-10 -25 0 -49t35 -34q13 -5 24 -5q42 0 60 40q34 84 98.5 148.5t148.5 98.5q25 11 35 35t0 49zM1513 1303l46 -46l-244 -243l68 -68q19 -19 19 -45.5t-19 -45.5l-64 -64q89 -161 89 -343q0 -143 -55.5 -273.5 t-150 -225t-225 -150t-273.5 -55.5t-273.5 55.5t-225 150t-150 225t-55.5 273.5t55.5 273.5t150 225t225 150t273.5 55.5q182 0 343 -89l64 64q19 19 45.5 19t45.5 -19l68 -68zM1521 1359q-10 -10 -22 -10q-13 0 -23 10l-91 90q-9 10 -9 23t9 23q10 9 23 9t23 -9l90 -91 q10 -9 10 -22.5t-10 -22.5zM1751 1129q-11 -9 -23 -9t-23 9l-90 91q-10 9 -10 22.5t10 22.5q9 10 22.5 10t22.5 -10l91 -90q9 -10 9 -23t-9 -23zM1792 1312q0 -14 -9 -23t-23 -9h-96q-14 0 -23 9t-9 23t9 23t23 9h96q14 0 23 -9t9 -23zM1600 1504v-96q0 -14 -9 -23t-23 -9 t-23 9t-9 23v96q0 14 9 23t23 9t23 -9t9 -23zM1751 1449l-91 -90q-10 -10 -22 -10q-13 0 -23 10q-10 9 -10 22.5t10 22.5l90 91q10 9 23 9t23 -9q9 -10 9 -23t-9 -23z" />
-<glyph unicode="" horiz-adv-x="1792" d="M609 720l287 208l287 -208l-109 -336h-355zM896 1536q182 0 348 -71t286 -191t191 -286t71 -348t-71 -348t-191 -286t-286 -191t-348 -71t-348 71t-286 191t-191 286t-71 348t71 348t191 286t286 191t348 71zM1515 186q149 203 149 454v3l-102 -89l-240 224l63 323 l134 -12q-150 206 -389 282l53 -124l-287 -159l-287 159l53 124q-239 -76 -389 -282l135 12l62 -323l-240 -224l-102 89v-3q0 -251 149 -454l30 132l326 -40l139 -298l-116 -69q117 -39 240 -39t240 39l-116 69l139 298l326 40z" />
-<glyph unicode="" horiz-adv-x="1792" d="M448 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM256 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM832 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23 v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM640 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM66 768q-28 0 -47 19t-19 46v129h514v-129q0 -27 -19 -46t-46 -19h-383zM1216 224v-192q0 -14 -9 -23t-23 -9h-192 q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1024 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1600 224v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23 zM1408 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 1016v-13h-514v10q0 104 -382 102q-382 -1 -382 -102v-10h-514v13q0 17 8.5 43t34 64t65.5 75.5t110.5 76t160 67.5t224 47.5t293.5 18.5t293 -18.5t224 -47.5 t160.5 -67.5t110.5 -76t65.5 -75.5t34 -64t8.5 -43zM1792 608v-192q0 -14 -9 -23t-23 -9h-192q-14 0 -23 9t-9 23v192q0 14 9 23t23 9h192q14 0 23 -9t9 -23zM1792 962v-129q0 -27 -19 -46t-46 -19h-384q-27 0 -46 19t-19 46v129h514z" />
-<glyph unicode="" horiz-adv-x="1792" d="M704 1216v-768q0 -26 -19 -45t-45 -19v-576q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v512l249 873q7 23 31 23h424zM1024 1216v-704h-256v704h256zM1792 320v-512q0 -26 -19 -45t-45 -19h-512q-26 0 -45 19t-19 45v576q-26 0 -45 19t-19 45v768h424q24 0 31 -23z M736 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23zM1408 1504v-224h-352v224q0 14 9 23t23 9h288q14 0 23 -9t9 -23z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1755 1083q37 -37 37 -90t-37 -91l-401 -400l150 -150l-160 -160q-163 -163 -389.5 -186.5t-411.5 100.5l-362 -362h-181v181l362 362q-124 185 -100.5 411.5t186.5 389.5l160 160l150 -150l400 401q38 37 91 37t90 -37t37 -90.5t-37 -90.5l-400 -401l234 -234l401 400 q38 37 91 37t90 -37z" />
-<glyph unicode="" horiz-adv-x="1792" d="M873 796q0 -83 -63.5 -142.5t-152.5 -59.5t-152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59t152.5 -59t63.5 -143zM1375 796q0 -83 -63 -142.5t-153 -59.5q-89 0 -152.5 59.5t-63.5 142.5q0 84 63.5 143t152.5 59q90 0 153 -59t63 -143zM1600 616v667q0 87 -32 123.5 t-111 36.5h-1112q-83 0 -112.5 -34t-29.5 -126v-673q43 -23 88.5 -40t81 -28t81 -18.5t71 -11t70 -4t58.5 -0.5t56.5 2t44.5 2q68 1 95 -27q6 -6 10 -9q26 -25 61 -51q7 91 118 87q5 0 36.5 -1.5t43 -2t45.5 -1t53 1t54.5 4.5t61 8.5t62 13.5t67 19.5t67.5 27t72 34.5z M1763 621q-121 -149 -372 -252q84 -285 -23 -465q-66 -113 -183 -148q-104 -32 -182 15q-86 51 -82 164l-1 326v1q-8 2 -24.5 6t-23.5 5l-1 -338q4 -114 -83 -164q-79 -47 -183 -15q-117 36 -182 150q-105 180 -22 463q-251 103 -372 252q-25 37 -4 63t60 -1q3 -2 11 -7 t11 -8v694q0 72 47 123t114 51h1257q67 0 114 -51t47 -123v-694l21 15q39 27 60 1t-4 -63z" />
-<glyph unicode="" horiz-adv-x="1792" d="M896 1102v-434h-145v434h145zM1294 1102v-434h-145v434h145zM1294 342l253 254v795h-1194v-1049h326v-217l217 217h398zM1692 1536v-1013l-434 -434h-326l-217 -217h-217v217h-398v1158l109 289h1483z" />
-<glyph unicode="" d="M773 217v-127q-1 -292 -6 -305q-12 -32 -51 -40q-54 -9 -181.5 38t-162.5 89q-13 15 -17 36q-1 12 4 26q4 10 34 47t181 216q1 0 60 70q15 19 39.5 24.5t49.5 -3.5q24 -10 37.5 -29t12.5 -42zM624 468q-3 -55 -52 -70l-120 -39q-275 -88 -292 -88q-35 2 -54 36 q-12 25 -17 75q-8 76 1 166.5t30 124.5t56 32q13 0 202 -77q70 -29 115 -47l84 -34q23 -9 35.5 -30.5t11.5 -48.5zM1450 171q-7 -54 -91.5 -161t-135.5 -127q-37 -14 -63 7q-14 10 -184 287l-47 77q-14 21 -11.5 46t19.5 46q35 43 83 26q1 -1 119 -40q203 -66 242 -79.5 t47 -20.5q28 -22 22 -61zM778 803q5 -102 -54 -122q-58 -17 -114 71l-378 598q-8 35 19 62q41 43 207.5 89.5t224.5 31.5q40 -10 49 -45q3 -18 22 -305.5t24 -379.5zM1440 695q3 -39 -26 -59q-15 -10 -329 -86q-67 -15 -91 -23l1 2q-23 -6 -46 4t-37 32q-30 47 0 87 q1 1 75 102q125 171 150 204t34 39q28 19 65 2q48 -23 123 -133.5t81 -167.5v-3z" />
-<glyph unicode="" horiz-adv-x="2048" d="M1024 1024h-384v-384h384v384zM1152 384v-128h-640v128h640zM1152 1152v-640h-640v640h640zM1792 384v-128h-512v128h512zM1792 640v-128h-512v128h512zM1792 896v-128h-512v128h512zM1792 1152v-128h-512v128h512zM256 192v960h-128v-960q0 -26 19 -45t45 -19t45 19 t19 45zM1920 192v1088h-1536v-1088q0 -33 -11 -64h1483q26 0 45 19t19 45zM2048 1408v-1216q0 -80 -56 -136t-136 -56h-1664q-80 0 -136 56t-56 136v1088h256v128h1792z" />
-<glyph unicode="" horiz-adv-x="2048" d="M1024 13q-20 0 -93 73.5t-73 93.5q0 32 62.5 54t103.5 22t103.5 -22t62.5 -54q0 -20 -73 -93.5t-93 -73.5zM1294 284q-2 0 -40 25t-101.5 50t-128.5 25t-128.5 -25t-101 -50t-40.5 -25q-18 0 -93.5 75t-75.5 93q0 13 10 23q78 77 196 121t233 44t233 -44t196 -121 q10 -10 10 -23q0 -18 -75.5 -93t-93.5 -75zM1567 556q-11 0 -23 8q-136 105 -252 154.5t-268 49.5q-85 0 -170.5 -22t-149 -53t-113.5 -62t-79 -53t-31 -22q-17 0 -92 75t-75 93q0 12 10 22q132 132 320 205t380 73t380 -73t320 -205q10 -10 10 -22q0 -18 -75 -93t-92 -75z M1838 827q-11 0 -22 9q-179 157 -371.5 236.5t-420.5 79.5t-420.5 -79.5t-371.5 -236.5q-11 -9 -22 -9q-17 0 -92.5 75t-75.5 93q0 13 10 23q187 186 445 288t527 102t527 -102t445 -288q10 -10 10 -23q0 -18 -75.5 -93t-92.5 -75z" />
-<glyph unicode="" horiz-adv-x="1792" d="M384 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM384 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5 t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 0q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5 t37.5 90.5zM384 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1152 384q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM768 768q0 53 -37.5 90.5t-90.5 37.5 t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1536 0v384q0 52 -38 90t-90 38t-90 -38t-38 -90v-384q0 -52 38 -90t90 -38t90 38t38 90zM1152 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5z M1536 1088v256q0 26 -19 45t-45 19h-1280q-26 0 -45 -19t-19 -45v-256q0 -26 19 -45t45 -19h1280q26 0 45 19t19 45zM1536 768q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1664 1408v-1536q0 -52 -38 -90t-90 -38 h-1408q-52 0 -90 38t-38 90v1536q0 52 38 90t90 38h1408q52 0 90 -38t38 -90z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1112 1090q0 159 -237 159h-70q-32 0 -59.5 -21.5t-34.5 -52.5l-63 -276q-2 -5 -2 -16q0 -24 17 -39.5t41 -15.5h53q69 0 128.5 13t112.5 41t83.5 81.5t30.5 126.5zM1716 938q0 -265 -220 -428q-219 -161 -612 -161h-61q-32 0 -59 -21.5t-34 -52.5l-73 -316 q-8 -36 -40.5 -61.5t-69.5 -25.5h-213q-31 0 -53 20t-22 51q0 10 13 65h151q34 0 64 23.5t38 56.5l73 316q8 33 37.5 57t63.5 24h61q390 0 607 160t217 421q0 129 -51 207q183 -92 183 -335zM1533 1123q0 -264 -221 -428q-218 -161 -612 -161h-60q-32 0 -59.5 -22t-34.5 -53 l-73 -315q-8 -36 -40 -61.5t-69 -25.5h-214q-31 0 -52.5 19.5t-21.5 51.5q0 8 2 20l300 1301q8 36 40.5 61.5t69.5 25.5h444q68 0 125 -4t120.5 -15t113.5 -30t96.5 -50.5t77.5 -74t49.5 -103.5t18.5 -136z" />
-<glyph unicode="" horiz-adv-x="1792" d="M602 949q19 -61 31 -123.5t17 -141.5t-14 -159t-62 -145q-21 81 -67 157t-95.5 127t-99 90.5t-78.5 57.5t-33 19q-62 34 -81.5 100t14.5 128t101 81.5t129 -14.5q138 -83 238 -177zM927 1236q11 -25 20.5 -46t36.5 -100.5t42.5 -150.5t25.5 -179.5t0 -205.5t-47.5 -209.5 t-105.5 -208.5q-51 -72 -138 -72q-54 0 -98 31q-57 40 -69 109t28 127q60 85 81 195t13 199.5t-32 180.5t-39 128t-22 52q-31 63 -8.5 129.5t85.5 97.5q34 17 75 17q47 0 88.5 -25t63.5 -69zM1248 567q-17 -160 -72 -311q-17 131 -63 246q25 174 -5 361q-27 178 -94 342 q114 -90 212 -211q9 -37 15 -80q26 -179 7 -347zM1520 1440q9 -17 23.5 -49.5t43.5 -117.5t50.5 -178t34 -227.5t5 -269t-47 -300t-112.5 -323.5q-22 -48 -66 -75.5t-95 -27.5q-39 0 -74 16q-67 31 -92.5 100t4.5 136q58 126 90 257.5t37.5 239.5t-3.5 213.5t-26.5 180.5 t-38.5 138.5t-32.5 90t-15.5 32.5q-34 65 -11.5 135.5t87.5 104.5q37 20 81 20q49 0 91.5 -25.5t66.5 -70.5z" />
-<glyph unicode="" horiz-adv-x="2304" d="M1975 546h-138q14 37 66 179l3 9q4 10 10 26t9 26l12 -55zM531 611l-58 295q-11 54 -75 54h-268l-2 -13q311 -79 403 -336zM710 960l-162 -438l-17 89q-26 70 -85 129.5t-131 88.5l135 -510h175l261 641h-176zM849 318h166l104 642h-166zM1617 944q-69 27 -149 27 q-123 0 -201 -59t-79 -153q-1 -102 145 -174q48 -23 67 -41t19 -39q0 -30 -30 -46t-69 -16q-86 0 -156 33l-22 11l-23 -144q74 -34 185 -34q130 -1 208.5 59t80.5 160q0 106 -140 174q-49 25 -71 42t-22 38q0 22 24.5 38.5t70.5 16.5q70 1 124 -24l15 -8zM2042 960h-128 q-65 0 -87 -54l-246 -588h174l35 96h212q5 -22 20 -96h154zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-<glyph unicode="" horiz-adv-x="2304" d="M671 603h-13q-47 0 -47 -32q0 -22 20 -22q17 0 28 15t12 39zM1066 639h62v3q1 4 0.5 6.5t-1 7t-2 8t-4.5 6.5t-7.5 5t-11.5 2q-28 0 -36 -38zM1606 603h-12q-48 0 -48 -32q0 -22 20 -22q17 0 28 15t12 39zM1925 629q0 41 -30 41q-19 0 -31 -20t-12 -51q0 -42 28 -42 q20 0 32.5 20t12.5 52zM480 770h87l-44 -262h-56l32 201l-71 -201h-39l-4 200l-34 -200h-53l44 262h81l2 -163zM733 663q0 -6 -4 -42q-16 -101 -17 -113h-47l1 22q-20 -26 -58 -26q-23 0 -37.5 16t-14.5 42q0 39 26 60.5t73 21.5q14 0 23 -1q0 3 0.5 5.5t1 4.5t0.5 3 q0 20 -36 20q-29 0 -59 -10q0 4 7 48q38 11 67 11q74 0 74 -62zM889 721l-8 -49q-22 3 -41 3q-27 0 -27 -17q0 -8 4.5 -12t21.5 -11q40 -19 40 -60q0 -72 -87 -71q-34 0 -58 6q0 2 7 49q29 -8 51 -8q32 0 32 19q0 7 -4.5 11.5t-21.5 12.5q-43 20 -43 59q0 72 84 72 q30 0 50 -4zM977 721h28l-7 -52h-29q-2 -17 -6.5 -40.5t-7 -38.5t-2.5 -18q0 -16 19 -16q8 0 16 2l-8 -47q-21 -7 -40 -7q-43 0 -45 47q0 12 8 56q3 20 25 146h55zM1180 648q0 -23 -7 -52h-111q-3 -22 10 -33t38 -11q30 0 58 14l-9 -54q-30 -8 -57 -8q-95 0 -95 95 q0 55 27.5 90.5t69.5 35.5q35 0 55.5 -21t20.5 -56zM1319 722q-13 -23 -22 -62q-22 2 -31 -24t-25 -128h-56l3 14q22 130 29 199h51l-3 -33q14 21 25.5 29.5t28.5 4.5zM1506 763l-9 -57q-28 14 -50 14q-31 0 -51 -27.5t-20 -70.5q0 -30 13.5 -47t38.5 -17q21 0 48 13 l-10 -59q-28 -8 -50 -8q-45 0 -71.5 30.5t-26.5 82.5q0 70 35.5 114.5t91.5 44.5q26 0 61 -13zM1668 663q0 -18 -4 -42q-13 -79 -17 -113h-46l1 22q-20 -26 -59 -26q-23 0 -37 16t-14 42q0 39 25.5 60.5t72.5 21.5q15 0 23 -1q2 7 2 13q0 20 -36 20q-29 0 -59 -10q0 4 8 48 q38 11 67 11q73 0 73 -62zM1809 722q-14 -24 -21 -62q-23 2 -31.5 -23t-25.5 -129h-56l3 14q19 104 29 199h52q0 -11 -4 -33q15 21 26.5 29.5t27.5 4.5zM1950 770h56l-43 -262h-53l3 19q-23 -23 -52 -23q-31 0 -49.5 24t-18.5 64q0 53 27.5 92t64.5 39q31 0 53 -29z M2061 640q0 148 -72.5 273t-198 198t-273.5 73q-181 0 -328 -110q127 -116 171 -284h-50q-44 150 -158 253q-114 -103 -158 -253h-50q44 168 171 284q-147 110 -328 110q-148 0 -273.5 -73t-198 -198t-72.5 -273t72.5 -273t198 -198t273.5 -73q181 0 328 110 q-120 111 -165 264h50q46 -138 152 -233q106 95 152 233h50q-45 -153 -165 -264q147 -110 328 -110q148 0 273.5 73t198 198t72.5 273zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-<glyph unicode="" horiz-adv-x="2304" d="M313 759q0 -51 -36 -84q-29 -26 -89 -26h-17v220h17q61 0 89 -27q36 -31 36 -83zM2089 824q0 -52 -64 -52h-19v101h20q63 0 63 -49zM380 759q0 74 -50 120.5t-129 46.5h-95v-333h95q74 0 119 38q60 51 60 128zM410 593h65v333h-65v-333zM730 694q0 40 -20.5 62t-75.5 42 q-29 10 -39.5 19t-10.5 23q0 16 13.5 26.5t34.5 10.5q29 0 53 -27l34 44q-41 37 -98 37q-44 0 -74 -27.5t-30 -67.5q0 -35 18 -55.5t64 -36.5q37 -13 45 -19q19 -12 19 -34q0 -20 -14 -33.5t-36 -13.5q-48 0 -71 44l-42 -40q44 -64 115 -64q51 0 83 30.5t32 79.5zM1008 604 v77q-37 -37 -78 -37q-49 0 -80.5 32.5t-31.5 82.5q0 48 31.5 81.5t77.5 33.5q43 0 81 -38v77q-40 20 -80 20q-74 0 -125.5 -50.5t-51.5 -123.5t51 -123.5t125 -50.5q42 0 81 19zM2240 0v527q-65 -40 -144.5 -84t-237.5 -117t-329.5 -137.5t-417.5 -134.5t-504 -118h1569 q26 0 45 19t19 45zM1389 757q0 75 -53 128t-128 53t-128 -53t-53 -128t53 -128t128 -53t128 53t53 128zM1541 584l144 342h-71l-90 -224l-89 224h-71l142 -342h35zM1714 593h184v56h-119v90h115v56h-115v74h119v57h-184v-333zM2105 593h80l-105 140q76 16 76 94q0 47 -31 73 t-87 26h-97v-333h65v133h9zM2304 1274v-1268q0 -56 -38.5 -95t-93.5 -39h-2040q-55 0 -93.5 39t-38.5 95v1268q0 56 38.5 95t93.5 39h2040q55 0 93.5 -39t38.5 -95z" />
-<glyph unicode="" horiz-adv-x="2304" d="M119 854h89l-45 108zM740 328l74 79l-70 79h-163v-49h142v-55h-142v-54h159zM898 406l99 -110v217zM1186 453q0 33 -40 33h-84v-69h83q41 0 41 36zM1475 457q0 29 -42 29h-82v-61h81q43 0 43 32zM1197 923q0 29 -42 29h-82v-60h81q43 0 43 31zM1656 854h89l-44 108z M699 1009v-271h-66v212l-94 -212h-57l-94 212v-212h-132l-25 60h-135l-25 -60h-70l116 271h96l110 -257v257h106l85 -184l77 184h108zM1255 453q0 -20 -5.5 -35t-14 -25t-22.5 -16.5t-26 -10t-31.5 -4.5t-31.5 -1t-32.5 0.5t-29.5 0.5v-91h-126l-80 90l-83 -90h-256v271h260 l80 -89l82 89h207q109 0 109 -89zM964 794v-56h-217v271h217v-57h-152v-49h148v-55h-148v-54h152zM2304 235v-229q0 -55 -38.5 -94.5t-93.5 -39.5h-2040q-55 0 -93.5 39.5t-38.5 94.5v678h111l25 61h55l25 -61h218v46l19 -46h113l20 47v-47h541v99l10 1q10 0 10 -14v-86h279 v23q23 -12 55 -18t52.5 -6.5t63 0.5t51.5 1l25 61h56l25 -61h227v58l34 -58h182v378h-180v-44l-25 44h-185v-44l-23 44h-249q-69 0 -109 -22v22h-172v-22q-24 22 -73 22h-628l-43 -97l-43 97h-198v-44l-22 44h-169l-78 -179v391q0 55 38.5 94.5t93.5 39.5h2040 q55 0 93.5 -39.5t38.5 -94.5v-678h-120q-51 0 -81 -22v22h-177q-55 0 -78 -22v22h-316v-22q-31 22 -87 22h-209v-22q-23 22 -91 22h-234l-54 -58l-50 58h-349v-378h343l55 59l52 -59h211v89h21q59 0 90 13v-102h174v99h8q8 0 10 -2t2 -10v-87h529q57 0 88 24v-24h168 q60 0 95 17zM1546 469q0 -23 -12 -43t-34 -29q25 -9 34 -26t9 -46v-54h-65v45q0 33 -12 43.5t-46 10.5h-69v-99h-65v271h154q48 0 77 -15t29 -58zM1269 936q0 -24 -12.5 -44t-33.5 -29q26 -9 34.5 -25.5t8.5 -46.5v-53h-65q0 9 0.5 26.5t0 25t-3 18.5t-8.5 16t-17.5 8.5 t-29.5 3.5h-70v-98h-64v271l153 -1q49 0 78 -14.5t29 -57.5zM1798 327v-56h-216v271h216v-56h-151v-49h148v-55h-148v-54zM1372 1009v-271h-66v271h66zM2065 357q0 -86 -102 -86h-126v58h126q34 0 34 25q0 16 -17 21t-41.5 5t-49.5 3.5t-42 22.5t-17 55q0 39 26 60t66 21 h130v-57h-119q-36 0 -36 -25q0 -16 17.5 -20.5t42 -4t49 -2.5t42 -21.5t17.5 -54.5zM2304 407v-101q-24 -35 -88 -35h-125v58h125q33 0 33 25q0 13 -12.5 19t-31 5.5t-40 2t-40 8t-31 24t-12.5 48.5q0 39 26.5 60t66.5 21h129v-57h-118q-36 0 -36 -25q0 -20 29 -22t68.5 -5 t56.5 -26zM2139 1008v-270h-92l-122 203v-203h-132l-26 60h-134l-25 -60h-75q-129 0 -129 133q0 138 133 138h63v-59q-7 0 -28 1t-28.5 0.5t-23 -2t-21.5 -6.5t-14.5 -13.5t-11.5 -23t-3 -33.5q0 -38 13.5 -58t49.5 -20h29l92 213h97l109 -256v256h99l114 -188v188h66z" />
-<glyph unicode="" horiz-adv-x="2304" d="M322 689h-15q-19 0 -19 18q0 28 19 85q5 15 15 19.5t28 4.5q77 0 77 -49q0 -41 -30.5 -59.5t-74.5 -18.5zM664 528q-47 0 -47 29q0 62 123 62l3 -3q-5 -88 -79 -88zM1438 687h-15q-19 0 -19 19q0 28 19 85q5 15 14.5 19t28.5 4q77 0 77 -49q0 -41 -30.5 -59.5 t-74.5 -18.5zM1780 527q-47 0 -47 30q0 62 123 62l3 -3q-5 -89 -79 -89zM373 894h-128q-8 0 -14.5 -4t-8.5 -7.5t-7 -12.5q-3 -7 -45 -190t-42 -192q0 -7 5.5 -12.5t13.5 -5.5h62q25 0 32.5 34.5l15 69t32.5 34.5q47 0 87.5 7.5t80.5 24.5t63.5 52.5t23.5 84.5 q0 36 -14.5 61t-41 36.5t-53.5 15.5t-62 4zM719 798q-38 0 -74 -6q-2 0 -8.5 -1t-9 -1.5l-7.5 -1.5t-7.5 -2t-6.5 -3t-6.5 -4t-5 -5t-4.5 -7t-4 -9q-9 -29 -9 -39t9 -10q5 0 21.5 5t19.5 6q30 8 58 8q74 0 74 -36q0 -11 -10 -14q-8 -2 -18 -3t-21.5 -1.5t-17.5 -1.5 q-38 -4 -64.5 -10t-56.5 -19.5t-45.5 -39t-15.5 -62.5q0 -38 26 -59.5t64 -21.5q24 0 45.5 6.5t33 13t38.5 23.5q-3 -7 -3 -15t5.5 -13.5t12.5 -5.5h56q1 1 7 3.5t7.5 3.5t5 3.5t5 5.5t2.5 8l45 194q4 13 4 30q0 81 -145 81zM1247 793h-74q-22 0 -39 -23q-5 -7 -29.5 -51 t-46.5 -81.5t-26 -38.5l-5 4q0 77 -27 166q-1 5 -3.5 8.5t-6 6.5t-6.5 5t-8.5 3t-8.5 1.5t-9.5 1t-9 0.5h-10h-8.5q-38 0 -38 -21l1 -5q5 -53 25 -151t25 -143q2 -16 2 -24q0 -19 -30.5 -61.5t-30.5 -58.5q0 -13 40 -13q61 0 76 25l245 415q10 20 10 26q0 9 -8 9zM1489 892 h-129q-18 0 -29 -23q-6 -13 -46.5 -191.5t-40.5 -190.5q0 -20 43 -20h7.5h9h9t9.5 1t8.5 2t8.5 3t6.5 4.5t5.5 6t3 8.5l21 91q2 10 10.5 17t19.5 7q47 0 87.5 7t80.5 24.5t63.5 52.5t23.5 84q0 36 -14.5 61t-41 36.5t-53.5 15.5t-62 4zM1835 798q-26 0 -74 -6 q-38 -6 -48 -16q-7 -8 -11 -19q-8 -24 -8 -39q0 -10 8 -10q1 0 41 12q30 8 58 8q74 0 74 -36q0 -12 -10 -14q-4 -1 -57 -7q-38 -4 -64.5 -10t-56.5 -19.5t-45.5 -39t-15.5 -62.5t26 -58.5t64 -21.5q24 0 45 6t34 13t38 24q-3 -15 -3 -16q0 -5 2 -8.5t6.5 -5.5t8 -3.5 t10.5 -2t9.5 -0.5h9.5h8q42 0 48 25l45 194q3 15 3 31q0 81 -145 81zM2157 889h-55q-25 0 -33 -40q-10 -44 -36.5 -167t-42.5 -190v-5q0 -16 16 -18h1h57q10 0 18.5 6.5t10.5 16.5l83 374h-1l1 5q0 7 -5.5 12.5t-13.5 5.5zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048 q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-<glyph unicode="" horiz-adv-x="2304" d="M1597 633q0 -69 -21 -106q-19 -35 -52 -35q-23 0 -41 9v224q29 30 57 30q57 0 57 -122zM2035 669h-110q6 98 56 98q51 0 54 -98zM476 534q0 59 -33 91.5t-101 57.5q-36 13 -52 24t-16 25q0 26 38 26q58 0 124 -33l18 112q-67 32 -149 32q-77 0 -123 -38q-48 -39 -48 -109 q0 -58 32.5 -90.5t99.5 -56.5q39 -14 54.5 -25.5t15.5 -27.5q0 -31 -48 -31q-29 0 -70 12.5t-72 30.5l-18 -113q72 -41 168 -41q81 0 129 37q51 41 51 117zM771 749l19 111h-96v135l-129 -21l-18 -114l-46 -8l-17 -103h62v-219q0 -84 44 -120q38 -30 111 -30q32 0 79 11v118 q-32 -7 -44 -7q-42 0 -42 50v197h77zM1087 724v139q-15 3 -28 3q-32 0 -55.5 -16t-33.5 -46l-10 56h-131v-471h150v306q26 31 82 31q16 0 26 -2zM1124 389h150v471h-150v-471zM1746 638q0 122 -45 179q-40 52 -111 52q-64 0 -117 -56l-8 47h-132v-645l150 25v151 q36 -11 68 -11q83 0 134 56q61 65 61 202zM1278 986q0 33 -23 56t-56 23t-56 -23t-23 -56t23 -56.5t56 -23.5t56 23.5t23 56.5zM2176 629q0 113 -48 176q-50 64 -144 64q-96 0 -151.5 -66t-55.5 -180q0 -128 63 -188q55 -55 161 -55q101 0 160 40l-16 103q-57 -31 -128 -31 q-43 0 -63 19q-23 19 -28 66h248q2 14 2 52zM2304 1280v-1280q0 -52 -38 -90t-90 -38h-2048q-52 0 -90 38t-38 90v1280q0 52 38 90t90 38h2048q52 0 90 -38t38 -90z" />
-<glyph unicode="" horiz-adv-x="2048" d="M1558 684q61 -356 298 -556q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5zM1024 -176q16 0 16 16t-16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5zM2026 1424q8 -10 7.5 -23.5t-10.5 -22.5 l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5 l418 363q10 8 23.5 7t21.5 -11z" />
-<glyph unicode="" horiz-adv-x="2048" d="M1040 -160q0 16 -16 16q-59 0 -101.5 42.5t-42.5 101.5q0 16 -16 16t-16 -16q0 -73 51.5 -124.5t124.5 -51.5q16 0 16 16zM503 315l877 760q-42 88 -132.5 146.5t-223.5 58.5q-93 0 -169.5 -31.5t-121.5 -80.5t-69 -103t-24 -105q0 -384 -137 -645zM1856 128 q0 -52 -38 -90t-90 -38h-448q0 -106 -75 -181t-181 -75t-180.5 74.5t-75.5 180.5l149 129h757q-166 187 -227 459l111 97q61 -356 298 -556zM1942 1520l84 -96q8 -10 7.5 -23.5t-10.5 -22.5l-1872 -1622q-10 -8 -23.5 -7t-21.5 11l-84 96q-8 10 -7.5 23.5t10.5 21.5l186 161 q-19 32 -19 66q50 42 91 88t85 119.5t74.5 158.5t50 206t19.5 260q0 152 117 282.5t307 158.5q-8 19 -8 39q0 40 28 68t68 28t68 -28t28 -68q0 -20 -8 -39q124 -18 219 -82.5t148 -157.5l418 363q10 8 23.5 7t21.5 -11z" />
-<glyph unicode="" horiz-adv-x="1408" d="M512 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM768 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM1024 160v704q0 14 -9 23t-23 9h-64q-14 0 -23 -9t-9 -23v-704 q0 -14 9 -23t23 -9h64q14 0 23 9t9 23zM480 1152h448l-48 117q-7 9 -17 11h-317q-10 -2 -17 -11zM1408 1120v-64q0 -14 -9 -23t-23 -9h-96v-948q0 -83 -47 -143.5t-113 -60.5h-832q-66 0 -113 58.5t-47 141.5v952h-96q-14 0 -23 9t-9 23v64q0 14 9 23t23 9h309l70 167 q15 37 54 63t79 26h320q40 0 79 -26t54 -63l70 -167h309q14 0 23 -9t9 -23z" />
-<glyph unicode="" d="M1150 462v-109q0 -50 -36.5 -89t-94 -60.5t-118 -32.5t-117.5 -11q-205 0 -342.5 139t-137.5 346q0 203 136 339t339 136q34 0 75.5 -4.5t93 -18t92.5 -34t69 -56.5t28 -81v-109q0 -16 -16 -16h-118q-16 0 -16 16v70q0 43 -65.5 67.5t-137.5 24.5q-140 0 -228.5 -91.5 t-88.5 -237.5q0 -151 91.5 -249.5t233.5 -98.5q68 0 138 24t70 66v70q0 7 4.5 11.5t10.5 4.5h119q6 0 11 -4.5t5 -11.5zM768 1280q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51t248.5 51t204 136.5t136.5 204t51 248.5 t-51 248.5t-136.5 204t-204 136.5t-248.5 51zM1536 640q0 -209 -103 -385.5t-279.5 -279.5t-385.5 -103t-385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103t385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" d="M972 761q0 108 -53.5 169t-147.5 61q-63 0 -124 -30.5t-110 -84.5t-79.5 -137t-30.5 -180q0 -112 53.5 -173t150.5 -61q96 0 176 66.5t122.5 166t42.5 203.5zM1536 640q0 -111 -37 -197t-98.5 -135t-131.5 -74.5t-145 -27.5q-6 0 -15.5 -0.5t-16.5 -0.5q-95 0 -142 53 q-28 33 -33 83q-52 -66 -131.5 -110t-173.5 -44q-161 0 -249.5 95.5t-88.5 269.5q0 157 66 290t179 210.5t246 77.5q87 0 155 -35.5t106 -99.5l2 19l11 56q1 6 5.5 12t9.5 6h118q5 0 13 -11q5 -5 3 -16l-120 -614q-5 -24 -5 -48q0 -39 12.5 -52t44.5 -13q28 1 57 5.5t73 24 t77 50t57 89.5t24 137q0 292 -174 466t-466 174q-130 0 -248.5 -51t-204 -136.5t-136.5 -204t-51 -248.5t51 -248.5t136.5 -204t204 -136.5t248.5 -51q228 0 405 144q11 9 24 8t21 -12l41 -49q8 -12 7 -24q-2 -13 -12 -22q-102 -83 -227.5 -128t-258.5 -45q-156 0 -298 61 t-245 164t-164 245t-61 298t61 298t164 245t245 164t298 61q344 0 556 -212t212 -556z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1698 1442q94 -94 94 -226.5t-94 -225.5l-225 -223l104 -104q10 -10 10 -23t-10 -23l-210 -210q-10 -10 -23 -10t-23 10l-105 105l-603 -603q-37 -37 -90 -37h-203l-256 -128l-64 64l128 256v203q0 53 37 90l603 603l-105 105q-10 10 -10 23t10 23l210 210q10 10 23 10 t23 -10l104 -104l223 225q93 94 225.5 94t226.5 -94zM512 64l576 576l-192 192l-576 -576v-192h192z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1615 1536q70 0 122.5 -46.5t52.5 -116.5q0 -63 -45 -151q-332 -629 -465 -752q-97 -91 -218 -91q-126 0 -216.5 92.5t-90.5 219.5q0 128 92 212l638 579q59 54 130 54zM706 502q39 -76 106.5 -130t150.5 -76l1 -71q4 -213 -129.5 -347t-348.5 -134q-123 0 -218 46.5 t-152.5 127.5t-86.5 183t-29 220q7 -5 41 -30t62 -44.5t59 -36.5t46 -17q41 0 55 37q25 66 57.5 112.5t69.5 76t88 47.5t103 25.5t125 10.5z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1792 128v-384h-1792v384q45 0 85 14t59 27.5t47 37.5q30 27 51.5 38t56.5 11t55.5 -11t52.5 -38q29 -25 47 -38t58 -27t86 -14q45 0 85 14.5t58 27t48 37.5q21 19 32.5 27t31 15t43.5 7q35 0 56.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14t85 14t59 27.5t47 37.5 q30 27 51.5 38t56.5 11q34 0 55.5 -11t51.5 -38q28 -24 47 -37.5t59 -27.5t85 -14zM1792 448v-192q-35 0 -55.5 11t-52.5 38q-29 25 -47 38t-58 27t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-22 -19 -33 -27t-31 -15t-44 -7q-35 0 -56.5 11t-51.5 38q-29 25 -47 38t-58 27 t-86 14q-45 0 -85 -14.5t-58 -27t-48 -37.5q-21 -19 -32.5 -27t-31 -15t-43.5 -7q-35 0 -56.5 11t-51.5 38q-28 24 -47 37.5t-59 27.5t-85 14q-46 0 -86 -14t-58 -27t-47 -38q-30 -27 -51.5 -38t-56.5 -11v192q0 80 56 136t136 56h64v448h256v-448h256v448h256v-448h256v448 h256v-448h64q80 0 136 -56t56 -136zM512 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1024 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51 t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150zM1536 1312q0 -77 -36 -118.5t-92 -41.5q-53 0 -90.5 37.5t-37.5 90.5q0 29 9.5 51t23.5 34t31 28t31 31.5t23.5 44.5t9.5 67q38 0 83 -74t45 -150z" />
-<glyph unicode="" horiz-adv-x="2048" d="M2048 0v-128h-2048v1536h128v-1408h1920zM1664 1024l256 -896h-1664v576l448 576l576 -576z" />
-<glyph unicode="" horiz-adv-x="1792" d="M768 646l546 -546q-106 -108 -247.5 -168t-298.5 -60q-209 0 -385.5 103t-279.5 279.5t-103 385.5t103 385.5t279.5 279.5t385.5 103v-762zM955 640h773q0 -157 -60 -298.5t-168 -247.5zM1664 768h-768v768q209 0 385.5 -103t279.5 -279.5t103 -385.5z" />
-<glyph unicode="" horiz-adv-x="2048" d="M2048 0v-128h-2048v1536h128v-1408h1920zM1920 1248v-435q0 -21 -19.5 -29.5t-35.5 7.5l-121 121l-633 -633q-10 -10 -23 -10t-23 10l-233 233l-416 -416l-192 192l585 585q10 10 23 10t23 -10l233 -233l464 464l-121 121q-16 16 -7.5 35.5t29.5 19.5h435q14 0 23 -9 t9 -23z" />
-<glyph unicode="" horiz-adv-x="1792" d="M1292 832q0 -6 10 -41q10 -29 25 -49.5t41 -34t44 -20t55 -16.5q325 -91 325 -332q0 -146 -105.5 -242.5t-254.5 -96.5q-59 0 -111.5 18.5t-91.5 45.5t-77 74.5t-63 87.5t-53.5 103.5t-43.5 103t-39.5 106.5t-35.5 95q-32 81 -61.5 133.5t-73.5 96.5t-104 64t-142 20 q-96 0 -183 -55.5t-138 -144.5t-51 -185q0 -160 106.5 -279.5t263.5 -119.5q177 0 258 95q56 63 83 116l84 -152q-15 -34 -44 -70l1 -1q-131 -152 -388 -152q-147 0 -269.5 79t-190.5 207.5t-68 274.5q0 105 43.5 206t116 176.5t172 121.5t204.5 46q87 0 159 -19t123.5 -50 t95 -80t72.5 -99t58.5 -117t50.5 -124.5t50 -130.5t55 -127q96 -200 233 -200q81 0 138.5 48.5t57.5 128.5q0 42 -19 72t-50.5 46t-72.5 31.5t-84.5 27t-87.5 34t-81 52t-65 82t-39 122.5q-3 16 -3 33q0 110 87.5 192t198.5 78q78 -3 120.5 -14.5t90.5 -53.5h-1 q12 -11 23 -24.5t26 -36t19 -27.5l-129 -99q-26 49 -54 70v1q-23 21 -97 21q-49 0 -84 -33t-35 -83z" />
-<glyph unicode="" d="M1432 484q0 173 -234 239q-35 10 -53 16.5t-38 25t-29 46.5q0 2 -2 8.5t-3 12t-1 7.5q0 36 24.5 59.5t60.5 23.5q54 0 71 -15h-1q20 -15 39 -51l93 71q-39 54 -49 64q-33 29 -67.5 39t-85.5 10q-80 0 -142 -57.5t-62 -137.5q0 -7 2 -23q16 -96 64.5 -140t148.5 -73 q29 -8 49 -15.5t45 -21.5t38.5 -34.5t13.5 -46.5v-5q1 -58 -40.5 -93t-100.5 -35q-97 0 -167 144q-23 47 -51.5 121.5t-48 125.5t-54 110.5t-74 95.5t-103.5 60.5t-147 24.5q-101 0 -192 -56t-144 -148t-50 -192v-1q4 -108 50.5 -199t133.5 -147.5t196 -56.5q186 0 279 110 q20 27 31 51l-60 109q-42 -80 -99 -116t-146 -36q-115 0 -191 87t-76 204q0 105 82 189t186 84q112 0 170 -53.5t104 -172.5q8 -21 25.5 -68.5t28.5 -76.5t31.5 -74.5t38.5 -74t45.5 -62.5t55.5 -53.5t66 -33t80 -13.5q107 0 183 69.5t76 174.5zM1536 1120v-960 q0 -119 -84.5 -203.5t-203.5 -84.5h-960q-119 0 -203.5 84.5t-84.5 203.5v960q0 119 84.5 203.5t203.5 84.5h960q119 0 203.5 -84.5t84.5 -203.5z" />
-<glyph unicode="" horiz-adv-x="2048" d="M1152 640q0 104 -40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5t198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM1920 640q0 104 -40.5 198.5 t-109.5 163.5t-163.5 109.5t-198.5 40.5h-386q119 -90 188.5 -224t69.5 -288t-69.5 -288t-188.5 -224h386q104 0 198.5 40.5t163.5 109.5t109.5 163.5t40.5 198.5zM2048 640q0 -130 -51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5 t-136.5 204t-51 248.5t51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5z" />
-<glyph unicode="" horiz-adv-x="2048" d="M0 640q0 130 51 248.5t136.5 204t204 136.5t248.5 51h768q130 0 248.5 -51t204 -136.5t136.5 -204t51 -248.5t-51 -248.5t-136.5 -204t-204 -136.5t-248.5 -51h-768q-130 0 -248.5 51t-204 136.5t-136.5 204t-51 248.5zM1408 128q104 0 198.5 40.5t163.5 109.5 t109.5 163.5t40.5 198.5t-40.5 198.5t-109.5 163.5t-163.5 109.5t-198.5 40.5t-198.5 -40.5t-163.5 -109.5t-109.5 -163.5t-40.5 -198.5t40.5 -198.5t109.5 -163.5t163.5 -109.5t198.5 -40.5z" />
-<glyph unicode="" horiz-adv-x="2304" d="M762 384h-314q-40 0 -57.5 35t6.5 67l188 251q-65 31 -137 31q-132 0 -226 -94t-94 -226t94 -226t226 -94q115 0 203 72.5t111 183.5zM576 512h186q-18 85 -75 148zM1056 512l288 384h-480l-99 -132q105 -103 126 -252h165zM2176 448q0 132 -94 226t-226 94 q-60 0 -121 -24l174 -260q15 -23 10 -49t-27 -40q-15 -11 -36 -11q-35 0 -53 29l-174 260q-93 -95 -93 -225q0 -132 94 -226t226 -94t226 94t94 226zM2304 448q0 -185 -131.5 -316.5t-316.5 -131.5t-316.5 131.5t-131.5 316.5q0 97 39.5 183.5t109.5 149.5l-65 98l-353 -469 q-18 -26 -51 -26h-197q-23 -164 -149 -274t-294 -110q-185 0 -316.5 131.5t-131.5 316.5t131.5 316.5t316.5 131.5q114 0 215 -55l137 183h-224q-26 0 -45 19t-19 45t19 45t45 19h384v-128h435l-85 128h-222q-26 0 -45 19t-19 45t19 45t45 19h256q33 0 53 -28l267 -400 q91 44 192 44q185 0 316.5 -131.5t131.5 -316.5z" />
-<glyph unicode="" d="M384 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1408 320q0 53 -37.5 90.5t-90.5 37.5t-90.5 -37.5t-37.5 -90.5t37.5 -90.5t90.5 -37.5t90.5 37.5t37.5 90.5zM1362 716l-72 384q-5 23 -22.5 37.5t-40.5 14.5 h-918q-23 0 -40.5 -14.5t-22.5 -37.5l-72 -384q-5 -30 14 -53t49 -23h1062q30 0 49 23t14 53zM1136 1328q0 20 -14 34t-34 14h-640q-20 0 -34 -14t-14 -34t14 -34t34 -14h640q20 0 34 14t14 34zM1536 603v-603h-128v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5 t-37.5 90.5v128h-768v-128q0 -53 -37.5 -90.5t-90.5 -37.5t-90.5 37.5t-37.5 90.5v128h-128v603q0 112 25 223l103 454q9 78 97.5 137t230 89t312.5 30t312.5 -30t230 -89t97.5 -137l105 -454q23 -102 23 -223z" />
-<glyph unicode="" horiz-adv-x="2048" d="M1463 704q0 -35 -25 -60.5t-61 -25.5h-702q-36 0 -61 25.5t-25 60.5t25 60.5t61 25.5h702q36 0 61 -25.5t25 -60.5zM1677 704q0 86 -23 170h-982q-36 0 -61 25t-25 60q0 36 25 61t61 25h908q-88 143 -235 227t-320 84q-177 0 -327.5 -87.5t-238 -237.5t-87.5 -327 q0 -86 23 -170h982q36 0 61 -25t25 -60q0 -36 -25 -61t-61 -25h-908q88 -143 235.5 -227t320.5 -84q132 0 253 51.5t208 139t139 208t52 253.5zM2048 959q0 -35 -25 -60t-61 -25h-131q17 -85 17 -170q0 -167 -65.5 -319.5t-175.5 -263t-262.5 -176t-319.5 -65.5 q-246 0 -448.5 133t-301.5 350h-189q-36 0 -61 25t-25 61q0 35 25 60t61 25h132q-17 85 -17 170q0 167 65.5 319.5t175.5 263t262.5 176t320.5 65.5q245 0 447.5 -133t301.5 -350h188q36 0 61 -25t25 -61z" />
-<glyph unicode="" horiz-adv-x="1280" d="M953 1158l-114 -328l117 -21q165 451 165 518q0 56 -38 56q-57 0 -130 -225zM654 471l33 -88q37 42 71 67l-33 5.5t-38.5 7t-32.5 8.5zM362 1367q0 -98 159 -521q18 10 49 10q15 0 75 -5l-121 351q-75 220 -123 220q-19 0 -29 -17.5t-10 -37.5zM283 608q0 -36 51.5 -119 t117.5 -153t100 -70q14 0 25.5 13t11.5 27q0 24 -32 102q-13 32 -32 72t-47.5 89t-61.5 81t-62 32q-20 0 -45.5 -27t-25.5 -47zM125 273q0 -41 25 -104q59 -145 183.5 -227t281.5 -82q227 0 382 170q152 169 152 427q0 43 -1 67t-11.5 62t-30.5 56q-56 49 -211.5 75.5 t-270.5 26.5q-37 0 -49 -11q-12 -5 -12 -35q0 -34 21.5 -60t55.5 -40t77.5 -23.5t87.5 -11.5t85 -4t70 0h23q24 0 40 -19q15 -19 19 -55q-28 -28 -96 -54q-61 -22 -93 -46q-64 -46 -108.5 -114t-44.5 -137q0 -31 18.5 -88.5t18.5 -87.5l-3 -12q-4 -12 -4 -14 q-137 10 -146 216q-8 -2 -41 -2q2 -7 2 -21q0 -53 -40.5 -89.5t-94.5 -36.5q-82 0 -166.5 78t-84.5 159q0 34 33 67q52 -64 60 -76q77 -104 133 -104q12 0 26.5 8.5t14.5 20.5q0 34 -87.5 145t-116.5 111q-43 0 -70 -44.5t-27 -90.5zM11 264q0 101 42.5 163t136.5 88 q-28 74 -28 104q0 62 61 123t122 61q29 0 70 -15q-163 462 -163 567q0 80 41 130.5t119 50.5q131 0 325 -581q6 -17 8 -23q6 16 29 79.5t43.5 118.5t54 127.5t64.5 123t70.5 86.5t76.5 36q71 0 112 -49t41 -122q0 -108 -159 -550q61 -15 100.5 -46t58.5 -78t26 -93.5 t7 -110.5q0 -150 -47 -280t-132 -225t-211 -150t-278 -55q-111 0 -223 42q-149 57 -258 191.5t-109 286.5z" />
-<glyph unicode="" horiz-adv-x="2048" d="M785 528h207q-14 -158 -98.5 -248.5t-214.5 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-203q-5 64 -35.5 99t-81.5 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t40 -51.5t66 -18q95 0 109 139zM1497 528h206 q-14 -158 -98 -248.5t-214 -90.5q-162 0 -254.5 116t-92.5 316q0 194 93 311.5t233 117.5q148 0 232 -87t97 -247h-204q-4 64 -35 99t-81 35q-57 0 -88.5 -60.5t-31.5 -177.5q0 -48 5 -84t18 -69.5t39.5 -51.5t65.5 -18q49 0 76.5 38t33.5 101zM1856 647q0 207 -15.5 307 t-60.5 161q-6 8 -13.5 14t-21.5 15t-16 11q-86 63 -697 63q-625 0 -710 -63q-5 -4 -17.5 -11.5t-21 -14t-14.5 -14.5q-45 -60 -60 -159.5t-15 -308.5q0 -208 15 -307.5t60 -160.5q6 -8 15 -15t20.5 -14t17.5 -12q44 -33 239.5 -49t470.5 -16q610 0 697 65q5 4 17 11t20.5 14 t13.5 16q46 60 61 159t15 309zM2048 1408v-1536h-2048v1536h2048z" />
-<glyph unicode="" d="M992 912v-496q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v496q0 112 -80 192t-192 80h-272v-1152q0 -14 -9 -23t-23 -9h-160q-14 0 -23 9t-9 23v1344q0 14 9 23t23 9h464q135 0 249 -66.5t180.5 -180.5t66.5 -249zM1376 1376v-880q0 -135 -66.5 -249t-180.5 -180.5 t-249 -66.5h-464q-14 0 -23 9t-9 23v960q0 14 9 23t23 9h160q14 0 23 -9t9 -23v-768h272q112 0 192 80t80 192v880q0 14 9 23t23 9h160q14 0 23 -9t9 -23z" />
-<glyph unicode="" d="M1311 694v-114q0 -24 -13.5 -38t-37.5 -14h-202q-24 0 -38 14t-14 38v114q0 24 14 38t38 14h202q24 0 37.5 -14t13.5 -38zM821 464v250q0 53 -32.5 85.5t-85.5 32.5h-133q-68 0 -96 -52q-28 52 -96 52h-130q-53 0 -85.5 -32.5t-32.5 -85.5v-250q0 -22 21 -22h55 q22 0 22 22v230q0 24 13.5 38t38.5 14h94q24 0 38 -14t14 -38v-230q0 -22 21 -22h54q22 0 22 22v230q0 24 14 38t38 14h97q24 0 37.5 -14t13.5 -38v-230q0 -22 22 -22h55q21 0 21 22zM1410 560v154q0 53 -33 85.5t-86 32.5h-264q-53 0 -86 -32.5t-33 -85.5v-410 q0 -21 22 -21h55q21 0 21 21v180q31 -42 94 -42h191q53 0 86 32.5t33 85.5zM1536 1176v-1072q0 -96 -68 -164t-164 -68h-1072q-96 0 -164 68t-68 164v1072q0 96 68 164t164 68h1072q96 0 164 -68t68 -164z" />
-<glyph unicode="" horiz-adv-x="1792" />
-<glyph unicode="" horiz-adv-x="1792" />
-<glyph unicode="" horiz-adv-x="1792" />
-</font>
-</defs></svg>
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(c<a?'':e(parseInt(c/a)))+((c=c%a)>35?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<d/2)6 h.i.A(x,t*2,0,c,d)*.5+b;6 h.i.v(x,t*2-d,0,c,d)*.5+c*.5+b}});',62,74,'||||||return||Math|function|||||if|var|PI|jQuery|easing|pow|75|70158|else|sin|sqrt||5625|asin|||undefined|easeOutBounce|abs||def|swing|easeInBounce|525|cos|easeOutQuad|easeOutBack|easeInBack|easeInSine|easeOutElastic|easeInOutQuint|easeOutQuint|easeInQuint|easeInOutQuart|easeOutQuart|easeInQuart|extend|easeInElastic|easeInOutCirc|easeInOutCubic|easeOutCirc|easeInOutElastic|easeOutCubic|easeInCirc|easeInOutExpo|easeInCubic|easeOutExpo|easeInExpo||9375|easeInOutSine|easeInOutQuad|25|easeOutSine|easeInOutBack|easeInQuad|625|984375|jswing|easeInOutBounce'.split('|'),0,{}))
-
-/*
- *
- * TERMS OF USE - EASING EQUATIONS
- *
- * Open source under the BSD License.
- *
- * Copyright © 2001 Robert Penner
- * 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.
- *
- */
DELETED cgisetup/www/css/img/fancybox/jquery.fancybox-1.3.4.js
Index: cgisetup/www/css/img/fancybox/jquery.fancybox-1.3.4.js
==================================================================
--- cgisetup/www/css/img/fancybox/jquery.fancybox-1.3.4.js
+++ /dev/null
@@ -1,1156 +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($) {
- var tmp, loading, overlay, wrap, outer, content, close, title, nav_left, nav_right,
-
- selectedIndex = 0, selectedOpts = {}, selectedArray = [], currentIndex = 0, currentOpts = {}, currentArray = [],
-
- ajaxLoader = null, imgPreloader = new Image(), imgRegExp = /\.(jpg|gif|png|bmp|jpeg)(.*)?$/i, swfRegExp = /[^\.]\.(swf)\s*$/i,
-
- loadingTimer, loadingFrame = 1,
-
- titleHeight = 0, titleStr = '', start_pos, final_pos, busy = false, fx = $.extend($('<div/>')[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( '<p id="fancybox-error">The requested content cannot be loaded.<br />Please try again later.</p>' );
-
- _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;
- }
-
- $('<div class="fancybox-inline-tmp" />')
- .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 = '<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="' + selectedOpts.width + '" height="' + selectedOpts.height + '"><param name="movie" value="' + href + '"></param>';
- emb = '';
-
- $.each(selectedOpts.swf, function(name, val) {
- str += '<param name="' + name + '" value="' + val + '"></param>';
- emb += ' ' + name + '="' + val + '"';
- });
-
- str += '<embed src="' + href + '" type="application/x-shockwave-flash" width="' + selectedOpts.width + '" height="' + selectedOpts.height + '"' + emb + '></embed></object>';
-
- 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('<div style="width:' + w + ';height:' + h + ';overflow: ' + (selectedOpts.scrolling == 'auto' ? 'auto' : (selectedOpts.scrolling == 'yes' ? 'scroll' : 'hidden')) + ';position:relative;"></div>');
-
- selectedOpts.width = tmp.width();
- selectedOpts.height = tmp.height();
-
- _show();
- },
-
- _process_image = function() {
- selectedOpts.width = imgPreloader.width;
- selectedOpts.height = imgPreloader.height;
-
- $("<img />").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 '<table id="fancybox-title-float-wrap" cellpadding="0" cellspacing="0"><tr><td id="fancybox-title-float-left"></td><td id="fancybox-title-float-main">' + title + '</td><td id="fancybox-title-float-right"></td></tr></table>';
- }
-
- return '<div id="fancybox-title-' + currentOpts.titlePosition + '">' + title + '</div>';
- }
-
- 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') {
- $('<iframe id="fancybox-frame" name="fancybox-frame' + new Date().getTime() + '" frameborder="0" hspace="0" ' + ($.browser.msie ? 'allowtransparency="true""' : '') + ' scrolling="' + selectedOpts.scrolling + '" src="' + currentOpts.href + '"></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 = $('<div id="fancybox-tmp"></div>'),
- loading = $('<div id="fancybox-loading"><div></div></div>'),
- overlay = $('<div id="fancybox-overlay"></div>'),
- wrap = $('<div id="fancybox-wrap"></div>')
- );
-
- outer = $('<div id="fancybox-outer"></div>')
- .append('<div class="fancybox-bg" id="fancybox-bg-n"></div><div class="fancybox-bg" id="fancybox-bg-ne"></div><div class="fancybox-bg" id="fancybox-bg-e"></div><div class="fancybox-bg" id="fancybox-bg-se"></div><div class="fancybox-bg" id="fancybox-bg-s"></div><div class="fancybox-bg" id="fancybox-bg-sw"></div><div class="fancybox-bg" id="fancybox-bg-w"></div><div class="fancybox-bg" id="fancybox-bg-nw"></div>')
- .appendTo( wrap );
-
- outer.append(
- content = $('<div id="fancybox-content"></div>'),
- close = $('<a id="fancybox-close"></a>'),
- title = $('<div id="fancybox-title"></div>'),
-
- nav_left = $('<a href="javascript:;" id="fancybox-left"><span class="fancy-ico" id="fancybox-left-ico"></span></a>'),
- nav_right = $('<a href="javascript:;" id="fancybox-right"><span class="fancy-ico" id="fancybox-right-ico"></span></a>')
- );
-
- 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');
-
- $('<iframe id="fancybox-hide-sel-frame" src="' + (/^https/i.test(window.location.href || '') ? 'javascript:void(false)' : 'about:blank' ) + '" scrolling="no" border="0" frameborder="0" tabindex="-1"></iframe>').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("<div/>")[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('<p id="fancybox-error">The requested content cannot be loaded.<br />Please try again later.</p>');
-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('<div class="fancybox-inline-tmp" />').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("<img />").attr({id:"fancybox-img",src:v.src,alt:e.title}).appendTo(m);Q()};v.src=c;break;case "swf":e.scrolling="no";C='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="'+e.width+'" height="'+e.height+'"><param name="movie" value="'+c+
-'"></param>';P="";b.each(e.swf,function(x,H){C+='<param name="'+x+'" value="'+H+'"></param>';P+=" "+x+'="'+H+'"'});C+='<embed src="'+c+'" type="application/x-shockwave-flash" width="'+e.width+'" height="'+e.height+'"'+P+"></embed></object>";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('<div style="width:'+a+";height:"+c+
-";overflow: "+(e.scrolling=="auto"?"auto":e.scrolling=="yes"?"scroll":"hidden")+';position:relative;"></div>');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"?'<table id="fancybox-title-float-wrap" cellpadding="0" cellspacing="0"><tr><td id="fancybox-title-float-left"></td><td id="fancybox-title-float-main">'+s+'</td><td id="fancybox-title-float-right"></td></tr></table>':'<div id="fancybox-title-'+d.titlePosition+'">'+s+"</div>":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('<iframe id="fancybox-frame" name="fancybox-frame'+(new Date).getTime()+'" frameborder="0" hspace="0" '+(b.browser.msie?'allowtransparency="true""':"")+' scrolling="'+e.scrolling+'" src="'+d.href+'"></iframe>').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;k<C;k++)if(typeof a[k]=="object")b(a[k]).data("fancybox",b.extend({},g,a[k]));else a[k]=b({}).data("fancybox",b.extend({content:a[k]},g));o=jQuery.merge(o,a)}else{if(typeof a=="object")b(a).data("fancybox",b.extend({},g,a));else a=b({}).data("fancybox",b.extend({content:a},g));o.push(a)}if(q>o.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&&a<l.length){q=a;I()}else if(d.cyclic&&l.length>1){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('<div id="fancybox-tmp"></div>'),t=b('<div id="fancybox-loading"><div></div></div>'),u=b('<div id="fancybox-overlay"></div>'),f=b('<div id="fancybox-wrap"></div>'));D=b('<div id="fancybox-outer"></div>').append('<div class="fancybox-bg" id="fancybox-bg-n"></div><div class="fancybox-bg" id="fancybox-bg-ne"></div><div class="fancybox-bg" id="fancybox-bg-e"></div><div class="fancybox-bg" id="fancybox-bg-se"></div><div class="fancybox-bg" id="fancybox-bg-s"></div><div class="fancybox-bg" id="fancybox-bg-sw"></div><div class="fancybox-bg" id="fancybox-bg-w"></div><div class="fancybox-bg" id="fancybox-bg-nw"></div>').appendTo(f);
-D.append(j=b('<div id="fancybox-content"></div>'),E=b('<a id="fancybox-close"></a>'),n=b('<div id="fancybox-title"></div>'),z=b('<a href="javascript:;" id="fancybox-left"><span class="fancy-ico" id="fancybox-left-ico"></span></a>'),A=b('<a href="javascript:;" id="fancybox-right"><span class="fancy-ico" id="fancybox-right-ico"></span></a>'));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('<iframe id="fancybox-hide-sel-frame" src="'+(/^https/i.test(window.location.href||"")?"javascript:void(false)":"about:blank")+'" scrolling="no" border="0" frameborder="0" tabindex="-1"></iframe>').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 @@
-<!DOCTYPE html>
-<html><head>
-<title>HTML KickStart Elements</title>
-<meta charset="UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-<meta name="description" content="HTML KickStart is a ultra–lean set of HTML5, CSS, and jQuery (javascript) files, layouts, and elements designed to give you a headstart and save you a lot of hours on your next web project." />
-<meta name="copyright" content="Joshua Gatcke 99lime.com All Rights Reserved" />
-<link rel="stylesheet" type="text/css" href="css/kickstart.css" media="all" /> <!-- KICKSTART -->
-<link rel="stylesheet" type="text/css" href="style.css" media="all" /> <!-- CUSTOM STYLES -->
-<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
-<script type="text/javascript" src="js/kickstart.js"></script> <!-- KICKSTART -->
-</head><body>
-<!-- ===================================== END HEADER ===================================== -->
-<nav class="navbar">
-<a class="hide-phone" id="logo" href="http://www.99lime.com"><i class="fa fa-angle-right"></i> 99<span>Lime</span></a>
-<ul>
-<li><a href="http://www.99lime.com/elements/"><span>HTML</span>KickStart</a></li>
-<li><a href="http://www.99lime.com/uikit/"><span>UI</span>KIT</a></li>
-<li><a href="http://www.99lime.com/blog/">Blog</a></li>
-</ul>
-</nav>
-<div class="callout callout-top clearfix">
- <div class="grid">
- <h1>HTML KickStart</h1>
- <h4>Ultra–Lean HTML5, CSS, & JS Building Blocks<br />for Rapid Website Production</h4>
- <div class="col_3">
- <i class="fa fa-mobile fa-4x"></i><br />
- Responsive
- </div>
-
- <div class="col_3">
- <i class="fa fa-github fa-4x"></i><br />
- MIT Open Source
- </div>
-
- <div class="col_3">
- <i class="fa fa-flag fa-4x"></i><br />
- 479 Icons<br />
- </div>
-
- <div class="col_3 omega">
- <i class="fa fa-tint fa-4x"></i><br />
- Designer Friendly
- </i>
- </div>
- <div class="clear"></div><br />
- <a class="button red large" href="http://www.99lime.com/downloads/"><i class="fa fa-cloud-download"></i> Download (Github)</a>
- <span style="white-space: nowrap;">
- <a class="button blue large" href="https://twitter.com/htmlkickstart"><i class="fa fa-twitter"></i></a>
- <a class="button blue large" href="mailto:joshua@99lime.com"><i class="fa fa-envelope"></i></a></span><br />
- <p>Downloaded over 91036 Times :)</p>
- </div>
-</div>
-
-<div class="grid">
-
-<!-- =====================================
- INSTRUCTIONS
-===================================== -->
-<h3>Getting Started</h3>
-<ul class="tabs">
-<li><a href="#instructions">Instructions</a></li>
-</ul>
-
- <div id="instructions" class="tab-content">
- <div class="col_8">
- <h4><i class="fa fa-wrench"></i> Setup</h4>
- <ol>
- <li><a href="http://www.99lime.com/downloads/">Download HTML KickStart</a></li>
- <li>Include jQuery and HTML KickStart
-<pre>
-<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 -->
-</pre>
- </li>
- <li>Copy Elements into your HTML</li>
- </ol>
- </div>
- <div class="col_1"></div>
- <div class="col_3">
- <h4><i class="fa fa-globe"></i> Browsers</h4>
- HTML KickStart Tested and working in IE 8+, Safari, Chrome, Firefox, Opera, Safari IOS, Browser and Chrome Android.
- <h4>Notes</h4>
- Don't forget to use an HTML5 Doctype
- <code><!DOCTYPE html></code>
- </div>
- </div>
-
-<!-- =====================================
- BUTTONS
-===================================== -->
-<style type="text/css">
-#btn-example .button-bar{margin-bottom:10px;}
-</style>
-
-<h3 id="buttons">Buttons</h3>
-<ul class="tabs">
-<li><a href="#btn-example">Example</a></li>
-<li><a href="#btn-sizes">Sizes</a></li>
-<li><a href="#btn-icons">With Icons</a></li>
-<li><a href="#btn-colors">Colors</a></li>
-<li><a href="#btn-styles">Styles</a></li>
-<li><a href="#btn-bar">Button Bar</a></li>
-</ul>
-
- <style type="text/css">
- #btn-example a.button, #btn-example button{margin-bottom:10px;}
- </style>
-
- <div id="btn-example" class="tab-content">
- <div class="col_3">
- <h4>Buttons</h4>
- <button>Button</button><br />
- <a class="button" href="">A.button</a><br />
- <button class="small">Small</button> <br />
- <button class="small" disabled="disabled">Small (disabled)</button><br />
- <button class="medium">Medium</button><br />
- <button class="large">Large</button>
- </div>
-
- <!-- BUTTONS W/ICON -->
- <div class="col_3">
- <h4>With Icons</h4>
- <button class="small"><i class="fa fa-picture-o"></i> Small</button><br />
- <button class="medium"><i class="fa fa-coffee"></i> Medium</button><br />
- <button class="large"><i class="fa fa-leaf"></i> Large</button><br />
- </div>
-
- <!-- BUTTON VARIATIONS -->
- <div class="col_3">
- <h4>Colors</h4>
- <button class="blue"><i class="fa fa-star"></i> .blue</button><br />
- <a class="button orange" href=""><i class="fa fa-music"></i> .orange</a><br />
- <button class="small pink"><i class="fa fa-plus-square"></i> .pink</button><br />
- <button class="medium green"><i class="fa fa-play-circle"></i> .green</button><br />
- <button class="large red"><i class="fa fa-minus-square"></i> .red</button>
- </div>
-
- <!-- BUTTON STYLES -->
- <div class="col_3">
- <h4>Styles</h4>
- <button>default</button><br />
- <button class="pill"><i class="fa fa-star"></i> .pill</button><br />
- <a class="button pop" href=""><i class="icon-music"></i> .pop</a><br />
- <button class="inset"><i class="fa fa-plus-square"></i> .inset</button> <br />
- <button class="square"><i class="fa fa-minus-square"></i> .square</button>
- </div><div class="clear"></div>
-
- <div class="col_12">
- <h4>Button Bar</h4>
- <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-square"></i></a></li>
- </ul>
-
- <ul class="button-bar">
- <li><a href=""><i class="fa fa-folder-open"></i></a></li>
- <li><a href=""><i class="fa fa-file"></i></a></li>
- <li><a href=""><i class="fa fa-trash"></i></a></li>
- <li><a href=""><i class="fa fa-wrench"></i></a></li>
- </ul>
-
- <ul class="button-bar">
- <li><a href="">Item1</a></li>
- <li><a href=""><i class="fa fa-globe"></i> Item2</a></li>
- <li><a href="">Item3</a></li>
- <li><a href="">Item4</a></li>
- </ul>
-
- <ul class="button-bar">
- <li><a href=""><i class="fa fa-caret-left"></i></a></li>
- <li><a href=""><i class="fa fa-caret-right"></i></a></li>
- </ul>
- </div>
- </div>
-
- <div id="btn-sizes" class="tab-content">
-<pre>
-<!-- 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></pre>
- </div>
-
- <div id="btn-icons" class="tab-content">
-<pre>
-<!-- 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></pre>
- </div>
-
- <div id="btn-colors" class="tab-content">
-<pre>
-<!-- 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></pre>
- </div>
-
- <div id="btn-styles" class="tab-content">
-<pre>
-<!-- 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>
-</pre>
- </div>
-
- <div id="btn-bar" class="tab-content">
-<pre>
-<!-- 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>
-</pre>
- </div>
-
-<!-- =====================================
- LISTS
-===================================== -->
-<h3 id="lists">Lists</h3>
-<ul class="tabs">
-<li><a href="#list-example">Example</a></li>
-<li><a href="#list-ul">UL</a></li>
-<li><a href="#list-ol">OL</a></li>
-<li><a href="#list-checks">UL.icons</a></li>
-<li><a href="#list-alt">UL.alt</a></li>
-</ul>
-
- <div id="list-example" class="tab-content">
- <div class="col_3">
- <h4>Unordered List</h4>
- <ul>
- <li>Apple</li>
- <li>Banana</li>
- <li>Orange</li>
- <li>Pear</li>
- </ul>
- </div>
-
- <div class="col_3">
- <h4>Ordered List</h4>
- <ol>
- <li>Apple</li>
- <li>Banana</li>
- <li>Orange</li>
- <li>Pear</li>
- </ol>
- </div>
-
- <div class="col_3">
- <h4>UL.icons</h4>
- <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>
- </div>
-
- <div class="col_3">
- <h4>UL.alt</h4>
- <ul class="alt">
- <li>Apple</li>
- <li>Banana</li>
- <li>Orange</li>
- <li>Pear</li>
- </ul>
- </div>
- </div>
-
- <div id="list-ul" class="tab-content">
-<pre>
-<!-- Unordered List -->
-<ul>
-<li>Apple</li>
-<li>Banana</li>
-<li>Orange</li>
-<li>Pear</li>
-</ul></pre>
- </div>
-
- <div id="list-ol" class="tab-content">
-<pre>
-<!-- Ordered List -->
-<ol>
-<li>Apple</li>
-<li>Banana</li>
-<li>Orange</li>
-<li>Pear</li>
-</ol></pre>
- </div>
-
- <div id="list-checks" class="tab-content">
-<pre>
-<!-- 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></pre>
- </div>
-
- <div id="list-alt" class="tab-content">
-<pre>
-<!-- List Alternative Style -->
-<ul class="alt">
-<li>Apple</li>
-<li>Banana</li>
-<li>Orange</li>
-<li>Pear</li>
-</ul></pre>
- </div>
-
-<!-- =====================================
- MENUS
-===================================== -->
-<h3 id="menus">Menus</h3>
-<ul class="tabs">
-<li><a href="#menu-example">Example</a></li>
-<li><a href="#menu-horizontal">Horizontal</a></li>
-<li><a href="#menu-vertical">Vertical</a></li>
-<li><a href="#menu-vertical-right">Vertical.right</a></li>
-</ul>
-
- <div id="menu-example" class="tab-content">
- <p>These Menus are optionally responsive when using a responsive grid: <code>.grid</code> or <code>.grid.flex</code></p>
- <!-- MENU VERTICAL -->
- <div class="col_3">
- <h4>Vertical Left</h4>
- <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>
- </div>
-
- <!-- MENU HORIZONTAL -->
- <div class="col_6">
- <h4>Horizontal</h4>
- <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>
- </div>
-
- <!-- MENU VERTICAL RIGHT -->
- <div class="col_3">
- <h4>Vertical Right</h4>
- <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>
- </div>
- </div>
-
- <div id="menu-vertical" class="tab-content">
-<pre>
-<!-- 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></pre>
- </div>
-
- <div id="menu-horizontal" class="tab-content">
-<pre>
-<!-- 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></pre>
- </div>
-
- <div id="menu-vertical-right" class="tab-content">
-<pre>
-<!-- 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>
- </div>
-
-<!-- =====================================
- TABLES
-===================================== -->
-<h3 id="tables">Tables</h3>
-<ul class="tabs">
-<li><a href="#table-example">Example</a></li>
-<li><a href="#table">Table</a></li>
-<li><a href="#table-wside">Table w/side TH</a></li>
-<li><a href="#table-styles">Table Styles</a></li>
-</ul>
-
- <div id="table-example" class="tab-content">
- <div class="col_6">
- <h4>Table (default)</h4>
- <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>
- </div>
-
- <div class="col_6">
- <h4>Table.striped</h4>
- <table class="striped" 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>
- </div><div class="clear"></div>
-
- <div class="col_6">
- <h4>Table.tight</h4>
- <table class="tight" 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>
- </div>
-
- <div class="col_6">
- <h4>Table.sortable</h4>
- <table class="sortable" cellspacing="0" cellpadding="0">
- <thead><tr>
- <th>Name</th>
- <th>Number</th>
- <th>Color</th>
- <th>Actions</th>
- </tr></thead>
- <tbody><tr>
- <td>Joshua</td>
- <td>555-4325</td>
- <td>Blue</td>
- <td><a href=""><i class="fa fa-pencil"></i></a>
- <a href=""><i class="fa fa-minus-square"></i></a></td>
- </tr><tr>
- <td>Peter</td>
- <td>555-5698</td>
- <td>Gold</td>
- <td><a href=""><i class="fa fa-pencil"></i></a>
- <a href=""><i class="fa fa-minus-square"></i></a></td>
- </tr><tr>
- <td>Mary</td>
- <td>666-7654</td>
- <td>Red</td>
- <td><a href=""><i class="fa fa-pencil"></i></a>
- <a href=""><i class="fa fa-minus-square"></i></a></td>
- </tr><tr>
- <td>Gretty</td>
- <td>555-6732</td>
- <td>Pink</td>
- <td><a href=""><i class="fa fa-pencil"></i></a>
- <a href=""><i class="fa fa-minus-square"></i></a></td>
- </tr></tbody>
- </table>
- </div>
- </div>
-
- <div id="table" class="tab-content">
-<pre>
-<!-- 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></pre>
- </div>
-
- <div id="table-wside" class="tab-content">
-<pre>
-<!-- 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></pre>
- </div>
-
- <div id="table-styles" class="tab-content">
-<pre>
-<!-- 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>
-</pre>
- </div>
-
-<!-- =====================================
- TOOL TIPS
-===================================== -->
-<h3 id="tooltips">ToolTips</h3>
-<ul class="tabs">
-<li><a href="#tooltip-example">Example</a></li>
-<li><a href="#tooltip-positions">Positions</a></li>
-<li><a href="#tooltip-html">w/ HTML Content</a></li>
-</ul>
-
- <div id="tooltip-example" class="tab-content">
- <div class="col_4">
- <h4>Tooltips</h4>
- <p>Tooltips are awesome. These tooltips are designed to mimic the default browser tooltips - smart, aware of the edge of the browser window. Simple.</p>
- <p>Hover over the examples on the right to preview.</p>
- <p>Use:<br />
- <code>class="tooltip"</code> + <br />
- <code class="tooltip" title="my tooltip content">title="my tooltip content"</code></p>
- </div>
-
- <div class="col_4">
- <h4>Tooltip Positions</h4>
- <ul>
- <li><code class="tooltip" title="This is a default (top) tooltip">.tooltip</code> (default)</li>
- <li><code class="tooltip-top" title="This is a Top tooltip">.tooltip-top</code></li>
- <li><code class="tooltip-right" title="This is a Right tooltip">.tooltip-right</code></li>
- <li><code class="tooltip-left" title="This is a Left tooltip">.tooltip-left</code></li>
- <li><code class="tooltip-bottom" title="This is a Bottom tooltip">.tooltip-bottom</code></li>
- </ul>
- </div>
-
- <div class="col_4">
- <h4>Tooltips with HTML Content</h4>
- <code>.tooltip</code> + <code>data-content="#ID"</code>
- <hr />
- <button class="tooltip medium orange pill" data-content="#tooltipcontentID">Hover Over Me</button>
- <button class="tooltip medium blue pill" data-content="#tooltipcontentID" data-action="click">Click Me</button>
- <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>
- </div>
- </div>
-
- <div id="tooltip-positions" class="tab-content">
-<pre>
-<!-- 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>
-</pre>
- </div>
-
- <div id="tooltip-html" class="tab-content">
-<pre>
-<!-- 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>
-</pre>
- </div>
-
-<!-- =====================================
- TYPOGRAPHY
-===================================== -->
-
-<h3 id="typography">Typography</h3>
-<ul class="tabs">
-<li><a href="#type-example">Example</a></li>
-<li><a href="#type-headings">Headings</a></li>
-<li><a href="#type-paragraphs">Paragraphs</a></li>
-<li><a href="#type-blockquotes">Blockquote</a></li>
-<li><a href="#type-blockquotes-small">Blockquote.small</a></li>
-<li><a href="#type-inline-styles">Inline Styles</a></li>
-<li><a href="#type-address">Address</a></li>
-</ul>
-
- <div id="type-example" class="tab-content">
- <div class="col_8">
- <h4>Paragraphs</h4>
- <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>
- <p>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.</p>
-
- <!-- BLOCKQUOTES -->
- <h4>Blockquote</h4>
- <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 -->
- <h4>Blockquote Small</h4>
- <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>
- </div>
-
- <!-- TYPE STYLES -->
- <div class="col_4">
- <h4>Inline Styles</h4>
- <ul>
- <li><strong>Strong</strong></li>
- <li><em>Emphasis</em></li>
- <li><a href="">Inline Link</a></li>
- <li><strike>Strike</strike></li>
- <li>Inline <i class="fa fa-film"></i> Icons</li>
- <li><code><h1>Sample Code</h1></code></li>
- </ul>
- <hr />
-
- <h1>Heading 1</h1>
- <h2>Heading 2</h2>
- <h3>Heading 3</h3>
- <h4>Heading 4</h4>
- <h5>Heading 5</h5>
- <h6>Heading 6</h6>
- <hr />
-
- <h4>Address</h4>
- <address><p>
- 1234 South Creek Lane<br />
- Calgary, Alberta, Canada<br />
- T4B–1S6
- </p>
- </address>
- </div>
- </div>
-
- <div id="type-headings" class="tab-content">
-<pre>
-<!-- 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></pre>
- </div>
-
- <div id="type-paragraphs" class="tab-content">
-<pre>
-<!-- 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></pre>
- </div>
-
- <div id="type-blockquotes" class="tab-content">
-<pre>
-<!-- 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></pre>
- </div>
-
- <div id="type-blockquotes-small" class="tab-content">
-<pre>
-<!-- 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></pre>
- </div>
-
- <div id="type-inline-styles" class="tab-content">
-<pre><!-- 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></pre>
- </div>
-
- <div id="type-address" class="tab-content">
-<pre>
-<!-- Address -->
-<address><p>
-1234 South Creek Lane<br />
-Calgary, Alberta, Canada<br />
-T4B–1S6
-</p>
-</address></pre>
- </div>
-
-<!-- =====================================
- HORIZONTAL RULES
-===================================== -->
-<h3 id="horizontal-rules">Horizontal Rules</h3>
-<ul class="tabs">
-<li><a href="#hr-example">Example</a></li>
-<li><a href="#hr-html">HTML</a></li>
-</ul>
-
- <div id="hr-example" class="tab-content">
- <div class="col_4">
- <h4>HR</h4>
- <hr />
- </div>
-
- <div class="col_4">
- <h4>HR.alt1</h4>
- <hr class="alt1" />
- </div>
-
- <div class="col_4">
- <h4>HR.alt2</h4>
- <hr class="alt2" />
- </div>
- </div>
-
- <div id="hr-html" class="tab-content">
-<pre>
-<!-- HR -->
-<hr />
-
-<!-- HR.alt1 -->
-<hr class="alt1" />
-
-<!-- HR.alt2 -->
-<hr class="alt2" /></pre>
- </div>
-
-<!-- =====================================
- ICONS
-===================================== -->
-<style type="text/css">
-#icon-description{border:1px solid #ddd;padding:20px;background:#fff;}
-#icon-description span{color:red;}
-</style>
-
-<h3 id="icons">Icons/Glyphs</h3>
-<div id="icon-description" class="clearfix">
- <div class="col_7">
- <h4>HTML KickStart now using<br /><a href="http://fortawesome.github.com/Font-Awesome/">Font Awesome 4.2.0 Icons</a>!</h4>
- How to use icons: <code><i class="<span>fa fa-globe</span>"></i></code>.
- <br />Replace <span>fa-globe</span> with the icon you would like to use from the <a href="http://fortawesome.github.io/Font-Awesome/cheatsheet/">Cheatsheet</a>.</div>
- <div class="col_5">
- <i class="fa fa-github-alt fa-large"></i>
- <i class="fa fa-github-alt fa-2x"></i>
- <i class="fa fa-github-alt fa-3x"></i>
- <i class="fa fa-github-alt fa-4x"></i>
- <br />
- To increase the size of icons relative to its container, use <code>fa-large</code>, <code>fa-2x</code>, <code>fa-3x</code>, or <code>fa-4x</code>.</div><hr />
- <div class="col_4">
- <i class="fa fa-github-alt fa-4x pull-left"></i> <code>.pull-left</code> 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.
- </div>
- <div class="col_4">
- <i class="fa fa-github-alt fa-4x pull-right"></i> <code>.pull-right</code> 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.
- </div>
- <div class="col_4">
- <i class="fa fa-github-alt fa-4x pull-left fa-border"></i> <code>.fa-border</code> 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.
- </div>
-</div>
-<div class="clear" style="margin-bottom:40px;"></div>
-
-<!-- =====================================
- CODE/PRE
-===================================== -->
-<h3 id="code">Code/Pre</h3>
-<ul class="tabs">
-<li><a href="#code-example">Example</a></li>
-<li><a href="#code-html">PRE.html</a></li>
-<li><a href="#code-css">PRE.css</a></li>
-<li><a href="#code-js">PRE.js</a></li>
-<li><a href="#code-php">PRE.php</a></li>
-</ul>
-
- <div id="code-example" class="tab-content">
- <div class="col_4">
- <h4>PRE HTML</h4>
- <pre>
-<html>
-<head><title>This is a title</title></head>
-<body class="subpage">
- <!-- Content Here -->
-</body>
-</html></pre>
- </div>
-
- <!-- CODE CSS -->
- <div class="col_4">
- <h4>PRE CSS</h4>
- <pre class="css">
-body{
-font-weight:bold;
-color:#000;
-line-height:150%;
-}</pre>
- </div>
-
- <!-- CODE JS -->
- <div class="col_4">
- <h4>PRE JS</h4>
- <pre class="js">
-$(document).ready(function(){
- alert('jQuery');
-});</pre>
- </div>
- </div>
-
- <div id="code-html" class="tab-content">
-<pre>
-<!-- Code HTML -->
-<pre>
-…code goes here…
-</pre></pre>
- </div>
-
- <div id="code-css" class="tab-content">
-<pre>
-<!-- Code CSS -->
-<pre>
-…code goes here…
-</pre></pre>
- </div>
-
- <div id="code-js" class="tab-content">
-<pre>
-<!-- Code Javascript -->
-<pre>
-…code goes here…
-</pre></pre>
- </div>
-
- <div id="code-php" class="tab-content">
-<pre>
-<!-- Code PHP -->
-<pre>
-…code goes here…
-</pre></pre>
- </div>
-
-<!-- =====================================
- TABS
-===================================== -->
-<h3 id="tabs">Tabs</h3>
-<ul class="tabs">
-<li><a href="#tabs-example">Example</a></li>
-<li><a href="#tabs-left">Tabs.left</a></li>
-<li><a href="#tabs-center">Tabs.center</a></li>
-<li><a href="#tabs-right">Tabs.right</a></li>
-</ul>
-
- <div id="tabs-example" class="tab-content">
- <div class="col_4">
- <h4>Tabs.left</h4>
- <ul class="tabs left">
- <li><a href="#tab1">Tab1</a></li>
- <li><a href="#tab2">Tab2</a></li>
- <li><a href="#tab3">Tab3</a></li>
- </ul>
-
- <div id="tab1" class="tab-content">Tab1</div>
- <div id="tab2" class="tab-content">Tab2</div>
- <div id="tab3" class="tab-content">Tab3</div>
- </div>
-
- <!-- TABS CENTER -->
- <div class="col_4">
- <h4>Tabs.center</h4>
- <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>
- </div>
-
- <!-- TABS RIGHT -->
- <div class="col_4">
- <h4>Tabs.right</h4>
- <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>
- </div>
- </div>
-
- <div id="tabs-left" class="tab-content">
-<pre>
-<!-- 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></pre>
- </div>
-
- <div id="tabs-center" class="tab-content">
-<pre>
-<!-- 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></pre>
- </div>
-
- <div id="tabs-right" class="tab-content">
-<pre>
-<!-- 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></pre>
- </div>
-
-<!-- =====================================
- BREADCRUMBS
-===================================== -->
-<h3 id="breadcrumbs">Breadcrumbs</h3>
-<ul class="tabs">
-<li><a href="#bread-example">Example</a></li>
-<li><a href="#bread">Breadcrumbs</a></li>
-<li><a href="#bread-alt1">Breadcrumbs.alt1</a></li>
-</ul>
-
- <div id="bread-example" class="tab-content">
- <div class="col_6">
- <h4>Breadcrumbs</h4>
- <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>
- </div>
-
- <div class="col_6">
- <h4>Breadcrumbs.alt1</h4>
- <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>
- </div>
- </div>
-
- <div id="bread" class="tab-content">
-<pre>
-<!-- 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></pre>
- </div>
-
- <div id="bread-alt1" class="tab-content">
-<pre>
-<!-- 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></pre>
- </div>
-
-<!-- =====================================
- GRIDS/COLUMNS
-===================================== -->
-<style type="text/css">
-#grids-example [class*="col_"]{
-padding:10px;
-}
-</style>
-
-<h3 id="columns">Grids/Columns</h3>
-<ul class="tabs">
-<li><a href="#grids-example">Example</a></li>
-<li><a href="#grids-html">HTML</a></li>
-</ul>
-
- <div id="grids-example" class="tab-content">
- <h4>Responsive & Flexible Grid</h4>
- <p>Responsive functionality is optional. Only use <code>.grid</code> & <code>.grid.flex</code> if you
- want a responsive grid. Resize your browser to see it in action.</p>
- <div class="col_4"><p>Responsive Grid:<br /><code><div class="grid"></code></p></div>
- <div class="col_4"><p>Flexible Responsive Grid:<br /><code><div class="grid flex"></code></p></div>
- <div class="col_4"><p>Grid Helper Classes:<br />
- <code>.show-desktop</code>
- <code>.hide-desktop</code>
- <code>.show-tablet</code>
- <code>.hide-tablet</code>
- <code>.show-phone</code>
- <code>.hide-phone</code>
- </p></div>
- <div class="col_12">All columns automatically have the class <code>.column</code>. Apply padding and borders directly to columns
- <br /><code>.column{border:1px solid red;padding:10px;}</code> </div>
- <div class="clear"></div>
-
- <div class="col_12 visible">col_12</div>
- <div class="col_1 visible">col_1</div><div class="col_11 visible">col_11</div>
- <div class="col_2 visible">col_2</div><div class="col_10 visible">col_10</div>
- <div class="col_3 visible">col_3</div><div class="col_9 visible">col_9</div>
- <div class="col_4 visible">col_4</div><div class="col_8 visible">col_8</div>
- <div class="col_5 visible">col_5</div><div class="col_7 visible">col_7</div>
- <div class="col_6 visible">col_6</div><div class="col_6 visible">col_6</div>
- <div class="col_7 visible">col_7</div><div class="col_5 visible">col_5</div>
- <div class="col_8 visible">col_8</div><div class="col_4 visible">col_4</div>
- <div class="col_9 visible">col_9</div><div class="col_3 visible">col_3</div>
- <div class="col_10 visible">col_10</div><div class="col_2 visible">col_2</div>
- <div class="col_11 visible">col_11</div><div class="col_1 visible">col_1</div>
- <div class="col_12 visible">col_12</div>
-
- <!-- FOURTHS -->
- <div class="col_3 visible">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 visible">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 visible">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 visible">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 visible">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 visible">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 visible">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 visible">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 visible">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>
-
- <div id="grids-html" class="tab-content">
-<pre>
-<!-- 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></pre>
- </div>
-
-<!-- =====================================
- IMAGES
-===================================== -->
-<h3 id="images">Images</h3>
-<ul class="tabs">
-<li><a href="#images-example">Example</a></li>
-<li><a href="#images-caption">.caption</a></li>
-<li><a href="#images-gallery">DIV.gallery</a></li>
-<li><a href="#images-left">.align-left</a></li>
-<li><a href="#images-right">.align-right</a></li>
-<li><a href="#images-full-width">.full-width</a></li>
-</ul>
-
- <div id="images-example" class="tab-content">
- <div class="col_6">
- <h4>IMG.caption</h4>
- <img class="caption" title="This is the image caption" src="http://placehold.it/400x350/4D99E0/ffffff.png&text=400x350" width="400" height="350" />
- </div>
-
- <div class="col_6 gallery">
- <h4>DIV.gallery</h4>
- <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>
-
- <div class="clear"> </div>
-
- <div class="col_4">
- <h4>IMG.align-left</h4>
- <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>
- </div>
-
- <div class="col_4">
- <h4>IMG.align-right</h4>
- <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>
- </div>
-
- <div class="col_4">
- <h4>IMG.full-width</h4>
- <img class="full-width" src="http://placehold.it/260x200/4D99E0/ffffff.png&text=full+width" />
- </div>
- </div>
-
- <div id="images-caption" class="tab-content">
-<pre>
-<!-- Caption -->
-<img class="caption" title="This is the image caption" src="http://placehold.it/400x350/4D99E0/ffffff.png&text=400x350" width="400" height="350" /></pre>
- </div>
-
- <div id="images-left" class="tab-content">
-<pre>
-<!-- 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></pre>
- </div>
-
- <div id="images-right" class="tab-content">
-<pre>
-<!-- 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></pre>
- </div>
-
- <div id="images-full-width" class="tab-content">
-<pre>
-<!-- Full Width -->
-<img class="full-width" src="http://placehold.it/260x200/4D99E0/ffffff.png&text=full+width" /></pre>
- </div>
-
- <div id="images-gallery" class="tab-content">
-<pre>
-<!-- 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></pre>
- </div>
-
-<!-- =====================================
- SLIDESHOW
-===================================== -->
-<h3 id="slideshow">Slideshow</h3>
-<ul class="tabs">
-<li><a href="#slideshow-example">Example</a></li>
-<li><a href="#slideshow-html">HTML</a></li>
-</ul>
-
- <div id="slideshow-example" class="tab-content">
- <p>Fully responsive slideshow. Touch enabled. Uses the awesome & highly configurable <a href="http://bxslider.com/">BXSlider</a>.</p>
- <div class="col_8">
- <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>
- </ul>
- </div>
-
- <div class="col_4">
- <h4>Features</h4>
- <ul class="icons">
- <li><i class="fa fa-check"></i> Slide Any HTML Content</li>
- <li><i class="fa fa-check"></i> Responsive</li>
- <li><i class="fa fa-check"></i> Touch Enabled</li>
- <li><i class="fa fa-check"></i> Iframes</li>
- <li><i class="fa fa-check"></i> Videos</li>
- <li><i class="fa fa-check"></i> Images</li>
- <li><i class="fa fa-check"></i> Lightweight</li>
- <li><i class="fa fa-check"></i> Multiple Slideshows</li>
- <li><i class="fa fa-check"></i> Zero Setup Required</li>
- <li><i class="fa fa-check"></i> Unordered List (default)</li>
- </ul>
- </div>
- </div>
-
- <div id="slideshow-html" class="tab-content">
-<pre>
-<!-- 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></pre>
- </div>
-
-
-<!-- =====================================
- FORMS
-===================================== -->
-<h3 id="forms">Forms</h3>
-<ul class="tabs">
-<li><a href="#form-example">Example</a></li>
-<li><a href="#form-textfield">Textfield</a></li>
-<li><a href="#form-select">Select</a></li>
-<li><a href="#form-checkbox">Checkbox</a></li>
-<li><a href="#form-radio">Radio</a></li>
-<li><a href="#form-fieldset">Fieldset</a></li>
-<li><a href="#form-textarea">Textarea</a></li>
-<li><a href="#form-notices">Notices</a></li>
-</ul>
-
- <div id="form-example" class="tab-content">
- <h4>Form.vertical</h4>
- <form class="vertical"><div class="col_4">
- <label for="text1">Text Field</label>
- <input id="text1" type="text" />
-
- <label for="text2">Placeholder</label>
- <input id="text2" type="text" placeholder="Placeholder Text" />
-
- <label for="text3" class="disabled">Disabled Field</label>
- <input id="text3" type="text" disabled="disabled" />
-
- <label for="text4">Label with Right Hint <span class="right">A-Z, 0-9</span></label>
- <input id="text4" type="text" />
-
- <label for="text5">Label with Hint <span>A-Z, 0-9</span></label>
- <input id="text5" type="text" />
-
- <label for="text6" class="error">Text Field (Error)</label>
- <input id="text6" class="error" type="text" />
- </div>
-
- <div class="col_4">
- <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>
-
- <label for="select3">Select multiple</label>
- <select id="select3" multiple="multiple" class="fancy">
- <option value="0">-- Choose --</option>
- <option value="1">Option 1</option>
- <option value="2">Option 2</option>
- <option value="3">Option 3</option>
- </select>
-
- <fieldset>
- <legend>Checkboxes</legend>
- <input type="checkbox" id="check1" /> <label for="check1" class="inline">Checkbox Field</label><br />
- <input type="checkbox" id="check2" /> <label for="check2" class="inline">Checkbox Field</label><br />
- <input type="checkbox" id="check3" /> <label for="check3" class="inline">Checkbox Field</label>
- </fieldset>
-
- <fieldset>
- <legend>Radios</legend>
- <input type="radio" name="radio" id="radio1" /> <label for="radio1" class="inline">Option1</label><br />
- <input type="radio" name="radio" id="radio2" /> <label for="radio2" class="inline">Option1</label><br />
- <input type="radio" name="radio" id="radio3" /> <label for="radio3" class="inline">Option1</label>
- </fieldset>
-
- <label for="file1">File Field</label>
- <input id="file1" type="file" />
- </div>
-
- <div class="col_4">
- <div class="notice error"><i class="fa fa-remove fa-large"></i> This is an Error Notice
- <a href="#close" class="fa fa-remove"></a></div>
- <div class="notice warning"><i class="fa fa-warning fa-large"></i> This is a Warning Notice
- <a href="#close" class="fa fa-remove"></a></div>
- <div class="notice success"><i class="fa fa-check fa-large"></i> This is a Success Notice
- <a href="#close" class="fa fa-remove"></a></div>
-
- <label for="textarea1">TextArea</label>
- <textarea id="textarea1" placeholder="Placeholder Text"></textarea>
-
- <button type="submit">Submit</button>
- </div>
- </form>
- <hr />
-
- <div class="col_12">
- <h4>Inline Form Fields (default)</h4>
- <form>
- <label for="text21">Label</label>
- <input type="text" name="text21" placeholder="Username" />
- <input type="text" name="text22" placeholder="Password "/>
- <select id="select22" class="fancy">
- <option value="0">-- Choose --</option>
- <option value="1">Option 1</option>
- <option value="2">Option 2</option>
- <option value="3">Option 3</option>
- </select>
-
- <button type="button" class="small green">Button</button>
- <input type="checkbox" name="check23" id="check23" /> <label for="check23">Checkbox Label</label>
- </form>
- </div>
- <hr />
-
- <style type="text/css">
- #form-sizes label{border:1px dotted #ccc;}
- </style>
-
- <div id="form-sizes" class="col_12">
- <h4>Input/Label Sizes</h4>
- <!--label class="col_12">label.col_12</label-->
- <!--input type="text" placeholder=".col_1" class="col_1" /><label class="col_11">label.col_11</label-->
- <input type="text" placeholder=".col_2" class="col_2" /><label class="col_10">label.col_10</label>
- <input type="text" placeholder=".col_3" class="col_3" /><label class="col_9">label.col_9</label>
- <input type="text" placeholder=".col_4" class="col_4" /><label class="col_8">label.col_8</label>
- <input type="text" placeholder=".col_5" class="col_5" /><label class="col_7">label.col_7</label>
- <input type="text" placeholder=".col_6" class="col_6" /><label class="col_6">label.col_6</label>
- <input type="text" placeholder=".col_7" class="col_7" /><label class="col_5">label.col_5</label>
- <input type="text" placeholder=".col_8" class="col_8" /><label class="col_4">label.col_4</label>
- <input type="text" placeholder=".col_9" class="col_9" /><label class="col_3">label.col_3</label>
- <input type="text" placeholder=".col_10" class="col_10" /><label class="col_2">label.col_2</label>
- <!--input type="text" placeholder=".col_11" class="col_11" /><label class="col_1">label.col_1</label-->
- <!--input type="text" placeholder=".col_12" class="col_12" /-->
- </div>
- </div>
-
- <div id="form-textfield" class="tab-content">
-<pre>
-<!-- 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" /></pre>
- </div>
-
- <div id="form-select" class="tab-content">
-<pre>
-<!-- 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></pre>
- </div>
-
- <div id="form-checkbox" class="tab-content">
-<pre>
-<!-- Checkbox -->
-<input type="checkbox" id="check1" />
-<label for="check1" class="inline">Checkbox Field</label></pre>
- </div>
-
- <div id="form-radio" class="tab-content">
-<pre>
-<!-- Radio -->
-<input type="radio" name="radio" id="radio1" />
-<label for="radio1" class="inline">Option1</label></pre>
- </div>
-
- <div id="form-fieldset" class="tab-content">
-<pre>
-<!-- Fieldset -->
-<fieldset>
-<legend>Checkboxes</legend>
- <!-- Form Fields Here -->
-</fieldset></pre>
- </div>
-
- <div id="form-textarea" class="tab-content">
-<pre>
-<!-- Textarea -->
-<textarea id="textarea1" placeholder="Placeholder Text"></textarea></pre>
- </div>
-
- <div id="form-notices" class="tab-content">
-<pre>
-<!-- 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></pre>
- </div>
-
-<!-- =====================================
- Extras/Helpers
-===================================== -->
-<h3 id="forms">Extras/Helpers</h3>
- <ul class="tabs">
- <li><a href="#extras">Extras</a></li>
- </ul>
-
- <div id="extras" class="tab-content">
- <table><thead><tr>
- <th>Item</th>
- <th>Description</th>
- </tr><tr>
- <td><code>.left</code> <code>.center</code> <code>.right</code></td>
- <td>Align Text</td>
- </tr><tr>
- <td><code>a.lightbox</code></td>
- <td>Open Link in lightbox. Auto Detects, iframe, inline content, etc.</td>
- </tr>
- <tr>
- <td><code>.clear</code></td>
- <td>Add this class to a div or other element to clear floats.</td>
- </tr><tr>
- <td><code>.clearfix</code></td>
- <td>Add this class to containers that have floating children inside to clear inner floats.</td>
- </tr><tr>
- <td><code>li.first</code> <code>li.last</code></td>
- <td>First and Last <code><li></li></code> items automatically get classes <code>.first</code> and <code>.last</code> respectively.</td>
- </tr><tr>
- <td><code>.column</code></td>
- <td>All columns have the class <code>.column</code> added to them automatically for easy global styling.</td>
- </tr><tr>
- <td><code>.visible</code></td>
- <td>Add this to columns to view during production. Adds light grey background color to columns.</td>
- </tr><tr>
- <td><code>.hide</code> <code>.show</code></td>
- <td><code>.hide</code> to hide content (display:none). <code>.show</code> to show content (display:block).</td>
- </tr><tr>
- <td><code>tr.first</code> <code>tr.last</code></td>
- <td>First and Last <code><tr></tr></code> items automatically get classes <code>.first</code> and <code>.last</code> respectively.</td>
- </tr><tr>
- <td><code>tr.alt</code></td>
- <td>Every second table row automatically gets class <code>.alt</code>.</td>
- </tr></thead></table>
- </div>
-
-
-</div><!--END GRID WRAP-->
-
-<div class="callout clearfix">
- <div class="grid">
- <a class="button red large" href="http://www.99lime.com/downloads/"><i class="fa fa-download-cloud"></i> Download (Github)</a>
- <span style="white-space: nowrap;">
- <a class="button blue large" href="https://twitter.com/htmlkickstart"><i class="fa fa-twitter"></i></a>
- <a class="button blue large" href="mailto:joshua@99lime.com"><i class="fa fa-envelope"></i></a></span><br />
- <p>Downloaded over 91036 Times :)</p>
- </div>
-</div>
-
-<!-- Begin MailChimp Signup Form -->
-<div class="grid center" id="mc_embed_signup">
-<form action="http://99lime.us4.list-manage2.com/subscribe/post?u=f4a8f36be8ffba6bf0580ef5f&id=67a4916516" method="post" id="mc-embedded-subscribe-form" name="mc-embedded-subscribe-form" class="validate" target="_blank">
-
-<div class="mc-field-group">
-<h4>99Lime Announcements and Releases.</h4>
-
-<input type="email" style="width:40%;" value="" placeholder="name@domain.com" name="EMAIL" class="required email" id="mce-EMAIL">
-<button class="button small orange" type="submit" value="Get Notified" name="subscribe" id="mc-embedded-subscribe">Get Notified</button>
-</div>
-<label for="mce-EMAIL"><span>No spam. We hate spam too.</span></label>
-<div id="mce-responses" class="clear">
-<div class="response" id="mce-error-response" style="display:none"></div>
-<div class="response" id="mce-success-response" style="display:none"></div>
-</div>
-</form>
-</div>
-
-<!--End mc_embed_signup-->
-
-<!-- ===================================== START FOOTER ===================================== -->
-<div class="clear"></div>
-<div id="footer">
-© Copyright 2014 All Rights Reserved. This website was built with
-<a href="http://www.99lime.com">HTML KickStart</a> •
-<a href="http://99lime.com/rss/">RSS</a> •
-<a href="http://www.99lime.com/_bak2/">Joshua Gatcke</a>
-</div>
-
-<script type="text/javascript">
-
- var _gaq = _gaq || [];
- _gaq.push(['_setAccount', 'UA-1641401-6']);
- _gaq.push(['_trackPageview']);
-
- (function() {
- var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
- ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
- var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
- })();
-
-</script>
-
-</body></html>
DELETED cgisetup/www/example.html
Index: cgisetup/www/example.html
==================================================================
--- cgisetup/www/example.html
+++ /dev/null
@@ -1,116 +0,0 @@
-<!DOCTYPE html>
-<html><head>
-<title>HTML KickStart Elements</title>
-<meta charset="UTF-8">
-<meta name="viewport" content="width=device-width, initial-scale=1.0"/>
-<meta name="description" content="" />
-<meta name="copyright" content="" />
-<link rel="stylesheet" type="text/css" href="css/kickstart.css" media="all" /> <!-- KICKSTART -->
-<link rel="stylesheet" type="text/css" href="style.css" media="all" /> <!-- CUSTOM STYLES -->
-<script type="text/javascript" src="https://ajax.googleapis.com/ajax/libs/jquery/1.9.1/jquery.min.js"></script>
-<script type="text/javascript" src="js/kickstart.js"></script> <!-- KICKSTART -->
-</head><body>
-
-<!-- Menu Horizontal -->
-<ul class="menu">
-<li class="current"><a href="">Item 1</a></li>
-<li><a href="">Item 2</a></li>
-<li><a href=""><span class="icon" data-icon="R"></span>Item 3</a>
- <ul>
- <li><a href=""><i class="fa fa-car"></i> Sub Item</a></li>
- <li><a href=""><i class="fa fa-arrow-circle-right"></i> Sub Item</a>
- <ul>
- <li><a href=""><i class="fa fa-comments"></i> Sub Item</a></li>
- <li><a href=""><i class="fa fa-check"></i> Sub Item</a></li>
- <li><a href=""><i class="fa fa-cutlery"></i> Sub Item</a></li>
- <li><a href=""><i class="fa fa-cube"></i> Sub Item</a></li>
- </ul>
- </li>
- <li class="divider"><a href=""><i class="fa fa-file"></i> li.divider</a></li>
- </ul>
-</li>
-<li><a href="">Item 4</a></li>
-</ul>
-
-<div class="grid">
-
-<!-- ===================================== END HEADER ===================================== -->
-
-<div class="col_12">
- <div class="col_9">
- <h3>Paragraphs</h3>
- <p><img class="align-left" src="http://placehold.it/180x150/4D99E0/ffffff.png&text=180x150" width="180" height="150" />
- Lorem ipsum dolor sit amet, consectetuer <em>adipiscing elit</em>, sed diam nonummy nibh euismod
- tincidunt ut laoreet dolore magna aliquam erat volutpat. Ut wisi enim ad minim veniam, quis
- nostrud exerci tation <strong>ullamcorper suscipit lobortis</strong> nisl ut aliquip ex ea commodo consequat.
- Duis autem vel eum iriure dolor in hendrerit in vulputate velit esse molestie consequat</p>
-
- <p>El illum dolore eu <span class="icon" data-icon="2"></span> 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 <code><h1>Sample Code</h1></code> option
- congue nihil imperdiet doming id quod mazim placerat facer possim assum.</p>
-
- <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, 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.</p>
- </div>
-
- <div class="col_3">
- <h5>Icon List</h5>
- <ul class="icons">
- <li><i class="fa fa-li fa-check"></i> Apple</li>
- <li><i class="fa fa-li fa-check"></i> Banana</li>
- <li><i class="fa fa-li fa-check"></i> Orange</li>
- <li><i class="fa fa-li fa-check"></i> Pear</li>
- </ul>
-
- <h5>Sample Icons</h5>
- <i class="fa fa-twitter-square fa-3x"></i>
- <i class="fa fa-facebook-square fa-3x"></i>
- <i class="fa fa-linkedin-square fa-3x"></i>
- <i class="fa fa-github-square fa-3x"></i>
-
- <h5>Button w/Icon</h5>
- <a class="button orange small" href="#"><i class="fa fa-rss"></i> RSS</a>
- </div>
-
- <hr />
-
- <div class="col_3">
- <h4>Column</h4>
- <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</p>
- </div>
-
- <div class="col_3">
- <h4>Column</h4>
- <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</p>
- </div>
-
- <div class="col_3">
- <h4>Column</h4>
- <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</p>
- </div>
-
- <div class="col_3">
- <h4>Column</h4>
- <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</p>
- </div>
-</div>
-
-</div><!-- END GRID -->
-
-<!-- ===================================== START FOOTER ===================================== -->
-<div class="clear"></div>
-<div id="footer">
-© Copyright 2011–2012 All Rights Reserved. This website was built with <a href="http://www.99lime.com">HTML KickStart</a>
-</div>
-
-</body></html>
DELETED cgisetup/www/index.html
Index: cgisetup/www/index.html
==================================================================
--- cgisetup/www/index.html
+++ /dev/null
@@ -1,6 +0,0 @@
-<html>
-<head>blah</head>
-<body>
-Hello
-</body>
-
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('<li class="menu-toggle"><a href="#"><span class="icon" data-icon="Y"></span> Menu</a></li>');
-
- // find menu items with children.
- $(this).find('li').has('ul').addClass('has-menu')
- .find('a:first').append('<span class="arrow"> </span>');
- });
-
- $('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('<div class="caption">');
- $(this).parents('div.caption')
- .attr('class', 'img-wrap '+$(this).attr('class'));
- if($(this).attr('title')){
- $(this).parents('div.caption')
- .append('<span>'+$(this).attr('title')+'</span>');
- }
- });
-
- /*---------------------------------
- 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('<div class="hide"></div>');
- 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('<span class="arrow"></span>');
-
- // 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('<div class="clear"> </div>');
- $('[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("<div/>")[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('<p id="fancybox-error">The requested content cannot be loaded.<br />Please try again later.</p>'),
-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<a(b).length?"inline":"ajax"),d.type=f,d.href=c,d.title=e,d.autoDimensions&&("html"==d.type||"inline"==d.type||"ajax"==d.type?(d.width="auto",d.height="auto"):d.autoDimensions=!1),d.modal&&(d.overlayShow=!0,d.hideOnOverlayClick=!1,d.hideOnContentClick=!1,d.enableEscapeButton=
-!1,d.showCloseButton=!1),d.padding=parseInt(d.padding,10),d.margin=parseInt(d.margin,10),p.css("padding",d.padding+d.margin),a(".fancybox-inline-tmp").unbind("fancybox-cancel").bind("fancybox-change",function(){a(this).replaceWith(m.children())}),f){case "html":p.html(d.content);D();break;case "inline":if(!0===a(b).parent().is("#fancybox-content")){l=!1;break}a('<div class="fancybox-inline-tmp" />').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("<img />").attr({id:"fancybox-img",src:n.src,alt:d.title}).appendTo(p);N()};n.src=c;break;case "swf":d.scrolling="no";g='<object classid="clsid:D27CDB6E-AE6D-11cf-96B8-444553540000" width="'+d.width+'" height="'+d.height+'"><param name="movie" value="'+c+'"></param>';
-k="";a.each(d.swf,function(a,b){g+='<param name="'+a+'" value="'+b+'"></param>';k+=" "+a+'="'+b+'"'});g+='<embed src="'+c+'" type="application/x-shockwave-flash" width="'+d.width+'" height="'+d.height+'"'+k+"></embed></object>";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<a.status&&M()},success:function(a,b,f){if(200==("object"==typeof f?f:E).status){if("function"==typeof d.ajax.win){j=
-d.ajax.win(c,a,b,f);if(!1===j){u.hide();return}if("string"==typeof j||"object"==typeof j)a=j}p.html(a);D()}}}));break;case "iframe":N()}else M()}},D=function(){var b=d.width,c=d.height,b=-1<b.toString().indexOf("%")?parseInt((a(window).width()-2*d.margin)*parseFloat(b)/100,10)+"px":"auto"==b?"auto":b+"px",c=-1<c.toString().indexOf("%")?parseInt((a(window).height()-2*d.margin)*parseFloat(c)/100,10)+"px":"auto"==c?"auto":c+"px";p.wrapInner('<div style="width:'+b+";height:"+c+";overflow: "+("auto"==
-d.scrolling?"auto":"yes"==d.scrolling?"scroll":"hidden")+';position:relative;"></div>');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=-1<c.width.toString().indexOf("%")?parseInt(b[0]*parseFloat(c.width)/100,10):c.width+n;f.height=-1<c.height.toString().indexOf("%")?parseInt(b[1]*
-parseFloat(c.height)/100,10):c.height+n;if(F&&(f.width>b[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?'<table id="fancybox-title-float-wrap" cellpadding="0" cellspacing="0"><tr><td id="fancybox-title-float-left"></td><td id="fancybox-title-float-main">'+w+'</td><td id="fancybox-title-float-right"></td></tr></table>':'<div id="fancybox-title-'+c.titlePosition+'">'+w+"</div>":!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<x&&j.show(),m.css({width:g.width-2*c.padding,height:d.autoDimensions?"auto":g.height-x-2*c.padding}).html(p.contents()),e.css(g).fadeIn("none"==c.transitionIn?0:c.speedIn,P)))}},P=function(){a.support.opacity||(m.get(0).style.removeAttribute("filter"),e.get(0).style.removeAttribute("filter"));d.autoDimensions&&
-m.css("height","auto");e.css("height","auto");w&&w.length&&j.show();c.showCloseButton&&C.show();(c.enableEscapeButton||c.enableKeyboardNav)&&a(document).bind("keydown.fb",function(b){if(27==b.keyCode&&c.enableEscapeButton)b.preventDefault(),a.fancybox.close();else if((37==b.keyCode||39==b.keyCode)&&c.enableKeyboardNav&&"INPUT"!==b.target.tagName&&"TEXTAREA"!==b.target.tagName&&"SELECT"!==b.target.tagName)b.preventDefault(),a.fancybox[37==b.keyCode?"prev":"next"]()});c.showNavArrows?((c.cyclic&&1<
-k.length||0!==r)&&y.show(),(c.cyclic&&1<k.length||r!=k.length-1)&&z.show()):(y.hide(),z.hide());c.hideOnContentClick&&m.bind("click",a.fancybox.close);c.hideOnOverlayClick&&v.bind("click",a.fancybox.close);a(window).bind("resize.fb",a.fancybox.resize);c.centerOnScroll&&a(window).bind("scroll.fb",a.fancybox.center);"iframe"==c.type&&a('<iframe id="fancybox-frame" name="fancybox-frame'+(new Date).getTime()+'" frameborder="0" hspace="0" '+(navigator.userAgent.match(/msie [6]/i)?'allowtransparency="true""':
-"")+' scrolling="'+d.scrolling+'" src="'+c.href+'"></iframe>').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));0<r&&(b=k[r-1].href,"undefined"!==typeof b&&b.match(H)&&(h=new Image,h.src=b))},Q=function(b){var a={width:parseInt(t.width+(g.width-t.width)*b,10),height:parseInt(t.height+(g.height-t.height)*b,10),top:parseInt(t.top+(g.top-t.top)*b,10),left:parseInt(t.left+(g.left-t.left)*b,
-10)};"undefined"!==typeof g.opacity&&(a.opacity=0.5>b?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;e<g;e++)"object"==typeof b[e]?a(b[e]).data("fancybox",a.extend({},d,b[e])):b[e]=
-a({}).data("fancybox",a.extend({content:b[e]},d));q=jQuery.merge(q,b)}else"object"==typeof b?a(b).data("fancybox",a.extend({},d,b)):b=a({}).data("fancybox",a.extend({content:b},d)),q.push(b);if(s>q.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<b&&b<k.length?(s=b,G()):c.cyclic&&1<k.length&&(s=b>=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('<div id="fancybox-tmp"></div>'),u=a('<div id="fancybox-loading"><div></div></div>'),
-v=a('<div id="fancybox-overlay"></div>'),e=a('<div id="fancybox-wrap"></div>')),B=a('<div id="fancybox-outer"></div>').append('<div class="fancybox-bg" id="fancybox-bg-n"></div><div class="fancybox-bg" id="fancybox-bg-ne"></div><div class="fancybox-bg" id="fancybox-bg-e"></div><div class="fancybox-bg" id="fancybox-bg-se"></div><div class="fancybox-bg" id="fancybox-bg-s"></div><div class="fancybox-bg" id="fancybox-bg-sw"></div><div class="fancybox-bg" id="fancybox-bg-w"></div><div class="fancybox-bg" id="fancybox-bg-nw"></div>').appendTo(e),
-B.append(m=a('<div id="fancybox-content"></div>'),C=a('<a id="fancybox-close"></a>'),j=a('<div id="fancybox-title"></div>'),y=a('<a href="javascript:;" id="fancybox-left"><span class="fancy-ico" id="fancybox-left-ico"></span></a>'),z=a('<a href="javascript:;" id="fancybox-right"><span class="fancy-ico" id="fancybox-right-ico"></span></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<c?"prev":"next"]()}),a.support.opacity||e.addClass("fancybox-ie"),K&&(u.addClass("fancybox-ie6"),e.addClass("fancybox-ie6"),a('<iframe id="fancybox-hide-sel-frame" src="'+(/^https/i.test(window.location.href||"")?"javascript:void(false)":"about:blank")+'" scrolling="no" border="0" frameborder="0" tabindex="-1"></iframe>').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=$('<div id="tiptip_holder" style="max-width:'+opts.maxWidth+';"></div>');var tiptip_content=$('<div id="tiptip_content"></div>');var tiptip_arrow=$('<div id="tiptip_arrow"></div>');$("body").append(tiptip_holder.html(tiptip_content).prepend(tiptip_arrow.html('<div id="tiptip_arrow_inner"></div>')))}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).scrollLeft());var left_compare=(tip_w+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*(i<K?-1:(i>K?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<x;z++){var o=c(A,z)?!a:z>=D&&z<D+y.s.length,t=(o?y.s:y.n)[u[o?0:1]].e;t.parent().append(t);if(o||!n.returns){l.push(t.get(0))}u[o?0:1]++}}return B.pushStack(l)}});function d(h){return h&&h.toLowerCase?h.toLowerCase():h}function c(j,m){for(var k=0,h=j.length;k<h;k++){if(j[k]==m){return !a}}return a}e.fn.TinySort=e.fn.Tinysort=e.fn.tsort=e.fn.tinysort})(jQuery);
-
-/*global jQuery */
-/*jshint multistr:true browser:true */
-/*!
-* FitVids 1.0
-*
-* Copyright 2011, Chris Coyier - http://css-tricks.com + Dave Rupert - http://daverupert.com
-* Credit to Thierry Koblentz - http://www.alistapart.com/articles/creating-intrinsic-ratios-for-video/
-* Released under the WTFPL license - http://sam.zoy.org/wtfpl/
-*
-* Date: Thu Sept 01 18:00:00 2011 -0500
-*/
-
-(function( $ ){
-
- "use strict";
-
- $.fn.fitVids = function( options ) {
- var settings = {
- customSelector: null
- };
-
- var div = document.createElement('div'),
- ref = document.getElementsByTagName('base')[0] || document.getElementsByTagName('script')[0];
-
- div.className = 'fit-vids-style';
- div.innerHTML = '­<style> \
- .fluid-width-video-wrapper { \
- width: 100%; \
- position: relative; \
- padding: 0; \
- } \
- \
- .fluid-width-video-wrapper iframe, \
- .fluid-width-video-wrapper object, \
- .fluid-width-video-wrapper embed { \
- position: absolute; \
- top: 0; \
- left: 0; \
- width: 100%; \
- height: 100%; \
- } \
- </style>';
-
- ref.parentNode.insertBefore(div,ref);
-
- if ( options ) {
- $.extend( settings, options );
- }
-
- return this.each(function(){
- var selectors = [
- "iframe[src*='player.vimeo.com']",
- "iframe[src*='www.youtube.com']",
- "iframe[src*='www.kickstarter.com']",
- "object",
- "embed"
- ];
-
- if (settings.customSelector) {
- selectors.push(settings.customSelector);
- }
-
- var $allVideos = $(this).find(selectors.join(','));
-
- $allVideos.each(function(){
- var $this = $(this);
- if (this.tagName.toLowerCase() === 'embed' && $this.parent('object').length || $this.parent('.fluid-width-video-wrapper').length) { return; }
- var height = ( this.tagName.toLowerCase() === 'object' || ($this.attr('height') && !isNaN(parseInt($this.attr('height'), 10))) ) ? parseInt($this.attr('height'), 10) : $this.height(),
- width = !isNaN(parseInt($this.attr('width'), 10)) ? parseInt($this.attr('width'), 10) : $this.width(),
- aspectRatio = height / width;
- if(!$this.attr('id')){
- var videoID = 'fitvid' + Math.floor(Math.random()*999999);
- $this.attr('id', videoID);
- }
- $this.wrap('<div class="fluid-width-video-wrapper"></div>').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.length<o.settings.minSlides&&(o.settings.minSlides=o.children.length),o.children.length<o.settings.maxSlides&&(o.settings.maxSlides=o.children.length),o.settings.randomStart&&(o.settings.startSlide=Math.floor(Math.random()*o.children.length)),o.active={index:o.settings.startSlide},o.carousel=o.settings.minSlides>1||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('<div class="bx-wrapper"><div class="bx-viewport"></div></div>'),o.viewport=r.parent(),o.loader=t('<div class="bx-loading" />'),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('<div class="bx-controls" />'),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.minThreshold)t=o.settings.minSlides;else 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+='<div class="bx-pager-item"><a href="" data-slide-index="'+i+'" class="bx-pager-link">'+n+"</a></div>"}o.pagerEl.html(e)},S=function(){o.settings.pagerCustom?o.pagerEl=t(o.settings.pagerCustom):(o.pagerEl=t('<div class="bx-pager" />'),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('<a class="bx-next" href="">'+o.settings.nextText+"</a>"),o.controls.prev=t('<a class="bx-prev" href="">'+o.settings.prevText+"</a>"),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('<div class="bx-controls-direction" />'),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('<div class="bx-controls-auto-item"><a class="bx-start" href="">'+o.settings.startText+"</a></div>"),o.controls.stop=t('<div class="bx-controls-auto-item"><a class="bx-stop" href="">'+o.settings.stopText+"</a></div>"),o.controls.autoEl=t('<div class="bx-controls-auto" />'),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('<div class="bx-caption"><span>'+e+"</span></div>")})},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;c<i;++c){var j=f[c];if(/\\[bdsw]/i.test(j))a.push(j);else{var j=m(j),d;c+2<i&&"-"===f[c+1]?(d=m(f[c+2]),c+=2):d=j;b.push([j,d]);d<65||j>122||(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;c<b.length;++c)i=b[c],i[0]<=j[1]+1?j[1]=Math.max(j[1],i[1]):f.push(j=i);b=["["];o&&b.push("^");b.push.apply(b,a);for(c=0;c<
-f.length;++c)i=f[c],b.push(e(i[0])),i[1]>i[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<b;++c){var j=f[c];j==="("?++i:"\\"===j.charAt(0)&&(j=+j.substring(1))&&j<=i&&(d[j]=-1)}for(c=1;c<d.length;++c)-1===d[c]&&(d[c]=++t);for(i=c=0;c<b;++c)j=f[c],j==="("?(++i,d[i]===void 0&&(f[c]="(?:")):"\\"===j.charAt(0)&&
-(j=+j.substring(1))&&j<=i&&(f[c]="\\"+d[i]);for(i=c=0;c<b;++c)"^"===f[c]&&"^"!==f[c+1]&&(f[c]="");if(a.ignoreCase&&s)for(c=0;c<b;++c)j=f[c],a=j.charAt(0),j.length>=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<d;++p){var g=a[p];if(g.ignoreCase)l=!0;else if(/[a-z]/i.test(g.source.replace(/\\u[\da-f]{4}|\\x[\da-f]{2}|\\[^UXux]/gi,""))){s=!0;l=!1;break}}for(var r=
-{b:8,t:9,n:10,v:11,f:12,r:13},n=[],p=0,d=a.length;p<d;++p){g=a[p];if(g.global||g.multiline)throw Error(""+g);n.push("(?:"+y(g)+")")}return RegExp(n.join("|"),l?"gi":"g")}function M(a){function m(a){switch(a.nodeType){case 1:if(e.test(a.className))break;for(var g=a.firstChild;g;g=g.nextSibling)m(g);g=a.nodeName;if("BR"===g||"LI"===g)h[s]="\n",t[s<<1]=y++,t[s++<<1|1]=a;break;case 3:case 4:g=a.nodeValue,g.length&&(g=p?g.replace(/\r\n?/g,"\n"):g.replace(/[\t\n\r ]+/g," "),h[s]=g,t[s<<1]=y,y+=g.length,
-t[s++<<1|1]=a)}}var e=/(?:^|\s)nocode(?:\s|$)/,h=[],y=0,t=[],s=0,l;a.currentStyle?l=a.currentStyle.whiteSpace:window.getComputedStyle&&(l=document.defaultView.getComputedStyle(a,q).getPropertyValue("white-space"));var p=l&&"pre"===l.substring(0,3);m(a);return{a:h.join("").replace(/\n$/,""),c:t}}function B(a,m,e,h){m&&(a={a:m,d:a},e(a),h.push.apply(h,a.e))}function x(a,m){function e(a){for(var l=a.d,p=[l,"pln"],d=0,g=a.a.match(y)||[],r={},n=0,z=g.length;n<z;++n){var f=g[n],b=r[f],o=void 0,c;if(typeof b===
-"string")c=!1;else{var i=h[f.charAt(0)];if(i)o=f.match(i[1]),b=i[0];else{for(c=0;c<t;++c)if(i=m[c],o=f.match(i[1])){b=i[0];break}o||(b="pln")}if((c=b.length>=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<g;++d){var r=e[d],n=r[3];if(n)for(var k=n.length;--k>=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<d.length;++g)e(d[g]);m===(m|0)&&d[0].setAttribute("value",
-m);var r=s.createElement("OL");r.className="linenums";for(var n=Math.max(0,m-1|0)||0,g=0,z=d.length;g<z;++g)l=d[g],l.className="L"+(g+n)%10,l.firstChild||l.appendChild(s.createTextNode("\xa0")),r.appendChild(l);a.appendChild(r)}function k(a,m){for(var e=m.length;--e>=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*</.test(m)?"default-markup":"default-code";return A[a]}function E(a){var m=
-a.g;try{var e=M(a.h),h=e.a;a.a=h;a.c=e.c;a.d=0;C(m,h)(a);var k=/\bMSIE\b/.test(navigator.userAgent),m=/\n/g,t=a.a,s=t.length,e=0,l=a.c,p=l.length,h=0,d=a.e,g=d.length,a=0;d[g]=s;var r,n;for(n=r=0;n<g;)d[n]!==d[n+2]?(d[r++]=d[n++],d[r++]=d[n++]):n+=2;g=r;for(n=r=0;n<g;){for(var z=d[n],f=d[n+1],b=n+2;b+2<=g&&d[b+1]===f;)b+=2;d[r++]=z;d[r++]=f;n=b}for(d.length=r;h<p;){var o=l[h+2]||s,c=d[a+2]||s,b=Math.min(o,c),i=l[h+1],j;if(i.nodeType!==1&&(j=t.substring(e,b))){k&&(j=j.replace(m,"\r"));i.nodeValue=
-j;var u=i.ownerDocument,v=u.createElement("SPAN");v.className=d[a+1];var x=i.parentNode;x.replaceChild(v,i);v.appendChild(i);e<o&&(l[h+1]=i=u.createTextNode(t.substring(b,o)),x.insertBefore(i,v.nextSibling))}e=b;e>=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",/^[^<?]+/],["dec",/^<!\w[^>]*(?:>|$)/],["com",/^<\!--[\S\s]*?(?:--\>|$)/],["lang-",/^<\?([\S\s]+?)(?:\?>|$)/],["lang-",/^<%([\S\s]+?)(?:%>|$)/],["pun",/^(?:<[%?]|[%?]>)/],["lang-",/^<xmp\b[^>]*>([\S\s]+?)<\/xmp\b[^>]*>/i],["lang-js",/^<script\b[^>]*>([\S\s]*?)(<\/script\b[^>]*>)/i],["lang-css",/^<style\b[^>]*>([\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<h.length&&l.now()<e;p++){var n=h[p],k=n.className;if(k.indexOf("prettyprint")>=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))}}p<h.length?setTimeout(m,
-250):a&&a()}for(var e=[document.getElementsByTagName("pre"),document.getElementsByTagName("code"),document.getElementsByTagName("xmp")],h=[],k=0;k<e.length;++k)for(var t=0,s=e[k].length;t<s;++t)h.push(e[k][t]);var e=q,l=Date;l.now||(l={now:function(){return+new Date}});var p=0,d,g=/\blang(?:uage)?-([\w.]+)(?!\S)/;m()};window.PR={createSimpleLexer:x,registerLangHandler:k,sourceDecorator:u,PR_ATTRIB_NAME:"atn",PR_ATTRIB_VALUE:"atv",PR_COMMENT:"com",PR_DECLARATION:"dec",PR_KEYWORD:"kwd",PR_LITERAL:"lit",
-PR_NOCODE:"nocode",PR_PLAIN:"pln",PR_PUNCTUATION:"pun",PR_SOURCE:"src",PR_STRING:"str",PR_TAG:"tag",PR_TYPE:"typ"}})();
-
-/*
- HTML5 Shiv v3.6.2pre | @afarkas @jdalton @jon_neal @rem | MIT/GPL2 Licensed
- Uncompressed source: https://github.com/aFarkas/html5shiv
-*/
-(function(l,f){function m(){var a=e.elements;return"string"==typeof a?a.split(" "):a}function i(a){var b=n[a[o]];b||(b={},h++,a[o]=h,n[h]=b);return b}function p(a,b,c){b||(b=f);if(g)return b.createElement(a);c||(c=i(b));b=c.cache[a]?c.cache[a].cloneNode():r.test(a)?(c.cache[a]=c.createElem(a)).cloneNode():c.createElem(a);return b.canHaveChildren&&!s.test(a)?c.frag.appendChild(b):b}function t(a,b){if(!b.cache)b.cache={},b.createElem=a.createElement,b.createFrag=a.createDocumentFragment,b.frag=b.createFrag();
-a.createElement=function(c){return!e.shivMethods?b.createElem(c):p(c,a,b)};a.createDocumentFragment=Function("h,f","return function(){var n=f.cloneNode(),c=n.createElement;h.shivMethods&&("+m().join().replace(/\w+/g,function(a){b.createElem(a);b.frag.createElement(a);return'c("'+a+'")'})+");return n}")(e,b.frag)}function q(a){a||(a=f);var b=i(a);if(e.shivCSS&&!j&&!b.hasCSS){var c,d=a;c=d.createElement("p");d=d.getElementsByTagName("head")[0]||d.documentElement;c.innerHTML="x<style>article,aside,figcaption,figure,footer,header,hgroup,main,nav,section{display:block}mark{background:#FF0;color:#000}</style>";
-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="<xyz></xyz>";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<h;d++)c.createElement(e[d]);return c}};l.html5=e;q(f)})(this,document);
DELETED cgisetup/www/license.txt
Index: cgisetup/www/license.txt
==================================================================
--- cgisetup/www/license.txt
+++ /dev/null
@@ -1,7 +0,0 @@
-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/style.css
Index: cgisetup/www/style.css
==================================================================
--- cgisetup/www/style.css
+++ /dev/null
@@ -1,155 +0,0 @@
-/*
- 99Lime.com HTML KickStart by Joshua Gatcke
- style.css
-
-*/
-
-/*---------------------------------
- IMPORTS
------------------------------------*/
-@import url(https://fonts.googleapis.com/css?family=Arimo:400,700);
-
-/*---------------------------------
- OVERRIDES
------------------------------------*/
-h1,h2,h3,h4,h5,h6{
-font-family: "Arimo", arial, verdana, sans-serif;
-font-weight:normal;
-}
-
-thead th,
-tbody th{
-font-family: "Arimo", arial, verdana, sans-serif;
-}
-
-button,
-a.btn,
-input[type="submit"],
-input[type="reset"],
-input[type="button"]{
-font-family: "Arimo", arial, verdana, sans-serif;
-}
-
-.menu{
-font-family: "Arimo", arial, verdana, sans-serif;
-}
-
-blockquote{
-font-family: "Arimo", arial, verdana, sans-serif;
-}
-
-/*---------------------------------
- LAYOUT
------------------------------------*/
-body{
-margin:0;
-padding:0 0 0 0;
-color:#000;
-background:#efefef url(css/img/gray_jean.png);
-font:normal 0.9em/150% 'Arimo', arial, verdana, sans-serif;
-text-shadow: 0 0 1px transparent; /* google font pixelation fix */
-}
-
-#wrap{
-width:100%;
-background:#fff;
-margin:30px auto 30px auto;
-padding:0 2%;
-border:1px solid #ccc;
-}
-
-
-#footer{
-text-align:center;
-padding:20px;
-margin:0;
-border-top:1px solid #ddd;
-color:#999;
-font-size:0.8em;
-text-shadow:0px 1px 1px #fff;
-position: relative;
-top:0;
-left:0;
-background:#fff;
-}
-
- #link-top{
- display:none;
- }
-
-/* NAV BAR*/
-.navbar{
-position:fixed;
-top:0;
-left:0;
-width: 100%;
-background:#000;
-color:#fff;
-z-index:1000;
-}
-
- .navbar #logo{
- position:absolute;
- top:0;
- right:0;
- padding:0.5em 1em;
- font-size: 1.7em;
- color:#efefef;
- text-decoration:none;
- }
-
- .navbar span{
- color:#86dc00;
- }
-
-
- .navbar ul{
- display:inline-block;
- margin:0;
- padding:0;
- }
-
- .navbar li{
- margin:0;
- padding:0;
- list-style-type:0;
- display:inline-block;
- }
-
- .navbar li a{
- display:inline-block;
- color:#efefef;
- padding:1em 1.3em;
- text-decoration:none;
- text-transform: uppercase;
- line-height:100%;
- font-size: 1.2em;
- }
-
-.callout{
-background:#4598ef;/*#86dc00;*/
-padding:3em 0;
-color:#fff;
-box-shadow:inset 0 0 10px rgba(0,0,0,0.2);
-text-align: center;
-text-shadow:0px 1px 3px rgba(0,0,0,0.2);
-display:block;
-}
- .callout + div.grid{margin-top:50px;}
- a.callout{cursor:pointer;}
- .callout i.icon-4x{font-size:6em;}
- .callout h4{margin-bottom:30px;}
- .callout-top{margin:50px 0 0 0;}
- .callout p{margin-bottom:0;}
- .callout .button{margin-top:10px;}
- .callout.green{background:#19ad0b;/*#86dc00;*/}
-
-#mc_embed_signup{
-padding:30px 0;
-}
-
-#ui-preview{
-border:5px solid #ddd;
-margin:30px 0;
-display:block;
-}
Index: client.scm
==================================================================
--- client.scm
+++ client.scm
@@ -1,27 +1,30 @@
;; 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 <http://www.gnu.org/licenses/>.
;;======================================================================
;; 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))
@@ -36,24 +39,26 @@
(let ((sig (conc (get-host-name) " " (current-process-id))))
(set! *my-client-signature* sig)
*my-client-signature*)))
;; Not currently used! But, I think it *should* be used!!!
-(define (client:logout serverdat)
+#;(define (client:logout serverdat)
(let ((ok (and (socket? serverdat)
(cdb:logout serverdat *toppath* (client:get-signature)))))
ok))
-(define (client:connect iface port)
- (case (server:get-transport)
+#;(define (client:connect iface port)
+ (http-transport:client-connect iface port)
+ #;(case (server:get-transport)
((rpc) (rpc:client-connect iface port))
((http) (http:client-connect iface port))
((zmq) (zmq:client-connect iface port))
(else (rpc:client-connect iface port))))
(define (client:setup areapath #!key (remaining-tries 100) (failed-connects 0))
- (case (server:get-transport)
+ (client:setup-http areapath remaining-tries: remaining-tries failed-connects: failed-connects)
+ #;(case (server:get-transport)
((rpc) (rpc-transport:client-setup remaining-tries: remaining-tries failed-connects: failed-connects)) ;;(client:setup-rpc run-id))
((http)(client:setup-http areapath remaining-tries: remaining-tries failed-connects: failed-connects))
(else (rpc-transport:client-setup remaining-tries: remaining-tries failed-connects: failed-connects)))) ;; (client:setup-rpc run-id))))
;; Do all the connection work, look up the transport type and set up the
@@ -100,11 +105,11 @@
(let ((runremote (or area-dat *runremote*))) ;; it might have been generated only a few statements ago
(remote-conndat-set! runremote start-res) ;; (hash-table-set! runremote run-id start-res)
(debug:print-info 2 *default-log-port* "connected to " (http-transport:server-dat-make-url start-res))
start-res)
(begin ;; login failed but have a server record, clean out the record and try again
- (debug:print-info 0 *default-log-port* "client:setup, login failed, will attempt to start server ... start-res=" start-res ", server-dat=" server-dat) ;; had runid. Fixes part of Randy;s ticket 1405717332
+ (debug:print-info 0 *default-log-port* "client:setup, login unsuccessful, will attempt to start server ... start-res=" start-res ", server-dat=" server-dat) ;; had runid. Fixes part of Randy;s ticket 1405717332
(case *transport-type*
((http)(http-transport:close-connections)))
(remote-conndat-set! runremote #f) ;; (hash-table-delete! runremote run-id)
(thread-sleep! 1)
(client:setup-http areapath remaining-tries: (- remaining-tries 1))
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 <http://www.gnu.org/licenses/>.
+;;
+
+;; 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 (<procname> <args>) <body> )
+(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 (<procname> ... ) <body>)
+;; 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 <args>) <body>)
+ (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,40 @@
;;======================================================================
;; 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 <http://www.gnu.org/licenses/>.
+
;;======================================================================
-(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 udp ;; 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))
+(declare (uses commonmod))
+(import commonmod)
(include "common_records.scm")
+
;; (require-library margs)
;; (include "margs.scm")
;; (define old-exit exit)
@@ -31,14 +42,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 +74,22 @@
(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 +115,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 +130,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 +152,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 <host port>
;; (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 +172,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
@@ -149,17 +193,94 @@
(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*))
+
+(define *common:logpro-exit-code->status-sym-alist*
+ '( ( 0 . pass )
+ ( 1 . fail )
+ ( 2 . warn )
+ ( 3 . check )
+ ( 4 . waived )
+ ( 5 . abort )
+ ( 6 . skip )))
+
+(define (common:logpro-exit-code->status-sym exit-code)
+ (or (alist-ref exit-code *common:logpro-exit-code->status-sym-alist*) 'fail))
+
+(define (common:worse-status-sym ss1 ss2)
+ (let loop ((status-syms-remaining '(abort fail check skip warn waived pass)))
+ (cond
+ ((null? status-syms-remaining)
+ 'fail)
+ ((eq? (car status-syms-remaining) ss1)
+ ss1)
+ ((eq? (car status-syms-remaining) ss2)
+ ss2)
+ (else
+ (loop (cdr status-syms-remaining))))))
+
+(define (common:steps-can-proceed-given-status-sym status-sym)
+ (if (member status-sym '(warn waived pass))
+ #t
+ #f))
+
+(define (status-sym->string status-sym)
+ (case status-sym
+ ((pass) "PASS")
+ ((fail) "FAIL")
+ ((warn) "WARN")
+ ((check) "CHECK")
+ ((waived) "WAIVED")
+ ((abort) "ABORT")
+ ((skip) "SKIP")
+ (else "FAIL")))
+
+(define (common:logpro-exit-code->test-status exit-code)
+ (status-sym->string (common:logpro-exit-code->status-sym exit-code)))
+
(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,82 +346,229 @@
(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))))
+
+
+(define (common:get-sync-lock-filepath)
+ (let* ((tmp-area (common:get-db-tmp-area))
+ (lockfile (conc tmp-area "/megatest.db.sync-lock")))
+ lockfile))
+
;; 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 <file> to <file>.mins if not exists
+ (if (not (file-exists? minsfile))
+ (copy+zip filepath minsfile))
+ ;; copy <file>.mins to <file>.hrs if not exists
+ (if (not (file-exists? hrsfile))
+ (copy minsfile hrsfile))
+ ;; copy <file>.hrs to <file>.days if not exists
+ (if (not (file-exists? daysfile))
+ (copy hrsfile daysfile))
+ ;; copy <file>.days to <file>.weeks if not exists
+ (if (not (file-exists? wksfile))
+ (copy daysfile wksfile))
+
+
+ ;; if age(<file>.mins.gz) >= 1h:
+ ;; copy <file>.mins.gz <file>.hrs.gz
+ ;; copy <prev file> <file>.mins.gz
+ (when (>= (age-mins minsfile) 1)
+ (copy minsfile hrsfile)
+ (copy+zip filepath minsfile))
+
+ ;; if age(<file>.hrs.gz) >= 1d:
+ ;; copy <file>.hrs.gz <file>.days.gz
+ ;; copy <file>.mins.gz <file>.hrs.gz
+ (when (>= (age-days hrsfile) 1)
+ (copy hrsfile daysfile)
+ (copy minsfile hrsfile))
+
+ ;; if age(<file>.days.gz) >= 1w:
+ ;; copy <file>.days.gz <file>.weeks.gz
+ ;; copy <file>.hrs.gz <file>.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.
;;
(define (common:rotate-logs)
- (if (not (directory-exists? "logs"))(create-directory "logs"))
- (directory-fold
- (lambda (file rem)
- (handle-exceptions
- exn
- (debug:print-info 0 *default-log-port* "failed to rotate log " file ", probably handled by another process.")
- (let* ((fullname (conc "logs/" file))
- (file-age (- (current-seconds)(file-modification-time fullname))))
- (if (or (and (string-match "^.*.log" file)
- (> (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)
- (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)))
- (if (> file-age (* (string->number (or (configf:lookup *configdat* "setup" "log-expire-days") "30")) 24 3600))
- (handle-exceptions
- exn
- #f
- (delete-file fullname)))))))
- '()
- "logs"))
-
+ (let* ((all-files (make-hash-table))
+ (stats (make-hash-table))
+ (inc-stat (lambda (key)
+ (hash-table-set! stats key (+ (hash-table-ref/default stats key 0) 1))))
+ (max-allowed (string->number (or (configf:lookup *configdat* "setup" "max-logfiles") "300")))) ;; name -> age
+ (if (not (directory-exists? "logs"))(create-directory "logs"))
+ (directory-fold
+ (lambda (file rem)
+ (handle-exceptions
+ exn
+ (begin
+ (debug:print-info 2 *default-log-port* "unable to rotate log " file ", probably handled by another process, this is safe to ignore.")
+ (debug:print 2 *default-log-port* " message: " ((condition-property-accessor 'exn 'message) exn))
+ ;; (print-call-chain (current-error-port)) ;;
+ )
+ (let* ((fullname (conc "logs/" file))
+ (mod-time (file-modification-time fullname))
+ (file-age (- (current-seconds) mod-time)))
+ (hash-table-set! all-files file mod-time)
+ (if (or (and (string-match "^.*.log" file)
+ (> (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 (common:file-exists? gzfile)
+ (begin
+ (debug:print-info 0 *default-log-port* "removing " gzfile)
+ (delete-file* gzfile)
+ (hash-table-delete! all-files gzfile) ;; needed?
+ ))
+ (debug:print-info 0 *default-log-port* "compressing " file)
+ (system (conc "gzip " fullname))
+ (inc-stat "gzipped")
+ (hash-table-set! all-files (conc file ".gz") file-age) ;; add the .gz file and remove the base file
+ (hash-table-delete! all-files file)
+ )
+ (if (> file-age (* (string->number (or (configf:lookup *configdat* "setup" "log-expire-days") "30")) 24 3600))
+ (handle-exceptions
+ exn
+ #f
+ (if (directory? fullname)
+ (begin
+ (debug:print-error 0 *default-log-port* fullname " in logs directory is a directory! Cannot rotate it, it is best to not put subdirectories in the logs dir.")
+ (inc-stat "directories"))
+ (begin
+ (delete-file* fullname)
+ (inc-stat "deleted")))
+ (hash-table-delete! all-files file)))))))
+ '()
+ "logs")
+ (for-each
+ (lambda (category)
+ (let ((quant (hash-table-ref/default stats category 0)))
+ (if (> quant 0)
+ (debug:print-info 0 *default-log-port* category " log files: " quant))))
+ `("deleted" "gzipped" "directories"))
+ (let ((num-logs (hash-table-size all-files)))
+ (if (> num-logs max-allowed) ;; because NFS => don't let number of logs exceed 300
+ (let ((files (take (sort (hash-table-keys all-files)
+ (lambda (a b)
+ (< (hash-table-ref all-files a)(hash-table-ref all-files b))))
+ (- num-logs max-allowed))))
+ (for-each
+ (lambda (file)
+ (let* ((fullname (conc "logs/" file)))
+ (if (directory? fullname)
+ (debug:print-error 0 *default-log-port* fullname " in logs directory is a directory! Cannot rotate it, it is best to not put subdirectories in the logs dir.")
+ (handle-exceptions
+ exn
+ (debug:print-error 0 *default-log-port* "failed to remove " fullname)
+ (delete-file* fullname)))))
+ files)
+ (debug:print-info 0 *default-log-port* "Deleted " (length files) " files from logs, keeping " max-allowed " files."))))))
+
;; 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"))
+ (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 +575,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 +589,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 +658,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)))
@@ -421,28 +692,31 @@
;; dot-locking egg seems not to work, using this for now
;; if lock is older than expire-time then remove it and try again
;; to get the lock
;;
(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 (> (- (current-seconds)(file-modification-time fname)) expire-time)
+ (let ((fmod-time (handle-exceptions
+ ext
+ (current-seconds)
+ (file-modification-time fname))))
+ (if (common:file-exists? fname)
+ (if (> (- (current-seconds) fmod-time) expire-time)
(begin
- (delete-file* fname)
+ (handle-exceptions exn #f (delete-file* fname))
(common:simple-file-lock fname expire-time: expire-time))
#f)
(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)
- (with-input-from-file fname
- (lambda ()
- (equal? key-string (read-line))))
+ (if (common:file-exists? fname)
+ (handle-exceptions exn
+ #f
+ (with-input-from-file fname
+ (lambda ()
+ (equal? key-string (read-line)))))
#f)))))
(define (common:simple-file-lock-and-wait fname #!key (expire-time 300))
(let ((end-time (+ expire-time (current-seconds))))
(let loop ((got-lock (common:simple-file-lock fname expire-time: expire-time)))
@@ -462,12 +736,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 +750,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
@@ -585,23 +884,54 @@
(configf:lookup *configdat* "setup" "testsuite" )
(getenv "MT_TESTSUITE_NAME")
(if (string? *toppath* )
(pathname-file *toppath*)
#f))) ;; (pathname-file (current-directory)))))
+
+;; safe getting of toppath
+(define (common:get-toppath areapath)
+ (or *toppath*
+ (if areapath
+ (begin
+ (set! *toppath* areapath)
+ (setenv "MT_RUN_AREA_HOME" areapath)
+ areapath)
+ #f)
+ (if (getenv "MT_RUN_AREA_HOME")
+ (begin
+ (set! *toppath* (getenv "MT_RUN_AREA_HOME"))
+ *toppath*)
+ #f)
+ ;; last resort, look for megatest.config
+ (let loop ((thepath (realpath ".")))
+ (if (file-exists? (conc thepath "/megatest.config"))
+ thepath
+ (if (equal? thepath "/")
+ (begin
+ (debug:print-error 0 *default-log-port* "Unable to find megatest home directory.")
+ #f)
+ (loop (pathname-directory thepath)))))
+ ))
(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 " *db-cache-path*)
+ (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 +948,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,105 +982,48 @@
(< 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.")
+ (let* ((syncer (or (configf:lookup *configdat* "server" "sync-method") "brute-force-sync")))
+ (cond
+ ((equal? syncer "brute-force-sync")
+ (server:writable-watchdog-bruteforce dbstruct))
+ ((equal? syncer "delta-sync")
+ (server:writable-watchdog-deltasync dbstruct))
+ (else
+ (debug:print-error 0 *default-log-port* "Unknown server/sync-method specified ("syncer") - valid values are brute-force-sync and delta-sync.")
+ (exit 1)))
+ ;;(debug:print 1 *default-log-port* "INFO: ["(common:human-time)"] Syncer started (method="syncer")")
+ )))
+ (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)
+ ;;(common:telemetry-log-close)
(on-exit (lambda () 0))
;;(debug:print-info 13 *default-log-port* "std-exit-procedure called; *time-to-exit*="*time-to-exit*)
(let ((no-hurry (if *time-to-exit* ;; hurry up
#f
(begin
@@ -776,14 +1040,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...")
@@ -803,18 +1068,29 @@
0)
(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 " 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 " exiting promptly")
+ (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 +1134,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 +1162,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)
@@ -924,11 +1202,23 @@
;;
(define (common:bash-glob instr)
(string-split
(with-input-from-pipe
(conc "/bin/bash -c \"echo " instr "\"")
- read-line)))
+ read-line)))
+
+;;======================================================================
+;; Some safety net stuff
+;;======================================================================
+
+;; return input if it is a list or return null
+(define (common:list-or-null inlst #!key (ovrd #f)(message #f))
+ (if (list? inlst)
+ inlst
+ (begin
+ (if message (debug:print-error 0 *default-log-port* message))
+ (or ovrd '()))))
;;======================================================================
;; T A R G E T S , S T A T E , S T A T U S ,
;; R U N N A M E A N D T E S T P A T T
;;======================================================================
@@ -965,21 +1255,31 @@
(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
+ ((or (args:get-arg "--modepatt") (args:get-arg "-modepatt")) ;; modepatt is a forced setting, when set it MUST refer to an existing PATT in the runconfig
+ (if rconf
+ (let* ((patts-from-mode-patt (runconfigs-get rconf testpatt-key)))
+ (debug:print-info 0 *default-log-port* "modepatt defined is: "testpatt-key" runconfigs values for " testpatt-key " " patts-from-mode-patt)
+ patts-from-mode-patt)
+ (begin
+ (debug:print-info 0 *default-log-port* " modepatt defined is: "testpatt-key" runconfigs values for " testpatt-key) ;; " " patts-from-mode-patt)
+ #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)
rtestpatt)
- (else args-testpatt))))
+ (else
+ (debug:print-info 0 *default-log-port* "using testpatt " args-testpatt " rtestpatt:" rtestpatt)
+ args-testpatt))))
(define (common:false-on-exception thunk #!key (message #f))
(handle-exceptions exn
@@ -986,44 +1286,65 @@
(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 *toppath*
- (conc *toppath* "/lt")
- (if (file-exists? "megatest.config") ;; we are in the toppath (new area, mtutils compatible)
- (conc (current-directory) "/lt")
- #f)))))
+ (if *configdat*
+ (configf:lookup *configdat* "setup" "linktree")
+ #f)
+ (if (or *toppath* (getenv "MT_RUN_AREA_HOME"))
+ (conc (or *toppath* (getenv "MT_RUN_AREA_HOME")) "/lt")
+ #f)
+ (let* ((tp (common:get-toppath #f))
+ (lt (conc tp "/lt")))
+ (if (not tp)(debug:print 0 *default-log-port* "WARNING: cannot calculate best path for linktree, using " lt))
+ lt)))
(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 +1362,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 +1402,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 +1438,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 +1472,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 +1629,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
;;======================================================================
@@ -1359,76 +1716,147 @@
;; (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 10))
+ (if *toppath*
+ (let* ((fullpath (conc *toppath* "/.sysdata/" 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)
+ (handle-exceptions
+ exn
+ (begin
+ (debug:print-info 1 *default-log-port* " removing bad file " fullpath)
+ (delete-file* fullpath)
+ #f)
+ (with-input-from-file fullpath read))
+ (begin
+ (debug:print-info 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)))
+ #f))
+
+(define (common:write-cached-info key dtype dat)
+ (if *toppath*
+ (let* ((fulldir (conc *toppath* "/.sysdata"))
+ (fullpath (conc fulldir "/" key "-" dtype ".log")))
+ (if (not (file-exists? fulldir))(create-directory fulldir #t))
+ (handle-exceptions
+ exn
+ #f
+ (with-output-to-file fullpath (lambda ()(pp dat)))))
+ #f))
+
;; 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))))))
+ (handle-exceptions
+ exn
+ '(99 99 99)
+ (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 +1863,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 +1884,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 +1913,150 @@
(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))
- (let* ((loadavg (common:get-cpu-load remote-host))
- (first (car loadavg))
- (next (cadr loadavg))
- (adjload (* maxload numcpus))
- (loadjmp (- first next)))
- (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)))
- ((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))))))
+ (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-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)))
+ (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: (+ 2592000 (random 3600))) ;; 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)
+ (if (> numcpu 0)
+ numcpu
+ #f) ;; if zero return #f so caller knows that things are not working
+ (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))))
+ (if (and (number? result)
+ (> result 0))
+ (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 #!optional (rem-tries 5))
(let ((num-cpus (common:get-num-cpus remote-host)))
- (common:wait-for-cpuload maxload num-cpus 15 msg: msg)))
+ (if num-cpus
+ (common:wait-for-cpuload maxload num-cpus 15 msg: msg remote-host: remote-host)
+ (begin
+ (thread-sleep! (random 60)) ;; we failed to get num cpus. wait a bit and try again
+ (if (> rem-tries 0)
+ (common:wait-for-normalized-load maxload msg remote-host (- rem-tries 1))
+ #f)))))
+
+;; DO NOT CALL THIS DIRECTLY. It is called from common:wait-for-normalized-load
+;;
+(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 to have zero. If we get 1, it's possible that we got the previous default, and we should check again
+ (common:get-num-cpus remote-host)
+ numcpus-in))
+ (maxload (if force-maxload
+ maxload-in
+ (if (number? maxload-in)
+ (max maxload-in 0.5)
+ 0.5))) ;; so maxload must be greater than 0.5 for now BUG - FIXME?
+ (first (car loadavg))
+ (next (cadr loadavg))
+ (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)) (abs (* (+ (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
+ ;; let's let the user know once in a long while that load checking is happening but not constantly report it
+ (if (> (random 100) 75) ;; about 25% of the time
+ (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* "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 " 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 (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))
@@ -1599,10 +2101,20 @@
(let ((res (read-line)))
(if (string? res)
(string->number res)))))
(get-unix-df path)))
+(define (get-free-inodes path)
+ (if (configf:lookup *configdat* "setup" "free-inodes-script")
+ (with-input-from-pipe
+ (conc (configf:lookup *configdat* "setup" "free-inodes-script") " " path)
+ (lambda ()
+ (let ((res (read-line)))
+ (if (string? res)
+ (string->number res)))))
+ (get-unix-inodes path)))
+
(define (get-unix-df path)
(let* ((df-results (process:cmd-run->list (conc "df " path)))
(space-rx (regexp "([0-9]+)\\s+([0-9]+)%"))
(freespc #f))
;; (write df-results)
@@ -1612,10 +2124,24 @@
(let ((newval (string->number (cadr match))))
(if (number? newval)
(set! freespc newval))))))
(car df-results))
freespc))
+
+(define (get-unix-inodes path)
+ (let* ((df-results (process:cmd-run->list (conc "df -i " path)))
+ (space-rx (regexp "([0-9]+)\\s+([0-9]+)%"))
+ (freenodes 0)) ;; 0 is a better failsafe than #f here.
+ ;; (write df-results)
+ (for-each (lambda (l)
+ (let ((match (string-search space-rx l)))
+ (if match
+ (let ((newval (string->number (cadr match))))
+ (if (number? newval)
+ (set! freenodes newval))))))
+ (car df-results))
+ freenodes))
(define (common:check-space-in-dir dirpath required)
(let* ((dbspace (if (directory? dirpath)
(get-df dirpath)
0)))
@@ -1627,12 +2153,13 @@
;; check space in dbdir and in megatest dir
;; returns: ok/not dbspace required-space
;;
(define (common:check-db-dir-space)
(let* ((required (string->number
+ ;; default is 1GB (or actually a billion bytes) This is the number of 1 kB blocks.
(or (configf:lookup *configdat* "setup" "dbdir-space-required")
- "100000")))
+ "1000000")))
(dbdir (common:get-db-tmp-area)) ;; (db:get-dbdir))
(tdbspace (common:check-space-in-dir dbdir required))
(mdbspace (common:check-space-in-dir *toppath* required)))
(sort (list tdbspace mdbspace) (lambda (a b)
(< (cadr a)(cadr b))))))
@@ -1651,12 +2178,16 @@
(exit 1)))))
;; paths is list of lists ((name path) ... )
;;
(define (common:get-disk-with-most-free-space disks minsize)
- (let ((best #f)
- (bestsize 0))
+ (let* ((best #f)
+ (bestsize 0)
+ (default-min-inodes-string "1000000")
+ (default-min-inodes (string->number default-min-inodes-string))
+ (min-inodes (or (string->number (if (configf:lookup *configdat* "setup" "min_inodes") (configf:lookup *configdat* "setup" "min_inodes") default-min-inodes-string)) default-min-inodes)))
+
(for-each
(lambda (disk-num)
(let* ((dirpath (cadr (assoc disk-num disks)))
(freespc (cond
((not (directory? dirpath))
@@ -1670,19 +2201,115 @@
((not (eq? (string-ref dirpath 0) #\/))
(if (common:low-noise-print 300 "disks not a proper path " disk-num)
(debug:print 0 *default-log-port* "WARNING: disk " disk-num " at path \"" dirpath "\" is not a fully qualified path - ignoring it."))
-1)
(else
- (get-df dirpath)))))
- (if (> freespc bestsize)
+ (get-df dirpath))))
+ (free-inodes (cond
+ ((not (directory? dirpath))
+ (if (common:low-noise-print 300 "disks not a dir " disk-num)
+ (debug:print 0 *default-log-port* "WARNING: disk " disk-num " at path \"" dirpath "\" is not a directory - ignoring it."))
+ -1)
+ ((not (file-write-access? dirpath))
+ (if (common:low-noise-print 300 "disks not writeable " disk-num)
+ (debug:print 0 *default-log-port* "WARNING: disk " disk-num " at path \"" dirpath "\" is not writeable - ignoring it."))
+ -1)
+ ((not (eq? (string-ref dirpath 0) #\/))
+ (if (common:low-noise-print 300 "disks not a proper path " disk-num)
+ (debug:print 0 *default-log-port* "WARNING: disk " disk-num " at path \"" dirpath "\" is not a fully qualified path - ignoring it."))
+ -1)
+ (else
+ (get-free-inodes dirpath))))
+ ;;(free-inodes (get-free-inodes dirpath))
+ )
+ (debug:print 2 *default-log-port* "INFO: disk " disk-num " path " dirpath " free space " freespc " free inodes " free-inodes)
+ (if (and (> freespc bestsize)(> free-inodes min-inodes ))
(begin
(set! best (cons disk-num dirpath))
- (set! bestsize freespc)))))
+ (set! bestsize freespc)))
+ ;;(print "Processing: " disk-num " bestsize: " bestsize " best: " best " freespc: " freespc " min-inodes: " min-inodes " free-inodes: " free-inodes)
+ ))
(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: "))
@@ -1694,11 +2321,11 @@
(define (save-environment-as-files fname #!key (ignorevars (list "USER" "HOME" "DISPLAY" "LS_COLORS" "XKEYSYMDB" "EDITOR" "MAKEFLAGS" "MAKEF" "MAKEOVERRIDES")))
;;(bb-check-path msg: "save-environment-as-files entry")
(let ((envvars (get-environment-variables))
- (whitesp (regexp "[^a-zA-Z0-9_\\-:,.\\/%$]"))
+ (whitesp (regexp "[^a-zA-Z0-9_\\-:,\\.\\/%$]"))
(mungeval (lambda (val)
(cond
((eq? val #t) "") ;; convert #t to empty string
((eq? val #f) #f) ;; convert #f to itself (still thinking about this one
(else val)))))
@@ -1708,11 +2335,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 +2350,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 +2445,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 +2770,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 +2825,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 +2910,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 +2946,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 +2970,49 @@
;; 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 +3019,330 @@
;;
(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:
+;; <vector subhash value>
+
+(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*)))
+
+(define *common:telemetry-log-state* 'startup)
+(define *common:telemetry-log-socket* #f)
+
+(define (common:telemetry-log-open)
+ (if (eq? *common:telemetry-log-state* 'startup)
+ (let* ((serverhost (configf:lookup *configdat* "telemetry" "host"))
+ (serverport (configf:lookup-number *configdat* "telemetry" "port"))
+ (user (or (get-environment-variable "USER") "unknown"))
+ (host (or (get-environment-variable "HOST") "unknown")))
+ (set! *common:telemetry-log-state*
+ (handle-exceptions
+ exn
+ (begin
+ (debug:print-info 0 *default-log-port* "common-telemetry-log open udp port failure")
+ 'broken)
+ (if (and serverhost serverport user host)
+ (let* ((s (udp-open-socket)))
+ ;;(udp-bind! s #f 0)
+ (udp-connect! s serverhost serverport)
+ (set! *common:telemetry-log-socket* s)
+ 'open)
+ 'not-needed))))))
+
+(define (common:telemetry-log event #!key (payload '()))
+ (if (eq? *common:telemetry-log-state* 'startup)
+ (common:telemetry-log-open))
+
+ (if (eq? 'open *common:telemetry-log-state*)
+ (handle-exceptions
+ exn
+ (begin
+ (debug:print-info 0 *default-log-port* "common-telemetry-log comms failure ; disabled (no server?)")
+ ;;(define *common:telemetry-log-state* 'broken-or-no-server-preclose)
+ ;;(common:telemetry-log-close)
+ (define *common:telemetry-log-state* 'broken-or-no-server)
+ (set! *common:telemetry-log-socket* #f)
+ )
+ (if (and *common:telemetry-log-socket* event) ;; TODO - filter on event against telemetry.want-events
+ (let* ((user (or (get-environment-variable "USER") "unknown"))
+ (host (or (get-environment-variable "HOST") "unknown"))
+ (start (conc "[megatest "event"]"))
+ (toppath (or *toppath* "/dev/null"))
+ (payload-serialized
+ (base64:base64-encode
+ (z3:encode-buffer
+ (with-output-to-string (lambda () (pp payload))))))
+ (msg (conc user":"host":"start":"(current-process-id)":"(car (argv))":"
+ toppath":"payload-serialized)))
+ (udp-send *common:telemetry-log-socket* msg))))))
+
+(define (common:telemetry-log-close)
+ (when (or (member *common:telemetry-log-state* '(broken-or-no-server-preclose open)) *common:telemetry-log-socket*)
+ (handle-exceptions
+ exn
+ (begin
+ (define *common:telemetry-log-state* 'closed-fail)
+ (debug:print-info 0 *default-log-port* "common-telemetry-log closure failure")
+ )
+ (begin
+ (define *common:telemetry-log-state* 'closed)
+ (udp-close-socket *common:telemetry-log-socket*)
+ (set! *common:telemetry-log-socket* #f)))))
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 <http://www.gnu.org/licenses/>.
+;;
;;======================================================================
;; (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))
ADDED commonmod.scm
Index: commonmod.scm
==================================================================
--- /dev/null
+++ commonmod.scm
@@ -0,0 +1,36 @@
+;;======================================================================
+;; 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 <http://www.gnu.org/licenses/>.
+
+;;======================================================================
+
+(declare (unit commonmod))
+
+(module commonmod
+ *
+
+(import scheme chicken data-structures extras)
+(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18)
+
+;; (define (debug:print . params) #f)
+;; (define (debug:print-info . params) #f)
+;;
+;; (define (set-functions dbgp dbgpinfo)
+;; (set! debug:print dbgp)
+;; (set! debug:print-info dbgpinfo))
+
+)
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 <http://www.gnu.org/licenses/>.
The database keys, runs are indexed on this
keys: (db:get-keys #f) =>
(#("OS" "TEXT")
Index: configf.scm
==================================================================
--- configf.scm
+++ configf.scm
@@ -1,21 +1,30 @@
;;======================================================================
;; 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 <http://www.gnu.org/licenses/>.
+
;;======================================================================
;;======================================================================
;; Config file handling
;;======================================================================
-(use regex regex-case) ;; directory-utils)
+(use regex regex-case matchable) ;; directory-utils)
(declare (unit configf))
(declare (uses process))
(declare (uses env))
(declare (uses keys))
@@ -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,24 +108,25 @@
(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 "\"))"
" (conc (or *toppath* (get-environment-variable \"MT_RUN_AREA_HOME\"))"
" (if (string-null? extra) \"\" \"/\")"
" extra)))"))
((get g)
- (let* ((parts (string-split cmd))
- (sect (car parts))
- (var (cadr parts)))
- (conc "(lambda (ht)(config-lookup ht \"" sect "\" \"" var "\"))")))
+ (match (string-split cmd)
+ ((sect var)(conc "(lambda (ht)(configf:lookup ht \"" sect "\" \"" var "\"))"))
+ (else
+ (debug:print-error 0 *default-log-port* "#{get ...} used with only one parameter, \"" cmd "\", two needed.")
+ "(lambda (ht) #f)")))
((runconfigs-get rget) (conc "(lambda (ht)(runconfigs-get ht \"" cmd "\"))"))
;; ((rget) (conc "(lambda (ht)(runconfigs-get ht \"" cmd "\"))"))
(else "(lambda (ht)(print \"ERROR\") \"ERROR\")"))))
;; (print "fullcmd=" fullcmd)
(handle-exceptions
@@ -176,11 +193,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 +250,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 +310,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
+ (configf: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))
@@ -411,11 +499,11 @@
(let ((configdat (if configfile
(read-config configfile #f #t environ-patt: environ-patt post-section-procs: (list (cons "^fields$" set-fields)) #f))))
(if toppath (change-directory curr-dir))
(list configdat toppath configfile fname))))
-(define (config-lookup cfgdat section var)
+(define (configf:lookup cfgdat section var)
(if (hash-table? cfgdat)
(let ((sectdat (hash-table-ref/default cfgdat section '())))
(if (null? sectdat)
#f
(let ((match (assoc var sectdat)))
@@ -423,21 +511,51 @@
(cadr match)
#f))
))
#f))
-(define configf:lookup config-lookup)
+;; 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 config-lookup configf: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 +605,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
@@ -517,11 +635,11 @@
(sechash (make-hash-table)) ;; current section hash, init with hash for "default" section
(new #f) ;; put the line to be used in new, if it is to be deleted the set new to #f
(secname #f))
;; step 2: Flatten multiline entries
- (if (not (null? fdat))(set! fdat (configf:compress-multi-line fdat)))
+ (if (not (null? fdat))(set! fdat (configf:compress-multi-lines fdat)))
;; step 3: Modify values per contents of "indat" and remove absent values
(if (not (null? fdat))
(let loop ((hed (car fdat))
(tal (cadr fdat))
@@ -532,19 +650,19 @@
(configf:comment-rx _ (set! res (append res (list hed)))) ;; (loop (read-line inp) curr-section-name #f #f))
(configf:blank-l-rx _ (set! res (append res (list hed)))) ;; (loop (read-line inp) curr-section-name #f #f))
(configf:section-rx ( x section-name ) (let ((section-hash (hash-table-ref/default refdat section-name #f)))
(if (not section-hash)
(let ((newhash (make-hash-table)))
- (hash-table-set! refhash section-name newhash)
+ (hash-table-set! refdat section-name newhash) ;; was refhash - not sure that refdat is correct here
(set! sechash newhash))
(set! sechash section-hash))
(set! new hed) ;; will append this at the bottom of the loop
(set! secname section-name)
))
;; No need to process key cmd, let it fall though to key val
(configf:key-val-pr ( x key val )
- (let ((newval (config-lookup indat sec key)))
+ (let ((newval (configf:lookup indat secname key))) ;; was sec, bug or correct?
;; can handle newval == #f here => that means key is removed
(cond
((equal? newval val)
(set! res (append res (list hed))))
((not newval) ;; key has been removed
@@ -566,18 +684,18 @@
(lambda (section)
(let ((sdat '()) ;; append needed bits here
(svars (configf:section-vars indat section)))
(for-each
(lambda (var)
- (let ((val (config-lookup refdat section var)))
+ (let ((val (configf:lookup refdat section var)))
(if (not val) ;; this one is new
(begin
(if (null? sdat)(set! sdat (list (conc "[" section "]"))))
(set! sdat (append sdat (list (conc var " " val))))))))
svars)
(set! fdat (append fdat sdat))))
- (delete-duplicates (append require-sections (hash-table-keys indat))))
+ (delete-duplicates (append required-sections (hash-table-keys indat))))
;; step 5: Write out new file
(with-output-to-file fname
(lambda ()
(for-each
@@ -591,11 +709,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 ()
@@ -657,42 +775,39 @@
ht))
;; if
(define (configf:read-alist fname)
(handle-exceptions
- exn
- #f
- (configf:alist->config
- (with-input-from-file fname read))))
+ exn
+ #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 <jsb@nil.at>
-;; 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 <http://www.gnu.org/licenses/>.
+
+;;======================================================================
+
+;;======================================================================
+;; 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)) ;; #<stepname start end status Duration Logfile Comment 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]
+;; #<unique var> <menu item text, can have template variables> : <command line with template %variable%s>
+;; 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 <runconfig target vars, env-override vars from mtest>
+ ;; 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 <http://www.gnu.org/licenses/>.
+;;
;;======================================================================
;;======================================================================
;; 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 <http://www.gnu.org/licenses/>.
+
;;======================================================================
;;======================================================================
;; 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")
@@ -39,17 +49,33 @@
;; C O M M O N
;;======================================================================
(define *dashboard-comment-share-slot* #f)
+(define (message-window msg)
+ (iup:show
+ (iup:dialog
+ (iup:vbox
+ (iup:label msg #:margin "40x40")))))
+
(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 +259,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 +366,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 +484,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 +511,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 +522,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 +549,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 +568,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,18 +627,18 @@
)))))
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)
(if (eq? cnum 13)
- (command-prox obj)))
+ (command-proc obj)))
))
(command-launch-button (iup:button "Execute!" #:action (lambda (x)
(command-proc command-text-box))))
;; (lambda (x)
;; (let* ((cmd (iup:attribute command-text-box "VALUE"))
@@ -616,15 +669,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 +739,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,16 +767,21 @@
(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)
- (dcommon:populate-steps teststeps steps-matrix))))
+ (dcommon:populate-steps teststeps steps-matrix run-id test-id))))
(hash-table-set! widgets "StepsMatrix" proc)
(proc testdat))
steps-matrix)
;; populate the Test Data panel
(iup:frame
@@ -770,6 +829,112 @@
;; Now start keeping the gui updated from the db
(refreshdat) ;; update from the db here
;(thread-suspend! other-thread)
(if *exit-started*
(set! *exit-started* 'ok))))))))))
+
+(define (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))))
+
+;; Display the tests as rows of boxes on the test/task pane
+;;
+(define (dashboard:draw-tests cnv xadj yadj tests-draw-state sorted-testnames test-records)
+ (canvas-clear! cnv)
+ (canvas-font-set! cnv "Helvetica, -10")
+ (let-values (((sizex sizey sizexmm sizeymm) (canvas-size cnv))
+ ((originx originy) (canvas-origin cnv)))
+ ;; (print "originx: " originx " originy: " originy)
+ ;; (canvas-origin-set! cnv 0 (- (/ sizey 2)))
+ (if (hash-table-ref/default tests-draw-state 'first-time #t)
+ (begin
+ (hash-table-set! tests-draw-state 'first-time #f)
+ (hash-table-set! tests-draw-state 'scalef 1)
+ (hash-table-set! tests-draw-state 'tests-info (make-hash-table))
+ (hash-table-set! tests-draw-state 'selected-tests (make-hash-table))
+ ;; set these
+ (dcommon:initial-draw-tests cnv xadj yadj sizex sizey sizexmm sizeymm originx originy tests-draw-state sorted-testnames test-records))
+ (dcommon:redraw-tests cnv xadj yadj sizex sizey sizexmm sizeymm originx originy tests-draw-state sorted-testnames test-records))
+ ))
+
+(define (dboard:tabdat-test-patts-use vec)
+ (let ((val (dboard:tabdat-test-patts vec)))(if val val ""))) ;;RADT => What is the if for?
+
+;; additional setters for dboard:data
+(define (dboard:tabdat-test-patts-set!-use vec val)
+ (dboard:tabdat-test-patts-set! vec (if (equal? val "") #f val)))
+
+;; Extract the various bits of data from tabdat and create the command line equivalent that will be displayed
+;;
+(define (dashboard:update-run-command tabdat)
+ (let* ((cmd-tb (dboard:tabdat-command-tb tabdat))
+ (cmd (dboard:tabdat-command tabdat))
+ (test-patt (let ((tp (dboard:tabdat-test-patts tabdat)))
+ (if (or (not tp)
+ (equal? tp ""))
+ "%"
+ tp)))
+ (states (dboard:tabdat-states tabdat))
+ (statuses (dboard:tabdat-statuses tabdat))
+ (target (let ((targ-list (dboard:tabdat-target tabdat)))
+ (if targ-list (string-intersperse targ-list "/") "no-target-selected")))
+ (run-name (dboard:tabdat-run-name tabdat))
+ (states-str (if (or (not states)
+ (null? states))
+ ""
+ (conc " -state " (string-intersperse states ","))))
+ (statuses-str (if (or (not statuses)
+ (null? statuses))
+ ""
+ (conc " -status " (string-intersperse statuses ","))))
+ (full-cmd "megatest"))
+ (case (string->symbol cmd)
+ ((run)
+ (set! full-cmd (conc full-cmd
+ " -run"
+ " -testpatt "
+ test-patt
+ " -target "
+ target
+ " -runname "
+ run-name
+ " -clean-cache"
+ )))
+ ((remove-runs)
+ (set! full-cmd (conc full-cmd
+ " -remove-runs -runname "
+ run-name
+ " -target "
+ target
+ " -testpatt "
+ test-patt
+ states-str
+ statuses-str
+ )))
+ (else (set! full-cmd " no valid command ")))
+ (iup:attribute-set! cmd-tb "VALUE" full-cmd)))
+
+(define (iuplistbox-fill-list lb items #!key (selected-item #f))
+ (let ((i 1))
+ (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" i))) ;; (number->string i))))
+ (set! i (+ i 1)))
+ items)
+ ;; (iup:attribute-set! lb "VALUE" (if selected-item selected-item ""))
+ i))
+
+;; if tab-num passed in then use it, otherwise look in commondat at curr-tab-num
+;; adds the updater passed in the updaters list at that hashkey
+;;
+(define (dboard:commondat-add-updater commondat updater #!key (tab-num #f))
+ (let* ((tnum (or tab-num
+ (dboard:commondat-curr-tab-num commondat)))
+ (curr-updaters (hash-table-ref/default (dboard:commondat-updaters commondat) tnum '())))
+ (hash-table-set! (dboard:commondat-updaters commondat)
+ tnum
+ (cons updater curr-updaters))))
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 <http://www.gnu.org/licenses/>.
+;;
;;======================================================================
(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))))
@@ -115,10 +157,11 @@
;; RA => Might require revert for filters
;; create a watch dog to move changes from lt/.db/*.db to megatest.db
;;
;;;(if (file-write-access? (conc *toppath* "/megatest.db"))
;;(debug:print-info 13 *default-log-port* "Before common:watchdog spawn")
+
(thread-start! (make-thread common:watchdog "Watchdog thread"))
;;(debug:print-info 13 *default-log-port* "After common:watchdog spawn")
;; (if (not (args:get-arg "-use-db-cache"))
;; (begin
;; (debug:print-info 0 *default-log-port* "Forcing db-cache mode due to read-only access to megatest.db")
@@ -204,11 +247,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 +267,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 +358,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 +386,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 +614,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 +688,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 +769,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 +834,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 +862,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 +1052,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 +1136,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 +1425,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 +1452,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 +1473,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 +1501,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 +1573,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 +1618,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 +1675,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 +1719,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 +1754,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 +1796,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 +1812,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 +1931,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 +1968,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 +2112,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 +2175,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 +2226,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 +2266,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 +2318,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 +2358,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)) ;; #<stepname start end status Duration Logfile Comment 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 +2464,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 +2566,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 +2589,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
@@ -2675,23 +2637,26 @@
#:tabchangepos-cb (lambda (obj curr prev)
(debug:catch-and-dump
(lambda ()
(let* ((tab-num (dboard:commondat-curr-tab-num commondat))
(tabdat (dboard:common-get-tabdat commondat tab-num: tab-num)))
+
(dboard:tabdat-layout-update-ok-set! tabdat #f))
(dboard:commondat-curr-tab-num-set! commondat curr)
(let* ((tab-num (dboard:commondat-curr-tab-num commondat))
(tabdat (dboard:common-get-tabdat commondat tab-num: tab-num)))
+
(dboard:commondat-please-update-set! commondat #t)
(dboard:tabdat-layout-update-ok-set! tabdat #t)))
"tabchangepos"))
(dashboard:summary commondat stats-dat tab-num: 0)
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 +2723,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 +2852,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 +3438,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 +3473,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 +3497,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 <http://www.gnu.org/licenses/>.
+#
# 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 <http://www.gnu.org/licenses/>.
+#
[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 <http://www.gnu.org/licenses/>.
+#
[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 <http://www.gnu.org/licenses/>.
+
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 <http://www.gnu.org/licenses/>.
+#
[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 <http://www.gnu.org/licenses/>.
+#
[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 <http://www.gnu.org/licenses/>.
(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 <http://www.gnu.org/licenses/>.
+;;
;;======================================================================
;;======================================================================
;; Database access
;;======================================================================
@@ -188,56 +197,60 @@
;; 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:set-busy-handler! db (sqlite3:make-busy-timeout 136000))
(sqlite3:execute db "PRAGMA synchronous = 0;")
- (if (not file-exists)
+ (if (and (configf:lookup *configdat* "setup" "tmp_mode") (string-match "^/tmp/.*" fname))
+ (begin
+ ;;(print "DEBUG: Setting tmp_mode for " fname)
+ (sqlite3:execute db (configf:lookup *configdat* "setup" "tmp_mode"))
+ )
+ )
+ (if (and (configf:lookup *configdat* "setup" "nfs_mode") (not (string-match "^/tmp/.*" fname)))
(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."))
- (initproc db)))
+ ;;(print "DEBUG: Setting nfs_mode for " fname)
+ (sqlite3:execute db (configf:lookup *configdat* "setup" "nfs_mode"))
+ )
+ )
+ (if (and (not (or (configf:lookup *configdat* "setup" "tmp_mode") (configf:lookup *configdat* "setup" "nfs_mode")))
+ (configf:lookup *configdat* "setup" "use-wal")
+ (string-match "^/tmp/.*" fname)) ;; this is a file in /tmp
+ (sqlite3:execute db "PRAGMA journal_mode=WAL;")
+ (debug:print 2 *default-log-port* "Creating " fname " in NON-WAL mode."))
+ (if (not file-exists)
+ (initproc db))
(if (not readyexists)
(begin
(common:simple-file-release-lock lockfname)
(with-output-to-file
readyfname
@@ -254,83 +267,55 @@
(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*)
+ (sqlite3:set-busy-handler! db (sqlite3:make-busy-timeout 136000))
+ (sqlite3:execute db "PRAGMA synchronous = 0;")
+ ;; (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."))
(exn () (debug:print 0 *default-log-port* "ERROR: Unknown error with database " fname " message: " ((condition-property-accessor 'exn 'message) exn))))
)))
-
-
-
-
-;; ;; 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))
-;; (db (db:lock-create-open dbfile (lambda (db)
-;; (handle-exceptions
-;; exn
-;; (begin
-;; ;; (release-dot-lock dbpath)
-;; (if (> attemptnum 2)
-;; (debug:print-error 0 *default-log-port* "tried twice, cannot create/initialize db for run-id " run-id ", at path " dbpath)
-;; (db:open-rundb dbstruct run-id attemptnum (+ attemptnum 1))))
-;; (db:initialize-run-id-db db)
-;; (sqlite3:execute
-;; db
-;; "INSERT OR IGNORE INTO tests (id,run_id,testname,event_time,item_path,state,status) VALUES (?,?,'bogustest',strftime('%s','now'),'nowherepath','DELETED','n/a');"
-;; (* run-id 30000) ;; allow for up to 30k tests per run
-;; run-id)
-;; ;; do a dummy query to test that the table exists and the db is truly readable
-;; (sqlite3:execute db "SELECT * FROM tests WHERE id=?;" (* run-id 30000))
-;; )))) ;; add strings db to rundb, not in use yet
-;; (olddb (if *megatest-db*
-;; *megatest-db*
-;; (let ((db (db:open-megatest-db)))
-;; (set! *megatest-db* db)
-;; db)))
-;; (write-access (file-write-access? dbfile)))
-;; (if (and dbexists (not write-access))
-;; (set! *db-write-access* #f)) ;; only unset so other db's also can use this control
-;; (dbr:dbstruct-rundb-set! dbstruct (cons db dbfile))
-;; (dbr:dbstruct-inuse-set! dbstruct #t)
-;; (dbr:dbstruct-olddb-set! dbstruct olddb)
-;; ;;; (mutex-unlock! *rundb-mutex*) ;;; why did we need a mutex on opening db's?
-;; (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))
+ (let* ((max-stale-tmp (configf:lookup-number *configdat* "server" "filling-db-max-stale-seconds" default: 10))
+ (dbpath (db:dbfile-path )) ;; path to tmp db area
+ (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 +322,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 max-stale-tmp))) ;; 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
@@ -378,14 +379,17 @@
;; Open the classic megatest.db file (defaults to open in toppath)
;;
;; NOTE: returns a dbdat not a dbstruct!
;;
+
+;;(define (db:reopen-megatest-db
+
(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 +414,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 +444,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 +491,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 +514,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 +531,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 +560,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
@@ -584,10 +607,12 @@
"\"\n")
(exit) ;; we can not safely continue when a db was corrupted - even if fixed.
)
;; test read/write access to the database
(let ((db (sqlite3:open-database dbpath)))
+ (sqlite3:set-busy-handler! db (sqlite3:make-busy-timeout 136000))
+ (sqlite3:execute db "PRAGMA synchronous = 0;")
(cond
((equal? fname "megatest.db")
(sqlite3:execute db "DELETE FROM tests WHERE state='DELETED';"))
((equal? fname "main.db")
(sqlite3:execute db "DELETE FROM runs WHERE state='deleted';"))
@@ -596,11 +621,11 @@
((equal? fname "monitor.db")
(sqlite3:execute "DELETE FROM servers WHERE state LIKE 'defunct%';"))
(else
(sqlite3:execute db "vacuum;")))
- (finalize! db)
+ (sqlite3:finalize! db)
#t))))))
;; tbls is ( ("tablename" ( "field1" [#f|proc1] ) ( "field2" [#f|proc2] ) .... ) )
;; db's are dbdat's
;;
@@ -613,11 +638,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 +686,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 +758,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 +884,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 +945,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 +959,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,150 +1003,121 @@
;; '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)
+
+ ;; /tmp/bjbarcla/megatest_localdb/fullrun/.nfs.pdx.disks.icf_env_disk001.bjbarcla.gwa.issues.mtdev.matt-bisect.megatest.ext-tests.runs.all.v1.65.1.6524.dev.bb-24-justrollup-f8.rollup.fullrun/megatest.db.lock
+ (delete-file* (common:get-sync-lock-filepath))
+ )
+
+ ;; clear out junk records
+ ;;
+ ((dejunk)
+ (db:delay-if-busy mtdb) ;; ok to delay on mtdb
+ (when (file-write-access? (db:dbdat-get-path 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)
+#;(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...")
(exit)
(if (or *db-write-access*
(not #t)) ;; was: (member proc * db:all-write-procs *)))
@@ -1073,11 +1132,11 @@
(if (not idb)(sqlite3:finalize! dbstruct))
(debug:print-info 11 *default-log-port* "open-run-close-no-exception-handling END" )
res)
#f))
-(define (open-run-close-exception-handling proc idb . params)
+#;(define (open-run-close-exception-handling proc idb . params)
(handle-exceptions
exn
(let ((sleep-time (random 30))
(err-status ((condition-property-accessor 'sqlite3 'status #f) exn)))
(case err-status
@@ -1084,20 +1143,20 @@
((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))
(apply open-run-close-no-exception-handling proc idb params)))
;; (define open-run-close
-(define open-run-close open-run-close-exception-handling)
+#;(define open-run-close open-run-close-exception-handling)
;; open-run-close-no-exception-handling
;; open-run-close-exception-handling)
;;)
(define (db:initialize-main-db dbdat)
@@ -1105,31 +1164,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 <linktree>/.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 +1201,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 +1233,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 +1244,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 +1314,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 +1337,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 +1357,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 +1416,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
;;
@@ -1394,20 +1464,20 @@
(set! res id))
db
"SELECT id FROM archive_blocks WHERE archive_disk_id=? AND disk_path=?;"
bdisk-id archive-path)
(if res ;; record exists, update du if applicable and return res
- (begin
- (if du (sqlite3:exectute db "UPDATE archive_blocks SET last_du=?,last_du_time=(strftime('%s','now'))
+ (if du (sqlite3:execute db "UPDATE archive_blocks SET last_du=?,last_du_time=(strftime('%s','now'))
WHERE archive_disk_id=? AND disk_path=?;"
- bdisk-id archive-path du))
- res)
+ bdisk-id archive-path du))
(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)))))
+ (set! res (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,13 +1518,13 @@
;; 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")
+ (handler (sqlite3:make-busy-timeout (if (args:get-arg "-override-timeout")
(string->number (args:get-arg "-override-timeout"))
136000)))) ;; 136000)))
(sqlite3:set-busy-handler! db handler)
(if (not dbexists)
(begin
@@ -1491,11 +1561,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))
@@ -1542,49 +1612,97 @@
;; given a launch delay (minimum time from last launch) return amount of time to wait
;;
;; (define (db:launch-delay-left dbstruct run-id launch-delay)
+
+
+(define (db:get-status-from-final-status-file run-dir)
+ (let (
+ (infile (conc run-dir "/.final-status")))
+
+ ;; first verify we are able to write the output file
+ (if (not (file-read-access? infile))
+ (begin
+ (debug:print 0 *default-log-port* "ERROR: cannot read " infile)
+ (debug:print 0 *default-log-port* "ERROR: run-dir is " run-dir)
+ #f
+ )
+ (with-input-from-file infile read-lines)
+ )
+ )
+)
+
+
+
;; 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 (if (and deadtime-str
- (string->number deadtime-str))
- (string->number deadtime-str)
- 7200))) ;; two hours
+ ;; The default running-deadtime is 720 seconds = 12 minutes.
+ ;; "(running-deadtime-default (+ server-start-allowance (* 2 launch-monitor-period)))" = 200 + (2 * (200 + 30 + 30))
+ (deadtime-trim (or ovr-deadtime (configf:lookup-number *configdat* "setup" "deadtime")))
+ (server-start-allowance 200)
+ (server-overloaded-budget 200)
+ (launch-monitor-off-time (or (configf:lookup-number *configdat* "setup" "test-stats-update-period") 30))
+ (launch-monitor-on-time-budget 30)
+ (launch-monitor-period (+ launch-monitor-off-time launch-monitor-on-time-budget server-overloaded-budget))
+ (remotehoststart-deadtime-default (+ server-start-allowance server-overloaded-budget 30))
+ (remotehoststart-deadtime (or deadtime-trim remotehoststart-deadtime-default))
+ (running-deadtime-default (+ server-start-allowance (* 2 launch-monitor-period)))
+ (running-deadtime (or deadtime-trim running-deadtime-default)) ;; two minutes (30 seconds between updates, this leaves 3x grace period)
+ )
+ (debug:print-info 4 *default-log-port* "running-deadtime = " running-deadtime)
+ (debug:print-info 4 *default-log-port* "deadtime-trim = " deadtime-trim)
+
(db:with-db
dbstruct #f #f
(lambda (db)
- (if (number? ovr-deadtime)(set! deadtime ovr-deadtime))
-
;; in RUNNING or REMOTEHOSTSTART for more than 10 minutes
;;
;; HOWEVER: this code in run:test seems to work fine
;; (> (- (current-seconds)(+ (db:test-get-event_time testdat)
;; (db:test-get-run_duration testdat)))
;; 600)
;; (db:delay-if-busy dbdat)
(sqlite3:for-each-row
- (lambda (test-id run-dir uname testname item-path)
+ (lambda (test-id run-dir uname testname item-path event-time run-duration)
+ (if (and (equal? uname "n/a")
+ (equal? item-path "")) ;; this is a toplevel test
+ ;; what to do with toplevel? call rollup?
+ (begin
+ (set! toplevels (cons (list test-id run-dir uname testname item-path run-id) toplevels))
+ (debug:print-info 0 *default-log-port* "Found old toplevel test in RUNNING state, test-id=" test-id))
+ (begin
+ (set! incompleted (cons (list test-id run-dir uname testname item-path run-id) incompleted))
+ (debug:print-info 0 *default-log-port* "Found old test in RUNNING state, test-id=" test-id" exceeded running-deadtime "running-deadtime" now="(current-seconds)" event-time="event-time" run-duration="run-duration))))
+ db
+
+ "SELECT id,rundir,uname,testname,item_path,event_time,run_duration FROM tests WHERE run_id=? AND (strftime('%s','now') - event_time) > (run_duration + ?) AND state IN ('RUNNING');"
+ run-id running-deadtime) ;; default time 720 seconds
+
+
+ (sqlite3:for-each-row
+ (lambda (test-id run-dir uname testname item-path event-time run-duration)
(if (and (equal? uname "n/a")
(equal? item-path "")) ;; this is a toplevel test
;; what to do with toplevel? call rollup?
(begin
(set! toplevels (cons (list test-id run-dir uname testname item-path run-id) toplevels))
(debug:print-info 0 *default-log-port* "Found old toplevel test in RUNNING state, test-id=" test-id))
- (set! incompleted (cons (list test-id run-dir uname testname item-path run-id) incompleted))))
+ (begin
+ (debug:print-info 0 *default-log-port* "Found old test in REMOTEHOSTSTART state, test-id=" test-id" exceeded running-deadtime "running-deadtime" now="(current-seconds)" event-time="event-time" run-duration="run-duration)
+ (set! incompleted (cons (list test-id run-dir uname testname item-path run-id) incompleted)))))
db
- "SELECT id,rundir,uname,testname,item_path FROM tests WHERE run_id=? AND (strftime('%s','now') - event_time) > (run_duration + ?) AND state IN ('RUNNING','REMOTEHOSTSTART');"
- run-id deadtime)
+ "SELECT id,rundir,uname,testname,item_path,event_time,run_duration FROM tests WHERE run_id=? AND (strftime('%s','now') - event_time) > (run_duration + ?) AND state IN ('REMOTEHOSTSTART');"
+ run-id remotehoststart-deadtime) ;; default time 230 seconds
;; in LAUNCHED for more than one day. Could be long due to job queues TODO/BUG: Need override for this in config
;;
;; (db:delay-if-busy dbdat)
(sqlite3:for-each-row
@@ -1591,11 +1709,13 @@
(lambda (test-id run-dir uname testname item-path)
(if (and (equal? uname "n/a")
(equal? item-path "")) ;; this is a toplevel test
;; what to do with toplevel? call rollup?
(set! toplevels (cons (list test-id run-dir uname testname item-path run-id) toplevels))
- (set! oldlaunched (cons (list test-id run-dir uname testname item-path run-id) oldlaunched))))
+ (begin
+ (debug:print-info 0 *default-log-port* "Found old test in LAUNCHED state, test-id=" test-id" 1 day since event_time marked")
+ (set! oldlaunched (cons (list test-id run-dir uname testname item-path run-id) oldlaunched)))))
db
"SELECT id,rundir,uname,testname,item_path FROM tests WHERE run_id=? AND (strftime('%s','now') - event_time) > 86400 AND state IN ('LAUNCHED');"
run-id)
(debug:print-info 18 *default-log-port* "Found " (length oldlaunched) " old LAUNCHED items, " (length toplevels) " old LAUNCHED toplevel tests and " (length incompleted) " tests marked RUNNING but apparently dead.")
@@ -1604,23 +1724,47 @@
;;
;; (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))))
(if (> (length all-ids) 0)
(begin
- (debug:print 0 *default-log-port* "WARNING: Marking test(s); " (string-intersperse (map conc all-ids) ", ") " as INCOMPLETE")
+ ;; (launch:is-test-alive "localhost" 435)
+ (debug:print 0 *default-log-port* "WARNING: Marking test(s); " (string-intersperse (map conc all-ids) ", ") " as DEAD")
(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
- all-ids))))))))
+ (lambda (test-id)
+ (let* (;; (run-dir (db:test-get-rundir-from-test-id dbstruct run-id test-id))
+ (tinfo (db:get-test-info-by-id dbstruct run-id test-id))
+ (run-dir (db:test-get-rundir tinfo))
+ (host (db:test-get-host tinfo))
+ (pid (db:test-get-process_id tinfo))
+ (result (db:get-status-from-final-status-file run-dir)))
+ (if (and (list? result) (> (length result) 1) (equal? "PASS" (cadr result)) (equal? "COMPLETED" (car result)))
+ (begin
+ (debug:print 0 *default-log-port* "INFO: test " test-id " actually passed, so marking PASS not DEAD")
+ (db:set-state-status-and-roll-up-items dbstruct run-id test-id 'foo "COMPLETED" "PASS"
+ "Test stopped responding but it has PASSED; marking it PASS in the DB."))
+ (let ((is-alive (launch:is-test-alive host pid)))
+ (if is-alive
+ (debug:print 0 *default-log-port* "INFO: test " test-id " on host " host " has a process on pid " pid ", NOT setting to DEAD.")
+ (begin
+ (debug:print 0 *default-log-port* "INFO: test " test-id " final state/status is not COMPLETED/PASS. It is " result)
+ (db:set-state-status-and-roll-up-items dbstruct run-id test-id 'foo "COMPLETED" "DEAD"
+ "Test stopped responding while in RUNNING or REMOTEHOSTSTART; presumed dead.")))))))
+ ;; call end of eud of run detection for posthook - from merge, is it needed?
+ ;; (launch:end-of-run-check run-id)
+ all-ids)
+ ;;call end of eud of run detection for posthook
+ (launch:end-of-run-check run-id)
+ )))))))
+
;; ALL REPLACED BY THE BLOCK ABOVE
;;
;; (sqlite3:execute
;; db
@@ -1655,28 +1799,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))
@@ -1801,10 +1954,20 @@
(if (string? res)
(let ((valnum (string->number res)))
(if valnum (set! res valnum))))
res))))
+(define (db:inc-var dbstruct var)
+ (db:with-db dbstruct #f #t
+ (lambda (db)
+ (sqlite3:execute db "UPDATE metadat SET val=val+1 WHERE var=?;" var))))
+
+(define (db:dec-var dbstruct var)
+ (db:with-db dbstruct #f #t
+ (lambda (db)
+ (sqlite3:execute db "UPDATE metadat SET val=val-1 WHERE var=?;" var))))
+
;; This was part of db:get-var. It was used to estimate the load on
;; the database files.
;;
;; scale by 10, average with current value.
;; (set! *global-delta* (/ (+ *global-delta* (* (- (current-milliseconds) start-ms)
@@ -1822,10 +1985,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 (sqlite3: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 +2088,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 +2107,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 +2261,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 +2359,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 +2549,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 +2572,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 +2600,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)))
@@ -2317,13 +2664,21 @@
(define (db:set-run-status dbstruct run-id status msg)
(db:with-db
dbstruct #f #f
(lambda (db)
- (if msg
+ (if msg
(sqlite3:execute db "UPDATE runs SET status=?,comment=? WHERE id=?;" status msg run-id)
(sqlite3:execute db "UPDATE runs SET status=? WHERE id=?;" status run-id)))))
+
+(define (db:set-run-state-status dbstruct run-id state status )
+ (db:with-db
+ dbstruct #f #f
+ (lambda (db)
+ (sqlite3:execute db "UPDATE runs SET status=?,state=? WHERE id=?;" status state run-id))))
+
+
(define (db:get-run-status dbstruct run-id)
(let ((res "n/a"))
(db:with-db
dbstruct #f #f
@@ -2333,10 +2688,24 @@
(set! res status))
db
"SELECT status FROM runs WHERE id=?;"
run-id)
res))))
+
+(define (db:get-run-state dbstruct run-id)
+ (let ((res "n/a"))
+ (db:with-db
+ dbstruct #f #f
+ (lambda (db)
+ (sqlite3:for-each-row
+ (lambda (status)
+ (set! res status))
+ db
+ "SELECT state FROM runs WHERE id=?;"
+ run-id)
+ res))))
+
;;======================================================================
;; K E Y S
;;======================================================================
@@ -2351,11 +2720,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 +2738,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)))
@@ -2385,11 +2754,11 @@
thekey))
;; Get run-ids for runs with same target but different runnames and NOT run-id
;;
(define (db:get-prev-run-ids dbstruct run-id)
- (let* ((keyvals (rmt:get-key-val-pairs run-id))
+ (let* ((keyvals (db:get-key-val-pairs dbstruct run-id))
(kvalues (map cadr keyvals))
(keys (rmt:get-keys))
(qrystr (string-intersperse (map (lambda (x)(conc x "=?")) keys) " AND ")))
(let ((prev-run-ids '()))
(if (null? keyvals)
@@ -2680,11 +3049,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 +3063,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)
@@ -2709,10 +3078,22 @@
(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 = '') AND testname=?;" run-id testname))))
+
+(define (db:get-not-completed-cnt dbstruct run-id)
+(db:with-db
+ dbstruct
+ run-id
+ #f
+ (lambda (db)
+ ;(print "SELECT count(id) FROM tests WHERE state not in ('COMPLETED', 'DELETED') AND run_id=" run-id)
+ (sqlite3:first-result
+ db
+ "SELECT count(id) FROM tests WHERE state not in ('COMPLETED', 'DELETED') AND run_id=?;" run-id))))
+
(define (db:get-count-tests-running-in-jobgroup dbstruct run-id jobgroup)
(if (not jobgroup)
0 ;;
(let ((testnames '()))
;; get the testnames
@@ -2793,11 +3174,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 +3279,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 +3332,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
;;======================================================================
@@ -2968,11 +3383,26 @@
db
"INSERT OR REPLACE into test_steps (test_id,stepname,state,status,event_time,comment,logfile) VALUES(?,?,?,?,?,?,?);"
test-id teststep-name state-in status-in (current-seconds)
(if comment comment "")
(if logfile logfile "")))))
-
+
+
+
+(define (db:delete-steps-for-test! dbstruct run-id test-id)
+ ;; TODO: figure out why status is the key field rather than state (note: CONSTRAINT test_steps_constraint UNIQUE (test_id,stepname,state) )
+ (db:with-db
+ dbstruct
+ run-id
+ #t
+ (lambda (db)
+ (sqlite3:execute
+ db
+ "UPDATE test_steps set status='DELETED' where test_id=?" ;; and run_id=? !! - run_id not in table (bummer) TODO: get run_id into schema for test_steps
+ test-id))))
+
+
;; db-get-test-steps-for-run
(define (db:get-steps-for-test dbstruct run-id test-id)
(db:with-db
dbstruct
run-id
@@ -2984,10 +3414,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 +3448,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 +3538,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 +3644,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,21 +3778,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)))
- (if (member state '("LAUNCHED" "REMOTEHOSTSTART"))
+ (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
(lambda (db)
@@ -3325,65 +3804,153 @@
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
- (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")
- (not (member (dbr:counts-status x)
- *common:not-started-ok-statuses*))))
- 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* >))
- (all-curr-statuses (common:special-sort ;; worst -> best
- (delete-duplicates
- (cons status (map dbr:counts-status state-status-counts)))
- *common:std-statuses* >))
- (non-completes (filter (lambda (x)
- (not (equal? x "COMPLETED")))
- all-curr-states))
- (newstate (cond
- ((> (length non-completes) 0) ;;
- (car non-completes)) ;; (remove (lambda (x)(equal? "COMPLETED" x)) all-curr-states)))
- (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))))
- ;; (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)))))))
+ (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
+ (state-stauses (db:roll-up-rules state-status-counts state status))
+ (newstate (car state-stauses))
+ (newstatus (cadr state-stauses)))
+ (debug:print 4 *default-log-port* "BB> tl-test-id="tl-test-id" ; "test-name":"item-path" newstate="newstate" newstatus="newstatus" 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))))
+(define (db:roll-up-rules state-status-counts state status)
+ (let* ((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")
+ (not (member (dbr:counts-status x) *common:not-started-ok-statuses*))))
+ state-status-counts)))
+ (all-curr-states (common:special-sort ;; worst -> best (sort of)
+ (delete-duplicates
+ (if (and state (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
+ (if (and state status (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 (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
+ ((> 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))))
+ (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")
+
+ ;; NB// Pass the db so it is part of the transaction
+ (list newstate newstatus)))
+
+(define (db:set-state-status-and-roll-up-run dbstruct run-id curr-state curr-status)
+ (mutex-lock! *db-transaction-mutex*)
+ (db:with-db
+ dbstruct #f #f
+ (lambda (db)
+ (let ((tr-res
+ (sqlite3:with-transaction
+ db
+ (lambda ()
+ (let* ((state-status-counts (db:get-all-state-status-counts-for-run dbstruct run-id))
+ (state-stauses (db:roll-up-rules state-status-counts #f #f ))
+ (newstate (car state-stauses))
+ (newstatus (cadr state-stauses)))
+ (if (or (not (eq? newstate curr-state)) (not (eq? newstatus curr-status)))
+ (db:set-run-state-status dbstruct run-id newstate newstatus )))))))
+ (mutex-unlock! *db-transaction-mutex*)
+ tr-res))))
+
+
+(define (db:get-all-state-status-counts-for-run dbstruct run-id)
+ (let* ((test-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
+ "SELECT state,status,count(id) FROM tests WHERE run_id=? GROUP BY state,status;"
+ run-id )))))
+ test-count-recs))
+
+
+;; 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
@@ -3428,11 +3995,11 @@
;; TESTS
'(register-test "INSERT OR IGNORE INTO tests (run_id,testname,event_time,item_path,state,status) VALUES (?,?,strftime('%s','now'),?,'NOT_STARTED','n/a');")
;; Test state and status
'(set-test-state "UPDATE tests SET state=? WHERE id=?;")
'(set-test-status "UPDATE tests SET state=? WHERE id=?;")
- '(state-status "UPDATE tests SET state=?,status=? WHERE id=?;") ;; DONE
+ '(state-status "UPDATE tests SET state=?,status=? WHERE id=?;") ;; D/ONE
'(state-status-msg "UPDATE tests SET state=?,status=?,comment=? WHERE id=?;") ;; DONE
;; Test comment
'(set-test-comment "UPDATE tests SET comment=? WHERE id=?;")
'(set-test-start-time "UPDATE tests SET event_time=strftime('%s','now') WHERE id=?;") ;; DONE
'(pass-fail-counts "UPDATE tests SET pass_count=?,fail_count=? WHERE id=?;")
@@ -3580,11 +4147,11 @@
((not (equal? calling-path *toppath*))
(list #f "Login failed due to mismatch paths: " calling-path ", " *toppath*))
;; ((not (equal? *run-id* run-id))
;; (list #f "Login failed due to mismatch run-id: " run-id ", " *run-id*))
((not (equal? megatest-version calling-version))
- (list #f "Login failed due to mismatch megatest version: " calling-version ", " megatest-version))
+ (list #t (conc "Login warning due to mismatch megatest version: " calling-version ", " megatest-version)))
(else
(hash-table-set! *logged-in-clients* client-signature (current-seconds))
'(#t "successful login"))))
(define (db:general-call dbstruct stmtname params)
@@ -3603,17 +4170,18 @@
;;
(define (db:get-state-status-summary dbstruct run-id testname)
(let ((res '()))
(db:with-db
dbstruct #f #f
- (sqlite3:for-each-row
- (lambda (state status count)
- (set! res (cons (vector state status count) res)))
- db
- "SELECT state,status,count(state) FROM tests WHERE run_id=? AND testname=? AND item_path='' GROUP BY state,status;"
- run-id testname)
- res)))
+ (lambda (db)
+ (sqlite3:for-each-row
+ (lambda (state status count)
+ (set! res (cons (vector state status count) res)))
+ db
+ "SELECT state,status,count(state) FROM tests WHERE run_id=? AND testname=? AND item_path='' GROUP BY state,status;"
+ run-id testname)
+ res))))
(define (db:get-latest-host-load dbstruct raw-hostname)
(let* ((hostname (string-substitute "\\..*$" "" raw-hostname))
(res (cons -1 0)))
(db:with-db
@@ -3719,11 +4287,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 +4351,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 +4440,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
@@ -3891,13 +4475,18 @@
;;
;; Note: mode 'normal means that tests must be COMPLETED and ok (i.e. PASS, WARN, CHECK, SKIP or WAIVED)
;; mode 'toplevel means that tests must be COMPLETED only
;; 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
+;;
+;; IDEA for consideration:
+;; 1. collect all tests "upstream"
+;; 2. any NOT completed and good? if yes => return those as prereqs not met, if no => return null list
;;
;; (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 +4509,156 @@
;; (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))))) ;; how is this different from using member?
+ (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")))
- ;; 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)))
+ (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-test-name (db:test-get-testname waiton-test))
+ (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 waiton-item-path ref-item-path itemmaps)) ;; (equal? ref-item-path waiton-item-path)))
+ (real-ref-test-name (car (string-split ref-test-name "/"))) ;; I THINK ref-test-name SHOULD NEVER HAVE THE ITEM_PATH!
+ (test-and-ref-are-same (equal? real-ref-test-name waiton-test-name)))
+ (debug:print 4 *default-log-port* "waiton-test-name " waiton-test-name " ref-test-name: " ref-test-name " test-and-ref-are-same: " test-and-ref-are-same)
(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))
+ ((and waiton-is-completed waiton-is-ok test-and-ref-are-same) ;; probably from [waitons] table
+ (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)
+ (print test-qry)
+ `((runs . ,(sqlite3:fold-row backcons '() db run-qry))
+ (tests . ,(sqlite3:fold-row backcons '() db test-qry))
+ (test_steps . ,(sqlite3:fold-row backcons '() db (conc "SELECT id FROM test_steps WHERE test_id in (" test-qry ")")))
+ (test_data . ,(sqlite3: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 +4669,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 . ,(sqlite3:fold-row backcons '() db "SELECT id FROM runs WHERE last_update>=?" since-time))
+ (tests . ,(sqlite3:fold-row backcons '() db "SELECT id FROM tests WHERE last_update>=?" since-time))
+ (test_steps . ,(sqlite3:fold-row backcons '() db "SELECT id FROM test_steps WHERE last_update>=?" since-time))
+ (test_data . ,(sqlite3: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 . ,(sqlite3:fold-row backcons '() db "SELECT id FROM run_stats WHERE last_update>=?" since-time))
)))))
;;======================================================================
;; Extract ods file from the db
;;======================================================================
@@ -4083,12 +4754,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 +4802,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 <http://www.gnu.org/licenses/>.
+
;;======================================================================
;; 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 <http://www.gnu.org/licenses/>.
+;;
;;======================================================================
(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")
@@ -34,10 +43,75 @@
;;======================================================================
;; C O M M O N D A T A S T R U C T U R E
;;======================================================================
;;
+;; data common to all tabs goes here
+;;
+(defstruct dboard:commondat
+ ((curr-tab-num 0) : number)
+ please-update
+ tabdats
+ update-mutex
+ updaters
+ updating
+ uidat ;; needs to move to tabdat at some time
+ hide-not-hide-tabs
+ )
+
+(define (dboard:commondat-make)
+ (make-dboard:commondat
+ curr-tab-num: 0
+ tabdats: (make-hash-table)
+ please-update: #t
+ update-mutex: (make-mutex)
+ updaters: (make-hash-table)
+ updating: #f
+ hide-not-hide-tabs: #f
+ ))
+
+;; RADT => Matrix defstruct addition
+(defstruct dboard:graph-dat
+ ((id #f) : string)
+ ((color #f) : vector)
+ ((flag #t) : boolean)
+ ((cell #f) : number)
+ )
+
+;; data for runs, tests etc. was used in run summary?
+;;
+(defstruct dboard:runsdat
+ ;; new system
+ runs-index ;; target/runname => colnum
+ tests-index ;; testname/itempath => rownum
+ matrix-dat ;; vector of vectors rows/cols
+ )
+
+(define (dboard:runsdat-make-init)
+ (make-dboard:runsdat
+ runs-index: (make-hash-table)
+ tests-index: (make-hash-table)
+ matrix-dat: (make-sparse-array)))
+
+;; used to keep the rundata from rmt:get-tests-for-run
+;; in sync.
+;;
+(defstruct dboard:rundat
+ run
+ tests-drawn ;; list of id's already drawn on screen
+ tests-notdrawn ;; list of id's NOT already drawn
+ rowsused ;; hash of lists covering what areas used - replace with quadtree
+ hierdat ;; put hierarchial sorted list here
+ tests ;; hash of id => testdat
+ ((tests-by-name (make-hash-table)) : hash-table) ;; hash of testfullname => testdat
+ key-vals
+ ((last-update 0) : number) ;; last query to db got records from before last-update
+ ((last-db-time 0) : number) ;; last timestamp on megatest.db
+ ((data-changed #f) : boolean)
+ ((run-data-offset 0) : number) ;; get only 100 items per call, set back to zero when received less than 100 items
+ (db-path #f))
+
;;======================================================================
;; D O T F I L E
;;======================================================================
@@ -72,11 +146,11 @@
;;
(define (dcommon:modifiy-if-different mtrx cell-name new-val prev-changed)
(let ((curr-val (iup:attribute mtrx cell-name)))
(if (not (equal? curr-val new-val))
(begin
- (iup:attribute-set! mtrx cell-name col-name)
+ (iup:attribute-set! mtrx cell-name new-val) ;; was col-name
#t) ;; need a re-draw
prev-changed)))
;; TO-DO
@@ -85,187 +159,187 @@
;; 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:runsdat-get-col-num dat target runname force-set)
+;; (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)))
(if res
res
@@ -272,11 +346,11 @@
(if force-set
(let ((max-col-num (+ 1 (common:max (cons-1 (hash-table-values runs-index))))))
(hash-table-set! runs-index col-name max-col-num)
max-col-num)))))
-(define (dcommon:runsdat-get-row-num dat testname itempath force-set)
+#;(define (dcommon:runsdat-get-row-num dat testname itempath force-set)
(let* ((tests-index (dboard:runsdat-runs-index dat))
(row-name (conc testname "/" itempath))
(res (hash-table-ref/default runs-index row-name #f)))
(if res
res
@@ -313,11 +387,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 +408,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)
@@ -435,11 +513,11 @@
(debug:print 2 "ERROR: No test data found for test " test-id ", exiting")
(exit 1))
(let*
((rundir (if testdat
(db:test-get-rundir testdat)
- logfile))
+ (current-directory))) ;; logfile))
(testfullname (if testdat (db:test-get-fullname testdat) "Gathering data ..."))
(xterm (lambda ()
(if (directory-exists? rundir)
(let* ((shell (if (get-environment-variable "SHELL")
(conc "-e " (get-environment-variable "SHELL"))
@@ -491,11 +569,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")))
@@ -538,70 +616,74 @@
;; Megatest version
(iup:attribute-set! general-matrix "2:0" "Version")
(iup:attribute-set! general-matrix "2:1" (conc megatest-version "-" (substring megatest-fossil-hash 0 4)))
general-matrix))
+
+(define (dcommon:stats-updater commondat tabdat stats-matrix)
+ (if (and (iup:ihandle? stats-matrix)
+ (dashboard:database-changed? commondat tabdat context-key: 'run-stats))
+ (let* ((changed #f)
+ (run-stats (rmt:get-run-stats))
+ (indices (common:sparse-list-generate-index run-stats)) ;; proc: set-cell))
+ (row-indices (car indices))
+ (col-indices (cadr indices))
+ (max-row (if (null? row-indices) 1 (common:max (map cadr row-indices))))
+ (max-col (if (null? col-indices) 1
+ (common:max (map cadr col-indices))))
+ (max-visible (max (- (dboard:tabdat-num-tests tabdat) 15) 3))
+ (max-col-vis (if (> max-col 10) 10 max-col))
+ (numrows 1)
+ (numcols 1))
+ (iup:attribute-set! stats-matrix "CLEARVALUE" "CONTENTS")
+ (iup:attribute-set! stats-matrix "NUMCOL" max-col )
+ (iup:attribute-set! stats-matrix "NUMLIN" (if (< max-row max-visible) max-visible max-row)) ;; min of 20
+ (iup:attribute-set! stats-matrix "NUMCOL_VISIBLE" max-col-vis)
+ (iup:attribute-set! stats-matrix "NUMLIN_VISIBLE" (if (> max-row max-visible) max-visible max-row))
+ (print "row-indices: " row-indices " col-indices: " col-indices)
+ ;; Row labels
+ (for-each (lambda (ind)
+ (let* ((name (car ind))
+ (num (cadr ind))
+ (key (conc num ":0")))
+ (if (not (equal? (iup:attribute stats-matrix key) name))
+ (begin
+ (set! changed #t)
+ (iup:attribute-set! stats-matrix key name)))))
+ row-indices)
+
+ ;; Col labels
+ (for-each (lambda (ind)
+ (let* ((name (car ind))
+ (num (cadr ind))
+ (key (conc "0:" num)))
+ (if (not (equal? (iup:attribute stats-matrix key) name))
+ (begin
+ (set! changed #t)
+ (iup:attribute-set! stats-matrix key name)))))
+ col-indices)
+
+ ;; Cell contents
+ (for-each (lambda (entry)
+ (let* ((row-name (car entry))
+ (col-name (cadr entry))
+ (value (caddr entry))
+ (row-num (cadr (assoc row-name row-indices)))
+ (col-num (cadr (assoc col-name col-indices)))
+ (key (conc row-num ":" col-num)))
+ (if (not (equal? (iup:attribute stats-matrix key) value))
+ (begin
+ (set! changed #t)
+ (iup:attribute-set! stats-matrix key value)))))
+ run-stats)
+ (if changed (iup:attribute-set! stats-matrix "REDRAW" "ALL")))))
+
(define (dcommon:run-stats commondat tabdat #!key (tab-num #f))
(let* ((stats-matrix (iup:matrix expand: "YES"))
- (changed #f)
(stats-updater (lambda ()
- (if (dashboard:database-changed? commondat tabdat context-key: 'run-stats)
- (let* ((run-stats (rmt:get-run-stats))
- (indices (common:sparse-list-generate-index run-stats)) ;; proc: set-cell))
- (row-indices (car indices))
- (col-indices (cadr indices))
- (max-row (if (null? row-indices) 1 (common:max (map cadr row-indices))))
- (max-col (if (null? col-indices) 1
- (common:max (map cadr col-indices))))
- (max-visible (max (- (dboard:tabdat-num-tests tabdat) 15) 3))
- (max-col-vis (if (> max-col 10) 10 max-col))
- (numrows 1)
- (numcols 1))
- (iup:attribute-set! stats-matrix "CLEARVALUE" "CONTENTS")
- (iup:attribute-set! stats-matrix "NUMCOL" max-col )
- (iup:attribute-set! stats-matrix "NUMLIN" (if (< max-row max-visible) max-visible max-row)) ;; min of 20
- (iup:attribute-set! stats-matrix "NUMCOL_VISIBLE" max-col-vis)
- (iup:attribute-set! stats-matrix "NUMLIN_VISIBLE" (if (> max-row max-visible) max-visible max-row))
-
- ;; Row labels
- (for-each (lambda (ind)
- (let* ((name (car ind))
- (num (cadr ind))
- (key (conc num ":0")))
- (if (not (equal? (iup:attribute stats-matrix key) name))
- (begin
- (set! changed #t)
- (iup:attribute-set! stats-matrix key name)))))
- row-indices)
-
- ;; Col labels
- (for-each (lambda (ind)
- (let* ((name (car ind))
- (num (cadr ind))
- (key (conc "0:" num)))
- (if (not (equal? (iup:attribute stats-matrix key) name))
- (begin
- (set! changed #t)
- (iup:attribute-set! stats-matrix key name)))))
- col-indices)
-
- ;; Cell contents
- (for-each (lambda (entry)
- (let* ((row-name (car entry))
- (col-name (cadr entry))
- (value (caddr entry))
- (row-num (cadr (assoc row-name row-indices)))
- (col-num (cadr (assoc col-name col-indices)))
- (key (conc row-num ":" col-num)))
- (if (not (equal? (iup:attribute stats-matrix key) value))
- (begin
- (set! changed #t)
- (iup:attribute-set! stats-matrix key value)))))
- run-stats)
- (if changed (iup:attribute-set! stats-matrix "REDRAW" "ALL")))
- ))))
+ (dcommon:stats-updater commondat tabdat stats-matrix))))
;; (dboard:commondat-please-update-set! commondat #t) ;; force redraw on first pass
;; (mark-for-update tabdat)
;; (stats-updater)
(dboard:commondat-add-updater commondat stats-updater tab-num: tab-num)
;; (set! dashboard:update-summary-tab updater)
@@ -709,11 +791,11 @@
(iup:menu-item "Files" (iup:menu ;; Note that you can use either #:action or action: for options
(iup:menu-item "Open" action: (lambda (obj)
(let* ((area-name (iup:textbox #:expand "HORIZONTAL"))
(fd (iup:file-dialog #:dialogtype "DIR"))
(top (iup:show fd #:modal? "YES")))
- (iup:attribute-set! source-tb "VALUE"
+ (iup:attribute-set! area-name "VALUE" ;; was source-tb, no idea what is correct
(iup:attribute fd "VALUE"))
(iup:destroy! fd))))
;; (lambda (obj)
;; (iup:show (iup:file-dialog))
;; (print "File->open " obj)))
@@ -933,24 +1015,28 @@
(lambda (x y)
(list (+ x 0) ;; xtorig)
(+ y 0))) ;; ytorig)))
#f #f)) ;; process polyline
edges))))
- (llx (if no-dot
+ (cx (if no-dot ;; this is the centerpoint!
curr-x
(string->number (list-ref nodedat 2))))
- (lly (if no-dot
+ (cy (if no-dot
curr-y
(string->number (list-ref nodedat 3))))
(boxw (if no-dot
boxw
(string->number (list-ref nodedat 4))))
(boxh (if no-dot
boxh
(string->number (list-ref nodedat 5))))
- (urx (+ llx boxw))
- (ury (+ lly boxh)))
+ (boxw/2 (/ boxw 2))
+ (boxh/2 (/ boxh 2))
+ (urx (+ cx boxw/2))
+ (ury (+ cy boxh/2))
+ (llx (- cx boxw/2))
+ (lly (- cy boxh/2)))
;; if we are in no-dot mode then increment curr-x and curr-y as needed
(if no-dot
(begin
(cond
@@ -1137,28 +1223,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 +1272,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)
@@ -1242,27 +1329,49 @@
;;======================================================================
;; S T E P S
;;======================================================================
-(define (dcommon:populate-steps teststeps steps-matrix)
- (let ((max-row 0)
- (max-col 7))
+(define (dcommon:populate-steps teststeps steps-matrix run-id test-id)
+ (let* ((max-row 0)
+ (max-col 9)
+ (white "255 255 255")
+
+ (testinfo (rmt:get-testinfo-state-status run-id test-id))
+ (state (db:test-get-state testinfo))
+ (status (db:test-get-status testinfo))
+ (test-status-color (car (gutils:get-color-for-state-status state status)))
+ (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")
+ (begin
+ (iup:attribute-set! steps-matrix "CLEARATTRIB" "CONTENTS")
+ (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) '("" "-" "#<unspecified>"))
+ running-color)
+
+ ((member (conc status) '("0" 0))
+ white)
+ (else test-status-color)))
+ ; (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)
@@ -1290,6 +1399,63 @@
(define (dcommon:run-html-viewer lfilename)
(let ((htmlviewercmd (configf:lookup *configdat* "setup" "htmlviewercmd")))
(if htmlviewercmd
(system (conc "(" htmlviewercmd " " lfilename " ) &"))
(iup:send-url lfilename))))
+
+(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 (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
+ (begin
+ (set! *last-monitor-update-time* run-update-time) ;; monitor-modtime)
+ #t)
+ #f)))
+
+;; DOES NOT WORK RELIABLY WITH /tmp WAL mode files. Timestamps only change when the db
+;; is closed (I think). If db dir starts with /tmp always return true
+;;
+(define (dashboard:database-changed? commondat tabdat #!key (context-key 'default))
+ (let* ((run-update-time (current-seconds))
+ (dbdir (dboard:tabdat-dbdir tabdat))
+ (modtime (dashboard:get-youngest-run-db-mod-time dbdir))
+ (recalc (dashboard:recalc modtime
+ (dboard:commondat-please-update commondat)
+ (dboard:get-last-db-update tabdat context-key))))
+ ;; (dboard:tabdat-last-db-update tabdat))))
+ (if recalc
+ (dboard:set-last-db-update! tabdat context-key run-update-time))
+ (dboard:commondat-please-update-set! commondat #f)
+ recalc))
+
+(define (dashboard:get-youngest-run-db-mod-time dbdir)
+ (handle-exceptions
+ exn
+ (begin
+ (debug:print 2 *default-log-port* "WARNING: error in accessing databases in get-youngest-run-db-mod-time: " ((condition-property-accessor 'exn 'message) exn) " db-dir="dbdir)
+ (current-seconds)) ;; something went wrong - just print an error and return current-seconds
+ (common:max (map (lambda (filen)
+ (file-modification-time filen))
+ (glob (conc dbdir "/*.db*"))))))
+
+(define (dboard:get-last-db-update tabdat context)
+ (hash-table-ref/default (dboard:tabdat-last-db-update tabdat) context 0))
+
+(define (dboard:set-last-db-update! tabdat context newtime)
+ (hash-table-set! (dboard:tabdat-last-db-update tabdat) context newtime))
+
+;; point inside line
+;;
+(define-inline (dashboard:px-between px lx1 lx2)
+ (and (< lx1 px)(> lx2 px)))
+
+(define (dashboard:recalc modtime please-update-buttons last-db-update-time)
+ (or please-update-buttons
+ (and ;; (> (current-milliseconds)(+ *last-recalc-ended-time* 150)) ;; can't use this - it needs to be tab specific
+ (> modtime (- last-db-update-time 3)) ;; add three seconds of margin
+ (> (current-seconds)(+ last-db-update-time 1)))))
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/<group>.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 ;; <target/path>/<runname>/...
- 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/<group>.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 => <run-id>.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
-;;======================================================================
-
-;; <area> - <target - ... > - <runname> - <test> - <itempath - ...>
-
-(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 <http://www.gnu.org/licenses/>.
+;;
(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 <http://www.gnu.org/licenses/>.
+#
+
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 @@
-<!DOCTYPE html>
-<html lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<meta name="generator" content="AsciiDoc 8.6.7">
-<title>Megatest Web App API Specificiation</title>
-<style type="text/css">
-/* Shared CSS for AsciiDoc xhtml11 and html5 backends */
-
-/* Default font. */
-body {
- font-family: Georgia,serif;
-}
-
-/* Title font. */
-h1, h2, h3, h4, h5, h6,
-div.title, caption.title,
-thead, p.table.header,
-#toctitle,
-#author, #revnumber, #revdate, #revremark,
-#footer {
- font-family: Arial,Helvetica,sans-serif;
-}
-
-body {
- margin: 1em 5% 1em 5%;
-}
-
-a {
- color: blue;
- text-decoration: underline;
-}
-a:visited {
- color: fuchsia;
-}
-
-em {
- font-style: italic;
- color: navy;
-}
-
-strong {
- font-weight: bold;
- color: #083194;
-}
-
-h1, h2, h3, h4, h5, h6 {
- color: #527bbd;
- margin-top: 1.2em;
- margin-bottom: 0.5em;
- line-height: 1.3;
-}
-
-h1, h2, h3 {
- border-bottom: 2px solid silver;
-}
-h2 {
- padding-top: 0.5em;
-}
-h3 {
- float: left;
-}
-h3 + * {
- clear: left;
-}
-h5 {
- font-size: 1.0em;
-}
-
-div.sectionbody {
- margin-left: 0;
-}
-
-hr {
- border: 1px solid silver;
-}
-
-p {
- margin-top: 0.5em;
- margin-bottom: 0.5em;
-}
-
-ul, ol, li > p {
- margin-top: 0;
-}
-ul > li { color: #aaa; }
-ul > li > * { color: black; }
-
-pre {
- padding: 0;
- margin: 0;
-}
-
-#author {
- color: #527bbd;
- font-weight: bold;
- font-size: 1.1em;
-}
-#email {
-}
-#revnumber, #revdate, #revremark {
-}
-
-#footer {
- font-size: small;
- border-top: 2px solid silver;
- padding-top: 0.5em;
- margin-top: 4.0em;
-}
-#footer-text {
- float: left;
- padding-bottom: 0.5em;
-}
-#footer-badges {
- float: right;
- padding-bottom: 0.5em;
-}
-
-#preamble {
- margin-top: 1.5em;
- margin-bottom: 1.5em;
-}
-div.imageblock, div.exampleblock, div.verseblock,
-div.quoteblock, div.literalblock, div.listingblock, div.sidebarblock,
-div.admonitionblock {
- margin-top: 1.0em;
- margin-bottom: 1.5em;
-}
-div.admonitionblock {
- margin-top: 2.0em;
- margin-bottom: 2.0em;
- margin-right: 10%;
- color: #606060;
-}
-
-div.content { /* Block element content. */
- padding: 0;
-}
-
-/* Block element titles. */
-div.title, caption.title {
- color: #527bbd;
- font-weight: bold;
- text-align: left;
- margin-top: 1.0em;
- margin-bottom: 0.5em;
-}
-div.title + * {
- margin-top: 0;
-}
-
-td div.title:first-child {
- margin-top: 0.0em;
-}
-div.content div.title:first-child {
- margin-top: 0.0em;
-}
-div.content + div.title {
- margin-top: 0.0em;
-}
-
-div.sidebarblock > div.content {
- background: #ffffee;
- border: 1px solid #dddddd;
- border-left: 4px solid #f0f0f0;
- padding: 0.5em;
-}
-
-div.listingblock > div.content {
- border: 1px solid #dddddd;
- border-left: 5px solid #f0f0f0;
- background: #f8f8f8;
- padding: 0.5em;
-}
-
-div.quoteblock, div.verseblock {
- padding-left: 1.0em;
- margin-left: 1.0em;
- margin-right: 10%;
- border-left: 5px solid #f0f0f0;
- color: #888;
-}
-
-div.quoteblock > div.attribution {
- padding-top: 0.5em;
- text-align: right;
-}
-
-div.verseblock > pre.content {
- font-family: inherit;
- font-size: inherit;
-}
-div.verseblock > div.attribution {
- padding-top: 0.75em;
- text-align: left;
-}
-/* DEPRECATED: Pre version 8.2.7 verse style literal block. */
-div.verseblock + div.attribution {
- text-align: left;
-}
-
-div.admonitionblock .icon {
- vertical-align: top;
- font-size: 1.1em;
- font-weight: bold;
- text-decoration: underline;
- color: #527bbd;
- padding-right: 0.5em;
-}
-div.admonitionblock td.content {
- padding-left: 0.5em;
- border-left: 3px solid #dddddd;
-}
-
-div.exampleblock > div.content {
- border-left: 3px solid #dddddd;
- padding-left: 0.5em;
-}
-
-div.imageblock div.content { padding-left: 0; }
-span.image img { border-style: none; }
-a.image:visited { color: white; }
-
-dl {
- margin-top: 0.8em;
- margin-bottom: 0.8em;
-}
-dt {
- margin-top: 0.5em;
- margin-bottom: 0;
- font-style: normal;
- color: navy;
-}
-dd > *:first-child {
- margin-top: 0.1em;
-}
-
-ul, ol {
- list-style-position: outside;
-}
-ol.arabic {
- list-style-type: decimal;
-}
-ol.loweralpha {
- list-style-type: lower-alpha;
-}
-ol.upperalpha {
- list-style-type: upper-alpha;
-}
-ol.lowerroman {
- list-style-type: lower-roman;
-}
-ol.upperroman {
- list-style-type: upper-roman;
-}
-
-div.compact ul, div.compact ol,
-div.compact p, div.compact p,
-div.compact div, div.compact div {
- margin-top: 0.1em;
- margin-bottom: 0.1em;
-}
-
-tfoot {
- font-weight: bold;
-}
-td > div.verse {
- white-space: pre;
-}
-
-div.hdlist {
- margin-top: 0.8em;
- margin-bottom: 0.8em;
-}
-div.hdlist tr {
- padding-bottom: 15px;
-}
-dt.hdlist1.strong, td.hdlist1.strong {
- font-weight: bold;
-}
-td.hdlist1 {
- vertical-align: top;
- font-style: normal;
- padding-right: 0.8em;
- color: navy;
-}
-td.hdlist2 {
- vertical-align: top;
-}
-div.hdlist.compact tr {
- margin: 0;
- padding-bottom: 0;
-}
-
-.comment {
- background: yellow;
-}
-
-.footnote, .footnoteref {
- font-size: 0.8em;
-}
-
-span.footnote, span.footnoteref {
- vertical-align: super;
-}
-
-#footnotes {
- margin: 20px 0 20px 0;
- padding: 7px 0 0 0;
-}
-
-#footnotes div.footnote {
- margin: 0 0 5px 0;
-}
-
-#footnotes hr {
- border: none;
- border-top: 1px solid silver;
- height: 1px;
- text-align: left;
- margin-left: 0;
- width: 20%;
- min-width: 100px;
-}
-
-div.colist td {
- padding-right: 0.5em;
- padding-bottom: 0.3em;
- vertical-align: top;
-}
-div.colist td img {
- margin-top: 0.3em;
-}
-
-@media print {
- #footer-badges { display: none; }
-}
-
-#toc {
- margin-bottom: 2.5em;
-}
-
-#toctitle {
- color: #527bbd;
- font-size: 1.1em;
- font-weight: bold;
- margin-top: 1.0em;
- margin-bottom: 0.1em;
-}
-
-div.toclevel0, div.toclevel1, div.toclevel2, div.toclevel3, div.toclevel4 {
- margin-top: 0;
- margin-bottom: 0;
-}
-div.toclevel2 {
- margin-left: 2em;
- font-size: 0.9em;
-}
-div.toclevel3 {
- margin-left: 4em;
- font-size: 0.9em;
-}
-div.toclevel4 {
- margin-left: 6em;
- font-size: 0.9em;
-}
-
-span.aqua { color: aqua; }
-span.black { color: black; }
-span.blue { color: blue; }
-span.fuchsia { color: fuchsia; }
-span.gray { color: gray; }
-span.green { color: green; }
-span.lime { color: lime; }
-span.maroon { color: maroon; }
-span.navy { color: navy; }
-span.olive { color: olive; }
-span.purple { color: purple; }
-span.red { color: red; }
-span.silver { color: silver; }
-span.teal { color: teal; }
-span.white { color: white; }
-span.yellow { color: yellow; }
-
-span.aqua-background { background: aqua; }
-span.black-background { background: black; }
-span.blue-background { background: blue; }
-span.fuchsia-background { background: fuchsia; }
-span.gray-background { background: gray; }
-span.green-background { background: green; }
-span.lime-background { background: lime; }
-span.maroon-background { background: maroon; }
-span.navy-background { background: navy; }
-span.olive-background { background: olive; }
-span.purple-background { background: purple; }
-span.red-background { background: red; }
-span.silver-background { background: silver; }
-span.teal-background { background: teal; }
-span.white-background { background: white; }
-span.yellow-background { background: yellow; }
-
-span.big { font-size: 2em; }
-span.small { font-size: 0.6em; }
-
-span.underline { text-decoration: underline; }
-span.overline { text-decoration: overline; }
-span.line-through { text-decoration: line-through; }
-
-div.unbreakable { page-break-inside: avoid; }
-
-
-/*
- * xhtml11 specific
- *
- * */
-
-tt {
- font-family: "Courier New", Courier, monospace;
- font-size: inherit;
- color: navy;
-}
-
-div.tableblock {
- margin-top: 1.0em;
- margin-bottom: 1.5em;
-}
-div.tableblock > table {
- border: 3px solid #527bbd;
-}
-thead, p.table.header {
- font-weight: bold;
- color: #527bbd;
-}
-p.table {
- margin-top: 0;
-}
-/* Because the table frame attribute is overriden by CSS in most browsers. */
-div.tableblock > table[frame="void"] {
- border-style: none;
-}
-div.tableblock > table[frame="hsides"] {
- border-left-style: none;
- border-right-style: none;
-}
-div.tableblock > table[frame="vsides"] {
- border-top-style: none;
- border-bottom-style: none;
-}
-
-
-/*
- * html5 specific
- *
- * */
-
-.monospaced {
- font-family: "Courier New", Courier, monospace;
- font-size: inherit;
- color: navy;
-}
-
-table.tableblock {
- margin-top: 1.0em;
- margin-bottom: 1.5em;
-}
-thead, p.tableblock.header {
- font-weight: bold;
- color: #527bbd;
-}
-p.tableblock {
- margin-top: 0;
-}
-table.tableblock {
- border-width: 3px;
- border-spacing: 0px;
- border-style: solid;
- border-color: #527bbd;
- border-collapse: collapse;
-}
-th.tableblock, td.tableblock {
- border-width: 1px;
- padding: 4px;
- border-style: solid;
- border-color: #527bbd;
-}
-
-table.tableblock.frame-topbot {
- border-left-style: hidden;
- border-right-style: hidden;
-}
-table.tableblock.frame-sides {
- border-top-style: hidden;
- border-bottom-style: hidden;
-}
-table.tableblock.frame-none {
- border-style: hidden;
-}
-
-th.tableblock.halign-left, td.tableblock.halign-left {
- text-align: left;
-}
-th.tableblock.halign-center, td.tableblock.halign-center {
- text-align: center;
-}
-th.tableblock.halign-right, td.tableblock.halign-right {
- text-align: right;
-}
-
-th.tableblock.valign-top, td.tableblock.valign-top {
- vertical-align: top;
-}
-th.tableblock.valign-middle, td.tableblock.valign-middle {
- vertical-align: middle;
-}
-th.tableblock.valign-bottom, td.tableblock.valign-bottom {
- vertical-align: bottom;
-}
-
-
-/*
- * manpage specific
- *
- * */
-
-body.manpage h1 {
- padding-top: 0.5em;
- padding-bottom: 0.5em;
- border-top: 2px solid silver;
- border-bottom: 2px solid silver;
-}
-body.manpage h2 {
- border-style: none;
-}
-body.manpage div.sectionbody {
- margin-left: 3em;
-}
-
-@media print {
- body.manpage div#toc { display: none; }
-}
-@media screen {
- body {
- max-width: 50em; /* approximately 80 characters wide */
- margin-left: 16em;
- }
-
- #toc {
- position: fixed;
- top: 0;
- left: 0;
- bottom: 0;
- width: 13em;
- padding: 0.5em;
- padding-bottom: 1.5em;
- margin: 0;
- overflow: auto;
- border-right: 3px solid #f8f8f8;
- background-color: white;
- }
-
- #toc .toclevel1 {
- margin-top: 0.5em;
- }
-
- #toc .toclevel2 {
- margin-top: 0.25em;
- display: list-item;
- color: #aaaaaa;
- }
-
- #toctitle {
- margin-top: 0.5em;
- }
-}
-</style>
-<script type="text/javascript">
-/*<+'])');
- // Function that scans the DOM tree for header elements (the DOM2
- // nodeIterator API would be a better technique but not supported by all
- // browsers).
- var iterate = function (el) {
- for (var i = el.firstChild; i != null; i = i.nextSibling) {
- if (i.nodeType == 1 /* Node.ELEMENT_NODE */) {
- var mo = re.exec(i.tagName);
- if (mo && (i.getAttribute("class") || i.getAttribute("className")) != "float") {
- result[result.length] = new TocEntry(i, getText(i), mo[1]-1);
- }
- iterate(i);
- }
- }
- }
- iterate(el);
- return result;
- }
-
- var toc = document.getElementById("toc");
- if (!toc) {
- return;
- }
-
- // Delete existing TOC entries in case we're reloading the TOC.
- var tocEntriesToRemove = [];
- var i;
- for (i = 0; i < toc.childNodes.length; i++) {
- var entry = toc.childNodes[i];
- if (entry.nodeName.toLowerCase() == 'div'
- && entry.getAttribute("class")
- && entry.getAttribute("class").match(/^toclevel/))
- tocEntriesToRemove.push(entry);
- }
- for (i = 0; i < tocEntriesToRemove.length; i++) {
- toc.removeChild(tocEntriesToRemove[i]);
- }
-
- // Rebuild TOC entries.
- var entries = tocEntries(document.getElementById("content"), toclevels);
- for (var i = 0; i < entries.length; ++i) {
- var entry = entries[i];
- if (entry.element.id == "")
- entry.element.id = "_toc_" + i;
- var a = document.createElement("a");
- a.href = "#" + entry.element.id;
- a.appendChild(document.createTextNode(entry.text));
- var div = document.createElement("div");
- div.appendChild(a);
- div.className = "toclevel" + entry.toclevel;
- toc.appendChild(div);
- }
- if (entries.length == 0)
- toc.parentNode.removeChild(toc);
-},
-
-
-/////////////////////////////////////////////////////////////////////
-// Footnotes generator
-/////////////////////////////////////////////////////////////////////
-
-/* Based on footnote generation code from:
- * http://www.brandspankingnew.net/archive/2005/07/format_footnote.html
- */
-
-footnotes: function () {
- // Delete existing footnote entries in case we're reloading the footnodes.
- var i;
- var noteholder = document.getElementById("footnotes");
- if (!noteholder) {
- return;
- }
- var entriesToRemove = [];
- for (i = 0; i < noteholder.childNodes.length; i++) {
- var entry = noteholder.childNodes[i];
- if (entry.nodeName.toLowerCase() == 'div' && entry.getAttribute("class") == "footnote")
- entriesToRemove.push(entry);
- }
- for (i = 0; i < entriesToRemove.length; i++) {
- noteholder.removeChild(entriesToRemove[i]);
- }
-
- // Rebuild footnote entries.
- var cont = document.getElementById("content");
- var spans = cont.getElementsByTagName("span");
- var refs = {};
- var n = 0;
- for (i=0; i<spans.length; i++) {
- if (spans[i].className == "footnote") {
- n++;
- var note = spans[i].getAttribute("data-note");
- if (!note) {
- // Use [\s\S] in place of . so multi-line matches work.
- // Because JavaScript has no s (dotall) regex flag.
- note = spans[i].innerHTML.match(/\s*\[([\s\S]*)]\s*/)[1];
- spans[i].innerHTML =
- "[<a id='_footnoteref_" + n + "' href='#_footnote_" + n +
- "' title='View footnote' class='footnote'>" + n + "</a>]";
- spans[i].setAttribute("data-note", note);
- }
- noteholder.innerHTML +=
- "<div class='footnote' id='_footnote_" + n + "'>" +
- "<a href='#_footnoteref_" + n + "' title='Return to text'>" +
- n + "</a>. " + note + "</div>";
- var id =spans[i].getAttribute("id");
- if (id != null) refs["#"+id] = n;
- }
- }
- if (n == 0)
- noteholder.parentNode.removeChild(noteholder);
- else {
- // Process footnoterefs.
- for (i=0; i<spans.length; i++) {
- if (spans[i].className == "footnoteref") {
- var href = spans[i].getElementsByTagName("a")[0].getAttribute("href");
- href = href.match(/#.*/)[0]; // Because IE return full URL.
- n = refs[href];
- spans[i].innerHTML =
- "[<a href='#_footnote_" + n +
- "' title='View footnote' class='footnote'>" + n + "</a>]";
- }
- }
- }
-},
-
-install: function(toclevels) {
- var timerId;
-
- function reinstall() {
- asciidoc.footnotes();
- if (toclevels) {
- asciidoc.toc(toclevels);
- }
- }
-
- function reinstallAndRemoveTimer() {
- clearInterval(timerId);
- reinstall();
- }
-
- timerId = setInterval(reinstall, 500);
- if (document.addEventListener)
- document.addEventListener("DOMContentLoaded", reinstallAndRemoveTimer, false);
- else
- window.onload = reinstallAndRemoveTimer;
-}
-
-}
-asciidoc.install(2);
-/*]]>*/
-</script>
-</head>
-<body class="article">
-<div id="header">
-<h1>Megatest Web App API Specificiation</h1>
-<span id="author">Matt Welland</span><br>
-<span id="email" class="monospaced"><<a href="mailto:matt@kiatoa.com">matt@kiatoa.com</a>></span><br>
-<span id="revnumber">version 1.0,</span>
-<span id="revdate">2013-12</span>
-<div id="toc">
- <div id="toctitle">Table of Contents</div>
- <noscript><p><b>JavaScript must be enabled in your browser to display the table of contents.</b></p></noscript>
-</div>
-</div>
-<div id="content">
-<div id="preamble">
-<div class="sectionbody">
-<div class="paragraph"><p>Megatest Web App</p></div>
-<div class="olist arabic"><ol class="arabic">
-<li>
-<p>
-See runs
-</p>
-</li>
-<li>
-<p>
-Manage jobs
-</p>
-</li>
-<li>
-<p>
-Debug
-</p>
-</li>
-</ol></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_example_abstract">Example Abstract</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>The Megatest Web App aims to make as much of the power of the dashboard available to the web based user.</p></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_common">1. Common</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>This is an example endpoint. You will need to use your own cgi server to serve out your megatest runs.</p></div>
-<div class="paragraph"><p>Endpoint: <a href="http://kiatoa.com/cgi-bin/megatest">http://kiatoa.com/cgi-bin/megatest</a></p></div>
-<div class="sect2">
-<h3 id="_error_format_response">1.1. Error format response</h3>
-<div class="paragraph"><p>All API errors are returned in the following format:</p></div>
-<div class="exampleblock">
-<div class="content">
-<div class="paragraph"><p>{ "<span class="blue">error</span>" : "<span class="red">Error message</span>" }</p></div>
-</div></div>
-</div>
-<div class="sect2">
-<h3 id="_get_list_of_runs">1.2. Get List of Runs</h3>
-<div class="paragraph"><p>URL: <base>/runs</p></div>
-<div class="paragraph"><p>Method: GET</p></div>
-<div class="paragraph"><p>Filter Params: target, testpatt, offset, limit</p></div>
-<div class="paragraph"><p>Megatest Cmd: megatest -start-dir <path to megatest area> -list-runs % -target % -dumpmode json -fields runs:runname,id+tests:state,status:id</p></div>
-<div class="paragraph"><p>Response:</p></div>
-<div class="exampleblock">
-<div class="content">
-<div class="paragraph"><p>[
- {
- "<span class="red">run_id</span>" : "1",
- "<span class="red">name</span>" : "runname1",
- "<span class="red">target</span>" : "target1",
- "<span class="red">tests</span>" :
- [
- "<span class="green">test</span>":
- [
- {"<span class="blue">id</span>": 1, "<span class="blue">name</span>":test1, "<span class="blue">item_path</span>": "", "<span class="blue">shortdir</span>": "/temp/foo/bar/target1/runname1/test1", "<span class="blue">final_logf</span>": "megatest-rollup-test1.html", "<span class="blue">status</span>": "PASS#"}
- {"<span class="blue">id</span>": 2, "<span class="blue">name</span>":test2, "<span class="blue">item_path</span>": "", "<span class="blue">shortdir</span>": "/temp/foo/bar/target1/runname1/test2", "<span class="blue">final_logf</span>": "megatest-rollup-test2.html", "<span class="blue">status</span>": "PASS"}
- {"<span class="blue">id</span>": 3, "<span class="blue">name</span>":test3, "<span class="blue">item_path</span>": "", "<span class="blue">shortdir</span>": "/temp/foo/bar/target1/runname1/test3", "<span class="blue">final_logf</span>": "megatest-rollup-test3.html", "<span class="blue">status</span>": "PASS"}
- ]
- ]
- },
- {
- "<span class="red">run_id</span>" : "2",
- "<span class="red">name</span>" : "runname2",
- "<span class="red">target</span>" : "target2",
- "<span class="red">tests</span>" :
- [
- "<span class="green">test</span>:
- [
- {"<span class="blue">id</span>": 4, "<span class="blue">name</span>":[blue]test1, "<span class="blue">item_path</span>": "", "<span class="blue">shortdir</span>": "/temp/foo/bar/target2/runname2/test1", "<span class="blue">final_logf</span>": "megatest-rollup-test1.html", "<span class="blue">status</span>": "PASS"}
- {"<span class="blue">id</span>": 5, "<span class="blue">name</span>":[blue]test2, "<span class="blue">item_path</span>": "", "<span class="blue">shortdir</span>": "/temp/foo/bar/target2/runname2/test2", "<span class="blue">final_logf</span>": "megatest-rollup-test2.html", "<span class="blue">status</span>": "FAIL"}
- {"<span class="blue">id</span>": 6, "<span class="blue">name</span>":test3, "<span class="blue">item_path</span>": "", "<span class="blue">shortdir</span>": "/temp/foo/bar/target2/runname2/test3", "<span class="blue">final_logf</span>": "megatest-rollup-test3.html", "<span class="blue">status</span>": "PASS"}
- ]
- ]
- }
-]</p></div>
-</div></div>
-</div>
-<div class="sect2">
-<h3 id="_trigger_a_new_run">1.3. Trigger a new Run</h3>
-<div class="paragraph"><p>URL: <base>/runs</p></div>
-<div class="paragraph"><p>Method: POST</p></div>
-<div class="paragraph"><p>Megatest Cmd: megatest -runtests % -target <target> :runname <run_name> -run</p></div>
-<div class="paragraph"><p>Request Params:</p></div>
-<div class="exampleblock">
-<div class="content">
-<div class="paragraph"><p>{"<span class="blue">target</span>": "target_value", "<span class="blue">runname</span>" : "runname", "<span class="blue">test_pattern</span>": "optional test pattern"}</p></div>
-</div></div>
-<div class="paragraph"><p>Response:</p></div>
-<div class="paragraph"><p>If Error</p></div>
-<div class="exampleblock">
-<div class="content">
-<div class="paragraph"><p>{ "<span class="blue">error</span>" : "<span class="red">Error message</span>" }</p></div>
-</div></div>
-<div class="paragraph"><p>If Success returns the results of the run</p></div>
-<div class="exampleblock">
-<div class="content">
-<div class="paragraph"><p>[
- {
- "<span class="red">run_id</span>" : "2",
- "<span class="red">name</span>" : "runname2",
- "<span class="red">target</span>" : "target2",
- "<span class="red">tests</span>" :
- [
- "<span class="green">test</span>:
- [
- {"<span class="blue">id</span>": 4, "<span class="blue">name</span>":[blue]test1, "<span class="blue">item_path</span>": "", "<span class="blue">shortdir</span>": "/temp/foo/bar/target2/runname2/test1", "<span class="blue">final_logf</span>": "megatest-rollup-test1.html", "<span class="blue">status</span>": "PASS"}
- {"<span class="blue">id</span>": 5, "<span class="blue">name</span>":[blue]test2, "<span class="blue">item_path</span>": "", "<span class="blue">shortdir</span>": "/temp/foo/bar/target2/runname2/test2", "<span class="blue">final_logf</span>": "megatest-rollup-test2.html", "<span class="blue">status</span>": "FAIL"}
- {"<span class="blue">id</span>": 6, "<span class="blue">name</span>":test3, "<span class="blue">item_path</span>": "", "<span class="blue">shortdir</span>": "/temp/foo/bar/target2/runname2/test3", "<span class="blue">final_logf</span>": "megatest-rollup-test3.html", "<span class="blue">status</span>": "PASS"}
- ]
- ]
- }
-]</p></div>
-</div></div>
-</div>
-<div class="sect2">
-<h3 id="_get_perticular_run">1.4. Get perticular Run</h3>
-<div class="paragraph"><p>URL: <base>/runs/:id</p></div>
-<div class="paragraph"><p>Method: GET</p></div>
-<div class="paragraph"><p>Filter Params: testpatt</p></div>
-<div class="paragraph"><p>Megatest Cmd: megatest -start-dir <path to megatest area> -list-runs <runname> -target % -dumpmode json -fields runs:runname,id+tests:state,status:id</p></div>
-<div class="paragraph"><p>Response:</p></div>
-<div class="exampleblock">
-<div class="content">
-<div class="paragraph"><p>[
- {
- "<span class="red">run_id</span>" : "2",
- "<span class="red">name</span>" : "runname2",
- "<span class="red">target</span>" : "target2",
- "<span class="red">tests</span>" :
- [
- "<span class="green">test</span>":
- [
- {"<span class="blue">id</span>": 4, "<span class="blue">name</span>":[blue]test1, "<span class="blue">item_path</span>": "", "<span class="blue">shortdir</span>": "/temp/foo/bar/target2/runname2/test1", "<span class="blue">final_logf</span>": "megatest-rollup-test1.html", "<span class="blue">status</span>": "PASS"}
- {"<span class="blue">id</span>": 5, "<span class="blue">name</span>":[blue]test2, "<span class="blue">item_path</span>": "", "<span class="blue">shortdir</span>": "/temp/foo/bar/target2/runname2/test2", "<span class="blue">final_logf</span>": "megatest-rollup-test2.html", "<span class="blue">status</span>": "FAIL"}
- {"<span class="blue">id</span>": 6, "<span class="blue">name</span>":test3, "<span class="blue">item_path</span>": "", "<span class="blue">shortdir</span>": "/temp/foo/bar/target2/runname2/test3", "<span class="blue">final_logf</span>": "megatest-rollup-test3.html", "<span class="blue">status</span>": "PASS"}
- ]
- ]
- }
-]</p></div>
-</div></div>
-</div>
-<div class="sect2">
-<h3 id="_re_execute_a_run">1.5. Re-execute a run</h3>
-<div class="paragraph"><p>URL: <base>/runs/:id</p></div>
-<div class="paragraph"><p>Method: PUT/PATCH</p></div>
-<div class="paragraph"><p>Request Params: {"testpatt" : "pattern"}</p></div>
-<div class="paragraph"><p>Response:</p></div>
-<div class="exampleblock">
-<div class="content">
-<div class="paragraph"><p>[
- {
- "<span class="red">run_id</span>" : "2",
- "<span class="red">name</span>" : "runname2",
- "<span class="red">target</span>" : "target2",
- "<span class="red">tests</span>" :
- [
- "<span class="green">test</span>":
- [
- {"<span class="blue">id</span>": 4, "<span class="blue">name</span>":[blue]test1, "<span class="blue">item_path</span>": "", "<span class="blue">shortdir</span>": "/temp/foo/bar/target2/runname2/test1", "<span class="blue">final_logf</span>": "megatest-rollup-test1.html", "<span class="blue">status</span>": "PASS"}
- {"<span class="blue">id</span>": 5, "<span class="blue">name</span>":[blue]test2, "<span class="blue">item_path</span>": "", "<span class="blue">shortdir</span>": "/temp/foo/bar/target2/runname2/test2", "<span class="blue">final_logf</span>": "megatest-rollup-test2.html", "<span class="blue">status</span>": "FAIL"}
- {"<span class="blue">id</span>": 6, "<span class="blue">name</span>":test3, "<span class="blue">item_path</span>": "", "<span class="blue">shortdir</span>": "/temp/foo/bar/target2/runname2/test3", "<span class="blue">final_logf</span>": "megatest-rollup-test3.html", "<span class="blue">status</span>": "PASS"}
- ]
- ]
- }
-]</p></div>
-</div></div>
-</div>
-<div class="sect2">
-<h3 id="_get_list_of_tests_within_a_run">1.6. Get List of tests within a run</h3>
-<div class="paragraph"><p>URL: <base>/runs/:id/tests</p></div>
-<div class="paragraph"><p>Method: GET</p></div>
-<div class="paragraph"><p>Megatest Cmd: megatest -start-dir <path to megatest area> -list-runs <runname> -target % -dumpmode json -fields runs:runname,id+tests:state,status:id</p></div>
-<div class="paragraph"><p>Response:</p></div>
-<div class="exampleblock">
-<div class="content">
-<div class="paragraph"><p>[
- "<span class="red">tests</span>" :
- [
- {"<span class="blue">id</span>": 4, "<span class="blue">name</span>":[blue]test1, "<span class="blue">item_path</span>": "", "<span class="blue">shortdir</span>": "/temp/foo/bar/target2/runname2/test1", "<span class="blue">final_logf</span>": "megatest-rollup-test1.html", "<span class="blue">status</span>": "PASS"}
- {"<span class="blue">id</span>": 5, "<span class="blue">name</span>":[blue]test2, "<span class="blue">item_path</span>": "", "<span class="blue">shortdir</span>": "/temp/foo/bar/target2/runname2/test2", "<span class="blue">final_logf</span>": "megatest-rollup-test2.html", "<span class="blue">status</span>": "FAIL"}
- {"<span class="blue">id</span>": 6, "<span class="blue">name</span>":test3, "<span class="blue">item_path</span>": "", "<span class="blue">shortdir</span>": "/temp/foo/bar/target2/runname2/test3", "<span class="blue">final_logf</span>": "megatest-rollup-test3.html", "<span class="blue">status</span>": "PASS"}
- ]
-]</p></div>
-</div></div>
-</div>
-<div class="sect2">
-<h3 id="_re_execute_a_test_within_a_run">1.7. Re-execute a test within a run</h3>
-<div class="paragraph"><p>URL: <base>/runs/:id/tests/:id</p></div>
-<div class="paragraph"><p>Method: PUT/PATCH</p></div>
-<div class="paragraph"><p>Response:</p></div>
-<div class="exampleblock">
-<div class="content">
-<div class="paragraph"><p>{"<span class="blue">id</span>": "4", "<span class="blue">name</span>":"test1", "<span class="blue">item_path</span>": "", "<span class="blue">shortdir</span>": "/temp/foo/bar/target2/runname2/test1", "<span class="blue">final_logf</span>": "megatest-rollup-test1.html", "<span class="blue">status</span>": "PASS"}</p></div>
-</div></div>
-</div>
-<div class="sect2">
-<h3 id="_get_perticular_test_that_belongs_to_a_runs">1.8. Get perticular test that belongs to a Runs</h3>
-<div class="paragraph"><p>URL: <base>/runs/:id/tests/:id</p></div>
-<div class="paragraph"><p>Method: GET</p></div>
-<div class="paragraph"><p>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</p></div>
-<div class="paragraph"><p>Response:</p></div>
-<div class="exampleblock">
-<div class="content">
-<div class="paragraph"><p>{"<span class="blue">id</span>": "4", "<span class="blue">name</span>":"test1", "<span class="blue">item_path</span>": "", "<span class="blue">shortdir</span>": "/temp/foo/bar/target2/runname2/test1", "<span class="blue">final_logf</span>": "megatest-rollup-test1.html", "<span class="blue">status</span>": "PASS"}</p></div>
-</div></div>
-</div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_notes">2. Notes</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>Misc …</p></div>
-<div class="olist arabic"><ol class="arabic">
-<li>
-<p>
-blah
-</p>
-</li>
-<li>
-<p>
-baz
-</p>
-</li>
-</ol></div>
-</div>
-</div>
-</div>
-<div id="footnotes"><hr></div>
-<div id="footer">
-<div id="footer-text">
-Version 1.0<br>
-Last updated 2016-12-12 13:03:08 PST
-</div>
-</div>
-</body>
-</html>
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 <http://www.gnu.org/licenses/>.
+
+
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 <http://www.gnu.org/licenses/>.
+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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd">
-<html xmlns="http://www.w3.org/1999/xhtml" xml:lang="en" lang="en">
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/>
-<meta name="generator" content="http://www.nongnu.org/elyxer/"/>
-<meta name="create-date" content="2014-01-25"/>
-<link rel="stylesheet" href="http://elyxer.nongnu.org/lyx.css" type="text/css" media="all"/>
-<title>Megatest User Manual</title>
-</head>
-<body>
-<div id="globalWrapper">
-<div class="Standard">
-
-</div>
-<div class="Standard">
-
-</div>
-<div class="Standard">
-
-</div>
-<h1 class="title">
-Megatest User Manual
-</h1>
-<h2 class="author">
-Matthew Welland
-</h2>
-<h2 class="Date">
-Jan. 29, 2012
-</h2>
-<div class="Standard">
-<p><br/>
-</p>
-©2011 Matthew Welland. All rights reserved.
-</div>
-<div class="Standard">
-Megatest is free software released under the General Public License v2.0. Please see the file COPYING in the source distribution for details.
-</div>
-<div class="Standard">
-<div class="medskip"> </div>Email: matt@kiatoa.com.
-</div>
-<div class="Standard">
-Web: www.kiatoa.com/fossils/megatest
-</div>
-<div class="Standard">
-<div class="medskip"> </div>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.
-</div>
-<div class="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.
-</div>
-<div class="Standard">
-<p><br/>
-</p>
-
-</div>
-<h1 class="Section-">
-<a class="toc" name="toc-Section--1"></a>Megatest/document Revision History
-</h1>
-<div class="Standard">
-<i>Notable revisions of the software are occasionally documented here</i>.
-</div>
-<div class="Standard">
-<div class="center">
-<table>
-<tr>
-<td align="center" valign="top" style="width: 0.5in;">
-Version
-</td>
-<td align="center" valign="top" style="width: 0.5in;">
-Author
-</td>
-<td align="justify" valign="top" style="width: 3in;">
-Description
-</td>
-<td align="center" valign="top" style="width: 1in;">
-Date
-</td>
-
-</tr>
-<tr>
-<td align="center" valign="top" style="width: 0.5in;">
-v1.25
-</td>
-<td align="center" valign="top" style="width: 0.5in;">
-matt
-</td>
-<td align="justify" valign="top" style="width: 3in;">
-converted to new document template
-</td>
-<td align="center" valign="top" style="width: 1in;">
-<span class="unknown">\thedate</span>
-</td>
-
-</tr>
-
-</table>
-
-</div>
-
-</div>
-<div class="Standard">
-<p><br/>
-</p>
-<div class="fulltoc">
-<div class="tocheader">
-Table of Contents
-</div>
-<div class="tocindent">
-<div class="toc">
-<a class="Link" href="#toc-Section--1">Section: Megatest/document Revision History</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Section-1">Section 1: Introduction</a>
-</div>
-<div class="tocindent">
-<div class="toc">
-<a class="Link" href="#toc-Subsection-1.1">Subsection 1.1: Megatest design philosophy</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Subsection-1.2">Subsection 1.2: Megatest architecture</a>
-</div>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Section-2">Section 2: Installation</a>
-</div>
-<div class="tocindent">
-<div class="toc">
-<a class="Link" href="#toc-Subsection-2.1">Subsection 2.1: Dependencies</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Subsection-2.2">Subsection 2.2: Build and Install</a>
-</div>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Section-3">Section 3: Setup</a>
-</div>
-<div class="tocindent">
-<div class="toc">
-<a class="Link" href="#toc-Subsection-3.1">Subsection 3.1: Create megatest.config</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Subsection-3.2">Subsection 3.2: Create runconfigs.config</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Subsection-3.3">Subsection 3.3: Create the tests directory and your first test</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Subsection-3.4">Subsection 3.4: Create the testconfig file for your test</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Subsection-3.5">Subsection 3.5: Create your test running script, main.sh</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Subsection-3.6">Subsection 3.6: Run megatest and watch your run progress</a>
-</div>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Section-4">Section 4: Choose Flow or Unstructured Run?</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Section-5">Section 5: How to Write Tests</a>
-</div>
-<div class="tocindent">
-<div class="toc">
-<a class="Link" href="#toc-Subsection-5.1">Subsection 5.1: A Simple Test with one Step</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Subsection-5.2">Subsection 5.2: Create your testconfig file</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Subsection-5.3">Subsection 5.3: Create the main.csh script</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Subsection-5.4">Subsection 5.4: Simple Test with Multiple Steps </a>
-</div>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Section-6">Section 6: Simple Test with Multiple Steps, Some in Parallel</a>
-</div>
-<div class="tocindent">
-<div class="toc">
-<a class="Link" href="#toc-Subsection-6.1">Subsection 6.1: The Makefile</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Subsection-6.2">Subsection 6.2: The main.csh file</a>
-</div>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Section-7">Section 7: Simple Test with Iteration</a>
-</div>
-<div class="tocindent">
-<div class="toc">
-<a class="Link" href="#toc-Subsection-7.1">Subsection 7.1: Update your testconfig file for iteration</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Subsection-7.2">Subsection 7.2: Rewrite your main.csh for iteration</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Subsection-7.3">Subsection 7.3: Tests with Inter-test dependencies</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Subsection-7.4">Subsection 7.4: Rolling up Miscellaneous Data</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Subsection-7.5">Subsection 7.5: Rolling up Runs</a>
-</div>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Section-8">Section 8: Dashboard</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Section-9">Section 9: Generating an OpenDocument Spreadsheet from the Database</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Section-10">Section 10: Introspection</a>
-</div>
-<div class="tocindent">
-<div class="toc">
-<a class="Link" href="#toc-Subsection-10.1">Subsection 10.1: Getting previous test paths</a>
-</div>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Section-11">Section 11: Flows</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Section-12">Section 12: Flow Specification and Running (Not released yet)</a>
-</div>
-<div class="tocindent">
-<div class="toc">
-<a class="Link" href="#toc-Subsection-12.1">Subsection 12.1: Write your flow file</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Subsection-12.2">Subsection 12.2: Run the flow</a>
-</div>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Section-13">Section 13: Monitor based running</a>
-</div>
-<div class="tocindent">
-<div class="toc">
-<a class="Link" href="#toc-Subsection-13.1">Subsection 13.1: Monitor logic</a>
-</div>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Section-14">Section 14: Reference</a>
-</div>
-<div class="tocindent">
-<div class="toc">
-<a class="Link" href="#toc-Subsection-14.1">Subsection 14.1: Configuration file Syntax</a>
-</div>
-<div class="tocindent">
-<div class="toc">
-<a class="Link" href="#toc-Subsubsection-14.1.1">Subsubsection 14.1.1: Sections</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Subsubsection-14.1.2">Subsubsection 14.1.2: Variables</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Subsubsection-14.1.3">Subsubsection 14.1.3: Includes</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Subsubsection-14.1.4">Subsubsection 14.1.4: Setting a variable by running a command</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Subsubsection-14.1.5">Subsubsection 14.1.5: Notes</a>
-</div>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Subsection-14.2">Subsection 14.2: Environment variables</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Subsection-14.3">Subsection 14.3: megatest.config</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Subsection-14.4">Subsection 14.4: runconfigs.config file</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Subsection-14.5">Subsection 14.5: Writing tests</a>
-</div>
-<div class="tocindent">
-<div class="toc">
-<a class="Link" href="#toc-Subsubsection-14.5.1">Subsubsection 14.5.1: testconfig file</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Subsubsection-14.5.2">Subsubsection 14.5.2: Command line</a>
-</div>
-</div>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Appendix-A">Appendix A: Data</a>
-</div>
-<div class="toc">
-<a class="Link" href="#toc-Appendix-B">Appendix B: References</a>
-</div>
-</div>
-
-</div>
-
-</div>
-<div class="Standard">
-<p><br/>
-</p>
-
-</div>
-<h1 class="Section">
-<a class="toc" name="toc-Section-1">1</a> Introduction
-</h1>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-1.1">1.1</a> Megatest design philosophy
-</h2>
-<div class="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 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.
-</div>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-1.2">1.2</a> Megatest architecture
-</h2>
-<div class="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 “call home” to your master sqlite3 database.
-</div>
-<h1 class="Section">
-<a class="toc" name="toc-Section-2">2</a> Installation
-</h1>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-2.1">2.1</a> Dependencies
-</h2>
-<div class="Standard">
-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.
-</div>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-2.2">2.2</a> Build and Install
-</h2>
-<div class="Standard">
-Run “make test” to create the megatest executable. You may wish to copy the executable to a centrally accessible location.
-</div>
-<h1 class="Section">
-<a class="toc" name="toc-Section-3">3</a> Setup
-</h1>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-3.1">3.1</a> Create megatest.config
-</h2>
-<div class="Standard">
-Create the file megatest.config using the megatest.config template from the tests directory. At a minimum you need the following:
-</div>
-<div class="Standard">
-<div class="listing">
-<pre class="listing"># 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
-</pre>
-</div>
-
-</div>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-3.2">3.2</a> Create runconfigs.config
-</h2>
-<div class="Standard">
-This file is used to set environment variables that are run specific. You can simply create an empty file to start.
-</div>
-<div class="Standard">
-<div class="listing">
-<pre class="listing"># runconfigs.config
-</pre>
-</div>
-
-</div>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-3.3">3.3</a> Create the tests directory and your first test
-</h2>
-<div class="Standard">
-<div class="listing">
-<pre class="listing">mt
-|-- megatest.config
-|-- runconfigs.config
-‘-- tests
- ‘-- mytest
- |-- main.sh
- ‘-- testconfig
-</pre>
-</div>
-
-</div>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-3.4">3.4</a> Create the testconfig file for your test
-</h2>
-<div class="Standard">
-<div class="listing">
-<pre class="listing">[setup]
-runscript main.sh
-</pre>
-</div>
-
-</div>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-3.5">3.5</a> Create your test running script, main.sh
-</h2>
-<div class="Standard">
-<div class="listing">
-<pre class="listing">#!/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"
-</pre>
-</div>
-
-</div>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-3.6">3.6</a> Run megatest and watch your run progress
-</h2>
-<div class="Standard">
-<div class="listing">
-<pre class="listing">megatest :field1 abc :field2 def :runname 2011week08.4a -runall
-
-watch megatest -list-runs %
-
-# OR use the dashboard
-
-dashboard &
-</pre>
-</div>
-
-</div>
-<h1 class="Section">
-<a class="toc" name="toc-Section-4">4</a> Choose Flow or Unstructured Run?
-</h1>
-<div class="Standard">
-A flow is a structured and specifically sequenced set of tests. See the Flows chapter to understand the difference.
-</div>
-<h1 class="Section">
-<a class="toc" name="toc-Section-5">5</a> How to Write Tests
-</h1>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-5.1">5.1</a> A Simple Test with one Step
-</h2>
-<div class="Standard">
-<div class="listing">
-<pre class="listing">mkdir simpletest
-cd simpletest
-</pre>
-</div>
-
-</div>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-5.2">5.2</a> Create your testconfig file
-</h2>
-<div class="Standard">
-<div class="listing">
-<pre class="listing"># testconfig
-
-[setup]
-runscript main.csh
-</pre>
-</div>
-
-</div>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-5.3">5.3</a> Create the main.csh script
-</h2>
-<div class="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.
-</div>
-<div class="Standard">
-<div class="left">
-<div class="listing">
-<pre class="listing">#!/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 $?
-</pre>
-</div>
-
-</div>
-
-</div>
-<div class="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.
-</div>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-5.4">5.4</a> Simple Test with Multiple Steps
-</h2>
-<div class="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.
-</div>
-<div class="Standard">
-<div class="listing">
-<pre class="listing">#!/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 $?
-</pre>
-</div>
-
-</div>
-<h1 class="Section">
-<a class="toc" name="toc-Section-6">6</a> Simple Test with Multiple Steps, Some in Parallel
-</h1>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-6.1">6.1</a> The Makefile
-</h2>
-<div class="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.
-</div>
-<div class="Standard">
-<div class="listing">
-<pre class="listing"># 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)
-</pre>
-</div>
-
-</div>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-6.2">6.2</a> The main.csh file
-</h2>
-<div class="Standard">
-<div class="listing">
-<pre class="listing">#!/bin/tcsh -x
-
-# run the cpu1 and cpu2 simulations in parallel.
-# The -j parameter tells make how many jobs it may run in parallel
-
-<div class="left">
-make -j 2
-</div>
-
-$MT_MEGATEST -test-status :state COMPLETED :status $?
-</pre>
-</div>
-
-</div>
-<h1 class="Section">
-<a class="toc" name="toc-Section-7">7</a> Simple Test with Iteration
-</h1>
-<div class="Standard">
-Since no jobs run after the cpu1 and cpu2 simulations in this test it is possible to use iterated mode.
-</div>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-7.1">7.1</a> Update your testconfig file for iteration
-</h2>
-<div class="Standard">
-<div class="listing">
-<pre class="listing">[setup]
-runscript main.csh
-<div class="left">
-
-</div>
-
-[items]
-CPU cpu1 cpu2
-</pre>
-</div>
-
-</div>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-7.2">7.2</a> Rewrite your main.csh for iteration
-</h2>
-<div class="Standard">
-<div class="listing">
-<pre class="listing">#!/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 $?
-</pre>
-</div>
-
-</div>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-7.3">7.3</a> Tests with Inter-test dependencies
-</h2>
-<div class="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 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”.
-</div>
-<div class="Standard">
-<div class="listing">
-<pre class="listing"># testconfig for the "system" test
-[setup]
-runscript main.csh
-waiton cpu mem
-</pre>
-</div>
-
-</div>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-7.4">7.4</a> Rolling up Miscellaneous Data
-</h2>
-<div class="Standard">
-Use the -load-test-data switch to roll up arbitrary data from a test into the test_data table.
-</div>
-<div class="Standard">
-<div class="listing">
-<pre class="listing"># 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
-</pre>
-</div>
-
-</div>
-<div class="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.
-</div>
-<div class="Standard">
-Where value, expected and tol are specified the behavior is as follows.
-</div>
-<ul>
-<li>
-If value, expected and tol are numbers then status is calculated as PASS if (expected-tol) <= value <= (expected+tol)
-</li>
-<li>
-If value and expected are numbers and tol is >, <, >= or <= then value is compared with expected using the operator given by tol
-</li>
-<li>
-If status is specified its value overrides the above calculations.
-</li>
-
-</ul>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-7.5">7.5</a> Rolling up Runs
-</h2>
-<div class="Standard">
-To roll up a number of tests in a sequence of runs to a single run use the -rollup command.
-</div>
-<div class="Standard">
-<div class="listing">
-<pre class="listing">megatest -rollup :sysname ubuntu :fsname nfs :datapath none :runname rollup_ww38
-</pre>
-</div>
-
-</div>
-<div class="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.
-</div>
-<h1 class="Section">
-<a class="toc" name="toc-Section-8">8</a> Dashboard
-</h1>
-<div class="Standard">
-<div class="listing">
-<pre class="listing">> dashboard &
-</pre>
-</div>
-
-</div>
-<div class="Standard">
-<img class="embedded" src="dashboard.png" alt="figure dashboard.png" style="width: 730px; max-width: 913px; height: 626px; max-height: 783px;"/>
-
-</div>
-<div class="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.
-</div>
-<div class="Standard">
-<img class="embedded" src="dashboard-test.png" alt="figure dashboard-test.png" style="width: 643px; max-width: 804px; height: 571px; max-height: 714px;"/>
-
-</div>
-<h1 class="Section">
-<a class="toc" name="toc-Section-9">9</a> Generating an OpenDocument Spreadsheet from the Database
-</h1>
-<div class="Standard">
-And OpenDocument multi-paned spreadsheet can be generated from the megatest.db file by running -extract-ods
-</div>
-<div class="Standard">
-<div class="listing">
-<pre class="listing">megatest -extract-ods results.ods :runname %
-</pre>
-</div>
-
-</div>
-<div class="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.
-</div>
-<h1 class="Section">
-<a class="toc" name="toc-Section-10">10</a> Introspection
-</h1>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-10.1">10.1</a> Getting previous test paths
-</h2>
-<div class="Standard">
-<div class="listing">
-<pre class="listing">megatest -test-paths -target %/%/% :runname % -testpatt % -itempatt % :status PASS
-</pre>
-</div>
-
-</div>
-<h1 class="Section">
-<a class="toc" name="toc-Section-11">11</a> Flows
-</h1>
-<div class="Standard">
-A flow specifies the tests to run, the order and dependencies and is managed by a running megatest process.
-</div>
-<h1 class="Section">
-<a class="toc" name="toc-Section-12">12</a> Flow Specification and Running (Not released yet)
-</h1>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-12.1">12.1</a> Write your flow file
-</h2>
-<div class="Standard">
-flows/<flowname>.config
-</div>
-<div class="Standard">
-<div class="listing">
-<pre class="listing"># 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
-</pre>
-</div>
-
-</div>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-12.2">12.2</a> Run the flow
-</h2>
-<div class="Standard">
-<div class="listing">
-<pre class="listing">megatest -runflow <flowname> :FIELD1 val1 :FIELD2 val2 :runname wk32.4
-</pre>
-</div>
-
-</div>
-<h1 class="Section">
-<a class="toc" name="toc-Section-13">13</a> Monitor based running
-</h1>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-13.1">13.1</a> Monitor logic
-</h2>
-<div class="Standard">
-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.
-</div>
-<div class="Standard">
-<img class="embedded" src="monitor-state-diagram.png" alt="figure monitor-state-diagram.png" style="max-width: 531px; max-height: 465px;"/>
-
-</div>
-<h1 class="Section">
-<a class="toc" name="toc-Section-14">14</a> Reference
-</h1>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-14.1">14.1</a> Configuration file Syntax
-</h2>
-<div class="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.
-</div>
-<h3 class="Subsubsection">
-<a class="toc" name="toc-Subsubsection-14.1.1">14.1.1</a> Sections
-</h3>
-<div class="Standard">
-<div class="listing">
-<pre class="listing">[section name]
-</pre>
-</div>
-
-</div>
-<div class="Standard">
-This creates a section named “section name”
-</div>
-<h3 class="Subsubsection">
-<a class="toc" name="toc-Subsubsection-14.1.2">14.1.2</a> Variables
-</h3>
-<div class="Standard">
-<div class="listing">
-<pre class="listing">VARX has this value
-</pre>
-</div>
-
-</div>
-<div class="Standard">
-The variable “VARX” will have the value “has this value”
-</div>
-<h3 class="Subsubsection">
-<a class="toc" name="toc-Subsubsection-14.1.3">14.1.3</a> Includes
-</h3>
-<div class="Standard">
-<div class="listing">
-<pre class="listing">[include filename]
-</pre>
-</div>
-
-</div>
-<div class="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).
-</div>
-<h3 class="Subsubsection">
-<a class="toc" name="toc-Subsubsection-14.1.4">14.1.4</a> Setting a variable by running a command
-</h3>
-<div class="Standard">
-<div class="listing">
-<pre class="listing">VARNAME [system ls /tmp]
-</pre>
-</div>
-
-</div>
-<div class="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.
-</div>
-<h3 class="Subsubsection">
-<a class="toc" name="toc-Subsubsection-14.1.5">14.1.5</a> Notes
-</h3>
-<ul>
-<li>
-Some variables are infered as lists. Each token on the line separated by whitespace will be member of the list.
-</li>
-<li>
-Comments (lines starting with #) and blank lines are ignored.
-</li>
-
-</ul>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-14.2">14.2</a> Environment variables
-</h2>
-<div class="Standard">
-<table>
-<tr>
-<td align="left" valign="top" style="width: 10%;">
-Variable
-</td>
-<td align="left" valign="top" style="width: 50%;">
-Purpose
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top" style="width: 10%;">
-MT_CMDINFO
-</td>
-<td align="left" valign="top" style="width: 50%;">
-Conveys test variables to the megatest test runner.
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top" style="width: 10%;">
-MT_TEST_RUN_DIR
-</td>
-<td align="left" valign="top" style="width: 50%;">
-Directory assigned by megatest for the test to run.
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top" style="width: 10%;">
-MT_TEST_NAME
-</td>
-<td align="left" valign="top" style="width: 50%;">
-Name of the test, corrosponds to the directory name under tests.
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top" style="width: 10%;">
-MT_ITEM_INFO
-</td>
-<td align="left" valign="top" style="width: 50%;">
-Iterated tests will set this to a sequence of key/values ((KEY val) ...)
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top" style="width: 10%;">
-MT_RUN_AREA_HOME
-</td>
-<td align="left" valign="top" style="width: 50%;">
-Directory where megatest was launched from and where the tests code can be found
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top" style="width: 10%;">
-MT_RUNNAME
-</td>
-<td align="left" valign="top" style="width: 50%;">
-Name of this run as set by the :runname parameter
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top" style="width: 10%;">
-MT_MEGATEST
-</td>
-<td align="left" valign="top" style="width: 50%;">
-Path/Filename to megatest executable. Found either from called path or but using the “exectuable” keyword in the [setup] section.
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top" style="width: 10%;">
-<field1> ....
-</td>
-<td align="left" valign="top" style="width: 50%;">
-The field values as set on the megatest -runall command line (e.g. :field1 abc)
-</td>
-
-</tr>
-
-</table>
-
-</div>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-14.3">14.3</a> megatest.config
-</h2>
-<div class="Standard">
-<table>
-<tr>
-<td align="left" valign="top" style="width: 10%;">
-section
-</td>
-<td align="left" valign="top" style="width: 15%;">
-variable
-</td>
-<td align="left" valign="top" style="width: 20%;">
-value
-</td>
-<td align="left" valign="top" style="width: 6%;">
-required
-</td>
-<td align="left" valign="top" style="width: 20%;">
-comment
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top" style="width: 10%;">
-[setup]
-</td>
-<td align="left" valign="top" style="width: 15%;">
-max_concurrent_jobs
-</td>
-<td align="left" valign="top" style="width: 20%;">
-if variable is not defined no limit on jobs
-</td>
-<td align="left" valign="top" style="width: 6%;">
-no
-</td>
-<td align="left" valign="top" style="width: 20%;">
-
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top" style="width: 10%;">
-
-</td>
-<td align="left" valign="top" style="width: 15%;">
-executable
-</td>
-<td align="left" valign="top" style="width: 20%;">
-full path to megatest binary
-</td>
-<td align="left" valign="top" style="width: 6%;">
-no
-</td>
-<td align="left" valign="top" style="width: 20%;">
-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.
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top" style="width: 10%;">
-
-</td>
-<td align="left" valign="top" style="width: 15%;">
-runsdir
-</td>
-<td align="left" valign="top" style="width: 20%;">
-full path to where the link tree to all runs will be created
-</td>
-<td align="left" valign="top" style="width: 6%;">
-no
-</td>
-<td align="left" valign="top" style="width: 20%;">
-Because your runs may be spread out over several disk partitions a central link tree is created to make finding all the runs easy.
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top" style="width: 10%;">
-[fields]
-</td>
-<td align="left" valign="top" style="width: 15%;">
-string of letters, numbers and underscore
-</td>
-<td align="left" valign="top" style="width: 20%;">
-string of letters, numbers and underscore
-</td>
-<td align="left" valign="top" style="width: 6%;">
-at least one
-</td>
-<td align="left" valign="top" style="width: 20%;">
-
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top" style="width: 10%;">
-[jobtools]
-</td>
-<td align="left" valign="top" style="width: 15%;">
-launcher
-</td>
-<td align="left" valign="top" style="width: 20%;">
-command line used to launch jobs - the job command (megatest -execute) will be appended to this
-</td>
-<td align="left" valign="top" style="width: 6%;">
-no
-</td>
-<td align="left" valign="top" style="width: 20%;">
-
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top" style="width: 10%;">
-
-</td>
-<td align="left" valign="top" style="width: 15%;">
-workhosts
-</td>
-<td align="left" valign="top" style="width: 20%;">
-list of hostnames to run jobs on NOT SUPPORTED RIGHT NOW
-</td>
-<td align="left" valign="top" style="width: 6%;">
-n/a
-</td>
-<td align="left" valign="top" style="width: 20%;">
-
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top" style="width: 10%;">
-[jobgroups]
-</td>
-<td align="left" valign="top" style="width: 15%;">
-string of letters, numbers and underscore
-</td>
-<td align="left" valign="top" style="width: 20%;">
-number
-</td>
-<td align="left" valign="top" style="width: 6%;">
-no
-</td>
-<td align="left" valign="top" style="width: 20%;">
-Control number of jobs allowed to concurrently run in categories. See [jobgroup] in testconfig
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top" style="width: 10%;">
-[env-override]
-</td>
-<td align="left" valign="top" style="width: 15%;">
-string of letters, numbers and underscore
-</td>
-<td align="left" valign="top" style="width: 20%;">
-any string
-</td>
-<td align="left" valign="top" style="width: 6%;">
-no
-</td>
-<td align="left" valign="top" style="width: 20%;">
-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.
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top" style="width: 10%;">
-[disks]
-</td>
-<td align="left" valign="top" style="width: 15%;">
-string of letters, numbers and underscore
-</td>
-<td align="left" valign="top" style="width: 20%;">
-a valid path writable by the test launching process and by the test process
-</td>
-<td align="left" valign="top" style="width: 6%;">
-yes
-</td>
-<td align="left" valign="top" style="width: 20%;">
-The disk usage balancing algorithm is to choose the disk with the least space for each test run.
-</td>
-
-</tr>
-
-</table>
-
-</div>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-14.4">14.4</a> runconfigs.config file
-</h2>
-<div class="Standard">
-<table>
-<tr>
-<td align="left" valign="top" style="width: 20%;">
-section
-</td>
-<td align="left" valign="top" style="width: 12%;">
-variable
-</td>
-<td align="left" valign="top" style="width: 3%;">
-value
-</td>
-<td align="left" valign="top" style="width: 4%;">
-required?
-</td>
-<td align="left" valign="top" style="width: 30%;">
-comment
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top" style="width: 20%;">
-[default]
-</td>
-<td align="left" valign="top" style="width: 12%;">
-string of letters, numbers and underscore
-</td>
-<td align="left" valign="top" style="width: 3%;">
-any
-</td>
-<td align="left" valign="top" style="width: 4%;">
-no
-</td>
-<td align="left" valign="top" style="width: 30%;">
-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
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top" style="width: 20%;">
-[field1value/field2value...]
-</td>
-<td align="left" valign="top" style="width: 12%;">
-string of letters, numbers and underscore
-</td>
-<td align="left" valign="top" style="width: 3%;">
-any
-</td>
-<td align="left" valign="top" style="width: 4%;">
-no
-</td>
-<td align="left" valign="top" style="width: 30%;">
-the values in this section will be set for any run where field1 is field1value, field2 is field2value and fieldN is fieldNvalue.
-</td>
-
-</tr>
-
-</table>
-
-</div>
-<div class="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:
-</div>
-<div class="Standard">
-<div class="listing">
-<pre class="listing"># 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
-</pre>
-</div>
-
-</div>
-<div class="Paragraph-">
-<a class="toc" name="toc-Paragraph--1"></a>Running megatest like this:
-</div>
-<div class="Code">
-megatest :CUSTOMER megacorp :LOCATION new_zealand :runname week12_2011_run1 -runall
-</div>
-<div class="Paragraph-">
-<a class="toc" name="toc-Paragraph--2"></a>Would set:
-</div>
-<div class="Code">
-ENCRYPTION true
-</div>
-<div class="Code">
-TESTPATH /nfs/testing/megacorp_runs
-</div>
-<h2 class="Subsection">
-<a class="toc" name="toc-Subsection-14.5">14.5</a> Writing tests
-</h2>
-<h3 class="Subsubsection">
-<a class="toc" name="toc-Subsubsection-14.5.1">14.5.1</a> testconfig file
-</h3>
-<div class="Standard">
-<table>
-<tr>
-<td align="left" valign="top" style="width: 8%;">
-section
-</td>
-<td align="left" valign="top" style="width: 6%;">
-variable
-</td>
-<td align="left" valign="top" style="width: 12%;">
-value
-</td>
-<td align="left" valign="top" style="width: 6%;">
-required?
-</td>
-<td align="left" valign="top" style="width: 30%;">
-comments
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top" style="width: 8%;">
-[setup]
-</td>
-<td align="left" valign="top" style="width: 6%;">
-runscript
-</td>
-<td align="left" valign="top" style="width: 12%;">
-name of script to execute for this test
-</td>
-<td align="left" valign="top" style="width: 6%;">
-yes
-</td>
-<td align="left" valign="top" style="width: 30%;">
-The script must be executable and either provide the full path or put a copy at the top of your test directory
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top" style="width: 8%;">
-[requirements]
-</td>
-<td align="left" valign="top" style="width: 6%;">
-waiton
-</td>
-<td align="left" valign="top" style="width: 12%;">
-list of valid test names
-</td>
-<td align="left" valign="top" style="width: 6%;">
-no
-</td>
-<td align="left" valign="top" style="width: 30%;">
-This test will not run until the named tests are state completed and status PASS
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top" style="width: 8%;">
-
-</td>
-<td align="left" valign="top" style="width: 6%;">
-jobgroup
-</td>
-<td align="left" valign="top" style="width: 12%;">
-
-</td>
-<td align="left" valign="top" style="width: 6%;">
-
-</td>
-<td align="left" valign="top" style="width: 30%;">
-
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top" style="width: 8%;">
-[items]
-</td>
-<td align="left" valign="top" style="width: 6%;">
-any valid
-</td>
-<td align="left" valign="top" style="width: 12%;">
-list of values
-</td>
-<td align="left" valign="top" style="width: 6%;">
-no
-</td>
-<td align="left" valign="top" style="width: 30%;">
-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
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top" style="width: 8%;">
-[eztests]
-</td>
-<td align="left" valign="top" style="width: 6%;">
-any valid
-</td>
-<td align="left" valign="top" style="width: 12%;">
-stepname command
-</td>
-<td align="left" valign="top" style="width: 6%;">
-no
-</td>
-<td align="left" valign="top" style="width: 30%;">
-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
-</td>
-
-</tr>
-
-</table>
-
-</div>
-<h3 class="Subsubsection">
-<a class="toc" name="toc-Subsubsection-14.5.2">14.5.2</a> Command line
-</h3>
-<div class="Standard">
-<table>
-<tr>
-<td align="left" valign="top">
-switch or param
-</td>
-<td align="left" valign="top">
-parameter
-</td>
-<td align="left" valign="top" style="width: 30%;">
-purpose
-</td>
-<td align="left" valign="top">
-comments
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top">
--h
-</td>
-<td align="left" valign="top">
-
-</td>
-<td align="left" valign="top" style="width: 30%;">
-brief help
-</td>
-<td align="left" valign="top">
-
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top">
--runall
-</td>
-<td align="left" valign="top">
-
-</td>
-<td align="left" valign="top" style="width: 30%;">
-run all tests
-</td>
-<td align="left" valign="top">
-
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top">
--runtests
-</td>
-<td align="left" valign="top">
-test1,test2,...
-</td>
-<td align="left" valign="top" style="width: 30%;">
-run one or more tests
-</td>
-<td align="left" valign="top">
-
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top">
--step
-</td>
-<td align="left" valign="top">
-stepname
-</td>
-<td align="left" valign="top" style="width: 30%;">
-record a step
-</td>
-<td align="left" valign="top">
-requires :state and :status
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top">
--test-status
-</td>
-<td align="left" valign="top">
-
-</td>
-<td align="left" valign="top" style="width: 30%;">
-record the test status
-</td>
-<td align="left" valign="top">
-requires :state and :status
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top">
--setlog
-</td>
-<td align="left" valign="top">
-logfilename
-</td>
-<td align="left" valign="top" style="width: 30%;">
-set the logfile name for a test
-</td>
-<td align="left" valign="top">
-path is assumed to be relative to the test run directory
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top">
--set-toplog
-</td>
-<td align="left" valign="top">
-logfilename
-</td>
-<td align="left" valign="top" style="width: 30%;">
-set the logfile name for the top test in an iterated test run
-</td>
-<td align="left" valign="top">
-each sub test can have its own logfile set
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top">
--m
-</td>
-<td align="left" valign="top">
-“comment”
-</td>
-<td align="left" valign="top" style="width: 30%;">
-sets a comment for the step, test or run
-</td>
-<td align="left" valign="top">
-
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top">
-:runname
-</td>
-<td align="left" valign="top">
-[a-zA-Z0-9_-]+
-</td>
-<td align="left" valign="top" style="width: 30%;">
-directory in which this run will be stored in the test run area
-</td>
-<td align="left" valign="top">
-
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top">
-:state
-</td>
-<td align="left" valign="top">
-any value
-</td>
-<td align="left" valign="top" style="width: 30%;">
-Set the step or test state, this is stored in the state field in the steps or tests table respectively
-</td>
-<td align="left" valign="top">
-For tests Megatest recognises “INCOMPLETE”, “COMPLETE”
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top">
-:status
-</td>
-<td align="left" valign="top">
-any value
-</td>
-<td align="left" valign="top" style="width: 30%;">
-Set the step or test status, this is stored in the status field in the steps or tests table respectively
-</td>
-<td align="left" valign="top">
-For tests Megatest recognises “PASS”, “FAIL”, and “CHECK”
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top">
--list-runs
-</td>
-<td align="left" valign="top">
-any value, % is wildcard
-</td>
-<td align="left" valign="top" style="width: 30%;">
-Respects -itempatt and -testpatt for filters
-</td>
-<td align="left" valign="top">
-
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top">
--testpatt
-</td>
-<td align="left" valign="top">
-any value, % is wildcard
-</td>
-<td align="left" valign="top" style="width: 30%;">
-
-</td>
-<td align="left" valign="top">
-
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top">
--itempatt
-</td>
-<td align="left" valign="top">
-any value, % is wildcard
-</td>
-<td align="left" valign="top" style="width: 30%;">
-
-</td>
-<td align="left" valign="top">
-
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top">
--showkeys
-</td>
-<td align="left" valign="top">
-
-</td>
-<td align="left" valign="top" style="width: 30%;">
-Print the keys being used for this database
-</td>
-<td align="left" valign="top">
-
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top">
--force
-</td>
-<td align="left" valign="top">
-
-</td>
-<td align="left" valign="top" style="width: 30%;">
-Test will not re-run if in the “PASS”, “CHECK” or “KILLED”, using -force will force the run to be launched.
-</td>
-<td align="left" valign="top">
-WARNING: The -force switch will bypass any “waiton” dependencies.
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top">
--xterm
-</td>
-<td align="left" valign="top">
-
-</td>
-<td align="left" valign="top" style="width: 30%;">
-Launch an xterm instead of run the test. The xterm will have the environment that the test would see.
-</td>
-<td align="left" valign="top">
-
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top">
--remove-runs
-</td>
-<td align="left" valign="top">
-
-</td>
-<td align="left" valign="top" style="width: 30%;">
-Remove a run, test or subtest from the database and the disk. Cannot be undone. Requires -testpatt, -itempatt, :runname and all keys be specified.
-</td>
-<td align="left" valign="top">
-
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top">
-<i>Test helpers</i>
-</td>
-<td align="left" valign="top">
-
-</td>
-<td align="left" valign="top" style="width: 30%;">
-
-</td>
-<td align="left" valign="top">
-
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top">
--runstep
-</td>
-<td align="left" valign="top">
-
-</td>
-<td align="left" valign="top" style="width: 30%;">
-Used inside a test to run a step, record the start and end of the step and optionally analyze the output using logpro.
-</td>
-<td align="left" valign="top">
-
-</td>
-
-</tr>
-<tr>
-<td align="left" valign="top">
--logpro
-</td>
-<td align="left" valign="top">
-
-</td>
-<td align="left" valign="top" style="width: 30%;">
-If using logpro to acess the PASS/FAIL status of the step you specify the logpro file with this parameter.
-</td>
-<td align="left" valign="top">
-
-</td>
-
-</tr>
-
-</table>
-
-</div>
-<h1 class="Section">
-<a class="toc" name="toc-Appendix-A">A</a> Data
-</h1>
-<h1 class="Section">
-<a class="toc" name="toc-Appendix-B">B</a> References
-</h1>
-
-<hr class="footer"/>
-<div class="footer" id="generated-by">
-Document generated by <a href="http://elyxer.nongnu.org/">eLyXer 1.2.3 (2011-08-31)</a> on <span class="create-date">2014-01-25T22:27:14.268137</span>
-</div>
-</div>
-</body>
-</html>
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 <http://www.gnu.org/licenses/>.
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 <http://www.gnu.org/licenses/>.
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 <http://www.gnu.org/licenses/>.
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 <http://www.gnu.org/licenses/>.
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 <http://www.gnu.org/licenses/>.
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 <http://www.gnu.org/licenses/>.
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 <http://www.gnu.org/licenses/>.
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
@@ -11,17 +28,17 @@
# design_spec.html : $(SRCFILES) $(CSVFILES)
# asciidoc -b html5 -a icons -a iconsdir=$(DISPATH)/images/icons -a toc2 design_spec.txt
#
-all : server.ps megatest_manual.html client.ps complex-itemmap.png
+all : server.ps megatest_manual.html client.ps complex-itemmap.png megatest_manual.pdf
-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 *.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_manual.pdf : megatest_manual.txt *.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 <http://www.gnu.org/licenses/>.
+
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 <http://www.gnu.org/licenses/>.
+
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/devnotes.txt
Index: docs/manual/devnotes.txt
==================================================================
--- /dev/null
+++ docs/manual/devnotes.txt
@@ -0,0 +1,37 @@
+Developer Notes
+---------------
+
+Collected here are some topics that may interest the megatest developer.
+
+telemetry
+~~~~~~~~~
+
+A new feature introduced in v1.6525 allows a centralized debug messaging system. Debugging client-server issues
+is greatly aided by a centralized, time coherent log of events across test execution, server, and runner. This
+is provided by the telemetry feature
+
+
+source code call example
+
+
+[source,ini]
+ [telemetry]
+ host <IP where telemetry daemon will run>
+ port <UDP port to listen -- we recommend 5929>
+ want-events <comma separated list of telemetry-log keywords
+
+[source,ini]
+ [telemetry]
+ host 10.38.32.91
+ port 5929
+ want-events ALL
+
+[source,scheme]
+(common:telemetry-log <keyword string>
+
+
+Usage:
+1. Add telemetry section to megatest.config
+2. Start telemetry daemon telemetry-daemon -a start -l /tmp/my-telemetry.log
+3. Run megatest
+4. examine / parse telemetry log
Index: docs/manual/getting_started.txt
==================================================================
--- docs/manual/getting_started.txt
+++ docs/manual/getting_started.txt
@@ -1,14 +1,30 @@
+// This file is part of Megatest.
+//
+// Megatest is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Megatest is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU 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/>.
+//
+// Copyright 2006-2012, Matthew Welland.
Getting Started
---------------
-[partintro]
+// [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.
Index: docs/manual/howto.txt
==================================================================
--- docs/manual/howto.txt
+++ docs/manual/howto.txt
@@ -1,5 +1,21 @@
+// This file is part of Megatest.
+//
+// Megatest is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Megatest is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU 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/>.
+//
+// Copyright 2006-2012, Matthew Welland.
How To Do Things
----------------
Process Runs
@@ -52,10 +68,27 @@
Hint: You can browse the archive using bup commands directly.
----------------
bup -d /path/to/bup/archive ftp
----------------
+
+Pass Data from Test to Test
+~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+.To save the data call archive save within your test:
+----------------
+megatest -archive save
+----------------
+
+.To retrieve the data call archive get using patterns as needed
+----------------
+# Put the retrieved data into /tmp
+DESTPATH=/tmp/$USER/$MT_TARGET/$MT_RUN_NAME/$MT_TESTNAME/$MT_ITEMPATH/my_data
+mkdir -p $DESTPATH
+megatest -archive get -runname % -dest $DESTPATH
+----------------
+
Submit jobs to Host Types based on Test Name
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
.In megatest.config
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 <http://www.gnu.org/licenses/>.
+
Installation
------------
Dependencies
~~~~~~~~~~~~
@@ -6,5 +23,6 @@
Chicken scheme and a number of "eggs" are required for building
Megatest. See the script installall.sh in the utils directory of the
source distribution for an automated way to install everything
needed for building Megatest on Linux.
+
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 <http://www.gnu.org/licenses/>.
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
ADDED docs/manual/megatest-stand-alone-area.png
Index: docs/manual/megatest-stand-alone-area.png
==================================================================
--- /dev/null
+++ docs/manual/megatest-stand-alone-area.png
cannot compute difference between binary files
ADDED docs/manual/megatest-system-architecture.png
Index: docs/manual/megatest-system-architecture.png
==================================================================
--- /dev/null
+++ docs/manual/megatest-system-architecture.png
cannot compute difference between binary files
ADDED docs/manual/megatest-system-architecture.svg
Index: docs/manual/megatest-system-architecture.svg
==================================================================
--- /dev/null
+++ docs/manual/megatest-system-architecture.svg
@@ -0,0 +1,5662 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+ xmlns:dc="http://purl.org/dc/elements/1.1/"
+ xmlns:cc="http://creativecommons.org/ns#"
+ xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#"
+ xmlns:svg="http://www.w3.org/2000/svg"
+ xmlns="http://www.w3.org/2000/svg"
+ xmlns:xlink="http://www.w3.org/1999/xlink"
+ xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+ xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+ width="210mm"
+ height="297mm"
+ viewBox="0 0 744.09448819 1052.3622047"
+ id="svg2"
+ version="1.1"
+ inkscape:version="0.91 r13725"
+ sodipodi:docname="megatest-system-architecture.svg"
+ inkscape:export-filename="Z:\src\megatest\docs\manual\megatest-system-architecture.png"
+ inkscape:export-xdpi="90"
+ inkscape:export-ydpi="90">
+ <defs
+ id="defs4">
+ <marker
+ inkscape:stockid="Arrow1Lstart"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="marker16686"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ id="path16688"
+ d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+ transform="scale(0.8) translate(12.5,0)" />
+ </marker>
+ <marker
+ inkscape:isstock="true"
+ style="overflow:visible"
+ id="marker16520"
+ refX="0.0"
+ refY="0.0"
+ orient="auto"
+ inkscape:stockid="Arrow1Lstart"
+ inkscape:collect="always">
+ <path
+ transform="scale(0.8) translate(12.5,0)"
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+ d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+ id="path16522" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow2Lstart"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow2Lstart"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ id="path4946"
+ style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+ d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+ transform="scale(1.1) translate(1,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow1Lstart"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow1Lstart"
+ style="overflow:visible"
+ inkscape:isstock="true"
+ inkscape:collect="always">
+ <path
+ id="path4928"
+ d="M 0.0,0.0 L 5.0,-5.0 L -12.5,0.0 L 5.0,5.0 L 0.0,0.0 z "
+ style="fill-rule:evenodd;stroke:#000000;stroke-width:1pt;stroke-opacity:1;fill:#000000;fill-opacity:1"
+ transform="scale(0.8) translate(12.5,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow2Lend"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="marker5302"
+ style="overflow:visible;"
+ inkscape:isstock="true">
+ <path
+ id="path5304"
+ style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+ d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+ transform="scale(1.1) rotate(180) translate(1,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow2Lend"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="marker5274"
+ style="overflow:visible;"
+ inkscape:isstock="true">
+ <path
+ id="path5276"
+ style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+ d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+ transform="scale(1.1) rotate(180) translate(1,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow2Lend"
+ orient="auto"
+ refY="0.0"
+ refX="0.0"
+ id="Arrow2Lend"
+ style="overflow:visible;"
+ inkscape:isstock="true">
+ <path
+ id="path4949"
+ style="fill-rule:evenodd;stroke-width:0.625;stroke-linejoin:round;stroke:#000000;stroke-opacity:1;fill:#000000;fill-opacity:1"
+ d="M 8.7185878,4.0337352 L -2.2072895,0.016013256 L 8.7185884,-4.0017078 C 6.9730900,-1.6296469 6.9831476,1.6157441 8.7185878,4.0337352 z "
+ transform="scale(1.1) rotate(180) translate(1,0)" />
+ </marker>
+ <inkscape:path-effect
+ effect="vonkoch"
+ id="path-effect4210"
+ is_visible="true"
+ ref_path="m 427.02546,366.74247 311.64896,0"
+ generator="m 427.02546,561.12273 103.88298,0 m 103.88299,0 103.88299,0"
+ similar_only="false"
+ nbgenerations="1"
+ drawall="true"
+ maxComplexity="1000" />
+ <inkscape:path-effect
+ effect="spiro"
+ id="path-effect4208"
+ is_visible="true" />
+ <inkscape:path-effect
+ effect="knot"
+ id="path-effect4206"
+ is_visible="true"
+ interruption_width="3"
+ prop_to_stroke_width="true"
+ add_stroke_width="true"
+ add_other_stroke_width="true"
+ switcher_size="15"
+ crossing_points_vector="" />
+ <inkscape:path-effect
+ effect="interpolate"
+ id="path-effect4204"
+ is_visible="true"
+ trajectory="M 0,0 0,0"
+ equidistant_spacing="true"
+ steps="5" />
+ <inkscape:path-effect
+ effect="gears"
+ id="path-effect4202"
+ is_visible="true"
+ teeth="10"
+ phi="5" />
+ <marker
+ inkscape:stockid="Arrow2Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker5302-0"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path5304-2"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+ d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+ transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow2Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker5302-0-9"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path5304-2-2"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+ d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+ transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow2Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker5302-0-9-7"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path5304-2-2-6"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+ d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+ transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow2Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker5302-0-9-7-7"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path5304-2-2-6-7"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+ d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+ transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow2Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker5302-0-9-7-7-1"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path5304-2-2-6-7-7"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+ d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+ transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow2Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker5274-8"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path5276-0"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+ d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+ transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow2Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker5274-8-6"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path5276-0-2"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+ d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+ transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow2Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker5274-8-6-7"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path5276-0-2-5"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+ d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+ transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow2Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker5274-8-6-7-5"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path5276-0-2-5-3"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+ d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+ transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow2Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker5302-0-9-7-7-6"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path5304-2-2-6-7-1"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+ d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+ transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
+ </marker>
+ <marker
+ inkscape:stockid="Arrow2Lend"
+ orient="auto"
+ refY="0"
+ refX="0"
+ id="marker5302-0-9-7-7-6-8"
+ style="overflow:visible"
+ inkscape:isstock="true">
+ <path
+ inkscape:connector-curvature="0"
+ id="path5304-2-2-6-7-1-6"
+ style="fill:#000000;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:0.625;stroke-linejoin:round;stroke-opacity:1"
+ d="M 8.7185878,4.0337352 -2.2072895,0.01601326 8.7185884,-4.0017078 c -1.7454984,2.3720609 -1.7354408,5.6174519 -6e-7,8.035443 z"
+ transform="matrix(-1.1,0,0,-1.1,-1.1,0)" />
+ </marker>
+ </defs>
+ <sodipodi:namedview
+ id="base"
+ pagecolor="#ffffff"
+ bordercolor="#666666"
+ borderopacity="1.0"
+ inkscape:pageopacity="0.0"
+ inkscape:pageshadow="2"
+ inkscape:zoom="0.88269231"
+ inkscape:cx="330.10992"
+ inkscape:cy="527.65204"
+ inkscape:document-units="px"
+ inkscape:current-layer="layer1"
+ showgrid="false"
+ inkscape:window-width="1876"
+ inkscape:window-height="1085"
+ inkscape:window-x="3865"
+ inkscape:window-y="33"
+ inkscape:window-maximized="0"
+ showguides="false">
+ <inkscape:grid
+ type="xygrid"
+ id="grid4462" />
+ </sodipodi:namedview>
+ <metadata
+ id="metadata7">
+ <rdf:RDF>
+ <cc:Work
+ rdf:about="">
+ <dc:format>image/svg+xml</dc:format>
+ <dc:type
+ rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
+ <dc:title></dc:title>
+ </cc:Work>
+ </rdf:RDF>
+ </metadata>
+ <g
+ inkscape:label="Layer 1"
+ inkscape:groupmode="layer"
+ id="layer1">
+ <image
+ y="187.43408"
+ x="132.13397"
+ id="image18538"
+ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAlcAAAE8CAIAAABiggPXAAAAA3NCSVQICAjb4U/gAAAgAElEQVR4
+nOydeVzU1f7/z5nPfAZmRmBgZnBDQEEvmLiAIlaiZSpmKrilYta1X2TW/X69XXO7fuubt9TK261b
+kdrN0lwKVNxwQc2VLy6IhgnGDorLLDCAM8h8lvP74+jHjzOfGQfB/TwfPXrgmXPO+6yf8/mc5XUg
+Quh6k72i2rD915P5f5QBAoFAIBAeX/r1jBj6dM/OQW29vRQAAGhnmIy9x3edrPRtG+ql9n3QySMQ
+CATCowdCiGE5hJAnnmUQ0nIKQPhAwtqu1VlNF57v2X788AFKby+4amPWiYomtT6E4XiO4z2JiEAg
+EAgEAQRAY+P1OtOlJstleEfPECq1IX4Bevwpdv/DqpRelExWe7ls6FOal0cOlBdWX1PrOl+3M54N
+pQQCgUAg3Ebj9aZaQzXfWNuxS6TSS+He8zVb45ULZTzi/bVtvRT0/Q8LtG29FDTv5X+s8NKo55vk
+Fk6lYHieJ2MggUAgEJoNAqDputVuqe7QLUbp4wvhHb7K1F6+6kam/lJRG78AmpY/kLAKWq5Uqqpr
+Zeu37JHzCHLcbUPgtQZrbY3FTVxeXgp9W90dTRIIBALhsQchhBCQAU6pUvM8AuAO31QIIW+luo5n
+AEKIvxWW4/hrtQaOtbsKqPBWK338JcPyPEI811BzRa7wVvkGiG1dqzUACNto9ACAW2ERAABAmbyh
+wSYHACDBDQAAQI259lpdXYBWI5kOjuMvVF7U6gOgjIyChCcCnmOtpguUQqXyb/ug00IgPIzgbyIE
+AOLvvLkEDzYQQAAgAkgIy/P8NdOF+OhwlbeXcyhTbV1e6WWvNhqXYQ2V/boG1DQ0VdaZlT7+AAAE
+UKPFENVRyfP8uUuXVf7thLA84hG4MWDLbwzkolFQTqGQjjpE0Vbbdaeswk4ddHU1ZoTQncZ7AuHR
+g2cZAKGMkt/4J8cinmfqqv+SGF10wbT7zCUfbXsAAACI5ziEeAhlMtmN7Woca4cyCgLA8xyEMggh
+z3MURfM8CxCAlBziCAGQURSEsgeXSwKhlRH2azZvbQ0ihJAoLK9QyPv2CKcoyjl+k6Uhr9R8a6hy
+CMvziG3s0S1E5e2VlfN7aY3Zu42GuVbTq5NqcOxTZReunCo5p9S0FYcVopIDABAC4q0xXXRo3IBA
+X3/f69cbcQgIIQQQQiiTyfz9/H9iiy7AWwkgEB4LEGNraAMsMiizyXyBog1vb/RiaxWQ0+i8eoR3
+4njUtrCi7pqZUmp4ptGLrfOSsRygGqEPUrSx2+oDZHWczNvOAR9ZEwfpRhb6UU21jLeKYuQyvhGo
+7RxoA21yGbJBNUf7ySj6QWeZQGglIAT4W9CDbZaibyiIkCgsjwACF6+YNu89DuW3fQ56U1xCfAwA
+gOeRZFgAIK3puOPI76MGRr34bK/th05X1lzpE6qJ7xtZUX0160Spj66TQ1hh4JMjBBy+BWUQtfGW
++asV1+U8vJlDGZThUdBHRStpgFiEIPkYJDw+IJ6Xo+vDYsOf6tL+531nzl8xtGsDXnmpn9XWFNYp
+0Eft/UzvrjHdQ+d/tbnGBkM1aOyg6LCgtua6azuOnsutqAVW49//O6nikrG2ztYvqsvx/NLiqisp
+41/c8uupvk91DvBtk3nkN9t1e8Iz/f3aKPefKNyZd5nzDpDJHN95CYRHDmEkQAh5stES4fEHAgCA
+MDDhsAgAhABHqTXtu4r889bL5/HSHc/zrsLKFaqa62jb4fzR8VEvDux1uqD06T6RZReu7D5eynjr
+KYoWh8Wriji4HADAcbx4FMTZgDJIyW5M2uDpHQghnsZBAHBkUynhsYOnfHadKNdr2iQNitr86+n4
+6HAvWv7z/+UHqEvfHDeo4pJx77FzDZzSG14f1q+7Qi7P+DU3vFPb4XERFVePX6ptksupp7oE/V56
+MW3PiT+qTCFtfb1oeWyPsLzC8rCgwJfie9XW207+Xhreqe3gmD8dzCutY30pikyoEB4feB4xDOuJ
+zxtziQjwNw+p8zxiWBaPRDxCrOjwujDPyvOIZTnpsNgu5XX1OrvtUP7YIdHx/XqUX7iy4//ON9Fa
+CkGeYcV2xaOeHADAo9tOSvAIAQBlUAZvjoKyW6MghAAChDgeIUCO2BMeL2Tyela99Wjhay/GvJE0
+kOf5dbtzK2pR1aXLDMdVXTEfKTSp/Dtogal7l44Qgqd7d/VVK33USn0b+gLLAAAuGmo2Hyq4UAdY
+jg4BACF0OO+PrNzK+B7Xev0peMuB03vzKgf1uNY9rCMFeZ7jACTfgoTHAQggAIBHPMN6OAoCACD+
+oBLCsjclYPCIKPYtdpcMe8M/QoBt7NTJt43K29bYpPX3DdK1KbjcQKv8nO0KY578pgkktggAgFAm
+g7KboQDE/xdN/pJvQcLjB5R7V5nrSi8YX4gLLCirLrxQA2gdaLzxq4z2BgBCgJTetNXWxLKc2XLN
+ZLnWyHC4a5RdNJSbmrx82/LXrwEAeB79XnKJoVTX7QzPo99LLzEydaOdkeF+hEg3Ijwu4DECAYQQ
+22RDPOfKo4yiKYU3XhmE+KPrZlgeCV9WDkPSbe6SYW8Mk421/bv6D+7XvaL66rH8soRner4U35s7
+cKrY1CDzUuNtpUJYh1FQYr+nSqVWKBQQCCuDEEAoA/DmauTN6VUC4bEBIWS3PhXk2yO8Y3HllfY6
+v/4R7Q8V1uClc4Wcgpyd5zkWwtp6W0HpxTXbjtquN+kD/JooPxntBQDgEeJ4gOCtNXOW58HN7aAc
+zwMIhc5253NVBMIjAh4MEEA8z9mM5U91aeulkNj81XDNVmpoVOk7488qAG8NJOINKmyTzVZ7RRQO
+yVkG3FzMkwzL8zxrNffv6j+kf4+yC1e2Z/9Rz3plHDiT9Fyvlwb12XrgVLGpgfL2EYcF4hlRhJD4
+kAdC4PeCgstXr0rmlrHbG69fR2RGlPDYgdim9ipmzKDoakNtxqHf43t3ThjQ3WA5WVjK19RZnwrv
+NGaAdd9vl+t5+clz5fHR3dRK78Ymu7+veuvh389bbhz1RQCv8t8a69z87cnhKgLhIefGWtmNXSq8
+0lsx+vn+vm1Uzj4rqq+Wbj2GeP7WeyJC4rAAIH+/NqPiezpMk3gpQr29aHwe0UVYDtrrnu4dV159
+devRwmvIR6agq62Nm389M25InwE9w37fekypUAthcdfD/7p5al5krw76H6xuAtWuPmkpHoby5EOQ
+8JiBeIptGNSrC8uirdl/VDXId54ob6Pyfj4m/Iqpfvvh/NGDevbrHnLi/CVDk2p3bhXDcv2eCqUo
+qqDskrGBpWjv2nrrdTuHVx0AgNcZrqbeCik5gNJ/I4Z8CxIeBxBCMggAxB9lqNHO/bD5V0ltMTvD
+cjzgeR7CGyfteKew6btz7iYsAshbt3rrYRsDr8v9IUUhnpfJvS5Z0ZodOQgheRu9OKy468E/L9vd
+BJVkyyeBwDPXqetmmQxyXgGA8uJZu+x6jQywnFcAz7Fypg4CwCt1gFYhjgHXLTLOBgFAchXy8uU4
+XtFkBLSKVfhDGQUA4Kxmmm3glXqgUHHWGqm/1Q86xwRC66CgUE1Znr5bXIO1EXGsG1EVCCCk5DLE
+XbuYr+sWZ2e41goLAOA5BvsRh8Jx4uO54rAAgOt1hqc72OUAYB0ZMgoSnnRkci9e3Z4HeBkcyOQK
+1KYthwCAkKIB7+UD8E8IQZkcqbQ80uKAEEJKBlh50I2gCAEAZKoADvkDCCFy9TfpdITHBij39rEY
+q4GXr0x2hwNAHGO31V328tHeXKBrvbCyG2t8t4WRURDPmrKMOKxodwzCX6KkQxIIN3HoRs5bqF17
+d/zd1W9keyjhMYLlZT7tu9ZdKr5uunBHLQieY9v4t20TGMowLI/QgworuEuclCAQCAQCwXMYlkVy
+yj+oG2+3eeAdUt5trttZfK/7gworIGevNzCI5cleNQKBQCDcLSwA9hubVTygqVa8GeVBhQWsTaWA
+8uh2TUih5HiW45o8ioVAIBAIhIcPg9FcUX4hNrb3HX1SlJcMypm6+nCtt3zisH6B7TowTP11u/k+
+pJJAIBAIhHtBbm5+Wml2ytjkO/r0VmjlMmVZAbhQfdXlJWdGYw1ZLCQQCIQWQp6lDznSo2BJSeWP
+P26sq2u4z6m5CwoKigsKih/d844Iofz8wvLyC3cdg9lsMRjMCKGSkgpcDoWFJXY7c9cR2myNp079
+npubL/xnMJgFW7m5+TZbo+AZp1/sx006hQiblV+brbGi4qIbD0Leq6qqxWlrrfg9oaCg2MN8OddX
+a+GcBuf6une0Yr7urh4fCOL8SvZlhmF++WX7qVNnH91n1GOP9Cj4/fc/x8fHajS+9zk1GIPBfOLE
+GU98six78OCxAwdyHt1Xrbq6hi1bsk6fPnfXMWRm/pqVddhoNC9e/A3LsnY788knyy2W+ruOsKCg
+eM6cxWlpmcJ/FRU3OnZxcXlGxh7xgIfT//HHX2dlHb5jOj/++Oubce4oKir3PD3ffbfBjQch799+
+u7awsNTDaAVMppr09J2ep8eZo0dPbtq028N8OdTXXRv1JA3O9XXv8DBfCKGsrCNWq62oqFyyrIqK
+yn/5JfP+pLmFIITS0zP37DmMnz+SfZmm6bFjE1JTf2rFuia0LnJnp5ycvHbt9J07dxI7Ct8WEAKa
+pgEALMvK5beCMwxD0zTHcTKZTLhiiqblWOeN4zhhcypFURQlAzcui7rhUyaDODa7nSkrq0pP39m7
+91OCLQz2L8SJ+X//b5JMBnGEGMGWTAbxzcAQQpZlIYSCu5ByV/kS0qa4qQnLsqzwNueQhpagUinn
+zZtJUbdOurgqQ1fIZJDnEQBQSB7LspJCzeIPROd8URSFEI9LJiYm6tNP5zsE53kUHd0jOrqHQqST
+q9H4vv/+f69evclh87GzLYRQYuLwV18dBwAoLCzZsmXPpEmjgoM7um8bOOu4NHAbwz7Ffwt5l8lk
+Ivl5TwkO7jhmzNCtW/cmJQ0PDw9pbvCcnLxTp86++eaUwEBtUVH5pk27kpPHBAd3dOXfub6AVDsE
+UmXopm1s27Zv4sSRffv2XLs249ix0926dZasL3G0CgWNW7u4Lwt/Y1sQQuzffV92lS9nGhuvr1mz
+qXv3rtnZJ3kedevWWfwrz6Njx/LattWFhga5siWkmeeR0JeF5w/H8Z6UoXO+JJF8Ronzsnv3oaVL
+5+KEOfdljJ+fT//+vbdv3zdu3Ag3JUN4UEiMgkVF5RqNX2CgVnApKan4+us1JlMNAECj8Z01a3p4
+eGhaWmZQUPuBA/tBCE2mmp9/3v7yy6Nyc/OvXjVevHjl/PlSAMDo0S9MmDCSYdj9+7PXrduCY+vb
+N2rmzGk0Lc/LO5ua+hNuiyEhHWfPTvHxUX/22Ypjx05funR1+vT3NBrfDz6YpdcH4IDnz5fMmbNk
+xozkl14agl3Wr9+WlXVYrw/45JP5uInb7YxgKySkY2xsb6XSu1+/nl9+uapPnx7p6ZmCLX9/P9f5
+aqdUKr/99ieeR9OnTxw4sJ/N1rhhw7aDB49huzhfLR8IWZb97LMV+fmFcXHRf/3r69gxK+uIcxm6
+sTVsWDxFUT4+6rlzZygUtKu5UJOpZvnydThOuVzunK++faM0Gr/+/XsDAGy2RoPBBACgadrf/8bV
+XGVllYsXf1NTU7d48Xvdu3eVtOLGFgDAYqnD0ZaXX9Bo/HS6AHF9Aam2odH4PvNMX1xWixd/M3Pm
+K3q9Vvw3AECj8cV5f+ONyeJ26zndunVOShqekbE7KWl4eHgoAMBoNIsnGMTl4IC4v3Tr1rm2ts5g
+MLsZBR3qC7joX5Jl6EnbwPEDF/Ul2JLL5WPHJly4cCklZfJ33/08eHAc9rNy5Qb8d3Z27pUrxt69
+n0pN/clkqnHTl3EunPMlSXp6Zk5O3ty5Syorq9u0UT39dExkZDj+CSGUl3f2yhXj669PArf3ZcGW
+zdb444/p48eP3L374MGDx4TnxsqVG557bkBFxcX167e6L0PJfEn2L5weh2eU0AysVltaWmZS0nDc
+CCX7MkatVsXERKWlZZJR8OFEYhR0gGGYL75Y9dZbU/FoZDTWfP31mk8/nT9ixOAffkhXqbxDQ4NW
+rUp7/vmndTp/g8G8evWmTz9dkJIyGQDwz3/+JyIijGHYEyfOfP75Qhzhpk27t23bGx/ff+3ajEWL
+/qZQyAEA58+X7tp1cMqUMTNnvhId3WPPnsMLFswEAOp0/uLE8DwvftUaNy4hOvqppUu/FVzOnj0v
+2MrLO3f8+OnZs1OsVtv27fs7dmwnuC9fvnb27BRX+Xr99TlRUX/66KPZPI/+8Y8vIyLC9u/Ppmm5
+kAWcr549I1tU9gDI5fKZM185duz0gQM5gqNkGbqxJTz3haeJJKmpPw0aFIfjtNtZ53xt2rQbQhAW
+FpKfX3j0aO67736E45w7dwZ+BQ4LC1m6dO6iRf++45qNpC0AQHr6zpMn8wEAPXtGTJgwUqVSnjp1
+1n3bMJlqP/tshb+/hudRcXGFcNmm8DcAQKGgcd7xB8TdER4eMmbMMNwGIASpqT8VF1cIv4rLoYU4
+1JdD/zKZavfsORwaGiRZhpJtIzw8tLCw1Gg0FxQUq1TKiIhwmQwCqfoS27Lb2UWLvpw1azpN0xUV
+FwU/wt9xcdFz5y7dty979uwUjcbHTV8eP/5F53y5YvTooZmZB+bPn7l/fzZN02Fhtz6+jcaatWsz
+Fix4R6vVgNv7smBr3LgRERHhr7wy67333vz884W4L8+f//bQoQP/8pcPxo8f8fnnC4W+LFmGkvmS
+7F84Pc7PKPzrtm37ZDI4fPggPIJK9mXCI8GdezVCwGAwHzp0XK1WAQAslrqqqmoAgL+/37RpY1et
+SqNpeuDA2OjoKNwapk0bGxMThfshQgi/Rp05U7Br1yEc4W+/FQ4YEA0AMplqAwO1+LUxMFCHZx78
+/f30+gCFgg4M1DmkpHv3rlu2fCee/FSrVQ7v/gghq7URh9Xp/K3WRrVaZbXaIiPDk5MTVSoldq+t
+rUcIWCz1en2AYAi/jKvVKpVK+cYbUzp0aMuy7DPP9FOrlXY7k5NzWjiYWVRU1pLtJ2Jwfh0cJcuw
+hVy7ZlOrlTizdjtjtTYCgGOG2BEXDq6OoUOf/fjj93BA4dEPIQwM1GFv7mlosB448H94ywnLshcu
+XMYztK+/PjE5OQkAcOLEme3b9yUnJ4nrC6cBJ0xoG4GBupSUKRkZe1peAu5BCJ05cy40tCOeefv7
+399xmNlrlSFQyu5t7TAwUNe1a6hcLpesLyDVNkymmo0bM4uLKyCEDQ3WP/0pDDdU5/oS27LbGZut
+0eEtU4xCQdO0fPr0iXjSsn//3j4+bczmWqm+3AzOnv2jpsZy+PCJwsJSnGA85iGEDh7MCQ0N0mr9
+b6YWOduCEOp0/n379hw+PJ6iqO7dw61WGwBAo/HR6wNwH1coFN27d6UoSrIMJfPlqnIkn1EAAIPB
+bDCYYmN7i796Jfsy4eFHomNTlMzhscuyLMPccNFo/KZPn0jTcgAARVEqlbKpyc5xHO6WAAA8We/G
+5IAB0c49h+cRhBJbdcQrFsLaj5vIQ0OD2rcPnDNnCQDAx6fN6NEv3Mpqc55i+O1PLpdPmzbW+ddx
+40a4mfJqOTIZ5b4MW4vY2F5btmTh4vL39xNmbCCEbia17gjPI+GTHc9EaTR+AACZjMLRDhgQvXPn
+gfLyKk9ic56tavWNBhzHbdmSZbczM2dOoygZx/ErVqyvrKwWPISGBqWkTJZsQuL+wnGcXH4HMcM7
+cqdlYMe2ERzcccmSuXPmLMHrgm7CUpRswoSR33671mptBAAkJAzC9eIGITtjxyYAAMzmWvGvkn3Z
+PTIZvH69CT9PZDLIcTducEtPzxTKXzKg2BaEEDew4OCO4p6IK0ij8cXff57nS8BuZ5zX/zDCM8pq
+ta1fv6Vv356e553jeFf5IjxwJCp72LD4FSvWFxQUC2sJwcEdX3jh2ZuvOVCvD8BrgWvWbO7bt2dE
+RFha2g6eR3jtJz09s2vXUDwDplYrIYQ0Le/WrcuIEYNwbGq1Sq1WGQxmtVppMJjxeFNZeencuT9e
+e20CAEChoCGEBoPJYmnYu/dISspkvNbtvC5osdQbDGa7nTEYzPiVzWKpt1jqBw+OAwCoVN59+jzl
+JvM6XYDRWIP/NhprNBrfm/cBOKJWK3v1ihSyoNH4tWSQEGM0mmtr661Wm8Fg0uu1rbXpRrzFDq9p
++fv7mky1eFnObmd1On8AoNFohhDi4tLrte5nFO12xmKpt9sZo7GmtrYOL5AghIzGGqvVxjCMwWDG
+bUOn0/Tp0yM6+kbhC/kS1gVzc8+Ghnbq3r1rSUkFruubRpBCoQAACm3DYmlYsWId3q4s1NfWrXsL
+C0tapaDAzfUns9kydWoirlYI4XPPDRBP/KpUSldvUcOGxael7Th8+HhERJiQr2YlQNwOhTYvWV/N
+zZdDfSGEysqqunQJ1mr9IYSRkeH4dVZsS61Wmky16Ob9pQ4oFLRzX25WqmJje/fr13Py5DGHDx9n
+GBbP5VittsLCkpdeGiLuVi231dwyZFkWvxF++ineZwAln1GVldUlJZVvvz3NIbirvlxbW7dt2z68
+2El4CJHo2IGB2oAAv8LCkvDwUIWCVijod96Z9sUXq/Dme70+4IMPZmk0vjt27I+Pj42JiYIQJicn
+rl69sWfPCABAQsLgPXsOr1y5AQCQnJwYFRVB0/KYmFK8zgQAGDYsftq0sXp9QHJy0sKFy/B7fURE
+2IwZNw78R0VFYP86XcA770y7fZvobeuCaWmZhw8fr69vmDdvaUrK5Pj4/u3bB6rVyvXrt2IPZ84U
+TJmSCCHs2jVUeINWqZShoUEO+dLpAvAaid3OREaGi40CAEaPHpqaukbIArbV4sIHDMOkpv5UVFRe
+V9cwb94nCxa8HR4eqtVqxHkMCenoySSkGL0+QLxWite0ZsyYumzZyrVrMwAACgU9c+Yren0Ax3Xe
+vfuQUFwJCYPGjk3A5eMcbWlp5SefLK+rq//xx/S8vN/xOpnJVLto0ZcGg5ll2YqKi7htONgS8rV1
+axZeFxw8OC45eYxKpRTqGpsYPDhu/PgXVSql0DZ0uoDExOHV1VfE9TVhwsi72MzpitLSyqtXTTg9
+2EUmg56PZIGB2uTkxGXLVuJ9JeJ4PMG5HeI2L1lfbtqGczuRrK+wsJAdO/bjAV6n8586NSk6Okps
+a8KEkefPl8TF9dFofJ3jdKgv3Jc9zyzOywcfzPLz8xk9eqgww5SdfSo2tndUVIQntiTbp0Mfx0iW
+oWRZYYQ5cByP5DOKYZgDB3Lws0IcVrIv45/Onj0PAAoNvYezR4SWAKsrzzsrqDU12Tdu3JmYOEx4
++WIYRvhIurnhmIcQCs0OT12uXr0JAJCcPObm5nsZ7rQIIWF7t+RBBSDauy/277zJW4gTp0GYUcHu
+ubn5mzfv/t///St2XLs2Q6Ggp05Nun1j/a2JVud8AadDIK5suSlWzxEfwJDL5TIZRAiJB3uHcm5u
+nBicNWdba9ZsBgBNmjQaOy5cuOzll0fFxPSQLAHgor5claFzviTbwB3bBt7QT1HU3r1HY2N7qVRK
+juPeeGPe558vdF48vjtc5bdZMYg37jcXz8vQVduQbCcO9WW3Mykp8z/6aDb+AjMYzO+//8/lyxfj
+Ehb6LELo5mEJiThd1VdLcMjXHW1J1pdDHxd8OpQhcNunsH/xY8e5zbtqLZK2WJZNS8scMWKwqz3G
+hFYkNzc/LS3T+ZSXMzcV1I5eqL4q3YK9vBTJyYliF+fm5TDNjZsFRcl4Hjk3EVfrTK7mFT30T1Ey
+h2R07hzcrp1+4cJl+J/CWpdD+oUUOucLuFhBdLbVKkiWlfhxcBdGXT2YnN3j4vpkZOwWiisoqF2n
+Tu3dxCBZKR6Woas69aSu5XI5x3Ecx3355SrP17Q8p+WP8hbG4HkZumobku3Eub+8/PJL33//My5D
+CGFCwiA8KeqqzTs7tnDNWBKHfN3RlmRqm9WXXaXE2b9zAjzvX9hR2FZKeDhx2XWNxhqdzr+5y1TC
+WaUHhVarmTRpNN7FCgAIDNTe020sjzrdunWeOPElYctD587BeMPeQwhFUUOGPBMYqEUIQSiLjAxr
+9WfxY4+4DAEACgUdFRXRWkvRBFfc3bOUcN+QHgVLSiozMva88cak5oqo3d2Z5ZZQUFAMABDOSOE0
+3P9k3DUIobNnz/v4tHEQ6/Ecs9nCcZxeH1BaWtmlS4hMBgsLS8LCQjwcJDp37uRg2mZrLCwsFYuw
+BAd3xEVqNlvKy6u6d+8qLKvg9NvtjODHTTqFTaFarb/n+bXZGg0GM17KjYmJcvaAEMJ5v3jxkk4X
+0NxlVCH+ZoVyoKCg2GZr9CRfzvXVErvu0+BcX67KsOW0Yr6qqqrvoh5bHaFducmL2I9kX8Y6onFx
+faKjo+7Pxm9CcyE6og8YoiPqSXqIjujdpYHoiLYET/JCdEQfA4iOKNERJTqiREeU6IhKY7czHMfZ
+7TcySHREH0uIjijRESU6okRHlOiISvcvhmGyso44PDfwT0RH9LGB6IgSHVGiIwoA0RElOqJSlJRU
+Ggwm8XNj/vy38U9ER/SxgeiIEh1RoiMKANERdYLoiAIAnJ8b2J3oiD5OEB1RaYiOKNERJTqigOiI
+Sj03iI7oYwbRESU6okRHlOiIEh1RACR0RKUhOqKPGURHlOiIEh1RoiNKdEQBcNIRlXxuEB3Rxw+i
+I0p0RImOKNERJTqit/kXt23n5wbREX1oITqiABAdURdxunInOqKuUnufYyA6og+njqjkc4PoiD5m
+tPK2N6Ij+mhBdESfKIiOKIHgTCuPgg+DgOejpSP6wHHWEX1ouXcamE8OpAwJBAfI5l0CgUAgPLmQ
+UZBAIBAITy5kFCQQCATCkwsZBQkEAoHw5EJGQQKBQCA8uZBRkEAgEAHYgKMAACAASURBVAhPLmQU
+JBAIBMKTCxkFCQQCgfDkQkZBAoFAIDy5kFGQQCAQCE8uLkdBo7EGSV61RyAQCI845PlGEJDWES0p
+qczI2PPGG5Pw7aaEewdC6OzZ8z4+be5azNNstnAcp9cHlJZWdukSIpPBwsKSsLCQuxabttkaCwtL
+EeIFl+Dgjlia1Wy2lJdXde/eVbieDaffbmcEP27SKVwur9X6e55fm63RYDC7uQEYIYTzfvHiJZ0u
+oLnXMTYLz/MLAKiqqtbpAgAAOP1CWMEDLoeCgmLhRl8IYVRUhEJBV1VVi69KFspc7I7T4FBf4rJ1
+bhutUwpuuWN93WuE9oDvonLuXwzD/PLL9ri4PtHRUfenTAgPM9Tf/vqOuo0Pzzex3K2btT/7bMXw
+4YNa8SLTZmEwmM+dK+rYsd0DsX6fqatrWL16E8/zkZHhdxfDxo07y8qq2rfXf/DBv1588TmO4+fN
++2TgwNjmXswt8NtvhXPnLqmtrTt3rhj/16FDIK6O/PzCrVv3RkSECa9HOP1paZleXoqePSPdp3Pl
+yvVXrhjPnSsuL68KDNRptf4epmfdui1DhjzjyoPRaMZ5/+yzFYGBug4dApuT3WaAEEpPz9yz58i5
+c0VVVdXh4Z1VKm83/pcu/TYwUGc0mnH6jUZzSsoCo7G2sLAEF6xcToWFhcyY8feysqqiovJz54or
+Ki7Y7UyXLp0WL/7m6NGTZWUXzp0r/uOPsqqqyxERYRUVF3/5ZcepU2dxcJyG4uJycX2Jy9ahbbTK
+fS9FReVms8XHp012dm5QUHuZ7Lb5JLud2bhxp8lUe9ftuYXgOsrPP9+3b0+ZDEr2L4qigoLaf/LJ
+8tYqE8JDwqVLV8+dKx46dOAdfcoplQzStcaq+garxLdgTk5eu3Z6h1d14QUWwht3bjlcNYmvo+Q4
+TiaTCRdj0rQc39vCcRzH3XhXpSgK3+/F8whfNA9EV2ja7UxZWVV6+s7evZ8SbGGwfyFOcPu1ltid
+5xFCiKJkOMGCLeF6TIerUF3lS0jbvb6+R6VSzps3U9wVXZWhK2QyyPMIACgUBcuyAEjM9kjekSu6
+XpVCiMclExMT5XxTJc+j6Oge0dE9xGWi0fi+//5/r169SahfV7YQQomJw199dRwAoLCwZMuWPZMm
+jQoO7ui+beCs49IQX3l6+/WnN/Iuk8nEn7CtTnp6pt3O/OMff1Mo6JycvOXL17799jQ38yU4PRDK
+eP5Gqtq10y9ZMkdcgHY706aN6v33/wvfGGwwmN5996MhQ56BEM6Ykdy3b0/sZ/r09xITh+bk5HXo
+0Hb+/Jk47Jw5S/Dntbi+Vq/elJOT161bZyDVNloIz6Ps7JM8j1Qq5YoV62NjezuMIgaDed++7JUr
+lwi5w3+471+4zUMIsX/3zw1XfRnT2Hh99+5DS5fOxZ6d+xfGz8+nf//e27fvw/ePEp5kJEbBoqJy
+jcZPPNtTUlLx9ddrTKYaAIBG4ztr1vTw8NC0tMygoPYDB/aDEJpMNT//vP3ll0fl5uZfvWq8ePHK
++fOlAIDRo1+YMGEkw7D792evW7cFx9a3b9TMmdNoWp6XdzY19Sfc7kNCOs6eneLjo/7ssxXHjp2+
+dOnq9OnvaTS+H3wwS68PwAHPny+ZM2fJjBnJL700BABgtdo2bNh28OAx/Cu2VVZWuWfP4aSk4atW
+pZ0/X4pt2WyNP/6YPn78yN27Dx48eAzb8vf3c52vdkql8ttvf+J5NH36RJzHe1H6LMt+9tmK/PzC
+uLjov/71deyYlXXEuQzdJADf6ejjo547dwa+T1zSm8lUs3z5OhynXC7H+bLZGoUy7Ns3SqPx69+/
+N7gxqWUCANA0LdyRXVZWuXjxNzU1dYsXv9e9e1c3+ZK0BQCwWOpwtOXlFzQaP50uwG5n3LcNjcb3
+mWf64rJavPibmTNf0eu14r8BABqNL877G29Mbu6lWggho7FG/NKgVqtcfUbn5p6dOHEkfnDHxER9
+880au93uJnIhPW+9NRW7MAxjMJgVCjkAUK8PEKpVmOQ0Gms0Gl/sbDTW4OKy21mdzh8Al21AqC+c
+J4VCgf9yaBvui8ITysoq16zZTFHUnj2HT506u2bN5pSUycKvJlNNWtqO6dMnYlue96/s7NwrV4y9
+ez+VmvqTyVTj5rnhqi9jP1arLS0tMylpOG4Ykv0Lo1arYmKi0tIyyShIuPP9ggzDfPHFqrfemopH
+I6Ox5uuv13z66fwRIwb/8EO6SuUdGhq0alXa888/rdP5Gwzm1as3ffrpAtw3/vnP/0REhDEMe+LE
+mc8/X4gj3LRp97Zte+Pj+69dm7Fo0d8UCjkA4Pz50l27Dk6ZMmbmzFeio3vs2XN4wYKZAECd7rZJ
+M57nhde6bdv20bRciBbbioqKkMlkKSnzP/hgVkrKZGxr3LgRERHhr7wy67333vz884V5eeeWL187
+e3aKq3y9/vqcqKg/ffTRbJ5H//jHlxERYffowkK5XD5z5ivHjp0+cCBHcJQsQzeTjULa3M9Bpab+
+NGhQHI7TbmdxvvbvzxbKcNOm3RCCsLCQ/PzCo0dz3333Ixzn3Lkz8Ot2WFjI0qVzFy36t7CI1Sxb
+AID09J0nT+YDAHr2jJgwYaRKpTx16qz7tmEy1X722Qp/fw3Po+LiCryjQfw3AEChoHHe72ItymSq
+XbToS4ulXnAZNix+2rSxzY1HEiE9wlXPJSWVc+cugRDq9QEffDALf0eaTDWLFv372jUrx3GRkV1n
+zZpO0zTDMKmpP9E0bTSaunbtPHPmK8LroDO4vgoLS8LDQ4YOHTh+/IvY3cO24TlhYSGJicNomo6P
+j12yJDUxcZj419TUnwYPjsNvPG6eG879Ky4ueu7cpfv2Zc+enaLR+Lh5bkj25fnz38Z+tm3bJ5PB
+4cMH4dcLyf5FIDhw51EQIWAwmA8dOo5fkC2WOnyTu7+/37RpY1etSqNpeuDA2OjoKNzypk0bGxNz
+Y80ZIYQ/Tc6cKdi16xCO8LffCgcMiAYAmUy1gYFa/NoYGKjDMyT+/n56fYBCQeMJIjHdu3fdsuU7
+PNEBALDbmZyc08ILclFRmd3OQAhVKuW4cQk4Db17dwcAQAh1Ov++fXsOHx5PUVT37uFWqw0hYLHU
+6/UBgiH80qpWq1Qq5RtvTOnQoS3Lss8800+tvoe7LXB+HRwly7CFXLtmU6uVOLN2O2O1NgKAY4bY
+EW++wNUxdOizH3/8Hg4ozDhBCAMDdZ7sPWlosB448H8VFRcBACzLXrhwGX9svf76xOTkJADAiRNn
+tm/fl5ychBCyWhuFKlCplDhhQtsIDNSlpEzJyNjT8hKQRK8P+Ne//ke8W/CebpeIjAxfsWIxnhsU
+Ps50uoClS+eVlVWdOHFm6tSkdu30AACapv/+93d0uoC0tB1jxgyNjOzqZj5g6NBnP/zwr+vWbQkM
+1CUkDPLyUtyj9BuNNUVF5RzHMwxTWVldVFQmDLRFReVeXopOnTrgdLp6bkj2L4WCpmn59OkT8URu
+//69fXzamM21zm1Dsi9jDwaD2WAwxcb2Fn/1SvYvAkGMxCgoLKoJsCzLMDdcNBq/6dMn0rQcAEBR
+lEqlbGqycxwnPDvwZL0bkwMGRA8YEO3gyPMIQoljG+LVR2HtRzLaceNGCG/cMhmF0yA2BCHE35HB
+wR2Dgzu6H1rwF6pcLm+tz4JmIaT/XhMb22vLlqw5c5YAAPz9/YTZIQhhSybQeB4Jn+x4RlSj8QMA
+yGQUjnbAgOidOw8IW0bd4/z0F5aTW47Vavv3v3+orb31Ldi/f29Xs2Q0LRfWa1mWvbsiomnaOaBC
+IY+Pj6Vp+Zo1m6ZPn4h3lsrlVHh4yPjxL27dutfLy8vNbjX88jdlyph167bu2LF/7NiEezSHT1EU
+7oY0TXt7ewnLjeXlFzIydiclJYj3E0g+N3ABSvYvufxGmxk7NgEAYDbXukqGQ18GAFittvXrt/Tt
+29P52eIKjuOFV2rCk4zEKDhsWPyKFesLCoqFtZ/g4I4vvPDszVeqG+sZJlPNmjWb+/btGRERlpa2
+g+cRnglJT8/s2jUUz4Cp1UoIIU3Lu3XrMmLEIBwbXncxGMxqtfLmGgmorLx07twfr702AQCgUNAQ
+QoPBZLE07N17JCVlMn53dlgXVKuVvXpFCtFqNH7NfSrpdAFGYw3+W1iPuc+HiIxGc21tvdVqMxhM
+er22tR5e4k32eG3P39/XZKp1WGcyGs0QwsGD4wAAer3W/Yyi3c5YLPV2O2M01tTW1uHFGLyuZrXa
+8IoXbhs6naZPnx7R0U/hgEK+hHXB3NyzoaGdunfvWlJSgev6phG8pgWFtmGxNKxYsQ7PHAr1tXXr
+3sLCklYpKJqmhw2LFx8dczP7/ec/T8zI2O3n56PT+WdmHhDWnzxHtC4IAABqtUq8/6t//z5yuXz5
+8nVz5swQHLt165yUNPy77zbMnv2GWq0UFgvBzf4lJF6tVk2dmvjTT5szM3/FfaTV0Wo1Q4Y8zTDs
+kCHPFBQUDxjQBwCAELpw4VJTkx1/yQlIPjc8tyU8B2463FrvdKaysrqkpPLtt6c5uLvqX7W1ddu2
+7Xv99Umep4fwuCIxCgYGagMC/AoLS8LDQxUKWqGg33ln2hdfrMJrJ8J6xo4d++PjY2NioiCEycmJ
+q1dv7NkzAgCQkDB4z57DK1duAAAkJydGRUXQtDwmphSvM4Gb6y56fUByctLChcvwe31ERNiMGcnY
+Q1RUBPav0wW8886027eJ3loXHD16aGrqGiHalJTJ8fH9AQBarcZ5S5hKpXR4xDvkS6cLwOsxdjsT
+GRkuNnrvwGs/RUXldXUN8+Z9smDB2+HhoQ7pDwnp2NwDcHp9wNKl3wr/xGt7M2ZMXbZs5dq1GQAA
+hYLG60wc13n37kPr12/FPhMSBo0dm+BcVpjS0spPPlleV1f/44/peXm/4/VCvK5mMJhZlq2ouIjb
+hoMtIV9bt2bhdcHBg+OSk8eoVEqhrrGJwYPjxo9/UaVSCm1DpwtITBxeXX1FXF8TJoxsrWM8CgUd
+ExPloefw8JCkpOE4DcnJiXgnp+e2IIQQwnnzlgouw4bFT5o0SmhvMhkMDe2IZ1bE9R4c3MHXt41c
+Lndo87h/lZRUCPWlUik7dmx3T3f/jx49lGEYlUr5wQezcLJNptr8/PMzZ74i9ubquQEAkOxfzu1c
+sm0Aqb7MMMyBAzm4/zq4O/cv/NPZs+cBQKGhHVtaHIRHH1hdeT6wXQeGqb9uv/X10NRk37hxZ2Li
+MGGzHMMwwuvyzc3NPIRQmLjDU5erV28CACQnj7m5+V6GOyRCSJhKkjyoAG4/kyD4d/i8s9sZIU6c
+Bo7j8N9iW+LBUsDhaIerfLnyeY8QH/aQy+X4nK84/Q7l3Nw4MThrzrbWrNkMAJo0aTR2XLhw2csv
+j4qJ6eGqBCTry1UZOudLsg3csW0oFDTLshRF7d17NDa2l0ql5DjujTfmff75QufF4/sAzq+4HTY3
+rADOr4tDRxL9C7ho8+IYXLX/e8rtB1duc/ewf0m2c1dtwzkGVy3WuR1ix7S0zBEjBgubSwmPB7m5
++Wlpmc6nvJzxVmjlMmVZwdEL1Veln/VeXork5ESxi3MTd5hSx02QomQ8j5ybo6t1JldzmB76pyiZ
+88y+sGbggGQnkey6920IlLTlkP67WLpwlX5n97i4PhkZuxcuXIb/GRTUrlOn9m5ikKwUD8vQVZ16
+UtdyuZzjOI7jvvxyldXaCABISBiE1xrvPy2ZJ/CkrLAfyf4FXLR5cQyu2v89xVWZeN6/JNu5q7bh
+HIPnbR47TpkyRtI/4QnE5ePeaKzR6fybu0yFzye1OFWE+0S3bp0nTnxJ2IbQuXOwVqt5sElyBUVR
+Q4Y8ExioRQhBKIuMDLvXggaEJw2Lpd7Pz+cebSwiPLS0so7oPTpXd59pubangCcamA9WR7Rz504O
+ph9aHVFXa3j3U0cUNEcn00FHFNxetiqVMiIi3KG+xBqYYn1Rz3VEJd0FW2ItU0GzFLRqGQrlI2kL
+l4kQv5B353wBqTbjSovVVb4ky9C5jrD7li1ZWq1m+PBB5AXriUJ6FPz++58TE4c/KCltg8FcUXEh
+Nrb3A7EOAKira9iyJatHjz+1fBQsKCjOyNgjnL27F7YyM3+VyeCwYQMXL/5m+fLFAIBPPln+6afz
+7/qNpKCgeO7cpeLxZvz4ETi24uLy7dv36XQBwhiA03/69Llx40ZMnZrkPp0ZGbu7du0MANBqNUlJ
+CQ5bCt2kx30ZGo1mnPdvv107fvzImJgenkR7d9jtzPLl6wwG09Kl8+7oGacHIR6n325nNm/enZ9/
+Hv+qVHonJAyKiYkS15eQlxMnzhw4cKyh4RoAQC6n8vLOJSePqa6+umnTrtraOhxDUFC75OSk8vIq
+5/rSaHydbcXF9UlPzzx16ne8rRRvxB02bCBFUZ6XYVFROQAgNDTo2LG8Z57p6zD3g/OoUilDQjpK
+2hLHb7czOO8WS71zvjiO+/nnbRcvXsGOuM1oND7vvvtRr17dhRnUuLg+oaFBkrZycvKcy1AsDFRU
+VL51694JE17E7XnSpFFvvjm/f/8+j8fbPMFDHmEd0WZpD4p1KSlKjrVGXelSutL2vAtb4KYGpiuI
+jugjpCPa1GT/z39+vnLF6OGlPA46ohZL3e7dh1at+gwXyKlTv2/cmBkTE+VQX7jotm3bN3HiSKwj
+ynFcdnYuTdMOOqInTpzBO2Wc68tgMEna2rZtn7CryGAwz5mzZMiQZyiK8rAMPdcRZRhW0hbH8eL4
+cd4l81VVVX3x4hUhX3j0BS60WCVticvQbmdmzFiQmDhUGAV5Hh07lte2rU54paNp+csvj9q2be9r
+r42/n5sDCA+WR1hH1HPtQQddyqFDB164cHnGjCmSupSS2oN3bQtrYLqC6Ig+WjqiGzfuDA7uEBvb
+Kz19pyeRO+mI3joHqddrIyPDBH1R91AUhU8BOYDnS6qqqqXqS9qWcOZSo/ETyg14XIae64ja7Ywr
+W3dEyJfYEc8cGAwmSS1WSVvCGVm1WqVUKhcseFs434kQyss7e+WKUXxkkKKovn2j3n1367Rp4zxJ
+J+Hx4BHWEfVce7BZupSS2oMttOWy9ImO6COlI4olNPPzCz2M3EFHVDgjK5PBMWOGde0aGhER3io6
+OM71JWlLJoPCGb6EhEGRkeFRURE4Bg/L0HMdUfF5QQdbLcRZi9WVLeHcat++Uc8+269791sqdEZj
+zdq1GQsWvPPQbgcj3DceYR1RV9qD7m15okvprD14P225KsMWQnREJWmWjuhdX9mIgRDGx8fGxfVh
+WfaHH9Lz8n7H64ItiRPjXF+StgYMiA4PD8X53bJlz44d+4V1QQ8Nea4jCgCQtNXyzEpqsUra8vf3
++/DDv/I8OnHizObNu4V1QYTQwYM5oaFBHt5wSXi8kTijQ1Ey4Vguxr2OKM/z91RHVOwHOOmIirUH
+nTeYSNq6653Q983W/dQRvXTp6pw5S+bMWXLp0lUh/ficFv7vLqJ1ryOqUNADBkRfuWJ8SHREly1b
+uXDhMuG/rVv3tlbkzrbWrNksk0GVSvn229NGjRri+egudEAxQjk415ekLY7jV67cYLU2KhT0xIkv
+vfXW1HXrtjgs6LrHcx3RltiSrF+O44Svf6zFKmTWla1Nm3ZdunRVoaCffbbf//7vXw8fPo6lt/E9
+kTNnTnM+pGi33z/FDMJDwiOsIyqJQkG7tyWpS2m3s1qtv8XSgD9KPNT2bJYtVxAd0UdIR9Riqbfb
+7UJ9NVcb02ptzM4++fzzT+M2b7U2tmmjAi70bMX1xbLc5s27X355lIOO6M6dBx3WcTEajZ+kLY7j
+CgqKq6uv4GsRxXcZeojnOqKubEm2Q8l8OeiI5uaelcvlvXtHSmqxStoqKipTq1Xe3l5iW1arrbCw
+5KWXhji/4bEs++23P02fPoGclHiikFZQ++abNe3a6UeNekG4LdNZD/DHH9N79PgT1hGtra1bvXrj
+a69N2Lp1b21tndForqysBgBgrUWalqenZ27btg9HjtddEEJHjpxctSpNrCOKD1chhLB/rCMqSP8V
+FBTPnv3xX/7y2ogRg4V0PvfcAPFODSGsK1s6XUD//r1Pnz736afzhXwpFPSECSPLyqrefHMKQmjx
+4m+w9mBgoFbQHrw7W889N6C6+oqDxKIAwzDOtnbs2E9RlJs8usduZ+bOXSI8VcHNtaKGBuuyZStx
+vWAd0ZiYqCtXjF999WNV1SXsE+uIVlRcPHjwmHOaCwtLsI6oQkH37BmJ15+MxpoPP/wC64iGhHTE
+baO2tk5sS8jXqlVpeEJ18OC4yZNH47kpcRlid5VKKVmGQn1NmDBy/fotX3314X1WUFu5csPhw8cR
+QnV1DRqNr1gb0xNctXlx/xLavEMZ4vpiGDY1dU1u7lkcIe5fJSUVCxZ8hgdUTErK5IEDYz231axC
+sNsZrCNqMtUKewV++WX7pEmjcP8VaGG+HJ4buG3YbI1/+csH4s813O88t7V371GO44YMecZ5qCsp
+qfzhh/TZs98gymqPKHenoPbI64h6rj0o2MrPLxRKSsiXXC7nOFY4BOKsPXh3trAGpps5FqIj+gjp
+iIo1PIW0NTeSlpQhcKEj6rByLOnu3lYLaa6OqIf5kmwbklqsnttyo7O6devep57q1lpC7YT7zxOq
+I3oXYSG8pcQozpdMRovz4sDd2XIVm5tfiY6os62HREdUUsOzubSkDF2lwVU/8txWC2kVHVFJTWDn
+LLTQlhud1TFjhkq6Ex5vWnkdWNARxdMmd9xTZ7XaJC8dvad4fk7rsYfoiBIIhCecVh4F8c4ChNCe
+PYfq6685fFA6k519ymAw4Tvt3Pt0pQeI3Z11KZ21NLEmIdYYFG6ld8aVzqH75N2R1opHjFhzEnig
+bylZVvgFXNCZbMX0tDqudESd2wbWVpXc51JVVW001gg6kwQC4QmnpdM7khiN5oyMPUlJw+/oc+jQ
+Z/PzzxcWlrr3dvToyU2bdqelZaalZW7evHvt2i14x7PIfYcgsAQAOHz4xNy5S8RHoQ0G87p1GWlp
+mTt27N+/P9thdUfMt9+uFdKDdQ7F8Thz7Nhps9ni4FhUVC5Ojyfx3AVY+1HYVl5QUPzddxtceWZZ
+9uDBY998s2bFivVi95Mn89eu3fLhh1+0/PiBQ3paiEMZYgwG84kTZ8Qukm0jM/PXrKzDktGePJmf
+lXVY8uDBHW0RCITHD+lvQZZlEUIO8+xY7/GOb9Acx69fvzUhYZBS6e0QFv8taEUCACCESUnDd+8+
+GBYW7Gav3a5dB5OShmM9QJut8Z133k9MHJqff/7UqbNvvjklMFBbVFS+adOu5OQxQUEdjh8/feLE
+maYmuyCLZbXafv55W69e3f/rv/5stdpWr960fft+B9kLAYZhf/ghLSSkg7+/35YtWWVlVTge8TI7
+1vbEWpebNu3CaRPyZbczWGsxNDRIWLpnWZbn+Zua97fWMJz3LwiapUJduFlZdNgWIWwlcNZ9xTo1
+ubm90tIyxUHGjRsxcGA/4UZvjGR9sSwLIcTurrY4uTngj+PEOq4OerDOtiTLUFJjFmtFRkdH4VOt
+b765IDFxKEKI427toBBdUcuNGvWCpD4t/vuOerbutVjBnXRfJW0BqfrCccpkEJc5+XIlEO4R0o/X
+1NS12dknv/56kSC7BwDIyjry1Vc/Llv2d/e79jmOy809+/nnY4RngaRWpNCrY2KivvlmDT7o4wpB
+29BqtaWlZSYlDdfrtbt2HRL0Trt161xbW2cwmO125siRE9OmjTtzpkAITtN0586dfv/9j8jIMIul
+wWq19ejxJ1e2IIRPPdVt+fJ1UVER1dWXhc3f69dvEz4vsLYn1tU8ceK3kpJKtVoZH98/JWWyxVL/
+4YdfnDyZ7+3tdeBATteuoQsWvI1DnTp1dtOmXVgbE2uxSuptZmUd4ThOOBO5cuWGwYPj3Jc5vhdN
++Kek7qub4M5kZ+euXHnjsxLXl9Vq+/LLVX369EhPzwQ3dV/9/f0EW3K5/KWXnncTZ1bWkR9+SA8M
+1I4c+Xx6emZCwiCsj+psy2ZrdC5DCKErjVmEANYdbWqy48IUwGccd+480L9/78jIcGyLZdmvvvpQ
+aNu4Hj3Rs5WsLwihc9uQHAixdqWDdq64DMX1lZq69vjx06GhQbGxvTMy9gi2mlWPBALhjkiPghzH
+yeVyh08Q/I1yFzbOnj0v1oo8ePDYsWN5kurArhDuZlu3bmunTu2HDHnG1eMgLCwkJWWKwyqjQkE/
+//zT33yz5t13P9Jq/RMSBnXpEuzKFoQwNDSoouJiefmFLl1CTp36HbuPG5eQkBCP/8banlFREUuX
+zv3wwy8TE4f36hWhUCgAAH5+PvPnv71hw1aapsePHwEhpGnabmdMpprjx8989NFsuZwStFgl9Tbx
+gXdhja2i4uIddTv//e8fhE9bV7qvzfqYiIuLxroH4Ja2Z+z27fs7dmyH6zEv79zy5Wtnz04RbNnt
+7DffrHEz62swmAcPjhs0qP/KlRsWLfrbV1/9iPVRnW2NGzfCuQwBAK40Zo1Gc1bW4UWL/lZVVb1k
+SapgsaCguLCwZNu2vZMmjQ4LC8H56tIl5G9/+4f4mDzWR8V/43zNn/+2pC3J+goM1Dq3DUndV6xd
+6aCdO2HCi5L1dfHi5ddem8Bx3PHjpz/6aLZgy/NKJBAIniA9Cv7Xf/2Z4ziH5+bIkc8PGxZ/F/JC
+DlqREyaMxBfNNAt8b5lWq3Evewgh1Gh8Hebl7HYmI2NPWFjIrFmvWyz1P/6YrtH4OqudCej1AYmJ
+w7Zv3/fmm1Pwpw8AID//vLBMVVRUZrczWFdTrVb5+/sKuYMQBgZq8SZ+8Wk2nS4gJWVKhw5t8T/x
+i78rvU0gumfOk8K5ds0mZNmV7muzqKi4mJOTh/++qY8KIiPDTxaOWAAAIABJREFUk5MT8RuGTudf
+W1uPELBY6vX6AJzTv/zl1TlzlriJVq1W6fUBZnMt3uqJ0+xsy1UZutKYVShovV7766/ZFy9esVhu
+3FF39OjJqqpLAQF+K1YsoWk5bjMKBR0YqHWY6jcaa7KyjuBZ2aqqaoulwZUtSS1WINU2XBSAhHYu
+zyNxGYKbbQMA4O/vCwCwWhsDA7WCLQKB0LpIf9shxDt/a+Ghy5PtfwoFzbIut5/wPC/+pmRZ9o6f
+KU1N9u++26BQ0GPHJghDoFjvlOM4QeTTGYulfu/eIyNHPo8fgoMGxW3bdgetyG7duowePVSwlZOT
+JzypxXqGYiTdeR4Ji16C5pP4V0m9TQCA3c5yHOfJ6wLOu/gWQ1e6rx6CNSHx3wjddk7c/TuQw1H9
+FtoSRyupPykssGk0vjNmTAUAJiUN//jj93AZUhSFPTi0NwesVtv69VuEcaupyS7Zwt1s+XHfNux2
+xlVYV9q5BALhftL664Jyufytt15ZtSptzpwb14lJ6gEK6vI//JA+ZswwsSFn/vOfn728FIMG9Tca
+scAN1OsDhg2LT0vbcfjw8YiIMEGXUtC6RAjhqUV839j48S9+//0vEya8aLE0HD58XHypmCRarUar
+7SM8HKurryiV3lgyNDf3bEXFra8rQRdRnC9BFxHro06ZIn1iRFJvU61WXr5sSEvbMWhQ3Pff/4K1
+WF0kE6rVyqysI0FB7Y8ePdmlSzCW0ZLUfQUuNEstlnq8nmowmPFnSkPDtZqauj//eQIAoLLy0urV
+m559tp+rghI0MFmWW7lyvfAd4xoo1q50Y8uhDF1pzOLyDw7ugOckIyLCcL7i4nrHxvYuLq545533
+hTVIq9VWW1uP2wbWfbVaGwsLS/7nf/4ba5YePJgj7NJyZctBA9NN22BZFn8c35yRhs7auVOmJErq
+iAppEEujEQiEVsfluqD4/jbB8cKFy3dco5LJYGhox4YGa1XVJaxFFBUVERNTKuxCxHqA+G+z2WIw
+mJ97boD7ZX+7nTl8+Di+DBbc1DINDNQmJycuW7YS7x9JTh6jUimx1iXLsnV1DUuXfgsASEmZHB/f
+/6WXhqSnZ7777kc3NQZdiiSFhHQULytGRobTND169NDU1DU4C4MHx02ZMlrwI9xhJs6X4B/rNwrx
+4F8hhF27hspkUAgLRHqbo0cP/e67DfHxsdHRPTZu3NmlS7Cri9nwHXJlZVWvvjru8mXD7t2HZs58
+RXzXGhDpvjIMk5r6E9YsnTfvE0EfNS0t8/Dh4/X1DfPmLcVlJa6viIiwV18dFxioFdKMTatUytDQ
+ILEthYIeP/5FmUzmarZAq9VQFIXTQ9M0LufIyHBnW67KEIjaEq5HmqYlyxDb6t69a2Rk+IABfdLT
+d5aWVoaHh2Znn1qzZhNuG1h/UriHD2uWJiYOr66+4qGtmTNf0esD3LQN4eMYl4nYFrip7elQXzpd
+wKxZ08Xlg8+2itsPgUBoRaR1RK9fb3r99Tn/+tf/iBdFEEKzZy+ePHkUPrHgnpKSynPnigRFIlda
+kceOnUYI9e/fx/1Eqxv9RmFDueTGfSClSeh+AlZSH1WcBpkMQihz8OOQBrF/QcNT/Kugu+hes9SN
+5qGAELNYy7EV9RtpWo7T4KAVKbbrrMXqjCt9VElbkmUoxONQj55rsTZX99UTW8CDtiFOv4fanq7a
+IYFAcEVr6oju3HlgxIjBDjqNJ0/+FhLSwY3qipjw8BDx95Yrrci4uD6exOZGv9H50dBcbVJnW5Lx
+NysNzv4d/AhDhXvNUjeah84xi4ef1tVvxGlwiFPSrqDF6owrfVRJW56nTTJfHtoScKX76oktV+l0
+5d9DbU9X7ZBAILQu0l0rOrqHsJNNIDS0U1hY6EOrM0kgEAgEQnORHgUltSjJWSUCgUAgPGaQjdoE
+AoFAeHKRHgXFB84EOI5zoxJJIBAIBMIjh/QomJq6durUWTcP590gK+tIYuIbBQXF9yVhBAKBQCDc
+c6RHwdbVESUQCAQC4eHkfuiIEggEAoHwcHJPdEQJBAKBQHgkIOuCBAKBQHhycbkueNc6ogQCgUAg
+PCpIj4JvvTU1MjLcwRGvC977JBEIBAKBcJ+QHgVbriNKIBAIBMLDD9ERJRAIBMKTywPTEUUIlZZW
+dukS4rzp1GZrLCws7dSp/UOlXFpVVY2v7QUABAd3DAzU4nQidOMadK3Wv3PnTm7yRSAQCISHjQd2
++M9oNC9e/M3y5YudL5oxmWo2bsxMShr+8IyCRUXlmzbtqq2tw/8MCmqXnJxUXl41d+7SmJgo7KjV
+apKSEjQaH1f5IhAIBMLDhvQoyLIsQsjhzjOO4ziOb8WHuytV0nbtAj/88F2alrvyLHnlKU3LIYQ8
+jxDCd6wiAABFUfieNp5H+IJv4OJ6VQil7+TD5OTkdejQdv78mfifJ06cwbeqxsRECTc6rl69KScn
+b8SIQURtlUAgEB4VpEfB1NS12dknv/56kV5/62ssK+vIV1/9uGzZ37t373rvEmSx1H/44ReVldXT
+p0986aUh2NFkqlm+fN3586UAALlcPn36xIED+9lsjRs2bDt48Bj2M3r0CxMmjDx/vmTHjv0BARrs
+3rdv1MyZ02hanpd3NjX1Jzw+hYR0nD07xd/fr6Sk4uuv15hMNQAAjcZ31qzp4eGhniQyNrY3AKCq
+qtpmazQYTDedkUKhaM2yIBAIBMI9RnoUfIA6on5+PvPnv71hw1az2SI4pqb+NGhQXErKZACA3c5u
+3JjZs2fErl0HaVr++ecLsZ9//vM/ERFhdjuzfv22xYvfw+6bNu3etm1vfHz/tWszFi36m0IhBwCc
+P1+6a9fBCRNe/OKLVW+9NVWvDwAAGI01X3+95tNP57v/2BXWAvGrwNGjue+++xH+afDguPHjX7Ra
+bfekXAgEAoFwD3jodEQhhIGBWodDGteu2dRqZWCgDv/znXdelcvldjuTk3MagBubUIqKyvCn3tCh
+zw4fHk9RFABApVJarY0KBa3Xa3/9NRvLAAQGaseNG4EQMBjMhw4dV6tVAACLpa6qqvqOycNrlidO
+/PbppwuwrY8/fg//hCdayShIIBAIjxCPpI6og6gNZty4EfgsI4QQD4ECGo3v//t/k4TxsqSkYseO
+/eD2axQ1Gr/p0yc6LEY6ExzcccmSuTExUXhrKIRQoaDxf568H5A7GgkEAuGh4kGuCzIMYzCY8Swl
+AECtVqnVKoSQ0Vhjtdrwr3p9AITQ39/XZKrFK3Asy23evPvll0ep1cpevSJHjBiEg2s0fgoFLfk9
+Z7HUb9iwdfz4kdhWYWHpoUPHRo16ITi44wsvPItnRAGA2JZkUtVqpdFYIywBqtVKCKHkYOwqX/jv
++7O2SiAQCAQPcbkueK91RCGEEMJ585YKLsOGxU+bNtZkql206EuDwcyybEXFxQ8+mKXR+M6YMXXZ
+spVr12YAABQKeubMV3Q6/9Gjh6amrhGW5VJSJsfH91eplOLDjlqthqIoPz+f6OiohQuX4W2iERFh
+M2e+olDQ77wz7YsvVlks9QAAvT4A25JMrYOt5OTEqKiIkpIK54OVrvKF/yZ3NBIIBMJDBayuPB/Y
+rgPD1F+337pB4vr1ptdfn/Ovf/2PsBQHAEAIzZ69ePLkUX379mwV2wzDiMdZ4QCD2F3yUIRcLscT
+sxzH4xMLAACKkuGJUJZlhclJfGYCu0uetZC0Jckdbd0xXzg9DMMK6ScQCARCa5Gbm5+WlimcXnOD
+t0IrlynLCo5eqL4q/S14f3REXZ3Pk3SXXHWjKBk+DujKp3iNUHKQc3NGsLm2PIkTryN6aJFAIBAI
+9xqiI0ogEAiEJ5cHpiNKIBAIBMIDh+zUIBAIBMKTCxkFCQQCgfDkQkZBAoFAIDy5kFGQQCAQCE8u
+ZBQkEAgEwpMLGQUJBAKB8ORCRkECgUAgPLmQUZBAIBAITy5kFCQQCATCkwsZBQkEAoHw5OJyFDQa
+a1zdn3d/sFjqH2wCrFYbuRGXQHDmgfdNAkIIXwnnwAN/bj+KSOuIlpRUZmTseeONSfi+PYTQ2bPn
+7XYmOLhjy9VEzWYLx3Hu4zGbLd9///PYsQnh4aEtNHd32GyN69ZtjYjoEh/f/4EkwHPMZkt5eVX3
+7l1VKuWDTsuDAbdPH582nTt3cuPNZms0GMzOGrk2W2NhYSlCfEvKsLCwJCwspKHBKrRtXC/4V63W
+v3PnTkI/wo4qlTIiIlwmg2J3CGFUVAQWsi8oKBau8xTSVlVVbTDcuAQN90eHfOH+pdcHSMYpaUsc
+p9iWZL4AAFu2ZGm1muHDB93xghQhbTgeZ/+u3B8SWqVttDwNzmVoMtX++OPGpKTh4eEhgk+GYX75
+ZXtcXJ/o6Chyd5vnUH/76zvqNj4838Ryt67P/eyzFcOHDxLKt66uYfXqTWlpmV5eip49I1tocuPG
+nWVlVe7j2bhxZ5s2qkGDBri6/P1e89tvhTk5ea++Ov7uLsUtKio3my1arX+rJ8yZ/PzCrVv3RkSE
+uboi+IFgtzPZ2blBQe3vw63CuH3yPB8ZGe7G22+/Fa5bt2XIkGcc3C9fNqxZs2n16k19+vTo0CHw
+LhJgtzPz5n0ycGDsrl0Hcds2GMwbNmzNyTl97lzxuXPF5eVVgYE6nudSUhYYjbWFhSXnzhX/8UeZ
+UunVqVN7oX8dOXLi+vWmfv16KhT00aMnd+48ePr0OeyzqupyRESYQkHv25e9Y8evK1duqKu7FhTU
+tmPHdg75wv2rfXu9YKui4oLdznTp0kkmk0na+uijr48ePVlWdsHBlnO+sImIiLBPP10eH99frVa5
+LxmctoEDY3E8Dv6PHj2Zk5PXs2fEQzsKtrxttBzJMlSrlTIZTEvbIW7PFEUFBbX/5JPlL774nHCj
+3BPFpUtXz50rHjp04B19yimVDNK1xqr6BqvEt2BOTl67dnrxa7VG4/v++/+9evUmjuPFPiXvrRVf
+h0vTcjyMcRyHw+I3X45z981eXn7h8uWrSUkJ4tcZD23xPEII362LAAAUReFLAXke4Yvmwe3X3kpi
+tdqOHj3p0JIEWxRFIcTjGIR8iW3Z7Ux29kmeR6GhQXe05ZwvfB89w7DO+RIuOMR+sHt0dI/o6B7i
+5wjDMDRN47RBeOu+Q89t4bLCz0H3ZcgwDEXJsbtgi2VZg8G8YsX6mJgomqbdPOPc5EvSlmS+VCrl
+vHkzHbq9ZDtkGFZcj9hucHDHJUvmzpmzBCHp5i225QqZDAKAZDKII6+qqr548Ypw2+fq1ZtycvJG
+jBjUrp1+yZI5uEDwjaADBkQL/QsA8Oqr43CQbdv2TZw4Et9ozXFcdnYuTsO4cSMGDuz37rsfCfEA
+ALKzTx09evLZZ/sBAIT+JdiyWm1r12Zs2ZI1btwISVsQwhkzkrEtu52ZPv29xMSh+GnrkC+hPF9+
+edS2bXtfe228++YNoYzneSEe8U8cx+3ceWDs2ARsyP1zA9zev7AfhmGFtoEdcd9ECDW3zbtKf7Pa
+huBI03KWZXFbddOXhTS7f0a5KsNu3brodKdzcvIGDIgWHP38fPr37719+75x/5+9c4+Lusr///nM
+zGeUGZWBuawKAgq4YGKKpvgr0TIFNRVETcWs7Bspuq1b5i13++qWl3Lb2pLUNlPzUiDiDS+YSQhf
+vCCarsByB8V0hoFBA3Jun98fbz1+ms+Fz4DXPM+Hf+DhcN7n8j6f8/mcy+vEjRIqFMEFHg8uLq7Q
+aDxbnPmsra1bt25bUVEZQkihUMycOXnIkKcoitq+fW9GRhbEGTfu+UmTxths9qNHc7Zt240Q8vf3
+0eu1Xl6eIimbzfVms6Vnz+7itpqamnfs2JuZeYJtq6iodP/+o97eGggfMCAsMXEGTSvy8y8kJX0D
+bufv7zN/foJIHhobm/LyLiQmzmCHYFsDBoRpNJ6DBvUNDPTH5cK2mpqaly375PTp8+3btzt2LDc4
+OGDJkjlCz1DecmVkHL92zXT58lUIx+U6dix3zpxbWcrIOO5wOF54YXh5edWKFWvr6hpWrHinV69g
+hJDdbt+wYcezzw6urLy8ffsejabTvHkzg4IC3LK1bNknHh4eEyZE//DD/wUE+AjVYceO6g8+WDtw
+4JM7dx6wWm3Y1vbte/fvP3rmzIU33liiUCgWLpwl9JUmXi4XW7zlstvtH320/vz5woiI8L/85TWc
+MtcPEUJNTc2bNu1k+4bQCF1aWvn551tqa+sQQtiWkMMoFIolS+bo9dqRIyPF38FtNpvRaFYqFQih
+xsbmDh1a+JYC5HK5+Mx89+6+584VOJ3MkCFPcX+rVqv69w9LTk4XeTKaTHVGYy1CyGq163ReCFEi
+5ZLL5QMGhL311p4ZM+LEcx4aGjh79nScDg63Wm1Hj+YEBHQDp2X3L8T33EC326uxsemtt/5us9lH
+j362vLy6uflX8I2FC1eaTHUDBoR16KA+d67AXZ93a86J1zfYtkaPfrauzvLii2Pz8s5zbZWXVx0+
+nBUbG7VxY3JRUVmLzyihOtRqNd7emuLiCvYoKKWtCS6IvceJk5T0zdChEQkJUxFCVqv973//NCQk
+0GDQxsVFR0dHQpx//OPfISGBNpv91KlzH3+8FCFUVFS2YsXaqVPHt8XWzp3pffqEHDyYSdMKSBbb
+slpt27fvXbHiHQhPTT20d++RyMhBW7emLV/+Njx9iorKDh7MnDbNjTzs3fs9tpWaeoiiUGCg/4UL
+Rbhc2FZc3KjFi+fs2LGHpumJE0dRFAVDIHuNB91eE+KtQ6PRvHlz6ocfLoFwKJdCoairazAazbAO
+VFZWFRjojxAKDPRftWrh8uX/wokrFIoRI4b86U/vTZw46uOPl5pMdZ9/vuXDDxdLt2W12rp0+cP8
++QnLl3/65z+/mpV1iluH+fkX163b+vbbCSdO5Dudzvffn69QyLGtuLjo8PAnVq5MWrVqkVJJw1Qt
+e50MgCegSLkgGthavHgOb7mUSjox8aUTJ84eO5bLTpzrhwih7Oy80aOfZfvGxImjuc1ts9k++WTj
+7NnT9XpvhBDbFq97yGQUjJEtvjuWllYtXLjy0qWfdTrv8PAnEhNfEo+Pbtcbe22Pi16vjY+P+frr
+FJWqPcM4Kcq9WWibzZaU9A1N0yZTbXBw98TEl6Dg0sslhErl4efngxByeYeAvjN/fgIstrH7F0Io
+JeVAWVlVQ8MNbv+KjBxotdpWr1782Wdfjx79XHPzr+CHJlPdokWzjx8/TdOK2bOnu+vz0hd6hHyD
+besf//hyzJjndDovXlthYSEymSwhYfF7781LSJjK+4zCPi9Sh4S7RetHwV9+aVKrPQwGHULIarU1
+NjbD1/r580XFxRUQp7i4HF5tGhubIabBoCspqWyLLYTQ3LkvKxQKq9WGEIUDGYYBWyNGPBMVdevV
+VaXygIzV1tYbDFp4iBgMOjzzIBG2Lei3SiXNMMy5cwUHD/4IcX76qXDw4HCKogwGrUbjCYbgV3a7
+PTPzRGXlZZygv7/PH/8YeONG47Fj/wfhdrv90qWfoQ5nzJjQv/+t9W0oV58+oSdOnM3IyJo+Pbag
+oOTKlWuzZ09HCFEUZTDoXNbtNZqOer13fHyMSuWhVCp79QqWy+VC7cW1BaWDYUmv98Z1WFhYeuRI
+lkwmRwhVV9dYLDcQQjqdd0LCtK5d/wCm4QVZrVYZDFqoCvzgLimp2LXrEM4kTSt0Ou9evYJ5y2Uy
+1WVkHIfZMGyLt1wIIS8vT3gkseH1Qz7f4IFhkNFo/vHHkzBZZ7E0VFfXtOgkUggNDVq/fkV6+jGT
+yRwfHyNlKbekpCI19WBe3vnvvlsrMhp5eXnOmDFh48bk8vJL7I8DKdA0/e67c3U67+Tk/ePHjwgN
+Db6n6/FWq62wsDQ0NAgvE7r05VmzplMUlZ9/AT83EKu9wK8YBqnVHmq1R339ra2SBoMWOoJe7w1+
+6JbPS4RhkMVyXa/3xhnj2mIYpFJ5QB1ybVEUpVJ5xMVFQ3jfvr0gYfYzSqfzwuUi3Gt4RkE8Yd0K
+cnPzc3PzYVeIw+Hg7tl1OpkWNy/BmyzDMEJdUXwrMEVR4rNSTifT0ssyJZffmosHBg58cvfujAUL
+ViKEvLw8eWcbBg8O5z59YA1AoVDwvvU7nQzOKszYwPApk8m5tfTMM0+lph4sKCjhrlnyAusKGk0n
+eA8VgtcWL3K53OlkYLOLn5/P88/fmrKGt1cRYD0vIqJfREQ/7m+55WpsbNq+fXenTh2hjDdvWtk5
+lFIuIT90OhmJu3XsdrvNdqsXaDSeM2dOpunWvzKyoWk6Li46I+N4WtrhadPGt2unFI8fEdEvPLz3
+zJnvuKyrcdHpvF97bcrSpWu4v3I4nHjxlReFQh4U5D9x4ug9e460a9eOvfOQF6vVLr4iKITD4UxK
+2tK16x9gjpoXhnHK5XentnkR8Xmr1dbiWj4vY8cO37fvaHJyOkLI17czfL0h4ScezgM8NGA62i2c
+ToaiEMxds2mxrQku8DT2yJGR69dvLygogQkrhBDDMCZTXWNjE6xq6PXeFEV5eXWqra13WUuoqbnq
+4dF+1KihCKG8vAuVlTUIIaWSpigKYlZVXdmyZdcrr0wSyVNoaGBgoF96+g8vvDAcQti27HbHrl2H
+XnxxrFrtgRczEEJqtQdFUQIDJKVWe+D1mKqqKxcv/lckDxpNp3HjRnz11Xd4vcpkMlMUNWxYBEJI
+r9fCrnSlku7ZswcUFiGkVqvwuy3Om7gtnU7Tr1/v8PAn4L96vVbkHbxnz+4IMWfOXCgtrcIZs1pt
+Fst1q9VmMtXV1zeILHbytpdQ5Nv58WbFobp16xIVNRTqkKZpLy9P0belW3Uuk1HQXtzPNaFyNTY2
+FxaW/vWvf1YqFRbLjczMXPFvJpPJXF9/vbGxyWishTrk9UOEUE5OXkpKOrQjQoxSqUQCdejn5/P8
+88/czjMFPi9eXWzYPs+2Bcjl8uHDn9637/t///vbOXNmSO9fCCGL5brRaLZabTCN7DJHqtVq8KsG
+XoO0WG5kZZ187bUpSKAvs9siNjbqyy93zJ//OnsJygW73f7FF9/MnDmpFXs7zeb6ysrL06bFsO26
+9OUDBzIHDeorXodeXp24/V2t9sBbUZD7Pm+32+FNF89+8/qGTudtMtXBn5hMdRpNJ4pC1dVXunTR
+w+DXvXs37O0pKenBwQEwIQ/PKAHjv3lGSVkzLioqLSurfvPNV9mB9fUNe/d+D21NkAjPKGgwaL29
+PQsLS4OCAvDZlOXLPzUazXa7vbLy8nvvzdNoOs2aNX3Nmg1bt6YhhGBtRq/3HjduRFLSlrfeeh8h
+NGxYxLRp41Qqj9DQoP79yyAwJCTw5ZfjxJcZVCoPH5/ONTVXm5qaYYqDa0un82LbQgjFx8eEhYWU
+llayD4RptRq5XK7Xe8fHxy5dugYmQkNCAmfNihfJgFJJh4YGFRSUwoMGIRQc3P3QoR+3b98DEaKj
+h06YEB0WFoLLhRAaOTJyxowJ8DPOm7gtl3ItWTInKCgA8ozj+Pv74AnPWbOmb9q0c968mXi7TVlZ
+1erV6xoarm/alJKf/5+FC2cpFAqKooKDA1zeQHnbS8hWQICvUkm/9948T8+OvHUYGhq0cOEs+AFn
+hm0Xx5fJKGgvkQp3KRfblk7nHRMTVVNz1SV9DKxpFRdXNDTcWLRoNdQhrx8ihKZMGXvlyjUcDouC
+3DpUKum5c2d88slGOJis13uDz4sUwQUX3wBbTU3NOP/gY9eu1SJ3+hdCKDk5PSvr5PXrNxYtWpWQ
+MDUycpBK5cH1eYqiKIpatGgVQkin8547dwZ83vHaYvuYn1/XTp06iH8MVVbWIESFhYVIrxDMgQM/
+TJ8e6/JKxO3LgYH+NK0QqcM333yVpmnc38EPx40bYbPZcBy3fB4hhDepYh9r0Td0Om/w2969/7hp
+U0p2dh7Yio2NiooaihCKjh52+HDWhg070O1nFG4jdg1wn1Hia8YMw5SUVBoMWq1Www6/cKEIISYg
+wEdqexAQomqqigydu9ps13+13jk2e/OmdefOAzExI/HHjc1mw29dvAcVFAoFuI7D4XQ4HAghmYyi
+KBlFUXA6gr1d2Ol0ik/oMQyTlnY4PLw37t7ithBCcrkM0rTb78zVwJkJCOc9ayFCdvZppZIeOLAv
+QmjLll0IMVOmjINfLV265sUXx/bv35tdLpeJFJw3cVvccrHzDOlAHeL4Lk8o3nLBJGSrbUmvQ5f8
+uNiF+Li9xOtBqFxKJY1/K7FcSMAP7XY7RclwOLYoVIdcn5cOr2+45J9dLnf7F2rJ54Xyzw1v0cdc
+2LPnyBNP9Gxx1pQXF1vscG65pNehkB+2on85nQy7uiT6xuLFq2Niovr1ewJ+m5i49KOP3j14MBMh
+FB8//vbhnDvl4n0GSn9GWSzXd+/OmDp1HHtG3W63Jyenjxo1THwT/u8YOH2ETyiJ0F6pVcg8yguy
+L9Vc4x8FCS4UF1ekpR0ymy3wX1/fzlOmjGu7jA6BQPh9kJubf+jQj83Nv8J/+/QJmTz5heTk/U4n
+g6eICPea1o2Cgm98JlOdTuf1oKRbHjZ69uw+efILZnM9/Ld7dz+XiQgCgfA4M2hQP0/PjnBgiaJk
+oaGBSiUN5yzJs/Qhh38rUWlp1aZNOxsabtzn3LSCgoKSgoIStrDFPaJ7924DBvSBf3dxCGQY5vz5
+woqKS61OwWy2GI1mhmFKSyuhHgoLS9uiA97U1HzmzH/y8s7jf1hk0my25OWdZx98hPyz44jkEyfo
+VnmbmprZh0y44LJXV9ew83a30pdCQUGJxHJx2+uRA+r5rtRbG331gYPbUSajQkODlEpaq/Xq3783
+rDUaDNpOndTffbfvzJkLj2hbPw7wj4JfffVtZOTAB6VLaTSaT506JyUmnMM7diz30ZVRb2i4sXt3
+xtmzF1udQnr6DxkZWSaTecWKtXa73Wq1rV69jldvXiI7U1ACAAAgAElEQVQFBSULFqxITk7H/yor
+bz3cS0oq0tIOswc8yP8HH3yOhVpE8vnBB5/fTnM/PswnJT9ffrlDJAIu+xdfbC0sLJOYLKa2ti4l
+5YD0/HDJzj6dmnpIYrlc2kskptVqy8o6iVfLHh6gnltsF5z/EyfO4tUENtnZp48ezcEnUngR+tuH
+AYZhUlLSDx/OgucPb1+maXrChOikpG/cPaNMuG9I0hFFfLp5vMvRQhp9vHqAvLp5VqutvLw6JeVA
+375PuOg3QnwX3b//+Z8pMhnFPh/D1iylKAp0Ke12O0VROJy7LcKlXGwtTYjAq3PYdrgamG7pHEJx
+nE4GoTtKj3a7nfdsmbgWK1sftX//MO7cOq9mqXSNWYZhYmKiQLuysLB09+7DU6aM9fPzEfcNKDrU
+BntbxG+3SNwqu0wmc9F7lIKfn8/48SP27DniotAvkdzc/DNnLrzxxjSDQVtcXJGaejA+fjw+LsaF
+215IwA+5WqxYZxVraYr0L7xtBL5UxLVYhfQ2ubbQ7XrG+pZC4Pynph6cMCHa5TRtizqi4AOpqQdj
+Y6MGDOgjXi6hOuT25bbXIaa5+ddDh35ctWohRObVs0VE2/OhR5KOKK9uXnJyuq9vF9AOra2t+/bb
+fUK6ebx6gEK6lB99tP7EibNXrlybOfMdjabTe+/Nw5uqi4pKFyxYOWtWPD5HCFqRer336tV3zvew
+NUsHDuzr4dH+qaf6fPrpxn79eqekpCOWRp9wuTp7eHh88cU3Ticjolna9oGQVwPTXZ1DWHvo2FEN
+27iF5pda1GLF+qjo1mUutej2uUBIgatZKgSvLYSQxdIAyVZUXNJoPHU6b3Z7IT7f0Gg6Pf30AKir
+FSvWJia+pNdr2T8jhDSaTlD211+f2rotS3BOLi3tUGxsFOhUmUxm9gQDux5cYPeXnj2719c3GI1m
+kVHQpb2QQP/i1WLNycm7etXUt+8TSUnf1NbWifSvpqbmTZtSJk4cc+hQZmbmCXEtVt724rUFfojr
+GYR+eLHb7V9+uePEibNvvLHk3LmC2tr6oKAA3Jel6IiCv5069VNpaZVa7REZOSghYarFcp1bLrf6
+chvrELtBY2NTcnJ6bGwUOKGQni0i2p4PPS1LJAjp5o0aNQx0CwMCfDduTH7uuf8npJvH1hFFLWl7
+Jia+FB7e+/DhrCVLEhGiXM6ZuWwvBr3KVau+wCFsbc/8/IsnT56dPz+hsbFp376jPj6dcfi6dVvn
+z08QKtdrry0IC/vj++/PdzoZ0B48ejSHq1na9kumQFPGRQPTXZ1D/NwXv1eIV1ORXS6sj3r+fGF2
+dh6c04JzgfAKzNUsdcsWQigl5cDp0+cRQn36hEyaNEal8jhz5oK4b9TW1n/00XovL43TyZSUVMLI
+xP4Z3T57hxDi3h0onaAg//HjR4IPUBRKSvqGLfXHroc24tJeLv2rtrb+8OGsgABfXi3WiIjwhQtX
+ff99zvz5CRpNR5H+FRc3KiQk6KWX5r3zzhsff7xUXIuVt714bYEf4noWGewVCkV8/PjS0spVqxat
+XLk2NjaK3Zel6IiCvy1b9mlMTNSTT4bAkXlPz47ccrnVl9tehxBn797vZTIqKmoovBnw9mXCI0HL
+vVpIUxHrFtI0PWTIwPDwMCHdPIQQV29TSNsTNCGVShrL9GF69QrevftL9uQn6FX+NrcM1h7U6bwa
+G5vValVjY1NoaBDoT6LbGn1CeoBqtUql8nj99Wldu/7Bbrc//fRTarWH1WrLzT2LhSewLmXb4dXA
+bIvOoRC8moq8+qgIoREjnvngg3fgD1k3vPBolvIipI/62muT4+NjEUKnTp3bt+/7+PhYdnshPt1X
+g0GXkDAtLe1w22tAHIZhzp27GBDgA7Nh774712U7w10ZArlQFNW3b6+8vPPgXUolHR8fo1AoFAoF
+V4tVqaRpWjFz5mS4cWXQoL4dO3Ywm+t59Wx1Oq8BA/qAbmqvXkGNjU3IHY1ZXlvSy8UwzKlTP1VV
+1Rw5klVTc/XUqZ8GDw6HZwhXRzQgwDc3Nx8XYfjwp3v08Ad/U6tVXl6dsIfwlkvoGcXbl4XqkOuH
+QnWIEDIazUZj7cCBfdmrA7x9mfDwI0lHVEhTUS6Xq1QeN29aHQ4HPnbaolKokN4mr7Yne/URr/2I
+JB4Q4NuliwFkkDp27DBu3PN3iurOUwy+UBUKBe9Zn7i4USJvwW1HurZnGxHSR6Uoqi0Xn4roo0Ky
+gweHHzhwzOWKCSG4s8F3faOBw+HYvTvDarUlJs6Qy2UOh3P9+u1VVXcUtAMCfBMSpvK6ELu/OBwO
+hcK9200VCsXEiaMPHsyERKxW686dB7j39rHXQbGJCROiEUL4AA/A7l9YU9fPz4ftsRI1Zrm2pON0
+Otu3b9e+fTunk3E6mfbt20H+eXVEBw58EsRQ4L9paYe5a6t4PY9bLqvVxvuMguVk3r4sXodsuHUI
+OrcDBvSRrlpOtD0fZiTpiPJqKtbW1m3ZsmvAgD4hIYFwOBTWfri6eTSt4OptGo1mIW1PrB9osdw4
+cuR4QsJU6D/cdUGupqLFct1iuQ5CkSpVe5ByEIJXD5B3t6la7fHkk6G4CBqN5926HZurgXlXkmVv
+44Q1LV5NRV59VCF4NRV5dSmF9FHxumBe3gVYEyotreTTiryjqWix3Fi/fhvMB+L22rPnSGFh6V2p
+KHR7jcpstkyfHgPNSlHUs88OdrkJS+gtauTIyOTk/VlZJ0NCAnG5pFu32+3btu1+9tnBMGFoMtV9
+8cXW25O9krRYRfRsJdIKjdkWgTsRMzNPzJgxwWisHTp0ENQtr44orNXhInzxxVaTqQ6GHJy3vLwL
+CoVi5Ej+a8Tvqe6rC1VVNWwtX4xQXybang85LeuICmkq7t9/NDJyYP/+YRRFxcfHbN68s0+fEMSn
+m+eiBwh6myLanliDEfQPf7tN9DfrglxNxS5dDGq1Bxb8PHeuAPobW38SdBeF9ACtVhtbGxNw0TkE
+W22ufH4NTBGdQ4no9d7stVJY0+LVVHQ4ePRRXXQpMbyapVI0MHG59uzJgHXBYcMi4uPHq1QevHqb
+KpUHV0eU3V6TJo1pnXwXL2VlVdeu1UJ+IEQmo6SPZAaDNj4+Zs2aDRs27MDlkm5doVBERUVy/RAJ
+aLFy/UFIz5a3HaVrzPLacgt4VtA0DZqfEMirIxoREc7VBHbJ27BhEVOnjuMtl4juK7cv85aL1w95
+bdlstmPHctlavjic25fhV0Tb8yGn9TqivNqDmzenIgHdPF69TSHdPBzf5ZPLarXhNBGf9mBe3vld
+uw797//+BQK3bk1TKunp02Pd1W/kvvjz6hy2HXd1Dt1NE8Cany62hPRRhZQkpett8paL1wda9A3Q
+EZXL5UeOZA8c+KRK5eFwOF5/fdHHHy/lLh63jhaVM6WkwLuZXiIimqUuWqy8/iBUh7zlckuL1V3f
+axG3dETZeZNSLul9uS11KOQtvHVItD3vJ3dTQa1dO2V8fAw7hNttXKa5wS3kcpnTyXBdRGidSWhe
+UWJ8uVzmko3u3f06d9bjK9bwWpdL/nEOueVCAiuIXFt3Bd66Yj8CWmFU6EHMDY+I6JeWdghXl69v
+527duoikwNsoEutQqE2ltLVCoXA4HA6H49NPN8JVq9HRQ2Gt8a7Q9p0vbUyBtw4Brs9z4wjVIW+u
+3PJ5oVy1GqE0RfoXN2/3olzS61B6/4LAadPG88YnPCTcZR1ROAvV5ly1Hq1WM2XKOHwzuMGgvafb
+WB51HiF9VLiTz2DQMgyDdRofdKYIdxOit0l4IPCPgqWlVWlph19/fYq7Imr3/5qFgoIShFBISBCe
+3zAYtI/QbQ8Mw1y4UNSxYwcXsR7pmM0Wh8Oh13uXlVX16OEvk1GFhaWBgf4SB4nu3bu5mG5qai4s
+LGOLsPj5+UCVms2WiorqXr2C8bIK5N9qteE4IvnEm0K1Wi/p5W1qajYazbCU279/GDcCwzBQ9suX
+r+h03u4uZeH03forFwoKSpqamqWUi9tebbGLqa6u0em8EUJtL4tb/iMR3EYwN871eZvN9t13+yIi
++oWHh92fDdIEAkB0RB8wREdUSn4eTx1Rt7if2p7uQvQ2CQ8zREeU6IgSHdGHSEeUfaWweHuh+6jt
+yfYN6X0ZQ/Q2CQ8zREeU6IgSHdGHRUdUoVBMmBB96dKVhISpDQ03xNsL/dY37qm2J/aNwEB/iX2Z
+6G0SHhWIjijRESU6ogg9HDqiVqt9+fJP4SyaSx3u3Jnep0/IwYOZXL1NGLbvqbYn9g12/0IIZWae
+OHEiPyQkiLcvQxyit0l4yCE6okRHlOiIIvTgdETZfmi12pqammFkYrcXQmju3JcVCgW7vRBCs2ZN
+d2tCwi1tT17fcGmvSZPGOJ1Os7mety8jordJeBQgOqL8EB1RoiN6f3RE5XLZpEljvvhiq/g5SN79
+XwzjlMvd8Gp3tT15fcMlQW5/xH2Z6G0SHgmIjijRESU6og9SR5RhmPLy6h49/LRaL4qiQkOD4BWT
+3V52uwN0RNVqD5OpDlfXgQOZgwb1FZ8JZ+OWtievb7jobYK2Z9++vXj7MtHbJDwSEB1RoiNKdEQf
+sI5oYKD//v1HYdDV6bymT48NDw/jtpdO5+Xih/HxMYGB7tWDdG3P4GAe3+C219Sp49jthW73ZaK3
+SXhUIDqiREeU6Ig+SB1Rq9WWkLD4/ffnwwq30Wj+29/+sW7dCig1r7bnXfdDXh8T8g3pfZnobRLu
+M0RHFCGiIyqQplA40REVyu19S0Eul7344gtfffUtlIuiqOjooTApet/8kDdBId+Q3peJ3ibhkYDo
+iD7WEB3RBw67XAghpZIOCwt5GLQ0HyHfaAVEs5SAeeR1RHnz8DBkQyJER7RF7rWOqFtILy/iaHvi
+v8URoB5KS++cfbTZ7DabXamkq6tr2FuccJ2zwyEPLu3Frts2apZyfUMKd0WXtS0QzVKCW8jf/stc
+dYeOTudNu+POjriPPlofFTX0Lm5AcAuj0XzxYrGPT+cHYv0+09BwY/PmVKfTKX2nnws7dx4oL6/u
+0kX/3nv/HD36WYfDuWjR6iFDBrp74Tjmp58KFy5cWV/fcPFiCfzr2tUAzXH+fOGePUdCQgLx6xHk
+Pzk5vV07pbiMwM6dBzZs2H71qunixZKKimqDQafVeonEZ+dn27bdw4c/LRTBZDJD2T/6aL3BoOva
+1eBOcd3gth7m8YsXi6ura4KCuqtU7UXir1r1hcGgM5nMkH+TyZyQsMRkqi8sLIWKVSjkgYH+s2a9
+W15eXVxccfFiSWXlJavV1qNHtxUr1mZnny4vv3TxYsl//1teXf1zSEhgZeXl777bf+bMBfhzyENJ
+SQW7vdh16+Ibd2Wepri4wmy2dOzYIScnz9e3i8tJCavVtnPngdra+lb7cxuBNjp/vmjAgD4yGcXb
+v+Ryua9vl9Wr192tOiE8JFy5cu3ixZIRI4a0GFMhV8kout5Uff1G46OtI8rVVHQ6GYZh8BEubAty
+y93CIF1H9B5BdEQfuI6odFJS0q1W29///rZSSefm5q9bt3XOnBki8yVcbc/OnfUrVy5gV6DVauvQ
+QfW3v70JO32Mxtq33np/+PCnKYqaNSt+wIA+EGfmzHdiYkbk5uZ37fqHxYsT4W8XLFgJn9fs9tq8
+OTU3N79nz+5IQLO0LTidTE7OaaeTUak81q/fPnBgX5dRxGg0f/99zoYNK3Hp4Afx/gU+T1EUxBd/
+bgj1ZYBolhLc5RHWEWXrHGJb5eVVhw9nxcZGbdyYXFRUBraampo3bUqZOHHMoUOZmZknWqEjeo/W
+D4iO6APXEYXzjuyXBjjPyhs5L+/C5Mlj4MHdv3/Y2rVbrFarSOJcbU84ValUKvC5WwjHk5z43Cr8
+7HK+U8gQbi8ok1KphJ+4mqVtpLy8asuWXXK5/PDhrDNnLmzZsgs03oDa2rrk5P0zZ0520UdFLfWv
+nJy8q1dNffs+kZT0TW1tnchzQ6gvQxyiWUpoBY+wjihb5xDbCgsLkclkCQmL33tvXkLCVLAVFzcq
+JCTopZfmvfPOGx9/vLQVOqL3aKGR6Ig+cB1ROO/IvogKzrO6mw4vXG3P0tKqhQtXUhSFz90ihGpr
+65Yv/9cvvzQ6HI7Q0GA4Ywfn6miaNplqg4O7w/lOIUPQXoWFpUFB/iNGDJk4cTSES/QN6QQG+sfE
+jKRpOjJy4MqVSTExI9m/TUr6ZtiwCHjjEXlucPtXRET4woWrvv8+Z/78BI2mo8hzg7cvL148B+IQ
+zVJCK3iEdUR5tT0pilKpPOLioiEPffv2QghRFKXTeQ0Y0CcqKlIul/fqFdTY2OSWjmib6lgUoiP6
+YHVE9Xrvf/7zr2zBoHu6XSI0NGj9+hUwN4g/znQ671WrFpWXV586dW769NjOnfUIIZqm3313rk7n
+nZy8f/z4EaGhwSLzASNGPLNs2V+2bdttMOiio4e2a6e8R/k3meqKiyscDqfNZquqqikuLscDbXFx
+Rbt2ym7dukI+hZ4bvP1LqaRpWjFz5mSYyB00qG/Hjh3M5nqub/D2ZYhANEsJreP3oyPK1vbEOpxs
+Q/gcnp+fj5+fj/jQIq4jeq8hOqJs7qmOaGNj07/+9XV9/Z1vwUGD+grNktG0Aq/X2u321lURTdPc
+P1QqFZGRA2lasWVL6syZk2FnqUIhDwrynzhx9J49R9q1ayeyWw1e/qZNG79t2579+49OmBB9j+bw
+5XI5dEOapkGPFMIrKi6lpR2KjY1m7yfgfW7cVsPg6V9YgnXChGiEED6kwcWlLyOiWUpoA4+wjmjb
+tT2l64jeO4iO6IPVEaVpeuTISLZWtcjs96uvTk5LO+Tp2VGn80pPP4bXn6TDWhdECCG1WsXe/zVo
+UD+FQrFu3bYFC2bhQLj78Msvd8yf/7qLjij0L5x5tVo1fXrMN9/sSk//AWvt3l20Ws3w4f/PZrMP
+H/50QUHJ4MH9EEIMw1y6dOXmTSt8yWF4nxvSbblolrLXO7kQzVJCq3mEdUSFtD1ddDgBrjamWzqi
+9wiiI/rAdUSFziDyEhTkHxsbBXmIj4+BnZzSbVEURVHUokWrcMjIkZFTpozF/iaTUQEBPjCzwm53
+P7+unTp1UCgUXB3RsLCQ0tJK3F4qlYePT+d7uvt/3LgRNptNpfIAPVKEUG1t/fnzRYmJL7GjCT03
+EEK8/Yvr57y+gfj6MtEsJbSF35uOKPyti+g2O4cugdJ1RO8RREf0YdARdQsob+s0PNl1hW6XV+DQ
+EU//QgI+z05ByP/vKS46vexw6Tq9XD8X8g1uCkSzlICIjij7b3kfAbydRLqO6D2C6Ig+DDqibtGW
+eQIpdQVxePsXEvB5dgpC/n9PEaoTt3R6uYFCvsFNgWiWElrN701HlOAWj5BW5O9VR5TwkNPY2MS7
+oYnwu+F3qCPadtqu7YlpUVOR6Ii2yEOlI4rc0cl00RFFv61blcojJCTIpb3YGpgFBSX4aKZ0HVHe
+cGyLrWVKUVRYWIiL3bbXoUv9gH+yfYNbLpc4UG8QzvUZ3nKx0xQKF6lDlyKw85OTc8ZorIX18lbX
+CeFhhn8U/Oqrb2NiotwdAu8WRqO5svLSwIF9H4h1hFBDw43duzN69/5j20fBgoKStLTD+OzdvbCV
+nv6DTEaNHDlkxYq169atQAitXr3uww8Xt/qNpKCgZOHCVezxZuLEUZBaSUnFvn3f63Te+BkH+T97
+9mJc3Kjp02PF85mWdig4uDtCSKvVxMZGu2wpFMmPeB2aTGYo+xdfbJ04cUz//r2lJNs6rFbbunXb
+jMbaVasWtRgZ8sMwTsi/1WrbtevQ+fNF8FsPj/bR0UP79w9jtxcuy6lT544dO3Hjxi8IIYVCnp9/
+MT5+fE3NtdTUg/X1DZCCr2/n+PjYiopqbntpNJ24tiIi+qWkpJ858x/YVgobcUeOHCKXy6XXYXFx
+BUIoIMD3xIn8p58e4DL3A2XEG1iMRvO33+5FCMXHx8I0Q3b2aW65wIex/0AeunXr8u23ey9fvgqB
+4DMBAb68dbhkyUe+vp3xQOXv7/PHPwZmZ+dJrEP2FAjkOSKiH7TIiBHPLFy4KjQ0+J76FeEB8gjr
+iLqlPcjWpZTLFaA1KqRLKaTt2Qpb6LYGphBER/QR0hG9edP6739/e/WqiZF2nsZFR9RiaTh06MeN
+Gz+CCjlz5j87d6b37x/m0l5QdXv3fj958hjQEXU4HDk5eTRNu+iInjp1DnbKcNvLaKzltbV37/d4
+V5HRaF6wYOXw4U/L5XKJdeiWjmh9fUNy8v7w8N5yufyrr76Fc5DsclmttlmzlsTEjGAYxuG4UwMO
+h5NhnNXVNZcvX8XlgtHXpQ7NZktJSQVCiK3FiuG15VKH7777UUVFNXsUrKi49PPPRvwWTlFUbGzU
+oUOZgYF+D+rDgHBPeYR1RKVrD7roUo4YMeTSpZ9nzZrGq0vJqz3YaluggSkE0RF9tHREd+484OfX
+deDAJ1NSDkhJnKMjeuccpF6vDQ0NxPqi4sjlcjgF5AI8qaura/jai98WPnOp0XjiekOS61C6jqjd
+bt+8eWd4eNgzzzzldDI0rfj2231vvDENn1tVq1UeHh5LlsyReOYSZg5YxwcRQkir1Wi1/cDn8SQn
+PhfIawufuYS6cilvaWllVtZJl3OEUjRjCY8uj7COqHTtQbd0KXm1B9toS7D2iY7oI6UjChKa588X
+SkzcRUcUn5GVyajx40cGBweEhATdFR0cbnvx2pLJKHyGLzp6aGhoUFhYCKQgsQ6l64gqFIpXXpnk
+6dkRISSTUf37h/n7+9I0jc+SDhgQ9swzT/XqJaYMJx3QYoXzzfhcIK8tfObS39933Ljnu3fvhudR
+4VmXmPjSg7pUjvBAeIR1RIW0B8VtSdGl5GoP3k9bQnXYRoiOKC9u6Yi2+spGgKKoyMiBERH97Hb7
+11+n5Of/B9a02pImwG0vXluDB4cHBQVAeXfvPrx//1G8LijRkHQdUYQQe/4QBMQRQl5ensuW/cXp
+ZE6dOrdr1yFYq2t7DYAWK2QGeyyvLbVa9ac/vepwOKqrr3z11bdduhjwuuDJk+eCgvz9/clR+scL
+njM6crkMH8sFxHVEnU7nPdURZcdBHB1RtvYgd4MJr61Wv3veN1v3U0f0ypVrCxasXLBg5ZUr13D+
+4ZwW/GtFsuI6okolPXhw+NWrpodER3TNmg1Ll67B//bsOXK3Eufa2rJll0xGqVQec+bMGDt2uPTR
+HXdANrgeuO3Fa8vhcG7YsKOxsVmppCdPfmH27Onbtu12WdAVxy0dUV5SUw9euXJNqaSfeeap//3f
+v2RlncRy2OI4HA7ucqzTyeD8K5UKqAHcd3ht5ebmnzp1Tqmkg4L8V65cePnyVfDD3Nz8M2cuTJsW
+w33XabVmLOGR4BHWEeVFqaTFbfHqUlqtdq3Wy2K5AR8lErU93bIlBNERfYR0RC2W61arFbeXu9qY
+jY3NOTmnn3vu/4HPNzY2d+igQgJ6tuz2stsdu3YdevHFsS46ogcOZLqs4wIajSevLYfDUVBQUlNz
+FZa42HcZSsQtHVFeiovL1WpV+/btEMsPefVRYV8YDszLu6BQKPr27cV9bkybFoP4fJ7XVk3NVZOp
+LjDQj23LarUVF5cbDDre1v/665Tx40e6qxlLeFTgV1Bbu3ZL5876sWOfx7dlcvUAN21K6d37j6Aj
+Wl/fsHnzzldembRnz5H6+gaTyVxVVYMQAq1FmlakpKTv3fs9JA7rLgzDHD9+euPGZLaOKByuYhgG
+4oOOKJb+KygomT//gz/96ZVRo4bhfD777GD2Tg38t0K2dDrvQYP6nj178cMPF+NyKZX0pEljysur
+33hjGsMwK1asBe1Bg0GL1xhaZ+vZZwfX1Fx1kVjE2Gw2rq39+4/K5XKRMopjtdoWLlyJn6ro9lrR
+jRuNa9ZsgHYBHdH+/cOuXjV99tmm6uorEBN0RCsrL2dmnuDmubCwFHRElUq6T59QWH8ymeqWLfsE
+dET9/X3AN+rrG9i2cLk2bkyGCdVhwyKmTh2nVqtc6hDCVSoP3jrE7TVp0pjt23d/9tmy+6ygtmHD
+jqyskwzDNDTc0Gg6sbUxpSDk8+z+hX3epQ6hvWw2e1LSlry8C5Ag9K/S0solSz6CARVISJg6ZMhA
+6bbcqgSr1QY6orW19XivwHff7ZsyZSz0X3Gkl8vlucH1DVyuTp06Svd5XltlZVUnT56bNGk090PQ
+bLb8619fv/jiC9L7IOFB0ToFtUdeR1S69iC2df58Ia4pXC6FQuFw2PEhEK72YOtswWY5EUk2oiP6
+COmIsjU8cd7cTaQtdYgEdERdVo55w8VttREhHVFepJdL+nNDus8L2RLy+RMnzjIMM2hQv/uzSEFo
+C4+pjmgr/pai7igxssslk9HssrjQOltCqYn8luiIcm09JDqivBqe7tKWOhTKg1A/km6rjbiVpvRy
+SX9uuKUj2qIWK5uIiH684YTfDXdZNhrriMK0SYt76h6IRp/0c1q/e4iOKIFAeMy5y6MgrC0zDHP4
+8I/Xr//i8kHJRbpGH68eIA7n6lJytTRBkxC0E/Gt9FywhqFQOq3jbqXDhq05iSToW/LWFbwUY93F
+u5ifu46QjmiLupRsqqtrTKY6rJ9JIBAec9o6vcOLyWROSzscGxvVYswRI545f76osLBMPFp29unU
+1EPJyenJyem7dh3aunU37K5mhe8HgSUgK+vUwoUr2UehjUbztm1pycnp+/cfPXo0x2V1h80XX2zF
++bFabatXr2Onw+XEibNms8UlsLi4gp0fKem0AtB+xNvlCwpKvvxyh1Bku92emXli7dot69dvZ4ef
+Pn1+69bdy5Z90vbjBy75aSMudQgYjeZTp86xQ3h9Iz39h4yMLN5kT58+n5GRxXvwoEVbBALh9wf/
+t6DdbmcYxmWuH/QeW3yDdjic27fviY4e6uHR3jx4D/wAACAASURBVOVv4WesFYkka/QdPJgZGxsF
+eoBNTc1z5/4tJmbE+fNFZ85ceOONaQaDtri4IjX1YHz8eF/fridPnj116tzNm1Ysi9XY2PTtt3uf
+fLLXm2++2tjYtHlz6r59R11kLzA2m/3rr5P9/bt6eXnu3p1RXl4N6bCX2WEPN2hdpqYehLzhclmt
+NtBaDAjwxUv6drvd6XTe1vK/s47CXefHmqW4LURWFl22ReCtBFzdV9Cpyct7Mjk5nf0ncXGjhgx5
+Ct/oDfC2l91upygKwoW2Kogc8Ic0QcfVRQ+Wa4u3Dnk1ZkErMjw8DE61vvEGjy4l64pax9ixz/Pq
+08LPLerZimuxopZ0X3ltIb72gjRlMgrqnHy5Egj3CP7Ha1LS1pyc059/vpx9RCYj4/hnn21as+Zd
+8R3DDocjL+/Cxx+Px88CXq1I3KulaPRhrb/Gxqbk5PTY2Ci9Xnvw4I9Y77Rnz+719Q1Go9lqtR0/
+fmrGjLhz5wrwn9M03b17t//857+hoYEWy43Gxqbevf8oZIuiqCee6Llu3bawsJCamp/x5u/t2/fi
+zwvQ9gRdzVOnfiotrVKrPSIjByUkTLVYri9b9snp0+fbt2937FhucHDAkiVz4K/OnLmQmnoQtDFB
+i5VXbzMj47jD4cBnIjds2DFsWIR4nVss10GqCuDVfRX5cy45OXkbNtz6rIT2amxs+vTTjf369U5J
+SUe3dV+9vDyxLYVC8cILz4mkmZFx/OuvUwwG7Zgxz6WkpEdHDwV9VK6tpqZmbh1SFCWkMcswCHRH
+b960QmVi4IzjgQPHBg3qGxoaBLbsdvtnny3Dvg3tKEXPlre9KIri+gbvQMgwDFc7l12H7PZKStp6
+8uTZgADfgQP7pqUdxrbcakcCgdAi/KOgw+FQKBQunyDwjdIKGxcuFLG1IjMzT5w4kc+rDiwEvptt
+27Y93bp1GT78aaHHQWCgf0LCNJdVRqWSfu65/7d27Za33npfq/WKjh7ao4efkC2KogICfCsrL1dU
+XOrRw//Mmf9AeFxcdHR0JPwM2p5hYSGrVi1ctuzTmJioJ58MUSqVCCFPz46LF8/ZsWMPTdMTJ46i
+KIqmaavVVltbd/Lkufffn69QyLEWK6/eJhz+xWtslZWXW9Tt/Ne/vsaftkK6r259TEREhIPuAbqj
+7Tlw376jPj6doR3z8y+uW7d1/vwEbMtqta9du0Vk1tdoNA8bFjF06KANG3YsX/72Z59tAn1Urq24
+uFHcOkQICWnMmkzmjIys5cvfrq6uWbkyCVssKCgpLCzdu/fIlCnjAgP9oVw9evi//fbf2cfkQR8V
+foZyLV48h9cWb3sZDFqub/DqvppMdVzt3EmTRvO21+XLP7/yyiSHw3Hy5Nn335+PbUlvRAKBIAX+
+UfDNN191OBwuz80xY54bOTJSfN8/Ly5akZMmjYGLZtwC7i3TajXisocURWk0nVzm5axWW1ra4cBA
+/3nzXrNYrm/alKLRdOKqnWH0eu+YmJH79n3/xhvT4NMHIXT+fBFepiouLrdabaCrqVarvLw64dJR
+FGUwaGETP/s0m07nnZAwrWvXP8B/4cVfSG8Tse6Zk1I5v/zShIsspPvqFpWVl3Nz8+Hn2/qoKDQ0
+KD4+Bt4wdDqv+vrrDIMslut6vTeU9E9/ennBgpUiyarVKr3e22yuh62ekGeuLaE6FNKYVSppvV77
+ww85ly9ftVhu3RuXnX26uvqKt7fn+vUraVoBPqNU0gaD1mWq32Sqy8g4DrOy1dU1FssNIVu8WqyI
+zzcEKoBHO9fpZNh1iG77BkLIy6sTQqixsdlg0GJbBALh7sL/bccwTu63FgxdUrb/KZW03S64/cTp
+dLK/KaVo9N28af3yyx1KJT1hQjQeAtl6pw6HA4t8crFYrh85cnzMmOfgITh0aMTevS1oRfbs2WPc
+uBHYVm5uPn5S8+oZCoW76Bxyf8urt4kQslrtDodDyusClJ19i6GQ7qtEQBMSfmaY35wTF38Hcjm2
+3EZb7GR5tS7xAptG02nWrOkIUbGxUR988A7UoVwuhwgu/uZCY2PT9u278bh186aV18NFtvyI+4bV
+ahP6WyHtXAKBcD+5++uCCoVi9uyXNm5MXrDg1tVlWBcUIoAe4MiRQ+C/UjT6/v3vb9u1Uw4dOshk
+AoEbSq/3HjkyMjl5f1bWyZCQQKxLibUuGYaBqUW4R23ixNFfffXdpEmjLZYb3PvDuLDvLUMI1dRc
+9fBoD5KheXkXKivvfF1hvUd2ubAuIlvnkAuv3qZa7fHzz8bk5P1Dh0Z89dV3oHMokE1KrfbIyDju
+69slO/t0jx5+IKPFq/uKBDRLLZbrsJ5qNJrhM+XGjV/q6hpefXUSQqiq6srmzanPPPOUUEVhDUy7
+3bFhw3b8HSMMxdauFLHlUodCGrNQ/35+XWFOMiQkEMoVEdF34MC+JSWVc+f+Da9BNjY21ddfB98A
+3dfGxubCwtK//vXPoFmamZmLd2kJ2XLRYhXxDbvdDh/Ht2ekKV4NTF4dUZwHtjQagUC46wiuC7Lv
+b8OBly793OIalUxGBQT43LjRWF19Ba7pCgsL6d+/DO9CBD1A+NlsthiN5mefHSy+7G+12rKyTsJl
+sOi2lqnBoI2Pj1mzZgPsH4mPH69SeYDWpd1ub2i4sWrVFwihhISpkZGDXnhheEpK+ltvvX9bO1Hw
+/jB/fx/2smJoaBBN0/hOMsj/tGnjcBx8hxm7XDg+6BzidOC3FEUFBwfIZBT+W8TS2xw3bsSXX+6I
+jBwYHt57584DPXr44UvgXIA75MrLq19+Oe7nn42HDv2YmPiSUknjO+QQS/fVZrMlJX0DmqWLFq3G
++qjJyelZWSevX7+xaNEqqCt2e4WEBL78cpzBoMV5BtMqlUdAgC/bllJJT5w4WiaTCc0WaLUauVwO
++aFpGuo5NDSIa0uoDhHLl6Ad2ffVsesQbPXqFRwaGjR4cL+UlANlZVVBQQE5OWe2bEkF3wDdV3wP
+H2iWxsRE1dRclWgrMfElvd5bxDfwxzHUCdsWuq2B6dJeOp33vHkz2fUDZ1vZ/kMgEO4i/Dqiv/56
+87XXFvzzn39lL4owDDN//oqpU8fCiQVxSkurLl4sHj9+BP5bXj1AiRp9IvqNeEM578Z9xKdJKD4B
+y6uPys6DTEZRlMwljkse2PGxniH7t1h3UVyz1EVTlBecMlvLsY26lOz2omkF5MFFK5Jtl6vFykVI
+H5XXFm8d4nRc2lG6Fqu7uq9SbCEJvsHOv0RtTyE/JBAIQtxNHdEDB46NGjXMRafx9Omf/P27iqiu
+sAkK8md/bwnpAUrU6BPRb+Q+GtzVJuXa4k3frTxw47vEwUOFuGapi6aouHX28NNGXUqXuoI8uKTJ
+axdrsXIR0kfltSU9b7zlkmgLI6T7KsWWUD6F4kvU9hTyQwKBcHfh71rh4b3xTjZMQEC3wMCAh1Zn
+kkAgEAgEd+EfBXm1KMlZJQKBQCD8ziAbtQkEAoHw+MI/CrIPnGEcDoeISiSBQCAQCI8c/KNgUtLW
+6dPn3T6cd4uMjOMxMa8XFJTcl4wRCAQCgXDP4R8F766OKIFAIBAIDyf3Q0eUQCAQCISHk3uiI0og
+EAgEwiMBWRckEAgEwuOL4Lpgq3VECQQCgUB4VOAfBWfPnh4aGuQSCOuC9z5LBAKBQCDcJ/hHwbbr
+iBIIBAKB8PBDdEQJBAKB8PjywHREGYYpK6vq0cOfu+m0qam5sLCsW7cuD5VyaXV1DVzbixDy8/Mx
+GLSQT4a5dQ26VuvVvXs3kXIRCAQC4WHjgR3+M5nMK1asXbduBfeimdraup0702Njox6eUbC4uCI1
+9WB9fQP819e3c3x8bEVF9cKFq/r3D4NArVYTGxut0XQUKheBQCAQHjb4R0G73c4wjMudZw6Hw+Fw
+3sWHu5AqaefOhmXL3qJphVBk3itPaVpBUZTTyTAM3LHKIITkcjnc0+Z0MnDBNxK4XpWi+O/kA3Jz
+87t2/cPixYnw31OnzsGtqv37h+EbHTdvTs3NzR81aihRWyUQCIRHBf5RMClpa07O6c8/X67X3/ka
+y8g4/tlnm9asebdXr+B7lyGL5fqyZZ9UVdXMnDn5hReGQ2Btbd26dduKisoQQgqFYubMyUOGPNXU
+1Lxjx97MzBMQZ9y45ydNGlNUVLp//1Fvbw2EDxgQlpg4g6YV+fkXkpK+gfHJ399n/vwELy/P0tLK
+zz/fUltbhxDSaDrNmzczKChASiYHDuyLEKqurmlqajYaa28HM0ql8m7WBYFAIBDuMfyj4APUEfX0
+7Lh48ZwdO/aYzRYcmJT0zdChEQkJUxFCVqt95870Pn1CDh7MpGnFxx8vhTj/+Me/Q0ICrVbb9u17
+V6x4B8JTUw/t3XskMnLQ1q1py5e/rVQqEEJFRWUHD2ZOmjT6k082zp49Xa/3RgiZTHWff77lww8X
+i3/s4rVAeBXIzs5766334VfDhkVMnDi6sbHpntQLgUAgEO4BD52OKEVRBoPW5ZDGL780qdUeBoMO
+/jt37ssKhcJqteXmnkXo1iaU4uJy+NQbMeKZqKhIuVyOEFKpPBobm5VKWq/X/vBDDsgAGAzauLhR
+DIOMRvOPP55Uq1UIIYulobq6psXswZrlqVM/ffjhErD1wQfvwK9gopWMggQCgfAI8UjqiLqI2gBx
+caPgLCNFUTAEYjSaTv/zP1PweFlaWrl//1H022sUNRrPmTMnuyxGcvHz81m5cmH//mGwNZSiKKWS
+hn9S3g/IHY0EAoHwUPEg1wVtNpvRaIZZSoSQWq1Sq1UMw5hMdY2NTfBbvd6boigvr061tfWwAme3
+O3btOvTii2PVao8nnwwdNWoo/LlG46lU0rzfcxbL9R079kycOAZsFRaW/fjjibFjn/fz83n++Wdg
+RhQhCmzxZlWt9jCZ6vASoFrtQVEU72AsVC74+f6srRIIBAJBIoLrgvdaR5SiKIqiFi1ahUNGjoyc
+MWNCbW398uWfGo1mu91eWXn5vffmaTSdZs2avmbNhq1b0xBCSiWdmPiSTuc1btyIpKQteFkuIWFq
+ZOQglcqDfdhRq9XI5XJPz47h4WFLl66BbaIhIYGJiS8plfTcuTM++WSjxXIdIaTXe4Mt3ty62IqP
+jwkLCyktreQerBQqF/xM7mgkEAiEhwqqpqrI0LmrzXb9V+udGyR+/fXma68t+Oc//4qX4hBCDMPM
+n79i6tSxAwb0uSu2bTYbe5zFBxjY4byHIhQKBUzMOhxOOLGAEJLLZTARarfb8eQknJmAcN6zFry2
+eGnRVovlgvzYbHacfwKBQCDcLfLyzicnp+PTayK0V2oVMo/yguxLNdf4vwXvj46o0Pk83nDeVTe5
+XAbHAYVistcIeQc5kTOC7tqSkiasI0q0SCAQCIR7DdERJRAIBMLjywPTESUQCAQC4YFDdmoQCAQC
+4fGFjIIEAoFAeHwhoyCBQCAQHl/IKEggEAiExxcyChIIBALh8YWMggQCgUB4fCGjIIFAIBAeX8go
+SCAQCITHFzIKEggEAuHxhYyCBAKBQHh8ERwFTaY6ofvz7g8Wy/UHm4HGxiZyIy6BwOWB900CwzBw
+JZwLD/y5/SjCryNaWlqVlnb49denwH17DMNcuFBktdr8/HzariZqNlscDod4Omaz5auvvp0wIToo
+KKCN5lpHU1Pztm17QkJ6REYOeiAZkI7ZbKmoqO7VK1il8njQeXkwgH927Nihe/duItGampqNRjNX
+I7epqbmwsIxhnG2pw8LC0sBA/xs3GrFvQ7vAb7Var+7du+F+BIEqlUdISJBMRrHDKYoKCwsBIfuC
+ghJ8nSfOW3V1jdF46xI06I8u5YL+pdd786bJa4udJtsWb7kQQrt3Z2i1mqiooS1ekILzBulw4wuF
+PyTcFd9oex64dVhbW79p087Y2KigIH8c02azfffdvoiIfuHhYeTuNunI3/7LXHWHjk7nTbvjzvW5
+H320PipqKK7fhoYbmzenJient2un7NMntI0md+48UF5eLZ7Ozp0HOnRQDR06WOjy93vNTz8V5ubm
+v/zyxNZdiltcXGE2W7Rar7ueMS7nzxfu2XMkJCRQ6IrgB4LVasvJyfP17XIfbhUG/3Q6naGhQSLR
+fvqpcNu23cOHP+0S/vPPxi1bUjdvTu3Xr3fXroZWZMBqtS1atHrIkIEHD2aCbxuN5h079uTmnr14
+seTixZKKimqDQed0OhISlphM9YWFpRcvlvz3v+UeHu26deuC+9fx46d+/fXmU0/1USrp7OzTBw5k
+nj17EWJWV/8cEhKoVNLff5+zf/8PGzbsaGj4xdf3Dz4+nV3KBf2rSxc9tlVZeclqtfXo0U0mk/Ha
+ev/9z7OzT5eXX3KxxS0XmAgJCfzww3WRkYPUapV4zUDehgwZCOm4xM/OPp2bm9+nT8hDOwq23Tfa
+Dm8dqtUeMhmVnLyf7c9yudzXt8vq1etGj34W3yj3WHHlyrWLF0tGjBjSYkyFXCWj6HpT9fUbjTzf
+grm5+Z0769mv1RpNp7/97c+bN6c6HE52TN57a9nX4dK0AoYxh8MBfwtvvg6H2Dd7RcWln3++Fhsb
+zX6dkWjL6WQYBu7WZRBCcrkcLgV0Ohm4aB799tpbXhobm7KzT7t4ErYll8sZxgkp4HKxbVmttpyc
+004nExDg26ItbrngPnqbzc4tF77gEOJAeHh47/Dw3uzniM1mo2ka8kZRd+47lG4L6gqeg+J1aLPZ
+5HIFhGNbdrvdaDSvX7+9f/8wmqZFnnEi5eK1xVsulcpj0aJEl27P64c2m53djmDXz89n5cqFCxas
+ZBh+92bbEkImoxBiZDIKEq+urrl8+Sq+7XPz5tTc3PxRo4Z27qxfuXIBVAjcCDp4cDjuXwihl1+O
+gz/Zu/f7yZPHwI3WDocjJycP8hAXN2rIkKfeeut9nA5CKCfnTHb26WeeeQohhPsXttXY2LR1a9ru
+3RlxcaN4bVEUNWtWPNiyWm0zZ74TEzMCnrYu5cL1+eKLY/fuPfLKKxPF3ZuiZE6nE6fD/pXD4Thw
+4NiECdFgSPy5gX7bvyCOzWbHvgGB0DcZhnHX54Xy75Zv4ECaVtjtdvBVkb6M8yz+jBKqw549e+h0
+Z3Nz8wcPDseBnp4dBw3qu2/f93Fxo4QKRXCBx4OLiys0Gs8WZz5ra+vWrdtWVFSGEFIoFDNnTh4y
+5CmKorZv35uRkQVxxo17ftKkMTab/ejRnG3bdiOE/P199Hqtl5enSMpmc73ZbOnZs7u4raam5h07
+9mZmnmDbKioq3b//qLe3BsIHDAhLTJxB04r8/AtJSd+A2/n7+8yfnyCSh8bGpry8C4mJM9gh2NaA
+AWEajeegQX0DA/1xubCtpqbmZcs+OX36fPv27Y4dyw0ODliyZI7QM5S3XBkZx69dM12+fBXCcbmO
+HcudM+dWljIyjjscjhdeGF5eXrVixdq6uoYVK97p1SsYIWS32zds2PHss4MrKy9v375Ho+k0b97M
+oKAAt2wtW/aJh4fHhAnRP/zwfwEBPkJ12LGj+oMP1g4c+OTOnQesVhu2tX373v37j545c+GNN5Yo
+FIqFC2cJfaWJl8vFFm+57Hb7Rx+tP3++MCIi/C9/eQ2nzPVDhFBTU/OmTTvZviE0QpeWVn7++Zba
+2jqEELYl5DAKhWLJkjl6vXbkyEjxd3CbzWY0mpVKBUKosbG5Q4cWvqUAuVwuPjPfvbvvuXMFTicz
+ZMhT3N+q1ar+/cOSk9NFnowmU53RWIsQslrtOp0XQpRIueRy+YABYW+9tWfGjDjxnIeGBs6ePR2n
+g8OtVtvRozkBAd3Aadn9C/E9N9Dt9mpsbHrrrb/bbPbRo58tL69ubv4VfGPhwpUmU92AAWEdOqjP
+nStw1+fdmnPi9Q22rdGjn62rs7z44ti8vPNcW+XlVYcPZ8XGRm3cmFxUVNbiM0qoDrVajbe3pri4
+gj0KSmlrggti73HiJCV9M3RoRELCVISQ1Wr/+98/DQkJNBi0cXHR0dGREOcf//h3SEigzWY/derc
+xx8vRQgVFZWtWLF26tTxbbG1c2d6nz4hBw9m0rQCksW2rFbb9u17V6x4B8JTUw/t3XskMnLQ1q1p
+y5e/DU+foqKygwczp01zIw97936PbaWmHqIoFBjof+FCES4XthUXN2rx4jk7duyhaXrixFEURcEQ
+yF7jQbfXhHjr0Gg0b96c+uGHSyAcyqVQKOrqGoxGM6wDlZVVBQb6I4QCA/1XrVq4fPm/cOIKhWLE
+iCF/+tN7EyeO+vjjpSZT3eefb/nww8XSbVmtti5d/jB/fsLy5Z/++c+vZmWd4tZhfv7Fdeu2vv12
+wokT+U6n8/335ysUcmwrLi46PPyJlSuTVq1apFTSMFXLXicD4AkoUi6IBrYWL57DWy6lkk5MfOnE
+ibPHjuWyE+f6IUIoOztv9Ohn2b4xceJobnPbbLZPPtk4e/Z0vd4bIcS2xeseMhkFY2SL746lpVUL
+F668dOlnnc47PPyJxMSXxOOj2/XGXtvjotdr4+Njvv46RaVqzzBOinJvFtpmsyUlfUPTtMlUGxzc
+PTHxJSi49HIJoVJ5+Pn5IIRc3iGg78yfnwCLbez+hRBKSTlQVlbV0HCD278iIwdarbbVqxd/9tnX
+o0c/19z8K/ihyVS3aNHs48dP07Ri9uzp7vq89IUeId9g2/rHP74cM+Y5nc6L11ZYWIhMJktIWPze
+e/MSEqbyPqOwz4vUIeFu0fpR8JdfmtRqD4NBhxCyWm2Njc3wtX7+fFFxcQXEKS4uh1ebxsZmiGkw
+6EpKKttiCyE0d+7LCoXCarUhROFAhmHA1ogRz0RF3Xp1Vak8IGO1tfUGgxYeIgaDDs88SIRtC/qt
+UkkzDHPuXMHBgz9CnJ9+Khw8OJyiKINBq9F4giH4ld1uz8w8UVl5GSfo7+/zxz8G3rjReOzY/0G4
+3W6/dOlnqMMZMyb0739rfRvK1adP6IkTZzMysqZPjy0oKLly5drs2dMRQhRFGQw6l3V7jaajXu8d
+Hx+jUnkolcpevYLlcrlQe3FtQelgWNLrvXEdFhaWHjmSJZPJEULV1TUWyw2EkE7nnZAwrWvXP4Bp
+eEFWq1UGgxaqAj+4S0oqdu06hDNJ0wqdzrtXr2DecplMdRkZx2E2DNviLRdCyMvLEx5JbHj9kM83
+eGAYZDSaf/zxJEzWWSwN1dU1LTqJFEJDg9avX5GefsxkMsfHx0hZyi0pqUhNPZiXd/6779aKjEZe
+Xp4zZkzYuDG5vPwS++NACjRNv/vuXJ3OOzl5//jxI0JDg+/perzVaissLA0NDcLLhC59edas6RRF
+5edfwM8NxGov8CuGQWq1h1rtUV9/a6ukwaCFjqDXe4MfuuXzEmEYZLFc1+u9cca4thgGqVQeUIdc
+WxRFqVQecXHREN63by9ImP2M0um8cLkI9xqeURBPWLeC3Nz83Nx82BXicDi4e3adTqbFzUvwJssw
+jFBXFN8KTFGU+KyU08m09LJMyeW35uKBgQOf3L07Y8GClQghLy9P3tmGwYPDuU8fWANQKBS8b/1O
+J4OzCjM2MHzKZHJuLT3zzFOpqQcLCkq4a5a8wLqCRtMJ3kOF4LXFi1wudzoZ2Ozi5+fz/PO3pqzh
+7VUEWM+LiOgXEdGP+1tuuRobm7Zv392pU0co482bVnYOpZRLyA+dTkbibh273W6z3eoFGo3nzJmT
+abr1r4xsaJqOi4vOyDielnZ42rTx7dopxeNHRPQLD+89c+Y7LutqXHQ679dem7J06RrurxwOJ158
+5UWhkAcF+U+cOHrPniPt2rVj7zzkxWq1i68ICuFwOJOStnTt+geYo+aFYZxy+d2pbV5EfN5qtbW4
+ls/L2LHD9+07mpycjhDy9e0MX29I+ImH8wAPDZiOdgunk6EoBHPXbFpsa4ILPI09cmTk+vXbCwpK
+YMIKIcQwjMlU19jYBKsaer03RVFeXp1qa+td1hJqaq56eLQfNWooQigv70JlZQ1CSKmkKYqCmFVV
+V7Zs2fXKK5NE8hQaGhgY6Jee/sMLLwyHELYtu92xa9ehF18cq1Z74MUMhJBa7UFRlMAASanVHng9
+pqrqysWL/xXJg0bTady4EV999R1erzKZzBRFDRsWgRDS67WwK12ppHv27AGFRQip1Sr8bovzJm5L
+p9P069c7PPwJ+K9erxV5B+/ZsztCzJkzF0pLq3DGrFabxXLdarWZTHX19Q0ii5287SUU+XZ+vFlx
+qG7dukRFDYU6pGnay8tT9G3pVp3LZBS0F/dzTahcjY3NhYWlf/3rn5VKhcVyIzMzV/ybyWQy19df
+b2xsMhproQ55/RAhlJOTl5KSDu2IEKNUKpFAHfr5+Tz//DO380yBz4tXFxu2z7NtAXK5fPjwp/ft
++/7f//52zpwZ0vsXQshiuW40mq1WG0wju8yRarUa/KqB1yAtlhtZWSdfe20KEujL7LaIjY368ssd
+8+e/zl6CcsFut3/xxTczZ05qxd5Os7m+svLytGkxbLsuffnAgcxBg/qK16GXVyduf1erPfBWFOS+
+z9vtdnjTxbPfvL6h03mbTHXwJyZTnUbTiaJQdfWVLl30MPh1794Ne3tKSnpwcABMyMMzSsD4b55R
+UtaMi4pKy8qq33zzVXZgfX3D3r3fQ1sTJMIzChoMWm9vz8LC0qCgAHw2ZfnyT41Gs91ur6y8/N57
+8zSaTrNmTV+zZsPWrWkIIVib0eu9x40bkZS05a233kcIDRsWMW3aOJXKIzQ0qH//MggMCQl8+eU4
+8WUGlcrDx6dzTc3VpqZmmOLg2tLpvNi2EELx8TFhYSGlpZXsA2FarUYul+v13vHxsUuXroGJ0JCQ
+wFmz4kUyoFTSoaFBBQWl8KBBCAUHdz906Mft2/dAhOjooRMmRIeFheByIYRGjoycMWMC/IzzJm7L
+pVxLlswJCgqAPOM4/v4+eMJz1qzpmzbtzRt1qwAAIABJREFUnDdvJt5uU1ZWtXr1uoaG65s2peTn
+/2fhwlkKhYKiqODgAJc3UN72ErIVEOCrVNLvvTfP07Mjbx2GhgYtXDgLfsCZYdvF8WUyCtpLpMJd
+ysW2pdN5x8RE1dRcdUkfA2taxcUVDQ03Fi1aDXXI64cIoSlTxl65cg2Hw6Igtw6VSnru3BmffLIR
+Dibr9d7g8yJFcMHFN8BWU1Mzzj/42LVrtcid/oUQSk5Oz8o6ef36jUWLViUkTI2MHKRSeXB9nqIo
+iqIWLVqFENLpvOfOnQGfd7y22D7m59e1U6cO4h9DlZU1CFFhYSHSKwRz4MAP06fHurwScftyYKA/
+TStE6vDNN1+laRr3d/DDceNG2Gw2HMctn0cI4U2q2Mda9A2dzhv8tnfvP27alJKdnQe2YmOjoqKG
+IoSio4cdPpy1YcMOdPsZhduIXQPcZ5T4mjHDMCUllQaDVqvVsMMvXChCiAkI8JHaHgSEqJqqIkPn
+rjbb9V+td47N3rxp3bnzQEzMSPxxY7PZ8FsX70EFhUIBruNwOB0OB0JIJqMoSkZRFJyOYG8Xdjqd
+4hN6DMOkpR0OD++Nu7e4LYSQXC6DNO32O3M1cGYCwnnPWoiQnX1aqaQHDuyLENqyZRdCzJQp4+BX
+S5euefHFsf3792aXy2UiBedN3Ba3XOw8QzpQhzi+yxOKt1wwCdlqW9Lr0CU/LnYhPm4v8XoQKpdS
+SePfSiwXEvBDu91OUTIcji0K1SHX56XD6xsu+WeXy93+hVryeaH8c8Nb9DEX9uw58sQTPVucNeXF
+xRY7nFsu6XUo5Iet6F9OJ8OuLom+sXjx6piYqH79noDfJiYu/eijdw8ezEQIxcePv3045065eJ+B
+0p9RFsv13bszpk4dx55Rt9vtycnpo0YNE9+E/zsGTh/hE0oitFdqFTKP8oLsSzXX+EdBggvFxRVp
+aYfMZgv819e385Qp49ouo0MgEH4f5ObmHzr0Y3Pzr/DfPn1CJk9+ITl5v9PJ4Ckiwr2mdaOg4Buf
+yVSn03k9KOmWh42ePbtPnvyC2VwP/+3e3c9lIoJAIDzODBrUz9OzIxxYoihZaGigUkm3eH70/mCx
+XPf07Ege5kJI0hF9mCkoKEEIgR7jPTXUvXs3cZnK1iFRA1MErBtZVlbVo4e/TEa1UZsRayfiEKwf
+y9Usla4xy9XVlJ4fXv1PDMMwUPbLl6/odN7u6j22mL4U4DyolHJx24v3LCnWF3XxDdD8xHHakudW
+U11do9N5I4TaXm/3VEcU8nl/9D9lMgpvJ8Q8wOkidtml674+nvBvqP3qq28jIwc+qCHQaDSfOnVO
+Skw4h3fsWO6jK6Pe0HBj9+6Ms2cvtjqF9PQfMjKyTCbzihVr7Xa71WpbvXodr968RAoKShYsWJGc
+nI7/VVZegl+VlFSkpR1mKy9D/j/44HMs1CKSzw8++Px2mvvxYT4p+fnyyx0iEXDZv/hia2FhmcRk
+MbW1dSkpB6Tnh0t29unU1EMSy8VtryVLPtq0aSeubezPvL5x+vT5rVt3L1v2ibtnXu8iUM8ttovV
+asvKOulwOE6cOItXE9hkZ58+ejQHn0iRTnFxhZT2ap0//A4oLv7/7Z17XFTV2sfXnhsygIxyEYWQ
+AgtSDMVQ81qGl8yARFMxj1leXu2c99RrmnbO6XTejpf07bydPl57szRvgcpFMQk9GcUHNUTDEA8g
+N8VoZriJgzkze/b7x5PL7d5rb/YwIKDr9/EP3LNmPevyrLX37LWe76r48stMPE5nzZp24MBRV+aE
++1uKOKKIxM0jLkdLMfqIPEAiN89qtZWXV6ekHI2KGijgN0J6AffvtddmqVQMPz6GzyxlGAa4lHa7
+nWEYfF28LUJQLz5LExIQOYeuS8zAdIpzCNVxODiE7pAe7XY7MbZMnsXK56NGR0eK360TmaXKGbMc
+x8XHTwJ2ZXFxWVpa1qxZ04KDA+V9A6oOrcHfFnH3Fonf6q5SqQS8RyUKDg6Mi4tNT88WEPoVKi+v
+4OzZC4sXz/H39ykpqTh48KukpDgcLiaWuL88PfV/+csfcBQ2FpGPijmi/IvENnTK5yGsDdK36vPQ
+zphvKSXMkj148KsXX5wsiKZ1hSNK5PSK68WyDo5z8LdZyZRWqg1h6w20jzzPVopZyjAMZp/KjGUp
+jqjy/sL5nDpV0KePL/6Zrpz7+mBKEUeUyM1LTs4MCuoL7FCzuX7//sNS3DwiD1CKS7lhw7ZTp85d
+u/bLggVvGQw93333j3hT9aVLZStWrF2yJAnHEQIr0s+v9/r1d+J7+MzSmJgod/ceTz45+KOPdgwZ
+MiglJRPxGH3S9Qpwd3ffsuULh4OTYZa6fiMkMjCd5RzC2oOXlwds45aK4WuVxYr5qOi3l4RmdDsu
+EHIQM0ulRLSFEGpsbIJsKyquGAzevr69+f2FSL5hMPQcNWoYtNWaNZuWLn3Zz8+H/zdCyGDoCXVf
+uHB2295BQZxcauqxhIRJwKkymer4Lxj47SAQf7w8+ujDDQ1NRmOdzF2Q2F/4sR3HjErxUcUitqHF
+0kL0+cbG6++9978Q7oZ9fvPm3adPnwsJCYqJiUpNzWrV53E7A+iHKLvd/skn+06dOrd48erz5y+a
+zQ1hYSF4LCvhiDIMk5ubDzEGqDVOrxT3tbS0cvfuNLO5ns86VtiGLS03P/88JTFx6rFjJ0+ePCXP
+syX6fG5ufm2tKSpq4ObNX5jN9TJjmeM4IkeUWC9if0G2kE9trYkfMqic+/pgqvXnAilu3pQp44Fb
+GBIStGNH8jPPPCXFzeNzRFFrbM+lS18eOnRQVlbO6tVLEWIEcWaC7cXAq1y3bgu+wmd7FhQUnT59
+bvnyRRZLy+HDJwIDA/D1rVt3L1++SKper766IjLysfffX+5wcMAePHEiV8wsdf2QKWDKCBiYznIO
+8bwvf64QkanIrxfmoxYWFn//fT782oC4QHh+FDNLnbKFEEpJOfrDD4UIocGDw2fMmKrXu589e0He
+N8zmhg0btvXqZXA4uNLSSrgz8f9Gt2PvEEKurFGFhfWPi5sIPsAwaPPmL/ioP347uChxf5nN9X/7
+2z91Oi2OGUUSvkEUkWc7dmyM2OdXrVrm7e21atUyeFWAff7q1Z/nz5/Bsuzp0+fef395qz6P21nm
+Zq/RaJKS4srKKtete3vt2k0JCZP4Y1kJRzQsLGTEiKHgOUiW0yuYo8zmhqysnJCQIJvN9vXXOatW
+LTMYvLAfqtVqMc+2uLiMyAQODw97+eU/vvXW4g8//JM8z5bo8yNGDF25ct3x47nLly8yGLxkxrLJ
+VC+eD2fMeI5YL2J/gV9BPqtXv0637ylX66NaiqmIuYVarXbMmJihQyOluHkIITFvU4rtCUxInU4r
+fkH0+OMD0tI+4b/8BF7l3aXlMHvQ17eXxXLTw0NvsbRERIQBfxLdZvRJ8QA9PPR6vfvChXP69etj
+t9tHjXrSw8PdarXl5Z3D4AnMpXRdRAamK5xDKRGZikQ+KkIoNnb03//+FnyRd8ILgVlKlBQf9dVX
+ZyYlJSCEzpw5f/jw8aSkBH5/IRL31d/fd9GiOampWa63gLw4jjt/vigkJBDehr3zzuv8s4QQrx3a
+Xb6+vdetexs8mW+F6BtiEXm2CCGxzyOEbDZ7Ts5pAHLy+ai9evVEv/F+fbBvuOLzHMedOfNjVVVN
+dnZOTU3tmTM/jhw5FOYQhRxRhFBl5dW8vAJ+vYicXsFY9vf3HTAgRKPRaLXaxYuT4HQa7PNEnq0U
+E9jXt9ewYYOBPfv442EWSwtyhtOr02m1Ws2CBTOhDMOHR3l5eRKbS6fT+vn5/OtfufBo5+/vM336
+FKl6EfsL2vzkybyQkKB7c7LpfSNFHFEppqJardbr3W/dsrIsi7ertUoKleJtEtme/NVHvPYjk3lI
+SFDfvv6AQfLy8nzhhWfvVNWZWQyeyDQaDTHWZ/r0KTJPwa5LOdvTRUnxURmGcWU7mQwfFbIdOXLo
+0aPfCB7JpSR+g9TuG0NYlk1L+9pqtS1dOk+tVrGsY9u2vVVVdwjaISFBixbNJroQf7ywLKvRtGVn
+vE6naa/9e/zxJSgwMDzd3Nzg1shxTgwKZ33e4XD06OHWo4ebw8E5HFyPHm54rU4hR7Si4kpq6rGA
+AH+4gmPq77bCEXfGYZ8RdweRZwtPwFj8NsRc4uDgQH4LKOT08svw4ouT+df5zFKDoedrr83KysqB
++1lZWWVLy81p054VZCW/CpOSkol9WPBRm7mvD4IUcUSJTEWzuX7XrkPDhg0ODw+F4FBY+xFz87Ra
+jZi3aTTWSbE9MT+wsbE5O/u7RYtmw/gRrwuKmYqNjdcbG68DKFKv7wEoBykReYDE3aYeHu5PPBGB
+q2AweLfXnCVmYLZLtvxtnLCmRWQqEvmoUiIyFYlcSik+Kl4XzM+/AGtCZWWVJFbkHaZiY2Pztm17
+YLsy7q/09Ozi4rJ2aSh0e02orq5x7tx46FaGYZ5+eqQgekFqEpk4cWxy8pGcnNPh4aG4Xu1SMKJv
+iH2eyLMl0plZlq2srFm4cJafX2+7nd26dc/16834U51Oy2dXuujzcCbiyZOn5s170Wg0jxs3HL6u
+nCNqs9nq65teeWUGQqiq6trOnQfhGGEk4vTOmRPPH8t43lBeWhkmsEK5yCxtbLy+b196YuJUmA+L
+iy9/++2padOelamXoL8slpbi4rLnn58g7iZXuK8PglrniEoxFY8cOTF2bEx0dCTDMElJ8Tt3Hhg8
+OByRuHkCHiDwNmXYnpjBCPzDu7eJ3rUuKGYq9u3r7+HhjoGf589fhPHG508Cd1GKB2i12vhsTJCA
+cwi2XG58MgNThnOoUH5+vflrpbCmRWQqsiyBjyrgUmIRmaVKGJi4XunpX8O64PjxI5KS4vR6dyJv
+U693F3NE+f01Y8bUtuG7iLp8ueqXX8xQHrhCjP2Skr+/T1JS/MaN27dv34fr5VQBxP6GJHwDkXye
+yLNt1ed1Om1i4nMqlUqlYsDHIiLC4LcOZnK66PMwV2i1WmB+wsW2cUQF/GEBp1c8lmHeEIwdYjuD
+pJjAxLGgnNOLpMevgFnq7e01dGikgCMqXy9Bf+Xmno2JiSLCXV3hvj4IajtHlMge3LnzIJLg5hF5
+m1LcPJxe8PBitdpwnojEHszPLzx06Nhf//oGXNy9O1Wn086dm+Asv1H84E/kHLouZzmHzuYJwsxP
+gS0pPqoUSVI5b5NYL6IPtOobwBFVq9XZ2d/HxDyh17uzLLtw4dsffvgn8eJx29QqOVNJDvzN9O1i
+XTlHtG3MUo1Gw7J2rVYrxRHtCJ9vM0dUwB8Wc3pd5KNK+SHxW07xbKXGb5uZpcR6SbFJkWvc1+6l
+9iSoubnpkpLi+VfEXS549QyOolarHA5O7DRS60xSv9AVplerVYJiPPxwcECAHz5iDa91CcqPS0h8
+NpRa/umIU7uIbcV35TYYlRrq4usjRgxJTT2GmysoKOChh/rK5EDsFIVtKNWnSvpao9GwLMuy7Ecf
+7YCdHZMnj4O1xnaR60smruSgvL+QhB8S21CJz6tUWiQxlqVsuSipDJXUSzAuBOkVzlFSkvJD4rec
+mjekLIrTKxxfxHrJnKsaFxcrVQYqJLNHtG0c0U7n5vn4GGbNegHvfPP39+nQbSzdXd2Ijwpn8vn7
++3AchzmNnV0oKiqqTlN78VHbmSN677l5Yo6ov79PNzrtodM5omI+apfliOp02ujoSHECyhG9x+ou
+HFEqGSkfy8p9+x6oI/iolCPayaIcUSXloRxRLMoRpWoXKRzLMMdu2rRr27a9nVHMu9RBfFTKEaUc
+UcoRpRzRTuaIOjVvENmexHohkh+6zvYkckSVzxsQ44jDTOXnQ6KUHCnMt8VxDjzGsS2FYxkYRvn5
+TyQnZwrKoHA+7Pp8VMoRpRxRyhGlHNFO5ohK+TyRIypme0qN5Y5ge0pxRJXPG+XlVVlZOQkJk3bs
+SL506bLMfCjlchCTA03HHwswH/JtXbpUduTIid69DXiML106T6fTKh/LUhLb6r58VMoRpRxRyhFF
+iHJEO5UjKuXzRI6omO0pGMuYt6mc7RkWFiJeC0cI8ecoeY6o8nkjMjJcpVItWrTq3Xf/uGjRbPn5
+kLhmzHEcjueurKzBXJjp0ydPnjyWb8tqte3dm7FmzVt4jGdkZCcmPqd8LEtJbKv78lEpR5RyRClH
+FCHKEe1UjiiS8HkiR1TM9mQYJirq8fz8QiitTqdNSorXaDREPySyPc3m+gMHMvlvAhMTp4SEBBUX
+l2Vn56hUaoRQdXVNY2MzkuCISs0bfD4q1IthGL3effr0yVDfqKjHkQRHFNbkoPyg/v0DH3ss9NVX
+X1q8eNWYMTH+/j6ffro/Pn4S/GosLLyEl6Vxf8XGjoa2QnfGlxNjWUpEW2J1Cz4q5YiSRTmilCNK
+OaJ8dTRHVDxvyHBExWzPxMTnvvrqJHSE1Wo9cODo/PmJUn6ISGzPtWtXCqpgNJrVarXDwcGUExwc
++OyzD+NPBRzR2yH8cvMGX3iM484Sc0SnT5+ydOnLpG//th726KOP4D0ceXkFeXkFcJ9gWRa/KZGJ
+I2yzpGyBuh0flXJEKUeUckQpRxShTuWIItK80dx8Q4ojKpDdbt+zJ+3pp0fCS1eTqX7Llt0cx0n5
+oWIxDz3Ud9KkcTBHyawNS0nAR4V6EVMSOaL4qVQgtVo9bNjgP/95I8chf39feItQU1Pr7t4D+is/
+/0JlZQ3xuyDlYxmR/FDGVnfko1KOKOWIUo4o5Yh2MkcUtTZv8DmiYv/UaDSTJo0Vj2WiHyLFY0ow
+R+G1YSJHFJH6UcxHBZinYIwjCY5oq2UrL6/Gr7v4tsaPHzFnzgtQR35bYbvKxzLRD6Vsoe7JR6Uc
+UcoRpRxRyhHtZI6oknmDzxGVYnsq8UOpMkhJyueJHFGF84YU81NqPpSSwCK2pVIxDKOCOvLT8O26
+MpalbPHTdwoflXJEEaIcUYk8pa5TjqhUae9lDpQjqnDe4C/yiTNpF7anWK74PJLuL+K07uybPYFF
+oi1+Gr7djqiXVPouzkelHNEHWpQjStUVdO/njbbNb1T3pbo9R5RYhq5QDIWiHNFW1dEcUaekvL5I
+xNvE38UJoB34MWEMw0RGhut0WuCF4pS4zfnXoQyC/uK3rdg32qcVZNUGLmv7DljsD1IsVpvN9uWX
+h0eMGDJ0aGRnsVipuo7U//XG6x6eXg7HLTt7Z0fchg3bJk0a11nnURmNdUVFJYGBAZ1i/R6rqal5
+586DDodDPuZdRgcOHC0vr+7b1+/dd//x3HNPs6zj7bfXjxkT4+xh2Vg//li8cuXahoamoqJS+Nev
+nz90R2FhcXp6dnh4KH48gvInJ2e6uenkMQIHDhzdvn1vba2pqKi0oqLa399XYfTPjz8W79mTNmHC
+KKkEJlMd1H3Dhm3+/r79+vk7U10nxHFcSkpmVtZ3RUUl1dU1YWEP6/U9ZNKvW7fF39/XZKqD8ptM
+dYsWrTaZGoqLy6BhNRp1aGj/JUveKS+vLimpKCoqray8YrXaHnnkoTVrNn3//Q/l5VeKikr//e/y
+6uqfw8NDKyuvfvnlkbNnL8DXoQylpRX8/uK3rcA32uX3VklJRV1do5eXZ25uflBQX0HkktVqO3Dg
+qNnc0GZ/dlHQR4WFl4YNG6xSMcTxpVarg4L6rl+/tb3ahKqL6Nq1X4qKSmNjx7SaUqPWqxhtg6n6
+erOle3NElTP6lLMHpXiAHSTKEe10jqhyQdzSf//3f+l02ry8gq1bdy9bNk/mfYmYtxkQ4Ld27QrB
+xgE+R9RoNL/55vsTJoxiGGbJkqRhwwZDmgUL3oqPj83LK+jXr8+qVUvhuytWrIWf1/z+2rnzYF5e
+AYSEi33DRTkcXG7uDw4Hp9e7b9u2NyYmSnAXMRrrjh/P3b59La4d/CE/vqTYnk5xREE3b/567Ni3
+69athMREFitCyNvba/jwqMOHj0tFI1A9OOrGHFGLpUUho88p9iCRB9hB6weUI9rpHFGIkeI/NEC8
+HTFxfv6FmTOnwsQdHR25adMuq9Uqk7mYtwmRWDqdBsfdwnX8khPHrcLfgvhOKUO4v6BOOp0O/hL4
+hnxTKFF5edWuXYfUanVWVs7Zsxd27TqEw7wQQmZzfXLykQULZoIt5eOLyPYkzhtSYxnSWCwtycmZ
+CQmTwDFkWKweHvro6Mjk5Ex6F6TqxhzRjIzjChl9StiD8jzADlpopBzRTueIQowU/3AWiLdzNh+i
+xLzNsrKqlSvXMgyD427RbY7ojRsWlmUjIgZArBvEaWm1WpPJPGDAwxDfKWUI+qu4uCwsrH9s7JjE
+xOfgukLfUK7Q0P7x8RO1Wu3YsTFr126Oj5/I/3Tz5i/Gjx8BTzwy84Z4fBHZnsR5gziWV61aBmky
+Mo6rVMykSePg8UI5i5XqQVY35ogSOYdERh+RPegUR9SlNpYV5Yh2LkfUz6/3P/7xZz4wqEO3S0RE
+hG3btgbeDeIfZ8ARLS+vPnPm/Ny5CQEBfgghrVb7zjuv+/r2Tk4+EhcXGxExQOZ9QGzs6Pfee2PP
+njR/f9/Jk8e5uek6qPwmU31JSQXLOmw2W1VVTUlJOb7RlpRUuLnpHnqo3+1DAMjzBnF8EdmedXUN
+Yt8gjmVIYDTWGY3mmJgo/q9ehSxWqgdZ9w9HlM85FDP6kIg9KH9rUc4D7AhRjihfHcoRtVha/vnP
+z4A0DRo+PErqLZlWq8HrtXa7vW1NpNVqxV/U6TRjx8ZotZpduw4uWDATdpZqNOqwsP6Jic+lp2e7
+ubnJ7FaDh785c+L27Ek/cuTEiy9O7qB3+MDVhFoAIxSuA/MzIWEyfz8Bcd64TcMgjC8B2xMH8Igl
+5ohaLC1796YNGzZYPLdIiWUdHREBTNXt1I05oq6zPZVzRDtOlCPauRxRrVY7ceJYPg5Y5u33K6/M
+TE095u3t5evbKzPzG7z+pFy8dUGEEPLw0PP3fw0fPkSj0WzdumfFiiX4Ipx9+Mkn+5YvX0jkUuLC
+e3jo586N/+KLQ5mZ/8Ks3faVj49hwoSnbDb7hAmjLl4sHTlyCEKI47grV67dumWFX3JYxHlDuS08
+D9y+cGe9U6yqqpqysqply+YJrkuNr4aGpoyM4/zD6qgeWHVjjqgU51DM6EMk9qBTHNEOEuWIdjpH
+VCoGkaiwsP4JCZOgDElJ8bCTU7kthmEYhnn77XX4ysSJY2fNmob9TaViQkIC4c0Kv9+Dg/v17Omp
+0WiIXMqyskrcX3q9e2BgQIfu/n/hhVibzabXuwMjFCFkNjcUFl4ScC+l5g0kwU0V+znRNxBpLNts
+tm++yYPxK7hOZLEihC5cuIQQFxJCkRpU9x1HFEkz+pxiD3bcYXLiUlGOaKdzRJ0S1LdtXE1+W6Hb
+9ZUIOnKC7SnFirxnInI1kZOcXrGfS/mGOAenWKx2uz05OXPKlPHOnhFB1cVFOaJ3vkucAlxkD3aQ
+KEe0K3BEnZIr7wmUtBWkcYrtKcWKvGeSahMX2Z5SviHOwSkWq0ajmTMnjpie6j4QjihlGEalUtnt
+drVaw3EcxEOLH5juN44olVOiHFEqKqzGxuve3l4ULtrdlZyc6enpcfly1SOPBFssLfX1jaGh/cvL
+qz089L17Gy5frpo/P7Fvnzsr+vchR9R1uc72xGqVqUg5oq2qS3FEkTOcTAFHFN3dtnq9e3h4mKC/
++AxMPl9UOUeUeB3b4rNMMbMUtWsb4vYh2oI2wfnjuovrhUg+I8VilaoXsQ3FfQTX09K+9vExTJo0
+jj5gdWsNHPjo4cPH9Xr30tKK5maLt7fX2bMXVCqVw+G4evVnvd796NFvXn3lEZyefBf89NP98fGT
+nL0FtpeMxrrKyisxMVGdYh0h1NTUnJb29aBBj7l+F7x4sTQ1NQvH3nWErczMf6lUzMSJY9as2bR1
+6xqE0Pr1Wz/4YFWbn0guXixduXId/36TmDgFcistrTh8+Livb298D4DynztXNH36lLlzE+TLmZp6
+bMCAhxFCPj6GhITJgi2FMuWRb0OTqQ7qvmXL7sTEqdHRg5Rk2zZZrbatW/cYjeZ1695uNTGUh+Mc
+UH6r1Xbo0LHCwkvwqbt7j8mTx0VHR/L7C9flzJnz33xzqrn5BkJIo1EXFBQlJcXV1Pxy8OBXDQ1N
+kENQUEBSUkJFRbW4vwyGnmJbI0YMSUnJPHv2J9hWChtxJ04co1arlbdhSUkFQigkJOjUqYJRo4YJ
+3v1AHfV69/79A4m2+PlbrTaoe2PjdXG9WJbdvz/j6tVauAg+YzB4vfnm+0888Th+gzpixJCQkCCi
+rby8AnEb8sFAJSUV6enZM2Y8B/48a9a0xYtXDR8+5P54mn9gVVFxRaVSNTU1e3rqPT31DofD29vr
+xo2WGzda4PqTTw7mp+/GHFGn2IN8LiW8I1arVVJcSim2ZxtsodsMTClRjmg34ojeumX9v//bX1tr
+4pTF0wg4oo2NTceOfbtjxwZokLNnfzpwIDM6OlLQX9B0GRnHZ86cChxRlmVzc/O1Wq2AI3rmzHnY
+KSPuL6PRTLSVkXEc7yoyGutWrFg7YcIotVqtsA2Vc0RtNjvRFss6+PlD3Yn1qq6uuXq1FtcL7r5I
+gsVKtMVvQ6vVtmTJ6vj4WHwXdDi4U6cK+vTxxY90Wq3mpZemZWRkz5+feC83B1C1rxwOh5eXh06n
+hXHa3GwBoApCCK4LNg92Y46ocvaggEsZGzvmypWflyyZQ+RSEtmDbbYFDEwpUY5o9+KIHjhwNDi4
+X0zMEykpR5VkLuKI3omD9PPziYgIxXxReanVaogCEgjel1RX15D6i2wLx1waDN643ZDiNlTOEbVa
+bVK2WhWuF/8ivDkwGs1EFivRFo6R9fDQu7u7r169DMd3chxXUHChttbEDxlUq9XDhkW++Wb6vHnT
+lZSTqmsqOLjfxYuler17U1Ozl5c2JuuSAAALWklEQVSHt7dXS8tNb2+v5mZLU1OzXu8u4HV0Y46o
+cvagU1xKInvQRVtSbUs5ot2LIwoIzcLCYoWZCziiOEZWpWLi4iYOGBASHh7WLhwccX8RbalUDI7h
+mzx5XEREWGRkOOSgsA2Vc0T58YICWy5KzGKVsoXjVocNixw9+snHH79DoTOZ6nfvTl29+vUuux2M
+qs366ad/6/XuLS033dx0bm46uPPdumW9dcsKd8SxY2P46bsxR1SKPShvSwmXUswevJe2pNrQRVGO
+KFFOcUTbfGQjiGGYsWNjRowYYrfbP/sspaDgJ1gXdCVPkLi/iLZGjhwaFhYC9U1Lyzpy5AReF1Ro
+SDlHFCFEtOV6ZYksVqKtXr2833vvDYeDO3Pm/KFDx/C6IMdxJ0/mhYQEKTzhkqp76eGHg83mHwVr
+gfw1wurqa+ipO+kJMTpqtQqH5YLkOaIOh6NDOaL8NEjEEeWzB8UbTIi22rwT+p7Zupcc0WvXflmx
+Yu2KFWuvXfsFlx/itOBfG7KV54jqdNqRI4fW1pq6CEd048btf/rTRvwvPT27vTIX29q165BKxej1
+7suWzZs2bYLyuzsegHzhdhD3F9EWyzq2b99nsdzU6bQzZz7/H/8xd8+eNMGCrryUc0RdsUXsX5Zl
+8a9/YLHiykrZOnjwq2vXftHptKNHP/nXv76Rk3Ma0NtwTuTSpfPEQYpW670jZlB1kFQqprnZ0txs
+gf96eXl4eXnA33BdeBMRZ9FdOKJE6XRaeVtELqXVavfx6dXY2Aw/ShSyPZ2yJSXKEe1GHNHGxutW
+qxX3l7NsTIvlZm7uD8888xT4vMVy09NTjyR4tvz+stvZQ4eOvfTSNAFH9OjRk4J1XJDB4E20xbLs
+xYulNTW1cCwi/yxDhVLOEZWyRfRDYr0EHNH8/AsajSYqKoLIYiXaKikp9/DQ9+jhxrdlsbQUF5c9
+//wE8ROe3W7fsuWLBQtm0EiJbq3q6mvitUD+GqHgNwyZoLZp066AAL9p057Fp2WKeYCff54yaNBj
+wBFtaGjaufPA/Pkz0tOzGxqaTKa6qqoahBCwFrVaTUpKZkbGccgc1l04jvvuux927Ejmc0QhuIrj
+OEgPHFGM/rt4sXT58r///vfzp0wZj8v59NMj+Ts18HelbPn69h4+POrcuaIPPliF66XTaWfMmFpe
+Xr148RyO49as2QTsQX9/H8webJutp58eWVNTK0AsYtlsNrGtI0dOqNVqmTrKy2q1rVy5Fs+q6PZa
+UXOzZePG7dAvwBGNjo6srTV9/PHn1dXXICVwRCsrr548eUpc5uLiMuCI6nTawYMjYP3JZKp/773/
+BY5o//6B4BsNDU18W7heO3YkwwvV8eNHzJ79Aryb4rchXNfr3YltiPtrxoype/emffzxe/eYoLZ9
++76cnNMcxzU1NRsMPflsTCWS8nn++MI+L2hD6C+bzb558678/AuQIYyvsrLK1as3wA0VtGjR7DFj
+YpTbcqoRrFYbcETN5ga8V+DLLw/PmjUNxi+Wi/USzBvgGy0tN3//+3f5P9dg3Cm3lZ39PcuyEyaM
+Et/qysqqPvssZfnyhZSs1k0FBLWkpHiIF3Q4HBAv2NJyU6VSeXl5wB2xTx/fV195FRPUuj1HVDl7
+ENsqLCzGrDlcL41Gw7J2HAQiZg+2zRYwMGXesVCOaDfiiPIZnrhszmbiShsiCY6oYOWYeF3eloty
+liOqsF5E3yCyWJXbkuGspqdnDxz4aHuB2qnuveAu+NRT0Rcvlt66ZYVHQ4Zh3Nx0N260IIQ4jrt1
+y/rss6NiJ0y5fziibfguw6jUahWy25GDu5POblchhFgHUqtc5xwKGJjiBDKfUo6o2FYX4YgSGZ7O
+ypU2lCqD1DhSbstFtQtHlMgEFlfBRVsynNW4uFjidarupXaIF3RF3YIjCrFTPTbv1h45IfjINmX8
+r7fj9h4EUY4oFRXVfab2jxdEzrAi20AeEnAFEY+1SGQnoruZhET2IMuyMiXR692DgwNVFdWa/ELB
+R+xApctv943EHNEuKymOKBUVFRVW+8cLImdYkc6qpKRi1ar1q1e/jrmFmLXI5/59/PHOhoam3r1/
++5nSq1fP8PDQysqrYvagj4+htLTizJnz8Hc7FpWKioqKquvL2XhB4V0QzmSCsB687ExkRRI5ouju
+5Wgxb1OlYuDMJ4Zhysqq0tOzHY47XEGWdWzevKtfvz7r17/tcDiysnL27cuYPz+RYZglS5IwPwVe
+hZ05cz4wMADYgyzL/vnP/1NRUe3jYxgxYgjHcZ9+un/BgpmCTWtUVFRUVPe3IF5QsBbIXyOUixds
+aGj66KMdQ4YMSknJRLfZnlKbhokcUb2+B+ZSIhJHtH//wIEDH+3Z03P06CdTU7MSEiaZTHdedbIs
+m59/4cMP42AFm8/0Ky2t3L07zWyux1xKvAYJLEqIP4N8hg8fotVqdu069MorM+imZyoqKqoHR87G
+C951F7TZbIcPnwgMDACuY0FB0datu1etWka0ROSI7t9/GHMpEUIpKUcvX65qamrGrMhLly6vWbNp
+9uw4b2+v+fMTxfAwovr29f/++x/+8z8XGAxemEsJK38cx2VlfWs2NyQlxeHFRZWKiY6ONJsbZMpP
+RUVFRXX/adCgxyoqrgjWAvlrhD/99O/hT47G6YVvRCMiwpKS4uF24uvbq6HhOpIQkSPK51IihJYs
+mcswTEHBBcyK9Pf3LS2tRAgBDFdhrf7wh1dYloUXoZiBiW7HrZtM9a+9NsvNTcf/is1mN5vrQ0Np
+6A8VFRXVAyRXzxfkOE7wzlRGwBG9dcvK54jenZtDrb7LRKuUUZ1Oa7f/FjyLmX4c5xBvi2dZNi3t
+a6vVtnDhbMGncA6cn1/vGTOmKqwLFRUVFdV9IGfjBYU3vMuXq7Zs2W00mo1GM+YcchxnNNZZLC2N
+jU1GYx1kbTbXf/ZZyuDBES+//OL58xdzcs5wHOfh4Q5IQ/i3e3dacXEZ5gEajWY4kwznaTSagUtp
+NJotlhY4aWj//sNXr9Zeu/YLPqssOTkzJ+f07WzrgAf49dffFReXjR79JNApjUYzFMxiadm7Nz04
+uJ/8sXxUVFRUVPefgoP7NTU1q1SqGzdaGIbx9vZyOByennpgH6pUqlbiBUND+/v59YazysLDQwEm
+CWewASuysvIqsBOPHDkxdmwMcESTkuJ37jwweHD4Cy/Ebt68C76OEEpKig8N7a/VaqKjL+M8gYWN
+z3WzWFo+/zxlz5404AFGR0e2tPwK56IB9w8hNGXK+I0bt2/fvg/d5gH6+fVmWbag4Cc4yhXxeJW5
+uWcDAvwmTBhFb4FUVFRUD5qcjRe8iyNqNJrffPP9Tz/9AN8/ZNiDRI4oUsAD3LcvAyH0u99Nl+IB
+otv8Q8wYRK1xKQXXpTiBfOnf+JvbzoOCi7d+N73lH3+R/yIVFRUVVRcUcESnTn3mhx9+FLBD+UzR
+wMCAObOSpDiijEajUcjuI3JEkQIeILBGiXliiQvgFJdSEcVNo0Hir6u6Ov6NioqKikpGLsULGgw9
+V65c0tF4xi7CGv116cvWl54XXHQ4T4CjoqKiouo6qq6+FhbW/+efTb6+vX799VZj4/WAAD+zub5H
+D7eAAL+ffzYNGvQYP/1vd0GGUatVbu493AYNHNjRRewb0K+jTShSaBgXKrzGINT592cqKioqKufl
+5WkIfSR0+ovTNFrN9es3vHt62Ww2m83es6fn9es3tFoNXPfz7c0wd2b63+6CGrVeo3aXyJmKioqK
+iqqra9jQgCciR2q1GoRQr7tPv8anUN++znCO37aVaFi7taXxZ85x1ymdVFRUVFRU3VFWZck4zsGy
+NoSQJu/kIQaxgGKhoqKioqJ6QGS32wKCIv4figeRy8FLskwAAAAASUVORK5CYII=
+"
+ style="image-rendering:optimizeSpeed"
+ preserveAspectRatio="none"
+ height="176.65359"
+ width="322.573" />
+ <g
+ transform="translate(12.122621,500.63961)"
+ id="g4654-9">
+ <rect
+ y="199.68129"
+ x="68.74765"
+ height="262.25259"
+ width="282.35532"
+ id="rect4359-0"
+ style="fill:#fff6d5;fill-opacity:1;stroke:#ffe680;stroke-width:2.35244703;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <g
+ transform="translate(32.85403,-1.1328976)"
+ id="g4558-5">
+ <rect
+ style="fill:#ffb380;fill-opacity:1;stroke:#aa4400;stroke-width:1.75937951;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect4388-0"
+ width="134.52634"
+ height="57.383476"
+ x="164.16541"
+ y="270.81332" />
+ <flowRoot
+ transform="translate(-350.93614,69.363122)"
+ xml:space="preserve"
+ id="flowRoot4230-6-5-8"
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"><flowRegion
+ id="flowRegion4232-8-3-0"><rect
+ id="rect4234-36-7-2"
+ width="188.57143"
+ height="34.285721"
+ x="521.42859"
+ y="205.21935" /></flowRegion><flowPara
+ id="flowPara4236-0-5-3"
+ style="font-size:22.5px">run control</flowPara></flowRoot> </g>
+ <g
+ transform="translate(32.85403,-1.1328976)"
+ id="g4550-8">
+ <rect
+ style="fill:#ddff55;fill-opacity:1;stroke:#88aa00;stroke-width:2.12757635;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect4414-12"
+ width="134.15814"
+ height="59.872425"
+ x="164.34949"
+ y="330.99744" />
+ <flowRoot
+ transform="translate(-352.92371,125.9618)"
+ xml:space="preserve"
+ id="flowRoot4230-6-5-4-2"
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"><flowRegion
+ id="flowRegion4232-8-3-5-9"><rect
+ id="rect4234-36-7-3-4"
+ width="168.57141"
+ height="78.571434"
+ x="521.42859"
+ y="205.21935" /></flowRegion><flowPara
+ id="flowPara4236-0-5-6-8"
+ style="font-size:22.5px">storage</flowPara><flowPara
+ style="font-size:22.5px"
+ id="flowPara4456-57">allocation</flowPara></flowRoot> </g>
+ <g
+ style="fill:#ffcc00"
+ transform="matrix(0.69892424,0,0,0.60590041,-67.539165,-184.64324)"
+ id="g4510-3">
+ <g
+ transform="translate(21.07191,-13.088427)"
+ id="g4565-33">
+ <rect
+ y="817.35736"
+ x="220.84483"
+ height="45.00967"
+ width="84.160019"
+ id="rect4494-61"
+ style="fill:#ffcc00;fill-opacity:1;stroke:#88aa00;stroke-width:1.99030769;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ sodipodi:open="true"
+ d="m 221.21854,816.24251 a 41.834236,18.546101 0 0 1 40.18978,-19.00419 41.834236,18.546101 0 0 1 43.40743,17.55829 41.834236,18.546101 0 0 1 -39.01506,19.47937 41.834236,18.546101 0 0 1 -44.46328,-17.03113"
+ sodipodi:end="3.0620028"
+ sodipodi:start="3.1161299"
+ sodipodi:ry="18.546101"
+ sodipodi:rx="41.834236"
+ sodipodi:cy="815.77032"
+ sodipodi:cx="263.03922"
+ sodipodi:type="arc"
+ id="path4458-0"
+ style="fill:#ffcc00;fill-opacity:1;stroke:#88aa00;stroke-width:2.02593803;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ transform="scale(1,-1)"
+ d="m 221.40372,-862.64317 a 41.834236,18.546101 0 0 1 20.45608,-16.4174 41.834236,18.546101 0 0 1 42.30602,-0.10995 41.834236,18.546101 0 0 1 20.88886,16.30994 l -41.83028,-0.25478 z"
+ sodipodi:end="0.013738116"
+ sodipodi:start="3.1161299"
+ sodipodi:ry="18.546101"
+ sodipodi:rx="41.834236"
+ sodipodi:cy="-863.11536"
+ sodipodi:cx="263.2244"
+ sodipodi:type="arc"
+ id="path4458-4-6"
+ style="fill:#ffcc00;fill-opacity:1;stroke:#88aa00;stroke-width:2.02593803;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="853.41882"
+ x="222.65796"
+ height="11.132897"
+ width="81.339867"
+ id="rect4496-8"
+ style="fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ </g>
+ <flowRoot
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="flowRoot4230-6-7-3"
+ xml:space="preserve"
+ transform="translate(-444.3006,0.67342019)"><flowRegion
+ id="flowRegion4232-8-9-7"><rect
+ y="205.21935"
+ x="521.42859"
+ height="34.285721"
+ width="188.57143"
+ id="rect4234-36-4-96" /></flowRegion><flowPara
+ style="font-size:22.5px"
+ id="flowPara4236-0-4-93">area/testsuite</flowPara></flowRoot> <flowRoot
+ transform="translate(-104.22658,-299.08497)"
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="flowRoot4540-7"
+ xml:space="preserve"><flowRegion
+ id="flowRegion4542-3"><rect
+ y="649.05066"
+ x="168.80174"
+ height="39.651405"
+ width="130.28322"
+ id="rect4544-3" /></flowRegion><flowPara
+ style="font-size:15px;text-align:center;text-anchor:middle"
+ id="flowPara4546-2">state/status database</flowPara><flowPara
+ id="flowPara4548-7" /></flowRoot> <rect
+ y="399.81317"
+ x="70.239655"
+ height="61.176472"
+ width="279.82571"
+ id="rect4598-3"
+ style="fill:#d3bc5f;fill-opacity:1;stroke:none;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <flowRoot
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="flowRoot4230-6-7-1-0"
+ xml:space="preserve"
+ transform="translate(-440.9019,200.0634)"><flowRegion
+ id="flowRegion4232-8-9-2-6"><rect
+ y="205.21935"
+ x="521.42859"
+ height="52.412083"
+ width="264.47556"
+ id="rect4234-36-4-9-3" /></flowRegion><flowPara
+ style="font-size:17.5px;text-align:center;text-anchor:middle"
+ id="flowPara4236-0-4-9-0">configs and custom automation</flowPara></flowRoot> </g>
+ <g
+ transform="translate(-7.1366364,513.10148)"
+ id="g4654-4">
+ <rect
+ y="199.68129"
+ x="68.74765"
+ height="262.25259"
+ width="282.35532"
+ id="rect4359-8"
+ style="fill:#fff6d5;fill-opacity:1;stroke:#ffe680;stroke-width:2.35244703;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <g
+ transform="translate(32.85403,-1.1328976)"
+ id="g4558-9">
+ <rect
+ style="fill:#ffb380;fill-opacity:1;stroke:#aa4400;stroke-width:1.75937951;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect4388-5"
+ width="134.52634"
+ height="57.383476"
+ x="164.16541"
+ y="270.81332" />
+ <flowRoot
+ transform="translate(-350.93614,69.363122)"
+ xml:space="preserve"
+ id="flowRoot4230-6-5-0"
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"><flowRegion
+ id="flowRegion4232-8-3-6"><rect
+ id="rect4234-36-7-4"
+ width="188.57143"
+ height="34.285721"
+ x="521.42859"
+ y="205.21935" /></flowRegion><flowPara
+ id="flowPara4236-0-5-66"
+ style="font-size:22.5px">run control</flowPara></flowRoot> </g>
+ <g
+ transform="translate(32.85403,-1.1328976)"
+ id="g4550-9">
+ <rect
+ style="fill:#ddff55;fill-opacity:1;stroke:#88aa00;stroke-width:2.12757635;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect4414-1"
+ width="134.15814"
+ height="59.872425"
+ x="164.34949"
+ y="330.99744" />
+ <flowRoot
+ transform="translate(-352.92371,125.9618)"
+ xml:space="preserve"
+ id="flowRoot4230-6-5-4-1"
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"><flowRegion
+ id="flowRegion4232-8-3-5-2"><rect
+ id="rect4234-36-7-3-6"
+ width="168.57141"
+ height="78.571434"
+ x="521.42859"
+ y="205.21935" /></flowRegion><flowPara
+ id="flowPara4236-0-5-6-1"
+ style="font-size:22.5px">storage</flowPara><flowPara
+ style="font-size:22.5px"
+ id="flowPara4456-5">allocation</flowPara></flowRoot> </g>
+ <g
+ style="fill:#ffcc00"
+ transform="matrix(0.69892424,0,0,0.60590041,-67.539165,-184.64324)"
+ id="g4510-57">
+ <g
+ transform="translate(21.07191,-13.088427)"
+ id="g4565-3">
+ <rect
+ y="817.35736"
+ x="220.84483"
+ height="45.00967"
+ width="84.160019"
+ id="rect4494-6"
+ style="fill:#ffcc00;fill-opacity:1;stroke:#88aa00;stroke-width:1.99030769;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ sodipodi:open="true"
+ d="m 221.21854,816.24251 a 41.834236,18.546101 0 0 1 40.18978,-19.00419 41.834236,18.546101 0 0 1 43.40743,17.55829 41.834236,18.546101 0 0 1 -39.01506,19.47937 41.834236,18.546101 0 0 1 -44.46328,-17.03113"
+ sodipodi:end="3.0620028"
+ sodipodi:start="3.1161299"
+ sodipodi:ry="18.546101"
+ sodipodi:rx="41.834236"
+ sodipodi:cy="815.77032"
+ sodipodi:cx="263.03922"
+ sodipodi:type="arc"
+ id="path4458-46"
+ style="fill:#ffcc00;fill-opacity:1;stroke:#88aa00;stroke-width:2.02593803;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ transform="scale(1,-1)"
+ d="m 221.40372,-862.64317 a 41.834236,18.546101 0 0 1 20.45608,-16.4174 41.834236,18.546101 0 0 1 42.30602,-0.10995 41.834236,18.546101 0 0 1 20.88886,16.30994 l -41.83028,-0.25478 z"
+ sodipodi:end="0.013738116"
+ sodipodi:start="3.1161299"
+ sodipodi:ry="18.546101"
+ sodipodi:rx="41.834236"
+ sodipodi:cy="-863.11536"
+ sodipodi:cx="263.2244"
+ sodipodi:type="arc"
+ id="path4458-4-4"
+ style="fill:#ffcc00;fill-opacity:1;stroke:#88aa00;stroke-width:2.02593803;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="853.41882"
+ x="222.65796"
+ height="11.132897"
+ width="81.339867"
+ id="rect4496-9"
+ style="fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ </g>
+ <flowRoot
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="flowRoot4230-6-7-2"
+ xml:space="preserve"
+ transform="translate(-444.3006,0.67342019)"><flowRegion
+ id="flowRegion4232-8-9-0"><rect
+ y="205.21935"
+ x="521.42859"
+ height="34.285721"
+ width="188.57143"
+ id="rect4234-36-4-5" /></flowRegion><flowPara
+ style="font-size:22.5px"
+ id="flowPara4236-0-4-8">area/testsuite</flowPara></flowRoot> <flowRoot
+ transform="translate(-104.22658,-299.08497)"
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="flowRoot4540-2"
+ xml:space="preserve"><flowRegion
+ id="flowRegion4542-6"><rect
+ y="649.05066"
+ x="168.80174"
+ height="39.651405"
+ width="130.28322"
+ id="rect4544-7" /></flowRegion><flowPara
+ style="font-size:15px;text-align:center;text-anchor:middle"
+ id="flowPara4546-0">state/status database</flowPara><flowPara
+ id="flowPara4548-6" /></flowRoot> <rect
+ y="399.81317"
+ x="70.239655"
+ height="61.176472"
+ width="279.82571"
+ id="rect4598-5"
+ style="fill:#d3bc5f;fill-opacity:1;stroke:none;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <flowRoot
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="flowRoot4230-6-7-1-2"
+ xml:space="preserve"
+ transform="translate(-440.9019,200.0634)"><flowRegion
+ id="flowRegion4232-8-9-2-2"><rect
+ y="205.21935"
+ x="521.42859"
+ height="52.412083"
+ width="264.47556"
+ id="rect4234-36-4-9-8" /></flowRegion><flowPara
+ style="font-size:17.5px;text-align:center;text-anchor:middle"
+ id="flowPara4236-0-4-9-3">configs and custom automation</flowPara></flowRoot> </g>
+ <g
+ id="g4190"
+ transform="matrix(-0.84371534,0.01979065,-0.02351016,-1.0022856,1092.315,1172.4738)">
+ <path
+ sodipodi:open="true"
+ d="m 512.15263,288.64133 a 63.57143,12.857143 0 0 1 60.44617,-12.99805 63.57143,12.857143 0 0 1 66.45678,11.73666 63.57143,12.857143 0 0 1 -55.53716,13.86501 63.57143,12.857143 0 0 1 -70.55918,-10.71249"
+ sodipodi:end="2.9816588"
+ sodipodi:start="3.1294277"
+ sodipodi:ry="12.857143"
+ sodipodi:rx="63.57143"
+ sodipodi:cy="288.48492"
+ sodipodi:cx="575.71936"
+ sodipodi:type="arc"
+ id="path4136-0"
+ style="fill:#99ff99;fill-opacity:1;stroke:#07ff00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ style="fill:#99ff99;fill-opacity:1;stroke:#07ff00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path4178"
+ sodipodi:type="arc"
+ sodipodi:cx="575.71936"
+ sodipodi:cy="294.60724"
+ sodipodi:rx="63.57143"
+ sodipodi:ry="12.857143"
+ sodipodi:start="3.1294277"
+ sodipodi:end="2.9816588"
+ d="m 512.15263,294.76364 a 63.57143,12.857143 0 0 1 60.44617,-12.99805 63.57143,12.857143 0 0 1 66.45678,11.73666 63.57143,12.857143 0 0 1 -55.53716,13.86501 63.57143,12.857143 0 0 1 -70.55918,-10.71248"
+ sodipodi:open="true" />
+ <path
+ sodipodi:open="true"
+ d="m 512.15263,300.88596 a 63.57143,12.857143 0 0 1 60.44617,-12.99805 63.57143,12.857143 0 0 1 66.45678,11.73666 63.57143,12.857143 0 0 1 -55.53716,13.865 63.57143,12.857143 0 0 1 -70.55918,-10.71248"
+ sodipodi:end="2.9816588"
+ sodipodi:start="3.1294277"
+ sodipodi:ry="12.857143"
+ sodipodi:rx="63.57143"
+ sodipodi:cy="300.72955"
+ sodipodi:cx="575.71936"
+ sodipodi:type="arc"
+ id="path4180"
+ style="fill:#99ff99;fill-opacity:1;stroke:#07ff00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ style="fill:#99ff99;fill-opacity:1;stroke:#07ff00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path4182"
+ sodipodi:type="arc"
+ sodipodi:cx="575.71936"
+ sodipodi:cy="306.85187"
+ sodipodi:rx="63.57143"
+ sodipodi:ry="12.857143"
+ sodipodi:start="3.1294277"
+ sodipodi:end="2.9816588"
+ d="m 512.15263,307.00827 a 63.57143,12.857143 0 0 1 60.44617,-12.99805 63.57143,12.857143 0 0 1 66.45678,11.73666 63.57143,12.857143 0 0 1 -55.53716,13.86501 63.57143,12.857143 0 0 1 -70.55918,-10.71248"
+ sodipodi:open="true" />
+ <path
+ sodipodi:open="true"
+ d="m 512.15263,313.13058 a 63.57143,12.857143 0 0 1 60.44617,-12.99804 63.57143,12.857143 0 0 1 66.45678,11.73666 63.57143,12.857143 0 0 1 -55.53716,13.865 63.57143,12.857143 0 0 1 -70.55918,-10.71248"
+ sodipodi:end="2.9816588"
+ sodipodi:start="3.1294277"
+ sodipodi:ry="12.857143"
+ sodipodi:rx="63.57143"
+ sodipodi:cy="312.97418"
+ sodipodi:cx="575.71936"
+ sodipodi:type="arc"
+ id="path4184"
+ style="fill:#99ff99;fill-opacity:1;stroke:#07ff00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ style="fill:#99ff99;fill-opacity:1;stroke:#07ff00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path4186"
+ sodipodi:type="arc"
+ sodipodi:cx="575.71936"
+ sodipodi:cy="319.0965"
+ sodipodi:rx="63.57143"
+ sodipodi:ry="12.857143"
+ sodipodi:start="3.1294277"
+ sodipodi:end="2.9816588"
+ d="m 512.15263,319.2529 a 63.57143,12.857143 0 0 1 60.44617,-12.99805 63.57143,12.857143 0 0 1 66.45678,11.73666 63.57143,12.857143 0 0 1 -55.53716,13.86501 63.57143,12.857143 0 0 1 -70.55918,-10.71249"
+ sodipodi:open="true" />
+ <path
+ sodipodi:open="true"
+ d="m 512.15263,325.37521 a 63.57143,12.857143 0 0 1 60.44617,-12.99804 63.57143,12.857143 0 0 1 66.45678,11.73666 63.57143,12.857143 0 0 1 -55.53716,13.865 63.57143,12.857143 0 0 1 -70.55918,-10.71248"
+ sodipodi:end="2.9816588"
+ sodipodi:start="3.1294277"
+ sodipodi:ry="12.857143"
+ sodipodi:rx="63.57143"
+ sodipodi:cy="325.21881"
+ sodipodi:cx="575.71936"
+ sodipodi:type="arc"
+ id="path4188"
+ style="fill:#99ff99;fill-opacity:1;stroke:#07ff00;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 480.79052,694.68093 c -20.48995,16.02845 -49.92126,-2.22239 -61.48209,35.56138 -14.07962,50.51945 13.82501,65.4894 9.14417,107.80549 0.30581,43.82264 -8.10403,35.30357 13.87255,75.62963 11.76423,19.14732 41.85079,38.54184 50.91809,59.14205 25.79328,31.08882 46.46188,-3.14626 83.61295,-0.31378 32.17165,2.32694 31.03441,7.29979 63.48515,9.94718 26.05422,-13.75252 60.87578,-31.62469 63.68671,-61.1889 9.53867,-46.64667 -26.39163,-67.56952 -17.75811,-114.34909 3.31882,-37.73498 28.49078,-79.48402 2.32824,-109.58076 -24.95714,-19.25618 -45.71429,-7.14286 -62.21189,-38.53298 -30.06032,-27.22255 -65.38383,-15.84869 -72.95381,5.65785 -24.07053,43.07907 -44.28571,-11.42857 -72.64196,30.22193 z"
+ id="path4199"
+ inkscape:connector-curvature="0"
+ sodipodi:nodetypes="ccccccccccccc" />
+ <flowRoot
+ xml:space="preserve"
+ id="flowRoot4230"
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ transform="translate(-24.923748,483.7473)"><flowRegion
+ id="flowRegion4232"><rect
+ id="rect4234"
+ width="188.57143"
+ height="34.285721"
+ x="521.42859"
+ y="205.21935" /></flowRegion><flowPara
+ id="flowPara4236"
+ style="font-size:22.5px"><flowSpan
+ style="font-size:22.5px;line-height:124.00000095%"
+ id="flowSpan4238">compute</flowSpan> cloud</flowPara></flowRoot> <flowRoot
+ transform="translate(-6.809158,713.2426)"
+ xml:space="preserve"
+ id="flowRoot4230-5"
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"><flowRegion
+ id="flowRegion4232-6"><rect
+ id="rect4234-3"
+ width="162.85713"
+ height="72.857147"
+ x="521.42859"
+ y="205.21935" /></flowRegion><flowPara
+ id="flowPara4236-7"
+ style="font-size:22.5px">storage (NFS, moosefs etc.)</flowPara></flowRoot> <g
+ id="g4306"
+ transform="translate(-24.923748,483.7473)">
+ <rect
+ y="237.82025"
+ x="481.17233"
+ height="43.369614"
+ width="56.226757"
+ id="rect4277"
+ style="fill:#e9afaf;fill-opacity:1;stroke:#a02c2c;stroke-width:1.48752904;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <flowRoot
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="flowRoot4230-2"
+ xml:space="preserve"
+ transform="translate(-33.313982,40.923874)"><flowRegion
+ id="flowRegion4232-3"><rect
+ y="205.21935"
+ x="521.42859"
+ height="32.857151"
+ width="61.428555"
+ id="rect4234-2" /></flowRegion><flowPara
+ style="font-size:22.5px"
+ id="flowPara4236-9">job</flowPara></flowRoot> </g>
+ <g
+ transform="translate(95.790536,522.31872)"
+ id="g4306-3">
+ <rect
+ y="237.82025"
+ x="481.17233"
+ height="43.369614"
+ width="56.226757"
+ id="rect4277-9"
+ style="fill:#e9afaf;fill-opacity:1;stroke:#a02c2c;stroke-width:1.48752904;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <flowRoot
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="flowRoot4230-2-2"
+ xml:space="preserve"
+ transform="translate(-33.313982,40.923874)"><flowRegion
+ id="flowRegion4232-3-7"><rect
+ y="205.21935"
+ x="521.42859"
+ height="32.857151"
+ width="61.428555"
+ id="rect4234-2-0" /></flowRegion><flowPara
+ style="font-size:22.5px"
+ id="flowPara4236-9-5">job</flowPara></flowRoot> </g>
+ <g
+ transform="translate(-25.638031,588.03302)"
+ id="g4306-6">
+ <rect
+ y="237.82025"
+ x="481.17233"
+ height="43.369614"
+ width="56.226757"
+ id="rect4277-6"
+ style="fill:#e9afaf;fill-opacity:1;stroke:#a02c2c;stroke-width:1.48752904;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <flowRoot
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="flowRoot4230-2-27"
+ xml:space="preserve"
+ transform="translate(-33.313982,40.923874)"><flowRegion
+ id="flowRegion4232-3-2"><rect
+ y="205.21935"
+ x="521.42859"
+ height="32.857151"
+ width="61.428555"
+ id="rect4234-2-09" /></flowRegion><flowPara
+ style="font-size:22.5px"
+ id="flowPara4236-9-4">job</flowPara></flowRoot> </g>
+ <flowRoot
+ transform="translate(-433.36378,162.68235)"
+ xml:space="preserve"
+ id="flowRoot4230-6"
+ style="font-style:normal;font-weight:normal;font-size:15px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;"><flowRegion
+ id="flowRegion4232-8"><rect
+ id="rect4234-36"
+ width="188.57143"
+ height="34.285721"
+ x="521.42859"
+ y="205.21935"
+ style="font-size:15px;" /></flowRegion><flowPara
+ id="flowPara4236-0"
+ style="font-size:15px;" /></flowRoot> <g
+ id="g4654"
+ transform="translate(-23.79085,525.66451)">
+ <rect
+ y="199.68129"
+ x="68.74765"
+ height="262.25259"
+ width="282.35532"
+ id="rect4359"
+ style="fill:#fff6d5;fill-opacity:1;stroke:#ffe680;stroke-width:2.35244703;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <g
+ transform="translate(32.85403,-1.1328976)"
+ id="g4558">
+ <rect
+ style="fill:#ffb380;fill-opacity:1;stroke:#aa4400;stroke-width:1.75937951;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect4388"
+ width="134.52634"
+ height="57.383476"
+ x="164.16541"
+ y="270.81332" />
+ <flowRoot
+ transform="translate(-350.93614,69.363122)"
+ xml:space="preserve"
+ id="flowRoot4230-6-5"
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"><flowRegion
+ id="flowRegion4232-8-3"><rect
+ id="rect4234-36-7"
+ width="188.57143"
+ height="34.285721"
+ x="521.42859"
+ y="205.21935" /></flowRegion><flowPara
+ id="flowPara4236-0-5"
+ style="font-size:22.5px">run control</flowPara></flowRoot> </g>
+ <g
+ transform="translate(32.85403,-1.1328976)"
+ id="g4550">
+ <rect
+ style="fill:#ddff55;fill-opacity:1;stroke:#88aa00;stroke-width:2.12757635;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect4414"
+ width="134.15814"
+ height="59.872425"
+ x="164.34949"
+ y="330.99744" />
+ <flowRoot
+ transform="translate(-352.92371,125.9618)"
+ xml:space="preserve"
+ id="flowRoot4230-6-5-4"
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"><flowRegion
+ id="flowRegion4232-8-3-5"><rect
+ id="rect4234-36-7-3"
+ width="168.57141"
+ height="78.571434"
+ x="521.42859"
+ y="205.21935" /></flowRegion><flowPara
+ id="flowPara4236-0-5-6"
+ style="font-size:22.5px">storage</flowPara><flowPara
+ style="font-size:22.5px"
+ id="flowPara4456">allocation</flowPara></flowRoot> </g>
+ <g
+ style="fill:#ffcc00"
+ transform="matrix(0.69892424,0,0,0.60590041,-67.539165,-184.64324)"
+ id="g4510">
+ <g
+ transform="translate(21.07191,-13.088427)"
+ id="g4565">
+ <rect
+ y="817.35736"
+ x="220.84483"
+ height="45.00967"
+ width="84.160019"
+ id="rect4494"
+ style="fill:#ffcc00;fill-opacity:1;stroke:#88aa00;stroke-width:1.99030769;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ sodipodi:open="true"
+ d="m 221.21854,816.24251 a 41.834236,18.546101 0 0 1 40.18978,-19.00419 41.834236,18.546101 0 0 1 43.40743,17.55829 41.834236,18.546101 0 0 1 -39.01506,19.47937 41.834236,18.546101 0 0 1 -44.46328,-17.03113"
+ sodipodi:end="3.0620028"
+ sodipodi:start="3.1161299"
+ sodipodi:ry="18.546101"
+ sodipodi:rx="41.834236"
+ sodipodi:cy="815.77032"
+ sodipodi:cx="263.03922"
+ sodipodi:type="arc"
+ id="path4458"
+ style="fill:#ffcc00;fill-opacity:1;stroke:#88aa00;stroke-width:2.02593803;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <path
+ transform="scale(1,-1)"
+ d="m 221.40372,-862.64317 a 41.834236,18.546101 0 0 1 20.45608,-16.4174 41.834236,18.546101 0 0 1 42.30602,-0.10995 41.834236,18.546101 0 0 1 20.88886,16.30994 l -41.83028,-0.25478 z"
+ sodipodi:end="0.013738116"
+ sodipodi:start="3.1161299"
+ sodipodi:ry="18.546101"
+ sodipodi:rx="41.834236"
+ sodipodi:cy="-863.11536"
+ sodipodi:cx="263.2244"
+ sodipodi:type="arc"
+ id="path4458-4"
+ style="fill:#ffcc00;fill-opacity:1;stroke:#88aa00;stroke-width:2.02593803;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <rect
+ y="853.41882"
+ x="222.65796"
+ height="11.132897"
+ width="81.339867"
+ id="rect4496"
+ style="fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ </g>
+ </g>
+ <flowRoot
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="flowRoot4230-6-7"
+ xml:space="preserve"
+ transform="translate(-444.3006,0.67342019)"><flowRegion
+ id="flowRegion4232-8-9"><rect
+ y="205.21935"
+ x="521.42859"
+ height="34.285721"
+ width="188.57143"
+ id="rect4234-36-4" /></flowRegion><flowPara
+ style="font-size:22.5px"
+ id="flowPara4236-0-4">area/testsuite</flowPara></flowRoot> <flowRoot
+ transform="translate(-104.22658,-299.08497)"
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="flowRoot4540"
+ xml:space="preserve"><flowRegion
+ id="flowRegion4542"><rect
+ y="649.05066"
+ x="168.80174"
+ height="39.651405"
+ width="130.28322"
+ id="rect4544" /></flowRegion><flowPara
+ style="font-size:15px;text-align:center;text-anchor:middle"
+ id="flowPara4546">state/status database</flowPara><flowPara
+ id="flowPara4548" /></flowRoot> <rect
+ y="399.81317"
+ x="70.239655"
+ height="61.176472"
+ width="279.82571"
+ id="rect4598"
+ style="fill:#d3bc5f;fill-opacity:1;stroke:none;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <flowRoot
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="flowRoot4230-6-7-1"
+ xml:space="preserve"
+ transform="translate(-440.9019,200.0634)"><flowRegion
+ id="flowRegion4232-8-9-2"><rect
+ y="205.21935"
+ x="521.42859"
+ height="52.412083"
+ width="264.47556"
+ id="rect4234-36-4-9" /></flowRegion><flowPara
+ style="font-size:17.5px;text-align:center;text-anchor:middle"
+ id="flowPara4236-0-4-9">configs and custom automation</flowPara></flowRoot> </g>
+ <g
+ id="g4510-5"
+ transform="matrix(0.9875096,0,0,0.89462735,317.68506,-291.88682)"
+ style="fill:#ffcc00">
+ <g
+ id="g4565-7"
+ transform="translate(21.07191,-13.088427)">
+ <rect
+ style="fill:#ffcc00;fill-opacity:1;stroke:#88aa00;stroke-width:1.99030769;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect4494-4"
+ width="84.160019"
+ height="45.00967"
+ x="220.84483"
+ y="817.35736" />
+ <path
+ style="fill:#ffcc00;fill-opacity:1;stroke:#88aa00;stroke-width:2.02593803;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path4458-8"
+ sodipodi:type="arc"
+ sodipodi:cx="263.03922"
+ sodipodi:cy="815.77032"
+ sodipodi:rx="41.834236"
+ sodipodi:ry="18.546101"
+ sodipodi:start="3.1161299"
+ sodipodi:end="3.0620028"
+ d="m 221.21854,816.24251 a 41.834236,18.546101 0 0 1 40.18978,-19.00419 41.834236,18.546101 0 0 1 43.40743,17.55829 41.834236,18.546101 0 0 1 -39.01506,19.47937 41.834236,18.546101 0 0 1 -44.46328,-17.03113"
+ sodipodi:open="true" />
+ <path
+ style="fill:#ffcc00;fill-opacity:1;stroke:#88aa00;stroke-width:2.02593803;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="path4458-4-7"
+ sodipodi:type="arc"
+ sodipodi:cx="263.2244"
+ sodipodi:cy="-863.11536"
+ sodipodi:rx="41.834236"
+ sodipodi:ry="18.546101"
+ sodipodi:start="3.1161299"
+ sodipodi:end="0.013738116"
+ d="m 221.40372,-862.64317 a 41.834236,18.546101 0 0 1 20.45608,-16.4174 41.834236,18.546101 0 0 1 42.30602,-0.10995 41.834236,18.546101 0 0 1 20.88886,16.30994 l -41.83028,-0.25478 z"
+ transform="scale(1,-1)" />
+ <rect
+ style="fill:#ffcc00;fill-opacity:1;stroke:none;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
+ id="rect4496-5"
+ width="81.339867"
+ height="11.132897"
+ x="222.65796"
+ y="853.41882" />
+ </g>
+ </g>
+ <path
+ style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#Arrow2Lend)"
+ d="m 274.16122,593.53868 26.05664,95.1634"
+ id="path4922"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0" />
+ <path
+ style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker5302)"
+ d="m 261.69935,595.80447 -2.2658,89.49892"
+ id="path5270"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0" />
+ <path
+ style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker5274)"
+ d="m 252.63617,598.07027 -49.80483,90.64802"
+ id="path5272"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0" />
+ <path
+ style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker5302-0)"
+ d="M 313.96906,821.51733 442.96295,751.01146"
+ id="path5270-0"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0" />
+ <path
+ style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker5302-0-9)"
+ d="M 313.81263,825.7827 570.98038,787.26418"
+ id="path5270-0-9"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0" />
+ <path
+ style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker5302-0-9-7)"
+ d="m 310.41394,830.31429 135.94771,18.12636"
+ id="path5270-0-9-2"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0" />
+ <path
+ style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker5302-0-9-7-7)"
+ d="M 334.20479,679.63889 561.91721,483.64761"
+ id="path5270-0-9-2-0"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0" />
+ <path
+ style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker5302-0-9-7-7-1)"
+ d="M 373.85621,692.10077 572.11329,491.57789"
+ id="path5270-0-9-2-0-5"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0" />
+ <flowRoot
+ transform="translate(65.932827,283.73434)"
+ xml:space="preserve"
+ id="flowRoot4230-7"
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"><flowRegion
+ id="flowRegion4232-4"><rect
+ id="rect4234-68"
+ width="151.18582"
+ height="55.810787"
+ x="521.42859"
+ y="205.21935" /></flowRegion><flowPara
+ id="flowPara4236-39"
+ style="font-size:22.5px;text-align:center;text-anchor:middle">postgresql database</flowPara></flowRoot> <flowRoot
+ transform="matrix(0.75559123,-0.65504344,0.65504344,0.75559123,-79.970125,770.0914)"
+ xml:space="preserve"
+ id="flowRoot4230-8"
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ inkscape:transform-center-y="-2.2099189"
+ inkscape:transform-center-x="3.4352659"><flowRegion
+ id="flowRegion4232-46"><rect
+ id="rect4234-30"
+ width="70.750061"
+ height="33.152824"
+ x="521.42859"
+ y="205.21935" /></flowRegion><flowPara
+ id="flowPara4236-6"
+ style="font-size:15px">sync</flowPara></flowRoot> <path
+ style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ d="m 467.3997,628.12966 0,0"
+ id="path9031"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0" />
+ <path
+ style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#marker16686);marker-end:url(#marker5274-8)"
+ d="M 125.75163,641.12037 113.28976,360.16178"
+ id="path5272-7"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0" />
+ <path
+ style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#marker16520);marker-end:url(#marker5274-8-6)"
+ d="M 87.233115,651.31645 100.82788,357.89598"
+ id="path5272-7-4"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0" />
+ <path
+ style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-start:url(#Arrow1Lstart);marker-end:url(#marker5274-8-6-7)"
+ d="M 49.847495,676.2402 84.96732,356.76309"
+ id="path5272-7-4-2"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0" />
+ <g
+ id="g12830"
+ transform="translate(-133.68192,-662.74509)">
+ <image
+ width="334.8475"
+ height="196.18736"
+ preserveAspectRatio="none"
+ style="image-rendering:optimizeSpeed"
+ xlink:href="data:image/png;base64,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
+H0TyDRO5smJVAAAAAElFTkSuQmCC
+"
+ id="image7309"
+ x="159.41721"
+ y="812.08984" />
+ <flowRoot
+ transform="translate(-332.84714,572.62323)"
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="flowRoot4230-65"
+ xml:space="preserve"><flowRegion
+ id="flowRegion4232-0"><rect
+ y="205.21935"
+ x="521.42859"
+ height="34.285721"
+ width="375.49951"
+ id="rect4234-1" /></flowRegion><flowPara
+ style="font-size:22.5px"
+ id="flowPara4236-2">multi-area dashboard and xterm</flowPara></flowRoot> </g>
+ <image
+ y="147.08878"
+ x="484.35513"
+ id="image12827"
+ xlink:href="data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAA+YAAAPTCAIAAACytYRuAAAAA3NCSVQICAjb4U/gAAAgAElEQVR4
+nOzdeVxU5foA8OfMysywyDaAQiwiCoOiKRhkgktWgtdS1OxaLi1q2e3+sNQyc8lKu0mLlm1uXVsk
+tExM06sskSQuobLIIouo6Aw7zAyznt8fZ2YYZgOGgRnz+X781MzLO+95z5lzZp7zznPeQwQNTYAB
+FykYVlhUPvDLRaiHJOKG9hWX7d0LhMxy3jGKy/O0dy8QQgj1r45FOzPnM1ksFs3ePUEIIYQQQgiZ
+plKrVWo1w97dQMhBNb2msHcXEDIrYIe9e4AQQmhAqJRKNZ2Oo+wIIYQQQgg5KLVarVarMWRHCCGE
+EELIQalUKpVKhSE7QgghhBBCDgpH2RFCCCGEEHJoGLIjhBBCCCHk0EiSJEkSQ3aEEEIIIYQclFql
+Vt8tkzzSgVQDQQLw6Kq33xCt+8BLLGUQNCDV9u4ZuiexWEwSAFQqgk5vIqXS01nSkiuMskoAUIaF
+cEeMdJqS4E5wSJUK6HQCQC7H+SKRnS1fOp/DdUr9cI+9O4IQQqh3qFF2xw3ZeSSICQCADu7wDs8H
+SS82SdKTHjj8xEKSxVPsTJUWC13s3Ud0jyJJklAoSBar9s/TivWbWCeyvQBagQkAXqBoB2h6OL59
+01v+D0wm5HKSybR3fxGCqKhwe3cBIYSQNdRqtVrtqIkxDJJ4S8EUqJ2Ubo/zwp5JfNCJGf1E6+TZ
+sdNd1W20xJmB6XvkUfe1AABB2Luv6N5DqtUki1V9+DvahETnE2eVzy5sKMjh3qnl3qltKMiRP7eQ
+d/IsbUJi9eHvSBaLVOOPQQghhBCyEkkCOOwou4+KHk+op7o1Xg88zA/eup22uL55DsGQ0zpukYRc
+2qzgDB26eePN2UvVMoWDnnUgO4p9YIyn56CMo5kG5ZMnxUqlHXl//tXH9ml0+s1zv7OefJYY4tP+
+zacB8Ym6gXRPvo/sq4dq/zmLu/BfrCefvZUTMCT6IVBh1I66yMw8LRSK5s2bZ1CekZHB43EnTZps
+l14hhNDdqLT4hIW/Do+YNmA9+T37h1VrtublGYYZsbFj3t+y+qH4J61r1qEvP31QTXgxxR7chtFu
+5wbz6vxb2+a7poGCcbzuIbqqmEHQlKIOQZz30090AGmygUe+LD5R+vkjXUv2vB5pZX9mf36itLjL
+vxOrw0wt1PpFIBvy9ByUlDgpKXGSfmFS4qS5cx7z9BzU9/ab5K2yNW8y5dCx95OQ+ES6XE6q1aRa
+DWpSpVKyVRCa8I+OPR8z5SBb82azvNVUG8eWsVnsZccMSis+jmWzYz+u0CuIY7HZLDabxY77qAK6
+LYfjy1jLjusvRa+140uNl2iiGup/QqHowIEfDhw4oF944MCB3bt3CYUie/UKIYTuUsMjppn8N8Dd
+WLVm6/tbVsfGjtEvpOL1VWu29qFhggTCEUN2FxXzSbkTnSZXMWlKNlPFYL0E21cyP6Sr5P+9+sLh
+khgm5JIkQTbJF88EJt3c+OXNmsCVX86yTZcOLqPe+23ZcHPv3GnDI6ZN21pmm6ZRP8g4mpn351/6
+UTv1+NTpPOOhdyt0nDnDysoVPzv/vkn/UHZISCadoNGAIOSkgk5nZN3K2pT9ZtDkmeLnnmJn5UrP
+nDHTzNixlzd1DZSPfbDqQuezio/i2BElb8llMrlMJpd9A0ePWywHAIBHH1+852dtXF5RehkuHDha
+oXs2NnxY31cf9d28efMmTZqkH7UfOHDgwIEfkpJmGA+9I4QQuivk5f1lELXr4nXjofeeIwFIAEdM
+jBkq5XmQoCJVdLpKRQCdI/+P+rnVxVsIvkot58w9eSir6YEHwvLV8gi+O4wN6/izhGuyncyvDk16
+flnkoc8LB3gFkAPY981PAKAfsp86nfdjuskx5l6TFl72VJONLy2hqZQ0Jy4AqNVqFali0Vl5N/MW
+/LpAKL4zZcQ/Ql95kfnl7ubCyxA3xWQ7o0bBgaMVr7wSqnl+/Oc9ixcv3nMZAAAqPn5m1ajD8s8f
+1dYO/fcroRbKdU/Dx14urYDHQgEqjh4Y9f77l0vKAahnMO8b/arInl5++V8AcODAD9RTKl5fsmSJ
+TRpfvnS+yetNP/9sk/7TsvIqnEMGIYRsSBe1U8PqfY/XQRuyO+Iou7eSzVCz1AByJbO21v2dU//c
+UfY4NLSp6+S05ma5yOXrokXE9QZFUzmDJp8wXGq2obLPv6iZlWqcwRK57IQmv2XzbIDZn5/QDsbr
+ZbZELjvRJa/GhM5sGf2aYZrGTWXOoAG175ufdGPtNozXAYBeVtlKZzj7DaXRGcerjle1VNFoNCad
+mV+XP+/oPIVKsWvarmiv0XSvIWI6k15Waa6d8FffGrXqP9oh8oqPN11+/9XHtc8yDlxY/PijRq8x
+V64TmjQPqIH1iqMHIDxx+Kg9Px8HACgvuTBqOBWxV3wURyXVsJd2DtBrC+O0I//Hl2lzbzTpNMeW
+sWM/Pm5QzWQh6pGXX/6XdqzdlvE6AHh6uvekmlTSYaslIoTuNQYJwwb/7N07e6Ki9o9S3/xw29q+
+x+s6jjjKLiUIqYpJkvSOdjafJo50qXO5LYr2yQWCW3wnvF1BtvuoSQbQRHdIGkOttPTNdHDZtkeK
+X3/96OL3OkfaH/kybXzm3GnvFQLM2nxiddi0E/nvTnsEDv0Gsx4KqoGgxLD3CssiE8dD1WnL/Ty4
+bNpBqsHiJ1+P/O29QgAYsuh5mB0xrTBy2Yk0g+UiO2hoaKYeSKU2Dk1UoHJmOWfeypnxU9J4vwd+
+evynyubKJw4/oVQrtyVsezriaRIAoNv5jB57fPHMn49/8eijABUZ1CB4ie6PY8NND4mbK9cIHT7q
+ws8VAKHlJTDv1dDHhi/eVFoBj1b8vGfx458DABxbJjgwr0h+JhTg+NK4jysefQUALqzaNK9IJg+t
++ChO8PTHiXmvhMKjn8tlnwPAsWXsTR+/+tgroaarmSlEPcLn+1APeDyeDZvd/O5nBiXU+PqyF9+y
+4VIQQveygc8Uv7uQJEnYaFpDkgQgHXKUvYolblSw5UonF4Way1bPHHbmr3nLzj719M+PLI6nnSSu
+XZ/q9j+CBTQxQYiaCmssn3X89sKbNxet0BsFjwwOgiGL0k6UFp8o3RwTGBwMZTdqAoMjAWZPG5L5
+1VlImBwJYTMSIPNod9nqszaXFp8oLV4Z31l0c+9rnxcCQOHnX+QMCcZxdrvSja8b5LX3nSosZJBK
+ffv6pbGeUS9GLT9/5/zi44sXHluoUCs+nvzx0xFPK5RyQq1uqytzVSlVYSEWmnr01fcvb/qoAuD4
+B6tGvfXvLrHuhRLTQ9bmynVtUunsx3/eM2p4KEBoOBw4WtGZyF5RehkurBKw2GwWe+aeCyXlAAAw
+9v1v/h0KAKH/fmuxdgHHl7LZLDZ7pl7mhKlqpgtR93T56wZ57QghhO5eVP76/618598pm42vRrWa
+I46y17HF1WpWqNzdSdZOVxD1NwefLve5KvU+dX3c7Q7nZ6O/fkqQpbpF0EF9tYSWVeLcTXOHvtn7
+/I4vZ23TK8p/I+LNg51PwzLh9RmRVcGBZz85dBqef2Z45ORJcDbF8gB55LITm+GNiGkHIez1Y68b
+/TksLLDna4xszzgfhgrZbXL5KSdylJhGI3fscv5yz0fxHypI1b7CfZ4cz+2Ttz854kmlWslQkSoG
+DT7d004jOJGjLLUVmjQPnj56HA5cfv+bz7uWj12lGYCHHpR3qRM+9nLp8fDLix//AgBCE+fBBxlH
+L+snsi8+LPtCrwH9lKGK0ssAjwNUfBQ3Ew7L5I9CxcdxTxstQ1ut+0Jkmi5e1+XDUHntePkpQgjd
+vQyuN9Xltff18lPHHGVX09S/sVskUj+JwgnqOR7SjvuglSNWPTrk3JbHPv0s+TNeo1LZSoCM+CPP
+S66kd9de2XuvHQrarB0LL6yqhpilXRLNy45kwaT/PBmUdboQyo5kDXlkhT9kne4mpSXMP7DmRikA
+RE6e1BmdD5mUGAaawvzfDvV63ZFNTJ4UaxCv6/LaJ0+K7Xv7TnFxsoQJzrt+qMr8hWAwPk34ZM6w
+5Lcf3PTkiCcVSjlNqSLY7JrTv/B2fS9LmOAUF2exsdBX3hq1auYqmJcUali+eM9MvRkbKz76+LiF
+cv2XJs2DVTNXgSaBJnT4qD2rVukS2UOHj4I9mwyTzrUTy+hy5StKLlAZOBUZBy6Yr2a2EFmSkZFh
+EK/r8tozMjLs2zeEEELWMZ4fxngOGas54ig7AZA96M4JYUiy1L+DXul0Sx0bLIwdXwEeMvAAaAAl
+jWDT1VDPPFXt1qMWCz9P2Tf+4ELqyW8vzA0+kbajlHqas234st8Kj56FheOpTJjCo2eD0sZn7ugu
+K+bQN3uf33GweBbU5GfX6EpvVge/Xlo8BACy35x20PyrUb+SSjvSfjx2OjNPv3DfNz81NDTbJKnd
+neUq2bJZMXEaZ9G/rn1DC4xP2pu4DwBIACaDpQSozs5wWvwvBQvYWza7s1zlcoWl5h597f2xMNw4
+AfzRL2RF4XECFpt6Ovb9ojMWyzuFJs4buwrmJWqafOzxxbAHdLH0Y58XvR8niGCvAgCAxYdlnwPA
+2FElT7PZFwBg8WH5o1SvNkUI2Ktg7OLFY3UtG1UzW4gs4fG4S5Y8m5SUpF/48sv/4vN9eDzTU2Ah
+hBAyx0EueDU5oK6L2q2+lRKQQJIEETQ0oe9d7K1IwbDConLLdVwUrNdb/GY5N7I5tWoXqZLfAZ4d
+pKuM5SojWER1I3fjX0OyhO4EmLmZEkJ9IBE31NZcMPdXBp1G0OnVh79jzX6WoQLJs/NUKxa7DQ4j
+gGitKyd27OJ+fUBJB/nBXUEznyJVKuXf5O6nx5axN4UXGVxdarIQ9buAwLFcnmfP67/5xosNDU07
+v/i+/7qEEELI5joW7fxvfDOb7eSIo+yUNqb8TffaQsmgf5K+YeomlkIK7U7gLOtgqA43DdpU5ymh
+AcbryC4IGo2Qy4NmPnUj11f81ib2rn3Ou/a1AhMAPEHRDiB+OJ656a2gByYTcjkwmfA3CdnRXcx4
+DhmEEEJ3EccN2QkANV39nUvjLwr6eLnLCBWTI5G30clzasYFkk3QgE6QKtI2s+cg1CsEQZAsFqhU
+AQ9MbvottuNUVv3VK4yySgCoDwvhjhjpPiXBneCQKhXJYuE+ihBCCCGrOe7dTym64fN2puoUwClg
+ADBADQBATXOJ8Tqyl87cdJWaBwzexKmeE6d2qaEAOSioCgPduX702Oeyx3pWiBBCCCHbIElHvfsp
+QgghhBBCCBz5VkoIIYQQQgghcOR52RFCCCGEEEJAJcZgyI4QQgghhJDDIklQkySG7AghhBBCCDko
+Uk2SGLIjhBBCCCHksNRAqklgSMQNA7/sO7fZdlkuQj0kk7XauwsIWYK7KEII3Qto1Ci7mmRYuCs7
+QgghxyS8XW7vLiCEEOp3ge9fU5Mk5rIjhBBCCCHkuKjLTx337qfob4kkye4rIYQQGkAEgXcTR8hx
+qanEmJ6/QKlUtra2NjY2NjY2KpVKqVQKABwtDw8PPp/fb71FdzddpI4hO0IIOSyM3RGyQCQSenvb
+IdYlSZIkoUche1tb282bN+/cucPlcj09PUeMGM5gMLhcLgBIJBKJRCqVSmpqai5evOjj4zNixAgO
+h9PPnUd3EypM1/8vQgghR0MQBEmSGLUjZI5SqbLLckmS7D4xRqlUVlRU3LlzJyQkOD5+IpPJNKjg
+5ubm5uYGACEhIQBQWVmZnZ0dFBQUGBiIgTsCvUhdLBZXVFRIJBJ79wghhFAXrq6u/v7+bm5uGLUj
+5ICou59aCtkbGxuvXLkSEBBgMlg3KSQkJCQkpLKy8syZM2PGjPHw8LBRb9FdjCRJkiSrq6tDQoK9
+vb3t3R2EEEJdNDc3FxeXjBkzBjA3BjmMt95a18Oamza93a89sTs1CaSFUfaamprq6mqBQODn59vb
+pkNCQjw9PfPy/gwNDQ0MDOxbP9HfAUmSra2tGK8jhJADGjRokEwmw/F15FAqKyvt3QVHQY2ym57k
+saam5tatW3FxsVbE6xQ3N7cpUybfunXr5s2bfegkuruRWvbuCEIIdYGfSybhhzZCDokkwdS87G1t
+bdXV1VFRo6gLTK3GZDJjYx+4evVqY2NjX9pBfwP4BYAQcihtbW327oLDwQ9qhByZYcgulUovXrwo
+EAioi0r7iIra//rrL2pGSIQQQsgRtLa22rsLCKHeGbrw47S0tNcn2bsfdmIYstfU1AQEBFidD2PM
+zc0tODi4oqLCVg0ihBBCCKF7ydCFH6e9l+hn727YU5fLT6VS6Z07d+LjJ9p2GSEhwTk5v7e1tbm4
+uNi2ZUcmFou3b/9ELJasWbOGx+PZuzsIIXQXq62t3bdvX21trYU6YWFhM2bMCAsLG7BeWa2H0932
+MT01LS0NAObOnduXRu5BC36mt3QQR55U2rsj9icWizMzM8Visa6Ez/eeNGmy7ml1dXV7e3tkZKR1
+7SvqPlfe3EKq2gFMXvc8Te/xtX2vzN036fW05WOsWxblVn7++R3bAWDcipcHx8T0pakBRQAQXUP2
+ioqKgICAbudzFIvFH330EQCsXbu2JwtiMplhYWHV1dUjR47sbScLCgoUCsWYMWMYjF7cqNUysVic
+kZFRWFgoFoslEnFQUFBwcMi8efOov27Z8p5YLHn77T5NGETF6/n5+QCwbt26t99+G6P2HpJIJKdP
+ny4oKGhoaAAAf3//4cOHJyUl2btfCCF7SktLsxyvA0BZWdnevXvffffdgemS1U6dOpWRkdHDqH3u
+3LlTpkyxYikFBQWnTp0CgICAgNjYWCtauGcdLTc9M4d1bBJUmCMWiw8cOFBYWFhdXWWhGp/Pj4kZ
+v2TJkt62n5mZuXv3LoPCyMhI3R1Ajxz5JT8//7//3d/blimKG+8RpMRMvG4byo4OWUuLrKW59eat
+y3t2F6WlAUkCQFFammDu3FGLl7gOGcx2G8R2c2M4OfVfN/qKBgRNL2RXKpVCoXDixIcsv4qK1/Pz
+83t1UuXr61NUVKRUKnsbeUul0vb2tnPnzkVHR9skai8sLNy9e7f+zi0UCvPz8zMzT69Y8XJkZCQV
+Z/eFLl4PCgoGgOrqKozae4j6xg0ICFi4cKGnpydVUlBQsHTp0uXLl48ePdreHUQI2UdZWRkAWPgc
+KCsr27ZtG3Wq7+CoeL0nI+gSiSQjI8O6kJ2K1wEgLS0NQ3Y7Mg4qdEH89u2fiMXiNWtet7rxjIyM
+jIwj3VYTCoVUtd5G7frj6zp37gh1IXtfqcVkf8brALBzxPD2ujoTfyDJogMHig4coJ45+/m9XF1j
+w+Vu2fKe5XhSIIjs+YkcQRAEQXQGwY2Nja6urpY/RHTxenBw8CuvvNLDJQEAk8n09PS8c+fOkCFD
+ev4qAIiOjj537pytovbq6uqtW7eIxWKBIDIpKSkyMlIiEVdWVmVmns7Pz3/rrXWpqR/2pX3oGq+/
+/voaLpe3bt06jNp7Ii8v78iRI3PnztX/Sh49evTo0aOnTJmSmppKPbVfBxFCdmbhE+CuyIehUOPr
+H37Y/dfN0qVLrbtjdEFBQVlZGTXw0dDQkJeXh1G73ekidV0kV1VVXV1dVVhYaHViSWbmaQBYvXrN
++PHjdYWzZj1x6NBP+tUKCwvfemtdZuZpKwbaTRKLxevWrZNIxJRly5YCwOLFS/S70TMEAAlAo+YX
+Be2dvGw4eVEPbzVg8zsSCIUiyxV4vF6kvdEIMAzZqcPbHP14/Y033uDze3eO5evrKxKJehuyMxgM
+W0XtYrF4y5b3xGJxUtKMefPmUdEzj8fz9uaPHz9++/ZPMjMz161707rGdYvQj9ep09C3334bo/Zu
+SSQSg3h9586dEolk5cqVABAQEJCSkpKamhoQEGB5LzWvKH1jSfj6ZEHvXiXM2pnjvVzvVUXpG9OL
+NI8FyXrtCbN27swWGpd3fY3hn3rci4Mwe3mCpUPu1+eIxEvbys6lDOt1811bOTSL/Hp6X9roKb0t
+xo9frrd2ndvL3BbuUf3Ov1rxxvcna3vUk93AiqVW/PZVZlt0cvJod6vatYfNmzfrJ8mEhYVRHxQI
+ACQSyY0bN6gh9ri4OE9Pz71796alpXl6evr7+/cxOR71hfGYa2RkZHV1VWbmaatDdqFQCADjx49P
+SUmprq4yN3BLtW9yyNxqkZGRQuGdoqIiAAgKCgIAK8Ibvbt36WJmAgBsGD8zOBwbVus5apzRVgiD
+xBipVOrl5WWudh/jdQDgcjnWTfVoq6g9MzNTKBTGxMSYPMt8+eV/Uee7VrRMMRmvAwCPx8OovVun
+T58OCwvTH0Iz+IE7ICAgKioqLy9v4PLaNZGgILmzSJiVA8nr1wuoxzt3phcJkgWaxyXhy9cv51Ov
+25gO2uCoKH1juih++XorA60em/5196MSAxmQd6cofWe2d/L65drNl+69Xrsp07XbuCh9484sbypG
+7W19DWFWTpFgYrKJDtxbLGyH0EeeDx3o7vTRm2/2aWzFcVCX7oSFhen/RFBbW3vp0qXeftDV1tam
+paXduHFDNyrv6ek5efJkLpd75MiRhoaGbdu2UeXU75Z30Y8Sf2Pz5s3LyDjS93RcsHWA2C0ej0eF
+UlTYY3VuD0EQJKkGtQxADTQnABqoJQAkEGygmYr0Mt+bm9m7RdC0EeN6ktxIENSDS/v2DZ85s/Tw
+4awNG5qrq/WrOSoCgOi8xkIqlXK5pk8yOjo6+hivA4Crq6vVt66gonZnZxcqalcqrbmO++zZswCg
+f6UzZcuW92bNemLWrCdsEq8DgH68TqGidtDmtdv2TPfvobS01OAn7zfffNPgi3nu3Lm67Mx+J8za
+mS6KX24wKMlP6CzhJ0wUFJUUAQAIi0uEgonaSFEwMZ6v+QMUpaeLuowII4pQJOLHT9RsS35EOF8k
+EgIAFOVkeydrt7FgYjxk5xRZU1+7mOIS0L3sHvY32w6bN29eqkcXjPaH2trazZs3b9u2jUqm72FJ
+D0ml0iNHjhg0lZqaeuTIkYKCgl41lZaWVlZWRqXIh4WFTZkyZe7cudSY+vLly/Vj9IKCAmomGaTz
+0jH6gp/pLR0m/tTSAQt+pr90jN4fy+XxeHw+XywWU/ktfZGSkjJr1hPr1q2zScd0+Hxv40Ifn85v
+NB7PuS957SSpBqAx3KcwvOcB4USSSob7I0zv+UB3JlUyq5vVR9BMXEysUih2xcWpFIqEDRssVHM0
+nWcVCoXC3FwxX3/9NRWMVlVVPf/885ZbHDdunBU7TUFBgeYruDtU1G5FWh7VvvHPT8b5RjG9n/dH
+F68DgMndVzeyTkXtA3xC7PgaGhoCAgL0S/QTY3qD+v0/vESTK8E3CJg14+HLE/jU4/qJ65MFJpJa
++AnL1ycAFKWbX5JQJOJ7TQQAENV32Xf53t5QIhIC8ItKivjhyy18nFnorV66R3y8hc5rm9INoZen
+Rj8F320sDkvcBQDw7FHy6+kA5anRYSvPA+widmmL4NfnCKqOrsQk7Us7K+qVjNMl45SnRj8FG+d/
+n7jyvKYiaNvXNt+5AvyIcNiZU5SQLACAopxsoDZT5zaltmREOP+gSAjQ6/qaDVZcAuGz+Zqckonh
+JenZQqDeZNBuXv1kGr0dQVNuXGL4/uV4ad4z/XdHLw3FXNqOrtxwFzVaguFuYFievD5Z0KUnhp3R
+bgeDOvV/7NlfGf7M015/fVUT8vyUYACA2nM/XxAymUwm03/0tAg+NFbkC51HjfB1AgB5802R3MWH
+78oAAKVMAUwmwz5fcgM5yq6bqUY3F01PSizz9PRsaGhoaGjw9PSMjY3Ny8vbtm3bypUrORxOamqq
+RCKhImzql8YepgLOmDGDOnVJSkoyuFw1ICCA+nQ9deoUFaxbdz3r39gVIXFFSFxvIY7MU7rpzRrS
+0gEvHacfLadNCOiv+8LOmzdv+/btZ8+eNR5P7JV+CiomTZpsENI4O3eJ0ZcsWVJdXW11+6RSzHBP
+cB55iKA5tV99XtVW4DLqCBAgLl2hbPnD6mb10egmTrfyUlPrS0ryUlOfPXPGQrW+sO3lpyQJJNl1
+xhhzIXtjY2PPe2kuVY7JZCoUCnOv6lXOTF8uQjVOSrHJji4WSwSCyKKiQl2J7t0yeFcEgsheXXNw
+j5BKpZyumWTGg0xcLrdnV2IVpW+E5PXrk6mHuhQKAKDGyes35hQlJHtnHSwJX75cAMKsg7qUCyov
+r0c640YQhAvS03OyJgo00Vp6EfDjAUAoEoF3uCh9407zqdame6sZ5F+vDf+KIN505007vzLs0FGS
+/JqKyp+bRX49fVjKOXKEfmJMeWp04qVtZWTKMIBfnyOiU03nwZenRoetjDpKnpsOAOWpqeWGJdFh
+0aB96fmV6+eXkeQw+PU5IpHYNW5bGUkOg/LU6LDnfjU4J+AnLF+etXPjxnTQD1pF9ULvcJPha2/r
+G7xFAMLsnPDl69fzoSh9Y/rGIn788vXr+frpTcKsnfq5N1kiEyWGBOGC9BIRAJ8Ki/lQTz0pKikS
+hCdDl/exa5qP+V1Uj+ndwHSz4YL0dO05jeZ3H+2qa7cDv0sdUWlZfdiDD3iA7j53zUUn/mwb8Uji
+CFeA28VZ5647R9/n4XG9tQPACUAuEQOTqVQBMACUKiXBZJvb8P1tIHPZdRl6uq+2npRYFhYWlpeX
+V1ZWFhsbu2jRIgCgonbqI27KlClJSUlcLpcaejcYy7DQ5vLly3fu3JmWlsblco1HtfLy8jIyMgBg
+7ty5eCmqgSPzlDMOMK4IiRkHGEfmaX7G18XrI/nkp4+p+mnRMTHjAbbn5+eLRH2dhiUlJUX3k74N
+OTs76z/19taMu4vFYpFI86FYXV3N43H70P/O1HUSSELzlLAum9qA+9ChwsJCABAVF/MjIwFA1tIS
+m5KSl5oam5JSeviwrlrfl6XPtpefUjpjXw6HI5FI3NzcjCutXr169SADPcIAACAASURBVOrVVVVV
+wcHB77zzjnWp2BKJhGM+u7/bTxClUllYWCgSCZ2dXay7UIPL5QFAXy7NtoA6SGbNekJXoju70o/j
+dTWRAWrYyfIXXm1tbc++vfidCS2CifE5O0uKkgV6AZFgYnzOwaws75Lw2boBcJFmaFYg6FHygDaW
+0+XCJK+H9I07N2ZTi48XQIm2alF6iSY2M0hyt9Rb7y4Rl2BifM5BC503Nm5bmSZAnr5627inrpbD
+dMNo/NetK2FbmSZInz7r2cT1R8pTUoxa+nXryvPPHj2nibaHpaQMK09d36Xku23fP3WkPCVlGACM
+2/Yd1eL01dvGXQLNk2Ez5o/7/mo5TB+m+e1Cbwuu1+Sjb9wZbjF/qLf1Aai4eeJ6bR1+/GyqvmBi
+fI4INE86x+WLcrKFgmTtWRA/IYFflL7RoMR4GYJwQXpJUbJAICwu8Z44Eagn2oi9KCcb4rXdFIQL
+0nOKhQl86HYX1a60md3AZLMJeu0Ii0sgfra2wc7toL8sUUkZxP1DP5+5prAYIh4Z4QoAAL5e/Ks3
+6yX33ecx6HpzKwxylbeJWYM86M0yGbDZcpWSYb+IfUBH2RctWrR3715PT8+4uLiel1hGXTZWUFBA
+ffHponb9eB2081r2/IL70aNHz507Ny0tbe/evRwORz/VsKysLC0tjWofh9iNuTl1idqpQl28vv9x
+1X1u/TXKzuPxJk2alJmZefZsfh+v1OqPgfazZ89u3brFoPCLL74AgJSUFIMsX4OJa3qCYPBU7Rfa
+r8wCxiBl4wlSLWm7nERjeCiaTpLK1tWLPGnMQYr6E2y/BWpptbzpNG/MnyYasXixql90DBWXZ23Y
+kHzgAEEQmW+95Xf//c+eOUPlsuuq9arn3bL120GAfsjOYDDM5Yiz2ex33nln7dq1VVVVa9eutS5q
+t5B40y39eH306NEWQn8LZsxI2r59e0bGkf4I2VEfhYWFnTp1ivrqMufSpUs9m+RR/1Rfl6Sih58w
+O3znQdDGvPyE5cth586N2T2b0KVL8NhJkLxee6GqMGtntnc4H0AIAJ0Z2FTMpZe2YaG39UK+l4kU
+QuPO98X5lWFE59jkOHP5wOMiuoT75cXnDUqsICwu6RINz44v2ZlTlJDs7cXPMdpCVtQH6Bzp7jnj
+bW5Yojf5j2ao39uLn15SlOwtKgGvCIG3IEck7JKuI8zWnMlpXkT93+SbLjJsXGR+NzDRLD8inE/F
+411+XeiyHTrrlOT+DmFLDYPBluLTP5czmUwmk8lisdycAYDj5HS9tRWcFO3AdOGwOVKlEhhqNY3W
+v3MpW0SNsg/MRDFhYWEGuS49KbFs8uTJVLZ6QUEB9Zm2aNEiajwiNjaWitepGyGZHC+3YMqUKXl5
+ecb3nJJIJBKJJCwsDO+Eao5+1E6VDEC8TomJGZ+ZmZmRccQBbxpoMunlzh2hs7Oz8VV51dXVvQ7Z
+CRpJqpVN/wNQAY1DEAxV0wkVABBsgs4SeGYBwVBzO5zuY6mkoGzscI6M6O0q+I0bRz0o/vHH4h9/
+7LaaoyIA9CZ5dHV1bWlpMXdCz+Px+hi1t7a2ubi4WNFNm8TrABATM57H252fn5+RkWF8YJw9e7ao
+qMhWU5bqLFnyrPGdw5CxpKSk//u//5syZYpuHN1gQL22tvbMmTM9+4YW6Wczi0TgHc4H0P+Jqiin
+xNsbDmZFaEcqdZnrpobB9WkyyNdbiuupsVEBaIIxq3oLINSkWABQufK62ZyMOm+1ccZzQpb36IXn
+i8sB+hS1G2T/6/C9vYUlnSuuy0Uv6mX9/poqRu/ETNsDapheVA/hE/kAXpBTXAS6XpjMVBeZedP5
+Ro2b3w1MJcBr43HQ/3XBYDvo6pQVR8Q+YTRFmFvE5GkC165lgwY53eyQyVTA82QBwYA2mZyuArqz
+HUP2u33GGC6XSyWx7Nu3TyqVUkG5/uA3NSgOAElJST1MjNGhsgepuF8ikUilUk9PT+ra0xs3bthw
+Lf5+DKL2gYnXASAyMpLH4wmFwr7nxtx1SJIkCBrQqR/YSQAAurPBYzqLLb+9BwBodFfTrVg0JCY6
+YMKE2txcC3UCHnxwSEy0FY0PIAJA7wpZDw+PhgZLOetU1B4cHExF7b2d9uT27ds+Pj697aOt4nUA
+4PF4q1evAYDdu3ft3r27sLAQAMRicWFh4fbtn2zduiUj40gPL4HtOYzXe4jL5a5cuTI1NVU3PqQ/
+Y0xtbe3OnTtnzJjRs9+IhbpZQ4RZB7MNZ8oQZu1Mh4nJybPDSw5mCUGTew4AAN5e3XxadpmfxEyV
+9J2dixRMjIdsaimgSSmO4GsSO7SlpnorCBdAUY6mhjCrcxIUo853aao3ps969vzKp1LNxOjlqdFE
+dGq5YbXy1NRfp6/eNm5X4nO/akueWhm1saeTwet622UFQZh1MFsoCBcAgCBc0Pl+6DZYr+tbMUWK
+IFwg7HyvhFlZRcYlpl7HjwiHkoM5ovAIvuZJTom2F11b0N8QFndRvS6Z3A3MNUtNYpReUkRtGwAT
+20FbpzhixAiDlwcGBLQUn7/aalDsNGgQtN1olDtzWQBMDhtkHXKg2+nC07+N0aNHx8bGSiSSvXv3
+7t27t6CgoKGhoba2lprOhbqNKzUbo3XtczictLS0tWvXvvHGG2lpaVS2vXV3ZbqnUFH7SD45IWCA
+4nXQ5MZMBoAjRzJ6+1pqBr9uLwClZsxzwAmmCYLQROdAUgBIg8dAAEEAQZD6kxz2HJPn/Pi33/mO
+GWOugs+oUY9/+x2T52yugnV0sxGa+9fLmVq6jrJ7eHhcvHjRcvqKwVj7Rx991MNFKRSKlpaW4cOH
+96Z/AABXr161SbxOiYyM3LTp7R07tmdkHDG4xy+Px1ux4mWbnOBWV1dTtxXQRx0wyALq8qnNmzdP
+mTIlNjY2ICBAIpFQ9+0rKCiYMWNGj38gFiSHl1DXKQIIkrvOiK6Z3lsAAAkTvTfuTPdeP9FLtFOv
+uoUwTygSQVHRRv1pZEzOK9J5WSh1waguyd1U+rXJ3gqSl4t2Usk6wI9PjufnmOt8zzYJZfqsZxMT
+tTPGTP+aPPocoUuNMTdnTNdq47aVpQybfu5oMZFI7NKWnDP1um50yf7Xz0ii1tzwMtPe1tcbbrey
+S/z45QkCgWGJqdfxI8Ihu0SztC5PzHfb0i7apUumdgNLWyNckJ4uil+uHVU3tR0E4YKDB0UJy8ON
+Fhf4wBzauZ9PH71GJcb4RyZEeAGA0yAXaJA6u7AAAJhsNrSrWPaK2C1c0NLbWRHtjkqGSUtLy8vL
+y8vL0/8Tl8s1nvilJ6iJaACAmnmGKjx16pRuelxqmpo+9/3vzM0JchZaM5F0X0yePDkj44gVdyeN
+iRmfkXEkJeX/DMr1r6zT6eOkNP2D1N4AtUtKuqn0dBqA2rplOPv6PvH9D8dfXlF18qTBn4ImTXpk
+x6fOfn7WtWyBbS8/VZMESQIhk8l1RVeuXPH29g4I8Lf8SrFY/O6773K53LVr1/ZwYbW1N+rq6saY
+P8sxp6CgQKFQREZG9j1e15eRkXH27NmiokIejxcUFBwZGZmUlNT3E9Bly5ZStyIzJygo+J6a3pHU
+UqvV+fn5kyYldPsS6t4iBQUFtbW1XC7X09OTGo7q8deM493s0pK7q7d3DYPZDO9Zf6ft8MYbbxjc
+Xs2kgICAHqbN3Lhxw9+/my+7ASCRSKjZY3SfeAEBAb35xOuirKxMN0u9LnP91KlTulOClStXmruJ
+UmZmVkxMDI1GI7SsWqG70oKf6UfLLZ2GTgggjzxpZRyfkpLC53uvWfO68QP9auvWrePxuFbck2j3
+7t0GQ5DGeDxeTEzMkiXP9jbOOXDgwIEDPxgUpqZ+6O3t/fTTCwzKlyx5trfp+JJzgQQp6f4+gAAE
+ASTB5UbX9Kp9fSqFovDbb3M2rG+vqwMAnq/vxLfWj3z6aTqL1fNG6urq/Pohvrcs8P1rqWOb2Gx2
+l5BdKpWeOXPm0Ucfse3CFApFTs7vkZGRHh4etm3Z0RQWFu7Ysd1c1C4QRE6ePMkhT3P7ixUhe5/d
+XUHw3dXbuwVuVUp/bwc1wMANtpeVle3du9dy1B4WFhYXF9fDn+McJGS3LYlEkpqayuFw5s6dq/9z
+RG1t7alTp27cuJGSkmJuYq57OWSfuK/zqlOTEoep9z/eX/M8OjKxWEzNDarD53tTYUxGRoZ+gjSP
+xxs/Pqa3qQqKus+VN7eQqnb9eR5NIQm6M2PIGqbfsl61b6zt5s28Dz4AUv3Aq6+59v4TwG4h+/3N
+LIOQHQCuXLnC4/GGD7flrYxLS8taWlqsGGJHdzsM2btzd/UWob+Pv2XI3hf3csiOUA/ZK2T/4P5m
+NpttOEYSHh5eVlbW0tJiqyW1tLTU1taGhobaqkGELOrJPI2O4+7qLUIIIYQGmloNKrXRz5oMBiMm
+JiYv70+bXFquUCjOn78QHh5u3fSOCCGEUH/AbyWE0N1CqQalccgOAB4eHqGhoefPX1AoFH1ZgEKh
+KCi4xOfzqUmIEEIIIQfh6mrNHM8IITTwVCpSpSJNXzwUGBjo7e196tRpqzNkWlpacnJ+d3Z2HmE0
++S9CCCFkX5irjRC6W6hUoFIBw9yfQ0NDPTw8cnJ+Dw4OjozsRbatQqGorKyi8teHDBlii66iux5B
+ECwWq7293dnZxncrQAgh1EcikYjH4+FpDEKOSalSEyrSbMgOAB4eHg8++GB1dfXx478JBIJu52tX
+KBT19Q3FxcVOTk73338/Zgoi3RcASZIhISGXL1+RyWT27RJCCCEDrq6u1O3JcboYhByQUqUilCpL
+ITsAuLi4jBw5sq2trbq6uqCgwNfX19PTw83NjcPhcLlchZZEIq2qqpJIJBwOZ8yYMRisIwMEQbi5
+uUVFRWnvQgxkT+6dgBBCqN9QoTmhx949QgiZoFCqCULZTchOoQL3kSNHCoXCxsbGurrbUqlUKpUy
+mUwGg8FkMjkczuDBg318fBiMHjWI7ikGdyHGYB0hhByHQeBu7+4g5LgYDLpdlqtUqgiauncRNk7/
+gnqLitF1Xwm6xwghhByE7iMa8MJchMzr7e1dbUWpUnefGINQ32GkjhBCjkz3+Ywf1Ag5IJVaTZAW
+Lz9FyFbwawAhhBwWfkQj5MhUapJQkYzbt2/buycIIYQQQgghE5RqklCTjPFb/rR3TxBCCCGEEPqb
+u7ljtlgsVqvVvXmRWK0iVXQzdz9FCCGEEEII2ZB1SWjURHsYsiOEEEIIIeSgSCBIIDBkRwghhBBC
+yEGRABiyI4QQQggh5MhwlB0hhBBCCCG76sk1qRiyI4QQQgghZB/19fW7du3Kzs42V4EEggTAWykh
+hBBCCCFkB2Kx+LvvvqusrKysrGxtbZ05c6ZxHZwxBiGEEEIIIbv5z3/+U1lZOXPmzEGDBmVnZx8+
+fNi4DglAkhiyI4QQQgghNOA2bdrU2to6adKkSZMmbdiwwdXVNTMzMz8/37gmiaPsCCGEEEII2UV8
+fLwuGea1114LCQkxrkMCYC47QgghhBBCdjBz5syoqCjdUx6P99RTTxlXI0mSJMm+huwfpDz2z1Bn
+AKisqHow9bxxhS/XJM64jwug/HZf1qtnm3TlDDZ79VPjk4e7ezozmTRCpVSJWsUHfr6w5Xy9cSOC
+8NAP5oSFeDi5sugApFgiL6+5/eKX56pkpMlerX1p2gqBW0XZtYc+uqhf/u2bSZMHcxQK6QuvZBzX
+Kx/3YEzaPwM7RA2j1p9WdrPG7n+8n+ALHY+vOnalm5oIIYQQQgiZph+vU7y8vIyr2eby00E0BfVg
+iJ/7SBN/94nhswAAQD2ILtOV+vqH/PnO9BXRfDea7Ma14r/++uuGqNnDzeWVJfE//3NY1xaI9156
++NjLY0Z5s+TNdy7/9dflogq5GqLCA09ueiSGTZjsVWXVbSWAjyev6xmJT6QHU61WM5mMWQ966v9h
+5hhnDoCkoVLV/RrLuISaQSicu6+JEEIIIYRQn5AkSUKfR9kpMpmMzePOF7heKWrVL4+fdp+HE6FU
+qhh6y2GwfQ//O2oIl6i++Fvq9+erlK5Sksaj/xYdOvrfzz4cEyv4sLrp//7QjLWvWDL5GcEgRXv9
+vg8/y2rmCVVsIFR+jPZ/r1g6OtBr9+vxUzdk3Tbqz8mTFZJHQzk87oMAulkuR473dXNitNTXu3h5
+RY7hwx8N2r8QMd4cAPnVizWmB+0RclRRge6Xapq6r4cQsh2rjzs8YBFC1rFZLnujqMHbf3D8JH8o
+KtYvXzjGg6YU1zfTfbyYusKtL0Xdx2U01Pz1f9/UnJUP10bJPsXFNcEFtU/GBE1/bOTbf2Q2Anh4
+hy6PGkQq23/9Ku2T28NFpOY3gSsy9c2PM354+ykvvvumSd4vZIoM+lOvqBe2yEI92dOG8bLLxVTh
+nGhPNsjzThbeP+chvp+PB5Q0aqp7+7qwlLL2439KAZxsskEGRPD+z0Zc23psfY22IDDqj9UuO17M
+/d6eveoV940bpr4gPO/3WZV+aVTyY8cjbz26ofU1gxX8+wje/9m4Kdonlaf/92C6Fd/i7hs3TH2k
+8OgDfdo+RnuRo4pKfuz4ZBM/bp3a/+OCM/oFA7lG7hs3TH2B37VMWPbohkuXBmDhjkW32R12j7LJ
+QQd9OO5scsAihO5FJAkkaaOQvfnGHZ6vj+8Q30Ao1vs48r6fzxXXVzcxBvt0FvpM8ecCSE98e+Gs
+3EN/VLtd5fHJd5eTogYTdIgEyAF4+vEADyat6eb1rdfcdfE6AADQijroZ2obHwtxG+LHAzAM2QE4
+l0TtoZ78mAc9QROyE7F8rlImOZpXMfjhccM8eNPZxH4ZCQCBwzycnRgd9W0nlZp4PXpc5MezQvxd
+WUwaIZPLy67VPbM932Asf9L0mB3xg31dmKRSdbup9d2v/jh0Q9qnjdhrYg+Qt+hnBhFiZ6B7mq3v
+gG4dyi59YQ5/PlTpnWYEvzHZufTH4zXg9NWao83tEfbrXv8IjPpjdVhL+po1mks/xi3YklzHNzxv
+6QGZFw049D725uLdspFrjmxbc0IKAOCf9OqKEVd3fJBxAwCgWjq2a8WBXCOZFw1K09fs6byKxz/p
+1RVfJF9/wMpw8O6l+zgy+lxyBDY76KAPx51NDliE0L3LNiG7Ghpr6sUjfXmzvdmpIk3OeuykQA8O
+cTWvhDZqsK5m+P18NyeGvL3511vOxlko1+UNr7z1NkPtWgRBADBtCBeAvF1dW6M27qfTB1/89zRL
+XC4bDOBu9Ffif5dF/xjB5/vxAa4DAIDf4EHsjub6k0rXyJttYV4+Tzzmt//nWwAw5UFvLkDNzRoh
+AAA8/8+EtbFeTFJxu6biTrP8vtDgyPDAkxt4D2/I1EXtdLbzsumDOlrrC/+64T44eIiP+0evTuG+
+c3K/SGbUE3vRG//TDfsFRv2xevD/Tre9MNkPAKDwvF/BkLoF2seaby9TL+wvnEu5laVzHkuOO/u9
+bqA0jj8RSr/I9WuG4Oe3jLi29dilGpO9ct+4YerQEz8uOKP5Pq7a/+OCM7oR+kvQOSjb/qUDjfm5
+b1wS5py7443fx2ZrLgNprE4v/SF52MbAqvU1wfs/Gwe6YeO4CXULIOXF3O+7jDFTq+O+ccPUWV4A
+8Yl1ntR7Z907fj+1kSG66xh2ofk27aRZFrGPOrwkvBSgCSVj92my8Nw3bngACql1bP9y69Whq3W7
+jW5gtf3L020vTNZsTPPlJtfXoH3DfUmi0PUEAKQFmaXHEwZHpTddAnPvZvD+z0Zc239r6oKwEKoP
+/b1/dr8b6K8jgO63C1NH1qWe7xWBUX+sDtNNV6b9PWTAV7+bgw7MvO8m+2l03JleR7111/u86nrA
+IoTuRW1tbdevX5fL5T2sz+fzwdaTPDJ+KhZG+IbOeDww9asyquj5GE+aUvLr8cakUZ31ogVuTgDi
+jo58tcnRBuff2nS13X15TADF9WrTo9flsqBy8xFydm61ZNYIZzfXQIAagPhpQ1wYtFs3a4RAZBXV
+z4/yCx7mA3ALABIDnAE6LvxeSwKDwfZ/OdqDoRb/+unOPTWsFjXhw2xJWfHi2EDPvUvCHt2tWTU6
+g9lUc/HN7f+rVHK59GPLFi18ZOSQlCWj928928vt1k/cN26Y+kJj+prU8wAwbtGW4xvg0Q2XLhFi
+Z3B+wff3NWs+hnGLtySPq6MdW7PmY/BPenXFyI2BVdQXUmLpjjWpNwDAP3HN8Q1R/RuoKWqzSmHp
+/cFwRvMdNv/++6D02F4F6A3XmezVn4Wl9S9QL/RnOdfXC/zdAZrG+TrXl16siYsvmVyXvmbXeQAY
+9+yW1ROumsoXinaqjWAJDQqL5fxzHQH9tb6BgxO96y//11UbOgCAe/bvP68531HQHgEg9gAA3ZFB
+lwCAJwDETThuuDonD32wI2LVihFXd3zwEwsgxNp3XLORDcew/3eRatPczmCHTWeWzIvmPGtkyY41
+H98ATkF7wnua3SZ4/2fjBLk71mTcAP/HX17xAMA1T7BQbm7nN2jf8vg955KSAYTEBcDsuwliD3Ce
+soD1zZo1XwKMW7zlhSVRh9b351HW/W6gv47gn/TqCnNHFnj1+CMieP/qMIl2YHvc4i3JCybMP5P7
+/cCvfjcHnZlPS9P9/LPrcXe/mXXUrbvuV5dbXV9oPMyEEELdsNm87IePV/x7YvCQQD8PKGsEAHAf
+5cURN9SmizlJetWcCDUAkEC0mm5Gn4wGJAAoSSaAotvaBpqU9aIW2VB3TgKb2Ccj54wcxNTG5Xl/
+VrXPDnfzdA8EqAG3ABeWQtJ+slQNAMlzQrxY9Iaq8s3l/tTQfpHcV/rtlW/fSBgaMkS7akCqJce/
+vfiLJJgEAPAR7s4bv+VxLx/3eL2rXQeEx6xVc2Z1KbkGABA4OJFfmr61cZ90LABkf5U+clvyG3GX
+5t0CACi9UruvdSz8Xrk4eThQj692LAC3Mf4AQ8Jf4Jd+857rPtlYABh06MfRa59/I+7SvDNGS7YZ
+973Hcmf/+z5tbkxwckR97ke11fpfaXGme7X0ZhOEs6MAYIibsL4+ks8FgEg+3L4sb6ZLAGilrWP3
+AcDvh+A85IGJexNQ8aV+6NnvQac/dwg0pVVyuhQqQvZZ3sFNrU51u6cQIEwVvE8qsf4d145uasew
+3TfOm6DO/Wpzhbu5zU7tDHbYdBbVX732aevYZv2iOP6U+tx3D7ruk42Fq/muuaFvTLBcbml9TbRv
+WvD++UPrf/+hELpJgChNP7CzdWw1QHZBafI89jiA/v4Fo9vdQLeOg240rRhh5siyuJW6uvjVmnSQ
+aga2swtKk4czdGl7A7r6lg86c8fOGZP95OzSP+7MrWMcfwqUfvH72H0KacH7awIVEQCcS11eiBBC
+vWDjWynVietqGyQR3i7zvdmfimQjxwd58WgV50tvkl2yGpVKssezsqjVfZrAhUpn95ia4L3vN/EY
+b45CIqbi8hZl440myShf3mxv9l7w9nBmSW43Z6tYABDvyyYAlEyv156J0zVEI2hqpZrNZY0BOAUA
+AAqp9KReYk+VTFLfLnf3ZOlf7Tog6nO1Gb0A1OCYHwCAP3dIvehXqSbqrZbSr9XD/f7ucAsA6q/d
+cAcAUHAlUF9HPVYzFQAMGkT5cQGGPPPh8Gf0lnHb3x2gHxNzqytuFNRP0OTGxPHj6iv+VdFlCCrK
+33Svmn+qKH0yfBwA8Mnrl5p9p7hEAQz1Kv0jjwOQm/vwwrWfDV1r4vLELvRDz4EIOmkqAJpE3ctX
+/dnd6lj7jhuISo55gch99yD7ktrsZtftDAO96Sy6fVPeDF1isih/F6jv+K+MAwCg9vvvjaY3gGax
+3Nz6yky2rzNm/py6+XrPS9OXHjJbWUeiCKkGAIBqNQNA1U1tG+h+N9CtY3Oe2SMr6glzW8mYe3br
+2K4XfV7T/W1AV9/yQWfu2OlRP02vY5S/C9TfOasAAM6l9rH33rXICKF+YbOQnSR5J6ubInwCkh7x
++XT/9ecneDGUkqO/3iahyyQPlwtuyyb4M5044QAl3TTZImyTDXZ2HhLoCmesGJYgjl28PWMEf+gw
+D4+Lrj6ubMntm1RcDsA7f0c8ytdlyhTvMpmXE5DXaq5RYchQFzYA+PoHzPY3ao/BCOx8Qmvrktjj
+JCcBgOB7EVDe+55aTz+jl8rxpYpVAIy2zmqsDgAaQWUR0To6J5/XfwwA4EKQBmcBANAki4Du4o8+
+Uct/Kan/5P5gOFM1//776kvOnOyaNGW2VwqXa/VukYHuwG8oPdNy3zzvcYEQUN+6UwEAxOb314ym
+UT9Vz6lbYClfVhdrDkTQeauxHkKHBnYObwMAgHtUYNMlC+m8iu5Wx9p3vIvAqC8mu5b+ePG/Mj/o
+2c4woJvOIgVpuIu6ECSQTN24eLP2+nVL5abX19Nk+zq6y0/HLd6SPLw0/cvGX2QOmPbQ/W7QuY6K
+DnNHlvmtFGjUniaQvU3lII1bvCXZTjfbtnzQmT12mIbtmGB6HV0IsmubCCHUNyQBJGHDz1Dih0NX
+n4sOCB4WyIC2WF+euKH2x3aeQaWS0psS6WgPZ+50b3aJiYs12cfefiSIqT74659v5tSfu90W5ecy
+OMgfwHjudYifFvvVdB9RXf2crbm3THUo988b0rkCDy/PuAkq/bgcAH79vfapKD+/AO9/gCsdOvJO
+3gFgA4BI3AHerNLsb/ccKzZqj3MSzKWxOrHpNABVXXUbgAPMlXCrsd7LezhArua5e4AXCOsaAAZb
+fBkU1jVAvP9tKgFj4HBOnquoTxk8P9D1/yLqC1INRyjN96rteAn5dPTgwdC8TtE2vN4tMhpoJUV5
+QNcNbmV/ueY80z/p1RWJ0e7rzU+HPHARZ9W1gvroh6LdQb8zgYO/WD21wtKvASZXR+/wsfYd1+O+
+cUlYYGn6k7l+VDjbw53B7sG6OYV1DSDwiAIhNcYZ5ecB0NhN+XXvZgAAIABJREFUuVU7v+7y0+wv
+18ALW5K3uZ65myZaNcn8kdXzrRTHn1Kfu+ODjCuyiF9kY0HB2DIAHTfJ8kFn9tjpwe3yzKxjYV0D
+xLvrtYkQQjbQ17uf6rvefqOuUezs7vLcaH9PHq32qmFWDACIVc1nbzQCOD25cJTx6cIwQdgwd5YL
+V3XzQi0A7P3hr3alytPPd6m/8RAXsSJmkAuLyZLVmQvEWpSiO81SDo+3KFQXl2sUlF5vE8tdB7kL
+BrHlYknWbU1frrXIAOjO/g/sax2r+3eE/c8177776qp/6c4/mBz2CL0brzLY3p4uTKVMVnSntxkP
+/aPqWkF90OYXg6ln81+Mi67P/S6v+5Hy5rwzufVBmzdo758bN6Hus8c2Gg+f2VpzZf6vpfclJ7EC
+Ss98UGnYT/O94py82RA9OYJZci0P2krryYdGBglvyps1dSbMB6iWjt3nPjnYq76kwORp3YBTyz/4
+Lpc5eeofybqB2OD9qyMCS9O/OgcAjXX1MCaKeuPcN04dqqnS7epY+47rRCXHvOBdmv5lo+4SPXvt
+DLbSnHcmF0Z+odnOwW8kuHdf3rf1rZaO3fZlein4pWreCDPv5l3A7JHVi61EV4CX/+3Wsb/IOBAY
+9cf8oQAeQ+2y/1g+6Ppy7JhZx+a8ilIImh4HABCV/FidtnGEELIOlctuy5CdJJ1/vdZIY3BeSPZn
+abJijHH/syuvVa7yDwk4uHCEftTOc/H95pmhPBoIrxX+LHECgKr2239cE9EYnFUvxye46NclVixM
+eGCws0re+uPuc+anQ+dcrpeweNyRfK68Xfy/250tiFXSa00SFofn68JsbxLlaTMxfsooaleqfAMD
+XhmqG2JhfL4sZBCNJq+/phvqJ2icpS+N1TZHfPBSxCAGvelW9SnT0+AMOLX8g/d35PqOq/tsTt1n
+c1J9c3e8f/GnnlzBqyA2v78jlxZ2/LM5dZ/NqVvglLtj26Hafu8vqP12FpTGCYJKC25fMj7rMd+r
+5ryKUgDhTXkzcK4IYYg3lcgOcO6b9FK/VKr+6oim9E+NzwTshHOp7OK6NemSyVOpd6eOmr1EEyu3
+ffJ+emkE9cbFeGXlam4CbHp1GrJK6vnxiXUvBlv/jmu4zx/pCjA8edsL2l7N+WOml312BltREJvf
+T2/TbOdh7bmlUN94rZvyvq5vtbRxfXopRI6rezHY7Lt5NzB7ZPV8K/2Znl4atFmz07Jy16SXgvtQ
+44TDgWDxoOv1saN33JlbR0Xt+h25IQvm1H025/jkuvQ9Fw1fiBBCvUf4Lk/ry+u/fnVqYoh70Z/Z
+U78RAkDkYJ/DbzzEpRHt9dcnrf/zBkkAwP82JQq8GEf3n3zujAQACKLt+ZiQ1+Y/5MyitbZ1lNxo
+vNGmDrvPI9SLy2FA8+3y1VtP/SLzotofxq7/7NW5giGepFJVW9966Xor04U3xt+N78Ik5ZKzR358
+6TTnttFYvk7ihOGfPTWKBdB442rsu1f0p6l59ZkHUh4IIEB1+fTxR9I1ufIsWvPWZx6eExNEqBQl
+VY1XG5Vjh3sHurHk7aJ3Nh/6qtUDgPvXfx724TCARtwRteRXtQ0N9gr35ijaRe+9k/5Fi1dfNmYv
+NcW71jW3R3TGuLS6fzhLL7dS10tJo5yLR1NnZOrBh9v9mjUVmmo0L9F/eVO8a6V23gO9FwKnQL/9
+fsWsXMhpqpaO1ZuITb+H5nrV2fNB7OKZbKdszepDEOdCvDYZtWuzjqAp3rUySPdEFvGLjGP0J06B
+1D2Qo3lDTa7OIHbxTLYUFCH7pO7WvuNUYTBwdZtXv1dgn53Bsi4rBdSKD5Lp3mLD1QwCAOAUjF5w
+fGrrnLcqcsFCucndzKB9fab+xKxcyGnSvikm3039w42qD7r9tl90vxsYr4jZI8vMVtI129m+3k7r
+nt3qHti5yw3s6uutUZDuSZeDztSxY/5t0j/uzKwjtc1vuWvKNWvX9YBFCN2LSrc80tt52aP3tj/O
+rWYw2TYO2Vk0afbbyUHunPKzJ+P3tVCj7AYhOwC40Rse5hPLF/wj0M+T48SiAahVSnF7S2Huya9O
+38mUDu7oXIJylFPtoikPTZsw0oXHYTHoAKRc1tFwq+rg/sPposGlSq6F7rkx2Gf+M92DTejH5ZTI
+wX6/vDmBA9Ldb/+8tq5zAD6QdWPB+Kj508e7uXAZNEKplLeIrn/96U/fNAU2kgQVsntAa/aZmzET
+Ilw5TFKlaBLW6FVACDmAuAl1C1y01+m6b9w4ddbVHx76nt5srtze/UUIIfS3Z13IPpNji5A93Kky
+htVU1DHsvNwVAABU47lXRzBkRR1Dz8vdqDrjOMUCpjJfElaidNK9kEFIBGxREKPFlaagAahJeqPa
+pULuXaZwNUqnIf2Y9cNZDT40qROhBiA6SHatwuOqzKeR7DaxR/ywc/lgGnlJOqxA0eVyIhatMdG5
+yhXYOe3hVV0TWjwYDaPYwiF0KQNIJcm8qfT8q2NwiyYc70jglfHB+bycO4It9KIpSJJRq/TSq4AQ
+cgDMyrVznl8xwYN6dvP3HZsOuf4i45gtRwghhPqZPUN2hBByTJo8BADomghhrhwhhBDqV9aF7P9w
+qmaw2HaaKBchhPqZ9pauPS1HCCGEHBEJQNp0xhiEEEIIIYSQjWHIjhBCCCGEkMOy/bzsCCGEEEII
+IVvCxBiEEEIIIYQcH4bsCCGEEEIIOTQM2RFCCCGEEHJoGLIjhBBCCCHk0DBkRwghhBBCyEGRJEmS
+JIbsCCGEEEIIOSwSAEN2hBBCCCGEHBU1ys7430sR9u4JQgghhBBCyCSSBDVj6NChpBZoA3nt30m7
+9g8hhBBCCKG7CUEQugfUY0JLLpdb0yKpBiAZVBO6qJ16DADUY9v1HyGEEEIIob8/XaQOevF6H9tk
+0Gg03Wg6Fa9TjeIQO0IIIYQQQr2lP9AONonaSWDoN6o/so4hO0IIIYQQQr2lH53rR+19aZOha0g/
+K8ZgYQghhBBCCKFeMciQsb4hEhhg6lQAcJQdIYQQQgih3jOIzm0yDs4w1wqOsiOEEEIIIdRHfQ2q
+SUKTy04NqBs0h6PsCCGEEEII9ZbJGL1vgTthmBgD2mAdR9kRQgghhBCyjm1jaUZ/LwAhhBBCCCFk
+JZIEkmTgLOwIIYQQQgj1n75NF0OCbpQdR9YRQgghhBByNCSoAdQ0e3cDIYQQQgghZAGJITtCCCGE
+EEIOikYAjQAM2RFCCCGEEHJQdBrQaQSG7AghhBBCCDkoOo3AkB0hhBBCCCHHRacRdDomxiCEEEII
+IeSwCJIg8PJThBBCCCGEHJcaQIUhO0IIIYQQQg4L52VHCCGEEELIoakB1Ax7dwIhhBBCCCFkmlot
+VyoBQ3aEEEIIIYQclFIhI0kcZUcIIYQQQshRKZQyklRhyI4QQgghhJCDUik7SDUDQ3aEEEIIIYQc
+lFIpp9ExMQYhhBBCCCFHpVYrAfDyU4QQQgghhBwVqVaqCQzZEUIIIYQQclQqlYrAUXaEEEIIIYQc
+FgkYsiOEEEIIIeTA6DSCRiNo9u4GQgghhBBCyDSCAAzZEUIIIYQQclx0GkGj0zBkRwghhBBCyFER
+QAPAkB0hhBBCCCFHRZJqksSQHSGEEEIIIQdFkiSQePdThBBCCCGEHJWaJAk1jrIjhBBCCCHksEgg
+MTEGIYQQQgghx0USADjJI0IIIYQQQg6LJIAkbJnL3nqr9tSZym8utfzVIJMBABChnpxZUfwnp470
+G+RkwwV1SyGu/+Vg0X3jR0UPdx/I5fZW4/Wa7Pzqby61FLfIW5UkABHgzor2d1v0YMjYUQF3y+nU
+n79kPXFcBAAAvDOfTQ+2Rx/Uipp/rjz3/+zdeXwTZf4H8O8kaZs2vdL0pielact9lPsUUVlOgQUX
+XHddwGNZXVf47aJ7euy6uirIqriuwurqgoKAVkAQRBSKIC039KSld9o0TdI2ac6Z3x+TpGmb9EpL
+I3zeL1680snMM888edp855nvPHPcwhFRhCzs8PN3xrhaa/+HRx461UhERKKPfjktQVMyZWc5ERH5
+7ntixqSB7i2l5y6+caxiT0mLkUgoEg4JCX7/+TmJ/b5by9WTl7afrtlf3tJo4YQi4diEwIczE+6Z
+le7Tdj3W3JR7/Npr39V+ozBaiYmX+v9yatyyu0YE+7jtqorLF+a+VVRLlBgfceDpWbK275p19Ye/
+uPrv85pzapOVKFjiOzkueP28ESNTw/vjOHtNU3btvlevXbJwRPTGyonLpie4W/P8oRMLsxRWop78
+LgxY+7PmplNHLr97TnW82mAk8vMVjYkL2jArdUpmolf98em0/dnrOZffz67JKm2uNXH8l87qyV00
+CwDAD01fhuwt32SdfeJoXa2Fc1rIFav0/zh249VvK/88L3Xt3OE34S8oazZcyr74+KcVxSaffRP7
+f3+913J8z5kHv1Ia2yzkKtTGCnXd3st1QwYVbvvFBHls0ABV7wdG4BN//4T846caiUipaiy4UBsz
+OqrdOqy5KutiM/86KjIkbUREy4mSm11R98q+z5n7Xmmj/UerxWoIEAX2805Zc/07//r+mTydY4nV
+Yj1boj1bcnnq5fo3H50SZY97WHP9a1tOv1zSYl+Rq1Drf7+/8P3L6o/Xz4hyHR5p935VWetm1/q6
+67/afPGQ1upY0qgzHS6oP1zw7TOL5A/dlD8X3aPdsa/kUpu/bK5pyq49dbDW2uV6Tgaw/Vlz/T82
+ndpS1voXyGiynC5RLy85u6qg7vn7xwf05ED6Uyftz36X9e3yQ0qnNueKVfrf7y98O0f54aNTh0T6
+36xKAgD0qz5LjGnZ+/6J+w/V1rr5VrNaLH/Jyn91/+W+2FcXyk5f/NGu8mJT19+vA6plz/ZvV7aP
+19sormpY+PrJiyXqm1ep3pq0aFbN1uU1W5fXDNAQOxERCYYPCZPYXlsOFlV3XKM8V3FMx/KvfzEh
+OpooefpEe80XD/gQ+7k8JR+vSySBR/84t2brsi9/OV7WxUYeYr/99KJzvOgsO6/mtU8vsvY1vztw
+2SlebFVQpnxu1zm24xtkOfnp+RcKXWxCRETa93bkOcfrTqzPZF3/vsBbev6Z/RfcH4Uz9TsfFXcn
+sncygO3PfrnrnHO87oTbkV3+hdeczXbS/mXfn3uwTbzu9JZC/df9lwz9WjMAgJuIYfoiZD9/KOfX
+Z2zfvX6+/u+uGlHw8pKarcsLnp32xiSpn20tbsuXZefLtJ7v7hZw/lDOEzm24VShSPTbO5PPPvuj
+mq3Lq7YsPPFQ+qpBtjZr1DY/8vGFWrOrr2PoIGnSoLsktv6893tlRfv32SvFDfbgyG/6sEE3sWrd
+wlpt0V54mH90bBCRIDhU0vkmHjKoS7ecsEXGidHSr56aU7N12bnHh84OEfILPzihKDWz/JqvHFPx
+C2ePjL348pLyl+e8lhnML9mbXXOpsrnNsZib9v/v+E++dB1OEZG6uGKnPQ5LS5R989Scmq3LTq5O
+SRMxRERk2nvpRt8daO/VXru00f1ROGG/y7roJgJ2awDbn6jqgzO2P0HBIYH7H59RtXX5xSeH2XfN
+br9c4w3xbuft7zjLJRL+fcnQki3Lyl++4+8jbZemDucoS9Q9+0QAALyVgGEEnibGsOaKt76q4/+k
+BocEZz05I81+LTI4ImbZz6JiQ20XLq2Wlj05pWMSRztt25R7/NqbZ+r4TMpgie+cwaGPzBnWLpO1
+9MQZPuE4MT7iwNPTqo6fe+lbBZ/NOXZw6NOtmZfqF//+7ZYKk30705ItR4loembCrtWOFJk2aaN+
+vqJZySFrp6a0y910Ss5uk+KsKrg8f0t+GRE5pVTu2X7wsRwdET0xN+1HgbrHvqgp1lmjgv033pOy
+8o6Mji1mUJdssbeYUOT30UMTpo2I5t8S+IiHjBnx8vC44e989/srOiIqq1Dt+Sp/3dyhjioJRYHf
+vHpPitN18JoL5+/5d7GSiEjwnwcnz50Qyy9vrC7b80XRW/mNFTqrUCQcmxD860kJM6fJnRJky1es
+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
+"
+ style="image-rendering:optimizeSpeed"
+ preserveAspectRatio="none"
+ height="212.02832"
+ width="219.69937" />
+ <path
+ style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker5274-8-6-7-5)"
+ d="m 595.90413,398.08621 10e-6,-33.39285"
+ id="path5272-7-4-2-4"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0" />
+ <path
+ style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker5302-0-9-7-7-6)"
+ d="M 534.72767,365.82626 420.30501,434.93302"
+ id="path5270-0-9-2-0-53"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0" />
+ <path
+ style="display:inline;fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1;marker-end:url(#marker5302-0-9-7-7-6-8)"
+ d="m 228.84532,348.8328 12.46187,49.84749"
+ id="path5270-0-9-2-0-53-2"
+ inkscape:connector-type="polyline"
+ inkscape:connector-curvature="0" />
+ <flowRoot
+ xml:space="preserve"
+ id="flowRoot4230-55"
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ transform="translate(-20.16739,-91.254775)"><flowRegion
+ id="flowRegion4232-1"><rect
+ id="rect4234-5"
+ width="188.57143"
+ height="34.285721"
+ x="521.42859"
+ y="205.21935" /></flowRegion><flowPara
+ id="flowPara4236-68"
+ style="font-size:22.5px">multi-area web</flowPara></flowRoot> <flowRoot
+ transform="matrix(0.11890794,-0.99290529,0.99290529,0.11890794,-227.17711,1076.0558)"
+ xml:space="preserve"
+ id="flowRoot4230-8-8"
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ inkscape:transform-center-y="0.6888992"
+ inkscape:transform-center-x="3.4259773"><flowRegion
+ id="flowRegion4232-46-4"><rect
+ id="rect4234-30-1"
+ width="176.59036"
+ height="20.865274"
+ x="521.42859"
+ y="205.21935" /></flowRegion><flowPara
+ id="flowPara4236-6-4"
+ style="font-size:15px">direct read and control</flowPara></flowRoot> <g
+ id="g19871"
+ transform="translate(0,87.233115)">
+ <rect
+ y="320.43707"
+ x="175.52585"
+ height="182.54306"
+ width="239.18793"
+ id="rect4881"
+ style="fill:#bcd35f;fill-opacity:1;stroke:#445016;stroke-width:1.8534621;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <flowRoot
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="flowRoot4230-3"
+ xml:space="preserve"
+ transform="translate(-328.31553,121.72999)"><flowRegion
+ id="flowRegion4232-81"><rect
+ y="205.21935"
+ x="521.42859"
+ height="139.6452"
+ width="279.20322"
+ id="rect4234-6" /></flowRegion><flowPara
+ style="font-size:22.5px"
+ id="flowPara4236-3">multi-area control:</flowPara><flowPara
+ id="flowPara4910"
+ style="font-size:22.5px">- contours</flowPara><flowPara
+ id="flowPara4912"
+ style="font-size:22.5px">- sub-runs</flowPara><flowPara
+ id="flowPara4914"
+ style="font-size:22.5px">- file/vcs sensors</flowPara><flowPara
+ id="flowPara4916"
+ style="font-size:22.5px">- events</flowPara></flowRoot> <rect
+ y="446.1608"
+ x="176.39276"
+ height="55.511982"
+ width="236.7756"
+ id="rect4598-37"
+ style="fill:#d3bc5f;fill-opacity:1;stroke:none;stroke-width:2;stroke-linejoin:round;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" />
+ <flowRoot
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ id="flowRoot4230-6-7-1-4"
+ xml:space="preserve"
+ transform="translate(-358.53963,247.54394)"><flowRegion
+ id="flowRegion4232-8-9-2-1"><rect
+ y="205.21935"
+ x="521.42859"
+ height="52.412083"
+ width="264.47556"
+ id="rect4234-36-4-9-7" /></flowRegion><flowPara
+ style="font-size:17.5px;text-align:center;text-anchor:middle"
+ id="flowPara4236-0-4-9-8">configs and custom automation</flowPara></flowRoot> </g>
+ <flowRoot
+ xml:space="preserve"
+ id="flowRoot19887"
+ style="font-style:normal;font-weight:normal;font-size:40px;line-height:125%;font-family:sans-serif;letter-spacing:0px;word-spacing:0px;fill:#000000;fill-opacity:1;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1"
+ transform="translate(-24.923747,28.32244)"><flowRegion
+ id="flowRegion19889"><rect
+ id="rect19891"
+ width="704.66223"
+ height="84.967316"
+ x="55.511982"
+ y="19.159592" /></flowRegion><flowPara
+ id="flowPara19893">Megatest Full System Architecture</flowPara></flowRoot> </g>
+</svg>
Index: docs/manual/megatest_manual.html
==================================================================
--- docs/manual/megatest_manual.html
+++ docs/manual/megatest_manual.html
@@ -783,201 +783,183 @@
<div id="content">
<div class="sect1">
<h2 id="_preface">Preface</h2>
<div class="sectionbody">
<div class="paragraph"><p>This book is organised as three sub-books; getting started, writing tests and reference.</p></div>
+<div class="listingblock">
+<div class="title">License</div>
+<div class="content monospaced">
+<pre> 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/>.</pre>
+</div></div>
</div>
</div>
<div class="sect1">
<h2 id="_why_megatest">Why Megatest?</h2>
<div class="sectionbody">
<div class="paragraph"><p>The Megatest project was started for two reasons, the first was an
immediate and pressing need for a generalized tool to manage a suite
-of regression tests and the second was the fact that the author had
-written or maintained several such tools at different companies over
-the years and it seemed a good thing to have a single open source
-tool, flexible enough to meet the needs of any team doing continuous
-integrating and or running a complex suite of tests for release
-qualification.</p></div>
+of regression tests and the second was the fact that I had written or
+maintained several such tools at different companies over the years. I
+thought a single open source tool, flexible enough to meet the needs
+of any team doing continuous integrating and or running a complex
+suite of tests for release qualification would solve some problems for
+me and for others.</p></div>
+<div class="literalblock">
+<div class="content monospaced">
+<pre>-- Matt Welland, original author of the Megatest tool suite.</pre>
+</div></div>
</div>
</div>
<div class="sect1">
<h2 id="_megatest_design_philosophy">Megatest Design Philosophy</h2>
<div class="sectionbody">
-<div class="paragraph"><p>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.</p></div>
+<div class="paragraph"><p>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.</p></div>
<div class="ulist"><ul>
<li>
<p>
-Self-checking -Repeatable strive for directed or self-checking test
- as opposed to delta based tests
-</p>
-</li>
-<li>
-<p>
-Traceable - environment variables, host OS and other possibly influential
- variables are captured and kept recorded.
-</p>
-</li>
-<li>
-<p>
-Immutable - once this test is run it cannot be easily overwritten or
- accidentally modified.
-</p>
-</li>
-<li>
-<p>
-Repeatable - this test result can be recreated in the future
-</p>
-</li>
-<li>
-<p>
-Relocatable - the testsuite or automation area can be checked out and the tests run anywhere
-</p>
-</li>
-<li>
-<p>
-Encapsulated - the tests run in self-contained directories and all inputs
- and outputs to the process can be found in the run areas.
-</p>
-</li>
-<li>
-<p>
-Deployable - anyone on the team, at any site, at any time can run the flow
+Self-checking - make it as easy as possible to write self-checking
+ tests (as opposed to using deltas, i.e. tests that compare with a
+ previous measurement to deterine PASS/FAIL).
+</p>
+</li>
+<li>
+<p>
+Traceable - environment variables, host OS and other possibly
+ influential variables are captured and kept recorded.
+</p>
+</li>
+<li>
+<p>
+Immutable - once a test is run it cannot be easily overwritten or
+ modified accidentally.
+</p>
+</li>
+<li>
+<p>
+Repeatable - test results can be recreated in the future using all
+ the original variables.
+</p>
+</li>
+<li>
+<p>
+Relocatable - the testsuite or automation area can be checked out
+ and the tests run anywhere in the disk hierarchy.
+</p>
+</li>
+<li>
+<p>
+Encapsulated - the tests run in self-contained directories and all
+ inputs and outputs to the process can be found in the run areas.
+</p>
+</li>
+<li>
+<p>
+Deployable - a testsuite is self-contained and can be bundled with
+ a software project and easily used by others with little to no
+ setup burden.
</p>
</li>
</ul></div>
</div>
</div>
<div class="sect1">
<h2 id="_megatest_architecture">Megatest Architecture</h2>
<div class="sectionbody">
+<div class="sect2">
+<h3 id="_data_separation">Data separation</h3>
<div class="paragraph"><p>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
+plain text config files. All system state is stored in an sqlite3
+database.</p></div>
+</div>
+<div class="sect2">
+<h3 id="_distributed_compute">Distributed Compute</h3>
+<div class="paragraph"><p>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.</p></div>
-</div>
-</div>
-<div class="sect1">
-<h2 id="_road_map">Road Map</h2>
-<div class="sectionbody">
-<div class="paragraph"><p>Note 1: This road-map is still evolving and subject to change without notice.</p></div>
-<div class="sect2">
-<h3 id="_architecture_refactor">Architecture Refactor</h3>
-<div class="sect3">
-<h4 id="_goals">Goals</h4>
-<div class="olist arabic"><ol class="arabic">
-<li>
-<p>
-Reduce load on the file system. Sqlite3 files on network filesystem can be
- a burden.
-</p>
-</li>
-<li>
-<p>
-Reduce number of servers and frequency of start/stop. This is mostly an
- issue of clutter but also a reduction in "moving parts".
-</p>
-</li>
-<li>
-<p>
-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.
-</p>
-</li>
-<li>
-<p>
-Reduce number of processes involved in managing running tests.
-</p>
-</li>
-</ol></div>
-</div>
-<div class="sect3">
-<h4 id="_changes_needed">Changes Needed</h4>
-<div class="olist arabic"><ol class="arabic">
-<li>
-<p>
-ACID compliant db will be on /tmp and synced to megatest.db with a five
- second max delay.
-</p>
-</li>
-<li>
-<p>
-Read/writes to db for processes on homehost will go direct to /tmp
- megatest.db file.
-</p>
-</li>
-<li>
-<p>
-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.
-</p>
-</li>
-<li>
-<p>
-Db syncs rely on the target db file timestame minus some margin.
-</p>
-</li>
-<li>
-<p>
-Since bulk reads do not use the server we can switch to simple RPC for the
- network transport.
-</p>
-</li>
-<li>
-<p>
-Test running manager process extended to manage multiple running tests.
-</p>
-</li>
-</ol></div>
-</div>
-</div>
-<div class="sect2">
-<h3 id="_current_items">Current Items</h3>
-<div class="sect3">
-<h4 id="_ww05_migrate_to_inmem_db">ww05 - migrate to inmem-db</h4>
-<div class="olist arabic"><ol class="arabic">
-<li>
-<p>
-Switch to inmem db with fast sync to on disk db’s [DONE]
-</p>
-</li>
-<li>
-<p>
-Server polls tasks table for next action
-</p>
-<div class="olist loweralpha"><ol class="loweralpha">
-<li>
-<p>
-Task table used for tracking runner process [DONE]
-</p>
-</li>
-<li>
-<p>
-Task table used for jobs to run
-</p>
-</li>
-<li>
-<p>
-Task table used for queueing runner actions (remove runs, cleanRunExecute, etc)
-</p>
-</li>
-</ol></div>
-</li>
-</ol></div>
-<div class="paragraph"><p>shifting, note that the preceding blank line is needed.</p></div>
+sqlite3 database. Megatest has been used with the Intel Netbatch and
+lsf (also known as openlava) batch systems and it should be
+straightforward to use it with other similar systems.</p></div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_overview">Overview</h2>
+<div class="sectionbody">
+<div class="sect2">
+<h3 id="_stand_alone_megatest_area">Stand-alone Megatest Area</h3>
+<div class="paragraph"><p>A single, stand-alone, Megatest based testsuite or "area" is
+sufficient for most validation, automation and build problems.</p></div>
+<div class="imageblock">
+<div class="content">
+<img src="megatest-stand-alone-area.png" alt="Static">
+</div>
+</div>
+<div class="paragraph"><p>Megatest is designed as a distributed or decoupled system. This means
+you can run the areas stand-alone with no additional
+infrastructure. I.e. there are no databases, web servers or other
+centralized resources needed. However as your needs grow you can
+integrate multiple areas into a bigger system.</p></div>
+<div class="sect3">
+<h4 id="_component_descriptions">Component Descriptions</h4>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+Multi-area dashboard and xterm. A gui (the dashboard) is usually the
+ best option for controlling and launching runs but all operations
+ can also be done from the commandline. Note: The not yet released
+ multi-area dashboard replaces the old dashboard for browsing and
+ controlling runs but for managing a single area the old dashboard
+ works very well.
+</p>
+</li>
+<li>
+<p>
+Area/testsuite. This is your testsuite or automation definition and
+ consists of the information in megatest.config, runconfigs.config
+ and your testconfigs along with any custom scripting that can’t be
+ done with the native Megatest features.
+</p>
+</li>
+<li>
+<p>
+If your testsuite or build automation is too large to run on a
+ single instance you can distribute your jobs into a compute server
+ pool. The only current requirements are password-less ssh access and
+ a network filesystem.
+</p>
+</li>
+</ol></div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_full_system_architecture">Full System Architecture</h3>
+<div class="imageblock">
+<div class="content">
+<img src="megatest-system-architecture.png" alt="Static">
+</div>
</div>
</div>
</div>
</div>
<div class="sect1">
@@ -993,14 +975,14 @@
</div>
</div>
<div class="sect1">
<h2 id="_getting_started">Getting Started</h2>
<div class="sectionbody">
-<div class="openblock">
+<div class="listingblock">
<div class="title">Getting started with Megatest</div>
-<div class="content">
-<div class="paragraph"><p>Creating a testsuite or flow and your first test or task.</p></div>
+<div class="content monospaced">
+<pre>Creating a testsuite or flow and your first test or task.</pre>
</div></div>
<div class="paragraph"><p>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.</p></div>
<div class="sect2">
@@ -1100,10 +1082,290 @@
<div class="content monospaced">
<pre>dashboard -rows 24</pre>
</div></div>
</div>
</div>
+</div>
+<div class="sect1">
+<h2 id="_study_plan">Study Plan</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Megatest is an extensive program with a lot to learn. Following are some paths through the material to smooth the learning path.</p></div>
+<div class="sect2">
+<h3 id="_basic_concepts_suggest_you_pick_these_up_on_the_way">Basic Concepts (suggest you pick these up on the way)</h3>
+<div class="ulist"><ul>
+<li>
+<p>
+Components of automation; run, test, iteration
+</p>
+</li>
+<li>
+<p>
+Selectors; target, runname, and testpatt
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="_running_testsuites_or_automation">Running Testsuites or Automation</h3>
+<div class="ulist"><ul>
+<li>
+<p>
+Using the dashboard gui (recommended)
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+Using the "Runs" panel.
+</p>
+</li>
+<li>
+<p>
+Using the "Run Control" panel.
+</p>
+</li>
+<li>
+<p>
+Using a test control panel
+</p>
+</li>
+<li>
+<p>
+The Right Mouse Button menu
+</p>
+</li>
+<li>
+<p>
+Debug features
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+xterm
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+pstree
+</p>
+</li>
+<li>
+<p>
+log files; mt_copy.log, mt_launch.log
+</p>
+</li>
+<li>
+<p>
+variables; megatest.csh, megatest.sh
+</p>
+</li>
+<li>
+<p>
+testconfig dump, *testconfig
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+State/status buttons
+</p>
+</li>
+<li>
+<p>
+Run, Clean, KillReq
+</p>
+</li>
+<li>
+<p>
+ReRunClean
+</p>
+</li>
+</ul></div>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+Using the command line
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+Getting help; megatest -h, megatest -manual
+</p>
+</li>
+<li>
+<p>
+Starting runs; megatest -run
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+Selection controls; -target, -runname and -testpatt
+</p>
+</li>
+</ul></div>
+</li>
+</ul></div>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="_writing_tests_and_flows">Writing Tests and Flows</h3>
+<div class="ulist"><ul>
+<li>
+<p>
+environment variables (table 5)
+</p>
+</li>
+<li>
+<p>
+tests/<em>testname</em>/testconfig <a href="megatest_manual.html#_the_testconfig_file">testconfig details</a>
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+ezsteps and logpro section
+</p>
+</li>
+<li>
+<p>
+iteration (one test applied to many inputs), items, itemstable <a href="megatest_manual.html#_iteration">test iteration</a>
+</p>
+</li>
+<li>
+<p>
+dependencies, waiton, itemmatch, itemwait <a href="megatest_manual.html#_requirements_section">test requirements</a>
+</p>
+</li>
+<li>
+<p>
+miscellaneous; mode toplevel, runtimelim, skip on file, no file, script or on running, waiver propagation
+</p>
+</li>
+</ul></div>
+</li>
+<li>
+<p>
+megatest areas
+</p>
+<div class="ulist"><ul>
+<li>
+<p>
+megatest.config
+</p>
+</li>
+<li>
+<p>
+runconfigs.config
+</p>
+</li>
+<li>
+<p>
+config language features; include, shell, system, scheme, rp|realpath, getenv, get, rget, scriptinc <a href="megatest.html#_config_file_helpers">config file helpers</a>
+</p>
+</li>
+</ul></div>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="_advanced_topics">Advanced Topics</h3>
+<div class="ulist"><ul>
+<li>
+<p>
+Removing and keeping runs selectively <a href="megatest_manual.html#_managing_old_runs">managing runs</a>
+</p>
+</li>
+<li>
+<p>
+Subruns <a href="megatest_manual.html#_nested_runs">nested runs</a>
+</p>
+</li>
+<li>
+<p>
+Config file features <a href="megatest_manual.html#_config_file_helpers">config file features</a>
+</p>
+</li>
+<li>
+<p>
+HTML output with -generate-html
+</p>
+</li>
+<li>
+<p>
+Triggers, post run, state/status
+</p>
+</li>
+<li>
+<p>
+MTLOWESTLOAD
+</p>
+</li>
+<li>
+<p>
+flexilauncher
+</p>
+</li>
+<li>
+<p>
+env delta and testconfig
+</p>
+</li>
+<li>
+<p>
+capturing test data, extracting values from logpro and using them for pass/fail
+</p>
+</li>
+<li>
+<p>
+mtutil, postgres connection, packets for cross-site/cross-user control (e.g. mcrun).
+</p>
+</li>
+</ul></div>
+</div>
+<div class="sect2">
+<h3 id="_maintenance_and_troubleshooting">Maintenance and Troubleshooting</h3>
+<div class="ulist"><ul>
+<li>
+<p>
+cleanup-db, database structure of Megatest 1.6x
+</p>
+</li>
+<li>
+<p>
+archiving
+</p>
+</li>
+<li>
+<p>
+homehost management
+</p>
+</li>
+<li>
+<p>
+show-runconfig
+</p>
+</li>
+<li>
+<p>
+show-config
+</p>
+</li>
+<li>
+<p>
+show with -debug 0,9
+</p>
+</li>
+<li>
+<p>
+load management
+</p>
+</li>
+</ul></div>
+</div>
+</div>
</div>
<div class="sect1">
<h2 id="_writing_tests">Writing Tests</h2>
<div class="sectionbody">
<div class="sect2">
@@ -1190,10 +1452,26 @@
<div class="content monospaced">
<pre>bup -d /path/to/bup/archive ftp</pre>
</div></div>
</div>
</div>
+</div>
+<div class="sect2">
+<h3 id="_pass_data_from_test_to_test">Pass Data from Test to Test</h3>
+<div class="listingblock">
+<div class="title">To save the data call archive save within your test:</div>
+<div class="content monospaced">
+<pre>megatest -archive save</pre>
+</div></div>
+<div class="listingblock">
+<div class="title">To retrieve the data call archive get using patterns as needed</div>
+<div class="content monospaced">
+<pre># Put the retrieved data into /tmp
+DESTPATH=/tmp/$USER/$MT_TARGET/$MT_RUN_NAME/$MT_TESTNAME/$MT_ITEMPATH/my_data
+mkdir -p $DESTPATH
+megatest -archive get -runname % -dest $DESTPATH</pre>
+</div></div>
</div>
<div class="sect2">
<h3 id="_submit_jobs_to_host_types_based_on_test_name">Submit jobs to Host Types based on Test Name</h3>
<div class="listingblock">
<div class="title">In megatest.config</div>
@@ -1324,18 +1602,79 @@
</div>
</div>
<div class="sect1">
<h2 id="_reference">Reference</h2>
<div class="sectionbody">
+<div class="sect2">
+<h3 id="_megatest_use_modes">Megatest Use Modes</h3>
+<table class="tableblock frame-topbot grid-all"
+style="
+width:80%;
+">
+<caption class="title">Table 2. Base commands</caption>
+<col style="width:20%;">
+<col style="width:40%;">
+<col style="width:40%;">
+<thead>
+<tr>
+<th class="tableblock halign-center valign-top" >Use case </th>
+<th class="tableblock halign-left valign-top" > Megatest command </th>
+<th class="tableblock halign-left valign-top" > mtutil</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-center valign-top" ><p class="tableblock">Start from scratch</p></td>
+<td class="tableblock halign-left valign-top" ><p class="tableblock monospaced">-rerun-all</p></td>
+<td class="tableblock halign-left valign-top" ><p class="tableblock monospaced">restart</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-center valign-top" ><p class="tableblock">Rerun non-good completed</p></td>
+<td class="tableblock halign-left valign-top" ><p class="tableblock monospaced">-rerun-clean</p></td>
+<td class="tableblock halign-left valign-top" ><p class="tableblock monospaced">rerunclean</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-center valign-top" ><p class="tableblock">Rerun all non-good and not completed yet</p></td>
+<td class="tableblock halign-left valign-top" ><p class="tableblock monospaced">-set-state-status KILLREQ; -rerun-</p></td>
+<td class="tableblock halign-left valign-top" ><p class="tableblock monospaced">clean</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-center valign-top" ><p class="tableblock">killrerun</p></td>
+<td class="tableblock halign-left valign-top" ><p class="tableblock monospaced">Continue run</p></td>
+<td class="tableblock halign-left valign-top" ><p class="tableblock monospaced">-run</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-center valign-top" ><p class="tableblock">resume</p></td>
+<td class="tableblock halign-left valign-top" ><p class="tableblock monospaced">Remove run</p></td>
+<td class="tableblock halign-left valign-top" ><p class="tableblock monospaced">-remove-runs</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-center valign-top" ><p class="tableblock">clean</p></td>
+<td class="tableblock halign-left valign-top" ><p class="tableblock monospaced">Lock run</p></td>
+<td class="tableblock halign-left valign-top" ><p class="tableblock monospaced">-lock</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-center valign-top" ><p class="tableblock">lock</p></td>
+<td class="tableblock halign-left valign-top" ><p class="tableblock monospaced">Unlock run</p></td>
+<td class="tableblock halign-left valign-top" ><p class="tableblock monospaced">-unlock</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-center valign-top" ><p class="tableblock">unlock</p></td>
+<td class="tableblock halign-left valign-top" ><p class="tableblock monospaced">killrun</p></td>
+<td class="tableblock halign-left valign-top" ><p class="tableblock monospaced">-set-state-status KILLREQ; -kill-run</p></td>
+</tr>
+</tbody>
+</table>
+</div>
<div class="sect2">
<h3 id="_config_file_helpers">Config File Helpers</h3>
<div class="paragraph"><p>Various helpers for more advanced config files.</p></div>
<table class="tableblock frame-topbot grid-all"
style="
width:80%;
">
-<caption class="title">Table 2. Helpers</caption>
+<caption class="title">Table 3. Helpers</caption>
<col style="width:14%;">
<col style="width:28%;">
<col style="width:28%;">
<col style="width:28%;">
<thead>
@@ -1415,17 +1754,38 @@
<pre>[items]
A a b c
B d e f</pre>
</div></div>
<div class="paragraph"><p>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).</p></div>
-<div class="sect3">
-<h4 id="_disk_space_checks">Disk Space Checks</h4>
+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).</p></div>
+<div class="paragraph"><p>Wildcards and regexes in Targets</p></div>
+<div class="listingblock">
+<div class="content monospaced">
+<pre>[a/2/b]
+VAR1 VAL1
+
+[a/%/b]
+VAR1 VAL2</pre>
+</div></div>
+<div class="paragraph"><p>Will result in:</p></div>
+<div class="listingblock">
+<div class="content monospaced">
+<pre>[a/2/b]
+VAR1 VAL2</pre>
+</div></div>
+<div class="paragraph"><p>Can use either wildcard of "%" or a regular expression:</p></div>
+<div class="listingblock">
+<div class="content monospaced">
+<pre>[/abc.*def/]</pre>
+</div></div>
+</div>
+<div class="sect2">
+<h3 id="_disk_space_checks">Disk Space Checks</h3>
<div class="paragraph"><p>Some parameters you can put in the [setup] section of megatest.config:</p></div>
<div class="listingblock">
<div class="content monospaced">
<pre># minimum space required in a run disk
minspace 10000000
@@ -1435,21 +1795,21 @@
# script that takes path as parameter and returns number of bytes available:
free-space-script check-space.sh</pre>
</div></div>
</div>
-<div class="sect3">
-<h4 id="_trim_trailing_spaces">Trim trailing spaces</h4>
+<div class="sect2">
+<h3 id="_trim_trailing_spaces">Trim trailing spaces</h3>
<div class="listingblock">
<div class="content monospaced">
<pre>[configf:settings trim-trailing-spaces yes]</pre>
</div></div>
</div>
+<div class="sect2">
+<h3 id="_job_submission_control">Job Submission Control</h3>
<div class="sect3">
-<h4 id="_job_submission_control">Job Submission Control</h4>
-<div class="sect4">
-<h5 id="_submit_jobs_to_host_types_based_on_test_name_2">Submit jobs to Host Types based on Test Name</h5>
+<h4 id="_submit_jobs_to_host_types_based_on_test_name_2">Submit jobs to Host Types based on Test Name</h4>
<div class="listingblock">
<div class="title">In megatest.config</div>
<div class="content monospaced">
<pre>[host-types]
general nbfake
@@ -1463,11 +1823,10 @@
launcher bsub
# if defined and not "no" flexi-launcher will bypass launcher unless
# there is no host-type match.
flexi-launcher yes</pre>
</div></div>
-</div>
<div class="sect4">
<h5 id="_host_types">host-types</h5>
<div class="paragraph"><p>List of host types and the commandline to run a job on that host type.</p></div>
<div class="listingblock">
<div class="title">host-type ⇒ launch command</div>
@@ -1489,10 +1848,19 @@
<div class="listingblock">
<div class="title">In megatest.config</div>
<div class="content monospaced">
<pre>[setup]
reruns 5</pre>
+</div></div>
+<div class="paragraph"><p>Replace the default blacklisted environment variables with user supplied
+list.</p></div>
+<div class="paragraph"><p>Default list: USER HOME DISPLAY LS_COLORS XKEYSYMDB EDITOR MAKEFLAGS MAKEF MAKEOVERRIDES</p></div>
+<div class="paragraph"><div class="title">Add a "bad" variable "PROMPT" to the variables that will be commented out</div><p>in the megatest.sh and megatest.csh files:</p></div>
+<div class="listingblock">
+<div class="content monospaced">
+<pre>[setup]
+blacklistvars USER HOME DISPLAY LS_COLORS XKEYSYMDB EDITOR MAKEFLAGS PROMPT</pre>
</div></div>
</div>
<div class="sect4">
<h5 id="_run_time_limit">Run time limit</h5>
<div class="listingblock">
@@ -1524,10 +1892,43 @@
<div class="listingblock">
<div class="content monospaced">
<pre>[setup]
nodot</pre>
</div></div>
+</div>
+<div class="sect2">
+<h3 id="_capturing_test_data">Capturing Test Data</h3>
+<div class="paragraph"><p>In a test you can capture arbitrary variables and roll them up in the
+megatest database for viewing on the dashboard or web app.</p></div>
+<div class="listingblock">
+<div class="title">In a test as a script</div>
+<div class="content monospaced">
+<pre>$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</pre>
+</div></div>
+<div class="paragraph"><p>Alternatively you can use logpro triggers to capture values and inject them
+into megatest using the -set-values mechanism:</p></div>
+<div class="listingblock">
+<div class="title">Megatest help related to -set-values</div>
+<div class="content monospaced">
+<pre>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)</pre>
+</div></div>
</div>
<div class="sect2">
<h3 id="_dashboard_settings">Dashboard settings</h3>
<div class="listingblock">
<div class="title">Runs tab buttons, font and size</div>
@@ -1542,11 +1943,11 @@
<h3 id="_database_settings">Database settings</h3>
<table class="tableblock frame-topbot grid-all"
style="
width:70%;
">
-<caption class="title">Table 3. Database config settings in [setup] section of megatest.config</caption>
+<caption class="title">Table 4. Database config settings in [setup] section of megatest.config</caption>
<col style="width:14%;">
<col style="width:28%;">
<col style="width:28%;">
<col style="width:28%;">
<thead>
@@ -1563,16 +1964,10 @@
<td class="tableblock halign-left valign-top" ><p class="tableblock monospaced">Prevent concurrent access issues</p></td>
<td class="tableblock halign-left valign-top" ><p class="tableblock monospaced">yes|no or not defined</p></td>
<td class="tableblock halign-left valign-top" ><p class="tableblock monospaced">Default=no, may help on some network file systems, may slow things down also.</p></td>
</tr>
<tr>
-<td class="tableblock halign-center valign-top" ><p class="tableblock">daemonize</p></td>
-<td class="tableblock halign-left valign-top" ><p class="tableblock monospaced">Daemonize the server on start</p></td>
-<td class="tableblock halign-left valign-top" ><p class="tableblock monospaced">yes|no or not defined</p></td>
-<td class="tableblock halign-left valign-top" ><p class="tableblock monospaced">Default=no</p></td>
-</tr>
-<tr>
<td class="tableblock halign-center valign-top" ><p class="tableblock">faststart</p></td>
<td class="tableblock halign-left valign-top" ><p class="tableblock monospaced">All direct file access to sqlite db files</p></td>
<td class="tableblock halign-left valign-top" ><p class="tableblock monospaced">yes|no or not defined</p></td>
<td class="tableblock halign-left valign-top" ><p class="tableblock monospaced">Default=yes, suggest no for central automated systems and yes for interactive use</p></td>
</tr>
@@ -1633,29 +2028,72 @@
<div class="listingblock">
<div class="content monospaced">
<pre>runscript main.csh</pre>
</div></div>
</div>
+</div>
+<div class="sect2">
+<h3 id="_iteration">Iteration</h3>
+<div class="listingblock">
+<div class="title">Sections for iteration</div>
+<div class="content monospaced">
+<pre># full combinations
+[items]
+A x y
+B 1 2
+
+# Yields: x/1 x/2 y/1 y/2
+
+# tabled
+[itemstable]
+A x y
+B 1 2
+
+# Yields x/1 y/2</pre>
+</div></div>
+<div class="listingblock">
+<div class="title">Or use files</div>
+<div class="content monospaced">
+<pre>[itemopts]
+slash path/to/file/with/items
+# or
+space path/to/file/with/items</pre>
+</div></div>
+<div class="listingblock">
+<div class="title">File format for / delimited</div>
+<div class="content monospaced">
+<pre>key1/key2/key3
+val1/val2/val2
+...</pre>
+</div></div>
+<div class="listingblock">
+<div class="title">File format for space delimited</div>
+<div class="content monospaced">
+<pre>key1 key2 key3
+val1 val2 val2
+...</pre>
+</div></div>
</div>
<div class="sect2">
<h3 id="_requirements_section">Requirements section</h3>
<div class="listingblock">
<div class="title">Header</div>
<div class="content monospaced">
<pre>[requirements]</pre>
</div></div>
-<div class="sect3">
-<h4 id="_wait_on_other_tests">Wait on Other Tests</h4>
+</div>
+<div class="sect2">
+<h3 id="_wait_on_other_tests">Wait on Other Tests</h3>
<div class="listingblock">
<div class="content monospaced">
<pre># A normal waiton waits for the prior tests to be COMPLETED
# and PASS, CHECK or WAIVED
waiton test1 test2</pre>
</div></div>
</div>
-<div class="sect3">
-<h4 id="_mode">Mode</h4>
+<div class="sect2">
+<h3 id="_mode">Mode</h3>
<div class="paragraph"><p>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</p></div>
<div class="listingblock">
<div class="content monospaced">
<pre>[requirements]
@@ -1675,11 +2113,10 @@
<div class="content monospaced">
<pre>[requirements]
mode itemmatch</pre>
</div></div>
</div>
-</div>
<div class="sect2">
<h3 id="_overriding_enviroment_variables">Overriding Enviroment Variables</h3>
<div class="paragraph"><p>Override variables before starting the test. Can include files (perhaps generated by megatest -envdelta or similar).</p></div>
<div class="listingblock">
<div class="content monospaced">
@@ -1697,95 +2134,156 @@
<h3 id="_itemmap_handling">Itemmap Handling</h3>
<div class="paragraph"><p>For cases were the dependent test has a similar but not identical
itempath to the downstream test an itemmap can allow for itemmatch
mode</p></div>
<div class="listingblock">
+<div class="title">example for removing part of itemmap for waiton test (eg: item <span class="monospaced">foo-x/bar</span> depends on waiton’s item <span class="monospaced">y/bar</span>)</div>
<div class="content monospaced">
<pre>[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/</pre>
+</div></div>
+<div class="listingblock">
+<div class="title">example for removing part of itemmap for waiton test (eg: item <span class="monospaced">foo/bar/baz</span> in this test depends on waiton’s item <span class="monospaced">baz</span>)</div>
+<div class="content monospaced">
+<pre># ## 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 .*/</pre>
+</div></div>
+<div class="listingblock">
+<div class="title">example replacing part of itemmap for (eg: item <span class="monospaced">foo/1234</span> will imply waiton’s item <span class="monospaced">bar/1234</span>)</div>
+<div class="content monospaced">
+<pre>#
# ## 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/</pre>
+</div></div>
+<div class="listingblock">
+<div class="title">example for backreference (eg: item <span class="monospaced">foo23/thud</span> will imply waiton’s item <span class="monospaced">num-23/bar/thud</span></div>
+<div class="content monospaced">
+<pre>#
+# ## 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/</pre>
+</div></div>
+<div class="listingblock">
+<div class="title">example multiple itemmaps</div>
+<div class="content monospaced">
+<pre># 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</pre>
</div></div>
-<div class="sect3">
-<h4 id="_complex_mappings">Complex mappings</h4>
-<div class="paragraph"><p>Complex mappings can be handled with the [itemmap] section</p></div>
+</div>
+<div class="sect2">
+<h3 id="_complex_mapping">Complex mapping</h3>
+<div class="paragraph"><p>Complex mappings can be handled with a separate [itemmap] section (instead if an itemmap line in the [requirements] section)</p></div>
+<div class="paragraph"><p>Each line in an itemmap section starts with a waiton test name followed by an itemmap expression</p></div>
+<div class="listingblock">
+<div class="title">eg: The following causes waiton test A item <span class="monospaced">bar/1234</span> to run when our test’s <span class="monospaced">foo/1234</span> item is requested as well as causing waiton test B’s <span class="monospaced">blah</span> item to run when our test’s <span class="monospaced">stuff/blah</span> item is requested</div>
+<div class="content monospaced">
+<pre>[itemmap]
+A foo/ bar/
+B stuff/</pre>
+</div></div>
+</div>
+<div class="sect2">
+<h3 id="_complex_mapping_example">Complex mapping example</h3>
<div class="imageblock">
<div class="content">
<img src="complex-itemmap.png" alt="complex-itemmap.png">
</div>
</div>
-<div class="paragraph"><p>Example:</p></div>
-<div class="olist arabic"><ol class="arabic">
-<li>
-<p>
-Request to run D/1/res
-</p>
-</li>
-<li>
-<p>
-Megatest uses rule "(\d+)/res" → "\1/aa" to create item C/1/aa from D/1/res
-</p>
-</li>
-<li>
-<p>
-Full list to be run is now: D/1/res, C/1/aa
-</p>
-</li>
-<li>
-<p>
-Megatest uses rule "(\d+)/aa" → "aa/\1" to create item A/aa/1
-</p>
-</li>
-<li>
-<p>
-Full list to be run is now: D/1/res, C/1/aa, A/aa/1
-</p>
-</li>
-</ol></div>
+<div class="paragraph"><p>We accomplish this by configuring the testconfigs of our tests C D and E as follows:</p></div>
<div class="listingblock">
-<div class="title">Testconfig for Test C</div>
+<div class="title">Testconfig for Test E has</div>
<div class="content monospaced">
<pre>[requirements]
-waiton A B
-
-[itemmap]
-A (\d+)/aa aa/\1
-B (\d+)/bb</pre>
+waiton C
+itemmap (\d+)/res \1/bb</pre>
</div></div>
<div class="listingblock">
-<div class="title">Testconfig for Test D</div>
+<div class="title">Testconfig for Test D has</div>
<div class="content monospaced">
<pre>[requirements]
waiton C
itemmap (\d+)/res \1/aa</pre>
</div></div>
<div class="listingblock">
-<div class="title">Testconfig for Test E</div>
+<div class="title">Testconfig for Test C has</div>
<div class="content monospaced">
<pre>[requirements]
-waiton C
-itemmap (\d+)/res \1/bb</pre>
+waiton A B
+
+[itemmap]
+A (\d+)/aa aa/\1
+B (\d+)/bb bb/\1</pre>
+</div></div>
+<div class="listingblock">
+<div class="title">Testconfigs for Test B and Test A have no waiton or itemmap configured</div>
+<div class="content monospaced">
+<pre></pre>
</div></div>
+<div class="olist arabic"><div class="title">Walk through one item — we want the following to happen for testpatt <span class="monospaced">D/1/res</span> (see blue boxes in complex itemmaping figure above):</div><ol class="arabic">
+<li>
+<p>
+eg from command line <span class="monospaced">megatest -run -testpatt D/1/res -target mytarget -runname myrunname</span>
+</p>
+</li>
+<li>
+<p>
+Full list to be run is now: <span class="monospaced">D/1/res</span>
+</p>
+</li>
+<li>
+<p>
+Test D has a waiton - test C. Test D’s itemmap rule <span class="monospaced">itemmap (\d+)/res \1/aa</span> → causes <span class="monospaced">C/1/aa</span> to run before <span class="monospaced">D/1/res</span>
+</p>
+</li>
+<li>
+<p>
+Full list to be run is now: <span class="monospaced">D/1/res</span>, <span class="monospaced">C/1/aa</span>
+</p>
+</li>
+<li>
+<p>
+Test C was a waiton - test A. Test C’s rule <span class="monospaced">A (\d+)/aa aa/\1</span> → causes <span class="monospaced">A/aa/1</span> to run before <span class="monospaced">C/1/aa</span>
+</p>
+</li>
+<li>
+<p>
+Full list to be run is now: <span class="monospaced">D/1/res</span>, <span class="monospaced">C/1/aa</span>, <span class="monospaced">A/aa/1</span>
+</p>
+</li>
+<li>
+<p>
+Test A has no waitons. All waitons of all tests in full list have been processed. Full list is finalized.
+</p>
+</li>
+</ol></div>
+</div>
+<div class="sect2">
+<h3 id="_itemstable">itemstable</h3>
+<div class="paragraph"><p>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.</p></div>
</div>
-<div class="sect3">
-<h4 id="_dynamic_flow_dependency_tree">Dynamic Flow Dependency Tree</h4>
+<div class="sect2">
+<h3 id="_dynamic_flow_dependency_tree">Dynamic Flow Dependency Tree</h3>
<div class="listingblock">
<div class="title">Autogeneration waiton list for dynamic flow dependency trees</div>
<div class="content monospaced">
<pre>[requirements]
# With a toplevel test you may wish to generate your list
@@ -1792,31 +2290,31 @@
# of tests to run dynamically
#
waiton #{shell get-valid-tests-to-run.sh}</pre>
</div></div>
</div>
-<div class="sect3">
-<h4 id="_run_time_limit_2">Run time limit</h4>
+<div class="sect2">
+<h3 id="_run_time_limit_2">Run time limit</h3>
<div class="listingblock">
<div class="content monospaced">
<pre>[requirements]
runtimelim 1h 2m 3s # this will automatically kill the test if it runs for more than 1h 2m and 3s</pre>
</div></div>
</div>
-<div class="sect3">
-<h4 id="_skip">Skip</h4>
+<div class="sect2">
+<h3 id="_skip">Skip</h3>
<div class="paragraph"><p>A test with a skip section will conditional skip running.</p></div>
<div class="listingblock">
<div class="title">Skip section example</div>
<div class="content monospaced">
<pre>[skip]
prevrunning x
# rundelay 30m 15s</pre>
</div></div>
</div>
-<div class="sect3">
-<h4 id="_skip_on_still_running_tests">Skip on Still-running Tests</h4>
+<div class="sect2">
+<h3 id="_skip_on_still_running_tests">Skip on Still-running Tests</h3>
<div class="listingblock">
<div class="content monospaced">
<pre># 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
@@ -1824,35 +2322,51 @@
[skip]
prevrunning x</pre>
</div></div>
</div>
-<div class="sect3">
-<h4 id="_skip_if_a_file_exists">Skip if a File Exists</h4>
+<div class="sect2">
+<h3 id="_skip_if_a_file_exists">Skip if a File Exists</h3>
<div class="listingblock">
<div class="content monospaced">
<pre>[skip]
fileexists /path/to/a/file # skip if /path/to/a/file exists</pre>
</div></div>
</div>
-<div class="sect3">
-<h4 id="_skip_if_test_ran_more_recently_than_specified_time">Skip if test ran more recently than specified time</h4>
+<div class="sect2">
+<h3 id="_skip_if_a_file_does_not_exist">Skip if a File Does not Exist</h3>
+<div class="listingblock">
+<div class="content monospaced">
+<pre>[skip]
+filenotexists /path/to/a/file # skip if /path/to/a/file does not exist</pre>
+</div></div>
+</div>
+<div class="sect2">
+<h3 id="_skip_if_a_script_completes_with_0_status">Skip if a script completes with 0 status</h3>
+<div class="listingblock">
+<div class="content monospaced">
+<pre>[skip]
+script /path/to/a/script # skip if /path/to/a/script completes with 0 status</pre>
+</div></div>
+</div>
+<div class="sect2">
+<h3 id="_skip_if_test_ran_more_recently_than_specified_time">Skip if test ran more recently than specified time</h3>
<div class="listingblock">
<div class="title">Skip if this test has been run in the past fifteen minutes and 15 seconds.</div>
<div class="content monospaced">
<pre>[skip]
rundelay 15m 15s</pre>
</div></div>
</div>
-<div class="sect3">
-<h4 id="_disks">Disks</h4>
+<div class="sect2">
+<h3 id="_disks">Disks</h3>
<div class="paragraph"><p>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.</p></div>
</div>
-<div class="sect3">
-<h4 id="_controlled_waiver_propagation">Controlled waiver propagation</h4>
+<div class="sect2">
+<h3 id="_controlled_waiver_propagation">Controlled waiver propagation</h3>
<div class="paragraph"><p>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</p></div>
<div class="paragraph"><p>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)</p></div>
<div class="listingblock">
<div class="content monospaced">
@@ -1871,11 +2385,10 @@
# This builtin rule is applied if a <waivername>.logpro file exists
# logpro diff %file1% %file2% | logpro %waivername%.logpro %waivername%.html</pre>
</div></div>
</div>
-</div>
<div class="sect2">
<h3 id="_ezsteps">Ezsteps</h3>
<div class="listingblock">
<div class="title">Example ezsteps with logpro rules</div>
<div class="content monospaced">
@@ -1887,18 +2400,124 @@
;; 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/)</pre>
</div></div>
<div class="paragraph"><p>To transfer the environment to the next step you can do the following:</p></div>
<div class="listingblock">
+<div class="title">Propagate environment to next step</div>
<div class="content monospaced">
<pre>$MT_MEGATEST -env2file .ezsteps/${stepname}</pre>
</div></div>
+</div>
+<div class="sect2">
+<h3 id="_scripts">Scripts</h3>
+<div class="listingblock">
+<div class="title">Specifying scripts inline (best used for only simple scripts)</div>
+<div class="content monospaced">
+<pre>[scripts]
+loaddb #!/bin/bash
+ sqlite3 $1 <<EOF
+ .mode tabs
+ .import $2 data
+ .q
+ EOF</pre>
+</div></div>
+<div class="paragraph"><p>The above snippet results in the creation of an executable script
+called "loaddb" in the test directory. NOTE: every line in the script
+must be prefixed with the exact same number of spaces. Lines beginning
+with a # will not work as expected. Currently you cannot indent
+intermediate lines.</p></div>
+<div class="listingblock">
+<div class="title">Full example with ezsteps, logpro rules, scripts etc.</div>
+<div class="content monospaced">
+<pre># You can include a common file
+#
+[include #{getenv MT_RUN_AREA_HOME}/global-testconfig.inc]
+
+# Use "var" for a scratch pad
+#
+[var]
+dumpsql select * from data;
+sepstr .....................................
+
+# NOT IMPLEMENTED YET!
+#
+[ezsteps-addendum]
+prescript something.sh
+postscript something2.sh
+
+# Add additional steps here. Format is "stepname script"
+[ezsteps]
+importdb loaddb prod.db prod.sql
+dumpprod dumpdata prod.db "#{get var dumpsql}"
+diff (echo "prod#{get var sepstr}test";diff --side-by-side \
+ dumpprod.log reference.log ;echo DIFFDONE)
+
+[scripts]
+loaddb #!/bin/bash
+ sqlite3 $1 <<EOF
+ .mode tabs
+ .import $2 data
+ .q
+ EOF
+
+dumpdata #!/bin/bash
+ sqlite3 $1 <<EOF
+ .separator ,
+ $2
+ .q
+ EOF
+
+# Test requirements are specified here
+[requirements]
+waiton setup
+priority 0
+
+# Iteration for your test is controlled by the items section
+# The complicated if is needed to allow processing of the config for the dashboard when there are no actual runs.
+[items]
+THINGNAME [system generatethings.sh | sort -u]
+
+# Logpro rules for each step can be captured here in the testconfig
+# note: The ;; after the stepname and the leading whitespace are required
+#
+[logpro]
+inputdb ;;
+ (expect:ignore in "LogFileBody" < 99 "Ignore error in comments" #/^\/\/.*error/)
+ (expect:warning in "LogFileBody" = 0 "Any warning" #/warn/)
+ (expect:required in "LogFileBody" > 0 "Some data found" #/^[a-z]{3,4}[0-9]+_r.*/)
+
+diff ;;
+ (expect:ignore in "LogFileBody" < 99 "Ignore error in comments" #/^\/\/.*error/)
+ (expect:warning in "LogFileBody" = 0 "Any warning" #/warn/)
+ (expect:error in "LogFileBody" = 0 "< or > indicate missing entry" (list #/(<|>)/ #/error/i))
+ (expect:error in "LogFileBody" = 0 "Difference in data" (list #/\s+\|\s+/ #/error/i))
+ (expect:required in "LogFileBody" > 0 "DIFFDONE Marker found" #/DIFFDONE/)
+ (expect:required in "LogFileBody" > 0 "Some things found" #/^[a-z]{3,4}[0-9]+_r.*/)
+
+# NOT IMPLEMENTED YET!
+#
+## Also: enhance logpro to take list of command files: file1,file2...
+[waivers]
+createprod{target=%78/%/%/%} ;;
+ (disable:required "DIFFDONE Marker found")
+ (disable:error "Some error")
+ (expect:waive in "LogFileBody" < 99 "Waive if failed due to version" #/\w+3\.6.*/)
+
+# test_meta is a section for storing additional data on your test
+[test_meta]
+author matt
+owner matt
+description Compare things
+tags tagone,tagtwo
+reviewed never</pre>
+</div></div>
</div>
<div class="sect2">
<h3 id="_triggers">Triggers</h3>
-<div class="paragraph"><p>In your testconfig triggers can be specified</p></div>
+<div class="paragraph"><p>In your testconfig or megatest.config triggers can be specified</p></div>
<div class="listingblock">
+<div class="title">Triggers spec</div>
<div class="content monospaced">
<pre>[triggers]
# Call script running.sh when test goes to state=RUNNING, status=PASS
RUNNING/PASS running.sh
@@ -1907,26 +2526,95 @@
RUNNING/ running.sh
# Call script onpass.sh any time status goes to PASS
PASS/ onpass.sh</pre>
</div></div>
-<div class="paragraph"><p>Scripts called will have; test-id test-rundir trigger, added to the commandline.</p></div>
+<div class="paragraph"><p>Scripts called will have; test-id test-rundir trigger test-name item-path state status event-time, added to the commandline.</p></div>
<div class="paragraph"><p>HINT</p></div>
<div class="paragraph"><p>To start an xterm (useful for debugging), use a command line like the following:</p></div>
<div class="listingblock">
+<div class="title">Start an xterm using a trigger for test completed.</div>
<div class="content monospaced">
<pre>[triggers]
COMPLETED/ xterm -e bash -s --</pre>
</div></div>
<div class="admonitionblock">
<table><tr>
<td class="icon">
<img src="/nfs/pdx/disks/ice.disk.002/icfadm/pkgs/asciidoc/8.6.7/images/icons/note.png" alt="Note">
</td>
-<td class="content">There is a trailing space after the --</td>
+<td class="content">There is a trailing space after the double-dash</td>
</tr></table>
</div>
+<div class="paragraph"><p>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.</p></div>
+<table class="tableblock frame-topbot grid-all"
+style="
+width:90%;
+">
+<caption class="title">Table 5. Environment variables visible to the trigger script</caption>
+<col style="width:50%;">
+<col style="width:50%;">
+<thead>
+<tr>
+<th class="tableblock halign-left valign-top" > Variable </th>
+<th class="tableblock halign-left valign-top" > Purpose</th>
+</tr>
+</thead>
+<tbody>
+<tr>
+<td class="tableblock halign-left valign-top" ><p class="tableblock">MT_TEST_RUN_DIR</p></td>
+<td class="tableblock halign-left valign-top" ><p class="tableblock">The directory where Megatest ran this test</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top" ><p class="tableblock">MT_CMDINFO</p></td>
+<td class="tableblock halign-left valign-top" ><p class="tableblock">Encoded command data for the test</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top" ><p class="tableblock">MT_DEBUG_MODE</p></td>
+<td class="tableblock halign-left valign-top" ><p class="tableblock">Used to pass the debug mode to nested calls to Megatest</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top" ><p class="tableblock">MT_RUN_AREA_HOME</p></td>
+<td class="tableblock halign-left valign-top" ><p class="tableblock">Megatest home area</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top" ><p class="tableblock">MT_TESTSUITENAME</p></td>
+<td class="tableblock halign-left valign-top" ><p class="tableblock">The name of this testsuite or area</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top" ><p class="tableblock">MT_TEST_NAME</p></td>
+<td class="tableblock halign-left valign-top" ><p class="tableblock">The name of this test</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top" ><p class="tableblock">MT_ITEM_INFO</p></td>
+<td class="tableblock halign-left valign-top" ><p class="tableblock">The variable and values for the test item</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top" ><p class="tableblock">MT_MEGATEST</p></td>
+<td class="tableblock halign-left valign-top" ><p class="tableblock">Which Megatest binary is being used by this area</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top" ><p class="tableblock">MT_TARGET</p></td>
+<td class="tableblock halign-left valign-top" ><p class="tableblock">The target variable values, separated by <em>/</em></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top" ><p class="tableblock">MT_LINKTREE</p></td>
+<td class="tableblock halign-left valign-top" ><p class="tableblock">The base of the link tree where all run tests can be found</p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top" ><p class="tableblock">MT_ITEMPATH</p></td>
+<td class="tableblock halign-left valign-top" ><p class="tableblock">The values of the item path variables, separated by <em>/</em></p></td>
+</tr>
+<tr>
+<td class="tableblock halign-left valign-top" ><p class="tableblock">MT_RUNNAME</p></td>
+<td class="tableblock halign-left valign-top" ><p class="tableblock">The name of the run</p></td>
+</tr>
+</tbody>
+</table>
</div>
<div class="sect2">
<h3 id="_override_the_toplevel_html_file">Override the Toplevel HTML File</h3>
<div class="paragraph"><p>Megatest generates a simple html file summary for top level tests of
iterated tests. The generation can be overridden. NOTE: the output of
@@ -1961,11 +2649,11 @@
archive0 /mfs/myarchive-data/adisk1</pre>
</div></div>
</div>
</div>
<div class="sect1">
-<h2 id="_handling_environment_variables">Handling Environment Variables</h2>
+<h2 id="_environment_variables">Environment Variables</h2>
<div class="sectionbody">
<div class="paragraph"><p>It is often necessary to capture and or manipulate environment
variables. Megatest has some facilities built in to help.</p></div>
<div class="sect2">
<h3 id="_capture_variables">Capture variables</h3>
@@ -1982,11 +2670,13 @@
# write the diff from before to after
megatest -envdelta before-after -dumpmode bash</pre>
</div></div>
<div class="paragraph"><p>Dump modes include bash, csh and config. You can include config data
-into megatest.config or runconfigs.config.</p></div>
+into megatest.config, runconfigs.config and testconfig files. This is
+useful for capturing a complex environment in a special-purpose test
+and then utilizing that environment in downstream tests.</p></div>
<div class="listingblock">
<div class="title">Example of generating and using config data</div>
<div class="content monospaced">
<pre>megatest -envcap original
# do some stuff here
@@ -1995,27 +2685,111 @@
</div></div>
<div class="paragraph"><p>Then in runconfigs.config</p></div>
<div class="listingblock">
<div class="title">Example of using modified.config in a testconfig</div>
<div class="content monospaced">
-<pre>cat testconfig
-
-[pre-launch-env-vars]
+<pre>[pre-launch-env-vars]
[include modified.config]</pre>
</div></div>
</div>
</div>
+</div>
+<div class="sect1">
+<h2 id="_managing_old_runs">Managing Old Runs</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>It is often desired to keep some older runs around but this must be balanced with the costs of disk space.</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+Use -remove-keep
+</p>
+</li>
+<li>
+<p>
+Use -archive (can also be done from the -remove-keep interface)
+</p>
+</li>
+<li>
+<p>
+use -remove-runs with -keep-records
+</p>
+</li>
+</ol></div>
+<div class="listingblock">
+<div class="title">For each target, remove all runs but the most recent 3 if they are over 1 week old</div>
+<div class="content monospaced">
+<pre># 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'"</pre>
+</div></div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_nested_runs">Nested Runs</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>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.</p></div>
+<div class="paragraph"><p>If you are not using the current area you can use ezsteps to retrieve
+and setup the sub-Megatest run area.</p></div>
+<div class="paragraph"><p>In the testconfig:</p></div>
+<div class="listingblock">
+<div class="content monospaced">
+<pre>[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 ...</pre>
+</div></div>
+</div>
</div>
<div class="sect1">
<h2 id="_programming_api">Programming API</h2>
<div class="sectionbody">
<div class="paragraph"><p>These routines can be called from the megatest repl.</p></div>
<table class="tableblock frame-topbot grid-all"
style="
width:70%;
">
-<caption class="title">Table 4. API Keys Related Calls</caption>
+<caption class="title">Table 6. API Keys Related Calls</caption>
<col style="width:14%;">
<col style="width:28%;">
<col style="width:28%;">
<col style="width:28%;">
<thead>
@@ -2054,19 +2828,373 @@
</div>
</div>
</div>
</div>
<div class="sect1">
-<h2 id="_example_index">Example Index</h2>
+<h2 id="_road_map">Road Map</h2>
+<div class="sectionbody">
+<div class="paragraph"><p>Note 1: This road-map continues to evolve and subject to change without notice.</p></div>
+<div class="sect2">
+<h3 id="_here_is_a_smattering_of_ideas_for_megatest_2_0">Here is a smattering of ideas for Megatest 2.0</h3>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+Add variable $MT_RUNPATH = $MT_LINKTREE/$MT_TARGET/$MT_RUNNAME
+</p>
+</li>
+</ol></div>
+<div class="listingblock">
+<div class="content monospaced">
+<pre>[db]
+api legacy|new</pre>
+</div></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+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.
+</p>
+</li>
+<li>
+<p>
+Rigorous megatest.config and runconfig.config caching.
+</p>
+<div class="olist loweralpha"><ol class="loweralpha">
+<li>
+<p>
+Cache the configs in $MT_RUNPATH
+</p>
+</li>
+<li>
+<p>
+Following invocations of –run, -rerun* will calculate the new config but only overwrite the cached file IF changed
+</p>
+</li>
+</ol></div>
+</li>
+<li>
+<p>
+If the cached file changes ALL existing tests go from COMPLETED → STALE, I’m not sure what to do about RUNNING tests
+</p>
+</li>
+<li>
+<p>
+!VARS in runconfigs are not exported to the environment. They are accessed via rget as if the ! was not there.
+</p>
+</li>
+<li>
+<p>
+Per test copy commands (crude example below is not correct).
+</p>
+</li>
+</ol></div>
+<div class="listingblock">
+<div class="content monospaced">
+<pre>[testcopy]
+%/iind% unison SRC DEST
+% cp –r SRC DEST</pre>
+</div></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+Test management via pkts (optional?)
+</p>
+<div class="olist loweralpha"><ol class="loweralpha">
+<li>
+<p>
+Control pkt types: run, kill, rerunclean, clean, archive, status?
+</p>
+</li>
+<li>
+<p>
+Status pkt types: ack, step, status_change
+</p>
+</li>
+</ol></div>
+</li>
+<li>
+<p>
+Add nanomsg as a transport option
+.
+</p>
+</li>
+</ol></div>
+</div>
+<div class="sect2">
+<h3 id="_rfc_m01_add_ability_to_move_runs_to_other_areas">RFC M01: Add ability to move runs to other Areas</h3>
+<div class="paragraph"><p><strong>Purpose</strong>: allow shrinking megatest.db data by moving runs to an alternate
+ Megatest area with same keys.</p></div>
+<div class="paragraph"><p><strong>Method</strong>: extend db sync to take a different megatest area as a destination.</p></div>
+<div class="paragraph"><p><strong>Design</strong>:</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+add param -destination [area|path]. when specified runs are copied to new
+ area and removed from local db.
+</p>
+</li>
+<li>
+<p>
+the data move would involve these steps
+</p>
+<div class="olist loweralpha"><ol class="loweralpha">
+<li>
+<p>
+copy the run data to destination area megatest.db
+</p>
+</li>
+<li>
+<p>
+mark the run records as deleted, do not remove the run data on disk
+</p>
+</li>
+</ol></div>
+</li>
+<li>
+<p>
+accessing the data would be by running dashboard in the satellite area
+</p>
+</li>
+<li>
+<p>
+future versions of Megatest dashboard should support displaying areas in a
+ merged way.
+</p>
+</li>
+<li>
+<p>
+some new controls would be supported in the config
+</p>
+<div class="olist loweralpha"><ol class="loweralpha">
+<li>
+<p>
+[setup] ⇒ allow-runs [no|yes] ⇐= used to disallow runs
+</p>
+</li>
+<li>
+<p>
+[setup] ⇒ auto-migrate=[areaname|path] ⇐= used to automatically
+ migrate data to a satellite area.
+</p>
+</li>
+</ol></div>
+</li>
+</ol></div>
+<div class="paragraph"><p><strong>Branch</strong>: This work is taking place on branch v1.65-reduce-records</p></div>
+</div>
+<div class="sect2">
+<h3 id="_rfc_m02_move_data_into_completed_runs_db">RFC M02: Move data into completed-runs.db</h3>
+<div class="paragraph"><p><strong>Purpose</strong>: shrink megatest.db data to enable lower load and higher performance.</p></div>
+<div class="paragraph"><p><strong>Method</strong>: add a completed-runs.db and automatically move runs data from megatest.db to that db</p></div>
+<div class="paragraph"><p><strong>Design</strong>:</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+completed-runs.db is a full megatest database with complete schema
+</p>
+</li>
+<li>
+<p>
+the data move would involve these steps
+</p>
+<div class="olist loweralpha"><ol class="loweralpha">
+<li>
+<p>
+copy the run data to completed-runs.db
+</p>
+</li>
+<li>
+<p>
+remove the run data, first from /tmp/…/megatest.db and /tmp/…/megatest_ref.db, followed by megatest.db
+</p>
+</li>
+</ol></div>
+</li>
+<li>
+<p>
+accessing the data would be unchanged for most operations.
+</p>
+</li>
+<li>
+<p>
+a mode -full-db will be added which when specified would attach the completed-runs.db to megatest.db before doing the query
+</p>
+</li>
+<li>
+<p>
+mechanisms for moving runs to/from the megatest.db would be added
+</p>
+<div class="olist loweralpha"><ol class="loweralpha">
+<li>
+<p>
+-reduce-records ⇒ move runs to completed-runs.db
+</p>
+</li>
+<li>
+<p>
+-restore-records ⇒ move runs from completed-runs.db to megatest.db
+</p>
+</li>
+</ol></div>
+</li>
+</ol></div>
+<div class="paragraph"><p><strong>Branch</strong>: This work is taking place on branch v1.65-reduce-records</p></div>
+</div>
+<div class="sect2">
+<h3 id="_rfc_m03_automatic_homehost_migrations">RFC M03: Automatic homehost migrations</h3>
+<div class="paragraph"><p><strong>Purpose</strong>: Automatically migrate homehost.</p></div>
+<div class="paragraph"><p><strong>Method</strong>: Check that there are no tests running, launched or remotehoststart in past ½ hour then if not on homehost migrate the db to current host</p></div>
+<div class="paragraph"><p><strong>Design</strong>:</p></div>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+Check that the system is quiescent, i.e. that there are no runs in flight or recently run
+</p>
+</li>
+<li>
+<p>
+Create a lock
+</p>
+</li>
+<li>
+<p>
+Migrate the /tmp cache db to the current host
+</p>
+</li>
+<li>
+<p>
+Update the .homehost file
+</p>
+</li>
+<li>
+<p>
+Remove the lock
+</p>
+</li>
+</ol></div>
+<div class="paragraph"><p><strong>Branch</strong>: This work not yet started</p></div>
+</div>
+<div class="sect2">
+<h3 id="_architecture_refactor">Architecture Refactor</h3>
+<div class="sect3">
+<h4 id="_goals">Goals</h4>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+Reduce load on the file system. Sqlite3 files on network filesystem can be
+ a burden. <span class="green">[DONE]</span>
+</p>
+</li>
+<li>
+<p>
+Reduce number of servers and frequency of start/stop. This is mostly an
+ issue of clutter but also a reduction in "moving parts". <span class="green">[DONE]</span>
+</p>
+</li>
+<li>
+<p>
+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. <span class="green">[DONE]</span>
+</p>
+</li>
+<li>
+<p>
+Reduce number of processes involved in managing running tests.
+</p>
+</li>
+</ol></div>
+</div>
+<div class="sect3">
+<h4 id="_changes_needed">Changes Needed</h4>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+ACID compliant db will be on /tmp and synced to megatest.db with a five
+ second max delay. <span class="green">[DONE]</span>
+</p>
+</li>
+<li>
+<p>
+Read/writes to db for processes on homehost will go direct to /tmp
+ megatest.db file. <span class="green">[DONE]</span>
+</p>
+</li>
+<li>
+<p>
+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. <span class="green">[DONE]</span>
+</p>
+</li>
+<li>
+<p>
+Db syncs rely on the target db file timestame minus some margin. <span class="green">[DONE]</span>
+</p>
+</li>
+<li>
+<p>
+Since bulk reads do not use the server we can switch to simple RPC for the
+ network transport. <span class="green">[DONE]</span>
+</p>
+</li>
+<li>
+<p>
+Test running manager process extended to manage multiple running tests.
+</p>
+</li>
+</ol></div>
+</div>
+</div>
+<div class="sect2">
+<h3 id="_current_items">Current Items</h3>
+<div class="sect3">
+<h4 id="_ww05_migrate_to_inmem_db">ww05 - migrate to inmem-db</h4>
+<div class="olist arabic"><ol class="arabic">
+<li>
+<p>
+Switch to inmem db with fast sync to on disk db’s <span class="green">[DONE]</span>
+</p>
+</li>
+<li>
+<p>
+Server polls tasks table for next action
+</p>
+<div class="olist loweralpha"><ol class="loweralpha">
+<li>
+<p>
+Task table used for tracking runner process <span class="red">[Replaced by mtutil]</span>
+</p>
+</li>
+<li>
+<p>
+Task table used for jobs to run <span class="red">[Replaced by mtutil]</span>
+</p>
+</li>
+<li>
+<p>
+Task table used for queueing runner actions (remove runs,
+ cleanRunExecute, etc) <span class="red">[Replaced by mtutil</span>]
+</p>
+</li>
+</ol></div>
+</li>
+</ol></div>
+<div class="paragraph"><p>shifting, note that the preceding blank line is needed.</p></div>
+</div>
+</div>
+</div>
+</div>
+<div class="sect1">
+<h2 id="_index">Index</h2>
<div class="sectionbody">
</div>
</div>
</div>
<div id="footnotes"><hr></div>
<div id="footer">
<div id="footer-text">
Version 1.0<br>
-Last updated 2016-12-12 13:03:08 PST
+Last updated 2020-07-22 14:21:46 PDT
</div>
</div>
</body>
</html>
Index: docs/manual/megatest_manual.txt
==================================================================
--- docs/manual/megatest_manual.txt
+++ docs/manual/megatest_manual.txt
@@ -9,85 +9,128 @@
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?
-------------
The Megatest project was started for two reasons, the first was an
immediate and pressing need for a generalized tool to manage a suite
-of regression tests and the second was the fact that the author had
-written or maintained several such tools at different companies over
-the years and it seemed a good thing to have a single open source
-tool, flexible enough to meet the needs of any team doing continuous
-integrating and or running a complex suite of tests for release
-qualification.
+of regression tests and the second was the fact that I had written or
+maintained several such tools at different companies over the years. I
+thought a single open source tool, flexible enough to meet the needs
+of any team doing continuous integrating and or running a complex
+suite of tests for release qualification would solve some problems for
+me and for others.
+
+ -- Matt Welland, original author of the Megatest tool suite.
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.
-
- * 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
- variables are captured and kept recorded.
-
- * Immutable - once this test is run it cannot be easily overwritten or
- accidentally modified.
-
- * Repeatable - this test result can be recreated in the future
-
- * Relocatable - the testsuite or automation area can be checked out and the tests run anywhere
-
- * Encapsulated - the tests run in self-contained directories and all inputs
- and outputs to the process can be found in the run areas.
-
- * Deployable - anyone on the team, at any site, at any time can run the flow
+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 - make it as easy as possible to write self-checking
+ tests (as opposed to using deltas, i.e. tests that compare with a
+ previous measurement to deterine PASS/FAIL).
+
+ * Traceable - environment variables, host OS and other possibly
+ influential variables are captured and kept recorded.
+
+ * Immutable - once a test is run it cannot be easily overwritten or
+ modified accidentally.
+
+ * Repeatable - test results can be recreated in the future using all
+ the original variables.
+
+ * Relocatable - the testsuite or automation area can be checked out
+ and the tests run anywhere in the disk hierarchy.
+
+ * Encapsulated - the tests run in self-contained directories and all
+ inputs and outputs to the process can be found in the run areas.
+
+ * Deployable - a testsuite is self-contained and can be bundled with
+ a software project and easily used by others with little to no
+ setup burden.
Megatest Architecture
---------------------
+
+Data separation
+~~~~~~~~~~~~~~~
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
+plain text config files. All system state is stored in an sqlite3
+database.
+
+Distributed Compute
+~~~~~~~~~~~~~~~~~~~
+
+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.
+sqlite3 database. Megatest has been used with the Intel Netbatch and
+lsf (also known as openlava) batch systems and it should be
+straightforward to use it with other similar systems.
-include::../plan.txt[]
-// 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::overview.txt[]
include::installation.txt[]
include::getting_started.txt[]
-:leveloffset: 0
+include::study_plan.txt[]
+
+// :leveloffset: 0
include::writing_tests.txt[]
include::howto.txt[]
+
include::reference.txt[]
+
Megatest Internals
------------------
["graphviz", "server.png"]
----------------------------------------------------------------------
include::server.dot[]
----------------------------------------------------------------------
+
+include::plan.txt[]
+// 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
// [appendix]
// Example Appendix
// ================
@@ -132,11 +175,11 @@
// Example Colophon
// ================
// Text at the end of a book describing facts about its production.
[index]
-Example Index
--------------
+Index
+-----
////////////////////////////////////////////////////////////////
The index is normally left completely empty, it's contents are
generated automatically by the DocBook toolchain.
////////////////////////////////////////////////////////////////
ADDED docs/manual/overview.txt
Index: docs/manual/overview.txt
==================================================================
--- /dev/null
+++ docs/manual/overview.txt
@@ -0,0 +1,43 @@
+
+Overview
+--------
+
+Stand-alone Megatest Area
+~~~~~~~~~~~~~~~~~~~~~~~~~
+
+A single, stand-alone, Megatest based testsuite or "area" is
+sufficient for most validation, automation and build problems.
+
+image::megatest-stand-alone-area.png[Static,300]
+
+Megatest is designed as a distributed or decoupled system. This means
+you can run the areas stand-alone with no additional
+infrastructure. I.e. there are no databases, web servers or other
+centralized resources needed. However as your needs grow you can
+integrate multiple areas into a bigger system.
+
+Component Descriptions
+^^^^^^^^^^^^^^^^^^^^^^
+
+. Multi-area dashboard and xterm. A gui (the dashboard) is usually the
+ best option for controlling and launching runs but all operations
+ can also be done from the commandline. Note: The not yet released
+ multi-area dashboard replaces the old dashboard for browsing and
+ controlling runs but for managing a single area the old dashboard
+ works very well.
+
+. Area/testsuite. This is your testsuite or automation definition and
+ consists of the information in megatest.config, runconfigs.config
+ and your testconfigs along with any custom scripting that can't be
+ done with the native Megatest features.
+
+. If your testsuite or build automation is too large to run on a
+ single instance you can distribute your jobs into a compute server
+ pool. The only current requirements are password-less ssh access and
+ a network filesystem.
+
+Full System Architecture
+~~~~~~~~~~~~~~~~~~~~~~~~
+
+image::megatest-system-architecture.png[Static,300]
+
ADDED docs/manual/plan.txt
Index: docs/manual/plan.txt
==================================================================
--- /dev/null
+++ docs/manual/plan.txt
@@ -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 <http://www.gnu.org/licenses/>.
+
+// 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
Index: docs/manual/reference.txt
==================================================================
--- docs/manual/reference.txt
+++ docs/manual/reference.txt
@@ -1,9 +1,40 @@
+// This file is part of Megatest.
+//
+// Megatest is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Megatest is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU 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/>.
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.
@@ -67,14 +98,16 @@
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
@@ -86,21 +119,21 @@
# 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
@@ -144,10 +177,22 @@
------------------
[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]
@@ -169,10 +214,45 @@
-----------------
[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
------------------
@@ -188,11 +268,10 @@
.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 | <hostname> | Defaults to local host
|hostname | Hostname to bind to | <hostname>\|- | 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
@@ -218,29 +297,71 @@
-------------------
runscript main.csh
-------------------
+Iteration
+~~~~~~~~~
+
+.Sections for iteration
+------------------
+# full combinations
+[items]
+A x y
+B 1 2
+
+# Yields: x/1 x/2 y/1 y/2
+
+# tabled
+[itemstable]
+A x y
+B 1 2
+
+# Yields x/1 y/2
+------------------
+
+.Or use files
+------------------
+[itemopts]
+slash path/to/file/with/items
+# or
+space path/to/file/with/items
+------------------
+
+.File format for / delimited
+------------------
+key1/key2/key3
+val1/val2/val2
+...
+------------------
+
+.File format for space delimited
+------------------
+key1 key2 key3
+val1 val2 val2
+...
+------------------
+
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
-------------------
@@ -286,75 +407,139 @@
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
+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 /
+[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/
+[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
+~~~~~~~~~~~~~~~~~~~~~~~
+
// 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
+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
@@ -362,19 +547,19 @@
#
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
-----------------
@@ -382,11 +567,11 @@
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
@@ -395,35 +580,51 @@
[skip]
prevrunning x
-----------------
Skip if a File Exists
-^^^^^^^^^^^^^^^^^^^^^
+~~~~~~~~~~~~~~~~~~~~~
+
+-----------------
+[skip]
+fileexists /path/to/a/file # skip if /path/to/a/file exists
+-----------------
+
+Skip if a File Does not Exist
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+-----------------
+[skip]
+filenotexists /path/to/a/file # skip if /path/to/a/file does not exist
+-----------------
+
+Skip if a script completes with 0 status
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
-----------------
[skip]
-fileexists /path/to/a/file # skip if /path/to/a/file exists
+script /path/to/a/script # skip if /path/to/a/script completes with 0 status
-----------------
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)
@@ -461,19 +662,126 @@
-----------------
To transfer the environment to the next step you can do the following:
+.Propagate environment to next step
----------------------------
$MT_MEGATEST -env2file .ezsteps/${stepname}
----------------------------
+Scripts
+~~~~~~~
+
+.Specifying scripts inline (best used for only simple scripts)
+----------------------------
+[scripts]
+loaddb #!/bin/bash
+ sqlite3 $1 <<EOF
+ .mode tabs
+ .import $2 data
+ .q
+ EOF
+----------------------------
+
+The above snippet results in the creation of an executable script
+called "loaddb" in the test directory. NOTE: every line in the script
+must be prefixed with the exact same number of spaces. Lines beginning
+with a # will not work as expected. Currently you cannot indent
+intermediate lines.
+
+.Full example with ezsteps, logpro rules, scripts etc.
+-----------------
+# You can include a common file
+#
+[include #{getenv MT_RUN_AREA_HOME}/global-testconfig.inc]
+
+# Use "var" for a scratch pad
+#
+[var]
+dumpsql select * from data;
+sepstr .....................................
+
+# NOT IMPLEMENTED YET!
+#
+[ezsteps-addendum]
+prescript something.sh
+postscript something2.sh
+
+# Add additional steps here. Format is "stepname script"
+[ezsteps]
+importdb loaddb prod.db prod.sql
+dumpprod dumpdata prod.db "#{get var dumpsql}"
+diff (echo "prod#{get var sepstr}test";diff --side-by-side \
+ dumpprod.log reference.log ;echo DIFFDONE)
+
+[scripts]
+loaddb #!/bin/bash
+ sqlite3 $1 <<EOF
+ .mode tabs
+ .import $2 data
+ .q
+ EOF
+
+dumpdata #!/bin/bash
+ sqlite3 $1 <<EOF
+ .separator ,
+ $2
+ .q
+ EOF
+
+# Test requirements are specified here
+[requirements]
+waiton setup
+priority 0
+
+# Iteration for your test is controlled by the items section
+# The complicated if is needed to allow processing of the config for the dashboard when there are no actual runs.
+[items]
+THINGNAME [system generatethings.sh | sort -u]
+
+# Logpro rules for each step can be captured here in the testconfig
+# note: The ;; after the stepname and the leading whitespace are required
+#
+[logpro]
+inputdb ;;
+ (expect:ignore in "LogFileBody" < 99 "Ignore error in comments" #/^\/\/.*error/)
+ (expect:warning in "LogFileBody" = 0 "Any warning" #/warn/)
+ (expect:required in "LogFileBody" > 0 "Some data found" #/^[a-z]{3,4}[0-9]+_r.*/)
+
+diff ;;
+ (expect:ignore in "LogFileBody" < 99 "Ignore error in comments" #/^\/\/.*error/)
+ (expect:warning in "LogFileBody" = 0 "Any warning" #/warn/)
+ (expect:error in "LogFileBody" = 0 "< or > indicate missing entry" (list #/(<|>)/ #/error/i))
+ (expect:error in "LogFileBody" = 0 "Difference in data" (list #/\s+\|\s+/ #/error/i))
+ (expect:required in "LogFileBody" > 0 "DIFFDONE Marker found" #/DIFFDONE/)
+ (expect:required in "LogFileBody" > 0 "Some things found" #/^[a-z]{3,4}[0-9]+_r.*/)
+
+# NOT IMPLEMENTED YET!
+#
+## Also: enhance logpro to take list of command files: file1,file2...
+[waivers]
+createprod{target=%78/%/%/%} ;;
+ (disable:required "DIFFDONE Marker found")
+ (disable:error "Some error")
+ (expect:waive in "LogFileBody" < 99 "Waive if failed due to version" #/\w+3\.6.*/)
+
+# test_meta is a section for storing additional data on your test
+[test_meta]
+author matt
+owner matt
+description Compare things
+tags tagone,tagtwo
+reviewed never
+-----------------
+
Triggers
~~~~~~~~
-In your testconfig triggers can be specified
+In your testconfig or megatest.config triggers can be specified
+.Triggers spec
-----------------
[triggers]
# Call script running.sh when test goes to state=RUNNING, status=PASS
RUNNING/PASS running.sh
@@ -483,22 +791,48 @@
# 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:
+.Start an xterm using a trigger for test completed.
-----------------
[triggers]
COMPLETED/ xterm -e bash -s --
-----------------
-NOTE: There is a trailing space after the --
+NOTE: There is a trailing space after the double-dash
+
+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.
+
+// ,cols="^,2m"
+
+.Environment variables visible to the trigger script
+[width="90%",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
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -532,12 +866,12 @@
# Within the archive the data is structured like this:
# <target>/<runname>/<test>/
archive0 /mfs/myarchive-data/adisk1
--------------
-Handling Environment Variables
-------------------------------
+Environment Variables
+---------------------
It is often necessary to capture and or manipulate environment
variables. Megatest has some facilities built in to help.
Capture variables
@@ -556,11 +890,13 @@
# 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.
+into megatest.config, runconfigs.config and testconfig files. This is
+useful for capturing a complex environment in a special-purpose test
+and then utilizing that environment in downstream tests.
.Example of generating and using config data
------------------------------
megatest -envcap original
# do some stuff here
@@ -570,16 +906,86 @@
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.
@@ -592,6 +998,5 @@
| (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 <http://www.gnu.org/licenses/>.
digraph G {
subgraph cluster_1 {
node [style=filled,shape=box];
ADDED docs/manual/stand-alone-megatest-area.svg
Index: docs/manual/stand-alone-megatest-area.svg
==================================================================
--- /dev/null
+++ docs/manual/stand-alone-megatest-area.svg
cannot compute difference between binary files
ADDED docs/manual/study_plan.txt
Index: docs/manual/study_plan.txt
==================================================================
--- /dev/null
+++ docs/manual/study_plan.txt
@@ -0,0 +1,89 @@
+// This file is part of Megatest.
+//
+// Megatest is free software: you can redistribute it and/or modify
+// it under the terms of the GNU General Public License as published by
+// the Free Software Foundation, either version 3 of the License, or
+// (at your option) any later version.
+//
+// Megatest is distributed in the hope that it will be useful,
+// but WITHOUT ANY WARRANTY; without even the implied warranty of
+// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+// GNU 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/>.
+//
+// Copyright 2006-2012, Matthew Welland.
+
+Study Plan
+----------
+
+Megatest is an extensive program with a lot to learn. Following are some paths through the material to smooth the learning path.
+
+Basic Concepts (suggest you pick these up on the way)
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* Components of automation; run, test, iteration
+* Selectors; target, runname, and testpatt
+
+Running Testsuites or Automation
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* Using the dashboard gui (recommended)
+** Using the "Runs" panel.
+** Using the "Run Control" panel.
+** Using a test control panel
+** The Right Mouse Button menu
+** Debug features
+*** xterm
+**** pstree
+**** log files; mt_copy.log, mt_launch.log
+**** variables; megatest.csh, megatest.sh
+**** testconfig dump, *testconfig
+*** State/status buttons
+*** Run, Clean, KillReq
+*** ReRunClean
+* Using the command line
+** Getting help; megatest -h, megatest -manual
+** Starting runs; megatest -run
+*** Selection controls; -target, -runname and -testpatt
+
+Writing Tests and Flows
+~~~~~~~~~~~~~~~~~~~~~~~
+
+* environment variables (table 5)
+* tests/_testname_/testconfig link:megatest_manual.html#_the_testconfig_file[testconfig details]
+** ezsteps and logpro section
+** iteration (one test applied to many inputs), items, itemstable link:megatest_manual.html#_iteration[test iteration]
+** dependencies, waiton, itemmatch, itemwait link:megatest_manual.html#_requirements_section[test requirements]
+** miscellaneous; mode toplevel, runtimelim, skip on file, no file, script or on running, waiver propagation
+* megatest areas
+** megatest.config
+** runconfigs.config
+** config language features; include, shell, system, scheme, rp|realpath, getenv, get, rget, scriptinc link:megatest.html#_config_file_helpers[config file helpers]
+
+Advanced Topics
+~~~~~~~~~~~~~~~
+
+* Removing and keeping runs selectively link:megatest_manual.html#_managing_old_runs[managing runs]
+* Subruns link:megatest_manual.html#_nested_runs[nested runs]
+* Config file features link:megatest_manual.html#_config_file_helpers[config file features]
+* HTML output with -generate-html
+* Triggers, post run, state/status
+* MTLOWESTLOAD
+* flexilauncher
+* env delta and testconfig
+* capturing test data, extracting values from logpro and using them for pass/fail
+* mtutil, postgres connection, packets for cross-site/cross-user control (e.g. mcrun).
+
+Maintenance and Troubleshooting
+~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+
+* cleanup-db, database structure of Megatest 1.6x
+* archiving
+* homehost management
+* show-runconfig
+* show-config
+* show with -debug 0,9
+* load management
+
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 <http://www.gnu.org/licenses/>.
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 <http://www.gnu.org/licenses/>.
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 <http://www.gnu.org/licenses/>.
+//
+
digraph megatest_state_status {
ranksep=0.05
// rankdir=LR
node [shape=box,style=filled];
@@ -31,11 +49,11 @@
label="{RUNNING|{n/a|<here> PASS |<here> FAIL}}";
]
"COMPLETED" [
shape="record";
- label = "{COMPLETED|{PASS | <here> FAIL |<here> CHECK|<here> SKIP}}";
+ label = "{COMPLETED|{PASS | SKIP | WAIVED | FAIL | CHECK| ABORT}}";
]
"RUNNING" -> "COMPLETED";
"RUNNING" -> "INCOMPLETE" [label="test dead for > 24hrs"];
Index: docs/megatest-training.odp
==================================================================
--- docs/megatest-training.odp
+++ docs/megatest-training.odp
cannot compute difference between binary files
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}{<reportTopic>}
-\newcommand{\revisionNumber}{<rev. no.>}
-\newcommand{\documentNumber}{<doc. no.>}
-
-
-% 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
-<lyxtabular version="3" rows="2" columns="4">
-<features tabularvalignment="middle">
-<column alignment="center" valignment="top" width="0.5in">
-<column alignment="center" valignment="top" width="0.5in">
-<column alignment="block" valignment="top" width="3in">
-<column alignment="center" valignment="top" width="1in">
-<row>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Version
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Author
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Description
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Date
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-v1.25
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-matt
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-converted to new document template
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
-\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
-</cell>
-</row>
-</lyxtabular>
-
-\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/<flowname>.config
-\end_layout
-
-\begin_layout Standard
-\begin_inset listings
-lstparams "basicstyle={\small\ttfamily},language=sh"
-inline false
-status open
-
-\begin_layout Plain Layout
-
-# Flow: <flowname>
-\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
-
-# <testname>[,<predecessor>]
-\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 <flowname> :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
-<lyxtabular version="3" rows="9" columns="2">
-<features tabularvalignment="middle" tabularwidth="80page%">
-<column alignment="left" valignment="top" width="10page%">
-<column alignment="left" valignment="top" width="50page%">
-<row>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Variable
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Purpose
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-MT_CMDINFO
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Conveys test variables to the megatest test runner.
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-MT_TEST_RUN_DIR
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Directory assigned by megatest for the test to run.
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-MT_TEST_NAME
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Name of the test, corrosponds to the directory name under tests.
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-MT_ITEM_INFO
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Iterated tests will set this to a sequence of key/values ((KEY val) ...)
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-MT_RUN_AREA_HOME
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\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
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-MT_RUNNAME
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Name of this run as set by the :runname parameter
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-MT_MEGATEST
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\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
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-<field1> ....
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
-\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
-</cell>
-</row>
-</lyxtabular>
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-megatest.config
-\end_layout
-
-\begin_layout Standard
-\begin_inset Tabular
-<lyxtabular version="3" rows="10" columns="5">
-<features tabularvalignment="middle" tabularwidth="80page%">
-<column alignment="left" valignment="top" width="10page%">
-<column alignment="left" valignment="top" width="15page%">
-<column alignment="left" valignment="top" width="20page%">
-<column alignment="left" valignment="top" width="6page%">
-<column alignment="left" valignment="top" width="20page%">
-<row>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-section
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-variable
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-value
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-required
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-comment
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-[setup]
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-max_concurrent_jobs
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-if variable is not defined no limit on jobs
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-executable
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-full path to megatest binary
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\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
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-runsdir
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-full path to where the link tree to all runs will be created
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\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
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-[fields]
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-string of letters, numbers and underscore
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-string of letters, numbers and underscore
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-at least one
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-[jobtools]
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-launcher
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\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
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-workhosts
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-list of hostnames to run jobs on NOT SUPPORTED RIGHT NOW
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-n/a
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-[jobgroups]
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-string of letters, numbers and underscore
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-number
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\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
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-[env-override]
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-string of letters, numbers and underscore
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-any string
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\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
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-[disks]
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-string of letters, numbers and underscore
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\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
-</cell>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-yes
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
-\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
-</cell>
-</row>
-</lyxtabular>
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsection
-runconfigs.config file
-\end_layout
-
-\begin_layout Standard
-\begin_inset Tabular
-<lyxtabular version="3" rows="3" columns="5">
-<features tabularvalignment="middle" tabularwidth="80page%">
-<column alignment="left" valignment="top" width="20page%">
-<column alignment="left" valignment="top" width="12page%">
-<column alignment="left" valignment="top" width="3page%">
-<column alignment="left" valignment="top" width="4page%">
-<column alignment="left" valignment="top" width="30page%">
-<row>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-section
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-variable
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-value
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-required?
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-comment
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-[default]
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-string of letters, numbers and underscore
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-any
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\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
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-[field1value/field2value...]
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-string of letters, numbers and underscore
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-any
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
-\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
-</cell>
-</row>
-</lyxtabular>
-
-\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
-<lyxtabular version="3" rows="6" columns="5">
-<features tabularvalignment="middle" tabularwidth="80page%">
-<column alignment="left" valignment="top" width="8page%">
-<column alignment="left" valignment="top" width="6page%">
-<column alignment="left" valignment="top" width="12page%">
-<column alignment="left" valignment="top" width="6page%">
-<column alignment="left" valignment="top" width="30page%">
-<row>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-section
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-variable
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-value
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-required?
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-comments
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-[setup]
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-runscript
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-name of script to execute for this test
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-yes
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\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
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-[requirements]
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-waiton
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-list of valid test names
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\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
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-jobgroup
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-[items]
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-any valid
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-list of values
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\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
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-[eztests]
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-any valid
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-stepname command
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-no
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-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
-\end_layout
-
-\end_inset
-</cell>
-</row>
-</lyxtabular>
-
-\end_inset
-
-
-\end_layout
-
-\begin_layout Subsubsection
-Command line
-\end_layout
-
-\begin_layout Standard
-\begin_inset Tabular
-<lyxtabular version="3" rows="22" columns="4">
-<features tabularvalignment="middle">
-<column alignment="left" valignment="top" width="0">
-<column alignment="left" valignment="top" width="0">
-<column alignment="left" valignment="top" width="30page%">
-<column alignment="left" valignment="top" width="0pt">
-<row>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-switch or param
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-parameter
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-purpose
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-comments
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
--h
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-brief help
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
--runall
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-run all tests
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
--runtests
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-test1,test2,...
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-run one or more tests
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
--step
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-stepname
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-record a step
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-requires :state and :status
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
--test-status
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-record the test status
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-requires :state and :status
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
--setlog
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-logfilename
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-set the logfile name for a test
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-path is assumed to be relative to the test run directory
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
--set-toplog
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-logfilename
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-set the logfile name for the top test in an iterated test run
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-each sub test can have its own logfile set
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
--m
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-\begin_inset Quotes eld
-\end_inset
-
-comment
-\begin_inset Quotes erd
-\end_inset
-
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-sets a comment for the step, test or run
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-:runname
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-[a-zA-Z0-9_-]+
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-directory in which this run will be stored in the test run area
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-:state
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-any value
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\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
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\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
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-:status
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-any value
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\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
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\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
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
--list-runs
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-any value, % is wildcard
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Respects -itempatt and -testpatt for filters
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
--testpatt
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-any value, % is wildcard
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
--itempatt
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-any value, % is wildcard
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
--showkeys
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-Print the keys being used for this database
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
--force
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\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
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\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
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
--xterm
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\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
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
--remove-runs
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\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
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\shape italic
-Test helpers
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
--runstep
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" usebox="none">
-\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
-</cell>
-<cell alignment="left" valignment="top" topline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-<row>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
--logpro
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="center" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" usebox="none">
-\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
-</cell>
-<cell alignment="left" valignment="top" topline="true" bottomline="true" leftline="true" rightline="true" usebox="none">
-\begin_inset Text
-
-\begin_layout Plain Layout
-
-\end_layout
-
-\end_inset
-</cell>
-</row>
-</lyxtabular>
-
-\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 <http://www.gnu.org/licenses/>.
+
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 <http://www.gnu.org/licenses/>.
+
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 <http://www.gnu.org/licenses/>.
+
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 <http://www.gnu.org/licenses/>.
+
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 <http://www.gnu.org/licenses/>.
+//
+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
-
ADDED docs/ulex-transition.fig
Index: docs/ulex-transition.fig
==================================================================
--- /dev/null
+++ docs/ulex-transition.fig
@@ -0,0 +1,39 @@
+#FIG 3.2 Produced by xfig version 3.2.5-alpha5
+Landscape
+Center
+Inches
+Letter
+100.00
+Single
+-2
+1200 2
+5 1 0 1 0 7 50 -1 -1 0.000 0 1 1 0 3450.000 7793.750 2475 8625 3450 9075 4425 8625
+ 0 0 1.00 60.00 120.00
+5 1 0 1 0 7 50 -1 -1 0.000 0 0 1 0 3450.000 7762.500 4725 8625 3375 9300 2175 8625
+ 0 0 1.00 60.00 120.00
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+ 1200 1425 3675 1425 3675 4800 1200 4800 1200 1425
+2 2 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 5
+ 3825 1425 7425 1425 7425 4800 3825 4800 3825 1425
+2 1 0 1 0 7 50 -1 -1 0.000 0 0 -1 0 0 2
+ 2325 4950 2325 7200
+2 4 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5
+ 3150 8550 3150 7200 1650 7200 1650 8550 3150 8550
+2 4 0 1 0 7 50 -1 -1 0.000 0 0 7 0 0 5
+ 5700 8550 5700 7200 3975 7200 3975 8550 5700 8550
+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
+ 4800 4875 4800 7125
+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
+ 4800 4875 2700 7125
+4 0 0 50 -1 0 12 0.0000 4 150 1185 1350 1725 runs and tests\001
+4 0 0 50 -1 0 12 0.0000 4 195 1065 1725 7650 megatest.db\001
+4 0 0 50 -1 0 12 0.0000 4 195 1140 4950 5775 config setting\001
+4 0 0 50 -1 0 12 0.0000 4 150 375 4125 7575 1.db\001
+4 0 0 50 -1 0 12 0.0000 4 150 375 4125 7830 2.db\001
+4 0 0 50 -1 0 12 0.0000 4 15 240 4125 8085 ....\001
+4 0 0 50 -1 0 12 0.0000 4 150 360 4875 5325 ulex\001
+4 0 0 50 -1 0 12 0.0000 4 150 690 1125 825 v1.6535\001
+4 0 0 50 -1 0 12 0.0000 4 195 2190 2400 9600 import/export steps script\001
+4 0 0 50 -1 0 12 0.0000 4 195 1590 3900 1725 steps and test data\001
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 <pat> / --debug-pattern <pat>
- (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 <description; #f uses func prototype> <expected result> <thunk>)
-
-; (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<br /><img cid:"cid" alt=\"test image\"><br>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<h1>hello</h1><i>italics</i>" use_html: #t)
-;(sendmail "bb" "4hello attach subject html" "<h2>hmm</h2>" 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 <http://www.gnu.org/licenses/>.
+
;;======================================================================
(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,
@@ -59,15 +68,15 @@
(for-each-row
(lambda (row)
(let ((var (car row))
(val (cadr row)))
(hash-table-set! result var
- (if (and (hash-table-ref/default results var #f)
+ (if (and (hash-table-ref/default result var #f)
(assoc var paths)) ;; this var is a path and there is a previous path
(let ((sep (cadr (assoc var paths))))
- (env:merge-path-envvar sep (hash-table-ref results var) valb))
- valb)))))
+ (env:merge-path-envvar sep (hash-table-ref result var) val))
+ val)))))
(sql db "SELECT var,val FROM envvars WHERE context=?")
context))
contexts)
result))
@@ -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 <http://www.gnu.org/licenses/>.
+
+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 <http://www.gnu.org/licenses/>.
+;;
;; 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))
@@ -24,152 +32,165 @@
(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*
+ ;;# TODO - recapture item variables, debug repeated step eval; regen logpro from test
+ (let* ((do-update-test-state-status #f)
+ (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"))
(ezstepslst (hash-table-ref/default testconfig "ezsteps" '()))
(run-mutex (make-mutex))
(rollup-status 0)
+ (rollup-status-string #f)
+ (rollup-status-sym #f)
(exit-info (vector #t #t #t))
- (test-id (db:test-get-id testdat))
- (run-id (db:test-get-run_id testdat))
- (test-name (db:test-get-testname testdat))
+ (test-id (db:test-get-id testdat))
+ (run-id (db:test-get-run_id testdat))
+ (test-name (db:test-get-testname testdat))
+ (orig-test-state (db:test-get-state testdat))
+ (orig-test-status (db:test-get-status testdat))
(kill-job #f)) ;; for future use (on re-factoring with launch.scm code
+
+ ;; keep trying till NFS deigns to populate test run dir on this host
(let loop ((count 5))
- (if (file-exists? test-run-dir)
- (push-directory test-run-dir)
+ (if (not (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))
(message-window "ERROR: You can only re-run steps defined via ezsteps")
(begin
(let loop ((ezstep (car ezstepslst))
(tal (cdr ezstepslst))
- (prevstep #f)
- (runflag #f)) ;; flag used to skip steps when not starting at the beginning
+ (status-sym-so-far 'pass)
+ ;;(runflag #f)
+ (saw-start-step-name #f)) ;; flag used to skip steps when not starting at the beginning
(if (vector-ref exit-info 1)
- (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
- (stepcmd (list-ref stepparts 3))
- (script "") ; "#!/bin/bash\n") ;; yep, we depend on bin/bash FIXME!!!
- (logpro-used #f))
-
- ;; Skip steps until hit start-step-name
- ;;
- (if (and start-step-name
- (not runflag))
- (if (equal? stepname start-step-name)
- (set! runflag #t) ;; and continue
- (if (not (null? tal))
- (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))
-
- ;; call the command using mt_ezstep
- (set! script (conc "mt_ezstep " stepname " " (if prevstep prevstep "-") " " stepcmd))
-
- (debug:print 4 *default-log-port* "script: " script)
- (rmt:teststep-set-status! run-id test-id stepname "start" "-" #f #f)
- ;; now launch
- (let ((pid (process-run script)))
- (let processloop ((i 0))
- (let-values (((pid-val exit-status exit-code)(process-wait pid #t)))
- (mutex-lock! run-mutex)
- (vector-set! exit-info 0 pid)
- (vector-set! exit-info 1 exit-status)
- (vector-set! exit-info 2 exit-code)
- (mutex-unlock! run-mutex)
- (if (eq? pid-val 0)
- (begin
- (thread-sleep! 1)
- (processloop (+ i 1))))
- ))
- (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")))
- ;; 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)))
- (overall-status (cond
- ((eq? rollup-status 2) 'warn)
- ((eq? rollup-status 0) 'pass)
- (else 'fail)))
- (next-status (cond
- ((eq? overall-status 'pass) this-step-status)
- ((eq? overall-status 'warn)
- (if (eq? this-step-status 'fail) 'fail 'warn))
- (else 'fail))))
- (debug:print 4 *default-log-port* "Exit value received: " (vector-ref exit-info 2) " logpro-used: " logpro-used
- " this-step-status: " this-step-status " overall-status: " overall-status
- " 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"
- (if (eq? this-step-status 'warn) "Logpro warning found" #f)
- #f))
- ((pass)
- (tests:test-set-status! 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)
- ))))
- (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))))
+ (let* ((stepname (car ezstep)) ;; do stuff to run the step
+ (logpro-used (common:file-exists? (conc test-run-dir "/" stepname ".logpro")))
+ (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
+ (stepcmd (list-ref stepparts 3))
+ (script (conc "mt_ezstep '"test-run-dir"' '"stepname"' '"stepcmd"'")) ;; call the command using mt_ezstep
+ (saw-start-step-name-next (or saw-start-step-name (equal? stepname start-step-name)))
+ (proceed-with-this-step
+ (or (not start-step-name)
+ (equal? stepname start-step-name)
+ (and saw-start-step-name (not run-one))
+ saw-start-step-name-next
+ (and start-step-name (equal? stepname start-step-name))))
+ )
+ (setenv "MT_STEP_NAME" stepname)
+ (set! do-update-test-state-status (and proceed-with-this-step (null? tal)))
+ ;;(BB> "stepname="stepname" proceed-with-this-step="proceed-with-this-step " do-update-test-state-status="do-update-test-state-status " orig-test-state="orig-test-state" orig-test-status="orig-test-status)
+ (cond
+ ((and (not proceed-with-this-step) (null? tal))
+ 'done)
+ ((not proceed-with-this-step)
+ (loop (car tal)
+ (cdr tal)
+ status-sym-so-far
+ saw-start-step-name-next))
+ (else
+ (debug:print 4 *default-log-port* "ezsteps:\n stepname: " stepname " stepinfo: " stepinfo " stepparts: " stepparts
+ " stepparms: " stepparms " stepcmd: " stepcmd)
+ (debug:print 4 *default-log-port* "script: " script)
+ (rmt:teststep-set-status! run-id test-id stepname "start" "-" #f #f)
+
+ ;; now launch the script
+ (let ((pid (process-run script)))
+ (let processloop ((i 0))
+ (let-values (((pid-val exit-status exit-code)(process-wait pid #t)))
+ (mutex-lock! run-mutex)
+ (vector-set! exit-info 0 pid)
+ (vector-set! exit-info 1 exit-status)
+ (vector-set! exit-info 2 exit-code)
+ (mutex-unlock! run-mutex)
+ (if (eq? pid-val 0)
+ (begin
+ (thread-sleep! 1)
+ (processloop (+ i 1))))
+ ))
+ (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! run-id test-id (conc stepname ".html")))
+
+ ;; set the test final status
+ (let* ((this-step-status (cond
+ (logpro-used
+ (common:logpro-exit-code->status-sym (vector-ref exit-info 2)))
+ ((eq? (vector-ref exit-info 2) 0)
+ 'pass)
+ (else
+ 'fail)))
+ (overall-status-sym (common:worse-status-sym this-step-status status-sym-so-far))
+ (overall-status-string (status-sym->string overall-status-sym)))
+ (debug:print 4 *default-log-port* "Exit value received: " (vector-ref exit-info 2) " logpro-used: " logpro-used
+ " this-step-status: " this-step-status " overall-status: " overall-status-sym)
+ ;;" next-status: " next-status " rollup-status: " rollup-status)
+ (set! rollup-status-string overall-status-string)
+ (set! rollup-status-sym overall-status-sym)
+ (tests:test-set-status! run-id test-id "RUNNING" overall-status-string #f #f)))
+
+ (if (and
+ (not run-one)
+ (common:steps-can-proceed-given-status-sym rollup-status-sym)
+ (not (null? tal)))
+ (loop (car tal)
+ (cdr tal)
+ rollup-status-sym
+ saw-start-step-name-next)))))
(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
)
- (new-status (cond
- ((not (vector-ref exit-info 1)) "FAIL") ;; job failed to run
- ((eq? rollup-status 0)
- ;; if the current status is AUTO the defer to the calculated value (i.e. leave this AUTO)
- (if (equal? (db:test-get-status testinfo) "AUTO") "AUTO" "PASS"))
- ((eq? rollup-status 1) "FAIL")
- ((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)))
+ (new-status rollup-status-string)
+ ) ;; (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
- new-state
- new-status
+ (tests:test-set-status! run-id test-id
+ (if do-update-test-state-status new-state orig-test-state)
+ (if do-update-test-state-status new-status orig-test-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))))
+ (if (and (not (equal? item-path "")) do-update-test-state-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))
+ ;;(pop-directory)
+ rollup-status-string))
+
+(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 <http://www.gnu.org/licenses/>.
+
;; 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 <http://www.gnu.org/licenses/>.
;;
-;; 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 <http://www.gnu.org/licenses/>.
(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 <http://www.gnu.org/licenses/>.
+
+;;======================================================================
+
+(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 <http://www.gnu.org/licenses/>.
+;;
(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 <http://www.gnu.org/licenses/>.
+
;;======================================================================
(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))
@@ -147,18 +156,18 @@
(print "")
(print "[setup]")
(print "# Adjust max_concurrent_jobs to limit how much you load your machines")
(print "max_concurrent_jobs 50\n")
(print "# This is your link path. Avoid moving it once set.")
- (print "linktree " (common:real-path lntree))
+ (print "linktree " lntree) ;; (common:real-path lntree))
(print "\n# Job tools are more advanced ways to control how your jobs are launched")
(print "[jobtools]\nuseshell yes\nlauncher nbfake\nmaxload 1.5\n")
(print "# You can override environment variables for all your tests here")
(print "[env-override]\nEXAMPLE_VAR example value\n")
(print "# As you run more tests you may need to add additional disks, the names are arbitrary but must be unique")
- (print "[disks]\ndisk0 " (common:real-path firstd))))
-
+ (print "[disks]\ndisk0 " firstd))) ;; (common:real-path firstd))))
+
(print
"==================
I'm now creating a runconfigs.config file for you with a default section.
You can use this file to set variables for your tests based on the \"target\" (the combination
@@ -186,11 +195,11 @@
;; Now create a test and logpro file
(print
"==================
You now have the basic common files for your megatest setup. Next run
-\"megatest -gen-test\" to create a test.
+\"megatest -create-test <testname>\" to create a test.
Thank you for using Megatest.
You can edit your config files and create tests in the " path " directory
@@ -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 <http://www.gnu.org/licenses/>.
+
+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 <http://www.gnu.org/licenses/>.
+
+ 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 <http://www.gnu.org/licenses/>.
+;;
;;======================================================================
(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 <http://www.gnu.org/licenses/>.
(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,45 +32,53 @@
(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))
(define (http-transport:run hostn)
+ ;; Configurations for server
+ (tcp-buffer-size 2048)
+ (max-connections 2048)
(debug:print 2 *default-log-port* "Attempting to start the server ...")
(let* ((db #f) ;; (open-db)) ;; we don't want the server to be opening and closing the db unnecesarily
(hostname (get-host-name))
(ipaddrstr (let ((ipstr (if (string=? "-" hostn)
;; (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 +117,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 +265,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 +283,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
@@ -273,11 +309,11 @@
(if (vector-ref res 0) ;; this is the first flag or the second flag?
res ;; this is the *inner* vector? seriously? why?
(if (debug:debug-mode 11)
(let ((call-chain (get-call-chain))) ;; note: this code also called in nmsg-transport - consider consolidating it
(print-call-chain (current-error-port))
- (debug:print-error 11 *default-log-port* "error above occured at server, res=" res " message: " ((condition-property-accessor 'exn 'message) exn))
+ (debug:print-error 11 *default-log-port* "error above occured at server, res=" res) ;; " message: " ((condition-property-accessor 'exn 'message) exn))
(debug:print 11 *default-log-port* " server call chain:")
(pp (vector-ref res 1) (current-error-port))
(signal (vector-ref res 0)))
res))
(signal (make-composite-condition
@@ -292,12 +328,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,15 +382,18 @@
(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* ((sdat #f)
+ (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))
+ (begin ;; let ((sdat #f))
(thread-sleep! 0.01)
(debug:print-info 0 *default-log-port* "Waiting for server alive signature")
(mutex-lock! *heartbeat-mutex*)
(set! sdat *server-info*)
(mutex-unlock! *heartbeat-mutex*)
@@ -355,36 +400,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))
+ (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 +484,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 +530,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 "<h1>Dashboard</h1>" bdy "<br/> <br/> " )))
+
(define (http-transport:main-page)
(let ((linkpath (root-path)))
(conc "<head><h1>" (pathname-strip-directory *toppath*) "</h1></head>"
"<body>"
"Run area: " *toppath*
@@ -540,11 +658,11 @@
"<h2>Server Stats</h2>"
(http-transport:stats-table)
"<hr>"
(http-transport:runs linkpath)
"<hr>"
- (http-transport:run-stats)
+ ;; (http-transport:run-stats)
"</body>"
)))
(define (http-transport:stats-table)
(mutex-lock! *heartbeat-mutex*)
@@ -575,14 +693,14 @@
(map (lambda (p)
(conc "<a href=\"" p "\">" p "</a><br>"))
files))
" ")))
-(define (http-transport:run-stats)
+#;(define (http-transport:run-stats)
(let ((stats (open-run-close db:get-running-stats #f)))
(conc "<table>"
(string-intersperse
(map (lambda (stat)
(conc "<tr><td>" (car stat) "</td><td>" (cadr stat) "</td></tr>"))
stats)
" ")
"</table>")))
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 <http://www.gnu.org/licenses/>.
+;;
;;======================================================================
;;======================================================================
;; 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 <http://www.gnu.org/licenses/>.
;; (define itemdat '((ripeness "green ripe overripe")
;; (temperature "cool medium hot")
;; (season "summer winter fall spring")))
@@ -109,19 +117,69 @@
#f)))
res)))
;; Nope, not now, return null as of 6/6/2011
(define (items:check-valid-items class item)
- (let ((valid-values (let ((s (config-lookup *configdat* "validvalues" class)))
+ (let ((valid-values (let ((s (configf:lookup *configdat* "validvalues" class)))
(if s (string-split s) #f))))
(if valid-values
(if (member item valid-values)
item #f)
item)))
+
+;; '(("k1" "k2" "k3")
+;; ("a" "b" "c")
+;; ("d" "e" "f"))
+;;
+;; => '((("k1" "a")("k2" "b")("k3" "c"))
+;; (("k1" "d")("k2" "e")("k3" "f")))
+;;
+(define (items:first-row-intersperse data)
+ (if (< (length data) 2)
+ '()
+ (let ((header (car data))
+ (rows (cdr data)))
+ (map (lambda (row)
+ (map list header row))
+ rows))))
+
+;; k1/k2/k3
+;; a/b/c
+;; d/e/f
+;; => '(("k1" "k2" "k3")
+;; ("a" "b" "c")
+;; ("d" "e" "f"))
+;;
+;; => '((("k1" "a")("k2" "b")("k3" "c"))
+;; (("k1" "d")("k2" "e")("k3" "f")))
+;;
+(define (items:read-items-file fname ftype) ;; 'sxml 'slash 'space
+ (if (and fname (file-exists? fname))
+ (items:first-row-intersperse (case ftype
+ ((slash space)
+ (let ((splitter (case ftype
+ ((slash) (lambda (x)(string-split x "/")))
+ (else string-split))))
+ (debug:print 0 *default-log-port* "Reading " fname " of type " ftype)
+ (with-input-from-file fname
+ (lambda ()
+ (let loop ((inl (read-line))
+ (res '()))
+ (if (eof-object? inl)
+ res
+ (loop (read-line)(cons (splitter inl) res))))))))
+ ((sxml)(with-input-from-file fname read))
+ (else (debug:print 0 *default-log-port* "items file type " ftype " not recognised"))))
+ (begin
+ (if fname (debug:print 0 *default-log-port* "no items file " fname " found"))
+ '())))
(define (items:get-items-from-config tconfig)
- (let* ((have-items (hash-table-ref/default tconfig "items" #f))
+ (let* ((slashf (configf:lookup tconfig "itemopts" "slash")) ;; a/b/c\nd/e/f\n ...
+ (sxmlf (configf:lookup tconfig "itemopts" "sxml")) ;; '(("a" "b" "c")("d" "e" "f") ...)
+ (spacef (configf:lookup tconfig "itemopts" "space")) ;; a b c\nd e f\n ...
+ (have-items (hash-table-ref/default tconfig "items" #f))
(have-itable (hash-table-ref/default tconfig "itemstable" #f))
(items (hash-table-ref/default tconfig "items" '()))
(itemstable (hash-table-ref/default tconfig "itemstable" '())))
(debug:print 5 *default-log-port* "items: " items " itemstable: " itemstable)
(set! items (map (lambda (item)
@@ -132,16 +190,23 @@
(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 (or (not (null? items))(not (null? itemstable)))
+ (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))
+ slashf
+ sxmlf
+ spacef)
(append (item-assoc->item-list items)
- (item-table->item-list itemstable))
+ (item-table->item-list itemstable)
+ (items:read-items-file slashf 'slash)
+ (items:read-items-file sxmlf 'sxml)
+ (items:read-items-file spacef 'space))
'(()))))
;; (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 <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <stdarg.h>
+
+#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 <stdlib.h>
+#include <stdio.h>
+#include <stdarg.h>
+#include <string.h>
+
+#undef __IUPDEF_H
+#include <iup.h>
+#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 " <X>")
- (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 " <L>")
- (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 <http://www.gnu.org/licenses/>.
+;;
+(define *java-script-lib* (conc (common:get-install-area) "/share/js/jquery-3.1.0.slim.min.js"))
ADDED junk/cube.scm
Index: junk/cube.scm
==================================================================
--- /dev/null
+++ junk/cube.scm
@@ -0,0 +1,103 @@
+(use gl glut 3viewer typed-records matchable)
+
+(define red '#f32(1 0 0 1)) ;;
+(define blue '#f32(0 0 1 1)) ;;
+(define green '#f32(0 1 0 1)) ;;
+(define yellow '#f32(1 1 0 1)) ;;
+(define white '#f32(1 1 1 1)) ;;
+(define orange '#f32(1 0.5 0 1)) ;;
+(define black '#f32(0 0 0 1)) ;;
+
+(define colors
+ `((1 . ,red ) ;; red
+ (2 . ,blue ) ;; blue
+ (3 . ,green ) ;; green
+ (4 . ,yellow ) ;; yellow
+ (5 . ,white ) ;; white
+ (6 . ,orange ) ;; orange
+ (7 . ,black ) ;; black
+ ))
+
+;; retrive color
+(define (rc c)
+ (alist-ref c colors))
+
+(defstruct cspec
+ (x 0)
+ (y 0)
+ (z 0)
+ (n (rc 1)) ;; north
+ (s (rc 1)) ;; south
+ (e (rc 1)) ;; east
+ (w (rc 1)) ;; west
+ (t (rc 1)) ;; top
+ (b (rc 1))) ;; bottom
+
+(define a 0)
+
+(define (spin id)
+ (set! a (modulo (+ a 1) 360)))
+
+(define (colorize id col)
+ (gl:Materialfv
+ gl:FRONT_AND_BACK gl:AMBIENT_AND_DIFFUSE
+ (if (object-highlighted? id)
+ '#f32(1 1 0 1)
+ col)))
+
+(define (make-cuber cspec)
+ (lambda (id)
+ (gl:Translatef (cspec-x cspec)(cspec-y cspec)(cspec-z cspec))
+ (draw-side id (cspec-w cspec)) ;; west side
+ (gl:Translatef 0 1 0)
+ (gl:Rotatef 90 1 0 0)
+ (draw-side id (cspec-e cspec)) ;; east side
+ (gl:Translatef 0 0 1)
+ (gl:Rotatef 90 0 1 0)
+ (draw-side id (cspec-n cspec)) ;; east side
+ (gl:Translatef 0 0 1)
+ (gl:Rotatef 90 0 1 0)
+ (draw-side id (cspec-s cspec)) ;; east side
+ (gl:Translatef 0 0 1)
+ (gl:Rotatef 90 0 1 0)
+ (draw-side id (cspec-t cspec)) ;; east side
+ (gl:Translatef 0 1 0)
+ (gl:Rotatef 90 1 0 0)
+ (draw-side id (cspec-b cspec)) ;; east side
+ ))
+
+(define (draw-side id color)
+ (colorize id color) ;; '#f32(1 0 0 1))
+ (gl:Begin gl:POLYGON)
+ (gl:Vertex2f 0 0)
+ (gl:Vertex2f 0 1)
+ (gl:Vertex2f 1 1)
+ (gl:Vertex2f 1 0)
+ (gl:End)
+ )
+
+(define data
+ (map (lambda (inl)
+ (map string->number (string-split inl)))
+ (with-input-from-file "data.txt"
+ read-lines)))
+
+(print "data: " data)
+
+(use trace)
+
+;; (add-object draw-cube animate: spin select: (lambda _ (print "oink!")))
+;; (add-object draw-polygon animate: spin select: (lambda _ (print "oink!")))
+(gl:Clear gl:COLOR_BUFFER_BIT)
+(for-each
+ (lambda (dat)
+ ;; (let ((c1 (make-cspec e: red w: blue n: green s: yellow t: white b: orange)))
+ (match dat
+ ((x y z n s e w t b)
+ (let ((c1 (make-cspec x: x y: y z: z n: (rc n) s: (rc s) e: (rc e) w: (rc w) t: (rc t) b: (rc b))))
+ (pp (cspec->alist c1))
+ (add-object (make-cuber c1) select: (lambda _ (print "oink!")))))
+ (else (print "bad object " dat))))
+ data)
+(gl:Flush)
+(start-viewer)
ADDED junk/data.txt
Index: junk/data.txt
==================================================================
--- /dev/null
+++ junk/data.txt
@@ -0,0 +1,1 @@
+0 0 0 1 2 3 4 5 6
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 <http://www.gnu.org/licenses/>.
+
;;======================================================================
(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 <http://www.gnu.org/licenses/>.
+;;
;;======================================================================
;; 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 <http://www.gnu.org/licenses/>.
;;======================================================================
;; 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"))
@@ -79,23 +85,40 @@
((equal? status "PASS") "PASS") ;; skip the message part if status is pass
(status (conc (configf:lookup dat "final" "exit-status") ": " (if msg msg "no message")))
(else #f)))
#f)))
-(define (launch:runstep ezstep run-id test-id exit-info m tal testconfig)
+(define (launch:runstep ezstep run-id test-id exit-info m tal testconfig) ;;; TODO: deprecate me in favor of ezsteps.scm
(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
- (stepcmd (list-ref stepparts 3))
+ ;; (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 (if (and (list? stepparts)
+ (> (length stepparts) 1))
+ (list-ref stepparts 2)
+ #f)) ;; 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 (if (and (list? stepparts)
+ (> (length stepparts) 2))
+ (list-ref stepparts 3)
+ (conc "# error, no command for step "stepname)))
(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 +127,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 +145,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 +181,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 +203,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 +274,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 +308,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 +328,56 @@
;; 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)))
+ (setenv "MT_STEP_NAME" stepname)
+ ;; 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)
@@ -328,34 +384,63 @@
start-seconds)))))
(kill-tries 0))
;; (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))))
- (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)
+ (disk-free (get-df (current-directory)))
+ (last-sync (current-seconds)))
+ (common:telemetry-log "zombie" (conc "launch:monitor-job - top of loop encountered at "(current-seconds)" with last-sync="last-sync))
+ (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))
+
+ (test-info (rmt:get-test-info-by-id run-id test-id))
+ (state (db:test-get-state test-info))
+ (status (db:test-get-status test-info))
+ (kill-reason "no kill reason specified")
+ (kill-job? #f))
+ (common:telemetry-log "zombie" (conc "launch:monitor-job - decision time encountered at "(current-seconds)" with last-sync="last-sync" do-sync="do-sync" over-time="over-time" update-period="update-period))
+ (cond
+ ((test-get-kill-request run-id test-id)
+ (set! kill-reason "KILLING TEST since received kill request (KILLREQ)")
+ (set! kill-job? #t))
+ ((and runtlim (> (- (current-seconds) start-seconds) runtlim))
+ (set! kill-reason (conc "KILLING TEST DUE TO TIME LIMIT EXCEEDED! Runtime=" (- (current-seconds) start-seconds) " seconds, limit=" runtlim))
+ (set! kill-job? #t))
+ ((equal? status "DEAD")
+ (tests:update-central-meta-info run-id test-id new-cpu-load new-disk-free (calc-minutes) #f #f)
+ (rmt:set-state-status-and-roll-up-items run-id test-id 'foo "RUNNING" "n/a" "was marked dead; really still running.")
+ ;;(set! kill-reason "KILLING TEST because it was marked as DEAD by launch:handle-zombie-tests (might indicate really overloaded server or else overzealous setup.deadtime)") ;; MARK RUNNING
+ (set! kill-job? #f)))
+
+ (debug:print 4 *default-log-port* "cpu: " new-cpu-load " disk: " new-disk-free " last-sync: " last-sync " do-sync: " do-sync)
+ (launch:handle-zombie-tests run-id)
+ (when do-sync
+ ;;(with-output-to-file (conc (getenv "MT_TEST_RUN_DIR") "/last-loadinfo.log" #:append)
+ ;; (lambda () (pp (list (current-seconds) new-cpu-load new-disk-free (calc-minutes)))))
+ (common:telemetry-log "zombie" (conc "launch:monitor-job - dosync started at "(current-seconds)))
+ (tests:update-central-meta-info run-id test-id new-cpu-load new-disk-free (calc-minutes) #f #f)
+ (common:telemetry-log "zombie" (conc "launch:monitor-job - dosync finished at "(current-seconds))))
+
(if kill-job?
(begin
+ (debug:print-info 0 *default-log-port* "proceeding to kill test: "kill-reason)
(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
;; between tries?
(let* ((pid1 (launch:einf-pid exit-info)) ;; (vector-ref exit-info 0))
@@ -385,23 +470,28 @@
#f
(process-signal pid-num signal/kill)))
(process:get-sub-pids pid))))
;; (debug:print-info 0 *default-log-port* "not killing process " pid " as it is not alive"))))
pids)
- (tests:test-set-status! run-id test-id "KILLED" "KILLED" (args:get-arg "-m") #f))
+ ;; BB: question to Matt -- does the tests:test-state-status! encompass rollup to toplevel? If not, should it?
+ (tests:test-set-status! run-id test-id "KILLED" "KILLED" (conc (args:get-arg "-m")" "kill-reason) #f)) ;; BB ADDED kill-reason -- confirm OK with Matt
(begin
(debug:print-error 0 *default-log-port* "Nothing to kill, pid1=" pid1 ", pid2=" pid2)
- (tests:test-set-status! run-id test-id "KILLED" "FAILED TO KILL" (args:get-arg "-m") #f)
+ (tests:test-set-status! run-id test-id "KILLED" "FAILED TO KILL" (conc (args:get-arg "-m")" "kill-reason) #f) ;; BB ADDED kill-reason -- confirm OK with Matt
)))
(mutex-unlock! m)
- ;; no point in sticking around. Exit now.
+ ;; no point in sticking around. Exit now. But run end of run before exiting?
+ (launch:end-of-run-check run-id)
(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 +504,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,98 +530,92 @@
(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)
- (print "Received signal " signum ", cleaning up before exit. Please wait...")
+ (print "Received signal " signum ", cleaning up before exit (set this test to COMPLETED/ABORT) . Please wait...")
(let ((th1 (make-thread (lambda ()
- (rmt:test-set-state-status run-id test-id "INCOMPLETE" "KILLED" #f)
+ (print "set test to COMPLETED/ABORT begin.")
+ (rmt:test-set-state-status run-id test-id "COMPLETED" "ABORT" "received kill signal")
+ (print "set test to COMPLETED/ABORT complete.")
(print "Killed by signal " signum ". Exiting")
- (thread-sleep! 1)
(exit 1))))
(th2 (make-thread (lambda ()
- (thread-sleep! 2)
+ (thread-sleep! 20)
(debug:print 0 *default-log-port* "Done")
(exit 4)))))
(thread-start! th2)
(thread-start! th1)
(thread-join! th2)))))
@@ -539,43 +624,64 @@
) ;; (set-signal-handler! signal/stop sighand)
;; 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))
+ (let* ((test-info (let loop ((tries 0))
+ (let ((tinfo (rmt:get-test-info-by-id run-id test-id)))
+ (if tinfo
+ tinfo
+ (if (> tries 5)
+ #f
+ (begin
+ (thread-sleep! (+ 1 (* tries 10)))
+ (loop (+ tries 1))))))))
+ (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)
+
+ (rmt:general-call 'set-test-start-time #f test-id)
+ (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:general-call 'set-test-start-time #f test-id)
(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"))
(debug:print-error 0 *default-log-port* "test state is " (db:test-get-state test-info) ", cannot proceed")
(exit))))
-
- (debug:print 2 *default-log-port* "Exectuing " test-name " (id: " test-id ") on " (get-host-name))
+
+ ;; cleanup prior execution's steps
+ (rmt:delete-steps-for-test! run-id test-id)
+
+ (debug:print 2 *default-log-port* "Executing " 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 +689,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 +767,18 @@
;;(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
+ (let ((vars (string-split blacklist)))
+ (save-environment-as-files "megatest" ignorevars: vars)
+ (for-each (lambda (var)
+ (unsetenv var))
+ vars))
+ (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 +786,40 @@
;; (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)))
+ (scripts (configf:get-section tconfig "scripts")))
+ ;; create .testconfig file
+ (configf:write-alist tconfig tconfig-tmpfile)
+ (file-move tconfig-tmpfile tconfig-fname #t)
+ (delete-file* ".final-status")
+
+ ;; extract scripts from testconfig and write them to files in test run dir
+ (for-each
+ (lambda (scriptdat)
+ (match scriptdat
+ ((name content)
+ (with-output-to-file name
+ (lambda ()
+ (print content)
+ (change-file-mode name (bitwise-ior perm/irwxg perm/irwxu)))))
+ (else
+ (debug:print-info 0 "Invalid script definiton found in [scripts] section of testconfig. \"" scriptdat "\""))))
+ scripts))
;;
(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 +826,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)
@@ -706,12 +846,11 @@
;; only state and status needed - use lazy routine
(testinfo (rmt:get-testinfo-state-status run-id test-id)))
;; Am I completed?
(if (member (db:test-get-state testinfo) '("REMOTEHOSTSTART" "RUNNING")) ;; NOTE: It should *not* be REMOTEHOSTSTART but for reasons I don't yet understand it sometimes gets stuck in that state ;; (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
+ ;; "COMPLETED" ;; (db:test-get-state testinfo))) ;; else preseve the state as set within the test
)
(new-status (cond
((not (launch:einf-exit-status exit-info)) "FAIL") ;; job failed to run ... (vector-ref exit-info 1)
((eq? (launch:einf-rollup-status exit-info) 0) ;; (vector-ref exit-info 3)
;; if the current status is AUTO then defer to the calculated value (i.e. leave this AUTO)
@@ -724,10 +863,14 @@
((eq? (launch:einf-rollup-status exit-info) 4) "WAIVED")
((eq? (launch:einf-rollup-status exit-info) 5) "ABORT")
((eq? (launch:einf-rollup-status exit-info) 6) "SKIP")
(else "FAIL")))) ;; (db:test-get-status testinfo)))
(debug:print-info 1 *default-log-port* "Test exited in state=" (db:test-get-state testinfo) ", setting state/status based on exit code of " (launch:einf-exit-status exit-info) " and rollup-status of " (launch:einf-rollup-status exit-info))
+
+ ;; Leave a .final-status file for each sub-test
+ (tests:save-final-status run-id test-id)
+
(tests:test-set-status! run-id
test-id
new-state
new-status
(args:get-arg "-m") #f)
@@ -734,19 +877,111 @@
;; need to update the top test record if PASS or FAIL and this is a subtest
;; NO NEED TO CALL set-state-status-and-roll-up-items HERE, THIS IS DONE IN set-state-status-and-roll-up-items called by tests:test-set-status!
))
;; for automated creation of the rollup html file this is a good place...
(if (not (equal? item-path ""))
- (tests:summarize-items run-id test-id test-name #f))
+ (tests:summarize-items run-id test-id test-name #f))
(tests:summarize-test run-id test-id) ;; don't force - just update if no
+ ;; Leave a .final-status file for the top level test
+ (tests:save-final-status run-id test-id)
(rmt:update-run-stats run-id (rmt:get-raw-run-stats run-id)))
(mutex-unlock! m)
+ (launch:end-of-run-check run-id )
(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))))
+ )))
+
+;; Spec for End of test
+;; At end of each test call, after marking self as COMPLETED do run-state-status-rollup
+;; At transition to run COMPLETED/X do hooks
+;; Definition: test_dead if event_time + duration + 1 minute? < current_time AND
+;; we can prove the process is not alive (ssh host pstree -A pid)
+;; if dead safe to mark the test as killed in the db
+;; State/status table
+;; new
+;; 100% COMPLETED/ (PASS,FAIL,ABORT etc.) ==> COMPLETED / X where X is same as itemized rollup
+;; > 3 RUNNING with not test_dead do nothing (run should already be RUNNING/ na
+;; > 0 RUNNING and test_dead then send KILLREQ ==> COMPLETED
+;; 0 RUNNING ==> this is actually the first condition, should not get here
+
+(define (launch:end-of-run-check run-id )
+ (let* ((not-completed-cnt (rmt:get-not-completed-cnt run-id))
+ (running-cnt (rmt:get-count-tests-running-for-run-id run-id))
+ (all-test-launched (rmt:get-var (conc "lunch-complete-" run-id)))
+ (current-state (rmt:get-run-state run-id))
+ (current-status (rmt:get-run-status run-id)))
+ ;;get-vars run-id to query metadata table to check if all completed. if all-test-launched = yes then only not-completed-cnt = 0 means everyting is completed if no entry found in the table do nothing
+ (debug:print 0 *default-log-port* "Running test cnt :" running-cnt)
+ (rmt:set-state-status-and-roll-up-run run-id current-state current-status)
+ (runs:update-junit-test-reporter-xml run-id)
+ (cond
+ ((and all-test-launched (eq? not-completed-cnt 0) (equal? all-test-launched "yes" ))
+ (if (and (equal? (rmt:get-var (conc "end-of-run-" run-id)) "no") (common:simple-lock (conc "endOfRun" run-id)))
+ (begin
+ (debug:print 4 *default-log-port* "look for post hook. currseconds: " (current-seconds) " EOR " (rmt:get-var (conc "end-of-run-" run-id)))
+ (debug:print 0 *default-log-port* "End of Run Detected.")
+ (rmt:set-var (conc "end-of-run-" run-id) "yes")
+ ;(thread-sleep! 10)
+ (runs:run-post-hook run-id)
+ (debug:print 4 *default-log-port* "currseconds: " (current-seconds)" eor: " (rmt:get-var (conc "end-of-run-" run-id)))
+ (common:simple-unlock (conc "endOfRun" run-id)))
+ (debug:print 0 *default-log-port* "End of Run Detected but not running post hook. This should happen when eor is set to yes. This will happen only when 2 tests exit at smae time. eor= " (rmt:get-var (conc "end-of-run-" run-id)))))
+ ((> running-cnt 3)
+ (debug:print 0 *default-log-port* "There are " running-cnt " tests running." ))
+ ((> running-cnt 0)
+ (debug:print 0 *default-log-port* "running cnt > 0 but <= 3 kill-running-tests-if-dead" )
+ (let ((kill-cnt (launch:kill-tests-if-dead run-id)))
+ (if (and all-test-launched (equal? all-test-launched "yes") (eq? kill-cnt running-cnt))
+ (launch:end-of-run-check run-id)))) ;;todo
+ (else (debug:print 0 *default-log-port* "Should it get here?? May be everything is not launched yet. Running test cnt:" running-cnt " Not completed test cnt:" not-completed-cnt)
+ (let* ((not-completed-tests (rmt:get-tests-for-run run-id "%" `("NOT_STARTED" "RUNNING" "LAUNCHED" "REMOTEHOSTSTART") `() #f #f #f #f #f #f #f #f)))
+ (if (> (length not-completed-tests) 0)
+ (let loop ((running-test (car not-completed-tests))
+ (tal (cdr not-completed-tests)))
+ (let* ((test-name (vector-ref running-test 2))
+ (item-path (vector-ref running-test 11)))
+ (debug:print 0 *default-log-port* "test " test-name "/" item-path " not completed")
+ (if (not (null? tal))
+ (loop (car tal) (cdr tal)))))))))))
+
+(define (launch:is-test-alive host pid)
+ (if (and host pid (not (equal? host "n/a")))
+ (let* ((cmd (conc "ssh " host " pstree -A " pid))
+ (output (with-input-from-pipe cmd read-lines)))
+ (debug:print 2 *default-log-port* "Running " cmd " received " output)
+ (if (eq? (length output) 0)
+ #f
+ #t))
+ #t))
+
+(define (launch:kill-tests-if-dead run-id)
+ (let* ((running-tests (rmt:get-tests-for-run run-id "%" `("RUNNING" "LAUNCHED" "REMOTEHOSTSTART") `() #f #f #f #f #f #f #f #f)))
+ (let loop ((running-test (car running-tests))
+ (tal (cdr running-tests))
+ (kill-cnt 0))
+ (let* ((test-name (vector-ref running-test 2))
+ (item-path (vector-ref running-test 11))
+ (test-id (vector-ref running-test 0))
+ (host (vector-ref running-test 6))
+ (pid (rmt:test-get-top-process-pid run-id test-id))
+ (event-time (vector-ref running-test 5))
+ (duration (vector-ref running-test 12))
+ (flag 0)
+ (curr-time (current-seconds)))
+ (if (and (< (+ event-time duration 600) curr-time) (not (launch:is-test-alive host pid))) ;;test has not updated duration in last 10 min then likely its not running but confirm before marking it as killed
+ (begin
+ (debug:print 0 *default-log-port* "test " test-name "/" item-path " needs to be killed")
+ (set! flag 1)
+ (rmt:set-state-status-and-roll-up-items run-id test-name item-path "KILLREQ" "n/a" #f)))
+ (if (not (null? tal))
+ (loop (car tal) (cdr tal) (+ kill-cnt flag))
+ (+ kill-cnt flag))))))
+;; 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 +993,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 +1029,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?))
- (toppath (or *toppath* areapath (getenv "MT_RUN_AREA_HOME"))) ;; preserve toppath
-
- (runname (common:args-get-runname))
+ (let* ((use-cache (common:use-cache?)) ;; BB- use-cache checks *configdat* for use-cache setting. We do not have *configdat*. Bootstrapping problem here.
+ (toppath (common:get-toppath areapath))
(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,21 +1129,24 @@
*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
(debug:print-error 0 *default-log-port* "you are not in a megatest area!")
(exit 1)))
(setenv "MT_RUN_AREA_HOME" *toppath*)
;; the seed read is done, now read runconfigs, cache it then read megatest.config one more time and cache it
- (let* ((keys (rmt:get-keys))
+ (let* ((keys (common:list-or-null (rmt:get-keys)
+ message: "Failed to retrieve keys in launch.scm. Please report this to the developers."))
(key-vals (keys:target->keyval keys target))
(linktree (common:get-linktree)) ;; (or (getenv "MT_LINKTREE")(if *configdat* (configf:lookup *configdat* "setup" "linktree") #f)))
; (if *configdat*
; (configf:lookup *configdat* "setup" "linktree")
; (conc *toppath* "/lt"))))
@@ -889,26 +1158,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 +1204,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 +1226,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,20 +1238,43 @@
(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.
*toppath*)))
+
(define (get-best-disk confdat testconfig)
(let* ((disks (or (and testconfig (hash-table-ref/default testconfig "disks" #f))
(hash-table-ref/default confdat "disks" #f)))
(minspace (let ((m (configf:lookup confdat "setup" "minspace")))
@@ -967,14 +1281,50 @@
(string->number (or m "10000")))))
(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
+ (begin ;; DEAD CODE PATH - REVISIT!
+;; (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)))))))))))
+ ;; no disks definition - use mtrah/runs, fall back to currdir/runs
+ (let* ((toppath (or *toppath*
+ (common:get-toppath *toppath*)
+ (begin
+ (debug:print-error 0 *default-log-port* "Creating runs dir in current directory, this is probably not what you wanted. Please check your setup.")
+ (current-directory))))
+ (runsdir (conc toppath "/runs")))
+ (if (not (file-exists? runsdir))(create-directory runsdir))
+ runsdir)
+ ))) ;; 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 (configf: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:
;;
;; <linkdir> - <target> - <testname> -.
;; |
@@ -1010,11 +1360,11 @@
(toptest-path (conc disk-path (if contour (conc "/" contour) "") "/" testtop-base))
(test-path (conc disk-path (if contour (conc "/" contour) "") "/" test-base))
;; ensure this exists first as links to subtests must be created there
(linktree (common:get-linktree))
- ;; WAS: (let ((rd (config-lookup *configdat* "setup" "linktree")))
+ ;; WAS: (let ((rd (configf:lookup *configdat* "setup" "linktree")))
;; (if rd rd (conc *toppath* "/runs"))))
;; which seems wrong ...
(lnkbase (conc linktree (if contour (conc "/" contour) "") "/" target "/" runname))
(lnkpath (conc lnkbase "/" testname))
@@ -1028,19 +1378,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.
@@ -1053,29 +1408,29 @@
(let ((iterated-parent (pathname-directory (conc lnkpath "/" item-path))))
(debug:print-info 2 *default-log-port* "Creating iterated parent " iterated-parent)
(handle-exceptions
exn
(begin
- (debug:print-error 0 *default-log-port* " Failed to create directory " iterated-parent ((condition-property-accessor 'exn 'message) exn) ", exiting")
- (exit 1))
+ (debug:print-error 0 *default-log-port* " Failed to create directory " iterated-parent ((condition-property-accessor 'exn 'message) exn) ", continuing but link tree may be corrupted")
+ #;(exit 1))
(create-directory iterated-parent #t))))
(if (symbolic-link? lnkpath)
(handle-exceptions
exn
(begin
- (debug:print-error 0 *default-log-port* " Failed to remove symlink " lnkpath ((condition-property-accessor 'exn 'message) exn) ", exiting")
- (exit 1))
+ (debug:print-error 0 *default-log-port* " Failed to remove symlink " lnkpath ((condition-property-accessor 'exn 'message) exn) ", continuing but link tree may be corrupted.")
+ #;(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")
- (exit 1))
+ (debug:print-error 0 *default-log-port* " Failed to create symlink " lnkpath ((condition-property-accessor 'exn 'message) exn) ", continuing but link tree may be corrupted.")
+ #;(exit 1))
(create-symbolic-link toptest-path lnkpath)))
;; NB - This was not working right - some top tests are not getting the path set!!!
;;
;; Do the setting of this record after the paths are created so that the shortdir can
@@ -1090,11 +1445,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,37 +1484,47 @@
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)
;;
(create-work-area run-id run-info keyvals test-id test-src-path disk-path testname itemdat remtries: (- remtries 1)))
(list #f #f)))))
+
+
+(define (launch:handle-zombie-tests run-id)
+ (let* ((key (conc "zombiescan-runid-"run-id))
+ (now (current-seconds))
+ (threshold (- (current-seconds) (* 2 (or (configf:lookup-number *configdat* "setup" "deadtime") 120))))
+ (val (rmt:get-var key))
+ (do-scan?
+ (cond
+ ((not val)
+ #t)
+ ((< val threshold)
+ #t)
+ (else #f))))
+ (when do-scan?
+ (debug:print 1 *default-log-port* "INFO: search and mark zombie tests")
+ (rmt:set-var key (current-seconds))
+ (rmt:find-and-mark-incomplete run-id #f))))
+
+
+
+
;; 1. look though disks list for disk with most space
;; 2. create run dir on disk, path name is meaningful
;; 3. create link from run dir to megatest runs area
;; 4. remotely run the test on allocated host
@@ -1166,17 +1531,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
@@ -1192,22 +1571,23 @@
;; for tconfig, why do we allow fallback to test-conf?
(tconfig (or (tests:get-testconfig test-name item-path tregistry #t force-create: #t)
(begin
(debug:print 0 *default-log-port* "WARNING: falling back to pre-calculated testconfig. This is likely not desired.")
test-conf))) ;; force re-read now that all vars are set
- (useshell (let ((ush (config-lookup *configdat* "jobtools" "useshell")))
+ (useshell (let ((ush (configf:lookup *configdat* "jobtools" "useshell")))
(if ush
(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
- ;; (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"))
+ (runscript (configf:lookup tconfig "setup" "runscript"))
+ (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 (configf:lookup tconfig "requirements" "diskspace"))
+ ;; (memory (configf:lookup tconfig "requirements" "memory"))
+ ;; (hosts (configf:lookup *configdat* "jobtools" "workhosts")) ;; I'm pretty sure this was never completed
+ (remote-megatest (configf:lookup *configdat* "setup" "executable"))
(run-time-limit (or (configf:lookup tconfig "requirements" "runtimelim")
(configf:lookup *configdat* "setup" "runtimelim")))
;; FIXME SOMEDAY: not good how this is so obtuse, this hack is to
;; allow running from dashboard. Extract the path
;; from the called megatest and convert dashboard
@@ -1219,11 +1599,11 @@
(case (string->symbol exe)
((dboard) "../megatest")
((mtest) "../megatest")
((dashboard) "megatest")
(else exe)))))
- (launcher (common:get-launcher *configdat* test-name item-path)) ;; (config-lookup *configdat* "jobtools" "launcher"))
+ (launcher (common:get-launcher *configdat* test-name item-path)) ;; (configf:lookup *configdat* "jobtools" "launcher"))
(test-sig (conc (common:get-testsuite-name) ":" test-name ":" item-path)) ;; (item-list->path itemdat))) ;; test-path is the full path including the item-path
(work-area #f)
(toptest-work-area #f) ;; for iterated tests the top test contains data relevant for all
(diskpath #f)
(cmdparms #f)
@@ -1283,11 +1663,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 +1676,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 +1709,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 " "))
@@ -1380,11 +1766,11 @@
;; - it it's run directory correct for the test
;; - is there a controlling mtest (maybe stuck)
;; 2. if recovery is needed watch pid
;; - when it exits take the exit code and do the needful
;;
- (let* ((pid (rmt:test-get-top-process-id run-id test-id))
+ (let* ((pid (rmt:test-get-top-process-pid run-id test-id))
(psres (with-input-from-pipe
(conc "ps -F -u " (current-user-name) " | grep -E '" pid " ' | grep -v 'grep -E " pid "'")
(lambda ()
(read-line))))
(rundir (if (string? psres) ;; real process owned by user
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 <http://www.gnu.org/licenses/>.
+;;
-(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 <http://www.gnu.org/licenses/>.
+
(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 <http://www.gnu.org/licenses/>.
+
;; 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.6558)
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 <http://www.gnu.org/licenses/>.
+
+## 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 #{getenv USER}:admin 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 <http://www.gnu.org/licenses/>.
+;;
;; (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,82 @@
(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. Use -kill-wait to override the 10 second
+ per test wait after kill delay.
+ -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 +126,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 <age> : 120d,3h,20m to apply only to runs older than the
+ specified age. NB// M=month, m=minute
+ -actions <action>[,...] : actions to take; print,remove-runs,archive,kill-runs
+ -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 <key> in runconfigs instead of default TESTPATT if -testpatt and -tagexpr are not specified
+ -modepatt key : load testpatt from <key> in runconfigs instead of default TESTPATT if -testpatt and -tagexpr are not specified
-tagexpr tag1,tag2%,.. : select tests with tags matching expression
+
Test helpers (for use inside tests)
-step stepname
-test-status : set the state and status of a test (use :state and :status)
-setlog logfname : set the path/filename to the final log relative to the test
@@ -133,21 +177,24 @@
-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 syncing to pgdb
+ -run-tag tagname : add a tag to a run while syncing 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
@@ -179,12 +226,21 @@
will substitute %s for the sheet name in generating
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
+ cmd: keep-html, restore, save, save-remove, get (use
+ -dest to set destination), -include path1,path2... to get or save specific files
+ -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 <patt> -target-patt <patt> -dumpmode <csv,json,plain-text>
+ -list-test-time : list time requered to complete each test in a run. It following following arguments
+ -runname <patt> -target <patt> -dumpmode <csv,json,plain-text>
+
+
+
Diff report
-diff-rep : generate diff report (must include -src-target, -src-runname, -target, -runname
and either -diff-email or -diff-html)
-src-target <target>
@@ -228,33 +284,42 @@
":state"
"-state"
":status"
"-status"
"-list-runs"
+ "-testdata-csv"
"-testpatt"
"--modepatt"
+ "-modepatt"
"-tagexpr"
"-itempatt"
"-setlog"
"-set-toplog"
"-runstep"
"-logpro"
"-m"
"-rerun"
+
"-days"
"-rename-run"
"-to"
+ "-dest"
;; values and messages
":category"
":variable"
":value"
":expected"
":tol"
":units"
;; misc
"-start-dir"
+ "-run-patt"
+ "-target-patt"
"-contour"
+ "-area-tag"
+ "-area"
+ "-run-tag"
"-server"
"-transport"
"-port"
"-extract-ods"
"-pathmod"
@@ -261,11 +326,24 @@
"-env2file"
"-envcap"
"-envdelta"
"-setvars"
"-set-state-status"
+
+ ;; move runs stuff here
+ "-remove-keep"
"-set-run-status"
+ "-age"
+
+ ;; archive
+ "-archive"
+ "-actions"
+ "-precmd"
+ "-include"
+ "-exclude-rx"
+ "-exclude-rx-from"
+
"-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 +353,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"
@@ -289,10 +367,11 @@
"-src-target"
"-src-runname"
"-diff-email"
"-sync-to"
"-pgsync"
+ "-kill-wait" ;; wait this long before removing test (default is 10 sec)
"-diff-html"
)
(list "-h" "-help" "--help"
"-manual"
"-version"
@@ -310,22 +389,29 @@
"-rerun-clean"
"-rerun-all"
"-clean-cache"
"-no-cache"
"-cache-db"
+ "-cp-eventtime-to-publishtime"
"-use-db-cache"
"-prepend-contour"
+
+
;; misc
"-repl"
"-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 +423,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 +437,11 @@
"-convert-to-norm"
"-convert-to-old"
"-import-megatest.db"
"-sync-to-megatest.db"
-
+ "-sync-brute-force"
"-logging"
"-v" ;; verbose 2, more than normal (normal is 1)
"-q" ;; quiet 0, errors/warnings only
"-diff-rep"
@@ -372,11 +461,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,53 +478,72 @@
;; 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
(thread-start! *watchdog*)))
;; bracket open-output-file with code to make leading directory if it does not exist and handle exceptions
-(define (open-logfile logpath)
+(define (open-logfile logpath-in)
(condition-case
- (let* ((log-dir (or (pathname-directory logpath) ".")))
+ (let* ((log-dir (or (pathname-directory logpath-in) "."))
+ (fname (pathname-strip-directory logpath-in))
+ (logpath (if (> (string-length fname) 250)
+ (let ((newlogf (conc log-dir "/" (common:get-signature fname) ".log")))
+ (debug:print 0 *default-log-port* "WARNING: log file " logpath-in " path too long, converted to " newlogf)
+ newlogf)
+ logpath-in)))
(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))))
-
+;; 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 +561,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,23 +600,37 @@
(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
;;======================================================================
(debug:setup)
(if (args:get-arg "-logging")(set! *logging* #t))
-(if (debug:debug-mode 3) ;; we are obviously debugging
- (set! open-run-close open-run-close-no-exception-handling))
+;;(if (debug:debug-mode 3) ;; we are obviously debugging
+;; (set! open-run-close open-run-close-no-exception-handling))
(if (args:get-arg "-itempatt")
(let ((newval (conc (args:get-arg "-testpatt") "/" (args:get-arg "-itempatt"))))
(debug:print 0 *default-log-port* "WARNING: -itempatt has been deprecated, please use -testpatt testpatt/itempatt method, new testpatt is "newval)
(hash-table-set! args:arg-hash "-testpatt" newval)
@@ -534,11 +656,13 @@
;; 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 (common:args-get-target)
+ (args:get-arg "-runname")
+ toppath)))
(if (args:get-arg "-env2file")
(begin
(save-environment-as-files (args:get-arg "-env2file"))
(set! *didsomething* #t)))
@@ -690,11 +814,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 +874,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 +962,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 +985,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 +1026,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,23 +1054,34 @@
;; 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)(target-in #f)(runname-in #f)(keys-in #f)(keyvals-in #f)) ;; #f is "use default"
(let* ((runrec (runs:runrec-make-record))
- (target (common:args-get-target)))
+ (target (or target-in (common:args-get-target))) ;; eventually get rid of the call to common:args-get-target
+ (runname (or runname-in
+ (args:get-arg "-runname"))) ;; eventually get rid of the get-arg calls
+ (testpatt (or (args:get-arg "-testpatt")
+ (and (eq? action 'archive) ;; if it is an archive command fallback to MT_TEST_NAME and MT_ITEMPATH
+ (common:get-full-test-name))
+ (and (eq? action 'kill-runs)
+ "%/%") ;; I'm just guessing that this is correct :(
+ (common:args-get-testpatt #f) ;; (args:get-arg "-testpatt")))
+ ))) ;;
(cond
((not target)
- (debug:print-error 0 *default-log-port* "Missing required parameter for " action ", you must specify -target or -reqtarg")
+ (debug:print-error 0 *default-log-port* "Missing required parameter for "
+ action ", you must specify -target or -reqtarg")
(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")
+ ((not 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"))
- (debug:print-error 0 *default-log-port* "Missing required parameter for " action ", you must specify the test pattern with -testpatt")
+ ((not testpatt)
+ (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
(debug:print-error 0 *default-log-port* "Attempted " action "on test(s) but run area config file not found")
@@ -953,23 +1090,76 @@
(begin
;; check for correct version, exit with message if not correct
(common:exit-on-version-changed)
(runs:operate-on action
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)
+ runname
+ 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 (common:args-get-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 <target name>")
+ (exit 1))
+ ((not runname-patt)
+ (debug:print-error 0 *default-log-port* "Missing runname, must specify runname for -kill-rerun with -runname <run name>")
+ (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 <target name>")
+ (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 <runname name>")
+ (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 +1213,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
+ (rmt: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% ...
;;
@@ -1113,11 +1407,11 @@
(let* ((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") "") ","))
(statuses (string-split (or (args:get-arg "-status") "") ","))
(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
+ (rmt: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)
@@ -1160,11 +1454,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))
@@ -1238,11 +1532,11 @@
;; "\n rundir: " (get-value-by-fieldname test test-field-index "") ;; (sdb:qry 'getstr ;; (filedb:get-path *fdb*
;; (db:test-get-rundir test) ;; )
)
;; Each test
;; DO NOT remote run
- (let ((steps (db:dispatch-query access-mode rmt:get-steps-for-test db:get-steps-for-test run-id (db:test-get-id test)))) ;; (db:get-steps-for-test dbstruct run-id (db:test-get-id test))))
+ (let ((steps (rmt:get-steps-for-test run-id (db:test-get-id test)))) ;; (db:get-steps-for-test dbstruct run-id (db:test-get-id test))))
(for-each
(lambda (step)
(format #t
" Step: ~20a State: ~10a Status: ~10a Time ~22a\n"
(tdb:step-get-stepname step)
@@ -1382,10 +1676,69 @@
;;======================================================================
;; full run
;;======================================================================
+
+(define (handle-run-requests target runname keys keyvals need-clean)
+ (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
+ (let* ((rconfig (full-runconfigs-read)))
+ (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 rconfig) ;; (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 rconfig) ;; (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)))
;; get lock in db for full run for this directory
;; for all tests with deps
;; walk tree of tests to find head tasks
;; add head tasks to task queue
@@ -1402,62 +1755,39 @@
;; 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")))
+ (orig-cmdline (string-intersperse (argv) " ")))
+ (general-run-call
+ "-runall"
+ "run all tests"
+ (lambda (target runname keys keyvals)
+ (if (or (string-search "%" target)
+ (string-search "%" runname)) ;; we are being asked to re-run multiple runs
+ (let* ((run-specs (rmt:simple-get-runs runname #f #f target #f))) ;; list of simple-run records
+ (debug:print-info 0 *default-log-port* "Pattern supplied for target or runname with "
+ (length run-specs) " matches round. Running each in turn.")
+ (if (null? run-specs)
+ (debug:print 0 *default-log-port* "WARNING: No runs match target " target " and runname " runname))
+ (for-each (lambda (spec)
+ (let* ((newcmdline (string-substitute
+ (conc "target " target)
+ (conc "target " (simple-run-target spec))
+ (string-substitute
+ (conc "runname " runname)
+ (conc "runname " (simple-run-runname spec))
+ orig-cmdline))))
+ (debug:print 0 *default-log-port* "ORIG: " orig-cmdline)
+ (debug:print 0 *default-log-port* "NEW: " newcmdline)
+ (system newcmdline)))
+ run-specs))
+ (handle-run-requests target runname keys keyvals need-clean))))))
;;======================================================================
;; run one test
;;======================================================================
@@ -1543,11 +1873,12 @@
(db-host (assoc/default 'db-host cmdinfo))
(run-id (assoc/default 'run-id cmdinfo))
(itemdat (assoc/default 'itemdat cmdinfo))
(state (args:get-arg ":state"))
(status (args:get-arg ":status"))
- (target (args:get-arg "-target"))
+ ;;(target (args:get-arg "-target"))
+ (target (common:args-get-target))
(toppath (assoc/default 'toppath cmdinfo)))
(change-directory toppath)
(if (not target)
(begin
(debug:print-error 0 *default-log-port* "-target is required.")
@@ -1559,11 +1890,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"
@@ -1580,15 +1911,22 @@
;; Archive tests
;;======================================================================
;; Archive tests matching target, runname, and testpatt
(if (args:get-arg "-archive")
;; else do a general-run-call
- (general-run-call
- "-archive"
- "Archive"
- (lambda (target runname keys keyvals)
- (operate-on 'archive))))
+ (begin
+ ;; for the archive get we need to preserve the starting dir as part of the target path
+ (if (and (args:get-arg "-dest")
+ (not (equal? (substring (args:get-arg "-dest") 0 1) "/")))
+ (let ((newpath (conc (current-directory) "/" (args:get-arg "-dest"))))
+ (debug:print-info 1 *default-log-port* "Preserving original path to destination, was " (args:get-arg "-dest") ", now " newpath)
+ (hash-table-set! args:arg-hash "-dest" newpath)))
+ (general-run-call
+ "-archive"
+ "Archive"
+ (lambda (target runname keys keyvals)
+ (operate-on 'archive target-in: target runname-in: runname )))))
;;======================================================================
;; Extract a spreadsheet from the runs database
;;======================================================================
@@ -1849,20 +2187,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 +2257,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 +2346,68 @@
;; ;; ;; 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)))
+
+(when (args:get-arg "-sync-brute-force")
+ ((server:get-bruteforce-syncer (db:setup #t) persist-until-sync: #t))
+ (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 <http://www.gnu.org/licenses/>.
+
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 <http://www.gnu.org/licenses/>.
[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 <http://www.gnu.org/licenses/>.
[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 <http://www.gnu.org/licenses/>.
[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 <http://www.gnu.org/licenses/>.
+
+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 <http://www.gnu.org/licenses/>.
+;;
+;; 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 <http://www.gnu.org/licenses/>.
+
+;; 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 <http://www.gnu.org/licenses/>.
+;;
+(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 <http://www.gnu.org/licenses/>.
+
+(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 <http://www.gnu.org/licenses/>.
+;;
+(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 <http://www.gnu.org/licenses/>.
[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 <http://www.gnu.org/licenses/>.
[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 <http://www.gnu.org/licenses/>.
+
(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 <http://www.gnu.org/licenses/>.
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 <http://www.gnu.org/licenses/>.
# 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 <http://www.gnu.org/licenses/>.
+
(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 <http://www.gnu.org/licenses/>.
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 <http://www.gnu.org/licenses/>.
# 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 <http://www.gnu.org/licenses/>.
+
(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 <http://www.gnu.org/licenses/>.
+
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 <http://www.gnu.org/licenses/>.
+
(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 <http://www.gnu.org/licenses/>.
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 <http://www.gnu.org/licenses/>.
+
(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 <http://www.gnu.org/licenses/>.
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 <http://www.gnu.org/licenses/>.
+
(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 <http://www.gnu.org/licenses/>.
# 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 <http://www.gnu.org/licenses/>.
+
(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 <http://www.gnu.org/licenses/>.
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 <http://www.gnu.org/licenses/>.
# 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 <http://www.gnu.org/licenses/>.
;; 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 <http://www.gnu.org/licenses/>.
+;;
(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 <http://www.gnu.org/licenses/>.
;; 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 <http://www.gnu.org/licenses/>.
+
-- 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,23 @@
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 run_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,
@@ -40,10 +70,37 @@
id SERIAL PRIMARY KEY,
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 TABLE IF NOT EXISTS run_tags (
+ id SERIAL PRIMARY KEY,
+ tag_id INTEGER DEFAULT 0,
+ run_id INTEGER DEFAULT 0,
+ CONSTRAINT areatagconstraint UNIQUE (tag_id, run_id));
+
+
+CREATE VIEW area_tag_view as
+select a.id as aid, t.id as tid,area_name,tag_name,area_path 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 ;
+
+CREATE VIEW run_tag_view as
+select r.id as rid, t.id as tid,tag_name from runs as r inner join run_tags as rt on rt.run_id = r.id
+inner join tags as t on t.id = rt.tag_id ;
+
INSERT INTO areas (id,area_name,area_path) VALUES (0,'local','.');
CREATE TABLE IF NOT EXISTS ttype (
id SERIAL PRIMARY KEY,
@@ -61,11 +118,20 @@
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));
+ publish_time INTEGER default date_part('epoch'::text, now()),
+ 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 +274,94 @@
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 flexviews(
+ id SERIAL PRIMARY KEY ,
+ public INTEGER DEFAULT 0,
+ attributes TEXT NOT NULL,
+ name TEXT NOT NULL,
+ 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 '',
+ is_default boolean default 'f',
+ 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 <http://www.gnu.org/licenses/>.
+
-- 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 <http://www.gnu.org/licenses/>.
+;;
(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
;;======================================================================
@@ -190,27 +255,40 @@
;; (if newcomment (rmt:general-call 'set-test-comment run-id newcomment test-id))))
(rmt:set-state-status-and-roll-up-items run-id test-id #f newstate newstatus newcomment)
;; (mt:process-triggers run-id test-id newstate newstatus)
#t)))
+
+(define (mt:test-set-state-status-by-id-unless-completed run-id test-id newstate newstatus newcomment)
+ (let* ((test-vec (rmt:get-testinfo-state-status run-id test-id))
+ (state (vector-ref test-vec 3)))
+ (if (equal? state "COMPLETED")
+ #t
+ (rmt:set-state-status-and-roll-up-items run-id test-id #f newstate newstatus newcomment))))
+
+
(define (mt:test-set-state-status-by-testname run-id test-name item-path new-state new-status new-comment)
- (let ((test-id (rmt:get-test-id run-id test-name item-path)))
- (rmt:set-state-status-and-roll-up-items run-id test-name item-path new-state new-status new-comment)
- ;; (mt:process-triggers run-id test-id new-state new-status)
- #t))
+ ;(let ((test-id (rmt:get-test-id run-id test-name item-path)))
+ (rmt:set-state-status-and-roll-up-items run-id test-name item-path new-state new-status new-comment)
+ ;; (mt:process-triggers run-id test-id new-state new-status)
+ #t);)
;;(mt:test-set-state-status-by-id run-id test-id new-state new-status new-comment)))
+(define (mt:test-set-state-status-by-testname-unless-completed run-id test-name item-path new-state new-status new-comment)
+ (let ((test-id (rmt:get-test-id run-id test-name item-path)))
+ (mt:test-set-state-status-by-id-unless-completed run-id test-id new-state new-status new-comment)))
+
(define (mt:lazy-read-test-config test-name)
(let ((tconf (hash-table-ref/default *testconfigs* test-name #f)))
(if tconf
tconf
(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 ...]
ADDED mtexec.scm
Index: mtexec.scm
==================================================================
--- /dev/null
+++ mtexec.scm
@@ -0,0 +1,122 @@
+; 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 <http://www.gnu.org/licenses/>.
+;;
+
+;; (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-19 srfi-18 extras format pkts regex regex-case
+ (prefix dbi dbi:)
+ )
+
+;; (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 help (conc "
+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 ")
+
+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
+
+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
+
+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
+
+Examples:
+
+# Start a megatest run in the area \"mytests\"
+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) " ") "
+Version " megatest-version ", built from " megatest-fossil-hash ))
+ ;; 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))
+
+(define *remargs*
+ (args:get-args
+ (if *action* (cdr (argv)) (argv))
+ '("-log")
+ '("-h")
+ args:arg-hash
+ 0))
+
+(if (args:get-arg "-h")
+ (begin
+ (print help)
+ (exit)))
+
+(if (or (args:get-arg "-repl")
+ (args:get-arg "-load"))
+ (begin
+ (import extras) ;; might not be needed
+ ;; (import csi)
+ (import readline)
+ (import apropos)
+ ;; (import (prefix sqlite3 sqlite3:)) ;; doesn't work ...
+
+ (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: mtut.scm
==================================================================
--- mtut.scm
+++ mtut.scm
@@ -1,50 +1,126 @@
-;; 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 <http://www.gnu.org/licenses/>.
+;;
;; (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:)
+ (prefix sqlite3 sqlite3:)
+ 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 +132,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 <key> 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 <key> 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,30 +203,39 @@
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)
+ ("-reqtarg" . R)
+
("-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)
+ ("-archive" . b)
))
(define *switch-keys*
'(
("-h" . #f)
("-help" . #f)
@@ -143,20 +244,65 @@
("-version" . #f)
;; misc
("-repl" . #f)
("-immediate" . I)
("-preclean" . r)
- ("-rerun-all" . u)
("-prepend-contour" . w)
+ ("-force" . F)
+ ("-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")
+ (lock . "-lock")
+ (unlock . "-unlock")
(sync . "")
- (archive . "-archive")
- (set-ss . "-set-state-status")))
+ (archive . "")
+ (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 +313,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 +344,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 +393,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 +477,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 +489,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 +640,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 +696,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 +751,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 +777,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 +790,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,35 +816,38 @@
(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
+ (let ((std-runname (conc "sched" (time->string (seconds->local-time (current-seconds)) "%M%H%d")))
+ (packets-generated 0))
+ (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)
-
- (for-each
+ ;;(print "rgentargs: " rgentargs)
+ (for-each
(lambda (runkey)
(let* ((keydats (configf:get-section rgconf runkey)))
(for-each
(lambda (sense) ;; these are the sense rules
(let* ((key (car sense))
@@ -561,36 +857,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 +908,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 +985,161 @@
(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)
+ ;;(print "Area: " area)
+ ;;(print "Target: " runkey)
+ ;;(print "OR: " (or (string->number (if (configf:lookup mtconf "setup" "max_packets_per_run") (configf:lookup mtconf "setup" "max_packets_per_run") "10000" ))))
+ ;;(print "Packets generated: " packets-generated)
+ ;;(print "Comparison: " (< packets-generated 4))
+ ;;(print "Full Comparison: "
+ ;; (and (< packets-generated (or (string->number (if (configf:lookup mtconf "setup" "max_packets_per_run") (configf:lookup mtconf "setup" "max_packets_per_run") "10000" )) 10000))
+ ;; (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))))
+ ;;(print "Area Allowed: " (area-allowed? area "area-needs-to-be-run" runkey contour #f))
+;Add code to check whether area is valid
+ (if
+ ;; This code checks whether the target has been passed in via argument, and only runs the specified target
+ (and (< packets-generated (or (string->number (if (configf:lookup mtconf "setup" "max_packets_per_run") (configf:lookup mtconf "setup" "max_packets_per_run") "10000" )) 10000))
+ (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)
+ (set! packets-generated (+ packets-generated 1))
+ ) 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)
+ )))))
+ (if (>= packets-generated (string->number (configf:lookup mtconf "setup" "max_packets_per_run"))) (print "Skipping area: " area " and target: " runkey " due to packets-generated: " packets-generated " higher than " (configf:lookup mtconf "setup" "max_packets_per_run"))))
+
+ ) (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 +1151,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 +1229,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)
@@ -838,112 +1337,557 @@
(conc pktsdir "/" uuid ".pkt")
(lambda ()
(print pkt)))
(print "ERROR: cannot process commands without a pkts directory")))
+(define (check-if-modepatt-defined pkta notification-hook pktfile)
+ (let* ((start-dir (alist-ref 'S pkta))
+ (target (or (alist-ref 'R pkta) (alist-ref 't pkta)))
+ (patt (alist-ref 'o pkta))
+ (uuid (alist-ref 'Z pkta))
+ (cmd (conc "megatest -show-runconfig -target " target " -start-dir " start-dir))
+ (res (handle-exceptions
+ exn
+ #f
+ (print "Running " cmd)
+ (with-input-from-pipe cmd read-lines))))
+ (let loop ((hed (car res))
+ (tail (cdr res)))
+ (if (string-contains hed patt)
+ #t
+ (if (null? tail)
+ (begin
+ (if notification-hook
+ (let* ((notification-cmd (conc notification-hook " --pkt " pktfile " --msg INVALID_MODEPATT")))
+ (print "Running " notification-cmd)
+ (system notification-cmd)))
+ #f)
+ (loop (car tail) (cdr tail)))))))
+
+(define (check-if-target-defined pkta notification-hook pktfile)
+ (let* ((start-dir (alist-ref 'S pkta))
+ (target (alist-ref 'R pkta))
+ (uuid (alist-ref 'Z pkta))
+ (cmd (conc "megatest -list-targets -start-dir " start-dir))
+ (res (handle-exceptions
+ exn
+ #f
+ (print "Running " cmd)
+ (with-input-from-pipe cmd read-lines))))
+ (if (member target res)
+ #t
+ (begin
+ (if notification-hook
+ (let* ((notification-cmd (conc notification-hook " --pkt " pktfile " --msg INVALID_TARGET")))
+ (print "Running " notification-cmd)
+ (system notification-cmd)))
+ #f))))
+
+
+(define (validate-cmd cmd pkta notification-hook pktfile)
+ (let ((ret #t))
+ (if (string-contains cmd "-reqtarg")
+ (if (check-if-target-defined pkta notification-hook pktfile)
+ (begin
+ (print "Target is valid")
+ (if (string-contains cmd "-modepatt")
+ (if (check-if-modepatt-defined pkta notification-hook pktfile)
+ (print "Modepatt is valid")
+ (set! ret #f))))
+ (set! ret #f))
+ (if (string-contains cmd "-modepatt")
+ (if (check-if-modepatt-defined pkta notification-hook pktfile)
+ (print "Modepatt is valid")
+ (set! ret #f))))
+ ret))
+
+
;; collect all needed data and create run pkts for contours with changed inputs
;;
(define (dispatch-commands mtconf toppath)
;; we are expecting a directory "logs", check and create it, create the log in /tmp if not able to create logs dir
(let ((logdir
(if (if (not (directory? "logs"))
(handle-exceptions
- exn
- #f
- (create-directory "logs")
- #t)
+ exn
+ #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")))
+ (notification-hook (if (configf:lookup mtconf "setup" "notification-hook")
+ (configf:lookup mtconf "setup" "notification-hook")
+ #f)))
+ (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"))
(contours (configf:get-section mtconf "contours"))
(pkts (find-pkts pdb '(cmd) '()))
(torun (make-hash-table)) ;; target => ( ... info ... )
(rgentargs (hash-table-keys rgconf))) ;; these are the targets registered for automatically triggering
+ (sqlite3:set-busy-handler! (dbi:db-conn pdb) (sqlite3:make-busy-timeout 10000))
(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"))
+ (pktfile (conc pktsdir "/" uuid ".pkt"))
(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
+ (begin
+ (print "WARNING: cpuload too high, skipping processing of " uuid " due to " cpuload " > " maxload)
+ (if notification-hook
+ (let* ((notification-cmd (conc notification-hook " --pkt " pktfile " --msg HIGH_LOAD")))
+ (print "Running " notification-cmd)
+ (system notification-cmd))))
+ (begin
+ ;; if modepatt used chek if it is defined for the target. If -reqtarg check if target exist.
+ (if (validate-cmd fullcmd pkta notification-hook pktfile)
+ (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))
+ (if notification-hook
+ (let* ((notification-cmd (conc notification-hook " --pkt " pktfile " --msg RUN_LAUNCHED --contour " (caar contours) " --log_path " logf )))
+ (print "Running " notification-cmd)
+ (system notification-cmd))))
+ (begin
+ (mark-processed pdb (list (alist-ref 'id pktdat)))
+ (let-values (((ack-uuid ack-pkt)
+ (add-z-card
+ (construct-sdat 'P uuid
+ 'T "invalid-input"
+ 'c (alist-ref 'o 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))
+ (if notification-hook
+ (let* ((notification-cmd (conc notification-hook " --pkt " pktfile " --msg ACCESS_DENIED")))
+ (print "Running " notification-cmd)
+ (system notification-cmd)))))))
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 lock unlock)
+
(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 <areaname>")
+ (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)))
+ (print "run log @ " (conc (current-directory) "/" uuid "-" *action* ".log"))
(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 +1907,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 <http://www.gnu.org/licenses/>.
+
;;======================================================================
(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 <http://www.gnu.org/licenses/>.
+
+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 <http://www.gnu.org/licenses/>.
+;;
(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 <http://www.gnu.org/licenses/>.
+
(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 <http://www.gnu.org/licenses/>.
+;;
(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 <http://www.gnu.org/licenses/>.
+;;======================================================================
+
+(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/<group>.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 ;; <target/path>/<runname>/...
+ 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/<group>.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 => <run-id>.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
+;;======================================================================
+
+;; <area> - <target - ... > - <runname> - <test> - <itempath - ...>
+
+(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 <http://www.gnu.org/licenses/>.
+;;
;;======================================================================
(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 <http://www.gnu.org/licenses/>.
+
+
+(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 <http://www.gnu.org/licenses/>.
+;;
;;======================================================================
(require-extension (srfi 18) extras tcp s11n)
(use sqlite3 srfi-1 posix regex regex-case srfi-69 hostinfo md5 message-digest)
ADDED path-glob/path-glob.scm
Index: path-glob/path-glob.scm
==================================================================
--- /dev/null
+++ path-glob/path-glob.scm
@@ -0,0 +1,46 @@
+(define (multi-glob pathspec)
+ (let* ((path-parts (intersperse (string-split pathspec "/" #t) "/")))
+ (print "path-parts: " path-parts)
+ (if (null? path-parts)
+ '()
+ (let loop ((parts (cdr path-parts))
+ (result (let ((p (car path-parts)))
+ (if (string=? p "")
+ '("")
+ (glob (car path-parts))))))
+ (if (null? parts)
+ result
+ (let* ((part (car parts))
+ (rem (cdr parts)))
+ (loop rem
+ (apply append
+ (map (lambda (curr)
+ (let ((new (string-append curr part)))
+ (print "new: " new " part: " part)
+ (cond
+ ((and (directory? curr)(file-read-access? curr))
+ (glob new))
+ ((member part '("." ".." "/")) (list new part))
+ (else '()))))
+ result)))))))))
+
+;; alternative implementation
+
+(define (path-glob pattern)
+ (let ((parts (string-split pattern "/" '())))
+ (if (null? parts)
+ '()
+ (glob-expand (car parts) (cdr parts))
+ )))
+
+(define (glob-expand pattern #!optional (rest '()))
+ (let ((result '())
+ (expanded (glob pattern)))
+ (apply append result (cond
+ ((null? expanded) (list '()))
+ ((null? rest) (list expanded))
+ (else (map (lambda (x)
+ (if (directory? x)
+ (glob-expand (conc x "/" (car rest)) (cdr rest))
+ '()))
+ expanded))))))
ADDED path-glob/test.scm
Index: path-glob/test.scm
==================================================================
--- /dev/null
+++ path-glob/test.scm
@@ -0,0 +1,46 @@
+(use test posix srfi-1)
+(load "path-glob.scm")
+
+;; (define globbers `((multi-glob . ,multi-glob)(path-glob . ,path-glob)))
+(define globbers `((path-glob . ,path-glob)))
+
+(define interesting-patts '("../*/*" "/*/bin/*" "./*/bin/*"))
+(define simple-patts '("../*" "/*" "/bin/*" "." ".." "*" "a[0-1]*"))
+
+(define (trim-list lst)
+ (if (> (length lst) 3)
+ (append (take lst 3) '(...))
+ lst))
+
+(define (generate-prefix patt)
+ (write (conc "patt: " patt (make-string (- 10 (string-length patt)) #\ ))))
+
+(print "\nCompare each globber with glob") ;; can only do one level globs here
+(for-each
+ (lambda (globber)
+ (print "\nGlobber: " globber " vs glob")
+ (for-each
+ (lambda (patt)
+ (generate-prefix patt)
+ (test #f '() (trim-list
+ (lset-xor string=? ((alist-ref globber globbers) patt)(glob patt)))))
+ simple-patts))
+ (map car globbers))
+
+(print "\nTest the globbers against patts - only checks for resiliance, not correctness.")
+(for-each
+ (lambda (patt)
+ (generate-prefix patt)(test #f #t (list? (path-glob patt)))
+ ;; (generate-prefix patt)(test #f #t (list? (multi-glob patt)))
+ )
+ interesting-patts)
+
+(print "\nCompare the globbers against each other")
+#;(for-each
+ (lambda (patt)
+ (generate-prefix patt)
+ (test #f '() (trim-list
+ (lset-xor string=? (path-glob patt)(multi-glob patt)))))
+ interesting-patts)
+
+(test-exit)
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 <http://www.gnu.org/licenses/>.
+
(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 <http://www.gnu.org/licenses/>.
+;;
(require-extension (srfi 18) extras tcp s11n)
(use sqlite3 srfi-1 posix srfi-69 hostinfo dot-locking z3)
(import (prefix sqlite3 sqlite3:))
@@ -16,20 +25,19 @@
(declare (unit portlogger))
(declare (uses db))
;; 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))))
- (handler (make-busy-timeout 136000))
+ (handler (sqlite3:make-busy-timeout 136000))
(canwrite (file-write-access? fname)))
;; (db-init (lambda ()
;; (sqlite3:execute
;; db
;; "CREATE TABLE IF NOT EXISTS ports (
@@ -56,12 +64,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 +111,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 +136,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 +166,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 <http://www.gnu.org/licenses/>.
+
;;======================================================================
;;======================================================================
;; 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))
@@ -65,26 +99,29 @@
(if (not (eof-object? curr))
(loop (read-line fh)
(append result (list (proc curr))))
(begin
(close-input-port fh)
- (close-input-port fhe)
+ ;;(close-input-port fhe)
(close-output-port fho)
result))))))
(define (process:cmd-run-proc-each-line-alt cmd proc)
(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 <http://www.gnu.org/licenses/>.
+
;; (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 <http://www.gnu.org/licenses/>.
+
# 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
+ ;; 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 <http://www.gnu.org/licenses/>.
+;;
+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,24 +1,34 @@
;;======================================================================
;; 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 <http://www.gnu.org/licenses/>.
+;;
;;======================================================================
(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")
+;; (declare (uses rmtmod))
+
+;; (import rmtmod)
;;
;; THESE ARE ALL CALLED ON THE CLIENT SIDE!!!
;;
@@ -48,177 +58,264 @@
;; 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
+ #;(common:telemetry-log (conc "rmt:"(->string cmd))
+ payload: `((rid . ,rid)
+ (params . ,params)))
+
+ (if (> attemptnum 2)
+ (debug:print 0 *default-log-port* "INFO: attemptnum in rmt:send-receive is " attemptnum))
+
+ (cond
+ ((> attemptnum 2) (thread-sleep! 0.05))
+ ((> attemptnum 10) (thread-sleep! 0.5))
+ ((> attemptnum 20) (thread-sleep! 1)))
+ (if (and (> attemptnum 5) (= 0 (modulo attemptnum 15)))
+ (begin (server:run *toppath*) (thread-sleep! 3)))
+
+
+ ;;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
(areapath *toppath*);; TODO - resolve from dbstruct to be compatible with multiple areas
(runremote (or area-dat
*runremote*))
- (readonly-mode (if (and runremote
- (remote-ro-mode-checked runremote))
- (remote-ro-mode runremote)
- (let* ((dbfile (conc *toppath* "/megatest.db"))
- (ro-mode (not (file-write-access? dbfile)))) ;; TODO: use dbstruct or runremote to figure this out in future
- (if runremote
- (begin
- (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)
+ (attemptnum (+ 1 attemptnum))
+ (readonly-mode (rmtmod:calc-ro-mode runremote *toppath*)))
+
+ ;; 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
- ;; 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.")
+ ;;DOT EXIT;
+ ;;DOT MUTEXLOCK -> EXIT [label="> 15 attempts"]; {rank=same "case 1" "EXIT" }
+ ;; give up if more than 150 attempts
+ ((> attemptnum 150)
+ (debug:print 0 *default-log-port* "ERROR: 150 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 0 *default-log-port* "WARNING: write transaction requested on a readonly area. cmd="cmd" params="params)
- #f
- )
+ (readonly-mode (extras-readonly-mode *rmt-mutex* *default-log-port* cmd params))
+ ;; 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 #<request>.\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*)
- (debug:print-info 12 *default-log-port* "rmt:send-receive, case 9")
- (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"))
- ((exn)(vector #f "other fail" (print-call-chain)))))
- (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
- ;; (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.
- (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*)
- (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)
- (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*))
- (rmt:send-receive cmd rid params attemptnum: (+ attemptnum 1)))))))))
+ (else (extras-case-11 *default-log-port* runremote cmd params attemptnum rid)))))
+ ;;DOT }
+
+;; bunch of small functions factored out of send-receive to make debug easier
+;;
+
+(define (extras-case-11 *default-log-port* runremote cmd params attemptnum rid)
+ ;; (mutex-unlock! *rmt-mutex*)
+ (debug:print-info 12 *default-log-port* "rmt:send-receive, case 9")
+ ;; (mutex-lock! *rmt-mutex*)
+ (let* ((conninfo (remote-conndat runremote))
+ (dat-in (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"))
+ ((exn)(vector #f "other fail" (print-call-chain)))))
+ (else
+ (debug:print 0 *default-log-port* "ERROR: transport " (remote-transport runremote) " not supported")
+ (exit))))
+
+;; No Title
+;; Error: (vector-ref) out of range
+;; #(#<condition: (exn type)> (#("db.scm:3740: regex#regexp" #f #f) #("db.scm:3739: regex#string-substitute" #f #f) #("db.scm:3738: base64#base64-decode" #f #f) #("db.scm:3737: z3#z3:decode-buffer" #f #f) #("db.scm:3736: with-input-from-string" #f #f) #("db.scm:3741: s11n#deserialize" #f #f) #("api.scm:374: api:execute-requests" #f #f) #("api.scm:139: call-with-current-continuation" #f #f) #("api.scm:139: with-exception-handler" #f #f) #("api.scm:139: ##sys#call-with-values" #f #f) #("api.scm:158: string->symbol" #f #f) #("api.scm:160: current-milliseconds" #f #f) #("api.scm:161: dbr:dbstruct-read-only" #f #f) #("api.scm:139: k15" #f #f) #("api.scm:139: g19" #f #f) #("api.scm:142: get-call-chain" #f #f)) #("get-test-info-by-id" (1102 507299)))
+;; 6
+;;
+;; Call history:
+;;
+;; http-transport.scm:306: thread-terminate!
+;; http-transport.scm:307: debug:print-info
+;; common_records.scm:235: debug:debug-mode
+;; rmt.scm:259: k587
+;; rmt.scm:259: g591
+;; rmt.scm:276: http-transport:server-dat-update-last-access
+;; http-transport.scm:364: current-seconds
+;; rmt.scm:282: debug:print-info
+;; common_records.scm:235: debug:debug-mode
+;; rmt.scm:283: mutex-unlock!
+;; rmt.scm:287: extras-transport-succeded <--
+;; +-----------------------------------------------------------------------------+
+;; | Exit Status : 70
+;;
+
+ (dat (if (and (vector? dat-in) ;; ... check it is a correct size
+ (> (vector-length dat-in) 1))
+ dat-in
+ (vector #f (conc "communications fail (type 2), dat-in=" dat-in))))
+ (success (if (vector? dat) (vector-ref dat 0) #f))
+ (res (if (vector? dat) (vector-ref dat 1) #f)))
+ (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) ;; NOTE: *runremote* is global copy of runremote. Purpose: factor out global.
+ (http-transport:close-connections area-dat: runremote)))
+ (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
+ (extras-transport-succeded *default-log-port* *rmt-mutex* attemptnum runremote res params rid cmd)
+ (extras-transport-failed *default-log-port* *rmt-mutex* attemptnum runremote cmd rid params)
+ )))
;; (define (rmt:update-db-stats run-id rawcmd params duration)
;; (mutex-lock! *db-stats-mutex*)
;; (handle-exceptions
;; exn
@@ -275,19 +372,19 @@
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..
exn ;; This is an attempt to detect that situation and recover gracefully
(begin
- (debug:print0 *default-log-port* "ERROR: bad data from server " v " message: " ((condition-property-accessor 'exn 'message) exn))
+ (debug:print 0 *default-log-port* "ERROR: bad data from server " v " message: " ((condition-property-accessor 'exn 'message) exn))
(vector #t '())) ;; should always get a vector but if something goes wrong return a dummy
(if (and (vector? v)
(> (vector-length v) 1))
(let ((newvec (vector (vector-ref v 0)(vector-ref v 1))))
newvec) ;; by copying the vector while inside the error handler we should force the detection of a corrupted record
@@ -390,10 +487,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 +534,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 +578,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
@@ -586,10 +693,14 @@
(define (rmt:get-prereqs-not-met run-id waitons ref-test-name ref-item-path #!key (mode '(normal))(itemmaps #f))
(rmt:send-receive 'get-prereqs-not-met run-id (list run-id waitons ref-test-name ref-item-path mode itemmaps)))
(define (rmt:get-count-tests-running-for-run-id run-id)
(rmt:send-receive 'get-count-tests-running-for-run-id run-id (list run-id)))
+
+(define (rmt:get-not-completed-cnt run-id)
+ (rmt:send-receive 'get-not-completed-cnt run-id (list run-id)))
+
;; Statistical queries
(define (rmt:get-count-tests-running run-id)
(rmt:send-receive 'get-count-tests-running run-id (list run-id)))
@@ -602,10 +713,14 @@
;; state and status are extra hints not usually used in the calculation
;;
(define (rmt:set-state-status-and-roll-up-items run-id test-name item-path state status comment)
(rmt:send-receive 'set-state-status-and-roll-up-items run-id (list run-id test-name item-path state status comment)))
+
+(define (rmt:set-state-status-and-roll-up-run run-id state status)
+ (rmt:send-receive 'set-state-status-and-roll-up-run run-id (list run-id state status)))
+
(define (rmt:update-pass-fail-counts run-id test-name)
(rmt:general-call 'update-pass-fail-counts run-id test-name test-name test-name))
(define (rmt:top-test-set-per-pf-counts run-id test-name)
@@ -612,10 +727,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 +740,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 +762,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)))
@@ -653,19 +777,26 @@
(rmt:send-receive 'lock/unlock-run #f (list run-id lock unlock user)))
;; set/get status
(define (rmt:get-run-status run-id)
(rmt:send-receive 'get-run-status #f (list run-id)))
+
+(define (rmt:get-run-state run-id)
+ (rmt:send-receive 'get-run-state #f (list run-id)))
+
(define (rmt:set-run-status run-id run-status #!key (msg #f))
(rmt:send-receive 'set-run-status #f (list run-id run-status msg)))
+(define (rmt:set-run-state-status run-id state status )
+ (rmt:send-receive 'set-run-state-status #f (list run-id state status)))
+
(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))) ;; )
@@ -679,10 +810,16 @@
(rmt:send-receive 'del-var #f (list varname)))
(define (rmt:set-var varname value)
(rmt:send-receive 'set-var #f (list varname value)))
+(define (rmt:inc-var varname)
+ (rmt:send-receive 'inc-var #f (list varname)))
+
+(define (rmt:dec-var varname)
+ (rmt:send-receive 'dec-var #f (list varname)))
+
;;======================================================================
;; M U L T I R U N Q U E R I E S
;;======================================================================
;; Need to move this to multi-run section and make associated changes
@@ -746,23 +883,31 @@
(if (or (not state)(not status))
(debug:print 3 *default-log-port* "WARNING: Invalid " (if status "status" "state")
" value \"" (if status state-in status-in) "\", update your validvalues section in megatest.config"))
(rmt:send-receive 'teststep-set-status! run-id (list run-id test-id teststep-name state-in status-in comment logfile))))
+
+(define (rmt:delete-steps-for-test! run-id test-id)
+ (rmt:send-receive 'delete-steps-for-test! run-id (list run-id test-id)))
+
(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 +935,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
;;======================================================================
@@ -812,5 +973,70 @@
(define (rmt:test-set-archive-block-id run-id test-id archive-block-id)
(rmt:send-receive 'test-set-archive-block-id run-id (list run-id test-id archive-block-id)))
(define (rmt:test-get-archive-block-info archive-block-id)
(rmt:send-receive 'test-get-archive-block-info #f (list archive-block-id)))
+
+
+(define (rmtmod:calc-ro-mode runremote *toppath*)
+ (if (and runremote
+ (remote-ro-mode-checked runremote))
+ (remote-ro-mode runremote)
+ (let* ((dbfile (conc *toppath* "/megatest.db"))
+ (ro-mode (not (file-write-access? dbfile)))) ;; TODO: use dbstruct or runremote to figure this out in future
+ (if runremote
+ (begin
+ (remote-ro-mode-set! runremote ro-mode)
+ (remote-ro-mode-checked-set! runremote #t)
+ ro-mode)
+ ro-mode))))
+
+(define (extras-readonly-mode rmt-mutex log-port cmd params)
+ (mutex-unlock! rmt-mutex)
+ (debug:print-info 12 log-port "rmt:send-receive, case 3")
+ (debug:print 0 log-port "WARNING: write transaction requested on a readonly area. cmd="cmd" params="params)
+ #f)
+
+(define (extras-transport-failed *default-log-port* *rmt-mutex* attemptnum runremote cmd rid params)
+ (debug:print 0 *default-log-port* "WARNING: communication failed. Trying again, try num: " attemptnum)
+ (mutex-lock! *rmt-mutex*)
+ (remote-conndat-set! runremote #f)
+ (http-transport:close-connections area-dat: runremote)
+ (remote-server-url-set! runremote #f)
+ (mutex-unlock! *rmt-mutex*)
+ (debug:print-info 12 *default-log-port* "rmt:send-receive, case 9.1")
+ (rmt:send-receive cmd rid params attemptnum: (+ attemptnum 1)))
+
+(define (extras-transport-succeded *default-log-port* *rmt-mutex* attemptnum runremote res params rid cmd)
+ (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
+
+#;(set-functions rmt:send-receive remote-server-url-set!
+ http-transport:close-connections remote-conndat-set!
+ debug:print debug:print-info
+ remote-ro-mode remote-ro-mode-set!
+ remote-ro-mode-checked-set! remote-ro-mode-checked)
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 <http://www.gnu.org/licenses/>.
+
;;======================================================================
ADDED rmtmod.scm
Index: rmtmod.scm
==================================================================
--- /dev/null
+++ rmtmod.scm
@@ -0,0 +1,61 @@
+;;======================================================================
+;; 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 <http://www.gnu.org/licenses/>.
+
+;;======================================================================
+
+(declare (unit rmtmod))
+(declare (uses commonmod))
+
+(module rmtmod
+ *
+
+(import scheme chicken data-structures extras)
+(import (prefix sqlite3 sqlite3:) posix typed-records srfi-18)
+(import commonmod)
+
+;; Hack to make these functions visible to the refactored code, goal is to eliminate these over time.
+(define (rmt:send-receive . params) #f)
+(define (http-transport:close-connections . params) #f)
+;; from remote defstruct in common.scm
+(define (remote-conndat-set! . params) #f)
+(define (remote-server-url-set! . params) #f)
+(define (remote-ro-mode . params) #f)
+(define (remote-ro-mode-set! . params) #f)
+(define (remote-ro-mode-checked-set! . params) #f)
+(define (remote-ro-mode-checked . params) #f)
+(define (debug:print . params) #f)
+(define (debug:print-info . params) #f)
+
+(define (set-functions send-receive rsus
+ close-connections rcs
+ dbgp dbgpinfo
+ ro-mode ro-mode-set
+ ro-mode-checked-set ro-mode-checked
+ )
+ (set! rmt:send-receive send-receive)
+ (set! remote-server-url-set! rsus)
+ (set! http-transport:close-connections close-connections)
+ (set! remote-conndat-set! rcs)
+ (set! debug:print dbgp)
+ (set! debug:print-info dbgpinfo)
+ (set! remote-ro-mode ro-mode)
+ (set! remote-ro-mode-set! ro-mode-set)
+ (set! remote-ro-mode-checked-set! ro-mode-checked-set)
+ (set! remote-ro-mode-checked ro-mode-checked))
+
+)
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 <http://www.gnu.org/licenses/>.
+;;
(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 <http://www.gnu.org/licenses/>.
.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 <http://www.gnu.org/licenses/>.
+;;
;;======================================================================
(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 <http://www.gnu.org/licenses/>.
+
;;======================================================================
;; 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 <http://www.gnu.org/licenses/>.
+
# 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:
@@ -6,14 +23,14 @@
# (add-to-list 'auto-mode-alist '("config\\'" . conf-space-mode))
#
# 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
+[a/b/c/d]
+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 <http://www.gnu.org/licenses/>.
+;;
(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,26 @@
-
;; 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 <http://www.gnu.org/licenses/>.
;; strftime('%m/%d/%Y %H:%M:%S','now','localtime')
-(use sqlite3 srfi-1 posix regex regex-case srfi-69 dot-locking (srfi 18)
- posix-extras directory-utils pathname-expand typed-records format)
-(import (prefix sqlite3 sqlite3:))
+(use (prefix sqlite3 sqlite3:) srfi-1 posix regex regex-case srfi-69 (srfi 18)
+ posix-extras directory-utils pathname-expand typed-records format sxml-serializer sxml-modifications)
(declare (unit runs))
(declare (uses db))
(declare (uses common))
(declare (uses items))
@@ -21,11 +27,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")
@@ -41,17 +46,164 @@
reglen regfull
runname max-concurrent-jobs run-id
test-patts required-tests test-registry
registry-mutex flags keyvals run-info all-tests-registry
can-run-more-tests
- ((can-run-more-tests-count 0) : fixnum))
+ ((can-run-more-tests-count 0) : fixnum)
+ (last-runners-check 0) ;; time when we last checked number of runners
+ (last-runners-count #f) ;;
+ (runner-registered #f) ;; have I registered myself?
+ (run-skip-count 0) ;; how many times have I skipped running sequentially
+ )
(defstruct runs:testdat
hed tal reg reruns test-record
test-name item-path jobgroup
waitons testmode newtal itemmaps prereqs-not-met)
+(define (runs:print-parallel-runners-state state num-registered last-registered skip-count)
+ (debug:print-info 0 *default-log-port* "runs:parallel-runners-mgmt, state=" state
+ ", num-registered=" num-registered ", last-registered=" last-registered
+ ", skip-count=" skip-count))
+
+(define (runs:print-parallel-runners-state2 state num-registered last-runners-count skip-count)
+ (debug:print-info 0 *default-log-port* "runs:parallel-runners-mgmt, state=" state
+ ", num-registered=" num-registered ", last-runners-count=" last-runners-count
+ ", skip-count=" skip-count))
+
+
+(define (runs:parallel-runners-mgmt rdat)
+ (let ((time-to-check 2.8) ;; 28
+ (time-to-wait 3.0))
+ (if (> (- (current-seconds) (runs:dat-last-runners-check rdat)) time-to-check) ;; time to check
+ (let* ((num-registered (or (rmt:get-var "num-runners") 0))
+ (last-runners-count (runs:dat-last-runners-count rdat))
+ (skip-count (runs:dat-run-skip-count rdat)))
+ (cond
+ ;; first time in
+ ((not last-runners-count)
+ (runs:print-parallel-runners-state2 "A" num-registered last-runners-count skip-count)
+ (rmt:set-var "num-runners" 1)
+ (runs:dat-last-runners-count-set! rdat num-registered)
+ (runs:dat-run-skip-count-set! rdat 0))
+ ;; too many waits, decrement num-runners and continue on
+ ((> (runs:dat-run-skip-count rdat) 3)
+ (runs:print-parallel-runners-state2 "B" num-registered last-runners-count skip-count)
+ (rmt:dec-var "num-runners")
+ (runs:dat-run-skip-count-set! rdat 0))
+ ;; too many running, take a break
+ ((> num-registered last-runners-count)
+ (runs:print-parallel-runners-state2 "C" num-registered last-runners-count skip-count)
+ (rmt:dec-var "num-runners")
+ (debug:print-info 0 *default-log-port*
+ "Too many running (" num-registered
+ "), last-count=" last-runners-count " waiting... ")
+ (thread-sleep! time-to-wait)
+ (runs:dat-run-skip-count-set! rdat (+ (runs:dat-run-skip-count rdat) 1)))
+ ;; we have been in waiting mode, do not increment again as we already did that
+ ((> skip-count 0)
+ (runs:print-parallel-runners-state2 "D" num-registered last-runners-count skip-count)
+ (runs:dat-run-skip-count-set! rdat 0)
+ ;; (runs:dat-last-runners-count-set! rdat num-registered)
+ )
+ ;; skip count is zero, not too many running, this is transition into running
+ (else
+ (runs:print-parallel-runners-state2 "E" num-registered last-runners-count skip-count)
+ (rmt:inc-var "num-runners")
+ #;(runs:dat-run-skip-count-set! rdat 0)))))))
+
+
+;; (define (runs:parallel-runners-mgmt rdat)
+;; (let ((time-to-check 2.8) ;; 28
+;; (time-to-wait 3.0))
+;; (if (> (- (current-seconds) (runs:dat-last-runners-check rdat)) time-to-check) ;; time to check
+;; (let* ((num-registered (or (rmt:get-var "num-runners") 0))
+;; (last-registered (or (rmt:get-var "runner-change-time") 0))
+;; (skip-count (runs:dat-run-skip-count rdat)))
+;; (cond
+;; ;; consider this the beginning of time
+;; ((eq? num-registered 0)
+;; (runs:print-parallel-runners-state "A" num-registered last-registered skip-count)
+;; (rmt:set-var "num-runners" 1) ;; potential bug - not ACID
+;; (rmt:set-var "runner-change-time" (current-seconds))
+;; (runs:dat-last-runners-check-set! rdat (current-seconds))
+;; (runs:dat-runner-registered-set! rdat #t)
+;; (runs:dat-run-skip-count-set! rdat 0))
+;; ;; have headroom to run another
+;; ((< num-registered 3)
+;; (runs:print-parallel-runners-state "B" num-registered last-registered skip-count)
+;; (rmt:inc-var "num-runners")
+;; (rmt:set-var "runner-change-time" (current-seconds))
+;; (runs:dat-last-runners-check-set! rdat (current-seconds))
+;; (runs:dat-run-skip-count-set! rdat 0))
+;; ;; we've waited too many rounds, gonna force a round
+;; ((> (runs:dat-run-skip-count rdat) 3)
+;; (runs:print-parallel-runners-state "C" num-registered last-registered skip-count)
+;; (rmt:set-var "num-runners" 1)
+;; ;; (rmt:set-var "runner-change-time" (current-seconds))
+;; (runs:dat-last-runners-check-set! rdat (current-seconds))
+;; (runs:dat-run-skip-count-set! rdat 0))
+;; ;; have too many runners working, but this is the first time to wait since doing some work
+;; ((eq? (runs:dat-run-skip-count rdat) 0) ;; and num-registered is >= 3
+;; (runs:print-parallel-runners-state "D" num-registered last-registered skip-count)
+;; (if (not (eq? (runs:dat-last-runners-check rdat) 0)) ;; do not decrement if we've never incremented
+;; (begin
+;; (rmt:dec-var "num-runners")
+;; #;(rmt:set-var "runner-change-time" (current-seconds))))
+;; (runs:dat-last-runners-check-set! rdat (current-seconds))
+;; (runs:dat-run-skip-count-set! rdat (+ (runs:dat-run-skip-count rdat) 1))
+;; (debug:print-info 0 *default-log-port* "Too many runners working (" num-registered
+;; "). Resting for 30 seconds.")
+;; (thread-sleep! time-to-wait)
+;; (runs:parallel-runners-mgmt rdat))
+;; ;; ok, keep waiting
+;; (else
+;; (runs:print-parallel-runners-state "E" num-registered last-registered skip-count)
+;; (thread-sleep! time-to-wait)
+;; (runs:dat-run-skip-count-set! rdat (+ (runs:dat-run-skip-count rdat) 1))
+;; (runs:parallel-runners-mgmt rdat)))))))
+
+
+(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 +248,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,22 +338,31 @@
(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
- ((> (runs:dat-can-run-more-tests-count runsdat) 20)
+
+ (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) ;; original intent was - save cycles, wait a long time
(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
- (else 0)))
+ 10) ;; obviously haven't had any work to do for a while
+ (else
+ ;; if have a number for inter-test-delay, use it, else don't delay much, maybe even zero?
+ (configf:lookup-number *configdat* "setup" "inter-test-delay" default: 0.01))))
+
(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)))
+ (job-group-limit (let ((jobg-count (configf:lookup *configdat* "jobgroups" jobgroup)))
(if (string? jobg-count)
(string->number jobg-count)
jobg-count))))
(if (> (+ num-running num-running-in-jobgroup) 0)
(runs:inc-can-run-more-tests-count runsdat)) ;; (set! *runs:can-run-more-tests-count* (+ *runs:can-run-more-tests-count* 1)))
@@ -199,11 +370,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,11 +389,96 @@
" 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)))
+
+;;======================================================================
+;; runs:run-tests is called from megatest.scm and itself
+;;======================================================================
+;;
;; 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
;;
(define (runs:run-tests target runname test-patts user flags #!key (run-count 1)) ;; test-names
@@ -237,15 +493,17 @@
;; 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))
+ (allowed-tests #f)
+ (runconf #f))
;; check if readonly
(when readonly-mode
(debug:print-error 0 *default-log-port* "megatest.db is readonly. Cannot proceed.")
(exit 1))
@@ -253,14 +511,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 +538,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
@@ -302,10 +567,17 @@
;; register this run in monitor.db
(rmt:tasks-add "run-tests" user target runname test-patts task-key) ;; params)
(rmt:tasks-set-state-given-param-key task-key "running")
+ (common:telemetry-log "run-tests"
+ payload:
+ `( (target . ,target)
+ (run-name . ,runname)
+ (test-patts . ,test-patts) ) )
+
+
;; Now generate all the tests lists
(set! all-tests-registry (tests:get-all)) ;; hash of testname => path-to-test
(set! all-test-names (hash-table-keys all-tests-registry))
;; filter first for allowed-tests (from -tagexpr) then for test-patts.
(set! test-names (tests:filter-test-names
@@ -320,12 +592,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 +634,49 @@
(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)
+ ;; mark all test launced flag as false in the meta table
+ (rmt:set-var (conc "lunch-complete-" run-id) "no")
+ (debug:print-info 1 *default-log-port* "Setting end-of-run to no")
+ (let* ((config-reruns (let ((x (configf:lookup *configdat* "setup" "reruns")))
+ (if x (string->number x) #f)))
+ (config-rerun-cnt (if config-reruns
+ config-reruns
+ 1)))
+ (if (eq? config-rerun-cnt run-count)
+ (rmt:set-var (conc "end-of-run-" run-id) "no")))
+
+ (rmt:set-run-state-status run-id "new" "n/a")
;; 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))
+
+ ;; NOTE: Have the config - can extract [waitons] section
+
+ ((hed-mode)
+ (let ((m (configf: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,107 +684,117 @@
(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
- (config-lookup config "requirements" "priority") ;; priority 3
- (tests:get-items config) ;; expand the [items] and or [itemstable] into explict items
+ (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
+ (configf:lookup config "requirements" "priority") ;; priority 3
+ (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))
(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)))
+ #;(th1 (make-thread (lambda ()
+ (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! th1)
(thread-start! th2)
- (thread-join! th1)
+ ;; (thread-join! th1)
+ ;; just do the main stuff in the main thread
+ (runs:run-tests-queue run-id runname test-records keyvals flags test-patts required-tests
+ (any->number reglen) all-tests-registry)
(set! keep-going #f)
(thread-join! th2)
;; if run-count > 0 call, set -preclean and -rerun STUCK/DEAD
(if (> run-count 0) ;; handle reruns
(begin
@@ -493,14 +801,21 @@
(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)))
+ (launch:end-of-run-check run-id)))
(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
+
+ ; (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)
))
;; loop logic. These are used in runs:run-tests-queue to make it a bit more readable.
@@ -512,31 +827,56 @@
;; 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)
+;;======================================================================
+;; runs:expand-items is called by runs:run-tests-queue
+;;======================================================================
+;;
+;; 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 +883,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 +917,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 +937,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 +971,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 +1003,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-unless-completed run-id test-id "COMPLETED" "PREQ_DISCARDED" "Failed to run due to prior failed prerequisites")
+ (mt:test-set-state-status-by-id-unless-completed 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 +1088,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,23 +1128,23 @@
(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!
(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 +1161,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 +1195,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))
@@ -881,24 +1239,29 @@
(not (member 'exclusive testmode)))))
;; (hash-table-delete! *max-tries-hash* (db:test-make-full-name test-name item-path))
;; 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))
+
+ ;; jobtools maxload is useful for where the full Megatest run is done on one machine
+ (if maxload ;; only gate if maxload is specified, NOTE: maxload is normalized, i.e. load=1 means all cpus fully utilized
+ (common:wait-for-normalized-load maxload "Waiting for load to drop before starting more tests" #f))
+
+ ;; jobtools maxhomehostload is intended to prevent overloading on the homehost which can cause database corruption issues
+ (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 +1281,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-unless-completed 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-unless-completed 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-unless-completed 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 +1350,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,28 +1392,36 @@
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)))
(runname (or (runs:gendat-runname *runs:general-data*)
(db:get-value-by-header (db:get-rows run-dat)
(db:get-header run-dat) "runname")))
(target (or (runs:gendat-target *runs:general-data*)(rmt:get-target run-id)))
- (testsdat (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)
- (runs:gendat-inc-results-last-update *runs:general-data*) ;; last update time
- 'dashboard)))
+ (testsdat (let ((res (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)
+ (runs:gendat-inc-results-last-update *runs:general-data*) ;; last update time
+ 'dashboard)))
+ (if (list? res)
+ res
+ (begin
+ (debug:print-error
+ 0 *default-log-port*
+ "FAILED TO GET DATA using rmt:get-tests-for-run. Notify developers if you see this. result: " res)
+ '())))))
(if (not (runs:gendat-run-info *runs:general-data*))
(runs:gendat-run-info-set! *runs:general-data* run-dat))
(if (not (runs:gendat-runname *runs:general-data*))
(runs:gendat-runname-set! *runs:general-data* runname))
(if (not (runs:gendat-target *runs:general-data*))
@@ -1088,10 +1460,14 @@
;; every time though the loop increment the test/itempatt val.
;; when the min is > max-allowed and none running then force exit
;;
(define *max-tries-hash* (make-hash-table))
+;;======================================================================
+;; runs:run-tests-queue is called by runs:run-tests
+;;======================================================================
+;;
;; test-records is a hash table testname:item_path => vector < testname testconfig waitons priority items-info ... >
(define (runs:run-tests-queue run-id runname test-records keyvals flags test-patts required-tests reglen-in all-tests-registry)
;; At this point the list of parent tests is expanded
;; NB// Should expand items here and then insert into the run queue.
(debug:print 5 *default-log-port* "test-records: " test-records ", flags: " (hash-table->alist flags))
@@ -1098,54 +1474,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 (configf: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,11 +1529,11 @@
(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)
@@ -1177,20 +1550,39 @@
;; (print "Top of loop, hed=" hed ", tal=" tal " ,reruns=" reruns)
(let* ((test-record (hash-table-ref test-records hed))
(test-name (tests:testqueue-get-testname test-record))
(tconfig (tests:testqueue-get-testconfig test-record))
- (jobgroup (config-lookup tconfig "test_meta" "jobgroup"))
- (testmode (let ((m (config-lookup tconfig "requirements" "mode")))
+ (jobgroup (configf:lookup tconfig "test_meta" "jobgroup"))
+ (testmode (let ((m (configf:lookup tconfig "requirements" "mode")))
(if m (map string->symbol (string-split m)) '(normal))))
(itemmaps (tests:get-itemmaps tconfig)) ;; (configf:lookup tconfig "requirements" "itemmap"))
- (waitons (tests:testqueue-get-waitons test-record))
(priority (tests:testqueue-get-priority test-record))
(itemdat (tests:testqueue-get-itemdat test-record)) ;; itemdat can be a string, list or #f
(items (tests:testqueue-get-items test-record))
(item-path (item-list->path itemdat))
(tfullname (db:test-make-full-name test-name item-path))
+ ;; these are hard coded item-item waits test/item-path => test/item-path2 ...
+ (extra-waits (let* ((section (configf:get-section (tests:testqueue-get-testconfig test-record) "waitons"))
+ (myextra (alist-ref tfullname section equal?)))
+ (if myextra
+ (let ((extras (string-split (car myextra))))
+ (if (runs:lownoise (conc tfullname "extra-waitons" tfullname) 60)
+ (debug:print-info 0 *default-log-port* "HAVE EXTRA WAITONS for test " tfullname ": " myextra))
+ (for-each
+ (lambda (extra)
+ ;; (debug:print 0 *default-log-port* "FYI: extra = " extra " reruns = " reruns)
+ (let ((basetestname (car (string-split extra "/"))))
+ #;(if (not (member extra tal))
+ (set! reruns (append tal (list extra))))
+ (if (not (member basetestname tal))
+ (set! reruns (append tal (list basetestname))))
+ ))
+ extras)
+ extras)
+ '())))
+ (waitons (delete-duplicates (append (tests:testqueue-get-waitons test-record) extra-waits) equal?))
(newtal (append tal (list hed)))
(regfull (>= (length reg) reglen))
(num-running (rmt:get-count-tests-running-for-run-id run-id))
(testdat (make-runs:testdat
hed: hed
@@ -1206,21 +1598,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 +1634,31 @@
(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)
+ )
+
+ (runs:parallel-runners-mgmt runsdat)
;; check for hed in waitons => this would be circular, remove it and issue an
;; error
(if (member test-name waitons)
(begin
@@ -1279,88 +1678,106 @@
(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)
+ (debug:print-error 0 *default-log-port* "Test " (tests:testqueue-get-testname test-record) " is itemized but has no items matching the 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 +1785,26 @@
;; (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
+ ;; this is the point where everything is launched and now you can mark the run in metadata table as all launched
+ (rmt:set-var (conc "lunch-complete-" run-id) "yes")
+
;; 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 +1822,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")))))
@@ -1452,37 +1878,48 @@
;; parent-test is there as a placeholder for when parent-tests can be run as a setup step
;;
(define (run:test run-id run-info keyvals runname test-record flags parent-test test-registry all-tests-registry)
;; All these vars might be referenced by the testconfig file reader
+ ;;
+ ;; NEED to reprocess testconfig here, ensuring that item variables are available.
+ ;; This is for Tal's issue with item-specific env vars not being set for use in skip.
+ ;; HSD https://hsdes.intel.com/appstore/icf/index.html#/article?articleId=1408763273
+ ;;
(let* ((test-name (tests:testqueue-get-testname test-record))
(test-waitons (tests:testqueue-get-waitons test-record))
- (test-conf (tests:testqueue-get-testconfig test-record))
(itemdat (tests:testqueue-get-itemdat test-record))
- (test-path (hash-table-ref all-tests-registry test-name)) ;; (conc *toppath* "/tests/" test-name)) ;; could use tests:get-testconfig here ...
- (force (hash-table-ref/default flags "-force" #f))
- (rerun (hash-table-ref/default flags "-rerun" #f))
- (keepgoing (hash-table-ref/default flags "-keepgoing" #f))
- (incomplete-timeout (string->number (or (configf:lookup *configdat* "setup" "incomplete-timeout") "x")))
(item-path "")
(db #f)
(full-test-name #f))
;; setting itemdat to a list if it is #f
(if (not itemdat)(set! itemdat '()))
(set! item-path (item-list->path itemdat))
(set! full-test-name (db:test-make-full-name test-name item-path))
+ (runs:set-megatest-env-vars run-id inrunname: runname testname: test-name itempath: item-path) ;; these may be needed by the launching process
+
+ (let* ((test-conf ;; re-instate the tests:get-testconfig once the kinks are worked out. FIXME!!!
+ ;; (tests:get-testconfig test-name item-path all-tests-registry #t force-create: #t))
+ (tests:testqueue-get-testconfig test-record ))
+ (test-path (hash-table-ref all-tests-registry test-name)) ;; (conc *toppath* "/tests/" test-name)) ;; could use tests:get-testconfig here ...
+
+ (force (hash-table-ref/default flags "-force" #f))
+ (rerun (hash-table-ref/default flags "-rerun" #f))
+ (keepgoing (hash-table-ref/default flags "-keepgoing" #f))
+ (incomplete-timeout (string->number (or (configf:lookup *configdat* "setup" "incomplete-timeout") "x")))
+ )
+
(debug:print-info 4 *default-log-port*
"\nTESTNAME: " full-test-name
"\n test-config: " (hash-table->alist test-conf)
"\n itemdat: " itemdat
)
(debug:print 2 *default-log-port* "Attempting to launch test " full-test-name)
;; (setenv "MT_TEST_NAME" test-name) ;;
;; (setenv "MT_ITEMPATH" item-path)
;; (setenv "MT_RUNNAME" runname)
- (runs:set-megatest-env-vars run-id inrunname: runname testname: test-name itempath: item-path) ;; these may be needed by the launching process
(change-directory *toppath*)
;; Here is where the test_meta table is best updated
;; Yes, another use of a global for caching. Need a better way?
;;
@@ -1490,12 +1927,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 +1960,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")
@@ -1589,15 +2026,32 @@
(configf:lookup test-conf "skip" "prevrunning"))
;; run-ids = #f means *all* runs
(let ((running-tests (rmt:get-tests-for-runs-mindata #f full-test-name '("RUNNING" "REMOTEHOSTSTART" "LAUNCHED") '() #f)))
(if (not (null? running-tests)) ;; have to skip
(set! skip-test "Skipping due to previous tests running"))))
- ((and skip-check
- (configf:lookup test-conf "skip" "fileexists"))
- (if (common:file-exists? (configf:lookup test-conf "skip" "fileexists"))
- (set! skip-test (conc "Skipping due to existance of file " (configf:lookup test-conf "skip" "fileexists")))))
- ((and skip-check
+
+ ;; split the string and OR of file-exists?
+ ((and skip-check
+ (configf:lookup test-conf "skip" "fileexists"))
+ (let* ((files (string-split (configf:lookup test-conf "skip" "fileexists")))
+ (existing (filter common:file-exists? files)))
+ (if (not (null? existing)) ;; (common:file-exists? (configf:lookup test-conf "skip" "fileexists"))
+ (set! skip-test (conc "Skipping due to existance of file(s) " (string-intersperse existing ", ")))))) ;; (configf:lookup test-conf "skip" "fileexists")))))
+
+ ((and skip-check
+ (configf:lookup test-conf "skip" "filenotexists"))
+ (let* ((files (string-split (configf:lookup test-conf "skip" "filenotexists")))
+ (existing (filter common:file-exists? files)))
+ (if (null? existing) ;; (common:file-exists? (configf:lookup test-conf "skip" "filenotexists")))
+ (set! skip-test (conc "Skipping due to non existance of files " (string-intersperse files ", ")))))) ;; (configf:lookup test-conf "skip" "filenotexists")))))
+
+ ((and skip-check
+ (configf:lookup test-conf "skip" "script"))
+ (if (= (system (configf:lookup test-conf "skip" "script")) 0)
+ (set! skip-test (conc "Skipping due to zero return value of script " (configf:lookup test-conf "skip" "script")))))
+
+ ((and skip-check
(configf:lookup test-conf "skip" "rundelay"))
;; run-ids = #f means *all* runs
(let* ((numseconds (common:hms-string->seconds (configf:lookup test-conf "skip" "rundelay")))
(running-tests (rmt:get-tests-for-runs-mindata #f full-test-name '("RUNNING" "REMOTEHOSTSTART" "LAUNCHED") '() #f))
(completed-tests (rmt:get-tests-for-runs-mindata #f full-test-name '("COMPLETED" "INCOMPLETE") '("PASS" "FAIL" "ABORT") #f)) ;; ironically INCOMPLETE is same as COMPLETED in this contex
@@ -1609,10 +2063,13 @@
(if skip-test
(begin
(mt:test-set-state-status-by-id run-id test-id "COMPLETED" "SKIP" skip-test)
(debug:print-info 1 *default-log-port* "SKIPPING Test " full-test-name " due to " skip-test))
+ ;;
+ ;; Here the test is handed off to launch.scm for launch-test to complete the launch process
+ ;;
(if (not (launch-test test-id run-id run-info keyvals runname test-conf test-name test-path itemdat flags))
(begin
(print "ERROR: Failed to launch the test. Exiting as soon as possible")
(set! *globalexitstatus* 1) ;;
(process-signal (current-process-id) signal/kill))))))))
@@ -1634,11 +2091,11 @@
(debug:print-error 0 *default-log-port* "Failed to launch test " full-test-name ". Unrecognised state " (test:get-state testdat))
(case (string->symbol (test:get-state testdat))
((COMPLETED INCOMPLETE)
(hash-table-set! test-registry (db:test-make-full-name test-name test-path) 'DONOTRUN))
(else
- (hash-table-set! test-registry (db:test-make-full-name test-name test-path) 'DONOTRUN))))))))
+ (hash-table-set! test-registry (db:test-make-full-name test-name test-path) 'DONOTRUN)))))))))
;;======================================================================
;; END OF NEW STUFF
;;======================================================================
@@ -1670,23 +2127,116 @@
(lambda (f x)
(let ((fullname (conc real-dir "/" f)))
(if (not (string-search (regexp "testdat.db") f))
(runs:recursive-delete-with-error-msg fullname)))
(+ 1 x))
- 0 real-dir)
+ 0 real-dir #t)
;; 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 %"
+ (if (member 'kill-runs actions) ;; if kill-runs is specified then set -kill-wait to 0
+ " -kill-wait 0"
+ "")))))
+ ((archive)
+ (if remove (system (conc precmd " megatest -archive save-remove -target " target " -runname " (simple-run-runname run) " -testpatt %"))))
+ ((kill-runs)
+ (if remove (system (conc precmd " megatest -kill-runs -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 (remove-last-path-directory path-in)
+ (let* ((dparts (string-split path-in "/"))
+ (path-out (conc "/" (string-intersperse (take dparts (- (length dparts) 1)) "/")))
+ )
+ path-out
+ )
+)
+
+
+;; (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 +2244,21 @@
(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".
+ (test-records '())) ;; for tasks that we wish to operate on all tests in one fell swoop
- (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,34 +2267,40 @@
(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)
'()))
(lasttpath "/does/not/exist/I/hope")
+ (lastrealpath "/does/not/exist/I/hope")
+ ;; there may be a number of different disks used in the same run.
+ (run-paths-hash (make-hash-table))
(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,19 +2309,29 @@
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"))
- (thread-start! worker-thread))
+ (let ((op (string->symbol (args:get-arg "-archive"))))
+ (set! worker-thread
+ (make-thread
+ (lambda ()
+ (case op
+ ((save save-remove keep-html)
+ (archive:run-bup op run-id run-name tests rp-mutex bup-mutex))
+ ((restore)
+ (archive:bup-restore op run-id run-name tests rp-mutex bup-mutex))
+ ((get) ;;; NOTE: This is a special case. We wish to operate on ALL tests in one go
+ (set! test-records (append tests test-records)))
+ (else
+ (debug:print-error 0 *default-log-port* "unrecognised sub command " op " for -archive. Run \"megatest\" to see help")
+ (exit))))
+ "archive-bup-thread"))
+ (thread-start! worker-thread)
+ (if (eq? op 'get)
+ (thread-join! worker-thread)) ;; we need the test-records set to not overlap
+ ))
(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,11 +2344,14 @@
(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))
- (allow-run-time 10)) ;; seconds to allow for killing tests before just brutally killing 'em
+ (backgrounded-remove-status (make-hash-table))
+ (backgrounded-remove-last-visit (make-hash-table))
+ (backgrounded-remove-result (make-hash-table))
+ (allow-run-time (string->number (or (args:get-arg "-kill-wait") "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)))
(if (not new-test-dat)
@@ -1792,122 +2362,287 @@
(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-status (db:test-get-status 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
+ (let ((rundir (db:test-get-rundir new-test-dat)))
+ (if (and (not (string= rundir "/tmp/badname"))
+ (file-exists? rundir)
+ (substring-index run-name rundir)
+ (substring-index target rundir)
+ )
+ (begin
+ (set! lasttpath (db:test-get-rundir new-test-dat)) ;; remember this path for run removal
+ (set! lastrealpath (remove-last-path-directory (resolve-pathname lasttpath)))
+ (hash-table-set! run-paths-hash lastrealpath 1)
+ (runs:remove-test-directory new-test-dat mode) ;; 'remove-all)
+ )
+ (begin
+ (debug:print 2 *default-log-port* "Not removing directory " rundir " because either it doesn't exist or has a bad name")
+ (debug:print 2 *default-log-port* "Is /tmp/badname: " (string= rundir "/tmp/badname"))
+ (debug:print 2 *default-log-port* "Exists: " (file-exists? rundir))
+ (debug:print 2 *default-log-port* "Has run-name: " (substring-index run-name rundir))
+ (debug:print 2 *default-log-port* "Has target: " (substring-index target rundir))
+ ;;PJH remove record from db no need to cleanup directory
+ (case 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))))
+
+ )
+ )
+ )
+
+ (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))))
+ ((and (member test-status '("PREQ_FAIL" "PREQ_DISCARDED" "BLOCKED" "ZERO_ITEMS" "KEEP_TRYING" "TEN_STRIKES" "TIMED_OUT")))
+ (rmt:set-state-status-and-roll-up-items run-id (db:test-get-id test) 'foo "NOT_STARTED" "n/a" (conc "kill-run moved from "test-state":"test-status" to NOT_STARTED:n/a"))
+ ;;(mt:test-set-state-status-by-id run-id (db:test-get-id test) "NOT_STARTED" "n/a" (conc "kill-run moved from "test-state":"test-status" to NOT_STARTED:n/a"))
+ (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))
- ;; 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))))
+ (let* ((linkspath (remove-last-path-directory lasttpath))
+ (runpaths (hash-table-keys run-paths-hash))
+ )
+
+ (debug:print 2 *default-log-port* "run-paths-hash: " (hash-table-keys run-paths-hash))
+
+ (debug:print 1 *default-log-port* "Removing target " target "run: " run-name)
+ (if (not keep-records)
+ (begin
+ (debug:print 1 *default-log-port* "Removing DB records for the run.")
+ (rmt:delete-run run-id)
+ (rmt:delete-old-deleted-test-records))
+ )
+ (if (not (equal? linkspath "/does/not/exist/I"))
+ (begin
+ (debug:print 1 *default-log-port* "Recursively removing links dir " linkspath)
+ (runs:recursive-delete-with-error-msg linkspath)))
+
+ (for-each (lambda(runpath)
+ (debug:print 1 *default-log-port* "Recursively removing runs dir " runpath)
+ (runs:recursive-delete-with-error-msg runpath)
+ )
+ runpaths
+ )
)))))
))
runs)
- ;; (sqlite3:finalize! (db:delay-if-busy tdbdat))
+ ;; special case - archive get
+ (if (equal? (args:get-arg "-archive") "get")
+ (archive:bup-get-data "get" #f #f test-records rp-mutex bup-mutex))
)
- #t)
+ #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.
- (begin ;; let* ((realpath (resolve-pathname run-dir)))
- (debug:print-info 1 *default-log-port* "Recursively removing " real-dir)
- (if (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")))
+ (common:file-exists? real-dir)) ;; bad heuristic but should prevent /tmp /home etc.
+ (let* ((realpath (resolve-pathname run-dir)))
+ (debug:print-info 1 *default-log-port* "Recursively removing " realpath)
+ (if (common:file-exists? realpath)
+ (runs:safe-delete-test-dir realpath)
+ (debug:print 0 *default-log-port* "WARNING: test dir " realpath " 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")))
(if (symbolic-link? run-dir)
(begin
@@ -1927,23 +2662,25 @@
(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
;;======================================================================
;; Since many calls to a run require pretty much the same setup
;; this wrapper is used to reduce the replication of code
(define (general-run-call switchname action-desc proc)
- (let ((runname (or (args:get-arg "-runname")(args:get-arg ":runname")))
+ (let ((runname (common:args-get-runname))
(target (common:args-get-target)))
(cond
((not target)
(debug:print-error 0 *default-log-port* "Missing required parameter for " switchname ", you must specify the target with -target")
(exit 3))
@@ -1954,11 +2691,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)))
@@ -1996,17 +2734,23 @@
(let* ((db #f)
(rundat (mt:get-runs-by-patt keys runname target))
(header (vector-ref rundat 0))
(runs (vector-ref rundat 1)))
(for-each (lambda (run)
- (let ((run-id (db:get-value-by-header run header "id")))
+ (let ((run-id (db:get-value-by-header run header "id"))
+ (str (if lock
+ "lock"
+ "unlock")))
(if (or lock
(and unlock
- (begin
+ (or (args:get-arg "-force")
+ (begin
(print "Do you really wish to unlock run " run-id "?\n y/n: ")
- (equal? "y" (read-line)))))
+ (equal? "y" (read-line))))))
+ (begin
(rmt:lock/unlock-run run-id lock unlock user)
+ (debug:print-info 0 *default-log-port* "Done " str " on run id " run-id))
(debug:print-info 0 *default-log-port* "Skipping lock/unlock on " run-id))))
runs)))
;;======================================================================
;; Rollup runs
;;======================================================================
@@ -2020,11 +2764,11 @@
(rmt:testmeta-add-record test-name)))
(for-each
(lambda (key)
(let* ((idx (cadr key))
(fld (car key))
- (val (config-lookup test-conf "test_meta" fld)))
+ (val (configf:lookup test-conf "test_meta" fld)))
;; (debug:print 5 *default-log-port* "idx: " idx " fld: " fld " val: " val)
(if (and val (not (equal? (vector-ref currrecord idx) val)))
(begin
(print "Updating " test-name " " fld " to " val)
(rmt:testmeta-update-field test-name fld val)))))
@@ -2034,14 +2778,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)
@@ -2053,11 +2799,11 @@
(hash-table-keys test-names))))
;; This could probably be refactored into one complex query ...
;; NOT PORTED - DO NOT USE YET
;;
-(define (runs:rollup-run keys runname user keyvals)
+#;(define (runs:rollup-run keys runname user keyvals)
(debug:print 4 *default-log-port* "runs:rollup-run, keys: " keys " -runname " runname " user: " user)
(let* ((db #f)
;; register run operates on the main db
(new-run-id (rmt:register-run keyvals runname "new" "n/a" user (args:get-arg "-contour")))
(prev-tests (rmt:get-matching-previous-test-run-records new-run-id "%" "%"))
@@ -2107,19 +2853,111 @@
(conc "INSERT OR REPLACE INTO test_data (test_id,category,variable,value,expected,tol,units,comment) "
"SELECT " (db:test-get-id new-testdat) ",category,variable,value,expected,tol,units,comment FROM test_data WHERE test_id=?;")
(db:test-get-id testdat))))
))
prev-tests)))
+
+(define doc-template
+ '(*TOP*
+ (*PI* xml "version='1.0'")
+ (testsuite)))
+
+(define (runs:update-junit-test-reporter-xml run-id)
+ (let* (
+ (junit-test-reporter (configf:lookup *configdat* "runs" "junit-test-reporter-xml"))
+ (junit-test-report-dir (configf:lookup *configdat* "runs" "junit-test-report-dir"))
+ (xml-dir (if (and junit-test-reporter (equal? junit-test-reporter "yes" ))
+ (if junit-test-report-dir
+ junit-test-report-dir
+ (conc (getenv "MT_LINKTREE") "/" (getenv "MT_TARGET") "/" (getenv "MT_RUNNAME")))
+ #f))
+ (xml-ts-name (if xml-dir
+ (conc (getenv "MT_TESTSUITENAME")"."(string-translate (getenv "MT_TARGET") "/" ".") "." (getenv "MT_RUNNAME"))
+ #f))
+ (keyname (if xml-ts-name (common:get-signature xml-ts-name) #f))
+ (xml-path (if xml-dir
+ (conc xml-dir "/" keyname ".xml")
+ #f))
+
+ (test-data (if xml-dir
+ (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
+ #f)
+ '()))
+ (tests-count (if xml-dir (length test-data) #f)))
+ (if (and junit-test-reporter (equal? junit-test-reporter "yes" ))
+ (begin
+ ;((sxml-modify! `("testsuite" insert-into (@ (name ,xml-ts-name) (tests ,tests-count)))) doc)
+
+ (let loop ((test (car test-data))
+ (tail (cdr test-data))
+ (doc doc-template)
+ (fail-cnt 0)
+ (error-cnt 0))
+ (let* ((test-name (vector-ref test 2))
+ (test-itempath (vector-ref test 11))
+ (tc-name (conc test-name (if (and test-itempath (not (equal? test-itempath ""))) (conc "." (string-translate test-itempath "/" "." )) "")))
+ (test-state (vector-ref test 3))
+ (comment (vector-ref test 14))
+ (test-status (vector-ref test 4))
+ (exc-msg (conc "No bucket for State " test-state " Status " test-status))
+ (new-doc (cond
+ ((member test-state (list "RUNNING" ))
+ ((sxml-modify `("testsuite" insert-into (testcase (@ (name ,tc-name)) (inProgress)))) doc))
+ ((member test-state (list "LAUNCHED" "REMOTEHOSTSTART" "NOT_STARTED"))
+ ((sxml-modify `("testsuite" insert-into (testcase (@ (name ,tc-name)) (inQueue)))) doc))
+ ((member test-status (list "PASS" "WARN" "WAIVED"))
+ ((sxml-modify `("testsuite" insert-into (testcase (@ (name ,tc-name))))) doc))
+ ((member test-status (list "FAIL" "CHECK"))
+ ((sxml-modify `("testsuite" insert-into (testcase (@ (name ,tc-name)) (failure (@ (message ,comment) (type "failure")))))) doc))
+ ((member test-status (list "DEAD" "KILLED" "ABORT" "PREQ_FAIL" "PREQ_DISCARDED"))
+ ((sxml-modify `("testsuite" insert-into (testcase (@ (name ,tc-name)) (failure (@ (message ,comment) (type "error")))))) doc))
+ ((member test-status (list "SKIP"))
+ ((sxml-modify `("testsuite" insert-into (testcase (@ (name ,tc-name)) (skipped (@ (type "skipped")))))) doc))
+ (else
+ (debug:print 0 *default-log-port* (conc "What do I do with State " test-state " Status " test-status))
+ ((sxml-modify `("testsuite" insert-into (testcase (@ (name ,tc-name)) (failure (@ (message ,exc-msg) (type "error")))))) doc))))
+ (new-error-cnt (if (member test-status (list "DEAD" "KILLED" "ABORT" "PREQ_FAIL" "PREQ_DISCARDED"))
+ (+ error-cnt 1)
+ error-cnt))
+ (new-fail-cnt (if (member test-status (list "FAIL" "CHECK"))
+ (+ fail-cnt 1)
+ fail-cnt)))
+ (if (null? tail)
+ (let* ((final-doc ((sxml-modify `("testsuite" insert-into (@ (name ,xml-ts-name) (tests ,tests-count) (errors ,error-cnt) (failures ,fail-cnt)))) new-doc)))
+ (debug:print 0 *default-log-port* "modify attrib error=" error-cnt " fail= " fail-cnt)
+ (handle-exceptions
+ exn
+ (let* ((msg ((condition-property-accessor 'exn 'message) exn)))
+ (debug:print 0 *default-log-port* (conc "WARNING: Failed to update file" xml-path". Message:" msg)))
+
+ (if (not (file-exists? xml-dir))
+ (create-directory xml-dir #t))
+ (if (not (rmt:no-sync-get/default keyname #f))
+ (begin
+ (rmt:no-sync-set keyname "on")
+ (debug:print 0 *default-log-port* "creating xml at " xml-path)
+ (with-output-to-file xml-path
+ (lambda ()
+ (print (sxml-serializer#serialize-sxml final-doc ns-prefixes: (list (cons 'gnm "http://foo"))))))
+ (rmt:no-sync-del! keyname))
+ (debug:print 0 *default-log-port* "Could not get the lock. Skip writing the xml file."))))
+ (loop (car tail) (cdr tail) new-doc new-fail-cnt new-error-cnt))))))))
;; clean cache files
(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 <http://www.gnu.org/licenses/>.
+;;
+(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 <http://www.gnu.org/licenses/>.
+
+
+;; 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 <http://www.gnu.org/licenses/>.
+;;
+
+(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 <area code> : list the users that can access the area.
+ sauth open <path> --group <grpname> : Open up an area. User needs to be the owner of the area to open it.
+ --code <unique short identifier for an area>
+ --retrieve|--publish [--additional-grps <comma separated unix grps requierd to get to the path>]
+ sauth update <area code> --retrieve|--publish : update the binaries with the lates changes
+ sauth grant <username> --area <area identifier> : Grant permission to read or write to a area that is alrady opend up.
+ --expiration yyyy/mm/dd --retrieve|--publish
+ [--restrict <comma separated directory names> ]
+ sauth read-shell <area identifier> : Open sretrieve shell for reading.
+ sauth write-shell <area identifier> : 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 <action> <area> [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 <action> <area> [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 <path> --group <grpname> --code <unique short identifier for an area> --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 <area-code> --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 <http://www.gnu.org/licenses/>.
+
;;======================================================================
;;======================================================================
;; 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,40 @@
-
-;; 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 <http://www.gnu.org/licenses/>.
+;;
(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 +41,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 +69,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 +131,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 +149,13 @@
(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
+ (common:wait-for-homehost-load load-limit (conc " delaying server start due to load on homehost. limit is " load-limit))
(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))
@@ -292,11 +328,11 @@
(lock-file (conc areapath "/logs/server-start.lock")))
(if (> (- (current-seconds) when-run) run-delay)
(begin
(common:simple-file-lock-and-wait lock-file expire-time: 15)
(server:run areapath)
- (thread-sleep! 5) ;; don't release the lock for at least a few seconds
+ (thread-sleep! 2) ;; don't release the lock for at least a few seconds
(common:simple-file-release-lock lock-file)))
(hash-table-set! *server-kind-run* areapath (list (+ call-num 1)(current-seconds))))))
(define (server:start-and-wait areapath #!key (timeout 60))
(let ((give-up-time (+ (current-seconds) timeout)))
@@ -424,16 +460,288 @@
(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:get-bruteforce-syncer dbstruct #!key (fork-to-background #f) (persist-until-sync #f))
+ (let* ((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 (common:get-sync-lock-filepath))
+ (sync-cmd-core (conc sqlite-exe" " tmp-db " .dump | "sqlite-exe" " staging-file "&>"sync-log))
+ (sync-cmd (if fork-to-background
+ (conc "/usr/bin/env NBFAKE_LOG="*toppath*"/logs/last-server-sync-"(current-process-id)".log nbfake \""sync-cmd-core" && /bin/mv -f " staging-file " " mtdbfile" \"")
+ sync-cmd-core))
+ (default-min-intersync-delay 2)
+ (min-intersync-delay (configf:lookup-number *configdat* "server" "minimum-intersync-delay" default: default-min-intersync-delay))
+ (default-duty-cycle 0.1)
+ (duty-cycle (configf:lookup-number *configdat* "server" "sync-duty-cycle" default: default-duty-cycle))
+ (last-sync-seconds 10) ;; we will adjust this to a measurement and delay last-sync-seconds * (1 - duty-cycle)
+ (calculate-off-time (lambda (work-duration duty-cycle)
+ (* (/ (- 1 duty-cycle) duty-cycle) last-sync-seconds)))
+ (off-time min-intersync-delay) ;; adjusted in closure below.
+ (do-a-sync
+ (lambda ()
+ (BB> "Start do-a-sync with fork-to-background="fork-to-background" persist-until-sync="persist-until-sync)
+ (let* ((finalres
+ (let retry-loop ((num-tries 0))
+ (if (common:simple-file-lock lockfile)
+ (begin
+ (cond
+ ((not (or fork-to-background persist-until-sync))
+ (debug:print 0 *default-log-port* "INFO: syncer thread sleeping for max of (server.minimum-intersync-delay="min-intersync-delay
+ " , off-time="off-time" seconds ]")
+ (thread-sleep! (max off-time min-intersync-delay)))
+ (else
+ (debug:print 0 *default-log-port* "INFO: syncer thread NOT sleeping ; maybe time-to-exit...")))
+
+ (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))
+ (res2
+ (cond
+ ((eq? 0 res)
+ (delete-file* (conc mtdbfile ".backup"))
+ (if (eq? 0 (file-size sync-log))
+ (delete-file sync-log))
+ (system (conc "/bin/mv " staging-file " " mtdbfile))
+
+ (set! last-sync-seconds (/ (- (current-milliseconds) start-time) 1000))
+ (set! off-time (calculate-off-time
+ last-sync-seconds
+ (cond
+ ((and (number? duty-cycle) (> duty-cycle 0) (< duty-cycle 1))
+ duty-cycle)
+ (else
+ (debug:print 0 *default-log-port* "WARNING: ["(common:human-time)"] server.sync-duty-cycle is invalid. Should be a number between 0 and 1, but "duty-cycle" was specified. Using default value: "default-duty-cycle)
+ default-duty-cycle))))
+
+ (debug:print 1 *default-log-port* "INFO: ["(common:human-time)"] pid="(current-process-id)" SYNC took "last-sync-seconds" sec")
+ (debug:print 1 *default-log-port* "INFO: ["(common:human-time)"] pid="(current-process-id)" SYNC took "last-sync-seconds" sec ; with duty-cycle of "duty-cycle" off time is now "off-time)
+ 'sync-completed)
+ (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)))
+ #f))))
+ (common:simple-file-release-lock lockfile)
+ (BB> "released lockfile: " lockfile)
+ (when (common:file-exists? lockfile)
+ (BB> "DID NOT ACTUALLY RELEASE LOCKFILE"))
+ res2) ;; end let
+ );; end begin
+ ;; else
+ (cond
+ (persist-until-sync
+ (thread-sleep! 1)
+ (debug:print 1 *default-log-port* "INFO: ["(common:human-time)"] pid="(current-process-id)" other SYNC in progress; we're in a fork-to-background so we need to succeed. Let's wait a jiffy and and try again. num-tries="num-tries" (waiting for lockfile="lockfile" to disappear)")
+ (retry-loop (add1 num-tries)))
+ (else
+ (thread-sleep! (max off-time (+ last-sync-seconds min-intersync-delay)))
+ (debug:print 1 *default-log-port* "INFO: ["(common:human-time)"] pid="(current-process-id)" other SYNC in progress; not syncing.")
+ 'parallel-sync-in-progress))
+ ) ;; end if got lockfile
+ )
+ ))
+ (BB> "End do-a-sync with fork-to-background="fork-to-background" persist-until-sync="persist-until-sync" and result="finalres)
+ finalres)
+ ) ;; end lambda
+ ))
+ do-a-sync))
+
+(define (server:writable-watchdog-bruteforce dbstruct)
+ (thread-sleep! 1) ;; delay for startup
+ (let* ((do-a-sync (server:get-bruteforce-syncer dbstruct))
+ (final-sync (server:get-bruteforce-syncer dbstruct fork-to-background: #t persist-until-sync: #t)))
+ (when (and (not (args:get-arg "-sync-to-megatest.db")) ;; conditions under which we do not run the sync
+ (args:get-arg "-server"))
+
+ (let loop ()
+ (do-a-sync)
+ (if (not *time-to-exit*) (loop))) ;; keep going unless time to exit
+
+ ;; time to exit, close the no-sync db here
+ (final-sync)
+
+ (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)
+ )))))
+
+(define (server:writable-watchdog-deltasync dbstruct)
+ (thread-sleep! 0.05) ;; delay for startup
+ (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))
+ (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 (and (not *time-to-exit*) ;; do not start a sync if we are in the process of exiting
+ (or need-sync should-sync)
+ (or sync-done sync-stale)
+ (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
+ " 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
+
+ (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 <http://www.gnu.org/licenses/>.
+
(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 <http://www.gnu.org/licenses/>.
+;;
+(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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<manifest:manifest xmlns:manifest="urn:oasis:names:tc:opendocument:xmlns:manifest:1.0">
- <manifest:file-entry manifest:media-type="application/vnd.oasis.opendocument.spreadsheet" manifest:version="1.2" manifest:full-path="/"/>
- <manifest:file-entry manifest:media-type="" manifest:full-path="Configurations2/statusbar/"/>
- <manifest:file-entry manifest:media-type="" manifest:full-path="Configurations2/accelerator/current.xml"/>
- <manifest:file-entry manifest:media-type="" manifest:full-path="Configurations2/accelerator/"/>
- <manifest:file-entry manifest:media-type="" manifest:full-path="Configurations2/floater/"/>
- <manifest:file-entry manifest:media-type="" manifest:full-path="Configurations2/popupmenu/"/>
- <manifest:file-entry manifest:media-type="" manifest:full-path="Configurations2/progressbar/"/>
- <manifest:file-entry manifest:media-type="" manifest:full-path="Configurations2/toolpanel/"/>
- <manifest:file-entry manifest:media-type="" manifest:full-path="Configurations2/menubar/"/>
- <manifest:file-entry manifest:media-type="" manifest:full-path="Configurations2/toolbar/"/>
- <manifest:file-entry manifest:media-type="" manifest:full-path="Configurations2/images/Bitmaps/"/>
- <manifest:file-entry manifest:media-type="" manifest:full-path="Configurations2/images/"/>
- <manifest:file-entry manifest:media-type="application/vnd.sun.xml.ui.configuration" manifest:full-path="Configurations2/"/>
- <manifest:file-entry manifest:media-type="text/xml" manifest:full-path="content.xml"/>
- <manifest:file-entry manifest:media-type="text/xml" manifest:full-path="styles.xml"/>
- <manifest:file-entry manifest:media-type="text/xml" manifest:full-path="meta.xml"/>
- <manifest:file-entry manifest:media-type="image/png" manifest:full-path="Thumbnails/thumbnail.png"/>
- <manifest:file-entry manifest:media-type="" manifest:full-path="Thumbnails/"/>
- <manifest:file-entry manifest:media-type="text/xml" manifest:full-path="settings.xml"/>
-</manifest:manifest>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" grddl:transformation="http://docs.oasis-open.org/office/1.2/xslt/odf2rdf.xsl">
-<office:scripts/>
-<office:font-face-decls>
-<style:font-face style:name="Arial" svg:font-family="Arial" style:font-family-generic="swiss" style:font-pitch="variable"/>
-<style:font-face style:name="DejaVu Sans" svg:font-family="'DejaVu Sans'" style:font-family-generic="system" style:font-pitch="variable"/>
-<style:font-face style:name="Droid Sans Fallback" svg:font-family="'Droid Sans Fallback'" style:font-family-generic="system" style:font-pitch="variable"/>
-<style:font-face style:name="Lohit Hindi" svg:font-family="'Lohit Hindi'" style:font-family-generic="system" style:font-pitch="variable"/>
-</office:font-face-decls>
-<office:automatic-styles>
-<style:style style:name="co1" style:family="table-column">
-<style:table-column-properties fo:break-before="auto" style:column-width="0.8925in"/>
-</style:style>
-<style:style style:name="ro1" style:family="table-row">
-<style:table-row-properties style:row-height="0.178in" fo:break-before="auto" style:use-optimal-row-height="true"/>
-</style:style>
-<style:style style:name="ta1" style:family="table" style:master-page-name="Default">
-<style:table-properties table:display="true" style:writing-mode="lr-tb"/>
-</style:style>
-</office:automatic-styles>
-<office:body>
-<office:spreadsheet>
-<table:table table:name="Sheet1" table:style-name="ta1" table:print="false">
-<table:table-column table:style-name="co1" table:number-columns-repeated="2" table:default-cell-style-name="Default"/>
-<table:table-row table:style-name="ro1">
-<table:table-cell office:value-type="string">
-<text:p>Row 1,A</text:p>
-</table:table-cell>
-<table:table-cell office:value-type="string">
-<text:p>Row 1,B</text:p>
-</table:table-cell>
-</table:table-row>
-<table:table-row table:style-name="ro1">
-<table:table-cell office:value-type="string">
-<text:p>Row 2,A</text:p>
-</table:table-cell>
-<table:table-cell office:value-type="string">
-<text:p>Row 2,B</text:p>
-</table:table-cell>
-</table:table-row>
-<table:table-row table:style-name="ro1">
-<table:table-cell table:number-columns-repeated="2"/>
-</table:table-row>
-<table:table-row table:style-name="ro1">
-<table:table-cell office:value-type="string">
-<text:p>this is sheet one</text:p>
-</table:table-cell>
-<table:table-cell/>
-</table:table-row>
-</table:table>
-<table:table table:name="Sheet2" table:style-name="ta1" table:print="false">
-<table:table-column table:style-name="co1" table:number-columns-repeated="2" table:default-cell-style-name="Default"/>
-<table:table-row table:style-name="ro1">
-<table:table-cell office:value-type="string">
-<text:p>Row 1,A</text:p>
-</table:table-cell>
-<table:table-cell office:value-type="string">
-<text:p>Row 1,B</text:p>
-</table:table-cell>
-</table:table-row>
-<table:table-row table:style-name="ro1">
-<table:table-cell office:value-type="string">
-<text:p>Row 2,A</text:p>
-</table:table-cell>
-<table:table-cell office:value-type="string">
-<text:p>Row 2,B</text:p>
-</table:table-cell>
-</table:table-row>
-<table:table-row table:style-name="ro1">
-<table:table-cell table:number-columns-repeated="2"/>
-</table:table-row>
-<table:table-row table:style-name="ro1">
-<table:table-cell office:value-type="string">
-<text:p>this is sheet two</text:p>
-</table:table-cell>
-<table:table-cell/>
-</table:table-row>
-</table:table>
-<table:table table:name="Sheet3" table:style-name="ta1" table:print="false">
-<table:table-column table:style-name="co1" table:number-columns-repeated="2" table:default-cell-style-name="Default"/>
-<table:table-row table:style-name="ro1">
-<table:table-cell office:value-type="float" office:value="1">
-<text:p>1</text:p>
-</table:table-cell>
-<table:table-cell office:value-type="float" office:value="2">
-<text:p>2</text:p>
-</table:table-cell>
-</table:table-row>
-<table:table-row table:style-name="ro1">
-<table:table-cell office:value-type="float" office:value="2">
-<text:p>2</text:p>
-</table:table-cell>
-<table:table-cell office:value-type="float" office:value="4">
-<text:p>4</text:p>
-</table:table-cell>
-</table:table-row>
-<table:table-row table:style-name="ro1">
-<table:table-cell office:value-type="float" office:value="3">
-<text:p>3</text:p>
-</table:table-cell>
-<table:table-cell office:value-type="float" office:value="6">
-<text:p>6</text:p>
-</table:table-cell>
-</table:table-row>
-<table:table-row table:style-name="ro1">
-<table:table-cell office:value-type="float" office:value="4">
-<text:p>4</text:p>
-</table:table-cell>
-<table:table-cell office:value-type="float" office:value="8">
-<text:p>8</text:p>
-</table:table-cell>
-</table:table-row>
-<table:table-row table:style-name="ro1">
-<table:table-cell office:value-type="float" office:value="5">
-<text:p>5</text:p>
-</table:table-cell>
-<table:table-cell office:value-type="float" office:value="10">
-<text:p>10</text:p>
-</table:table-cell>
-</table:table-row>
-<table:table-row table:style-name="ro1">
-<table:table-cell office:value-type="float" office:value="6">
-<text:p>6</text:p>
-</table:table-cell>
-<table:table-cell office:value-type="float" office:value="12">
-<text:p>12</text:p>
-</table:table-cell>
-</table:table-row>
-</table:table>
-</office:spreadsheet>
-</office:body>
-</office:document-content>
DELETED spreadsheet/basic/content.xml~
Index: spreadsheet/basic/content.xml~
==================================================================
--- spreadsheet/basic/content.xml~
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document-content xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:xforms="http://www.w3.org/2002/xforms" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:field="urn:openoffice:names:experimental:ooo-ms-interop:xmlns:field:1.0" xmlns:formx="urn:openoffice:names:experimental:ooxml-odf-interop:xmlns:form:1.0" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" grddl:transformation="http://docs.oasis-open.org/office/1.2/xslt/odf2rdf.xsl"><office:scripts/><office:font-face-decls><style:font-face style:name="Arial" svg:font-family="Arial" style:font-family-generic="swiss" style:font-pitch="variable"/><style:font-face style:name="DejaVu Sans" svg:font-family="'DejaVu Sans'" style:font-family-generic="system" style:font-pitch="variable"/><style:font-face style:name="Droid Sans Fallback" svg:font-family="'Droid Sans Fallback'" style:font-family-generic="system" style:font-pitch="variable"/><style:font-face style:name="Lohit Hindi" svg:font-family="'Lohit Hindi'" style:font-family-generic="system" style:font-pitch="variable"/></office:font-face-decls><office:automatic-styles><style:style style:name="co1" style:family="table-column"><style:table-column-properties fo:break-before="auto" style:column-width="0.8925in"/></style:style><style:style style:name="ro1" style:family="table-row"><style:table-row-properties style:row-height="0.178in" fo:break-before="auto" style:use-optimal-row-height="true"/></style:style><style:style style:name="ta1" style:family="table" style:master-page-name="Default"><style:table-properties table:display="true" style:writing-mode="lr-tb"/></style:style></office:automatic-styles><office:body><office:spreadsheet><table:table table:name="Sheet1" table:style-name="ta1" table:print="false"><table:table-column table:style-name="co1" table:number-columns-repeated="2" table:default-cell-style-name="Default"/><table:table-row table:style-name="ro1"><table:table-cell office:value-type="string"><text:p>Row 1,A</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Row 1,B</text:p></table:table-cell></table:table-row><table:table-row table:style-name="ro1"><table:table-cell office:value-type="string"><text:p>Row 2,A</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Row 2,B</text:p></table:table-cell></table:table-row><table:table-row table:style-name="ro1"><table:table-cell table:number-columns-repeated="2"/></table:table-row><table:table-row table:style-name="ro1"><table:table-cell office:value-type="string"><text:p>this is sheet one</text:p></table:table-cell><table:table-cell/></table:table-row></table:table><table:table table:name="Sheet2" table:style-name="ta1" table:print="false"><table:table-column table:style-name="co1" table:number-columns-repeated="2" table:default-cell-style-name="Default"/><table:table-row table:style-name="ro1"><table:table-cell office:value-type="string"><text:p>Row 1,A</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Row 1,B</text:p></table:table-cell></table:table-row><table:table-row table:style-name="ro1"><table:table-cell office:value-type="string"><text:p>Row 2,A</text:p></table:table-cell><table:table-cell office:value-type="string"><text:p>Row 2,B</text:p></table:table-cell></table:table-row><table:table-row table:style-name="ro1"><table:table-cell table:number-columns-repeated="2"/></table:table-row><table:table-row table:style-name="ro1"><table:table-cell office:value-type="string"><text:p>this is sheet two</text:p></table:table-cell><table:table-cell/></table:table-row></table:table><table:table table:name="Sheet3" table:style-name="ta1" table:print="false"><table:table-column table:style-name="co1" table:number-columns-repeated="2" table:default-cell-style-name="Default"/><table:table-row table:style-name="ro1"><table:table-cell office:value-type="float" office:value="1"><text:p>1</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="2"><text:p>2</text:p></table:table-cell></table:table-row><table:table-row table:style-name="ro1"><table:table-cell office:value-type="float" office:value="2"><text:p>2</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="4"><text:p>4</text:p></table:table-cell></table:table-row><table:table-row table:style-name="ro1"><table:table-cell office:value-type="float" office:value="3"><text:p>3</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="6"><text:p>6</text:p></table:table-cell></table:table-row><table:table-row table:style-name="ro1"><table:table-cell office:value-type="float" office:value="4"><text:p>4</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="8"><text:p>8</text:p></table:table-cell></table:table-row><table:table-row table:style-name="ro1"><table:table-cell office:value-type="float" office:value="5"><text:p>5</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="10"><text:p>10</text:p></table:table-cell></table:table-row><table:table-row table:style-name="ro1"><table:table-cell office:value-type="float" office:value="6"><text:p>6</text:p></table:table-cell><table:table-cell office:value-type="float" office:value="12"><text:p>12</text:p></table:table-cell></table:table-row></table:table></office:spreadsheet></office:body></office:document-content>
DELETED spreadsheet/basic/meta.xml
Index: spreadsheet/basic/meta.xml
==================================================================
--- spreadsheet/basic/meta.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document-meta xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:grddl="http://www.w3.org/2003/g/data-view#" office:version="1.2" grddl:transformation="http://docs.oasis-open.org/office/1.2/xslt/odf2rdf.xsl"><office:meta><meta:initial-creator>Matt Welland</meta:initial-creator><meta:creation-date>2011-09-06T20:46:23</meta:creation-date><dc:date>2011-09-06T22:05:47</dc:date><dc:creator>Matt Welland</dc:creator><meta:editing-duration>PT1H19M25S</meta:editing-duration><meta:editing-cycles>2</meta:editing-cycles><meta:generator>LibreOffice/3.3$Linux LibreOffice_project/330m19$Build-301</meta:generator><meta:document-statistic meta:table-count="3" meta:cell-count="22" meta:object-count="0"/></office:meta></office:document-meta>
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 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document-settings xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:config="urn:oasis:names:tc:opendocument:xmlns:config:1.0" xmlns:ooo="http://openoffice.org/2004/office" office:version="1.2"><office:settings><config:config-item-set config:name="ooo:view-settings"><config:config-item config:name="VisibleAreaTop" config:type="int">0</config:config-item><config:config-item config:name="VisibleAreaLeft" config:type="int">0</config:config-item><config:config-item config:name="VisibleAreaWidth" config:type="int">4516</config:config-item><config:config-item config:name="VisibleAreaHeight" config:type="int">1799</config:config-item><config:config-item-map-indexed config:name="Views"><config:config-item-map-entry><config:config-item config:name="ViewId" config:type="string">view1</config:config-item><config:config-item-map-named config:name="Tables"><config:config-item-map-entry config:name="Sheet1"><config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item><config:config-item config:name="CursorPositionY" config:type="int">0</config:config-item><config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item><config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item><config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item><config:config-item config:name="VerticalSplitPosition" config:type="int">0</config:config-item><config:config-item config:name="ActiveSplitRange" config:type="short">2</config:config-item><config:config-item config:name="PositionLeft" config:type="int">0</config:config-item><config:config-item config:name="PositionRight" config:type="int">0</config:config-item><config:config-item config:name="PositionTop" config:type="int">0</config:config-item><config:config-item config:name="PositionBottom" config:type="int">0</config:config-item><config:config-item config:name="ZoomType" config:type="short">0</config:config-item><config:config-item config:name="ZoomValue" config:type="int">100</config:config-item><config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item><config:config-item config:name="ShowGrid" config:type="boolean">true</config:config-item></config:config-item-map-entry><config:config-item-map-entry config:name="Sheet2"><config:config-item config:name="CursorPositionX" config:type="int">0</config:config-item><config:config-item config:name="CursorPositionY" config:type="int">4</config:config-item><config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item><config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item><config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item><config:config-item config:name="VerticalSplitPosition" config:type="int">0</config:config-item><config:config-item config:name="ActiveSplitRange" config:type="short">2</config:config-item><config:config-item config:name="PositionLeft" config:type="int">0</config:config-item><config:config-item config:name="PositionRight" config:type="int">0</config:config-item><config:config-item config:name="PositionTop" config:type="int">0</config:config-item><config:config-item config:name="PositionBottom" config:type="int">0</config:config-item><config:config-item config:name="ZoomType" config:type="short">0</config:config-item><config:config-item config:name="ZoomValue" config:type="int">100</config:config-item><config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item><config:config-item config:name="ShowGrid" config:type="boolean">true</config:config-item></config:config-item-map-entry><config:config-item-map-entry config:name="Sheet3"><config:config-item config:name="CursorPositionX" config:type="int">1</config:config-item><config:config-item config:name="CursorPositionY" config:type="int">5</config:config-item><config:config-item config:name="HorizontalSplitMode" config:type="short">0</config:config-item><config:config-item config:name="VerticalSplitMode" config:type="short">0</config:config-item><config:config-item config:name="HorizontalSplitPosition" config:type="int">0</config:config-item><config:config-item config:name="VerticalSplitPosition" config:type="int">0</config:config-item><config:config-item config:name="ActiveSplitRange" config:type="short">2</config:config-item><config:config-item config:name="PositionLeft" config:type="int">0</config:config-item><config:config-item config:name="PositionRight" config:type="int">0</config:config-item><config:config-item config:name="PositionTop" config:type="int">0</config:config-item><config:config-item config:name="PositionBottom" config:type="int">0</config:config-item><config:config-item config:name="ZoomType" config:type="short">0</config:config-item><config:config-item config:name="ZoomValue" config:type="int">100</config:config-item><config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item><config:config-item config:name="ShowGrid" config:type="boolean">true</config:config-item></config:config-item-map-entry></config:config-item-map-named><config:config-item config:name="ActiveTable" config:type="string">Sheet3</config:config-item><config:config-item config:name="HorizontalScrollbarWidth" config:type="int">270</config:config-item><config:config-item config:name="ZoomType" config:type="short">0</config:config-item><config:config-item config:name="ZoomValue" config:type="int">100</config:config-item><config:config-item config:name="PageViewZoomValue" config:type="int">60</config:config-item><config:config-item config:name="ShowPageBreakPreview" config:type="boolean">false</config:config-item><config:config-item config:name="ShowZeroValues" config:type="boolean">true</config:config-item><config:config-item config:name="ShowNotes" config:type="boolean">true</config:config-item><config:config-item config:name="ShowGrid" config:type="boolean">true</config:config-item><config:config-item config:name="GridColor" config:type="long">12632256</config:config-item><config:config-item config:name="ShowPageBreaks" config:type="boolean">true</config:config-item><config:config-item config:name="HasColumnRowHeaders" config:type="boolean">true</config:config-item><config:config-item config:name="HasSheetTabs" config:type="boolean">true</config:config-item><config:config-item config:name="IsOutlineSymbolsSet" config:type="boolean">true</config:config-item><config:config-item config:name="IsSnapToRaster" config:type="boolean">false</config:config-item><config:config-item config:name="RasterIsVisible" config:type="boolean">false</config:config-item><config:config-item config:name="RasterResolutionX" config:type="int">1270</config:config-item><config:config-item config:name="RasterResolutionY" config:type="int">1270</config:config-item><config:config-item config:name="RasterSubdivisionX" config:type="int">1</config:config-item><config:config-item config:name="RasterSubdivisionY" config:type="int">1</config:config-item><config:config-item config:name="IsRasterAxisSynchronized" config:type="boolean">true</config:config-item></config:config-item-map-entry></config:config-item-map-indexed></config:config-item-set><config:config-item-set config:name="ooo:configuration-settings"><config:config-item config:name="IsKernAsianPunctuation" config:type="boolean">false</config:config-item><config:config-item config:name="IsRasterAxisSynchronized" config:type="boolean">true</config:config-item><config:config-item config:name="LinkUpdateMode" config:type="short">3</config:config-item><config:config-item config:name="SaveVersionOnClose" config:type="boolean">false</config:config-item><config:config-item config:name="AllowPrintJobCancel" config:type="boolean">true</config:config-item><config:config-item config:name="HasSheetTabs" config:type="boolean">true</config:config-item><config:config-item config:name="ShowPageBreaks" config:type="boolean">true</config:config-item><config:config-item config:name="RasterResolutionX" config:type="int">1270</config:config-item><config:config-item config:name="PrinterSetup" config:type="base64Binary"/><config:config-item config:name="RasterResolutionY" config:type="int">1270</config:config-item><config:config-item config:name="LoadReadonly" config:type="boolean">false</config:config-item><config:config-item config:name="RasterSubdivisionX" config:type="int">1</config:config-item><config:config-item config:name="ShowNotes" config:type="boolean">true</config:config-item><config:config-item config:name="ShowZeroValues" config:type="boolean">true</config:config-item><config:config-item config:name="RasterSubdivisionY" config:type="int">1</config:config-item><config:config-item config:name="ApplyUserData" config:type="boolean">true</config:config-item><config:config-item config:name="GridColor" config:type="long">12632256</config:config-item><config:config-item config:name="RasterIsVisible" config:type="boolean">false</config:config-item><config:config-item config:name="IsSnapToRaster" config:type="boolean">false</config:config-item><config:config-item config:name="PrinterName" config:type="string"/><config:config-item config:name="ShowGrid" config:type="boolean">true</config:config-item><config:config-item config:name="CharacterCompressionType" config:type="short">0</config:config-item><config:config-item config:name="HasColumnRowHeaders" config:type="boolean">true</config:config-item><config:config-item config:name="IsOutlineSymbolsSet" config:type="boolean">true</config:config-item><config:config-item config:name="AutoCalculate" config:type="boolean">true</config:config-item><config:config-item config:name="IsDocumentShared" config:type="boolean">false</config:config-item><config:config-item config:name="UpdateFromTemplate" config:type="boolean">true</config:config-item></config:config-item-set></office:settings></office:document-settings>
DELETED spreadsheet/basic/styles.xml
Index: spreadsheet/basic/styles.xml
==================================================================
--- spreadsheet/basic/styles.xml
+++ /dev/null
@@ -1,2 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<office:document-styles xmlns:office="urn:oasis:names:tc:opendocument:xmlns:office:1.0" xmlns:style="urn:oasis:names:tc:opendocument:xmlns:style:1.0" xmlns:text="urn:oasis:names:tc:opendocument:xmlns:text:1.0" xmlns:table="urn:oasis:names:tc:opendocument:xmlns:table:1.0" xmlns:draw="urn:oasis:names:tc:opendocument:xmlns:drawing:1.0" xmlns:fo="urn:oasis:names:tc:opendocument:xmlns:xsl-fo-compatible:1.0" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:meta="urn:oasis:names:tc:opendocument:xmlns:meta:1.0" xmlns:number="urn:oasis:names:tc:opendocument:xmlns:datastyle:1.0" xmlns:presentation="urn:oasis:names:tc:opendocument:xmlns:presentation:1.0" xmlns:svg="urn:oasis:names:tc:opendocument:xmlns:svg-compatible:1.0" xmlns:chart="urn:oasis:names:tc:opendocument:xmlns:chart:1.0" xmlns:dr3d="urn:oasis:names:tc:opendocument:xmlns:dr3d:1.0" xmlns:math="http://www.w3.org/1998/Math/MathML" xmlns:form="urn:oasis:names:tc:opendocument:xmlns:form:1.0" xmlns:script="urn:oasis:names:tc:opendocument:xmlns:script:1.0" xmlns:ooo="http://openoffice.org/2004/office" xmlns:ooow="http://openoffice.org/2004/writer" xmlns:oooc="http://openoffice.org/2004/calc" xmlns:dom="http://www.w3.org/2001/xml-events" xmlns:rpt="http://openoffice.org/2005/report" xmlns:of="urn:oasis:names:tc:opendocument:xmlns:of:1.2" xmlns:xhtml="http://www.w3.org/1999/xhtml" xmlns:grddl="http://www.w3.org/2003/g/data-view#" xmlns:tableooo="http://openoffice.org/2009/table" xmlns:css3t="http://www.w3.org/TR/css3-text/" office:version="1.2" grddl:transformation="http://docs.oasis-open.org/office/1.2/xslt/odf2rdf.xsl"><office:font-face-decls><style:font-face style:name="Arial" svg:font-family="Arial" style:font-family-generic="swiss" style:font-pitch="variable"/><style:font-face style:name="DejaVu Sans" svg:font-family="'DejaVu Sans'" style:font-family-generic="system" style:font-pitch="variable"/><style:font-face style:name="Droid Sans Fallback" svg:font-family="'Droid Sans Fallback'" style:font-family-generic="system" style:font-pitch="variable"/><style:font-face style:name="Lohit Hindi" svg:font-family="'Lohit Hindi'" style:font-family-generic="system" style:font-pitch="variable"/></office:font-face-decls><office:styles><style:default-style style:family="table-cell"><style:paragraph-properties style:tab-stop-distance="0.5in"/><style:text-properties style:font-name="Arial" fo:language="en" fo:country="US" style:font-name-asian="DejaVu Sans" style:language-asian="zh" style:country-asian="CN" style:font-name-complex="DejaVu Sans" style:language-complex="hi" style:country-complex="IN"/></style:default-style><number:number-style style:name="N0"><number:number number:min-integer-digits="1"/></number:number-style><number:currency-style style:name="N104P0" style:volatile="true"><number:currency-symbol number:language="en" number:country="US">$</number:currency-symbol><number:number number:decimal-places="2" number:min-integer-digits="1" number:grouping="true"/></number:currency-style><number:currency-style style:name="N104"><style:text-properties fo:color="#ff0000"/><number:text>-</number:text><number:currency-symbol number:language="en" number:country="US">$</number:currency-symbol><number:number number:decimal-places="2" number:min-integer-digits="1" number:grouping="true"/><style:map style:condition="value()>=0" style:apply-style-name="N104P0"/></number:currency-style><style:style style:name="Default" style:family="table-cell"><style:text-properties style:font-name-asian="Droid Sans Fallback" style:font-name-complex="Lohit Hindi"/></style:style><style:style style:name="Result" style:family="table-cell" style:parent-style-name="Default"><style:text-properties fo:font-style="italic" style:text-underline-style="solid" style:text-underline-width="auto" style:text-underline-color="font-color" fo:font-weight="bold"/></style:style><style:style style:name="Result2" style:family="table-cell" style:parent-style-name="Result" style:data-style-name="N104"/><style:style style:name="Heading" style:family="table-cell" style:parent-style-name="Default"><style:table-cell-properties style:text-align-source="fix" style:repeat-content="false"/><style:paragraph-properties fo:text-align="center"/><style:text-properties fo:font-size="16pt" fo:font-style="italic" fo:font-weight="bold"/></style:style><style:style style:name="Heading1" style:family="table-cell" style:parent-style-name="Heading"><style:table-cell-properties style:rotation-angle="90"/></style:style></office:styles><office:automatic-styles><style:page-layout style:name="Mpm1"><style:page-layout-properties style:writing-mode="lr-tb"/><style:header-style><style:header-footer-properties fo:min-height="0.2957in" fo:margin-left="0in" fo:margin-right="0in" fo:margin-bottom="0.0984in"/></style:header-style><style:footer-style><style:header-footer-properties fo:min-height="0.2957in" fo:margin-left="0in" fo:margin-right="0in" fo:margin-top="0.0984in"/></style:footer-style></style:page-layout><style:page-layout style:name="Mpm2"><style:page-layout-properties style:writing-mode="lr-tb"/><style:header-style><style:header-footer-properties fo:min-height="0.2957in" fo:margin-left="0in" fo:margin-right="0in" fo:margin-bottom="0.0984in" fo:border="0.0346in solid #000000" fo:padding="0.0071in" fo:background-color="#c0c0c0"><style:background-image/></style:header-footer-properties></style:header-style><style:footer-style><style:header-footer-properties fo:min-height="0.2957in" fo:margin-left="0in" fo:margin-right="0in" fo:margin-top="0.0984in" fo:border="0.0346in solid #000000" fo:padding="0.0071in" fo:background-color="#c0c0c0"><style:background-image/></style:header-footer-properties></style:footer-style></style:page-layout></office:automatic-styles><office:master-styles><style:master-page style:name="Default" style:page-layout-name="Mpm1"><style:header><text:p><text:sheet-name>???</text:sheet-name></text:p></style:header><style:header-left style:display="false"/><style:footer><text:p>Page <text:page-number>1</text:page-number></text:p></style:footer><style:footer-left style:display="false"/></style:master-page><style:master-page style:name="Report" style:page-layout-name="Mpm2"><style:header><style:region-left><text:p><text:sheet-name>???</text:sheet-name> (<text:title>???</text:title>)</text:p></style:region-left><style:region-right><text:p><text:date style:data-style-name="N2" text:date-value="2011-09-06">09/06/2011</text:date>, <text:time>22:05:47</text:time></text:p></style:region-right></style:header><style:header-left style:display="false"/><style:footer><text:p>Page <text:page-number>1</text:page-number> / <text:page-count>99</text:page-count></text:p></style:footer><style:footer-left style:display="false"/></style:master-page></office:master-styles></office:document-styles>
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 <http://www.gnu.org/licenses/>.
(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 <src file> <relative dest> : copy file to target area
- mkdir <dir name> : maks directory in target area
- rm <file> : remove file <file> from target area
- ln <target> <link name> : creates a symlink
- log :
-
+(define spublish:help (conc "Usage: spublish [action [params ...]]
+
+ ls <area> : list contents of target area
+ cp|publish <area> <src file> <destination> : copy file to target area
+ mkdir <area> <dir name> : maks directory in target area
+ rm <area> <file> : remove file <file> from target area
+ ln <area> <target> <link name> : 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 <target path> : To change the current directory within the sretrive shell.
+ pwd : Prints the full pathname of the current directory within the sretrive shell.
+ mkdir <path> : creates directory. Note it does not create's a path recursive manner.
+ rm <target path> : removes files and emoty directories
+ cp <src> <target path> : 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 <area> <src file> <destination>" )
(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; <area> <path>")
+ (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; <area> <target> <link name>" )
+ (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; <area> <path> ")
(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 <http://www.gnu.org/licenses/>.
+;;
(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 <relversion> : retrieve data for release <version>
- -m \"message\" : why retrieved?
- cp <relative path> : copy file to current directory
- log : get listing of recent downloads
- shell : start a shell-like interface
+ ls <area> : list contents of target area
+ get <area> <reletive path> : retrieve path to the data within <area>
+ -m \"message\" : why retrieved?
+ shell <area> : 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 <path> | grep txt
+ cd <target directory> : To change the current directory within the sretrive shell.
+ pwd : Prints the full pathname of the current directory within the sretrive shell.
+ get <file or directory path> : download directory/files into the directory where sretrieve shell cmd was invoked
+ less <file path> : Read input file to allows backward movement in the file as well as forward movement
+ cat <file path> : show the contents of a file. The output of the cmd can be piped into other system cmd.
+
+ sgrep <search path> <pattern> [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 <search path> <pattern> [options] "))
+ ((< plen 2)
+ (print "Error: Missing arguments to grep!! Useage: grep <search path> <pattern> [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 (<file path>) 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 <path> 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
- ;; <packages-metadir>/<package-type>.config file using
- ;; <upstream-file> 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; <area> <relative path>" )
(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; <area> <relative path>" )
+ (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; <area> <relative path>" )
+ (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; <area> ")
+ (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 <area>!!" )
+ (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 <http://www.gnu.org/licenses/>.
+
+;; 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 #!optional (sub-cmd "-run")) ;; BUG: "-run" should be changed to "-rerun-clean" but current doesn't work
+ (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 " sub-cmd " " 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 <http://www.gnu.org/licenses/>.
[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 <http://www.gnu.org/licenses/>.
+;;
;;======================================================================
;;======================================================================
;; 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 <http://www.gnu.org/licenses/>.
;;======================================================================
;; 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 <http://www.gnu.org/licenses/>.
+;;
;; 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,28 +96,28 @@
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))
(else (sqlite3:open-database ":memory:")))) ;; (never-give-up-open-db dbpath))
- (handler (make-busy-timeout 36000)))
+ (handler (sqlite3:make-busy-timeout 36000)))
(if (and exists
(not write-access))
(set! *db-write-access* write-access)) ;; only unset so other db's also can use this control
(sqlite3:set-busy-handler! mdb handler)
(db:set-sync mdb) ;; (sqlite3:execute mdb (conc "PRAGMA synchronous = 0;"))
@@ -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
;;======================================================================
@@ -258,11 +279,11 @@
"SELECT count(id) FROM monitors WHERE last_update < (strftime('%s','now') - 300) AND username=?;"
(car (user-information (current-user-id))))
res))
;;
-(define (tasks:start-monitor db mdb)
+#;(define (tasks:start-monitor db mdb)
(if (> (tasks:get-num-alive-monitors mdb) 2) ;; have two running, no need for more
(debug:print-info 1 *default-log-port* "Not starting monitor, already have more than two running")
(let* ((megatestdb (conc *toppath* "/megatest.db"))
(monitordbf (conc (db:dbfile-path #f) "/monitor.db"))
(last-db-update 0)) ;; (file-modification-time megatestdb)))
@@ -422,23 +443,23 @@
(db:with-db
dbstruct #f #t
(lambda (db)
(sqlite3:execute db (conc "DELETE FROM tasks_queue WHERE id IN (" task-ids ");")))))
-(define (tasks:process-queue dbstruct)
+#;(define (tasks:process-queue dbstruct)
(let* ((task (tasks:snag-a-task dbstruct))
(action (if task (tasks:task-get-action task) #f)))
(if action (print "tasks:process-queue task: " task))
(if action
(case (string->symbol action)
((run) (tasks:start-run dbstruct task))
((remove) (tasks:remove-runs dbstruct task))
((lock) (tasks:lock-runs dbstruct task))
;; ((monitor) (tasks:start-monitor db task))
- ((rollup) (tasks:rollup-runs dbstruct task))
+ #;((rollup) (tasks:rollup-runs dbstruct task))
((updatemeta)(tasks:update-meta dbstruct task))
- ((kill) (tasks:kill-monitors dbstruct task))))))
+ #;((kill) (tasks:kill-monitors dbstruct task))))))
(define (tasks:tasks->text tasks)
(let ((fmtstr "~10a~10a~10a~12a~20a~12a~12a~10a"))
(conc (format #f fmtstr "id" "action" "owner" "state" "target" "runname" "testpatts" "params") "\n"
(string-intersperse
@@ -448,11 +469,11 @@
(tasks:task-get-action task)
(tasks:task-get-owner task)
(tasks:task-get-state task)
(tasks:task-get-target task)
(tasks:task-get-name task)
- (tasks:task-get-test task)
+ (tasks:task-get-testpatt task)
;; (tasks:task-get-item task)
(tasks:task-get-params task)))
tasks) "\n"))))
(define (tasks:set-state dbstruct task-id state)
@@ -606,122 +627,471 @@
(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"))))
+ (run-tag (if (args:get-arg "-run-tag")
+ (args:get-arg "-run-tag")
+ ""))
+ (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)
+ (publish-time (if (args:get-arg "-cp-eventtime-to-publishtime")
+ event-time
+ (current-seconds)))
+ (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 publish-time)
+ (debug:print-info 0 *default-log-port* "Working on run-id " run-id " pgdb-id " new-run-id )
+ (if (not (equal? run-tag ""))
+ (task:add-run-tag dbh new-run-id run-tag))
+ 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)
+
+ (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 publish-time))
+ (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 (task:add-run-tag dbh run-id 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-run-taged-with-a-tag dbh (vector-ref tag-info 0) run-id))
+ (pgdb:insert-run-tag dbh (vector-ref tag-info 0) run-id)))))
+
+
+(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))
(state (db:test-get-state test-info))
(status (db:test-get-status test-info))
(host (db:test-get-host test-info))
+ (pid (db:test-get-process_id test-info))
(cpuload (db:test-get-cpuload test-info))
(diskfree (db:test-get-diskfree test-info))
(uname (db:test-get-uname test-info))
(run-dir (db:test-get-rundir test-info))
(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 pid))
+ (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 pid)
+ (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)
+ (print "In sync")
(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)))
+ ;(print "123")
+ ;(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)))
+ (debug:print-info 0 "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 <http://www.gnu.org/licenses/>.
+
+;;======================================================================
+;;
+;; 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 <http://www.gnu.org/licenses/>.
+;;
;;======================================================================
;;======================================================================
;; 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))
@@ -66,13 +75,13 @@
dbexists)
(sqlite3:open-database dbpath)
(sqlite3:open-database ":memory:"))))
(tdb-writeable (and (file-write-access? work-area)
(file-write-access? dbpath)))
- (handler (make-busy-timeout (if (args:get-arg "-override-timeout")
- (string->number (args:get-arg "-override-timeout"))
- 136000))))
+ (handler (sqlite3:make-busy-timeout (if (args:get-arg "-override-timeout")
+ (string->number (args:get-arg "-override-timeout"))
+ 136000))))
(if (and tdb-writeable
*db-write-access*)
(sqlite3:set-busy-handler! db handler))
(if (not dbexists)
ADDED telemetry-daemon
Index: telemetry-daemon
==================================================================
--- /dev/null
+++ telemetry-daemon
@@ -0,0 +1,265 @@
+#!/usr/bin/env python
+# -*- Mode: Python; -*-
+## Tiny Syslog Server in Python.
+##
+## This is a tiny syslog server that is able to receive UDP based syslog
+## entries on a specified port and save them to a file.
+## That's it... it does nothing else...
+
+
+import os
+import sys, os, time, atexit
+from signal import SIGTERM
+import logging
+import logging.handlers
+import SocketServer
+import datetime
+from subprocess import call
+import argparse
+import os
+import socket
+
+## code to determine this host's IP on non-loopback interface
+if os.name != "nt":
+ import fcntl
+ import struct
+
+ def get_interface_ip(ifname):
+ s = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
+ return socket.inet_ntoa(fcntl.ioctl(s.fileno(), 0x8915, struct.pack('256s',
+ ifname[:15]))[20:24])
+
+def get_lan_ip():
+ ip = socket.gethostbyname(socket.gethostname())
+ if ip.startswith("127.") and os.name != "nt":
+ interfaces = [
+ "eth0",
+ "eth1",
+ "eth2",
+ "wlan0",
+ "wlan1",
+ "wifi0",
+ "ath0",
+ "ath1",
+ "ppp0",
+ ]
+ for ifname in interfaces:
+ try:
+ ip = get_interface_ip(ifname)
+ break
+ except IOError:
+ pass
+ return ip
+
+class Daemon(object):
+ """
+ A generic daemon class.
+
+ Usage: subclass the Daemon class and override the run() method
+ """
+ def __init__(self, pidfile, stdin='/dev/null', stdout='/dev/null', stderr='/dev/null'):
+ self.stdin = stdin
+ self.stdout = stdout
+ self.stderr = stderr
+ self.pidfile = pidfile
+
+ def daemonize(self):
+ """
+ do the UNIX double-fork magic, see Stevens' "Advanced
+ Programming in the UNIX Environment" for details (ISBN 0201563177)
+ http://www.erlenstar.demon.co.uk/unix/faq_2.html#SEC16
+ """
+ try:
+ pid = os.fork()
+ if pid > 0:
+ # exit first parent
+ sys.exit(0)
+ except OSError, e:
+ sys.stderr.write("fork #1 failed: %d (%s)\n" % (e.errno, e.strerror))
+ sys.exit(1)
+
+ # decouple from parent environment
+ os.chdir("/")
+ os.setsid()
+ os.umask(0)
+
+ # do second fork
+ try:
+ pid = os.fork()
+ if pid > 0:
+ # exit from second parent
+ sys.exit(0)
+ except OSError, e:
+ sys.stderr.write("fork #2 failed: %d (%s)\n" % (e.errno, e.strerror))
+ sys.exit(1)
+
+ # redirect standard file descriptors
+ sys.stdout.flush()
+ sys.stderr.flush()
+ si = file(self.stdin, 'r')
+ so = file(self.stdout, 'a+')
+ se = file(self.stderr, 'a+', 0)
+ os.dup2(si.fileno(), sys.stdin.fileno())
+ os.dup2(so.fileno(), sys.stdout.fileno())
+ os.dup2(se.fileno(), sys.stderr.fileno())
+
+ # write pidfile
+ atexit.register(self.delpid)
+ pid = str(os.getpid())
+ file(self.pidfile,'w+').write("%s\n" % pid)
+
+ def delpid(self):
+ os.remove(self.pidfile)
+
+ def start(self):
+ """
+ Start the daemon
+ """
+ # Check for a pidfile to see if the daemon already runs
+ try:
+ pf = file(self.pidfile,'r')
+ pid = int(pf.read().strip())
+ pf.close()
+ except IOError:
+ pid = None
+
+ if pid:
+ message = "pidfile %s already exist. Daemon already running?\n"
+ sys.stderr.write(message % self.pidfile)
+ sys.exit(1)
+
+ # Start the daemon
+ self.daemonize()
+ self.run()
+
+ def stop(self):
+ """
+ Stop the daemon
+ """
+ # Get the pid from the pidfile
+ try:
+ pf = file(self.pidfile,'r')
+ pid = int(pf.read().strip())
+ pf.close()
+ except IOError:
+ pid = None
+
+ if not pid:
+ message = "pidfile %s does not exist. Daemon not running?\n"
+ sys.stderr.write(message % self.pidfile)
+ return # not an error in a restart
+
+ # Try killing the daemon process
+ try:
+ while 1:
+ os.kill(pid, SIGTERM)
+ time.sleep(0.1)
+ except OSError, err:
+ err = str(err)
+ if err.find("No such process") > 0:
+ if os.path.exists(self.pidfile):
+ os.remove(self.pidfile)
+ else:
+ print str(err)
+ sys.exit(1)
+
+ def restart(self):
+ """
+ Restart the daemon
+ """
+ self.stop()
+ self.start()
+
+ def run(self):
+ """
+ You should override this method when you subclass Daemon. It will be called after the process has been
+ daemonized by start() or restart().
+ """
+
+# setup logging module so that the log can be moved aside and will reopen for append
+def log_setup(logfile):
+ log_handler = logging.handlers.WatchedFileHandler(logfile)
+ formatter = logging.Formatter(
+ '%(message)s','')
+ log_handler.setFormatter(formatter)
+ logger = logging.getLogger()
+ logger.addHandler(log_handler)
+ logger.setLevel(logging.INFO)
+
+
+class SyslogUDPHandler(SocketServer.BaseRequestHandler):
+ def handle(self):
+ data = bytes.decode(self.request[0].strip())
+ socket = self.request[1]
+ print( "%s : " % self.client_address[0], str(data))
+ timestamp = datetime.datetime.now().isoformat()
+ logline = timestamp + ":"+self.client_address[0] + ":" + str(data)
+ logging.info(str(logline))
+
+
+
+class TelemetryLogDaemon(Daemon):
+ def __init__(self, pidfile, logfile, server_ip, server_port):
+ self.logfile = logfile
+ self.server_ip = server_ip
+ self.server_port = server_port
+ super(TelemetryLogDaemon, self).__init__(pidfile)
+
+ def run(self):
+ log_setup(self.logfile)
+ server = SocketServer.UDPServer((self.server_ip,int(self.server_port)), SyslogUDPHandler)
+ server.serve_forever(poll_interval=0.5)
+
+
+def main():
+ default_log_file = os.environ['PWD'] + "/telemetry.log"
+
+ parser = argparse.ArgumentParser(description = 'telemetry-daemon')
+ actions="start,restart,stop,nodaemon".split(",")
+
+ parser.add_argument("-a", "--action", required=True, choices=actions, help="manage daemon: start stop or restart")
+ parser.add_argument("-p", "--server-port", default="5929", help="specify alternate udp port number, default is 5929")
+ parser.add_argument("-i", "--server-ip", default=get_lan_ip(), help="specify IP if heuristics to get local host lan ip fails")
+ parser.add_argument("-l", "--log-file", default=default_log_file, help="specify log file to write")
+ parser.add_argument("-z", "--pid-file", default=default_log_file + ".pidfile", help="specify pidfile")
+ opts = parser.parse_args()
+
+ tld = TelemetryLogDaemon(opts.pid_file, opts.log_file, opts.server_ip, opts.server_port)
+
+ if opts.action == "start":
+ print "Info: Starting server"
+ print """Example addition to megatest.config to enable telemetry:
+
+[telemetry]
+host %s
+port %s
+want-events ALL
+
+ """ % (opts.server_ip, opts.server_port)
+ tld.start()
+
+ elif opts.action == "stop":
+ tld.stop()
+ elif opts.action == "restart":
+
+ print "Info: Restarting server"
+ print """Example addition to megatest.config to enable telemetry:
+
+[telemetry]
+host %s
+port %s
+want-events ALL
+
+ """ % (opts.server_ip, opts.server_port)
+ tld.restart()
+ elif opts.action == "nodaemon":
+ log_setup(opts.log_file)
+ server = SocketServer.UDPServer((opts.server_ip,int(opts.server_port)), SyslogUDPHandler)
+ server.serve_forever(poll_interval=0.5)
+
+if __name__ == '__main__':
+ main()
+
+
+
+
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 <http://www.gnu.org/licenses/>.
+
;; 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>(.*)<.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 <http://www.gnu.org/licenses/>.
+;;
;;======================================================================
;;======================================================================
;; Tests
;;======================================================================
@@ -31,10 +40,15 @@
(include "common_records.scm")
(include "key_records.scm")
(include "db_records.scm")
(include "run_records.scm")
(include "test_records.scm")
+(include "js-path.scm")
+
+(define (init-java-script-lib)
+ (set! *java-script-lib* (conc (common:get-install-area) "/share/js/jquery-3.1.0.slim.min.js"))
+ )
;; 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 +75,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,18 +167,18 @@
;; 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")
+ (configf: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))))
(instr2 (if config
- (config-lookup config "requirements" "waitor")
+ (configf:lookup config "requirements" "waitor")
"")))
(debug:print-info 8 *default-log-port* "waitons string is " instr ", waitors string is " instr2)
(let ((newwaitons
(string-split (cond
((procedure? instr) ;; here
@@ -205,27 +226,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 +353,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 +370,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 +468,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 +487,16 @@
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)
+ ;; This was added in check-in a5adfa3f9a. Message was: "...added delay in set-values to allow for delayed write on server start"
+ ;; I'm inserting an arbitrary rmt: call to force/ensure that the server is available to (hopefully) prevent a communication issue.
+ (rmt:get-var "MEGATEST_VERSION") ;; this does NOTHING but ensure the server is reachable. This is almost certainly NOT needed :)
+ ;; BB - commentiong out arbitrary 10 second wait (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 +634,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;}
- </style>
- <script src=/nfs/site/disks/ch_ciaf_disk023/fdk_gwa_disk003/pjhatwal/fdk/docs/qa-env-team/jquery-3.1.0.slim.min.js></script>
+
+</style>
<script type="text/JavaScript">
function filtersome() {
@@ -669,10 +727,28 @@
}
</script>
EOF
)
+(define tests:css-jscript-block-dynamic
+#<<EOF
+ <script src= ./jquery3.1.0.js></script>
+EOF
+)
+
+(define (test:js-block javascript-lib)
+ (conc "<script src=" javascript-lib "></script>" ))
+
+
+(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 +785,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 +824,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 +837,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 "")
+ "<H2>Data not found</H2>"
+ (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 +1204,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 +1243,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 +1271,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)))))
))))))
@@ -1036,10 +1401,29 @@
;; (string<? (conc (vector-ref a 2))
;; (conc (vector-ref b 2)))
#f))
(string<? (conc time-a)(conc time-b)))))))))
+
+;; Save test state and status in to a file .final-status in the test directory
+;;
+(define (tests:save-final-status run-id test-id)
+ (let* ((test-dat (rmt:get-test-info-by-id run-id test-id))
+ (out-dir (db:test-get-rundir test-dat))
+ (status-file (conc out-dir "/.final-status"))
+ )
+ ;; first verify we are able to write the output file
+ (if (not (file-write-access? out-dir))
+ (debug:print 0 *default-log-port* "ERROR: cannot write .final-status to " out-dir)
+ (let*
+ ((outp (open-output-file status-file))
+ (status (db:test-get-status test-dat))
+ (state (db:test-get-state test-dat)))
+ (fprintf outp "~S\n" state)
+ (fprintf outp "~S\n" status)
+ (close-output-port outp)))))
+
;; summarize test in to a file test-summary.html in the test directory
;;
(define (tests:summarize-test run-id test-id)
(let* ((test-dat (rmt:get-test-info-by-id run-id test-id))
@@ -1057,11 +1441,11 @@
(color (common:get-color-from-status status))
(logf (db:test-get-final_logf test-dat))
(steps-dat (tests:get-compressed-steps run-id test-id)))
;; (dcommon:get-compressed-steps #f 1 30045)
;; (#("wasting_time" "23:36:13" "23:36:21" "0" "8.0s" "wasting_time.log"))
-
+
(s:output-new
oup
(s:html
(s:title "Summary for " full-name)
(s:body
@@ -1075,11 +1459,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 +1513,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 +1530,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)(wait-a-minute #f))
(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
@@ -1185,13 +1570,37 @@
dat
;; no cached data available
(let* ((treg (or test-registry
(tests:get-all)))
(test-path (or (hash-table-ref/default treg test-name #f)
+ (let* ((local-tcdir (conc (getenv "MT_LINKTREE") "/"
+ (getenv "MT_TARGET") "/"
+ (getenv "MT_RUNNAME") "/"
+ test-name "/" item-path))
+ (local-tcfg (conc local-tcdir "/testconfig")))
+ (if (common:file-exists? local-tcfg)
+ local-tcdir
+ #f))
(conc *toppath* "/tests/" test-name)))
(test-configf (conc test-path "/testconfig"))
- (testexists (and (file-exists? test-configf)(file-read-access? test-configf)))
+ (testexists (let loopa ((tries-left 30))
+ (cond
+ (
+ (and (common:file-exists? test-configf)(file-read-access? test-configf))
+ #t)
+ (
+ (common:file-exists? test-configf)
+ (debug:print 0 *default-log-port* "WARNING: Cannot read testconfig file: "test-configf)
+ #f)
+ (
+ (and wait-a-minute (> tries-left 0))
+ (thread-sleep! 10)
+ (debug:print 0 *default-log-port* "WARNING: testconfig file does not exist: "test-configf" will retry in 10 seconds. Tries left: "tries-left) ;; BB: this fires
+ (loopa (sub1 tries-left)))
+ (else
+ (debug:print 0 *default-log-port* "WARNING: testconfig file does not exist: "test-configf) ;; BB: this fires
+ #f))))
(tcfg (if testexists
(read-config test-configf #f system-allowed
environ-patt: (if system-allowed
"pre-launch-env-vars"
#f))
@@ -1198,14 +1607,15 @@
#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?))
+ (if (and tcfg (not (common:in-running-test?)))
(configf:write-alist tcfg tpath))))
tcfg))))))
;; sort tests by priority and waiton
;; Move test specific stuff to a test unit FIXME one of these days
@@ -1232,12 +1642,12 @@
(b-record (hash-table-ref test-records b))
(a-waitons (or (tests:testqueue-get-waitons a-record) '()))
(b-waitons (or (tests:testqueue-get-waitons b-record) '()))
(a-config (tests:testqueue-get-testconfig a-record))
(b-config (tests:testqueue-get-testconfig b-record))
- (a-raw-pri (config-lookup a-config "requirements" "priority"))
- (b-raw-pri (config-lookup b-config "requirements" "priority"))
+ (a-raw-pri (configf:lookup a-config "requirements" "priority"))
+ (b-raw-pri (configf:lookup b-config "requirements" "priority"))
(a-priority (mungepriority a-raw-pri))
(b-priority (mungepriority b-raw-pri)))
(tests:testqueue-set-priority! a-record a-priority)
(tests:testqueue-set-priority! b-record b-priority)
;; (debug:print 0 *default-log-port* "a=" a ", b=" b ", a-waitons=" a-waitons ", b-waitons=" b-waitons)
@@ -1356,11 +1766,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)
@@ -1427,11 +1837,11 @@
(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* "hed=" hed " at top of loop")
;; don't know item-path at this time, let the testconfig get the top level testconfig
(let* ((config (tests:get-testconfig hed #f all-tests-registry 'return-procs))
(waitons (let ((instr (if config
- (config-lookup config "requirements" "waiton")
+ (configf: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 \"" hed "\", grep through your testconfigs to find and remove or create the test. Discarding and continuing.")
""))))
(debug:print-info 8 *default-log-port* "waitons string is " instr)
(string-split (cond
@@ -1460,11 +1870,11 @@
(if (not (hash-table-ref/default test-records hed #f))
(hash-table-set! test-records
hed (vector hed ;; 0
config ;; 1
waitons ;; 2
- (config-lookup config "requirements" "priority") ;; priority 3
+ (configf:lookup config "requirements" "priority") ;; priority 3
(let ((items (hash-table-ref/default config "items" #f)) ;; items 4
(itemstable (hash-table-ref/default config "itemstable" #f)))
;; if either items or items table is a proc return it so test running
;; process can know to call items:get-items-from-config
;; if either is a list and none is a proc go ahead and call get-items
@@ -1542,11 +1952,11 @@
(uname (get-uname "-srvpio"))
(hostname (get-host-name)))
(tests:update-central-meta-info run-id test-id cpuload diskfree minutes uname hostname)))
;; (define (tests:set-partial-meta-info test-id run-id minutes work-area)
-(define (tests:set-partial-meta-info test-id run-id minutes work-area remtries)
+#;(define (tests:set-partial-meta-info test-id run-id minutes work-area remtries)
(let* ((cpuload (get-cpu-load))
(diskfree (get-df (current-directory)))
(remtries 10))
(handle-exceptions
exn
@@ -1559,11 +1969,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,10 +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 <http://www.gnu.org/licenses/>.
#
# run some tests
BINPATH = $(shell readlink -m $(PWD)/../bin)
+LSBR = $(shell lsb_release -sr)
MEGATEST = $(BINPATH)/megatest
+MTEST = $(BINPATH)/.$(LSBR)/mtest
DASHBOARD = $(BINPATH)/dashboard
PATH := $(BINPATH):$(PATH)
RUNNAME := $(shell date +w%V.%u.%H.%M)
IPADDR := "-"
RUNID := 1
@@ -22,20 +40,23 @@
TARGET = "ubuntu/nfs/none"
all : build unit test4
# test1 test2 test3 test4 test5 test6 test7 test8 test9
-unit : all-rmt.log
+unit : all-rmt.log all-api.log
# basicserver.log runs.log misc.log tests.log
+
+# inter dependencies on the unit tests, I wish these could be "suggestions"
+all-rmt.log : all-api.log
rel :
cd release;dashboard -rows 25 &
## basicserver.log : unittests/basicserver.scm
## script -c "./rununittest.sh basicserver $(DEBUG)" basicserver.log
-%.log : build unittests/%.scm
+%.log : build unittests/%.scm $(MTEST)
script -c "./rununittest.sh $* $(DEBUG)" $*.log
if logpro unit.logpro $*.html < $*.log > /dev/null;then echo ALLPASS;else echo ALLFAIL;mv $*.log $*.log.FAIL;fi
server :
cd fullrun;$(MEGATEST) -server - -debug $(DEBUG) -run-id $(RUNID)
@@ -87,11 +108,11 @@
cd fullrun;sleep 5;$(MEGATEST) -preclean -runtests % -target ubuntu/nfs/sleep60 :runname $(RUNNAME)_ac -debug $(DEBUG) $(LOGGING) > ac.log 2> ac.log &
cd fullrun;sleep 8;$(MEGATEST) -preclean -runtests % -target ubuntu/nfs/sleep240 :runname $(RUNNAME)_ad -debug $(DEBUG) $(LOGGING) > ad.log 2> ad.log &
# cd fullrun;sleep 0;$(MEGATEST) -preclean -runtests % -target $(TARGET) :runname $(RUNNAME)_af -debug $(DEBUG) $(LOGGING) > af.log 2> af.log &
# MUST ADD THIS BACK IN ASAP!!!!
- # cd fullrun;sleep 10;$(MEGATEST) -run-wait -target $(TARGET) :runname % -testpatt % :state RUNNING,LAUNCHED,NOT_STARTED,REMOTEHOSTSTART;echo ALL DONE
+# cd fullrun;sleep 10;$(MEGATEST) -run-wait -target $(TARGET) :runname % -testpatt % :state RUNNING,LAUNCHED,NOT_STARTED,REMOTEHOSTSTART;echo ALL DONE
test6: fullprep
cd fullrun;$(MEGATEST) -preclean -runtests runfirst -testpatt %/1 -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_itempatt -v
cd fullrun;$(MEGATEST) -preclean -runtests runfirst -testpatt %blahha% -reqtarg ubuntu/nfs/none :runname $(RUNNAME)_itempatt -debug 10
cd fullrun;$(MEGATEST) -rollup :runname newrun -target ubuntu/nfs/none -debug 10
@@ -173,11 +194,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 <http://www.gnu.org/licenses/>.
[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 <http://www.gnu.org/licenses/>.
[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 <http://www.gnu.org/licenses/>.
[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 <http://www.gnu.org/licenses/>.
[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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
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 <http://www.gnu.org/licenses/>.
+
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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
+[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 <http://www.gnu.org/licenses/>.
+
# (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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
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 <http://www.gnu.org/licenses/>.
+
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 <<EOF
-for f in $FILES;do
- FOSSLF=$FSLSAREA/$AREANAME/\$f
- CACHEF=$WORKAREA/$SITENAME/
- if [ ! -e \$FOSSLF ];then
- cp \$CACHEF \$FOSSLF
- chmod ug+rw \$FOSSLF
- elif [ \$CACHEF -nt \$FOSSLF ];then
- fossil pull -R \$FOSSLF \$CACHEF
- fi
-done
-EOF
-
-# Do the local sync
-for f in $FILES;do
- FOSSLF=$FSLSAREA/$AREANAME/\$f
- CACHEF=$WORKAREA/$SITENAME/
- if [ ! -e \$FOSSLF ];then
- cp \$CACHEF \$FOSSLF
- chmod ug+rw \$FOSSLF
- elif [ \$CACHEF -nt \$FOSSLF ];then
- fossil pull -R \$FOSSLF \$CACHEF
- fi
-done
-
-echo done
DELETED tests/fslsync/tests/sync/rsync.logpro
Index: tests/fslsync/tests/sync/rsync.logpro
==================================================================
--- tests/fslsync/tests/sync/rsync.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/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:
-# <testsuite>/<creationdate>
-# Within the archive the data is structured like this:
-# <target>/<runname>/<test>/
-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 <<EOF
-(require-library trace)
-(import trace)
-(trace
-$x
-)
-EOF
- fname=`echo "$x" | tr ':!>' '-_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 <waivername>.logpro file
-# diff diff %file1% %file2%
-
-# This builtin rule is applied if a <waivername>.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 "<html><header>Results$i</header><body>Nothing but faux results here!</body></html>" > 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 <http://www.gnu.org/licenses/>.
+
(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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
(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 <http://www.gnu.org/licenses/>.
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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
(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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
(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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
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 <http://www.gnu.org/licenses/>.
(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 <http://www.gnu.org/licenses/>.
(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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
(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 <http://www.gnu.org/licenses/>.
+
(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 <http://www.gnu.org/licenses/>.
(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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
(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 <http://www.gnu.org/licenses/>.
+
(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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
(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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
(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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
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 <http://www.gnu.org/licenses/>.
+
# Usage: rununittest.sh testname debuglevel
#
banner $1
# put megatest on path from correct location
@@ -11,13 +28,13 @@
# Clean setup
#
dbdir=$(echo /tmp/$USER/megatest_localdb/simplerun/.[a-zA-Z]*/)
echo "dbdir=$dbdir"
-rm -f simplerun/megatest.db simplerun/monitor.db simplerun/db/monitor.db $dbdir
+rm -f simplerun/megatest.db simplerun/monitor.db simplerun/db/monitor.db
rm -rf simplelinks/ simpleruns/ simplerun/db/ $dbdir
mkdir -p simplelinks simpleruns
(cd simplerun;cp ../../*_records.scm .;perl -pi.bak -e 's/define-inline/define/' *_records.scm)
(cd simplerun;cp ../../altdb.scm .)
# Run the test $1 is the unit test to run
cd simplerun;echo '(load "../tests.scm")' | ../../bin/megatest -repl -debug $2 $1
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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
;; 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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
;; 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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
;; 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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
;; 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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
# 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 <http://www.gnu.org/licenses/>.
+
[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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
;; 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 <http://www.gnu.org/licenses/>.
+;;
;; 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 <http://www.gnu.org/licenses/>.
+
;; Ignore initial errors
(trigger "ScriptStart" #/^Script started/)
(trigger "TestStart" #/^megatest> \(/)
(section "startup" "ScriptStart" "TestStart")
ADDED tests/unittests/all-api.scm
Index: tests/unittests/all-api.scm
==================================================================
--- /dev/null
+++ tests/unittests/all-api.scm
@@ -0,0 +1,180 @@
+
+;;======================================================================
+;; A L L - A P I
+;;======================================================================
+
+;; 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 <http://www.gnu.org/licenses/>.
+
+
+;; Run like this:
+;;
+;; Update the following line. make unit from parent directory.
+;; ./rununittest.sh all-api 1
+
+;; Definitions:
+;; NTN - no test needed
+;; DEP - function is deprecated, no point in testing
+;; NED - function nested under others, no test needed.
+;; DEF - deferred
+
+
+;; Issues:
+;; 1. Most of the API calls accept a string or symbol for the function name, but at least one requires a symbol.
+;; Should we decide one way or the other, symbol or string, (seems symbol is best) and enforce that in the API? Current code:
+;; (cmd (if (symbol? cmd-in)
+;; cmd-in
+;; (string->symbol cmd-in)))
+;; Just accept symbol
+;; In the refactor, change execute-requests to only accept a symbol.
+
+;; 2. Some functions return <unspecified> in element 1 of the vector. What to do about this? Fix them to return a measurable value?
+;; Or is there a way to make test accept <unspecified>? - No.
+;; This is why I had to use vector-ref and look at one value or the other.
+;; Look at why functions are returning unspecified.
+;; The last function they call returns nothing.
+
+;; 3. Some API functions call non-existent db functions.
+;; Delete these API functions after checking that they are not called?
+;; Comment them out and give a date to delete. (in the refactor branch?)
+
+;; 4. get-tests-times: no such query supported in api.scm, but it is in the list of read-only queries. Remove it? Or implement it if it's in db.scm?
+
+
+(define my-dbstruct (db:setup #t))
+(define toppath (current-directory))
+(define keypatts '(("SYSTEM" "ubuntu")("RELEASE" "v1.234")) )
+(define keys (db:get-keys my-dbstruct))
+
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'start-server (list *toppath* ))) 0))
+(test #f '() (vector-ref (api:execute-requests my-dbstruct (vector 'get-key-val-pairs (list 0 ))) 1))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'set-var (list "LAST_UPDATE" 1234567))) 0))
+(test #f 1234567 (vector-ref (api:execute-requests my-dbstruct (vector 'get-var (list "LAST_UPDATE" ))) 1))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'del-var (list "LAST_UPDATE" ))) 0))
+(test #f '("SYSTEM" "RELEASE") (vector-ref (api:execute-requests my-dbstruct (vector 'get-keys (list ))) 1))
+(test #f '() (vector-ref (api:execute-requests my-dbstruct (vector 'get-key-vals (list 1 ))) 1))
+(test #f 0 (vector-ref (api:execute-requests my-dbstruct (vector 'test-toplevel-num-items (list 1 "foo"))) 1))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-test-info-by-id (list 1 1))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-steps-info-by-id (list 1))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-data-info-by-id (list 1))) 0))
+(test #f '(#t "successful login") (vector-ref (api:execute-requests my-dbstruct (vector 'login (list toppath megatest-version "Fred"))) 1))
+(test #f '(-1 . 0) (vector-ref (api:execute-requests my-dbstruct (vector 'get-latest-host-load (list "localhost"))) 1))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-changed-record-ids (list 0))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-run-record-ids (list "%" 1 keys "%/%"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-not-completed-cnt (list 1))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-tests-tags (list ))) 0))
+(test #f '("SYSTEM" "RELEASE") (vector-ref (api:execute-requests my-dbstruct (vector 'get-keys-write (list ))) 1))
+(test #f (vector '("SYSTEM" "RELEASE") '())(vector-ref (api:execute-requests my-dbstruct (vector 'get-targets (list 1 ))) 1))
+(test #f "" (vector-ref (api:execute-requests my-dbstruct (vector 'get-target (list 1 ))) 1))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'general-call (list 'register-test 1 1 "foo" ""))) 0))
+(test #f 1 (vector-ref (api:execute-requests my-dbstruct (vector 'get-test-id (list 1 "foo" ""))) 1))
+(test #f "/tmp/badname" (vector-ref (api:execute-requests my-dbstruct (vector 'test-get-rundir-from-test-id (list 1 1))) 1))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'set-tests-state-status (list 1 '("foo") "COMPLETED" "PASS" "NOT_STARTED" "PASS"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'test-set-state-status-by-id (list 1 1 "COMPLETED" "PASS" "Just testing!"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-tests-for-run (list 1 "%" '() '() #f #f #f #f #f #f 0 #f))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-tests-for-run-mindata (list 1 "%" '("COMPLETED") '("PASS") #f ))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'delete-test-records (list 1 2 ))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'test-set-state-status (list 1 1 "COMPLETED" "FAIL" "Another message" ))) 0))
+(test #f '() (vector-ref (api:execute-requests my-dbstruct (vector 'get-matching-previous-test-run-records (list 1 "foo" ""))) 1))
+(test #f '("/tmp/badname" "logs/final.log") (vector-ref (api:execute-requests my-dbstruct (vector 'test-get-logfile-info (list 1 "foo"))) 1))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'test-get-records-for-index-file (list 1 "foo"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-testinfo-state-status (list 1 1))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'general-call (list 'test-set-log 1 "/tmp/another/logfile/eh" 1))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'test-set-archive-block-id (list 1 1 123))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'test-set-top-process-pid (list 1 1 123))) 0))
+(test #f 123 (vector-ref (api:execute-requests my-dbstruct (vector 'test-get-top-process-pid (list 1 1))) 1))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-run-ids-matching-target (list keys "%/%" #f "%" "%" "%" "%"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'test-get-paths-matching-keynames-target-new (list 1 keys "%/%" #f "%" "%" "%" "%"))) 0))
+(test #f '() (vector-ref (api:execute-requests my-dbstruct (vector 'get-prereqs-not-met (list 1 '() "foo" "" '(normal) '()))) 1))
+(test #f 0 (vector-ref (api:execute-requests my-dbstruct (vector 'get-count-tests-running-for-run-id (list 1))) 1))
+(test #f 0 (vector-ref (api:execute-requests my-dbstruct (vector 'get-count-tests-running (list 1))) 1))
+(test #f 0 (vector-ref (api:execute-requests my-dbstruct (vector 'get-count-tests-running-for-testname (list 1 "foo"))) 1))
+(test #f 0 (vector-ref (api:execute-requests my-dbstruct (vector 'get-count-tests-running-in-jobgroup (list 1 "nada"))) 1))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'set-state-status-and-roll-up-items (list 1 "foo" "" "COMPLETED" "FAIL" "Just yet another message"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'set-state-status-and-roll-up-run (list 1 "COMPLETED" "FAIL"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'top-test-set-per-pf-counts (list 1 "foo"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-raw-run-stats (list 1))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-run-info (list 1))) 0))
+(test #f 0 (vector-ref (api:execute-requests my-dbstruct (vector 'get-num-runs (list "%"))) 1))
+(test #f 0 (vector-ref (api:execute-requests my-dbstruct (vector 'get-runs-cnt-by-patt (list "%" "%/%" keys))) 1))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'register-run (list '(("SYSTEM" "ubuntu")("RELEASE" "v1.234")) "bar" "NEW" "JUSTFINE" "bobafett" "quick" ))) 0))
+(test #f #(#t "bar") (api:execute-requests my-dbstruct (vector 'get-run-name-from-id '(1))))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'delete-run (list 2))) 0)) ;; delete a non-existant run
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'update-run-stats (list 1 '()))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-main-run-stats (list 1 ))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'delete-old-deleted-test-records '())) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-runs (list "%" 10 0 keypatts))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'simple-get-runs (list "%" 10 0 keypatts))) 0))
+(test #f #(#t (1))(api:execute-requests my-dbstruct (vector 'get-all-run-ids '())))
+(test #f #(#t ()) (api:execute-requests my-dbstruct (vector 'get-prev-run-ids '(1))))
+(test #f #(#t "JUSTFINE") (api:execute-requests my-dbstruct (vector 'get-run-status '(1))))
+(test #f #(#t "NEW") (api:execute-requests my-dbstruct (vector 'get-run-state '(1))))
+(test #f #(#t (("Totals" "UNKNOWN" 1) ("bar" "UNKNOWN" 1))) (api:execute-requests my-dbstruct (vector 'get-run-stats '())))
+(test #f #(#t ()) (api:execute-requests my-dbstruct (vector 'get-run-times '(1 1 ))))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'lock/unlock-run '(1 #t #f "mikey"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'set-run-status '(1 "NOTFINE" "A message"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'set-run-state-status '(1 "NOTFINE" "AMESS"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'update-run-event_time '(1))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-runs-by-patt (list keys "%" "%/%" #f #f #f #f "ASC"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-steps-data (list 1 1))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-steps-for-test (list 1 1))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'delete-steps-for-test! (list 1 1))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'teststep-set-status! (list 1 1 "step1" "COMPLETED" "PASS" "force pass" "/tmp/logfile"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'test-data-rollup (list 1 1 "COMPLETED"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'csv->test-data (list 1 1 "some,data"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'read-test-data (list 1 1 "%"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'read-test-data* (list 1 1 "%" "%"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'tasks-add (list "run" "Fred" "%" "foo" "%/%" #f))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'tasks-set-state-given-param-key (list "mykey" "COMPLETED"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'tasks-get-last (list "%" "foo"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'find-task-queue-records (list "%" "myrun" "%/%" "RUNNING" "run"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'testmeta-add-record (list "foo"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'testmeta-update-field (list "foo" "description" "junk"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'testmeta-get-record (list "foo"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'have-incompletes? (list 1 12000))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'mark-incomplete (list 1 12000))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'no-sync-set (list "field1" "value1"))) 0))
+(test #f "value1" (vector-ref (api:execute-requests my-dbstruct (vector 'no-sync-get/default (list "field1" #f))) 1))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'no-sync-del! (list "field1"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'no-sync-get-lock (list "mykey"))) 0))
+(test #f 1 (vector-ref (api:execute-requests my-dbstruct (vector 'archive-register-disk (list "mydisk" "/usr/mydisk" 10000000))) 1))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'archive-register-block-name (list 1 "/usr/mydisk/myblock"))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'test-get-archive-block-info (list 1 ))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'ping (list ))) 0))
+(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'kill-server (list ))) 0))
+
+;; api.scm calls db:get-previous-test-run-record, which does not exist.
+;;(test #f '() (vector-ref (api:execute-requests my-dbstruct (vector "get-previous-test-run-record" (list 1 ))) 1))
+
+;; no such query supported in api.scm, but it is is the list of read-only queries.
+;;(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-tests-times (list ))) 0))
+
+;; api.scm calls db:get-tests-for-runs-mindata, which does not exist.
+;;(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'get-tests-for-runs-mindata (list 1 "%" '("COMPLETED") '("PASS") #f ))) 0))
+
+;;This api function calls db:archive-allocate-testsuite/area-to-block, which does not exist.
+;;(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'archive-allocate-testsuite/area-to-block (list 1 "/usr/mydisk/myblock"))) 0))
+
+;;debug this: ERROR: parameter last-update for db:sync-tables must be a pair or a number, received: (0 . last_update)
+;;(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'sync-inmem->db (list 1))) 0))
+
+;;debug this. Error: bad argument count - received 0 but expected 5: #<procedure (db:get-runs dbstruct3787 runpatt3788 count3789 offset3790 keypatts3...
+;;(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'synchash-get (list 1 (db:get-runs) "foo" 1 (list "%" 10 0 keypatts)))) 0))
+
+;;debug this. Call of non-procedure
+;;(test #f #t (vector-ref (api:execute-requests my-dbstruct (vector 'sdb-qry (list "sdb-db"))) 0))
+
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 <http://www.gnu.org/licenses/>.
+
;; Run like this:
;;
;; ./rununittest.sh all-rmt 1
@@ -14,14 +32,47 @@
;; DEF - deferred
(print "start dir: " (current-directory))
(define toppath (current-directory))
-(test #f #t (string?(server:start-and-wait *toppath*)))
+
+(test #f #f (server:check-if-running toppath)) ;; these are used by server:start-and-wait
+(test #f #t (list? (server:get-list toppath)))
+(test #f '() (server:get-best '()))
+(test #f #t (common:simple-file-lock-and-wait "test.lock" expire-time: 15))
+(test #f "test.lock" (common:simple-file-release-lock "test.lock"))
+(test #f #t (server:get-best-guess-address (get-host-name)))
+(test #f #t (string? (common:get-homehost)))
+
+;; clean out any old running servers
+;;
+(let ((servers (server:get-list toppath)))
+ (print "Known servers: " servers)
+ (if (not (null? servers))
+ (begin
+ (for-each
+ (lambda (server)
+ (let ((pid (list-ref server 4)))
+ (thread-start!
+ (make-thread
+ (lambda ()
+ (print "Attempting to kill server: " server)
+ (print "Attempting to kill pid " pid)
+ (system (conc "kill " pid))
+ (thread-sleep! 2)
+ (system (conc "kill -9 " pid)))
+ (conc pid)))))
+ servers)
+ (thread-sleep! 2))))
+;; let's start up a server the mechanical way
+(system "nbfake megatest -server -")
+(thread-sleep! 2)
+;; (test #f #t (string? (server:start-and-wait *toppath*)))
(test "setup for run" #t (begin (launch:setup)
(string? (getenv "MT_RUN_AREA_HOME"))))
+(test #f #t (client:setup-http toppath))
(test #f #t (vector? (client:setup toppath)))
(test #f #t (vector? (rmt:get-connection-info toppath))) ;; TODO: push areapath down.
(test #f #t (string? (server:check-if-running ".")))
;; DEF (test #f #f (rmt:send-receive-no-auto-client-setup *runremote* 'get-keys #f '()))
@@ -28,13 +79,24 @@
;; 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 '("test1" "test2")(sort (alist-ref "tagtwo" (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))
@@ -41,11 +103,11 @@
(test #f "" (rmt:get-target 1))
(test #f #t (rmt:register-test 1 "foo" ""))
(test #f 1 (rmt:get-test-id 1 "foo" ""))
(test #f "foo" (vector-ref (rmt:get-test-info-by-id 1 1) 2))
(test #f "/tmp/badname" (rmt:test-get-rundir-from-test-id 1 1))
-(test #f '(1) (db:set-tests-state-status *db* 1 '("foo") "COMPLETED" "PASS" "NOT_STARTED" "PASS"))
+;; (test #f '(1) (db:set-tests-state-status *db* 1 '("foo") "COMPLETED" "PASS" "NOT_STARTED" "PASS")) ;; trust that this was tested in all-api
(test #f '(1) (rmt:set-tests-state-status 1 '("foo") "COMPLETED" "PASS" "NOT_STARTED" "PASS"))
(test #f #t (mt:test-set-state-status-by-id 1 1 "COMPLETED" "PASS" "Just testing!"))
(test #f #t (list? (rmt:get-tests-for-run 1 "%" '() '() #f #f #f #f #f #f 0 #f)))
(test #f #t (list? (rmt:get-tests-for-runs-mindata '(1) "%" '() '() #f)))
(test #f #f (begin (rmt:delete-test-records 1 2) #f))
@@ -82,11 +144,42 @@
(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))))))
+
+
+(test #f '(("Totals" "UNKNOWN" 1) ("bar" "UNKNOWN" 1)) (begin (rmt:get-run-stats)))
+(test #f #t (begin (rmt:set-run-state-status 1 "COMPLETE" "PASS") #t))
+(test #f '"COMPLETE" (rmt:get-run-state 1))
+(test #f '"PASS" (rmt:get-run-status 1))
+(test #f #t (begin (rmt:set-var "foo" "bar")#t))
+(test #f "bar" (rmt:get-var "foo"))
+(test #f #t (begin (rmt:print-db-stats) #t))
+(test #f #t (begin (rmt:del-var "foo") #t))
+(test #f #f (rmt:get-var "foo"))
+(test #f (vector #f #f #f #f #f #f #f #f #f #f #f #f) (rmt:get-data-info-by-id 1))
+(test #f '() (rmt:get-key-vals 1))
+(test #f "ubuntu/v1.234" (rmt:get-target 1))
+(print (rmt:get-run-info 1))
+(test #f '((runs) (tests) (test_steps) (test_data)) (rmt:get-run-record-ids "ubuntu/v1.234" 1 '("fail_count") "bar"))
;; (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 <http://www.gnu.org/licenses/>.
;; 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 <http://www.gnu.org/licenses/>.
(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 <http://www.gnu.org/licenses/>.
(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 <http://www.gnu.org/licenses/>.
+
;; 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 <http://www.gnu.org/licenses/>.
;; 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 <http://www.gnu.org/licenses/>.
+
(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 <http://www.gnu.org/licenses/>.
+
(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 <http://www.gnu.org/licenses/>.
+
;; 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 <http://www.gnu.org/licenses/>.
+
;; ;; 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 <http://www.gnu.org/licenses/>.
+;;
(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 <http://www.gnu.org/licenses/>.
+
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 <http://www.gnu.org/licenses/>.
+
+(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 <procedure name>"))
+
+(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 <http://www.gnu.org/licenses/>.
+;;
;;======================================================================
(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 <http://www.gnu.org/licenses/>.
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 <http://www.gnu.org/licenses/>.
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 <http://www.gnu.org/licenses/>.
+
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 <http://www.gnu.org/licenses/>.
+
+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 <http://www.gnu.org/licenses/>.
+
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 <http://www.gnu.org/licenses/>.
+
+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 <http://www.gnu.org/licenses/>.
+
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 <http://www.gnu.org/licenses/>.
+
+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 <http://www.gnu.org/licenses/>.
+;;
(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 <http://www.gnu.org/licenses/>.
+
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 <http://www.gnu.org/licenses/>.
+;;
(use json fmt posix)
;; abstract out the alist-ref a bit and re-order the params
;;
ADDED utils/gen-build-info.sh
Index: utils/gen-build-info.sh
==================================================================
--- /dev/null
+++ utils/gen-build-info.sh
@@ -0,0 +1,16 @@
+echo "Data gathered on $(date)"
+echo
+echo "Megatest code node: $(fossil status | grep checkout: | awk '{print $2}')"
+echo
+echo "Host: $HOSTNAME"
+echo
+echo "Which csi: $(which csi)"
+echo
+echo "Version info from csc -version:"
+csc -version
+echo
+echo "Eggs info from chicken-status:"
+chicken-status
+echo
+echo "Host info from lsb_release -a:"
+lsb_release -a
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 <http://www.gnu.org/licenses/>.
+
#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 <http://www.gnu.org/licenses/>.
;; 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 <http://www.gnu.org/licenses/>.
+
+# 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 <http://www.gnu.org/licenses/>.
+
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 <http://www.gnu.org/licenses/>.
+
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 <http://www.gnu.org/licenses/>.
(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 <http://www.gnu.org/licenses/>.
+
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 <http://www.gnu.org/licenses/>.
+;;
+;; 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 <http://www.gnu.org/licenses/>.
+
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,18 +1,26 @@
#!/bin/bash
-usage="mt_ezstep stepname prevstepname command [args ...]"
-
-if [[ "$MT_CMDINFO" == "" ]];then
- if [[ -e megatest.sh ]];then
- source megatest.sh
- else
- echo "ERROR: $0 should be run within a megatest test environment"
- echo "Usage: $usage"
- exit
- fi
-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 <http://www.gnu.org/licenses/>.
+
+usage="mt_ezstep stepname command [args ...]"
+
# Purpose: This is for the [ezsteps] secton in your testconfig file.
# DO NOT USE IN YOUR SCRIPTS!
#
# Call like this:
@@ -24,16 +32,15 @@
fi
# Since the user may not have . on the path and since we are likely to want to
# run test scripts in the current directory add the current dir to the path
export PATH=$PATH:$PWD
-
+testrundir=$1; shift
stepname=$1;shift
-prevstepname=$1;shift
+
command=$*
-
allstatus=99
runstatus=99
logpropstatus=99
# prev_env=".ezsteps/${prevstepname}.sh"
@@ -41,39 +48,36 @@
# if [[ -e "${prev_env}" ]];then
# source $prev_env
# fi
# source the environment from the previous step if it exists
+cd $testrundir
+#if [[ "$MT_CMDINFO" == "" ]];then
+ if [[ -e megatest.sh ]];then
+ source megatest.sh
+ else
+ echo "ERROR: $0 should be run within a megatest test environment"
+ echo "Usage: $usage"
+ exit
+ fi
+#fi
+
+
# if a logpro file exists then use it otherwise just run the command, nb// was using 2>&1
if [[ -e ${stepname}.logpro ]];then
- # could do:
- $command 2>&1| tee ${stepname}.log | logpro ${stepname}.logpro ${stepname}.html &> /dev/null
- logprostatus=$?
- # $command 2>&1| logpro ${stepname}.logpro ${stepname}.html &> ${stepname}.log
- # allstatus=(${PIPESTATUS[0]} ${PIPESTATUS[1]})
- allstatus=(${PIPESTATUS[0]} ${PIPESTATUS[1]})
- runstatus=${allstatus[0]}
- # logprostatus=${allstatus[1]}
-else
- $command &> ${stepname}.log
- runstatus=$?
- logprostatus=$runstatus
-fi
-
-# If the test exits with non-zero, we will record FAIL even if logpro
-# says it is a PASS
-
-if [[ $runstatus -ne 0 ]]; then
- exitstatus=$runstatus
-elif [[ $logprostatus -eq 0 ]]; then
- exitstatus=$logprostatus
-elif [[ $logprostatus -eq 2 ]]; then
- exitstatus=2
-elif [[ $logprostatus -eq 1 ]]; then
- exitstatus=1
-else
- exitstatus=0
-fi
-
-# $MT_MEGATEST -env2file .ezsteps/${stepname}
+ eval $command 2>&1 ${stepname}.log
+ runstatus=$?
+ logpro ${stepname}.logpro ${stepname}.html &> /dev/null < ${stepname}.log
+ logprostatus=$?
+
+ if [[ $runstatus == 0 ]]; then
+ exitstatus=$logprostatus
+ else
+ exitstatus=$runstatus
+ fi
+else
+ eval $command &> ${stepname}.log
+ exitstatus=$?
+fi
+
exit $exitstatus
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 <http://www.gnu.org/licenses/>.
+
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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+
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 <http://www.gnu.org/licenses/>.
+
fullparams="$@"
function findfile () {
megatest $fullparams -repl <<EOF
(let* ((numargs (length remargs))
ADDED utils/mtrept.sh
Index: utils/mtrept.sh
==================================================================
--- /dev/null
+++ utils/mtrept.sh
@@ -0,0 +1,75 @@
+#!/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 <http://www.gnu.org/licenses/>.
+
+# 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 <http://www.gnu.org/licenses/>.
+
# 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}
@@ -9,6 +26,6 @@
cd $1
shift
export PATH="$1:$PATH"
shift
-"$@"
+exec "$@"
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 <http://www.gnu.org/licenses/>.
# 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 <http://www.gnu.org/licenses/>.
+
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 <http://www.gnu.org/licenses/>.
+
###############################################################################
#
# 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 <http://www.gnu.org/licenses/>.
+
# 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 <http://www.gnu.org/licenses/>.
+;;
;; 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 <http://www.gnu.org/licenses/>.
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 <http://www.gnu.org/licenses/>.
+;;
(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 <http://www.gnu.org/licenses/>.
+;;
+
+(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 <http://www.gnu.org/licenses/>.
+
$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 '<unknown>)) )
-
-(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 <http://www.gnu.org/licenses/>.
+
#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 <http://www.gnu.org/licenses/>.
+
## 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 <http://www.gnu.org/licenses/>.
+
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 <http://www.gnu.org/licenses/>.
+
+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 <http://www.gnu.org/licenses/>.
+;;
+(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/<your flow>_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/<your flow>_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 <http://www.gnu.org/licenses/>.
+;;
(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 <http://www.gnu.org/licenses/>.
;; strftime('%m/%d/%Y %H:%M:%S','now','localtime')
(use typed-records srfi-1)
@@ -555,11 +563,11 @@
;; (begin
;; (canvas-foreground-set! cnv fill-color)
;; (canvas-box! cnv llx ulx lly uly))) ;; docs are all over the place on this one.;; w h)
(if line-color
(canvas-foreground-set! cnv line-color)
- (if fill-color
+ #;(if fill-color
(canvas-foreground-set! cnv prev-foreground-color)))
(canvas-line! cnv llx ulx lly uly)
(canvas-foreground-set! cnv prev-foreground-color)
(if text
(let* ((prev-font (canvas-font cnv))
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 <http://www.gnu.org/licenses/>.
+;;
(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 <http://www.gnu.org/licenses/>.
+
(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 <http://www.gnu.org/licenses/>.
+
+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 <http://www.gnu.org/licenses/>.
+
+# # 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 <http://www.gnu.org/licenses/>.
+
+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 "$@"
+