From 4af2598ecb9757a9b16bc3e8c4b13a7da9ed71c1 Mon Sep 17 00:00:00 2001 From: Emery Hemingway Date: Fri, 17 Jan 2020 19:27:04 +0100 Subject: [PATCH] Use flake apps for tests --- LICENSES/LicenseRef-Genode.txt | 701 -------------------------------- flake.nix | 43 +- lib/default.nix | 124 ------ lib/genode.ld | 141 ------- lib/nova-bss.ld | 6 - lib/nova-isolinux.cfg | 5 - tests/common-test-driver.exp | 10 - tests/default.nix | 12 +- tests/driver-config.dhall | 27 -- tests/driver-config.xml | 39 -- tests/driver-linux-config.dhall | 41 ++ tests/driver-linux.nix | 75 ++-- tests/driver-nova-config.dhall | 43 ++ tests/driver-nova.nix | 42 +- tests/fs_report.dhall | 91 +++++ tests/fs_report.nix | 10 +- tests/fs_report.xml | 57 --- tests/pci.dhall | 151 +++---- tests/pci.nix | 9 +- tests/signal.dhall | 23 +- tests/signal.nix | 4 +- tests/solo5/blk.dhall | 62 +-- tests/solo5/boot-wrapper.dhall | 12 + tests/solo5/default.nix | 110 +---- tests/solo5/net.dhall | 141 ++++--- tests/solo5/net_2if.dhall | 154 +++---- tests/solo5/simple.dhall | 41 +- tests/solo5/time.dhall | 46 ++- tests/test-driver.exp | 17 - 29 files changed, 651 insertions(+), 1586 deletions(-) delete mode 100644 LICENSES/LicenseRef-Genode.txt delete mode 100644 lib/genode.ld delete mode 100644 lib/nova-bss.ld delete mode 100644 lib/nova-isolinux.cfg delete mode 100644 tests/common-test-driver.exp delete mode 100644 tests/driver-config.dhall delete mode 100644 tests/driver-config.xml create mode 100644 tests/driver-linux-config.dhall create mode 100644 tests/driver-nova-config.dhall create mode 100644 tests/fs_report.dhall delete mode 100644 tests/fs_report.xml create mode 100644 tests/solo5/boot-wrapper.dhall diff --git a/LICENSES/LicenseRef-Genode.txt b/LICENSES/LicenseRef-Genode.txt deleted file mode 100644 index 9da143b..0000000 --- a/LICENSES/LicenseRef-Genode.txt +++ /dev/null @@ -1,701 +0,0 @@ - - Linking exception clause - - - The Genode OS Framework (Genode) is licensed under the terms of the - GNU Affero General Public License version 3 (AGPLv3). - - Linking Genode code statically or dynamically with other modules - is making a combined work based on Genode. Thus, the terms and - conditions of the AGPLv3 cover the whole combination. - - As an "additional permission" as defined by Section 7 of the - AGPLv3, Genode Labs as the copyright holder of Genode gives you - permission to link Genode source code with "independent modules" - to produce an executable if the independent modules are licensed - under an "approved license", and to copy and distribute the - resulting executable under terms of your choice, provided that you - also meet, for each linked independent module, the terms and - conditions of the license of that module. - - An "approved license" is a license that is officially approved as - an Open-Source license by the Open Source Initiative [1], or - listed as a Free-Software license by the Free Software Foundation - [2], or explicitly approved by Genode Labs. - - An "independent module" is a module which is not derived from or - based on Genode, or merely uses the Genode API as defined in the - official documentation. - - If you modify Genode, you may extend this exception to your - version of Genode, but you are not obliged to do so. If you do not - wish to do so, delete this exception statement from your version. - - [1] https://opensource.org/licenses - [2] https://www.gnu.org/licenses/license-list.en.html - - ------------------------------------------------------------------------------- - - - GNU AFFERO GENERAL PUBLIC LICENSE - Version 3, 19 November 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU Affero General Public License is a free, copyleft license for -software and other kinds of works, specifically designed to ensure -cooperation with the community in the case of network server software. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -our General Public Licenses are 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. - - 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 -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. - - Developers that use our General Public Licenses protect your rights -with two steps: (1) assert copyright on the software, and (2) offer -you this License which gives you legal permission to copy, distribute -and/or modify the software. - - A secondary benefit of defending all users' freedom is that -improvements made in alternate versions of the program, if they -receive widespread use, become available for other developers to -incorporate. Many developers of free software are heartened and -encouraged by the resulting cooperation. However, in the case of -software used on network servers, this result may fail to come about. -The GNU General Public License permits making a modified version and -letting the public access it on a server without ever releasing its -source code to the public. - - The GNU Affero General Public License is designed specifically to -ensure that, in such cases, the modified source code becomes available -to the community. It requires the operator of a network server to -provide the source code of the modified version running there to the -users of that server. Therefore, public use of a modified version, on -a publicly accessible server, gives the public access to the source -code of the modified version. - - An older license, called the Affero General Public License and -published by Affero, was designed to accomplish similar goals. This is -a different license, not a version of the Affero GPL, but Affero has -released a new version of the Affero GPL which permits relicensing under -this license. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU Affero 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. - - 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 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. Remote Network Interaction; Use with the GNU General Public License. - - Notwithstanding any other provision of this License, if you modify the -Program, your modified version must prominently offer all users -interacting with it remotely through a computer network (if your version -supports such interaction) an opportunity to receive the Corresponding -Source of your version by providing access to the Corresponding Source -from a network server at no charge, through some standard or customary -means of facilitating copying of software. This Corresponding Source -shall include the Corresponding Source for any work covered by version 3 -of the GNU General Public License that is incorporated pursuant to the -following paragraph. - - 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 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 work with which it is combined will remain governed by version -3 of the GNU General Public License. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU Affero 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 that a certain numbered version of the GNU Affero 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 Affero 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 Affero 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 -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU Affero 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 distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU Affero General Public License for more details. - - You should have received a copy of the GNU Affero General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If your software can interact with users remotely through a computer -network, you should also make sure that it provides a way for users to -get its source. For example, if your program is a web application, its -interface could display a "Source" link that leads users to an archive -of the code. There are many ways you could offer source, and different -solutions will be better for different programs; see section 13 for the -specific requirements. - - 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 AGPL, see -. diff --git a/flake.nix b/flake.nix index cc29304..f34fe97 100644 --- a/flake.nix +++ b/flake.nix @@ -15,21 +15,37 @@ outputs = { self, dhall-haskell, genode-depot, nixpkgs }: let mkOutput = { system, localSystem, crossSystem }: - let thisSystem = builtins.getAttr system; + let + thisSystem = builtins.getAttr system; + lib = (nixpkgs.lib) // (import ./lib { + inherit system localSystem crossSystem; + inherit nixpkgs dhall-haskell genode-depot; + genodepkgs = self; + }); in rec { - packages = import ./packages { - inherit system nixpkgs; - depot = thisSystem genode-depot.packages; - dhallApps = dhall-haskell.apps.${localSystem}; - }; - legacyPackages = thisSystem nixpkgs.legacyPackages; # pass thru Nixpkgs + packages = import ./packages { + inherit system legacyPackages; + depot = thisSystem genode-depot.packages; + dhallApps = dhall-haskell.apps.${localSystem}; + }; + defaultPackage = packages.genode.base-linux; - devShell = packages.stdenv; + devShell = legacyPackages.mkShell { + nativeBuildInputs = [ dhall-haskell.packages.${localSystem}.dhall ]; + shellHook = '' + export DHALL_PRELUDE="${packages.dhallPrelude}/package.dhall" + export DHALL_GENODE="${packages.dhallGenode}/package.dhall" + export BASE_MANIFEST="${packages.genode.base.manifest}" + export BASE_LINUX_MANIFEST="${packages.genode.base-linux.manifest}" + export BASE_NOVA_MANIFEST="${packages.genode.base-nova.manifest}" + export OS_MANIFEST="${packages.genode.os.manifest}" + ''; + }; apps = import ./apps { nixpkgs = legacyPackages; @@ -37,18 +53,13 @@ inherit packages; }; - lib = (nixpkgs.lib) // (import ./lib { - inherit system localSystem crossSystem; - inherit nixpkgs dhall-haskell genode-depot; - genodepkgs = self; - }); - nixosModule = ./nixos; checks = (import ./tests { inherit system localSystem crossSystem; - inherit self nixpkgs dhall-haskell genode-depot; - lib = thisSystem self.lib; + apps = dhall-haskell.apps.${localSystem} // apps; + inherit self nixpkgs genode-depot; + inherit lib; genodepkgs = thisSystem self.packages; }) // { nixos = import ./nixos/test.nix { diff --git a/lib/default.nix b/lib/default.nix index ce34395..b0a5104 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -45,128 +45,4 @@ in { xmllint --noout $out ''; - buildNovaIso = { name, rom }: - let - - inherit (hostPkgs) cdrkit syslinux; - coreNovaObj = "${testPkgs.genode.base-nova}/lib/core-nova.o"; - - rom' = (with testPkgs.genode; { - init = "${os}/bin/init"; - "ld.lib.so" = "${depot.base-nova}/lib/ld.lib.so"; - timer = "${base-nova}/bin/nova_timer_drv"; - }) // rom; - - addressType = ".quad"; # TODO: 32bit?! - - map' = with nixpkgs.lib; - l: f: - concatStrings (imap0 (i: v: (f (toString i) v)) l); - - mapNames = map' (builtins.attrNames rom'); - mapValues = map' (builtins.attrValues rom'); - - modulesAsm = '' - .set MIN_PAGE_SIZE_LOG2, 12 - .set DATA_ACCESS_ALIGNM_LOG2, 3 - - .section .data - - .p2align DATA_ACCESS_ALIGNM_LOG2 - .global _boot_modules_headers_begin - _boot_modules_headers_begin: - - '' + (mapNames (i: _: '' - ${addressType} _boot_module_${i}_name - ${addressType} _boot_module_${i}_begin - ${addressType} _boot_module_${i}_end - _boot_module_${i}_begin - - '')) + '' - .global _boot_modules_headers_end - _boot_modules_headers_end: - - '' + (mapNames (i: name: '' - .p2align DATA_ACCESS_ALIGNM_LOG2 - _boot_module_${i}_name: - .string "${name}" - .byte 0 - - '')) + '' - .section .data.boot_modules_binaries - - .global _boot_modules_binaries_begin - _boot_modules_binaries_begin: - - '' + (mapValues (i: path: '' - .p2align MIN_PAGE_SIZE_LOG2 - _boot_module_${i}_begin: - .incbin "${path}" - _boot_module_${i}_end: - - '')) + '' - .p2align MIN_PAGE_SIZE_LOG2 - .global _boot_modules_binaries_end - _boot_modules_binaries_end: - ''; - - syslinuxDir = "${syslinux}/share/syslinux"; - - in hostPkgs.stdenv.mkDerivation { - name = name + "-iso"; - passthru = rom; - passAsFile = [ "modulesAsm" ]; - inherit modulesAsm; - preferLocalBuild = true; - dontUnpack = true; - - buildInputs = [ testPkgs.stdenv.cc hostPkgs.cdrkit hostPkgs.syslinux ]; - - buildPhase = '' - mkdir -p boot/syslinux - - # compile the boot modules into one object file - $CC -c -x assembler -o boot_modules.o $modulesAsmPath - - # link final image - $LD -nostdlib \ - -T${./genode.ld} \ - -T${./nova-bss.ld} \ - -z max-page-size=0x1000 \ - -Ttext=0x100000 -gc-sections \ - ${coreNovaObj} boot_modules.o \ - -o boot/image.elf - - strip boot/image.elf - - # build ISO image - cp ${testPkgs.NOVA}/hypervisor* boot/hypervisor - cp ${./nova-isolinux.cfg} boot/syslinux/isolinux.cfg - cp \ - ${syslinuxDir}/isolinux.bin \ - ${syslinuxDir}/ldlinux.c32 \ - ${syslinuxDir}/libcom32.c32 \ - ${syslinuxDir}/mboot.c32 \ - boot/syslinux - chmod +w boot/syslinux/isolinux.bin - mkisofs -o iso \ - -b syslinux/isolinux.bin -c syslinux/boot.cat \ - -no-emul-boot -boot-load-size 4 -boot-info-table \ - -iso-level 2 \ - boot - - isohybrid iso - - # build test script - cat > boot-qemu << EOF - #!/bin/sh - ${hostPkgs.qemu_test}/bin/qemu-system-x86_64 -cdrom $out/iso -machine q35 \$@ - EOF - ''; - - installPhase = '' - install -Dm444 iso $out/iso - install -Dm555 boot-qemu $out/bin/boot-qemu - ''; - }; - } diff --git a/lib/genode.ld b/lib/genode.ld deleted file mode 100644 index b8ae832..0000000 --- a/lib/genode.ld +++ /dev/null @@ -1,141 +0,0 @@ -// SPDX-FileCopyrightText: 2006-2017 Genode Labs GmbH -// -// SPDX-License-Identifier: LicenseRef-Genode - -/* - * \brief Linker script for Genode programs - * \author Christian Helmuth - * \date 2006-04-12 - */ - -/* - * Copyright (C) 2006-2017 Genode Labs GmbH - * - * This file is part of the Genode OS framework, which is distributed - * under the terms of the GNU Affero General Public License version 3. - */ - -ENTRY(_start) - -PHDRS -{ - ro PT_LOAD; - rw PT_LOAD; - boot PT_LOAD FLAGS(4); -} - -SECTIONS -{ - .text : { - /* begin of program image (link address) */ - _prog_img_beg = .; - - /* put entry code at the start of the text segment / raw binary */ - KEEP (*(.text.crt0)) - - *(.init) - *(.text .text.* .gnu.linkonce.t.*) - *(.fini) - *(.rodata .rodata.* .gnu.linkonce.r.*) - - . = ALIGN(0x08); - - _ctors_start = .; - KEEP (*(.ctors)) - KEEP (*(SORT(.ctors.*))) - KEEP (*(.init_array)) /* list of constructors specific for ARM eabi */ - _ctors_end = .; - _dtors_start = .; - KEEP (*(SORT(.dtors.*))) - KEEP (*(.dtors)) - _dtors_end = .; - } : ro = 0x0 - - /* Linux: exception section for uaccess mechanism */ - __ex_table : { *(__ex_table) } - - .eh_frame_hdr : { *(.eh_frame_hdr) } - __eh_frame_hdr_start = SIZEOF(.eh_frame_hdr) > 0 ? ADDR(.eh_frame_hdr) : 0; - __eh_frame_hdr_end = SIZEOF(.eh_frame_hdr) > 0 ? . : 0; - - . = ALIGN(0x1000); - - .data : { - /* - * Leave space for parent capability parameters at start of data - * section. The protection domain creator is reponsible for storing - * sane values here. - */ - _parent_cap = .; - _parent_cap_thread_id = .; - LONG(0xffffffff); - _parent_cap_local_name = .; - LONG(0xffffffff); - LONG(0xffffffff); - LONG(0xffffffff); - LONG(0xffffffff); - LONG(0xffffffff); - LONG(0xffffffff); - LONG(0xffffffff); - - /* - * Platform-specific entry for Fiasco.OC. - * - * PIC-code compiled for Fiasco.OC, needs some PIC-compatible - * way to enter the kernel, the fixed address of the kernel - * entry code address needs to be found here. - */ - __l4sys_invoke_indirect = .; - LONG(0xeacff000); - - *(.data .gnu.linkonce.d.*) - - /* include all data subsections except those of the boot modules */ - *(EXCLUDE_FILE (*boot_modules.o) .data.*) - } : rw - - /* exception frames for C++ */ - .eh_frame : { - __eh_frame_start__ = .; - __eh_frame_start = .; - KEEP (*(.eh_frame)) - __eh_frame_end = .; - LONG(0) - } : rw - - .gcc_except_table : { - KEEP(*(.gcc_except_table)) - KEEP(*(.gcc_except_table.*)) - } - - .dynamic : { *(.dynamic) } - - /* .ARM.exidx is sorted, so has to go in its own output section */ - __exidx_start = .; - .ARM.exidx : { - *(.ARM.exidx* .gnu.linkonce.armexidx.*) - } - __exidx_end = .; - - .ARM.extab : { - *(.ARM.extab*) - } : rw - - .bss : { - _bss_start = ALIGN(4); - *(.bss .bss.* .gnu.linkonce.b.* COMMON) - } - _bss_end = ALIGN(4); - - /* separate location for the binaries of the boot modules */ - .data.boot_modules_binaries : { *(.data.boot_modules_binaries) } : boot - - /* end of program image -- must be after last section */ - _prog_img_end = .; - - /DISCARD/ : { - *(.note) - *(.note.ABI-tag) - *(.comment) - } -} diff --git a/lib/nova-bss.ld b/lib/nova-bss.ld deleted file mode 100644 index 994c3a2..0000000 --- a/lib/nova-bss.ld +++ /dev/null @@ -1,6 +0,0 @@ -SECTIONS -{ - .data : { - *(.bss .bss.* .gnu.linkonce.b.* COMMON) - } : rw -} diff --git a/lib/nova-isolinux.cfg b/lib/nova-isolinux.cfg deleted file mode 100644 index 93cdac1..0000000 --- a/lib/nova-isolinux.cfg +++ /dev/null @@ -1,5 +0,0 @@ -SERIAL -DEFAULT 0 -LABEL 0 - KERNEL mboot.c32 - APPEND /hypervisor iommu novpid serial --- /image.elf diff --git a/tests/common-test-driver.exp b/tests/common-test-driver.exp deleted file mode 100644 index c5a1f84..0000000 --- a/tests/common-test-driver.exp +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env expect - -proc collect_modules {arg} { - global modules - foreach path [glob $arg] { - set name [file tail $path] - file link -s $name $path - append modules " $name " - } -} diff --git a/tests/default.nix b/tests/default.nix index d3956df..99b622f 100644 --- a/tests/default.nix +++ b/tests/default.nix @@ -7,23 +7,21 @@ let signal = call ./signal.nix { }; } // call ./solo5 { }; -in { self, system, localSystem, crossSystem, genodepkgs, nixpkgs, dhall-haskell, genode-depot, lib }: +in { self, apps, system, localSystem, crossSystem, genodepkgs, nixpkgs +, genode-depot, lib }: let - hostPkgs = import nixpkgs { - system = localSystem; - overlays = [ (self: super: { inherit (dhall-haskell.packages) dhall; }) ]; - }; + hostPkgs = import nixpkgs { system = localSystem; }; depot = builtins.getAttr crossSystem genode-depot.packages; testPkgs = genodepkgs; linux = tests (import ./driver-linux.nix { - inherit testPkgs hostPkgs lib depot; + inherit apps testPkgs hostPkgs lib depot; }).callTest; nova = (call: ((tests call) // { pci = call ./pci.nix { }; })) (import ./driver-nova.nix { - inherit system testPkgs hostPkgs lib depot; + inherit apps system testPkgs hostPkgs lib depot; }).callTest; testsToList = tests: diff --git a/tests/driver-config.dhall b/tests/driver-config.dhall deleted file mode 100644 index 63fe62d..0000000 --- a/tests/driver-config.dhall +++ /dev/null @@ -1,27 +0,0 @@ --- SPDX-License-Identifier: CC0-1.0 - -let Genode = - env:DHALL_GENODE - ? https://git.sr.ht/~ehmry/dhall-genode/blob/master/package.dhall - -in λ(testInit : Genode.Init.Type) - → Genode.Init::{ - , verbose = True - , defaultRoutes = - Genode.Init.default.defaultRoutes - # [ Genode.ServiceRoute.parent "IO_MEM" - , Genode.ServiceRoute.parent "IO_PORT" - , Genode.ServiceRoute.parent "IRQ" - , Genode.ServiceRoute.child "Timer" "timer" - ] - , children = - toMap - { timer = - Genode.Init.Start::{ - , binary = "timer" - , resources = { caps = 96, ram = Genode.units.MiB 1 } - , provides = [ "Timer" ] - } - , init = Genode.Init.toStart testInit - } - } diff --git a/tests/driver-config.xml b/tests/driver-config.xml deleted file mode 100644 index 77024a3..0000000 --- a/tests/driver-config.xml +++ /dev/null @@ -1,39 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/driver-linux-config.dhall b/tests/driver-linux-config.dhall new file mode 100644 index 0000000..86fbb98 --- /dev/null +++ b/tests/driver-linux-config.dhall @@ -0,0 +1,41 @@ +-- SPDX-License-Identifier: CC0-1.0 + +let Genode = env:DHALL_GENODE + +let baseLinux = env:BASE_LINUX_MANIFEST + +let os = env:OS_MANIFEST + +let Args = + { config : Genode.Init.Type, rom : Genode.Prelude.Map.Type Text Text } + : Type + +in λ(args : Args) + → { config = + Genode.Init::{ + , verbose = True + , defaultRoutes = + Genode.Init.default.defaultRoutes + # [ Genode.ServiceRoute.child "Timer" "timer" ] + , children = + [ { mapKey = "timer" + , mapValue = + Genode.Init.Start::{ + , binary = "linux_timer_drv" + , resources = { caps = 96, ram = Genode.units.MiB 1 } + , provides = [ "Timer" ] + } + } + , { mapKey = "init", mapValue = Genode.Init.toStart args.config } + ] + } + , rom = + [ { mapKey = "ld.lib.so" + , mapValue = baseLinux.bin.ld-linux.mapValue + } + , baseLinux.bin.linux_timer_drv + , os.bin.init + , baseLinux.bin.core-linux + ] + # args.rom + } diff --git a/tests/driver-linux.nix b/tests/driver-linux.nix index 04da68d..68e570d 100644 --- a/tests/driver-linux.nix +++ b/tests/driver-linux.nix @@ -1,6 +1,6 @@ # SPDX-License-Identifier: CC0-1.0 -{ testPkgs, hostPkgs, lib, depot }: +{ apps, testPkgs, hostPkgs, lib, depot }: let testDriver = with hostPkgs; @@ -21,7 +21,7 @@ let runTests = driver: hostPkgs.stdenv.mkDerivation { - name = "linux-"+driver.testName; + name = "linux-" + driver.testName; preferLocalBuild = true; buildCommand = '' @@ -34,26 +34,43 @@ let ''; }; - mkTest = { name ? "unamed", testScript, testConfig, bootModules, ... }@t: + mkTest = { name ? "unamed", testScript, testConfig, env ? { }, ... }: with testPkgs; let - bootModules' = with testPkgs.genode; { - inherit testConfig; - config = ./driver-config.xml; - core = "${base-linux}/bin/core-linux"; - init = "${os}/bin/init"; - "ld.lib.so" = "${base-linux}/bin/ld-linux.lib.so"; - timer = "${base-linux}/bin/linux_timer_drv"; - } // bootModules; + env' = { + DHALL_PRELUDE = "${testPkgs.dhallPrelude}/package.dhall"; + DHALL_GENODE = "${testPkgs.dhallGenode}/package.dhall"; + BASE_LINUX_MANIFEST = testPkgs.genode.base-linux.manifest; + OS_MANIFEST = testPkgs.genode.os.manifest; + } // env; - baseSetup = with builtins; - lib.concatStrings (map (name: '' - file link -s ${name} ${getAttr name bootModules'} - '') (attrNames bootModules')) + toExports = env: + with builtins; + let + keys = attrNames env; + f = key: ''set env(${key}) "${getAttr key env}"''; + exports = map f keys; + in concatStringsSep "\n" exports; - + '' - source ${./common-test-driver.exp} - ''; + baseSetup = '' + ${toExports env'} + + proc run_genode_until {{wait_for_re forever} {timeout_value 0} {running_spawn_id -1}} { + # + # If a running_spawn_id is specified, wait for the expected output + # + if {$running_spawn_id != -1} { + wait_for_output $wait_for_re $timeout_value $running_spawn_id + return + } + + global image_dir spawn_id + + spawn ${apps.linux-boot.program} \ + ${./driver-linux-config.dhall} ${testConfig} + wait_for_output $wait_for_re $timeout_value $spawn_id + } + ''; driver = with hostPkgs; runCommand "genode-test-driver-${name}" { @@ -63,23 +80,29 @@ let testName = name; } '' mkdir -p $out/bin - echo "$testConfig" > $out/test.config echo "$testScript" > $out/test-script echo "$baseSetup" > $out/base-setup ln -s ${testDriver}/bin/genode-test-driver $out/bin/ wrapProgram $out/bin/genode-test-driver \ - --run "export testConfig=\"$testConfig\"" \ --run "export testScript=\"\$(cat $out/test-script)\"" \ --run "export baseSetup=\"\$(cat $out/base-setup)\"" \ ''; - passMeta = drv: - drv - // lib.optionalAttrs (t ? meta) { meta = (drv.meta or { }) // t.meta; }; + test = runTests driver; - test = passMeta (runTests driver); - - in test // { inherit driver test; }; + in test // { + inherit driver test; + config = hostPkgs.runCommand (name + ".dhall") env' '' + ${apps.dhall.program} <<< "(${ + ./driver-linux-config.dhall + } ${testConfig})" > $out + ''; + xml = hostPkgs.runCommand (name + ".config") env' '' + ${apps.render-init.program} "(${ + ./driver-linux-config.dhall + } ${testConfig}).config" > $out + ''; + }; in { callTest = path: args: diff --git a/tests/driver-nova-config.dhall b/tests/driver-nova-config.dhall new file mode 100644 index 0000000..78d036e --- /dev/null +++ b/tests/driver-nova-config.dhall @@ -0,0 +1,43 @@ +-- SPDX-License-Identifier: CC0-1.0 + +let Genode = env:DHALL_GENODE + +let baseNova = env:BASE_NOVA_MANIFEST + +let os = env:OS_MANIFEST + +let Args = + { config : Genode.Init.Type, rom : Genode.Prelude.Map.Type Text Text } + : Type + +in λ(args : Args) + → { arch = let Arch = < x86_32 | x86_64 > in Arch.x86_64 + , config = + Genode.Init::{ + , verbose = True + , defaultRoutes = + Genode.Init.default.defaultRoutes + # [ Genode.ServiceRoute.parent "IO_MEM" + , Genode.ServiceRoute.parent "IO_PORT" + , Genode.ServiceRoute.parent "IRQ" + , Genode.ServiceRoute.child "Timer" "timer" + ] + , children = + [ { mapKey = "timer" + , mapValue = + Genode.Init.Start::{ + , binary = "nova_timer_drv" + , resources = { caps = 96, ram = Genode.units.MiB 1 } + , provides = [ "Timer" ] + } + } + , { mapKey = "init", mapValue = Genode.Init.toStart args.config } + ] + } + , rom = + [ { mapKey = "ld.lib.so", mapValue = baseNova.lib.ld-nova.mapValue } + , baseNova.bin.nova_timer_drv + , os.bin.init + ] + # args.rom + } diff --git a/tests/driver-nova.nix b/tests/driver-nova.nix index 9c3e42e..27e0e52 100644 --- a/tests/driver-nova.nix +++ b/tests/driver-nova.nix @@ -1,6 +1,6 @@ # SPDX-License-Identifier: CC0-1.0 -{ system, testPkgs, hostPkgs, lib, depot }: +{ system, apps, testPkgs, hostPkgs, lib, depot }: let testDriver = with hostPkgs; @@ -34,19 +34,19 @@ let ''; }; - mkTest = { name ? "unamed", testScript, testConfig, bootModules, qemuMem ? 32 - , ... }@t: + mkTest = { name ? "unamed", testScript, testConfig, env ? { }, qemuMem ? 32 + , ... # TODO: remove ... + }@t: let - bootModules' = (with testPkgs; - { - inherit testConfig; - config = ./driver-config.xml; - } // bootModules); + env' = { + DHALL_PRELUDE = "${testPkgs.dhallPrelude}/package.dhall"; + DHALL_GENODE = "${testPkgs.dhallGenode}/package.dhall"; + BASE_NOVA_MANIFEST = testPkgs.genode.base-nova.manifest; + OS_MANIFEST = testPkgs.genode.os.manifest; + } // env; - iso = lib.buildNovaIso { - inherit name; - rom = bootModules'; - }; + iso = apps.nova-iso.function env' + "${./driver-nova-config.dhall} ${testConfig}"; baseSetup = '' ## @@ -86,7 +86,10 @@ let } global spawn_id - spawn ${iso}/bin/boot-qemu -nographic -m size=${toString qemuMem} + spawn ${hostPkgs.qemu_test}/bin/qemu-system-x86_64 \ + -machine q35 -serial mon:stdio -nographic \ + -m size=${toString qemuMem} \ + -cdrom ${iso} wait_for_output $wait_for_re $timeout_value $spawn_id } @@ -107,12 +110,10 @@ let testName = name; } '' mkdir -p $out/bin - echo "$testConfig" > $out/test.config echo "$testScript" > $out/test-script echo "$baseSetup" > $out/base-setup ln -s ${testDriver}/bin/genode-test-driver $out/bin/ wrapProgram $out/bin/genode-test-driver \ - --run "export testConfig=\"$testConfig\"" \ --run "export testScript=\"\$(cat $out/test-script)\"" \ --run "export baseSetup=\"\$(cat $out/base-setup)\"" \ ''; @@ -125,8 +126,15 @@ let in test // { inherit driver iso test; - config = testConfig; - rom = bootModules'; + config = hostPkgs.runCommand (name + ".dhall") env' '' + ${apps.dhall.program} <<< "(${ + ./driver-nova-config.dhall + } ${testConfig})" > $out + ''; + xml = hostPkgs.runCommand (name + ".config") env' '' + ${apps.render-init.program} "(${ + ./driver-nova-config.dhall + } ${testConfig}).config" > $out''; }; in { diff --git a/tests/fs_report.dhall b/tests/fs_report.dhall new file mode 100644 index 0000000..e893535 --- /dev/null +++ b/tests/fs_report.dhall @@ -0,0 +1,91 @@ +-- SPDX-License-Identifier: CC0-1.0 + +let Genode = env:DHALL_GENODE + +let os = env:OS_MANIFEST + +in { config = + Genode.Init::{ + , verbose = True + , children = + toMap + { ram_fs = + Genode.Init.Start::{ + , binary = "ram_fs" + , resources = { caps = 96, ram = Genode.units.MiB 4 } + , provides = [ "File_system" ] + , config = + Some + ( Genode.Prelude.XML.text + '' + + + + + + + + + + + + + '' + ) + } + , fs_report = + Genode.Init.Start::{ + , binary = "fs_report" + , resources = { caps = 96, ram = Genode.units.MiB 4 } + , provides = [ "Report" ] + , routes = [ Genode.ServiceRoute.child "File_system" "ram_fs" ] + , config = + Some + ( Genode.Prelude.XML.text + " " + ) + } + , fs_rom = + Genode.Init.Start::{ + , binary = "fs_rom" + , resources = { caps = 96, ram = Genode.units.MiB 4 } + , provides = [ "ROM" ] + , routes = [ Genode.ServiceRoute.child "File_system" "ram_fs" ] + } + , test-fs_report = + Genode.Init.Start::{ + , binary = "test-fs_report" + , resources = { caps = 96, ram = Genode.units.MiB 4 } + , provides = [ "Report" ] + , config = + Some + ( Genode.Prelude.XML.text + " " + ) + , routes = + [ Genode.ServiceRoute.childLabel + "ROM" + "fs_rom" + (Some "devices") + (None Text) + , Genode.ServiceRoute.childLabel + "ROM" + "fs_rom" + (Some "focus") + (None Text) + , Genode.ServiceRoute.child + "Report" + "fs_report" + , Genode.ServiceRoute.parent "Timer" + ] + } + } + } + , rom = + [ os.bin.fs_report + , os.bin.fs_rom + , os.bin.ram_fs + , os.bin.test-fs_report + , os.lib.vfs + ] + } diff --git a/tests/fs_report.nix b/tests/fs_report.nix index b350201..238d849 100644 --- a/tests/fs_report.nix +++ b/tests/fs_report.nix @@ -7,15 +7,7 @@ testEnv.mkTest { name = "fs_report"; meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ehmry ]; - testConfig = ./fs_report.xml; - - bootModules = { - fs_report = "${genode.os}/bin/fs_report"; - fs_rom = "${genode.os}/bin/fs_rom"; - ram_fs = "${genode.os}/bin/ram_fs"; - test-fs_report = "${genode.os}/bin/test-fs_report"; - "vfs.lib.so" = "${genode.os}/lib/vfs.lib.so"; - }; + testConfig = ./fs_report.dhall; testScript = '' run_genode_until {child "test-fs_report" exited with exit value 0} 15 diff --git a/tests/fs_report.xml b/tests/fs_report.xml deleted file mode 100644 index 9986369..0000000 --- a/tests/fs_report.xml +++ /dev/null @@ -1,57 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/tests/pci.dhall b/tests/pci.dhall index 59357b6..bcb09db 100644 --- a/tests/pci.dhall +++ b/tests/pci.dhall @@ -2,75 +2,82 @@ let Genode = env:DHALL_GENODE -in λ ( _ - : {} - ) - → Genode.Init::{ - , verbose = True - , children = - toMap - { test-pci = - Genode.Init.Start::{ - , binary = "test-pci" - , resources = { caps = 96, ram = Genode.units.MiB 2 } - , routes = - [ Genode.ServiceRoute.child "Platform" "platform_drv" ] - } - , acpi_report_rom = - Genode.Init.Start::{ - , binary = "report_rom" - , resources = { caps = 96, ram = Genode.units.MiB 2 } - , provides = [ "ROM", "Report" ] - , config = - Some - ( Genode.Prelude.XML.text - '' - - - - - '' - ) - } - , acpi_drv = - Genode.Init.Start::{ - , binary = "acpi_drv" - , resources = { caps = 400, ram = Genode.units.MiB 4 } - , constrainPhys = True - , provides = [ "Platform", "Acpi" ] - , routes = - [ Genode.ServiceRoute.child "Report" "acpi_report_rom" - , Genode.ServiceRoute.parent "IRQ" - , Genode.ServiceRoute.parent "IO_MEM" - , Genode.ServiceRoute.parent "IO_PORT" - ] - } - , platform_drv = - Genode.Init.Start::{ - , binary = "platform_drv" - , resources = { caps = 800, ram = Genode.units.MiB 4 } - , constrainPhys = True - , provides = [ "Platform", "Acpi" ] - , routes = - [ Genode.ServiceRoute.parent "Timer" - , Genode.ServiceRoute.parent "IRQ" - , Genode.ServiceRoute.parent "IO_MEM" - , Genode.ServiceRoute.parent "IO_PORT" - , Genode.ServiceRoute.childLabel - "ROM" - "acpi_report_rom" - (Some "acpi") - (None Text) - ] - , config = - Some - ( Genode.Prelude.XML.text - '' - - - - '' - ) - } - } - } +let os = env:OS_MANIFEST + +in { config = + Genode.Init::{ + , verbose = True + , children = + toMap + { test-pci = + Genode.Init.Start::{ + , binary = "test-pci" + , resources = { caps = 96, ram = Genode.units.MiB 2 } + , routes = + [ Genode.ServiceRoute.child "Platform" "platform_drv" ] + } + , acpi_report_rom = + Genode.Init.Start::{ + , binary = "report_rom" + , resources = { caps = 96, ram = Genode.units.MiB 2 } + , provides = [ "ROM", "Report" ] + , config = + Some + ( Genode.Prelude.XML.text + '' + + + + + '' + ) + } + , acpi_drv = + Genode.Init.Start::{ + , binary = "acpi_drv" + , resources = { caps = 400, ram = Genode.units.MiB 4 } + , constrainPhys = True + , provides = [ "Platform", "Acpi" ] + , routes = + [ Genode.ServiceRoute.child "Report" "acpi_report_rom" + , Genode.ServiceRoute.parent "IRQ" + , Genode.ServiceRoute.parent "IO_MEM" + , Genode.ServiceRoute.parent "IO_PORT" + ] + } + , platform_drv = + Genode.Init.Start::{ + , binary = "platform_drv" + , resources = { caps = 800, ram = Genode.units.MiB 4 } + , constrainPhys = True + , provides = [ "Platform", "Acpi" ] + , routes = + [ Genode.ServiceRoute.parent "Timer" + , Genode.ServiceRoute.parent "IRQ" + , Genode.ServiceRoute.parent "IO_MEM" + , Genode.ServiceRoute.parent "IO_PORT" + , Genode.ServiceRoute.childLabel + "ROM" + "acpi_report_rom" + (Some "acpi") + (None Text) + ] + , config = + Some + ( Genode.Prelude.XML.text + '' + + + + '' + ) + } + } + } + , rom = + [ os.bin.acpi_drv + , os.bin.platform_drv + , os.bin.report_rom + , os.bin.test-pci + ] + } diff --git a/tests/pci.nix b/tests/pci.nix index 1a11a60..63d4ec8 100644 --- a/tests/pci.nix +++ b/tests/pci.nix @@ -7,14 +7,7 @@ testEnv.mkTest { name = "pci"; meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ehmry ]; - testConfig = testEnv.lib.renderDhallInit ./pci.dhall "{=}"; - - bootModules = { - acpi_drv = "${genode.os}/bin/acpi_drv"; - platform_drv = "${genode.os}/bin/platform_drv"; - report_rom = "${genode.os}/bin/report_rom"; - test-pci = "${genode.os}/bin/test-pci"; - }; + testConfig = ./pci.dhall; testScript = '' run_genode_until "--- Platform test finished ---.*\n" 60 diff --git a/tests/signal.dhall b/tests/signal.dhall index d5a182e..4fd961f 100644 --- a/tests/signal.dhall +++ b/tests/signal.dhall @@ -1,18 +1,21 @@ -- SPDX-License-Identifier: CC0-1.0 -let Genode = env:DHALL_GENODE ? ../dhall-genode/package.dhall +let Genode = env:DHALL_GENODE -in λ(_ : {}) - → Genode.Init::{ - , verbose = True - , children = - toMap - { test-signal = +let os = env:OS_MANIFEST + +in { config = + Genode.Init::{ + , verbose = True + , children = + toMap + { test-signal = Genode.Init.Start::{ , binary = "test-signal" , resources = { caps = 500, ram = Genode.units.MiB 10 } , routes = [ Genode.ServiceRoute.parent "Timer" ] } - : Genode.Init.Start.Type - } - } + } + } + , rom = [ os.bin.test-signal ] + } diff --git a/tests/signal.nix b/tests/signal.nix index 6897327..a36b0c6 100644 --- a/tests/signal.nix +++ b/tests/signal.nix @@ -7,9 +7,7 @@ testEnv.mkTest rec { name = "signal"; meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ehmry ]; - testConfig = testEnv.lib.renderDhallInit ./signal.dhall "{=}"; - - bootModules.test-signal = "${genode.os}/bin/test-signal"; + testConfig = ./signal.dhall; testScript = "run_genode_until {--- Signalling test finished ---} 120"; } diff --git a/tests/solo5/blk.dhall b/tests/solo5/blk.dhall index 23732df..40ecd68 100644 --- a/tests/solo5/blk.dhall +++ b/tests/solo5/blk.dhall @@ -2,31 +2,37 @@ let Genode = env:DHALL_GENODE -in λ(_ : {}) - → Genode.Init::{ - , children = - toMap - { solo5 = - Genode.Init.Start::{ - , binary = "test" - , resources = { caps = 256, ram = Genode.units.MiB 3 } - , routes = - [ Genode.ServiceRoute.parent "Timer" - , Genode.ServiceRoute.child "Block" "block" - ] - } - , block = - Genode.Init.Start::{ - , binary = "ram_block" - , provides = [ "Block" ] - , resources = { caps = 96, ram = Genode.units.MiB 9 } - , config = - Some - ( Genode.Prelude.XML.text - '' - - '' - ) - } - } - } +let os = env:OS_MANIFEST + +let tests = env:SOLO5_TEST_MANIFEST + +in { config = + Genode.Init::{ + , children = + toMap + { solo5 = + Genode.Init.Start::{ + , binary = "solo5-test_blk" + , resources = { caps = 256, ram = Genode.units.MiB 3 } + , routes = + [ Genode.ServiceRoute.parent "Timer" + , Genode.ServiceRoute.child "Block" "block" + ] + } + , block = + Genode.Init.Start::{ + , binary = "ram_block" + , provides = [ "Block" ] + , resources = { caps = 96, ram = Genode.units.MiB 9 } + , config = + Some + ( Genode.Prelude.XML.text + '' + + '' + ) + } + } + } + , rom = [ tests.bin.solo5-test_blk, os.bin.ram_block ] + } diff --git a/tests/solo5/boot-wrapper.dhall b/tests/solo5/boot-wrapper.dhall new file mode 100644 index 0000000..9b2ffed --- /dev/null +++ b/tests/solo5/boot-wrapper.dhall @@ -0,0 +1,12 @@ +-- SPDX-License-Identifier: CC0-1.0 + +let Genode = env:DHALL_GENODE + +let solo5 = env:SOLO5_MANIFEST + +let Args = + { config : Genode.Init.Type, rom : Genode.Prelude.Map.Type Text Text } + : Type + +in λ(boot : Args) + → { config = boot.config, rom = boot.rom # [ solo5.lib.solo5 ] } diff --git a/tests/solo5/default.nix b/tests/solo5/default.nix index 5ef4cd1..7bd3f2e 100644 --- a/tests/solo5/default.nix +++ b/tests/solo5/default.nix @@ -8,14 +8,16 @@ let run_genode_until {child "solo5" exited with exit value 0} 30 ''; - mkTest' = { name, bootModules, testScript ? defaultScript, ... }@attrs: + mkTest' = { name, testConfig, testScript ? defaultScript, ... }@attrs: testEnv.mkTest (attrs // { name = "solo5-" + name; inherit testScript; - bootModules = { - "solo5.lib.so" = "${solo5}/lib/solo5-bindings-genode/solo5.lib.so"; - } // bootModules; - meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ehmry ]; + env = { + SOLO5_MANIFEST = pkgs.solo5.manifest; + SOLO5_TEST_MANIFEST = pkgs.solo5.tests.manifest; + }; + testConfig = "(${./boot-wrapper.dhall} ${testConfig})"; + meta = { inherit (pkgs.solo5) maintainers; }; }); applyMkTest = x: { @@ -25,67 +27,33 @@ let mkTests = testList: builtins.listToAttrs (map applyMkTest testList); + toSimple = name: + "(${./simple.dhall} (env:SOLO5_TEST_MANIFEST).bin.solo5-test_${name})"; + tests = [ { name = "blk"; - bootModules = { - test = "${solo5.tests}/bin/solo5-test_blk"; - ram_block = "${genode.os}/bin/ram_block"; - }; - testConfig = testEnv.lib.renderDhallInit ./blk.dhall "{=}"; + testConfig = ./blk.dhall; } - /* { - name = "dumpcore"; - bootModules.test = "${solo5.tests}/bin/solo5-test_dumpcore"; - testConfig = testEnv.lib.renderDhallInit ./simple.dhall "{=}"; - } - */ - - /* { - name = "exception"; - bootModules.test = "${solo5.tests}/bin/solo5-test_exception"; - testConfig = testEnv.lib.renderDhallInit ./simple.dhall "{=}"; - } - */ - { name = "fpu"; - bootModules.test = "${solo5.tests}/bin/solo5-test_fpu"; - testConfig = testEnv.lib.renderDhallInit ./simple.dhall "{=}"; + testConfig = toSimple "fpu"; } { name = "globals"; - bootModules.test = "${solo5.tests}/bin/solo5-test_globals"; - testConfig = testEnv.lib.renderDhallInit ./simple.dhall "{=}"; + testConfig = toSimple "globals"; } { name = "hello"; - bootModules.test = "${solo5.tests}/bin/solo5-test_hello"; - testConfig = testEnv.lib.renderDhallInit ./simple.dhall "{=}"; + testConfig = toSimple "hello"; } - /* { - name = "mft_maxdevices"; - bootModules = { - test = "${solo5.tests}/bin/solo5-test_mft_maxdevices"; - rom_block = "${genode.os}/bin/rom_block"; - }; - testConfig = testEnv.lib.renderDhallInit ./mft_maxdevices.dhall "{=}"; - } - */ - { name = "net"; - bootModules = { - test = "${solo5.tests}/bin/solo5-test_net"; - nic_bridge = "${genode.os}/bin/nic_bridge"; - nic_loopback = "${genode.os}/bin/nic_loopback"; - ping = "${genode.os}/bin/ping"; - }; - testConfig = testEnv.lib.renderDhallInit ./net.dhall "{=}"; + testConfig = ./net.dhall; testScript = '' run_genode_until {child "ping" exited with exit value 0} 30 ''; @@ -93,69 +61,29 @@ let { name = "net_2if"; - bootModules = { - test = "${solo5.tests}/bin/solo5-test_net_2if"; - sequence = "${genode.os}/bin/sequence"; - nic_bridge = "${genode.os}/bin/nic_bridge"; - nic_loopback = "${genode.os}/bin/nic_loopback"; - ping = "${genode.os}/bin/ping"; - }; - testConfig = testEnv.lib.renderDhallInit ./net_2if.dhall "{=}"; + testConfig = ./net_2if.dhall; testScript = '' run_genode_until {child "clients" exited with exit value 0} 30 ''; qemuMem = 64; } - /* { - name = "notls"; - bootModules = { test = "${solo5.tests}/bin/solo5-test_notls"; }; - testConfig = testEnv.lib.renderDhallInit ./simple.dhall "{=}"; - } - */ - { name = "quiet"; - bootModules = { test = "${solo5.tests}/bin/solo5-test_quiet"; }; - testConfig = testEnv.lib.renderDhallInit ./simple.dhall "{=}"; + testConfig = toSimple "quiet"; } { name = "ssp"; - bootModules = { test = "${solo5.tests}/bin/solo5-test_ssp"; }; - testConfig = testEnv.lib.renderDhallInit ./simple.dhall "{=}"; + testConfig = toSimple "ssp"; testScript = '' run_genode_until {Error: stack protector check failed} 30 ''; } - /* { - name = "wnox"; - bootModules = { test = "${solo5.tests}/bin/solo5-test_wnox"; }; - testConfig = testEnv.lib.renderDhallInit ./simple.dhall "{=}"; - } - */ - - /* { - name = "xnow"; - bootModules = { test = "${solo5.tests}/bin/solo5-test_xnow"; }; - testConfig = testEnv.lib.renderDhallInit ./simple.dhall "{=}"; - } - */ - - /* { - name = "zeropage"; - bootModules = { test = "${solo5.tests}/bin/solo5-test_zeropage"; }; - testConfig = testEnv.lib.renderDhallInit ./simple.dhall "{=}"; - } - */ ] ++ (testEnv.lib.optional (!testEnv.isLinux) { name = "time"; - bootModules = { - test = "${solo5.tests}/bin/solo5-test_time"; - rtc_drv = "${genode.os}/bin/rtc_drv"; - }; - testConfig = testEnv.lib.renderDhallInit ./time.dhall "{=}"; + testConfig = ./time.dhall; } ); diff --git a/tests/solo5/net.dhall b/tests/solo5/net.dhall index 7fd33e1..ddaa8ba 100644 --- a/tests/solo5/net.dhall +++ b/tests/solo5/net.dhall @@ -2,67 +2,80 @@ let Genode = env:DHALL_GENODE -in λ(_ : {}) - → Genode.Init::{ - , children = - toMap - { nic = - Genode.Init.Start::{ - , binary = "nic_loopback" - , provides = [ "Nic" ] - } - , bridge = - Genode.Init.Start::{ - , binary = "nic_bridge" - , resources = { caps = 200, ram = Genode.units.MiB 6 } - , provides = [ "Nic" ] - , routes = [ Genode.ServiceRoute.child "Nic" "nic" ] - , config = - Some - ( Genode.Prelude.XML.text - '' - - - - - '' - ) - } - , solo5 = - Genode.Init.Start::{ - , binary = "test" - , resources = { caps = 256, ram = Genode.units.MiB 3 } - , routes = - [ Genode.ServiceRoute.parent "Timer" - , Genode.ServiceRoute.child "Nic" "bridge" - ] - , config = - Some - ( Genode.Prelude.XML.text - '' - limit - '' - ) - } - , ping = - Genode.Init.Start::{ - , binary = "ping" - , resources = { caps = 128, ram = Genode.units.MiB 6 } - , routes = - [ Genode.ServiceRoute.parent "Timer" - , Genode.ServiceRoute.child "Nic" "bridge" - ] - , config = - Some - ( Genode.Prelude.XML.text - '' - - '' - ) - } - } - } +let os = env:OS_MANIFEST + +let tests = env:SOLO5_TEST_MANIFEST + +in { config = + Genode.Init::{ + , children = + toMap + { nic = + Genode.Init.Start::{ + , binary = "nic_loopback" + , provides = [ "Nic" ] + } + , bridge = + Genode.Init.Start::{ + , binary = "nic_bridge" + , resources = { caps = 200, ram = Genode.units.MiB 6 } + , provides = [ "Nic" ] + , routes = [ Genode.ServiceRoute.child "Nic" "nic" ] + , config = + Some + ( Genode.Prelude.XML.text + '' + + + + + '' + ) + } + , solo5 = + Genode.Init.Start::{ + , binary = "solo5-test_net" + , resources = { caps = 256, ram = Genode.units.MiB 3 } + , routes = + [ Genode.ServiceRoute.parent "Timer" + , Genode.ServiceRoute.child "Nic" "bridge" + ] + , config = + Some + ( Genode.Prelude.XML.text + '' + limit + '' + ) + } + , ping = + Genode.Init.Start::{ + , binary = "ping" + , resources = { caps = 128, ram = Genode.units.MiB 6 } + , routes = + [ Genode.ServiceRoute.parent "Timer" + , Genode.ServiceRoute.child "Nic" "bridge" + ] + , config = + Some + ( Genode.Prelude.XML.leaf + { name = "config" + , attributes = + toMap + { interface = "10.0.0.72/24" + , dst_ip = "10.0.0.2" + , period_sec = "1" + , verbose = "no" + } + } + ) + } + } + } + , rom = + [ os.bin.nic_loopback + , os.bin.nic_bridge + , os.bin.ping + , tests.bin.solo5-test_net + ] + } diff --git a/tests/solo5/net_2if.dhall b/tests/solo5/net_2if.dhall index 101db90..86c70cf 100644 --- a/tests/solo5/net_2if.dhall +++ b/tests/solo5/net_2if.dhall @@ -2,75 +2,85 @@ let Genode = env:DHALL_GENODE -in λ ( _ - : {} - ) - → Genode.Init::{ - , children = - toMap - { nic = - Genode.Init.Start::{ - , binary = "nic_loopback" - , provides = [ "Nic" ] - } - , bridge = - Genode.Init.Start::{ - , binary = "nic_bridge" - , resources = { caps = 200, ram = Genode.units.MiB 8 } - , provides = [ "Nic" ] - , routes = [ Genode.ServiceRoute.child "Nic" "nic" ] - , config = - Some - ( Genode.Prelude.XML.text - '' - - - - - - '' - ) - } - , solo5 = - Genode.Init.Start::{ - , binary = "test" - , resources = { caps = 256, ram = Genode.units.MiB 4 } - , routes = - [ Genode.ServiceRoute.parent "Timer" - , Genode.ServiceRoute.child "Nic" "bridge" - ] - , config = - Some - ( Genode.Prelude.XML.text - '' - limit - '' - ) - } - , clients = - Genode.Init.Start::{ - , binary = "sequence" - , resources = { caps = 256, ram = Genode.units.MiB 8 } - , routes = - [ Genode.ServiceRoute.parent "Timer" - , Genode.ServiceRoute.child "Nic" "bridge" - ] - , config = - Some - ( Genode.Prelude.XML.text - '' - - - - - - - - - - - '' - ) - } - } - } +let os = env:OS_MANIFEST + +let tests = env:SOLO5_TEST_MANIFEST + +in { config = + Genode.Init::{ + , children = + toMap + { nic = + Genode.Init.Start::{ + , binary = "nic_loopback" + , provides = [ "Nic" ] + } + , bridge = + Genode.Init.Start::{ + , binary = "nic_bridge" + , resources = { caps = 200, ram = Genode.units.MiB 8 } + , provides = [ "Nic" ] + , routes = [ Genode.ServiceRoute.child "Nic" "nic" ] + , config = + Some + ( Genode.Prelude.XML.text + '' + + + + + + '' + ) + } + , solo5 = + Genode.Init.Start::{ + , binary = "solo5-test_net_2if" + , resources = { caps = 256, ram = Genode.units.MiB 4 } + , routes = + [ Genode.ServiceRoute.parent "Timer" + , Genode.ServiceRoute.child "Nic" "bridge" + ] + , config = + Some + ( Genode.Prelude.XML.text + '' + limit + '' + ) + } + , clients = + Genode.Init.Start::{ + , binary = "sequence" + , resources = { caps = 256, ram = Genode.units.MiB 8 } + , routes = + [ Genode.ServiceRoute.parent "Timer" + , Genode.ServiceRoute.child "Nic" "bridge" + ] + , config = + Some + ( Genode.Prelude.XML.text + '' + + + + + + + + + + + '' + ) + } + } + } + , rom = + [ tests.bin.solo5-test_net_2if + , os.bin.sequence + , os.bin.nic_bridge + , os.bin.nic_loopback + , os.bin.ping + ] + } diff --git a/tests/solo5/simple.dhall b/tests/solo5/simple.dhall index 20988d5..ae230a1 100644 --- a/tests/solo5/simple.dhall +++ b/tests/solo5/simple.dhall @@ -2,24 +2,27 @@ let Genode = env:DHALL_GENODE -in λ(_ : {}) - → Genode.Init::{ - , children = - toMap - { solo5 = - Genode.Init.Start::{ - , binary = "test" - , resources = { caps = 256, ram = Genode.units.MiB 3 } - , routes = [ Genode.ServiceRoute.parent "Timer" ] - , config = - Some - ( Genode.Prelude.XML.text - '' - - Hello_Solo5 - - '' - ) +in λ(testBinary : Genode.Prelude.Map.Entry Text Text) + → { config = + Genode.Init::{ + , children = + toMap + { solo5 = + Genode.Init.Start::{ + , binary = testBinary.mapKey + , resources = { caps = 256, ram = Genode.units.MiB 3 } + , routes = [ Genode.ServiceRoute.parent "Timer" ] + , config = + Some + ( Genode.Prelude.XML.text + '' + + Hello_Solo5 + + '' + ) + } } - } + } + , rom = [ testBinary ] } diff --git a/tests/solo5/time.dhall b/tests/solo5/time.dhall index e4d4e04..9519997 100644 --- a/tests/solo5/time.dhall +++ b/tests/solo5/time.dhall @@ -2,20 +2,32 @@ let Genode = env:DHALL_GENODE -in λ(_ : {}) - → { solo5 = - Genode.Init.Start::{ - , binary = "test" - , resources = { caps = 256, ram = Genode.units.MiB 3 } - , routes = - [ Genode.ServiceRoute.parent "Timer" - , Genode.ServiceRoute.child "Rtc" "clock" - ] - } - , clock = - Genode.Init.Start::{ - , binary = "rtc_drv" - , provides = [ "Rtc" ] - , routes = [ Genode.ServiceRoute.parent "IO_PORT" ] - } - } +let os = env:OS_MANIFEST + +let tests = env:SOLO5_TEST_MANIFEST + +let test = tests.bin.solo5-test_time + +in { config = + Genode.Init::{ + , children = + toMap + { solo5 = + Genode.Init.Start::{ + , binary = test.mapKey + , resources = { caps = 256, ram = Genode.units.MiB 3 } + , routes = + [ Genode.ServiceRoute.parent "Timer" + , Genode.ServiceRoute.child "Rtc" "clock" + ] + } + , clock = + Genode.Init.Start::{ + , binary = "rtc_drv" + , provides = [ "Rtc" ] + , routes = [ Genode.ServiceRoute.parent "IO_PORT" ] + } + } + } + , rom = [ test os.bin.rtc_drv ] + } diff --git a/tests/test-driver.exp b/tests/test-driver.exp index 9bac3a9..be9553f 100644 --- a/tests/test-driver.exp +++ b/tests/test-driver.exp @@ -27,23 +27,6 @@ proc wait_for_output { wait_for_re timeout_value running_spawn_id } { set output $expect_out(buffer) } - -proc run_genode_until {{wait_for_re forever} {timeout_value 0} {running_spawn_id -1}} { - # - # If a running_spawn_id is specified, wait for the expected output - # - if {$running_spawn_id != -1} { - wait_for_output $wait_for_re $timeout_value $running_spawn_id - return - } - - global image_dir spawn_id - - spawn ./core - wait_for_output $wait_for_re $timeout_value $spawn_id -} - - eval $env(baseSetup) eval $env(testScript)