From d78101625ec2c4acba5458d370739e780a1170dd Mon Sep 17 00:00:00 2001 From: Nigel Tao Date: Sun, 24 Feb 2019 11:44:22 +1100 Subject: [PATCH] Raise hash tests' digits-of-pi data length --- script/checksum.go | 6 +++--- test/c/std/adler32.c | 20 ++++++++++++++------ test/c/std/crc32.c | 20 ++++++++++++++------ 3 files changed, 31 insertions(+), 15 deletions(-) diff --git a/script/checksum.go b/script/checksum.go index 03b218c2..93a97600 100644 --- a/script/checksum.go +++ b/script/checksum.go @@ -48,11 +48,11 @@ func main1() error { flag.Parse() if *pi { - const digits = "3.1415926535897932384626433832795028841971693993751058209749445" - if len(digits) != 63 { + const digits = "3.1415926535897932384626433832795028841971693993751058209749445923078164062862089986280348253421170" + if len(digits) != 99 { panic("bad len(digits)") } - for i := 0; i < 64; i++ { + for i := 0; i < 100; i++ { if err := do(strings.NewReader(digits[:i])); err != nil { return err } diff --git a/test/c/std/adler32.c b/test/c/std/adler32.c index 09167761..b0833b62 100644 --- a/test/c/std/adler32.c +++ b/test/c/std/adler32.c @@ -168,15 +168,17 @@ const char* test_wuffs_adler32_pi() { CHECK_FOCUS(__func__); const char* digits = - "3.1415926535897932384626433832795028841971693993751058209749445"; - if (strlen(digits) != 63) { - RETURN_FAIL("strlen(digits): got %d, want 63", (int)(strlen(digits))); + "3." + "141592653589793238462643383279502884197169399375105820974944592307816406" + "2862089986280348253421170"; + if (strlen(digits) != 99) { + RETURN_FAIL("strlen(digits): got %d, want 99", (int)(strlen(digits))); } // The want values are determined by script/checksum.go. // // wants[i] is the checksum of the first i bytes of the digits string. - uint32_t wants[64] = { + uint32_t wants[100] = { 0x00000001, 0x00340034, 0x00960062, 0x01290093, 0x01F000C7, 0x02E800F8, 0x0415012D, 0x057B0166, 0x07130198, 0x08E101CE, 0x0AE40203, 0x0D1A0236, 0x0F85026B, 0x122802A3, 0x150402DC, 0x18170313, 0x1B63034C, 0x1EE2037F, @@ -187,11 +189,17 @@ const char* test_wuffs_adler32_pi() { 0xB8E508A2, 0xC1BD08D8, 0xCACE0911, 0xD4120944, 0xDD8F097D, 0xE74509B6, 0xF12E09E9, 0xFB4E0A20, 0x05B20A55, 0x10380A86, 0x1AEE0AB6, 0x25D90AEB, 0x30FC0B23, 0x3C510B55, 0x47D60B85, 0x53940BBE, 0x5F890BF5, 0x6BB20C29, - 0x78140C62, 0x84AA0C96, 0x91740CCA, 0x9E730CFF, + 0x78140C62, 0x84AA0C96, 0x91740CCA, 0x9E730CFF, 0xABAB0D38, 0xB9150D6A, + 0xC6B20D9D, 0xD47F0DCD, 0xE2830E04, 0xF0BF0E3C, 0xFF2C0E6D, 0x0DDE0EA3, + 0x1CB50ED7, 0x2BBC0F07, 0x3AF90F3D, 0x4A680F6F, 0x5A0F0FA7, 0x69EC0FDD, + 0x79FB100F, 0x8A3A103F, 0x9AB11077, 0xAB6110B0, 0xBC4A10E9, 0xCD6B1121, + 0xDEC21157, 0xF04B1189, 0x021B11C1, 0x140C11F1, 0x26301224, 0x38881258, + 0x4B181290, 0x5DDA12C2, 0x70D112F7, 0x83FB132A, 0x9759135E, 0xAAE91390, + 0xBEAA13C1, 0xD29C13F2, 0xE6C51429, 0xFB1E1459, }; int i; - for (i = 0; i < 64; i++) { + for (i = 0; i < 100; i++) { wuffs_adler32__hasher checksum; const char* status = wuffs_adler32__hasher__initialize( &checksum, sizeof checksum, WUFFS_VERSION, diff --git a/test/c/std/crc32.c b/test/c/std/crc32.c index 7833b7d0..c4776760 100644 --- a/test/c/std/crc32.c +++ b/test/c/std/crc32.c @@ -166,15 +166,17 @@ const char* test_wuffs_crc32_ieee_golden() { const char* do_test_xxxxx_crc32_ieee_pi(bool mimic) { const char* digits = - "3.1415926535897932384626433832795028841971693993751058209749445"; - if (strlen(digits) != 63) { - RETURN_FAIL("strlen(digits): got %d, want 63", (int)(strlen(digits))); + "3." + "141592653589793238462643383279502884197169399375105820974944592307816406" + "2862089986280348253421170"; + if (strlen(digits) != 99) { + RETURN_FAIL("strlen(digits): got %d, want 99", (int)(strlen(digits))); } // The want values are determined by script/checksum.go. // // wants[i] is the checksum of the first i bytes of the digits string. - uint32_t wants[64] = { + uint32_t wants[100] = { 0x00000000, 0x6DD28E9B, 0x69647A00, 0x83B58BCD, 0x16E010BE, 0xAF13912C, 0xB6C654DC, 0x02D43F2E, 0xC60167FD, 0xDE72F5D2, 0xECB2EAA3, 0x22E1CE23, 0x26F4BB12, 0x099FD2E0, 0x2D041A2F, 0xC14373C1, 0x61A5D6D0, 0xEB60F999, @@ -185,11 +187,17 @@ const char* do_test_xxxxx_crc32_ieee_pi(bool mimic) { 0x63623EDF, 0x0BB7D76F, 0x5001AC9B, 0x0A5FC5FB, 0xA76213D4, 0x0C1E135B, 0x916718F4, 0xD0FE1B9F, 0xE4D15B60, 0xCE8A5FB4, 0x381922EB, 0xB351097C, 0xA3003B0D, 0x64C7C28B, 0x8ED5424B, 0x6C872ADF, 0x7CBF02ED, 0x2D713AFF, - 0xA028F932, 0x3BC16241, 0xF256AB5C, 0xE69E60DA, + 0xA028F932, 0x3BC16241, 0xF256AB5C, 0xE69E60DA, 0xEBE7C22F, 0xB1EF6496, + 0x740F578E, 0xFEAF7E51, 0x762D849E, 0xEDC1C4D4, 0x028F38BE, 0x31636BA7, + 0xBB354E18, 0xE70C7239, 0x425AFE6E, 0xB09DA8AC, 0x25D02578, 0x4343533F, + 0xACF0D063, 0x20CC1F13, 0x7E9EDAD2, 0xE5A44AA7, 0xC550F584, 0x101040DF, + 0x0BC4A511, 0x706E5A5A, 0x71CE81A3, 0xBB75E3F2, 0x3EDA6848, 0x8B8F08F2, + 0xA9384B2B, 0xB6C07F06, 0x6D644EE4, 0xCAD8CCB4, 0x3F70B461, 0x205F9F77, + 0x4D9D54B7, 0xD69454CC, 0xF8BB504D, 0xFC4E595C, }; int i; - for (i = 0; i < 64; i++) { + for (i = 0; i < 100; i++) { uint32_t got; wuffs_base__slice_u8 data = ((wuffs_base__slice_u8){ .ptr = (uint8_t*)(digits),