From 193efb512ffbc2231ef5c48699d51fbae3f3f9f1 Mon Sep 17 00:00:00 2001 From: Karen Arutyunov Date: Sat, 10 Sep 2016 22:51:55 +0300 Subject: Move tests and examples to build2 as subprojects --- buildfile | 5 +++-- examples/.gitignore | 1 + examples/build/.gitignore | 1 + examples/build/bootstrap.build | 5 +++++ examples/build/root.build | 10 ++++++++++ examples/buildfile | 5 +++++ examples/hybrid/buildfile | 4 ++++ examples/inheritance/buildfile | 4 ++++ examples/performance/buildfile | 4 ++++ examples/persistence/buildfile | 4 ++++ examples/processing/buildfile | 4 ++++ examples/roundtrip/buildfile | 4 ++++ examples/xhtml/buildfile | 3 +++ tests/.gitignore | 1 + tests/build/.gitignore | 1 + tests/build/bootstrap.build | 5 +++++ tests/build/root.build | 10 ++++++++++ tests/buildfile | 3 +++ tests/parser/buildfile | 3 +++ tests/roundtrip/.gitignore | 5 +++++ tests/roundtrip/buildfile | 23 +++++++++++++++++++++++ tests/serializer/buildfile | 3 +++ 22 files changed, 106 insertions(+), 2 deletions(-) create mode 100644 examples/.gitignore create mode 100644 examples/build/.gitignore create mode 100644 examples/build/bootstrap.build create mode 100644 examples/build/root.build create mode 100644 examples/buildfile create mode 100644 examples/hybrid/buildfile create mode 100644 examples/inheritance/buildfile create mode 100644 examples/performance/buildfile create mode 100644 examples/persistence/buildfile create mode 100644 examples/processing/buildfile create mode 100644 examples/roundtrip/buildfile create mode 100644 examples/xhtml/buildfile create mode 100644 tests/.gitignore create mode 100644 tests/build/.gitignore create mode 100644 tests/build/bootstrap.build create mode 100644 tests/build/root.build create mode 100644 tests/buildfile create mode 100644 tests/parser/buildfile create mode 100644 tests/roundtrip/.gitignore create mode 100644 tests/roundtrip/buildfile create mode 100644 tests/serializer/buildfile diff --git a/buildfile b/buildfile index 92e7c19..aada460 100644 --- a/buildfile +++ b/buildfile @@ -2,11 +2,12 @@ # copyright : Copyright (c) 2013-2014 Code Synthesis Tools CC # license : MIT; see accompanying LICENSE file -d = xml/ doc/ +d = xml/ examples/ tests/ doc/ ./: $d doc{INSTALL LICENSE NEWS README version} file{manifest} include $d -# Don't install tests or the INSTALL file. +# Don't install examples, tests or the INSTALL file. # +dir{examples/}: install = false dir{tests/}: install = false doc{INSTALL}@./: install = false diff --git a/examples/.gitignore b/examples/.gitignore new file mode 100644 index 0000000..e54525b --- /dev/null +++ b/examples/.gitignore @@ -0,0 +1 @@ +driver diff --git a/examples/build/.gitignore b/examples/build/.gitignore new file mode 100644 index 0000000..225c27f --- /dev/null +++ b/examples/build/.gitignore @@ -0,0 +1 @@ +config.build diff --git a/examples/build/bootstrap.build b/examples/build/bootstrap.build new file mode 100644 index 0000000..2c2de24 --- /dev/null +++ b/examples/build/bootstrap.build @@ -0,0 +1,5 @@ +project = # Unnamed subproject. + +using config +using dist +using test diff --git a/examples/build/root.build b/examples/build/root.build new file mode 100644 index 0000000..1f7c350 --- /dev/null +++ b/examples/build/root.build @@ -0,0 +1,10 @@ +cxx.std = 11 + +using cxx + +hxx{*}: extension = +cxx{*}: extension = cxx + +# Every exe{} in this subproject is by default a test. +# +exe{*}: test = true diff --git a/examples/buildfile b/examples/buildfile new file mode 100644 index 0000000..b089d1b --- /dev/null +++ b/examples/buildfile @@ -0,0 +1,5 @@ +d = hybrid/ inheritance/ performance/ persistence/ processing/ roundtrip/ \ + xhtml/ + +./: $d +include $d diff --git a/examples/hybrid/buildfile b/examples/hybrid/buildfile new file mode 100644 index 0000000..44709de --- /dev/null +++ b/examples/hybrid/buildfile @@ -0,0 +1,4 @@ +import libs = libstudxml%lib{studxml} + +exe{driver}: cxx{dom driver} $libs +exe{driver}: test.input = position.xml diff --git a/examples/inheritance/buildfile b/examples/inheritance/buildfile new file mode 100644 index 0000000..a0f2d9c --- /dev/null +++ b/examples/inheritance/buildfile @@ -0,0 +1,4 @@ +import libs = libstudxml%lib{studxml} + +exe{driver}: cxx{driver position} $libs +exe{driver}: test.input = position.xml diff --git a/examples/performance/buildfile b/examples/performance/buildfile new file mode 100644 index 0000000..e4a33b3 --- /dev/null +++ b/examples/performance/buildfile @@ -0,0 +1,4 @@ +import libs = libstudxml%lib{studxml} + +exe{driver}: cxx{driver time} $libs +exe{driver}: test.input = test-50k.xml diff --git a/examples/persistence/buildfile b/examples/persistence/buildfile new file mode 100644 index 0000000..a0f2d9c --- /dev/null +++ b/examples/persistence/buildfile @@ -0,0 +1,4 @@ +import libs = libstudxml%lib{studxml} + +exe{driver}: cxx{driver position} $libs +exe{driver}: test.input = position.xml diff --git a/examples/processing/buildfile b/examples/processing/buildfile new file mode 100644 index 0000000..138992c --- /dev/null +++ b/examples/processing/buildfile @@ -0,0 +1,4 @@ +import libs = libstudxml%lib{studxml} + +exe{driver}: cxx{driver} $libs +exe{driver}: test.input = position.xml diff --git a/examples/roundtrip/buildfile b/examples/roundtrip/buildfile new file mode 100644 index 0000000..138992c --- /dev/null +++ b/examples/roundtrip/buildfile @@ -0,0 +1,4 @@ +import libs = libstudxml%lib{studxml} + +exe{driver}: cxx{driver} $libs +exe{driver}: test.input = position.xml diff --git a/examples/xhtml/buildfile b/examples/xhtml/buildfile new file mode 100644 index 0000000..3f8cb7d --- /dev/null +++ b/examples/xhtml/buildfile @@ -0,0 +1,3 @@ +import libs = libstudxml%lib{studxml} + +exe{driver}: cxx{driver} $libs diff --git a/tests/.gitignore b/tests/.gitignore new file mode 100644 index 0000000..e54525b --- /dev/null +++ b/tests/.gitignore @@ -0,0 +1 @@ +driver diff --git a/tests/build/.gitignore b/tests/build/.gitignore new file mode 100644 index 0000000..225c27f --- /dev/null +++ b/tests/build/.gitignore @@ -0,0 +1 @@ +config.build diff --git a/tests/build/bootstrap.build b/tests/build/bootstrap.build new file mode 100644 index 0000000..2c2de24 --- /dev/null +++ b/tests/build/bootstrap.build @@ -0,0 +1,5 @@ +project = # Unnamed subproject. + +using config +using dist +using test diff --git a/tests/build/root.build b/tests/build/root.build new file mode 100644 index 0000000..1f7c350 --- /dev/null +++ b/tests/build/root.build @@ -0,0 +1,10 @@ +cxx.std = 11 + +using cxx + +hxx{*}: extension = +cxx{*}: extension = cxx + +# Every exe{} in this subproject is by default a test. +# +exe{*}: test = true diff --git a/tests/buildfile b/tests/buildfile new file mode 100644 index 0000000..2058084 --- /dev/null +++ b/tests/buildfile @@ -0,0 +1,3 @@ +d = parser/ roundtrip/ serializer/ +./: $d +include $d diff --git a/tests/parser/buildfile b/tests/parser/buildfile new file mode 100644 index 0000000..3f8cb7d --- /dev/null +++ b/tests/parser/buildfile @@ -0,0 +1,3 @@ +import libs = libstudxml%lib{studxml} + +exe{driver}: cxx{driver} $libs diff --git a/tests/roundtrip/.gitignore b/tests/roundtrip/.gitignore new file mode 100644 index 0000000..cee4aa4 --- /dev/null +++ b/tests/roundtrip/.gitignore @@ -0,0 +1,5 @@ +attr-driver +char-driver +fup1-driver +fup2-driver +ns-driver diff --git a/tests/roundtrip/buildfile b/tests/roundtrip/buildfile new file mode 100644 index 0000000..9dd9858 --- /dev/null +++ b/tests/roundtrip/buildfile @@ -0,0 +1,23 @@ +# @@ Hack until build2 supports multiple tests. Also remove .gitignore. +# +./: exe{attr-driver} exe{char-driver} exe{fup1-driver} exe{fup2-driver} \ + exe{ns-driver} + +exe{attr-driver}: cxx{driver} +exe{attr-driver}: test.roundtrip = attribute.xml + +exe{char-driver}: cxx{driver} +exe{char-driver}: test.roundtrip = characters.xml + +exe{fup1-driver}: cxx{driver} +exe{fup1-driver}: test.roundtrip = followup-1.xml + +exe{fup2-driver}: cxx{driver} +exe{fup2-driver}: test.roundtrip = followup-2.xml + +exe{ns-driver}: cxx{driver} +exe{ns-driver}: test.roundtrip = namespace.xml + +import libs = libstudxml%lib{studxml} + +exe{attr-driver char-driver fup1-driver fup2-driver ns-driver}: $libs diff --git a/tests/serializer/buildfile b/tests/serializer/buildfile new file mode 100644 index 0000000..3f8cb7d --- /dev/null +++ b/tests/serializer/buildfile @@ -0,0 +1,3 @@ +import libs = libstudxml%lib{studxml} + +exe{driver}: cxx{driver} $libs -- cgit v1.1