aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-03-03 12:53:37 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-03-03 12:53:37 +0200
commitc76fe316122969986103d243706dc7fa7ab6ddc1 (patch)
treebddbe5695a9079b701219a3dc0d3c5805f4ca9e6 /tests
parent17287b34a8090d381278c02b7bc6676669968099 (diff)
Use names() to handle include/source, support include of directories
This gives us variable expansion and directory prefixes. Also, in include, if the path is a directory (either ends with / or has dir{} type), then we append 'buildfile'.
Diffstat (limited to 'tests')
-rw-r--r--tests/build/buildfile4
-rw-r--r--tests/build/semantics/include/includer1
-rw-r--r--tests/build/semantics/source/sourcer1
3 files changed, 6 insertions, 0 deletions
diff --git a/tests/build/buildfile b/tests/build/buildfile
new file mode 100644
index 0000000..99a0a6f
--- /dev/null
+++ b/tests/build/buildfile
@@ -0,0 +1,4 @@
+d=path/ prefix-map/
+
+.: $d
+include $d
diff --git a/tests/build/semantics/include/includer b/tests/build/semantics/include/includer
index c129e33..70527a5 100644
--- a/tests/build/semantics/include/includer
+++ b/tests/build/semantics/include/includer
@@ -7,3 +7,4 @@ nested/:
include includee5
include ../includee2 # skipped
}
+:
diff --git a/tests/build/semantics/source/sourcer b/tests/build/semantics/source/sourcer
index e8b9558..eb1310e 100644
--- a/tests/build/semantics/source/sourcer
+++ b/tests/build/semantics/source/sourcer
@@ -6,3 +6,4 @@ nested/:
source sourcee3
source ../sourcee1
}
+: