diff options
| author | Miquel Sabaté Solà <mikisabate@gmail.com> | 2025-01-13 16:13:40 +0100 |
|---|---|---|
| committer | Miquel Sabaté Solà <mikisabate@gmail.com> | 2025-01-13 16:15:07 +0100 |
| commit | 52bab4714b8f9301e4ad2a8c5dddf0787b8698f2 (patch) | |
| tree | 597e77ca4d0c9ab1838826913dbfdff26fb53b92 | |
| parent | 5f48de69f46d4da27b22c47178b2e6216f7a7801 (diff) | |
| download | tools.nes-52bab4714b8f9301e4ad2a8c5dddf0787b8698f2.tar.gz tools.nes-52bab4714b8f9301e4ad2a8c5dddf0787b8698f2.zip | |
tests: Update code.nes so -Werror can be passed
Update the underlying code.nes test data so it uses a tighter
configuration for NROM which in turn frees nasm from complaining about
empty segments. This makes room to allo for -Werror so we catch warnings
that might appear in the future.
Signed-off-by: Miquel Sabaté Solà <mikisabate@gmail.com>
| -rw-r--r-- | lib/xixanta/src/assembler.rs | 22 | ||||
| -rwxr-xr-x | scripts/test-e2e.sh | 15 | ||||
| -rw-r--r-- | tests/code.nes.tar.gz | bin | 52401 -> 51347 bytes |
3 files changed, 8 insertions, 29 deletions
diff --git a/lib/xixanta/src/assembler.rs b/lib/xixanta/src/assembler.rs index 7f46384..c64c413 100644 --- a/lib/xixanta/src/assembler.rs +++ b/lib/xixanta/src/assembler.rs @@ -1958,12 +1958,7 @@ mod tests { offset: 0, fill: Some(0x00), section_type: SectionType::Header, - segments: vec![Segment { - name: String::from("HEADER"), - len: 0, - offset: 0, - bundles: vec![], - }], + segments: vec![Segment::from("HEADER")], }, Mapping { name: String::from("ROM0"), @@ -1972,20 +1967,7 @@ mod tests { offset: 0, fill: None, section_type: SectionType::PrgRom, - segments: vec![ - Segment { - name: String::from("ONE"), - len: 0, - offset: 0, - bundles: vec![], - }, - Segment { - name: String::from("TWO"), - len: 0, - offset: 0, - bundles: vec![], - }, - ], + segments: vec![Segment::from("ONE"), Segment::from("TWO")], }, ] } diff --git a/scripts/test-e2e.sh b/scripts/test-e2e.sh index 554e3bb..9d71152 100755 --- a/scripts/test-e2e.sh +++ b/scripts/test-e2e.sh @@ -3,26 +3,23 @@ set -ex pushd tests - rm -rf out/ mkdir -p out/ -if [ ! -d code.nes ]; then - tar xzvf code.nes.tar.gz -fi - +rm -rf code.nes +tar xzf code.nes.tar.gz popd cargo build -./target/debug/nasm -c nrom65 -o tests/out/sprite.nes tests/code.nes/basics/sprite.s +./target/debug/nasm -c nrom -Werror -o tests/out/sprite.nes tests/code.nes/basics/sprite.s diff tests/out/sprite.nes tests/code.nes/out/basics/sprite.nes -./target/debug/nasm -c unrom -o tests/out/chr-ram.nes tests/code.nes/basics/chr-ram.s +./target/debug/nasm -c unrom -Werror -o tests/out/chr-ram.nes tests/code.nes/basics/chr-ram.s diff tests/out/chr-ram.nes tests/code.nes/out/basics/chr-ram.nes -./target/debug/nasm -c nrom65 -o tests/out/flicker.nes tests/code.nes/basics/flicker.s +./target/debug/nasm -c nrom -Werror -o tests/out/flicker.nes tests/code.nes/basics/flicker.s diff tests/out/flicker.nes tests/code.nes/out/basics/flicker.nes -./target/debug/nasm -c nrom65 -o tests/out/space.nes tests/code.nes/space/src/space.s +./target/debug/nasm -c nrom -Werror -o tests/out/space.nes tests/code.nes/space/src/space.s diff tests/out/space.nes tests/code.nes/out/space/space.nes diff --git a/tests/code.nes.tar.gz b/tests/code.nes.tar.gz Binary files differindex f2569ab..437bbed 100644 --- a/tests/code.nes.tar.gz +++ b/tests/code.nes.tar.gz |