068a1ca63e
Bootloader fork rebase:
- Base changed from 0.1.0 pre-patched archive to upstream 1.0.0 tag (c7eeb9f)
- Applied 0001-redbear-local-forks.patch (Cargo.toml crate path redirects)
- Applied fix-uefi-alloc-panic.patch equivalents (4 panic!() -> graceful
error handling in src/main.rs)
- Applied P5-live-preload-cap-1gib.patch (1 GiB cap on live image preload)
- Skipped: P0 GPT partition scan (requires new module + integration),
P1 timeout/default-resolution, P2 live preload guard (subsumed by
panic fixes + cap), P3 live image safe read, P4 large ISO boot,
redox.patch — to be applied in dedicated rebase session.
firmware-loader/Cargo.toml: version 0.1.0 -> 0.3.0 (sync with other
Red Bear custom crates which are at 0.3.0).
fork-upstream-map.toml: bootloader back from PENDING_REBASE to 1.0.0
since the partial rebase matches upstream 1.0.0 content.
fork-upstream-map.toml: base restored to 'main' tracked (was correctly
tracked by build-redbear.sh).
26 lines
593 B
Bash
Executable File
26 lines
593 B
Bash
Executable File
#!/bin/sh
|
|
# Before diff-3.7, this would provoke a UMR
|
|
|
|
. "${srcdir=.}/init.sh"; path_prepend_ ../src
|
|
|
|
fail=0
|
|
|
|
require_valgrind_
|
|
|
|
printf '\r' > r || framework_failure_
|
|
echo b > b || framework_failure_
|
|
|
|
# Use valgrind only when no Sanitizer is in use:
|
|
ASAN_OPTIONS=help=true diff --help 2>&1 |grep Sanitizer > /dev/null \
|
|
&& eval 'valgrind() { "$@"; }' \
|
|
|| eval 'valgrind() { env valgrind --quiet --error-exitcode=3 "$@"; }'
|
|
|
|
for opt in '' u c Dfoo; do
|
|
returns_ 1 valgrind \
|
|
diff -a$opt --strip-trailing-cr r b > out 2> err || fail=1
|
|
done
|
|
|
|
compare /dev/null err || fail=1
|
|
|
|
Exit $fail
|