[P4Testgen] Allow building p4testgen without BMV2 target (#4109)

* Allow building testgen with targets that don't have include path dependencies
* Move BMV2-using testgen test to BVM2 folder
* Also move tests that fail without BVM2 to BVM2

backends/p4tools/modules/testgen/CMakeLists.txt

@@ -52,15 +52,7 @@ set(
   test/gtest_utils.cpp
   test/lib/format_int.cpp
   test/lib/taint.cpp
-  test/small-step/binary.cpp
-  test/small-step/reachability.cpp
-  test/small-step/unary.cpp
   test/small-step/util.cpp
-  test/small-step/value.cpp
-  test/small-step/p4_asserts_parser_test.cpp
-  test/transformations/saturation_arithm.cpp
-  test/z3-solver/asrt_model.cpp
-  test/z3-solver/expressions.cpp
 )
 
 # Inja is needed to produce test templates.
@@ -112,7 +104,9 @@ configure_file(register.h.in register.h)
 add_p4tools_library(testgen ${TESTGEN_SOURCES})
 # Make sure the testgen library and anything that links to it see both the Z3 and Inja includes.
 target_link_libraries(testgen PUBLIC p4tools-common inja)
-target_include_directories(testgen ${TESTGEN_INCLUDES})
+if (TESTGEN_INCLUDES)
+  target_include_directories(testgen ${TESTGEN_INCLUDES})
+endif()
 
 # The executable.
 add_p4tools_executable(p4testgen main.cpp)

backends/p4tools/modules/testgen/targets/bmv2/CMakeLists.txt

@@ -34,6 +34,14 @@ set(
   ${TESTGEN_GTEST_SOURCES}
   ${CMAKE_CURRENT_SOURCE_DIR}/test/backend/ptf.cpp
   ${CMAKE_CURRENT_SOURCE_DIR}/test/backend/stf.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test/small-step/binary.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test/small-step/unary.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test/small-step/p4_asserts_parser_test.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test/small-step/value.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test/small-step/reachability.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test/transformations/saturation_arithm.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test/z3-solver/expressions.cpp
+  ${CMAKE_CURRENT_SOURCE_DIR}/test/z3-solver/asrt_model.cpp
   PARENT_SCOPE
 )