clio tests

CMakeLists.txt

@@ -15,6 +15,7 @@ file(WRITE ${CMAKE_BINARY_DIR}/CTestTestfile.cmake)
 option(BUILD_NATIVE "Build native code" ON)
 if(BUILD_NATIVE)
     add_subdirectory(native)
+    file(APPEND ${CMAKE_BINARY_DIR}/CTestTestfile.cmake "subdirs(\"native\")\n")
 endif()
 
 if(DEFINED WASI_SDK_PREFIX)

libraries/CMakeLists.txt

@@ -1,4 +1,7 @@
+enable_testing()
+
 add_subdirectory(abieos)
+add_subdirectory(clio)
 
 if(DEFINED IS_WASM)
     add_subdirectory(eosiolib)

libraries/clio/CMakeLists.txt

@@ -1,54 +1,7 @@
-add_library( clio INTERFACE )
-target_link_libraries( clio INTERFACE rapidjson )
-target_include_directories( clio INTERFACE include ${Boost_INCLUDE_DIRS} )
+enable_testing()
 
-target_sources( clio INTERFACE
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/fpconv.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/powers.h
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/compress.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/error.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/reflect.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/schema.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/translator.hpp
+add_library(clio INTERFACE)
+target_link_libraries(clio INTERFACE rapidjson)
+target_include_directories(clio INTERFACE include ${Boost_INCLUDE_DIRS})
 
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/stream.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/to_key.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/tuple.hpp
-
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/flatbuf.hpp
-
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/to_json.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/to_json/map.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/to_json/varint.hpp
-
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/json/any.hpp
-
-
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/to_bin.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/to_bin/map.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/to_bin/set.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/to_bin/list.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/to_bin/deque.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/to_bin/varint.hpp
-
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/from_bin.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/from_json.hpp
-
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/varint.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/from_bin/varint.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/from_json/varint.hpp
-
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/bytes.hpp
-
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/bytes/from_json.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/bytes/to_json.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/bytes/to_bin.hpp
-
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/from_protobuf.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/to_protobuf.hpp
-
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/protobuf/any.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/protobuf/json.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/protobuf/query.hpp
-        ${CMAKE_CURRENT_SOURCE_DIR}/include/clio/protobuf/schema.hpp
-)
+add_subdirectory(tests)

libraries/clio/include/clio/from_protobuf.hpp

@@ -1,5 +1,6 @@
 #pragma once
 #include <clio/from_bin.hpp>
+#include <clio/to_protobuf.hpp>
 #include <clio/tuple.hpp>
 
 namespace clio

libraries/clio/tests/CMakeLists.txt

@@ -1,23 +1,15 @@
-if(DEFINED IS_NATIVE)
-    find_package(Threads REQUIRED)
-    add_executable(clio-tests 
-        clio_tests.cpp
-        flat_views.cpp
-        benchmark.cpp
-        crypto.cpp
-    )
-    target_link_libraries(clio-tests clio clcrypto fc catch2-portable Threads::Threads)
-endif()
+enable_testing()
+
+add_executable(test-clio
+    clio_tests.cpp
+    flat_views.cpp
+    benchmark.cpp
+)
+target_link_libraries(test-clio clio catch2)
+set_target_properties(test-clio PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${ROOT_BINARY_DIR})
 
 if(DEFINED IS_WASM)
-    add_executable(clio-tests 
-        clio_tests.cpp
-        flat_views.cpp
-        benchmark.cpp
-    )
-    target_link_libraries(clio-tests clio catch2-portable boost)
+    target_link_libraries(test-clio basic-polyfill boost)
 endif()
 
-set_target_properties(clio-tests PROPERTIES RUNTIME_OUTPUT_DIRECTORY ${ROOT_BINARY_DIR})
-
-native_and_wasm_test(clio-tests)
+native_and_wasm_test(test-clio)

libraries/eosiolib/CMakeLists.txt

@@ -87,3 +87,26 @@ target_link_libraries(testlib PUBLIC fmt boost eosio-core)
 target_include_directories(testlib PUBLIC contracts tester)
 target_link_options(testlib INTERFACE -Wl,--export-table)
 add_dependencies(testlib fmt)
+
+add_library(basic-polyfill)
+target_compile_options(basic-polyfill PUBLIC -fno-exceptions)
+target_sources(basic-polyfill PRIVATE
+    tester/wasi_polyfill/__wasi_args_get.cpp
+    tester/wasi_polyfill/__wasi_args_sizes_get.cpp
+    tester/wasi_polyfill/__wasi_clock_time_get.cpp
+    tester/wasi_polyfill/__wasi_environ_get.cpp
+    tester/wasi_polyfill/__wasi_environ_sizes_get.cpp
+    tester/wasi_polyfill/__wasi_fd_close.cpp
+    tester/wasi_polyfill/__wasi_fd_fdstat_get.cpp
+    tester/wasi_polyfill/__wasi_fd_fdstat_set_flags.cpp
+    tester/wasi_polyfill/__wasi_fd_prestat_dir_name.cpp
+    tester/wasi_polyfill/__wasi_fd_prestat_get.cpp
+    tester/wasi_polyfill/__wasi_fd_read.cpp
+    tester/wasi_polyfill/__wasi_fd_seek.cpp
+    tester/wasi_polyfill/__wasi_fd_write.cpp
+    tester/wasi_polyfill/__wasi_path_open.cpp
+    tester/wasi_polyfill/__wasi_proc_exit.cpp
+    tester/wasi_polyfill/prints.cpp
+)
+target_link_libraries(basic-polyfill PUBLIC)
+target_link_options(basic-polyfill INTERFACE -Wl,--export-table)

libraries/eosiolib/tester/wasi_polyfill/prints.cpp

@@ -0,0 +1,8 @@
+#include <stdint.h>
+#include <string.h>
+
+extern "C" void prints(const char* cstr)
+{
+   [[clang::import_name("prints_l")]] void prints_l(const char*, uint32_t);
+   prints_l(cstr, strlen(cstr));
+}

native/CMakeLists.txt

@@ -25,6 +25,10 @@ function(native_test N)
     )
 endfunction()
 
+function(native_and_wasm_test N)
+    native_test(${N})
+endfunction()
+
 add_subdirectory(../external external)
 add_subdirectory(../libraries libraries)
 add_subdirectory(../programs programs)

wasm/CMakeLists.txt

@@ -29,6 +29,11 @@ function(eden_tester_test N)
 endfunction()
 
 add_subdirectory(../contracts contracts)
+
+function(native_and_wasm_test N)
+    eden_tester_test(${N})
+endfunction()
+
 add_subdirectory(../libraries libraries)
 add_subdirectory(../external external)
 add_subdirectory(boost)