Merge pull request #93 from davidgiven/dtrg-pc86-2

Rearrange the tests; don't run unsupported tests on emulators which don't support them.

plat/linux68k/tests/build.lua

@@ -4,4 +4,5 @@ plat_testsuite {
     name = "tests",
     plat = "linux68k",
     method = "plat/linux68k/emu+emu68k",
+	skipsets = {"floats"}, -- FPU instructions not supported by emulator
 }

plat/pc86/tests/build.lua

@@ -4,4 +4,5 @@ plat_testsuite {
     name = "tests",
     plat = "pc86",
     method = "plat/pc86/emu+pc86emu",
+	skipsets = {"floats"}, -- FPU instructions not supported by emulator
 }

tests/plat/build.lua

@@ -4,20 +4,25 @@ definerule("plat_testsuite",
 	{
 		plat = { type="string" },
 		method = { type="string" },
+		sets = { type="table", default={"core", "b", "bugs", "m2", "floats"}},
+		skipsets = { type="table", default={}},
 	},
 	function(e)
 		-- Remember this is executed from the caller's directory; local
 		-- target names will resolve there.
-		local testfiles = filenamesof(
+		local testfiles = {}
-			-- added structcopy_e.c
+		local skipsets = {}
-			"tests/plat/*.c",
+		for _, set in ipairs(e.skipsets) do
-			"tests/plat/*.e",
+			skipsets[set] = true
-			"tests/plat/*.p",
+		end
-			"tests/plat/b/*.b",
+		for _, set in ipairs(e.sets) do
-			"tests/plat/bugs/*.c",
+			if not skipsets[set] then
-			"tests/plat/bugs/*.mod",
+				local fs = filenamesof("tests/plat/"..set.."/*")
-			"tests/plat/m2/*.mod"
+				for _, f in ipairs(fs) do
-		)
+					testfiles[#testfiles+1] = f
+				end
+			end
+		end
 
 		acklibrary {
 			name = "lib",