From 458d3b580871772a2a9789915cfb428332e12183 Mon Sep 17 00:00:00 2001
From: Emery Hemingway <ehmry@posteo.net>
Date: Mon, 24 Feb 2020 14:24:36 +0100
Subject: [PATCH] Build Genode tests with upstream build system

---
 packages/default.nix | 22 ++++++++++++++++++++++
 tests/log.dhall      |  2 +-
 tests/log.nix        |  4 +---
 tests/pci.nix        |  2 +-
 tests/rtc.dhall      |  2 +-
 tests/rtc.nix        |  2 +-
 tests/signal.dhall   |  2 +-
 tests/signal.nix     |  2 +-
 8 files changed, 29 insertions(+), 9 deletions(-)

diff --git a/packages/default.nix b/packages/default.nix
index e1ca98a..9069824 100644
--- a/packages/default.nix
+++ b/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;
diff --git a/tests/log.dhall b/tests/log.dhall
index b4174c7..c66c65d 100644
--- a/tests/log.dhall
+++ b/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 ]
     }
diff --git a/tests/log.nix b/tests/log.nix
index 5c4d3c7..fea26e2 100644
--- a/tests/log.nix
+++ b/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 ];
 }
diff --git a/tests/pci.nix b/tests/pci.nix
index 63d4ec8..d0dac98 100644
--- a/tests/pci.nix
+++ b/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
   '';
diff --git a/tests/rtc.dhall b/tests/rtc.dhall
index f307b95..fd14141 100644
--- a/tests/rtc.dhall
+++ b/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 ]
     }
diff --git a/tests/rtc.nix b/tests/rtc.nix
index 73c5a31..dcc4877 100644
--- a/tests/rtc.nix
+++ b/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";
 }
diff --git a/tests/signal.dhall b/tests/signal.dhall
index 780389d..07a06fc 100644
--- a/tests/signal.dhall
+++ b/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 ]
     }
diff --git a/tests/signal.nix b/tests/signal.nix
index a36b0c6..fdac667 100644
--- a/tests/signal.nix
+++ b/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";
 }