triage tests

najaeda · Jul 25, 2023 · 5684f31 · 5684f31
1 parent 219a4d9
commit 5684f31
Show file tree

Hide file tree

Showing 3 changed files with 22 additions and 7 deletions.
diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml
@@ -45,6 +45,13 @@ jobs:
       working-directory: ${{github.workspace}}/build/test/snl/snl/kernel
       run: valgrind --error-exitcode=1 --show-leak-kinds=all --leak-check=full --errors-for-leak-kinds=all ./snlTests
 
+    - name: TestSNLKernelWithPyLoader
+      working-directory: ${{github.workspace}}/build/test/snl/snl/kernel
+      env:
+        PYTHONPATH: ${{env.PYTHONPATH}}:${{github.workspace}}/build/src/snl/python/snl_wrapping
+        PYTHONMALLOC: malloc
+      run: valgrind --error-exitcode=1 --show-leak-kinds=definite --leak-check=full --errors-for-leak-kinds=definite ./snlTestsWithPyLoader
+
     - name: TestSNLDump
       working-directory: ${{github.workspace}}/build/test/snl/snl/serialization/capnp
       run: valgrind --error-exitcode=1 --show-leak-kinds=all --leak-check=full --errors-for-leak-kinds=all ./snlCapnPTests
@@ -64,9 +71,9 @@ jobs:
       working-directory: ${{github.workspace}}/build/test/snl/formats/verilog/backend
       run: valgrind --error-exitcode=1 --show-leak-kinds=all --leak-check=full --errors-for-leak-kinds=all ./snlVRLDumperTests
 
-    - name: TestSNLPrimitives
-      working-directory: ${{github.workspace}}/build/test/snl/python/primitives
+    - name: TestSNLPyLoader
+      working-directory: ${{github.workspace}}/build/test/snl/python/pyloader
       env:
         PYTHONPATH: ${{env.PYTHONPATH}}:${{github.workspace}}/build/src/snl/python/snl_wrapping
         PYTHONMALLOC: malloc
-      run: valgrind --error-exitcode=1 --show-leak-kinds=definite --leak-check=full --errors-for-leak-kinds=definite ./snlPrimitivesTests --gtest_filter=-"*testFaultyPythonScript*" 
+      run: valgrind --error-exitcode=1 --show-leak-kinds=definite --leak-check=full --errors-for-leak-kinds=definite ./snlPyLoaderTests --gtest_filter=-"*testFaultyPythonScript*" 
diff --git a/src/snl/python/pyloader/SNLPyLoader.cpp b/src/snl/python/pyloader/SNLPyLoader.cpp
@@ -107,7 +107,6 @@ void SNLPyLoader::loadDB(
   Py_DECREF(pyDB);
   Py_DECREF(constructString);
   Py_Finalize();
-
 }
 
 void SNLPyLoader::loadPrimitives(

diff --git a/test/snl/snl/kernel/CMakeLists.txt b/test/snl/snl/kernel/CMakeLists.txt
@@ -8,18 +8,27 @@ SET(snl_tests
   SNLNetTest.cpp #SNLLargeDBTest.cpp
   SNLPathTest0.cpp SNLPathTest1.cpp
   SNLOccurrenceTest.cpp
-  SNLEquipotentialTest.cpp
   SNLParameterTest.cpp
   SNLDB0Test.cpp
 )
 
+SET(snl_tests_with_pyloader
+  SNLEquipotentialTest.cpp
+)
+
 ADD_EXECUTABLE(snlTests ${snl_tests})
 target_compile_definitions(snlTests PRIVATE
   SNL_BENCHS_PATH="${CMAKE_CURRENT_SOURCE_DIR}/benchs")
 
-TARGET_LINK_LIBRARIES(snlTests naja_snl_pyloader gtest gmock gtest_main)
+ADD_EXECUTABLE(snlTestsWithPyLoader ${snl_tests_with_pyloader})
+target_compile_definitions(snlTestsWithPyLoader PRIVATE
+  SNL_BENCHS_PATH="${CMAKE_CURRENT_SOURCE_DIR}/benchs")
+
+TARGET_LINK_LIBRARIES(snlTests naja_snl gtest gmock gtest_main)
+TARGET_LINK_LIBRARIES(snlTestsWithPyLoader naja_snl_pyloader gtest gmock gtest_main)
 
-GTEST_DISCOVER_TESTS(snlTests
+GTEST_DISCOVER_TESTS(snlTests)
+GTEST_DISCOVER_TESTS(snlTestsWithPyLoader
   PROPERTIES ENVIRONMENT
   PYTHONPATH=${PROJECT_BINARY_DIR}/src/snl/python/snl_wrapping
 )