Browse Source

Use flake apps for tests

tags/20.02
Emery Hemingway 1 year ago
parent
commit
4af2598ecb

+ 0
- 701
LICENSES/LicenseRef-Genode.txt View File

@@ -1,701 +0,0 @@
1
-
2
-                        Linking exception clause
3
-
4
-
5
-  The Genode OS Framework (Genode) is licensed under the terms of the
6
-  GNU Affero General Public License version 3 (AGPLv3).
7
-
8
-  Linking Genode code statically or dynamically with other modules
9
-  is making a combined work based on Genode. Thus, the terms and
10
-  conditions of the AGPLv3 cover the whole combination.
11
-
12
-  As an "additional permission" as defined by Section 7 of the
13
-  AGPLv3, Genode Labs as the copyright holder of Genode gives you
14
-  permission to link Genode source code with "independent modules"
15
-  to produce an executable if the independent modules are licensed
16
-  under an "approved license", and to copy and distribute the
17
-  resulting executable under terms of your choice, provided that you
18
-  also meet, for each linked independent module, the terms and
19
-  conditions of the license of that module.
20
-
21
-  An "approved license" is a license that is officially approved as
22
-  an Open-Source license by the Open Source Initiative [1], or
23
-  listed as a Free-Software license by the Free Software Foundation
24
-  [2], or explicitly approved by Genode Labs.
25
-
26
-  An "independent module" is a module which is not derived from or
27
-  based on Genode, or merely uses the Genode API as defined in the
28
-  official documentation.
29
-
30
-  If you modify Genode, you may extend this exception to your
31
-  version of Genode, but you are not obliged to do so. If you do not
32
-  wish to do so, delete this exception statement from your version.
33
-
34
-  [1] https://opensource.org/licenses
35
-  [2] https://www.gnu.org/licenses/license-list.en.html
36
-
37
-
38
-------------------------------------------------------------------------------
39
-
40
-
41
-                    GNU AFFERO GENERAL PUBLIC LICENSE
42
-                       Version 3, 19 November 2007
43
-
44
- Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
45
- Everyone is permitted to copy and distribute verbatim copies
46
- of this license document, but changing it is not allowed.
47
-
48
-                            Preamble
49
-
50
-  The GNU Affero General Public License is a free, copyleft license for
51
-software and other kinds of works, specifically designed to ensure
52
-cooperation with the community in the case of network server software.
53
-
54
-  The licenses for most software and other practical works are designed
55
-to take away your freedom to share and change the works.  By contrast,
56
-our General Public Licenses are intended to guarantee your freedom to
57
-share and change all versions of a program--to make sure it remains free
58
-software for all its users.
59
-
60
-  When we speak of free software, we are referring to freedom, not
61
-price.  Our General Public Licenses are designed to make sure that you
62
-have the freedom to distribute copies of free software (and charge for
63
-them if you wish), that you receive source code or can get it if you
64
-want it, that you can change the software or use pieces of it in new
65
-free programs, and that you know you can do these things.
66
-
67
-  Developers that use our General Public Licenses protect your rights
68
-with two steps: (1) assert copyright on the software, and (2) offer
69
-you this License which gives you legal permission to copy, distribute
70
-and/or modify the software.
71
-
72
-  A secondary benefit of defending all users' freedom is that
73
-improvements made in alternate versions of the program, if they
74
-receive widespread use, become available for other developers to
75
-incorporate.  Many developers of free software are heartened and
76
-encouraged by the resulting cooperation.  However, in the case of
77
-software used on network servers, this result may fail to come about.
78
-The GNU General Public License permits making a modified version and
79
-letting the public access it on a server without ever releasing its
80
-source code to the public.
81
-
82
-  The GNU Affero General Public License is designed specifically to
83
-ensure that, in such cases, the modified source code becomes available
84
-to the community.  It requires the operator of a network server to
85
-provide the source code of the modified version running there to the
86
-users of that server.  Therefore, public use of a modified version, on
87
-a publicly accessible server, gives the public access to the source
88
-code of the modified version.
89
-
90
-  An older license, called the Affero General Public License and
91
-published by Affero, was designed to accomplish similar goals.  This is
92
-a different license, not a version of the Affero GPL, but Affero has
93
-released a new version of the Affero GPL which permits relicensing under
94
-this license.
95
-
96
-  The precise terms and conditions for copying, distribution and
97
-modification follow.
98
-
99
-                       TERMS AND CONDITIONS
100
-
101
-  0. Definitions.
102
-
103
-  "This License" refers to version 3 of the GNU Affero General Public License.
104
-
105
-  "Copyright" also means copyright-like laws that apply to other kinds of
106
-works, such as semiconductor masks.
107
-
108
-  "The Program" refers to any copyrightable work licensed under this
109
-License.  Each licensee is addressed as "you".  "Licensees" and
110
-"recipients" may be individuals or organizations.
111
-
112
-  To "modify" a work means to copy from or adapt all or part of the work
113
-in a fashion requiring copyright permission, other than the making of an
114
-exact copy.  The resulting work is called a "modified version" of the
115
-earlier work or a work "based on" the earlier work.
116
-
117
-  A "covered work" means either the unmodified Program or a work based
118
-on the Program.
119
-
120
-  To "propagate" a work means to do anything with it that, without
121
-permission, would make you directly or secondarily liable for
122
-infringement under applicable copyright law, except executing it on a
123
-computer or modifying a private copy.  Propagation includes copying,
124
-distribution (with or without modification), making available to the
125
-public, and in some countries other activities as well.
126
-
127
-  To "convey" a work means any kind of propagation that enables other
128
-parties to make or receive copies.  Mere interaction with a user through
129
-a computer network, with no transfer of a copy, is not conveying.
130
-
131
-  An interactive user interface displays "Appropriate Legal Notices"
132
-to the extent that it includes a convenient and prominently visible
133
-feature that (1) displays an appropriate copyright notice, and (2)
134
-tells the user that there is no warranty for the work (except to the
135
-extent that warranties are provided), that licensees may convey the
136
-work under this License, and how to view a copy of this License.  If
137
-the interface presents a list of user commands or options, such as a
138
-menu, a prominent item in the list meets this criterion.
139
-
140
-  1. Source Code.
141
-
142
-  The "source code" for a work means the preferred form of the work
143
-for making modifications to it.  "Object code" means any non-source
144
-form of a work.
145
-
146
-  A "Standard Interface" means an interface that either is an official
147
-standard defined by a recognized standards body, or, in the case of
148
-interfaces specified for a particular programming language, one that
149
-is widely used among developers working in that language.
150
-
151
-  The "System Libraries" of an executable work include anything, other
152
-than the work as a whole, that (a) is included in the normal form of
153
-packaging a Major Component, but which is not part of that Major
154
-Component, and (b) serves only to enable use of the work with that
155
-Major Component, or to implement a Standard Interface for which an
156
-implementation is available to the public in source code form.  A
157
-"Major Component", in this context, means a major essential component
158
-(kernel, window system, and so on) of the specific operating system
159
-(if any) on which the executable work runs, or a compiler used to
160
-produce the work, or an object code interpreter used to run it.
161
-
162
-  The "Corresponding Source" for a work in object code form means all
163
-the source code needed to generate, install, and (for an executable
164
-work) run the object code and to modify the work, including scripts to
165
-control those activities.  However, it does not include the work's
166
-System Libraries, or general-purpose tools or generally available free
167
-programs which are used unmodified in performing those activities but
168
-which are not part of the work.  For example, Corresponding Source
169
-includes interface definition files associated with source files for
170
-the work, and the source code for shared libraries and dynamically
171
-linked subprograms that the work is specifically designed to require,
172
-such as by intimate data communication or control flow between those
173
-subprograms and other parts of the work.
174
-
175
-  The Corresponding Source need not include anything that users
176
-can regenerate automatically from other parts of the Corresponding
177
-Source.
178
-
179
-  The Corresponding Source for a work in source code form is that
180
-same work.
181
-
182
-  2. Basic Permissions.
183
-
184
-  All rights granted under this License are granted for the term of
185
-copyright on the Program, and are irrevocable provided the stated
186
-conditions are met.  This License explicitly affirms your unlimited
187
-permission to run the unmodified Program.  The output from running a
188
-covered work is covered by this License only if the output, given its
189
-content, constitutes a covered work.  This License acknowledges your
190
-rights of fair use or other equivalent, as provided by copyright law.
191
-
192
-  You may make, run and propagate covered works that you do not
193
-convey, without conditions so long as your license otherwise remains
194
-in force.  You may convey covered works to others for the sole purpose
195
-of having them make modifications exclusively for you, or provide you
196
-with facilities for running those works, provided that you comply with
197
-the terms of this License in conveying all material for which you do
198
-not control copyright.  Those thus making or running the covered works
199
-for you must do so exclusively on your behalf, under your direction
200
-and control, on terms that prohibit them from making any copies of
201
-your copyrighted material outside their relationship with you.
202
-
203
-  Conveying under any other circumstances is permitted solely under
204
-the conditions stated below.  Sublicensing is not allowed; section 10
205
-makes it unnecessary.
206
-
207
-  3. Protecting Users' Legal Rights From Anti-Circumvention Law.
208
-
209
-  No covered work shall be deemed part of an effective technological
210
-measure under any applicable law fulfilling obligations under article
211
-11 of the WIPO copyright treaty adopted on 20 December 1996, or
212
-similar laws prohibiting or restricting circumvention of such
213
-measures.
214
-
215
-  When you convey a covered work, you waive any legal power to forbid
216
-circumvention of technological measures to the extent such circumvention
217
-is effected by exercising rights under this License with respect to
218
-the covered work, and you disclaim any intention to limit operation or
219
-modification of the work as a means of enforcing, against the work's
220
-users, your or third parties' legal rights to forbid circumvention of
221
-technological measures.
222
-
223
-  4. Conveying Verbatim Copies.
224
-
225
-  You may convey verbatim copies of the Program's source code as you
226
-receive it, in any medium, provided that you conspicuously and
227
-appropriately publish on each copy an appropriate copyright notice;
228
-keep intact all notices stating that this License and any
229
-non-permissive terms added in accord with section 7 apply to the code;
230
-keep intact all notices of the absence of any warranty; and give all
231
-recipients a copy of this License along with the Program.
232
-
233
-  You may charge any price or no price for each copy that you convey,
234
-and you may offer support or warranty protection for a fee.
235
-
236
-  5. Conveying Modified Source Versions.
237
-
238
-  You may convey a work based on the Program, or the modifications to
239
-produce it from the Program, in the form of source code under the
240
-terms of section 4, provided that you also meet all of these conditions:
241
-
242
-    a) The work must carry prominent notices stating that you modified
243
-    it, and giving a relevant date.
244
-
245
-    b) The work must carry prominent notices stating that it is
246
-    released under this License and any conditions added under section
247
-    7.  This requirement modifies the requirement in section 4 to
248
-    "keep intact all notices".
249
-
250
-    c) You must license the entire work, as a whole, under this
251
-    License to anyone who comes into possession of a copy.  This
252
-    License will therefore apply, along with any applicable section 7
253
-    additional terms, to the whole of the work, and all its parts,
254
-    regardless of how they are packaged.  This License gives no
255
-    permission to license the work in any other way, but it does not
256
-    invalidate such permission if you have separately received it.
257
-
258
-    d) If the work has interactive user interfaces, each must display
259
-    Appropriate Legal Notices; however, if the Program has interactive
260
-    interfaces that do not display Appropriate Legal Notices, your
261
-    work need not make them do so.
262
-
263
-  A compilation of a covered work with other separate and independent
264
-works, which are not by their nature extensions of the covered work,
265
-and which are not combined with it such as to form a larger program,
266
-in or on a volume of a storage or distribution medium, is called an
267
-"aggregate" if the compilation and its resulting copyright are not
268
-used to limit the access or legal rights of the compilation's users
269
-beyond what the individual works permit.  Inclusion of a covered work
270
-in an aggregate does not cause this License to apply to the other
271
-parts of the aggregate.
272
-
273
-  6. Conveying Non-Source Forms.
274
-
275
-  You may convey a covered work in object code form under the terms
276
-of sections 4 and 5, provided that you also convey the
277
-machine-readable Corresponding Source under the terms of this License,
278
-in one of these ways:
279
-
280
-    a) Convey the object code in, or embodied in, a physical product
281
-    (including a physical distribution medium), accompanied by the
282
-    Corresponding Source fixed on a durable physical medium
283
-    customarily used for software interchange.
284
-
285
-    b) Convey the object code in, or embodied in, a physical product
286
-    (including a physical distribution medium), accompanied by a
287
-    written offer, valid for at least three years and valid for as
288
-    long as you offer spare parts or customer support for that product
289
-    model, to give anyone who possesses the object code either (1) a
290
-    copy of the Corresponding Source for all the software in the
291
-    product that is covered by this License, on a durable physical
292
-    medium customarily used for software interchange, for a price no
293
-    more than your reasonable cost of physically performing this
294
-    conveying of source, or (2) access to copy the
295
-    Corresponding Source from a network server at no charge.
296
-
297
-    c) Convey individual copies of the object code with a copy of the
298
-    written offer to provide the Corresponding Source.  This
299
-    alternative is allowed only occasionally and noncommercially, and
300
-    only if you received the object code with such an offer, in accord
301
-    with subsection 6b.
302
-
303
-    d) Convey the object code by offering access from a designated
304
-    place (gratis or for a charge), and offer equivalent access to the
305
-    Corresponding Source in the same way through the same place at no
306
-    further charge.  You need not require recipients to copy the
307
-    Corresponding Source along with the object code.  If the place to
308
-    copy the object code is a network server, the Corresponding Source
309
-    may be on a different server (operated by you or a third party)
310
-    that supports equivalent copying facilities, provided you maintain
311
-    clear directions next to the object code saying where to find the
312
-    Corresponding Source.  Regardless of what server hosts the
313
-    Corresponding Source, you remain obligated to ensure that it is
314
-    available for as long as needed to satisfy these requirements.
315
-
316
-    e) Convey the object code using peer-to-peer transmission, provided
317
-    you inform other peers where the object code and Corresponding
318
-    Source of the work are being offered to the general public at no
319
-    charge under subsection 6d.
320
-
321
-  A separable portion of the object code, whose source code is excluded
322
-from the Corresponding Source as a System Library, need not be
323
-included in conveying the object code work.
324
-
325
-  A "User Product" is either (1) a "consumer product", which means any
326
-tangible personal property which is normally used for personal, family,
327
-or household purposes, or (2) anything designed or sold for incorporation
328
-into a dwelling.  In determining whether a product is a consumer product,
329
-doubtful cases shall be resolved in favor of coverage.  For a particular
330
-product received by a particular user, "normally used" refers to a
331
-typical or common use of that class of product, regardless of the status
332
-of the particular user or of the way in which the particular user
333
-actually uses, or expects or is expected to use, the product.  A product
334
-is a consumer product regardless of whether the product has substantial
335
-commercial, industrial or non-consumer uses, unless such uses represent
336
-the only significant mode of use of the product.
337
-
338
-  "Installation Information" for a User Product means any methods,
339
-procedures, authorization keys, or other information required to install
340
-and execute modified versions of a covered work in that User Product from
341
-a modified version of its Corresponding Source.  The information must
342
-suffice to ensure that the continued functioning of the modified object
343
-code is in no case prevented or interfered with solely because
344
-modification has been made.
345
-
346
-  If you convey an object code work under this section in, or with, or
347
-specifically for use in, a User Product, and the conveying occurs as
348
-part of a transaction in which the right of possession and use of the
349
-User Product is transferred to the recipient in perpetuity or for a
350
-fixed term (regardless of how the transaction is characterized), the
351
-Corresponding Source conveyed under this section must be accompanied
352
-by the Installation Information.  But this requirement does not apply
353
-if neither you nor any third party retains the ability to install
354
-modified object code on the User Product (for example, the work has
355
-been installed in ROM).
356
-
357
-  The requirement to provide Installation Information does not include a
358
-requirement to continue to provide support service, warranty, or updates
359
-for a work that has been modified or installed by the recipient, or for
360
-the User Product in which it has been modified or installed.  Access to a
361
-network may be denied when the modification itself materially and
362
-adversely affects the operation of the network or violates the rules and
363
-protocols for communication across the network.
364
-
365
-  Corresponding Source conveyed, and Installation Information provided,
366
-in accord with this section must be in a format that is publicly
367
-documented (and with an implementation available to the public in
368
-source code form), and must require no special password or key for
369
-unpacking, reading or copying.
370
-
371
-  7. Additional Terms.
372
-
373
-  "Additional permissions" are terms that supplement the terms of this
374
-License by making exceptions from one or more of its conditions.
375
-Additional permissions that are applicable to the entire Program shall
376
-be treated as though they were included in this License, to the extent
377
-that they are valid under applicable law.  If additional permissions
378
-apply only to part of the Program, that part may be used separately
379
-under those permissions, but the entire Program remains governed by
380
-this License without regard to the additional permissions.
381
-
382
-  When you convey a copy of a covered work, you may at your option
383
-remove any additional permissions from that copy, or from any part of
384
-it.  (Additional permissions may be written to require their own
385
-removal in certain cases when you modify the work.)  You may place
386
-additional permissions on material, added by you to a covered work,
387
-for which you have or can give appropriate copyright permission.
388
-
389
-  Notwithstanding any other provision of this License, for material you
390
-add to a covered work, you may (if authorized by the copyright holders of
391
-that material) supplement the terms of this License with terms:
392
-
393
-    a) Disclaiming warranty or limiting liability differently from the
394
-    terms of sections 15 and 16 of this License; or
395
-
396
-    b) Requiring preservation of specified reasonable legal notices or
397
-    author attributions in that material or in the Appropriate Legal
398
-    Notices displayed by works containing it; or
399
-
400
-    c) Prohibiting misrepresentation of the origin of that material, or
401
-    requiring that modified versions of such material be marked in
402
-    reasonable ways as different from the original version; or
403
-
404
-    d) Limiting the use for publicity purposes of names of licensors or
405
-    authors of the material; or
406
-
407
-    e) Declining to grant rights under trademark law for use of some
408
-    trade names, trademarks, or service marks; or
409
-
410
-    f) Requiring indemnification of licensors and authors of that
411
-    material by anyone who conveys the material (or modified versions of
412
-    it) with contractual assumptions of liability to the recipient, for
413
-    any liability that these contractual assumptions directly impose on
414
-    those licensors and authors.
415
-
416
-  All other non-permissive additional terms are considered "further
417
-restrictions" within the meaning of section 10.  If the Program as you
418
-received it, or any part of it, contains a notice stating that it is
419
-governed by this License along with a term that is a further
420
-restriction, you may remove that term.  If a license document contains
421
-a further restriction but permits relicensing or conveying under this
422
-License, you may add to a covered work material governed by the terms
423
-of that license document, provided that the further restriction does
424
-not survive such relicensing or conveying.
425
-
426
-  If you add terms to a covered work in accord with this section, you
427
-must place, in the relevant source files, a statement of the
428
-additional terms that apply to those files, or a notice indicating
429
-where to find the applicable terms.
430
-
431
-  Additional terms, permissive or non-permissive, may be stated in the
432
-form of a separately written license, or stated as exceptions;
433
-the above requirements apply either way.
434
-
435
-  8. Termination.
436
-
437
-  You may not propagate or modify a covered work except as expressly
438
-provided under this License.  Any attempt otherwise to propagate or
439
-modify it is void, and will automatically terminate your rights under
440
-this License (including any patent licenses granted under the third
441
-paragraph of section 11).
442
-
443
-  However, if you cease all violation of this License, then your
444
-license from a particular copyright holder is reinstated (a)
445
-provisionally, unless and until the copyright holder explicitly and
446
-finally terminates your license, and (b) permanently, if the copyright
447
-holder fails to notify you of the violation by some reasonable means
448
-prior to 60 days after the cessation.
449
-
450
-  Moreover, your license from a particular copyright holder is
451
-reinstated permanently if the copyright holder notifies you of the
452
-violation by some reasonable means, this is the first time you have
453
-received notice of violation of this License (for any work) from that
454
-copyright holder, and you cure the violation prior to 30 days after
455
-your receipt of the notice.
456
-
457
-  Termination of your rights under this section does not terminate the
458
-licenses of parties who have received copies or rights from you under
459
-this License.  If your rights have been terminated and not permanently
460
-reinstated, you do not qualify to receive new licenses for the same
461
-material under section 10.
462
-
463
-  9. Acceptance Not Required for Having Copies.
464
-
465
-  You are not required to accept this License in order to receive or
466
-run a copy of the Program.  Ancillary propagation of a covered work
467
-occurring solely as a consequence of using peer-to-peer transmission
468
-to receive a copy likewise does not require acceptance.  However,
469
-nothing other than this License grants you permission to propagate or
470
-modify any covered work.  These actions infringe copyright if you do
471
-not accept this License.  Therefore, by modifying or propagating a
472
-covered work, you indicate your acceptance of this License to do so.
473
-
474
-  10. Automatic Licensing of Downstream Recipients.
475
-
476
-  Each time you convey a covered work, the recipient automatically
477
-receives a license from the original licensors, to run, modify and
478
-propagate that work, subject to this License.  You are not responsible
479
-for enforcing compliance by third parties with this License.
480
-
481
-  An "entity transaction" is a transaction transferring control of an
482
-organization, or substantially all assets of one, or subdividing an
483
-organization, or merging organizations.  If propagation of a covered
484
-work results from an entity transaction, each party to that
485
-transaction who receives a copy of the work also receives whatever
486
-licenses to the work the party's predecessor in interest had or could
487
-give under the previous paragraph, plus a right to possession of the
488
-Corresponding Source of the work from the predecessor in interest, if
489
-the predecessor has it or can get it with reasonable efforts.
490
-
491
-  You may not impose any further restrictions on the exercise of the
492
-rights granted or affirmed under this License.  For example, you may
493
-not impose a license fee, royalty, or other charge for exercise of
494
-rights granted under this License, and you may not initiate litigation
495
-(including a cross-claim or counterclaim in a lawsuit) alleging that
496
-any patent claim is infringed by making, using, selling, offering for
497
-sale, or importing the Program or any portion of it.
498
-
499
-  11. Patents.
500
-
501
-  A "contributor" is a copyright holder who authorizes use under this
502
-License of the Program or a work on which the Program is based.  The
503
-work thus licensed is called the contributor's "contributor version".
504
-
505
-  A contributor's "essential patent claims" are all patent claims
506
-owned or controlled by the contributor, whether already acquired or
507
-hereafter acquired, that would be infringed by some manner, permitted
508
-by this License, of making, using, or selling its contributor version,
509
-but do not include claims that would be infringed only as a
510
-consequence of further modification of the contributor version.  For
511
-purposes of this definition, "control" includes the right to grant
512
-patent sublicenses in a manner consistent with the requirements of
513
-this License.
514
-
515
-  Each contributor grants you a non-exclusive, worldwide, royalty-free
516
-patent license under the contributor's essential patent claims, to
517
-make, use, sell, offer for sale, import and otherwise run, modify and
518
-propagate the contents of its contributor version.
519
-
520
-  In the following three paragraphs, a "patent license" is any express
521
-agreement or commitment, however denominated, not to enforce a patent
522
-(such as an express permission to practice a patent or covenant not to
523
-sue for patent infringement).  To "grant" such a patent license to a
524
-party means to make such an agreement or commitment not to enforce a
525
-patent against the party.
526
-
527
-  If you convey a covered work, knowingly relying on a patent license,
528
-and the Corresponding Source of the work is not available for anyone
529
-to copy, free of charge and under the terms of this License, through a
530
-publicly available network server or other readily accessible means,
531
-then you must either (1) cause the Corresponding Source to be so
532
-available, or (2) arrange to deprive yourself of the benefit of the
533
-patent license for this particular work, or (3) arrange, in a manner
534
-consistent with the requirements of this License, to extend the patent
535
-license to downstream recipients.  "Knowingly relying" means you have
536
-actual knowledge that, but for the patent license, your conveying the
537
-covered work in a country, or your recipient's use of the covered work
538
-in a country, would infringe one or more identifiable patents in that
539
-country that you have reason to believe are valid.
540
-
541
-  If, pursuant to or in connection with a single transaction or
542
-arrangement, you convey, or propagate by procuring conveyance of, a
543
-covered work, and grant a patent license to some of the parties
544
-receiving the covered work authorizing them to use, propagate, modify
545
-or convey a specific copy of the covered work, then the patent license
546
-you grant is automatically extended to all recipients of the covered
547
-work and works based on it.
548
-
549
-  A patent license is "discriminatory" if it does not include within
550
-the scope of its coverage, prohibits the exercise of, or is
551
-conditioned on the non-exercise of one or more of the rights that are
552
-specifically granted under this License.  You may not convey a covered
553
-work if you are a party to an arrangement with a third party that is
554
-in the business of distributing software, under which you make payment
555
-to the third party based on the extent of your activity of conveying
556
-the work, and under which the third party grants, to any of the
557
-parties who would receive the covered work from you, a discriminatory
558
-patent license (a) in connection with copies of the covered work
559
-conveyed by you (or copies made from those copies), or (b) primarily
560
-for and in connection with specific products or compilations that
561
-contain the covered work, unless you entered into that arrangement,
562
-or that patent license was granted, prior to 28 March 2007.
563
-
564
-  Nothing in this License shall be construed as excluding or limiting
565
-any implied license or other defenses to infringement that may
566
-otherwise be available to you under applicable patent law.
567
-
568
-  12. No Surrender of Others' Freedom.
569
-
570
-  If conditions are imposed on you (whether by court order, agreement or
571
-otherwise) that contradict the conditions of this License, they do not
572
-excuse you from the conditions of this License.  If you cannot convey a
573
-covered work so as to satisfy simultaneously your obligations under this
574
-License and any other pertinent obligations, then as a consequence you may
575
-not convey it at all.  For example, if you agree to terms that obligate you
576
-to collect a royalty for further conveying from those to whom you convey
577
-the Program, the only way you could satisfy both those terms and this
578
-License would be to refrain entirely from conveying the Program.
579
-
580
-  13. Remote Network Interaction; Use with the GNU General Public License.
581
-
582
-  Notwithstanding any other provision of this License, if you modify the
583
-Program, your modified version must prominently offer all users
584
-interacting with it remotely through a computer network (if your version
585
-supports such interaction) an opportunity to receive the Corresponding
586
-Source of your version by providing access to the Corresponding Source
587
-from a network server at no charge, through some standard or customary
588
-means of facilitating copying of software.  This Corresponding Source
589
-shall include the Corresponding Source for any work covered by version 3
590
-of the GNU General Public License that is incorporated pursuant to the
591
-following paragraph.
592
-
593
-  Notwithstanding any other provision of this License, you have
594
-permission to link or combine any covered work with a work licensed
595
-under version 3 of the GNU General Public License into a single
596
-combined work, and to convey the resulting work.  The terms of this
597
-License will continue to apply to the part which is the covered work,
598
-but the work with which it is combined will remain governed by version
599
-3 of the GNU General Public License.
600
-
601
-  14. Revised Versions of this License.
602
-
603
-  The Free Software Foundation may publish revised and/or new versions of
604
-the GNU Affero General Public License from time to time.  Such new versions
605
-will be similar in spirit to the present version, but may differ in detail to
606
-address new problems or concerns.
607
-
608
-  Each version is given a distinguishing version number.  If the
609
-Program specifies that a certain numbered version of the GNU Affero General
610
-Public License "or any later version" applies to it, you have the
611
-option of following the terms and conditions either of that numbered
612
-version or of any later version published by the Free Software
613
-Foundation.  If the Program does not specify a version number of the
614
-GNU Affero General Public License, you may choose any version ever published
615
-by the Free Software Foundation.
616
-
617
-  If the Program specifies that a proxy can decide which future
618
-versions of the GNU Affero General Public License can be used, that proxy's
619
-public statement of acceptance of a version permanently authorizes you
620
-to choose that version for the Program.
621
-
622
-  Later license versions may give you additional or different
623
-permissions.  However, no additional obligations are imposed on any
624
-author or copyright holder as a result of your choosing to follow a
625
-later version.
626
-
627
-  15. Disclaimer of Warranty.
628
-
629
-  THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY
630
-APPLICABLE LAW.  EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT
631
-HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY
632
-OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO,
633
-THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
634
-PURPOSE.  THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM
635
-IS WITH YOU.  SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF
636
-ALL NECESSARY SERVICING, REPAIR OR CORRECTION.
637
-
638
-  16. Limitation of Liability.
639
-
640
-  IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
641
-WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS
642
-THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY
643
-GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE
644
-USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF
645
-DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD
646
-PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS),
647
-EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF
648
-SUCH DAMAGES.
649
-
650
-  17. Interpretation of Sections 15 and 16.
651
-
652
-  If the disclaimer of warranty and limitation of liability provided
653
-above cannot be given local legal effect according to their terms,
654
-reviewing courts shall apply local law that most closely approximates
655
-an absolute waiver of all civil liability in connection with the
656
-Program, unless a warranty or assumption of liability accompanies a
657
-copy of the Program in return for a fee.
658
-
659
-                     END OF TERMS AND CONDITIONS
660
-
661
-            How to Apply These Terms to Your New Programs
662
-
663
-  If you develop a new program, and you want it to be of the greatest
664
-possible use to the public, the best way to achieve this is to make it
665
-free software which everyone can redistribute and change under these terms.
666
-
667
-  To do so, attach the following notices to the program.  It is safest
668
-to attach them to the start of each source file to most effectively
669
-state the exclusion of warranty; and each file should have at least
670
-the "copyright" line and a pointer to where the full notice is found.
671
-
672
-    <one line to give the program's name and a brief idea of what it does.>
673
-    Copyright (C) <year>  <name of author>
674
-
675
-    This program is free software: you can redistribute it and/or modify
676
-    it under the terms of the GNU Affero General Public License as published by
677
-    the Free Software Foundation, either version 3 of the License, or
678
-    (at your option) any later version.
679
-
680
-    This program is distributed in the hope that it will be useful,
681
-    but WITHOUT ANY WARRANTY; without even the implied warranty of
682
-    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
683
-    GNU Affero General Public License for more details.
684
-
685
-    You should have received a copy of the GNU Affero General Public License
686
-    along with this program.  If not, see <http://www.gnu.org/licenses/>.
687
-
688
-Also add information on how to contact you by electronic and paper mail.
689
-
690
-  If your software can interact with users remotely through a computer
691
-network, you should also make sure that it provides a way for users to
692
-get its source.  For example, if your program is a web application, its
693
-interface could display a "Source" link that leads users to an archive
694
-of the code.  There are many ways you could offer source, and different
695
-solutions will be better for different programs; see section 13 for the
696
-specific requirements.
697
-
698
-  You should also get your employer (if you work as a programmer) or school,
699
-if any, to sign a "copyright disclaimer" for the program, if necessary.
700
-For more information on this, and how to apply and follow the GNU AGPL, see
701
-<http://www.gnu.org/licenses/>.

+ 25
- 14
flake.nix View File

@@ -15,21 +15,37 @@
15 15
   outputs = { self, dhall-haskell, genode-depot, nixpkgs }:
16 16
     let
17 17
       mkOutput = { system, localSystem, crossSystem }:
18
-        let thisSystem = builtins.getAttr system;
18
+        let
19
+          thisSystem = builtins.getAttr system;
20
+          lib = (nixpkgs.lib) // (import ./lib {
21
+            inherit system localSystem crossSystem;
22
+            inherit nixpkgs dhall-haskell genode-depot;
23
+            genodepkgs = self;
24
+          });
19 25
         in rec {
20 26
 
27
+          legacyPackages = thisSystem nixpkgs.legacyPackages;
28
+          # pass thru Nixpkgs
29
+
21 30
           packages = import ./packages {
22
-            inherit system nixpkgs;
31
+            inherit system legacyPackages;
23 32
             depot = thisSystem genode-depot.packages;
24 33
             dhallApps = dhall-haskell.apps.${localSystem};
25 34
           };
26 35
 
27
-          legacyPackages = thisSystem nixpkgs.legacyPackages;
28
-          # pass thru Nixpkgs
29
-
30 36
           defaultPackage = packages.genode.base-linux;
31 37
 
32
-          devShell = packages.stdenv;
38
+          devShell = legacyPackages.mkShell {
39
+            nativeBuildInputs = [ dhall-haskell.packages.${localSystem}.dhall ];
40
+            shellHook = ''
41
+              export DHALL_PRELUDE="${packages.dhallPrelude}/package.dhall"
42
+              export DHALL_GENODE="${packages.dhallGenode}/package.dhall"
43
+              export BASE_MANIFEST="${packages.genode.base.manifest}"
44
+              export BASE_LINUX_MANIFEST="${packages.genode.base-linux.manifest}"
45
+              export BASE_NOVA_MANIFEST="${packages.genode.base-nova.manifest}"
46
+              export OS_MANIFEST="${packages.genode.os.manifest}"
47
+            '';
48
+          };
33 49
 
34 50
           apps = import ./apps {
35 51
             nixpkgs = legacyPackages;
@@ -37,18 +53,13 @@
37 53
             inherit packages;
38 54
           };
39 55
 
40
-          lib = (nixpkgs.lib) // (import ./lib {
41
-            inherit system localSystem crossSystem;
42
-            inherit nixpkgs dhall-haskell genode-depot;
43
-            genodepkgs = self;
44
-          });
45
-
46 56
           nixosModule = ./nixos;
47 57
 
48 58
           checks = (import ./tests {
49 59
             inherit system localSystem crossSystem;
50
-            inherit self nixpkgs dhall-haskell genode-depot;
51
-            lib = thisSystem self.lib;
60
+            apps = dhall-haskell.apps.${localSystem} // apps;
61
+            inherit self nixpkgs genode-depot;
62
+            inherit lib;
52 63
             genodepkgs = thisSystem self.packages;
53 64
           }) // {
54 65
             nixos = import ./nixos/test.nix {

+ 0
- 124
lib/default.nix View File

@@ -45,128 +45,4 @@ in {
45 45
       xmllint --noout $out
46 46
     '';
47 47
 
48
-  buildNovaIso = { name, rom }:
49
-    let
50
-
51
-      inherit (hostPkgs) cdrkit syslinux;
52
-      coreNovaObj = "${testPkgs.genode.base-nova}/lib/core-nova.o";
53
-
54
-      rom' = (with testPkgs.genode; {
55
-        init = "${os}/bin/init";
56
-        "ld.lib.so" = "${depot.base-nova}/lib/ld.lib.so";
57
-        timer = "${base-nova}/bin/nova_timer_drv";
58
-      }) // rom;
59
-
60
-      addressType = ".quad"; # TODO: 32bit?!
61
-
62
-      map' = with nixpkgs.lib;
63
-        l: f:
64
-        concatStrings (imap0 (i: v: (f (toString i) v)) l);
65
-
66
-      mapNames = map' (builtins.attrNames rom');
67
-      mapValues = map' (builtins.attrValues rom');
68
-
69
-      modulesAsm = ''
70
-        .set MIN_PAGE_SIZE_LOG2, 12
71
-        .set DATA_ACCESS_ALIGNM_LOG2, 3
72
-
73
-        .section .data
74
-
75
-        .p2align DATA_ACCESS_ALIGNM_LOG2
76
-        .global _boot_modules_headers_begin
77
-        _boot_modules_headers_begin:
78
-
79
-      '' + (mapNames (i: _: ''
80
-        ${addressType} _boot_module_${i}_name
81
-        ${addressType} _boot_module_${i}_begin
82
-        ${addressType} _boot_module_${i}_end - _boot_module_${i}_begin
83
-
84
-      '')) + ''
85
-        .global _boot_modules_headers_end
86
-        _boot_modules_headers_end:
87
-
88
-      '' + (mapNames (i: name: ''
89
-        .p2align DATA_ACCESS_ALIGNM_LOG2
90
-        _boot_module_${i}_name:
91
-        .string "${name}"
92
-        .byte 0
93
-
94
-      '')) + ''
95
-        .section .data.boot_modules_binaries
96
-
97
-        .global _boot_modules_binaries_begin
98
-        _boot_modules_binaries_begin:
99
-
100
-      '' + (mapValues (i: path: ''
101
-        .p2align MIN_PAGE_SIZE_LOG2
102
-        _boot_module_${i}_begin:
103
-        .incbin "${path}"
104
-        _boot_module_${i}_end:
105
-
106
-      '')) + ''
107
-        .p2align MIN_PAGE_SIZE_LOG2
108
-        .global _boot_modules_binaries_end
109
-        _boot_modules_binaries_end:
110
-      '';
111
-
112
-      syslinuxDir = "${syslinux}/share/syslinux";
113
-
114
-    in hostPkgs.stdenv.mkDerivation {
115
-      name = name + "-iso";
116
-      passthru = rom;
117
-      passAsFile = [ "modulesAsm" ];
118
-      inherit modulesAsm;
119
-      preferLocalBuild = true;
120
-      dontUnpack = true;
121
-
122
-      buildInputs = [ testPkgs.stdenv.cc hostPkgs.cdrkit hostPkgs.syslinux ];
123
-
124
-      buildPhase = ''
125
-        mkdir -p boot/syslinux
126
-
127
-        # compile the boot modules into one object file
128
-        $CC -c -x assembler -o boot_modules.o $modulesAsmPath
129
-
130
-        # link final image
131
-        $LD -nostdlib \
132
-        	-T${./genode.ld} \
133
-        	-T${./nova-bss.ld} \
134
-        	-z max-page-size=0x1000 \
135
-        	-Ttext=0x100000 -gc-sections \
136
-        	${coreNovaObj} boot_modules.o \
137
-        	-o boot/image.elf
138
-
139
-        strip boot/image.elf
140
-
141
-        # build ISO image
142
-        cp ${testPkgs.NOVA}/hypervisor* boot/hypervisor
143
-        cp ${./nova-isolinux.cfg} boot/syslinux/isolinux.cfg
144
-        cp \
145
-        	${syslinuxDir}/isolinux.bin \
146
-        	${syslinuxDir}/ldlinux.c32 \
147
-        	${syslinuxDir}/libcom32.c32 \
148
-        	${syslinuxDir}/mboot.c32 \
149
-        	boot/syslinux
150
-        chmod +w boot/syslinux/isolinux.bin
151
-        mkisofs -o iso \
152
-        	-b syslinux/isolinux.bin -c syslinux/boot.cat \
153
-        	-no-emul-boot -boot-load-size 4 -boot-info-table \
154
-        	-iso-level 2 \
155
-        	boot
156
-
157
-        isohybrid iso
158
-
159
-        # build test script
160
-        cat > boot-qemu << EOF
161
-        #!/bin/sh
162
-        ${hostPkgs.qemu_test}/bin/qemu-system-x86_64 -cdrom $out/iso -machine q35 \$@
163
-        EOF
164
-      '';
165
-
166
-      installPhase = ''
167
-        install -Dm444 iso $out/iso
168
-        install -Dm555 boot-qemu $out/bin/boot-qemu
169
-      '';
170
-    };
171
-
172 48
 }

+ 0
- 141
lib/genode.ld View File

@@ -1,141 +0,0 @@
1
-// SPDX-FileCopyrightText: 2006-2017 Genode Labs GmbH
2
-//
3
-// SPDX-License-Identifier: LicenseRef-Genode
4
-
5
-/*
6
- * \brief  Linker script for Genode programs
7
- * \author Christian Helmuth
8
- * \date   2006-04-12
9
- */
10
-
11
-/*
12
- * Copyright (C) 2006-2017 Genode Labs GmbH
13
- *
14
- * This file is part of the Genode OS framework, which is distributed
15
- * under the terms of the GNU Affero General Public License version 3.
16
- */
17
-
18
-ENTRY(_start)
19
-
20
-PHDRS
21
-{
22
-	ro PT_LOAD;
23
-	rw PT_LOAD;
24
-	boot PT_LOAD FLAGS(4);
25
-}
26
-
27
-SECTIONS
28
-{
29
-	.text : {
30
-		/* begin of program image (link address) */
31
-		_prog_img_beg = .;
32
-
33
-		/* put entry code at the start of the text segment / raw binary */
34
-		KEEP (*(.text.crt0))
35
-
36
-		*(.init)
37
-		*(.text .text.* .gnu.linkonce.t.*)
38
-		*(.fini)
39
-		*(.rodata .rodata.* .gnu.linkonce.r.*)
40
-
41
-		. = ALIGN(0x08);
42
-
43
-		_ctors_start = .;
44
-		KEEP (*(.ctors))
45
-		KEEP (*(SORT(.ctors.*)))
46
-		KEEP (*(.init_array)) /* list of constructors specific for ARM eabi */
47
-		_ctors_end = .;
48
-		_dtors_start = .;
49
-		KEEP (*(SORT(.dtors.*)))
50
-		KEEP (*(.dtors))
51
-		_dtors_end = .;
52
-	} : ro = 0x0
53
-
54
-	/* Linux: exception section for uaccess mechanism */
55
-	__ex_table : { *(__ex_table) }
56
-
57
-	.eh_frame_hdr : { *(.eh_frame_hdr) }
58
-	__eh_frame_hdr_start = SIZEOF(.eh_frame_hdr) > 0 ? ADDR(.eh_frame_hdr) : 0;
59
-	__eh_frame_hdr_end = SIZEOF(.eh_frame_hdr) > 0 ? . : 0;
60
-
61
-	. = ALIGN(0x1000);
62
-
63
-	.data : {
64
-		/*
65
-		 * Leave space for parent capability parameters at start of data
66
-		 * section. The protection domain creator is reponsible for storing
67
-		 * sane values here.
68
-		 */
69
-		_parent_cap = .;
70
-		_parent_cap_thread_id = .;
71
-		LONG(0xffffffff);
72
-		_parent_cap_local_name = .;
73
-		LONG(0xffffffff);
74
-		LONG(0xffffffff);
75
-		LONG(0xffffffff);
76
-		LONG(0xffffffff);
77
-		LONG(0xffffffff);
78
-		LONG(0xffffffff);
79
-		LONG(0xffffffff);
80
-
81
-		/*
82
-		 * Platform-specific entry for Fiasco.OC.
83
-		 *
84
-		 * PIC-code compiled for Fiasco.OC, needs some PIC-compatible
85
-		 * way to enter the kernel, the fixed address of the kernel
86
-		 * entry code address needs to be found here.
87
-		 */
88
-		__l4sys_invoke_indirect = .;
89
-		LONG(0xeacff000);
90
-
91
-		*(.data .gnu.linkonce.d.*)
92
-
93
-		/* include all data subsections except those of the boot modules */
94
-		*(EXCLUDE_FILE (*boot_modules.o) .data.*)
95
-	} : rw
96
-
97
-	/* exception frames for C++ */
98
-	.eh_frame : {
99
-		__eh_frame_start__ = .;
100
-		__eh_frame_start = .;
101
-		KEEP (*(.eh_frame))
102
-		__eh_frame_end = .;
103
-		LONG(0)
104
-	} : rw
105
-
106
-	.gcc_except_table : {
107
-		KEEP(*(.gcc_except_table))
108
-		KEEP(*(.gcc_except_table.*))
109
-	}
110
-
111
-	.dynamic :  { *(.dynamic) }
112
-
113
-	/* .ARM.exidx is sorted, so has to go in its own output section */
114
-	__exidx_start = .;
115
-	.ARM.exidx : {
116
-		*(.ARM.exidx* .gnu.linkonce.armexidx.*)
117
-	}
118
-	__exidx_end = .;
119
-
120
-	.ARM.extab : {
121
-		*(.ARM.extab*)
122
-	} : rw
123
-
124
-	.bss : {
125
-		_bss_start = ALIGN(4);
126
-		*(.bss .bss.* .gnu.linkonce.b.* COMMON)
127
-	}
128
-	_bss_end = ALIGN(4);
129
-
130
-	/* separate location for the binaries of the boot modules */
131
-	.data.boot_modules_binaries : { *(.data.boot_modules_binaries) } : boot
132
-
133
-	/* end of program image -- must be after last section */
134
-	_prog_img_end = .;
135
-
136
-	/DISCARD/ : {
137
-		*(.note)
138
-		*(.note.ABI-tag)
139
-		*(.comment)
140
-	}
141
-}

+ 0
- 6
lib/nova-bss.ld View File

@@ -1,6 +0,0 @@
1
-SECTIONS
2
-{
3
-	.data : {
4
-		*(.bss .bss.* .gnu.linkonce.b.* COMMON)
5
-	} : rw
6
-}

+ 0
- 5
lib/nova-isolinux.cfg View File

@@ -1,5 +0,0 @@
1
-SERIAL
2
-DEFAULT 0
3
-LABEL 0
4
-	KERNEL mboot.c32
5
-	APPEND /hypervisor iommu novpid serial --- /image.elf

+ 0
- 10
tests/common-test-driver.exp View File

@@ -1,10 +0,0 @@
1
-#!/usr/bin/env expect
2
-
3
-proc collect_modules {arg} {
4
-	global modules
5
-	foreach path [glob $arg] {
6
-		set name [file tail $path]
7
-		file link -s $name $path
8
-		append modules " $name "
9
-	}
10
-}

+ 5
- 7
tests/default.nix View File

@@ -7,23 +7,21 @@ let
7 7
       signal = call ./signal.nix { };
8 8
     } // call ./solo5 { };
9 9
 
10
-in { self, system, localSystem, crossSystem, genodepkgs, nixpkgs, dhall-haskell, genode-depot, lib }:
10
+in { self, apps, system, localSystem, crossSystem, genodepkgs, nixpkgs
11
+, genode-depot, lib }:
11 12
 
12 13
 let
13
-  hostPkgs = import nixpkgs {
14
-    system = localSystem;
15
-    overlays = [ (self: super: { inherit (dhall-haskell.packages) dhall; }) ];
16
-  };
14
+  hostPkgs = import nixpkgs { system = localSystem; };
17 15
   depot = builtins.getAttr crossSystem genode-depot.packages;
18 16
   testPkgs = genodepkgs;
19 17
 
20 18
   linux = tests (import ./driver-linux.nix {
21
-    inherit testPkgs hostPkgs lib depot;
19
+    inherit apps testPkgs hostPkgs lib depot;
22 20
   }).callTest;
23 21
 
24 22
   nova = (call: ((tests call) // { pci = call ./pci.nix { }; }))
25 23
     (import ./driver-nova.nix {
26
-      inherit system testPkgs hostPkgs lib depot;
24
+      inherit apps system testPkgs hostPkgs lib depot;
27 25
     }).callTest;
28 26
 
29 27
   testsToList = tests:

+ 0
- 26
tests/driver-config.dhall View File

@@ -1,27 +0,0 @@
1
-
2
-let Genode =
3
-        env:DHALL_GENODE
4
-      ? https://git.sr.ht/~ehmry/dhall-genode/blob/master/package.dhall
5
-
6
-in    λ(testInit : Genode.Init.Type)
7
-    → Genode.Init::{
8
-      , verbose = True
9
-      , defaultRoutes =
10
-            Genode.Init.default.defaultRoutes
11
-          # [ Genode.ServiceRoute.parent "IO_MEM"
12
-            , Genode.ServiceRoute.parent "IO_PORT"
13
-            , Genode.ServiceRoute.parent "IRQ"
14
-            , Genode.ServiceRoute.child "Timer" "timer"
15
-            ]
16
-      , children =
17
-          toMap
18
-            { timer =
19
-                Genode.Init.Start::{
20
-                , binary = "timer"
21
-                , resources = { caps = 96, ram = Genode.units.MiB 1 }
22
-                , provides = [ "Timer" ]
23
-                }
24
-            , init = Genode.Init.toStart testInit
25
-            }
26
-      }

+ 0
- 39
tests/driver-config.xml View File

@@ -1,39 +0,0 @@
1
-<?xml version="1.0"?>
2
-<config prio_levels="2">
3
-  <parent-provides>
4
-    <service name="ROM"/>
5
-    <service name="IRQ"/>
6
-    <service name="IO_MEM"/>
7
-    <service name="IO_PORT"/>
8
-    <service name="PD"/>
9
-    <service name="RM"/>
10
-    <service name="CPU"/>
11
-    <service name="LOG"/>
12
-    <service name="TRACE"/>
13
-  </parent-provides>
14
-  <default-route>
15
-    <any-service>
16
-      <parent/>
17
-      <any-child/>
18
-    </any-service>
19
-  </default-route>
20
-  <start name="timer" caps="96">
21
-    <resource name="RAM" quantum="1M"/>
22
-    <provides>
23
-      <service name="Timer"/>
24
-    </provides>
25
-  </start>
26
-  <start name="init" caps="8000" priority="-1">
27
-    <resource name="RAM" quantum="286M"/>
28
-    <exit propagate="yes"/>
29
-    <route>
30
-      <service name="ROM" label="config">
31
-        <parent label="testConfig"/>
32
-      </service>
33
-      <any-service>
34
-        <parent/>
35
-        <any-child/>
36
-      </any-service>
37
-    </route>
38
-  </start>
39
-</config>

+ 41
- 0
tests/driver-linux-config.dhall View File

@@ -0,0 +1,41 @@
1
+-- SPDX-License-Identifier: CC0-1.0
2
+
3
+let Genode = env:DHALL_GENODE
4
+
5
+let baseLinux = env:BASE_LINUX_MANIFEST
6
+
7
+let os = env:OS_MANIFEST
8
+
9
+let Args =
10
+        { config : Genode.Init.Type, rom : Genode.Prelude.Map.Type Text Text }
11
+      : Type
12
+
13
+in    λ(args : Args)
14
+    → { config =
15
+          Genode.Init::{
16
+          , verbose = True
17
+          , defaultRoutes =
18
+                Genode.Init.default.defaultRoutes
19
+              # [ Genode.ServiceRoute.child "Timer" "timer" ]
20
+          , children =
21
+              [ { mapKey = "timer"
22
+                , mapValue =
23
+                    Genode.Init.Start::{
24
+                    , binary = "linux_timer_drv"
25
+                    , resources = { caps = 96, ram = Genode.units.MiB 1 }
26
+                    , provides = [ "Timer" ]
27
+                    }
28
+                }
29
+              , { mapKey = "init", mapValue = Genode.Init.toStart args.config }
30
+              ]
31
+          }
32
+      , rom =
33
+            [ { mapKey = "ld.lib.so"
34
+              , mapValue = baseLinux.bin.ld-linux.mapValue
35
+              }
36
+            , baseLinux.bin.linux_timer_drv
37
+            , os.bin.init
38
+            , baseLinux.bin.core-linux
39
+            ]
40
+          # args.rom
41
+      }

+ 51
- 28
tests/driver-linux.nix View File

@@ -1,6 +1,6 @@
1 1
 # SPDX-License-Identifier: CC0-1.0
2 2
 
3
-{ testPkgs, hostPkgs, lib, depot }:
3
+{ apps, testPkgs, hostPkgs, lib, depot }:
4 4
 
5 5
 let
6 6
   testDriver = with hostPkgs;
@@ -21,7 +21,7 @@ let
21 21
 
22 22
   runTests = driver:
23 23
     hostPkgs.stdenv.mkDerivation {
24
-      name = "linux-"+driver.testName;
24
+      name = "linux-" + driver.testName;
25 25
       preferLocalBuild = true;
26 26
 
27 27
       buildCommand = ''
@@ -34,26 +34,43 @@ let
34 34
       '';
35 35
     };
36 36
 
37
-  mkTest = { name ? "unamed", testScript, testConfig, bootModules, ... }@t:
37
+  mkTest = { name ? "unamed", testScript, testConfig, env ? { }, ... }:
38 38
     with testPkgs;
39 39
     let
40
-      bootModules' = with testPkgs.genode; {
41
-        inherit testConfig;
42
-        config = ./driver-config.xml;
43
-        core = "${base-linux}/bin/core-linux";
44
-        init = "${os}/bin/init";
45
-        "ld.lib.so" = "${base-linux}/bin/ld-linux.lib.so";
46
-        timer = "${base-linux}/bin/linux_timer_drv";
47
-      } // bootModules;
48
-
49
-      baseSetup = with builtins;
50
-        lib.concatStrings (map (name: ''
51
-          file link -s ${name} ${getAttr name bootModules'}
52
-        '') (attrNames bootModules'))
53
-
54
-        + ''
55
-          source ${./common-test-driver.exp}
56
-        '';
40
+      env' = {
41
+        DHALL_PRELUDE = "${testPkgs.dhallPrelude}/package.dhall";
42
+        DHALL_GENODE = "${testPkgs.dhallGenode}/package.dhall";
43
+        BASE_LINUX_MANIFEST = testPkgs.genode.base-linux.manifest;
44
+        OS_MANIFEST = testPkgs.genode.os.manifest;
45
+      } // env;
46
+
47
+      toExports = env:
48
+        with builtins;
49
+        let
50
+          keys = attrNames env;
51
+          f = key: ''set env(${key}) "${getAttr key env}"'';
52
+          exports = map f keys;
53
+        in concatStringsSep "\n" exports;
54
+
55
+      baseSetup = ''
56
+        ${toExports env'}
57
+
58
+        proc run_genode_until {{wait_for_re forever} {timeout_value 0} {running_spawn_id -1}} {
59
+        	#
60
+        	# If a running_spawn_id is specified, wait for the expected output
61
+        	#
62
+        	if {$running_spawn_id != -1} {
63
+        		wait_for_output $wait_for_re $timeout_value $running_spawn_id
64
+        		return
65
+        	}
66
+
67
+        	global image_dir spawn_id
68
+
69
+        	spawn ${apps.linux-boot.program} \
70
+        		${./driver-linux-config.dhall} ${testConfig}
71
+        	wait_for_output $wait_for_re $timeout_value $spawn_id
72
+        }
73
+      '';
57 74
 
58 75
       driver = with hostPkgs;
59 76
         runCommand "genode-test-driver-${name}" {
@@ -63,23 +80,29 @@ let
63 80
           testName = name;
64 81
         } ''
65 82
           mkdir -p $out/bin
66
-          echo "$testConfig" > $out/test.config
67 83
           echo "$testScript" > $out/test-script
68 84
           echo "$baseSetup" > $out/base-setup
69 85
           ln -s ${testDriver}/bin/genode-test-driver $out/bin/
70 86
           wrapProgram $out/bin/genode-test-driver \
71
-            --run "export testConfig=\"$testConfig\"" \
72 87
             --run "export testScript=\"\$(cat $out/test-script)\"" \
73 88
             --run "export baseSetup=\"\$(cat $out/base-setup)\"" \
74 89
         '';
75 90
 
76
-      passMeta = drv:
77
-        drv
78
-        // lib.optionalAttrs (t ? meta) { meta = (drv.meta or { }) // t.meta; };
79
-
80
-      test = passMeta (runTests driver);
91
+      test = runTests driver;
81 92
 
82
-    in test // { inherit driver test; };
93
+    in test // {
94
+      inherit driver test;
95
+      config = hostPkgs.runCommand (name + ".dhall") env' ''
96
+        ${apps.dhall.program} <<< "(${
97
+          ./driver-linux-config.dhall
98
+        } ${testConfig})" > $out
99
+      '';
100
+      xml = hostPkgs.runCommand (name + ".config") env' ''
101
+        ${apps.render-init.program} "(${
102
+          ./driver-linux-config.dhall
103
+        } ${testConfig}).config" > $out
104
+      '';
105
+    };
83 106
 
84 107
 in {
85 108
   callTest = path: args:

+ 43
- 0
tests/driver-nova-config.dhall View File

@@ -0,0 +1,43 @@
1
+-- SPDX-License-Identifier: CC0-1.0
2
+
3
+let Genode = env:DHALL_GENODE
4
+
5
+let baseNova = env:BASE_NOVA_MANIFEST
6
+
7
+let os = env:OS_MANIFEST
8
+
9
+let Args =
10
+        { config : Genode.Init.Type, rom : Genode.Prelude.Map.Type Text Text }
11
+      : Type
12
+
13
+in    λ(args : Args)
14
+    → { arch = let Arch = < x86_32 | x86_64 > in Arch.x86_64
15
+      , config =
16
+          Genode.Init::{
17
+          , verbose = True
18
+          , defaultRoutes =
19
+                Genode.Init.default.defaultRoutes
20
+              # [ Genode.ServiceRoute.parent "IO_MEM"
21
+                , Genode.ServiceRoute.parent "IO_PORT"
22
+                , Genode.ServiceRoute.parent "IRQ"
23
+                , Genode.ServiceRoute.child "Timer" "timer"
24
+                ]
25
+          , children =
26
+              [ { mapKey = "timer"
27
+                , mapValue =
28
+                    Genode.Init.Start::{
29
+                    , binary = "nova_timer_drv"
30
+                    , resources = { caps = 96, ram = Genode.units.MiB 1 }
31
+                    , provides = [ "Timer" ]
32
+                    }
33
+                }
34
+              , { mapKey = "init", mapValue = Genode.Init.toStart args.config }
35
+              ]
36
+          }
37
+      , rom =
38
+            [ { mapKey = "ld.lib.so", mapValue = baseNova.lib.ld-nova.mapValue }
39
+            , baseNova.bin.nova_timer_drv
40
+            , os.bin.init
41
+            ]
42
+          # args.rom
43
+      }

+ 26
- 18
tests/driver-nova.nix View File

@@ -1,6 +1,6 @@
1 1
 # SPDX-License-Identifier: CC0-1.0
2 2
 
3
-{ system, testPkgs, hostPkgs, lib, depot }:
3
+{ system, apps, testPkgs, hostPkgs, lib, depot }:
4 4
 
5 5
 let
6 6
   testDriver = with hostPkgs;
@@ -34,19 +34,19 @@ let
34 34
       '';
35 35
     };
36 36
 
37
-  mkTest = { name ? "unamed", testScript, testConfig, bootModules, qemuMem ? 32
38
-    , ... }@t:
37
+  mkTest = { name ? "unamed", testScript, testConfig, env ? { }, qemuMem ? 32
38
+    , ... # TODO: remove ...
39
+    }@t:
39 40
     let
40
-      bootModules' = (with testPkgs;
41
-        {
42
-          inherit testConfig;
43
-          config = ./driver-config.xml;
44
-        } // bootModules);
45
-
46
-      iso = lib.buildNovaIso {
47
-        inherit name;
48
-        rom = bootModules';
49
-      };
41
+      env' = {
42
+        DHALL_PRELUDE = "${testPkgs.dhallPrelude}/package.dhall";
43
+        DHALL_GENODE = "${testPkgs.dhallGenode}/package.dhall";
44
+        BASE_NOVA_MANIFEST = testPkgs.genode.base-nova.manifest;
45
+        OS_MANIFEST = testPkgs.genode.os.manifest;
46
+      } // env;
47
+
48
+      iso = apps.nova-iso.function env'
49
+        "${./driver-nova-config.dhall} ${testConfig}";
50 50
 
51 51
       baseSetup = ''
52 52
         ##
@@ -86,7 +86,10 @@ let
86 86
           }
87 87
 
88 88
           global spawn_id
89
-          spawn ${iso}/bin/boot-qemu -nographic -m size=${toString qemuMem}
89
+          spawn ${hostPkgs.qemu_test}/bin/qemu-system-x86_64 \
90
+            -machine q35 -serial mon:stdio -nographic \
91
+            -m size=${toString qemuMem} \
92
+            -cdrom ${iso}
90 93
           wait_for_output $wait_for_re $timeout_value $spawn_id
91 94
         }
92 95
 
@@ -107,12 +110,10 @@ let
107 110
           testName = name;
108 111
         } ''
109 112
           mkdir -p $out/bin
110
-          echo "$testConfig" > $out/test.config
111 113
           echo "$testScript" > $out/test-script
112 114
           echo "$baseSetup" > $out/base-setup
113 115
           ln -s ${testDriver}/bin/genode-test-driver $out/bin/
114 116
           wrapProgram $out/bin/genode-test-driver \
115
-            --run "export testConfig=\"$testConfig\"" \
116 117
             --run "export testScript=\"\$(cat $out/test-script)\"" \
117 118
             --run "export baseSetup=\"\$(cat $out/base-setup)\"" \
118 119
         '';
@@ -125,8 +126,15 @@ let
125 126
 
126 127
     in test // {
127 128
       inherit driver iso test;
128
-      config = testConfig;
129
-      rom = bootModules';
129
+      config = hostPkgs.runCommand (name + ".dhall") env' ''
130
+        ${apps.dhall.program} <<< "(${
131
+          ./driver-nova-config.dhall
132
+        } ${testConfig})" > $out
133
+      '';
134
+      xml = hostPkgs.runCommand (name + ".config") env' ''
135
+        ${apps.render-init.program} "(${
136
+          ./driver-nova-config.dhall
137
+        } ${testConfig}).config" > $out'';
130 138
     };
131 139
 
132 140
 in {

+ 91
- 0
tests/fs_report.dhall View File

@@ -0,0 +1,91 @@
1
+-- SPDX-License-Identifier: CC0-1.0
2
+
3
+let Genode = env:DHALL_GENODE
4
+
5
+let os = env:OS_MANIFEST
6
+
7
+in  { config =
8
+        Genode.Init::{
9
+        , verbose = True
10
+        , children =
11
+            toMap
12
+              { ram_fs =
13
+                  Genode.Init.Start::{
14
+                  , binary = "ram_fs"
15
+                  , resources = { caps = 96, ram = Genode.units.MiB 4 }
16
+                  , provides = [ "File_system" ]
17
+                  , config =
18
+                      Some
19
+                        ( Genode.Prelude.XML.text
20
+                            ''
21
+                            <config>
22
+                            	<content>
23
+                            		<dir name="test-fs_report">
24
+                            			<inline name="devices">
25
+                            				<devices version="initial"/>
26
+                            			</inline>
27
+                            		</dir>
28
+                            	</content>
29
+                            	<policy label_prefix="fs_report -> " root="/" writeable="yes"/>
30
+                            	<policy label_prefix="fs_rom -> "    root="/test-fs_report"/>
31
+                            	<policy label_prefix="test-fs_report -> " root="/test-fs_report" writeable="yes"/>
32
+                            </config>
33
+                            ''
34
+                        )
35
+                  }
36
+              , fs_report =
37
+                  Genode.Init.Start::{
38
+                  , binary = "fs_report"
39
+                  , resources = { caps = 96, ram = Genode.units.MiB 4 }
40
+                  , provides = [ "Report" ]
41
+                  , routes = [ Genode.ServiceRoute.child "File_system" "ram_fs" ]
42
+                  , config =
43
+                      Some
44
+                        ( Genode.Prelude.XML.text
45
+                            "<config> <vfs> <fs/> </vfs> </config>"
46
+                        )
47
+                  }
48
+              , fs_rom =
49
+                  Genode.Init.Start::{
50
+                  , binary = "fs_rom"
51
+                  , resources = { caps = 96, ram = Genode.units.MiB 4 }
52
+                  , provides = [ "ROM" ]
53
+                  , routes = [ Genode.ServiceRoute.child "File_system" "ram_fs" ]
54
+                  }
55
+              , test-fs_report =
56
+                  Genode.Init.Start::{
57
+                  , binary = "test-fs_report"
58
+                  , resources = { caps = 96, ram = Genode.units.MiB 4 }
59
+                  , provides = [ "Report" ]
60
+                  , config =
61
+                      Some
62
+                        ( Genode.Prelude.XML.text
63
+                            "<config> <vfs> <fs/> </vfs> </config>"
64
+                        )
65
+                  , routes =
66
+                      [ Genode.ServiceRoute.childLabel
67
+                          "ROM"
68
+                          "fs_rom"
69
+                          (Some "devices")
70
+                          (None Text)
71
+                      , Genode.ServiceRoute.childLabel
72
+                          "ROM"
73
+                          "fs_rom"
74
+                          (Some "focus")
75
+                          (None Text)
76
+                      , Genode.ServiceRoute.child
77
+                          "Report"
78
+                          "fs_report"
79
+                      , Genode.ServiceRoute.parent "Timer"
80
+                      ]
81
+                  }
82
+              }
83
+        }
84
+    , rom =
85
+        [ os.bin.fs_report
86
+        , os.bin.fs_rom
87
+        , os.bin.ram_fs
88
+        , os.bin.test-fs_report
89
+        , os.lib.vfs
90
+        ]
91
+    }

+ 1
- 9
tests/fs_report.nix View File

@@ -7,15 +7,7 @@ testEnv.mkTest {
7 7
   name = "fs_report";
8 8
   meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ehmry ];
9 9
 
10
-  testConfig = ./fs_report.xml;
11
-
12
-  bootModules = {
13
-    fs_report = "${genode.os}/bin/fs_report";
14
-    fs_rom = "${genode.os}/bin/fs_rom";
15
-    ram_fs = "${genode.os}/bin/ram_fs";
16
-    test-fs_report = "${genode.os}/bin/test-fs_report";
17
-    "vfs.lib.so" = "${genode.os}/lib/vfs.lib.so";
18
-  };
10
+  testConfig = ./fs_report.dhall;
19 11
 
20 12
   testScript = ''
21 13
     run_genode_until {child "test-fs_report" exited with exit value 0} 15

+ 0
- 57
tests/fs_report.xml View File

@@ -1,57 +0,0 @@
1
-	<config>
2
-		<parent-provides>
3
-			<service name="CPU"/>
4
-			<service name="LOG"/>
5
-			<service name="PD"/>
6
-			<service name="ROM"/>
7
-			<service name="Timer"/>
8
-		</parent-provides>
9
-
10
-		<default-route>
11
-			<any-service> <parent/> <any-child/> </any-service>
12
-		</default-route>
13
-
14
-		<default caps="100"/>
15
-
16
-		<start name="ram_fs">
17
-			<resource name="RAM" quantum="4M"/>
18
-			<provides> <service name="File_system"/> </provides>
19
-			<config>
20
-				<content>
21
-					<dir name="test-fs_report">
22
-						<inline name="devices">
23
-							<devices version="initial"/>
24
-						</inline>
25
-					</dir>
26
-				</content>
27
-				<policy label_prefix="fs_report -> " root="/" writeable="yes"/>
28
-				<policy label_prefix="fs_rom -> "    root="/test-fs_report"/>
29
-				<policy label_prefix="test-fs_report -> " root="/test-fs_report" writeable="yes"/>
30
-			</config>
31
-		</start>
32
-		<!--
33
-		  All reports sent by 'test-fs_report' are prefixed with the label of the
34
-		  component. Hence, they are written to the 'test-fs_report/' subdirectory.
35
-		  -->
36
-		<start name="fs_report">
37
-			<resource name="RAM" quantum="4M"/>
38
-			<provides> <service name="Report"/> </provides>
39
-			<config> <vfs> <fs/> </vfs> </config>
40
-		</start>
41
-		<start name="fs_rom">
42
-			<resource name="RAM" quantum="4M"/>
43
-			<provides> <service name="ROM"/> </provides>
44
-			<config/>
45
-		</start>
46
-		<start name="test-fs_report">
47
-			<resource name="RAM" quantum="4M"/>
48
-			<config> <vfs> <fs/> </vfs> </config>
49
-			<route>
50
-				<service name="ROM"    label="devices"> <child name="fs_rom"/> </service>
51
-				<service name="ROM"    label="focus">   <child name="fs_rom"/> </service>
52
-				<service name="Report" label="devices"> <child name="fs_report"/> </service>
53
-				<service name="Report" label="focus">   <child name="fs_report"/> </service>
54
-				<any-service> <parent/> <any-child/> </any-service>
55
-			</route>
56
-		</start>
57
-	</config>

+ 79
- 72
tests/pci.dhall View File

@@ -2,75 +2,82 @@
2 2
 
3 3
 let Genode = env:DHALL_GENODE
4 4
 
5
-in    λ ( _
6
-        : {}
7
-        )
8
-    → Genode.Init::{
9
-      , verbose = True
10
-      , children =
11
-          toMap
12
-            { test-pci =
13
-                Genode.Init.Start::{
14
-                , binary = "test-pci"
15
-                , resources = { caps = 96, ram = Genode.units.MiB 2 }
16
-                , routes =
17
-                    [ Genode.ServiceRoute.child "Platform" "platform_drv" ]
18
-                }
19
-            , acpi_report_rom =
20
-                Genode.Init.Start::{
21
-                , binary = "report_rom"
22
-                , resources = { caps = 96, ram = Genode.units.MiB 2 }
23
-                , provides = [ "ROM", "Report" ]
24
-                , config =
25
-                    Some
26
-                      ( Genode.Prelude.XML.text
27
-                          ''
28
-                          <config system="yes">
29
-                          	<policy label="smbios_decoder -> smbios_table" report="acpi_drv -> smbios_table"/>
30
-                          	<policy label="platform_drv -> acpi"           report="acpi_drv -> acpi"/>
31
-                          </config>
32
-                          ''
33
-                      )
34
-                }
35
-            , acpi_drv =
36
-                Genode.Init.Start::{
37
-                , binary = "acpi_drv"
38
-                , resources = { caps = 400, ram = Genode.units.MiB 4 }
39
-                , constrainPhys = True
40
-                , provides = [ "Platform", "Acpi" ]
41
-                , routes =
42
-                    [ Genode.ServiceRoute.child "Report" "acpi_report_rom"
43
-                    , Genode.ServiceRoute.parent "IRQ"
44
-                    , Genode.ServiceRoute.parent "IO_MEM"
45
-                    , Genode.ServiceRoute.parent "IO_PORT"
46
-                    ]
47
-                }
48
-            , platform_drv =
49
-                Genode.Init.Start::{
50
-                , binary = "platform_drv"
51
-                , resources = { caps = 800, ram = Genode.units.MiB 4 }
52
-                , constrainPhys = True
53
-                , provides = [ "Platform", "Acpi" ]
54
-                , routes =
55
-                    [ Genode.ServiceRoute.parent "Timer"
56
-                    , Genode.ServiceRoute.parent "IRQ"
57
-                    , Genode.ServiceRoute.parent "IO_MEM"
58
-                    , Genode.ServiceRoute.parent "IO_PORT"
59
-                    , Genode.ServiceRoute.childLabel
60
-                        "ROM"
61
-                        "acpi_report_rom"
62
-                        (Some "acpi")
63
-                        (None Text)
64
-                    ]
65
-                , config =
66
-                    Some
67
-                      ( Genode.Prelude.XML.text
68
-                          ''
69
-                          <config>
70
-                          	<policy label_prefix="test-pci"> <pci class="ALL"/> </policy>
71
-                          </config>
72
-                          ''
73
-                      )
74
-                }
75
-            }
76
-      }
5
+let os = env:OS_MANIFEST
6
+
7
+in  { config =
8
+        Genode.Init::{
9
+        , verbose = True
10
+        , children =
11
+            toMap
12
+              { test-pci =
13
+                  Genode.Init.Start::{
14
+                  , binary = "test-pci"
15
+                  , resources = { caps = 96, ram = Genode.units.MiB 2 }
16
+                  , routes =
17
+                      [ Genode.ServiceRoute.child "Platform" "platform_drv" ]
18
+                  }
19
+              , acpi_report_rom =
20
+                  Genode.Init.Start::{
21
+                  , binary = "report_rom"
22
+                  , resources = { caps = 96, ram = Genode.units.MiB 2 }
23
+                  , provides = [ "ROM", "Report" ]
24
+                  , config =
25
+                      Some
26
+                        ( Genode.Prelude.XML.text
27
+                            ''
28
+                            <config system="yes">
29
+                            	<policy label="smbios_decoder -> smbios_table" report="acpi_drv -> smbios_table"/>
30
+                            	<policy label="platform_drv -> acpi"           report="acpi_drv -> acpi"/>
31
+                            </config>
32
+                            ''
33
+                        )
34
+                  }
35
+              , acpi_drv =
36
+                  Genode.Init.Start::{
37
+                  , binary = "acpi_drv"
38
+                  , resources = { caps = 400, ram = Genode.units.MiB 4 }
39
+                  , constrainPhys = True
40
+                  , provides = [ "Platform", "Acpi" ]
41
+                  , routes =
42
+                      [ Genode.ServiceRoute.child "Report" "acpi_report_rom"
43
+                      , Genode.ServiceRoute.parent "IRQ"
44
+                      , Genode.ServiceRoute.parent "IO_MEM"
45
+                      , Genode.ServiceRoute.parent "IO_PORT"
46
+                      ]
47
+                  }
48
+              , platform_drv =
49
+                  Genode.Init.Start::{
50
+                  , binary = "platform_drv"
51
+                  , resources = { caps = 800, ram = Genode.units.MiB 4 }
52
+                  , constrainPhys = True
53
+                  , provides = [ "Platform", "Acpi" ]
54
+                  , routes =
55
+                      [ Genode.ServiceRoute.parent "Timer"
56
+                      , Genode.ServiceRoute.parent "IRQ"
57
+                      , Genode.ServiceRoute.parent "IO_MEM"
58
+                      , Genode.ServiceRoute.parent "IO_PORT"
59
+                      , Genode.ServiceRoute.childLabel
60
+                          "ROM"
61
+                          "acpi_report_rom"
62
+                          (Some "acpi")
63
+                          (None Text)
64
+                      ]
65
+                  , config =
66
+                      Some
67
+                        ( Genode.Prelude.XML.text
68
+                            ''
69
+                            <config>
70
+                            	<policy label_prefix="test-pci"> <pci class="ALL"/> </policy>
71
+                            </config>
72
+                            ''
73
+                        )
74
+                  }
75
+              }
76
+        }
77
+    , rom =
78
+        [ os.bin.acpi_drv
79
+        , os.bin.platform_drv
80
+        , os.bin.report_rom
81
+        , os.bin.test-pci
82
+        ]
83
+    }

+ 1
- 8
tests/pci.nix View File

@@ -7,14 +7,7 @@ testEnv.mkTest {
7 7
   name = "pci";
8 8
   meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ehmry ];
9 9
 
10
-  testConfig = testEnv.lib.renderDhallInit ./pci.dhall "{=}";
11
-
12
-  bootModules = {
13
-    acpi_drv = "${genode.os}/bin/acpi_drv";
14
-    platform_drv = "${genode.os}/bin/platform_drv";
15
-    report_rom = "${genode.os}/bin/report_rom";
16
-    test-pci = "${genode.os}/bin/test-pci";
17
-  };
10
+  testConfig = ./pci.dhall;
18 11
 
19 12
   testScript = ''
20 13
     run_genode_until "--- Platform test finished ---.*\n" 60

+ 13
- 10
tests/signal.dhall View File

@@ -1,18 +1,21 @@
1 1
 -- SPDX-License-Identifier: CC0-1.0
2 2
 
3
-let Genode = env:DHALL_GENODE ? ../dhall-genode/package.dhall
3
+let Genode = env:DHALL_GENODE
4 4
 
5
-in    λ(_ : {})
6
-    → Genode.Init::{
7
-      , verbose = True
8
-      , children =
9
-          toMap
10
-            { test-signal =
5
+let os = env:OS_MANIFEST
6
+
7
+in  { config =
8
+        Genode.Init::{
9
+        , verbose = True
10
+        , children =
11
+            toMap
12
+              { test-signal =
11 13
                   Genode.Init.Start::{
12 14
                   , binary = "test-signal"
13 15
                   , resources = { caps = 500, ram = Genode.units.MiB 10 }
14 16
                   , routes = [ Genode.ServiceRoute.parent "Timer" ]
15 17
                   }
16
-                : Genode.Init.Start.Type
17
-            }
18
-      }
18
+              }
19
+        }
20
+    , rom = [ os.bin.test-signal ]
21
+    }

+ 1
- 3
tests/signal.nix View File

@@ -7,9 +7,7 @@ testEnv.mkTest rec {
7 7
   name = "signal";
8 8
   meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ehmry ];
9 9
 
10
-  testConfig = testEnv.lib.renderDhallInit ./signal.dhall "{=}";
11
-
12
-  bootModules.test-signal = "${genode.os}/bin/test-signal";
10
+  testConfig = ./signal.dhall;
13 11
 
14 12
   testScript = "run_genode_until {--- Signalling test finished ---} 120";
15 13
 }

+ 34
- 28
tests/solo5/blk.dhall View File

@@ -2,31 +2,37 @@
2 2
 
3 3
 let Genode = env:DHALL_GENODE
4 4
 
5
-in    λ(_ : {})
6
-    → Genode.Init::{
7
-      , children =
8
-          toMap
9
-            { solo5 =
10
-                Genode.Init.Start::{
11
-                , binary = "test"
12
-                , resources = { caps = 256, ram = Genode.units.MiB 3 }
13
-                , routes =
14
-                    [ Genode.ServiceRoute.parent "Timer"
15
-                    , Genode.ServiceRoute.child "Block" "block"
16
-                    ]
17
-                }
18
-            , block =
19
-                Genode.Init.Start::{
20
-                , binary = "ram_block"
21
-                , provides = [ "Block" ]
22
-                , resources = { caps = 96, ram = Genode.units.MiB 9 }
23
-                , config =
24
-                    Some
25
-                      ( Genode.Prelude.XML.text
26
-                          ''
27
-                            <config size="8M" block_size="4096"/>
28
-                          ''
29
-                      )
30
-                }
31
-            }
32
-      }
5
+let os = env:OS_MANIFEST
6
+
7
+let tests = env:SOLO5_TEST_MANIFEST
8
+
9
+in  { config =
10
+        Genode.Init::{
11
+        , children =
12
+            toMap
13
+              { solo5 =
14
+                  Genode.Init.Start::{
15
+                  , binary = "solo5-test_blk"
16
+                  , resources = { caps = 256, ram = Genode.units.MiB 3 }
17
+                  , routes =
18
+                      [ Genode.ServiceRoute.parent "Timer"
19
+                      , Genode.ServiceRoute.child "Block" "block"
20
+                      ]
21
+                  }
22
+              , block =
23
+                  Genode.Init.Start::{
24
+                  , binary = "ram_block"
25
+                  , provides = [ "Block" ]
26
+                  , resources = { caps = 96, ram = Genode.units.MiB 9 }
27
+                  , config =
28
+                      Some
29
+                        ( Genode.Prelude.XML.text
30
+                            ''
31
+                              <config size="8M" block_size="4096"/>
32
+                            ''
33
+                        )
34
+                  }
35
+              }
36
+        }
37
+    , rom = [ tests.bin.solo5-test_blk, os.bin.ram_block ]
38
+    }

+ 12
- 0
tests/solo5/boot-wrapper.dhall View File

@@ -0,0 +1,12 @@
1
+-- SPDX-License-Identifier: CC0-1.0
2
+
3
+let Genode = env:DHALL_GENODE
4
+
5
+let solo5 = env:SOLO5_MANIFEST
6
+
7
+let Args =
8
+        { config : Genode.Init.Type, rom : Genode.Prelude.Map.Type Text Text }
9
+      : Type
10
+
11
+in    λ(boot : Args)
12
+    → { config = boot.config, rom = boot.rom # [ solo5.lib.solo5 ] }

+ 19
- 91
tests/solo5/default.nix View File

@@ -8,14 +8,16 @@ let
8 8
     run_genode_until {child "solo5" exited with exit value 0} 30
9 9
   '';
10 10
 
11
-  mkTest' = { name, bootModules, testScript ? defaultScript, ... }@attrs:
11
+  mkTest' = { name, testConfig, testScript ? defaultScript, ... }@attrs:
12 12
     testEnv.mkTest (attrs // {
13 13
       name = "solo5-" + name;
14 14
       inherit testScript;
15
-      bootModules = {
16
-        "solo5.lib.so" = "${solo5}/lib/solo5-bindings-genode/solo5.lib.so";
17
-      } // bootModules;
18
-      meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ehmry ];
15
+      env = {
16
+        SOLO5_MANIFEST = pkgs.solo5.manifest;
17
+        SOLO5_TEST_MANIFEST = pkgs.solo5.tests.manifest;
18
+      };
19
+      testConfig = "(${./boot-wrapper.dhall} ${testConfig})";
20
+      meta = { inherit (pkgs.solo5) maintainers; };
19 21
     });
20 22
 
21 23
   applyMkTest = x: {
@@ -25,67 +27,33 @@ let
25 27
 
26 28
   mkTests = testList: builtins.listToAttrs (map applyMkTest testList);
27 29
 
30
+  toSimple = name:
31
+    "(${./simple.dhall} (env:SOLO5_TEST_MANIFEST).bin.solo5-test_${name})";
32
+
28 33
   tests = [
29 34
     {
30 35
       name = "blk";
31
-      bootModules = {
32
-        test = "${solo5.tests}/bin/solo5-test_blk";
33
-        ram_block = "${genode.os}/bin/ram_block";
34
-      };
35
-      testConfig = testEnv.lib.renderDhallInit ./blk.dhall "{=}";
36
+      testConfig = ./blk.dhall;
36 37
     }
37 38
 
38
-    /* {
39
-         name = "dumpcore";
40
-         bootModules.test = "${solo5.tests}/bin/solo5-test_dumpcore";
41
-         testConfig = testEnv.lib.renderDhallInit ./simple.dhall "{=}";
42
-       }
43
-    */
44
-
45
-    /* {
46
-         name = "exception";
47
-         bootModules.test = "${solo5.tests}/bin/solo5-test_exception";
48
-         testConfig = testEnv.lib.renderDhallInit ./simple.dhall "{=}";
49
-       }
50
-    */
51
-
52 39
     {
53 40
       name = "fpu";
54
-      bootModules.test = "${solo5.tests}/bin/solo5-test_fpu";
55
-      testConfig = testEnv.lib.renderDhallInit ./simple.dhall "{=}";
41
+      testConfig = toSimple "fpu";
56 42
     }
57 43
 
58 44
     {
59 45
       name = "globals";
60
-      bootModules.test = "${solo5.tests}/bin/solo5-test_globals";
61
-      testConfig = testEnv.lib.renderDhallInit ./simple.dhall "{=}";
46
+      testConfig = toSimple "globals";
62 47
     }
63 48
 
64 49
     {
65 50
       name = "hello";
66
-      bootModules.test = "${solo5.tests}/bin/solo5-test_hello";
67
-      testConfig = testEnv.lib.renderDhallInit ./simple.dhall "{=}";
51
+      testConfig = toSimple "hello";
68 52
     }
69 53
 
70
-    /* {
71
-         name = "mft_maxdevices";
72
-         bootModules = {
73
-           test = "${solo5.tests}/bin/solo5-test_mft_maxdevices";
74
-           rom_block = "${genode.os}/bin/rom_block";
75
-         };
76
-         testConfig = testEnv.lib.renderDhallInit ./mft_maxdevices.dhall "{=}";
77
-       }
78
-    */
79
-
80 54
     {
81 55
       name = "net";
82
-      bootModules = {
83
-        test = "${solo5.tests}/bin/solo5-test_net";
84
-        nic_bridge = "${genode.os}/bin/nic_bridge";
85
-        nic_loopback = "${genode.os}/bin/nic_loopback";
86
-        ping = "${genode.os}/bin/ping";
87
-      };
88
-      testConfig = testEnv.lib.renderDhallInit ./net.dhall "{=}";
56
+      testConfig = ./net.dhall;
89 57
       testScript = ''
90 58
         run_genode_until {child "ping" exited with exit value 0} 30
91 59
       '';
@@ -93,69 +61,29 @@ let
93 61
 
94 62
     {
95 63
       name = "net_2if";
96
-      bootModules = {
97
-        test = "${solo5.tests}/bin/solo5-test_net_2if";
98
-        sequence = "${genode.os}/bin/sequence";
99
-        nic_bridge = "${genode.os}/bin/nic_bridge";
100
-        nic_loopback = "${genode.os}/bin/nic_loopback";
101
-        ping = "${genode.os}/bin/ping";
102
-      };
103
-      testConfig = testEnv.lib.renderDhallInit ./net_2if.dhall "{=}";
64
+      testConfig = ./net_2if.dhall;
104 65
       testScript = ''
105 66
         run_genode_until {child "clients" exited with exit value 0} 30
106 67
       '';
107 68
       qemuMem = 64;
108 69
     }
109 70
 
110
-    /* {
111
-         name = "notls";
112
-         bootModules = { test = "${solo5.tests}/bin/solo5-test_notls"; };
113
-         testConfig = testEnv.lib.renderDhallInit ./simple.dhall "{=}";
114
-       }
115
-    */
116
-
117 71
     {
118 72
       name = "quiet";
119
-      bootModules = { test = "${solo5.tests}/bin/solo5-test_quiet"; };
120
-      testConfig = testEnv.lib.renderDhallInit ./simple.dhall "{=}";
73
+      testConfig = toSimple "quiet";
121 74
     }
122 75
 
123 76
     {
124 77
       name = "ssp";
125
-      bootModules = { test = "${solo5.tests}/bin/solo5-test_ssp"; };
126
-      testConfig = testEnv.lib.renderDhallInit ./simple.dhall "{=}";
78
+      testConfig = toSimple "ssp";
127 79
       testScript = ''
128 80
         run_genode_until {Error: stack protector check failed} 30
129 81
       '';
130 82
     }
131 83
 
132
-    /* {
133
-         name = "wnox";
134
-         bootModules = { test = "${solo5.tests}/bin/solo5-test_wnox"; };
135
-         testConfig = testEnv.lib.renderDhallInit ./simple.dhall "{=}";
136
-       }
137
-    */
138
-
139
-    /* {
140
-         name = "xnow";
141
-         bootModules = { test = "${solo5.tests}/bin/solo5-test_xnow"; };
142
-         testConfig = testEnv.lib.renderDhallInit ./simple.dhall "{=}";
143
-       }
144
-    */
145
-
146
-    /* {
147
-         name = "zeropage";
148
-         bootModules = { test = "${solo5.tests}/bin/solo5-test_zeropage"; };
149
-         testConfig = testEnv.lib.renderDhallInit ./simple.dhall "{=}";
150
-       }
151
-    */
152 84
   ] ++ (testEnv.lib.optional (!testEnv.isLinux) {
153 85
     name = "time";
154
-    bootModules = {
155
-      test = "${solo5.tests}/bin/solo5-test_time";
156
-      rtc_drv = "${genode.os}/bin/rtc_drv";
157
-    };
158
-    testConfig = testEnv.lib.renderDhallInit ./time.dhall "{=}";
86
+    testConfig = ./time.dhall;
159 87
   }
160 88
 
161 89
   );

+ 77
- 64
tests/solo5/net.dhall View File

@@ -2,67 +2,80 @@
2 2
 
3 3
 let Genode = env:DHALL_GENODE
4 4
 
5
-in    λ(_ : {})
6
-    → Genode.Init::{
7
-      , children =
8
-          toMap
9
-            { nic =
10
-                Genode.Init.Start::{
11
-                , binary = "nic_loopback"
12
-                , provides = [ "Nic" ]
13
-                }
14
-            , bridge =
15
-                Genode.Init.Start::{
16
-                , binary = "nic_bridge"
17
-                , resources = { caps = 200, ram = Genode.units.MiB 6 }
18
-                , provides = [ "Nic" ]
19
-                , routes = [ Genode.ServiceRoute.child "Nic" "nic" ]
20
-                , config =
21
-                    Some
22
-                      ( Genode.Prelude.XML.text
23
-                          ''
24
-                          <config mac="02:02:02:02:03:00" verbose="no">
25
-                          	<policy label_prefix="solo5" ip_addr="10.0.0.2"/>
26
-                          	<default-policy/>
27
-                          </config>
28
-                          ''
29
-                      )
30
-                }
31
-            , solo5 =
32
-                Genode.Init.Start::{
33
-                , binary = "test"
34
-                , resources = { caps = 256, ram = Genode.units.MiB 3 }
35
-                , routes =
36
-                    [ Genode.ServiceRoute.parent "Timer"
37
-                    , Genode.ServiceRoute.child "Nic" "bridge"
38
-                    ]
39
-                , config =
40
-                    Some
41
-                      ( Genode.Prelude.XML.text
42
-                          ''
43
-                          <config><cmdline>limit</cmdline></config>
44
-                          ''
45
-                      )
46
-                }
47
-            , ping =
48
-                Genode.Init.Start::{
49
-                , binary = "ping"
50
-                , resources = { caps = 128, ram = Genode.units.MiB 6 }
51
-                , routes =
52
-                    [ Genode.ServiceRoute.parent "Timer"
53
-                    , Genode.ServiceRoute.child "Nic" "bridge"
54
-                    ]
55
-                , config =
56
-                    Some
57
-                      ( Genode.Prelude.XML.text
58
-                          ''
59
-                          <config interface="10.0.0.72/24"
60
-                                  dst_ip="10.0.0.2"
61
-                                  period_sec="1"
62
-                                  verbose="no"
63
-                                  count="8"/>
64
-                          ''
65
-                      )
66
-                }
67
-            }
68
-      }
5
+let os = env:OS_MANIFEST
6
+
7
+let tests = env:SOLO5_TEST_MANIFEST
8
+
9
+in  { config =
10
+        Genode.Init::{
11
+        , children =
12
+            toMap
13
+              { nic =
14
+                  Genode.Init.Start::{
15
+                  , binary = "nic_loopback"
16
+                  , provides = [ "Nic" ]
17
+                  }
18
+              , bridge =
19
+                  Genode.Init.Start::{
20
+                  , binary = "nic_bridge"
21
+                  , resources = { caps = 200, ram = Genode.units.MiB 6 }
22
+                  , provides = [ "Nic" ]
23
+                  , routes = [ Genode.ServiceRoute.child "Nic" "nic" ]
24
+                  , config =
25
+                      Some
26
+                        ( Genode.Prelude.XML.text
27
+                            ''
28
+                            <config mac="02:02:02:02:03:00" verbose="no">
29
+                            	<policy label_prefix="solo5" ip_addr="10.0.0.2"/>
30
+                            	<default-policy/>
31
+                            </config>
32
+                            ''
33
+                        )
34
+                  }
35
+              , solo5 =
36
+                  Genode.Init.Start::{
37
+                  , binary = "solo5-test_net"
38
+                  , resources = { caps = 256, ram = Genode.units.MiB 3 }
39
+                  , routes =
40
+                      [ Genode.ServiceRoute.parent "Timer"
41
+                      , Genode.ServiceRoute.child "Nic" "bridge"
42
+                      ]
43
+                  , config =
44
+                      Some
45
+                        ( Genode.Prelude.XML.text
46
+                            ''
47
+                            <config><cmdline>limit</cmdline></config>
48
+                            ''
49
+                        )
50
+                  }
51
+              , ping =
52
+                  Genode.Init.Start::{
53
+                  , binary = "ping"
54
+                  , resources = { caps = 128, ram = Genode.units.MiB 6 }
55
+                  , routes =
56
+                      [ Genode.ServiceRoute.parent "Timer"
57
+                      , Genode.ServiceRoute.child "Nic" "bridge"
58
+                      ]
59
+                  , config =
60
+                      Some
61
+                        ( Genode.Prelude.XML.leaf
62
+                            { name = "config"
63
+                            , attributes =
64
+                                toMap
65
+                                  { interface = "10.0.0.72/24"
66
+                                  , dst_ip = "10.0.0.2"
67
+                                  , period_sec = "1"
68
+                                  , verbose = "no"
69
+                                  }
70
+                            }
71
+                        )
72
+                  }
73
+              }
74
+        }
75
+    , rom =
76
+        [ os.bin.nic_loopback
77
+        , os.bin.nic_bridge
78
+        , os.bin.ping
79
+        , tests.bin.solo5-test_net
80
+        ]
81
+    }

+ 82
- 72
tests/solo5/net_2if.dhall View File

@@ -2,75 +2,85 @@
2 2
 
3 3
 let Genode = env:DHALL_GENODE
4 4
 
5
-in    λ ( _
6
-        : {}
7
-        )
8
-    → Genode.Init::{
9
-      , children =
10
-          toMap
11
-            { nic =
12
-                Genode.Init.Start::{
13
-                , binary = "nic_loopback"
14
-                , provides = [ "Nic" ]
15
-                }
16
-            , bridge =
17
-                Genode.Init.Start::{
18
-                , binary = "nic_bridge"
19
-                , resources = { caps = 200, ram = Genode.units.MiB 8 }
20
-                , provides = [ "Nic" ]
21
-                , routes = [ Genode.ServiceRoute.child "Nic" "nic" ]
22
-                , config =
23
-                    Some
24
-                      ( Genode.Prelude.XML.text
25
-                          ''
26
-                          <config mac="02:02:02:02:03:00" verbose="no">
27
-                          	<policy label="solo5 -> service0" ip_addr="10.0.0.2"/>
28
-                          	<policy label="solo5 -> service1" ip_addr="10.1.0.2"/>
29
-                          	<default-policy/>
30
-                          </config>
31
-                          ''
32
-                      )
33
-                }
34
-            , solo5 =
35
-                Genode.Init.Start::{
36
-                , binary = "test"
37
-                , resources = { caps = 256, ram = Genode.units.MiB 4 }
38
-                , routes =
39
-                    [ Genode.ServiceRoute.parent "Timer"
40
-                    , Genode.ServiceRoute.child "Nic" "bridge"
41
-                    ]
42
-                , config =
43
-                    Some
44
-                      ( Genode.Prelude.XML.text
45
-                          ''
46
-                          <config><cmdline>limit</cmdline></config>
47
-                          ''
48
-                      )
49
-                }
50
-            , clients =
51
-                Genode.Init.Start::{
52
-                , binary = "sequence"
53
-                , resources = { caps = 256, ram = Genode.units.MiB 8 }
54
-                , routes =
55
-                    [ Genode.ServiceRoute.parent "Timer"
56
-                    , Genode.ServiceRoute.child "Nic" "bridge"
57
-                    ]
58
-                , config =
59
-                    Some
60
-                      ( Genode.Prelude.XML.text
61
-                          ''
62
-                          <config>
63
-                            <start name="ping0">
64
-                              <binary name="ping"/>
65
-                              <config interface="10.0.0.72/24" dst_ip="10.0.0.2" period_sec="1" count="4"/>
66
-                            </start>
67
-                            <start name="ping1">
68
-                              <binary name="ping"/>
69
-                              <config interface="10.1.0.72/24" dst_ip="10.1.0.2" period_sec="1" count="4"/>
70
-                            </start>
71
-                          </config>
72
-                          ''
73
-                      )
74
-                }
75
-            }
76
-      }
5
+let os = env:OS_MANIFEST
6
+
7
+let tests = env:SOLO5_TEST_MANIFEST
8
+
9
+in  { config =
10
+        Genode.Init::{
11
+        , children =
12
+            toMap
13
+              { nic =
14
+                  Genode.Init.Start::{
15
+                  , binary = "nic_loopback"
16
+                  , provides = [ "Nic" ]
17
+                  }
18
+              , bridge =
19
+                  Genode.Init.Start::{
20
+                  , binary = "nic_bridge"
21
+                  , resources = { caps = 200, ram = Genode.units.MiB 8 }
22
+                  , provides = [ "Nic" ]
23
+                  , routes = [ Genode.ServiceRoute.child "Nic" "nic" ]
24
+                  , config =
25
+                      Some
26
+                        ( Genode.Prelude.XML.text
27
+                            ''
28
+                            <config mac="02:02:02:02:03:00" verbose="no">
29
+                            	<policy label="solo5 -> service0" ip_addr="10.0.0.2"/>
30
+                            	<policy label="solo5 -> service1" ip_addr="10.1.0.2"/>
31
+                            	<default-policy/>
32
+                            </config>
33
+                            ''
34
+                        )
35
+                  }
36
+              , solo5 =
37
+                  Genode.Init.Start::{
38
+                  , binary = "solo5-test_net_2if"
39
+                  , resources = { caps = 256, ram = Genode.units.MiB 4 }
40
+                  , routes =
41
+                      [ Genode.ServiceRoute.parent "Timer"
42
+                      , Genode.ServiceRoute.child "Nic" "bridge"
43
+                      ]
44
+                  , config =
45
+                      Some
46
+                        ( Genode.Prelude.XML.text
47
+                            ''
48
+                            <config><cmdline>limit</cmdline></config>
49
+                            ''
50
+                        )
51
+                  }
52
+              , clients =
53
+                  Genode.Init.Start::{
54
+                  , binary = "sequence"
55
+                  , resources = { caps = 256, ram = Genode.units.MiB 8 }
56
+                  , routes =
57
+                      [ Genode.ServiceRoute.parent "Timer"
58
+                      , Genode.ServiceRoute.child "Nic" "bridge"
59
+                      ]
60
+                  , config =
61
+                      Some
62
+                        ( Genode.Prelude.XML.text
63
+                            ''
64
+                            <config>
65
+                              <start name="ping0">
66
+                                <binary name="ping"/>
67
+                                <config interface="10.0.0.72/24" dst_ip="10.0.0.2" period_sec="1" count="4"/>
68
+                              </start>
69
+                              <start name="ping1">
70
+                                <binary name="ping"/>
71
+                                <config interface="10.1.0.72/24" dst_ip="10.1.0.2" period_sec="1" count="4"/>
72
+                              </start>
73
+                            </config>
74
+                            ''
75
+                        )
76
+                  }
77
+              }
78
+        }
79
+    , rom =
80
+        [ tests.bin.solo5-test_net_2if
81
+        , os.bin.sequence
82
+        , os.bin.nic_bridge
83
+        , os.bin.nic_loopback
84
+        , os.bin.ping
85
+        ]
86
+    }

+ 22
- 19
tests/solo5/simple.dhall View File

@@ -2,24 +2,27 @@
2 2
 
3 3
 let Genode = env:DHALL_GENODE
4 4
 
5
-in    λ(_ : {})
6
-    → Genode.Init::{
7
-      , children =
8
-          toMap
9
-            { solo5 =
10
-                Genode.Init.Start::{
11
-                , binary = "test"
12
-                , resources = { caps = 256, ram = Genode.units.MiB 3 }
13
-                , routes = [ Genode.ServiceRoute.parent "Timer" ]
14
-                , config =
15
-                    Some
16
-                      ( Genode.Prelude.XML.text
17
-                          ''
18
-                           <config>
19
-                           	<cmdline>Hello_Solo5</cmdline>
20
-                          </config>
21
-                           ''
22
-                      )
5
+in    λ(testBinary : Genode.Prelude.Map.Entry Text Text)
6
+    → { config =
7
+          Genode.Init::{
8
+          , children =
9
+              toMap
10
+                { solo5 =
11
+                    Genode.Init.Start::{
12
+                    , binary = testBinary.mapKey
13
+                    , resources = { caps = 256, ram = Genode.units.MiB 3 }
14
+                    , routes = [ Genode.ServiceRoute.parent "Timer" ]
15
+                    , config =
16
+                        Some
17
+                          ( Genode.Prelude.XML.text
18
+                              ''
19
+                               <config>
20
+                               	<cmdline>Hello_Solo5</cmdline>
21
+                              </config>
22
+                               ''
23
+                          )
24
+                    }
23 25
                 }
24
-            }
26
+          }
27
+      , rom = [ testBinary ]
25 28
       }

+ 29
- 17
tests/solo5/time.dhall View File

@@ -2,20 +2,32 @@
2 2
 
3 3
 let Genode = env:DHALL_GENODE
4 4
 
5
-in    λ(_ : {})
6
-    → { solo5 =
7
-          Genode.Init.Start::{
8
-          , binary = "test"
9
-          , resources = { caps = 256, ram = Genode.units.MiB 3 }
10
-          , routes =
11
-              [ Genode.ServiceRoute.parent "Timer"
12
-              , Genode.ServiceRoute.child "Rtc" "clock"
13
-              ]
14
-          }
15
-      , clock =
16
-          Genode.Init.Start::{
17
-          , binary = "rtc_drv"
18
-          , provides = [ "Rtc" ]
19
-          , routes = [ Genode.ServiceRoute.parent "IO_PORT" ]
20
-          }
21
-      }
5
+let os = env:OS_MANIFEST
6
+
7
+let tests = env:SOLO5_TEST_MANIFEST
8
+
9
+let test = tests.bin.solo5-test_time