This is an archive of the discontinued Mercurial Phabricator instance.

Differential D10351

unit-tests: Fix `cargo test` on 32-bit platforms
ClosedPublic

Authored by SimonSapin on Apr 9 2021, 6:08 AM.

Details

Reviewers
pulkit
Group Reviewers
hg-reviewers
Commits
rHG6d5a26e94d9e: unit-tests: Fix `cargo test` on 32-bit platforms
Summary

Fixes https://bz.mercurial-scm.org/show_bug.cgi?id=6506

This makes IndexEntryBuilder::build, which is only used in unit tests, use
u32 or u64 instead of platform-dependent usize when packing binary data
to be used at test input.

To run Rust unit tests in 32-bit mode in a x86-64 environment, use:

rustup target add i686-unknown-linux-gnu  # Once
(cd rust && cargo test --target i686-unknown-linux-gnu)

Diff Detail

Repository
rHG Mercurial
Lint
Automatic diff as part of commit; lint not applicable.
Unit
Automatic diff as part of commit; unit tests not applicable.

Event Timeline

SimonSapin created this revision.Apr 9 2021, 6:08 AM
pulkit accepted this revision.Apr 11 2021, 5:29 PM
This revision is now accepted and ready to land.Apr 11 2021, 5:29 PM
SimonSapin added a commit: rHG6d5a26e94d9e: unit-tests: Fix `cargo test` on 32-bit platforms.Apr 11 2021, 7:22 PM
Closed by commit rHG6d5a26e94d9e: unit-tests: Fix `cargo test` on 32-bit platforms (authored by SimonSapin). · Explain Why
This revision was automatically updated to reflect the committed changes.

Revision Contents
Changeset List

PathPackages
Mrust/hg-core/src/revlog/index.rs (8 lines)

Diff 26799

rust/hg-core/src/revlog/index.rs

(false, true) => [0u8, 1], (false, true) => [0u8, 1],
(true, false) => [0u8, 2], (true, false) => [0u8, 2],
(true, true) => [0u8, 3], (true, true) => [0u8, 3],
}); });
bytes.extend(&self.version.to_be_bytes()); bytes.extend(&self.version.to_be_bytes());
// Remaining offset bytes. // Remaining offset bytes.
bytes.extend(&[0u8; 2]); bytes.extend(&[0u8; 2]);
} else { } else {
// Offset is only 6 bytes will usize is 8. // Offset stored on 48 bits (6 bytes)
bytes.extend(&self.offset.to_be_bytes()[2..]); bytes.extend(&(self.offset as u64).to_be_bytes()[2..]);
} }
bytes.extend(&[0u8; 2]); // Revision flags. bytes.extend(&[0u8; 2]); // Revision flags.
bytes.extend(&self.compressed_len.to_be_bytes()[4..]); bytes.extend(&(self.compressed_len as u32).to_be_bytes());
bytes.extend(&self.uncompressed_len.to_be_bytes()[4..]); bytes.extend(&(self.uncompressed_len as u32).to_be_bytes());
bytes.extend(&self.base_revision.to_be_bytes()); bytes.extend(&self.base_revision.to_be_bytes());
bytes bytes
} }
} }
#[test] #[test]
fn is_not_inline_when_no_inline_flag_test() { fn is_not_inline_when_no_inline_flag_test() {
let bytes = IndexEntryBuilder::new() let bytes = IndexEntryBuilder::new()