summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKlaus T. Aehlig <aehlig@linta.de>2024-06-04 11:35:50 +0200
committerKlaus T. Aehlig <aehlig@linta.de>2024-06-04 11:40:15 +0200
commitd9b5abdb716bd5e4d474c724cb52e9f09899f942 (patch)
tree81ef3311effa8dec3a504ed5361a88c5e60cfb0f
parent3626877554b6c567d43336ec49414cedfe487260 (diff)
downloadhello-nix-d9b5abdb716bd5e4d474c724cb52e9f09899f942.tar.gz
test: add overall target
... acting as a test suite for all tests; in doing so, also add the usual structure that each directory has is own overall target of only the tree objects with the test results. While there, remove duplicate copy of a test script in a wrong directory.
-rw-r--r--test/TARGETS10
-rw-r--r--test/hello/TARGETS3
-rw-r--r--test/proto/TARGETS3
-rw-r--r--test/test_hello.sh5
-rw-r--r--test/withExtendedPath/TARGETS3
5 files changed, 16 insertions, 8 deletions
diff --git a/test/TARGETS b/test/TARGETS
new file mode 100644
index 0000000..54f7274
--- /dev/null
+++ b/test/TARGETS
@@ -0,0 +1,10 @@
+{ "":
+ { "type": "install"
+ , "tainted": ["test"]
+ , "dirs":
+ [ [["./", "hello", ""], "hello"]
+ , [["./", "proto", ""], "proto"]
+ , [["./", "withExtendedPath", ""], "withExtendedPath"]
+ ]
+ }
+}
diff --git a/test/hello/TARGETS b/test/hello/TARGETS
index d01c382..9d16e07 100644
--- a/test/hello/TARGETS
+++ b/test/hello/TARGETS
@@ -1,4 +1,5 @@
-{ "":
+{ "": {"type": "install", "tainted": ["test"], "deps": ["hello"]}
+, "hello":
{ "type": ["@", "rules", "shell/test", "script"]
, "name": ["hello"]
, "test": ["test_hello.sh"]
diff --git a/test/proto/TARGETS b/test/proto/TARGETS
index 50d5195..d2e817e 100644
--- a/test/proto/TARGETS
+++ b/test/proto/TARGETS
@@ -1,4 +1,5 @@
-{ "":
+{ "": {"type": "install", "tainted": ["test"], "deps": ["proto"]}
+, "proto":
{ "type": ["@", "rules", "shell/test", "script"]
, "name": ["proto"]
, "test": ["test.sh"]
diff --git a/test/test_hello.sh b/test/test_hello.sh
deleted file mode 100644
index 08347e8..0000000
--- a/test/test_hello.sh
+++ /dev/null
@@ -1,5 +0,0 @@
-set -e
-
-./hello | grep -i world
-./hello Universe | grep Universe
-./hello Universe | grep -i world && exit 1 || :
diff --git a/test/withExtendedPath/TARGETS b/test/withExtendedPath/TARGETS
index 73a5a9e..e5e7ca0 100644
--- a/test/withExtendedPath/TARGETS
+++ b/test/withExtendedPath/TARGETS
@@ -1,4 +1,5 @@
-{"withExtendedPath":
+{ "": {"type": "install", "tainted": ["test"], "deps": ["withExtendedPath"]}
+, "withExtendedPath":
{ "type": ["@", "rules", "shell/test", "script"]
, "name": ["find-in-extended-path"]
, "test": ["test.sh"]