From: David Given <dg@cowlark.com>
Date: Thu, 7 Jun 2018 15:05:50 +0000 (+0900)
Subject: Merge from trunk.
X-Git-Url: https://git.ndcode.org/public/gitweb.cgi?a=commitdiff_plain;h=1d4ddb939dcabd7c1cf7ecf904973028b82c937a;p=ack.git

Merge from trunk.
---

1d4ddb939dcabd7c1cf7ecf904973028b82c937a
diff --cc plat/linux68k/tests/build.lua
index 000000000,a025310a9..dd6d0fc63
mode 000000,100644..100644
--- a/plat/linux68k/tests/build.lua
+++ b/plat/linux68k/tests/build.lua
@@@ -1,0 -1,7 +1,7 @@@
+ include("tests/plat/build.lua")
+ 
+ plat_testsuite {
+     name = "tests",
+     plat = "linux68k",
 -    method = "plat/linux68k/emu+emu68k"
++    method = "plat/linux68k/emu+emu68k",
+ }