8000 Move all tests to tests dir and use ctest for pretty-print testing · arangodb/arangodb@b878290 · GitHub
[go: up one dir, main page]
Skip to content

Commit b878290

Browse files
jvolmerjvolmer
committed
Move all tests to tests dir and use ctest for pretty-print testing
1 parent 86b4eb1 commit b878290

File tree

12 files changed

+23
-31
lines changed

12 files changed

+23
-31
lines changed

‎arangod/AsyncRegistryServer/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,4 +6,3 @@ target_link_libraries(arangoserver
66
arango_async_registry_stacktrace)
77

88
add_subdirectory(Stacktrace)
9-
add_subdirectory(PrettyPrinter)

‎arangod/AsyncRegistryServer/PrettyPrinter/CMakeLists.txt

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎arangod/AsyncRegistryServer/PrettyPrinter/README.md

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -16,18 +16,11 @@ This ensures that the pretty-printer is loaded to gdb. You can check if it is lo
1616

1717
### Run tests
1818

19-
Run all tests via
20-
```
21-
cmake --build --target async_registry_pretty_printer_test
22-
```
23-
2419
#### Unit tests
2520

26-
Inside src-folder run unittests via
2721
```
28-
python3 -m unittest discover
22+
ctest --build -R async_registry_python_pretty_printer_test
2923
```
30-
or use cmake via `cmake --build --target async_registry_pretty_printer_python_test`.
3124

3225
#### Integration tests using gdb
3326

‎arangod/AsyncRegistryServer/PrettyPrinter/src/CMakeLists.txt

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎tests/AsyncRegistryServer/PrettyPrinter/CMakeLists.txt

Lines changed: 2 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,2 @@
1-
add_executable(async_registry_gdb_pretty_printer
2-
async_registry_gdb_pretty_printer_test.cpp)
3-
target_link_libraries(async_registry_gdb_pretty_printer
4-
PRIVATE
5-
arango_async_registry
6-
arango
7-
)
8-
9-
add_test(NAME async_registry_gdb_pretty_printer_test
10-
COMMAND gdb
11-
$<TARGET_FILE:async_registry_gdb_pretty_printer>
12-
-ix ${PROJECT_SOURCE_DIR}/arangod/AsyncRegistryServer/PrettyPrinter/.gdbinit
13-
-x ${CMAKE_CURRENT_SOURCE_DIR}/test.gdbscript
14-
-batch
15-
16-
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})
17-
18-
add_custom_target(async_registry_pretty_printer_test ALL COMMAND ${CMAKE_CTEST_COMMAND}
19-
DEPENDS async_registry_gdb_pretty_printer)
1+
add_subdirectory(gdb_integration)
2+
add_subdirectory(unittests)

‎tests/AsyncRegistryServer/PrettyPrinter/gdb_integration/CMakeLists.txt

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,16 @@
1+
add_executable(async_registry_gdb_pretty_printer
2+
async_registry_gdb_pretty_printer_test.cpp)
3+
target_link_libraries(async_registry_gdb_pretty_printer
4+
PRIVATE
5+
arango_async_registry
6+
arango
7+
)
8+
9+
add_test(NAME async_registry_gdb_pretty_printer_test
10+
COMMAND gdb
11+
$<TARGET_FILE:async_registry_gdb_pretty_printer>
12+
-ix ${PROJECT_SOURCE_DIR}/arangod/AsyncRegistryServer/PrettyPrinter/.gdbinit
13+
-x ${CMAKE_CURRENT_SOURCE_DIR}/test.gdbscript
14+
-batch
15+
16+
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR})

‎tests/AsyncRegistryServer/PrettyPrinter/async_registry_gdb_pretty_printer_test.cpp renamed to ‎tests/AsyncRegistryServer/PrettyPrinter/gdb_integration/async_registry_gdb_pretty_printer_test.cpp

File renamed without changes.

‎tests/AsyncRegistryServer/PrettyPrinter/test.gdbscript renamed to ‎tests/AsyncRegistryServer/PrettyPrinter/gdb_integration/test.gdbscript

File renamed without changes.

‎tests/AsyncRegistryServer/PrettyPrinter/unittests/CMakeLists.txt

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
add_test(NAME async_registry_python_pretty_printer_test
2+
COMMAND ${PYTHON_EXECUTABLE} -m unittest discover ${CMAKE_CURRENT_SOURCE_DIR}
3+
4+
WORKING_DIRECTORY ${PROJECT_SOURCE_DIR}/arangod/AsyncRegistryServer/PrettyPrinter/src)

‎arangod/AsyncRegistryServer/PrettyPrinter/src/tests/__init__.py renamed to ‎tests/AsyncRegistryServer/PrettyPrinter/unittests/tests/__init__.py

File renamed without changes.

‎arangod/AsyncRegistryServer/PrettyPrinter/src/tests/test_forest.py renamed to ‎tests/AsyncRegistryServer/PrettyPrinter/unittests/tests/test_forest.py

File renamed without changes.

‎arangod/AsyncRegistryServer/PrettyPrinter/src/tests/test_stacktrace.py renamed to ‎tests/AsyncRegistryServer/PrettyPrinter/unittests/tests/test_stacktrace.py

File renamed without changes.

0 commit comments

Comments
 (0)
0