Move libjsonnet_test_locale to cpp since it uses the C++ library and …

…add it to CTests
google · Mar 2, 2024 · 63ad7f6 · 63ad7f6
1 parent 9ee4e2c
commit 63ad7f6
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -133,9 +133,6 @@ if (BUILD_TESTS)
     # target runs tests without building them.
     add_custom_target(run_tests COMMAND ${CMAKE_CTEST_COMMAND}
         DEPENDS libjsonnet_test libjsonnet_test_file libjsonnet_test_snippet
-                jsonnet parser_test lexer_test libjsonnet++_test
+                jsonnet parser_test lexer_test libjsonnet++_test libjsonnet_test_locale
     )
-
 endif()
-
-
diff --git a/Makefile b/Makefile
@@ -147,7 +147,7 @@ MAKEDEPEND_SRCS = \
 	cmd/jsonnetfmt.cpp \
 	core/libjsonnet_test_snippet.c \
 	core/libjsonnet_test_file.c \
-	core/libjsonnet_test_locale.cpp
+	cpp/libjsonnet_test_locale.cpp
 
 depend: core/std.jsonnet.h
 	rm -f Makefile.depend
@@ -198,7 +198,7 @@ libjsonnet_test_file: $(LIBJSONNET_TEST_FILE_SRCS)
 	$(CC) $(CFLAGS) $(LDFLAGS) $< -L. -ljsonnet -o $@
 
 LIBJSONNET_TEST_LOCALE_SRCS = \
-	core/libjsonnet_test_locale.cpp \
+	cpp/libjsonnet_test_locale.cpp \
 	libjsonnet++.so \
 	include/libjsonnet++.h
 

diff --git a/cpp/CMakeLists.txt b/cpp/CMakeLists.txt
@@ -61,4 +61,7 @@ if (BUILD_TESTS)
     add_test_executablepp(libjsonnet++_test)
     # Run this in the source tree because it needs to access testdata files.
     add_test(NAME libjsonnet++_test COMMAND ${GLOBAL_OUTPUT_PATH}/libjsonnet++_test WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/..")
+
+    add_test_executablepp(libjsonnet_test_locale)
+    add_test(NAME libjsonnet_test_locale COMMAND ${GLOBAL_OUTPUT_PATH}/libjsonnet_test_locale WORKING_DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/..")
 endif()
diff --git a/core/libjsonnet_test_locale.cpp → cpp/libjsonnet_test_locale.cpp b/core/libjsonnet_test_locale.cpp → cpp/libjsonnet_test_locale.cpp