Turn off tests for Emscripten that use large amounts of data.

diff --git a/configure b/configure
index 552148caae2c04acdc7019ecf251a87a20b23472..5381ee65ac7eaae21fef8c31f5afd1acab0a664a 100755 (executable)
--- a/configure
+++ b/configure
@@ -2193,6 +2193,12 @@ for file in $SRCDIR/$ARCHDIR/*.c; do
     fi
 done
 
+# Emscripten does not support large amounts of data via stdin/out
+# https://github.com/emscripten-core/emscripten/issues/16755#issuecomment-1102732849
+if test "$CHOST" != "wasm32"; then
+    TEST="${TEST} ghtests"
+fi
+
 # Generate Makefile in test dir
 mkdir -p test
 if test $QEMU_ARCH; then QEMU_RUN="qemu-$QEMU_ARCH -L /usr/${CHOST}/"; fi
@@ -2201,7 +2207,7 @@ sed < $SRCDIR/test/Makefile.in "
 /^CFLAGS *=/s#=.*#=$CFLAGS#
 /^LDFLAGS *=/s#=.*#=$LDFLAGS#
 /^EXE *=/s#=.*#=$EXE#
-/^oldtests: */s#:.*#: $TEST#
+/^alltests: */s#:.*#: $TEST#
 /^SRCDIR *=/s#=.*#=$SRCDIR/test#
 /^SRCTOP *=/s#=.*#=$SRCDIR#
 /^QEMU_RUN *=/s#=.*#=$QEMU_RUN#

diff --git a/test/CMakeLists.txt b/test/CMakeLists.txt
index 61322e077b3f67541871cabc03aba8fdf5797e2f..3b7168881145739f7a43914ab01ad88dae5df7ae 100644 (file)
--- a/test/CMakeLists.txt
+++ b/test/CMakeLists.txt
@@ -72,17 +72,21 @@ add_executable(makecrct ${PROJECT_SOURCE_DIR}/tools/makecrct.c)
 configure_test_executable(makecrct)
 set(MAKECRCT_COMMAND ${CMAKE_CROSSCOMPILING_EMULATOR} $<TARGET_FILE:makecrct>)
 
-# Runs tests targeting CVEs
-include(cmake/test-cves.cmake)
+# Emscripten does not support large amounts of data via stdin/out
+# https://github.com/emscripten-core/emscripten/issues/16755#issuecomment-1102732849
+if(NOT BASEARCH_WASM32_FOUND)
+    # Runs tests targeting CVEs
+    include(cmake/test-cves.cmake)
 
-# Run tests with data files
-include(cmake/test-data.cmake)
+    # Run tests with data files
+    include(cmake/test-data.cmake)
 
-# Run tests targeting GitHub issues
-include(cmake/test-issues.cmake)
+    # Run tests targeting GitHub issues
+    include(cmake/test-issues.cmake)
 
-# Run tests targeting tools
-include(cmake/test-tools.cmake)
+    # Run tests targeting tools
+    include(cmake/test-tools.cmake)
+endif()
 
 if(WITH_FUZZERS)
     add_subdirectory(fuzz)

diff --git a/test/Makefile.in b/test/Makefile.in
index 4cd1399ec5ceff5eb35b22307d5322e87fa59877..e10de00bad9f04fe36cdfaff56b1ec851f5c6a92 100644 (file)
--- a/test/Makefile.in
+++ b/test/Makefile.in
@@ -13,9 +13,9 @@ TEST_LDFLAGS=-L.. ../$(LIBNAME).a
 QEMU_RUN=
 QEMU_VER:=$(shell command -v $(QEMU_RUN) --version 2> /dev/null)
 
-all: oldtests ghtests
+all: alltests
 
-oldtests: #set by ../configure
+alltests: #set by ../configure
 check_cross_dep:
 ifneq (,$(QEMU_RUN))
 ifeq (,$(QEMU_VER))