From dbf5b772b3b5f962c3186dd0073146539ec0586b Mon Sep 17 00:00:00 2001 From: Dylan Baker Date: Thu, 19 Apr 2018 11:02:32 -0700 Subject: [PATCH] compiler/glsl: close fd's in glcpp_test.py I would have thought falling out of scope would allow the gc to collect these, but apparently it doesn't, and this hits an fd limit on macos. Bugzilla: https://bugs.freedesktop.org/show_bug.cgi?id=106133 Fixes: db8cd8e36771eed98eb638fd0593c978c3da52a9 ("glcpp/tests: Convert shell scripts to a python script") Signed-off-by: Dylan Baker Reviewed-by: Eric Anholt Tested-by: Vinson Lee --- src/compiler/glsl/glcpp/tests/glcpp_test.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/src/compiler/glsl/glcpp/tests/glcpp_test.py b/src/compiler/glsl/glcpp/tests/glcpp_test.py index f07c2414ea2..cdc63b3ac2a 100755 --- a/src/compiler/glsl/glcpp/tests/glcpp_test.py +++ b/src/compiler/glsl/glcpp/tests/glcpp_test.py @@ -78,7 +78,8 @@ def _valgrind(glcpp, filename): extra_args = parse_test_file(filename, nl_format='\n') try: - _, tmpfile = tempfile.mkstemp() + fd, tmpfile = tempfile.mkstemp() + os.close(fd) with open(filename, 'rb') as f: proc = subprocess.Popen( ['valgrind', '--error-exitcode=31', '--log-file', tmpfile, glcpp] + extra_args, @@ -135,7 +136,8 @@ def _replace_test(args, replace): total += 1 testfile = os.path.join(args.testdir, filename) try: - _, tmpfile = tempfile.mkstemp() + fd, tmpfile = tempfile.mkstemp() + os.close(fd) with io.open(testfile, 'rt') as f: contents = f.read() with io.open(tmpfile, 'wt') as f: -- 2.30.2