vasilito
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).
28 lines
641 B
Bash
28 lines
641 B
Bash
#!/bin/sh
|
|
# This test is expected to fail at least with diffutils-3.6.
|
|
# Demonstrate how diff can produce suboptimal output.
|
|
# With these two files, diff -u prints output including this:
|
|
# -2
|
|
# +L: 361
|
|
# +L: 361
|
|
# +2
|
|
# The trouble is that "2" line that is both added and removed.
|
|
# This smaller patch could induce the same change:
|
|
# +L: 361
|
|
# +L: 361
|
|
|
|
. "${srcdir=.}/init.sh"; path_prepend_ ../src
|
|
|
|
require_perl_
|
|
|
|
fail=0
|
|
|
|
diff -u \
|
|
"$abs_top_srcdir/tests/large-subopt.in1" \
|
|
"$abs_top_srcdir/tests/large-subopt.in2" \
|
|
| $PERL -n0 -e \
|
|
'/\n-2\n(\+L: 361\n){2}\+2\n/ and do {$e=1; last}; END{exit !$e}' \
|
|
&& fail=1
|
|
|
|
Exit $fail
|