diff options
Diffstat (limited to 'unit-tests')
| -rw-r--r-- | unit-tests/.gitignore | 5 | ||||
| -rw-r--r-- | unit-tests/function/driver.cxx | 16 | ||||
| -rw-r--r-- | unit-tests/lexer/driver.cxx | 8 | ||||
| -rw-r--r-- | unit-tests/scheduler/driver.cxx | 6 | ||||
| -rw-r--r-- | unit-tests/test/script/lexer/driver.cxx | 8 | ||||
| -rw-r--r-- | unit-tests/test/script/parser/directive.test | 4 | ||||
| -rw-r--r-- | unit-tests/test/script/parser/driver.cxx | 18 | ||||
| -rw-r--r-- | unit-tests/test/script/regex/driver.cxx | 2 |
8 files changed, 36 insertions, 31 deletions
diff --git a/unit-tests/.gitignore b/unit-tests/.gitignore index e54525b..eac2bb8 100644 --- a/unit-tests/.gitignore +++ b/unit-tests/.gitignore @@ -1 +1,6 @@ driver + +# The immediate test/ sub-directory shouldn't be ignored. +# +*/test/ +test-*/ diff --git a/unit-tests/function/driver.cxx b/unit-tests/function/driver.cxx index 70fd69e..4650a18 100644 --- a/unit-tests/function/driver.cxx +++ b/unit-tests/function/driver.cxx @@ -4,14 +4,14 @@ #include <iostream> -#include <build2/types> -#include <build2/utility> - -#include <build2/parser> -#include <build2/context> -#include <build2/function> -#include <build2/variable> -#include <build2/diagnostics> +#include <build2/types.hxx> +#include <build2/utility.hxx> + +#include <build2/parser.hxx> +#include <build2/context.hxx> +#include <build2/function.hxx> +#include <build2/variable.hxx> +#include <build2/diagnostics.hxx> using namespace std; diff --git a/unit-tests/lexer/driver.cxx b/unit-tests/lexer/driver.cxx index 41366ec..5bbefb9 100644 --- a/unit-tests/lexer/driver.cxx +++ b/unit-tests/lexer/driver.cxx @@ -5,11 +5,11 @@ #include <cassert> #include <iostream> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/token> -#include <build2/lexer> +#include <build2/token.hxx> +#include <build2/lexer.hxx> using namespace std; diff --git a/unit-tests/scheduler/driver.cxx b/unit-tests/scheduler/driver.cxx index 2e20937..31551f2 100644 --- a/unit-tests/scheduler/driver.cxx +++ b/unit-tests/scheduler/driver.cxx @@ -8,10 +8,10 @@ #include <cassert> #include <iostream> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/scheduler> +#include <build2/scheduler.hxx> using namespace std; diff --git a/unit-tests/test/script/lexer/driver.cxx b/unit-tests/test/script/lexer/driver.cxx index 229c3b6..9ff393b 100644 --- a/unit-tests/test/script/lexer/driver.cxx +++ b/unit-tests/test/script/lexer/driver.cxx @@ -5,11 +5,11 @@ #include <cassert> #include <iostream> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/test/script/token> -#include <build2/test/script/lexer> +#include <build2/test/script/token.hxx> +#include <build2/test/script/lexer.hxx> using namespace std; diff --git a/unit-tests/test/script/parser/directive.test b/unit-tests/test/script/parser/directive.test index d735fb4..39bd666 100644 --- a/unit-tests/test/script/parser/directive.test +++ b/unit-tests/test/script/parser/directive.test @@ -46,11 +46,11 @@ EOI : var-expansion : -cat <<EOI >="foo-$(build.version).test"; +cat <<EOI >="foo-$(build.verson.project).test"; cmd EOI $* <<EOI >>EOO -.include "foo-$(build.version).test" +.include "foo-$(build.verson.project).test" EOI cmd EOO diff --git a/unit-tests/test/script/parser/driver.cxx b/unit-tests/test/script/parser/driver.cxx index 772bc10..fceb477 100644 --- a/unit-tests/test/script/parser/driver.cxx +++ b/unit-tests/test/script/parser/driver.cxx @@ -5,18 +5,18 @@ #include <cassert> #include <iostream> -#include <build2/types> -#include <build2/utility> +#include <build2/types.hxx> +#include <build2/utility.hxx> -#include <build2/target> -#include <build2/context> // reset() -#include <build2/scheduler> +#include <build2/target.hxx> +#include <build2/context.hxx> // reset() +#include <build2/scheduler.hxx> -#include <build2/test/target> +#include <build2/test/target.hxx> -#include <build2/test/script/token> -#include <build2/test/script/parser> -#include <build2/test/script/runner> +#include <build2/test/script/token.hxx> +#include <build2/test/script/parser.hxx> +#include <build2/test/script/runner.hxx> using namespace std; diff --git a/unit-tests/test/script/regex/driver.cxx b/unit-tests/test/script/regex/driver.cxx index 2680672..fd35f2a 100644 --- a/unit-tests/test/script/regex/driver.cxx +++ b/unit-tests/test/script/regex/driver.cxx @@ -5,7 +5,7 @@ #include <regex> #include <type_traits> // is_pod, is_array -#include <build2/test/script/regex> +#include <build2/test/script/regex.hxx> using namespace std; using namespace build2::test::script::regex; |