diff options
| author | Bent Bisballe Nyeng <deva@aasimon.org> | 2021-09-27 21:32:17 +0200 |
|---|---|---|
| committer | Bent Bisballe Nyeng <deva@aasimon.org> | 2021-09-27 21:32:17 +0200 |
| commit | e73ee708292aac55070701ff0157db4eab6c06f4 (patch) | |
| tree | c377bc83c6975e5a75b4445afda43407d720e904 /test | |
| parent | f30d40ec44e7bb4dda5cdd75e9761d67288af4a7 (diff) | |
Add folder hierarchy in build folder corresponding to that of the source folders and store build-files in corresponding locations.
Diffstat (limited to 'test')
| -rw-r--r-- | test/source_type_test.cc | 2 | ||||
| -rw-r--r-- | test/tasks_test.cc | 20 |
2 files changed, 11 insertions, 11 deletions
diff --git a/test/source_type_test.cc b/test/source_type_test.cc index 2da1ac4..47d820d 100644 --- a/test/source_type_test.cc +++ b/test/source_type_test.cc @@ -29,7 +29,7 @@ class TestableTaskCC { public: TestableTaskCC(const Source& source) - : TaskCC({}, {}, {}, source) + : TaskCC({}, {}, "build", source) {} Language language() const diff --git a/test/tasks_test.cc b/test/tasks_test.cc index d6515b8..612d899 100644 --- a/test/tasks_test.cc +++ b/test/tasks_test.cc @@ -100,29 +100,29 @@ public: auto tasks = getTasks(settings); uASSERT_EQUAL(6u, tasks.size()); auto task = tasks.begin(); - uASSERT_EQUAL("target1-foo_cc.o"s, (*task)->target()); + uASSERT_EQUAL("test/target1-foo_cc.o"s, (*task)->target()); task++; - uASSERT_EQUAL("target1-bar_c.o"s, (*task)->target()); + uASSERT_EQUAL("test/target1-bar_c.o"s, (*task)->target()); task++; - uASSERT_EQUAL("target1"s, (*task)->target()); + uASSERT_EQUAL("test/target1"s, (*task)->target()); task++; - uASSERT_EQUAL("target2"s, (*task)->target()); + uASSERT_EQUAL("test/target2"s, (*task)->target()); task++; - uASSERT_EQUAL("target3"s, (*task)->target()); + uASSERT_EQUAL("test/target3"s, (*task)->target()); task++; - uASSERT_EQUAL("target4"s, (*task)->target()); + uASSERT_EQUAL("test/target4"s, (*task)->target()); } { auto tasks = getTasks(settings, {"target1", "target3"}); uASSERT_EQUAL(4u, tasks.size()); auto task = tasks.begin(); - uASSERT_EQUAL("target1-foo_cc.o"s, (*task)->target()); + uASSERT_EQUAL("test/target1-foo_cc.o"s, (*task)->target()); task++; - uASSERT_EQUAL("target1-bar_c.o"s, (*task)->target()); + uASSERT_EQUAL("test/target1-bar_c.o"s, (*task)->target()); task++; - uASSERT_EQUAL("target1"s, (*task)->target()); + uASSERT_EQUAL("test/target1"s, (*task)->target()); task++; - uASSERT_EQUAL("target3"s, (*task)->target()); + uASSERT_EQUAL("test/target3"s, (*task)->target()); } { auto tasks = getTasks(settings, {"no-such-target"}); |