diff options
Diffstat (limited to 'tests')
-rw-r--r-- | tests/amalgam/config/buildfile | 2 | ||||
-rw-r--r-- | tests/amalgam/libtest/build/bootstrap.build | 2 | ||||
-rw-r--r-- | tests/amalgam/libtest/build/export.build | 6 | ||||
-rw-r--r-- | tests/amalgam/libtest/buildfile | 6 | ||||
-rw-r--r-- | tests/amalgam/libtest/test.cxx | 4 | ||||
-rw-r--r-- | tests/amalgam/simple1/build/bootstrap.build | 2 | ||||
-rw-r--r-- | tests/amalgam/simple1/buildfile | 9 | ||||
-rw-r--r-- | tests/amalgam/simple2/build/bootstrap.build | 2 | ||||
-rw-r--r-- | tests/amalgam/simple2/buildfile | 9 | ||||
-rw-r--r-- | tests/amalgam/simple2/driver.cxx | 4 | ||||
-rw-r--r-- | tests/amalgam/test/build/bootstrap.build | 2 | ||||
-rw-r--r-- | tests/amalgam/test/buildfile | 8 | ||||
-rw-r--r-- | tests/amalgam/test/driver.cxx (renamed from tests/amalgam/simple1/driver.cxx) | 0 |
13 files changed, 29 insertions, 27 deletions
diff --git a/tests/amalgam/config/buildfile b/tests/amalgam/config/buildfile index e9fc7f4..2f01ba3 100644 --- a/tests/amalgam/config/buildfile +++ b/tests/amalgam/config/buildfile @@ -1,3 +1,3 @@ -d = 1/ 2/ +d = #t/ #l/ .: $d include $d diff --git a/tests/amalgam/libtest/build/bootstrap.build b/tests/amalgam/libtest/build/bootstrap.build new file mode 100644 index 0000000..025e510 --- /dev/null +++ b/tests/amalgam/libtest/build/bootstrap.build @@ -0,0 +1,2 @@ +project = amalgam-libtest +using config diff --git a/tests/amalgam/libtest/build/export.build b/tests/amalgam/libtest/build/export.build new file mode 100644 index 0000000..b95e409 --- /dev/null +++ b/tests/amalgam/libtest/build/export.build @@ -0,0 +1,6 @@ +$out_root/: +{ + include buildfile +} + +export $out_root/lib{test} diff --git a/tests/amalgam/libtest/buildfile b/tests/amalgam/libtest/buildfile new file mode 100644 index 0000000..04c44da --- /dev/null +++ b/tests/amalgam/libtest/buildfile @@ -0,0 +1,6 @@ +using cxx + +hxx.ext = hxx +cxx.ext = cxx + +lib{test}: cxx{test} diff --git a/tests/amalgam/libtest/test.cxx b/tests/amalgam/libtest/test.cxx new file mode 100644 index 0000000..34a033a --- /dev/null +++ b/tests/amalgam/libtest/test.cxx @@ -0,0 +1,4 @@ +void +f () +{ +} diff --git a/tests/amalgam/simple1/build/bootstrap.build b/tests/amalgam/simple1/build/bootstrap.build deleted file mode 100644 index e4502f8..0000000 --- a/tests/amalgam/simple1/build/bootstrap.build +++ /dev/null @@ -1,2 +0,0 @@ -project = amalgam-simple1 -using config diff --git a/tests/amalgam/simple1/buildfile b/tests/amalgam/simple1/buildfile deleted file mode 100644 index ec6a4e1..0000000 --- a/tests/amalgam/simple1/buildfile +++ /dev/null @@ -1,9 +0,0 @@ -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/build/bootstrap.build b/tests/amalgam/simple2/build/bootstrap.build deleted file mode 100644 index 599ec1d..0000000 --- a/tests/amalgam/simple2/build/bootstrap.build +++ /dev/null @@ -1,2 +0,0 @@ -project = amalgam-simple2 -using config diff --git a/tests/amalgam/simple2/buildfile b/tests/amalgam/simple2/buildfile deleted file mode 100644 index ec6a4e1..0000000 --- a/tests/amalgam/simple2/buildfile +++ /dev/null @@ -1,9 +0,0 @@ -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 deleted file mode 100644 index 70b4146..0000000 --- a/tests/amalgam/simple2/driver.cxx +++ /dev/null @@ -1,4 +0,0 @@ -int -main () -{ -} diff --git a/tests/amalgam/test/build/bootstrap.build b/tests/amalgam/test/build/bootstrap.build new file mode 100644 index 0000000..a53e738 --- /dev/null +++ b/tests/amalgam/test/build/bootstrap.build @@ -0,0 +1,2 @@ +project = amalgam-test +using config diff --git a/tests/amalgam/test/buildfile b/tests/amalgam/test/buildfile new file mode 100644 index 0000000..3fadac3 --- /dev/null +++ b/tests/amalgam/test/buildfile @@ -0,0 +1,8 @@ +using cxx + +hxx.ext = hxx +cxx.ext = cxx + +import libs += amalgam-libtest + +exe{driver}: cxx{driver} $libs diff --git a/tests/amalgam/simple1/driver.cxx b/tests/amalgam/test/driver.cxx index 70b4146..70b4146 100644 --- a/tests/amalgam/simple1/driver.cxx +++ b/tests/amalgam/test/driver.cxx |