aboutsummaryrefslogtreecommitdiff
path: root/tests/amalgam
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-07-08 14:40:15 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-07-08 14:40:15 +0200
commit650d61845b3f61e9596a8a2dc97458998ba26013 (patch)
treeb0ce0b66bfd053ffb38849589404957cde0f12dc /tests/amalgam
parent402bb6e6b297614226c4f848ebdb13fd49a95d76 (diff)
Implement automatic amalgamation discovery
Diffstat (limited to 'tests/amalgam')
-rw-r--r--tests/amalgam/config/build/bootstrap.build1
-rw-r--r--tests/amalgam/config/buildfile2
-rw-r--r--tests/amalgam/simple/build/bootstrap.build1
3 files changed, 2 insertions, 2 deletions
diff --git a/tests/amalgam/config/build/bootstrap.build b/tests/amalgam/config/build/bootstrap.build
index 5951f06..5a01046 100644
--- a/tests/amalgam/config/build/bootstrap.build
+++ b/tests/amalgam/config/build/bootstrap.build
@@ -1,3 +1,4 @@
project = amalgam-config
+amalgamation = # Shall not be amalgamated.
subprojects = 1/ 2/
using config
diff --git a/tests/amalgam/config/buildfile b/tests/amalgam/config/buildfile
index e9fc7f4..7132877 100644
--- a/tests/amalgam/config/buildfile
+++ b/tests/amalgam/config/buildfile
@@ -1,3 +1,3 @@
-d = 1/ 2/
+d = #1/ 2/
.: $d
include $d
diff --git a/tests/amalgam/simple/build/bootstrap.build b/tests/amalgam/simple/build/bootstrap.build
index 8da7272..698a248 100644
--- a/tests/amalgam/simple/build/bootstrap.build
+++ b/tests/amalgam/simple/build/bootstrap.build
@@ -1,3 +1,2 @@
project = amalgam-simple
-amalgamation = ../
using config