refactor(tests): Move unit test files to unittests folder (#96)

arxlang · May 31, 2023 · 2349e1a · 2349e1a
1 parent 12d71d4
commit 2349e1a
Show file tree

Hide file tree

Showing 19 changed files with 7 additions and 7 deletions.
diff --git a/.makim.yaml b/.makim.yaml
@@ -268,7 +268,7 @@ groups:
               ${CLANG_EXTRA} \
               ${DEBUG_FLAGS} \
               -fPIC \
-              "${TEST_DIR_PATH}/main-objects/${test_name}.cpp" \
+              "${TEST_DIR_PATH}/integration/${test_name}.cpp" \
               ${OBJECT_FILE} \
               -o "${TMP_DIR}/main"
             set +x
@@ -346,15 +346,15 @@ groups:
       gen-all-examples:
         help: Test all code generation for the example arx files
         dependencies:
-          - target: tests.gen-object-examples
           - target: tests.gen-ast-examples
+          - target: tests.gen-object-examples
           - target: tests.gen-llvm-ir-examples
 
       all:
         help: Run sanitizer tests and code generation for examples
         dependencies:
           - target: tests.sanitizer
-          - target: tests.examples
+          - target: tests.gen-all-examples
 
       lint:
         help: Run linter tools

diff --git a/c b/c
diff --git a/meson.build b/meson.build
@@ -72,7 +72,7 @@ gmock_dep = dependency('gmock', required: get_option('dev'))
 
 if get_option('dev').enabled()
   deps += [gtest_dep, gmock_dep]
-  subdir('tests')
+  subdir('tests/unittests')
 endif
 
 clangtidy = find_program('clang-tidy', required: get_option('dev'))

diff --git a/src/codegen/ast-to-object.cpp b/src/codegen/ast-to-object.cpp
@@ -772,7 +772,7 @@ auto compile_object(TreeAST& tree_ast) -> int {
        ${DEBUG_FLAGS} \
        -fPIC \
        -std=c++20 \
-       "${TEST_DIR_PATH}/main-objects/${test_name}.cpp" \
+       "${TEST_DIR_PATH}/integration/${test_name}.cpp" \
        ${OBJECT_FILE} \
        -o "${TMP_DIR}/main"
   */

diff --git a/tests/main-objects/average.cpp → tests/integration/average.cpp b/tests/main-objects/average.cpp → tests/integration/average.cpp
diff --git a/tests/main-objects/constant.cpp → tests/integration/constant.cpp b/tests/main-objects/constant.cpp → tests/integration/constant.cpp
diff --git a/tests/main-objects/fibonacci.cpp → tests/integration/fibonacci.cpp b/tests/main-objects/fibonacci.cpp → tests/integration/fibonacci.cpp
diff --git a/tests/main-objects/print-star.cpp → tests/integration/print-star.cpp b/tests/main-objects/print-star.cpp → tests/integration/print-star.cpp
diff --git a/tests/main-objects/sum.cpp → tests/integration/sum.cpp b/tests/main-objects/sum.cpp → tests/integration/sum.cpp
diff --git a/tests/codegen/test-ast-to-llvm-ir.cpp → ...unittests/codegen/test-ast-to-llvm-ir.cpp b/tests/codegen/test-ast-to-llvm-ir.cpp → ...unittests/codegen/test-ast-to-llvm-ir.cpp
diff --git a/tests/codegen/test-ast-to-object.cpp → .../unittests/codegen/test-ast-to-object.cpp b/tests/codegen/test-ast-to-object.cpp → .../unittests/codegen/test-ast-to-object.cpp
diff --git a/tests/codegen/test-ast-to-stdout.cpp → .../unittests/codegen/test-ast-to-stdout.cpp b/tests/codegen/test-ast-to-stdout.cpp → .../unittests/codegen/test-ast-to-stdout.cpp
diff --git a/tests/main.cpp → tests/unittests/main.cpp b/tests/main.cpp → tests/unittests/main.cpp
diff --git a/tests/meson.build → tests/unittests/meson.build b/tests/meson.build → tests/unittests/meson.build
@@ -5,7 +5,7 @@ arx_build_lib = static_library(
   install : false,
   dependencies : deps)
 
-TESTS_PATH = PROJECT_PATH + '/tests'
+TESTS_PATH = PROJECT_PATH + '/tests/unittests'
 
 test_suite = [
   ['error', files(TESTS_PATH + '/test-error.cpp')],
@@ -20,7 +20,7 @@ test_suite = [
 
 foreach test_item : test_suite
     test_name = test_item[0]
-    test_src_files = test_item[1] + files(PROJECT_PATH + '/tests/main.cpp')
+    test_src_files = test_item[1] + files(TESTS_PATH + '/main.cpp')
 
     executable_name_suffix = test_name + '_tests'
     test_executable = executable(

diff --git a/tests/test-error.cpp → tests/unittests/test-error.cpp b/tests/test-error.cpp → tests/unittests/test-error.cpp
diff --git a/tests/test-io.cpp → tests/unittests/test-io.cpp b/tests/test-io.cpp → tests/unittests/test-io.cpp
diff --git a/tests/test-lexer.cpp → tests/unittests/test-lexer.cpp b/tests/test-lexer.cpp → tests/unittests/test-lexer.cpp
diff --git a/tests/test-parser.cpp → tests/unittests/test-parser.cpp b/tests/test-parser.cpp → tests/unittests/test-parser.cpp
diff --git a/tests/test-utils.cpp → tests/unittests/test-utils.cpp b/tests/test-utils.cpp → tests/unittests/test-utils.cpp