Set env var in ctest

Author: kirklandsign

extension/module/test/CMakeLists.txt

@@ -32,3 +32,5 @@ et_cxx_test(
   portable_kernels
   portable_ops_lib
 )
+
+set_property(TEST extension_module_test PROPERTY ENVIRONMENT "RESOURCES_PATH=${EXECUTORCH_ROOT}/extension/module/test/resources")

runtime/executor/test/CMakeLists.txt

@@ -17,10 +17,32 @@ set(EXECUTORCH_ROOT ${CMAKE_CURRENT_SOURCE_DIR}/../../..)
 
 include(${EXECUTORCH_ROOT}/build/Test.cmake)
 
+add_custom_command(
+  OUTPUT "${CMAKE_BINARY_DIR}/ModuleAddHalf.pte"
+  "${CMAKE_BINARY_DIR}/ModuleAdd.pte"
+  "${CMAKE_BINARY_DIR}/ModuleDynamicCatUnallocatedIO.pte"
+  "${CMAKE_BINARY_DIR}/ModuleIndex.pte"
+  "${CMAKE_BINARY_DIR}/ModuleLinear.pte"
+  "${CMAKE_BINARY_DIR}/ModuleMultipleEntry.pte"
+  "${CMAKE_BINARY_DIR}/ModuleSimpleTrain.pte"
+  COMMAND python3 -m test.models.export_program --modules "ModuleAdd,ModuleAddHalf,ModuleDynamicCatUnallocatedIO,ModuleIndex,ModuleLinear,ModuleMultipleEntry,ModuleSimpleTrain" --outdir "${CMAKE_BINARY_DIR}" 2> /dev/null
+  COMMAND python3 -m test.models.export_delegated_program --modules "ModuleAddMul" --backend_id "StubBackend" --outdir "${CMAKE_BINARY_DIR}" || true
+  WORKING_DIRECTORY ${EXECUTORCH_ROOT}
+)
+
+add_custom_target(generated_pte_files DEPENDS "${CMAKE_BINARY_DIR}/ModuleAddHalf.pte"
+  "${CMAKE_BINARY_DIR}/ModuleAdd.pte"
+  "${CMAKE_BINARY_DIR}/ModuleDynamicCatUnallocatedIO.pte"
+  "${CMAKE_BINARY_DIR}/ModuleIndex.pte"
+  "${CMAKE_BINARY_DIR}/ModuleLinear.pte"
+  "${CMAKE_BINARY_DIR}/ModuleMultipleEntry.pte"
+  "${CMAKE_BINARY_DIR}/ModuleSimpleTrain.pte")
+
 et_cxx_test(
   runtime_executor_test SOURCES executor_test.cpp EXTRA_LIBS portable_ops_lib
   portable_kernels
 )
+add_dependencies(runtime_executor_test generated_pte_files)
 
 et_cxx_test(
   allocation_failure_stress_test
@@ -32,6 +54,7 @@ et_cxx_test(
   extension_data_loader
   extension_runner_util
 )
+add_dependencies(allocation_failure_stress_test generated_pte_files)
 
 et_cxx_test(
   method_test
@@ -43,6 +66,7 @@ et_cxx_test(
   extension_data_loader
   extension_runner_util
 )
+add_dependencies(method_test generated_pte_files)
 
 # TODO(T191569140): Enable this test. et_cxx_test(method_meta_test SOURCES
 # method_meta_test.cpp EXTRA_LIBS extension_data_loader)
@@ -58,17 +82,20 @@ et_cxx_test(
   kernel_resolution_test SOURCES kernel_resolution_test.cpp EXTRA_LIBS
   extension_data_loader
 )
+add_dependencies(kernel_resolution_test generated_pte_files)
 
 et_cxx_test(
   kernel_integration_test SOURCES kernel_integration_test.cpp EXTRA_LIBS
   extension_data_loader extension_runner_util
 )
+add_dependencies(kernel_integration_test generated_pte_files)
 
 # TODO(T191569140): Enable this test. et_cxx_test( backend_integration_test
 # SOURCES backend_integration_test.cpp EXTRA_LIBS extension_data_loader
 # extension_runner_util )
 
 et_cxx_test(memory_manager_test SOURCES memory_manager_test.cpp)
+add_dependencies(memory_manager_test generated_pte_files)
 
 et_cxx_test(
   tensor_parser_test
@@ -80,6 +107,7 @@ et_cxx_test(
   extension_data_loader
   extension_runner_util
 )
+add_dependencies(tensor_parser_test generated_pte_files)
 
 target_include_directories(
   tensor_parser_test

test/run_oss_cpp_tests.sh

@@ -39,13 +39,14 @@ build_executorch() {
     -DEXECUTORCH_BUILD_DEVTOOLS=ON \
     -DEXECUTORCH_BUILD_VULKAN=$BUILD_VULKAN \
     -DEXECUTORCH_BUILD_XNNPACK=ON \
+    -DEXECUTORCH_BUILD_TESTS=ON \
     -Bcmake-out
   cmake --build cmake-out -j9 --target install
 }
 
 export_test_model() {
-  python3 -m test.models.export_program --modules "ModuleAdd,ModuleAddHalf,ModuleDynamicCatUnallocatedIO,ModuleIndex,ModuleLinear,ModuleMultipleEntry,ModuleSimpleTrain" --outdir "cmake-out" 2> /dev/null
-  python3 -m test.models.export_delegated_program --modules "ModuleAddMul" --backend_id "StubBackend" --outdir "cmake-out" || true
+  # python3 -m test.models.export_program --modules "ModuleAdd,ModuleAddHalf,ModuleDynamicCatUnallocatedIO,ModuleIndex,ModuleLinear,ModuleMultipleEntry,ModuleSimpleTrain" --outdir "cmake-out" 2> /dev/null
+  # python3 -m test.models.export_delegated_program --modules "ModuleAddMul" --backend_id "StubBackend" --outdir "cmake-out" || true
 
   DEPRECATED_ET_MODULE_LINEAR_CONSTANT_BUFFER_PATH="$(realpath test/models/deprecated/ModuleLinear-no-constant-segment.pte)"
   ET_MODULE_ADD_HALF_PATH="$(realpath cmake-out/ModuleAddHalf.pte)"
@@ -96,18 +97,18 @@ report_coverage() {
   ${LLVM_COV} report -instr-profile=cmake-out/merged.profdata $TEST_BINARY_LIST
 }
 
-probe_tests() {
+run_ctest() {
+  pushd cmake-out/
+  ctest
+  popd
+}
+
+probe_additional_tests() {
   # This function finds the set of directories that contain C++ tests
   # CMakeLists.txt rules, that are buildable using build_and_run_test
   dirs=(
-    backends
-    examples
-    extension
-    kernels
-    runtime
-    schema
-    devtools
-    test
+    examples/models/llama/tokenizer
+    extension/llm/tokenizer
   )
 
   find "${dirs[@]}" \
@@ -116,14 +117,15 @@ probe_tests() {
       | sort -u
 }
 
-build_executorch
+# build_executorch
+run_ctest
 export_test_model
 
 if [ -z "$1" ]; then
   echo "Running all directories:"
-  probe_tests
+  probe_additional_tests
 
-  for test_dir in $(probe_tests); do
+  for test_dir in $(probe_additional_tests); do
     build_and_run_test "${test_dir}"
   done
 else