Changes according to code review

Generating rootmaps and shared libraries for the tests using cmake.
Fix formatting.

Author: Vipul-Cariappa

bindings/pyroot/cppyy/cppyy/test/CMakeLists.txt

@@ -4,13 +4,58 @@
 # For the licensing terms see $ROOTSYS/LICENSE.
 # For the list of contributors see $ROOTSYS/README/CREDITS.
 
-add_custom_target(cppyy_tests_dict ALL COMMAND make all WORKING_DIRECTORY ${CMAKE_SOURCE_DIR}/bindings/pyroot/cppyy/cppyy/test)
+# Dictionary list
+set(CPPYY_TEST_DICTS
+advancedcpp
+advancedcpp2
+conversions
+cpp11features
+crossinheritance
+datatypes
+doc_helper
+example01
+fragile
+operators
+overloads
+pythonizables
+std_streams
+templates
+stltypes)
 
-file(GLOB CPPYY_TEST_SRC "test_*.py")
+foreach(DICT ${CPPYY_TEST_DICTS})
+    # Generate dictionary for the tests
+    ROOT_GENERATE_DICTIONARY(G__${DICT} ${CMAKE_CURRENT_SOURCE_DIR}/${DICT}.h ${CMAKE_CURRENT_SOURCE_DIR}/${DICT}.xml NOINSTALL)
+    # Create shared necessary libraries for the tests
+    ROOT_LINKER_LIBRARY(${DICT} ${CMAKE_CURRENT_SOURCE_DIR}/${DICT}.cxx NOINSTALL LIBRARIES Python3::Python)
+endforeach()
 
-foreach(CPPYY_TEST_FILE ${CPPYY_TEST_SRC})
-    get_filename_component(CPPYY_TEST_FILE_NAME ${CPPYY_TEST_FILE} NAME)
-    string(REPLACE ".py" "" CPPYY_TEST_FILE_NO_EXT ${CPPYY_TEST_FILE_NAME})
+# Tests list
+set(CPPYY_TESTS
+test_aclassloader
+test_advancedcpp
+test_api
+test_boost
+test_conversions
+test_cpp11features
+test_crossinheritance
+test_datatypes
+test_doc_features
+test_eigen
+test_fragile
+test_leakcheck
+test_lowlevel
+test_numba
+test_operators
+test_overloads
+test_pythonify
+test_pythonization
+test_regression
+test_stltypes
+test_streams
+test_templates
+test_concurrent)
 
-    ROOT_ADD_PYUNITTEST(${CPPYY_TEST_FILE_NO_EXT} ${CPPYY_TEST_FILE_NAME} GENERIC PYTHON_DEPS pytest ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_CURRENT_SOURCE_DIR})
+# Configure the tests
+foreach(TEST ${CPPYY_TESTS})
+    ROOT_ADD_PYUNITTEST(${TEST} ${TEST}.py GENERIC ENVIRONMENT LD_LIBRARY_PATH=${CMAKE_CURRENT_SOURCE_DIR} PYTHON_DEPS pytest)
 endforeach()

bindings/pyroot/cppyy/cppyy/test/test_concurrent.py

@@ -304,5 +304,6 @@ def test(i, state=State):
         assert State.c1 == 1000
         assert State.c2 == State.c3
 
+
 if __name__ == "__main__":
     exit(pytest.main(args=[__file__]))