Build Genode tests with upstream build system

packages/default.nix

@@ -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 { };
 
   dhallGenode = dhallPackages.genode;

tests/log.dhall

@@ -25,5 +25,5 @@ in  { config =
     , rom =
         let manifest = env:MANIFEST
         
-        in  Genode.Boot.toRomPaths [ manifest.base.bin.test-log ]
+        in  Genode.Boot.toRomPaths [ manifest.genode-tests.bin.test-log ]
     }

tests/log.nix

@@ -8,8 +8,6 @@ testEnv.mkTest rec {
   meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ehmry ];
 
   testConfig = ./log.dhall;
-
+  testInputs = [ pkgs.genodeTests ];
   testScript = "run_genode_until {Test done.} 120";
-
-  testInputs = [ pkgs.genode.base ];
 }

tests/pci.nix

@@ -8,7 +8,7 @@ testEnv.mkTest {
   meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ehmry ];
 
   testConfig = ./pci.dhall;
-
+  testInputs = [ pkgs.genodeTests ];
   testScript = ''
     run_genode_until "--- Platform test finished ---.*\n" 60
   '';

tests/rtc.dhall

@@ -31,5 +31,5 @@ in  { config =
         let manifest = env:MANIFEST
         
         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 ]
     }

tests/rtc.nix

@@ -8,6 +8,6 @@ testEnv.mkTest {
   meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ehmry ];
 
   testConfig = ./rtc.dhall;
-
+  testInputs = [ pkgs.genodeTests ];
   testScript = "run_genode_until {--- RTC test finished ---} 40";
 }

tests/signal.dhall

@@ -28,5 +28,5 @@ in  { config =
     , rom =
         let manifest = env:MANIFEST
         
-        in  Genode.Boot.toRomPaths [ manifest.os.bin.test-signal ]
+        in  Genode.Boot.toRomPaths [ manifest.genode-tests.bin.test-signal ]
     }

tests/signal.nix

@@ -8,6 +8,6 @@ testEnv.mkTest rec {
   meta.maintainers = with pkgs.stdenv.lib.maintainers; [ ehmry ];
 
   testConfig = ./signal.dhall;
-
+  testInputs = [ pkgs.genodeTests ];
   testScript = "run_genode_until {--- Signalling test finished ---} 120";
 }