fix tests

Author: sparkprime

CMakeLists.txt

@@ -91,18 +91,18 @@ include_directories(
 
 install(DIRECTORY include DESTINATION include)
 
+if (BUILD_TESTS)
+    # Set JSONNET_BIN variable required for regression tests.
+    file(TO_NATIVE_PATH ${GLOBAL_OUTPUT_PATH}/jsonnet JSONNET_BIN)
+endif()
+
 add_subdirectory(stdlib)
 add_subdirectory(third_party/md5)
 add_subdirectory(core)
 add_subdirectory(cmd)
 add_subdirectory(test_suite)
 
 if (BUILD_TESTS)
-    # Set JSONNET_CMD variable required for regression tests.
-    file(TO_NATIVE_PATH ${GLOBAL_OUTPUT_PATH}/jsonnet JSONNET_CMD)
-    set(CTEST_ENVIRONMENT
-        "JSONNET_CMD=${JSONNET_CMD}")
-
     # s`run_tests` target builds and runs all tests. The cmake-generated `test`
     # target runs tests without building them.
     add_custom_target(run_tests COMMAND ${CMAKE_CTEST_COMMAND}
@@ -111,3 +111,5 @@ if (BUILD_TESTS)
     )
 
 endif()
+
+

test_suite/CMakeLists.txt

@@ -2,10 +2,16 @@ find_program(BASH bash)
 if (BASH STREQUAL "BASH-NOTFOUND")
     message(WARNING "Bash not found, can't run regression tests.")
 else()
-    # Note: this test relies on the JSONNET_CMD environment variable, which
+    # Note: this test relies on the JSONNET_BIN variable, which
     # is set in the root CMakeLists.txt.
+    message( "Testing with Jsonnet executable: ${JSONNET_BIN}" )
     add_test(
         NAME regression_test
         COMMAND ${BASH} ${CMAKE_CURRENT_SOURCE_DIR}/run_tests.sh
         WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}")
-endif()
+    set_tests_properties(
+         regression_test
+             PROPERTIES
+             ENVIRONMENT JSONNET_BIN=${JSONNET_BIN})
+
+endif()