diff options
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/amalgam/config/build/bootstrap.build | 3 | ||||
| -rw-r--r-- | tests/amalgam/config/build/root.build | 1 | ||||
| -rw-r--r-- | tests/amalgam/config/buildfile | 3 | ||||
| -rw-r--r-- | tests/amalgam/simple/build/bootstrap.build | 3 | ||||
| -rw-r--r-- | tests/amalgam/simple/buildfile | 9 | ||||
| -rw-r--r-- | tests/amalgam/simple/driver.cxx | 4 | ||||
| -rw-r--r-- | tests/cli/lib/libtest/build/root.build | 1 | ||||
| -rw-r--r-- | tests/cli/lib/test/buildfile | 2 | ||||
| -rw-r--r-- | tests/cli/simple/build/root.build | 2 | ||||
| -rw-r--r-- | tests/cli/simple/buildfile | 6 |
10 files changed, 29 insertions, 5 deletions
diff --git a/tests/amalgam/config/build/bootstrap.build b/tests/amalgam/config/build/bootstrap.build new file mode 100644 index 0000000..5951f06 --- /dev/null +++ b/tests/amalgam/config/build/bootstrap.build @@ -0,0 +1,3 @@ +project = amalgam-config +subprojects = 1/ 2/ +using config diff --git a/tests/amalgam/config/build/root.build b/tests/amalgam/config/build/root.build new file mode 100644 index 0000000..7d1767b --- /dev/null +++ b/tests/amalgam/config/build/root.build @@ -0,0 +1 @@ +using cxx diff --git a/tests/amalgam/config/buildfile b/tests/amalgam/config/buildfile new file mode 100644 index 0000000..e9fc7f4 --- /dev/null +++ b/tests/amalgam/config/buildfile @@ -0,0 +1,3 @@ +d = 1/ 2/ +.: $d +include $d diff --git a/tests/amalgam/simple/build/bootstrap.build b/tests/amalgam/simple/build/bootstrap.build new file mode 100644 index 0000000..8da7272 --- /dev/null +++ b/tests/amalgam/simple/build/bootstrap.build @@ -0,0 +1,3 @@ +project = amalgam-simple +amalgamation = ../ +using config diff --git a/tests/amalgam/simple/buildfile b/tests/amalgam/simple/buildfile new file mode 100644 index 0000000..ec6a4e1 --- /dev/null +++ b/tests/amalgam/simple/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/simple/driver.cxx b/tests/amalgam/simple/driver.cxx new file mode 100644 index 0000000..70b4146 --- /dev/null +++ b/tests/amalgam/simple/driver.cxx @@ -0,0 +1,4 @@ +int +main () +{ +} diff --git a/tests/cli/lib/libtest/build/root.build b/tests/cli/lib/libtest/build/root.build index 4dce48b..f8d3d9e 100644 --- a/tests/cli/lib/libtest/build/root.build +++ b/tests/cli/lib/libtest/build/root.build @@ -3,4 +3,3 @@ using cxx hxx.ext = ixx.ext = ipp cxx.ext = cpp - diff --git a/tests/cli/lib/test/buildfile b/tests/cli/lib/test/buildfile index 70a4dc1..0bbeb95 100644 --- a/tests/cli/lib/test/buildfile +++ b/tests/cli/lib/test/buildfile @@ -3,4 +3,4 @@ import libs += cli-lib-libtest exe{driver}: cxx{driver} cli.cxx{test} $libs cli.cxx{test}: cli{test} -cxx.poptions = -I$out_root +cxx.poptions += -I$out_root diff --git a/tests/cli/simple/build/root.build b/tests/cli/simple/build/root.build index 8e910cf..8b13789 100644 --- a/tests/cli/simple/build/root.build +++ b/tests/cli/simple/build/root.build @@ -1,3 +1 @@ -using cxx -using cli diff --git a/tests/cli/simple/buildfile b/tests/cli/simple/buildfile index 80882c6..998eb67 100644 --- a/tests/cli/simple/buildfile +++ b/tests/cli/simple/buildfile @@ -1,8 +1,12 @@ +using cxx + hxx.ext = cxx.ext = cpp ixx.ext = ipp -cxx.poptions = -I$out_root +cxx.poptions += -I$out_root + +using cli exe{driver}: cxx{driver} cxx{test} cxx{test} hxx{test}: cli{test} |