Convert the inn test to work with the test library and not import InOut; it now

runs on qemuppc again. Reenable qemuppc tests.

build.lua

@@ -18,7 +18,7 @@ vars.plats = {
 vars.plats_with_tests = {
 	"linux386",
 	"linuxppc",
-	-- "qemuppc", FIXME: disable until we figure out why qemu won't run binaries bigger than 4kB
+	"qemuppc",
 	"pc86",
 }
 

tests/plat/bugs/bug-22-inn_mod.mod

@@ -1,5 +1,5 @@
 MODULE test;
-FROM InOut IMPORT WriteLn, WriteString;
+FROM Test IMPORT fail, finished;
 
 TYPE charset = SET OF CHAR;
 
@@ -10,17 +10,13 @@ END Space;
 
 BEGIN
   IF Space('a') THEN
-    WriteString("@@FAIL 1");
+    fail(1);
-    WriteLn;
   END;
   IF NOT Space(' ') THEN
-    WriteString("@@FAIL 2");
+    fail(2);
-    WriteLn;
   END;
   IF NOT Space(12C) THEN
-    WriteString("@@FAIL 3");
+    fail(3);
-    WriteLn;
   END;
-  WriteString("@@FINISHED");
+  finished;
-  WriteLn;
 END test.

tests/plat/build.lua

@@ -18,7 +18,10 @@ definerule("plat_testsuite",
 		acklibrary {
 			name = "lib",
 			srcs = { "tests/plat/lib/test.c" },
-			hdrs = { "tests/plat/lib/test.h" },
+			hdrs = {
+				"tests/plat/lib/test.h",
+				"tests/plat/lib/Test.def"
+			},
 			vars = { plat = e.plat },
 		}
 

tests/plat/lib/Test.def

@@ -0,0 +1,6 @@
+(*$Foreign*)
+DEFINITION MODULE Test;
+  PROCEDURE finished();
+  PROCEDURE writehex(code: LONGINT);
+  PROCEDURE fail(code: LONGINT);
+END Test.

tests/plat/lib/build.lua

@@ -1,7 +0,0 @@
-include("plat/build.lua")
-
-acklibrary {
-	name = "lib",
-	srcs = { "./test.c" },
-	hdrs = { "./test.h" },
-}