danderson/ofborg
0
0
Fork 0
forked from the-distro/ofborg
Code Pull requests Activity

use nixosTests for tests

Browse source 
The current approach runs e.g. `nix-build nixos/release.nix -A tests.installer`,
which is a no-op because `tests.installer` is a set of sets of
derivations (e.g. `tests.installer.simple.x86_64-linux`).

Use `nixosTests` instead, which doesn't have this extra nesting.
This commit is contained in:
Naïm Favier 2023-01-02 02:26:46 +01:00 committed by Cole Helbling
parent 6d5ad2f34b
commit 2beea85aed
2 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
README.md
View file

@ -48,8 +48,8 @@ instructions for ofborg.
@ofborg test list of tests @ofborg test list of tests
``` ```
This will run `nix-build ./nixos/release.nix -A tests.list -A tests.of -A This will run `nix-build ./default.nix -A nixosTests.list -A nixosTests.of -A
tests.tests` from the root of the Nixpkgs checkout. nixosTests.tests` from the root of the Nixpkgs checkout.
Tests will run on all allowed machines. For more information, see the "[Trusted Tests will run on all allowed machines. For more information, see the "[Trusted
Users](#trusted-users)" section. Users](#trusted-users)" section.

12
ofborg/src/commentparser.rs
View file

@ -38,8 +38,8 @@ named!(
)) | )) |
ws!(do_parse!( ws!(do_parse!(
tag!("test") >> tag!("test") >>
tests: ws!(many1!(map!(normal_token, |s| format!("tests.{}", s.0)))) >> tests: ws!(many1!(map!(normal_token, |s| format!("nixosTests.{}", s.0)))) >>
(Some(Instruction::Build(Subset::NixOS, tests))) (Some(Instruction::Build(Subset::Nixpkgs, tests)))
)) | )) |
value!(Some(Instruction::Eval), tag!("eval")) | value!(Some(Instruction::Eval), tag!("eval")) |
// TODO: Currently keeping previous behaviour of ignoring unknown commands. Maybe // TODO: Currently keeping previous behaviour of ignoring unknown commands. Maybe
@ -195,11 +195,11 @@ baz",
fn test_comment() { fn test_comment() {
assert_eq!( assert_eq!(
Some(vec![Instruction::Build( Some(vec![Instruction::Build(
Subset::NixOS, Subset::Nixpkgs,
vec![ vec![
String::from("tests.foo"), String::from("nixosTests.foo"),
String::from("tests.bar"), String::from("nixosTests.bar"),
String::from("tests.baz"), String::from("nixosTests.baz"),
] ]
),]), ),]),
parse("@GrahamCOfBorg test foo bar baz") parse("@GrahamCOfBorg test foo bar baz")