aboutsummaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorBoris Kolpackov <boris@codesynthesis.com>2015-07-10 15:29:42 +0200
committerBoris Kolpackov <boris@codesynthesis.com>2015-07-10 15:29:42 +0200
commit722cf9d345e38b6f5ff4ed538d1f68bc75b2ab51 (patch)
treec2a97aa7c5e54699fae778246187aa4b7ae8b32c /tests
parent650d61845b3f61e9596a8a2dc97458998ba26013 (diff)
Implement automatic subproject discovery
Currently we only capture their directories without the project names. We will need project names when we hook import search into this.
Diffstat (limited to 'tests')
-rw-r--r--tests/amalgam/config/build/bootstrap.build1
-rw-r--r--tests/amalgam/simple/build/bootstrap.build2
-rw-r--r--tests/amalgam/simple1/build/bootstrap.build2
-rw-r--r--tests/amalgam/simple1/buildfile (renamed from tests/amalgam/simple/buildfile)0
-rw-r--r--tests/amalgam/simple1/driver.cxx (renamed from tests/amalgam/simple/driver.cxx)0
-rw-r--r--tests/amalgam/simple2/build/bootstrap.build2
-rw-r--r--tests/amalgam/simple2/buildfile9
-rw-r--r--tests/amalgam/simple2/driver.cxx4
8 files changed, 17 insertions, 3 deletions
diff --git a/tests/amalgam/config/build/bootstrap.build b/tests/amalgam/config/build/bootstrap.build
index 5a01046..52d415a 100644
--- a/tests/amalgam/config/build/bootstrap.build
+++ b/tests/amalgam/config/build/bootstrap.build
@@ -1,4 +1,3 @@
project = amalgam-config
amalgamation = # Shall not be amalgamated.
-subprojects = 1/ 2/
using config
diff --git a/tests/amalgam/simple/build/bootstrap.build b/tests/amalgam/simple/build/bootstrap.build
deleted file mode 100644
index 698a248..0000000
--- a/tests/amalgam/simple/build/bootstrap.build
+++ /dev/null
@@ -1,2 +0,0 @@
-project = amalgam-simple
-using config
diff --git a/tests/amalgam/simple1/build/bootstrap.build b/tests/amalgam/simple1/build/bootstrap.build
new file mode 100644
index 0000000..e4502f8
--- /dev/null
+++ b/tests/amalgam/simple1/build/bootstrap.build
@@ -0,0 +1,2 @@
+project = amalgam-simple1
+using config
diff --git a/tests/amalgam/simple/buildfile b/tests/amalgam/simple1/buildfile
index ec6a4e1..ec6a4e1 100644
--- a/tests/amalgam/simple/buildfile
+++ b/tests/amalgam/simple1/buildfile
diff --git a/tests/amalgam/simple/driver.cxx b/tests/amalgam/simple1/driver.cxx
index 70b4146..70b4146 100644
--- a/tests/amalgam/simple/driver.cxx
+++ b/tests/amalgam/simple1/driver.cxx
diff --git a/tests/amalgam/simple2/build/bootstrap.build b/tests/amalgam/simple2/build/bootstrap.build
new file mode 100644
index 0000000..599ec1d
--- /dev/null
+++ b/tests/amalgam/simple2/build/bootstrap.build
@@ -0,0 +1,2 @@
+project = amalgam-simple2
+using config
diff --git a/tests/amalgam/simple2/buildfile b/tests/amalgam/simple2/buildfile
new file mode 100644
index 0000000..ec6a4e1
--- /dev/null
+++ b/tests/amalgam/simple2/buildfile
@@ -0,0 +1,9 @@
+using cxx
+
+hxx.ext = hxx
+cxx.ext = cxx
+ixx.ext = ixx
+
+cxx.poptions += -I$out_root
+
+exe{driver}: cxx{driver}
diff --git a/tests/amalgam/simple2/driver.cxx b/tests/amalgam/simple2/driver.cxx
new file mode 100644
index 0000000..70b4146
--- /dev/null
+++ b/tests/amalgam/simple2/driver.cxx
@@ -0,0 +1,4 @@
+int
+main ()
+{
+}