Skip to content

Commit 31eaba8

Browse files
committed
deqp: Add --no-rerun-tests flag
1 parent fac4209 commit 31eaba8

File tree

4 files changed

+14
-1
lines changed

4 files changed

+14
-1
lines changed

src/deqp/config/args.volt

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ import deqp.config.info;
1616

1717
fn parseArgs(settings: Settings, args: string[])
1818
{
19-
printFailing: bool;
19+
printFailing, noRerunTests: bool;
2020
threads, batchSize, randomize: i32;
2121
ctsBuildDir, resultsFile, tempDir, regressionFile: string;
2222
testNamesFiles, regressionFiles: string[];
@@ -27,6 +27,7 @@ fn parseArgs(settings: Settings, args: string[])
2727
watt.getopt(ref args, "test-names-file", ref testNamesFiles);
2828
watt.getopt(ref args, "results-file", ref resultsFile);
2929
watt.getopt(ref args, "temp-dir", ref tempDir);
30+
watt.getopt(ref args, "no-rerun-tests", ref noRerunTests);
3031
watt.getopt(ref args, "print-failing", ref printFailing);
3132
watt.getopt(ref args, "randomize", ref randomize);
3233
watt.getopt(ref args, "check|regression-file", ref regressionFiles);
@@ -56,6 +57,9 @@ fn parseArgs(settings: Settings, args: string[])
5657
if (printFailing) {
5758
settings.printFailing = printFailing;
5859
}
60+
if (noRerunTests) {
61+
settings.noRerunTests = noRerunTests;
62+
}
5963
if (regressionFiles !is null) {
6064
settings.regressionFiles = regressionFiles;
6165
}

src/deqp/config/info.volt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@ fn printConfig(s: Settings)
3232
info("\tthreads = %s", s.threads);
3333
info("\tresultsFile = '%s'", s.resultsFile);
3434
info("\ttempDir = '%s'", s.tempDir);
35+
info("\tnoRerunTests = %s", s.noRerunTests);
3536
}
3637

3738
fn printAllArgsAndConfig()

src/deqp/config/parser.volt

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,9 @@ fn parseConfigFile(s: Settings)
5555
if (root.hasKey("printFailing")) {
5656
s.printFailing = root["printFailing"].boolean();
5757
}
58+
if (root.hasKey("noRerunTests")) {
59+
s.noRerunTests = root["noRerunTests"].boolean();
60+
}
5861
if (root.hasKey("regressionFile")) {
5962
s.resultsFile = root["regressionFile"].str();
6063
}

src/deqp/driver.volt

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@ public:
3333

3434
testNamesFiles: string[];
3535
ctsBuildDir: string;
36+
noRerunTests: bool = false;
3637

3738
batchSize: u32;
3839

@@ -260,6 +261,10 @@ public:
260261

261262
info(" :: Rerunning failed test(s).");
262263

264+
if (settings.noRerunTests) {
265+
info("\tRerunning tests disabled by arguments or settings");
266+
}
267+
263268
if ((total / 8) > (bad - inc)) {
264269
mask |= 1u << Result.Fail;
265270
mask |= 1u << Result.InternalError;

0 commit comments

Comments
 (0)