Merge from trunk.

diff --cc plat/linux68k/tests/build.lua
index 0000000,a025310..dd6d0fc
mode 000000,100644..100644
--- /dev/null
--- 2/plat/linux68k/tests/build.lua
+++ b/plat/linux68k/tests/build.lua
@@@ -1,0 -1,7 +1,7 @@@
 -    method = "plat/linux68k/emu+emu68k"
+ include("tests/plat/build.lua")
+ 
+ plat_testsuite {
+     name = "tests",
+     plat = "linux68k",
++    method = "plat/linux68k/emu+emu68k",
+ }