Merge branch 'main' of https://github.com/nanocoh/naja

najaeda · Oct 12, 2024 · fbe53cd · fbe53cd
2 parents 562fb07 + 1423610
commit fbe53cd
Show file tree

Hide file tree

Showing 3 changed files with 36 additions and 14 deletions.
diff --git a/.github/workflows/valgrind.yml b/.github/workflows/valgrind.yml
@@ -72,6 +72,10 @@ jobs:
         PYTHONMALLOC: malloc
       run: valgrind --error-exitcode=1 --show-leak-kinds=definite --leak-check=full --errors-for-leak-kinds=definite ./snlVRLConstructorTests
 
+    - name: TestLiberty
+      working-directory: ${{github.workspace}}/build/test/snl/formats/liberty
+      run: valgrind --error-exitcode=1 --show-leak-kinds=all --leak-check=full --errors-for-leak-kinds=all ./snl_liberty_tests
+
     - name: TestSNLVRLDumper
       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
@@ -95,6 +99,22 @@ jobs:
 
     - name: TestDLE
       working-directory: ${{github.workspace}}/build/test/logic_opt
-      run: valgrind --error-exitcode=1 ./LoadlessLogicRemoverTests
-      #run: valgrind --error-exitcode=1 --show-leak-kinds=all --leak-check=full --errors-for-leak-kinds=all ./LoadlessLogicRemoverTests
+      run: valgrind --error-exitcode=1 ./loadlessLogicRemoverTests
+      #run: valgrind --error-exitcode=1 --show-leak-kinds=all --leak-check=full --errors-for-leak-kinds=all ./loadlessLogicRemoverTests
 
+    - name: TestConstantPropagation
+      working-directory: ${{github.workspace}}/build/test/logic_opt
+      run: valgrind --error-exitcode=1 --show-leak-kinds=all --leak-check=full --errors-for-leak-kinds=all ./constantPropagationTests
+
+    #- name: TestReductionOpt
+    #  working-directory: ${{github.workspace}}/build/test/logic_opt
+    #  env:
+    #    PYTHONPATH: ${{env.PYTHONPATH}}:${{github.workspace}}/build/src/snl/python/snl_wrapping
+    #    PYTHONMALLOC: malloc
+    #  run: valgrind --error-exitcode=1 --show-leak-kinds=all --leak-check=full --errors-for-leak-kinds=all ./reductionOptTests
+    #  #run: valgrind --error-exitcode=1 ./reductionOptTests
+
+    - name: TestBNE
+      working-directory: ${{github.workspace}}/build/test/bne
+      run: valgrind --error-exitcode=1 ./bneTests
+      #run: valgrind --error-exitcode=1 --show-leak-kinds=all --leak-check=full --errors-for-leak-kinds=all ./bneTests
diff --git a/test/bne/CMakeLists.txt b/test/bne/CMakeLists.txt
@@ -8,6 +8,8 @@ SET(sources
   BNETests.cpp
 )
 
-ADD_EXECUTABLE(BNETests ${sources})
+ADD_EXECUTABLE(bneTests ${sources})
 
-TARGET_LINK_LIBRARIES(BNETests naja_dnl naja_bne gmock gtest_main)
+TARGET_LINK_LIBRARIES(bneTests naja_dnl naja_bne gmock gtest_main)
+
+GTEST_DISCOVER_TESTS(bneTests)
diff --git a/test/logic_opt/CMakeLists.txt b/test/logic_opt/CMakeLists.txt
@@ -8,35 +8,35 @@ SET(sources
   LoadlessLogicRemoverTests.cpp
 )
 
-ADD_EXECUTABLE(LoadlessLogicRemoverTests ${sources})
+ADD_EXECUTABLE(loadlessLogicRemoverTests ${sources})
 
-TARGET_LINK_LIBRARIES(LoadlessLogicRemoverTests naja_dnl naja_opt gmock gtest_main)
+TARGET_LINK_LIBRARIES(loadlessLogicRemoverTests naja_dnl naja_opt gmock gtest_main)
 
-GTEST_DISCOVER_TESTS(LoadlessLogicRemoverTests)
+GTEST_DISCOVER_TESTS(loadlessLogicRemoverTests)
 
 SET(constantPropagationSources
   ConstantPropagationTests.cpp
 )
 
-ADD_EXECUTABLE(ConstantPropagationTests ${constantPropagationSources})
+ADD_EXECUTABLE(constantPropagationTests ${constantPropagationSources})
 
-TARGET_LINK_LIBRARIES(ConstantPropagationTests naja_dnl naja_opt naja_snl_visual gmock gtest_main)
+TARGET_LINK_LIBRARIES(constantPropagationTests naja_opt naja_snl_visual gmock gtest_main)
 
-GTEST_DISCOVER_TESTS(ConstantPropagationTests)
+GTEST_DISCOVER_TESTS(constantPropagationTests)
 
 SET(reductionOptSources
   ReductionOptTests.cpp
 )
 
-ADD_EXECUTABLE(ReductionOptTests ${reductionOptSources})
+ADD_EXECUTABLE(reductionOptTests ${reductionOptSources})
 
-target_compile_definitions(ReductionOptTests PRIVATE
+target_compile_definitions(reductionOptTests PRIVATE
   SNL_PRIMITIVES_TEST_PATH="${CMAKE_CURRENT_SOURCE_DIR}")
 
-TARGET_LINK_LIBRARIES(ReductionOptTests naja_dnl naja_opt naja_snl_visual naja_snl_pyloader gmock gtest_main)
+TARGET_LINK_LIBRARIES(reductionOptTests naja_opt naja_snl_visual naja_snl_pyloader gmock gtest_main)
 
 gtest_discover_tests(
-  ReductionOptTests
+  reductionOptTests
   PROPERTIES ENVIRONMENT
   PYTHONPATH=${PROJECT_BINARY_DIR}/src/snl/python/snl_wrapping
 )