From 7bafa453dade475c32c9963f1a93162835abd91e Mon Sep 17 00:00:00 2001 From: ADAM David Alan Martin Date: Thu, 12 Oct 2023 18:36:37 -0400 Subject: [PATCH] More testing. --- CMakeLists.txt | 1 + Testing/CMakeLists.txt | 1 + Testing/Makefile | 3 --- Testing/TableTest.test/CMakeLists.txt | 2 ++ Testing/{ => TableTest.test}/test.cc | 0 Testing/{ => TableTest.test}/test2.cc | 0 helpful-things/Makefile | 13 +++++++++++++ 7 files changed, 17 insertions(+), 3 deletions(-) create mode 100644 Testing/CMakeLists.txt delete mode 100644 Testing/Makefile create mode 100644 Testing/TableTest.test/CMakeLists.txt rename Testing/{ => TableTest.test}/test.cc (100%) rename Testing/{ => TableTest.test}/test2.cc (100%) create mode 100644 helpful-things/Makefile diff --git a/CMakeLists.txt b/CMakeLists.txt index 790e53c..24be548 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -20,6 +20,7 @@ link_libraries( alepha ) add_subdirectory( Meta ) add_subdirectory( Proof ) add_subdirectory( Reflection ) +add_subdirectory( Testing ) # The local subdir tests to build add_subdirectory( AutoRAII.test ) diff --git a/Testing/CMakeLists.txt b/Testing/CMakeLists.txt new file mode 100644 index 0000000..3d2bf00 --- /dev/null +++ b/Testing/CMakeLists.txt @@ -0,0 +1 @@ +add_subdirectory( TableTest.test ) diff --git a/Testing/Makefile b/Testing/Makefile deleted file mode 100644 index 3ec6ce7..0000000 --- a/Testing/Makefile +++ /dev/null @@ -1,3 +0,0 @@ -CXXFLAGS+= -std=c++17 -I ../ - -all: test diff --git a/Testing/TableTest.test/CMakeLists.txt b/Testing/TableTest.test/CMakeLists.txt new file mode 100644 index 0000000..f75bd65 --- /dev/null +++ b/Testing/TableTest.test/CMakeLists.txt @@ -0,0 +1,2 @@ +unit_test( test ) +unit_test( test2 ) diff --git a/Testing/test.cc b/Testing/TableTest.test/test.cc similarity index 100% rename from Testing/test.cc rename to Testing/TableTest.test/test.cc diff --git a/Testing/test2.cc b/Testing/TableTest.test/test2.cc similarity index 100% rename from Testing/test2.cc rename to Testing/TableTest.test/test2.cc diff --git a/helpful-things/Makefile b/helpful-things/Makefile new file mode 100644 index 0000000..0cef424 --- /dev/null +++ b/helpful-things/Makefile @@ -0,0 +1,13 @@ +# You can use this makefile in your +# build directory to drive ninja builds. + +__primary: test + +all: + ninja -v -j19 all + +clean: + ninja clean + +test: all + ninja test