test.trivial-builders: Add test cases, fix test runner, rename

The writeStringReferencesToFile didn't handle non-unique references
to the same path correctly.

1 files changed, 5 insertions, 2 deletions

diff --git a/pkgs/test/default.nix b/pkgs/test/default.nix
index ebf732839ceaf..80d82e5bee07d 100644
--- a/pkgs/test/default.nix
+++ b/pkgs/test/default.nix
@@ -51,8 +51,11 @@ with pkgs;
 
   cuda = callPackage ./cuda { };
 
-  trivial = callPackage ../build-support/trivial-builders/test.nix {};
-  trivial-overriding = callPackage ../build-support/trivial-builders/test-overriding.nix {};
+  trivial-builders = recurseIntoAttrs {
+    writeStringReferencesToFile = callPackage ../build-support/trivial-builders/test/writeStringReferencesToFile.nix {};
+    references = callPackage ../build-support/trivial-builders/test/references.nix {};
+    overriding = callPackage ../build-support/trivial-builders/test-overriding.nix {};
+  };
 
   writers = callPackage ../build-support/writers/test.nix {};
 }