Got tests to run w/emscripten! (3 failures)

CppTests: test cases: 499 | 496 passed | 3 failed assertions: 682799 | 682794 passed | 5 failed failed tests: >>> Query Functions >>> RealClockSource >>> Continuous Fast Push C4Tests: All tests passed (791941 assertions in 155 test cases)
couchbase · Jun 14, 2024 · 9d8f60e · 9d8f60e
1 parent 105e4cb
commit 9d8f60e
Show file tree

Hide file tree

Showing 16 changed files with 179 additions and 88 deletions.
diff --git a/C/tests/CMakeLists.txt b/C/tests/CMakeLists.txt
@@ -60,11 +60,25 @@ add_executable(
     c4CertificateTest.cc
 
     ${TOP}LiteCore/tests/main.cpp
-    ${TOP}Crypto/SecureRandomize.cc
     ${TOP}LiteCore/Support/TestsCommon.cc
     ${TOP}vendor/fleece/ObjC/slice+CoreFoundation.cc
 )
 
+if (NOT EMSCRIPTEN)
+    # These files contain internal functionality that isn't exported from the LiteCore shared lib.
+    # But C4Tests use these, so we have to compile them into its binary.
+    # This doesn't apply to Emscripten, bc WASM doesn't have shared libs; all linking is static.
+    target_sources(
+        C4Tests PRIVATE
+        ${TOP}Crypto/SecureRandomize.cc
+        ${TOP}LiteCore/Support/Error.cc
+        ${TOP}LiteCore/Support/FilePath.cc
+        ${TOP}LiteCore/Support/LogDecoder.cc
+        ${TOP}LiteCore/Support/Logging_Stub.cc
+        ${TOP}LiteCore/Support/StringUtil.cc
+    )
+endif()
+
 get_directory_property(this_targets DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} BUILDSYSTEM_TARGETS)
 set(LITECORE_TARGETS ${LITECORE_TARGETS} ${this_targets} PARENT_SCOPE)
 setup_build()

diff --git a/C/tests/c4PerfTest.cc b/C/tests/c4PerfTest.cc
@@ -175,6 +175,8 @@ class PerfTest : public C4Test {
         input += "_helium_macos";
 #elif defined(__linux__)
         input += "_helium_linux";
+#elif defined(__EMSCRIPTEN__)
+        input += "_helium_emscripten";
 #else
 #    error "Unknown platform"
 #endif

diff --git a/C/tests/cmake/platform_emscripten.cmake b/C/tests/cmake/platform_emscripten.cmake
@@ -1,14 +1,17 @@
 function(setup_build)
     target_sources(
         C4Tests PRIVATE
-	${TOP}Crypto/mbedUtils.cc
 	${TOP}LiteCore/Unix/strlcat.c
     )
 
     target_link_libraries(
         C4Tests PRIVATE
-        mbedcrypto
-        mbedx509
+    )
+
+    target_compile_options(
+        C4Tests PRIVATE
+        "-pthread"
+        "-fwasm-exceptions"
     )
 
     target_link_options(
@@ -19,7 +22,6 @@ function(setup_build)
         "SHELL:-s EXIT_RUNTIME=1"
         "SHELL:-s PTHREAD_POOL_SIZE=24"
         "SHELL:-s ALLOW_MEMORY_GROWTH=1"
-        "SHELL:-s DEMANGLE_SUPPORT=1"
         "SHELL:-s WASM_BIGINT=1"
         "-lnodefs.js"
         "-lnoderawfs.js"

diff --git a/CMakeLists.txt b/CMakeLists.txt
@@ -127,7 +127,14 @@ if(BUILD_ENTERPRISE)
     )
 endif()
 
-if(MSVC)
+if(EMSCRIPTEN)
+    # Emscripten does not actually support shared libraries and instead
+    # just builds a static library for compatibility with existing
+    # build setups. We just set this property to suppress a CMake warning.
+    set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
+
+    include("${PROJECT_SOURCE_DIR}/cmake/platform_emscripten.cmake")
+elseif(MSVC)
     add_definitions(-DWIN32_LEAN_AND_MEAN -D_WIN32_WINNT=0x0A00)
     if(WINDOWS_STORE)
         message(FATAL_ERROR "UWP no longer supported")
@@ -141,13 +148,6 @@ elseif(ANDROID)
 elseif("${CMAKE_SYSTEM_NAME}" STREQUAL "Linux")
     option(LITECORE_DYNAMIC_ICU "If enabled, search for ICU at runtime so as not to depend on a specific version" OFF)
     include("${PROJECT_SOURCE_DIR}/cmake/platform_linux_desktop.cmake")
-elseif(EMSCRIPTEN)
-    # Emscripten does not actually support shared libraries and instead
-    # just builds a static library for compatibility with existing
-    # build setups. We just set this property to suppress a CMake warning.
-    set_property(GLOBAL PROPERTY TARGET_SUPPORTS_SHARED_LIBS TRUE)
-
-    include("${PROJECT_SOURCE_DIR}/cmake/platform_emscripten.cmake")
 else()
     message(FATAL_ERROR "Unable to determine a supported platform from ${CMAKE_SYSTEM_NAME}")
 endif(MSVC)
@@ -340,60 +340,62 @@ install(FILES ${FLEECE_HEADERS} DESTINATION include/fleece)
 
 ### Support Libraries (Add functionality, but add nothing to official API)
 
-add_subdirectory(REST EXCLUDE_FROM_ALL)
-
-set(
-    LC_WEBSOCKET_SRC
-    Networking/HTTP/HTTPTypes.cc
-    Networking/HTTP/HTTPLogic.cc
-    Networking/NetworkInterfaces.cc
-    Networking/Poller.cc
-    Networking/TCPSocket.cc
-    Networking/TLSContext.cc
-    Networking/WebSockets/BuiltInWebSocket.cc
-    vendor/sockpp/src/acceptor.cpp
-    vendor/sockpp/src/connector.cpp
-    vendor/sockpp/src/datagram_socket.cpp
-    vendor/sockpp/src/exception.cpp
-    vendor/sockpp/src/inet_address.cpp
-    vendor/sockpp/src/inet6_address.cpp
-    vendor/sockpp/src/mbedtls_context.cpp
-    vendor/sockpp/src/socket.cpp
-    vendor/sockpp/src/stream_socket.cpp
-)
+if (NOT EMSCRIPTEN)
+    add_subdirectory(REST EXCLUDE_FROM_ALL)
 
-add_library(LiteCoreWebSocket STATIC EXCLUDE_FROM_ALL ${LC_WEBSOCKET_SRC})
-target_include_directories(
-    LiteCoreWebSocket PRIVATE
-    C
-    C/include
-    C/Cpp_include
-    Crypto
-    LiteCore/Support
-    Networking
-    Networking/BLIP/
-    Networking/HTTP
-    Networking/WebSockets
-    Replicator
-    REST
-    vendor/fleece/Fleece/Support
-    vendor/fleece/API
-    vendor/sockpp/include
-    vendor/mbedtls/include
-    vendor/mbedtls/crypto/include
-)
+    set(
+        LC_WEBSOCKET_SRC
+        Networking/HTTP/HTTPTypes.cc
+        Networking/HTTP/HTTPLogic.cc
+        Networking/NetworkInterfaces.cc
+        Networking/Poller.cc
+        Networking/TCPSocket.cc
+        Networking/TLSContext.cc
+        Networking/WebSockets/BuiltInWebSocket.cc
+        vendor/sockpp/src/acceptor.cpp
+        vendor/sockpp/src/connector.cpp
+        vendor/sockpp/src/datagram_socket.cpp
+        vendor/sockpp/src/exception.cpp
+        vendor/sockpp/src/inet_address.cpp
+        vendor/sockpp/src/inet6_address.cpp
+        vendor/sockpp/src/mbedtls_context.cpp
+        vendor/sockpp/src/socket.cpp
+        vendor/sockpp/src/stream_socket.cpp
+    )
 
-target_link_libraries(
-    LiteCoreWebSocket PUBLIC
-    LiteCoreObjects
-)
+    add_library(LiteCoreWebSocket STATIC EXCLUDE_FROM_ALL ${LC_WEBSOCKET_SRC})
+    target_include_directories(
+        LiteCoreWebSocket PRIVATE
+        C
+        C/include
+        C/Cpp_include
+        Crypto
+        LiteCore/Support
+        Networking
+        Networking/BLIP/
+        Networking/HTTP
+        Networking/WebSockets
+        Replicator
+        REST
+        vendor/fleece/Fleece/Support
+        vendor/fleece/API
+        vendor/sockpp/include
+        vendor/mbedtls/include
+        vendor/mbedtls/crypto/include
+    )
 
-if(LITECORE_PERF_TESTING_MODE)
-    target_compile_definitions(
+    target_link_libraries(
         LiteCoreWebSocket PUBLIC
-        LITECORE_PERF_TESTING_MODE
+        LiteCoreObjects
     )
-endif()
+
+    if(LITECORE_PERF_TESTING_MODE)
+        target_compile_definitions(
+            LiteCoreWebSocket PUBLIC
+            LITECORE_PERF_TESTING_MODE
+        )
+    endif()
+endif() # NOT EMSCRIPTEN
 
 ### TESTS:
 

diff --git a/LiteCore/Storage/UnicodeCollator_JS.cc b/LiteCore/Storage/UnicodeCollator_JS.cc
@@ -23,6 +23,7 @@ namespace litecore {
 
     using namespace std;
     using namespace emscripten;
+    using namespace fleece;
 
     class JSCollationContext : public CollationContext {
       public:

diff --git a/LiteCore/Support/ThreadUtil.cc b/LiteCore/Support/ThreadUtil.cc
@@ -33,11 +33,10 @@
 #    ifndef HAVE_PTHREAD_THREADID_NP
 #        include <sys/syscall.h>
 #    endif
-#    ifndef HAVE_PTHREAD_GETNAME_NP
-#        include <sys/prctl.h>
-#    endif
 #    ifdef __EMSCRIPTEN__
 #        include <emscripten/threading.h>
+#    elif !defined(HAVE_PTHREAD_GETNAME_NP)
+#        include <sys/prctl.h>
 #    endif
 
 namespace litecore {
@@ -55,10 +54,11 @@ namespace litecore {
     std::string GetThreadName() {
         std::string       retVal;
         std::stringstream s;
-        char              name[256];
 #    if defined(HAVE_PTHREAD_GETNAME_NP)
+        char name[256];
         if ( pthread_getname_np(pthread_self(), name, 255) == 0 && name[0] != 0 ) { s << name << " "; }
 #    elif defined(HAVE_PRCTL)
+        char name[256];
         if ( prctl(PR_GET_NAME, name, 0, 0, 0) == 0 ) { s << name << " "; }
 #    else
         s << "<unknown thread name> ";

diff --git a/LiteCore/tests/CMakeLists.txt b/LiteCore/tests/CMakeLists.txt
@@ -71,9 +71,6 @@ add_executable(
     UpgraderTest.cc
     VectorQueryTest.cc
     VersionVectorTest.cc
-    ${TOP}REST/tests/RESTListenerTest.cc
-    ${TOP}REST/tests/RESTClientTest.cc
-    ${TOP}REST/tests/SyncListenerTest.cc
     ${TOP}vendor/fleece/Tests/API_ValueTests.cc
     ${TOP}vendor/fleece/Tests/DeltaTests.cc
     ${TOP}vendor/fleece/Tests/EncoderTests.cc
@@ -89,13 +86,8 @@ add_executable(
     ${TOP}Replicator/tests/DBAccessTestWrapper.cc
     ${TOP}Replicator/tests/PropertyEncryptionTests.cc
     ${TOP}Replicator/tests/ReplicatorLoopbackTest.cc
-    ${TOP}Replicator/tests/ReplicatorAPITest.cc
-    ${TOP}Replicator/tests/ReplicatorSGTest.cc
     ${TOP}Replicator/tests/ReplicatorCollectionTest.cc
-    ${TOP}Replicator/tests/ReplicatorCollectionSGTest.cc
-    ${TOP}Replicator/tests/ReplicatorSG30Test.cc
     ${TOP}Replicator/tests/ReplicatorVVUpgradeTest.cc
-    ${TOP}Replicator/tests/SG.cc
     ${TOP}Replicator/tests/SGTestUser.cc
     ${TOP}Replicator/tests/ReplParams.cc
     ${TOP}C/tests/c4Test.cc
@@ -105,6 +97,20 @@ add_executable(
     main.cpp
 )
 
+if (NOT EMSCRIPTEN)
+    target_sources(
+        CppTests PRIVATE
+        ${TOP}REST/tests/RESTListenerTest.cc
+        ${TOP}REST/tests/RESTClientTest.cc
+        ${TOP}REST/tests/SyncListenerTest.cc
+        ${TOP}Replicator/tests/ReplicatorAPITest.cc
+        ${TOP}Replicator/tests/ReplicatorSGTest.cc
+        ${TOP}Replicator/tests/ReplicatorCollectionSGTest.cc
+        ${TOP}Replicator/tests/ReplicatorSG30Test.cc
+        ${TOP}Replicator/tests/SG.cc
+    )
+endif()
+
 get_directory_property(this_targets DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR} BUILDSYSTEM_TARGETS)
 set(LITECORE_TARGETS ${LITECORE_TARGETS} ${this_targets} PARENT_SCOPE)
 setup_build()
@@ -159,6 +165,12 @@ target_link_libraries(
     LiteCoreUnitTesting
     FleeceObjects
     BLIPObjects
-    LiteCoreREST_Static
-    LiteCoreWebSocket
 )
+
+if (NOT EMSCRIPTEN)
+    target_link_libraries(
+        CppTests PRIVATE
+        LiteCoreREST_Static
+        LiteCoreWebSocket
+    )
+endif()
diff --git a/LiteCore/tests/DataFileTest.cc b/LiteCore/tests/DataFileTest.cc
@@ -649,11 +649,13 @@ N_WAY_TEST_CASE_METHOD(DataFileTestFixture, "DataFile Compact", "[DataFile]") {
 
 TEST_CASE("CanonicalPath") {
 #ifdef __EMSCRIPTEN__
+    // clang-format off
     auto isMacOs = (bool)EM_ASM_INT({
-        if ( typeof require == = 'undefined' ) return false;
+        if ( typeof require === 'undefined' ) return false;
         const process              = require('process');
-        return process.platform == = 'darwin';
+        return process.platform === 'darwin';
     });
+    // clang-format on
 #endif
 
 #ifdef _MSC_VER

diff --git a/LiteCore/tests/LiteCoreTest.hh b/LiteCore/tests/LiteCoreTest.hh
@@ -51,7 +51,7 @@ std::string stringWithFormat(const char* format, ...) __printflike(1, 2);
  */
 template <size_t numDigits>
 static std::string randomDigitString() {
-    static_assert(1 < numDigits <= 64);
+    static_assert(1 < numDigits && numDigits <= 64);
     static_assert(numDigits % 2 == 0);
     auto appendEightDigits = [](std::stringstream& sstr) {
         auto now     = std::chrono::high_resolution_clock::now();

diff --git a/LiteCore/tests/cmake/platform_emscripten.cmake b/LiteCore/tests/cmake/platform_emscripten.cmake
@@ -5,6 +5,12 @@ function(setup_build)
         ${TOP}LiteCore/Unix
     )
 
+    target_compile_options(
+        CppTests PRIVATE
+        "-pthread"
+        "-fwasm-exceptions"
+    )
+
     target_link_options(
         CppTests PRIVATE
         "-pthread"
@@ -13,7 +19,6 @@ function(setup_build)
         "SHELL:-s EXIT_RUNTIME=1"
         "SHELL:-s PTHREAD_POOL_SIZE=24"
         "SHELL:-s ALLOW_MEMORY_GROWTH=1"
-        "SHELL:-s DEMANGLE_SUPPORT=1"
         "SHELL:-s WASM_BIGINT=1"
         "-lnodefs.js"
         "-lnoderawfs.js"

diff --git a/Networking/BLIP/cmake/platform_emscripten.cmake b/Networking/BLIP/cmake/platform_emscripten.cmake
@@ -19,14 +19,14 @@ endfunction()
 function(setup_build)
     add_subdirectory("${CMAKE_CURRENT_LIST_DIR}/../../vendor/zlib" "vendor/zlib")
     target_include_directories(
-        BLIPStatic PRIVATE
+        BLIPObjects PRIVATE
         "${CMAKE_CURRENT_LIST_DIR}/../../vendor/zlib"
         "${CMAKE_CURRENT_BINARY_DIR}/vendor/zlib"
         ${LITECORE_LOCATION}/LiteCore/Unix
     )
 
     target_link_libraries(
-        BLIPStatic INTERFACE
+        BLIPObjects INTERFACE
         zlibstatic
     )
 endfunction()
diff --git a/Replicator/tests/CookieStoreTest.cc b/Replicator/tests/CookieStoreTest.cc
@@ -184,6 +184,7 @@ TEST_CASE("Cookie Parser Failure", "[cookies]") {
             "name=value; Max-Age=",
     };
     for ( const auto& badCookie : badCookies ) {
+        ExpectingExceptions x;
         INFO("Checking " << badCookie);
         Cookie c(badCookie, "example.com", "/");
         CHECK(!c);