summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDylan Baker <baker.dylan.c@gmail.com>2014-07-09 17:25:27 -0700
committerKenneth Graunke <kenneth@whitecape.org>2014-07-13 23:42:21 -0700
commit73380e68e1adde97fe96a31e7c8442534a8a952c (patch)
treea4a96d6c51c54cfeb77f85156f61a837605dfd7a
parent4d28dc92d1581b27de56561444769603af57e4fb (diff)
run.py: don't support .frag or .vert files
v2 (Ken): Keep the code to skip .out files. Acked-by: Kenneth Graunke <kenneth@whitecape.org>
-rwxr-xr-xrun.py15
1 files changed, 2 insertions, 13 deletions
diff --git a/run.py b/run.py
index 3b35fce..d39b703 100755
--- a/run.py
+++ b/run.py
@@ -17,8 +17,7 @@ def process_directories(items):
else:
for dirpath, _, filenames in os.walk(item):
for fname in filenames:
- ext = os.path.splitext(fname)[1]
- if ext in ['.frag', '.vert', '.shader_test']:
+ if os.path.splitext(fname)[1] == '.shader_test':
yield os.path.join(dirpath, fname)
@@ -26,21 +25,11 @@ def run_test(filename):
if ".out" in filename:
return ""
- if ".shader_test" in filename:
- command = ['./bin/shader_runner',
- filename,
- '-auto',
- '-fbo']
- else:
- command = ['./bin/glslparsertest',
- filename,
- 'pass']
-
timebefore = time.time()
try:
p = subprocess.Popen(
- command,
+ ['./bin/shader_runner', filename, '-auto', '-fbo'],
stdout=subprocess.PIPE,
stderr=subprocess.PIPE)
(stdout, stderr) = p.communicate()