Allow TestOnly attribute on multiple tests. Fix test filtration

Author: MrSmith33

source/vox/tests/infra/runner.d

@@ -13,35 +13,21 @@ import vox.tests.tests;
 @nogc nothrow:
 
 i32 runTests(ref TestSuite suite) {
-	u32 numTests;
-	if (suite.filter.enabled) {
-		foreach(ref test; suite.tests) {
-			if (suite.filter.shouldRun(test)) {
-				++numTests;
-			}
-		}
-
-		writefln("Selected %s of %s tests to run", numTests, suite.tests.length);
+	if (suite.isFilterEnabled) {
+		writefln("Selected %s of %s tests to run", suite.numTestsToRun, suite.tests.length);
 	} else {
-		numTests = cast(u32)suite.tests.length;
-		writefln("Running %s tests", suite.tests.length);
+		writefln("Running all %s tests", suite.numTestsToRun);
 	}
 
-	// Warmup (first run does all the allocations and memory faults)
-	//if (suite.filter.disabled && suite.tests.length) {
-	//	context.runTest(suite.tests[0]);
-	//	context.runTest(suite.tests[0]);
-	//	context.runTest(suite.tests[0]);
-	//}
-	// End warmup
-
 	MonoTime start = currTime;
 	foreach(ref test; suite.tests) {
-		auto context = suite.contexts[test.contextIndex];
-		context.runTest(test);
+		if (!suite.isFilterEnabled || test.onlyThis) {
+			auto context = suite.contexts[test.contextIndex];
+			context.runTest(test);
+		}
 	}
 	MonoTime end = currTime;
-	writefln("Done %s tests in %s", suite.tests.length, end - start);
+	writefln("Done %s tests in %s", suite.numTestsToRun, end - start);
 
 	return 0;
 }

source/vox/tests/infra/test.d

@@ -17,7 +17,17 @@ struct TestSuite {
 	Array!TestDefinition definitions;
 	// test permutations
 	Array!TestInstance tests;
-	TestFilter filter;
+	u32 numOnlyInstances;
+
+	bool isFilterEnabled() => numOnlyInstances != 0;
+
+	u32 numTestsToRun() {
+		if (isFilterEnabled) {
+			return numOnlyInstances;
+		} else {
+			return tests.length;
+		}
+	}
 
 	u8 registerContext(ref VoxAllocator allocator, ITestContext context) {
 		foreach(i, c; contexts) {
@@ -76,6 +86,8 @@ struct TestInstance {
 	u32 index;
 	// Index into TestSuite.contexts
 	u8 contextIndex;
+	// @TestOnly
+	bool onlyThis;
 
 	PtrSize ptrSize() {
 		return cast(PtrSize)getParam(TestParamId.ptr_size);
@@ -93,15 +105,3 @@ struct TestInstance {
 		u32 value;
 	}
 }
-
-struct TestFilter {
-	@nogc nothrow:
-
-	bool enabled = false;
-	bool disabled() => !enabled;
-	bool shouldRun(ref TestInstance test) {
-		return definition == test.definition;
-	}
-
-	u32 definition;
-}

source/vox/tests/infra/test_maker.d

@@ -66,17 +66,6 @@ static struct MakerParam {
 void instantiateTest(ref VoxAllocator allocator, ref TestSuite suite, TestDefinition def) {
 	if (def.ignore) return;
 
-	if (def.onlyThis) {
-		if (suite.filter.enabled) {
-			auto otherDef = suite.definitions[suite.filter.definition];
-			panic("TestOnly attribute found in multiple places:\n  %s at %s:%s\n  %s at %s:%s\n",
-				otherDef.name, otherDef.file, otherDef.line,
-				def.name, def.file, def.line);
-		}
-		suite.filter.definition = def.index;
-		suite.filter.enabled = true;
-	}
-
 	ITestContext context = suite.contexts[def.contextIndex];
 
 	u32 numPermutations = 1;
@@ -128,9 +117,15 @@ void instantiateTest(ref VoxAllocator allocator, ref TestSuite suite, TestDefini
 			test_handler : def.test_handler,
 			parameters : testParameters,
 			contextIndex : def.contextIndex,
+			onlyThis : def.onlyThis,
 		};
 		suite.tests.put(allocator, t);
 
+		// How many filtered tests should run
+		if (def.onlyThis) {
+			++suite.numOnlyInstances;
+		}
+
 		// increment
 		foreach(ref param; parameters) {
 			// treat each parameter as a digit in a number