From 73a780674d8de121800a056446434ba3a3793ac9 Mon Sep 17 00:00:00 2001
From: YoshiRulz <OSSYoshiRulz@gmail.com>
Date: Fri, 22 Jan 2021 06:15:08 +1000
Subject: [PATCH] Add tests for decompressing/extracting archives

---
 .../SharpCompressArchiveFile.cs               |   2 +
 .../SharpCompressDearchivalMethod.cs          |  32 +++++++++++
 .../HawkFile/IFileDearchivalMethod.cs         |   7 +++
 src/BizHawk.Tests/BizHawk.Tests.csproj        |   3 +
 .../dearchive/DearchivalTests.cs              |  53 ++++++++++++++++++
 src/BizHawk.Tests/EmbeddedData.cs             |  17 ++++++
 .../data/dearchive/m3_scy_change.7z           | Bin 0 -> 1285 bytes
 .../data/dearchive/m3_scy_change.bsdtar.tar   | Bin 0 -> 34304 bytes
 .../data/dearchive/m3_scy_change.gb           | Bin 0 -> 32768 bytes
 .../data/dearchive/m3_scy_change.gb.gz        | Bin 0 -> 1312 bytes
 .../data/dearchive/m3_scy_change.gnutar.tar   | Bin 0 -> 40960 bytes
 .../data/dearchive/m3_scy_change.rar          | Bin 0 -> 1331 bytes
 .../data/dearchive/m3_scy_change.zip          | Bin 0 -> 1399 bytes
 src/BizHawk.Tests/data/dearchive/readme.md    |   2 +
 14 files changed, 116 insertions(+)
 create mode 100644 src/BizHawk.Tests/Client.Common/dearchive/DearchivalTests.cs
 create mode 100644 src/BizHawk.Tests/EmbeddedData.cs
 create mode 100644 src/BizHawk.Tests/data/dearchive/m3_scy_change.7z
 create mode 100644 src/BizHawk.Tests/data/dearchive/m3_scy_change.bsdtar.tar
 create mode 100644 src/BizHawk.Tests/data/dearchive/m3_scy_change.gb
 create mode 100644 src/BizHawk.Tests/data/dearchive/m3_scy_change.gb.gz
 create mode 100644 src/BizHawk.Tests/data/dearchive/m3_scy_change.gnutar.tar
 create mode 100644 src/BizHawk.Tests/data/dearchive/m3_scy_change.rar
 create mode 100644 src/BizHawk.Tests/data/dearchive/m3_scy_change.zip
 create mode 100644 src/BizHawk.Tests/data/dearchive/readme.md

diff --git a/src/BizHawk.Client.Common/SharpCompressArchiveFile.cs b/src/BizHawk.Client.Common/SharpCompressArchiveFile.cs
index 7cf94c7a6c..3555f50f66 100644
--- a/src/BizHawk.Client.Common/SharpCompressArchiveFile.cs
+++ b/src/BizHawk.Client.Common/SharpCompressArchiveFile.cs
@@ -24,6 +24,8 @@ namespace BizHawk.Client.Common
 
 		public SharpCompressArchiveFile(string path) => _archive = ArchiveFactory.Open(path, new());
 
+		public SharpCompressArchiveFile(Stream fileStream) => _archive = ArchiveFactory.Open(fileStream, new());
+
 		public void Dispose()
 		{
 			if (_archive == null) throw new ObjectDisposedException(nameof(SharpCompressArchiveFile));
diff --git a/src/BizHawk.Client.Common/SharpCompressDearchivalMethod.cs b/src/BizHawk.Client.Common/SharpCompressDearchivalMethod.cs
index d91bd5a7ef..dd4143bf51 100644
--- a/src/BizHawk.Client.Common/SharpCompressDearchivalMethod.cs
+++ b/src/BizHawk.Client.Common/SharpCompressDearchivalMethod.cs
@@ -49,8 +49,40 @@ namespace BizHawk.Client.Common
 			return false;
 		}
 
+		public bool CheckSignature(Stream fileStream, string? filenameHint)
+		{
+			if (!fileStream.CanRead || !fileStream.CanSeek) return false;
+
+			try
+			{
+				using var arcTest = ArchiveFactory.Open(fileStream); // should throw for non-archives
+				if (arcTest.Type != ArchiveType.Tar) return true; // not expecting false positives from anything but .tar for now
+			}
+			catch
+			{
+				return false;
+			}
+
+			// as above, SharpCompress seems to overzealously flag files it thinks are the in original .tar format, so we'll check for false positives
+
+			if (fileStream.Length < 512) return false;
+			// looking for magic bytes
+			var seekPos = fileStream.Position;
+			fileStream.Seek(0x101, SeekOrigin.Begin);
+			var buffer = new byte[8];
+			fileStream.Read(buffer, 0, 8);
+			fileStream.Seek(seekPos, SeekOrigin.Begin);
+			var s = buffer.BytesToHexString();
+			if (s == "7573746172003030" || s == "7573746172202000") return true; // "ustar\000" (libarchive's bsdtar) or "ustar  \0" (GNU Tar)
+
+			Console.WriteLine($"SharpCompress identified file in stream as original .tar format, probably a false positive, ignoring. Filename hint: {filenameHint}");
+			return false;
+		}
+
 		public SharpCompressArchiveFile Construct(string path) => new(path);
 
+		public SharpCompressArchiveFile Construct(Stream fileStream) => new(fileStream);
+
 		public static readonly SharpCompressDearchivalMethod Instance = new();
 
 		public IReadOnlyCollection<string> AllowedArchiveExtensions { get; } = new[]
diff --git a/src/BizHawk.Common/HawkFile/IFileDearchivalMethod.cs b/src/BizHawk.Common/HawkFile/IFileDearchivalMethod.cs
index ceba27afda..54f2c8df94 100644
--- a/src/BizHawk.Common/HawkFile/IFileDearchivalMethod.cs
+++ b/src/BizHawk.Common/HawkFile/IFileDearchivalMethod.cs
@@ -1,4 +1,5 @@
 using System.Collections.Generic;
+using System.IO;
 
 namespace BizHawk.Common
 {
@@ -8,8 +9,14 @@ namespace BizHawk.Common
 		/// <remarks>TODO could this receive a <see cref="HawkFile"/> itself? possibly handy, in very clever scenarios of mounting fake files</remarks>
 		bool CheckSignature(string fileName, out int offset, out bool isExecutable);
 
+		/// <remarks>for now, only used in tests</remarks>
+		bool CheckSignature(Stream fileStream, string? filenameHint = null);
+
 		IReadOnlyCollection<string> AllowedArchiveExtensions { get; }
 
 		T Construct(string path);
+
+		/// <remarks>for now, only used in tests</remarks>
+		T Construct(Stream fileStream);
 	}
 }
diff --git a/src/BizHawk.Tests/BizHawk.Tests.csproj b/src/BizHawk.Tests/BizHawk.Tests.csproj
index c728cd27da..162f96c3e0 100644
--- a/src/BizHawk.Tests/BizHawk.Tests.csproj
+++ b/src/BizHawk.Tests/BizHawk.Tests.csproj
@@ -14,4 +14,7 @@
 		<PackageReference Include="JunitXml.TestLogger" Version="2.1.78" PrivateAssets="all" />
 		<ProjectReference Include="$(ProjectDir)../BizHawk.Client.Common/BizHawk.Client.Common.csproj" />
 	</ItemGroup>
+	<ItemGroup>
+		<EmbeddedResource Include="data/**/*" />
+	</ItemGroup>
 </Project>
diff --git a/src/BizHawk.Tests/Client.Common/dearchive/DearchivalTests.cs b/src/BizHawk.Tests/Client.Common/dearchive/DearchivalTests.cs
new file mode 100644
index 0000000000..5201d772b7
--- /dev/null
+++ b/src/BizHawk.Tests/Client.Common/dearchive/DearchivalTests.cs
@@ -0,0 +1,53 @@
+using System;
+using System.IO;
+using System.Linq;
+
+using BizHawk.Client.Common;
+using BizHawk.Common.BufferExtensions;
+using BizHawk.Common.IOExtensions;
+
+using Microsoft.VisualStudio.TestTools.UnitTesting;
+
+namespace BizHawk.Tests.Client.Common.Dearchive
+{
+	[TestClass]
+	public class DearchivalTests
+	{
+		private const string EMBED_GROUP = "dearchive";
+
+		private static readonly (string Filename, bool HasSharpCompressSupport)[] TestCases = {
+			("m3_scy_change.7z", true),
+			("m3_scy_change.gb.gz", true),
+			("m3_scy_change.rar", true),
+			("m3_scy_change.bsdtar.tar", true),
+			("m3_scy_change.gnutar.tar", true),
+			("m3_scy_change.zip", true),
+		};
+
+		private readonly Lazy<byte[]> _rom = new(() => EmbeddedData.GetStream(EMBED_GROUP, "m3_scy_change.gb").ReadAllBytes());
+
+		private byte[] Rom => _rom.Value;
+
+		[TestMethod]
+		public void SanityCheck() => Assert.AreEqual("70DCA8E791878BDD32426391E4233EA52B47CDD1", Rom.HashSHA1());
+
+		[TestMethod]
+		public void TestSharpCompress()
+		{
+			var sc = SharpCompressDearchivalMethod.Instance;
+			foreach (var filename in TestCases.Where(testCase => testCase.HasSharpCompressSupport)
+				.Select(testCase => testCase.Filename))
+			{
+				var archive = EmbeddedData.GetStream(EMBED_GROUP, filename);
+				Assert.IsTrue(sc.CheckSignature(archive, filename), $"{filename} is an archive, but wasn't detected as such"); // puts the seek pos of the Stream param back where it was (in this case at the start), but that may not always be true
+				var af = sc.Construct(archive);
+				var items = af.Scan();
+				Assert.IsNotNull(items, $"{filename} contains 1 file, but it couldn't be enumerated correctly");
+				Assert.AreEqual(1, items!.Count, $"{filename} contains 1 file, but was detected as containing {items.Count} files");
+				using MemoryStream ms = new((int) items[0].Size);
+				af.ExtractFile(items[0].ArchiveIndex, ms);
+//				Assert.IsTrue(ms.ReadAllBytes().SequenceEqual(Rom), $"the file extracted from {filename} doesn't match the uncompressed file"); //TODO less dumb way of doing this? also it doesn't work
+			}
+		}
+	}
+}
diff --git a/src/BizHawk.Tests/EmbeddedData.cs b/src/BizHawk.Tests/EmbeddedData.cs
new file mode 100644
index 0000000000..dc80be02e0
--- /dev/null
+++ b/src/BizHawk.Tests/EmbeddedData.cs
@@ -0,0 +1,17 @@
+using System;
+using System.IO;
+using System.Reflection;
+
+namespace BizHawk.Tests
+{
+	public static class EmbeddedData
+	{
+		private static readonly Assembly Asm = typeof(EmbeddedData).Assembly;
+
+		public static Stream GetStream(string group, string embedPath)
+		{
+			var fullPath = $"BizHawk.Tests.data.{group}.{embedPath}";
+			return Asm.GetManifestResourceStream(fullPath) ?? throw new InvalidOperationException($"Could not find the embedded resource {fullPath}");
+		}
+	}
+}
diff --git a/src/BizHawk.Tests/data/dearchive/m3_scy_change.7z b/src/BizHawk.Tests/data/dearchive/m3_scy_change.7z
new file mode 100644
index 0000000000000000000000000000000000000000..e725fa4eb31ca40cccf6c95b0b25276f62d58e0e
GIT binary patch
literal 1285
zcmV+g1^W6odc3bE8~_BPItJ}~1ONa40001L0000000001IN#vlfByt?T>t=XSqZmw
z8SfC&ZQ&u>nqGHdQbLpbkph!Hb8p2=%jI0{eM6p_dj%WiG8sIvS|TeuM>YUgCX@mH
zWmVJ92d4!E#%*#4M|ek{4Mb2X)=-O0#{pjjYLnyQRbmRZ`;zWwYrhU7=nwm(rJa4Z
z?Z6V-^Y~pYL`gD34Y;z(!6IIADd#VFYuWty=B*0mR0);-Dx<A_24%(}0a!Rb=p3F$
zuaWiZ!6G2#8+85ShK8k*s`gu<oWhVxV{uKJs^N*lSLNrDIAVjottuesdZ+-SQv}rH
z?*}g>zI`@?Z8Jsuj_o$VCf)$4DJPOhg%dFbZ54Bdxi}E~@<5xU<AFbVTauLKqGUaU
zg9%EDB&f{*TQc!YxEf3S5Xs9qV)}3q>UGI9@ahtKO-_2$N>wjWi;TMYG?0fjOcTHU
zp%aMJN<Np-Z{&4FS$ii$@wJ=f{EG@p*lcH*ysbJi)49`RSh-oUcNpry=B)Y$fF??C
zbu}~o{FAE3S`5$Md6JSu4dv`T-5c{zvIFLhffuhSrmt3RYD1?p_HZ&Rni=w&H7Cm6
z8cHpC0vN596ytc@4VmD*sALB=o=U<2VZ8rCEfo(0Ok+JXI3z`%Ru|6<N!JYD6X&oF
z42r-Gl)e%ogALP%9;Zy=t0<M0PO-h{SU0xiIIIM|Q)29Kq-HZ4_gw9{V{#Q-I}<*x
z@?AqL$VY|zIQQlQ(y;y=UpG``PAr_lN}{%#ElP2C>1(M7@L+vZD>IusA70sfUIdTD
z(uD5&MPC_R*jRQn-ze+BK3`g_Vt?nz4QaELFRmxl+F^xAcSzn;Pu0-o-QMAq_)ZaG
zH+dP%YbveK+ZhVNzPougR5J{n{-&gfr~b8o+avO{q6Hf`HPG^PnFod=i+LdL$<?jj
z(FS}d=cb|#oav!K7x2957ria38gbv<)^e=NX=lf=zRXn$@53iy{2@D7(>)5&x4$AH
zn!G{868JabnH&?Km4ppb622tdV-*mfgIsh-1IWTN<=>aI55Z1?bNKC*9br|6s_!{?
zhbmVZarrD2;Q6vMl*WBxW+d5XF_>wR54!+mMPU;sQ!smP>tiF)82I$tukpXGFk}yB
z%@?zby#Ri-=2hw!Y8`_=0Msr|$iaUE24xOhO%TY``;R0IPo}f`yf?%on<wkq3$%o~
zh4uH(IneWtB&aw$ZAv5C&5yv${4R-a{k0E4)!L2agcfPg%_ll2XPx)4kcYV~N^VLi
z9rEp_7EM_Wm(hQHH-Xf=>`T#p$97<9by1_6X{pN{xPo_GP_^Wo)6`BONSiv@uOu7m
zTOa3++9To6><C)8KeYtS=`>AH9svtJ+EZLA@ispq*c9eG9>tX}ErH|+a97eTb8Cy)
zF}GziO6~?X8xGa(llekuzT;pVT8Bj;Up3U1YniQR$;fWc<>-H4XqcW^Jj<0x+yNH0
zL*gEGqL{rE(D&{$#hpnRL*4D9#%=N5XJtOLeG$NU#xQkg`-kmK_5c9{1^@vGgnIx7
z3jqKDAt3<<48Q<@00;^J<1XIm000F683_OY000000000HBLHmxGXP%za{yxic>rGk
vV*qFXVE}FbX8>gYE&yi$VgLXD82}Ut0RRA~X`NV#)d3X-0RSL?q=5hczc@(^

literal 0
HcmV?d00001

diff --git a/src/BizHawk.Tests/data/dearchive/m3_scy_change.bsdtar.tar b/src/BizHawk.Tests/data/dearchive/m3_scy_change.bsdtar.tar
new file mode 100644
index 0000000000000000000000000000000000000000..3bb70f7bc6da2bea922587bae938834048505087
GIT binary patch
literal 34304
zcmeI4UrbYX6vs~i@efi3qj3o-Z3Ae0FhyXnq`4~$T}PZ4wwh%xBDjJXb3mu7S#yiH
z7&V5dWE)NVvo{lBMwaZw_@Xw$G+50Z_F$$<qi!T-i`{szNOONXzu&zDoszxi!j|vv
z-s`>Rp7T3@KIeCTJlT(Gc7{3+?Ck8`wYTeoja?n|5{Ad)d9}9INghvieVymYJ8P=>
z@_3xpHFb5hHEg)a<MdS5)_Us6>3IpcJmYd-=#yRjoZ5kpL*09x(ayd2C%q~|6{qT%
zoB02Jif=Ad1;*bo@Bg`K<J)aFeh&t(7gJGwhz`+mDyAhR<wuT^{r2^}zuviXD|YEp
zSLa^)Z`beKj-9)7u|}J>#>vA!PgNUY>;YX)uJR`r`!#2(QOi$>WP{&DBZZB2XV~p6
zcFq(`yt{tN6)Cj)lN<foaLT9MPrd1C61F_s%)H*A009sHfdxh&e#-WkE_;n-S6d5x
zyz|{kH=lQMj$@zp_VtJQ`+EO=|DoiR?Z=XW{97y8YORgPnMbrfpU6`{)Ub%i$A3!v
zi;1=`A$o5qQTsBY?joYz<wW6Pq5(V6krhNI*uhB20>goHKmY_l00ck)1V8`;KmY_l
z00ck)1V8`;KmY_l00ck)1V8`;KmY_l00ck)1V8`;KmY_l00ck)1V8`;KmY_l00ck)
z1V8`;KmY_l00ck)1VG>g6YzTVpooiuV$xf|ha7wtll&&G2fg01GRGP*#nM4B<yccz
z*3b~{7B`iAGu++K@PgA>5bk<<jvc#jVRW>o$4sZaeL#)&c2jO?86EwGM@x$-ALB7J
zG&p$ot|`~mZQfj2xq5Y1mnjE>fj}_W%)^wcsse!>I|6~qN>dJnDk|J=m#eDEl=Jfo
z3i9%7wnFPC7Ah+PfqnY|fwneN-`nf+wYU3xy}hPfU*FW^c9)iRSik16Ze3eje}5Z~
zod4$Lj*iC0{rgS%$$!m$tIl)xi44Oyr4GZi(sePx-By>b6RDMPp5Oe!*CfkA#KbVa
zP4Hb1MIy#H%ir^rh(?L#{G0x~-pKCA*04XaHL_dA3y0NHg?bxS@kfnuW00>=gL9Dc
zRZO`)+5RanY%hnd>rFDZxe*SB{d}<A;m|he9maU}cxEJ>mbSdwPl}_QZCuWYL?X?c
ziCp{2zonm2F}WTk$HX5wdyCJY@u#EI;ZXSw8fV2JF)a?se0ANps$|PQ^EoJ{S1eTr
z{~u<{Up(h88WmUg`AYNvTd>~ZrM^O0Z%)qfDKC%qiEG)@;##z?yj)hSBFHG5Em0<8
z42gTMzb5V(Lz&EMyy<ACrpXGe_`~8H$5j2%gL;$riRY{S83xx9GcU6q<`rXWs~$@q
zlQvSXqMtJc*+ONIlZ~_K6DDutD(g<Ny^6<rIafwg@l@}E-U^w8T3@mf?sfKl_Va8u
zx4w+Syq=VOI?aCh$i;i~NSxtrexVK~p!^?YA2K4#R=qNs>UXZbx%^apF}8n7FTOJ8
ztNxs08>_#nK69^B>&2>P*1sjkxf<R*RX%4pLz$oQuk^gL%BT+?TKUS{n1N-_J1y(w
z9;@<aPyLQkz2D@MPG?54$Bl8lL)#?RpW?SI?AN!MdTT#dwafL88!B)1r@lA2;;nB<
z+N1y6>jm2XNJQTf4VAwV4e47Vk=gxVcE8dz-ra6wMvNQ0A~YgiuL&_Mzs%>4bhB~7
z`8eSsLlgF|-NnvqB1!(SlrOa+^+u{m`!dzS%8@ZQ|6<KdqJ)eMrK^h71YZdaurTrd
z`e|ul8o21Rd!mOeT{K`mXtq?VM#(MyWGlOE)tu&IV&`Y>qVPrMbb@^pg}-%X5@RW$
zc~Zm^-d;(G<ahpg&zt__eCGpya=vrXTgiFOg#E*{dG<XU?k;l9B%aR+Z$SVAKmY_l
z00ck)1V8`;KmY_l00ck)1V8`;KmY_l00ck)1V8`;KmY_l00ck)1V8`;KmY_l00ck)
i1V8`;KmY_l00ck)1V8`;KmY_l00ck)1VG^5An+HNHKEo3

literal 0
HcmV?d00001

diff --git a/src/BizHawk.Tests/data/dearchive/m3_scy_change.gb b/src/BizHawk.Tests/data/dearchive/m3_scy_change.gb
new file mode 100644
index 0000000000000000000000000000000000000000..163a2c62a3f2da4be2165ade5c851e41bf254bc5
GIT binary patch
literal 32768
zcmeI4U1$_n6vxjdF@D6XCZbpfo82Xe;zO|(F@<HiNu!+xYb5PT=}VU=tEE9US+rBS
z%*I$mMS>dIW<gEggdh!tzDQowrI97B(uY1swJd5IkQTSigB!El+jH;C##+pi(&piR
zXC^ae&bjB~ckbLgB}6YaGTW=QgUox*{l&cf53@77JvaY|#ctG6O=W_P(n_kOWp$0m
zPmuS{jf214y?Z-7F|mK|LGSN3?%qj{PF#N7STM`!W53M2Cgk`-x{_OC=9Zd<Ki_6l
z=4Gzc4A4k*o7ZmzL$&_7s;T!k&IFRxUNiTqX$<GX#)JIZfp+Ps@XRgf9SRTt0T5VZ
z1TtqmPv}ZWthm-y9p;_ycA?{<pK~1lG~U;r=<kdF`~G9yS<g>(Rh73_v(<VJk-vgy
zV<pk%Dx%gUL}C6_VlE}xy^QFC<wVgHL<ee!;wy=)TA~3j(eYJ8r`f?s-6F$*bU*+E
zKmY_l00ck)1V8`;KmY_l00ck)1V8`;KmY_l00ck)1V8`;KmY_l00ck)1V8`;KmY_l
z00ck)1V8`;KmY_l00ck)1V8`;KmY_l00cnbB@+mR?3m2RBXT;_#D^Mum(%<vW5+_F
zh6dj{Im6NsIpbT`(9qgy9gw%Qe9Jn}+WL~ySrqPidrzLcbZKm?x7SH08XeFh8g=B(
z&ats?d31I<@<|>;LxY3&?m6<-t=qRZH?Lj0f4?KgVv$HJ*1^M(TUsKKJ$oXN=4MAu
zB$}Fn!9bv;#gQv3tEwt0Jf3RzUo12?M<Ry~MIznZjy@g_hojMOI39Q8ZQI)0gTeax
zo*qZuu%WxVzrUM@BPS9a9X&m5ZHEs#@;`q%{nnl5?h^?i&gw%rR<<ptxZC=&Z6dug
zF7lgS`I=@~%CsEjw^_bRqGVD`vit*I*;I<?sei{`D3sin+-aG~oymPFo@ME$CjHjZ
z@yEoZ802eAa1Ls|j;Yos+dt!l?bWbtyItk>bXb;U^1*ta&)8!3h{@8a;z*&OY<abx
zktaCYjGB{7CObG2wf41tS3jd;ay?p3%RkHZE}ud1m#^OE)A<gH3-YL(l}A;+wk@t{
z+4awSj>y?n%k{y3!|eLYl>Mbr@+v=HO?}1|tao|ouTa%nmdkt^8&iGqdg+|Jp6Y9C
zR2Az8Dhg*yR4j@idH>Bf<b5$zEY8Q9P3<)dRiPVySdMZ`-5)z<x67Y-zV4q8Tua)y
zoO+m7nyuY>Tzy*ED7}t8DhAm?XHb^Kg~Dlvx46c-Gi<Npv0lwp(R4iByI816Wue!X
zs)T!8dQkeJR4T78ag5iKwl5UeFCXQ2j~~nP+|4ib!34Db6YN7pWZA7(MbrH**Y`9(
zU0<5*pV7;&o%y;yqio~$SJ&t4m3qCn_00Qs<qTKDyQj|QJZGr#)Bd%dcUBek(IYos
zl^Zi~?RlqVz1m}S{_LsWS8w+_d<uo)Na>WAw0n##YW-<`yDZb*<>=l0T-UDFLwV@D
z*`NO2)QWe%C1sEPbFUX^|C333M=H_yN-AORNG9j^gZcf+FnD*nSsW2Jc|{mRyk4_%
zSbdq#AB7Ha+W#aQAYn-FH^EweDVrm6JRi=l%D<IwH@?buvT|fR$p5isE?Y-pQ~jD+
zJt16211wB^xN%llI0gYa7o6&4%K!~H4~8e-Wl(O1nd@S=U54Lz%zpHFu*SOVpUtw5
z8tXfMF*}}@#^yZngm+g{Hut@`;Cai;Ep$FKa|@kI-pMU+X1$-Ruke1n>E06mT=w~#
z@D>C>00ck)1V8`;KmY_l00ck)1V8`;KmY_l00ck)1V8`;KmY_l00ck)1V8`;KmY_l
l00ck)1V8`;KmY_l00ck)1V8`;KmY_l00ck)1pZ3`e*^jRh<^Y8

literal 0
HcmV?d00001

diff --git a/src/BizHawk.Tests/data/dearchive/m3_scy_change.gb.gz b/src/BizHawk.Tests/data/dearchive/m3_scy_change.gb.gz
new file mode 100644
index 0000000000000000000000000000000000000000..b4ee534c0b3035f31d8aaa9b9f44212382eb7aab
GIT binary patch
literal 1312
zcmZ|Oi$Bu|003~8Pw(rfWI{TL70si<F3hLPqlYMB9<5(_%sghdcE;KmA0Lq|ti_^)
ziG9Yri{`PCvkKcdYK=8#%v|QVlbd1p7u@%M_#UO~+Etj@jL_3Zp8;@D1Rx4^Cn+|@
zJ~mQsUJ9Us;O0A*fU$7hXiXavdLr(?SUAZ<Xo)vm_|v|F1GOuoH8ZkphntVZWi8|*
zlH%RGyz_$FoGb8{Uui{|4swcV$ZqFi4^`!0enrxDiDSf3KQuH}`5cECIhl4K*<eB>
zuwF|Mag`gwaw)H9w(mtsNbO>QEzndgKHe=(UTX|h`8x*}fl-B@1D)$@(NIF3bZx<0
z6NN;cOWs_s)c2K=WhGpOX?OZO8ZBu<25h*j8Ba|W%=+Ndpq-~V1ROe?kRKb-3o~UW
z;)u!Qim}dXPTa;AVeE~LUWse(nC9j+;uGS8Scr&e$c97ldKsWcFy+0=uG<m?^}_y&
zRP|Nm1xB}g>tE2ajOPVlHYAJX2_kMfyZ%J^EpR;g?ta2RZg~HLwh+Tt4L|S6^R%8U
z@*=|br*)N{=(s=o+o9_u2<_I@(M6kcVHbW6IqMjxEzL2|`+rN1wr@jHSsE<N3}uw#
zO;U$p!D#-r%=LRB9~hW9MH03)^LVd<JqKCQ?$t+=&}m;aZ+`UfU<Cl&(=MM!s^qAb
zK%P&qblAz|d)Cl!rF`Vw(9qkrn_62LFHI?|so7`t(~&^zDdPu!L|UHj69{M@wl--O
zgXnn&AMkzNOehnQLa+paw|7{{KyaLnl3i1Cae8+6;)}W~eaoqiCJ%RHEx*o7QK2wv
z+PQBXoxxoM92^b+a7K_PZC7?j=lEFu5n?(gzFW~xq31f`{Vn{8p4yZfB|rj3jz4mn
zYJrm5zf*I630PLklYB_HW4*Tz9^1O~tR(twoYtSrKOfa@;et2YSx@Y+Z!}dP5Z^ud
zHeWKJ?>XiiWlVW%wTp4YaGALPZ`XbRA?}qMDl7`x1S;ggzBAc0(ye^3AV+hOh90}e
zccd16dPA>5z`)vR{4+V(ZFOFA__i+fo4dtfgQhE_LXrBs9WWBz9-Sx#sd3LlVotHI
zAd(ozaxa;7?OPR0Gis&J8#CwyI0d!6(o!;j0XZy<f0W(dk-%x$+0bHbYxKpCytLr9
z@q?MIk+Jq^fW^?+x+88dk*|08rB$u#xTaA~;HFbQN)>Fr)m%X_-(euopQ|D~-j{27
zS|5yLti*mIwMH-#L-U>D78#FKkm?yY2XSf$71Im_BI_vz6aYjKZbgE<_$}!$hp|IB
zBNKG+1~XKEneLfiXL(7QMtFmstA1Nq)f=jnNnNpeaa4Ub&Bwb;V?9*{nFkTwDf8pl
z@chd~fKg5ng6$5O;IiKrFh&a?ZD83;CaGUSW>&)j$|S5AaJd83NYu2uHDVk&?-|DP
zHF!$A!QF%fu)kiDs|+>7z3hqS>(+NRb)q?p$xK5ubMj&IJ86u`6&VY!E47g&rR=p*
zHGJ7$I_PROL-Eknz*j8spS5SFtZJ}pYg_RcCwlc#s{NC?kKK#}F;9@3`;LayP4kMg
z{UFVd<heS9eoy!}P|q|Nq7K;?+~W({pnI$^0R*byCd)^Hm`r4$+Je-z1A{C;Q}<7T
zOhZLgUDgdpe4r{{w>kUDGY!PoZHUfYs@Qmqs7m2!2Mb-GW63=B;HIQlYuB~6M1kD%
T|NZ{@qybIY%l_8O(9`=5Q?#EO

literal 0
HcmV?d00001

diff --git a/src/BizHawk.Tests/data/dearchive/m3_scy_change.gnutar.tar b/src/BizHawk.Tests/data/dearchive/m3_scy_change.gnutar.tar
new file mode 100644
index 0000000000000000000000000000000000000000..79929e79d079350eb5f7aca4fea1baafa3153812
GIT binary patch
literal 40960
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
J00jQ6z+Y-}pCkYP

literal 0
HcmV?d00001

diff --git a/src/BizHawk.Tests/data/dearchive/m3_scy_change.rar b/src/BizHawk.Tests/data/dearchive/m3_scy_change.rar
new file mode 100644
index 0000000000000000000000000000000000000000..83dca21f6f60351e48945f9ec269b37aa55c2d14
GIT binary patch
literal 1331
zcmV-31<d+VVR9iF2LS-{;ezW60R;yD1_1$pfPes#9AyD00s`iV00w}70;Gcikb$vX
z<1XImfCB*#Z8KkUV|ia=Xkl(=WiDr8g47HF{}=yL{$c<i2tWXf-VFjMg+)^`^k7Hl
zq>Pfs(S3DaI%zFQP^1eR1S+;i$y6$WMMQ`orBa2cx*))+lxsysS3(k^iqJ_kp#q{%
zK@rf{B(Q08#)S*;3-KvzwwK^rA#Io8<KFDO?S<KOU3c(V&X{n{W_Ov-$+McU|2S~}
z=X?F#UHk_O-<mT(-=WQyIegQ5)KHf9FP*r?el4z9%3}fdo6{uyHhQ|6UljeCROojt
zCxYa#$6<7;$~Kw@RZGZO>y+zyYsT)w&HlJgt96)`pYHO;HOnd#psnWd@u~hAJc=s+
zb<>RaZ!&4Kn(A`=ZMj#!TMby&FmhR2{vj;wF8R`8Rc$76{cudIbIG+~EiY54HE+66
zo@OPLm-hNUXa`!Mf@;H*)|vbmo_ki&S)EIEgvla+;fq4BU$t5zwp>5XI6@~ec>QzO
z3yQWP8@b^L<010x@Wcw!#ixOov+;2Ulgq^qY|7nU{(Noj>UaDrTRZ+0t(=Y#NAVi!
zn6_SoZPAd7jl_&?OGQSfqKznMHki;KB(|5w-!Yal1VlUS<L+MHvV(C@I3PXa9ASll
z(D0E6V$C*!u}{g7*iy7~<}3|FhnZY*F9wOWpg!Wbi(x)A1sOTeBLsiKVBp*}Q`#My
zn3G&mD%mztd3vlN9MFY$v~}hn8{s-tUXgYsP2+Go%3urWxyJ6Lc9_v9jUOz4&Q!tz
zCw4?cGW1|Z)d|58NU`F)c54a36OvA7X^bNXYKqP;CyEhG1YRof#Bj`>gh2=-j1}Dp
z=y{;=f)5v@nlUhjv)~ULA3>n;nzMx6TrSPb-14roGjb_D3ig4un_G2TReo2Mb$P!a
zx;!guaH5aj{PZ3cSY7-}{7JKB-=B)sXnhbKXd)qw%PHATR4N;?CZRLyfqm>$C&E!q
zfqt!)seoaGY&^aMt+dwgQP9U_j*|1NgIg_i&71T6S313bDH&v=R70`WRFD$TTJf4Q
zh@$L-UE*<gQRT~937mi&?rmxnYMqKn&rgtz)SqC+F;!G%kw@G*#KicW{KqJGK(Exh
zz&dY+^wXG{;Z$IljdOk}4iF5lcf>y~?E;h8rjx8q>owqpJUmFg<UbwD+t$0O_`9MM
zY8!!_DAi8ZtdA;wyzXn@)HiC1?RFMfL6JY8okFZu6EoSwPt3MfFtQo+)*A;cNf(YC
z7~`FO)J9oN87eo?r&l=nh}S52=X7cwl8MuwipR6y6ibhYGi$$Rd``O;RF4@RpMYTw
z7m?Asx}71Dy!K*ZkbfxaR<Wr6XJ$w$DEaSnpG);vP!yudgF&LPMn+^Us@sM*D@o}8
z0h#Kp?d{2w`#=KRDEm=$#2<I1-UU7oJgq_8)NC`5wh?v5AE><GuhPgnX*=J0BI#1S
zW-0pmr2o5|!wlm!-@WAp8iwQk1*(=<e{X!NPzpLUv6$H6B3Am9aZ#N!_TMaB{bb#G
zudZe~-8oaWT*Gqh&U=`PdK~DKN*cG@JzNjte0U5S&PB=Z*kR0<md{%Px~8F@1~hDU
z9+@vyxK3k&Wjtxr@yLG$rafEh_;0wY`{oVl1Pps-R%}H|+{Yyr{nO)01iy6c|K`)*
pKNc=J4|;Cvx5?q%cCdbz69N4zfYz4p$!`3X@5mi@R#5{51OQ5Zl>Gnz

literal 0
HcmV?d00001

diff --git a/src/BizHawk.Tests/data/dearchive/m3_scy_change.zip b/src/BizHawk.Tests/data/dearchive/m3_scy_change.zip
new file mode 100644
index 0000000000000000000000000000000000000000..5f99374b8295bb31c06f492c03b375ae1a3dccce
GIT binary patch
literal 1399
zcmZ{kZ9EeQ9LLuoS4UmtDT!;N6L(uK-I8YIA(v-`jj)iUnH`d+JVl3j3MuAcny1P!
z+_sL{xw_<W*3RQROw3}NAq>OjcyVv;bNzlVe*gdf^ZCE|z4$uW%E_w$z5sj)(5ON>
za={$FSRMcXBme+k?*!%yD$Fkm<#*dBIKUqq;42zK-M)s<Qd~rBFyWLJwfYBa@X1s)
zonOLIk0;Z}>0WNd`Mn*(-RAkT$Q<&eh;}fPa-0aPqy(Waia5zY!z6kt<PK7=AGunu
zSeR87tiV2fUB?b{E?}lK4BOYaK~Axk#07)bWb-C#Tg)p2o0Wx%HJ2B{7}phZn}vvR
z2~3UVWii0pr&*=!Vu2QFIucH-(MQ|k=<(aZf)NTRC95f(7Q5|zXK7?$h~nCfhl`ir
zpfeodRYJD?<Q%^KBZGqGnUrF_+PqDCIW8KICTcERZJSFRR3JF>4g{c-(cGr8RsA(8
zDT&tQX)6y{BnFkucrj<A6KY%8UaBgl6XW-18xa=>GF=Y*k;ZH`JYM>2zD3yHj9a1|
zv#P5F1F=V)(I%{{{Y0t_v26X+KGKPi)+e*la7&ih(z+&X>R9TECh-!K#rGgOJO62U
z{MJs@pOtrTV!}~wU|cR!5&zcb5W);nTERem^Zxw@_8WD}ySb1^s<APd!nc+bXUwdW
zV=xeI!HT#97Q^f6cR>+w<*ZAmG+jdwL;d|wbHq~|b3X`VVR2CVdE`(XECyc$#hQg$
zwlyGi52rtrSA9jc1S%f93}i429CY#ctvCXy(yEQeQ&si%2P5*O5H)-eD2Lk)$|==W
zZRfteVXUe2j%&c7)5`x^AdwbCuAitF7)(wM26K>E0#yVe3>F?TMfiy7jmc}-o2ubA
z!+Y)09Ju6eG_+)F4{Z7YoW87%W~3G@tLUgZo|)=OQ%Yi_uE&Jj%I(bOnTn65WYVLD
zhtXQpQhsv_I@dAWeOsl-$6~6uapVRaA}ogFH+bUa$*j5h5jUbR8mR>w=d$kM=|NSI
zb*FQf-LeXa1{~y3MCBMMfo={gkXa6>N8zES4xiw~TdV6z4RDxPJ3Av~SkJ6ST~a^b
z-FFk}A2g%R4a<cL*5z4?LZbq|g%wUi-%2y5s}07rNeO-0GrfGQpI;+k!od5(t6XVj
zrW?v%*^~0*xzi2M)?^WOF(s(N30a3Viu$SV*U-7hVn^KhJi#XR-Xh`cW~fXf5A(EI
zklh1!7qr^hn(!MxUincsv_tKj5$&;#E0+<BBO9^XE9l-=8>x>qQAQCB7xM;iyibS2
zyzaYfwIJ^fs+;P0e78KaO!N#nCx*p#L2&FXbM3L-_{$ZUCcN&|>QeOf&o5%{Z46KJ
zNf3fq6L=nwIfaw;J{?RSC-mbaZfkBNmkp~BWUXOkHLtWNdg-Q>Y&bN^w_24S*1K^;
zPdQS+*mKrQa^Hs-nZ+oek2s*Eohz}?!(-Kdi=-DS-7M06GoN1jzT%IVURkzed%L&Q
zr=X<Ml55zR%nsBrT)jq%vp+%`EqNnP1Gy!i94$J;ZFAeibf*kIUvqzFZO5G_NzZb8
zPufoMJx?QwVho3##TE(=ryc2&vE^!Q3(xzG3ZVlX>JP$=^&hYgdZ^cG86;(c*8?`E
z8D-5Z&!*ta#*)dPSNhcJ%P&WJQV5b7aSf*}L%-Z(d+>UP-OTS)koDBV2<X+5n_iIv
z%rOC>y(ZpZ!d;XX65m4Uk+N15^Es7Dvc0>+`+p^Db5KsUd%l3neIAnkepV#zPX9%w
TldZzu-TR&$o9!e>VR!one7Uy4

literal 0
HcmV?d00001

diff --git a/src/BizHawk.Tests/data/dearchive/readme.md b/src/BizHawk.Tests/data/dearchive/readme.md
new file mode 100644
index 0000000000..e5195a53c8
--- /dev/null
+++ b/src/BizHawk.Tests/data/dearchive/readme.md
@@ -0,0 +1,2 @@
+All files in this dir are derived from `m3_scy_change.gb`, which is an open source test rom from the [Mealybug Tearoom Tests](https://github.com/mattcurrie/mealybug-tearoom-tests) (specifically, it's the copy from [this bundle](https://github.com/mattcurrie/mealybug-tearoom-tests/blob/bc3430a7c1f5d394764f37a189b85d8ce4bb3c4e/mealybug-tearoom-tests.zip)).
+The test suite is made available under the MIT (Expat) license, and the full terms of the license can be found [here](https://github.com/mattcurrie/mealybug-tearoom-tests/blob/bc3430a7c1f5d394764f37a189b85d8ce4bb3c4e/LICENSE).