ddidderr
da0e2c8380
`make all` exercises substantially more than the default zstd binary. It also builds compression-only and decompression-only archives, older contrib tools that compile program C shims directly, and the single-file amalgamations. The Rust migration had changed symbol ownership without updating every one of those feature and link boundaries. The first failure came from `fileio_asyncio`: it is always compiled, but its codec bindings unconditionally referenced both `zstd_compress` and `zstd_decompress`. A compression-only archive therefore required disabled decoder modules, and the decompression-only configuration had the symmetric problem. Gate the concrete codec imports, callback types, helpers, and exports with their Cargo features. Keep the format probe compilable without the legacy decoder predicate when decompression is disabled. Once that boundary compiled, the remaining `make all` paths exposed related integration gaps. Move the C decompression projection declarations out of the compression preprocessor block, while leaving destination callback types shared. Link the Rust CLI helpers archive into zlibWrapper, pzstd, and largeNbDicts, whose util/time/data-generator C files are now declaration shims rather than implementations. The generated single-file C sources also call Rust-owned symbols now. Build and link an appropriately featured Rust archive in their native smoke tests, and include the pool configuration shim in the decoder case. The full amalgamation combines `zstd_lazy.c` and `zstd_opt.c` into one translation unit, so guard their otherwise translation-unit-local dictionary mode enum against duplicate definition. A Rust-backed amalgamation is no longer a standalone Emscripten input. Remove the obsolete emcc/Docker path and report that limitation explicitly; restoring the WebAssembly smoke test requires a Rust WebAssembly archive and a defined cross-language amalgamation contract. Test Plan: - `cargo check --manifest-path rust/Cargo.toml --no-default-features --features compression` -- passed - `cargo check --manifest-path rust/Cargo.toml --no-default-features --features decompression` -- passed - `sh -n build/single_file_libs/build_decoder_test.sh build/single_file_libs/build_library_test.sh` -- passed - `make all` -- passed, including native single-file and seekable-format tests - `git diff --cached --check` -- passed
59 lines
1.6 KiB
Bash
Executable File
59 lines
1.6 KiB
Bash
Executable File
#!/bin/sh
|
|
|
|
# Where to find the sources (only used to copy zstd.h)
|
|
ZSTD_SRC_ROOT="../../lib"
|
|
|
|
# Temporary compiled binary
|
|
OUT_FILE="tempbin"
|
|
|
|
RUST_TARGET_DIR="../../rust/target/single-file-library"
|
|
RUST_ARCHIVE="$RUST_TARGET_DIR/release/libzstd_rs.a"
|
|
|
|
# Amalgamate the sources
|
|
./create_single_file_library.sh
|
|
# Did combining work?
|
|
if [ $? -ne 0 ]; then
|
|
echo "Single file library creation script: FAILED"
|
|
exit 1
|
|
fi
|
|
echo "Single file library creation script: PASSED"
|
|
|
|
# Copy the header to here (for the tests)
|
|
cp "$ZSTD_SRC_ROOT/zstd.h" examples/zstd.h
|
|
cp "$ZSTD_SRC_ROOT/zstd_errors.h" examples/zstd_errors.h
|
|
|
|
# Build the Rust implementation referenced by the amalgamated C shims.
|
|
${CARGO:-cargo} build --manifest-path ../../rust/Cargo.toml --release \
|
|
--target-dir "$RUST_TARGET_DIR"
|
|
if [ $? -ne 0 ]; then
|
|
echo "Building Rust library archive: FAILED"
|
|
exit 1
|
|
fi
|
|
|
|
# Compile the generated output
|
|
cc -Wall -Wextra -Werror -Wshadow \
|
|
-Wno-unused-variable -Wno-unused-parameter -Wno-unused-but-set-variable \
|
|
-pthread -I. -Os -g0 -o $OUT_FILE zstd.c examples/roundtrip.c "$RUST_ARCHIVE"
|
|
# Did compilation work?
|
|
if [ $? -ne 0 ]; then
|
|
echo "Compiling roundtrip.c: FAILED"
|
|
exit 1
|
|
fi
|
|
echo "Compiling roundtrip.c: PASSED"
|
|
|
|
# Run then delete the compiled output
|
|
./$OUT_FILE
|
|
retVal=$?
|
|
rm -f $OUT_FILE
|
|
# Did the test work?
|
|
if [ $retVal -ne 0 ]; then
|
|
echo "Running roundtrip.c: FAILED"
|
|
exit 1
|
|
fi
|
|
echo "Running roundtrip.c: PASSED"
|
|
|
|
# The generated C now calls Rust, so it is no longer a standalone Emscripten input.
|
|
echo "(Skipping Emscripten test for Rust-backed amalgamation)"
|
|
|
|
exit 0
|