Skip to content
This repository was archived by the owner on Dec 8, 2025. It is now read-only.

Commit 80e69c1

Browse files
authored
Clean up .spv files generated during testing (#1144)
The glslangValidator tool always generates a .spv file when validating a shader in Vulkan mode. This change causes the tests that invoke the validator in this manner to subsequently delete such files.
1 parent 38ce80e commit 80e69c1

2 files changed

Lines changed: 26 additions & 0 deletions

File tree

generator/src/test/java/com/graphicsfuzz/generator/tool/GenerateShaderFamilyTest.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
import java.util.List;
3333
import net.sourceforge.argparse4j.inf.ArgumentParserException;
3434
import org.apache.commons.io.FileUtils;
35+
import org.junit.After;
3536
import org.junit.Ignore;
3637
import org.junit.Rule;
3738
import org.junit.Test;
@@ -42,6 +43,18 @@ public class GenerateShaderFamilyTest {
4243
@Rule
4344
public TemporaryFolder temporaryFolder = new TemporaryFolder();
4445

46+
@After
47+
public void deleteTemporarySpirvFiles() {
48+
// In Vulkan mode, glslangValidator will create SPIR-V files. This cleans them up after each
49+
// test.
50+
for (String kind : Arrays.asList("vert", "frag", "comp")) {
51+
final File tempFile = new File(kind + ".spv");
52+
if (tempFile.exists()) {
53+
tempFile.delete();
54+
}
55+
}
56+
}
57+
4558
@Test
4659
public void testGenerateSmall100ShaderFamily() throws Exception {
4760
final String samplesSubdir = "100";

generator/src/test/java/com/graphicsfuzz/generator/tool/GlslGenerateTest.java

Lines changed: 13 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -39,6 +39,7 @@
3939
import java.util.List;
4040
import net.sourceforge.argparse4j.inf.ArgumentParserException;
4141
import org.apache.commons.io.FileUtils;
42+
import org.junit.After;
4243
import org.junit.Rule;
4344
import org.junit.Test;
4445
import org.junit.rules.TemporaryFolder;
@@ -48,6 +49,18 @@ public class GlslGenerateTest {
4849
@Rule
4950
public TemporaryFolder temporaryFolder = new TemporaryFolder();
5051

52+
@After
53+
public void deleteTemporarySpirvFiles() {
54+
// In Vulkan mode, glslangValidator will create SPIR-V files. This cleans them up after each
55+
// test.
56+
for (String kind : Arrays.asList("vert", "frag", "comp")) {
57+
final File tempFile = new File(kind + ".spv");
58+
if (tempFile.exists()) {
59+
tempFile.delete();
60+
}
61+
}
62+
}
63+
5164
@Test
5265
public void testSmall100ShaderFamilies() throws Exception {
5366
final String references = Paths.get(ToolPaths.getShadersDirectory(),

0 commit comments

Comments
 (0)