From: Ben Pfaff <blp@cs.stanford.edu>
Date: Fri, 11 Jul 2025 00:23:02 +0000 (-0700)
Subject: Fix expected output for compressed data tests.
X-Git-Url: https://pintos-os.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0d11ea89d5824db4876cf03804ffe5b0840ee7d7;p=pspp

Fix expected output for compressed data tests.
---

diff --git a/rust/pspp/src/sys/test.rs b/rust/pspp/src/sys/test.rs
index 3b809785bf..fc39ec2730 100644
--- a/rust/pspp/src/sys/test.rs
+++ b/rust/pspp/src/sys/test.rs
@@ -673,10 +673,10 @@ fn test_sysfile(sysfile: Vec<u8>, expected: &str, expected_filename: &Path) {
         Err(error) => Item::new(Details::Text(Box::new(Text::new_log(error.to_string())))),
     };
 
-    assert_lines_eq(
-        &expected,
-        expected_filename.display(),
-        &output.to_string(),
-        "actual",
-    );
+    let actual = output.to_string();
+    if expected != actual && std::env::var("PSPP_REFRESH_EXPECTED").is_ok() {
+        std::fs::write(expected_filename, actual).unwrap();
+        panic!("{}: refreshed output", expected_filename.display());
+    }
+    assert_lines_eq(&expected, expected_filename.display(), &actual, "actual");
 }
diff --git a/rust/pspp/src/sys/testdata/compressed_data.expected b/rust/pspp/src/sys/testdata/compressed_data.expected
index 3b0e1d4e21..624955c00d 100644
--- a/rust/pspp/src/sys/testdata/compressed_data.expected
+++ b/rust/pspp/src/sys/testdata/compressed_data.expected
@@ -22,10 +22,10 @@
 │str15│       5│     │Nominal          │Input│   15│Left     │A15         │A15         │              │
 ╰─────┴────────┴─────┴─────────────────┴─────┴─────┴─────────┴────────────┴────────────┴──────────────╯
 
-╭────┬──────┬──────┬────────┬────────────────┬──────────────────────────────╮
-│Case│ num1 │ num2 │  str4  │      str8      │             str15            │
-├────┼──────┼──────┼────────┼────────────────┼──────────────────────────────┤
-│1   │-99.00│   .00│        │abcdefgh        │        0123                  │
-│2   │   .  │151.00│jklm    │nopqrstu        │vwxyzABC                      │
-│3   │  1.00│  2.00│DEFG    │HIJKLMNO        │        PQRSTUV               │
-╰────┴──────┴──────┴────────┴────────────────┴──────────────────────────────╯
+╭────┬──────┬──────┬────┬────────┬───────────────╮
+│Case│ num1 │ num2 │str4│  str8  │     str15     │
+├────┼──────┼──────┼────┼────────┼───────────────┤
+│1   │-99.00│   .00│    │abcdefgh│        0123   │
+│2   │   .  │151.00│jklm│nopqrstu│vwxyzABC       │
+│3   │  1.00│  2.00│DEFG│HIJKLMNO│        PQRSTUV│
+╰────┴──────┴──────┴────┴────────┴───────────────╯
diff --git a/rust/pspp/src/sys/testdata/compressed_data_other_bias.expected b/rust/pspp/src/sys/testdata/compressed_data_other_bias.expected
index 17e3b4157a..a2a09ddddd 100644
--- a/rust/pspp/src/sys/testdata/compressed_data_other_bias.expected
+++ b/rust/pspp/src/sys/testdata/compressed_data_other_bias.expected
@@ -24,10 +24,10 @@ Compression bias is 50 instead of the usual values of 0 or 100.
 │str15│       5│     │Nominal          │Input│   15│Left     │A15         │A15         │              │
 ╰─────┴────────┴─────┴─────────────────┴─────┴─────┴─────────┴────────────┴────────────┴──────────────╯
 
-╭────┬──────┬──────┬────────┬────────────────┬──────────────────────────────╮
-│Case│ num1 │ num2 │  str4  │      str8      │             str15            │
-├────┼──────┼──────┼────────┼────────────────┼──────────────────────────────┤
-│1   │-49.00│ 50.00│        │abcdefgh        │        0123                  │
-│2   │   .  │201.00│jklm    │nopqrstu        │vwxyzABC                      │
-│3   │ 51.00│ 52.00│DEFG    │HIJKLMNO        │        PQRSTUV               │
-╰────┴──────┴──────┴────────┴────────────────┴──────────────────────────────╯
+╭────┬──────┬──────┬────┬────────┬───────────────╮
+│Case│ num1 │ num2 │str4│  str8  │     str15     │
+├────┼──────┼──────┼────┼────────┼───────────────┤
+│1   │-49.00│ 50.00│    │abcdefgh│        0123   │
+│2   │   .  │201.00│jklm│nopqrstu│vwxyzABC       │
+│3   │ 51.00│ 52.00│DEFG│HIJKLMNO│        PQRSTUV│
+╰────┴──────┴──────┴────┴────────┴───────────────╯
diff --git a/rust/pspp/src/sys/testdata/compressed_data_zero_bias.expected b/rust/pspp/src/sys/testdata/compressed_data_zero_bias.expected
index 0a4fd1167b..96d6e5ac76 100644
--- a/rust/pspp/src/sys/testdata/compressed_data_zero_bias.expected
+++ b/rust/pspp/src/sys/testdata/compressed_data_zero_bias.expected
@@ -22,10 +22,10 @@
 │str15│       5│     │Nominal          │Input│   15│Left     │A15         │A15         │              │
 ╰─────┴────────┴─────┴─────────────────┴─────┴─────┴─────────┴────────────┴────────────┴──────────────╯
 
-╭────┬──────┬──────┬────────┬────────────────┬──────────────────────────────╮
-│Case│ num1 │ num2 │  str4  │      str8      │             str15            │
-├────┼──────┼──────┼────────┼────────────────┼──────────────────────────────┤
-│1   │  1.00│100.00│        │abcdefgh        │        0123                  │
-│2   │   .  │251.00│jklm    │nopqrstu        │vwxyzABC                      │
-│3   │101.00│102.00│DEFG    │HIJKLMNO        │        PQRSTUV               │
-╰────┴──────┴──────┴────────┴────────────────┴──────────────────────────────╯
+╭────┬──────┬──────┬────┬────────┬───────────────╮
+│Case│ num1 │ num2 │str4│  str8  │     str15     │
+├────┼──────┼──────┼────┼────────┼───────────────┤
+│1   │  1.00│100.00│    │abcdefgh│        0123   │
+│2   │   .  │251.00│jklm│nopqrstu│vwxyzABC       │
+│3   │101.00│102.00│DEFG│HIJKLMNO│        PQRSTUV│
+╰────┴──────┴──────┴────┴────────┴───────────────╯
diff --git a/rust/pspp/src/sys/testdata/partial_compressed_data_record.expected b/rust/pspp/src/sys/testdata/partial_compressed_data_record.expected
index bd5f2635de..64c01ec2da 100644
--- a/rust/pspp/src/sys/testdata/partial_compressed_data_record.expected
+++ b/rust/pspp/src/sys/testdata/partial_compressed_data_record.expected
@@ -24,8 +24,8 @@
 
 Unexpected end of file at offset 0x1ac, 0 bytes and 2 compression chunks into a compressed case.
 
-╭────┬──────┬────┬────────┬────────────────┬──────────────────────────────╮
-│Case│ num1 │num2│  str4  │      str8      │             str15            │
-├────┼──────┼────┼────────┼────────────────┼──────────────────────────────┤
-│1   │-99.00│ .00│        │abcdefgh        │        0123                  │
-╰────┴──────┴────┴────────┴────────────────┴──────────────────────────────╯
+╭────┬──────┬────┬────┬────────┬───────────────╮
+│Case│ num1 │num2│str4│  str8  │     str15     │
+├────┼──────┼────┼────┼────────┼───────────────┤
+│1   │-99.00│ .00│    │abcdefgh│        0123   │
+╰────┴──────┴────┴────┴────────┴───────────────╯
diff --git a/rust/pspp/src/sys/testdata/zcompressed_data.expected b/rust/pspp/src/sys/testdata/zcompressed_data.expected
index 41e507a580..834891e4f6 100644
--- a/rust/pspp/src/sys/testdata/zcompressed_data.expected
+++ b/rust/pspp/src/sys/testdata/zcompressed_data.expected
@@ -22,10 +22,10 @@
 │str15│       5│     │Nominal          │Input│   15│Left     │A15         │A15         │              │
 ╰─────┴────────┴─────┴─────────────────┴─────┴─────┴─────────┴────────────┴────────────┴──────────────╯
 
-╭────┬──────┬──────┬────────┬────────────────┬──────────────────────────────╮
-│Case│ num1 │ num2 │  str4  │      str8      │             str15            │
-├────┼──────┼──────┼────────┼────────────────┼──────────────────────────────┤
-│1   │-99.00│   .00│        │abcdefgh        │        0123                  │
-│2   │   .  │151.00│jklm    │nopqrstu        │vwxyzABC                      │
-│3   │  1.00│  2.00│DEFG    │HIJKLMNO        │        PQRSTUV               │
-╰────┴──────┴──────┴────────┴────────────────┴──────────────────────────────╯
+╭────┬──────┬──────┬────┬────────┬───────────────╮
+│Case│ num1 │ num2 │str4│  str8  │     str15     │
+├────┼──────┼──────┼────┼────────┼───────────────┤
+│1   │-99.00│   .00│    │abcdefgh│        0123   │
+│2   │   .  │151.00│jklm│nopqrstu│vwxyzABC       │
+│3   │  1.00│  2.00│DEFG│HIJKLMNO│        PQRSTUV│
+╰────┴──────┴──────┴────┴────────┴───────────────╯
diff --git a/rust/pspp/src/sys/testdata/zcompressed_data_uncompressed_size_block_size.expected b/rust/pspp/src/sys/testdata/zcompressed_data_uncompressed_size_block_size.expected
index a1a839cdf2..0591a35cd7 100644
--- a/rust/pspp/src/sys/testdata/zcompressed_data_uncompressed_size_block_size.expected
+++ b/rust/pspp/src/sys/testdata/zcompressed_data_uncompressed_size_block_size.expected
@@ -24,10 +24,10 @@ ZLIB block descriptor 0 reported block size 0x400000, when at most 0x3ff000 was
 │str15│       5│     │Nominal          │Input│   15│Left     │A15         │A15         │              │
 ╰─────┴────────┴─────┴─────────────────┴─────┴─────┴─────────┴────────────┴────────────┴──────────────╯
 
-╭────┬──────┬──────┬────────┬────────────────┬──────────────────────────────╮
-│Case│ num1 │ num2 │  str4  │      str8      │             str15            │
-├────┼──────┼──────┼────────┼────────────────┼──────────────────────────────┤
-│1   │-99.00│   .00│        │abcdefgh        │        0123                  │
-│2   │   .  │151.00│jklm    │nopqrstu        │vwxyzABC                      │
-│3   │  1.00│  2.00│DEFG    │HIJKLMNO        │        PQRSTUV               │
-╰────┴──────┴──────┴────────┴────────────────┴──────────────────────────────╯
+╭────┬──────┬──────┬────┬────────┬───────────────╮
+│Case│ num1 │ num2 │str4│  str8  │     str15     │
+├────┼──────┼──────┼────┼────────┼───────────────┤
+│1   │-99.00│   .00│    │abcdefgh│        0123   │
+│2   │   .  │151.00│jklm│nopqrstu│vwxyzABC       │
+│3   │  1.00│  2.00│DEFG│HIJKLMNO│        PQRSTUV│
+╰────┴──────┴──────┴────┴────────┴───────────────╯