diff options
| author | WBoerenkamps <wrj.boerenkamps@student.avans.nl> | 2024-09-27 14:00:57 +0200 |
|---|---|---|
| committer | WBoerenkamps <wrj.boerenkamps@student.avans.nl> | 2024-09-27 14:00:57 +0200 |
| commit | a78f7bbfcdabad9550afe22f615b973b92cb074f (patch) | |
| tree | 318e888219965634e3b81be9b74a0522af2136e0 /test | |
| parent | 86a7bd1aee2ee96079e00e2696a624fd6b642fa0 (diff) | |
| parent | f4560e02f703f1c6f857c8e5af63fa9fc4ca6438 (diff) | |
fixed merge conflict
Diffstat (limited to 'test')
| -rw-r--r-- | test/dummy.cpp | 5 | ||||
| -rw-r--r-- | test/makefile | 7 |
2 files changed, 1 insertions, 11 deletions
diff --git a/test/dummy.cpp b/test/dummy.cpp index 08850b2..a00a9c6 100644 --- a/test/dummy.cpp +++ b/test/dummy.cpp @@ -1,6 +1,3 @@ #include <gtest/gtest.h> -TEST(dummy, foo) { - ASSERT_TRUE(1); -} - +TEST(dummy, foo) { ASSERT_TRUE(1); } diff --git a/test/makefile b/test/makefile deleted file mode 100644 index 7aeee34..0000000 --- a/test/makefile +++ /dev/null @@ -1,7 +0,0 @@ -TARGET = $(BUILD_DIR)/test - -include ../lazy.mk - -test: $(TARGET) FORCE - $(TARGET) - |