Build Genode tests with upstream build system
This commit is contained in:
parent
7f30ff1fed
commit
458d3b5808
|
@ -51,6 +51,28 @@ in rec {
|
||||||
'';
|
'';
|
||||||
};
|
};
|
||||||
|
|
||||||
|
genodeTests = let
|
||||||
|
directoryBlacklist = [
|
||||||
|
"repos/base-*"
|
||||||
|
"repos/base/src/test/sanitizer"
|
||||||
|
"repos/base/src/test/xml_generator"
|
||||||
|
"repos/dde_bsd"
|
||||||
|
"repos/dde_linux"
|
||||||
|
"repos/gems/src/test/aes_cbc_4k"
|
||||||
|
"repos/gems/src/test/decorator_stress"
|
||||||
|
"repos/gems/src/test/text_painter"
|
||||||
|
"repos/gems/src/test/text_painter"
|
||||||
|
"repos/gems/src/test/tiled_wm"
|
||||||
|
"repos/libports"
|
||||||
|
"repos/ports"
|
||||||
|
];
|
||||||
|
in buildUpstream {
|
||||||
|
name = "genode-tests";
|
||||||
|
arch = "x86_64";
|
||||||
|
preBuild = "find ${toString directoryBlacklist} -name target.mk -delete";
|
||||||
|
targets = [ "test" ];
|
||||||
|
};
|
||||||
|
|
||||||
bender = legacyPackages.buildPackages.callPackage ./bender { };
|
bender = legacyPackages.buildPackages.callPackage ./bender { };
|
||||||
|
|
||||||
dhallGenode = dhallPackages.genode;
|
dhallGenode = dhallPackages.genode;
|
||||||
|
|
|
@ -25,5 +25,5 @@ in { config =
|
||||||
, rom =
|
, rom =
|
||||||
let manifest = env:MANIFEST
|
let manifest = env:MANIFEST
|
||||||
|
|
||||||
in Genode.Boot.toRomPaths [ manifest.base.bin.test-log ]
|
in Genode.Boot.toRomPaths [ manifest.genode-tests.bin.test-log ]
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,8 +8,6 @@ testEnv.mkTest rec {
|
||||||
meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ehmry ];
|
meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ehmry ];
|
||||||
|
|
||||||
testConfig = ./log.dhall;
|
testConfig = ./log.dhall;
|
||||||
|
testInputs = [ pkgs.genodeTests ];
|
||||||
testScript = "run_genode_until {Test done.} 120";
|
testScript = "run_genode_until {Test done.} 120";
|
||||||
|
|
||||||
testInputs = [ pkgs.genode.base ];
|
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,7 +8,7 @@ testEnv.mkTest {
|
||||||
meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ehmry ];
|
meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ehmry ];
|
||||||
|
|
||||||
testConfig = ./pci.dhall;
|
testConfig = ./pci.dhall;
|
||||||
|
testInputs = [ pkgs.genodeTests ];
|
||||||
testScript = ''
|
testScript = ''
|
||||||
run_genode_until "--- Platform test finished ---.*\n" 60
|
run_genode_until "--- Platform test finished ---.*\n" 60
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -31,5 +31,5 @@ in { config =
|
||||||
let manifest = env:MANIFEST
|
let manifest = env:MANIFEST
|
||||||
|
|
||||||
in Genode.Boot.toRomPaths
|
in Genode.Boot.toRomPaths
|
||||||
[ manifest.os.bin.test-rtc, manifest.os.bin.rtc_drv ]
|
[ manifest.genode-tests.bin.test-rtc, manifest.os.bin.rtc_drv ]
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,6 +8,6 @@ testEnv.mkTest {
|
||||||
meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ehmry ];
|
meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ehmry ];
|
||||||
|
|
||||||
testConfig = ./rtc.dhall;
|
testConfig = ./rtc.dhall;
|
||||||
|
testInputs = [ pkgs.genodeTests ];
|
||||||
testScript = "run_genode_until {--- RTC test finished ---} 40";
|
testScript = "run_genode_until {--- RTC test finished ---} 40";
|
||||||
}
|
}
|
||||||
|
|
|
@ -28,5 +28,5 @@ in { config =
|
||||||
, rom =
|
, rom =
|
||||||
let manifest = env:MANIFEST
|
let manifest = env:MANIFEST
|
||||||
|
|
||||||
in Genode.Boot.toRomPaths [ manifest.os.bin.test-signal ]
|
in Genode.Boot.toRomPaths [ manifest.genode-tests.bin.test-signal ]
|
||||||
}
|
}
|
||||||
|
|
|
@ -8,6 +8,6 @@ testEnv.mkTest rec {
|
||||||
meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ehmry ];
|
meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ehmry ];
|
||||||
|
|
||||||
testConfig = ./signal.dhall;
|
testConfig = ./signal.dhall;
|
||||||
|
testInputs = [ pkgs.genodeTests ];
|
||||||
testScript = "run_genode_until {--- Signalling test finished ---} 120";
|
testScript = "run_genode_until {--- Signalling test finished ---} 120";
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue
Block a user